@ai0x0/utils 0.0.45 → 0.0.47

package/es/backend/sqlite/schemas/index.d.ts

@@ -42,12 +42,76 @@ export declare const BASIC_UPDATE_OMIT: {
     readonly createdAt: true;
     readonly updatedAt: true;
 };
-export declare const queryListSchema: (schema: any) => z.ZodObject<{
-    [x: string]: any;
-}, any>;
-export declare const listBodySchema: (schema: any) => z.ZodObject<{
+export declare const queryListSchema: <Incoming extends z.ZodObject<z.core.$ZodLooseShape, z.core.$strip>>(schema: Incoming) => z.ZodObject<(("creatorId" | "orderBy" | "orderDir" | "pageSize" | "current" | "createdAtFrom" | "createdAtTo") & keyof Incoming["shape"] extends never ? {
+    current: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pageSize: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    createdAtFrom: z.ZodOptional<z.ZodString>;
+    createdAtTo: z.ZodOptional<z.ZodString>;
+    orderBy: z.ZodOptional<z.ZodString>;
+    creatorId: z.ZodOptional<z.ZodString>;
+    orderDir: z.ZodOptional<z.ZodEnum<{
+        asc: "asc";
+        desc: "desc";
+    }>>;
+} & Incoming["shape"] : ({
+    current: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pageSize: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    createdAtFrom: z.ZodOptional<z.ZodString>;
+    createdAtTo: z.ZodOptional<z.ZodString>;
+    orderBy: z.ZodOptional<z.ZodString>;
+    creatorId: z.ZodOptional<z.ZodString>;
+    orderDir: z.ZodOptional<z.ZodEnum<{
+        asc: "asc";
+        desc: "desc";
+    }>>;
+} extends infer T_1 extends z.core.util.SomeObject ? { [K in keyof T_1 as K extends keyof Incoming["shape"] ? never : K]: {
+    current: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pageSize: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    createdAtFrom: z.ZodOptional<z.ZodString>;
+    createdAtTo: z.ZodOptional<z.ZodString>;
+    orderBy: z.ZodOptional<z.ZodString>;
+    creatorId: z.ZodOptional<z.ZodString>;
+    orderDir: z.ZodOptional<z.ZodEnum<{
+        asc: "asc";
+        desc: "desc";
+    }>>;
+}[K]; } : never) & (Incoming["shape"] extends infer T_2 extends z.core.util.SomeObject ? { [K_1 in keyof T_2]: Incoming["shape"][K_1]; } : never)) extends infer T ? { [k in keyof T]: (("creatorId" | "orderBy" | "orderDir" | "pageSize" | "current" | "createdAtFrom" | "createdAtTo") & keyof Incoming["shape"] extends never ? {
+    current: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pageSize: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    createdAtFrom: z.ZodOptional<z.ZodString>;
+    createdAtTo: z.ZodOptional<z.ZodString>;
+    orderBy: z.ZodOptional<z.ZodString>;
+    creatorId: z.ZodOptional<z.ZodString>;
+    orderDir: z.ZodOptional<z.ZodEnum<{
+        asc: "asc";
+        desc: "desc";
+    }>>;
+} & Incoming["shape"] : ({
+    current: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pageSize: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    createdAtFrom: z.ZodOptional<z.ZodString>;
+    createdAtTo: z.ZodOptional<z.ZodString>;
+    orderBy: z.ZodOptional<z.ZodString>;
+    creatorId: z.ZodOptional<z.ZodString>;
+    orderDir: z.ZodOptional<z.ZodEnum<{
+        asc: "asc";
+        desc: "desc";
+    }>>;
+} extends infer T_1 extends z.core.util.SomeObject ? { [K in keyof T_1 as K extends keyof Incoming["shape"] ? never : K]: {
+    current: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pageSize: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    createdAtFrom: z.ZodOptional<z.ZodString>;
+    createdAtTo: z.ZodOptional<z.ZodString>;
+    orderBy: z.ZodOptional<z.ZodString>;
+    creatorId: z.ZodOptional<z.ZodString>;
+    orderDir: z.ZodOptional<z.ZodEnum<{
+        asc: "asc";
+        desc: "desc";
+    }>>;
+}[K]; } : never) & (Incoming["shape"] extends infer T_2 extends z.core.util.SomeObject ? { [K_1 in keyof T_2]: Incoming["shape"][K_1]; } : never))[k]; } : never, Incoming["_zod"]["config"]>;
+export declare const listBodySchema: <T extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>(schema: T) => z.ZodObject<{
     total: z.ZodNumber;
-    data: z.ZodArray<any>;
+    data: z.ZodArray<T>;
 }, z.core.$strip>;
 /**
  * 基于 drizzle + drizzle-zod 快速生成带基础字段（id / 创建时间等）的

package/es/backend/sqlite/schemas/index.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-/* eslint-disable no-unused-vars */
 import { z } from "zod";
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 import { createInsertSchema, createSelectSchema, createUpdateSchema } from "drizzle-zod";

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

@@ -1,17 +1,20 @@
 import { TypedNextResponse } from "next-rest-framework";
+import { z } from "zod";
 import { BaseTable } from "../types.js";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NextRequest } from "next/server";
-export interface DeleteOperationOptions<TTable extends BaseTable> {
+type DeleteOperationParams<B extends z.ZodSchema> = z.infer<B> & Record<string, unknown> & {
+    creatorId?: string;
+    id: string;
+};
+export interface DeleteOperationOptions<TTable extends BaseTable, B extends z.ZodSchema> {
     table?: TTable;
+    bodySchema?: B;
     description?: string;
     summary?: string;
     tags?: string[];
     onSuccess?: (payload: {
-        params: {
-            id: string;
-            creatorId?: string;
-        };
+        params: DeleteOperationParams<B>;
         data: unknown;
     }) => Promise<void>;
     onError?(error: Error): Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
@@ -22,4 +25,7 @@ export declare const createDeleteOperation: ({ db, getSession, }: {
     getSession(req: NextRequest): Promise<{
         userId?: string;
     } | undefined>;
-}) => <TTable extends BaseTable>({ table, description, summary, tags, onSuccess, onError, byCreator, }: DeleteOperationOptions<TTable>) => import("next-rest-framework").RouteOperationDefinition<"DELETE">;
+}) => <TTable extends BaseTable, B extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>> = z.ZodObject<{
+    id: z.ZodString;
+}, z.core.$strip>>({ table, bodySchema, description, summary, tags, onSuccess, onError, byCreator, }: DeleteOperationOptions<TTable, B>) => import("next-rest-framework").RouteOperationDefinition<"DELETE">;
+export {};

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

@@ -37,11 +37,15 @@ var import_zod = require("zod");
 var import_get_table_name = __toESM(require("./get-table-name"));
 var import_actions = require("../actions");
 var import_errors = require("../errors");
+var defaultDeleteBodySchema = import_zod.z.object({
+  id: import_zod.z.string()
+});
 var createDeleteOperation = ({
   db,
   getSession
 }) => ({
   table,
+  bodySchema = defaultDeleteBodySchema,
   description,
   summary,
   tags,
@@ -56,18 +60,19 @@ var createDeleteOperation = ({
     tags: tags ?? (table ? [(0, import_get_table_name.default)(table)] : [])
   }
 }).input({
-  body: import_zod.z.object({
-    id: import_zod.z.string()
-  }),
+  body: bodySchema,
   contentType: "application/json"
 }).handler(async (req) => {
   try {
-    const body = await req.json();
+    const body = bodySchema.parse(
+      await req.json()
+    );
     if (byCreator) {
       const { userId } = await getSession(req) || {};
       body.creatorId = userId;
     }
-    const data = table && db ? await (0, import_actions.createDeleteAction)({ table, db })(body) : body;
+    const tableParams = body;
+    const data = table && db ? await (0, import_actions.createDeleteAction)({ table, db })(tableParams) : body;
     await (onSuccess == null ? void 0 : onSuccess({ data, params: body }));
     return import_next_rest_framework.TypedNextResponse.json(data, {
       status: 200

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

@@ -3,6 +3,9 @@ import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { BaseTable, GetListRelations } from "../types.js";
+type GetListOperationParams<Q extends ZodSchema> = z.infer<Q> & Record<string, unknown> & {
+    creatorId?: string;
+};
 export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
     bodySchema: T;
     jsonArrayFields?: string[];
@@ -15,7 +18,7 @@ export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchem
     tags?: string[];
     table?: TTable;
     onSuccess?<D extends T>(payload: {
-        params: Partial<z.infer<T>> & Record<string, unknown>;
+        params: GetListOperationParams<Q>;
         data: {
             data: z.infer<D>[];
             total: number;
@@ -32,3 +35,4 @@ export declare const createGetListOperation: ({ db, getSession, }: {
         userId?: string;
     } | undefined>;
 }) => <T extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, Q extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ querySchema, bodySchema, table, description, summary, tags, relations, jsonArrayFields, setParams, onSuccess, onError, byCreator, }: GetListOperationOptions<T, Q, TTable>) => import("next-rest-framework").RouteOperationDefinition<"GET">;
+export {};

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

@@ -69,24 +69,28 @@ var createGetListOperation = ({
   }
 ]).handler(async (req) => {
   try {
-    const params = await (setParams == null ? void 0 : setParams(
+    const extraParams = await (setParams == null ? void 0 : setParams(
       req
     )) || {};
     if (byCreator) {
       const { userId } = await getSession(req) || {};
-      params.creatorId = userId;
+      extraParams.creatorId = userId;
     }
-    const mergedParams = Object.assign(
-      Object.fromEntries(new URL(req.url).searchParams),
-      params
+    const queryParams = querySchema.parse(
+      Object.fromEntries(new URL(req.url).searchParams)
     );
+    const mergedParams = {
+      ...queryParams,
+      ...extraParams
+    };
+    const tableParams = mergedParams;
     let result = table && db ? await (0, import_actions.createGetListAction)({
       bodySchema,
       db,
       jsonArrayFields,
       relations,
       table
-    })(mergedParams) : { data: [], total: 0 };
+    })(tableParams) : { data: [], total: 0 };
     if (onSuccess) {
       result = await onSuccess({ data: result, params: mergedParams });
     }

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

@@ -3,6 +3,9 @@ import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { BaseTable, GetListRelations } from "../types.js";
+type GetOperationParams<Q extends ZodSchema> = z.infer<Q> & Record<string, unknown> & {
+    creatorId?: string;
+};
 export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
     bodySchema: T;
     jsonArrayFields?: string[];
@@ -10,7 +13,7 @@ export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, T
     relations?: GetListRelations;
     setParams?(req: TypedNextRequest<"GET", "application/json", unknown, z.infer<Q>>): Promise<Record<string, unknown>>;
     onSuccess?(payload: {
-        params: Partial<z.infer<T>> & Record<string, unknown>;
+        params: GetOperationParams<Q>;
         data: z.infer<T>;
     }): Promise<z.infer<T>>;
     onError?(error: Error): Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
@@ -26,3 +29,4 @@ export declare const createGetOperation: ({ getSession, db, }: {
         userId?: string;
     } | undefined>;
 }) => <T extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, Q extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ querySchema, bodySchema, table, description, summary, tags, relations, setParams, jsonArrayFields, onSuccess, onError, byCreator, }: GetOperationOptions<T, Q, TTable>) => import("next-rest-framework").RouteOperationDefinition<"GET">;
+export {};

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

@@ -68,24 +68,28 @@ var createGetOperation = ({
   }
 ]).handler(async (req) => {
   try {
-    const params = await (setParams == null ? void 0 : setParams(
+    const extraParams = await (setParams == null ? void 0 : setParams(
       req
     )) || {};
     if (byCreator) {
       const { userId } = await getSession(req) || {};
-      params.creatorId = userId;
+      extraParams.creatorId = userId;
     }
-    const mergedParams = Object.assign(
-      Object.fromEntries(new URL(req.url).searchParams),
-      params
+    const queryParams = querySchema.parse(
+      Object.fromEntries(new URL(req.url).searchParams)
     );
+    const mergedParams = {
+      ...queryParams,
+      ...extraParams
+    };
+    const tableParams = mergedParams;
     const rawResult = table && db ? await (0, import_actions.createGetAction)({
       bodySchema,
       db,
       jsonArrayFields,
       relations,
       table
-    })(mergedParams) : mergedParams;
+    })(tableParams) : mergedParams;
     let result = rawResult ?? {};
     if (onSuccess) {
       result = await onSuccess({ data: result, params: mergedParams });

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

@@ -3,6 +3,9 @@ import { PgTable } from "drizzle-orm/pg-core";
 import { NextRequest } from "next/server";
 import { TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
+type PostOperationParams<IB extends ZodSchema> = z.infer<IB> & Record<string, unknown> & {
+    creatorId?: string;
+};
 export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends PgTable> {
     bodySchema: IB;
     contentType?: string;
@@ -13,7 +16,7 @@ export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema
     summary?: string;
     tags?: string[];
     onSuccess?(payload: {
-        params: Record<string, unknown>;
+        params: PostOperationParams<IB>;
         data: z.infer<OB>;
         req: NextRequest;
     }): Promise<z.infer<OB>>;
@@ -26,3 +29,4 @@ export declare const createPostOperation: ({ getSession, db, }: {
         userId?: string;
     } | undefined>;
 }) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends PgTable<import("drizzle-orm/pg-core").TableConfig>>({ bodySchema, contentType, description, outputBodySchema, parseBody, setBody, summary, tags, table, onSuccess, onError, }: PostOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"POST">;
+export {};

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

@@ -4,6 +4,9 @@ import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NextRequest } from "next/server";
 import { BaseTable } from "../types.js";
+type PutOperationParams<IB extends ZodSchema> = z.infer<IB> & Record<string, unknown> & {
+    editorId?: string;
+};
 export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends PgTable> {
     bodySchema: IB;
     description?: string;
@@ -13,7 +16,7 @@ export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema,
     tags?: string[];
     setBody?(req: TypedNextRequest<"PUT", "application/json", z.infer<IB>>): Promise<Partial<z.infer<IB>>>;
     onSuccess?(payload: {
-        params: Record<string, unknown>;
+        params: PutOperationParams<IB>;
         data: z.infer<OB>;
     }): Promise<z.infer<OB>>;
     onError?(error: Error): Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
@@ -25,3 +28,4 @@ export declare const createPutOperation: ({ getSession, db, }: {
     } | undefined>;
     db?: NodePgDatabase<Record<string, unknown>> | undefined;
 }) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ bodySchema, description, outputBodySchema, table, summary, tags, setBody, onSuccess, byCreator, onError, }: PutOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"PUT">;
+export {};

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

@@ -1,16 +1,19 @@
 import { TypedNextResponse } from "next-rest-framework";
+import { z } from "zod";
 import { BaseTable } from "../types.js";
 import { NextRequest } from "next/server";
-export interface DeleteOperationOptions<TTable extends BaseTable> {
+type DeleteOperationParams<B extends z.ZodSchema> = z.infer<B> & Record<string, unknown> & {
+    creatorId?: string;
+    id: string;
+};
+export interface DeleteOperationOptions<TTable extends BaseTable, B extends z.ZodSchema> {
     table?: TTable;
+    bodySchema?: B;
     description?: string;
     summary?: string;
     tags?: string[];
     onSuccess?: (_payload: {
-        params: {
-            id: string;
-            creatorId?: string;
-        };
+        params: DeleteOperationParams<B>;
         data: unknown;
     }) => Promise<void>;
     onError?: (_error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
@@ -21,4 +24,7 @@ export declare const createDeleteOperation: ({ db, getSession, }: {
     getSession: (_req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;
-}) => <TTable extends BaseTable>({ table, description, summary, tags, onSuccess, onError, byCreator, }: DeleteOperationOptions<TTable>) => import("next-rest-framework").RouteOperationDefinition<"DELETE">;
+}) => <TTable extends BaseTable, B extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>> = z.ZodObject<{
+    id: z.ZodString;
+}, z.core.$strip>>({ table, bodySchema, description, summary, tags, onSuccess, onError, byCreator, }: DeleteOperationOptions<TTable, B>) => import("next-rest-framework").RouteOperationDefinition<"DELETE">;
+export {};

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

@@ -37,11 +37,15 @@ var import_zod = require("zod");
 var import_get_table_name = __toESM(require("./get-table-name"));
 var import_actions = require("../actions");
 var import_errors = require("../errors");
+var defaultDeleteBodySchema = import_zod.z.object({
+  id: import_zod.z.string()
+});
 var createDeleteOperation = ({
   db,
   getSession
 }) => ({
   table,
+  bodySchema = defaultDeleteBodySchema,
   description,
   summary,
   tags,
@@ -56,18 +60,19 @@ var createDeleteOperation = ({
     tags: tags ?? (table ? [(0, import_get_table_name.default)(table)] : [])
   }
 }).input({
-  body: import_zod.z.object({
-    id: import_zod.z.string()
-  }),
+  body: bodySchema,
   contentType: "application/json"
 }).handler(async (req) => {
   try {
-    const body = await req.json();
+    const body = bodySchema.parse(
+      await req.json()
+    );
     if (byCreator) {
       const { userId } = await getSession(req) || {};
       body.creatorId = userId;
     }
-    const data = table && db ? await (0, import_actions.createDeleteAction)({ table, db })(body) : body;
+    const tableParams = body;
+    const data = table && db ? await (0, import_actions.createDeleteAction)({ table, db })(tableParams) : body;
     await (onSuccess == null ? void 0 : onSuccess({ data, params: body }));
     return import_next_rest_framework.TypedNextResponse.json(data, {
       status: 200

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

@@ -2,6 +2,9 @@ import { z, ZodSchema } from "zod";
 import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { BaseTable, GetListRelations } from "../types.js";
+type GetListOperationParams<Q extends ZodSchema> = z.infer<Q> & Record<string, unknown> & {
+    creatorId?: string;
+};
 export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
     bodySchema: T;
     jsonArrayFields?: string[];
@@ -14,7 +17,7 @@ export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchem
     tags?: string[];
     table?: TTable;
     onSuccess?: <D extends T>(_payload: {
-        params: Partial<z.infer<T>> & Record<string, unknown>;
+        params: GetListOperationParams<Q>;
         data: {
             data: z.infer<D>[];
             total: number;
@@ -31,3 +34,4 @@ export declare const createGetListOperation: ({ db, getSession, }: {
         userId?: string;
     } | undefined>;
 }) => <T extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, Q extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ querySchema, bodySchema, table, description, summary, tags, relations, jsonArrayFields, setParams, onSuccess, onError, byCreator, }: GetListOperationOptions<T, Q, TTable>) => import("next-rest-framework").RouteOperationDefinition<"GET">;
+export {};

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

@@ -69,24 +69,28 @@ var createGetListOperation = ({
   }
 ]).handler(async (req) => {
   try {
-    const params = await (setParams == null ? void 0 : setParams(
+    const extraParams = await (setParams == null ? void 0 : setParams(
       req
     )) || {};
     if (byCreator) {
       const { userId } = await getSession(req) || {};
-      params.creatorId = userId;
+      extraParams.creatorId = userId;
     }
-    const mergedParams = Object.assign(
-      Object.fromEntries(new URL(req.url).searchParams),
-      params
+    const queryParams = querySchema.parse(
+      Object.fromEntries(new URL(req.url).searchParams)
     );
+    const mergedParams = {
+      ...queryParams,
+      ...extraParams
+    };
+    const tableParams = mergedParams;
     let result = table && db ? await (0, import_actions.createGetListAction)({
       bodySchema,
       db,
       jsonArrayFields,
       relations,
       table
-    })(mergedParams) : { data: [], total: 0 };
+    })(tableParams) : { data: [], total: 0 };
     if (onSuccess) {
       result = await onSuccess({
         data: result,

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

@@ -2,6 +2,9 @@ import { z, ZodSchema } from "zod";
 import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { BaseTable, GetListRelations } from "../types.js";
+type GetOperationParams<Q extends ZodSchema> = z.infer<Q> & Record<string, unknown> & {
+    creatorId?: string;
+};
 export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
     bodySchema: T;
     jsonArrayFields?: string[];
@@ -9,7 +12,7 @@ export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, T
     relations?: GetListRelations;
     setParams?: (_req: TypedNextRequest<"GET", "application/json", unknown, z.infer<Q>>) => Promise<Record<string, unknown>>;
     onSuccess?: (_payload: {
-        params: Partial<z.infer<T>> & Record<string, unknown>;
+        params: GetOperationParams<Q>;
         data: z.infer<T>;
     }) => Promise<z.infer<T>>;
     onError?: (_error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
@@ -25,3 +28,4 @@ export declare const createGetOperation: ({ getSession, db, }: {
         userId?: string;
     } | undefined>;
 }) => <T extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, Q extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ querySchema, bodySchema, table, description, summary, tags, relations, setParams, jsonArrayFields, onSuccess, onError, byCreator, }: GetOperationOptions<T, Q, TTable>) => import("next-rest-framework").RouteOperationDefinition<"GET">;
+export {};

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

@@ -68,24 +68,28 @@ var createGetOperation = ({
   }
 ]).handler(async (req) => {
   try {
-    const params = await (setParams == null ? void 0 : setParams(
+    const extraParams = await (setParams == null ? void 0 : setParams(
       req
     )) || {};
     if (byCreator) {
       const { userId } = await getSession(req) || {};
-      params.creatorId = userId;
+      extraParams.creatorId = userId;
     }
-    const mergedParams = Object.assign(
-      Object.fromEntries(new URL(req.url).searchParams),
-      params
+    const queryParams = querySchema.parse(
+      Object.fromEntries(new URL(req.url).searchParams)
     );
+    const mergedParams = {
+      ...queryParams,
+      ...extraParams
+    };
+    const tableParams = mergedParams;
     const rawResult = table && db ? await (0, import_actions.createGetAction)({
       bodySchema,
       db,
       jsonArrayFields,
       relations,
       table
-    })(mergedParams) : mergedParams;
+    })(tableParams) : mergedParams;
     let result = rawResult ?? {};
     if (onSuccess) {
       result = await onSuccess({ data: result, params: mergedParams });

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

@@ -2,6 +2,9 @@ import { z, ZodSchema } from "zod";
 import { SQLiteTable } from "drizzle-orm/sqlite-core";
 import { NextRequest } from "next/server";
 import { TypedNextResponse } from "next-rest-framework";
+type PostOperationParams<IB extends ZodSchema> = z.infer<IB> & Record<string, unknown> & {
+    creatorId?: string;
+};
 export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends SQLiteTable> {
     bodySchema: IB;
     contentType?: string;
@@ -12,7 +15,7 @@ export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema
     summary?: string;
     tags?: string[];
     onSuccess?: (_payload: {
-        params: Record<string, unknown>;
+        params: PostOperationParams<IB>;
         data: z.infer<OB>;
         req: NextRequest;
     }) => Promise<z.infer<OB>>;
@@ -25,3 +28,4 @@ export declare const createPostOperation: ({ getSession, db, }: {
         userId?: string;
     } | undefined>;
 }) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends SQLiteTable<import("drizzle-orm/sqlite-core").TableConfig>>({ bodySchema, contentType, description, outputBodySchema, parseBody, setBody, summary, tags, table, onSuccess, onError, }: PostOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"POST">;
+export {};

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

@@ -3,6 +3,9 @@ import { SQLiteTable } from "drizzle-orm/sqlite-core";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
 import { NextRequest } from "next/server";
 import { BaseTable } from "../types.js";
+type PutOperationParams<IB extends ZodSchema> = z.infer<IB> & Record<string, unknown> & {
+    editorId?: string;
+};
 export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends SQLiteTable> {
     bodySchema: IB;
     description?: string;
@@ -12,7 +15,7 @@ export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema,
     tags?: string[];
     setBody?: (_req: TypedNextRequest<"PUT", "application/json", z.infer<IB>>) => Promise<Partial<z.infer<IB>>>;
     onSuccess?: (_payload: {
-        params: Record<string, unknown>;
+        params: PutOperationParams<IB>;
         data: z.infer<OB>;
     }) => Promise<z.infer<OB>>;
     onError?: (_error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
@@ -24,3 +27,4 @@ export declare const createPutOperation: ({ getSession, db, }: {
     } | undefined>;
     db?: any;
 }) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ bodySchema, description, outputBodySchema, table, summary, tags, setBody, onSuccess, byCreator, onError, }: PutOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"PUT">;
+export {};