pocketbase-zod-schema 0.1.2 → 0.1.3

package/dist/index.d.cts

@@ -1,9 +1,9 @@
 export { StatusEnum, StatusEnumType } from './enums.cjs';
 export { UserMutator } from './mutator.cjs';
-export { ProjectInputType, ProjectType, TypedPocketBase, UserInputType, UserType } from './types.cjs';
-export { PermissionTemplates, PermissionValidationResult, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, createPermissions, dateField, editorField, emailField, fileField, filesField, geoPointField, inputImageFileSchema, isPermissionSchema, isTemplateConfig, jsonField, mergePermissions, numberField, omitImageFilesSchema, relationField, relationsField, resolveTemplate, selectField, textField, urlField, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.cjs';
+export { TypedPocketBase, UserInputType, UserType } from './types.cjs';
+export { PermissionTemplates, PermissionValidationResult, RelationConfig, RelationsConfig, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, createPermissions, dateField, editorField, emailField, extractRelationMetadata, fileField, filesField, geoPointField, inputImageFileSchema, isPermissionSchema, isTemplateConfig, jsonField, mergePermissions, numberField, omitImageFilesSchema, relationField, relationsField, resolveTemplate, selectField, textField, urlField, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.cjs';
 export { A as APIRuleType, P as PermissionSchema, a as PermissionTemplate, b as PermissionTemplateConfig, R as RuleExpression } from './permissions-ZHafVSIx.cjs';
-export { P as ProjectInputSchema, a as ProjectSchema, U as UserInputSchema, b as UserSchema } from './user-jS1aYoeD.cjs';
+export { U as UserInputSchema, a as UserSchema } from './user-C39DQ40N.cjs';
 export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection } from './migration/analyzer.cjs';
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, 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';

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 export { StatusEnum, StatusEnumType } from './enums.js';
 export { UserMutator } from './mutator.js';
-export { ProjectInputType, ProjectType, TypedPocketBase, UserInputType, UserType } from './types.js';
-export { PermissionTemplates, PermissionValidationResult, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, createPermissions, dateField, editorField, emailField, fileField, filesField, geoPointField, inputImageFileSchema, isPermissionSchema, isTemplateConfig, jsonField, mergePermissions, numberField, omitImageFilesSchema, relationField, relationsField, resolveTemplate, selectField, textField, urlField, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.js';
+export { TypedPocketBase, UserInputType, UserType } from './types.js';
+export { PermissionTemplates, PermissionValidationResult, RelationConfig, RelationsConfig, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, createPermissions, dateField, editorField, emailField, extractRelationMetadata, fileField, filesField, geoPointField, inputImageFileSchema, isPermissionSchema, isTemplateConfig, jsonField, mergePermissions, numberField, omitImageFilesSchema, relationField, relationsField, resolveTemplate, selectField, textField, urlField, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.js';
 export { A as APIRuleType, P as PermissionSchema, a as PermissionTemplate, b as PermissionTemplateConfig, R as RuleExpression } from './permissions-ZHafVSIx.js';
-export { P as ProjectInputSchema, a as ProjectSchema, U as UserInputSchema, b as UserSchema } from './user-jS1aYoeD.js';
+export { U as UserInputSchema, a as UserSchema } from './user-C39DQ40N.js';
 export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection } from './migration/analyzer.js';
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, 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';

package/dist/index.js

@@ -77,14 +77,48 @@ function filesField(options) {
   if (options?.max !== void 0) schema = schema.max(options.max);
   return schema;
 }
-function relationField() {
-  return z.string();
+var RELATION_METADATA_KEY = "__pocketbase_relation__";
+function relationField(config) {
+  const metadata = {
+    [RELATION_METADATA_KEY]: {
+      type: "single",
+      collection: config.collection,
+      cascadeDelete: config.cascadeDelete ?? false,
+      maxSelect: 1,
+      minSelect: 0
+    }
+  };
+  return z.string().describe(JSON.stringify(metadata));
 }
-function relationsField(options) {
+function relationsField(config) {
+  const metadata = {
+    [RELATION_METADATA_KEY]: {
+      type: "multiple",
+      collection: config.collection,
+      cascadeDelete: config.cascadeDelete ?? false,
+      maxSelect: config.maxSelect ?? 999,
+      minSelect: config.minSelect ?? 0
+    }
+  };
   let schema = z.array(z.string());
-  if (options?.min !== void 0) schema = schema.min(options.min);
-  if (options?.max !== void 0) schema = schema.max(options.max);
-  return schema;
+  if (config.minSelect !== void 0) {
+    schema = schema.min(config.minSelect);
+  }
+  if (config.maxSelect !== void 0) {
+    schema = schema.max(config.maxSelect);
+  }
+  return schema.describe(JSON.stringify(metadata));
+}
+function extractRelationMetadata(description) {
+  if (!description) return null;
+  try {
+    const parsed = JSON.parse(description);
+    if (parsed[RELATION_METADATA_KEY]) {
+      return parsed[RELATION_METADATA_KEY];
+    }
+  } catch {
+  }
+  return null;
 }
 function editorField() {
   return z.string();
@@ -116,7 +150,7 @@ function withIndexes(schema, indexes) {
   return schema.describe(JSON.stringify(metadata));
 }
 
-// src/schema/permission-templates.ts
+// src/utils/permission-templates.ts
 var PermissionTemplates = {
   /**
    * Public access - anyone can perform all operations
@@ -335,44 +369,22 @@ function mergePermissions(...schemas) {
   }
   return merged;
 }
-var ProjectInputSchema = z.object({
-  // Required fields
-  title: z.string(),
-  content: z.string(),
-  status: StatusEnum,
-  summary: z.string().optional(),
-  User: z.string().nonempty("User ID is missing"),
-  SubscriberUsers: z.array(z.string())
-}).extend(inputImageFileSchema);
-var ProjectSchema = withPermissions(
-  ProjectInputSchema.omit(omitImageFilesSchema).extend(baseImageFileSchema),
-  {
-    template: "owner-only",
-    ownerField: "User",
-    customRules: {
-      // Override list rule to allow authenticated users to see all projects
-      listRule: '@request.auth.id != ""',
-      // Allow viewing if user is owner OR a subscriber
-      viewRule: '@request.auth.id != "" && (User = @request.auth.id || SubscriberUsers ?= @request.auth.id)'
-    }
-  }
-);
 var UserInputSchema = z.object({
-  name: z.string().min(2, "Name must be longer").optional(),
+  name: z.string().optional(),
   email: z.string().email(),
   password: z.string().min(8, "Password must be at least 8 characters"),
   passwordConfirm: z.string(),
   avatar: z.instanceof(File).optional()
 });
 var UserDatabaseSchema = z.object({
-  name: z.string().min(2, "Name must be longer").optional(),
+  name: z.string().optional(),
   email: z.string().email(),
   password: z.string().min(8, "Password must be at least 8 characters"),
   avatar: z.instanceof(File).optional()
 });
 var UserSchema = withIndexes(
   withPermissions(UserDatabaseSchema.extend(baseSchema), {
-    // Users can list other users (for mentions, user search, etc.)
+    // Users can list their own profile
     listRule: "id = @request.auth.id",
     // Users can view their own profile
     viewRule: "id = @request.auth.id",
@@ -381,15 +393,13 @@ var UserSchema = withIndexes(
     // Users can only update their own profile
     updateRule: "id = @request.auth.id",
     // Users can only delete their own account
-    deleteRule: "id = @request.auth.id",
-    // Users can only manage their own account (change email, password, etc.)
-    manageRule: "id = @request.auth.id"
+    deleteRule: "id = @request.auth.id"
+    // manageRule is null in PocketBase default (not set)
   }),
   [
-    // Email should be unique for authentication
-    "CREATE UNIQUE INDEX idx_users_email ON users (email)",
-    // Index on name for user search and sorting
-    "CREATE INDEX idx_users_name ON users (name)"
+    // PocketBase's default indexes for auth collections
+    "CREATE UNIQUE INDEX `idx_tokenKey__pb_users_auth_` ON `users` (`tokenKey`)",
+    "CREATE UNIQUE INDEX `idx_email__pb_users_auth_` ON `users` (`email`) WHERE `email` != ''"
   ]
 );
 var BaseMutator = class {
@@ -730,7 +740,7 @@ var UserMutator = class extends BaseMutator {
     };
   }
   getCollection() {
-    return this.pb.collection("Projects");
+    return this.pb.collection("Users");
   }
   async validateInput(input) {
     return UserInputSchema.parse(input);
@@ -1496,26 +1506,28 @@ function getMaxSelect(fieldName, zodType) {
   return 1;
 }
 function getMinSelect(fieldName, zodType) {
-  if (!isMultipleRelationField(fieldName, zodType)) {
-    return void 0;
-  }
-  let unwrappedType = zodType;
-  if (zodType instanceof z.ZodOptional) {
-    unwrappedType = zodType._def.innerType;
-  }
-  if (unwrappedType instanceof z.ZodNullable) {
-    unwrappedType = unwrappedType._def.innerType;
-  }
-  if (unwrappedType instanceof z.ZodDefault) {
-    unwrappedType = unwrappedType._def.innerType;
+  if (isSingleRelationField(fieldName, zodType)) {
+    return 0;
   }
-  if (unwrappedType instanceof z.ZodArray) {
-    const arrayDef = unwrappedType._def;
-    if (arrayDef.minLength) {
-      return arrayDef.minLength.value;
+  if (isMultipleRelationField(fieldName, zodType)) {
+    let unwrappedType = zodType;
+    if (zodType instanceof z.ZodOptional) {
+      unwrappedType = zodType._def.innerType;
+    }
+    if (unwrappedType instanceof z.ZodNullable) {
+      unwrappedType = unwrappedType._def.innerType;
+    }
+    if (unwrappedType instanceof z.ZodDefault) {
+      unwrappedType = unwrappedType._def.innerType;
+    }
+    if (unwrappedType instanceof z.ZodArray) {
+      const arrayDef = unwrappedType._def;
+      if (arrayDef.minLength) {
+        return arrayDef.minLength.value;
+      }
     }
   }
-  return void 0;
+  return 0;
 }
 var POCKETBASE_FIELD_TYPES = [
   "text",
@@ -1998,13 +2010,32 @@ async function importSchemaModule(filePath, config) {
     if (config?.pathTransformer) {
       importPath = config.pathTransformer(filePath);
     }
-    if (!importPath.endsWith(".js")) {
-      importPath = `${importPath}.js`;
+    let resolvedPath = null;
+    const jsPath = `${importPath}.js`;
+    const tsPath = `${importPath}.ts`;
+    if (fs2.existsSync(jsPath)) {
+      resolvedPath = jsPath;
+    } else if (fs2.existsSync(tsPath)) {
+      resolvedPath = tsPath;
+    } else {
+      resolvedPath = jsPath;
     }
-    const fileUrl = new URL(`file://${path4.resolve(importPath)}`);
+    const fileUrl = new URL(`file://${path4.resolve(resolvedPath)}`);
     const module = await import(fileUrl.href);
     return module;
   } catch (error) {
+    const tsPath = `${filePath}.ts`;
+    const isTypeScriptFile = fs2.existsSync(tsPath);
+    if (isTypeScriptFile) {
+      throw new SchemaParsingError(
+        `Failed to import TypeScript schema file. Node.js cannot import TypeScript files directly.
+Please either:
+  1. Compile your schema files to JavaScript first, or
+  2. Use tsx to run the migration tool (e.g., "npx tsx package/dist/cli/migrate.js status" or "tsx package/dist/cli/migrate.js status")`,
+        filePath,
+        error
+      );
+    }
     throw new SchemaParsingError(
       `Failed to import schema module. Make sure the schema files are compiled to JavaScript.`,
       filePath,
@@ -2067,7 +2098,17 @@ function buildFieldDefinition(fieldName, zodType) {
     required,
     options
   };
-  if (isRelationField(fieldName, zodType)) {
+  const relationMetadata = extractRelationMetadata(zodType.description);
+  if (relationMetadata) {
+    fieldDef.type = "relation";
+    fieldDef.relation = {
+      collection: relationMetadata.collection,
+      maxSelect: relationMetadata.maxSelect,
+      minSelect: relationMetadata.minSelect,
+      cascadeDelete: relationMetadata.cascadeDelete
+    };
+    fieldDef.options = void 0;
+  } else if (isRelationField(fieldName, zodType)) {
     fieldDef.type = "relation";
     const targetCollection = resolveTargetCollection(fieldName);
     const maxSelect = getMaxSelect(fieldName, zodType);
@@ -2079,6 +2120,13 @@ function buildFieldDefinition(fieldName, zodType) {
       cascadeDelete: false
       // Default to false, can be configured later
     };
+    if (fieldDef.options) {
+      const { min, max, pattern, ...relationSafeOptions } = fieldDef.options;
+      console.log("min", min);
+      console.log("max", max);
+      console.log("pattern", pattern);
+      fieldDef.options = Object.keys(relationSafeOptions).length > 0 ? relationSafeOptions : void 0;
+    }
   }
   return fieldDef;
 }
@@ -2131,11 +2179,12 @@ function convertZodSchemaToCollectionSchema(collectionName, zodSchema) {
     fields,
     indexes,
     rules: {
-      listRule: null,
-      viewRule: null,
-      createRule: null,
-      updateRule: null,
-      deleteRule: null
+      listRule: permissions?.listRule ?? null,
+      viewRule: permissions?.viewRule ?? null,
+      createRule: permissions?.createRule ?? null,
+      updateRule: permissions?.updateRule ?? null,
+      deleteRule: permissions?.deleteRule ?? null,
+      manageRule: permissions?.manageRule ?? null
     },
     permissions
   };
@@ -2159,7 +2208,12 @@ async function buildSchemaDefinition(config) {
       if (normalizedConfig.pathTransformer) {
         importPath = normalizedConfig.pathTransformer(filePath);
       } else if (mergedConfig.useCompiledFiles) {
-        importPath = filePath.replace(/\/src\//, "/dist/");
+        const distPath = filePath.replace(/\/src\//, "/dist/");
+        if (fs2.existsSync(`${distPath}.js`) || fs2.existsSync(`${distPath}.mjs`)) {
+          importPath = distPath;
+        } else {
+          importPath = filePath;
+        }
       }
       const module = await importSchemaModule(importPath, normalizedConfig);
       const schemas = extractSchemaDefinitions(module, mergedConfig.schemaPatterns);
@@ -2536,6 +2590,7 @@ function convertPocketBaseCollection(pbCollection) {
   if (pbCollection.manageRule !== void 0) rules.manageRule = pbCollection.manageRule;
   if (Object.keys(rules).length > 0) {
     schema.rules = rules;
+    schema.permissions = { ...rules };
   }
   return schema;
 }
@@ -3231,10 +3286,8 @@ var DiffEngine = class {
 var DEFAULT_TEMPLATE = `/// <reference path="{{TYPES_PATH}}" />
 migrate((app) => {
 {{UP_CODE}}
-  return true;
 }, (app) => {
 {{DOWN_CODE}}
-  return true;
 });
 `;
 var DEFAULT_CONFIG4 = {
@@ -3399,7 +3452,8 @@ function generateFieldDefinitionObject(field) {
     }
   }
   if (field.relation) {
-    const collectionIdPlaceholder = field.relation.collection === "Users" ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${field.relation.collection}").id`;
+    const isUsersCollection = field.relation.collection.toLowerCase() === "users";
+    const collectionIdPlaceholder = isUsersCollection ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${field.relation.collection}").id`;
     parts.push(`      collectionId: ${collectionIdPlaceholder}`);
     if (field.relation.maxSelect !== void 0) {
       parts.push(`      maxSelect: ${field.relation.maxSelect}`);
@@ -3483,7 +3537,7 @@ function generateIndexesArray(indexes) {
     ${indexStrings.join(",\n    ")},
   ]`;
 }
-function generateCollectionCreation(collection, varName = "collection") {
+function generateCollectionCreation(collection, varName = "collection", isLast = false) {
   const lines = [];
   lines.push(`  const ${varName} = new Collection({`);
   lines.push(`    name: "${collection.name}",`);
@@ -3499,7 +3553,7 @@ function generateCollectionCreation(collection, varName = "collection") {
   lines.push(`    indexes: ${generateIndexesArray(collection.indexes)},`);
   lines.push(`  });`);
   lines.push(``);
-  lines.push(`  app.save(${varName});`);
+  lines.push(isLast ? `  return app.save(${varName});` : `  app.save(${varName});`);
   return lines.join("\n");
 }
 function getFieldConstructorName(fieldType) {
@@ -3530,7 +3584,8 @@ function generateFieldConstructorOptions(field) {
     }
   }
   if (field.relation && field.type === "relation") {
-    const collectionIdPlaceholder = field.relation.collection === "Users" ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${field.relation.collection}").id`;
+    const isUsersCollection = field.relation.collection.toLowerCase() === "users";
+    const collectionIdPlaceholder = isUsersCollection ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${field.relation.collection}").id`;
     parts.push(`    collectionId: ${collectionIdPlaceholder}`);
     if (field.relation.maxSelect !== void 0) {
       parts.push(`    maxSelect: ${field.relation.maxSelect}`);
@@ -3544,7 +3599,7 @@ function generateFieldConstructorOptions(field) {
   }
   return parts.join(",\n");
 }
-function generateFieldAddition(collectionName, field, varName) {
+function generateFieldAddition(collectionName, field, varName, isLast = false) {
   const lines = [];
   const constructorName = getFieldConstructorName(field.type);
   const collectionVar = varName || `collection_${collectionName}_${field.name}`;
@@ -3554,10 +3609,10 @@ function generateFieldAddition(collectionName, field, varName) {
   lines.push(generateFieldConstructorOptions(field));
   lines.push(`  }));`);
   lines.push(``);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateFieldModification(collectionName, modification, varName) {
+function generateFieldModification(collectionName, modification, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_${modification.fieldName}`;
   const fieldVar = `${collectionVar}_field`;
@@ -3571,7 +3626,8 @@ function generateFieldModification(collectionName, modification, varName) {
     } else if (change.property.startsWith("relation.")) {
       const relationKey = change.property.replace("relation.", "");
       if (relationKey === "collection") {
-        const collectionIdValue = change.newValue === "Users" ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${change.newValue}").id`;
+        const isUsersCollection = String(change.newValue).toLowerCase() === "users";
+        const collectionIdValue = isUsersCollection ? '"_pb_users_auth_"' : `app.findCollectionByNameOrId("${change.newValue}").id`;
         lines.push(`  ${fieldVar}.collectionId = ${collectionIdValue};`);
       } else {
         lines.push(`  ${fieldVar}.${relationKey} = ${formatValue(change.newValue)};`);
@@ -3581,10 +3637,10 @@ function generateFieldModification(collectionName, modification, varName) {
     }
   }
   lines.push(``);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateFieldDeletion(collectionName, fieldName, varName) {
+function generateFieldDeletion(collectionName, fieldName, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_${fieldName}`;
   const fieldVar = `${collectionVar}_field`;
@@ -3593,18 +3649,18 @@ function generateFieldDeletion(collectionName, fieldName, varName) {
   lines.push(``);
   lines.push(`  ${collectionVar}.fields.remove(${fieldVar}.id);`);
   lines.push(``);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateIndexAddition(collectionName, index, varName) {
+function generateIndexAddition(collectionName, index, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_idx`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
   lines.push(`  ${collectionVar}.indexes.push("${index}");`);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateIndexRemoval(collectionName, index, varName) {
+function generateIndexRemoval(collectionName, index, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_idx`;
   const indexVar = `${collectionVar}_indexToRemove`;
@@ -3613,29 +3669,29 @@ function generateIndexRemoval(collectionName, index, varName) {
   lines.push(`  if (${indexVar} !== -1) {`);
   lines.push(`    ${collectionVar}.indexes.splice(${indexVar}, 1);`);
   lines.push(`  }`);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateRuleUpdate(collectionName, ruleType, newValue, varName) {
+function generateRuleUpdate(collectionName, ruleType, newValue, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_${ruleType}`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
   lines.push(`  ${collectionVar}.${ruleType} = ${formatValue(newValue)};`);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generatePermissionUpdate(collectionName, ruleType, newValue, varName) {
+function generatePermissionUpdate(collectionName, ruleType, newValue, varName, isLast = false) {
   const lines = [];
   const collectionVar = varName || `collection_${collectionName}_${ruleType}`;
   lines.push(`  const ${collectionVar} = app.findCollectionByNameOrId("${collectionName}");`);
   lines.push(`  ${collectionVar}.${ruleType} = ${formatValue(newValue)};`);
-  lines.push(`  app.save(${collectionVar});`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
-function generateCollectionDeletion(collectionName, varName = "collection") {
+function generateCollectionDeletion(collectionName, varName = "collection", isLast = false) {
   const lines = [];
   lines.push(`  const ${varName} = app.findCollectionByNameOrId("${collectionName}");`);
-  lines.push(`  app.delete(${varName});`);
+  lines.push(isLast ? `  return app.delete(${varName});` : `  app.delete(${varName});`);
   return lines.join("\n");
 }
 function generateUpMigration(diff) {
@@ -3727,7 +3783,24 @@ function generateUpMigration(diff) {
     lines.push(`  // No changes detected`);
     lines.push(``);
   }
-  return lines.join("\n");
+  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);
+    }
+  }
+  return code;
 }
 function generateDownMigration(diff) {
   const lines = [];
@@ -3829,7 +3902,24 @@ function generateDownMigration(diff) {
     lines.push(`  // No changes to revert`);
     lines.push(``);
   }
-  return lines.join("\n");
+  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);
+    }
+  }
+  return code;
 }
 function generate(diff, config) {
   const normalizedConfig = typeof config === "string" ? { migrationDir: config } : config;
@@ -4430,7 +4520,13 @@ async function executeGenerate(options) {
     const schemaDir = getSchemaDirectory(config);
     const migrationsDir = getMigrationsDirectory(config);
     logSection("\u{1F50D} Analyzing Schema");
-    const currentSchema = await withProgress("Parsing Zod schemas...", () => parseSchemaFiles(schemaDir));
+    const analyzerConfig = {
+      schemaDir,
+      excludePatterns: config.schema.exclude,
+      useCompiledFiles: false
+      // Use source files since we're in development/testing
+    };
+    const currentSchema = await withProgress("Parsing Zod schemas...", () => parseSchemaFiles(analyzerConfig));
     logSuccess(`Found ${currentSchema.collections.size} collection(s)`);
     logInfo("Loading previous snapshot...");
     const previousSnapshot = loadSnapshotIfExists({
@@ -4617,7 +4713,13 @@ async function executeStatus(options) {
     const schemaDir = getSchemaDirectory(config);
     const migrationsDir = getMigrationsDirectory(config);
     logSection("\u{1F50D} Checking Migration Status");
-    const currentSchema = await withProgress("Parsing Zod schemas...", () => parseSchemaFiles(schemaDir));
+    const analyzerConfig = {
+      schemaDir,
+      excludePatterns: config.schema.exclude,
+      useCompiledFiles: false
+      // Use source files since we're in development/testing
+    };
+    const currentSchema = await withProgress("Parsing Zod schemas...", () => parseSchemaFiles(analyzerConfig));
     logSuccess(`Found ${currentSchema.collections.size} collection(s) in schema`);
     logInfo("Loading previous snapshot...");
     const previousSnapshot = loadSnapshotIfExists({
@@ -4721,6 +4823,6 @@ async function executeStatus(options) {
   }
 }
 
-export { CLIUsageError, ConfigurationError, DiffEngine, FIELD_TYPE_INFO, FileSystemError, MigrationError, MigrationGenerationError, MigrationGenerator, POCKETBASE_FIELD_TYPES, PermissionTemplates, ProjectInputSchema, ProjectSchema, SchemaAnalyzer, SchemaParsingError, SnapshotError, SnapshotManager, StatusEnum, UserInputSchema, UserMutator, UserSchema, aggregateChanges, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, buildFieldDefinition, buildSchemaDefinition, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, convertPocketBaseMigration, convertZodSchemaToCollectionSchema, createMigrationFileStructure, createPermissions, dateField, detectDestructiveChanges, detectFieldChanges, discoverSchemaFiles, editorField, emailField, extractComprehensiveFieldOptions, extractFieldDefinitions, extractFieldOptions, extractIndexes, extractSchemaDefinitions, fileField, filesField, filterSystemCollections, findLatestSnapshot, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, formatChangeSummary, generate, generateChangeSummary, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, executeGenerate as generateMigration, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, geoPointField, getArrayElementType, getCollectionNameFromFile, getDefaultValue, getFieldTypeInfo, getMaxSelect, executeStatus as getMigrationStatus, getMinSelect, getSnapshotPath, getSnapshotVersion, getUsersSystemFields, importSchemaModule, inputImageFileSchema, isArrayType, isAuthCollection, isEditorField, isFieldRequired, isFileFieldByName, isGeoPointType, isMultipleRelationField, isPermissionSchema, isRelationField, isSingleRelationField, isSystemCollection, isTemplateConfig, jsonField, loadBaseMigration, loadConfig, loadSnapshot, loadSnapshotIfExists, logError, logInfo, logSection, logSuccess, logWarning, mapZodArrayType, mapZodBooleanType, mapZodDateType, mapZodEnumType, mapZodNumberType, mapZodRecordType, mapZodStringType, mapZodTypeToPocketBase, matchCollectionsByName, matchFieldsByName, mergePermissions, mergeSnapshots, numberField, omitImageFilesSchema, parseSchemaFiles, pluralize, relationField, relationsField, requiresForceFlag, resolveTargetCollection, resolveTemplate, saveSnapshot, selectField, selectSchemaForCollection, singularize, snapshotExists, textField, toCollectionName, unwrapZodType, urlField, validatePermissionConfig, validateRuleExpression, validateSnapshot, withIndexes, withPermissions, withProgress, writeMigrationFile };
+export { CLIUsageError, ConfigurationError, DiffEngine, FIELD_TYPE_INFO, FileSystemError, MigrationError, MigrationGenerationError, MigrationGenerator, POCKETBASE_FIELD_TYPES, PermissionTemplates, SchemaAnalyzer, SchemaParsingError, SnapshotError, SnapshotManager, StatusEnum, UserInputSchema, UserMutator, UserSchema, aggregateChanges, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, buildFieldDefinition, buildSchemaDefinition, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, convertPocketBaseMigration, convertZodSchemaToCollectionSchema, createMigrationFileStructure, createPermissions, dateField, detectDestructiveChanges, detectFieldChanges, discoverSchemaFiles, editorField, emailField, extractComprehensiveFieldOptions, extractFieldDefinitions, extractFieldOptions, extractIndexes, extractRelationMetadata, extractSchemaDefinitions, fileField, filesField, filterSystemCollections, findLatestSnapshot, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, formatChangeSummary, generate, generateChangeSummary, generateCollectionCreation, generateCollectionPermissions, generateCollectionRules, generateDownMigration, generateFieldAddition, generateFieldDefinitionObject, generateFieldDeletion, generateFieldModification, generateFieldsArray, generateIndexesArray, executeGenerate as generateMigration, generateMigrationDescription, generateMigrationFilename, generatePermissionUpdate, generateTimestamp, generateUpMigration, geoPointField, getArrayElementType, getCollectionNameFromFile, getDefaultValue, getFieldTypeInfo, getMaxSelect, executeStatus as getMigrationStatus, getMinSelect, getSnapshotPath, getSnapshotVersion, getUsersSystemFields, importSchemaModule, inputImageFileSchema, isArrayType, isAuthCollection, isEditorField, isFieldRequired, isFileFieldByName, isGeoPointType, isMultipleRelationField, isPermissionSchema, isRelationField, isSingleRelationField, isSystemCollection, isTemplateConfig, jsonField, loadBaseMigration, loadConfig, loadSnapshot, loadSnapshotIfExists, logError, logInfo, logSection, logSuccess, logWarning, mapZodArrayType, mapZodBooleanType, mapZodDateType, mapZodEnumType, mapZodNumberType, mapZodRecordType, mapZodStringType, mapZodTypeToPocketBase, matchCollectionsByName, matchFieldsByName, mergePermissions, mergeSnapshots, numberField, omitImageFilesSchema, parseSchemaFiles, pluralize, relationField, relationsField, requiresForceFlag, resolveTargetCollection, resolveTemplate, saveSnapshot, selectField, selectSchemaForCollection, singularize, snapshotExists, textField, toCollectionName, unwrapZodType, urlField, validatePermissionConfig, validateRuleExpression, validateSnapshot, withIndexes, withPermissions, withProgress, writeMigrationFile };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map