pocketbase-zod-schema 0.3.2 → 0.3.3

package/dist/index.d.cts

@@ -7,7 +7,7 @@ export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchema
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './migration/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 './migration/diff.cjs';
 export { MigrationGenerator, MigrationGeneratorConfig, createMigrationFileStructure, generate, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, writeMigrationFile } from './migration/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-CVxPCgWX.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 { CLIUsageError, ConfigurationError, FileSystemError, MigrationError, MigrationGenerationError, SchemaParsingError, SnapshotError } from './migration/index.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 { generateMigration, getMigrationStatus } from './cli/index.cjs';

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchema
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './migration/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 './migration/diff.js';
 export { MigrationGenerator, MigrationGeneratorConfig, createMigrationFileStructure, generate, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, writeMigrationFile } from './migration/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-Dfp-NP2D.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 { CLIUsageError, ConfigurationError, FileSystemError, MigrationError, MigrationGenerationError, SchemaParsingError, SnapshotError } from './migration/index.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 { generateMigration, getMigrationStatus } from './cli/index.js';

package/dist/index.js

@@ -3821,10 +3821,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) {
@@ -4480,7 +4489,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`;
@@ -4495,7 +4504,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)};`);
@@ -4571,9 +4587,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("");
@@ -4582,7 +4599,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) {
@@ -4767,6 +4784,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++) {
@@ -4782,8 +4804,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(``);
         }
@@ -4792,7 +4815,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(``);
         }
       }
@@ -4889,6 +4912,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++) {
@@ -5026,6 +5054,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 = [];