pocketbase-zod-schema 0.6.1 → 0.7.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.7.1](https://github.com/dastron/pocketbase-zod-schema/compare/pocketbase-zod-schema-v0.7.0...pocketbase-zod-schema-v0.7.1) (2026-05-06)
+
+
+### Bug Fixes
+
+* missing autodate fields ([e3d6dc6](https://github.com/dastron/pocketbase-zod-schema/commit/e3d6dc60d2e6b7d0fa9a52b6bace3c2d3addfc84))
+
+## [0.7.0](https://github.com/dastron/pocketbase-zod-schema/compare/pocketbase-zod-schema-v0.6.1...pocketbase-zod-schema-v0.7.0) (2026-02-13)
+
+
+### Features
+
+* Add migration filtering and skip destructive changes without force ([8b6f4f1](https://github.com/dastron/pocketbase-zod-schema/commit/8b6f4f1e918c40052ec15390b7c5c4df87e8a871))
+* Add migration filtering and skip destructive changes without force ([1a8ea15](https://github.com/dastron/pocketbase-zod-schema/commit/1a8ea15489957ec2407af8b57316f703eb40db57))
+* enhance codegen with complex types and strict mutators ([4086561](https://github.com/dastron/pocketbase-zod-schema/commit/4086561aa4ae8f132e965ff7672a581644eaa364))
+
+
+### Bug Fixes
+
+* remove idOrName:string from typegen ([423dcbb](https://github.com/dastron/pocketbase-zod-schema/commit/423dcbb1a584f9bf3722c797297cc9450ba45325))
+
 ## [0.6.1](https://github.com/dastron/pocketbase-zod-schema/compare/pocketbase-zod-schema-v0.6.0...pocketbase-zod-schema-v0.6.1) (2026-01-26)
 
 

package/dist/cli/index.cjs

@@ -2163,6 +2163,54 @@ function parseMigrationOperationsFromContent(content) {
         }
       }
     }
+    const unmarshalRegex = /unmarshal\s*\(/g;
+    let unmarshalMatch;
+    while ((unmarshalMatch = unmarshalRegex.exec(content)) !== null) {
+      let i = unmarshalMatch.index + unmarshalMatch[0].length;
+      while (i < content.length && /\s/.test(content[i])) i++;
+      if (content[i] !== "{") continue;
+      const objStart = i;
+      let braceCount = 1;
+      let inStr = false;
+      let strChar = null;
+      i++;
+      while (i < content.length && braceCount > 0) {
+        const ch = content[i];
+        const prev = i > 0 ? content[i - 1] : "";
+        if (!inStr && (ch === '"' || ch === "'")) {
+          inStr = true;
+          strChar = ch;
+        } else if (inStr && ch === strChar && prev !== "\\") {
+          inStr = false;
+          strChar = null;
+        }
+        if (!inStr) {
+          if (ch === "{") braceCount++;
+          if (ch === "}") braceCount--;
+        }
+        i++;
+      }
+      if (braceCount !== 0) continue;
+      const objStr = content.substring(objStart, i);
+      while (i < content.length && /[\s,]/.test(content[i])) i++;
+      const varStart = i;
+      while (i < content.length && /\w/.test(content[i])) i++;
+      const colVarName = content.substring(varStart, i);
+      const colInfo = variables.get(colVarName);
+      if (!colInfo || colInfo.type !== "collection") continue;
+      const keyValRegex = /"(\w+Rule)"\s*:\s*([^,}\n]+)/g;
+      let kvMatch;
+      while ((kvMatch = keyValRegex.exec(objStr)) !== null) {
+        const ruleKey = kvMatch[1];
+        const valStr = kvMatch[2].trim();
+        try {
+          const value = new Function("app", `return ${valStr}`)(mockApp);
+          getUpdate(colInfo.name).rulesToUpdate[ruleKey] = value;
+        } catch {
+          getUpdate(colInfo.name).rulesToUpdate[ruleKey] = valStr;
+        }
+      }
+    }
     const idxPushRegex = /(\w+)\.indexes\.push\s*\(/g;
     let match;
     while ((match = idxPushRegex.exec(content)) !== null) {
@@ -2933,6 +2981,81 @@ function categorizeChangesBySeverity(diff, _config) {
   return { destructive, nonDestructive };
 }
 
+// src/migration/diff/filter.ts
+function matchesPattern(text, patterns) {
+  if (!patterns || patterns.length === 0) return true;
+  return patterns.some((pattern) => {
+    try {
+      const regex = new RegExp(pattern);
+      return regex.test(text);
+    } catch {
+      return text.includes(pattern);
+    }
+  });
+}
+function isDestructiveFieldModification(mod) {
+  const typeChange = mod.changes.find((c) => c.property === "type");
+  const requiredChange = mod.changes.find((c) => c.property === "required" && c.newValue === true);
+  return !!(typeChange || requiredChange);
+}
+function filterDiff(diff, options) {
+  const { patterns = [], skipDestructive = false } = options;
+  const collectionsToCreate = diff.collectionsToCreate.filter((col) => {
+    return matchesPattern(col.name, patterns);
+  });
+  let collectionsToDelete = diff.collectionsToDelete;
+  if (skipDestructive) {
+    collectionsToDelete = [];
+  } else {
+    collectionsToDelete = collectionsToDelete.filter((col) => {
+      return matchesPattern(col.name, patterns);
+    });
+  }
+  const collectionsToModify = diff.collectionsToModify.map((mod) => {
+    const collectionMatches = matchesPattern(mod.collection, patterns);
+    const fieldsToAdd = mod.fieldsToAdd.filter((field) => {
+      return collectionMatches || matchesPattern(`${mod.collection}.${field.name}`, patterns);
+    });
+    let fieldsToRemove = mod.fieldsToRemove;
+    if (skipDestructive) {
+      fieldsToRemove = [];
+    } else {
+      fieldsToRemove = fieldsToRemove.filter((field) => {
+        return collectionMatches || matchesPattern(`${mod.collection}.${field.name}`, patterns);
+      });
+    }
+    let fieldsToModify = mod.fieldsToModify;
+    if (skipDestructive) {
+      fieldsToModify = fieldsToModify.filter((f) => !isDestructiveFieldModification(f));
+    }
+    fieldsToModify = fieldsToModify.filter((f) => {
+      return collectionMatches || matchesPattern(`${mod.collection}.${f.fieldName}`, patterns);
+    });
+    const indexesToAdd = collectionMatches ? mod.indexesToAdd : [];
+    const indexesToRemove = collectionMatches ? mod.indexesToRemove : [];
+    const rulesToUpdate = collectionMatches ? mod.rulesToUpdate : [];
+    const permissionsToUpdate = collectionMatches ? mod.permissionsToUpdate : [];
+    return {
+      ...mod,
+      fieldsToAdd,
+      fieldsToRemove,
+      fieldsToModify,
+      indexesToAdd,
+      indexesToRemove,
+      rulesToUpdate,
+      permissionsToUpdate
+    };
+  }).filter((mod) => {
+    return mod.fieldsToAdd.length > 0 || mod.fieldsToRemove.length > 0 || mod.fieldsToModify.length > 0 || mod.indexesToAdd.length > 0 || mod.indexesToRemove.length > 0 || mod.rulesToUpdate.length > 0 || mod.permissionsToUpdate.length > 0;
+  });
+  return {
+    ...diff,
+    collectionsToCreate,
+    collectionsToDelete,
+    collectionsToModify
+  };
+}
+
 // src/migration/diff/index.ts
 function hasChanges(modification) {
   return modification.fieldsToAdd.length > 0 || modification.fieldsToRemove.length > 0 || modification.fieldsToModify.length > 0 || modification.indexesToAdd.length > 0 || modification.indexesToRemove.length > 0 || modification.rulesToUpdate.length > 0 || modification.permissionsToUpdate.length > 0;
@@ -3152,6 +3275,36 @@ function getSystemFields() {
     }
   ];
 }
+function getSystemTimestampFields() {
+  return [
+    {
+      name: "created",
+      id: "autodate2990389176",
+      type: "autodate",
+      required: false,
+      options: {
+        hidden: false,
+        onCreate: true,
+        onUpdate: false,
+        presentable: false,
+        system: true
+      }
+    },
+    {
+      name: "updated",
+      id: "autodate3332085495",
+      type: "autodate",
+      required: false,
+      options: {
+        hidden: false,
+        onCreate: true,
+        onUpdate: true,
+        presentable: false,
+        system: true
+      }
+    }
+  ];
+}
 function getAuthSystemFields() {
   return [
     {
@@ -3506,6 +3659,18 @@ function generatePermissionUpdate(collectionName, ruleType, newValue, varName, i
   lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
+function generateGroupedRuleUpdates(collectionName, entries, varSuffix, isLast = false, collectionIdMap) {
+  const collectionVar = `collection_${collectionName}_${varSuffix}`;
+  const lines = [];
+  lines.push(`  const ${collectionVar} = ${generateFindCollectionCode(collectionName, collectionIdMap)};`);
+  lines.push(`  unmarshal({`);
+  for (const entry of entries) {
+    lines.push(`    "${entry.ruleType}": ${formatValue(entry.value)},`);
+  }
+  lines.push(`  }, ${collectionVar})`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
+  return lines.join("\n");
+}
 
 // src/migration/generator/collections.ts
 function generateCollectionCreation(collection, varName = "collection", isLast = false, collectionIdMap) {
@@ -3529,11 +3694,12 @@ function generateCollectionCreation(collection, varName = "collection", isLast =
     systemFieldNames.push(...getAuthSystemFields().map((f) => f.name));
   }
   const userFields = collection.fields.filter((f) => !systemFieldNames.includes(f.name));
-  const allFields = [...getSystemFields().filter((f) => f.name === "id")];
+  const allFields = [...getSystemFields()];
   if (collection.type === "auth") {
     allFields.push(...getAuthSystemFields());
   }
   allFields.push(...userFields);
+  allFields.push(...getSystemTimestampFields());
   lines.push(`    "fields": ${generateFieldsArray(allFields, collectionIdMap)},`);
   let allIndexes = [...collection.indexes || []];
   if (collection.type === "auth") {
@@ -3563,7 +3729,7 @@ function generateOperationUpMigration(operation, collectionIdMap) {
     const modification = operation.modifications;
     const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection?.name ?? modification.collection;
     let operationCount = 0;
-    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + modification.rulesToUpdate.length + modification.permissionsToUpdate.length;
+    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + (modification.permissionsToUpdate.length > 0 ? 1 : modification.rulesToUpdate.length > 0 ? 1 : 0);
     for (let i = 0; i < modification.fieldsToAdd.length; i++) {
       const field = modification.fieldsToAdd[i];
       operationCount++;
@@ -3603,23 +3769,29 @@ function generateOperationUpMigration(operation, collectionIdMap) {
       if (!isLast) lines.push("");
     }
     if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
-      for (const permission of modification.permissionsToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.permissionsToUpdate.length >= 2) {
+        const entries = modification.permissionsToUpdate.map((p) => ({ ruleType: p.ruleType, value: p.newValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "rules", isLast, collectionIdMap));
+      } else {
+        const permission = modification.permissionsToUpdate[0];
         const varName = `collection_${collectionName}_perm_${permission.ruleType}`;
-        const isLast = operationCount === totalOperations;
-        lines.push(
-          generatePermissionUpdate(collectionName, permission.ruleType, permission.newValue, varName, isLast, collectionIdMap)
-        );
-        if (!isLast) lines.push("");
+        lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.newValue, varName, isLast, collectionIdMap));
       }
+      if (!isLast) lines.push("");
     } else if (modification.rulesToUpdate.length > 0) {
-      for (const rule of modification.rulesToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.rulesToUpdate.length >= 2) {
+        const entries = modification.rulesToUpdate.map((r) => ({ ruleType: r.ruleType, value: r.newValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "rules", isLast, collectionIdMap));
+      } else {
+        const rule = modification.rulesToUpdate[0];
         const varName = `collection_${collectionName}_rule_${rule.ruleType}`;
-        const isLast = operationCount === totalOperations;
         lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.newValue, varName, isLast, collectionIdMap));
-        if (!isLast) lines.push("");
       }
+      if (!isLast) lines.push("");
     }
   } else if (operation.type === "delete") {
     const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection.name;
@@ -3658,25 +3830,31 @@ function generateOperationDownMigration(operation, collectionIdMap) {
     const modification = operation.modifications;
     const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection?.name ?? modification.collection;
     let operationCount = 0;
-    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + modification.rulesToUpdate.length + modification.permissionsToUpdate.length;
+    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + (modification.permissionsToUpdate.length > 0 ? 1 : modification.rulesToUpdate.length > 0 ? 1 : 0);
     if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
-      for (const permission of modification.permissionsToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.permissionsToUpdate.length >= 2) {
+        const entries = modification.permissionsToUpdate.map((p) => ({ ruleType: p.ruleType, value: p.oldValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "revert_rules", isLast, collectionIdMap));
+      } else {
+        const permission = modification.permissionsToUpdate[0];
         const varName = `collection_${collectionName}_revert_perm_${permission.ruleType}`;
-        const isLast = operationCount === totalOperations;
-        lines.push(
-          generatePermissionUpdate(collectionName, permission.ruleType, permission.oldValue, varName, isLast, collectionIdMap)
-        );
-        if (!isLast) lines.push("");
+        lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.oldValue, varName, isLast, collectionIdMap));
       }
+      if (!isLast) lines.push("");
     } else if (modification.rulesToUpdate.length > 0) {
-      for (const rule of modification.rulesToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.rulesToUpdate.length >= 2) {
+        const entries = modification.rulesToUpdate.map((r) => ({ ruleType: r.ruleType, value: r.oldValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "revert_rules", isLast, collectionIdMap));
+      } else {
+        const rule = modification.rulesToUpdate[0];
         const varName = `collection_${collectionName}_revert_rule_${rule.ruleType}`;
-        const isLast = operationCount === totalOperations;
         lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.oldValue, varName, isLast, collectionIdMap));
-        if (!isLast) lines.push("");
       }
+      if (!isLast) lines.push("");
     }
     for (let i = 0; i < modification.indexesToRemove.length; i++) {
       operationCount++;
@@ -4521,7 +4699,7 @@ function handleDestructiveChanges(diff, config, force) {
   }
   return true;
 }
-async function executeGenerate(options) {
+async function executeGenerate(filters, options) {
   try {
     const parentOpts = options.parent?.opts?.() || {};
     if (parentOpts.verbose) {
@@ -4531,6 +4709,9 @@ async function executeGenerate(options) {
     }
     logDebug("Starting migration generation...");
     logDebug(`Options: ${JSON.stringify(options, null, 2)}`);
+    if (filters && filters.length > 0) {
+      logDebug(`Filters: ${JSON.stringify(filters)}`);
+    }
     const config = await loadConfig(options);
     const schemaDir = getSchemaDirectory(config);
     const migrationsDir = getMigrationsDirectory(config);
@@ -4554,7 +4735,18 @@ async function executeGenerate(options) {
       logSuccess("Loaded previous snapshot as base reference");
     }
     logSection("\u{1F4CA} Comparing Schemas");
-    const diff = compare(currentSchema, previousSnapshot);
+    let diff = compare(currentSchema, previousSnapshot);
+    const skipDestructive = !options.force;
+    if (skipDestructive) {
+      const destructive = detectDestructiveChanges(diff);
+      if (destructive.length > 0) {
+        logInfo(`\u2139\uFE0F  Omitting ${destructive.length} destructive change(s) because --force is not set.`);
+      }
+    }
+    diff = filterDiff(diff, {
+      patterns: filters,
+      skipDestructive
+    });
     if (!hasChanges2(diff)) {
       logInfo("No changes detected");
       console.log();