pocketbase-zod-schema 0.3.0 → 0.3.1

package/dist/index.d.cts

@@ -1,15 +1,15 @@
 export { StatusEnum, StatusEnumType } from './enums.cjs';
 export { BaseMutator, MutatorOptions } from './mutator.cjs';
 export { CollectionConfig, PermissionTemplates, PermissionValidationResult, RelationConfig, RelationField, RelationsConfig, RelationsField, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, createPermissions, defineCollection, extractRelationMetadata, inputImageFileSchema, isPermissionSchema, isTemplateConfig, mergePermissions, omitImageFilesSchema, resolveTemplate, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.cjs';
-export { i as AutodateField, A as AutodateFieldOptions, B as BoolField, h as DateField, D as DateFieldOptions, g as EditorField, E as EmailField, F as FIELD_METADATA_KEY, a as FieldMetadata, k as FileField, b as FileFieldOptions, l as FilesField, c as FilesFieldOptions, G as GeoPointField, J as JSONField, d as NumberField, N as NumberFieldOptions, P as PocketBaseFieldType, j as SelectField, S as SelectFieldOptions, f as TextField, T as TextFieldOptions, U as URLField, e as extractFieldMetadata } from './fields-UcOPu1OQ.cjs';
+export { i as AutodateField, A as AutodateFieldOptions, B as BoolField, h as DateField, D as DateFieldOptions, g as EditorField, E as EmailField, F as FIELD_METADATA_KEY, a as FieldMetadata, k as FileField, b as FileFieldOptions, l as FilesField, c as FilesFieldOptions, G as GeoPointField, J as JSONField, d as NumberField, N as NumberFieldOptions, P as PocketBaseFieldType, j as SelectField, S as SelectFieldOptions, f as TextField, T as TextFieldOptions, U as URLField, e as extractFieldMetadata } from './fields-RVj26U-O.cjs';
 export { A as APIRuleType, P as PermissionSchema, a as PermissionTemplate, b as PermissionTemplateConfig, R as RuleExpression } from './permissions-ZHafVSIx.cjs';
 export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection } from './migration/analyzer.cjs';
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './migration/snapshot.cjs';
 export { ChangeSummary, DestructiveChange, DiffEngine, DiffEngineConfig, aggregateChanges, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, detectDestructiveChanges, detectFieldChanges, filterSystemCollections, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, generateChangeSummary, getUsersSystemFields, isSystemCollection, matchCollectionsByName, matchFieldsByName, requiresForceFlag } from './migration/diff.cjs';
 export { MigrationGenerator, MigrationGeneratorConfig, createMigrationFileStructure, generate, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, writeMigrationFile } from './migration/generator.cjs';
-export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from './types-YoBjsa-A.cjs';
+export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from './types-D-Fsdn_O.cjs';
 export { CLIUsageError, ConfigurationError, FileSystemError, MigrationError, MigrationGenerationError, SchemaParsingError, SnapshotError } from './migration/index.cjs';
-export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from './type-mapper-DrQmtznD.cjs';
+export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from './type-mapper-DaBe-1ph.cjs';
 export { generateMigration, getMigrationStatus } from './cli/index.cjs';
 export { formatChangeSummary, loadConfig, logError, logInfo, logSection, logSuccess, logWarning, withProgress } from './cli/utils/index.cjs';
 import 'zod';

package/dist/index.d.ts

@@ -1,15 +1,15 @@
 export { StatusEnum, StatusEnumType } from './enums.js';
 export { BaseMutator, MutatorOptions } from './mutator.js';
 export { CollectionConfig, PermissionTemplates, PermissionValidationResult, RelationConfig, RelationField, RelationsConfig, RelationsField, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, createPermissions, defineCollection, extractRelationMetadata, inputImageFileSchema, isPermissionSchema, isTemplateConfig, mergePermissions, omitImageFilesSchema, resolveTemplate, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.js';
-export { i as AutodateField, A as AutodateFieldOptions, B as BoolField, h as DateField, D as DateFieldOptions, g as EditorField, E as EmailField, F as FIELD_METADATA_KEY, a as FieldMetadata, k as FileField, b as FileFieldOptions, l as FilesField, c as FilesFieldOptions, G as GeoPointField, J as JSONField, d as NumberField, N as NumberFieldOptions, P as PocketBaseFieldType, j as SelectField, S as SelectFieldOptions, f as TextField, T as TextFieldOptions, U as URLField, e as extractFieldMetadata } from './fields-UcOPu1OQ.js';
+export { i as AutodateField, A as AutodateFieldOptions, B as BoolField, h as DateField, D as DateFieldOptions, g as EditorField, E as EmailField, F as FIELD_METADATA_KEY, a as FieldMetadata, k as FileField, b as FileFieldOptions, l as FilesField, c as FilesFieldOptions, G as GeoPointField, J as JSONField, d as NumberField, N as NumberFieldOptions, P as PocketBaseFieldType, j as SelectField, S as SelectFieldOptions, f as TextField, T as TextFieldOptions, U as URLField, e as extractFieldMetadata } from './fields-RVj26U-O.js';
 export { A as APIRuleType, P as PermissionSchema, a as PermissionTemplate, b as PermissionTemplateConfig, R as RuleExpression } from './permissions-ZHafVSIx.js';
 export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection } from './migration/analyzer.js';
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './migration/snapshot.js';
 export { ChangeSummary, DestructiveChange, DiffEngine, DiffEngineConfig, aggregateChanges, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, detectDestructiveChanges, detectFieldChanges, filterSystemCollections, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, generateChangeSummary, getUsersSystemFields, isSystemCollection, matchCollectionsByName, matchFieldsByName, requiresForceFlag } from './migration/diff.js';
 export { MigrationGenerator, MigrationGeneratorConfig, createMigrationFileStructure, generate, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, writeMigrationFile } from './migration/generator.js';
-export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from './types-Ds3NQvny.js';
+export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from './types-CUVzgZ9k.js';
 export { CLIUsageError, ConfigurationError, FileSystemError, MigrationError, MigrationGenerationError, SchemaParsingError, SnapshotError } from './migration/index.js';
-export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from './type-mapper-n231Fspm.js';
+export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from './type-mapper-CZzVeDj7.js';
 export { generateMigration, getMigrationStatus } from './cli/index.js';
 export { formatChangeSummary, loadConfig, logError, logInfo, logSection, logSuccess, logWarning, withProgress } from './cli/utils/index.js';
 import 'zod';

package/dist/index.js

@@ -2470,7 +2470,7 @@ var SchemaAnalyzer = class {
 var SNAPSHOT_VERSION = "1.0.0";
 function resolveCollectionIdToName(collectionId) {
   if (collectionId === "_pb_users_auth_") {
-    return "Users";
+    return "users";
   }
   const nameMatch = collectionId.match(/app\.findCollectionByNameOrId\s*\(\s*["']([^"']+)["']\s*\)/);
   if (nameMatch) {
@@ -2478,6 +2478,39 @@ function resolveCollectionIdToName(collectionId) {
   }
   return collectionId;
 }
+function extractFieldOptions2(pbField) {
+  const options = {};
+  if (pbField.options && typeof pbField.options === "object") {
+    Object.assign(options, pbField.options);
+  }
+  const directOptionKeys = [
+    "min",
+    "max",
+    "pattern",
+    "noDecimal",
+    // text/number fields
+    "values",
+    "maxSelect",
+    // select fields
+    "mimeTypes",
+    "maxSize",
+    "thumbs",
+    "protected",
+    // file fields
+    "onCreate",
+    "onUpdate",
+    // autodate fields
+    "exceptDomains",
+    "onlyDomains"
+    // email/url fields
+  ];
+  for (const key of directOptionKeys) {
+    if (pbField[key] !== void 0) {
+      options[key] = pbField[key];
+    }
+  }
+  return options;
+}
 function convertPocketBaseCollection(pbCollection) {
   const fields = [];
   const systemFieldNames = ["id", "created", "updated", "collectionId", "collectionName", "expand"];
@@ -2495,23 +2528,19 @@ function convertPocketBaseCollection(pbCollection) {
         type: pbField.type,
         required: pbField.required || false
       };
-      field.options = pbField.options ? { ...pbField.options } : {};
-      if (pbField.type === "select") {
-        if (pbField.values && Array.isArray(pbField.values)) {
-          field.options.values = pbField.values;
-        } else if (pbField.options?.values && Array.isArray(pbField.options.values)) {
-          field.options.values = pbField.options.values;
-        }
-      }
+      field.options = extractFieldOptions2(pbField);
       if (pbField.type === "relation") {
         const collectionId = pbField.collectionId || pbField.options?.collectionId || "";
-        const collectionName = resolveCollectionIdToName(collectionId);
+        const collectionName = resolveCollectionIdToName(collectionId || "");
         field.relation = {
           collection: collectionName,
           cascadeDelete: pbField.cascadeDelete ?? pbField.options?.cascadeDelete ?? false,
           maxSelect: pbField.maxSelect ?? pbField.options?.maxSelect,
           minSelect: pbField.minSelect ?? pbField.options?.minSelect
         };
+        delete field.options.maxSelect;
+        delete field.options.minSelect;
+        delete field.options.cascadeDelete;
       }
       const hasOnlyValues = Object.keys(field.options).length === 1 && field.options.values !== void 0;
       if (Object.keys(field.options).length === 0) {
@@ -2525,17 +2554,21 @@ function convertPocketBaseCollection(pbCollection) {
     type: pbCollection.type || "base",
     fields
   };
+  if (pbCollection.id) {
+    schema.id = pbCollection.id;
+  }
   if (pbCollection.indexes && Array.isArray(pbCollection.indexes)) {
     schema.indexes = pbCollection.indexes;
   }
-  const rules = {};
-  if (pbCollection.listRule !== void 0) rules.listRule = pbCollection.listRule;
-  if (pbCollection.viewRule !== void 0) rules.viewRule = pbCollection.viewRule;
-  if (pbCollection.createRule !== void 0) rules.createRule = pbCollection.createRule;
-  if (pbCollection.updateRule !== void 0) rules.updateRule = pbCollection.updateRule;
-  if (pbCollection.deleteRule !== void 0) rules.deleteRule = pbCollection.deleteRule;
-  if (pbCollection.manageRule !== void 0) rules.manageRule = pbCollection.manageRule;
-  if (Object.keys(rules).length > 0) {
+  const hasAnyRule = pbCollection.listRule !== void 0 || pbCollection.viewRule !== void 0 || pbCollection.createRule !== void 0 || pbCollection.updateRule !== void 0 || pbCollection.deleteRule !== void 0 || pbCollection.manageRule !== void 0;
+  if (hasAnyRule) {
+    const rules = {};
+    if (pbCollection.listRule !== void 0) rules.listRule = pbCollection.listRule;
+    if (pbCollection.viewRule !== void 0) rules.viewRule = pbCollection.viewRule;
+    if (pbCollection.createRule !== void 0) rules.createRule = pbCollection.createRule;
+    if (pbCollection.updateRule !== void 0) rules.updateRule = pbCollection.updateRule;
+    if (pbCollection.deleteRule !== void 0) rules.deleteRule = pbCollection.deleteRule;
+    if (pbCollection.manageRule !== void 0) rules.manageRule = pbCollection.manageRule;
     schema.rules = rules;
     schema.permissions = { ...rules };
   }
@@ -3285,17 +3318,19 @@ var CollectionIdRegistry = class {
   }
   /**
    * Generates a unique collection ID for a given collection name
-   * Special case: Returns constant "_pb_users_auth_" for users collection
    * Retries up to 10 times if collision occurs (extremely rare)
+   * Special case: returns "_pb_users_auth_" for users collection
    *
-   * @param collectionName - The name of the collection
+   * @param collectionName - The name of the collection (optional)
    * @returns A unique collection ID
    * @throws Error if unable to generate unique ID after max attempts
    */
   generate(collectionName) {
     if (collectionName && collectionName.toLowerCase() === "users") {
       const usersId = "_pb_users_auth_";
-      this.register(usersId);
+      if (!this.has(usersId)) {
+        this.register(usersId);
+      }
       return usersId;
     }
     const maxAttempts = 10;
@@ -3479,18 +3514,49 @@ function compareFieldConstraints(currentField, previousField) {
   }
   return changes;
 }
+function normalizeOptionValue(key, value, fieldType) {
+  if (key === "maxSelect" && value === 1 && (fieldType === "select" || fieldType === "file")) {
+    return void 0;
+  }
+  if (key === "maxSize" && value === 0 && fieldType === "file") {
+    return void 0;
+  }
+  if (fieldType === "file") {
+    if (key === "mimeTypes" && Array.isArray(value) && value.length === 0) {
+      return void 0;
+    }
+    if (key === "thumbs" && Array.isArray(value) && value.length === 0) {
+      return void 0;
+    }
+    if (key === "protected" && value === false) {
+      return void 0;
+    }
+  }
+  if (fieldType === "autodate") {
+    if (key === "onCreate" && value === true) {
+      return void 0;
+    }
+    if (key === "onUpdate" && value === false) {
+      return void 0;
+    }
+  }
+  return value;
+}
 function compareFieldOptions(currentField, previousField) {
   const changes = [];
   const currentOptions = currentField.options || {};
   const previousOptions = previousField.options || {};
   const allKeys = /* @__PURE__ */ new Set([...Object.keys(currentOptions), ...Object.keys(previousOptions)]);
+  const fieldType = currentField.type;
   for (const key of allKeys) {
     const currentValue = currentOptions[key];
     const previousValue = previousOptions[key];
-    if (currentValue === void 0 && previousValue === void 0) {
+    const normalizedCurrent = normalizeOptionValue(key, currentValue, fieldType);
+    const normalizedPrevious = normalizeOptionValue(key, previousValue, fieldType);
+    if (normalizedCurrent === void 0 && normalizedPrevious === void 0) {
       continue;
     }
-    if (!areValuesEqual(currentValue, previousValue)) {
+    if (!areValuesEqual(normalizedCurrent, normalizedPrevious)) {
       changes.push({
         property: `options.${key}`,
         oldValue: previousValue,
@@ -3500,7 +3566,7 @@ function compareFieldOptions(currentField, previousField) {
   }
   return changes;
 }
-function compareRelationConfigurations(currentField, previousField) {
+function compareRelationConfigurations(currentField, previousField, collectionIdToName) {
   const changes = [];
   const currentRelation = currentField.relation;
   const previousRelation = previousField.relation;
@@ -3512,8 +3578,8 @@ function compareRelationConfigurations(currentField, previousField) {
   }
   const normalizeCollection = (collection) => {
     if (!collection) return collection;
-    if (collection === "_pb_users_auth_") {
-      return "Users";
+    if (collectionIdToName && collectionIdToName.has(collection)) {
+      return collectionIdToName.get(collection);
     }
     const nameMatch = collection.match(/app\.findCollectionByNameOrId\s*\(\s*["']([^"']+)["']\s*\)/);
     if (nameMatch) {
@@ -3523,13 +3589,11 @@ function compareRelationConfigurations(currentField, previousField) {
   };
   const normalizedCurrent = normalizeCollection(currentRelation.collection);
   const normalizedPrevious = normalizeCollection(previousRelation.collection);
-  if (normalizedCurrent !== normalizedPrevious) {
+  if (normalizedCurrent.toLowerCase() !== normalizedPrevious.toLowerCase()) {
     changes.push({
       property: "relation.collection",
-      oldValue: normalizedPrevious,
-      // Use normalized value for clarity
-      newValue: normalizedCurrent
-      // Use normalized value for clarity
+      oldValue: previousRelation.collection,
+      newValue: currentRelation.collection
     });
   }
   if (currentRelation.cascadeDelete !== previousRelation.cascadeDelete) {
@@ -3539,14 +3603,20 @@ function compareRelationConfigurations(currentField, previousField) {
       newValue: currentRelation.cascadeDelete
     });
   }
-  if (currentRelation.maxSelect !== previousRelation.maxSelect) {
+  const normalizeMax = (val) => val === 1 ? null : val;
+  const currentMax = normalizeMax(currentRelation.maxSelect);
+  const previousMax = normalizeMax(previousRelation.maxSelect);
+  if (currentMax != previousMax) {
     changes.push({
       property: "relation.maxSelect",
       oldValue: previousRelation.maxSelect,
       newValue: currentRelation.maxSelect
     });
   }
-  if (currentRelation.minSelect !== previousRelation.minSelect) {
+  const normalizeMin = (val) => val === 0 ? null : val;
+  const currentMin = normalizeMin(currentRelation.minSelect);
+  const previousMin = normalizeMin(previousRelation.minSelect);
+  if (currentMin != previousMin) {
     changes.push({
       property: "relation.minSelect",
       oldValue: previousRelation.minSelect,
@@ -3555,7 +3625,7 @@ function compareRelationConfigurations(currentField, previousField) {
   }
   return changes;
 }
-function detectFieldChanges(currentField, previousField) {
+function detectFieldChanges(currentField, previousField, collectionIdToName) {
   const changes = [];
   const typeChange = compareFieldTypes(currentField, previousField);
   if (typeChange) {
@@ -3564,7 +3634,7 @@ function detectFieldChanges(currentField, previousField) {
   changes.push(...compareFieldConstraints(currentField, previousField));
   changes.push(...compareFieldOptions(currentField, previousField));
   if (currentField.type === "relation" && previousField.type === "relation") {
-    changes.push(...compareRelationConfigurations(currentField, previousField));
+    changes.push(...compareRelationConfigurations(currentField, previousField, collectionIdToName));
   }
   return changes;
 }
@@ -3575,7 +3645,7 @@ function compareIndexes(currentIndexes = [], previousIndexes = []) {
   const indexesToRemove = previousIndexes.filter((idx) => !currentSet.has(idx));
   return { indexesToAdd, indexesToRemove };
 }
-function compareRules(currentRules, previousRules) {
+function compareRules(currentRules, previousRules, currentPermissions, previousPermissions) {
   const updates = [];
   const ruleTypes = [
     "listRule",
@@ -3586,8 +3656,8 @@ function compareRules(currentRules, previousRules) {
     "manageRule"
   ];
   for (const ruleType of ruleTypes) {
-    const currentValue = currentRules?.[ruleType] ?? null;
-    const previousValue = previousRules?.[ruleType] ?? null;
+    const currentValue = currentRules?.[ruleType] ?? currentPermissions?.[ruleType] ?? null;
+    const previousValue = previousRules?.[ruleType] ?? previousPermissions?.[ruleType] ?? null;
     if (currentValue !== previousValue) {
       updates.push({
         ruleType,
@@ -3614,7 +3684,7 @@ function comparePermissions(currentPermissions, previousPermissions) {
   }
   return changes;
 }
-function compareCollectionFields(currentCollection, previousCollection, config) {
+function compareCollectionFields(currentCollection, previousCollection, config, collectionIdToName) {
   let fieldsToAdd = findNewFields(currentCollection.fields, previousCollection.fields);
   const fieldsToRemove = findRemovedFields(currentCollection.fields, previousCollection.fields);
   const fieldsToModify = [];
@@ -3624,7 +3694,7 @@ function compareCollectionFields(currentCollection, previousCollection, config)
   }
   const matchedFields = matchFieldsByName(currentCollection.fields, previousCollection.fields);
   for (const [currentField, previousField] of matchedFields) {
-    const changes = detectFieldChanges(currentField, previousField);
+    const changes = detectFieldChanges(currentField, previousField, collectionIdToName);
     if (changes.length > 0) {
       fieldsToModify.push({
         fieldName: currentField.name,
@@ -3636,14 +3706,20 @@ function compareCollectionFields(currentCollection, previousCollection, config)
   }
   return { fieldsToAdd, fieldsToRemove, fieldsToModify };
 }
-function buildCollectionModification(currentCollection, previousCollection, config) {
+function buildCollectionModification(currentCollection, previousCollection, config, collectionIdToName) {
   const { fieldsToAdd, fieldsToRemove, fieldsToModify } = compareCollectionFields(
     currentCollection,
     previousCollection,
-    config
+    config,
+    collectionIdToName
   );
   const { indexesToAdd, indexesToRemove } = compareIndexes(currentCollection.indexes, previousCollection.indexes);
-  const rulesToUpdate = compareRules(currentCollection.rules, previousCollection.rules);
+  const rulesToUpdate = compareRules(
+    currentCollection.rules,
+    previousCollection.rules,
+    currentCollection.permissions,
+    previousCollection.permissions
+  );
   const permissionsToUpdate = comparePermissions(currentCollection.permissions, previousCollection.permissions);
   return {
     collection: currentCollection.name,
@@ -3660,6 +3736,14 @@ 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;
 }
 function aggregateChanges(currentSchema, previousSnapshot, config) {
+  const collectionIdToName = /* @__PURE__ */ new Map();
+  if (previousSnapshot) {
+    for (const [name, collection] of previousSnapshot.collections) {
+      if (collection.id) {
+        collectionIdToName.set(collection.id, name);
+      }
+    }
+  }
   const collectionsToCreate = findNewCollections(currentSchema, previousSnapshot);
   const collectionsToDelete = findRemovedCollections(currentSchema, previousSnapshot);
   const filteredCollectionsToCreate = collectionsToCreate.filter(
@@ -3683,7 +3767,7 @@ function aggregateChanges(currentSchema, previousSnapshot, config) {
   const collectionsToModify = [];
   const matchedCollections = matchCollectionsByName(currentSchema, previousSnapshot);
   for (const [currentCollection, previousCollection] of matchedCollections) {
-    const modification = buildCollectionModification(currentCollection, previousCollection, config);
+    const modification = buildCollectionModification(currentCollection, previousCollection, config, collectionIdToName);
     if (hasChanges(modification)) {
       collectionsToModify.push(modification);
     }
@@ -4253,6 +4337,9 @@ function getSystemFields() {
 function generateCollectionCreation(collection, varName = "collection", isLast = false, collectionIdMap) {
   const lines = [];
   lines.push(`  const ${varName} = new Collection({`);
+  if (collection.id) {
+    lines.push(`    id: ${formatValue(collection.id)},`);
+  }
   lines.push(`    name: "${collection.name}",`);
   lines.push(`    type: "${collection.type}",`);
   const permissionsCode = generateCollectionPermissions(collection.permissions);
@@ -4496,7 +4583,24 @@ function generateOperationUpMigration(operation, collectionIdMap) {
     const varName = `collection_${collectionName}`;
     lines.push(generateCollectionDeletion(collectionName, varName, true));
   }
-  return lines.join("\n");
+  let code = lines.join("\n");
+  const savePattern = /^(\s*)app\.save\((\w+)\);$/gm;
+  const deletePattern = /^(\s*)app\.delete\((\w+)\);$/gm;
+  const saveMatches = [...code.matchAll(savePattern)];
+  const deleteMatches = [...code.matchAll(deletePattern)];
+  const allMatches = [
+    ...saveMatches.map((m) => ({ match: m, type: "save", index: m.index })),
+    ...deleteMatches.map((m) => ({ match: m, type: "delete", index: m.index }))
+  ].sort((a, b) => b.index - a.index);
+  if (allMatches.length > 0) {
+    const lastMatch = allMatches[0];
+    if (lastMatch.type === "save") {
+      code = code.substring(0, lastMatch.match.index) + lastMatch.match[1] + "return app.save(" + lastMatch.match[2] + ");" + code.substring(lastMatch.match.index + lastMatch.match[0].length);
+    } else {
+      code = code.substring(0, lastMatch.match.index) + lastMatch.match[1] + "return app.delete(" + lastMatch.match[2] + ");" + code.substring(lastMatch.match.index + lastMatch.match[0].length);
+    }
+  }
+  return code;
 }
 function generateOperationDownMigration(operation, collectionIdMap) {
   const lines = [];
@@ -4581,7 +4685,24 @@ function generateOperationDownMigration(operation, collectionIdMap) {
       lines.push(generateCollectionCreation(collection, varName, true, collectionIdMap));
     }
   }
-  return lines.join("\n");
+  let code = lines.join("\n");
+  const savePattern = /^(\s*)app\.save\((\w+)\);$/gm;
+  const deletePattern = /^(\s*)app\.delete\((\w+)\);$/gm;
+  const saveMatches = [...code.matchAll(savePattern)];
+  const deleteMatches = [...code.matchAll(deletePattern)];
+  const allMatches = [
+    ...saveMatches.map((m) => ({ match: m, type: "save", index: m.index })),
+    ...deleteMatches.map((m) => ({ match: m, type: "delete", index: m.index }))
+  ].sort((a, b) => b.index - a.index);
+  if (allMatches.length > 0) {
+    const lastMatch = allMatches[0];
+    if (lastMatch.type === "save") {
+      code = code.substring(0, lastMatch.match.index) + lastMatch.match[1] + "return app.save(" + lastMatch.match[2] + ");" + code.substring(lastMatch.match.index + lastMatch.match[0].length);
+    } else {
+      code = code.substring(0, lastMatch.match.index) + lastMatch.match[1] + "return app.delete(" + lastMatch.match[2] + ");" + code.substring(lastMatch.match.index + lastMatch.match[0].length);
+    }
+  }
+  return code;
 }
 function generateUpMigration(diff) {
   const lines = [];