@ai0x0/utils 0.0.10 → 0.0.12

package/es/backend/schemas/index.js

@@ -66,15 +66,20 @@ export var createTableSchema = function createTableSchema(_ref) {
   var table = pgTable(name, _objectSpread(_objectSpread({}, basicFields), columns), extraConfig);
   // 创建基础的schema
   var selectSchema = createSelectSchema(table, refineSchema);
+  // 去掉基础的字段的table
+  var insertTable = pgTable(name, columns);
+  var updateTable = pgTable(name, _objectSpread({
+    id: uuid()
+  }, columns));
   return {
     table: table,
     selectSchema: selectSchema,
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    insertSchema: createInsertSchema(table, refineSchema),
+    insertSchema: createInsertSchema(insertTable, refineSchema),
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    updateSchema: createUpdateSchema(table, _objectSpread({
+    updateSchema: createUpdateSchema(updateTable, _objectSpread({
       id: z.string()
     }, refineSchema)),
     querySchema: selectSchema.pick({

package/lib/backend/route-operation/delete-operation.d.ts

@@ -1,3 +1,4 @@
+import { TypedNextResponse } from "next-rest-framework";
 import { BaseTable } from "../types";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NextRequest } from "next/server";
@@ -5,6 +6,7 @@ export interface DeleteOperationOptions<TTable extends BaseTable> {
     table: TTable;
     summary?: string;
     onSuccess?: () => Promise<void>;
+    onError?: (error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
     byCreator?: boolean;
 }
 export declare const createDeleteOperation: ({ db, getSession, }: {
@@ -12,4 +14,4 @@ export declare const createDeleteOperation: ({ db, getSession, }: {
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;
-}) => <TTable extends BaseTable>({ table, summary, onSuccess, byCreator, }: DeleteOperationOptions<TTable>) => any;
+}) => <TTable extends BaseTable>({ table, summary, onSuccess, onError, byCreator, }: DeleteOperationOptions<TTable>) => any;

package/lib/backend/route-operation/delete-operation.js

@@ -43,6 +43,7 @@ var createDeleteOperation = ({
   table,
   summary,
   onSuccess,
+  onError,
   byCreator = true
 }) => (0, import_next_rest_framework.routeOperation)({
   method: "DELETE",
@@ -56,16 +57,25 @@ var createDeleteOperation = ({
   }),
   contentType: "application/json"
 }).handler(async (req) => {
-  const body = await req.json();
-  if (byCreator) {
-    const { userId } = await getSession(req) || {};
-    body.creatorId = userId;
+  try {
+    const body = await req.json();
+    if (byCreator) {
+      const { userId } = await getSession(req) || {};
+      body.creatorId = userId;
+    }
+    const data = await (0, import_actions.createDeleteAction)({ table, db })(body);
+    await (onSuccess == null ? void 0 : onSuccess());
+    return import_next_rest_framework.TypedNextResponse.json(data, {
+      status: 200
+    });
+  } catch (e) {
+    const response = await (onError == null ? void 0 : onError(e));
+    if (response) {
+      return response;
+    } else {
+      throw e;
+    }
   }
-  const data = await (0, import_actions.createDeleteAction)({ table, db })(body);
-  await (onSuccess == null ? void 0 : onSuccess());
-  return import_next_rest_framework.TypedNextResponse.json(data, {
-    status: 200
-  });
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/backend/route-operation/get-list-operation.d.ts

@@ -1,5 +1,6 @@
 import { z, ZodSchema } from "zod";
 import { NextRequest } from "next/server";
+import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { BaseTable, GetListRelations } from "../types";
 export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
@@ -7,7 +8,7 @@ export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchem
     jsonArrayFields?: string[];
     querySchema: Q;
     relations?: GetListRelations;
-    setParams?: (req: NextRequest) => Promise<Record<string, unknown>>;
+    setParams?: (req: TypedNextRequest<"GET", "application/json", unknown, z.infer<Q>>) => Promise<Record<string, unknown>>;
     byCreator?: boolean;
     summary?: string;
     table: TTable;
@@ -18,10 +19,11 @@ export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchem
         data: z.infer<T>[];
         total: number;
     }>;
+    onError?: (error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
 }
 export declare const createGetListOperation: ({ db, getSession, }: {
     db: NodePgDatabase<any>;
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;
-}) => <T extends z.ZodType<any, z.ZodTypeDef, any>, Q extends z.ZodType<any, z.ZodTypeDef, any>, TTable extends BaseTable>({ querySchema, bodySchema, table, summary, relations, jsonArrayFields, setParams, onSuccess, byCreator, }: GetListOperationOptions<T, Q, TTable>) => any;
+}) => <T extends z.ZodType<any, z.ZodTypeDef, any>, Q extends z.ZodType<any, z.ZodTypeDef, any>, TTable extends BaseTable>({ querySchema, bodySchema, table, summary, relations, jsonArrayFields, setParams, onSuccess, onError, byCreator, }: GetListOperationOptions<T, Q, TTable>) => any;

package/lib/backend/route-operation/get-list-operation.js

@@ -48,6 +48,7 @@ var createGetListOperation = ({
   jsonArrayFields,
   setParams,
   onSuccess,
+  onError,
   byCreator = true
 }) => (0, import_next_rest_framework.routeOperation)({
   method: "GET",
@@ -64,27 +65,36 @@ var createGetListOperation = ({
     status: 200
   }
 ]).handler(async (req) => {
-  const params = await (setParams == null ? void 0 : setParams(req)) || {};
-  if (byCreator) {
-    const { userId } = await getSession(req) || {};
-    params.creatorId = userId;
+  try {
+    const params = await (setParams == null ? void 0 : setParams(req)) || {};
+    if (byCreator) {
+      const { userId } = await getSession(req) || {};
+      params.creatorId = userId;
+    }
+    let result = await (0, import_actions.createGetListAction)({
+      bodySchema,
+      db,
+      jsonArrayFields,
+      relations,
+      table
+    })(
+      Object.assign(
+        Object.fromEntries(new URL(req.url).searchParams),
+        params
+      )
+    );
+    if (onSuccess) {
+      result = await onSuccess(result);
+    }
+    return import_next_rest_framework.TypedNextResponse.json(result, { status: 200 });
+  } catch (e) {
+    const response = await (onError == null ? void 0 : onError(e));
+    if (response) {
+      return response;
+    } else {
+      throw e;
+    }
   }
-  let result = await (0, import_actions.createGetListAction)({
-    bodySchema,
-    db,
-    jsonArrayFields,
-    relations,
-    table
-  })(
-    Object.assign(
-      Object.fromEntries(new URL(req.url).searchParams),
-      params
-    )
-  );
-  if (onSuccess) {
-    result = await onSuccess(result);
-  }
-  return import_next_rest_framework.TypedNextResponse.json(result, { status: 200 });
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/backend/route-operation/get-operation.d.ts

@@ -1,5 +1,6 @@
 import { z, ZodSchema } from "zod";
 import { NextRequest } from "next/server";
+import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { BaseTable, GetListRelations } from "../types";
 export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
@@ -7,8 +8,9 @@ export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, T
     jsonArrayFields?: string[];
     querySchema: Q;
     relations?: GetListRelations;
-    setParams?: (req: NextRequest) => Promise<Record<string, any>>;
+    setParams?: (req: TypedNextRequest<"GET", "application/json", unknown, z.infer<Q>>) => Promise<Record<string, any>>;
     onSuccess?: (data: z.infer<T>) => Promise<z.infer<T>>;
+    onError?: (error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
     summary?: string;
     table: TTable;
     byCreator?: boolean;
@@ -18,4 +20,4 @@ export declare const createGetOperation: ({ getSession, db, }: {
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;
-}) => <T extends z.ZodType<any, z.ZodTypeDef, any>, Q extends z.ZodType<any, z.ZodTypeDef, any>, TTable extends BaseTable>({ querySchema, bodySchema, table, summary, relations, setParams, jsonArrayFields, onSuccess, byCreator, }: GetOperationOptions<T, Q, TTable>) => any;
+}) => <T extends z.ZodType<any, z.ZodTypeDef, any>, Q extends z.ZodType<any, z.ZodTypeDef, any>, TTable extends BaseTable>({ querySchema, bodySchema, table, summary, relations, setParams, jsonArrayFields, onSuccess, onError, byCreator, }: GetOperationOptions<T, Q, TTable>) => any;

package/lib/backend/route-operation/get-operation.js

@@ -47,6 +47,7 @@ var createGetOperation = ({
   setParams,
   jsonArrayFields,
   onSuccess,
+  onError,
   byCreator = true
 }) => (0, import_next_rest_framework.routeOperation)({
   method: "GET",
@@ -63,27 +64,36 @@ var createGetOperation = ({
     status: 200
   }
 ]).handler(async (req) => {
-  const params = await (setParams == null ? void 0 : setParams(req)) || {};
-  if (byCreator) {
-    const { userId } = await getSession(req) || {};
-    params.creatorId = userId;
+  try {
+    const params = await (setParams == null ? void 0 : setParams(req)) || {};
+    if (byCreator) {
+      const { userId } = await getSession(req) || {};
+      params.creatorId = userId;
+    }
+    let result = await (0, import_actions.createGetAction)({
+      bodySchema,
+      db,
+      jsonArrayFields,
+      relations,
+      table
+    })(
+      Object.assign(
+        Object.fromEntries(new URL(req.url).searchParams),
+        params
+      )
+    ) || {};
+    if (onSuccess) {
+      result = await onSuccess(result);
+    }
+    return import_next_rest_framework.TypedNextResponse.json(result, { status: 200 });
+  } catch (e) {
+    const response = await (onError == null ? void 0 : onError(e));
+    if (response) {
+      return response;
+    } else {
+      throw e;
+    }
   }
-  let result = await (0, import_actions.createGetAction)({
-    bodySchema,
-    db,
-    jsonArrayFields,
-    relations,
-    table
-  })(
-    Object.assign(
-      Object.fromEntries(new URL(req.url).searchParams),
-      params
-    )
-  ) || {};
-  if (onSuccess) {
-    result = await onSuccess(result);
-  }
-  return import_next_rest_framework.TypedNextResponse.json(result, { status: 200 });
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/backend/route-operation/post-operation.d.ts

@@ -1,12 +1,12 @@
 import { z, ZodSchema } from "zod";
 import { PgTable } from "drizzle-orm/pg-core";
 import { NextRequest } from "next/server";
-import { TypedNextResponse } from "next-rest-framework";
+import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends PgTable> {
     bodySchema: IB;
     outputBodySchema?: IB;
-    setBody?: (req: NextRequest) => Promise<Partial<z.infer<IB>>>;
+    setBody?: (req: TypedNextRequest<"POST", "application/json", z.infer<IB>>) => Promise<Partial<z.infer<IB>>>;
     summary?: string;
     onSuccess?: (data: z.infer<OB>) => Promise<z.infer<OB>>;
     onError?: (error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;

package/lib/backend/route-operation/post-operation.js

@@ -70,8 +70,8 @@ var createPostOperation = ({
       await (setBody == null ? void 0 : setBody(req)) || {}
     );
     let [data] = await (0, import_actions.createPostAction)({ bodySchema, db, table })({
-      ...body,
-      creatorId: userId
+      creatorId: userId,
+      ...body
     });
     if (onSuccess) {
       data = await onSuccess(data);

package/lib/backend/route-operation/put-operation.d.ts

@@ -1,5 +1,6 @@
 import { z, ZodSchema } from "zod";
 import { PgTable } from "drizzle-orm/pg-core";
+import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NextRequest } from "next/server";
 import { BaseTable } from "../types";
@@ -8,8 +9,9 @@ export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema,
     outputBodySchema?: OB;
     table: TTable;
     summary?: string;
-    setBody?: (req: NextRequest) => Promise<Partial<z.infer<IB>>>;
+    setBody?: (req: TypedNextRequest<"PUT", "application/json", z.infer<IB>>) => Promise<Partial<z.infer<IB>>>;
     onSuccess?: (data: z.infer<OB>) => Promise<z.infer<OB>>;
+    onError?: (error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
     byCreator?: boolean;
 }
 export declare const createPutOperation: ({ getSession, db, }: {
@@ -17,4 +19,4 @@ export declare const createPutOperation: ({ getSession, db, }: {
         userId?: string;
     } | undefined>;
     db: NodePgDatabase<any>;
-}) => <IB extends z.ZodType<any, z.ZodTypeDef, any>, OB extends z.ZodType<any, z.ZodTypeDef, any>, TTable extends BaseTable>({ bodySchema, outputBodySchema, table, summary, setBody, onSuccess, byCreator, }: PutOperationOptions<IB, OB, TTable>) => any;
+}) => <IB extends z.ZodType<any, z.ZodTypeDef, any>, OB extends z.ZodType<any, z.ZodTypeDef, any>, TTable extends BaseTable>({ bodySchema, outputBodySchema, table, summary, setBody, onSuccess, byCreator, onError, }: PutOperationOptions<IB, OB, TTable>) => any;

package/lib/backend/route-operation/put-operation.js

@@ -46,7 +46,8 @@ var createPutOperation = ({
   summary,
   setBody,
   onSuccess,
-  byCreator = true
+  byCreator = true,
+  onError
 }) => (0, import_next_rest_framework.routeOperation)({
   method: "PUT",
   openApiOperation: {
@@ -63,26 +64,35 @@ var createPutOperation = ({
     contentType: "application/json"
   }
 ]).handler(async (req) => {
-  const { userId } = await getSession(req) || {};
-  const body = Object.assign(
-    await req.json(),
-    await (setBody == null ? void 0 : setBody(req)) || {}
-  );
-  let data = await (0, import_actions.createPutAction)({
-    bodySchema,
-    table,
-    db
-  })(
-    {
-      ...body,
-      editorId: userId
-    },
-    { byCreator }
-  );
-  if (onSuccess) {
-    data = await onSuccess(data);
+  try {
+    const { userId } = await getSession(req) || {};
+    const body = Object.assign(
+      await req.json(),
+      await (setBody == null ? void 0 : setBody(req)) || {}
+    );
+    let data = await (0, import_actions.createPutAction)({
+      bodySchema,
+      table,
+      db
+    })(
+      {
+        editorId: userId,
+        ...body
+      },
+      { byCreator }
+    );
+    if (onSuccess) {
+      data = await onSuccess(data);
+    }
+    return import_next_rest_framework.TypedNextResponse.json(data, { status: 200 });
+  } catch (e) {
+    const response = await (onError == null ? void 0 : onError(e));
+    if (response) {
+      return response;
+    } else {
+      throw e;
+    }
   }
-  return import_next_rest_framework.TypedNextResponse.json(data, { status: 200 });
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {