@drzl/analyzer 1.12.0 → 1.14.0

package/dist/index.cjs

@@ -206,7 +206,7 @@ function describeV1Column(column) {
         out.dbType = codec === "varchar" ? "VARCHAR" : codec === "char" ? "CHAR" : "TEXT";
         const kind = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
         const cap = codec && kind.startsWith("MySql") ? MYSQL_TEXT_CAPS[codec] : void 0;
-        if (cap) out.maxLength = cap;
+        if (cap) out.maxBytes = cap;
       } else {
         return null;
       }
@@ -215,6 +215,15 @@ function describeV1Column(column) {
   if (typeof dims === "number" && dims >= 1) out.arrayDimensions = dims;
   return out;
 }
+function unwrapArrayColumn(column) {
+  let element = column;
+  let dimensions = 0;
+  while (element?.baseColumn && String(element?.constructor?.name ?? "").endsWith("Array")) {
+    element = element.baseColumn;
+    dimensions++;
+  }
+  return { element, dimensions };
+}
 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;
@@ -515,10 +524,23 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         return { tsType: "number", dbType: "REAL" };
       case "SQLiteBlob":
         return { tsType: "Uint8Array", dbType: "BLOB" };
+      // SQLite spells a mode as a distinct class rather than as config, so `text({mode:'json'})`
+      // is a `SQLiteTextJson` and matched no arm at all: the column came back UNKNOWN, which is
+      // wider than the `any` a json column at least used to get.
+      case "SQLiteTextJson":
+      case "SQLiteBlobJson":
+        return { tsType: "any", dbType: "JSON" };
+      case "SQLiteBigInt":
+        return { tsType: "bigint", dbType: "BIGINT" };
       case "SQLiteNumeric":
         return { tsType: "string", dbType: "NUMERIC" };
       case "SQLiteBoolean":
         return { tsType: "boolean", dbType: "INTEGER" };
+      // 0.4x gives an enum its own class, which had no arm here at all, so an enum column came
+      // back `unknown` and every generator emitted a schema that accepted anything. The values
+      // were on the column the whole time, in `enumValues`, waiting for a type to attach to.
+      case "PgEnumColumn":
+        return { tsType: "string", dbType: "TEXT" };
       case "PgInteger":
       case "PgSmallInt":
         return { tsType: "number", dbType: "INTEGER" };
@@ -650,25 +672,26 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     const foreignKeys = [];
     const pkCols = [];
     const uniqueGroups = /* @__PURE__ */ new Map();
-    for (const [colName, col] of Object.entries(columnsObj)) {
+    for (const [colName, outerCol] of Object.entries(columnsObj)) {
+      const { element: col, dimensions: arrayDims } = unwrapArrayColumn(outerCol);
       let { tsType, dbType } = this.mapColumnType(col);
       if (tsType === "unknown" && /At$/.test(colName)) {
         tsType = "Date";
         dbType = "INTEGER";
       }
       const ev = col?.enumValues;
-      const nullable = !col?.notNull && !col?.config?.notNull;
-      const rawDefault = col?.default;
+      const nullable = !outerCol?.notNull && !outerCol?.config?.notNull;
+      const rawDefault = outerCol?.default;
       const defaultValue = rawDefault !== void 0 && !(rawDefault && typeof rawDefault === "object" && "queryChunks" in rawDefault) ? rawDefault : void 0;
-      const generatedIdentity = col?.generatedIdentity;
-      const isGenerated = !!(col?.generated || generatedIdentity?.type === "always" || col?.isGenerated);
-      const hasDefault = col?.hasDefault === true || col?.default !== void 0 || col?.config?.default !== void 0 || col?.defaultFn !== void 0 || isGenerated;
+      const generatedIdentity = outerCol?.generatedIdentity;
+      const isGenerated = !!(outerCol?.generated || generatedIdentity?.type === "always" || outerCol?.isGenerated);
+      const hasDefault = outerCol?.hasDefault === true || outerCol?.default !== void 0 || outerCol?.config?.default !== void 0 || outerCol?.defaultFn !== void 0 || isGenerated;
       const references = void 0;
-      const isUnique = !!(col?.isUnique || col?.config?.isUnique);
-      const isPk = !!(col?.primary || col?.config?.primaryKey);
+      const isUnique = !!(outerCol?.isUnique || outerCol?.config?.isUnique);
+      const isPk = !!(outerCol?.primary || outerCol?.config?.primaryKey);
       if (isPk) pkCols.push(colName);
       if (isUnique) unique.push({ columns: [colName] });
-      const uName = col?.uniqueName || col?.config?.uniqueName;
+      const uName = outerCol?.uniqueName || outerCol?.config?.uniqueName;
       if (uName) {
         const arr = uniqueGroups.get(uName) ?? [];
         arr.push(colName);
@@ -677,6 +700,22 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       const v1 = describeV1Column(col);
       const constraints = this.columnConstraints(col);
       if (v1?.shape) delete constraints.maxLength;
+      const sqlKind = String(outerCol?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
+      const sqlType = sqlKind.startsWith("MySql") && typeof col?.getSQLType === "function" ? String(col.getSQLType()).toLowerCase() : void 0;
+      const byteCap = sqlType ? MYSQL_TEXT_CAPS[sqlType] : void 0;
+      const jsonShape = dbType === "JSON" || dbType === "JSONB" || col?.config?.mode === "json" ? { kind: "json" } : void 0;
+      const shape = (v1?.shape ?? jsonShape)?.kind;
+      const finalTs = v1?.tsType ?? tsType;
+      const wide = (finalTs === "unknown" || finalTs === "any") && (!shape || shape === "custom");
+      if (wide) {
+        const sqlType2 = typeof col?.getSQLType === "function" ? col.getSQLType() : void 0;
+        issues.push({
+          code: "DRZL_ANL_UNKNOWN_COLUMN",
+          level: "warn",
+          message: `Column "${colName}" on table "${tsName}" has no known type${sqlType2 ? ` (SQL type ${sqlType2})` : ""}, so its validator will accept any value.`,
+          hint: shape === "custom" ? "A customType has no runtime shape to read. Declare it with .$type<T>() and turn on typedColumns to give the validator the type." : "Open an issue naming the column type so it can be modelled, or declare it with .$type<T>() and turn on typedColumns."
+        });
+      }
       columns.push({
         name: colName,
         tsType,
@@ -689,7 +728,13 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         enumValues: Array.isArray(ev) ? ev : void 0,
         ...defaultValue !== void 0 ? { defaultValue } : {},
         ...constraints,
-        ...v1 ?? {}
+        ...v1 ?? {},
+        // After the v1 spread, which sets its own `arrayDimensions` from `dimensions`. On 0.4x
+        // that spread has nothing to say and this is the only source.
+        ...arrayDims ? { arrayDimensions: arrayDims } : {},
+        // Only where v1 did not already describe the value, so a shaped column keeps its shape.
+        ...jsonShape && !v1?.shape ? { shape: jsonShape } : {},
+        ...byteCap && v1?.maxBytes === void 0 ? { maxBytes: byteCap } : {}
       });
     }
     const name = this.getSymbol(tbl, "drizzle:Name") || tsName;
@@ -729,6 +774,11 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       const cfg = entry?.config ?? entry ?? {};
       const cols = (cfg.columns ?? []).map((c) => toTs(c?.name)).filter(Boolean);
       if (!cols.length) continue;
+      const entityKind = String(entry?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
+      if (entityKind.endsWith("UniqueConstraintBuilder")) {
+        unique.push({ columns: cols, name: entry?.name });
+        continue;
+      }
       if (cfg.unique === void 0) {
         pkCols.splice(0, pkCols.length, ...cols);
         continue;

package/dist/index.d.cts

@@ -81,6 +81,16 @@ interface Column {
      * value than the one actually stored, so only the literal case is carried.
      */
     defaultValue?: unknown;
+    /**
+     * A cap measured in bytes rather than characters.
+     *
+     * MySQL's TEXT and BLOB families carry their limit in the type itself, and that limit is a byte
+     * budget: `tinytext` is 255 bytes, which on utf8mb4 is 255 ascii characters or 63 emoji.
+     * `maxLength` cannot express that, and using it applied the number as a character count.
+     *
+     * Only MySQL sets this. Postgres `text` has no limit and its `varchar(n)` counts characters.
+     */
+    maxBytes?: number;
     /**
      * Array depth for a column declared with `.array()`, absent when the column is a scalar.
      *

package/dist/index.d.ts

@@ -81,6 +81,16 @@ interface Column {
      * value than the one actually stored, so only the literal case is carried.
      */
     defaultValue?: unknown;
+    /**
+     * A cap measured in bytes rather than characters.
+     *
+     * MySQL's TEXT and BLOB families carry their limit in the type itself, and that limit is a byte
+     * budget: `tinytext` is 255 bytes, which on utf8mb4 is 255 ascii characters or 63 emoji.
+     * `maxLength` cannot express that, and using it applied the number as a character count.
+     *
+     * Only MySQL sets this. Postgres `text` has no limit and its `varchar(n)` counts characters.
+     */
+    maxBytes?: number;
     /**
      * Array depth for a column declared with `.array()`, absent when the column is a scalar.
      *

package/dist/index.js

@@ -166,7 +166,7 @@ function describeV1Column(column) {
         out.dbType = codec === "varchar" ? "VARCHAR" : codec === "char" ? "CHAR" : "TEXT";
         const kind = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
         const cap = codec && kind.startsWith("MySql") ? MYSQL_TEXT_CAPS[codec] : void 0;
-        if (cap) out.maxLength = cap;
+        if (cap) out.maxBytes = cap;
       } else {
         return null;
       }
@@ -175,6 +175,15 @@ function describeV1Column(column) {
   if (typeof dims === "number" && dims >= 1) out.arrayDimensions = dims;
   return out;
 }
+function unwrapArrayColumn(column) {
+  let element = column;
+  let dimensions = 0;
+  while (element?.baseColumn && String(element?.constructor?.name ?? "").endsWith("Array")) {
+    element = element.baseColumn;
+    dimensions++;
+  }
+  return { element, dimensions };
+}
 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;
@@ -475,10 +484,23 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         return { tsType: "number", dbType: "REAL" };
       case "SQLiteBlob":
         return { tsType: "Uint8Array", dbType: "BLOB" };
+      // SQLite spells a mode as a distinct class rather than as config, so `text({mode:'json'})`
+      // is a `SQLiteTextJson` and matched no arm at all: the column came back UNKNOWN, which is
+      // wider than the `any` a json column at least used to get.
+      case "SQLiteTextJson":
+      case "SQLiteBlobJson":
+        return { tsType: "any", dbType: "JSON" };
+      case "SQLiteBigInt":
+        return { tsType: "bigint", dbType: "BIGINT" };
       case "SQLiteNumeric":
         return { tsType: "string", dbType: "NUMERIC" };
       case "SQLiteBoolean":
         return { tsType: "boolean", dbType: "INTEGER" };
+      // 0.4x gives an enum its own class, which had no arm here at all, so an enum column came
+      // back `unknown` and every generator emitted a schema that accepted anything. The values
+      // were on the column the whole time, in `enumValues`, waiting for a type to attach to.
+      case "PgEnumColumn":
+        return { tsType: "string", dbType: "TEXT" };
       case "PgInteger":
       case "PgSmallInt":
         return { tsType: "number", dbType: "INTEGER" };
@@ -610,25 +632,26 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     const foreignKeys = [];
     const pkCols = [];
     const uniqueGroups = /* @__PURE__ */ new Map();
-    for (const [colName, col] of Object.entries(columnsObj)) {
+    for (const [colName, outerCol] of Object.entries(columnsObj)) {
+      const { element: col, dimensions: arrayDims } = unwrapArrayColumn(outerCol);
       let { tsType, dbType } = this.mapColumnType(col);
       if (tsType === "unknown" && /At$/.test(colName)) {
         tsType = "Date";
         dbType = "INTEGER";
       }
       const ev = col?.enumValues;
-      const nullable = !col?.notNull && !col?.config?.notNull;
-      const rawDefault = col?.default;
+      const nullable = !outerCol?.notNull && !outerCol?.config?.notNull;
+      const rawDefault = outerCol?.default;
       const defaultValue = rawDefault !== void 0 && !(rawDefault && typeof rawDefault === "object" && "queryChunks" in rawDefault) ? rawDefault : void 0;
-      const generatedIdentity = col?.generatedIdentity;
-      const isGenerated = !!(col?.generated || generatedIdentity?.type === "always" || col?.isGenerated);
-      const hasDefault = col?.hasDefault === true || col?.default !== void 0 || col?.config?.default !== void 0 || col?.defaultFn !== void 0 || isGenerated;
+      const generatedIdentity = outerCol?.generatedIdentity;
+      const isGenerated = !!(outerCol?.generated || generatedIdentity?.type === "always" || outerCol?.isGenerated);
+      const hasDefault = outerCol?.hasDefault === true || outerCol?.default !== void 0 || outerCol?.config?.default !== void 0 || outerCol?.defaultFn !== void 0 || isGenerated;
       const references = void 0;
-      const isUnique = !!(col?.isUnique || col?.config?.isUnique);
-      const isPk = !!(col?.primary || col?.config?.primaryKey);
+      const isUnique = !!(outerCol?.isUnique || outerCol?.config?.isUnique);
+      const isPk = !!(outerCol?.primary || outerCol?.config?.primaryKey);
       if (isPk) pkCols.push(colName);
       if (isUnique) unique.push({ columns: [colName] });
-      const uName = col?.uniqueName || col?.config?.uniqueName;
+      const uName = outerCol?.uniqueName || outerCol?.config?.uniqueName;
       if (uName) {
         const arr = uniqueGroups.get(uName) ?? [];
         arr.push(colName);
@@ -637,6 +660,22 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       const v1 = describeV1Column(col);
       const constraints = this.columnConstraints(col);
       if (v1?.shape) delete constraints.maxLength;
+      const sqlKind = String(outerCol?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
+      const sqlType = sqlKind.startsWith("MySql") && typeof col?.getSQLType === "function" ? String(col.getSQLType()).toLowerCase() : void 0;
+      const byteCap = sqlType ? MYSQL_TEXT_CAPS[sqlType] : void 0;
+      const jsonShape = dbType === "JSON" || dbType === "JSONB" || col?.config?.mode === "json" ? { kind: "json" } : void 0;
+      const shape = (v1?.shape ?? jsonShape)?.kind;
+      const finalTs = v1?.tsType ?? tsType;
+      const wide = (finalTs === "unknown" || finalTs === "any") && (!shape || shape === "custom");
+      if (wide) {
+        const sqlType2 = typeof col?.getSQLType === "function" ? col.getSQLType() : void 0;
+        issues.push({
+          code: "DRZL_ANL_UNKNOWN_COLUMN",
+          level: "warn",
+          message: `Column "${colName}" on table "${tsName}" has no known type${sqlType2 ? ` (SQL type ${sqlType2})` : ""}, so its validator will accept any value.`,
+          hint: shape === "custom" ? "A customType has no runtime shape to read. Declare it with .$type<T>() and turn on typedColumns to give the validator the type." : "Open an issue naming the column type so it can be modelled, or declare it with .$type<T>() and turn on typedColumns."
+        });
+      }
       columns.push({
         name: colName,
         tsType,
@@ -649,7 +688,13 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         enumValues: Array.isArray(ev) ? ev : void 0,
         ...defaultValue !== void 0 ? { defaultValue } : {},
         ...constraints,
-        ...v1 ?? {}
+        ...v1 ?? {},
+        // After the v1 spread, which sets its own `arrayDimensions` from `dimensions`. On 0.4x
+        // that spread has nothing to say and this is the only source.
+        ...arrayDims ? { arrayDimensions: arrayDims } : {},
+        // Only where v1 did not already describe the value, so a shaped column keeps its shape.
+        ...jsonShape && !v1?.shape ? { shape: jsonShape } : {},
+        ...byteCap && v1?.maxBytes === void 0 ? { maxBytes: byteCap } : {}
       });
     }
     const name = this.getSymbol(tbl, "drizzle:Name") || tsName;
@@ -689,6 +734,11 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       const cfg = entry?.config ?? entry ?? {};
       const cols = (cfg.columns ?? []).map((c) => toTs(c?.name)).filter(Boolean);
       if (!cols.length) continue;
+      const entityKind = String(entry?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
+      if (entityKind.endsWith("UniqueConstraintBuilder")) {
+        unique.push({ columns: cols, name: entry?.name });
+        continue;
+      }
       if (cfg.unique === void 0) {
         pkCols.splice(0, pkCols.length, ...cols);
         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/analyzer",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",
@@ -45,6 +45,6 @@
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm,cjs",
     "lint": "eslint . --ext .ts",
-    "test": "vitest run"
+    "test": "vitest run --testTimeout=20000"
   }
 }