@an5/adapters 0.2.3 → 0.2.5

package/typescript/src/base/index.ts

@@ -1,3 +1,3 @@
-export * from './types';
-export * from './sql';
-export * from './metadata';
+export * from './types';
+export * from './sql';
+export * from './metadata';

package/typescript/src/base/metadata.ts

@@ -1,28 +1,28 @@
-export interface ModelFieldMeta {
-  name?: string;
-  ts?: string;
-  sql?: string;
-  isId?: boolean;
-  [key: string]: any;
-}
-
-export interface AdapterMetadata {
-  modelToTable?: Record<string, string>;
-  modelFields?: Record<string, any>;
-}
-
-let modelToTable: Record<string, string> = {};
-let modelFields: Record<string, any> = {};
-
-export function setAdapterMetadata(metadata: AdapterMetadata): void {
-  modelToTable = { ...(metadata.modelToTable || {}) };
-  modelFields = { ...(metadata.modelFields || {}) };
-}
-
-export function getModelToTable(): Record<string, string> {
-  return modelToTable;
-}
-
-export function getFieldsForModel(modelName: string): any {
-  return modelFields[modelName] || {};
-}
+export interface ModelFieldMeta {
+  name?: string;
+  ts?: string;
+  sql?: string;
+  isId?: boolean;
+  [key: string]: any;
+}
+
+export interface AdapterMetadata {
+  modelToTable?: Record<string, string>;
+  modelFields?: Record<string, any>;
+}
+
+let modelToTable: Record<string, string> = {};
+let modelFields: Record<string, any> = {};
+
+export function setAdapterMetadata(metadata: AdapterMetadata): void {
+  modelToTable = { ...(metadata.modelToTable || {}) };
+  modelFields = { ...(metadata.modelFields || {}) };
+}
+
+export function getModelToTable(): Record<string, string> {
+  return modelToTable;
+}
+
+export function getFieldsForModel(modelName: string): any {
+  return modelFields[modelName] || {};
+}

package/typescript/src/base/sql.ts

@@ -1,98 +1,98 @@
-import type { Dialect } from './types';
-
-// ─── Quoting ───────────────────────────────────────────────────────────────────────
-
-export function quote(name: string, dialect: Dialect): string {
-  if (dialect === 'postgres') {
-    if (name.startsWith('[') && name.endsWith(']')) return `"${name.slice(1, -1)}"`;
-    if (name.startsWith('"')) return name;
-    return `"${name}"`;
-  }
-  if (dialect === 'mysql') {
-    if (name.startsWith('[') && name.endsWith(']')) return `\`${name.slice(1, -1)}\``;
-    if (name.startsWith('`')) return name;
-    return `\`${name}\``;
-  }
-  // mssql / sqlite
-  return name.startsWith('[') ? name : `[${name}]`;
-}
-
-// ─── Where clause builder ──────────────────────────────────────────────────────────
-
-export function parseWhere(modelName: string, where: any, params: Record<string, any>, dialect: Dialect, prefix = ''): string {
-  if (!where) return '';
-  const conditions: string[] = [];
-
-  const cleanWhere: Record<string, any> = {};
-  for (const [key, value] of Object.entries(where)) {
-    if (
-      key.includes('_') &&
-      value && typeof value === 'object' &&
-      !(value instanceof Date) &&
-      !(value as any).in && !(value as any).contains &&
-      !(value as any).not && !(value as any).gte &&
-      !(value as any).lte && !(value as any).gt && !(value as any).lt
-    ) {
-      Object.assign(cleanWhere, value);
-    } else {
-      cleanWhere[key] = value;
-    }
-  }
-
-  for (const [key, value] of Object.entries(cleanWhere)) {
-    if (key === 'OR' && Array.isArray(value)) {
-      const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}or_${i}_`)).filter(Boolean);
-      if (sub.length > 0) conditions.push(`(${sub.join(' OR ')})`);
-    } else if (key === 'AND' && Array.isArray(value)) {
-      const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}and_${i}_`)).filter(Boolean);
-      if (sub.length > 0) conditions.push(`(${sub.join(' AND ')})`);
-    } else {
-      const pname = `${prefix}${key}`;
-      const col = quote(key, dialect);
-
-      if (value === null) {
-        conditions.push(`${col} IS NULL`);
-      } else if (typeof value === 'object' && !(value instanceof Date)) {
-        const v = value as any;
-        if (v.not !== undefined) {
-          if (v.not === null) { conditions.push(`${col} IS NOT NULL`); }
-          else { const p = `${pname}_not`; params[p] = v.not; conditions.push(`${col} <> @${p}`); }
-        }
-        if (v.equals !== undefined) { const p = `${pname}_eq`; params[p] = v.equals; conditions.push(`${col} = @${p}`); }
-        if (v.contains !== undefined) { const p = `${pname}_co`; params[p] = `%${v.contains}%`; conditions.push(`${col} LIKE @${p}`); }
-        if (v.startsWith !== undefined) { const p = `${pname}_sw`; params[p] = `${v.startsWith}%`; conditions.push(`${col} LIKE @${p}`); }
-        if (v.endsWith !== undefined) { const p = `${pname}_ew`; params[p] = `%${v.endsWith}`; conditions.push(`${col} LIKE @${p}`); }
-        if (v.gte !== undefined) { const p = `${pname}_gte`; params[p] = v.gte; conditions.push(`${col} >= @${p}`); }
-        if (v.lte !== undefined) { const p = `${pname}_lte`; params[p] = v.lte; conditions.push(`${col} <= @${p}`); }
-        if (v.gt !== undefined) { const p = `${pname}_gt`; params[p] = v.gt; conditions.push(`${col} > @${p}`); }
-        if (v.lt !== undefined) { const p = `${pname}_lt`; params[p] = v.lt; conditions.push(`${col} < @${p}`); }
-        if (v.in !== undefined) {
-          if (Array.isArray(v.in) && v.in.length > 0) {
-            const ps = v.in.map((x: any, i: number) => { const p = `${pname}_in${i}`; params[p] = x; return `@${p}`; });
-            conditions.push(`${col} IN (${ps.join(', ')})`);
-          } else {
-            conditions.push('1=0');
-          }
-        }
-      } else {
-        params[pname] = value;
-        conditions.push(`${col} = @${pname}`);
-      }
-    }
-  }
-  return conditions.join(' AND ');
-}
-
-// ─── Order by builder ──────────────────────────────────────────────────────────────
-
-export function buildOrderBy(orderBy: any, dialect: Dialect): string {
-  if (!orderBy) return '';
-  const entries = Array.isArray(orderBy) ? orderBy : [orderBy];
-  const parts: string[] = [];
-  for (const entry of entries) {
-    for (const [key, dir] of Object.entries(entry)) {
-      parts.push(`${quote(key, dialect)} ${(dir as string).toUpperCase()}`);
-    }
-  }
-  return parts.length > 0 ? `ORDER BY ${parts.join(', ')}` : '';
-}
+import type { Dialect } from './types';
+
+// ─── Quoting ───────────────────────────────────────────────────────────────────────
+
+export function quote(name: string, dialect: Dialect): string {
+  if (dialect === 'postgres') {
+    if (name.startsWith('[') && name.endsWith(']')) return `"${name.slice(1, -1)}"`;
+    if (name.startsWith('"')) return name;
+    return `"${name}"`;
+  }
+  if (dialect === 'mysql') {
+    if (name.startsWith('[') && name.endsWith(']')) return `\`${name.slice(1, -1)}\``;
+    if (name.startsWith('`')) return name;
+    return `\`${name}\``;
+  }
+  // mssql / sqlite
+  return name.startsWith('[') ? name : `[${name}]`;
+}
+
+// ─── Where clause builder ──────────────────────────────────────────────────────────
+
+export function parseWhere(modelName: string, where: any, params: Record<string, any>, dialect: Dialect, prefix = ''): string {
+  if (!where) return '';
+  const conditions: string[] = [];
+
+  const cleanWhere: Record<string, any> = {};
+  for (const [key, value] of Object.entries(where)) {
+    if (
+      key.includes('_') &&
+      value && typeof value === 'object' &&
+      !(value instanceof Date) &&
+      !(value as any).in && !(value as any).contains &&
+      !(value as any).not && !(value as any).gte &&
+      !(value as any).lte && !(value as any).gt && !(value as any).lt
+    ) {
+      Object.assign(cleanWhere, value);
+    } else {
+      cleanWhere[key] = value;
+    }
+  }
+
+  for (const [key, value] of Object.entries(cleanWhere)) {
+    if (key === 'OR' && Array.isArray(value)) {
+      const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}or_${i}_`)).filter(Boolean);
+      if (sub.length > 0) conditions.push(`(${sub.join(' OR ')})`);
+    } else if (key === 'AND' && Array.isArray(value)) {
+      const sub = value.map((v, i) => parseWhere(modelName, v, params, dialect, `${prefix}and_${i}_`)).filter(Boolean);
+      if (sub.length > 0) conditions.push(`(${sub.join(' AND ')})`);
+    } else {
+      const pname = `${prefix}${key}`;
+      const col = quote(key, dialect);
+
+      if (value === null) {
+        conditions.push(`${col} IS NULL`);
+      } else if (typeof value === 'object' && !(value instanceof Date)) {
+        const v = value as any;
+        if (v.not !== undefined) {
+          if (v.not === null) { conditions.push(`${col} IS NOT NULL`); }
+          else { const p = `${pname}_not`; params[p] = v.not; conditions.push(`${col} <> @${p}`); }
+        }
+        if (v.equals !== undefined) { const p = `${pname}_eq`; params[p] = v.equals; conditions.push(`${col} = @${p}`); }
+        if (v.contains !== undefined) { const p = `${pname}_co`; params[p] = `%${v.contains}%`; conditions.push(`${col} LIKE @${p}`); }
+        if (v.startsWith !== undefined) { const p = `${pname}_sw`; params[p] = `${v.startsWith}%`; conditions.push(`${col} LIKE @${p}`); }
+        if (v.endsWith !== undefined) { const p = `${pname}_ew`; params[p] = `%${v.endsWith}`; conditions.push(`${col} LIKE @${p}`); }
+        if (v.gte !== undefined) { const p = `${pname}_gte`; params[p] = v.gte; conditions.push(`${col} >= @${p}`); }
+        if (v.lte !== undefined) { const p = `${pname}_lte`; params[p] = v.lte; conditions.push(`${col} <= @${p}`); }
+        if (v.gt !== undefined) { const p = `${pname}_gt`; params[p] = v.gt; conditions.push(`${col} > @${p}`); }
+        if (v.lt !== undefined) { const p = `${pname}_lt`; params[p] = v.lt; conditions.push(`${col} < @${p}`); }
+        if (v.in !== undefined) {
+          if (Array.isArray(v.in) && v.in.length > 0) {
+            const ps = v.in.map((x: any, i: number) => { const p = `${pname}_in${i}`; params[p] = x; return `@${p}`; });
+            conditions.push(`${col} IN (${ps.join(', ')})`);
+          } else {
+            conditions.push('1=0');
+          }
+        }
+      } else {
+        params[pname] = value;
+        conditions.push(`${col} = @${pname}`);
+      }
+    }
+  }
+  return conditions.join(' AND ');
+}
+
+// ─── Order by builder ──────────────────────────────────────────────────────────────
+
+export function buildOrderBy(orderBy: any, dialect: Dialect): string {
+  if (!orderBy) return '';
+  const entries = Array.isArray(orderBy) ? orderBy : [orderBy];
+  const parts: string[] = [];
+  for (const entry of entries) {
+    for (const [key, dir] of Object.entries(entry)) {
+      parts.push(`${quote(key, dialect)} ${(dir as string).toUpperCase()}`);
+    }
+  }
+  return parts.length > 0 ? `ORDER BY ${parts.join(', ')}` : '';
+}

package/typescript/src/base/types.ts

@@ -1,24 +1,24 @@
-export type Dialect = 'mssql' | 'postgres' | 'mysql' | 'sqlite' | 'googlesheets';
-
-export interface An5AdapterConfig {
-  connectionString: string;
-  poolMax?: number;
-  requestTimeout?: number;
-  connectionTimeout?: number;
-}
-
-export interface TransactionHandle {
-  exec<T>(query: string, params?: Record<string, any>): Promise<T[]>;
-  executeRaw(query: string, params?: Record<string, any>): Promise<number>;
-  commit(): Promise<void>;
-  rollback(): Promise<void>;
-}
-
-export interface QueryEngine {
-  dialect: Dialect;
-  exec<T>(query: string, params?: Record<string, any>): Promise<T[]>;
-  executeRaw(query: string, params?: Record<string, any>): Promise<number>;
-  connect(): Promise<void>;
-  disconnect(): Promise<void>;
-  beginTransaction(): Promise<TransactionHandle>;
-}
+export type Dialect = 'mssql' | 'postgres' | 'mysql' | 'sqlite' | 'googlesheets';
+
+export interface An5AdapterConfig {
+  connectionString: string;
+  poolMax?: number;
+  requestTimeout?: number;
+  connectionTimeout?: number;
+}
+
+export interface TransactionHandle {
+  exec<T>(query: string, params?: Record<string, any>): Promise<T[]>;
+  executeRaw(query: string, params?: Record<string, any>): Promise<number>;
+  commit(): Promise<void>;
+  rollback(): Promise<void>;
+}
+
+export interface QueryEngine {
+  dialect: Dialect;
+  exec<T>(query: string, params?: Record<string, any>): Promise<T[]>;
+  executeRaw(query: string, params?: Record<string, any>): Promise<number>;
+  connect(): Promise<void>;
+  disconnect(): Promise<void>;
+  beginTransaction(): Promise<TransactionHandle>;
+}

package/typescript/src/browser.ts

@@ -1,6 +1,6 @@
-// Browser-safe entry — no SQL engine imports
-export { An5SheetsAdapter, SheetsTableClient, createAn5SheetsAdapter } from './googlesheets';
-export type { An5SheetsAdapterConfig } from './googlesheets';
-export type { An5AdapterConfig, Dialect } from './base/types';
-export { getFieldsForModel, getModelToTable, setAdapterMetadata } from './base/metadata';
-export type { AdapterMetadata } from './base/metadata';
+// Browser-safe entry — no SQL engine imports
+export { An5SheetsAdapter, SheetsTableClient, createAn5SheetsAdapter, parseSheetsConnectionString } from './googlesheets';
+export type { An5SheetsAdapterConfig } from './googlesheets';
+export type { An5AdapterConfig, Dialect } from './base/types';
+export { getFieldsForModel, getModelToTable, setAdapterMetadata } from './base/metadata';
+export type { AdapterMetadata } from './base/metadata';

package/typescript/src/config.ts

@@ -1,95 +1,95 @@
-import { createAn5Adapter, type AnyAdapter } from './an5Adapter';
-
-export interface LlmConfigData {
-  provider: string;
-  apiKey: string;
-  model?: string;
-  endpoint?: string;
-}
-
-export interface EmbeddingConfigData {
-  provider: string;
-  apiKey: string;
-  model?: string;
-  endpoint?: string;
-}
-
-let _adapter: AnyAdapter | null = null;
-
-function getAdapter(): AnyAdapter | null {
-  if (_adapter) return _adapter;
-  const url = process.env.DATABASE_URL;
-  if (!url) return null;
-  try {
-    _adapter = createAn5Adapter({ connectionString: url });
-    return _adapter;
-  } catch {
-    return null;
-  }
-}
-
-export function resetAdapter(): void {
-  _adapter = null;
-}
-
-export async function getLlmConfig(): Promise<LlmConfigData | null> {
-  const adapter = getAdapter();
-  if (!adapter) return null;
-  try {
-    const rows = await adapter.table<LlmConfigData>('LlmConfig').findMany({
-      where: { isActive: true },
-    });
-    if (rows.length > 0) {
-      const c = rows[0] as any;
-      return { provider: c.provider, apiKey: c.apiKey, model: c.model, endpoint: c.endpoint };
-    }
-  } catch {}
-  return null;
-}
-
-export async function setLlmConfig(data: LlmConfigData): Promise<void> {
-  const adapter = getAdapter();
-  if (!adapter) throw new Error('DATABASE_URL not configured');
-  const existing = await adapter.table('LlmConfig').findFirst({ where: { isActive: true } });
-  if (existing) {
-    await adapter.table('LlmConfig').update({
-      where: { id: (existing as any).id },
-      data: { ...data, updatedAt: new Date() },
-    });
-  } else {
-    await adapter.table('LlmConfig').create({
-      data: { ...data, isActive: true, createdAt: new Date(), updatedAt: new Date() },
-    });
-  }
-}
-
-export async function getEmbeddingConfig(): Promise<EmbeddingConfigData | null> {
-  const adapter = getAdapter();
-  if (!adapter) return null;
-  try {
-    const rows = await adapter.table<EmbeddingConfigData>('EmbeddingConfig').findMany({
-      where: { isActive: true },
-    });
-    if (rows.length > 0) {
-      const c = rows[0] as any;
-      return { provider: c.provider, apiKey: c.apiKey, model: c.model, endpoint: c.endpoint };
-    }
-  } catch {}
-  return null;
-}
-
-export async function setEmbeddingConfig(data: EmbeddingConfigData): Promise<void> {
-  const adapter = getAdapter();
-  if (!adapter) throw new Error('DATABASE_URL not configured');
-  const existing = await adapter.table('EmbeddingConfig').findFirst({ where: { isActive: true } });
-  if (existing) {
-    await adapter.table('EmbeddingConfig').update({
-      where: { id: (existing as any).id },
-      data: { ...data, updatedAt: new Date() },
-    });
-  } else {
-    await adapter.table('EmbeddingConfig').create({
-      data: { ...data, isActive: true, createdAt: new Date(), updatedAt: new Date() },
-    });
-  }
-}
+import { createAn5Adapter, type AnyAdapter } from './an5Adapter';
+
+export interface LlmConfigData {
+  provider: string;
+  apiKey: string;
+  model?: string;
+  endpoint?: string;
+}
+
+export interface EmbeddingConfigData {
+  provider: string;
+  apiKey: string;
+  model?: string;
+  endpoint?: string;
+}
+
+let _adapter: AnyAdapter | null = null;
+
+function getAdapter(): AnyAdapter | null {
+  if (_adapter) return _adapter;
+  const url = process.env.DATABASE_URL;
+  if (!url) return null;
+  try {
+    _adapter = createAn5Adapter({ connectionString: url });
+    return _adapter;
+  } catch {
+    return null;
+  }
+}
+
+export function resetAdapter(): void {
+  _adapter = null;
+}
+
+export async function getLlmConfig(): Promise<LlmConfigData | null> {
+  const adapter = getAdapter();
+  if (!adapter) return null;
+  try {
+    const rows = await adapter.table<LlmConfigData>('LlmConfig').findMany({
+      where: { isActive: true },
+    });
+    if (rows.length > 0) {
+      const c = rows[0] as any;
+      return { provider: c.provider, apiKey: c.apiKey, model: c.model, endpoint: c.endpoint };
+    }
+  } catch {}
+  return null;
+}
+
+export async function setLlmConfig(data: LlmConfigData): Promise<void> {
+  const adapter = getAdapter();
+  if (!adapter) throw new Error('DATABASE_URL not configured');
+  const existing = await adapter.table('LlmConfig').findFirst({ where: { isActive: true } });
+  if (existing) {
+    await adapter.table('LlmConfig').update({
+      where: { id: (existing as any).id },
+      data: { ...data, updatedAt: new Date() },
+    });
+  } else {
+    await adapter.table('LlmConfig').create({
+      data: { ...data, isActive: true, createdAt: new Date(), updatedAt: new Date() },
+    });
+  }
+}
+
+export async function getEmbeddingConfig(): Promise<EmbeddingConfigData | null> {
+  const adapter = getAdapter();
+  if (!adapter) return null;
+  try {
+    const rows = await adapter.table<EmbeddingConfigData>('EmbeddingConfig').findMany({
+      where: { isActive: true },
+    });
+    if (rows.length > 0) {
+      const c = rows[0] as any;
+      return { provider: c.provider, apiKey: c.apiKey, model: c.model, endpoint: c.endpoint };
+    }
+  } catch {}
+  return null;
+}
+
+export async function setEmbeddingConfig(data: EmbeddingConfigData): Promise<void> {
+  const adapter = getAdapter();
+  if (!adapter) throw new Error('DATABASE_URL not configured');
+  const existing = await adapter.table('EmbeddingConfig').findFirst({ where: { isActive: true } });
+  if (existing) {
+    await adapter.table('EmbeddingConfig').update({
+      where: { id: (existing as any).id },
+      data: { ...data, updatedAt: new Date() },
+    });
+  } else {
+    await adapter.table('EmbeddingConfig').create({
+      data: { ...data, isActive: true, createdAt: new Date(), updatedAt: new Date() },
+    });
+  }
+}