pocketbase-zod-schema 0.3.2 → 0.3.3

package/dist/migration/generator.d.cts

@@ -1,4 +1,4 @@
-import { e as SchemaDiff, C as CollectionSchema, F as FieldDefinition, c as FieldModification, f as CollectionOperation } from '../types-CVxPCgWX.cjs';
+import { e as SchemaDiff, C as CollectionSchema, F as FieldDefinition, c as FieldModification, f as CollectionOperation } from '../types-d0yBwHoN.cjs';
 import '../fields-DBBm06VU.cjs';
 import 'zod';
 import '../permissions-ZHafVSIx.cjs';
@@ -176,7 +176,7 @@ declare function generateFieldAddition(collectionName: string, field: FieldDefin
  * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for modifying the field
  */
-declare function generateFieldModification(collectionName: string, modification: FieldModification, varName?: string, isLast?: boolean): string;
+declare function generateFieldModification(collectionName: string, modification: FieldModification, varName?: string, isLast?: boolean, collectionIdMap?: Map<string, string>): string;
 /**
  * Generates code for deleting a field from a collection
  *

package/dist/migration/generator.d.ts

@@ -1,4 +1,4 @@
-import { e as SchemaDiff, C as CollectionSchema, F as FieldDefinition, c as FieldModification, f as CollectionOperation } from '../types-Dfp-NP2D.js';
+import { e as SchemaDiff, C as CollectionSchema, F as FieldDefinition, c as FieldModification, f as CollectionOperation } from '../types-BWhwQxG-.js';
 import '../fields-DBBm06VU.js';
 import 'zod';
 import '../permissions-ZHafVSIx.js';
@@ -176,7 +176,7 @@ declare function generateFieldAddition(collectionName: string, field: FieldDefin
  * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for modifying the field
  */
-declare function generateFieldModification(collectionName: string, modification: FieldModification, varName?: string, isLast?: boolean): string;
+declare function generateFieldModification(collectionName: string, modification: FieldModification, varName?: string, isLast?: boolean, collectionIdMap?: Map<string, string>): string;
 /**
  * Generates code for deleting a field from a collection
  *

package/dist/migration/generator.js

@@ -536,7 +536,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`;
@@ -551,7 +551,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)};`);
@@ -627,9 +634,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("");
@@ -638,7 +646,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) {
@@ -823,6 +831,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++) {
@@ -838,8 +851,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(``);
         }
@@ -848,7 +862,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(``);
         }
       }
@@ -945,6 +959,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++) {
@@ -1082,6 +1101,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 = [];