on-zero 0.4.1 → 0.4.2

package/dist/cjs/generate.native.js

@@ -41,6 +41,7 @@ module.exports = __toCommonJS(generate_exports);
 var import_crypto = require("crypto"),
   import_fs = require("fs"),
   import_path = require("path"),
+  import_generate_helpers = require("./generate-helpers.native.js"),
   hash = function (s) {
     return (0, import_crypto.createHash)("sha256").update(s).digest("hex");
   },
@@ -79,209 +80,6 @@ function writeFileIfChanged(filePath, content) {
     cachedHash = generateCache[filePath];
   return cachedHash === contentHash && (0, import_fs.existsSync)(filePath) ? !1 : ((0, import_fs.writeFileSync)(filePath, content, "utf-8"), generateCache[filePath] = contentHash, !0);
 }
-function generateModelsFile(modelFiles, modelsDirName) {
-  var modelNames = modelFiles.map(function (f) {
-      return (0, import_path.basename)(f, ".ts");
-    }).sort(),
-    getImportName = function (name) {
-      return name === "user" ? "userPublic" : name;
-    },
-    imports = modelNames.map(function (name) {
-      return `import * as ${getImportName(name)} from '../${modelsDirName}/${name}'`;
-    }).join(`
-`),
-    sortedByImportName = [...modelNames].sort(function (a, b) {
-      return getImportName(a).localeCompare(getImportName(b));
-    }),
-    modelsObj = `export const models = {
-${sortedByImportName.map(function (name) {
-      return `  ${getImportName(name)},`;
-    }).join(`
-`)}
-}`;
-  return `// auto-generated by: on-zero generate
-${imports}
-
-${modelsObj}
-`;
-}
-function generateTypesFile(modelFiles) {
-  var modelNames = modelFiles.map(function (f) {
-      return (0, import_path.basename)(f, ".ts");
-    }).sort(),
-    getSchemaName = function (name) {
-      return name === "user" ? "userPublic" : name;
-    },
-    typeExports = modelNames.map(function (name) {
-      var pascalName = name.charAt(0).toUpperCase() + name.slice(1),
-        schemaName = getSchemaName(name);
-      return `export type ${pascalName} = TableInsertRow<typeof schema.${schemaName}>
-export type ${pascalName}Update = TableUpdateRow<typeof schema.${schemaName}>`;
-    }).join(`
-
-`);
-  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'
-import type * as schema from './tables'
-
-${typeExports}
-`;
-}
-function generateTablesFile(modelFiles, modelsDirName) {
-  var modelNames = modelFiles.map(function (f) {
-      return (0, import_path.basename)(f, ".ts");
-    }).sort(),
-    getExportName = function (name) {
-      return name === "user" ? "userPublic" : name;
-    },
-    exports = modelNames.map(function (name) {
-      return `export { schema as ${getExportName(name)} } from '../${modelsDirName}/${name}'`;
-    }).join(`
-`);
-  return `// auto-generated by: on-zero generate
-
-${exports}
-`;
-}
-function generateReadmeFile() {
-  return `# generated
-
-this folder is auto-generated by on-zero. do not edit files here directly.
-
-## what's generated
-
-- \`models.ts\` - exports all models from ../models
-- \`types.ts\` - typescript types derived from table schemas
-- \`tables.ts\` - exports table schemas for type inference
-- \`groupedQueries.ts\` - namespaced query re-exports for client setup
-- \`syncedQueries.ts\` - namespaced syncedQuery wrappers for server setup
-- \`syncedMutations.ts\` - valibot validators for mutation args (server auto-validation)
-
-## usage guidelines
-
-**do not import generated files outside of the data folder.**
-
-### queries
-
-write your queries as plain functions in \`../queries/\` and import them directly:
-
-\`\`\`ts
-// \u2705 good - import from queries
-import { channelMessages } from '~/data/queries/message'
-\`\`\`
-
-the generated query files are only used internally by zero client/server setup.
-
-### types
-
-you can import types from this folder, but prefer re-exporting from \`../types.ts\`:
-
-\`\`\`ts
-// \u274C okay but not preferred
-import type { Message } from '~/data/generated/types'
-
-// \u2705 better - re-export from types.ts
-import type { Message } from '~/data/types'
-\`\`\`
-
-## regeneration
-
-files are regenerated when you run:
-
-\`\`\`bash
-bun on-zero generate
-\`\`\`
-
-or in watch mode:
-
-\`\`\`bash
-bun on-zero generate --watch
-\`\`\`
-
-## more info
-
-see the [on-zero readme](./node_modules/on-zero/README.md) for full documentation.
-`;
-}
-function generateGroupedQueriesFile(queries) {
-  var sortedFiles = [...new Set(queries.map(function (q) {
-      return q.sourceFile;
-    }))].sort(),
-    exports = sortedFiles.map(function (file) {
-      return `export * as ${file} from '../queries/${file}'`;
-    }).join(`
-`);
-  return `/**
- * auto-generated by: on-zero generate
- *
- * grouped query re-exports for minification-safe query identity.
- * this file re-exports all query modules - while this breaks tree-shaking,
- * queries are typically small and few in number even in larger apps.
- */
-${exports}
-`;
-}
-function generateSyncedQueriesFile(queries) {
-  var queryByFile = /* @__PURE__ */new Map(),
-    _iteratorNormalCompletion = !0,
-    _didIteratorError = !1,
-    _iteratorError = void 0;
-  try {
-    for (var _iterator = queries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-      var q = _step.value;
-      queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
-    }
-  } catch (err) {
-    _didIteratorError = !0, _iteratorError = err;
-  } finally {
-    try {
-      !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-    } finally {
-      if (_didIteratorError) throw _iteratorError;
-    }
-  }
-  var sortedFiles = Array.from(queryByFile.keys()).sort(),
-    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(function (file) {
-      var fileQueries = queryByFile.get(file).sort(function (a, b) {
-          return a.name.localeCompare(b.name);
-        }),
-        queryDefs = fileQueries.map(function (q2) {
-          var validatorDef = q2.valibotCode.trim();
-          if (q2.params === "void" || !validatorDef) return `  ${q2.name}: defineQuery(() => Queries.${file}.${q2.name}()),`;
-          var indentedValidator = validatorDef.split(`
-`).map(function (line, i) {
-            return i === 0 ? line : `    ${line}`;
-          }).join(`
-`);
-          return `  ${q2.name}: defineQuery(
-    ${indentedValidator},
-    ({ args }) => Queries.${file}.${q2.name}(args)
-  ),`;
-        }).join(`
-`);
-      return `const ${file} = {
-${queryDefs}
-}`;
-    }).join(`
-
-`),
-    queriesObject = sortedFiles.map(function (file) {
-      return `  ${file},`;
-    }).join(`
-`);
-  return `${imports}
-${namespaceDefs}
-
-export const queries = defineQueries({
-${queriesObject}
-})
-`;
-}
 function createTypeResolver(ts, files, dir) {
   var configPath = ts.findConfigFile(dir, ts.sys.fileExists, "tsconfig.json"),
     compilerOptions = {
@@ -551,7 +349,7 @@ function extractSchemaColumns(ts, sourceFile, columns, primaryKeys) {
                 var colName = (_prop_name = prop.name) === null || _prop_name === void 0 ? void 0 : _prop_name.getText(sourceFile);
                 if (colName) {
                   var initText = prop.initializer.getText(sourceFile),
-                    colType = parseColumnType(initText);
+                    colType = (0, import_generate_helpers.parseColumnType)(initText);
                   columns[colName] = colType;
                 }
               }
@@ -572,224 +370,6 @@ function extractSchemaColumns(ts, sourceFile, columns, primaryKeys) {
   }
   visit(sourceFile);
 }
-function parseColumnType(initText) {
-  var optional = initText.includes(".optional()"),
-    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"), {
-    type,
-    optional,
-    customType: void 0
-  };
-}
-function columnTypeToValibot(col) {
-  var base = "v.string()";
-  switch (col.type) {
-    case "string":
-      base = "v.string()";
-      break;
-    case "number":
-      base = "v.number()";
-      break;
-    case "boolean":
-      base = "v.boolean()";
-      break;
-    case "json":
-      base = "v.unknown()";
-      break;
-    case "enum":
-      base = "v.string()";
-      break;
-  }
-  return col.optional ? `v.optional(v.nullable(${base}))` : base;
-}
-function shouldSkipObjectKey(name) {
-  return name.startsWith("__@");
-}
-function formatObjectKey(name) {
-  return /^[$A-Z_a-z][$\w]*$/.test(name) ? name : JSON.stringify(name);
-}
-function schemaColumnsToValibot(columns, primaryKeys, mode) {
-  var entries = [];
-  if (mode === "delete") {
-    var _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = primaryKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-        var pk = _step.value,
-          col = columns[pk];
-        col && entries.push(`${formatObjectKey(pk)}: ${columnTypeToValibot({
-          ...col,
-          optional: !1
-        })}`);
-      }
-    } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
-    } finally {
-      try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-      } finally {
-        if (_didIteratorError) throw _iteratorError;
-      }
-    }
-  } else if (mode === "update") {
-    var _iteratorNormalCompletion1 = !0,
-      _didIteratorError1 = !1,
-      _iteratorError1 = void 0;
-    try {
-      for (var _iterator1 = Object.entries(columns)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
-        var [name, col1] = _step1.value,
-          isPK = primaryKeys.includes(name);
-        isPK ? entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot({
-          ...col1,
-          optional: !1
-        })}`) : entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot({
-          ...col1,
-          optional: !0
-        })}`);
-      }
-    } catch (err) {
-      _didIteratorError1 = !0, _iteratorError1 = err;
-    } finally {
-      try {
-        !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
-      } finally {
-        if (_didIteratorError1) throw _iteratorError1;
-      }
-    }
-  } else {
-    var _iteratorNormalCompletion2 = !0,
-      _didIteratorError2 = !1,
-      _iteratorError2 = void 0;
-    try {
-      for (var _iterator2 = Object.entries(columns)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
-        var [name1, col2] = _step2.value;
-        entries.push(`${formatObjectKey(name1)}: ${columnTypeToValibot(col2)}`);
-      }
-    } catch (err) {
-      _didIteratorError2 = !0, _iteratorError2 = err;
-    } finally {
-      try {
-        !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
-      } finally {
-        if (_didIteratorError2) throw _iteratorError2;
-      }
-    }
-  }
-  return `v.object({
-    ${entries.join(`,
-    `)},
-  })`;
-}
-function generateSyncedMutationsFile(modelMutations) {
-  var sorted = [...modelMutations].sort(function (a, b) {
-      return a.modelName.localeCompare(b.modelName);
-    }),
-    modelDefs = sorted.map(function (model) {
-      var entries = [];
-      if (model.hasCRUD && Object.keys(model.columns).length > 0) for (var _loop = function (_i2, _iter2) {
-          var mode = _iter2[_i2],
-            hasCustomOverride = model.custom.some(function (m) {
-              return m.name === mode;
-            });
-          if (hasCustomOverride) {
-            var customMut = model.custom.find(function (m) {
-              return 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)},`);
-        }, _i = 0, _iter = ["insert", "update", "delete"]; _i < _iter.length; _i++) _loop(_i, _iter);
-      var _iteratorNormalCompletion = !0,
-        _didIteratorError = !1,
-        _iteratorError = void 0;
-      try {
-        for (var _iterator = model.custom[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-          var mut = _step.value;
-          if (!(model.hasCRUD && ["insert", "update", "delete", "upsert"].includes(mut.name))) {
-            if (mut.paramType === "void" || !mut.valibotCode) {
-              entries.push(`    ${mut.name}: v.void_(),`);
-              continue;
-            }
-            entries.push(`    ${mut.name}: ${extractValibotExpression(mut.valibotCode)},`);
-          }
-        }
-      } catch (err) {
-        _didIteratorError = !0, _iteratorError = err;
-      } finally {
-        try {
-          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-        } finally {
-          if (_didIteratorError) throw _iteratorError;
-        }
-      }
-      return `  ${model.modelName}: {
-${entries.join(`
-`)}
-  },`;
-    }).join(`
-`);
-  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}
-}
-`;
-}
-function extractValibotExpression(valibotCode) {
-  return valibotCode.trim() || "v.unknown()";
-}
-function parseTypeString(type) {
-  if (type = type.trim(), 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_()";
-  if (type === "null") return "v.null_()";
-  if (type === "any" || type === "unknown") return "v.unknown()";
-  if (type.startsWith("{") && type.endsWith("}")) {
-    var inner = type.slice(1, -1).trim();
-    if (!inner) return "v.object({})";
-    var normalized = inner.replace(/\n/g, "; ").replace(/;\s*;/g, ";"),
-      entries = [],
-      _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = normalized.split(";")[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-        var part = _step.value,
-          trimmed = part.trim().replace(/,\s*$/, "");
-        if (trimmed) {
-          var match = trimmed.match(/^(?:readonly\s+)?(\w+)(\?)?:\s*(.+)$/);
-          if (match) {
-            var [, name, opt, typeStr] = match,
-              parsed = parseTypeString(typeStr.trim());
-            if (!parsed) return null;
-            var val = parsed;
-            opt && (val = `v.optional(${val})`), entries.push(`${formatObjectKey(name)}: ${val}`);
-          }
-        }
-      }
-    } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
-    } finally {
-      try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-      } finally {
-        if (_didIteratorError) throw _iteratorError;
-      }
-    }
-    return entries.length === 0 ? "v.object({})" : `v.object({
-    ${entries.join(`,
-    `)},
-  })`;
-  }
-  if (type.endsWith("[]")) {
-    var inner1 = parseTypeString(type.slice(0, -2).trim());
-    return inner1 ? `v.array(${inner1})` : null;
-  }
-  return null;
-}
 function tsTypeToValibot(ts, checker, type, seen) {
   seen || (seen = /* @__PURE__ */new Set());
   var flags = type.getFlags();
@@ -851,11 +431,11 @@ function tsTypeToValibot(ts, checker, type, seen) {
       for (var _iterator = props[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
         var prop = _step.value,
           name1 = prop.getName();
-        if (!shouldSkipObjectKey(name1)) {
+        if (!(0, import_generate_helpers.shouldSkipObjectKey)(name1)) {
           var propType = resolveSymbolType(prop),
             isOptional = !!(prop.getFlags() & ts.SymbolFlags.Optional),
             val = recurse(propType);
-          isOptional && !val.startsWith("v.optional(") && (val = `v.optional(${val})`), entries.push(`${formatObjectKey(name1)}: ${val}`);
+          isOptional && !val.startsWith("v.optional(") && (val = `v.optional(${val})`), entries.push(`${(0, import_generate_helpers.formatObjectKey)(name1)}: ${val}`);
         }
       }
     } catch (err) {
@@ -898,11 +478,11 @@ function tsTypeToValibot(ts, checker, type, seen) {
       for (var _iterator1 = props1[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
         var prop1 = _step1.value,
           name3 = prop1.getName();
-        if (!shouldSkipObjectKey(name3)) {
+        if (!(0, import_generate_helpers.shouldSkipObjectKey)(name3)) {
           var propType1 = resolveSymbolType(prop1),
             isOptional1 = !!(prop1.getFlags() & ts.SymbolFlags.Optional),
             val1 = recurse(propType1);
-          isOptional1 && !val1.startsWith("v.optional(") && (val1 = `v.optional(${val1})`), entries1.push(`${formatObjectKey(name3)}: ${val1}`);
+          isOptional1 && !val1.startsWith("v.optional(") && (val1 = `v.optional(${val1})`), entries1.push(`${(0, import_generate_helpers.formatObjectKey)(name3)}: ${val1}`);
         }
       }
     } catch (err) {
@@ -1045,18 +625,24 @@ async function generate(options) {
     filesWithSchema = allModelFiles.filter(function (f) {
       return (0, import_fs.readFileSync)((0, import_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(");
     }),
-    writeResults = [writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), generateModelsFile(allModelFiles, modelsDirName)),
+    allModelNames = allModelFiles.map(function (f) {
+      return (0, import_path.basename)(f, ".ts");
+    }),
+    schemaModelNames = filesWithSchema.map(function (f) {
+      return (0, import_path.basename)(f, ".ts");
+    }),
+    writeResults = [writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), (0, import_generate_helpers.generateModelsFile)(allModelNames, modelsDirName)),
     // only generate types.ts and tables.ts when model files define schemas.
     // when using drizzle-zero CLI for schema generation, these files are
     // managed externally and should not be overwritten.
-    ...(filesWithSchema.length > 0 ? [writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), generateTypesFile(filesWithSchema)), writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), generateTablesFile(filesWithSchema, modelsDirName))] : []), writeFileIfChanged((0, import_path.resolve)(generatedDir, "README.md"), generateReadmeFile())],
+    ...(filesWithSchema.length > 0 ? [writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), (0, import_generate_helpers.generateTypesFile)(schemaModelNames)), writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), (0, import_generate_helpers.generateTablesFile)(schemaModelNames, modelsDirName))] : []), writeFileIfChanged((0, import_path.resolve)(generatedDir, "README.md"), (0, import_generate_helpers.generateReadmeFile)())],
     filesChanged = writeResults.filter(Boolean).length,
     queryCount = 0,
     mutationCount = 0,
     ts = await import("typescript"),
     typeToValibot = function (paramType) {
       try {
-        return parseTypeString(paramType.trim());
+        return (0, import_generate_helpers.parseTypeString)(paramType.trim());
       } catch {
         return null;
       }
@@ -1143,8 +729,8 @@ async function generate(options) {
       }
     }
     queryCount = allQueries.length;
-    var groupedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "groupedQueries.ts"), generateGroupedQueriesFile(allQueries)),
-      syncedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedQueries.ts"), generateSyncedQueriesFile(allQueries));
+    var groupedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "groupedQueries.ts"), (0, import_generate_helpers.generateGroupedQueriesFile)(allQueries)),
+      syncedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedQueries.ts"), (0, import_generate_helpers.generateSyncedQueriesFile)(allQueries));
     groupedChanged && filesChanged++, syncedChanged && filesChanged++;
   }
   var allModelMutations = [],
@@ -1274,7 +860,7 @@ async function generate(options) {
     }
   }
   if (allModelMutations.length > 0) {
-    var mutationsChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedMutations.ts"), generateSyncedMutationsFile(allModelMutations));
+    var mutationsChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedMutations.ts"), (0, import_generate_helpers.generateSyncedMutationsFile)(allModelMutations));
     mutationsChanged && filesChanged++;
   }
   if (filesChanged > 0 && !silent && console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas)${queryCount ? `, ${queryCount} queries` : ""}${mutationCount ? `, ${mutationCount} mutations` : ""}`), filesChanged > 0 && after) {