pocketbase-zod-schema 0.2.5 → 0.3.0

package/dist/cli/migrate.cjs

@@ -7,6 +7,7 @@ var fs5 = require('fs');
 var path5 = require('path');
 var url = require('url');
 var zod = require('zod');
+var crypto = require('crypto');
 var ora = require('ora');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -1320,12 +1321,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);
@@ -1495,6 +1506,65 @@ async function buildSchemaDefinition(config) {
 async function parseSchemaFiles(config) {
   return buildSchemaDefinition(config);
 }
+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
+   * Special case: Returns constant "_pb_users_auth_" for users collection
+   * Retries up to 10 times if collision occurs (extremely rare)
+   *
+   * @param collectionName - The name of the collection
+   * @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);
+      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_CONFIG2 = {
@@ -1826,6 +1896,18 @@ 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) {
@@ -1835,7 +1917,7 @@ function aggregateChanges(currentSchema, previousSnapshot, config) {
     }
   }
   return {
-    collectionsToCreate: filteredCollectionsToCreate,
+    collectionsToCreate: collectionsWithIds,
     collectionsToDelete: filteredCollectionsToDelete,
     collectionsToModify
   };
@@ -1918,42 +2000,48 @@ function generateTimestamp(config) {
   }
   return Math.floor(Date.now() / 1e3).toString();
 }
-function generateMigrationDescription(diff) {
-  const parts = [];
-  if (diff.collectionsToCreate.length > 0) {
-    if (diff.collectionsToCreate.length === 1) {
-      parts.push(`created_${diff.collectionsToCreate[0].name}`);
-    } else {
-      parts.push(`created_${diff.collectionsToCreate.length}_collections`);
-    }
-  }
-  if (diff.collectionsToDelete.length > 0) {
-    if (diff.collectionsToDelete.length === 1) {
-      parts.push(`deleted_${diff.collectionsToDelete[0].name}`);
-    } else {
-      parts.push(`deleted_${diff.collectionsToDelete.length}_collections`);
-    }
-  }
-  if (diff.collectionsToModify.length > 0) {
-    if (diff.collectionsToModify.length === 1) {
-      parts.push(`updated_${diff.collectionsToModify[0].collection}`);
-    } else {
-      parts.push(`updated_${diff.collectionsToModify.length}_collections`);
-    }
+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;
   }
-  if (parts.length === 0) {
-    return "no_changes";
+  for (const modification of diff.collectionsToModify) {
+    operations.push({
+      type: "modify",
+      collection: modification.collection,
+      modifications: modification,
+      timestamp: currentTimestamp.toString()
+    });
+    currentTimestamp += 1;
   }
-  let description = parts.join("_");
-  if (description.length > 80) {
-    description = description.substring(0, 77) + "...";
+  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 description;
+  return operations;
 }
-function generateMigrationFilename(diff, config) {
-  const timestamp = generateTimestamp(config);
-  const description = generateMigrationDescription(diff);
-  return `${timestamp}_${description}.js`;
+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 createMigrationFileStructure(upCode, downCode, config) {
   const mergedConfig = config ? mergeConfig3(config) : DEFAULT_CONFIG3;
@@ -2025,14 +2113,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(", ");
@@ -2040,7 +2127,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}"`);
@@ -2048,34 +2135,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")},
   ]`;
@@ -2134,7 +2234,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    ")},
   ]`;
@@ -2188,7 +2288,7 @@ 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({`);
   lines.push(`    name: "${collection.name}",`);
@@ -2202,7 +2302,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(``);
@@ -2224,42 +2324,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});`);
@@ -2309,7 +2426,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");
 }
@@ -2318,7 +2435,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(`  }`);
@@ -2347,243 +2464,194 @@ function generateCollectionDeletion(collectionName, varName = "collection", isLa
   lines.push(isLast ? `  return app.delete(${varName});` : `  app.delete(${varName});`);
   return lines.join("\n");
 }
-function generateUpMigration(diff) {
+function generateOperationUpMigration(operation, collectionIdMap) {
   const lines = [];
-  lines.push(`  // UP MIGRATION`);
-  lines.push(``);
-  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(``);
-    }
-  }
-  if (diff.collectionsToModify.length > 0) {
-    lines.push(`  // Modify existing collections`);
-    for (const modification of diff.collectionsToModify) {
-      const collectionName = modification.collection;
-      if (modification.fieldsToAdd.length > 0) {
-        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(``);
-        }
-      }
-      if (modification.fieldsToModify.length > 0) {
-        lines.push(`  // Modify fields in ${collectionName}`);
-        for (const fieldMod of modification.fieldsToModify) {
-          const varName = `collection_${collectionName}_modify_${fieldMod.fieldName}`;
-          lines.push(generateFieldModification(collectionName, fieldMod, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.fieldsToRemove.length > 0) {
-        lines.push(`  // Remove fields from ${collectionName}`);
-        for (const field of modification.fieldsToRemove) {
-          const varName = `collection_${collectionName}_remove_${field.name}`;
-          lines.push(generateFieldDeletion(collectionName, field.name, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.indexesToAdd.length > 0) {
-        lines.push(`  // Add indexes to ${collectionName}`);
-        for (let i = 0; i < modification.indexesToAdd.length; i++) {
-          const index = modification.indexesToAdd[i];
-          const varName = `collection_${collectionName}_addidx_${i}`;
-          lines.push(generateIndexAddition(collectionName, index, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.indexesToRemove.length > 0) {
-        lines.push(`  // Remove indexes from ${collectionName}`);
-        for (let i = 0; i < modification.indexesToRemove.length; i++) {
-          const index = modification.indexesToRemove[i];
-          const varName = `collection_${collectionName}_rmidx_${i}`;
-          lines.push(generateIndexRemoval(collectionName, index, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
-        lines.push(`  // Update permissions for ${collectionName}`);
-        for (const permission of modification.permissionsToUpdate) {
-          const varName = `collection_${collectionName}_perm_${permission.ruleType}`;
-          lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.newValue, varName));
-          lines.push(``);
-        }
-      } else if (modification.rulesToUpdate.length > 0) {
-        lines.push(`  // Update rules for ${collectionName}`);
-        for (const rule of modification.rulesToUpdate) {
-          const varName = `collection_${collectionName}_rule_${rule.ruleType}`;
-          lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.newValue, varName));
-          lines.push(``);
-        }
-      }
+  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("");
     }
-  }
-  if (diff.collectionsToDelete.length > 0) {
-    lines.push(`  // Delete collections`);
-    for (let i = 0; i < diff.collectionsToDelete.length; i++) {
-      const collection = diff.collectionsToDelete[i];
-      const varName = `collection_${collection.name}_delete`;
-      lines.push(generateCollectionDeletion(collection.name, varName));
-      lines.push(``);
-    }
-  }
-  if (lines.length === 2) {
-    lines.push(`  // No changes detected`);
-    lines.push(``);
-  }
-  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);
+    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));
   }
-  return code;
+  return lines.join("\n");
 }
-function generateDownMigration(diff) {
+function generateOperationDownMigration(operation, collectionIdMap) {
   const lines = [];
-  lines.push(`  // DOWN MIGRATION (ROLLBACK)`);
-  lines.push(``);
-  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(``);
+  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("");
     }
-  }
-  if (diff.collectionsToModify.length > 0) {
-    lines.push(`  // Revert modifications`);
-    for (const modification of diff.collectionsToModify) {
-      const collectionName = modification.collection;
-      if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
-        lines.push(`  // Revert permissions for ${collectionName}`);
-        for (const permission of modification.permissionsToUpdate) {
-          const varName = `collection_${collectionName}_revert_perm_${permission.ruleType}`;
-          lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.oldValue, varName));
-          lines.push(``);
-        }
-      } else if (modification.rulesToUpdate.length > 0) {
-        lines.push(`  // Revert rules for ${collectionName}`);
-        for (const rule of modification.rulesToUpdate) {
-          const varName = `collection_${collectionName}_revert_rule_${rule.ruleType}`;
-          lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.oldValue, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.indexesToRemove.length > 0) {
-        lines.push(`  // Restore indexes to ${collectionName}`);
-        for (let i = 0; i < modification.indexesToRemove.length; i++) {
-          const index = modification.indexesToRemove[i];
-          const varName = `collection_${collectionName}_restore_idx_${i}`;
-          lines.push(generateIndexAddition(collectionName, index, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.indexesToAdd.length > 0) {
-        lines.push(`  // Remove indexes from ${collectionName}`);
-        for (let i = 0; i < modification.indexesToAdd.length; i++) {
-          const index = modification.indexesToAdd[i];
-          const varName = `collection_${collectionName}_revert_idx_${i}`;
-          lines.push(generateIndexRemoval(collectionName, index, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.fieldsToRemove.length > 0) {
-        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(``);
-        }
-      }
-      if (modification.fieldsToModify.length > 0) {
-        lines.push(`  // Revert field modifications in ${collectionName}`);
-        for (const fieldMod of modification.fieldsToModify) {
-          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}`;
-          lines.push(generateFieldModification(collectionName, reverseMod, varName));
-          lines.push(``);
-        }
-      }
-      if (modification.fieldsToAdd.length > 0) {
-        lines.push(`  // Remove added fields from ${collectionName}`);
-        for (const field of modification.fieldsToAdd) {
-          const varName = `collection_${collectionName}_revert_add_${field.name}`;
-          lines.push(generateFieldDeletion(collectionName, field.name, varName));
-          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("");
     }
-  }
-  if (diff.collectionsToCreate.length > 0) {
-    lines.push(`  // Delete created collections`);
-    for (let i = 0; i < diff.collectionsToCreate.length; i++) {
-      const collection = diff.collectionsToCreate[i];
-      const varName = `collection_${collection.name}_rollback`;
-      lines.push(generateCollectionDeletion(collection.name, varName));
-      lines.push(``);
-    }
-  }
-  if (lines.length === 2) {
-    lines.push(`  // No changes to revert`);
-    lines.push(``);
-  }
-  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);
+    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));
     }
   }
-  return code;
+  return lines.join("\n");
 }
 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 hasChanges4 = diff.collectionsToCreate.length > 0 || diff.collectionsToModify.length > 0 || diff.collectionsToDelete.length > 0;
+    if (!hasChanges4) {
+      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;
@@ -3604,15 +3672,25 @@ async function executeGenerate(options) {
       process.exit(1);
     }
     logSection("\u{1F4DD} Generating Migration");
-    const migrationPath = await withProgress(
+    const migrationPaths = await withProgress(
       "Creating migration file...",
       () => Promise.resolve(generate(diff, migrationsDir))
     );
-    logSuccess(`Migration file created: ${path5__namespace.basename(migrationPath)}`);
+    if (migrationPaths.length === 0) {
+      logWarning("No migration files were generated (no changes detected).");
+      return;
+    }
+    if (migrationPaths.length === 1) {
+      logSuccess(`Migration file created: ${path5__namespace.basename(migrationPaths[0])}`);
+    } else {
+      logSuccess(`Created ${migrationPaths.length} migration files`);
+    }
     logSection("\u2705 Next Steps");
     console.log();
-    console.log("  1. Review the generated migration file:");
-    console.log(`     ${migrationPath}`);
+    console.log("  1. Review the generated migration file(s):");
+    migrationPaths.forEach((migrationPath) => {
+      console.log(`     ${migrationPath}`);
+    });
     console.log();
     console.log("  2. Apply the migration by running PocketBase:");
     console.log("     yarn pb");