pocketbase-zod-schema 0.3.1 → 0.3.2

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-CVxPCgWX.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-Dfp-NP2D.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

@@ -3471,7 +3471,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);
@@ -3765,11 +3765,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");
@@ -3887,20 +3885,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 +3990,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;
@@ -4103,20 +4107,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;
@@ -4233,20 +4240,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;