pocketbase-zod-schema 0.3.1 → 0.3.3

package/dist/migration/index.d.cts

@@ -2,9 +2,9 @@ export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchema
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './snapshot.cjs';
 export { ChangeSummary, DestructiveChange, DiffEngine, DiffEngineConfig, aggregateChanges, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, detectDestructiveChanges, detectFieldChanges, filterSystemCollections, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, generateChangeSummary, getUsersSystemFields, isSystemCollection, matchCollectionsByName, matchFieldsByName, requiresForceFlag } from './diff.cjs';
 export { MigrationGenerator, MigrationGeneratorConfig, createMigrationFileStructure, generate, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, writeMigrationFile } from './generator.cjs';
-export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from '../types-D-Fsdn_O.cjs';
-export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from '../type-mapper-DaBe-1ph.cjs';
-export { F as FIELD_METADATA_KEY, a as FieldMetadata, P as PocketBaseFieldType, e as extractFieldMetadata } from '../fields-RVj26U-O.cjs';
+export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from '../types-d0yBwHoN.cjs';
+export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from '../type-mapper-DsGgZwUo.cjs';
+export { F as FIELD_METADATA_KEY, a as FieldMetadata, P as PocketBaseFieldType, e as extractFieldMetadata } from '../fields-DBBm06VU.cjs';
 export { A as APIRuleType } from '../permissions-ZHafVSIx.cjs';
 import 'zod';
 

package/dist/migration/index.d.ts

@@ -2,9 +2,9 @@ export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchema
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './snapshot.js';
 export { ChangeSummary, DestructiveChange, DiffEngine, DiffEngineConfig, aggregateChanges, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, detectDestructiveChanges, detectFieldChanges, filterSystemCollections, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, generateChangeSummary, getUsersSystemFields, isSystemCollection, matchCollectionsByName, matchFieldsByName, requiresForceFlag } from './diff.js';
 export { MigrationGenerator, MigrationGeneratorConfig, createMigrationFileStructure, generate, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, writeMigrationFile } from './generator.js';
-export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from '../types-CUVzgZ9k.js';
-export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from '../type-mapper-CZzVeDj7.js';
-export { F as FIELD_METADATA_KEY, a as FieldMetadata, P as PocketBaseFieldType, e as extractFieldMetadata } from '../fields-RVj26U-O.js';
+export { d as CollectionModification, f as CollectionOperation, C as CollectionSchema, b as FieldChange, F as FieldDefinition, c as FieldModification, P as PermissionChange, R as RuleUpdate, S as SchemaDefinition, e as SchemaDiff, a as SchemaSnapshot } from '../types-BWhwQxG-.js';
+export { E as ExtractedFieldOptions, d as FIELD_TYPE_INFO, F as FieldTypeInfo, C as FieldTypeResult, P as POCKETBASE_FIELD_TYPES, z as extractComprehensiveFieldOptions, o as extractFieldOptions, x as getArrayElementType, v as getDefaultValue, D as getFieldTypeInfo, g as getMaxSelect, c as getMinSelect, w as isArrayType, A as isEditorField, q as isFieldRequired, B as isFileFieldByName, y as isGeoPointType, a as isMultipleRelationField, b as isRelationField, i as isSingleRelationField, j as mapZodArrayType, f as mapZodBooleanType, k as mapZodDateType, h as mapZodEnumType, e as mapZodNumberType, l as mapZodRecordType, m as mapZodStringType, n as mapZodTypeToPocketBase, p as pluralize, r as resolveTargetCollection, s as singularize, t as toCollectionName, u as unwrapZodType } from '../type-mapper-Dvh4QTM-.js';
+export { F as FIELD_METADATA_KEY, a as FieldMetadata, P as PocketBaseFieldType, e as extractFieldMetadata } from '../fields-DBBm06VU.js';
 export { A as APIRuleType } from '../permissions-ZHafVSIx.js';
 import 'zod';
 

package/dist/migration/index.js

@@ -3075,10 +3075,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) {
@@ -3471,7 +3480,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);
@@ -3734,7 +3743,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`;
@@ -3749,7 +3758,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)};`);
@@ -3765,11 +3781,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");
@@ -3827,9 +3841,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("");
@@ -3838,7 +3853,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) {
@@ -3887,20 +3902,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;
@@ -3989,20 +4007,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;
@@ -4017,6 +4038,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++) {
@@ -4032,8 +4058,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(``);
         }
@@ -4042,7 +4069,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(``);
         }
       }
@@ -4103,20 +4130,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;
@@ -4136,6 +4166,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++) {
@@ -4233,20 +4268,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;
@@ -4270,6 +4308,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 = [];