pocketbase-zod-schema 0.3.1 → 0.3.3

package/dist/cli/utils/index.d.cts

@@ -1,6 +1,6 @@
 import { Ora } from 'ora';
-import { e as SchemaDiff } from '../../types-D-Fsdn_O.cjs';
-import '../../fields-RVj26U-O.cjs';
+import { e as SchemaDiff } from '../../types-d0yBwHoN.cjs';
+import '../../fields-DBBm06VU.cjs';
 import 'zod';
 import '../../permissions-ZHafVSIx.cjs';
 

package/dist/cli/utils/index.d.ts

@@ -1,6 +1,6 @@
 import { Ora } from 'ora';
-import { e as SchemaDiff } from '../../types-CUVzgZ9k.js';
-import '../../fields-RVj26U-O.js';
+import { e as SchemaDiff } from '../../types-BWhwQxG-.js';
+import '../../fields-DBBm06VU.js';
 import 'zod';
 import '../../permissions-ZHafVSIx.js';
 

package/dist/{fields-RVj26U-O.d.cts → fields-DBBm06VU.d.cts}

@@ -116,6 +116,15 @@ interface SelectFieldOptions {
      */
     maxSelect?: number;
 }
+/**
+ * Human-friendly byte size input.
+ *
+ * - Use a number for raw bytes (e.g. `5242880`)
+ * - Use a string with unit suffix for kibibytes/mebibytes/gibibytes (e.g. `"5M"`, `"1G"`)
+ *
+ * Supported suffixes: `K`, `M`, `G` (case-insensitive).
+ */
+type ByteSize = number | `${number}${"K" | "M" | "G" | "k" | "m" | "g"}`;
 /**
  * File field configuration options
  */
@@ -126,9 +135,19 @@ interface FileFieldOptions {
      */
     mimeTypes?: string[];
     /**
-     * Maximum file size in bytes
+     * Maximum file size.
+     *
+     * - Provide a number for raw bytes
+     * - Or use a string with `K`, `M`, `G` suffix (case-insensitive)
+     *
+     * Max allowed is `8G`.
+     *
+     * @example
+     * maxSize: 5242880
+     * maxSize: "5M"
+     * maxSize: "1G"
      */
-    maxSize?: number;
+    maxSize?: ByteSize;
     /**
      * Thumbnail sizes to generate
      * Example: ["100x100", "200x200"]
@@ -299,29 +318,37 @@ declare function SelectField<T extends [string, ...string[]]>(values: T, options
  * Maps to PocketBase 'file' field type with maxSelect=1
  *
  * @param options - Optional file constraints
- * @returns Zod File schema with PocketBase metadata
+ * @returns Zod schema that accepts File on input and returns string when reading from database
  *
  * @example
  * const ProductSchema = z.object({
  *   thumbnail: FileField({ mimeTypes: ["image/*"], maxSize: 5242880 }),
  *   document: FileField({ mimeTypes: ["application/pdf"] }),
  * });
+ *
+ * @remarks
+ * - When creating/updating records: accepts File objects
+ * - When reading from PocketBase: returns string (filename)
  */
-declare function FileField(options?: FileFieldOptions): z.ZodType<File>;
+declare function FileField(options?: FileFieldOptions): z.ZodType<string, z.ZodTypeDef, File | string>;
 /**
  * Creates a multiple files field schema
  * Maps to PocketBase 'file' field type with maxSelect>1
  *
  * @param options - Optional file constraints
- * @returns Zod array of File schema with PocketBase metadata
+ * @returns Zod array schema that accepts File[] on input and returns string[] when reading from database
  *
  * @example
  * const ProductSchema = z.object({
  *   images: FilesField({ mimeTypes: ["image/*"], maxSelect: 5 }),
  *   attachments: FilesField({ minSelect: 1, maxSelect: 10 }),
  * });
+ *
+ * @remarks
+ * - When creating/updating records: accepts File[]
+ * - When reading from PocketBase: returns string[] (filenames)
  */
-declare function FilesField(options?: FilesFieldOptions): z.ZodArray<z.ZodType<File>>;
+declare function FilesField(options?: FilesFieldOptions): z.ZodType<string[], z.ZodTypeDef, (File | string)[]>;
 /**
  * Creates a JSON field schema with optional inner schema validation
  * Maps to PocketBase 'json' field type
@@ -362,4 +389,4 @@ declare function GeoPointField(): z.ZodObject<{
     lat: z.ZodNumber;
 }>;
 
-export { type AutodateFieldOptions as A, BoolField as B, type DateFieldOptions as D, EmailField as E, FIELD_METADATA_KEY as F, GeoPointField as G, JSONField as J, type NumberFieldOptions as N, type PocketBaseFieldType as P, type SelectFieldOptions as S, type TextFieldOptions as T, URLField as U, type FieldMetadata as a, type FileFieldOptions as b, type FilesFieldOptions as c, NumberField as d, extractFieldMetadata as e, TextField as f, EditorField as g, DateField as h, AutodateField as i, SelectField as j, FileField as k, FilesField as l };
+export { type AutodateFieldOptions as A, type ByteSize as B, type DateFieldOptions as D, EmailField as E, FIELD_METADATA_KEY as F, GeoPointField as G, JSONField as J, type NumberFieldOptions as N, type PocketBaseFieldType as P, type SelectFieldOptions as S, type TextFieldOptions as T, URLField as U, type FieldMetadata as a, type FileFieldOptions as b, type FilesFieldOptions as c, BoolField as d, extractFieldMetadata as e, NumberField as f, TextField as g, EditorField as h, DateField as i, AutodateField as j, SelectField as k, FileField as l, FilesField as m };

package/dist/{fields-RVj26U-O.d.ts → fields-DBBm06VU.d.ts}

@@ -116,6 +116,15 @@ interface SelectFieldOptions {
      */
     maxSelect?: number;
 }
+/**
+ * Human-friendly byte size input.
+ *
+ * - Use a number for raw bytes (e.g. `5242880`)
+ * - Use a string with unit suffix for kibibytes/mebibytes/gibibytes (e.g. `"5M"`, `"1G"`)
+ *
+ * Supported suffixes: `K`, `M`, `G` (case-insensitive).
+ */
+type ByteSize = number | `${number}${"K" | "M" | "G" | "k" | "m" | "g"}`;
 /**
  * File field configuration options
  */
@@ -126,9 +135,19 @@ interface FileFieldOptions {
      */
     mimeTypes?: string[];
     /**
-     * Maximum file size in bytes
+     * Maximum file size.
+     *
+     * - Provide a number for raw bytes
+     * - Or use a string with `K`, `M`, `G` suffix (case-insensitive)
+     *
+     * Max allowed is `8G`.
+     *
+     * @example
+     * maxSize: 5242880
+     * maxSize: "5M"
+     * maxSize: "1G"
      */
-    maxSize?: number;
+    maxSize?: ByteSize;
     /**
      * Thumbnail sizes to generate
      * Example: ["100x100", "200x200"]
@@ -299,29 +318,37 @@ declare function SelectField<T extends [string, ...string[]]>(values: T, options
  * Maps to PocketBase 'file' field type with maxSelect=1
  *
  * @param options - Optional file constraints
- * @returns Zod File schema with PocketBase metadata
+ * @returns Zod schema that accepts File on input and returns string when reading from database
  *
  * @example
  * const ProductSchema = z.object({
  *   thumbnail: FileField({ mimeTypes: ["image/*"], maxSize: 5242880 }),
  *   document: FileField({ mimeTypes: ["application/pdf"] }),
  * });
+ *
+ * @remarks
+ * - When creating/updating records: accepts File objects
+ * - When reading from PocketBase: returns string (filename)
  */
-declare function FileField(options?: FileFieldOptions): z.ZodType<File>;
+declare function FileField(options?: FileFieldOptions): z.ZodType<string, z.ZodTypeDef, File | string>;
 /**
  * Creates a multiple files field schema
  * Maps to PocketBase 'file' field type with maxSelect>1
  *
  * @param options - Optional file constraints
- * @returns Zod array of File schema with PocketBase metadata
+ * @returns Zod array schema that accepts File[] on input and returns string[] when reading from database
  *
  * @example
  * const ProductSchema = z.object({
  *   images: FilesField({ mimeTypes: ["image/*"], maxSelect: 5 }),
  *   attachments: FilesField({ minSelect: 1, maxSelect: 10 }),
  * });
+ *
+ * @remarks
+ * - When creating/updating records: accepts File[]
+ * - When reading from PocketBase: returns string[] (filenames)
  */
-declare function FilesField(options?: FilesFieldOptions): z.ZodArray<z.ZodType<File>>;
+declare function FilesField(options?: FilesFieldOptions): z.ZodType<string[], z.ZodTypeDef, (File | string)[]>;
 /**
  * Creates a JSON field schema with optional inner schema validation
  * Maps to PocketBase 'json' field type
@@ -362,4 +389,4 @@ declare function GeoPointField(): z.ZodObject<{
     lat: z.ZodNumber;
 }>;
 
-export { type AutodateFieldOptions as A, BoolField as B, type DateFieldOptions as D, EmailField as E, FIELD_METADATA_KEY as F, GeoPointField as G, JSONField as J, type NumberFieldOptions as N, type PocketBaseFieldType as P, type SelectFieldOptions as S, type TextFieldOptions as T, URLField as U, type FieldMetadata as a, type FileFieldOptions as b, type FilesFieldOptions as c, NumberField as d, extractFieldMetadata as e, TextField as f, EditorField as g, DateField as h, AutodateField as i, SelectField as j, FileField as k, FilesField as l };
+export { type AutodateFieldOptions as A, type ByteSize as B, type DateFieldOptions as D, EmailField as E, FIELD_METADATA_KEY as F, GeoPointField as G, JSONField as J, type NumberFieldOptions as N, type PocketBaseFieldType as P, type SelectFieldOptions as S, type TextFieldOptions as T, URLField as U, type FieldMetadata as a, type FileFieldOptions as b, type FilesFieldOptions as c, BoolField as d, extractFieldMetadata as e, NumberField as f, TextField as g, EditorField as h, DateField as i, AutodateField as j, SelectField as k, FileField as l, FilesField as m };

package/dist/index.cjs

@@ -488,6 +488,45 @@ function extractFieldMetadata(description) {
   }
   return null;
 }
+var MAX_FILE_SIZE_BYTES = 8 * 1024 * 1024 * 1024;
+function parseByteSizeToBytes(value, context) {
+  let bytes;
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      throw new Error(`${context}: maxSize must be a finite number of bytes`);
+    }
+    bytes = Math.round(value);
+  } else {
+    const trimmed = value.trim();
+    const match = /^(\d+(?:\.\d+)?)\s*([KMG])$/i.exec(trimmed);
+    if (!match) {
+      throw new Error(`${context}: maxSize string must be like "10K", "5M", or "1G" (case-insensitive)`);
+    }
+    const amount = Number(match[1]);
+    const unit = match[2].toUpperCase();
+    if (!Number.isFinite(amount)) {
+      throw new Error(`${context}: maxSize must be a valid number`);
+    }
+    const multiplier = unit === "K" ? 1024 : unit === "M" ? 1024 * 1024 : 1024 * 1024 * 1024;
+    bytes = Math.round(amount * multiplier);
+  }
+  if (bytes < 0) {
+    throw new Error(`${context}: maxSize must be >= 0`);
+  }
+  if (bytes > MAX_FILE_SIZE_BYTES) {
+    throw new Error(`${context}: maxSize cannot exceed 8G (${MAX_FILE_SIZE_BYTES} bytes)`);
+  }
+  return bytes;
+}
+function normalizeFileFieldOptions(options, context) {
+  if (!options) return options;
+  if (options.maxSize === void 0) return options;
+  return {
+    ...options,
+    // PocketBase expects bytes; normalize any human-friendly inputs to bytes here.
+    maxSize: parseByteSizeToBytes(options.maxSize, context)
+  };
+}
 function BoolField() {
   const metadata = {
     [FIELD_METADATA_KEY]: {
@@ -610,11 +649,14 @@ function SelectField(values, options) {
   return enumSchema.describe(JSON.stringify(metadata));
 }
 function FileField(options) {
-  const schema = zod.z.instanceof(File);
+  const schema = zod.z.preprocess((val) => {
+    return val instanceof File ? val.name || "" : val;
+  }, zod.z.string());
+  const normalizedOptions = normalizeFileFieldOptions(options, "FileField");
   const metadata = {
     [FIELD_METADATA_KEY]: {
       type: "file",
-      options: options || {}
+      options: normalizedOptions || {}
     }
   };
   return schema.describe(JSON.stringify(metadata));
@@ -625,17 +667,24 @@ function FilesField(options) {
       throw new Error("FilesField: minSelect cannot be greater than maxSelect");
     }
   }
-  let schema = zod.z.array(zod.z.instanceof(File));
+  let baseArraySchema = zod.z.array(zod.z.string());
   if (options?.minSelect !== void 0) {
-    schema = schema.min(options.minSelect);
+    baseArraySchema = baseArraySchema.min(options.minSelect);
   }
   if (options?.maxSelect !== void 0) {
-    schema = schema.max(options.maxSelect);
+    baseArraySchema = baseArraySchema.max(options.maxSelect);
   }
+  const schema = zod.z.preprocess((val) => {
+    if (Array.isArray(val)) {
+      return val.map((item) => item instanceof File ? item.name || "" : item);
+    }
+    return val;
+  }, baseArraySchema);
+  const normalizedOptions = normalizeFileFieldOptions(options, "FilesField");
   const metadata = {
     [FIELD_METADATA_KEY]: {
       type: "file",
-      options: options || {}
+      options: normalizedOptions || {}
     }
   };
   return schema.describe(JSON.stringify(metadata));
@@ -3799,10 +3848,19 @@ function aggregateChanges(currentSchema, previousSnapshot, config) {
       collectionsToModify.push(modification);
     }
   }
+  const existingCollectionIds = /* @__PURE__ */ new Map();
+  if (previousSnapshot) {
+    for (const [name, collection] of previousSnapshot.collections) {
+      if (collection.id) {
+        existingCollectionIds.set(name, collection.id);
+      }
+    }
+  }
   return {
     collectionsToCreate: collectionsWithIds,
     collectionsToDelete: filteredCollectionsToDelete,
-    collectionsToModify
+    collectionsToModify,
+    existingCollectionIds
   };
 }
 function detectDestructiveChanges(diff, config) {
@@ -4195,7 +4253,7 @@ function formatValue(value) {
     return JSON.stringify(value).replace(/","/g, '", "');
   }
   if (typeof value === "object") {
-    const entries = Object.entries(value).map(([k, v]) => `${k}: ${formatValue(v)}`).join(", ");
+    const entries = Object.entries(value).filter(([_k, v]) => v !== void 0).map(([k, v]) => `${k}: ${formatValue(v)}`).join(", ");
     return `{ ${entries} }`;
   }
   return String(value);
@@ -4458,7 +4516,7 @@ function generateFieldAddition(collectionName, field, varName, isLast = false, c
   lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateFieldModification(collectionName, modification, varName, isLast = false) {
+function generateFieldModification(collectionName, modification, varName, isLast = false, collectionIdMap) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_${modification.fieldName}`;
   const fieldVar = `${collectionVar}_field`;
@@ -4473,7 +4531,14 @@ function generateFieldModification(collectionName, modification, varName, isLast
       const relationKey = change.property.replace("relation.", "");
       if (relationKey === "collection") {
         const isUsersCollection = String(change.newValue).toLowerCase() === "users";
-        const collectionIdValue = isUsersCollection ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${change.newValue}").id`;
+        let collectionIdValue;
+        if (isUsersCollection) {
+          collectionIdValue = '"_pb_users_auth_"';
+        } else if (collectionIdMap && collectionIdMap.has(String(change.newValue))) {
+          collectionIdValue = `"${collectionIdMap.get(String(change.newValue))}"`;
+        } else {
+          collectionIdValue = `app.findCollectionByNameOrId("${change.newValue}").id`;
+        }
         lines.push(`  ${fieldVar}.collectionId = ${collectionIdValue};`);
       } else {
         lines.push(`  ${fieldVar}.${relationKey} = ${formatValue(change.newValue)};`);
@@ -4489,11 +4554,9 @@ function generateFieldModification(collectionName, modification, varName, isLast
 function generateFieldDeletion(collectionName, fieldName, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_${fieldName}`;
-  const fieldVar = `${collectionVar}_field`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
-  lines.push(`  const ${fieldVar} = ${collectionVar}.fields.getByName("${fieldName}");`);
   lines.push(``);
-  lines.push(`  ${collectionVar}.fields.remove(${fieldVar}.id);`);
+  lines.push(`  ${collectionVar}.fields.removeByName("${fieldName}");`);
   lines.push(``);
   lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
@@ -4551,9 +4614,10 @@ function generateOperationUpMigration(operation, collectionIdMap) {
     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) {
+    for (let i = 0; i < modification.fieldsToAdd.length; i++) {
+      const field = modification.fieldsToAdd[i];
       operationCount++;
-      const varName = `collection_${collectionName}_add_${field.name}`;
+      const varName = `collection_${collectionName}_add_${field.name}_${i}`;
       const isLast = operationCount === totalOperations;
       lines.push(generateFieldAddition(collectionName, field, varName, isLast, collectionIdMap));
       if (!isLast) lines.push("");
@@ -4562,7 +4626,7 @@ function generateOperationUpMigration(operation, collectionIdMap) {
       operationCount++;
       const varName = `collection_${collectionName}_modify_${fieldMod.fieldName}`;
       const isLast = operationCount === totalOperations;
-      lines.push(generateFieldModification(collectionName, fieldMod, varName, isLast));
+      lines.push(generateFieldModification(collectionName, fieldMod, varName, isLast, collectionIdMap));
       if (!isLast) lines.push("");
     }
     for (const field of modification.fieldsToRemove) {
@@ -4611,20 +4675,23 @@ function generateOperationUpMigration(operation, collectionIdMap) {
     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);
+  const hasReturnStatement = /return\s+app\.(save|delete)\(/m.test(code);
+  if (!hasReturnStatement) {
+    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;
@@ -4713,20 +4780,23 @@ function generateOperationDownMigration(operation, 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);
+  const hasReturnStatement = /return\s+app\.(save|delete)\(/m.test(code);
+  if (!hasReturnStatement) {
+    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;
@@ -4741,6 +4811,11 @@ function generateUpMigration(diff) {
       collectionIdMap.set(collection.name, collection.id);
     }
   }
+  if (diff.existingCollectionIds) {
+    for (const [name, id] of diff.existingCollectionIds) {
+      collectionIdMap.set(name, id);
+    }
+  }
   if (diff.collectionsToCreate.length > 0) {
     lines.push(`  // Create new collections`);
     for (let i = 0; i < diff.collectionsToCreate.length; i++) {
@@ -4756,8 +4831,9 @@ function generateUpMigration(diff) {
       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}`;
+        for (let i = 0; i < modification.fieldsToAdd.length; i++) {
+          const field = modification.fieldsToAdd[i];
+          const varName = `collection_${collectionName}_add_${field.name}_${i}`;
           lines.push(generateFieldAddition(collectionName, field, varName, false, collectionIdMap));
           lines.push(``);
         }
@@ -4766,7 +4842,7 @@ function generateUpMigration(diff) {
         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(generateFieldModification(collectionName, fieldMod, varName, false, collectionIdMap));
           lines.push(``);
         }
       }
@@ -4827,20 +4903,23 @@ function generateUpMigration(diff) {
     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);
+  const hasReturnStatement = /return\s+app\.(save|delete)\(/m.test(code);
+  if (!hasReturnStatement) {
+    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;
@@ -4860,6 +4939,11 @@ function generateDownMigration(diff) {
       collectionIdMap.set(collection.name, collection.id);
     }
   }
+  if (diff.existingCollectionIds) {
+    for (const [name, id] of diff.existingCollectionIds) {
+      collectionIdMap.set(name, id);
+    }
+  }
   if (diff.collectionsToDelete.length > 0) {
     lines.push(`  // Recreate deleted collections`);
     for (let i = 0; i < diff.collectionsToDelete.length; i++) {
@@ -4957,20 +5041,23 @@ function generateDownMigration(diff) {
     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);
+  const hasReturnStatement = /return\s+app\.(save|delete)\(/m.test(code);
+  if (!hasReturnStatement) {
+    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;
@@ -4994,6 +5081,11 @@ function generate(diff, config) {
         collectionIdMap.set(collection.name, collection.id);
       }
     }
+    if (diff.existingCollectionIds) {
+      for (const [name, id] of diff.existingCollectionIds) {
+        collectionIdMap.set(name, id);
+      }
+    }
     const baseTimestamp = generateTimestamp(normalizedConfig);
     const operations = splitDiffByCollection(diff, baseTimestamp);
     const filePaths = [];