zodvex 0.2.0 → 0.2.2

package/dist/index.js

@@ -1,37 +1,22 @@
 'use strict';
 
+var customFunctions = require('convex-helpers/server/customFunctions');
 var zod = require('zod');
 var values = require('convex/values');
-var customFunctions = require('convex-helpers/server/customFunctions');
 var server = require('convex-helpers/server');
 
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
+var metadata = /* @__PURE__ */ new WeakMap();
+var registryHelpers = {
+  getMetadata: (type) => metadata.get(type),
+  setMetadata: (type, meta) => metadata.set(type, meta)
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 function zid(tableName) {
   const baseSchema = zod.z.string().refine((val) => typeof val === "string" && val.length > 0, {
     message: `Invalid ID for table "${tableName}"`
   }).transform((val) => {
     return val;
   }).brand(`ConvexId_${tableName}`).describe(`convexId:${tableName}`);
-  exports.registryHelpers.setMetadata(baseSchema, {
+  registryHelpers.setMetadata(baseSchema, {
     isConvexId: true,
     tableName
   });
@@ -39,22 +24,29 @@ function zid(tableName) {
   branded._tableName = tableName;
   return branded;
 }
-var metadata; exports.registryHelpers = void 0;
-var init_ids = __esm({
-  "src/ids.ts"() {
-    metadata = /* @__PURE__ */ new WeakMap();
-    exports.registryHelpers = {
-      getMetadata: (type) => metadata.get(type),
-      setMetadata: (type, meta) => metadata.set(type, meta)
-    };
-  }
-});
+var baseCodecs = [];
 function registerBaseCodec(codec) {
   baseCodecs.unshift(codec);
 }
 function findBaseCodec(schema) {
   return baseCodecs.find((codec) => codec.check(schema));
 }
+registerBaseCodec({
+  check: (schema) => schema instanceof zod.z.ZodDate,
+  toValidator: () => values.v.float64(),
+  fromConvex: (value) => {
+    if (typeof value === "number") {
+      return new Date(value);
+    }
+    return value;
+  },
+  toConvex: (value) => {
+    if (value instanceof Date) {
+      return value.getTime();
+    }
+    return value;
+  }
+});
 function asZodType(schema) {
   return schema;
 }
@@ -65,28 +57,6 @@ function isDateSchema(schema) {
   }
   return false;
 }
-var baseCodecs;
-var init_registry = __esm({
-  "src/registry.ts"() {
-    baseCodecs = [];
-    registerBaseCodec({
-      check: (schema) => schema instanceof zod.z.ZodDate,
-      toValidator: () => values.v.float64(),
-      fromConvex: (value) => {
-        if (typeof value === "number") {
-          return new Date(value);
-        }
-        return value;
-      },
-      toConvex: (value) => {
-        if (value instanceof Date) {
-          return value.getTime();
-        }
-        return value;
-      }
-    });
-  }
-});
 function convertEnumType(actualValidator) {
   const options = actualValidator.options;
   if (options && Array.isArray(options) && options.length > 0) {
@@ -108,10 +78,6 @@ function convertEnumType(actualValidator) {
     return values.v.any();
   }
 }
-var init_enum = __esm({
-  "src/mapping/handlers/enum.ts"() {
-  }
-});
 function convertNullableType(actualValidator, visited, zodToConvexInternal2) {
   const innerSchema = actualValidator.unwrap();
   if (innerSchema && innerSchema instanceof zod.z.ZodType) {
@@ -137,10 +103,6 @@ function convertNullableType(actualValidator, visited, zodToConvexInternal2) {
     };
   }
 }
-var init_nullable = __esm({
-  "src/mapping/handlers/nullable.ts"() {
-  }
-});
 function convertRecordType(actualValidator, visited, zodToConvexInternal2) {
   let valueType = actualValidator._def?.valueType;
   if (!valueType) {
@@ -179,10 +141,6 @@ function convertRecordType(actualValidator, visited, zodToConvexInternal2) {
     return values.v.record(values.v.string(), values.v.any());
   }
 }
-var init_record = __esm({
-  "src/mapping/handlers/record.ts"() {
-  }
-});
 function convertDiscriminatedUnionType(actualValidator, visited, zodToConvexInternal2) {
   const options = actualValidator.def?.options || actualValidator.def?.optionsMap?.values();
   if (options) {
@@ -226,22 +184,8 @@ function convertUnionType(actualValidator, visited, zodToConvexInternal2) {
     return values.v.any();
   }
 }
-var init_union = __esm({
-  "src/mapping/handlers/union.ts"() {
-  }
-});
-
-// src/mapping/handlers/index.ts
-var init_handlers = __esm({
-  "src/mapping/handlers/index.ts"() {
-    init_enum();
-    init_nullable();
-    init_record();
-    init_union();
-  }
-});
 function isZid(schema) {
-  const metadata2 = exports.registryHelpers.getMetadata(schema);
+  const metadata2 = registryHelpers.getMetadata(schema);
   return metadata2?.isConvexId === true && metadata2?.tableName && typeof metadata2.tableName === "string";
 }
 function makeUnion(members) {
@@ -259,12 +203,12 @@ function getObjectShape(obj) {
   }
   return {};
 }
-var init_utils = __esm({
-  "src/mapping/utils.ts"() {
-    init_ids();
-  }
-});
+
+// src/mapping/core.ts
 function zodToConvexInternal(zodValidator, visited = /* @__PURE__ */ new Set()) {
+  if (!zodValidator) {
+    return values.v.any();
+  }
   if (visited.has(zodValidator)) {
     return values.v.any();
   }
@@ -289,7 +233,7 @@ function zodToConvexInternal(zodValidator, visited = /* @__PURE__ */ new Set())
   }
   let convexValidator;
   if (isZid(actualValidator)) {
-    const metadata2 = exports.registryHelpers.getMetadata(actualValidator);
+    const metadata2 = registryHelpers.getMetadata(actualValidator);
     const tableName = metadata2?.tableName || "unknown";
     convexValidator = values.v.id(tableName);
   } else {
@@ -395,7 +339,7 @@ function zodToConvexInternal(zodValidator, visited = /* @__PURE__ */ new Set())
         if (codec) {
           convexValidator = codec.toValidator(actualValidator);
         } else {
-          const metadata2 = exports.registryHelpers.getMetadata(actualValidator);
+          const metadata2 = registryHelpers.getMetadata(actualValidator);
           if (metadata2?.brand && metadata2?.originalSchema) {
             convexValidator = zodToConvexInternal(metadata2.originalSchema, visited);
           } else {
@@ -470,6 +414,13 @@ function zodToConvexInternal(zodValidator, visited = /* @__PURE__ */ new Set())
         convexValidator = values.v.any();
         break;
       default:
+        if (process.env.NODE_ENV !== "production") {
+          console.warn(
+            `[zodvex] Unrecognized Zod type "${defType}" encountered. Falling back to v.any().`,
+            "Schema:",
+            actualValidator
+          );
+        }
         convexValidator = values.v.any();
         break;
     }
@@ -494,33 +445,8 @@ function zodToConvexFields(zod$1) {
   }
   return result;
 }
-var init_core = __esm({
-  "src/mapping/core.ts"() {
-    init_ids();
-    init_registry();
-    init_handlers();
-    init_utils();
-  }
-});
-
-// src/mapping/index.ts
-var mapping_exports = {};
-__export(mapping_exports, {
-  getObjectShape: () => getObjectShape,
-  makeUnion: () => makeUnion,
-  zodToConvex: () => zodToConvex,
-  zodToConvexFields: () => zodToConvexFields
-});
-var init_mapping = __esm({
-  "src/mapping/index.ts"() {
-    init_core();
-    init_utils();
-  }
-});
 
 // src/codec.ts
-init_mapping();
-init_registry();
 function asZodType2(schema) {
   return schema;
 }
@@ -667,7 +593,6 @@ function fromConvexJS(value, schema) {
   }
   return value;
 }
-init_mapping();
 function pick(obj, keys) {
   const result = {};
   for (const key of keys) {
@@ -728,8 +653,7 @@ function toKeys(mask) {
 }
 function pickShape(schemaOrShape, mask) {
   const keys = toKeys(mask);
-  const { getObjectShape: getObjectShape3 } = (init_mapping(), __toCommonJS(mapping_exports));
-  const shape = schemaOrShape instanceof zod.z.ZodObject ? getObjectShape3(schemaOrShape) : schemaOrShape || {};
+  const shape = schemaOrShape instanceof zod.z.ZodObject ? getObjectShape(schemaOrShape) : schemaOrShape || {};
   const out = {};
   for (const k of keys) {
     if (k in shape) out[k] = shape[k];
@@ -740,8 +664,7 @@ function safePick(schema, mask) {
   return zod.z.object(pickShape(schema, mask));
 }
 function safeOmit(schema, mask) {
-  const { getObjectShape: getObjectShape3 } = (init_mapping(), __toCommonJS(mapping_exports));
-  const shape = getObjectShape3(schema);
+  const shape = getObjectShape(schema);
   const omit = new Set(toKeys(mask));
   const keep = Object.keys(shape).filter((k) => !omit.has(k));
   const picked = pickShape(schema, keep);
@@ -789,10 +712,9 @@ function customFnBuilder(builder, customization) {
             handleZodValidationError(parsed.error, "args");
           }
           const finalCtx = { ...ctx, ...added?.ctx ?? {} };
-          const finalArgs = {
-            ...parsed.data,
-            ...added?.args ?? {}
-          };
+          const baseArgs = parsed.data;
+          const addedArgs = added?.args ?? {};
+          const finalArgs = { ...baseArgs, ...addedArgs };
           const ret = await handler(finalCtx, finalArgs);
           if (returns && !fn.skipConvexValidation) {
             let validated;
@@ -850,24 +772,6 @@ function customFnBuilder(builder, customization) {
 function zCustomQuery(query, customization) {
   return customFnBuilder(query, customization);
 }
-function zStrictQuery(query, customization) {
-  return customFnBuilder(
-    query,
-    customization
-  );
-}
-function zStrictMutation(mutation, customization) {
-  return customFnBuilder(
-    mutation,
-    customization
-  );
-}
-function zStrictAction(action, customization) {
-  return customFnBuilder(
-    action,
-    customization
-  );
-}
 function zCustomMutation(mutation, customization) {
   return customFnBuilder(
     mutation,
@@ -880,66 +784,28 @@ function zCustomAction(action, customization) {
     customization
   );
 }
-
-// src/index.ts
-init_ids();
-init_mapping();
-init_registry();
-
-// src/tables.ts
-init_ids();
-init_mapping();
-function zodDoc(tableName, schema) {
-  return schema.extend({
-    _id: zid(tableName),
-    _creationTime: zod.z.number()
-  });
-}
-function zodDocOrNull(tableName, schema) {
-  return zod.z.union([zodDoc(tableName, schema), zod.z.null()]);
-}
-function zodTable(name, shape) {
-  const convexFields = zodToConvexFields(shape);
-  const table = server.Table(name, convexFields);
-  return Object.assign(table, {
-    shape,
-    zDoc: zodDoc(name, zod.z.object(shape))
-  });
-}
-function zodTableWithDocs(name, schema) {
-  const convexFields = zodToConvexFields(schema.shape);
-  const shape = getObjectShape(schema);
-  const mapped = {};
-  for (const [k, field] of Object.entries(shape)) {
-    mapped[k] = mapDateFieldToNumber(field);
-  }
-  const docSchema = zod.z.object({
-    ...mapped,
-    _id: zid(name),
-    _creationTime: zod.z.number()
-  });
-  const docArray = zod.z.array(docSchema);
-  const base = server.Table(name, convexFields);
-  return { ...base, schema, docSchema, docArray };
-}
-init_mapping();
 var customCheckCache = /* @__PURE__ */ new WeakMap();
-function containsCustom(schema) {
+function containsCustom(schema, maxDepth = 50, currentDepth = 0) {
   const cached = customCheckCache.get(schema);
   if (cached !== void 0) {
     return cached;
   }
+  if (currentDepth > maxDepth) {
+    return false;
+  }
   let result = false;
   if (schema._def?.typeName === "ZodCustom") {
     result = true;
   } else if (schema instanceof zod.z.ZodUnion) {
-    result = schema.options.some(containsCustom);
+    result = schema.options.some(
+      (opt) => containsCustom(opt, maxDepth, currentDepth + 1)
+    );
   } else if (schema instanceof zod.z.ZodOptional) {
-    result = containsCustom(schema.unwrap());
+    result = containsCustom(schema.unwrap(), maxDepth, currentDepth + 1);
   } else if (schema instanceof zod.z.ZodNullable) {
-    result = containsCustom(schema.unwrap());
+    result = containsCustom(schema.unwrap(), maxDepth, currentDepth + 1);
   } else if (schema instanceof zod.z.ZodDefault) {
-    result = containsCustom(schema.removeDefault());
+    result = containsCustom(schema.removeDefault(), maxDepth, currentDepth + 1);
   }
   customCheckCache.set(schema, result);
   return result;
@@ -983,9 +849,6 @@ function zQuery(query, input, handler, options) {
     }
   });
 }
-function zInternalQuery(internalQuery, input, handler, options) {
-  return zQuery(internalQuery, input, handler, options);
-}
 function zMutation(mutation, input, handler, options) {
   let zodSchema;
   let args;
@@ -1025,9 +888,6 @@ function zMutation(mutation, input, handler, options) {
     }
   });
 }
-function zInternalMutation(internalMutation, input, handler, options) {
-  return zMutation(internalMutation, input, handler, options);
-}
 function zAction(action, input, handler, options) {
   let zodSchema;
   let args;
@@ -1067,11 +927,74 @@ function zAction(action, input, handler, options) {
     }
   });
 }
-function zInternalAction(internalAction, input, handler, options) {
-  return zAction(internalAction, input, handler, options);
+
+// src/builders.ts
+function zQueryBuilder(builder) {
+  return (config) => {
+    return zQuery(builder, config.args ?? {}, config.handler, {
+      returns: config.returns
+    });
+  };
+}
+function zMutationBuilder(builder) {
+  return (config) => {
+    return zMutation(builder, config.args ?? {}, config.handler, {
+      returns: config.returns
+    });
+  };
+}
+function zActionBuilder(builder) {
+  return (config) => {
+    return zAction(builder, config.args ?? {}, config.handler, {
+      returns: config.returns
+    });
+  };
+}
+function zCustomQueryBuilder(query, customization) {
+  return customFnBuilder(
+    query,
+    customization
+  );
+}
+function zCustomMutationBuilder(mutation, customization) {
+  return customFnBuilder(
+    mutation,
+    customization
+  );
+}
+function zCustomActionBuilder(action, customization) {
+  return customFnBuilder(
+    action,
+    customization
+  );
+}
+function zodDoc(tableName, schema) {
+  return schema.extend({
+    _id: zid(tableName),
+    _creationTime: zod.z.number()
+  });
+}
+function zodDocOrNull(tableName, schema) {
+  return zod.z.union([zodDoc(tableName, schema), zod.z.null()]);
+}
+function zodTable(name, shape) {
+  const convexFields = zodToConvexFields(shape);
+  const table = server.Table(name, convexFields);
+  const zDoc = zodDoc(name, zod.z.object(shape));
+  const docArray = zod.z.array(zDoc);
+  return Object.assign(table, {
+    shape,
+    zDoc,
+    docArray
+  });
 }
 
+Object.defineProperty(exports, "customCtx", {
+  enumerable: true,
+  get: function () { return customFunctions.customCtx; }
+});
 exports.convexCodec = convexCodec;
+exports.customFnBuilder = customFnBuilder;
 exports.findBaseCodec = findBaseCodec;
 exports.formatZodIssues = formatZodIssues;
 exports.fromConvexJS = fromConvexJS;
@@ -1083,28 +1006,25 @@ exports.mapDateFieldToNumber = mapDateFieldToNumber;
 exports.pick = pick;
 exports.pickShape = pickShape;
 exports.registerBaseCodec = registerBaseCodec;
+exports.registryHelpers = registryHelpers;
 exports.returnsAs = returnsAs;
 exports.safeOmit = safeOmit;
 exports.safePick = safePick;
 exports.toConvexJS = toConvexJS;
-exports.zAction = zAction;
+exports.zActionBuilder = zActionBuilder;
 exports.zCustomAction = zCustomAction;
+exports.zCustomActionBuilder = zCustomActionBuilder;
 exports.zCustomMutation = zCustomMutation;
+exports.zCustomMutationBuilder = zCustomMutationBuilder;
 exports.zCustomQuery = zCustomQuery;
-exports.zInternalAction = zInternalAction;
-exports.zInternalMutation = zInternalMutation;
-exports.zInternalQuery = zInternalQuery;
-exports.zMutation = zMutation;
+exports.zCustomQueryBuilder = zCustomQueryBuilder;
+exports.zMutationBuilder = zMutationBuilder;
 exports.zPaginated = zPaginated;
-exports.zQuery = zQuery;
-exports.zStrictAction = zStrictAction;
-exports.zStrictMutation = zStrictMutation;
-exports.zStrictQuery = zStrictQuery;
+exports.zQueryBuilder = zQueryBuilder;
 exports.zid = zid;
 exports.zodDoc = zodDoc;
 exports.zodDocOrNull = zodDocOrNull;
 exports.zodTable = zodTable;
-exports.zodTableWithDocs = zodTableWithDocs;
 exports.zodToConvex = zodToConvex;
 exports.zodToConvexFields = zodToConvexFields;
 //# sourceMappingURL=index.js.map