@leonardovida-md/drizzle-neo-duckdb 1.0.3 → 1.1.0

package/src/sql/query-rewriters.ts

@@ -1,13 +1,3 @@
-const selectionRegex = /select\s+(.+)\s+from/i;
-const tableIdPropSelectionRegex = new RegExp(
-  [
-    `("(.+)"\\."(.+)")`, // table identifier + property
-    `(\\s+as\\s+'?(.+?)'?\\.'?(.+?)'?)?`, // optional AS clause
-  ].join(''),
-  'i'
-);
-const noTableIdPropSelectionRegex = /"(.+)"(\s+as\s+'?\1'?)?/i;
-
 export function adaptArrayOperators(query: string): string {
   type ArrayOperator = {
     token: '@>' | '<@' | '&&';
@@ -34,6 +24,7 @@ export function adaptArrayOperators(query: string): string {
     let inString = false;
     for (; idx >= 0; idx--) {
       const ch = source[idx];
+      if (ch === undefined) break;
       if (ch === "'" && source[idx - 1] !== '\\') {
         inString = !inString;
       }
@@ -62,6 +53,7 @@ export function adaptArrayOperators(query: string): string {
     let inString = false;
     for (; idx < source.length; idx++) {
       const ch = source[idx];
+      if (ch === undefined) break;
       if (ch === "'" && source[idx - 1] !== '\\') {
         inString = !inString;
       }
@@ -103,42 +95,3 @@ export function adaptArrayOperators(query: string): string {
 
   return rewritten;
 }
-
-export function queryAdapter(query: string): string {
-  const selection = selectionRegex.exec(query);
-
-  if (selection?.length !== 2) {
-    return query;
-  }
-
-  const fields = selection[1]
-    .split(',')
-    .map((field) => {
-      const trimmedField = field.trim();
-      const tableProp = tableIdPropSelectionRegex.exec(trimmedField);
-      if (tableProp) {
-        const [, identifier, table, column, , aliasTable, aliasColumn] =
-          tableProp;
-
-        const asAlias = `'${aliasTable ?? table}.${aliasColumn ?? column}'`;
-        if (tableProp[4]) {
-          return trimmedField.replace(tableProp[4], ` as ${asAlias}`);
-        }
-        return `${identifier} as ${asAlias}`;
-      }
-
-      const noTableProp = noTableIdPropSelectionRegex.exec(trimmedField);
-      if (noTableProp) {
-        const [, column, alias] = noTableProp;
-        const asAlias = ` as '${column}'`;
-        return alias
-          ? trimmedField.replace(alias, asAlias)
-          : `${trimmedField}${asAlias}`;
-      }
-
-      return trimmedField;
-    })
-    .filter(Boolean) as string[];
-
-  return query.replace(selection[1], fields.join(', '));
-}

package/src/utils.ts

@@ -1,3 +1,3 @@
 export { aliasFields } from './sql/selection.ts';
-export { adaptArrayOperators, queryAdapter } from './sql/query-rewriters.ts';
+export { adaptArrayOperators } from './sql/query-rewriters.ts';
 export { mapResultRow } from './sql/result-mapper.ts';

package/src/value-wrappers-core.ts

@@ -0,0 +1,156 @@
+/**
+ * DuckDB wrapper value helpers that are safe for client-side bundles.
+ * These utilities only tag values; conversion to native bindings lives
+ * in value-wrappers.ts to avoid pulling @duckdb/node-api into browsers.
+ */
+export const DUCKDB_VALUE_MARKER = Symbol.for('drizzle-duckdb:value');
+
+export type DuckDBValueKind =
+  | 'list'
+  | 'array'
+  | 'struct'
+  | 'map'
+  | 'timestamp'
+  | 'blob'
+  | 'json';
+
+export interface DuckDBValueWrapper<
+  TKind extends DuckDBValueKind = DuckDBValueKind,
+  TData = unknown,
+> {
+  readonly [DUCKDB_VALUE_MARKER]: true;
+  readonly kind: TKind;
+  readonly data: TData;
+}
+
+export interface ListValueWrapper
+  extends DuckDBValueWrapper<'list', unknown[]> {
+  readonly elementType?: string;
+}
+
+export interface ArrayValueWrapper
+  extends DuckDBValueWrapper<'array', unknown[]> {
+  readonly elementType?: string;
+  readonly fixedLength?: number;
+}
+
+export interface StructValueWrapper
+  extends DuckDBValueWrapper<'struct', Record<string, unknown>> {
+  readonly schema?: Record<string, string>;
+}
+
+export interface MapValueWrapper
+  extends DuckDBValueWrapper<'map', Record<string, unknown>> {
+  readonly valueType?: string;
+}
+
+export interface TimestampValueWrapper
+  extends DuckDBValueWrapper<'timestamp', Date | string> {
+  readonly withTimezone: boolean;
+  readonly precision?: number;
+}
+
+export interface BlobValueWrapper
+  extends DuckDBValueWrapper<'blob', Buffer | Uint8Array> {}
+
+export interface JsonValueWrapper extends DuckDBValueWrapper<'json', unknown> {}
+
+export type AnyDuckDBValueWrapper =
+  | ListValueWrapper
+  | ArrayValueWrapper
+  | StructValueWrapper
+  | MapValueWrapper
+  | TimestampValueWrapper
+  | BlobValueWrapper
+  | JsonValueWrapper;
+
+export function isDuckDBWrapper(
+  value: unknown
+): value is AnyDuckDBValueWrapper {
+  return (
+    value !== null &&
+    typeof value === 'object' &&
+    DUCKDB_VALUE_MARKER in value &&
+    (value as DuckDBValueWrapper)[DUCKDB_VALUE_MARKER] === true
+  );
+}
+
+export function wrapList(
+  data: unknown[],
+  elementType?: string
+): ListValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'list',
+    data,
+    elementType,
+  };
+}
+
+export function wrapArray(
+  data: unknown[],
+  elementType?: string,
+  fixedLength?: number
+): ArrayValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'array',
+    data,
+    elementType,
+    fixedLength,
+  };
+}
+
+export function wrapStruct(
+  data: Record<string, unknown>,
+  schema?: Record<string, string>
+): StructValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'struct',
+    data,
+    schema,
+  };
+}
+
+export function wrapMap(
+  data: Record<string, unknown>,
+  valueType?: string
+): MapValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'map',
+    data,
+    valueType,
+  };
+}
+
+export function wrapTimestamp(
+  data: Date | string,
+  withTimezone: boolean,
+  precision?: number
+): TimestampValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'timestamp',
+    data,
+    withTimezone,
+    precision,
+  };
+}
+
+export function wrapBlob(data: Buffer | Uint8Array): BlobValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'blob',
+    data,
+  };
+}
+
+export function wrapJson(data: unknown): JsonValueWrapper {
+  return {
+    [DUCKDB_VALUE_MARKER]: true,
+    kind: 'json',
+    data,
+  };
+}

package/src/value-wrappers.ts

@@ -9,219 +9,27 @@ import {
   type DuckDBValue,
   type DuckDBMapEntry,
 } from '@duckdb/node-api';
-
-/**
- * Symbol used to identify wrapped DuckDB values for native binding.
- * Uses Symbol.for() to ensure cross-module compatibility.
- */
-export const DUCKDB_VALUE_MARKER = Symbol.for('drizzle-duckdb:value');
-
-/**
- * Type identifier for each wrapper kind.
- */
-export type DuckDBValueKind =
-  | 'list'
-  | 'array'
-  | 'struct'
-  | 'map'
-  | 'timestamp'
-  | 'blob'
-  | 'json';
-
-/**
- * Base interface for all tagged DuckDB value wrappers.
- */
-export interface DuckDBValueWrapper<
-  TKind extends DuckDBValueKind = DuckDBValueKind,
-  TData = unknown,
-> {
-  readonly [DUCKDB_VALUE_MARKER]: true;
-  readonly kind: TKind;
-  readonly data: TData;
-}
-
-/**
- * List wrapper - maps to DuckDBListValue
- */
-export interface ListValueWrapper
-  extends DuckDBValueWrapper<'list', unknown[]> {
-  readonly elementType?: string;
-}
-
-/**
- * Array wrapper (fixed size) - maps to DuckDBArrayValue
- */
-export interface ArrayValueWrapper
-  extends DuckDBValueWrapper<'array', unknown[]> {
-  readonly elementType?: string;
-  readonly fixedLength?: number;
-}
-
-/**
- * Struct wrapper - maps to DuckDBStructValue
- */
-export interface StructValueWrapper
-  extends DuckDBValueWrapper<'struct', Record<string, unknown>> {
-  readonly schema?: Record<string, string>;
-}
-
-/**
- * Map wrapper - maps to DuckDBMapValue
- */
-export interface MapValueWrapper
-  extends DuckDBValueWrapper<'map', Record<string, unknown>> {
-  readonly valueType?: string;
-}
-
-/**
- * Timestamp wrapper - maps to DuckDBTimestampValue or DuckDBTimestampTZValue
- */
-export interface TimestampValueWrapper
-  extends DuckDBValueWrapper<'timestamp', Date | string> {
-  readonly withTimezone: boolean;
-  readonly precision?: number;
-}
-
-/**
- * Blob wrapper - maps to DuckDBBlobValue
- */
-export interface BlobValueWrapper
-  extends DuckDBValueWrapper<'blob', Buffer | Uint8Array> {}
-
-/**
- * JSON wrapper - delays JSON.stringify() to binding time.
- * DuckDB stores JSON as VARCHAR internally.
- */
-export interface JsonValueWrapper extends DuckDBValueWrapper<'json', unknown> {}
-
-/**
- * Union of all wrapper types for exhaustive type checking.
- */
-export type AnyDuckDBValueWrapper =
-  | ListValueWrapper
-  | ArrayValueWrapper
-  | StructValueWrapper
-  | MapValueWrapper
-  | TimestampValueWrapper
-  | BlobValueWrapper
-  | JsonValueWrapper;
-
-/**
- * Type guard to check if a value is a tagged DuckDB wrapper.
- * Optimized for fast detection in the hot path.
- */
-export function isDuckDBWrapper(
-  value: unknown
-): value is AnyDuckDBValueWrapper {
-  return (
-    value !== null &&
-    typeof value === 'object' &&
-    DUCKDB_VALUE_MARKER in value &&
-    (value as DuckDBValueWrapper)[DUCKDB_VALUE_MARKER] === true
-  );
-}
-
-/**
- * Create a list wrapper for variable-length lists.
- */
-export function wrapList(
-  data: unknown[],
-  elementType?: string
-): ListValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'list',
-    data,
-    elementType,
-  };
-}
-
-/**
- * Create an array wrapper for fixed-length arrays.
- */
-export function wrapArray(
-  data: unknown[],
-  elementType?: string,
-  fixedLength?: number
-): ArrayValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'array',
-    data,
-    elementType,
-    fixedLength,
-  };
-}
-
-/**
- * Create a struct wrapper for named field structures.
- */
-export function wrapStruct(
-  data: Record<string, unknown>,
-  schema?: Record<string, string>
-): StructValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'struct',
-    data,
-    schema,
-  };
-}
-
-/**
- * Create a map wrapper for key-value maps.
- */
-export function wrapMap(
-  data: Record<string, unknown>,
-  valueType?: string
-): MapValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'map',
-    data,
-    valueType,
-  };
-}
-
-/**
- * Create a timestamp wrapper.
- */
-export function wrapTimestamp(
-  data: Date | string,
-  withTimezone: boolean,
-  precision?: number
-): TimestampValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'timestamp',
-    data,
-    withTimezone,
-    precision,
-  };
-}
-
-/**
- * Create a blob wrapper for binary data.
- */
-export function wrapBlob(data: Buffer | Uint8Array): BlobValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'blob',
-    data,
-  };
-}
-
-/**
- * Create a JSON wrapper that delays JSON.stringify() to binding time.
- * This ensures consistent handling with other wrapped types.
- */
-export function wrapJson(data: unknown): JsonValueWrapper {
-  return {
-    [DUCKDB_VALUE_MARKER]: true,
-    kind: 'json',
-    data,
-  };
-}
+import {
+  DUCKDB_VALUE_MARKER,
+  isDuckDBWrapper,
+  wrapArray,
+  wrapBlob,
+  wrapJson,
+  wrapList,
+  wrapMap,
+  wrapStruct,
+  wrapTimestamp,
+  type AnyDuckDBValueWrapper,
+  type DuckDBValueWrapper,
+  type ArrayValueWrapper,
+  type BlobValueWrapper,
+  type JsonValueWrapper,
+  type ListValueWrapper,
+  type MapValueWrapper,
+  type StructValueWrapper,
+  type TimestampValueWrapper,
+  type DuckDBValueKind,
+} from './value-wrappers-core.ts';
 
 /**
  * Convert a Date or string to microseconds since Unix epoch.
@@ -322,3 +130,26 @@ export function wrapperToNodeApiValue(
     }
   }
 }
+
+// Re-export core helpers for convenience and backward compatibility.
+export {
+  DUCKDB_VALUE_MARKER,
+  isDuckDBWrapper,
+  wrapArray,
+  wrapBlob,
+  wrapJson,
+  wrapList,
+  wrapMap,
+  wrapStruct,
+  wrapTimestamp,
+  type AnyDuckDBValueWrapper,
+  type DuckDBValueWrapper,
+  type ArrayValueWrapper,
+  type BlobValueWrapper,
+  type JsonValueWrapper,
+  type ListValueWrapper,
+  type MapValueWrapper,
+  type StructValueWrapper,
+  type TimestampValueWrapper,
+  type DuckDBValueKind,
+} from './value-wrappers-core.ts';