@an5/adapters 0.2.5 → 0.2.9

package/typescript/src/googlesheets/types.ts

@@ -1,6 +1,6 @@
-// ─── Cache ────────────────────────────────────────────────────────────────────
-
-export interface SheetMeta {
-  sheetId: number;
-  title: string;
-}
+// ─── Cache ────────────────────────────────────────────────────────────────────
+
+export interface SheetMeta {
+  sheetId: number;
+  title: string;
+}

package/typescript/src/index.ts

@@ -1,28 +1,49 @@
-export {
-  An5Adapter,
-  AdapterTableClient,
-  createAn5Adapter,
-  setAdapterMetadata,
-} from './an5Adapter';
-export type {
-  An5AdapterConfig,
-  AdapterMetadata,
-  Dialect,
-} from './an5Adapter';
-export {
-  getLlmConfig, setLlmConfig,
-  getEmbeddingConfig, setEmbeddingConfig,
-  resetAdapter,
-} from './config';
-export type {
-  LlmConfigData, EmbeddingConfigData,
-} from './config';
-export {
-  An5SheetsAdapter,
-  SheetsTableClient,
-  createAn5SheetsAdapter,
-  parseSheetsConnectionString,
-} from './googlesheets';
-export type {
-  An5SheetsAdapterConfig,
+export {
+  An5Adapter,
+  AdapterTableClient,
+  createAn5Adapter,
+  createAdapterProxy,
+  executorFromAdapter,
+  setAdapterMetadata,
+} from './an5Adapter';
+export { parseWhere, buildOrderBy, quote } from './base/sql';
+export {
+  NBaseVectorClient,
+  NBaseError,
+  createNBaseVectorClient,
+  createNBaseClient,
+  parseNBaseConnectionString,
+  buildVectorId,
+  parseVectorId,
+} from './nbase';
+export type {
+  NBaseAdapterConfig,
+  NBaseClientConfig,
+  NBaseVector,
+  NBaseSearchOptions,
+  NBaseSearchResult,
+  NBaseStats,
+} from './nbase';
+export type {
+  An5AdapterConfig,
+  AdapterMetadata,
+  Dialect,
+} from './an5Adapter';
+export type { TypedAn5Adapter, AdapterAPI } from './typed';
+export {
+  getLlmConfig, setLlmConfig,
+  getEmbeddingConfig, setEmbeddingConfig,
+  resetAdapter,
+} from './config';
+export type {
+  LlmConfigData, EmbeddingConfigData,
+} from './config';
+export {
+  An5SheetsAdapter,
+  SheetsTableClient,
+  createAn5SheetsAdapter,
+  parseSheetsConnectionString,
+} from './googlesheets';
+export type {
+  An5SheetsAdapterConfig,
 } from './googlesheets';

package/typescript/src/mssql/engine.ts

@@ -1,132 +1,134 @@
-import sql from 'mssql';
-import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
-
-// ─── MSSQL Connection Config ───────────────────────────────────────────────────────
-
-export function parseMssqlConnectionString(url: string): sql.config {
-  let cleanUrl = (url || '').trim();
-  // Strip scheme prefix
-  cleanUrl = cleanUrl.replace(/^(?:sqlserver|mssql):\/\//i, '');
-
-  const parts = cleanUrl.split(';');
-  const firstPart = parts[0].trim();
-
-  // host:port or host,port (SQL Server native style)
-  let server = firstPart;
-  let port = 1433;
-  const commaIdx = firstPart.lastIndexOf(',');
-  const colonIdx = firstPart.lastIndexOf(':');
-  if (commaIdx !== -1) {
-    server = firstPart.slice(0, commaIdx).trim();
-    port = parseInt(firstPart.slice(commaIdx + 1), 10) || 1433;
-  } else if (colonIdx !== -1 && !firstPart.includes('=')) {
-    server = firstPart.slice(0, colonIdx).trim();
-    port = parseInt(firstPart.slice(colonIdx + 1), 10) || 1433;
-  }
-
-  const config: any = {
-    server,
-    port,
-    options: { encrypt: true, trustServerCertificate: true },
-    pool: { max: 10, min: 0, idleTimeoutMillis: 30000 },
-    requestTimeout: 60000,
-    connectionTimeout: 15000,
-  };
-
-  for (let i = 1; i < parts.length; i++) {
-    const part = parts[i].trim();
-    if (!part) continue;
-    const eqIdx = part.indexOf('=');
-    if (eqIdx === -1) continue;
-    const key = part.slice(0, eqIdx).trim().toLowerCase();
-    const value = decodeURIComponent(part.slice(eqIdx + 1).trim());
-    if (key === 'database' || key === 'initial catalog') config.database = value;
-    else if (key === 'user' || key === 'uid' || key === 'user id') config.user = value;
-    else if (key === 'password' || key === 'pwd') config.password = value;
-    else if (key === 'server' || key === 'data source') {
-      // SERVER=host,port style (key-value form)
-      const [s, p] = value.split(',');
-      config.server = s.trim();
-      if (p) config.port = parseInt(p.trim(), 10) || 1433;
-    }
-    else if (key === 'encrypt') config.options.encrypt = value.toLowerCase() === 'true';
-    else if (key === 'trustservercertificate') config.options.trustServerCertificate = value.toLowerCase() === 'true';
-    else if (key === 'connection timeout') config.connectionTimeout = parseInt(value, 10) * 1000;
-  }
-  return config;
-}
-
-// ─── MSSQL Engine ──────────────────────────────────────────────────────────────────
-
-export class MssqlEngine implements QueryEngine {
-  dialect: Dialect = 'mssql';
-  private pool: Promise<sql.ConnectionPool> | null = null;
-  private config: sql.config;
-
-  constructor(adapterConfig: An5AdapterConfig) {
-    this.config = parseMssqlConnectionString(adapterConfig.connectionString);
-    if (adapterConfig.poolMax) this.config.pool = { ...this.config.pool, max: adapterConfig.poolMax };
-    if (adapterConfig.requestTimeout) this.config.requestTimeout = adapterConfig.requestTimeout;
-    if (adapterConfig.connectionTimeout) this.config.connectionTimeout = adapterConfig.connectionTimeout;
-  }
-
-  private async getPool(): Promise<sql.ConnectionPool> {
-    if (!this.pool) this.pool = new sql.ConnectionPool(this.config).connect();
-    return this.pool;
-  }
-
-  private attachParams(req: sql.Request, params?: Record<string, any>): void {
-    if (params) for (const [k, v] of Object.entries(params)) req.input(k, v ?? null);
-  }
-
-  async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
-    const pool = await this.getPool();
-    const req = new sql.Request(pool);
-    this.attachParams(req, params);
-    const result = await req.query(query);
-    return (result.recordset || []) as T[];
-  }
-
-  async executeRaw(query: string, params?: Record<string, any>): Promise<number> {
-    const pool = await this.getPool();
-    const req = new sql.Request(pool);
-    this.attachParams(req, params);
-    const result = await req.query(query);
-    return result.rowsAffected[0] ?? 0;
-  }
-
-  async connect(): Promise<void> { await this.getPool(); }
-
-  async disconnect(): Promise<void> {
-    if (this.pool) {
-      const p = await this.pool;
-      await p.close();
-      this.pool = null;
-    }
-  }
-
-  async beginTransaction(): Promise<TransactionHandle> {
-    const pool = await this.getPool();
-    const tx = new sql.Transaction(pool);
-    await tx.begin();
-
-    const buildReq = (params?: Record<string, any>) => {
-      const req = new sql.Request(tx);
-      if (params) for (const [k, v] of Object.entries(params)) req.input(k, v ?? null);
-      return req;
-    };
-
-    return {
-      exec: async <T>(q: string, p?: Record<string, any>) => {
-        const r = await buildReq(p).query(q);
-        return (r.recordset || []) as T[];
-      },
-      executeRaw: async (q: string, p?: Record<string, any>) => {
-        const r = await buildReq(p).query(q);
-        return r.rowsAffected[0] ?? 0;
-      },
-      commit: () => tx.commit(),
-      rollback: () => tx.rollback(),
-    };
-  }
-}
+import sql from 'mssql';
+import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
+
+// ─── MSSQL Connection Config ───────────────────────────────────────────────────────
+
+export function parseMssqlConnectionString(url: string): sql.config {
+  let cleanUrl = (url || '').trim();
+  // Strip scheme prefix
+  cleanUrl = cleanUrl.replace(/^(?:sqlserver|mssql):\/\//i, '');
+
+  const parts = cleanUrl.split(';');
+  const firstPart = (parts[0] ?? '').trim();
+
+  // host:port or host,port (SQL Server native style)
+  let server = firstPart;
+  let port = 1433;
+  const commaIdx = firstPart.lastIndexOf(',');
+  const colonIdx = firstPart.lastIndexOf(':');
+  if (commaIdx !== -1) {
+    server = firstPart.slice(0, commaIdx).trim();
+    port = parseInt(firstPart.slice(commaIdx + 1), 10) || 1433;
+  } else if (colonIdx !== -1 && !firstPart.includes('=')) {
+    server = firstPart.slice(0, colonIdx).trim();
+    port = parseInt(firstPart.slice(colonIdx + 1), 10) || 1433;
+  }
+
+  const config: any = {
+    server,
+    port,
+    options: { encrypt: true, trustServerCertificate: true },
+    pool: { max: 10, min: 0, idleTimeoutMillis: 30000 },
+    requestTimeout: 60000,
+    connectionTimeout: 15000,
+  };
+
+  for (let i = 1; i < parts.length; i++) {
+    const rawPart = parts[i];
+    if (rawPart === undefined) continue;
+    const part = rawPart.trim();
+    if (!part) continue;
+    const eqIdx = part.indexOf('=');
+    if (eqIdx === -1) continue;
+    const key = part.slice(0, eqIdx).trim().toLowerCase();
+    const value = decodeURIComponent(part.slice(eqIdx + 1).trim());
+    if (key === 'database' || key === 'initial catalog') config.database = value;
+    else if (key === 'user' || key === 'uid' || key === 'user id') config.user = value;
+    else if (key === 'password' || key === 'pwd') config.password = value;
+    else if (key === 'server' || key === 'data source') {
+      // SERVER=host,port style (key-value form)
+      const [s, p] = value.split(',');
+      if (s !== undefined) config.server = s.trim();
+      if (p) config.port = parseInt(p.trim(), 10) || 1433;
+    }
+    else if (key === 'encrypt') config.options.encrypt = value.toLowerCase() === 'true';
+    else if (key === 'trustservercertificate') config.options.trustServerCertificate = value.toLowerCase() === 'true';
+    else if (key === 'connection timeout') config.connectionTimeout = parseInt(value, 10) * 1000;
+  }
+  return config;
+}
+
+// ─── MSSQL Engine ──────────────────────────────────────────────────────────────────
+
+export class MssqlEngine implements QueryEngine {
+  dialect: Dialect = 'mssql';
+  private pool: Promise<sql.ConnectionPool> | null = null;
+  private config: sql.config;
+
+  constructor(adapterConfig: An5AdapterConfig) {
+    this.config = parseMssqlConnectionString(adapterConfig.connectionString ?? '');
+    if (adapterConfig.poolMax) this.config.pool = { ...this.config.pool, max: adapterConfig.poolMax };
+    if (adapterConfig.requestTimeout) this.config.requestTimeout = adapterConfig.requestTimeout;
+    if (adapterConfig.connectionTimeout) this.config.connectionTimeout = adapterConfig.connectionTimeout;
+  }
+
+  private async getPool(): Promise<sql.ConnectionPool> {
+    if (!this.pool) this.pool = new sql.ConnectionPool(this.config).connect();
+    return this.pool;
+  }
+
+  private attachParams(req: sql.Request, params?: Record<string, any>): void {
+    if (params) for (const [k, v] of Object.entries(params)) req.input(k, v ?? null);
+  }
+
+  async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
+    const pool = await this.getPool();
+    const req = new sql.Request(pool);
+    this.attachParams(req, params);
+    const result = await req.query(query);
+    return (result.recordset || []) as T[];
+  }
+
+  async executeRaw(query: string, params?: Record<string, any>): Promise<number> {
+    const pool = await this.getPool();
+    const req = new sql.Request(pool);
+    this.attachParams(req, params);
+    const result = await req.query(query);
+    return result.rowsAffected[0] ?? 0;
+  }
+
+  async connect(): Promise<void> { await this.getPool(); }
+
+  async disconnect(): Promise<void> {
+    if (this.pool) {
+      const p = await this.pool;
+      await p.close();
+      this.pool = null;
+    }
+  }
+
+  async beginTransaction(): Promise<TransactionHandle> {
+    const pool = await this.getPool();
+    const tx = new sql.Transaction(pool);
+    await tx.begin();
+
+    const buildReq = (params?: Record<string, any>) => {
+      const req = new sql.Request(tx);
+      if (params) for (const [k, v] of Object.entries(params)) req.input(k, v ?? null);
+      return req;
+    };
+
+    return {
+      exec: async <T>(q: string, p?: Record<string, any>) => {
+        const r = await buildReq(p).query(q);
+        return (r.recordset || []) as T[];
+      },
+      executeRaw: async (q: string, p?: Record<string, any>) => {
+        const r = await buildReq(p).query(q);
+        return r.rowsAffected[0] ?? 0;
+      },
+      commit: () => tx.commit(),
+      rollback: () => tx.rollback(),
+    };
+  }
+}

package/typescript/src/mssql/index.ts

@@ -1 +1 @@
-export * from './engine';
+export * from './engine';

package/typescript/src/mysql/engine.ts

@@ -1,80 +1,80 @@
-import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
-
-// ─── MySQL Engine ──────────────────────────────────────────────────────────────────
-
-let Mysql2: any = null;
-try { Mysql2 = require('mysql2/promise'); } catch { }
-
-export class MysqlEngine implements QueryEngine {
-  dialect: Dialect = 'mysql';
-  private pool: any = null;
-
-  constructor(adapterConfig: An5AdapterConfig) {
-    if (!Mysql2) throw new Error('mysql2 package is required for MySQL support. Run: npm install mysql2');
-    this.pool = Mysql2.createPool({
-      uri: adapterConfig.connectionString,
-      connectionLimit: adapterConfig.poolMax ?? 10,
-      connectTimeout: adapterConfig.connectionTimeout ?? 15000,
-    });
-  }
-
-  /** Convert @name → ? (positional); return ordered values */
-  private transform(query: string, params?: Record<string, any>): { text: string; values: any[] } {
-    if (!params || Object.keys(params).length === 0) return { text: query, values: [] };
-    const values: any[] = [];
-    const text = query.replace(/@(\w+)/g, (_, name: string) => {
-      values.push(params[name] ?? null);
-      return '?';
-    });
-    return { text, values };
-  }
-
-  async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
-    const { text, values } = this.transform(query, params);
-    const [rows] = await this.pool.query(text, values);
-    return rows as T[];
-  }
-
-  async executeRaw(query: string, params?: Record<string, any>): Promise<number> {
-    const { text, values } = this.transform(query, params);
-    const [result] = await this.pool.query(text, values);
-    return (result as any).affectedRows ?? 0;
-  }
-
-  async connect(): Promise<void> {
-    const conn = await this.pool.getConnection();
-    conn.release();
-  }
-
-  async disconnect(): Promise<void> { await this.pool.end(); }
-
-  async beginTransaction(): Promise<TransactionHandle> {
-    const conn = await this.pool.getConnection();
-    await conn.beginTransaction();
-
-    const transform = (query: string, params?: Record<string, any>) => {
-      if (!params || Object.keys(params).length === 0) return { text: query, values: [] };
-      const values: any[] = [];
-      const text = query.replace(/@(\w+)/g, (_, name: string) => {
-        values.push(params[name] ?? null);
-        return '?';
-      });
-      return { text, values };
-    };
-
-    return {
-      exec: async <T>(q: string, p?: Record<string, any>) => {
-        const { text, values } = transform(q, p);
-        const [rows] = await conn.query(text, values);
-        return rows as T[];
-      },
-      executeRaw: async (q: string, p?: Record<string, any>) => {
-        const { text, values } = transform(q, p);
-        const [result] = await conn.query(text, values);
-        return (result as any).affectedRows ?? 0;
-      },
-      commit: async () => { await conn.commit(); conn.release(); },
-      rollback: async () => { await conn.rollback(); conn.release(); },
-    };
-  }
-}
+import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
+
+// ─── MySQL Engine ──────────────────────────────────────────────────────────────────
+
+let Mysql2: any = null;
+try { Mysql2 = require('mysql2/promise'); } catch { }
+
+export class MysqlEngine implements QueryEngine {
+  dialect: Dialect = 'mysql';
+  private pool: any = null;
+
+  constructor(adapterConfig: An5AdapterConfig) {
+    if (!Mysql2) throw new Error('mysql2 package is required for MySQL support. Run: npm install mysql2');
+    this.pool = Mysql2.createPool({
+      uri: adapterConfig.connectionString ?? '',
+      connectionLimit: adapterConfig.poolMax ?? 10,
+      connectTimeout: adapterConfig.connectionTimeout ?? 15000,
+    });
+  }
+
+  /** Convert @name → ? (positional); return ordered values */
+  private transform(query: string, params?: Record<string, any>): { text: string; values: any[] } {
+    if (!params || Object.keys(params).length === 0) return { text: query, values: [] };
+    const values: any[] = [];
+    const text = query.replace(/@(\w+)/g, (_, name: string) => {
+      values.push(params[name] ?? null);
+      return '?';
+    });
+    return { text, values };
+  }
+
+  async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
+    const { text, values } = this.transform(query, params);
+    const [rows] = await this.pool.query(text, values);
+    return rows as T[];
+  }
+
+  async executeRaw(query: string, params?: Record<string, any>): Promise<number> {
+    const { text, values } = this.transform(query, params);
+    const [result] = await this.pool.query(text, values);
+    return (result as any).affectedRows ?? 0;
+  }
+
+  async connect(): Promise<void> {
+    const conn = await this.pool.getConnection();
+    conn.release();
+  }
+
+  async disconnect(): Promise<void> { await this.pool.end(); }
+
+  async beginTransaction(): Promise<TransactionHandle> {
+    const conn = await this.pool.getConnection();
+    await conn.beginTransaction();
+
+    const transform = (query: string, params?: Record<string, any>) => {
+      if (!params || Object.keys(params).length === 0) return { text: query, values: [] };
+      const values: any[] = [];
+      const text = query.replace(/@(\w+)/g, (_, name: string) => {
+        values.push(params[name] ?? null);
+        return '?';
+      });
+      return { text, values };
+    };
+
+    return {
+      exec: async <T>(q: string, p?: Record<string, any>) => {
+        const { text, values } = transform(q, p);
+        const [rows] = await conn.query(text, values);
+        return rows as T[];
+      },
+      executeRaw: async (q: string, p?: Record<string, any>) => {
+        const { text, values } = transform(q, p);
+        const [result] = await conn.query(text, values);
+        return (result as any).affectedRows ?? 0;
+      },
+      commit: async () => { await conn.commit(); conn.release(); },
+      rollback: async () => { await conn.rollback(); conn.release(); },
+    };
+  }
+}

package/typescript/src/mysql/index.ts

@@ -1 +1 @@
-export * from './engine';
+export * from './engine';