refactor: improved error code of buildInsertInto()

packages/core/src/database/insert.ts

@@ -78,7 +78,10 @@ export const buildInsertInto: BuildInsertInto = <Schema extends SchemaLike<strin
       rows: [entry],
     } = result;
 
-    assert(!returning || entry, new RequestError('application.create_failed'));
+    assert(
+      !returning || entry,
+      new RequestError({ code: 'entity.create_failed', name: rest.tableSingular })
+    );
     return entry;
   };
 };

packages/core/src/errors/RequestError/index.ts

@@ -10,8 +10,12 @@ export default class RequestError extends Error {
   data: unknown;
 
   constructor(input: RequestErrorMetadata | LogtoErrorCode, data?: unknown) {
-    const { code, status = 400 } = typeof input === 'string' ? { code: input } : input;
-    const message = i18next.t<string, LogtoErrorI18nKey>(`errors:${code}`);
+    const {
+      code,
+      status = 400,
+      ...interpolation
+    } = typeof input === 'string' ? { code: input } : input;
+    const message = i18next.t<string, LogtoErrorI18nKey>(`errors:${code}`, interpolation);
 
     super(message);
 

packages/phrases/src/locales/en.ts

@@ -37,8 +37,8 @@ const errors = {
   swagger: {
     invalid_zod_type: 'Invalid Zod type, please check route guard config.',
   },
-  application: {
-    create_failed: 'Failed to create application.',
+  entity: {
+    create_failed: 'Failed to create {{name}}.',
   },
 };
 

packages/phrases/src/locales/zh-cn.ts

@@ -39,8 +39,8 @@ const errors = {
   swagger: {
     invalid_zod_type: '无效的 Zod 类型，请检查路由 guard 配置。',
   },
-  application: {
-    create_failed: '创建应用失败。',
+  entity: {
+    create_failed: '创建{{name}}失败。',
   },
 };
 

packages/schemas/src/api/error.ts

@@ -1,6 +1,6 @@
 import { LogtoErrorCode } from '@logto/phrases';
 
-export type RequestErrorMetadata = {
+export type RequestErrorMetadata = Record<string, unknown> & {
   code: LogtoErrorCode;
   status?: number;
 };

packages/schemas/src/db-entries/application.ts

@@ -14,6 +14,7 @@ export type ApplicationDBEntry = {
 
 export const Applications: GeneratedSchema<ApplicationDBEntry> = Object.freeze({
   table: 'applications',
+  tableSingular: 'application',
   fields: {
     id: 'id',
     name: 'name',

packages/schemas/src/db-entries/oidc-model-instance.ts

@@ -12,6 +12,7 @@ export type OidcModelInstanceDBEntry = {
 
 export const OidcModelInstances: GeneratedSchema<OidcModelInstanceDBEntry> = Object.freeze({
   table: 'oidc_model_instances',
+  tableSingular: 'oidc_model_instance',
   fields: {
     modelName: 'model_name',
     id: 'id',

packages/schemas/src/db-entries/user.ts

@@ -16,6 +16,7 @@ export type UserDBEntry = {
 
 export const Users: GeneratedSchema<UserDBEntry> = Object.freeze({
   table: 'users',
+  tableSingular: 'user',
   fields: {
     id: 'id',
     username: 'username',

packages/schemas/src/foundations.ts

@@ -7,6 +7,7 @@ export type SchemaLike<Key extends string> = {
 export type GeneratedSchema<Schema extends SchemaLike<string>> = keyof Schema extends string
   ? Readonly<{
       table: string;
+      tableSingular: string;
       fields: {
         [key in keyof Schema]: string;
       };

packages/schemas/src/gen/index.ts

@@ -234,6 +234,7 @@ const generate = async () => {
                 pascalCase: true,
               })}: GeneratedSchema<${databaseEntryType}> = Object.freeze({`,
               `  table: '${name}',`,
+              `  tableSingular: '${pluralize(name, 1)}',`,
               '  fields: {',
               ...fields.map(({ name }) => `    ${camelcase(name)}: '${name}',`),
               '  },',