@drzl/validation-core 2.0.0 → 3.0.0

package/dist/index.cjs

@@ -100187,6 +100187,7 @@ __export(index_exports2, {
   moduleSpecifier: () => moduleSpecifier,
   pascalCase: () => pascalCase,
   resolveAffix: () => resolveAffix,
+  resolveConfiguredImport: () => resolveConfiguredImport,
   schemaName: () => schemaName,
   selectColumns: () => selectColumns,
   typeName: () => typeName,
@@ -100196,6 +100197,8 @@ __export(index_exports2, {
 module.exports = __toCommonJS(index_exports2);
 
 // src/files.ts
+var import_node_fs = __toESM(require("fs"), 1);
+var import_node_path = __toESM(require("path"), 1);
 var IMPORT_EXTENSIONS = ["js", "none", "ts"];
 var DEFAULT_IMPORT_EXTENSION = "js";
 var TS_EXTENSIONS = [
@@ -100219,6 +100222,38 @@ function importSpecifier(relativePath, importExtension = DEFAULT_IMPORT_EXTENSIO
 function moduleSpecifier(tsName, fileSuffix, importExtension = DEFAULT_IMPORT_EXTENSION) {
   return importSpecifier(`./${moduleFileName(tsName, fileSuffix)}`, importExtension);
 }
+function resolveConfiguredImport(configured, outDirAbs, cwd, importExtension = DEFAULT_IMPORT_EXTENSION) {
+  if (isPackageSpecifier(configured)) return configured;
+  const targetAbs = import_node_path.default.isAbsolute(configured) ? configured : import_node_path.default.resolve(configured.startsWith(".") ? outDirAbs : cwd, configured);
+  const withIndex = pointsAtDirectory(targetAbs) ? `${configured}/index` : configured;
+  if (configured.startsWith(".")) {
+    return importSpecifier(withTsExtension(withIndex), importExtension);
+  }
+  const resolved = pointsAtDirectory(targetAbs) ? import_node_path.default.join(targetAbs, "index") : targetAbs;
+  const rel = import_node_path.default.relative(outDirAbs, resolved).split(import_node_path.default.sep).join("/");
+  const prefixed = !rel ? "." : rel.startsWith(".") ? rel : `./${rel}`;
+  return importSpecifier(withTsExtension(prefixed), importExtension);
+}
+function isPackageSpecifier(p5) {
+  if (p5.startsWith(".") || import_node_path.default.isAbsolute(p5)) return false;
+  if (p5.startsWith("@") || p5.includes(":")) return true;
+  return !p5.includes("/");
+}
+function pointsAtDirectory(absPath) {
+  try {
+    return import_node_fs.default.statSync(absPath).isDirectory();
+  } catch {
+    for (const ext of [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs"]) {
+      if (import_node_fs.default.existsSync(`${absPath}${ext}`)) return false;
+    }
+    return !/\.[a-z]+$/i.test(import_node_path.default.basename(absPath));
+  }
+}
+function withTsExtension(p5) {
+  if (/\.(ts|tsx|mts|cts)$/.test(p5)) return p5;
+  if (/\.(js|mjs|cjs)$/.test(p5)) return p5.replace(/\.(js|mjs|cjs)$/, ".ts");
+  return `${p5}.ts`;
+}
 
 // src/naming.ts
 var NAME_MODES = ["insert", "update", "select"];
@@ -100327,12 +100362,11 @@ function validateAffix(affix, schemaSuffix) {
 }
 
 // src/index.ts
-function isGeneratedColumn(c5, primaryKeyColumns) {
-  return c5.isGenerated || primaryKeyColumns.includes(c5.name);
+function isGeneratedColumn(c5, _primaryKeyColumns = []) {
+  return c5.isGenerated;
 }
 function insertColumns(table) {
-  const pkCols = table.primaryKey?.columns ?? [];
-  return table.columns.filter((c5) => !isGeneratedColumn(c5, pkCols));
+  return table.columns.filter((c5) => !isGeneratedColumn(c5));
 }
 function updateColumns(table) {
   const pkCols = table.primaryKey?.columns ?? [];
@@ -100384,6 +100418,7 @@ async function formatCode(code, filePath, fmt) {
   moduleSpecifier,
   pascalCase,
   resolveAffix,
+  resolveConfiguredImport,
   schemaName,
   selectColumns,
   typeName,

package/dist/index.d.cts

@@ -52,6 +52,34 @@ declare function importSpecifier(relativePath: string, importExtension?: ImportE
  * `./users.zod.js`.
  */
 declare function moduleSpecifier(tsName: string, fileSuffix: string, importExtension?: ImportExtension): string;
+/**
+ * Turn a configured module path into a specifier the generated file can actually import.
+ *
+ * Options like `validation.importPath`, `dbImportPath` and `schemaImportPath` get written as
+ * project-relative paths, `src/validators/zod`, because that is how the rest of the config
+ * names directories. Emitted verbatim that is a *bare* specifier: Node and tsc look for a
+ * package of that name in node_modules and never consider the local file. The config in the
+ * getting-started guide produced three such imports, none of which resolved.
+ *
+ * Two questions have to be answered, and neither can be guessed from the string alone.
+ *
+ * **Package or path?** `zod` and `@acme/schemas` are package names and pass through untouched.
+ * A path containing a separator, or starting with `.`, is a path.
+ *
+ * **File or directory?** `src/db/connection` is usually a file and `src/validators/zod` a
+ * directory holding a barrel, and they look identical. So the filesystem is asked. Where the
+ * target does not exist yet, which happens when this generator runs before the one that writes
+ * it, an extensionless path is taken to be a directory, since these options name directories by
+ * convention and the one path that can be missing is a generated barrel.
+ *
+ * A path already relative keeps its own spelling and only has its extension corrected, so
+ * anyone who followed the older guidance and wrote `../validators/zod/index.js` is unaffected.
+ *
+ * @param configured  what the user put in the config
+ * @param outDirAbs   absolute directory the importing file is written to
+ * @param cwd         project root a non-relative path is resolved against
+ */
+declare function resolveConfiguredImport(configured: string, outDirAbs: string, cwd: string, importExtension?: ImportExtension): string;
 
 /**
  * One place that decides what a generated identifier is called.
@@ -195,10 +223,24 @@ interface ValidationRenderer<TOptions extends ValidationGenerateOptions = Valida
     renderIndex?(analysis: Analysis, opts?: TOptions): string;
     generate(opts: TOptions): Promise<string[]>;
 }
-declare function isGeneratedColumn(c: Column, primaryKeyColumns: string[]): boolean;
+/**
+ * Whether the database generates this column's value, so it cannot be written.
+ *
+ * `primaryKeyColumns` is accepted for backwards compatibility and no longer consulted. It used
+ * to make every primary key count as generated, which dropped it from the insert schema whether
+ * or not the database supplied it. Right for a MySQL autoincrement column; wrong for a Postgres
+ * `integer('id').primaryKey()`, which Postgres does not generate, and for any natural key such
+ * as `text('slug').primaryKey()`. Those inserts became impossible to express: the required
+ * column was simply absent, with no way to provide it.
+ *
+ * Being a key says nothing about who supplies the value. `isGenerated` marks a column that
+ * cannot be written; `hasDefault` marks one that need not be, and those stay in the schema as
+ * optional.
+ */
+declare function isGeneratedColumn(c: Column, _primaryKeyColumns?: string[]): boolean;
 declare function insertColumns(table: Table): Column[];
 declare function updateColumns(table: Table): Column[];
 declare function selectColumns(table: Table): Column[];
 declare function formatCode(code: string, filePath: string, fmt?: FormatOptions): Promise<any>;
 
-export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, NAME_MODES, type NameMode, type ResolvedAffix, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, formatCode, importSpecifier, insertColumns, isGeneratedColumn, moduleFileName, moduleSpecifier, pascalCase, resolveAffix, schemaName, selectColumns, typeName, updateColumns, validateAffix };
+export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, NAME_MODES, type NameMode, type ResolvedAffix, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, formatCode, importSpecifier, insertColumns, isGeneratedColumn, moduleFileName, moduleSpecifier, pascalCase, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };

package/dist/index.d.ts

@@ -52,6 +52,34 @@ declare function importSpecifier(relativePath: string, importExtension?: ImportE
  * `./users.zod.js`.
  */
 declare function moduleSpecifier(tsName: string, fileSuffix: string, importExtension?: ImportExtension): string;
+/**
+ * Turn a configured module path into a specifier the generated file can actually import.
+ *
+ * Options like `validation.importPath`, `dbImportPath` and `schemaImportPath` get written as
+ * project-relative paths, `src/validators/zod`, because that is how the rest of the config
+ * names directories. Emitted verbatim that is a *bare* specifier: Node and tsc look for a
+ * package of that name in node_modules and never consider the local file. The config in the
+ * getting-started guide produced three such imports, none of which resolved.
+ *
+ * Two questions have to be answered, and neither can be guessed from the string alone.
+ *
+ * **Package or path?** `zod` and `@acme/schemas` are package names and pass through untouched.
+ * A path containing a separator, or starting with `.`, is a path.
+ *
+ * **File or directory?** `src/db/connection` is usually a file and `src/validators/zod` a
+ * directory holding a barrel, and they look identical. So the filesystem is asked. Where the
+ * target does not exist yet, which happens when this generator runs before the one that writes
+ * it, an extensionless path is taken to be a directory, since these options name directories by
+ * convention and the one path that can be missing is a generated barrel.
+ *
+ * A path already relative keeps its own spelling and only has its extension corrected, so
+ * anyone who followed the older guidance and wrote `../validators/zod/index.js` is unaffected.
+ *
+ * @param configured  what the user put in the config
+ * @param outDirAbs   absolute directory the importing file is written to
+ * @param cwd         project root a non-relative path is resolved against
+ */
+declare function resolveConfiguredImport(configured: string, outDirAbs: string, cwd: string, importExtension?: ImportExtension): string;
 
 /**
  * One place that decides what a generated identifier is called.
@@ -195,10 +223,24 @@ interface ValidationRenderer<TOptions extends ValidationGenerateOptions = Valida
     renderIndex?(analysis: Analysis, opts?: TOptions): string;
     generate(opts: TOptions): Promise<string[]>;
 }
-declare function isGeneratedColumn(c: Column, primaryKeyColumns: string[]): boolean;
+/**
+ * Whether the database generates this column's value, so it cannot be written.
+ *
+ * `primaryKeyColumns` is accepted for backwards compatibility and no longer consulted. It used
+ * to make every primary key count as generated, which dropped it from the insert schema whether
+ * or not the database supplied it. Right for a MySQL autoincrement column; wrong for a Postgres
+ * `integer('id').primaryKey()`, which Postgres does not generate, and for any natural key such
+ * as `text('slug').primaryKey()`. Those inserts became impossible to express: the required
+ * column was simply absent, with no way to provide it.
+ *
+ * Being a key says nothing about who supplies the value. `isGenerated` marks a column that
+ * cannot be written; `hasDefault` marks one that need not be, and those stay in the schema as
+ * optional.
+ */
+declare function isGeneratedColumn(c: Column, _primaryKeyColumns?: string[]): boolean;
 declare function insertColumns(table: Table): Column[];
 declare function updateColumns(table: Table): Column[];
 declare function selectColumns(table: Table): Column[];
 declare function formatCode(code: string, filePath: string, fmt?: FormatOptions): Promise<any>;
 
-export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, NAME_MODES, type NameMode, type ResolvedAffix, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, formatCode, importSpecifier, insertColumns, isGeneratedColumn, moduleFileName, moduleSpecifier, pascalCase, resolveAffix, schemaName, selectColumns, typeName, updateColumns, validateAffix };
+export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, NAME_MODES, type NameMode, type ResolvedAffix, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, formatCode, importSpecifier, insertColumns, isGeneratedColumn, moduleFileName, moduleSpecifier, pascalCase, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };

package/dist/index.js

@@ -1,6 +1,8 @@
 import "./chunk-MKBO26DX.js";
 
 // src/files.ts
+import nodeFs from "fs";
+import nodePath from "path";
 var IMPORT_EXTENSIONS = ["js", "none", "ts"];
 var DEFAULT_IMPORT_EXTENSION = "js";
 var TS_EXTENSIONS = [
@@ -24,6 +26,38 @@ function importSpecifier(relativePath, importExtension = DEFAULT_IMPORT_EXTENSIO
 function moduleSpecifier(tsName, fileSuffix, importExtension = DEFAULT_IMPORT_EXTENSION) {
   return importSpecifier(`./${moduleFileName(tsName, fileSuffix)}`, importExtension);
 }
+function resolveConfiguredImport(configured, outDirAbs, cwd, importExtension = DEFAULT_IMPORT_EXTENSION) {
+  if (isPackageSpecifier(configured)) return configured;
+  const targetAbs = nodePath.isAbsolute(configured) ? configured : nodePath.resolve(configured.startsWith(".") ? outDirAbs : cwd, configured);
+  const withIndex = pointsAtDirectory(targetAbs) ? `${configured}/index` : configured;
+  if (configured.startsWith(".")) {
+    return importSpecifier(withTsExtension(withIndex), importExtension);
+  }
+  const resolved = pointsAtDirectory(targetAbs) ? nodePath.join(targetAbs, "index") : targetAbs;
+  const rel = nodePath.relative(outDirAbs, resolved).split(nodePath.sep).join("/");
+  const prefixed = !rel ? "." : rel.startsWith(".") ? rel : `./${rel}`;
+  return importSpecifier(withTsExtension(prefixed), importExtension);
+}
+function isPackageSpecifier(p) {
+  if (p.startsWith(".") || nodePath.isAbsolute(p)) return false;
+  if (p.startsWith("@") || p.includes(":")) return true;
+  return !p.includes("/");
+}
+function pointsAtDirectory(absPath) {
+  try {
+    return nodeFs.statSync(absPath).isDirectory();
+  } catch {
+    for (const ext of [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs"]) {
+      if (nodeFs.existsSync(`${absPath}${ext}`)) return false;
+    }
+    return !/\.[a-z]+$/i.test(nodePath.basename(absPath));
+  }
+}
+function withTsExtension(p) {
+  if (/\.(ts|tsx|mts|cts)$/.test(p)) return p;
+  if (/\.(js|mjs|cjs)$/.test(p)) return p.replace(/\.(js|mjs|cjs)$/, ".ts");
+  return `${p}.ts`;
+}
 
 // src/naming.ts
 var NAME_MODES = ["insert", "update", "select"];
@@ -132,12 +166,11 @@ function validateAffix(affix, schemaSuffix) {
 }
 
 // src/index.ts
-function isGeneratedColumn(c, primaryKeyColumns) {
-  return c.isGenerated || primaryKeyColumns.includes(c.name);
+function isGeneratedColumn(c, _primaryKeyColumns = []) {
+  return c.isGenerated;
 }
 function insertColumns(table) {
-  const pkCols = table.primaryKey?.columns ?? [];
-  return table.columns.filter((c) => !isGeneratedColumn(c, pkCols));
+  return table.columns.filter((c) => !isGeneratedColumn(c));
 }
 function updateColumns(table) {
   const pkCols = table.primaryKey?.columns ?? [];
@@ -188,6 +221,7 @@ export {
   moduleSpecifier,
   pascalCase,
   resolveAffix,
+  resolveConfiguredImport,
   schemaName,
   selectColumns,
   typeName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/validation-core",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",
@@ -11,7 +11,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@drzl/analyzer": "^1.3.0"
+    "@drzl/analyzer": "^1.5.0"
   },
   "devDependencies": {
     "tsup": "^8.5.0",