next-data-kit 3.0.1 → 4.0.0

package/dist/index.cjs

@@ -48,6 +48,11 @@ var calculatePagination = (page, limit, total) => ({
 });
 
 // src/server/utils.ts
+var isProvided = (value) => value !== void 0 && value !== null && value !== "";
+var isSafeKey = (key) => {
+  const unsafeKeys = ["__proto__", "constructor", "prototype"];
+  return !unsafeKeys.includes(key);
+};
 var escapeRegex = (str) => {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
@@ -66,11 +71,6 @@ var createSearchFilter = (fields) => {
 };
 
 // src/server/adapters/mongoose.ts
-var isProvided = (value) => value !== void 0 && value !== null && value !== "";
-var isSafeKey = (key) => {
-  const unsafeKeys = ["__proto__", "constructor", "prototype"];
-  return !unsafeKeys.includes(key);
-};
 var mongooseAdapter = (model, options = {}) => {
   const { filter: customFilterFn, filterCustom, defaultSort = { _id: -1 } } = options;
   return async ({ filter, sorts, limit, skip, input }) => {
@@ -145,9 +145,7 @@ var mongooseAdapter = (model, options = {}) => {
 };
 
 // src/server/action.ts
-var dataKitServerAction = async (props) => {
-  const { input, adapter, item, maxLimit = 100, filterCustom, queryAllowed } = props;
-  const filterAllowed = filterCustom ? Object.keys(filterCustom) : void 0;
+async function executeDataKit(input, adapter, item, maxLimit, filterAllowed, queryAllowed) {
   if (input.query) {
     const safeQuery = {};
     Object.keys(input.query).forEach((key) => {
@@ -178,7 +176,6 @@ var dataKitServerAction = async (props) => {
     });
     input.filter = safeFilter;
   }
-  const finalAdapter = typeof adapter === "function" ? adapter : mongooseAdapter(adapter, props);
   switch (input.action ?? "FETCH") {
     case "FETCH": {
       if (!input.limit || !input.page) {
@@ -186,7 +183,7 @@ var dataKitServerAction = async (props) => {
       }
       const limit = Math.min(input.limit, maxLimit);
       const skip = limit * (input.page - 1);
-      const { items, total } = await finalAdapter({
+      const { items, total } = await adapter({
         filter: input.filter ?? {},
         sorts: input.sorts ?? [],
         limit,
@@ -204,7 +201,26 @@ var dataKitServerAction = async (props) => {
     default:
       throw new Error(`Unsupported action: ${input.action}`);
   }
-};
+}
+async function dataKitServerAction(props) {
+  const { input, item, maxLimit = 100, queryAllowed, filterAllowed: explicitFilterAllowed } = props;
+  const filterCustom = "filterCustom" in props ? props.filterCustom : void 0;
+  const filterAllowed = explicitFilterAllowed ?? (filterCustom ? Object.keys(filterCustom) : void 0);
+  let finalAdapter;
+  if ("adapter" in props && props.adapter) {
+    finalAdapter = props.adapter;
+  } else if ("model" in props && props.model) {
+    const model = props.model;
+    finalAdapter = mongooseAdapter(model, {
+      filter: props.filter,
+      filterCustom: props.filterCustom,
+      defaultSort: props.defaultSort
+    });
+  } else {
+    throw new Error("Either model or adapter must be provided");
+  }
+  return executeDataKit(input, finalAdapter, item, maxLimit, filterAllowed, queryAllowed);
+}
 
 // src/server/adapters/memory.ts
 var isProvided2 = (value) => value !== void 0 && value !== null && value !== "";
@@ -295,15 +311,20 @@ zod.z.object({
   limit: zod.z.number().int().positive().optional(),
   query: zod.z.record(zod.z.string(), zod.z.union([zod.z.string(), zod.z.number(), zod.z.boolean()])).optional(),
   filter: zod.z.record(zod.z.string(), zod.z.union([zod.z.string(), zod.z.number(), zod.z.boolean(), zod.z.null()])).optional(),
-  filterConfig: zod.z.record(zod.z.string(), zod.z.object({
-    type: zod.z.enum(["REGEX", "EXACT"]),
-    field: zod.z.string().optional()
-  })).optional(),
-  sorts: zod.z.array(zod.z.object({
-    path: zod.z.string().max(100),
-    // Limit path length to prevent abuse
-    value: zod.z.literal(-1).or(zod.z.literal(1))
-  })).max(5).optional(),
+  filterConfig: zod.z.record(
+    zod.z.string(),
+    zod.z.object({
+      type: zod.z.enum(["REGEX", "EXACT"]),
+      field: zod.z.string().optional()
+    })
+  ).optional(),
+  sorts: zod.z.array(
+    zod.z.object({
+      path: zod.z.string().max(100),
+      // Limit path length to prevent abuse
+      value: zod.z.literal(-1).or(zod.z.literal(1))
+    })
+  ).max(5).optional(),
   // Limit to 5 sort fields
   sort: zod.z.record(zod.z.string(), zod.z.literal(1).or(zod.z.literal(-1))).optional()
 });