pocketbase-zod-schema 0.2.4 → 0.3.0

package/dist/index.cjs

@@ -3,6 +3,7 @@
 var zod = require('zod');
 var fs3 = require('fs');
 var path5 = require('path');
+var crypto = require('crypto');
 var chalk = require('chalk');
 var ora = require('ora');
 
@@ -393,46 +394,6 @@ var inputImageFileSchema = {
 var omitImageFilesSchema = {
   imageFiles: true
 };
-function textField(options) {
-  let schema = zod.z.string();
-  if (options?.min !== void 0) schema = schema.min(options.min);
-  if (options?.max !== void 0) schema = schema.max(options.max);
-  if (options?.pattern !== void 0) schema = schema.regex(options.pattern);
-  return schema;
-}
-function emailField() {
-  return zod.z.string().email();
-}
-function urlField() {
-  return zod.z.string().url();
-}
-function numberField(options) {
-  let schema = zod.z.number();
-  if (options?.min !== void 0) schema = schema.min(options.min);
-  if (options?.max !== void 0) schema = schema.max(options.max);
-  return schema;
-}
-function boolField() {
-  return zod.z.boolean();
-}
-function dateField() {
-  return zod.z.date();
-}
-function selectField(values) {
-  return zod.z.enum(values);
-}
-function jsonField(schema) {
-  return schema ?? zod.z.record(zod.z.any());
-}
-function fileField() {
-  return zod.z.instanceof(File);
-}
-function filesField(options) {
-  let schema = zod.z.array(zod.z.instanceof(File));
-  if (options?.min !== void 0) schema = schema.min(options.min);
-  if (options?.max !== void 0) schema = schema.max(options.max);
-  return schema;
-}
 var RELATION_METADATA_KEY = "__pocketbase_relation__";
 function RelationField(config) {
   const metadata = {
@@ -476,15 +437,6 @@ function extractRelationMetadata(description) {
   }
   return null;
 }
-function editorField() {
-  return zod.z.string();
-}
-function geoPointField() {
-  return zod.z.object({
-    lon: zod.z.number(),
-    lat: zod.z.number()
-  });
-}
 function withPermissions(schema, config) {
   const metadata = {
     permissions: config
@@ -524,6 +476,191 @@ function defineCollection(config) {
   }
   return schema.describe(JSON.stringify(metadata));
 }
+var FIELD_METADATA_KEY = "__pocketbase_field__";
+function extractFieldMetadata(description) {
+  if (!description) return null;
+  try {
+    const parsed = JSON.parse(description);
+    if (parsed[FIELD_METADATA_KEY]) {
+      return parsed[FIELD_METADATA_KEY];
+    }
+  } catch {
+  }
+  return null;
+}
+function BoolField() {
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "bool"
+    }
+  };
+  return zod.z.boolean().describe(JSON.stringify(metadata));
+}
+function NumberField(options) {
+  if (options?.min !== void 0 && options?.max !== void 0) {
+    if (options.min > options.max) {
+      throw new Error("NumberField: min cannot be greater than max");
+    }
+  }
+  let schema = zod.z.number();
+  if (options?.min !== void 0) {
+    schema = schema.min(options.min);
+  }
+  if (options?.max !== void 0) {
+    schema = schema.max(options.max);
+  }
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "number",
+      options: options || {}
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
+function TextField(options) {
+  if (options?.min !== void 0 && options?.max !== void 0) {
+    if (options.min > options.max) {
+      throw new Error("TextField: min cannot be greater than max");
+    }
+  }
+  let schema = zod.z.string();
+  if (options?.min !== void 0) {
+    schema = schema.min(options.min);
+  }
+  if (options?.max !== void 0) {
+    schema = schema.max(options.max);
+  }
+  if (options?.pattern !== void 0) {
+    const pattern = options.pattern instanceof RegExp ? options.pattern : new RegExp(options.pattern);
+    schema = schema.regex(pattern);
+  }
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "text",
+      options: options || {}
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
+function EmailField() {
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "email"
+    }
+  };
+  return zod.z.string().email().describe(JSON.stringify(metadata));
+}
+function URLField() {
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "url"
+    }
+  };
+  return zod.z.string().url().describe(JSON.stringify(metadata));
+}
+function EditorField() {
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "editor"
+    }
+  };
+  return zod.z.string().describe(JSON.stringify(metadata));
+}
+function DateField(options) {
+  if (options?.min !== void 0 && options?.max !== void 0) {
+    const minDate = typeof options.min === "string" ? new Date(options.min) : options.min;
+    const maxDate = typeof options.max === "string" ? new Date(options.max) : options.max;
+    if (minDate > maxDate) {
+      throw new Error("DateField: min cannot be greater than max");
+    }
+  }
+  const schema = zod.z.string();
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "date",
+      options: options || {}
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
+function AutodateField(options) {
+  const schema = zod.z.string();
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "autodate",
+      options: options || {}
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
+function SelectField(values, options) {
+  const enumSchema = zod.z.enum(values);
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "select",
+      options: {
+        values,
+        maxSelect: options?.maxSelect ?? 1
+      }
+    }
+  };
+  if (options?.maxSelect && options.maxSelect > 1) {
+    return zod.z.array(enumSchema).describe(JSON.stringify(metadata));
+  }
+  return enumSchema.describe(JSON.stringify(metadata));
+}
+function FileField(options) {
+  const schema = zod.z.instanceof(File);
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "file",
+      options: options || {}
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
+function FilesField(options) {
+  if (options?.minSelect !== void 0 && options?.maxSelect !== void 0) {
+    if (options.minSelect > options.maxSelect) {
+      throw new Error("FilesField: minSelect cannot be greater than maxSelect");
+    }
+  }
+  let schema = zod.z.array(zod.z.instanceof(File));
+  if (options?.minSelect !== void 0) {
+    schema = schema.min(options.minSelect);
+  }
+  if (options?.maxSelect !== void 0) {
+    schema = schema.max(options.maxSelect);
+  }
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "file",
+      options: options || {}
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
+function JSONField(schema) {
+  const baseSchema2 = schema ?? zod.z.record(zod.z.string(), zod.z.any());
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "json"
+    }
+  };
+  return baseSchema2.describe(JSON.stringify(metadata));
+}
+function GeoPointField() {
+  const schema = zod.z.object({
+    lon: zod.z.number(),
+    lat: zod.z.number()
+  });
+  const metadata = {
+    [FIELD_METADATA_KEY]: {
+      type: "geoPoint"
+    }
+  };
+  return schema.describe(JSON.stringify(metadata));
+}
 
 // src/utils/permission-templates.ts
 var PermissionTemplates = {
@@ -2144,6 +2281,38 @@ function isAuthCollection(fields) {
   return hasEmail && hasPassword;
 }
 function buildFieldDefinition(fieldName, zodType) {
+  const fieldMetadata = extractFieldMetadata(zodType.description);
+  if (fieldMetadata) {
+    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: Object.keys(options2).length > 0 ? options2 : void 0
+    };
+    if (fieldMetadata.type === "relation") {
+      const relationMetadata2 = extractRelationMetadata(zodType.description);
+      if (relationMetadata2) {
+        fieldDef2.relation = {
+          collection: relationMetadata2.collection,
+          maxSelect: relationMetadata2.maxSelect,
+          minSelect: relationMetadata2.minSelect,
+          cascadeDelete: relationMetadata2.cascadeDelete
+        };
+      }
+    }
+    return fieldDef2;
+  }
   const fieldType = mapZodTypeToPocketBase(zodType, fieldName);
   const required = isFieldRequired(zodType);
   const options = extractFieldOptions(zodType);
@@ -3125,6 +3294,65 @@ 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
+   * 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_CONFIG3 = {
@@ -3467,6 +3695,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) {
@@ -3476,7 +3716,7 @@ function aggregateChanges(currentSchema, previousSnapshot, config) {
     }
   }
   return {
-    collectionsToCreate: filteredCollectionsToCreate,
+    collectionsToCreate: collectionsWithIds,
     collectionsToDelete: filteredCollectionsToDelete,
     collectionsToModify
   };
@@ -3712,6 +3952,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) {
@@ -3819,14 +4102,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(", ");
@@ -3834,7 +4116,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}"`);
@@ -3842,34 +4124,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")},
   ]`;
@@ -3928,7 +4223,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    ")},
   ]`;
@@ -3982,7 +4277,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}",`);
@@ -3996,7 +4291,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(``);
@@ -4018,42 +4313,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});`);
@@ -4103,7 +4415,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");
 }
@@ -4112,7 +4424,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(`  }`);
@@ -4141,16 +4453,179 @@ 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));
+  }
+  return lines.join("\n");
+}
+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));
+    }
+  }
+  return lines.join("\n");
+}
 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(``);
     }
   }
@@ -4162,7 +4637,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(``);
         }
       }
@@ -4253,12 +4728,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(``);
     }
   }
@@ -4303,7 +4789,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(``);
         }
       }
@@ -4372,12 +4858,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 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;
@@ -4395,7 +4902,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);
@@ -4999,15 +5507,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");
@@ -5270,29 +5788,42 @@ async function executeStatus(options) {
   }
 }
 
+exports.AutodateField = AutodateField;
 exports.BaseMutator = BaseMutator;
+exports.BoolField = BoolField;
 exports.CLIUsageError = CLIUsageError;
 exports.ConfigurationError = ConfigurationError;
+exports.DateField = DateField;
 exports.DiffEngine = DiffEngine;
+exports.EditorField = EditorField;
+exports.EmailField = EmailField;
+exports.FIELD_METADATA_KEY = FIELD_METADATA_KEY;
 exports.FIELD_TYPE_INFO = FIELD_TYPE_INFO;
+exports.FileField = FileField;
 exports.FileSystemError = FileSystemError;
+exports.FilesField = FilesField;
+exports.GeoPointField = GeoPointField;
+exports.JSONField = JSONField;
 exports.MigrationError = MigrationError;
 exports.MigrationGenerationError = MigrationGenerationError;
 exports.MigrationGenerator = MigrationGenerator;
+exports.NumberField = NumberField;
 exports.POCKETBASE_FIELD_TYPES = POCKETBASE_FIELD_TYPES;
 exports.PermissionTemplates = PermissionTemplates;
 exports.RelationField = RelationField;
 exports.RelationsField = RelationsField;
 exports.SchemaAnalyzer = SchemaAnalyzer;
 exports.SchemaParsingError = SchemaParsingError;
+exports.SelectField = SelectField;
 exports.SnapshotError = SnapshotError;
 exports.SnapshotManager = SnapshotManager;
 exports.StatusEnum = StatusEnum;
+exports.TextField = TextField;
+exports.URLField = URLField;
 exports.aggregateChanges = aggregateChanges;
 exports.baseImageFileSchema = baseImageFileSchema;
 exports.baseSchema = baseSchema;
 exports.baseSchemaWithTimestamps = baseSchemaWithTimestamps;
-exports.boolField = boolField;
 exports.buildFieldDefinition = buildFieldDefinition;
 exports.buildSchemaDefinition = buildSchemaDefinition;
 exports.categorizeChangesBySeverity = categorizeChangesBySeverity;
@@ -5306,21 +5837,17 @@ exports.convertPocketBaseMigration = convertPocketBaseMigration;
 exports.convertZodSchemaToCollectionSchema = convertZodSchemaToCollectionSchema;
 exports.createMigrationFileStructure = createMigrationFileStructure;
 exports.createPermissions = createPermissions;
-exports.dateField = dateField;
 exports.defineCollection = defineCollection;
 exports.detectDestructiveChanges = detectDestructiveChanges;
 exports.detectFieldChanges = detectFieldChanges;
 exports.discoverSchemaFiles = discoverSchemaFiles;
-exports.editorField = editorField;
-exports.emailField = emailField;
 exports.extractComprehensiveFieldOptions = extractComprehensiveFieldOptions;
 exports.extractFieldDefinitions = extractFieldDefinitions;
+exports.extractFieldMetadata = extractFieldMetadata;
 exports.extractFieldOptions = extractFieldOptions;
 exports.extractIndexes = extractIndexes;
 exports.extractRelationMetadata = extractRelationMetadata;
 exports.extractSchemaDefinitions = extractSchemaDefinitions;
-exports.fileField = fileField;
-exports.filesField = filesField;
 exports.filterSystemCollections = filterSystemCollections;
 exports.findLatestSnapshot = findLatestSnapshot;
 exports.findNewCollections = findNewCollections;
@@ -5346,7 +5873,6 @@ exports.generateMigrationFilename = generateMigrationFilename;
 exports.generatePermissionUpdate = generatePermissionUpdate;
 exports.generateTimestamp = generateTimestamp;
 exports.generateUpMigration = generateUpMigration;
-exports.geoPointField = geoPointField;
 exports.getArrayElementType = getArrayElementType;
 exports.getCollectionNameFromFile = getCollectionNameFromFile;
 exports.getDefaultValue = getDefaultValue;
@@ -5371,7 +5897,6 @@ exports.isRelationField = isRelationField;
 exports.isSingleRelationField = isSingleRelationField;
 exports.isSystemCollection = isSystemCollection;
 exports.isTemplateConfig = isTemplateConfig;
-exports.jsonField = jsonField;
 exports.loadBaseMigration = loadBaseMigration;
 exports.loadConfig = loadConfig;
 exports.loadSnapshot = loadSnapshot;
@@ -5394,7 +5919,6 @@ exports.matchCollectionsByName = matchCollectionsByName;
 exports.matchFieldsByName = matchFieldsByName;
 exports.mergePermissions = mergePermissions;
 exports.mergeSnapshots = mergeSnapshots;
-exports.numberField = numberField;
 exports.omitImageFilesSchema = omitImageFilesSchema;
 exports.parseSchemaFiles = parseSchemaFiles;
 exports.pluralize = pluralize;
@@ -5402,14 +5926,11 @@ exports.requiresForceFlag = requiresForceFlag;
 exports.resolveTargetCollection = resolveTargetCollection;
 exports.resolveTemplate = resolveTemplate;
 exports.saveSnapshot = saveSnapshot;
-exports.selectField = selectField;
 exports.selectSchemaForCollection = selectSchemaForCollection;
 exports.singularize = singularize;
 exports.snapshotExists = snapshotExists;
-exports.textField = textField;
 exports.toCollectionName = toCollectionName;
 exports.unwrapZodType = unwrapZodType;
-exports.urlField = urlField;
 exports.validatePermissionConfig = validatePermissionConfig;
 exports.validateRuleExpression = validateRuleExpression;
 exports.validateSnapshot = validateSnapshot;