@danielhritcu/zenstack-orm 3.5.5 → 3.5.7

package/dist/index.cjs

@@ -2874,9 +2874,18 @@ function extractSearch(where) {
   let found;
   const cleaned = {};
   for (const [key, value] of Object.entries(obj)) {
-    if (key === "search" && isSearchPayload(value)) {
-      found = value;
-      continue;
+    if (key === "search") {
+      if (typeof value === "string") {
+        found = {
+          q: value,
+          profile: "default"
+        };
+        continue;
+      }
+      if (isSearchPayload(value)) {
+        found = value;
+        continue;
+      }
     }
     if (key === "AND" || key === "OR") {
       const result = extractSearch(value);
@@ -3008,9 +3017,9 @@ function expandSearch(model, where, searchDefaults, schemaModels, virtualRelatio
   };
   const profile = search2.profile ? searchDefaults?.[model]?.[search2.profile] : void 0;
   const fields = search2.fields ?? profile?.fields;
-  if (!fields) return {
-    where: remaining
-  };
+  if (!fields) {
+    throw new Error(`Search on "${model}" requires a "default" search profile or explicit fields.`);
+  }
   const mode = search2.mode ?? profile?.mode ?? "contains";
   const strategy = search2.strategy ?? profile?.strategy ?? "all";
   const tokens = unique(search2.q.trim().split(/\s+/).map((t) => t.toLowerCase()).filter(Boolean));
@@ -5839,7 +5848,28 @@ var ZodSchemaFactory = class {
     }).optional();
     const searchDefaults = this.schema.plugins?.searchDefaults?.[model];
     if (searchDefaults) {
-      fields["search"] = import_zod2.z.any().optional();
+      const searchFieldMapSchema = import_zod2.z.lazy(() => import_zod2.z.record(import_zod2.z.string(), import_zod2.z.union([
+        import_zod2.z.literal(true),
+        searchFieldMapSchema
+      ])));
+      const searchPayloadSchema = zLooseObject({
+        q: import_zod2.z.string(),
+        fields: searchFieldMapSchema.optional(),
+        profile: import_zod2.z.string().optional(),
+        mode: import_zod2.z.enum([
+          "contains",
+          "startsWith",
+          "equals"
+        ]).optional(),
+        strategy: import_zod2.z.enum([
+          "all",
+          "any"
+        ]).optional()
+      });
+      fields["search"] = import_zod2.z.union([
+        import_zod2.z.string(),
+        searchPayloadSchema
+      ]).optional();
     }
     fields["AND"] = this.orArray(import_zod2.z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields, false, options)), true).optional();
     fields["OR"] = import_zod2.z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields, false, options)).array().optional();
@@ -10175,7 +10205,87 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
     }, "groupBy"),
     exists: /* @__PURE__ */ __name((args) => {
       return createPromise("exists", "exists", args, new ExistsOperationHandler(client, model, inputValidator), false);
-    }, "exists")
+    }, "exists"),
+    paginate: /* @__PURE__ */ __name((args) => {
+      return createZenStackPromise(async () => {
+        const rawArgs = args ?? {};
+        const pageSize = rawArgs["pageSize"] ?? client.$options?.default?.pageSize ?? 20;
+        const page = rawArgs["page"];
+        const cursorId = rawArgs["cursor"];
+        const findBaseArgs = {};
+        for (const [k, v] of Object.entries(rawArgs)) {
+          if (k !== "page" && k !== "cursor" && k !== "pageSize") {
+            findBaseArgs[k] = v;
+          }
+        }
+        const countResult = await operations.count({
+          where: findBaseArgs["where"]
+        });
+        let items;
+        if (page !== void 0) {
+          items = await operations.findMany({
+            ...findBaseArgs,
+            skip: (page - 1) * pageSize,
+            take: pageSize
+          });
+        } else {
+          items = await operations.findMany({
+            ...findBaseArgs,
+            ...cursorId ? {
+              cursor: {
+                id: cursorId
+              },
+              skip: 1
+            } : {},
+            take: pageSize + 1
+          });
+        }
+        const count = countResult;
+        if (page !== void 0) {
+          const total = Math.ceil(count / pageSize);
+          const hasNext = page < total;
+          const hasPrev = page > 1;
+          return {
+            items,
+            pagination: {
+              count,
+              page: {
+                size: pageSize,
+                current: page,
+                next: hasNext ? page + 1 : null,
+                prev: hasPrev ? page - 1 : null,
+                total
+              },
+              has: {
+                next: hasNext,
+                prev: hasPrev
+              }
+            }
+          };
+        } else {
+          const hasNext = items.length > pageSize;
+          if (hasNext) items = items.slice(0, pageSize);
+          const hasPrev = cursorId != null;
+          return {
+            items,
+            pagination: {
+              count,
+              page: {
+                size: pageSize
+              },
+              has: {
+                next: hasNext,
+                prev: hasPrev
+              },
+              cursor: {
+                next: hasNext && items.length > 0 ? items[items.length - 1].id : null,
+                prev: hasPrev && items.length > 0 ? items[0].id : null
+              }
+            }
+          };
+        }
+      });
+    }, "paginate")
   };
   const slicing = client.$options.slicing;
   if (slicing?.models) {