pocketbase-zod-schema 0.3.6 → 0.3.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.3.7](https://github.com/dastron/pocketbase-zod-schema/compare/pocketbase-zod-schema-v0.3.6...pocketbase-zod-schema-v0.3.7) (2026-01-15)
+
+
+### Bug Fixes
+
+* bump deps ([4c36d1c](https://github.com/dastron/pocketbase-zod-schema/commit/4c36d1c0fbe9013ef9fac482c196adbd3878a957))
+
 ## [0.3.6](https://github.com/dastron/pocketbase-zod-schema/compare/pocketbase-zod-schema-v0.3.5...pocketbase-zod-schema-v0.3.6) (2026-01-14)
 
 

package/dist/cli/index.cjs

@@ -37,7 +37,7 @@ var ora__default = /*#__PURE__*/_interopDefault(ora);
   id: zod.z.string().describe("unique id"),
   collectionId: zod.z.string().describe("collection id"),
   collectionName: zod.z.string().describe("collection name"),
-  expand: zod.z.record(zod.z.any()).describe("expandable fields"),
+  expand: zod.z.record(zod.z.string(), zod.z.any()).describe("expandable fields"),
   created: zod.z.string().describe("creation timestamp"),
   updated: zod.z.string().describe("last update timestamp")
 });
@@ -822,17 +822,33 @@ function pluralize(singular) {
 function toCollectionName(entityName) {
   return pluralize(entityName);
 }
-function isSingleRelationField(fieldName, zodType) {
+function unwrapType(zodType) {
   let unwrappedType = zodType;
-  if (zodType instanceof zod.z.ZodOptional) {
-    unwrappedType = zodType._def.innerType;
+  if (unwrappedType instanceof zod.z.ZodOptional) {
+    unwrappedType = unwrappedType.unwrap();
   }
   if (unwrappedType instanceof zod.z.ZodNullable) {
-    unwrappedType = unwrappedType._def.innerType;
+    unwrappedType = unwrappedType.unwrap();
   }
   if (unwrappedType instanceof zod.z.ZodDefault) {
-    unwrappedType = unwrappedType._def.innerType;
+    unwrappedType = unwrappedType.unwrap();
+  }
+  return unwrappedType;
+}
+function getChecks(zodType) {
+  const def = zodType.def ?? zodType._def;
+  return def?.checks ?? [];
+}
+function getJsonSchema(zodType) {
+  try {
+    const toJSONSchema = zodType.toJSONSchema;
+    return typeof toJSONSchema === "function" ? toJSONSchema.call(zodType) : null;
+  } catch {
+    return null;
   }
+}
+function isSingleRelationField(fieldName, zodType) {
+  const unwrappedType = unwrapType(zodType);
   if (!(unwrappedType instanceof zod.z.ZodString)) {
     return false;
   }
@@ -842,20 +858,11 @@ function isSingleRelationField(fieldName, zodType) {
   return startsWithUppercase && !isCommonField;
 }
 function isMultipleRelationField(fieldName, zodType) {
-  let unwrappedType = zodType;
-  if (zodType instanceof zod.z.ZodOptional) {
-    unwrappedType = zodType._def.innerType;
-  }
-  if (unwrappedType instanceof zod.z.ZodNullable) {
-    unwrappedType = unwrappedType._def.innerType;
-  }
-  if (unwrappedType instanceof zod.z.ZodDefault) {
-    unwrappedType = unwrappedType._def.innerType;
-  }
+  const unwrappedType = unwrapType(zodType);
   if (!(unwrappedType instanceof zod.z.ZodArray)) {
     return false;
   }
-  const elementType = unwrappedType._def.type;
+  const elementType = unwrappedType.element;
   if (!(elementType instanceof zod.z.ZodString)) {
     return false;
   }
@@ -878,20 +885,16 @@ function getMaxSelect(fieldName, zodType) {
     return 1;
   }
   if (isMultipleRelationField(fieldName, zodType)) {
-    let unwrappedType = zodType;
-    if (zodType instanceof zod.z.ZodOptional) {
-      unwrappedType = zodType._def.innerType;
-    }
-    if (unwrappedType instanceof zod.z.ZodNullable) {
-      unwrappedType = unwrappedType._def.innerType;
-    }
-    if (unwrappedType instanceof zod.z.ZodDefault) {
-      unwrappedType = unwrappedType._def.innerType;
-    }
+    const unwrappedType = unwrapType(zodType);
     if (unwrappedType instanceof zod.z.ZodArray) {
-      const arrayDef = unwrappedType._def;
-      if (arrayDef.maxLength) {
-        return arrayDef.maxLength.value;
+      const checks = getChecks(unwrappedType);
+      const maxCheck = checks.find((check) => check.kind === "max");
+      if (maxCheck) {
+        return maxCheck.value;
+      }
+      const schema = getJsonSchema(unwrappedType);
+      if (schema && typeof schema.maxItems === "number") {
+        return schema.maxItems;
       }
       return 999;
     }
@@ -903,36 +906,46 @@ function getMinSelect(fieldName, zodType) {
     return 0;
   }
   if (isMultipleRelationField(fieldName, zodType)) {
-    let unwrappedType = zodType;
-    if (zodType instanceof zod.z.ZodOptional) {
-      unwrappedType = zodType._def.innerType;
-    }
-    if (unwrappedType instanceof zod.z.ZodNullable) {
-      unwrappedType = unwrappedType._def.innerType;
-    }
-    if (unwrappedType instanceof zod.z.ZodDefault) {
-      unwrappedType = unwrappedType._def.innerType;
-    }
+    const unwrappedType = unwrapType(zodType);
     if (unwrappedType instanceof zod.z.ZodArray) {
-      const arrayDef = unwrappedType._def;
-      if (arrayDef.minLength) {
-        return arrayDef.minLength.value;
+      const checks = getChecks(unwrappedType);
+      const minCheck = checks.find((check) => check.kind === "min");
+      if (minCheck) {
+        return minCheck.value;
+      }
+      const schema = getJsonSchema(unwrappedType);
+      if (schema && typeof schema.minItems === "number") {
+        return schema.minItems;
       }
     }
   }
   return 0;
 }
+function getChecks2(zodType) {
+  const def = zodType.def ?? zodType._def;
+  return def?.checks ?? [];
+}
+function getJsonSchema2(zodType) {
+  try {
+    const toJSONSchema = zodType.toJSONSchema;
+    return typeof toJSONSchema === "function" ? toJSONSchema.call(zodType) : null;
+  } catch {
+    return null;
+  }
+}
 function mapZodStringType(zodType) {
-  const checks = zodType._def.checks || [];
-  const hasEmail = checks.some((check) => check.kind === "email");
+  const checks = getChecks2(zodType);
+  const hasEmail = checks.some((check) => check.kind === "email" || check.def?.format === "email");
   if (hasEmail) {
     return "email";
   }
-  const hasUrl = checks.some((check) => check.kind === "url");
+  const hasUrl = checks.some((check) => check.kind === "url" || check.def?.format === "url");
   if (hasUrl) {
     return "url";
   }
-  const hasDatetime = checks.some((check) => check.kind === "datetime");
+  const hasDatetime = checks.some(
+    (check) => check.kind === "datetime" || check.def?.format === "datetime" || check.def?.format === "date-time"
+  );
   if (hasDatetime) {
     return "date";
   }
@@ -948,21 +961,9 @@ function mapZodEnumType(_zodType) {
   return "select";
 }
 function mapZodArrayType(zodType, _fieldName) {
-  const elementType = zodType._def.type;
-  if (elementType instanceof zod.z.ZodType) {
-    const typeName = elementType._def.typeName;
-    if (typeName === "ZodType" && elementType._def?.innerType?.name === "File") {
-      return "file";
-    }
-  }
-  if (elementType._def?.typeName === "ZodType") {
-    const checks = elementType._def?.checks || [];
-    const isFileInstance = checks.some(
-      (check) => check.kind === "instanceof" || elementType._def?.innerType?.name === "File"
-    );
-    if (isFileInstance) {
-      return "file";
-    }
+  const elementType = zodType.element;
+  if (elementType instanceof zod.z.ZodFile) {
+    return "file";
   }
   if (elementType instanceof zod.z.ZodString) {
     return "relation";
@@ -978,29 +979,16 @@ function mapZodRecordType(_zodType) {
 function mapZodTypeToPocketBase(zodType, fieldName) {
   let unwrappedType = zodType;
   if (zodType instanceof zod.z.ZodOptional) {
-    unwrappedType = zodType._def.innerType;
+    unwrappedType = zodType.unwrap();
   }
   if (unwrappedType instanceof zod.z.ZodNullable) {
-    unwrappedType = unwrappedType._def.innerType;
+    unwrappedType = unwrappedType.unwrap();
   }
   if (unwrappedType instanceof zod.z.ZodDefault) {
-    unwrappedType = unwrappedType._def.innerType;
-  }
-  if (unwrappedType._def?.typeName === "ZodEffects") {
-    const effect = unwrappedType._def?.effect;
-    if (effect?.type === "refinement") {
-      const fileFieldNames = ["avatar", "image", "file", "attachment", "photo", "picture", "document", "upload"];
-      if (fileFieldNames.some((name) => fieldName.toLowerCase().includes(name))) {
-        return "file";
-      }
-    }
+    unwrappedType = unwrappedType.unwrap();
   }
-  if (unwrappedType._def?.typeName === "ZodType") {
-    const checks = unwrappedType._def?.checks || [];
-    const innerType = unwrappedType._def?.innerType;
-    if (innerType?.name === "File" || checks.some((check) => check.kind === "instanceof")) {
-      return "file";
-    }
+  if (unwrappedType instanceof zod.z.ZodFile) {
+    return "file";
   }
   if (unwrappedType instanceof zod.z.ZodString) {
     return mapZodStringType(unwrappedType);
@@ -1029,15 +1017,15 @@ function extractFieldOptions(zodType) {
   const options = {};
   let unwrappedType = zodType;
   if (zodType instanceof zod.z.ZodOptional) {
-    unwrappedType = zodType._def.innerType;
+    unwrappedType = zodType.unwrap();
   }
   if (unwrappedType instanceof zod.z.ZodNullable) {
-    unwrappedType = unwrappedType._def.innerType;
+    unwrappedType = unwrappedType.unwrap();
   }
   if (unwrappedType instanceof zod.z.ZodDefault) {
-    unwrappedType = unwrappedType._def.innerType;
+    unwrappedType = unwrappedType.unwrap();
   }
-  const checks = unwrappedType._def?.checks || [];
+  const checks = getChecks2(unwrappedType);
   if (unwrappedType instanceof zod.z.ZodString) {
     for (const check of checks) {
       if (check.kind === "min") {
@@ -1050,6 +1038,20 @@ function extractFieldOptions(zodType) {
         options.pattern = check.regex.source;
       }
     }
+    if (options.min === void 0 || options.max === void 0 || options.pattern === void 0) {
+      const schema = getJsonSchema2(unwrappedType);
+      if (schema) {
+        if (options.min === void 0 && typeof schema.minLength === "number") {
+          options.min = schema.minLength;
+        }
+        if (options.max === void 0 && typeof schema.maxLength === "number") {
+          options.max = schema.maxLength;
+        }
+        if (options.pattern === void 0 && typeof schema.pattern === "string") {
+          options.pattern = schema.pattern;
+        }
+      }
+    }
   }
   if (unwrappedType instanceof zod.z.ZodNumber) {
     for (const check of checks) {
@@ -1060,12 +1062,23 @@ function extractFieldOptions(zodType) {
         options.max = check.value;
       }
     }
+    if (options.min === void 0 || options.max === void 0) {
+      const schema = getJsonSchema2(unwrappedType);
+      if (schema) {
+        if (options.min === void 0 && typeof schema.minimum === "number") {
+          options.min = schema.minimum;
+        }
+        if (options.max === void 0 && typeof schema.maximum === "number") {
+          options.max = schema.maximum;
+        }
+      }
+    }
   }
   if (unwrappedType instanceof zod.z.ZodEnum) {
-    options.values = unwrappedType._def.values;
+    options.values = unwrappedType.options.map(String);
   }
   if (unwrappedType instanceof zod.z.ZodArray) {
-    const arrayChecks = unwrappedType._def?.checks || [];
+    const arrayChecks = getChecks2(unwrappedType);
     for (const check of arrayChecks) {
       if (check.kind === "min") {
         options.minSelect = check.value;
@@ -1074,6 +1087,17 @@ function extractFieldOptions(zodType) {
         options.maxSelect = check.value;
       }
     }
+    if (options.minSelect === void 0 || options.maxSelect === void 0) {
+      const schema = getJsonSchema2(unwrappedType);
+      if (schema) {
+        if (options.minSelect === void 0 && typeof schema.minItems === "number") {
+          options.minSelect = schema.minItems;
+        }
+        if (options.maxSelect === void 0 && typeof schema.maxItems === "number") {
+          options.maxSelect = schema.maxItems;
+        }
+      }
+    }
   }
   return options;
 }
@@ -1089,6 +1113,19 @@ function isFieldRequired(zodType) {
   }
   return true;
 }
+function unwrapZodType(zodType) {
+  let unwrapped = zodType;
+  if (unwrapped instanceof zod.z.ZodOptional) {
+    unwrapped = unwrapped.unwrap();
+  }
+  if (unwrapped instanceof zod.z.ZodNullable) {
+    unwrapped = unwrapped.unwrap();
+  }
+  if (unwrapped instanceof zod.z.ZodDefault) {
+    unwrapped = unwrapped.unwrap();
+  }
+  return unwrapped;
+}
 
 // src/migration/analyzer.ts
 var tsxLoaderRegistered = false;
@@ -1314,7 +1351,8 @@ function isAuthCollection(fields) {
   return hasEmail && hasPassword;
 }
 function buildFieldDefinition(fieldName, zodType) {
-  const fieldMetadata = extractFieldMetadata(zodType.description);
+  const unwrappedType = unwrapZodType(zodType);
+  const fieldMetadata = extractFieldMetadata(unwrappedType.description ?? zodType.description);
   if (fieldMetadata) {
     let required2;
     if (fieldMetadata.type === "number") {
@@ -1334,7 +1372,7 @@ function buildFieldDefinition(fieldName, zodType) {
       options: Object.keys(options2).length > 0 ? options2 : void 0
     };
     if (fieldMetadata.type === "relation") {
-      const relationMetadata2 = extractRelationMetadata(zodType.description);
+      const relationMetadata2 = extractRelationMetadata(unwrappedType.description ?? zodType.description);
       if (relationMetadata2) {
         fieldDef2.relation = {
           collection: relationMetadata2.collection,
@@ -1346,7 +1384,7 @@ function buildFieldDefinition(fieldName, zodType) {
     }
     return fieldDef2;
   }
-  const fieldType = mapZodTypeToPocketBase(zodType, fieldName);
+  const fieldType = mapZodTypeToPocketBase(zodType);
   const required = isFieldRequired(zodType);
   const options = extractFieldOptions(zodType);
   const fieldDef = {
@@ -1355,7 +1393,7 @@ function buildFieldDefinition(fieldName, zodType) {
     required,
     options
   };
-  const relationMetadata = extractRelationMetadata(zodType.description);
+  const relationMetadata = extractRelationMetadata(unwrappedType.description ?? zodType.description);
   if (relationMetadata) {
     fieldDef.type = "relation";
     fieldDef.relation = {
@@ -2765,7 +2803,9 @@ function generate(diff, config) {
       const downCode = generateOperationDownMigration(operation, collectionIdMap);
       const content = createMigrationFileStructure(upCode, downCode, normalizedConfig);
       if (!normalizedConfig.force && existingFiles.some((existingContent) => existingContent === content)) {
-        console.warn(`Duplicate migration detected for ${operation.type} ${typeof operation.collection === "string" ? operation.collection : operation.collection.name}. Skipping...`);
+        console.warn(
+          `Duplicate migration detected for ${operation.type} ${typeof operation.collection === "string" ? operation.collection : operation.collection.name}. Skipping...`
+        );
         continue;
       }
       const filename = generateCollectionMigrationFilename(operation);