pocketbase-zod-schema 0.2.1 → 0.2.3

package/dist/cli/index.js

@@ -9,7 +9,9 @@ import ora from 'ora';
   id: z.string().describe("unique id"),
   collectionId: z.string().describe("collection id"),
   collectionName: z.string().describe("collection name"),
-  expand: z.record(z.any()).describe("expandable fields")
+  expand: z.record(z.any()).describe("expandable fields"),
+  created: z.string().describe("creation timestamp"),
+  updated: z.string().describe("last update timestamp")
 });
 ({
   created: z.string().describe("creation timestamp"),
@@ -1072,7 +1074,7 @@ var DEFAULT_CONFIG = {
     "permission-templates.js"
   ],
   includeExtensions: [".ts", ".js"],
-  schemaPatterns: ["Schema", "InputSchema"],
+  schemaPatterns: ["Schema", "InputSchema", "Collection"],
   useCompiledFiles: true
 };
 function mergeConfig(config) {
@@ -1209,14 +1211,35 @@ function extractCollectionNameFromSchema(zodSchema) {
   }
   return null;
 }
-function extractSchemaDefinitions(module, patterns = ["Schema", "InputSchema"]) {
+function extractCollectionTypeFromSchema(zodSchema) {
+  if (!zodSchema.description) {
+    return null;
+  }
+  try {
+    const metadata = JSON.parse(zodSchema.description);
+    if (metadata.type === "base" || metadata.type === "auth") {
+      return metadata.type;
+    }
+  } catch {
+  }
+  return null;
+}
+function extractSchemaDefinitions(module, patterns = ["Schema", "InputSchema", "Collection"]) {
   const result = {};
+  if (module.default instanceof z.ZodObject) {
+    result.schema = module.default;
+  }
   for (const [key, value] of Object.entries(module)) {
+    if (key === "default") continue;
     if (value instanceof z.ZodObject) {
       if (patterns.includes("InputSchema") && key.endsWith("InputSchema")) {
         result.inputSchema = value;
-      } else if (patterns.includes("Schema") && key.endsWith("Schema") && !key.endsWith("InputSchema")) {
-        result.schema = value;
+      } else if (!result.schema) {
+        if (patterns.includes("Collection") && key.endsWith("Collection")) {
+          result.schema = value;
+        } else if (patterns.includes("Schema") && key.endsWith("Schema") && !key.endsWith("InputSchema")) {
+          result.schema = value;
+        }
       }
     }
   }
@@ -1305,8 +1328,13 @@ function extractIndexes(schema) {
 }
 function convertZodSchemaToCollectionSchema(collectionName, zodSchema) {
   const rawFields = extractFieldDefinitions(zodSchema);
-  const collectionType = isAuthCollection(rawFields) ? "auth" : "base";
-  const fields = rawFields.map(({ name, zodType }) => buildFieldDefinition(name, zodType));
+  const explicitType = extractCollectionTypeFromSchema(zodSchema);
+  const collectionType = explicitType ?? (isAuthCollection(rawFields) ? "auth" : "base");
+  let fields = rawFields.map(({ name, zodType }) => buildFieldDefinition(name, zodType));
+  if (collectionType === "auth") {
+    const authSystemFieldNames = ["email", "emailVisibility", "verified", "password", "tokenKey"];
+    fields = fields.filter((field) => !authSystemFieldNames.includes(field.name));
+  }
   const indexes = extractIndexes(zodSchema) || [];
   const permissionAnalyzer = new PermissionAnalyzer();
   let permissions = void 0;
@@ -1453,9 +1481,14 @@ function matchCollectionsByName(currentSchema, previousSnapshot) {
   if (!previousSnapshot) {
     return matches;
   }
+  const previousCollectionsLower = /* @__PURE__ */ new Map();
+  for (const [name, collection] of previousSnapshot.collections) {
+    previousCollectionsLower.set(name.toLowerCase(), [name, collection]);
+  }
   for (const [collectionName, currentCollection] of currentSchema.collections) {
-    const previousCollection = previousSnapshot.collections.get(collectionName);
-    if (previousCollection) {
+    const previousEntry = previousCollectionsLower.get(collectionName.toLowerCase());
+    if (previousEntry) {
+      const [, previousCollection] = previousEntry;
       matches.push([currentCollection, previousCollection]);
     }
   }
@@ -2040,6 +2073,55 @@ function generateIndexesArray(indexes) {
     ${indexStrings.join(",\n    ")},
   ]`;
 }
+function getSystemFields() {
+  return [
+    // id field - primary key, auto-generated
+    {
+      name: "id",
+      type: "text",
+      required: true,
+      options: {
+        autogeneratePattern: "[a-z0-9]{15}",
+        hidden: false,
+        id: "text3208210256",
+        max: 15,
+        min: 15,
+        pattern: "^[a-z0-9]+$",
+        presentable: false,
+        primaryKey: true,
+        system: true
+      }
+    },
+    // created field - autodate, set on creation
+    {
+      name: "created",
+      type: "autodate",
+      required: true,
+      options: {
+        hidden: false,
+        id: "autodate2990389176",
+        onCreate: true,
+        onUpdate: false,
+        presentable: false,
+        system: false
+      }
+    },
+    // updated field - autodate, set on creation and update
+    {
+      name: "updated",
+      type: "autodate",
+      required: true,
+      options: {
+        hidden: false,
+        id: "autodate3332085495",
+        onCreate: true,
+        onUpdate: true,
+        presentable: false,
+        system: false
+      }
+    }
+  ];
+}
 function generateCollectionCreation(collection, varName = "collection", isLast = false) {
   const lines = [];
   lines.push(`  const ${varName} = new Collection({`);
@@ -2052,7 +2134,9 @@ function generateCollectionCreation(collection, varName = "collection", isLast =
   } else if (rulesCode) {
     lines.push(`    ${rulesCode},`);
   }
-  lines.push(`    fields: ${generateFieldsArray(collection.fields)},`);
+  const systemFields = getSystemFields();
+  const allFields = [...systemFields, ...collection.fields];
+  lines.push(`    fields: ${generateFieldsArray(allFields)},`);
   lines.push(`    indexes: ${generateIndexesArray(collection.indexes)},`);
   lines.push(`  });`);
   lines.push(``);