@drzl/analyzer 1.8.0 → 1.10.0

package/dist/index.cjs

@@ -32,7 +32,9 @@ var index_exports = {};
 __export(index_exports, {
   SchemaAnalyzer: () => SchemaAnalyzer,
   default: () => index_default,
-  describeV1Column: () => describeV1Column
+  describeV1Column: () => describeV1Column,
+  isRelationsV2: () => isRelationsV2,
+  readRelationsV2: () => readRelationsV2
 });
 module.exports = __toCommonJS(index_exports);
 var import_meta = {};
@@ -122,6 +124,9 @@ function describeV1Column(column) {
     case "numeric":
       out.tsType = "string";
       out.dbType = "NUMERIC";
+      if (!String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "").startsWith("SQLite")) {
+        out.format = "numeric";
+      }
       break;
     case "json":
       out.tsType = "any";
@@ -213,6 +218,47 @@ function declaredLength(column) {
   const n = column?.length ?? column?.config?.length ?? column?.config?.dimensions;
   return typeof n === "number" && Number.isFinite(n) && n > 0 ? n : void 0;
 }
+function getSymbolOf(target, key) {
+  if (!target) return void 0;
+  try {
+    for (const sym of Object.getOwnPropertySymbols(target)) {
+      if (sym.description === key) return target[sym];
+    }
+  } catch {
+  }
+  return target[Symbol.for(key)];
+}
+function isRelationsV2(val) {
+  if (!val || typeof val !== "object" || Array.isArray(val)) return false;
+  const entries = Object.values(val);
+  if (!entries.length) return false;
+  return entries.every(
+    (e) => !!e && typeof e === "object" && !!e.table && !!e.relations && typeof e.relations === "object" && Object.values(e.relations).every(
+      (r) => r?.relationType === "one" || r?.relationType === "many"
+    )
+  );
+}
+function readRelationsV2(val, issues = []) {
+  const out = [];
+  for (const [tableKey, entry] of Object.entries(val)) {
+    const from = getSymbolOf(entry.table, "drizzle:Name") ?? entry.name ?? tableKey;
+    for (const [fieldName, r] of Object.entries(entry.relations ?? {})) {
+      const to = r?.targetTableName;
+      if (typeof to !== "string" || !to) {
+        issues.push({
+          code: "DRZL_ANL_REL_V2",
+          level: "warn",
+          message: `Relation "${fieldName}" on "${from}" names no target table and was skipped.`
+        });
+        continue;
+      }
+      const via = getSymbolOf(r.throughTable, "drizzle:Name") ?? getSymbolOf(r.through?.sourceTable, "drizzle:Name") ?? void 0;
+      if (via) out.push({ kind: "manyToMany", from, to, via });
+      else out.push({ kind: r.relationType === "many" ? "many" : "one", from, to });
+    }
+  }
+  return out;
+}
 var _SchemaAnalyzer = class _SchemaAnalyzer {
   constructor(schemaPath) {
     this.schemaPath = schemaPath;
@@ -766,6 +812,10 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (opts.includeRelations) {
             relations.push(...this.readRelationsObject(val, name, issues));
           }
+        } else if (isRelationsV2(val)) {
+          if (opts.includeRelations) {
+            relations.push(...readRelationsV2(val, issues));
+          }
         } else {
           const ev = val?.enumValues;
           if (Array.isArray(ev) && ev.every((x) => typeof x === "string")) {
@@ -903,5 +953,7 @@ var index_default = SchemaAnalyzer;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SchemaAnalyzer,
-  describeV1Column
+  describeV1Column,
+  isRelationsV2,
+  readRelationsV2
 });

package/dist/index.d.cts

@@ -62,8 +62,16 @@ interface Column {
      * generators fall back to the old inference there.
      */
     integer?: boolean;
-    /** A string column with a known shape, currently only `uuid`. */
-    format?: 'uuid';
+    /**
+     * A string column whose contents have a shape the database enforces.
+     *
+     * Only formats checked against Postgres itself appear here, and the list is short because most
+     * candidates failed: Postgres reads `'today'` and `'January 8, 1999'` as dates, pads
+     * `'2020-01-01'` into a macaddr, and accepts `'10.1/16'` as an inet. A check for any of those
+     * would reject input the database accepts, and turning away valid data is worse than not
+     * checking at all. See `COLUMN_FORMATS` in `@drzl/validation-core`.
+     */
+    format?: 'uuid' | 'numeric';
     /**
      * Array depth for a column declared with `.array()`, absent when the column is a scalar.
      *
@@ -198,6 +206,25 @@ interface AnalyzeOptions {
  * path below untouched.
  */
 declare function describeV1Column(column: any): Partial<Column> | null;
+/**
+ * Whether an export is a Relations v2 definition, from `defineRelations(schema, (r) => ...)`.
+ *
+ * v2 returns a plain object keyed by table name, each entry `{ table, name, relations }`, with
+ * no marker class or symbol to match on. So the shape is what identifies it: every value has a
+ * `relations` record whose entries carry a `relationType`. That is specific enough not to
+ * collide with a table or an enum, both of which are checked before this.
+ */
+declare function isRelationsV2(val: any): boolean;
+/**
+ * Read the relations declared by `defineRelations`.
+ *
+ * Simpler than the v1 reader, which has to invoke a callback with a stand-in builder to find
+ * out what was declared. v2 has already resolved everything: each descriptor states its
+ * `relationType`, its `targetTableName`, and for a many-to-many its `through` table, so nothing
+ * has to be inferred and the join table is stated rather than guessed at by the heuristic that
+ * covers v1.
+ */
+declare function readRelationsV2(val: any, issues?: Issue[]): Relation[];
 declare class SchemaAnalyzer {
     private readonly schemaPath;
     constructor(schemaPath: string);
@@ -302,4 +329,4 @@ declare class SchemaAnalyzer {
     analyze(opts?: AnalyzeOptions): Promise<Analysis>;
 }
 
-export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column };
+export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column, isRelationsV2, readRelationsV2 };

package/dist/index.d.ts

@@ -62,8 +62,16 @@ interface Column {
      * generators fall back to the old inference there.
      */
     integer?: boolean;
-    /** A string column with a known shape, currently only `uuid`. */
-    format?: 'uuid';
+    /**
+     * A string column whose contents have a shape the database enforces.
+     *
+     * Only formats checked against Postgres itself appear here, and the list is short because most
+     * candidates failed: Postgres reads `'today'` and `'January 8, 1999'` as dates, pads
+     * `'2020-01-01'` into a macaddr, and accepts `'10.1/16'` as an inet. A check for any of those
+     * would reject input the database accepts, and turning away valid data is worse than not
+     * checking at all. See `COLUMN_FORMATS` in `@drzl/validation-core`.
+     */
+    format?: 'uuid' | 'numeric';
     /**
      * Array depth for a column declared with `.array()`, absent when the column is a scalar.
      *
@@ -198,6 +206,25 @@ interface AnalyzeOptions {
  * path below untouched.
  */
 declare function describeV1Column(column: any): Partial<Column> | null;
+/**
+ * Whether an export is a Relations v2 definition, from `defineRelations(schema, (r) => ...)`.
+ *
+ * v2 returns a plain object keyed by table name, each entry `{ table, name, relations }`, with
+ * no marker class or symbol to match on. So the shape is what identifies it: every value has a
+ * `relations` record whose entries carry a `relationType`. That is specific enough not to
+ * collide with a table or an enum, both of which are checked before this.
+ */
+declare function isRelationsV2(val: any): boolean;
+/**
+ * Read the relations declared by `defineRelations`.
+ *
+ * Simpler than the v1 reader, which has to invoke a callback with a stand-in builder to find
+ * out what was declared. v2 has already resolved everything: each descriptor states its
+ * `relationType`, its `targetTableName`, and for a many-to-many its `through` table, so nothing
+ * has to be inferred and the join table is stated rather than guessed at by the heuristic that
+ * covers v1.
+ */
+declare function readRelationsV2(val: any, issues?: Issue[]): Relation[];
 declare class SchemaAnalyzer {
     private readonly schemaPath;
     constructor(schemaPath: string);
@@ -302,4 +329,4 @@ declare class SchemaAnalyzer {
     analyze(opts?: AnalyzeOptions): Promise<Analysis>;
 }
 
-export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column };
+export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column, isRelationsV2, readRelationsV2 };

package/dist/index.js

@@ -85,6 +85,9 @@ function describeV1Column(column) {
     case "numeric":
       out.tsType = "string";
       out.dbType = "NUMERIC";
+      if (!String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "").startsWith("SQLite")) {
+        out.format = "numeric";
+      }
       break;
     case "json":
       out.tsType = "any";
@@ -176,6 +179,47 @@ function declaredLength(column) {
   const n = column?.length ?? column?.config?.length ?? column?.config?.dimensions;
   return typeof n === "number" && Number.isFinite(n) && n > 0 ? n : void 0;
 }
+function getSymbolOf(target, key) {
+  if (!target) return void 0;
+  try {
+    for (const sym of Object.getOwnPropertySymbols(target)) {
+      if (sym.description === key) return target[sym];
+    }
+  } catch {
+  }
+  return target[Symbol.for(key)];
+}
+function isRelationsV2(val) {
+  if (!val || typeof val !== "object" || Array.isArray(val)) return false;
+  const entries = Object.values(val);
+  if (!entries.length) return false;
+  return entries.every(
+    (e) => !!e && typeof e === "object" && !!e.table && !!e.relations && typeof e.relations === "object" && Object.values(e.relations).every(
+      (r) => r?.relationType === "one" || r?.relationType === "many"
+    )
+  );
+}
+function readRelationsV2(val, issues = []) {
+  const out = [];
+  for (const [tableKey, entry] of Object.entries(val)) {
+    const from = getSymbolOf(entry.table, "drizzle:Name") ?? entry.name ?? tableKey;
+    for (const [fieldName, r] of Object.entries(entry.relations ?? {})) {
+      const to = r?.targetTableName;
+      if (typeof to !== "string" || !to) {
+        issues.push({
+          code: "DRZL_ANL_REL_V2",
+          level: "warn",
+          message: `Relation "${fieldName}" on "${from}" names no target table and was skipped.`
+        });
+        continue;
+      }
+      const via = getSymbolOf(r.throughTable, "drizzle:Name") ?? getSymbolOf(r.through?.sourceTable, "drizzle:Name") ?? void 0;
+      if (via) out.push({ kind: "manyToMany", from, to, via });
+      else out.push({ kind: r.relationType === "many" ? "many" : "one", from, to });
+    }
+  }
+  return out;
+}
 var _SchemaAnalyzer = class _SchemaAnalyzer {
   constructor(schemaPath) {
     this.schemaPath = schemaPath;
@@ -729,6 +773,10 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (opts.includeRelations) {
             relations.push(...this.readRelationsObject(val, name, issues));
           }
+        } else if (isRelationsV2(val)) {
+          if (opts.includeRelations) {
+            relations.push(...readRelationsV2(val, issues));
+          }
         } else {
           const ev = val?.enumValues;
           if (Array.isArray(ev) && ev.every((x) => typeof x === "string")) {
@@ -866,5 +914,7 @@ var index_default = SchemaAnalyzer;
 export {
   SchemaAnalyzer,
   index_default as default,
-  describeV1Column
+  describeV1Column,
+  isRelationsV2,
+  readRelationsV2
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/analyzer",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",