pocketbase-zod-schema 0.1.2 → 0.1.3

package/dist/migration/generator.d.cts

@@ -131,7 +131,7 @@ declare function generateIndexesArray(indexes?: string[]): string;
  * @param varName - Variable name to use for the collection (default: 'collection')
  * @returns JavaScript code for creating the collection
  */
-declare function generateCollectionCreation(collection: CollectionSchema, varName?: string): string;
+declare function generateCollectionCreation(collection: CollectionSchema, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for adding a field to an existing collection
  * Uses the appropriate Field constructor based on field type
@@ -139,9 +139,10 @@ declare function generateCollectionCreation(collection: CollectionSchema, varNam
  * @param collectionName - Name of the collection
  * @param field - Field definition to add
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for adding the field
  */
-declare function generateFieldAddition(collectionName: string, field: FieldDefinition, varName?: string): string;
+declare function generateFieldAddition(collectionName: string, field: FieldDefinition, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for modifying an existing field
  * Updates field properties based on detected changes
@@ -149,18 +150,20 @@ declare function generateFieldAddition(collectionName: string, field: FieldDefin
  * @param collectionName - Name of the collection
  * @param modification - Field modification details
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @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): string;
+declare function generateFieldModification(collectionName: string, modification: FieldModification, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for deleting a field from a collection
  *
  * @param collectionName - Name of the collection
  * @param fieldName - Name of the field to delete
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for deleting the field
  */
-declare function generateFieldDeletion(collectionName: string, fieldName: string, varName?: string): string;
+declare function generateFieldDeletion(collectionName: string, fieldName: string, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for updating collection permissions
  * Handles permission rule updates including manageRule for auth collections
@@ -169,9 +172,10 @@ declare function generateFieldDeletion(collectionName: string, fieldName: string
  * @param ruleType - Type of permission rule to update
  * @param newValue - New permission rule value
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for updating the permission
  */
-declare function generatePermissionUpdate(collectionName: string, ruleType: string, newValue: string | null, varName?: string): string;
+declare function generatePermissionUpdate(collectionName: string, ruleType: string, newValue: string | null, varName?: string, isLast?: boolean): string;
 /**
  * Generates the up migration function code
  * Applies all changes from the diff in the correct order

package/dist/migration/generator.d.ts

@@ -131,7 +131,7 @@ declare function generateIndexesArray(indexes?: string[]): string;
  * @param varName - Variable name to use for the collection (default: 'collection')
  * @returns JavaScript code for creating the collection
  */
-declare function generateCollectionCreation(collection: CollectionSchema, varName?: string): string;
+declare function generateCollectionCreation(collection: CollectionSchema, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for adding a field to an existing collection
  * Uses the appropriate Field constructor based on field type
@@ -139,9 +139,10 @@ declare function generateCollectionCreation(collection: CollectionSchema, varNam
  * @param collectionName - Name of the collection
  * @param field - Field definition to add
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for adding the field
  */
-declare function generateFieldAddition(collectionName: string, field: FieldDefinition, varName?: string): string;
+declare function generateFieldAddition(collectionName: string, field: FieldDefinition, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for modifying an existing field
  * Updates field properties based on detected changes
@@ -149,18 +150,20 @@ declare function generateFieldAddition(collectionName: string, field: FieldDefin
  * @param collectionName - Name of the collection
  * @param modification - Field modification details
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @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): string;
+declare function generateFieldModification(collectionName: string, modification: FieldModification, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for deleting a field from a collection
  *
  * @param collectionName - Name of the collection
  * @param fieldName - Name of the field to delete
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for deleting the field
  */
-declare function generateFieldDeletion(collectionName: string, fieldName: string, varName?: string): string;
+declare function generateFieldDeletion(collectionName: string, fieldName: string, varName?: string, isLast?: boolean): string;
 /**
  * Generates code for updating collection permissions
  * Handles permission rule updates including manageRule for auth collections
@@ -169,9 +172,10 @@ declare function generateFieldDeletion(collectionName: string, fieldName: string
  * @param ruleType - Type of permission rule to update
  * @param newValue - New permission rule value
  * @param varName - Variable name to use for the collection (default: auto-generated)
+ * @param isLast - Whether this is the last operation (will return the result)
  * @returns JavaScript code for updating the permission
  */
-declare function generatePermissionUpdate(collectionName: string, ruleType: string, newValue: string | null, varName?: string): string;
+declare function generatePermissionUpdate(collectionName: string, ruleType: string, newValue: string | null, varName?: string, isLast?: boolean): string;
 /**
  * Generates the up migration function code
  * Applies all changes from the diff in the correct order

package/dist/migration/generator.js

@@ -80,10 +80,8 @@ Cause: ${this.originalError.message}`);
 var DEFAULT_TEMPLATE = `/// <reference path="{{TYPES_PATH}}" />
 migrate((app) => {
 {{UP_CODE}}
-  return true;
 }, (app) => {
 {{DOWN_CODE}}
-  return true;
 });
 `;
 var DEFAULT_CONFIG = {
@@ -248,7 +246,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}`);
@@ -332,7 +331,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}",`);
@@ -348,7 +347,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) {
@@ -379,7 +378,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}`);
@@ -393,7 +393,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}`;
@@ -403,10 +403,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`;
@@ -420,7 +420,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)};`);
@@ -430,10 +431,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`;
@@ -442,18 +443,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`;
@@ -462,29 +463,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) {
@@ -576,7 +577,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 = [];
@@ -678,7 +696,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;