@drzl/analyzer 1.15.0 → 1.16.0

package/dist/index.cjs

@@ -33,6 +33,7 @@ __export(index_exports, {
   SchemaAnalyzer: () => SchemaAnalyzer,
   default: () => index_default,
   describeV1Column: () => describeV1Column,
+  isDrizzleView: () => isDrizzleView,
   isReadOnlyRelation: () => isReadOnlyRelation,
   isRelationsV2: () => isRelationsV2,
   readRelationsV2: () => readRelationsV2
@@ -68,6 +69,7 @@ var TUPLE_CLASS_SHAPES = {
   PgPointTuple: { kind: "tuple", length: 2 },
   PgLineTuple: { kind: "tuple", length: 3 }
 };
+var V1_ONLY_ENTITY_KINDS = /^(?:MsSql|Cockroach)/;
 function describeV1Column(column) {
   const codec = column?.codec;
   const dataType = column?.dataType;
@@ -80,8 +82,9 @@ function describeV1Column(column) {
       shape: { kind: "custom", sqlType: typeof sqlType === "string" ? sqlType : void 0 }
     };
   }
+  const entityKind = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
   const [js, semantic = ""] = dataType.split(" ");
-  if (typeof codec !== "string" && !semantic) return null;
+  if (typeof codec !== "string" && !semantic && !V1_ONLY_ENTITY_KINDS.test(entityKind)) return null;
   const out = {};
   switch (semantic) {
     case "int8":
@@ -117,7 +120,7 @@ function describeV1Column(column) {
     case "float":
     case "double": {
       if (semantic === "float")
-        [out.min, out.max] = codec === "float4" ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
+        [out.min, out.max] = codec === "float4" || entityKind.startsWith("Cockroach") ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
       out.integer = false;
       out.tsType = "number";
       out.dbType = semantic === "float" ? "REAL" : "DOUBLE";
@@ -234,15 +237,33 @@ 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;
+var VIEW_CONFIG_FIELDS = {
+  "drizzle:Columns": "selectedFields",
+  "drizzle:Name": "name",
+  "drizzle:Schema": "schema"
+};
+function ownSymbolOf(target, key) {
   try {
     for (const sym of Object.getOwnPropertySymbols(target)) {
       if (sym.description === key) return target[sym];
     }
   } catch {
   }
-  return target[Symbol.for(key)];
+  return void 0;
+}
+function getSymbolOf(target, key) {
+  if (!target) return void 0;
+  const own = ownSymbolOf(target, key);
+  if (own !== void 0) return own;
+  const direct = target[Symbol.for(key)];
+  if (direct !== void 0) return direct;
+  const field = VIEW_CONFIG_FIELDS[key];
+  if (!field) return void 0;
+  const cfg = ownSymbolOf(target, "drizzle:ViewBaseConfig");
+  return cfg ? cfg[field] : void 0;
+}
+function isDrizzleView(val) {
+  return !!val && typeof val === "object" && !!getSymbolOf(val, "drizzle:ViewBaseConfig");
 }
 function isReadOnlyRelation(val) {
   if (!val || typeof val !== "object") return false;
@@ -286,17 +307,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     this.schemaPath = schemaPath;
   }
   getSymbol(table, key) {
-    if (!table) return void 0;
-    try {
-      const syms = Object.getOwnPropertySymbols(table);
-      for (const s of syms) {
-        if (s.description === key) {
-          return table[s];
-        }
-      }
-    } catch {
-    }
-    return table[Symbol.for(key)];
+    return getSymbolOf(table, key);
   }
   /**
    * Drizzle keys the Columns object by TypeScript property name, but every other piece of
@@ -681,11 +692,10 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/Json/i.test(ctor)) return { tsType: "any", dbType: "JSON" };
           if (/Text/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
           if (/Bytes/i.test(ctor)) return { tsType: "Uint8Array", dbType: "BLOB" };
+          if (/Bool/i.test(ctor)) return { tsType: "boolean", dbType: "BOOLEAN" };
           if (/TimestampTz/i.test(ctor)) return { tsType: "Date", dbType: "TIMESTAMPTZ" };
-          if (/Timestamp/i.test(ctor)) return { tsType: "string", dbType: "TIMESTAMP" };
-          if (/LocalDateString|LocalTime/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
-          if (/DateDuration|RelDuration|Duration/i.test(ctor))
-            return { tsType: "string", dbType: "TEXT" };
+          if (/Timestamp|LocalDateString|LocalTime|DateDuration|RelDuration|Duration/i.test(ctor))
+            return { tsType: "unknown", dbType: "UNKNOWN" };
         }
         return { tsType: "unknown", dbType: "UNKNOWN" };
     }
@@ -880,12 +890,14 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     const relations = [];
     const enums = [];
     const columnEnums = [];
+    const viewTables = [];
     for (const [name, val] of Object.entries(exportsObj)) {
       try {
         const cols = this.getSymbol(val, "drizzle:Columns");
         if (cols && typeof cols === "object") {
           const table = this.analyzeTable(name, val, issues);
           tables.push(table);
+          if (isDrizzleView(val)) viewTables.push(table);
           for (const col of table.columns) {
             const enumVals = cols[col.name]?.enumValues;
             if (enumVals && enumVals.length) {
@@ -936,7 +948,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     let dialect = "unknown";
     const marks = /* @__PURE__ */ new Set();
     for (const [_, val] of Object.entries(exportsObj)) {
-      const cols = val?.[/* @__PURE__ */ Symbol.for("drizzle:Columns")];
+      const cols = this.getSymbol(val, "drizzle:Columns");
       if (!cols) continue;
       for (const c of Object.values(cols)) {
         const kind = c?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")];
@@ -953,6 +965,9 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     else if (/MySql|Mysql/i.test(names)) dialect = "mysql";
     else if (/Pg|Postgres/i.test(names)) dialect = "postgres";
     else if (/Gel/i.test(names)) dialect = "gel";
+    if (dialect === "sqlite") {
+      for (const view of viewTables) view.readOnly = true;
+    }
     if (dialect === "unknown" && tables.length) {
       issues.push({
         code: "DRZL_ANL_DIALECT",
@@ -1098,6 +1113,7 @@ var index_default = SchemaAnalyzer;
 0 && (module.exports = {
   SchemaAnalyzer,
   describeV1Column,
+  isDrizzleView,
   isReadOnlyRelation,
   isRelationsV2,
   readRelationsV2

package/dist/index.d.cts

@@ -231,6 +231,17 @@ interface AnalyzeOptions {
  * path below untouched.
  */
 declare function describeV1Column(column: any): Partial<Column> | null;
+/**
+ * Whether an export is a Drizzle view, of any dialect and on either major.
+ *
+ * Asked of `drizzle:ViewBaseConfig` rather than of `drizzle:IsDrizzleView`, which reads like the
+ * obvious question and is not there to be asked: the marker was introduced in 0.39.0, and a view
+ * built on 0.29.5, 0.33.0 or 0.36.4 answers undefined to it. The config is an own symbol on all
+ * eleven releases probed and on every view form measured, on both majors: the query-builder and
+ * explicit-column-list forms of pg view, pg materialized view, mysql view and sqlite view,
+ * `.existing()`, and the schema-qualified pg view and materialized view.
+ */
+declare function isDrizzleView(val: any): boolean;
 /**
  * Whether an export is a Relations v2 definition, from `defineRelations(schema, (r) => ...)`.
  *
@@ -402,4 +413,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, isReadOnlyRelation, isRelationsV2, readRelationsV2 };
+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, isDrizzleView, isReadOnlyRelation, isRelationsV2, readRelationsV2 };

package/dist/index.d.ts

@@ -231,6 +231,17 @@ interface AnalyzeOptions {
  * path below untouched.
  */
 declare function describeV1Column(column: any): Partial<Column> | null;
+/**
+ * Whether an export is a Drizzle view, of any dialect and on either major.
+ *
+ * Asked of `drizzle:ViewBaseConfig` rather than of `drizzle:IsDrizzleView`, which reads like the
+ * obvious question and is not there to be asked: the marker was introduced in 0.39.0, and a view
+ * built on 0.29.5, 0.33.0 or 0.36.4 answers undefined to it. The config is an own symbol on all
+ * eleven releases probed and on every view form measured, on both majors: the query-builder and
+ * explicit-column-list forms of pg view, pg materialized view, mysql view and sqlite view,
+ * `.existing()`, and the schema-qualified pg view and materialized view.
+ */
+declare function isDrizzleView(val: any): boolean;
 /**
  * Whether an export is a Relations v2 definition, from `defineRelations(schema, (r) => ...)`.
  *
@@ -402,4 +413,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, isReadOnlyRelation, isRelationsV2, readRelationsV2 };
+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, isDrizzleView, isReadOnlyRelation, isRelationsV2, readRelationsV2 };

package/dist/index.js

@@ -28,6 +28,7 @@ var TUPLE_CLASS_SHAPES = {
   PgPointTuple: { kind: "tuple", length: 2 },
   PgLineTuple: { kind: "tuple", length: 3 }
 };
+var V1_ONLY_ENTITY_KINDS = /^(?:MsSql|Cockroach)/;
 function describeV1Column(column) {
   const codec = column?.codec;
   const dataType = column?.dataType;
@@ -40,8 +41,9 @@ function describeV1Column(column) {
       shape: { kind: "custom", sqlType: typeof sqlType === "string" ? sqlType : void 0 }
     };
   }
+  const entityKind = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
   const [js, semantic = ""] = dataType.split(" ");
-  if (typeof codec !== "string" && !semantic) return null;
+  if (typeof codec !== "string" && !semantic && !V1_ONLY_ENTITY_KINDS.test(entityKind)) return null;
   const out = {};
   switch (semantic) {
     case "int8":
@@ -77,7 +79,7 @@ function describeV1Column(column) {
     case "float":
     case "double": {
       if (semantic === "float")
-        [out.min, out.max] = codec === "float4" ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
+        [out.min, out.max] = codec === "float4" || entityKind.startsWith("Cockroach") ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
       out.integer = false;
       out.tsType = "number";
       out.dbType = semantic === "float" ? "REAL" : "DOUBLE";
@@ -194,15 +196,33 @@ 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;
+var VIEW_CONFIG_FIELDS = {
+  "drizzle:Columns": "selectedFields",
+  "drizzle:Name": "name",
+  "drizzle:Schema": "schema"
+};
+function ownSymbolOf(target, key) {
   try {
     for (const sym of Object.getOwnPropertySymbols(target)) {
       if (sym.description === key) return target[sym];
     }
   } catch {
   }
-  return target[Symbol.for(key)];
+  return void 0;
+}
+function getSymbolOf(target, key) {
+  if (!target) return void 0;
+  const own = ownSymbolOf(target, key);
+  if (own !== void 0) return own;
+  const direct = target[Symbol.for(key)];
+  if (direct !== void 0) return direct;
+  const field = VIEW_CONFIG_FIELDS[key];
+  if (!field) return void 0;
+  const cfg = ownSymbolOf(target, "drizzle:ViewBaseConfig");
+  return cfg ? cfg[field] : void 0;
+}
+function isDrizzleView(val) {
+  return !!val && typeof val === "object" && !!getSymbolOf(val, "drizzle:ViewBaseConfig");
 }
 function isReadOnlyRelation(val) {
   if (!val || typeof val !== "object") return false;
@@ -246,17 +266,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     this.schemaPath = schemaPath;
   }
   getSymbol(table, key) {
-    if (!table) return void 0;
-    try {
-      const syms = Object.getOwnPropertySymbols(table);
-      for (const s of syms) {
-        if (s.description === key) {
-          return table[s];
-        }
-      }
-    } catch {
-    }
-    return table[Symbol.for(key)];
+    return getSymbolOf(table, key);
   }
   /**
    * Drizzle keys the Columns object by TypeScript property name, but every other piece of
@@ -641,11 +651,10 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/Json/i.test(ctor)) return { tsType: "any", dbType: "JSON" };
           if (/Text/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
           if (/Bytes/i.test(ctor)) return { tsType: "Uint8Array", dbType: "BLOB" };
+          if (/Bool/i.test(ctor)) return { tsType: "boolean", dbType: "BOOLEAN" };
           if (/TimestampTz/i.test(ctor)) return { tsType: "Date", dbType: "TIMESTAMPTZ" };
-          if (/Timestamp/i.test(ctor)) return { tsType: "string", dbType: "TIMESTAMP" };
-          if (/LocalDateString|LocalTime/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
-          if (/DateDuration|RelDuration|Duration/i.test(ctor))
-            return { tsType: "string", dbType: "TEXT" };
+          if (/Timestamp|LocalDateString|LocalTime|DateDuration|RelDuration|Duration/i.test(ctor))
+            return { tsType: "unknown", dbType: "UNKNOWN" };
         }
         return { tsType: "unknown", dbType: "UNKNOWN" };
     }
@@ -840,12 +849,14 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     const relations = [];
     const enums = [];
     const columnEnums = [];
+    const viewTables = [];
     for (const [name, val] of Object.entries(exportsObj)) {
       try {
         const cols = this.getSymbol(val, "drizzle:Columns");
         if (cols && typeof cols === "object") {
           const table = this.analyzeTable(name, val, issues);
           tables.push(table);
+          if (isDrizzleView(val)) viewTables.push(table);
           for (const col of table.columns) {
             const enumVals = cols[col.name]?.enumValues;
             if (enumVals && enumVals.length) {
@@ -896,7 +907,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     let dialect = "unknown";
     const marks = /* @__PURE__ */ new Set();
     for (const [_, val] of Object.entries(exportsObj)) {
-      const cols = val?.[/* @__PURE__ */ Symbol.for("drizzle:Columns")];
+      const cols = this.getSymbol(val, "drizzle:Columns");
       if (!cols) continue;
       for (const c of Object.values(cols)) {
         const kind = c?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")];
@@ -913,6 +924,9 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     else if (/MySql|Mysql/i.test(names)) dialect = "mysql";
     else if (/Pg|Postgres/i.test(names)) dialect = "postgres";
     else if (/Gel/i.test(names)) dialect = "gel";
+    if (dialect === "sqlite") {
+      for (const view of viewTables) view.readOnly = true;
+    }
     if (dialect === "unknown" && tables.length) {
       issues.push({
         code: "DRZL_ANL_DIALECT",
@@ -1058,6 +1072,7 @@ export {
   SchemaAnalyzer,
   index_default as default,
   describeV1Column,
+  isDrizzleView,
   isReadOnlyRelation,
   isRelationsV2,
   readRelationsV2

package/package.json

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