on-zero 0.16.20 → 0.16.21

package/dist/cjs/generate.cjs

@@ -49,9 +49,9 @@ var import_generate_helpers = require("./generate-helpers.cjs");
 var import_generate_layout = require("./generate-layout.cjs");
 var import_native_typescript = require("./native-typescript.cjs");
 const hash = s => (0, import_node_crypto.createHash)("sha256").update(s).digest("hex");
-const GENERATOR_CACHE_VERSION = "8";
+const GENERATOR_CACHE_VERSION = "10";
 const isGeneratorSourceFile = name => name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
-function hashInputTree(sourceRoots, generatedDir) {
+function hashInputTree(sourceRoots, generatedDir, dependencyPaths) {
   const parts = [];
   const seen = /* @__PURE__ */new Set();
   const walk = dir => {
@@ -72,6 +72,11 @@ function hashInputTree(sourceRoots, generatedDir) {
     }
   };
   for (const root of sourceRoots) walk(root);
+  for (const path of dependencyPaths) {
+    if (seen.has(path) || path.startsWith(`${generatedDir}/`) || !(0, import_node_fs.existsSync)(path)) continue;
+    seen.add(path);
+    parts.push(`${path}\0${(0, import_node_fs.readFileSync)(path, "utf-8")}`);
+  }
   return hash(parts.join("\0"));
 }
 let generateCache = {};
@@ -338,11 +343,12 @@ function extractSchemaColumns(sourceFile, columns, primaryKeys) {
 async function tsTypeToValibot(project, type, seen = /* @__PURE__ */new Set()) {
   const checker = project.checker;
   const flags = type.flags;
+  let path = seen;
   if (flags & (import_async.TypeFlags.Object | import_async.TypeFlags.Intersection)) {
     if (seen.has(type.id)) return "v.unknown()";
-    seen.add(type.id);
+    path = new Set(seen).add(type.id);
   }
-  const recurse = value => tsTypeToValibot(project, value, seen);
+  const recurse = value => tsTypeToValibot(project, value, path);
   if (flags & import_async.TypeFlags.String) return "v.string()";
   if (flags & import_async.TypeFlags.Number) return "v.number()";
   if (flags & import_async.TypeFlags.Boolean) return "v.boolean()";
@@ -525,13 +531,16 @@ function dataMembershipFromLayout(layout) {
     allTables: [...new Set(layout.instances.flatMap(instance => [...instance.syncTables, ...instance.supportTables]))].sort()
   };
 }
-async function loadGeneratorProject(baseDir) {
+async function loadGeneratorProject(baseDir, deferSources = false, tsconfig) {
   const sourcePaths = (0, import_native_typescript.collectTypeScriptSourcePaths)([baseDir, (0, import_node_path.resolve)((0, import_node_path.dirname)(baseDir), "database")]);
-  return (0, import_native_typescript.createNativeTypeScriptProject)(baseDir, sourcePaths);
+  return (0, import_native_typescript.createNativeTypeScriptProject)(baseDir, sourcePaths, {
+    deferSources,
+    tsconfig: tsconfig ? (0, import_node_path.resolve)(tsconfig) : void 0
+  });
 }
 async function deriveDataMembership(options) {
   const baseDir = (0, import_node_path.resolve)(options.dir);
-  const project = await loadGeneratorProject(baseDir);
+  const project = await loadGeneratorProject(baseDir, false, options.tsconfig);
   try {
     const layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, options.config ? (0, import_node_path.resolve)(options.config) : void 0);
     return dataMembershipFromLayout(layout);
@@ -541,7 +550,7 @@ async function deriveDataMembership(options) {
 }
 async function generateDrizzleSchemaInputFile(options) {
   const baseDir = (0, import_node_path.resolve)(options.dir);
-  const project = await loadGeneratorProject(baseDir);
+  const project = await loadGeneratorProject(baseDir, false, options.tsconfig);
   try {
     return generateDrizzleSchemaInputFileWithProject(options, project);
   } finally {
@@ -593,7 +602,7 @@ ${relations.map(relation => `    ${relation},`).join("\n")}
   return ["// auto-generated from the on-zero data layout", `import { defineRelations } from 'drizzle-orm'`, `import * as schema from ${schemaImportPath}`, "", `export { ${tableNames.join(", ")} } from ${schemaImportPath}`, `export const relations = defineRelations(schema, (r) => ({`, ...relationEntries, `}))`, ""].join("\n");
 }
 async function generate(options) {
-  const project = await loadGeneratorProject((0, import_node_path.resolve)(options.dir));
+  const project = await loadGeneratorProject((0, import_node_path.resolve)(options.dir), true, options.tsconfig);
   try {
     return await generateWithProject(options, project);
   } finally {
@@ -616,36 +625,44 @@ async function generateWithProject(options, project) {
     });
   }
   loadCache();
-  const layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, config ? (0, import_node_path.resolve)(config) : void 0);
-  const metadataHash = hash(layout.metadataPaths.map(path => `${path}\0${(0, import_node_fs.readFileSync)(path, "utf8")}`).join("\0"));
+  const configPath = config ? (0, import_node_path.resolve)(config) : (0, import_node_path.resolve)(baseDir, "on-zero.config.ts");
+  let cachedInputs = null;
+  if (generateCache.__configPath === configPath) {
+    try {
+      const value = JSON.parse(generateCache.__layoutInputs || "null");
+      if (value && typeof value === "object" && "sourceRoots" in value && Array.isArray(value.sourceRoots) && value.sourceRoots.every(path => typeof path === "string") && "metadataPaths" in value && Array.isArray(value.metadataPaths) && value.metadataPaths.every(path => typeof path === "string")) {
+        cachedInputs = {
+          sourceRoots: value.sourceRoots,
+          metadataPaths: value.metadataPaths
+        };
+      }
+    } catch {}
+  }
+  const dependencyPaths = await project.sourceFilePaths();
+  const hashInputs = layout2 => {
+    const metadataHash = hash(layout2.metadataPaths.map(path => `${path}\0${(0, import_node_fs.readFileSync)(path, "utf8")}`).join("\0"));
+    return hash(`${hashInputTree(layout2.sourceRoots, generatedDir, dependencyPaths)}\0${metadataHash}\0${externalZeroConfig}\0${project.configurationKey}`);
+  };
   const databaseSchemaPath = (0, import_node_path.resolve)((0, import_node_path.dirname)(baseDir), "database/schema.ts");
   const needsDrizzleSchema = (0, import_node_fs.existsSync)(databaseSchemaPath);
   const externalZeroConfigPath = (0, import_node_path.resolve)((0, import_node_path.dirname)(databaseSchemaPath), "drizzle-zero.config.ts");
   const externalZeroConfig = (0, import_node_fs.existsSync)(externalZeroConfigPath) ? (0, import_node_fs.readFileSync)(externalZeroConfigPath, "utf8") : null;
   const needsSqliteZeroSchema = needsDrizzleSchema && externalZeroConfig === null;
-  const inputHash = hash(`${hashInputTree(layout.sourceRoots, generatedDir)}\0${metadataHash}\0${externalZeroConfig}`);
-  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash &&
+  let cachedInputHash = null;
+  if (cachedInputs) {
+    try {
+      cachedInputHash = hashInputs(cachedInputs);
+    } catch {}
+  }
+  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === cachedInputHash &&
   // the input hash deliberately skips the generated directory, so it cannot
   // notice that the outputs themselves moved. existence is not correctness
   // either: a checkout, merge or revert leaves every file present and stale.
   // confirm the bytes on disk still match what the cache says it wrote there
   // before skipping the build, or the fast path serves someone else's output.
   //
-  // a consumer that formats generated output after this runs never hits the
-  // fast path again, because the cache holds the bytes written here and disk
-  // holds the formatted ones. soot does exactly that, `on-zero generate &&
-  // generate-instance-tables && oxfmt src/data/generated/`, and the number is
-  // already taken: 2.50s median before, 3.69s after, four warm runs each in
-  // one checkout with only the pin swapped, so about 1.2 seconds or 47
-  // percent on this step. the full three-command script went 2.65s to 3.14s
-  // with a spread that swallows most of it.
-  //
-  // the shape matters more than the number. this is not a cache that hits
-  // less often, it is a cache that never hits, so the cost does not degrade
-  // gracefully and grows with the generated output rather than staying at
-  // 1.2s. correct and slower beats fast and stale, which is why it is written
-  // this way, but if generate time ever becomes the complaint, record the
-  // hash after the consumer's formatter runs rather than weakening this.
+  // successful after commands record their final output hashes. formatting
+  // therefore keeps the fast path without trusting stale generated bytes.
   Object.entries(generateCache).every(([cachedPath, cachedHash]) => {
     if (!cachedPath.startsWith(generatedDir)) return true;
     try {
@@ -666,6 +683,9 @@ async function generateWithProject(options, project) {
       mutationCount: counts.mutationCount ?? 0
     };
   }
+  await project.loadSources();
+  const layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, config ? (0, import_node_path.resolve)(config) : void 0);
+  const inputHash = hashInputs(layout);
   const modelNamespaces = layout.namespaces.filter(namespace => namespace.modelPath !== null);
   const filesWithSchema = modelNamespaces.filter(namespace => (0, import_node_fs.readFileSync)(namespace.modelPath, "utf-8").includes("export const schema = table("));
   const modelModules = modelNamespaces.map(namespace => ({
@@ -855,11 +875,18 @@ async function generateWithProject(options, project) {
           ON_ZERO_GENERATED_DIR: generatedDir
         }
       });
+      const outputHashes = Object.fromEntries(Object.keys(generateCache).filter(filePath => filePath.startsWith(generatedDir)).map(filePath => [filePath, hash((0, import_node_fs.readFileSync)(filePath, "utf-8"))]));
+      Object.assign(generateCache, outputHashes);
     } catch (err) {
       if (!silent) console.error(`Error running after command: ${err}`);
     }
   }
   generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
+  generateCache.__configPath = configPath;
+  generateCache.__layoutInputs = JSON.stringify({
+    sourceRoots: layout.sourceRoots,
+    metadataPaths: layout.metadataPaths
+  });
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
     modelCount: modelNamespaces.length,
@@ -902,14 +929,14 @@ ${event} ${path}`);
     }, debounce);
   };
   const databaseDir = (0, import_node_path.resolve)((0, import_node_path.dirname)(baseDir), "database");
-  const project = await loadGeneratorProject(baseDir);
+  const project = await loadGeneratorProject(baseDir, false, options.tsconfig);
   let layout;
   try {
     layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, options.config ? (0, import_node_path.resolve)(options.config) : void 0);
   } finally {
     await project.close();
   }
-  const watcher = chokidar.watch([... /* @__PURE__ */new Set([...layout.sourceRoots, ...((0, import_node_fs.existsSync)(databaseDir) ? [databaseDir] : [])])], {
+  const watcher = chokidar.watch([... /* @__PURE__ */new Set([...layout.sourceRoots, ...(options.tsconfig ? [(0, import_node_path.resolve)(options.tsconfig)] : []), ...((0, import_node_fs.existsSync)(databaseDir) ? [databaseDir] : [])])], {
     persistent: true,
     ignoreInitial: true,
     ignored: [generatedDir, /node_modules/]

package/dist/cjs/generate.native.js

@@ -50,14 +50,19 @@ var import_async = require("typescript/unstable/async");
 var import_generate_helpers = require("./generate-helpers.native.js");
 var import_generate_layout = require("./generate-layout.native.js");
 var import_native_typescript = require("./native-typescript.native.js");
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var hash = function hash2(s) {
   return (0, import_crypto.createHash)("sha256").update(s).digest("hex");
 };
-var GENERATOR_CACHE_VERSION = "8";
+var GENERATOR_CACHE_VERSION = "10";
 var isGeneratorSourceFile = function isGeneratorSourceFile2(name) {
   return name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
 };
-function hashInputTree(sourceRoots, generatedDir) {
+function hashInputTree(sourceRoots, generatedDir, dependencyPaths) {
   var parts = [];
   var seen = /* @__PURE__ */new Set();
   var walk = function walk1(dir) {
@@ -120,6 +125,30 @@ function hashInputTree(sourceRoots, generatedDir) {
       }
     }
   }
+  var _iteratorNormalCompletion1 = true,
+    _didIteratorError1 = false,
+    _iteratorError1 = void 0;
+  try {
+    for (var _iterator1 = dependencyPaths[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+      var path = _step1.value;
+      if (seen.has(path) || path.startsWith(`${generatedDir}/`) || !(0, import_fs.existsSync)(path)) continue;
+      seen.add(path);
+      parts.push(`${path}\0${(0, import_fs.readFileSync)(path, "utf-8")}`);
+    }
+  } catch (err) {
+    _didIteratorError1 = true;
+    _iteratorError1 = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+        _iterator1.return();
+      }
+    } finally {
+      if (_didIteratorError1) {
+        throw _iteratorError1;
+      }
+    }
+  }
   return hash(parts.join("\0"));
 }
 var generateCache = {};
@@ -515,12 +544,13 @@ async function tsTypeToValibot(project, type) {
   var seen = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : /* @__PURE__ */new Set();
   var checker = project.checker;
   var flags = type.flags;
+  var path = seen;
   if (flags & (import_async.TypeFlags.Object | import_async.TypeFlags.Intersection)) {
     if (seen.has(type.id)) return "v.unknown()";
-    seen.add(type.id);
+    path = new Set(seen).add(type.id);
   }
   var recurse = function recurse2(value) {
-    return tsTypeToValibot(project, value, seen);
+    return tsTypeToValibot(project, value, path);
   };
   if (flags & import_async.TypeFlags.String) return "v.string()";
   if (flags & import_async.TypeFlags.Number) return "v.number()";
@@ -819,12 +849,17 @@ function dataMembershipFromLayout(layout) {
   };
 }
 async function loadGeneratorProject(baseDir) {
+  var deferSources = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false,
+    tsconfig = arguments.length > 2 ? arguments[2] : void 0;
   var sourcePaths = (0, import_native_typescript.collectTypeScriptSourcePaths)([baseDir, (0, import_path.resolve)((0, import_path.dirname)(baseDir), "database")]);
-  return (0, import_native_typescript.createNativeTypeScriptProject)(baseDir, sourcePaths);
+  return (0, import_native_typescript.createNativeTypeScriptProject)(baseDir, sourcePaths, {
+    deferSources,
+    tsconfig: tsconfig ? (0, import_path.resolve)(tsconfig) : void 0
+  });
 }
 async function deriveDataMembership(options) {
   var baseDir = (0, import_path.resolve)(options.dir);
-  var project = await loadGeneratorProject(baseDir);
+  var project = await loadGeneratorProject(baseDir, false, options.tsconfig);
   try {
     var layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, options.config ? (0, import_path.resolve)(options.config) : void 0);
     return dataMembershipFromLayout(layout);
@@ -834,7 +869,7 @@ async function deriveDataMembership(options) {
 }
 async function generateDrizzleSchemaInputFile(options) {
   var baseDir = (0, import_path.resolve)(options.dir);
-  var project = await loadGeneratorProject(baseDir);
+  var project = await loadGeneratorProject(baseDir, false, options.tsconfig);
   try {
     return generateDrizzleSchemaInputFileWithProject(options, project);
   } finally {
@@ -931,7 +966,7 @@ ${relations.map(function (relation) {
   return ["// auto-generated from the on-zero data layout", `import { defineRelations } from 'drizzle-orm'`, `import * as schema from ${schemaImportPath}`, "", `export { ${tableNames.join(", ")} } from ${schemaImportPath}`, `export const relations = defineRelations(schema, (r) => ({`, ...relationEntries, `}))`, ""].join("\n");
 }
 async function generate(options) {
-  var project = await loadGeneratorProject((0, import_path.resolve)(options.dir));
+  var project = await loadGeneratorProject((0, import_path.resolve)(options.dir), true, options.tsconfig);
   try {
     return await generateWithProject(options, project);
   } finally {
@@ -954,38 +989,50 @@ async function generateWithProject(options, project) {
     });
   }
   loadCache();
-  var layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, config ? (0, import_path.resolve)(config) : void 0);
-  var metadataHash = hash(layout.metadataPaths.map(function (path) {
-    return `${path}\0${(0, import_fs.readFileSync)(path, "utf8")}`;
-  }).join("\0"));
+  var configPath = config ? (0, import_path.resolve)(config) : (0, import_path.resolve)(baseDir, "on-zero.config.ts");
+  var cachedInputs = null;
+  if (generateCache.__configPath === configPath) {
+    try {
+      var value = JSON.parse(generateCache.__layoutInputs || "null");
+      if (value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && "sourceRoots" in value && Array.isArray(value.sourceRoots) && value.sourceRoots.every(function (path) {
+        return typeof path === "string";
+      }) && "metadataPaths" in value && Array.isArray(value.metadataPaths) && value.metadataPaths.every(function (path) {
+        return typeof path === "string";
+      })) {
+        cachedInputs = {
+          sourceRoots: value.sourceRoots,
+          metadataPaths: value.metadataPaths
+        };
+      }
+    } catch (unused) {}
+  }
+  var dependencyPaths = await project.sourceFilePaths();
+  var hashInputs = function hashInputs2(layout2) {
+    var metadataHash = hash(layout2.metadataPaths.map(function (path) {
+      return `${path}\0${(0, import_fs.readFileSync)(path, "utf8")}`;
+    }).join("\0"));
+    return hash(`${hashInputTree(layout2.sourceRoots, generatedDir, dependencyPaths)}\0${metadataHash}\0${externalZeroConfig}\0${project.configurationKey}`);
+  };
   var databaseSchemaPath = (0, import_path.resolve)((0, import_path.dirname)(baseDir), "database/schema.ts");
   var needsDrizzleSchema = (0, import_fs.existsSync)(databaseSchemaPath);
   var externalZeroConfigPath = (0, import_path.resolve)((0, import_path.dirname)(databaseSchemaPath), "drizzle-zero.config.ts");
   var externalZeroConfig = (0, import_fs.existsSync)(externalZeroConfigPath) ? (0, import_fs.readFileSync)(externalZeroConfigPath, "utf8") : null;
   var needsSqliteZeroSchema = needsDrizzleSchema && externalZeroConfig === null;
-  var inputHash = hash(`${hashInputTree(layout.sourceRoots, generatedDir)}\0${metadataHash}\0${externalZeroConfig}`);
-  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash &&
+  var cachedInputHash = null;
+  if (cachedInputs) {
+    try {
+      cachedInputHash = hashInputs(cachedInputs);
+    } catch (unused) {}
+  }
+  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === cachedInputHash &&
   // the input hash deliberately skips the generated directory, so it cannot
   // notice that the outputs themselves moved. existence is not correctness
   // either: a checkout, merge or revert leaves every file present and stale.
   // confirm the bytes on disk still match what the cache says it wrote there
   // before skipping the build, or the fast path serves someone else's output.
   //
-  // a consumer that formats generated output after this runs never hits the
-  // fast path again, because the cache holds the bytes written here and disk
-  // holds the formatted ones. soot does exactly that, `on-zero generate &&
-  // generate-instance-tables && oxfmt src/data/generated/`, and the number is
-  // already taken: 2.50s median before, 3.69s after, four warm runs each in
-  // one checkout with only the pin swapped, so about 1.2 seconds or 47
-  // percent on this step. the full three-command script went 2.65s to 3.14s
-  // with a spread that swallows most of it.
-  //
-  // the shape matters more than the number. this is not a cache that hits
-  // less often, it is a cache that never hits, so the cost does not degrade
-  // gracefully and grows with the generated output rather than staying at
-  // 1.2s. correct and slower beats fast and stale, which is why it is written
-  // this way, but if generate time ever becomes the complaint, record the
-  // hash after the consumer's formatter runs rather than weakening this.
+  // successful after commands record their final output hashes. formatting
+  // therefore keeps the fast path without trusting stale generated bytes.
   Object.entries(generateCache).every(function (param) {
     var [cachedPath, cachedHash] = param;
     if (!cachedPath.startsWith(generatedDir)) return true;
@@ -1008,6 +1055,9 @@ async function generateWithProject(options, project) {
       mutationCount: (_counts_mutationCount = counts.mutationCount) !== null && _counts_mutationCount !== void 0 ? _counts_mutationCount : 0
     };
   }
+  await project.loadSources();
+  var layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, config ? (0, import_path.resolve)(config) : void 0);
+  var inputHash = hashInputs(layout);
   var modelNamespaces = layout.namespaces.filter(function (namespace2) {
     return namespace2.modelPath !== null;
   });
@@ -1356,11 +1406,22 @@ async function generateWithProject(options, project) {
           ON_ZERO_GENERATED_DIR: generatedDir
         }
       });
+      var outputHashes = Object.fromEntries(Object.keys(generateCache).filter(function (filePath2) {
+        return filePath2.startsWith(generatedDir);
+      }).map(function (filePath2) {
+        return [filePath2, hash((0, import_fs.readFileSync)(filePath2, "utf-8"))];
+      }));
+      Object.assign(generateCache, outputHashes);
     } catch (err) {
       if (!silent) console.error(`Error running after command: ${err}`);
     }
   }
   generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
+  generateCache.__configPath = configPath;
+  generateCache.__layoutInputs = JSON.stringify({
+    sourceRoots: layout.sourceRoots,
+    metadataPaths: layout.metadataPaths
+  });
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
     modelCount: modelNamespaces.length,
@@ -1403,14 +1464,14 @@ ${event} ${path}`);
     }, debounce);
   };
   var databaseDir = (0, import_path.resolve)((0, import_path.dirname)(baseDir), "database");
-  var project = await loadGeneratorProject(baseDir);
+  var project = await loadGeneratorProject(baseDir, false, options.tsconfig);
   var layout;
   try {
     layout = (0, import_generate_layout.discoverDataLayout)(project, baseDir, options.config ? (0, import_path.resolve)(options.config) : void 0);
   } finally {
     await project.close();
   }
-  var watcher = chokidar.watch([... /* @__PURE__ */new Set([...layout.sourceRoots, ...((0, import_fs.existsSync)(databaseDir) ? [databaseDir] : [])])], {
+  var watcher = chokidar.watch([... /* @__PURE__ */new Set([...layout.sourceRoots, ...(options.tsconfig ? [(0, import_path.resolve)(options.tsconfig)] : []), ...((0, import_fs.existsSync)(databaseDir) ? [databaseDir] : [])])], {
     persistent: true,
     ignoreInitial: true,
     ignored: [generatedDir, /node_modules/]