on-zero 0.4.3 → 0.4.4

package/dist/cjs/generate-helpers.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var generate_helpers_exports = {};
 __export(generate_helpers_exports, {
@@ -47,7 +49,8 @@ function getModelImportName(name) {
   return name === "user" ? "userPublic" : name;
 }
 function parseTypeString(type) {
-  if (type = type.trim(), type === "string") return "v.string()";
+  type = type.trim();
+  if (type === "string") return "v.string()";
   if (type === "number") return "v.number()";
   if (type === "boolean") return "v.boolean()";
   if (type === "void" || type === "undefined") return "v.void_()";
@@ -56,22 +59,23 @@ function parseTypeString(type) {
   if (type.startsWith("{") && type.endsWith("}")) {
     const inner = type.slice(1, -1).trim();
     if (!inner) return "v.object({})";
-    const normalized = inner.replace(/\n/g, "; ").replace(/;\s*;/g, ";"),
-      entries = [];
+    const normalized = inner.replace(/\n/g, "; ").replace(/;\s*;/g, ";");
+    const entries = [];
     for (const part of normalized.split(";")) {
       const trimmed = part.trim().replace(/,\s*$/, "");
       if (!trimmed) continue;
       const match = trimmed.match(/^(?:readonly\s+)?(\w+)(\?)?:\s*(.+)$/);
       if (!match) continue;
-      const [, name, opt, typeStr] = match,
-        parsed = parseTypeString(typeStr.trim());
+      const [, name, opt, typeStr] = match;
+      const parsed = parseTypeString(typeStr.trim());
       if (!parsed) return null;
       let val = parsed;
-      opt && (val = `v.optional(${val})`), entries.push(`${formatObjectKey(name)}: ${val}`);
+      if (opt) val = `v.optional(${val})`;
+      entries.push(`${formatObjectKey(name)}: ${val}`);
     }
-    return entries.length === 0 ? "v.object({})" : `v.object({
-    ${entries.join(`,
-    `)},
+    if (entries.length === 0) return "v.object({})";
+    return `v.object({
+    ${entries.join(",\n    ")},
   })`;
   }
   if (type.endsWith("[]")) {
@@ -81,12 +85,11 @@ function parseTypeString(type) {
   return null;
 }
 function generateModelsFile(modelNames, modelsDirName) {
-  const sorted = [...modelNames].sort(),
-    imports = sorted.map(name => `import * as ${getModelImportName(name)} from '../${modelsDirName}/${name}'`).join(`
-`),
-    modelsObj = `export const models = {
-${[...sorted].sort((a, b) => getModelImportName(a).localeCompare(getModelImportName(b))).map(name => `  ${getModelImportName(name)},`).join(`
-`)}
+  const sorted = [...modelNames].sort();
+  const imports = sorted.map(name => `import * as ${getModelImportName(name)} from '../${modelsDirName}/${name}'`).join("\n");
+  const sortedByImportName = [...sorted].sort((a, b) => getModelImportName(a).localeCompare(getModelImportName(b)));
+  const modelsObj = `export const models = {
+${sortedByImportName.map(name => `  ${getModelImportName(name)},`).join("\n")}
 }`;
   return `// auto-generated by: on-zero generate
 ${imports}
@@ -95,24 +98,25 @@ ${modelsObj}
 `;
 }
 function generateTypesFile(modelNames) {
-  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'
-import type * as schema from './tables'
-
-${[...modelNames].sort().map(name => {
-    const pascalName = name.charAt(0).toUpperCase() + name.slice(1),
-      schemaName = getModelImportName(name);
+  const sorted = [...modelNames].sort();
+  const typeExports = sorted.map(name => {
+    const pascalName = name.charAt(0).toUpperCase() + name.slice(1);
+    const schemaName = getModelImportName(name);
     return `export type ${pascalName} = TableInsertRow<typeof schema.${schemaName}>
 export type ${pascalName}Update = TableUpdateRow<typeof schema.${schemaName}>`;
-  }).join(`
+  }).join("\n\n");
+  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'
+import type * as schema from './tables'
 
-`)}
+${typeExports}
 `;
 }
 function generateTablesFile(modelNames, modelsDirName) {
+  const sorted = [...modelNames].sort();
+  const exports = sorted.map(name => `export { schema as ${getModelImportName(name)} } from '../${modelsDirName}/${name}'`).join("\n");
   return `// auto-generated by: on-zero generate
 
-${[...modelNames].sort().map(name => `export { schema as ${getModelImportName(name)} } from '../${modelsDirName}/${name}'`).join(`
-`)}
+${exports}
 `;
 }
 function generateReadmeFile() {
@@ -176,6 +180,8 @@ see the [on-zero readme](./node_modules/on-zero/README.md) for full documentatio
 `;
 }
 function generateGroupedQueriesFile(queries) {
+  const sortedFiles = [...new Set(queries.map(q => q.sourceFile))].sort();
+  const exports = sortedFiles.map(file => `export * as ${file} from '../queries/${file}'`).join("\n");
   return `/**
  * auto-generated by: on-zero generate
  *
@@ -183,41 +189,42 @@ function generateGroupedQueriesFile(queries) {
  * this file re-exports all query modules - while this breaks tree-shaking,
  * queries are typically small and few in number even in larger apps.
  */
-${[...new Set(queries.map(q => q.sourceFile))].sort().map(file => `export * as ${file} from '../queries/${file}'`).join(`
-`)}
+${exports}
 `;
 }
 function generateSyncedQueriesFile(queries) {
   const queryByFile = /* @__PURE__ */new Map();
-  for (const q of queries) queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
-  const sortedFiles = Array.from(queryByFile.keys()).sort(),
-    imports = `// auto-generated by: on-zero generate
+  for (const q of queries) {
+    if (!queryByFile.has(q.sourceFile)) {
+      queryByFile.set(q.sourceFile, []);
+    }
+    queryByFile.get(q.sourceFile).push(q);
+  }
+  const sortedFiles = Array.from(queryByFile.keys()).sort();
+  const imports = `// auto-generated by: on-zero generate
 // server-side query definitions with validators
 import { defineQuery, defineQueries } from '@rocicorp/zero'
 import * as v from 'valibot'
 import * as Queries from './groupedQueries'
-`,
-    namespaceDefs = sortedFiles.map(file => {
-      const queryDefs = queryByFile.get(file).sort((a, b) => a.name.localeCompare(b.name)).map(q => {
-        const validatorDef = q.valibotCode.trim();
-        if (q.params === "void" || !validatorDef) return `  ${q.name}: defineQuery(() => Queries.${file}.${q.name}()),`;
-        const indentedValidator = validatorDef.split(`
-`).map((line, i) => i === 0 ? line : `    ${line}`).join(`
-`);
-        return `  ${q.name}: defineQuery(
+`;
+  const namespaceDefs = sortedFiles.map(file => {
+    const fileQueries = queryByFile.get(file).sort((a, b) => a.name.localeCompare(b.name));
+    const queryDefs = fileQueries.map(q => {
+      const validatorDef = q.valibotCode.trim();
+      if (q.params === "void" || !validatorDef) {
+        return `  ${q.name}: defineQuery(() => Queries.${file}.${q.name}()),`;
+      }
+      const indentedValidator = validatorDef.split("\n").map((line, i) => i === 0 ? line : `    ${line}`).join("\n");
+      return `  ${q.name}: defineQuery(
     ${indentedValidator},
     ({ args }) => Queries.${file}.${q.name}(args)
   ),`;
-      }).join(`
-`);
-      return `const ${file} = {
+    }).join("\n");
+    return `const ${file} = {
 ${queryDefs}
 }`;
-    }).join(`
-
-`),
-    queriesObject = sortedFiles.map(file => `  ${file},`).join(`
-`);
+  }).join("\n\n");
+  const queriesObject = sortedFiles.map(file => `  ${file},`).join("\n");
   return `${imports}
 ${namespaceDefs}
 
@@ -249,22 +256,36 @@ function columnTypeToValibot(col) {
 }
 function schemaColumnsToValibot(columns, primaryKeys, mode) {
   const entries = [];
-  if (mode === "delete") for (const pk of primaryKeys) {
-    const col = columns[pk];
-    col && entries.push(`${formatObjectKey(pk)}: ${columnTypeToValibot({
-      ...col,
-      optional: !1
-    })}`);
-  } else if (mode === "update") for (const [name, col] of Object.entries(columns)) primaryKeys.includes(name) ? entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot({
-    ...col,
-    optional: !1
-  })}`) : entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot({
-    ...col,
-    optional: !0
-  })}`);else for (const [name, col] of Object.entries(columns)) entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot(col)}`);
+  if (mode === "delete") {
+    for (const pk of primaryKeys) {
+      const col = columns[pk];
+      if (col) entries.push(`${formatObjectKey(pk)}: ${columnTypeToValibot({
+        ...col,
+        optional: false
+      })}`);
+    }
+  } else if (mode === "update") {
+    for (const [name, col] of Object.entries(columns)) {
+      const isPK = primaryKeys.includes(name);
+      if (isPK) {
+        entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot({
+          ...col,
+          optional: false
+        })}`);
+      } else {
+        entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot({
+          ...col,
+          optional: true
+        })}`);
+      }
+    }
+  } else {
+    for (const [name, col] of Object.entries(columns)) {
+      entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot(col)}`);
+    }
+  }
   return `v.object({
-    ${entries.join(`,
-    `)},
+    ${entries.join(",\n    ")},
   })`;
 }
 function extractValibotExpression(valibotCode) {
@@ -273,25 +294,34 @@ function extractValibotExpression(valibotCode) {
 function parseColumnType(initText) {
   const optional = initText.includes(".optional()");
   let type = "string";
-  return initText.startsWith("number(") ? type = "number" : initText.startsWith("boolean(") ? type = "boolean" : initText.startsWith("json(") || initText.startsWith("json<") ? type = "json" : initText.startsWith("enumeration(") && (type = "enum"), {
+  if (initText.startsWith("number(")) type = "number";else if (initText.startsWith("boolean(")) type = "boolean";else if (initText.startsWith("json(") || initText.startsWith("json<")) type = "json";else if (initText.startsWith("enumeration(")) type = "enum";
+  return {
     type,
     optional,
     customType: void 0
   };
 }
 function generateSyncedMutationsFile(modelMutations) {
-  return `// auto-generated by: on-zero generate
-// mutation validators derived from model schemas and handler types
-import * as v from 'valibot'
-
-export const mutationValidators = {
-${[...modelMutations].sort((a, b) => a.modelName.localeCompare(b.modelName)).map(model => {
+  const sorted = [...modelMutations].sort((a, b) => a.modelName.localeCompare(b.modelName));
+  const modelDefs = sorted.map(model => {
     const entries = [];
-    if (model.hasCRUD && Object.keys(model.columns).length > 0) for (const mode of ["insert", "update", "delete"]) if (model.custom.some(m => m.name === mode)) {
-      const customMut = model.custom.find(m => m.name === mode);
-      customMut.valibotCode ? entries.push(`    ${mode}: ${extractValibotExpression(customMut.valibotCode)},`) : entries.push(`    ${mode}: ${schemaColumnsToValibot(model.columns, model.primaryKeys, mode)},`);
-    } else entries.push(`    ${mode}: ${schemaColumnsToValibot(model.columns, model.primaryKeys, mode)},`);
-    for (const mut of model.custom) if (!(model.hasCRUD && ["insert", "update", "delete", "upsert"].includes(mut.name))) {
+    if (model.hasCRUD && Object.keys(model.columns).length > 0) {
+      for (const mode of ["insert", "update", "delete"]) {
+        const hasCustomOverride = model.custom.some(m => m.name === mode);
+        if (hasCustomOverride) {
+          const customMut = model.custom.find(m => m.name === mode);
+          if (customMut.valibotCode) {
+            entries.push(`    ${mode}: ${extractValibotExpression(customMut.valibotCode)},`);
+          } else {
+            entries.push(`    ${mode}: ${schemaColumnsToValibot(model.columns, model.primaryKeys, mode)},`);
+          }
+        } else {
+          entries.push(`    ${mode}: ${schemaColumnsToValibot(model.columns, model.primaryKeys, mode)},`);
+        }
+      }
+    }
+    for (const mut of model.custom) {
+      if (model.hasCRUD && ["insert", "update", "delete", "upsert"].includes(mut.name)) continue;
       if (mut.paramType === "void" || !mut.valibotCode) {
         entries.push(`    ${mut.name}: v.void_(),`);
         continue;
@@ -299,11 +329,15 @@ ${[...modelMutations].sort((a, b) => a.modelName.localeCompare(b.modelName)).map
       entries.push(`    ${mut.name}: ${extractValibotExpression(mut.valibotCode)},`);
     }
     return `  ${model.modelName}: {
-${entries.join(`
-`)}
+${entries.join("\n")}
   },`;
-  }).join(`
-`)}
+  }).join("\n");
+  return `// auto-generated by: on-zero generate
+// mutation validators derived from model schemas and handler types
+import * as v from 'valibot'
+
+export const mutationValidators = {
+${modelDefs}
 }
 `;
 }