pocketbase-zod-schema 0.3.1 → 0.3.2

package/dist/cli/index.d.cts

@@ -1,7 +1,7 @@
 export { MigrationConfig, StatusOutput, VerbosityLevel, createProgressBar, createSpinner, formatChangeSummary, formatDuration, formatStatusJson, getMigrationsDirectory, getSchemaDirectory, getVerbosity, loadConfig, logBox, logDebug, logError, logInfo, logKeyValue, logList, logSection, logStep, logSuccess, logTable, logTimed, logTimestamp, logWarning, setVerbosity, withProgress } from './utils/index.cjs';
 import 'ora';
-import '../types-D-Fsdn_O.cjs';
-import '../fields-RVj26U-O.cjs';
+import '../types-CVxPCgWX.cjs';
+import '../fields-DBBm06VU.cjs';
 import 'zod';
 import '../permissions-ZHafVSIx.cjs';
 

package/dist/cli/index.d.ts

@@ -1,7 +1,7 @@
 export { MigrationConfig, StatusOutput, VerbosityLevel, createProgressBar, createSpinner, formatChangeSummary, formatDuration, formatStatusJson, getMigrationsDirectory, getSchemaDirectory, getVerbosity, loadConfig, logBox, logDebug, logError, logInfo, logKeyValue, logList, logSection, logStep, logSuccess, logTable, logTimed, logTimestamp, logWarning, setVerbosity, withProgress } from './utils/index.js';
 import 'ora';
-import '../types-CUVzgZ9k.js';
-import '../fields-RVj26U-O.js';
+import '../types-Dfp-NP2D.js';
+import '../fields-DBBm06VU.js';
 import 'zod';
 import '../permissions-ZHafVSIx.js';
 

package/dist/cli/index.js

@@ -2141,7 +2141,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);
@@ -2435,11 +2435,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");
@@ -2557,20 +2555,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;
@@ -2659,20 +2660,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;