pocketbase-zod-schema 0.2.5 → 0.3.1

package/dist/migration/index.cjs

@@ -3,6 +3,7 @@
 var fs3 = require('fs');
 var path = require('path');
 var zod = require('zod');
+var crypto = require('crypto');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -1581,12 +1582,22 @@ function isAuthCollection(fields) {
 function buildFieldDefinition(fieldName, zodType) {
   const fieldMetadata = extractFieldMetadata(zodType.description);
   if (fieldMetadata) {
-    const required2 = isFieldRequired(zodType);
+    let required2;
+    if (fieldMetadata.type === "number") {
+      if (fieldMetadata.options?.required !== void 0) {
+        required2 = fieldMetadata.options.required;
+      } else {
+        required2 = false;
+      }
+    } else {
+      required2 = isFieldRequired(zodType);
+    }
+    const { required: _required, ...options2 } = fieldMetadata.options || {};
     const fieldDef2 = {
       name: fieldName,
       type: fieldMetadata.type,
       required: required2,
-      options: fieldMetadata.options
+      options: Object.keys(options2).length > 0 ? options2 : void 0
     };
     if (fieldMetadata.type === "relation") {
       const relationMetadata2 = extractRelationMetadata(zodType.description);
@@ -1785,7 +1796,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) {
@@ -1793,6 +1804,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"];
@@ -1810,23 +1854,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) {
@@ -1840,17 +1880,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 };
   }
@@ -2582,6 +2626,67 @@ var SnapshotManager = class {
     return validateSnapshot(snapshot);
   }
 };
+function generateCollectionId() {
+  const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+  const idLength = 15;
+  const bytes = crypto.randomBytes(idLength);
+  let id = "pb_";
+  for (let i = 0; i < idLength; i++) {
+    const index = bytes[i] % chars.length;
+    id += chars[index];
+  }
+  return id;
+}
+var CollectionIdRegistry = class {
+  ids;
+  constructor() {
+    this.ids = /* @__PURE__ */ new Set();
+  }
+  /**
+   * Generates a unique collection ID for a given collection name
+   * 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 (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_";
+      if (!this.has(usersId)) {
+        this.register(usersId);
+      }
+      return usersId;
+    }
+    const maxAttempts = 10;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+      const id = generateCollectionId();
+      if (!this.has(id)) {
+        this.register(id);
+        return id;
+      }
+    }
+    throw new Error("Failed to generate unique collection ID after maximum attempts");
+  }
+  /**
+   * Checks if an ID has already been registered
+   *
+   * @param id - The collection ID to check
+   * @returns True if the ID exists in the registry
+   */
+  has(id) {
+    return this.ids.has(id);
+  }
+  /**
+   * Registers a collection ID in the registry
+   *
+   * @param id - The collection ID to register
+   */
+  register(id) {
+    this.ids.add(id);
+  }
+};
 
 // src/migration/diff.ts
 var DEFAULT_CONFIG3 = {
@@ -2735,18 +2840,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,
@@ -2756,7 +2892,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;
@@ -2768,8 +2904,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) {
@@ -2779,13 +2915,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) {
@@ -2795,14 +2929,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,
@@ -2811,7 +2951,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) {
@@ -2820,7 +2960,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;
 }
@@ -2831,7 +2971,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",
@@ -2842,8 +2982,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,
@@ -2870,7 +3010,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 = [];
@@ -2880,7 +3020,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,
@@ -2892,14 +3032,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,
@@ -2916,6 +3062,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(
@@ -2924,16 +3078,28 @@ function aggregateChanges(currentSchema, previousSnapshot, config) {
   const filteredCollectionsToDelete = collectionsToDelete.filter(
     (collection) => !isSystemCollection(collection.name, config)
   );
+  const registry = new CollectionIdRegistry();
+  const collectionsWithIds = filteredCollectionsToCreate.map((collection) => {
+    if (collection.id) {
+      registry.register(collection.id);
+      return collection;
+    }
+    const id = registry.generate(collection.name);
+    return {
+      ...collection,
+      id
+    };
+  });
   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);
     }
   }
   return {
-    collectionsToCreate: filteredCollectionsToCreate,
+    collectionsToCreate: collectionsWithIds,
     collectionsToDelete: filteredCollectionsToDelete,
     collectionsToModify
   };
@@ -3169,6 +3335,49 @@ function generateTimestamp(config) {
   }
   return Math.floor(Date.now() / 1e3).toString();
 }
+function splitDiffByCollection(diff, baseTimestamp) {
+  const operations = [];
+  let currentTimestamp = parseInt(baseTimestamp, 10);
+  for (const collection of diff.collectionsToCreate) {
+    operations.push({
+      type: "create",
+      collection,
+      timestamp: currentTimestamp.toString()
+    });
+    currentTimestamp += 1;
+  }
+  for (const modification of diff.collectionsToModify) {
+    operations.push({
+      type: "modify",
+      collection: modification.collection,
+      modifications: modification,
+      timestamp: currentTimestamp.toString()
+    });
+    currentTimestamp += 1;
+  }
+  for (const collection of diff.collectionsToDelete) {
+    operations.push({
+      type: "delete",
+      collection: collection.name || collection,
+      // Handle both object and string
+      timestamp: currentTimestamp.toString()
+    });
+    currentTimestamp += 1;
+  }
+  return operations;
+}
+function generateCollectionMigrationFilename(operation) {
+  const timestamp = operation.timestamp;
+  const operationType = operation.type === "modify" ? "updated" : operation.type === "create" ? "created" : "deleted";
+  let collectionName;
+  if (typeof operation.collection === "string") {
+    collectionName = operation.collection;
+  } else {
+    collectionName = operation.collection.name;
+  }
+  const sanitizedName = collectionName.replace(/[^a-zA-Z0-9_]/g, "_").toLowerCase();
+  return `${timestamp}_${operationType}_${sanitizedName}.js`;
+}
 function generateMigrationDescription(diff) {
   const parts = [];
   if (diff.collectionsToCreate.length > 0) {
@@ -3276,14 +3485,13 @@ function formatValue(value) {
     return "null";
   }
   if (typeof value === "string") {
-    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n")}"`;
+    return JSON.stringify(value);
   }
   if (typeof value === "number" || typeof value === "boolean") {
     return String(value);
   }
   if (Array.isArray(value)) {
-    const items = value.map((v) => formatValue(v)).join(", ");
-    return `[${items}]`;
+    return JSON.stringify(value).replace(/","/g, '", "');
   }
   if (typeof value === "object") {
     const entries = Object.entries(value).map(([k, v]) => `${k}: ${formatValue(v)}`).join(", ");
@@ -3291,7 +3499,7 @@ function formatValue(value) {
   }
   return String(value);
 }
-function generateFieldDefinitionObject(field) {
+function generateFieldDefinitionObject(field, collectionIdMap) {
   const parts = [];
   parts.push(`      name: "${field.name}"`);
   parts.push(`      type: "${field.type}"`);
@@ -3299,34 +3507,47 @@ function generateFieldDefinitionObject(field) {
   if (field.unique !== void 0) {
     parts.push(`      unique: ${field.unique}`);
   }
+  if (field.type === "select") {
+    const maxSelect = field.options?.maxSelect ?? 1;
+    parts.push(`      maxSelect: ${maxSelect}`);
+    const values = field.options?.values ?? [];
+    parts.push(`      values: ${formatValue(values)}`);
+  }
   if (field.options && Object.keys(field.options).length > 0) {
     for (const [key, value] of Object.entries(field.options)) {
+      if (field.type === "select" && (key === "maxSelect" || key === "values")) {
+        continue;
+      }
       parts.push(`      ${key}: ${formatValue(value)}`);
     }
   }
   if (field.relation) {
     const isUsersCollection = field.relation.collection.toLowerCase() === "users";
-    const collectionIdPlaceholder = isUsersCollection ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${field.relation.collection}").id`;
-    parts.push(`      collectionId: ${collectionIdPlaceholder}`);
-    if (field.relation.maxSelect !== void 0) {
-      parts.push(`      maxSelect: ${field.relation.maxSelect}`);
-    }
-    if (field.relation.minSelect !== void 0) {
-      parts.push(`      minSelect: ${field.relation.minSelect}`);
-    }
-    if (field.relation.cascadeDelete !== void 0) {
-      parts.push(`      cascadeDelete: ${field.relation.cascadeDelete}`);
+    let collectionIdValue;
+    if (isUsersCollection) {
+      collectionIdValue = '"_pb_users_auth_"';
+    } else if (collectionIdMap && collectionIdMap.has(field.relation.collection)) {
+      collectionIdValue = `"${collectionIdMap.get(field.relation.collection)}"`;
+    } else {
+      collectionIdValue = `app.findCollectionByNameOrId("${field.relation.collection}").id`;
     }
+    parts.push(`      collectionId: ${collectionIdValue}`);
+    const maxSelect = field.relation.maxSelect ?? 1;
+    parts.push(`      maxSelect: ${maxSelect}`);
+    const minSelect = field.relation.minSelect ?? null;
+    parts.push(`      minSelect: ${minSelect}`);
+    const cascadeDelete = field.relation.cascadeDelete ?? false;
+    parts.push(`      cascadeDelete: ${cascadeDelete}`);
   }
   return `    {
 ${parts.join(",\n")},
     }`;
 }
-function generateFieldsArray(fields) {
+function generateFieldsArray(fields, collectionIdMap) {
   if (fields.length === 0) {
     return "[]";
   }
-  const fieldObjects = fields.map((field) => generateFieldDefinitionObject(field));
+  const fieldObjects = fields.map((field) => generateFieldDefinitionObject(field, collectionIdMap));
   return `[
 ${fieldObjects.join(",\n")},
   ]`;
@@ -3385,7 +3606,7 @@ function generateIndexesArray(indexes) {
   if (!indexes || indexes.length === 0) {
     return "[]";
   }
-  const indexStrings = indexes.map((idx) => `"${idx}"`);
+  const indexStrings = indexes.map((idx) => JSON.stringify(idx));
   return `[
     ${indexStrings.join(",\n    ")},
   ]`;
@@ -3439,9 +3660,12 @@ function getSystemFields() {
     }
   ];
 }
-function generateCollectionCreation(collection, varName = "collection", isLast = false) {
+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);
@@ -3453,7 +3677,7 @@ function generateCollectionCreation(collection, varName = "collection", isLast =
   }
   const systemFields = getSystemFields();
   const allFields = [...systemFields, ...collection.fields];
-  lines.push(`    fields: ${generateFieldsArray(allFields)},`);
+  lines.push(`    fields: ${generateFieldsArray(allFields, collectionIdMap)},`);
   lines.push(`    indexes: ${generateIndexesArray(collection.indexes)},`);
   lines.push(`  });`);
   lines.push(``);
@@ -3475,42 +3699,59 @@ function getFieldConstructorName(fieldType) {
   };
   return constructorMap[fieldType] || "TextField";
 }
-function generateFieldConstructorOptions(field) {
+function generateFieldConstructorOptions(field, collectionIdMap) {
   const parts = [];
   parts.push(`    name: "${field.name}"`);
   parts.push(`    required: ${field.required}`);
   if (field.unique !== void 0) {
     parts.push(`    unique: ${field.unique}`);
   }
+  if (field.type === "select") {
+    const maxSelect = field.options?.maxSelect ?? 1;
+    parts.push(`    maxSelect: ${maxSelect}`);
+    const values = field.options?.values ?? [];
+    parts.push(`    values: ${formatValue(values)}`);
+  }
   if (field.options && Object.keys(field.options).length > 0) {
     for (const [key, value] of Object.entries(field.options)) {
-      parts.push(`    ${key}: ${formatValue(value)}`);
+      if (field.type === "select" && (key === "maxSelect" || key === "values")) {
+        continue;
+      }
+      if (field.type === "number" && key === "noDecimal") {
+        parts.push(`    onlyInt: ${formatValue(value)}`);
+      } else {
+        parts.push(`    ${key}: ${formatValue(value)}`);
+      }
     }
   }
   if (field.relation && field.type === "relation") {
     const isUsersCollection = field.relation.collection.toLowerCase() === "users";
-    const collectionIdPlaceholder = isUsersCollection ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${field.relation.collection}").id`;
-    parts.push(`    collectionId: ${collectionIdPlaceholder}`);
-    if (field.relation.maxSelect !== void 0) {
-      parts.push(`    maxSelect: ${field.relation.maxSelect}`);
-    }
-    if (field.relation.minSelect !== void 0) {
-      parts.push(`    minSelect: ${field.relation.minSelect}`);
-    }
-    if (field.relation.cascadeDelete !== void 0) {
-      parts.push(`    cascadeDelete: ${field.relation.cascadeDelete}`);
+    let collectionIdValue;
+    if (isUsersCollection) {
+      collectionIdValue = '"_pb_users_auth_"';
+    } else if (collectionIdMap && collectionIdMap.has(field.relation.collection)) {
+      collectionIdValue = `"${collectionIdMap.get(field.relation.collection)}"`;
+    } else {
+      collectionIdValue = `app.findCollectionByNameOrId("${field.relation.collection}").id`;
     }
+    parts.push(`    collectionId: ${collectionIdValue}`);
+    const maxSelect = field.relation.maxSelect ?? 1;
+    parts.push(`    maxSelect: ${maxSelect}`);
+    const minSelect = field.relation.minSelect ?? null;
+    parts.push(`    minSelect: ${minSelect}`);
+    const cascadeDelete = field.relation.cascadeDelete ?? false;
+    parts.push(`    cascadeDelete: ${cascadeDelete}`);
   }
   return parts.join(",\n");
 }
-function generateFieldAddition(collectionName, field, varName, isLast = false) {
+function generateFieldAddition(collectionName, field, varName, isLast = false, collectionIdMap) {
   const lines = [];
   const constructorName = getFieldConstructorName(field.type);
   const collectionVar = varName || `collection_${collectionName}_${field.name}`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
   lines.push(``);
   lines.push(`  ${collectionVar}.fields.add(new ${constructorName}({`);
-  lines.push(generateFieldConstructorOptions(field));
+  lines.push(generateFieldConstructorOptions(field, collectionIdMap));
   lines.push(`  }));`);
   lines.push(``);
   lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
@@ -3560,7 +3801,7 @@ function generateIndexAddition(collectionName, index, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_idx`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
-  lines.push(`  ${collectionVar}.indexes.push("${index}");`);
+  lines.push(`  ${collectionVar}.indexes.push(${JSON.stringify(index)});`);
   lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
@@ -3569,7 +3810,7 @@ function generateIndexRemoval(collectionName, index, varName, isLast = false) {
   const collectionVar = varName || `collection_${collectionName}_idx`;
   const indexVar = `${collectionVar}_indexToRemove`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
-  lines.push(`  const ${indexVar} = ${collectionVar}.indexes.findIndex(idx => idx === "${index}");`);
+  lines.push(`  const ${indexVar} = ${collectionVar}.indexes.findIndex(idx => idx === ${JSON.stringify(index)});`);
   lines.push(`  if (${indexVar} !== -1) {`);
   lines.push(`    ${collectionVar}.indexes.splice(${indexVar}, 1);`);
   lines.push(`  }`);
@@ -3598,16 +3839,213 @@ function generateCollectionDeletion(collectionName, varName = "collection", isLa
   lines.push(isLast ? `  return app.delete(${varName});` : `  app.delete(${varName});`);
   return lines.join("\n");
 }
+function generateOperationUpMigration(operation, collectionIdMap) {
+  const lines = [];
+  if (operation.type === "create") {
+    const collection = operation.collection;
+    const varName = `collection_${collection.name}`;
+    lines.push(generateCollectionCreation(collection, varName, true, collectionIdMap));
+  } else if (operation.type === "modify") {
+    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;
+    for (const field of modification.fieldsToAdd) {
+      operationCount++;
+      const varName = `collection_${collectionName}_add_${field.name}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateFieldAddition(collectionName, field, varName, isLast, collectionIdMap));
+      if (!isLast) lines.push("");
+    }
+    for (const fieldMod of modification.fieldsToModify) {
+      operationCount++;
+      const varName = `collection_${collectionName}_modify_${fieldMod.fieldName}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateFieldModification(collectionName, fieldMod, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    for (const field of modification.fieldsToRemove) {
+      operationCount++;
+      const varName = `collection_${collectionName}_remove_${field.name}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateFieldDeletion(collectionName, field.name, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    for (let i = 0; i < modification.indexesToAdd.length; i++) {
+      operationCount++;
+      const index = modification.indexesToAdd[i];
+      const varName = `collection_${collectionName}_addidx_${i}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateIndexAddition(collectionName, index, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    for (let i = 0; i < modification.indexesToRemove.length; i++) {
+      operationCount++;
+      const index = modification.indexesToRemove[i];
+      const varName = `collection_${collectionName}_rmidx_${i}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateIndexRemoval(collectionName, index, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
+      for (const permission of modification.permissionsToUpdate) {
+        operationCount++;
+        const varName = `collection_${collectionName}_perm_${permission.ruleType}`;
+        const isLast = operationCount === totalOperations;
+        lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.newValue, varName, isLast));
+        if (!isLast) lines.push("");
+      }
+    } else if (modification.rulesToUpdate.length > 0) {
+      for (const rule of modification.rulesToUpdate) {
+        operationCount++;
+        const varName = `collection_${collectionName}_rule_${rule.ruleType}`;
+        const isLast = operationCount === totalOperations;
+        lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.newValue, varName, isLast));
+        if (!isLast) lines.push("");
+      }
+    }
+  } else if (operation.type === "delete") {
+    const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection.name;
+    const varName = `collection_${collectionName}`;
+    lines.push(generateCollectionDeletion(collectionName, varName, true));
+  }
+  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 = [];
+  if (operation.type === "create") {
+    const collection = operation.collection;
+    const varName = `collection_${collection.name}`;
+    lines.push(generateCollectionDeletion(collection.name, varName, true));
+  } else if (operation.type === "modify") {
+    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;
+    if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
+      for (const permission of modification.permissionsToUpdate) {
+        operationCount++;
+        const varName = `collection_${collectionName}_revert_perm_${permission.ruleType}`;
+        const isLast = operationCount === totalOperations;
+        lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.oldValue, varName, isLast));
+        if (!isLast) lines.push("");
+      }
+    } else if (modification.rulesToUpdate.length > 0) {
+      for (const rule of modification.rulesToUpdate) {
+        operationCount++;
+        const varName = `collection_${collectionName}_revert_rule_${rule.ruleType}`;
+        const isLast = operationCount === totalOperations;
+        lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.oldValue, varName, isLast));
+        if (!isLast) lines.push("");
+      }
+    }
+    for (let i = 0; i < modification.indexesToRemove.length; i++) {
+      operationCount++;
+      const index = modification.indexesToRemove[i];
+      const varName = `collection_${collectionName}_restore_idx_${i}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateIndexAddition(collectionName, index, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    for (let i = 0; i < modification.indexesToAdd.length; i++) {
+      operationCount++;
+      const index = modification.indexesToAdd[i];
+      const varName = `collection_${collectionName}_revert_idx_${i}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateIndexRemoval(collectionName, index, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    for (const field of modification.fieldsToRemove) {
+      operationCount++;
+      const varName = `collection_${collectionName}_restore_${field.name}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateFieldAddition(collectionName, field, varName, isLast, collectionIdMap));
+      if (!isLast) lines.push("");
+    }
+    for (const fieldMod of modification.fieldsToModify) {
+      operationCount++;
+      const reverseChanges = fieldMod.changes.map((change) => ({
+        property: change.property,
+        oldValue: change.newValue,
+        newValue: change.oldValue
+      }));
+      const reverseMod = {
+        fieldName: fieldMod.fieldName,
+        currentDefinition: fieldMod.newDefinition,
+        newDefinition: fieldMod.currentDefinition,
+        changes: reverseChanges
+      };
+      const varName = `collection_${collectionName}_revert_${fieldMod.fieldName}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateFieldModification(collectionName, reverseMod, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+    for (const field of modification.fieldsToAdd) {
+      operationCount++;
+      const varName = `collection_${collectionName}_revert_add_${field.name}`;
+      const isLast = operationCount === totalOperations;
+      lines.push(generateFieldDeletion(collectionName, field.name, varName, isLast));
+      if (!isLast) lines.push("");
+    }
+  } else if (operation.type === "delete") {
+    const collection = operation.collection;
+    if (typeof collection !== "string") {
+      const varName = `collection_${collection.name}`;
+      lines.push(generateCollectionCreation(collection, varName, true, collectionIdMap));
+    }
+  }
+  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 = [];
   lines.push(`  // UP MIGRATION`);
   lines.push(``);
+  const collectionIdMap = /* @__PURE__ */ new Map();
+  for (const collection of diff.collectionsToCreate) {
+    if (collection.id) {
+      collectionIdMap.set(collection.name, collection.id);
+    }
+  }
   if (diff.collectionsToCreate.length > 0) {
     lines.push(`  // Create new collections`);
     for (let i = 0; i < diff.collectionsToCreate.length; i++) {
       const collection = diff.collectionsToCreate[i];
       const varName = `collection_${collection.name}_create`;
-      lines.push(generateCollectionCreation(collection, varName));
+      lines.push(generateCollectionCreation(collection, varName, false, collectionIdMap));
       lines.push(``);
     }
   }
@@ -3619,7 +4057,7 @@ function generateUpMigration(diff) {
         lines.push(`  // Add fields to ${collectionName}`);
         for (const field of modification.fieldsToAdd) {
           const varName = `collection_${collectionName}_add_${field.name}`;
-          lines.push(generateFieldAddition(collectionName, field, varName));
+          lines.push(generateFieldAddition(collectionName, field, varName, false, collectionIdMap));
           lines.push(``);
         }
       }
@@ -3710,12 +4148,23 @@ function generateDownMigration(diff) {
   const lines = [];
   lines.push(`  // DOWN MIGRATION (ROLLBACK)`);
   lines.push(``);
+  const collectionIdMap = /* @__PURE__ */ new Map();
+  for (const collection of diff.collectionsToCreate) {
+    if (collection.id) {
+      collectionIdMap.set(collection.name, collection.id);
+    }
+  }
+  for (const collection of diff.collectionsToDelete) {
+    if (collection.id) {
+      collectionIdMap.set(collection.name, collection.id);
+    }
+  }
   if (diff.collectionsToDelete.length > 0) {
     lines.push(`  // Recreate deleted collections`);
     for (let i = 0; i < diff.collectionsToDelete.length; i++) {
       const collection = diff.collectionsToDelete[i];
       const varName = `collection_${collection.name}_recreate`;
-      lines.push(generateCollectionCreation(collection, varName));
+      lines.push(generateCollectionCreation(collection, varName, false, collectionIdMap));
       lines.push(``);
     }
   }
@@ -3760,7 +4209,7 @@ function generateDownMigration(diff) {
         lines.push(`  // Restore fields to ${collectionName}`);
         for (const field of modification.fieldsToRemove) {
           const varName = `collection_${collectionName}_restore_${field.name}`;
-          lines.push(generateFieldAddition(collectionName, field, varName));
+          lines.push(generateFieldAddition(collectionName, field, varName, false, collectionIdMap));
           lines.push(``);
         }
       }
@@ -3829,12 +4278,33 @@ function generate(diff, config) {
   const normalizedConfig = typeof config === "string" ? { migrationDir: config } : config;
   try {
     const migrationDir = resolveMigrationDir(normalizedConfig);
-    const upCode = generateUpMigration(diff);
-    const downCode = generateDownMigration(diff);
-    const content = createMigrationFileStructure(upCode, downCode, normalizedConfig);
-    const filename = generateMigrationFilename(diff, normalizedConfig);
-    const filePath = writeMigrationFile(migrationDir, filename, content);
-    return filePath;
+    const hasChanges2 = diff.collectionsToCreate.length > 0 || diff.collectionsToModify.length > 0 || diff.collectionsToDelete.length > 0;
+    if (!hasChanges2) {
+      return [];
+    }
+    const collectionIdMap = /* @__PURE__ */ new Map();
+    for (const collection of diff.collectionsToCreate) {
+      if (collection.id) {
+        collectionIdMap.set(collection.name, collection.id);
+      }
+    }
+    for (const collection of diff.collectionsToDelete) {
+      if (collection.id) {
+        collectionIdMap.set(collection.name, collection.id);
+      }
+    }
+    const baseTimestamp = generateTimestamp(normalizedConfig);
+    const operations = splitDiffByCollection(diff, baseTimestamp);
+    const filePaths = [];
+    for (const operation of operations) {
+      const upCode = generateOperationUpMigration(operation, collectionIdMap);
+      const downCode = generateOperationDownMigration(operation, collectionIdMap);
+      const content = createMigrationFileStructure(upCode, downCode, normalizedConfig);
+      const filename = generateCollectionMigrationFilename(operation);
+      const filePath = writeMigrationFile(migrationDir, filename, content);
+      filePaths.push(filePath);
+    }
+    return filePaths;
   } catch (error) {
     if (error instanceof MigrationGenerationError || error instanceof FileSystemError) {
       throw error;
@@ -3852,7 +4322,8 @@ var MigrationGenerator = class {
     this.config = mergeConfig4(config);
   }
   /**
-   * Generates a migration file from a schema diff
+   * Generates migration files from a schema diff
+   * Returns array of file paths (one per collection operation)
    */
   generate(diff) {
     return generate(diff, this.config);