@an5/adapters 0.2.10 → 0.2.13

package/typescript/src/googlesheets/oauth.ts

@@ -0,0 +1,31 @@
+import type { An5SheetsAdapterConfig } from './config';
+
+/** Deduplicate refresh requests within an adapter; do not expose token responses. */
+export function sheetsTokenProvider(config: An5SheetsAdapterConfig) {
+  let token = config.accessToken;
+  let expiresAt = config.tokenExpiresAt;
+  let pending: Promise<string> | undefined;
+  return async (force = false): Promise<string | undefined> => {
+    if (token && !force && (expiresAt === undefined || expiresAt > Date.now() + 60000)) return token;
+    if (!config.refreshToken || !config.oauthClientId) {
+      if (force || expiresAt !== undefined) throw new Error('Google access expired. Reconnect your Google account.');
+      return token;
+    }
+    if (!pending) pending = (async () => {
+      try {
+        const response = await fetch('https://oauth2.googleapis.com/token', {
+          method: 'POST', headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: new URLSearchParams({ grant_type: 'refresh_token', client_id: config.oauthClientId!, refresh_token: config.refreshToken!, ...(config.oauthClientSecret ? { client_secret: config.oauthClientSecret } : {}) }),
+          signal: AbortSignal.timeout(20000),
+        });
+        if (!response.ok) throw new Error();
+        const result = await response.json() as { access_token?: string; expires_in?: number };
+        if (!result.access_token || typeof result.access_token !== 'string' || typeof result.expires_in !== 'number' || !Number.isFinite(result.expires_in) || result.expires_in <= 0) throw new Error();
+        token = result.access_token; expiresAt = Date.now() + result.expires_in * 1000;
+        return token;
+      } catch { throw new Error('Google access expired or was revoked. Reconnect your Google account.'); }
+      finally { pending = undefined; }
+    })();
+    return pending;
+  };
+}

package/typescript/src/googlesheets/parseConnectionString.ts

@@ -33,6 +33,14 @@ export function parseSheetsConnectionString(url: string): An5SheetsAdapterConfig
   if (config.clientemail) result.clientEmail = config.clientemail;
   if (config.privatekey) result.privateKey = config.privatekey;
   if (config.accesstoken) result.accessToken = config.accesstoken;
+  if (config.refreshtoken) result.refreshToken = config.refreshtoken;
+  if (config.oauthclientid) result.oauthClientId = config.oauthclientid;
+  if (config.oauthclientsecret) result.oauthClientSecret = config.oauthclientsecret;
+  if (config.tokenexpiresat) {
+    const expiry = Number(config.tokenexpiresat);
+    if (!Number.isFinite(expiry) || expiry < 0) throw new Error('Invalid OAuth token expiry.');
+    result.tokenExpiresAt = expiry;
+  }
   if (config.apikey) result.apiKey = config.apikey;
 
   if (config.sheetmapping) {

package/typescript/src/googlesheets/tableClient.ts

@@ -1,18 +1,11 @@
 import { generateUUID } from '../base/uuid';
-import { getFieldsForModel } from '../base/metadata';
+import { getFieldsForModel, resolveIdField } from '../base/metadata';
 import type { An5SheetsAdapter } from './adapter';
 import { buildOrderBy, coerceCell, esc, matchWhere, resolveSheetName, sortRows } from './helpers';
 import { withRetry } from './retry';
 
 // ─── Utility ──────────────────────────────────────────────────────────────────
 
-function resolveIdField(fields: Record<string, any>): string | undefined {
-  if (Object.prototype.hasOwnProperty.call(fields, 'id')) return 'id';
-  return Object.keys(fields).find(
-    name => name.endsWith('_id') || name.endsWith('Id') || name.toLowerCase() === 'id'
-  );
-}
-
 // ─── Table Client ─────────────────────────────────────────────────────────────
 
 export class SheetsTableClient<T = any> {
@@ -227,17 +220,10 @@ export class SheetsTableClient<T = any> {
       return this.rowToValues(data, headers);
     });
 
-    try {
-      await this.adapter.appendRange(`${this.escSheetName}!A:A`, batchValues);
-      return { count: batchValues.length };
-    } catch (e) {
-      if (!args.skipDuplicates) throw e;
-      let count = 0;
-      for (const row of args.data) {
-        try { await this.create({ data: row }); count++; } catch { /* skip */ }
-      }
-      return { count };
-    }
+    // Sheets has no unique constraints. An append failure must propagate;
+    // retrying individual rows could duplicate a batch the service accepted.
+    await this.adapter.appendRange(`${this.escSheetName}!A:A`, batchValues);
+    return { count: batchValues.length };
   }
 
   async update(args: { where: any; data: Partial<T> }): Promise<T> {

package/typescript/src/index.ts

@@ -29,6 +29,19 @@ export type {
   AdapterMetadata,
   Dialect,
 } from './an5Adapter';
+export {
+  encodeVector,
+  decodeVector,
+  vectorDistance,
+  isVectorField,
+  AN5_VECTOR_FUNCTIONS,
+  SQLITE_VEC_FUNCTIONS,
+} from './sqlite/vector';
+export type {
+  SqliteVectorStrategy,
+  VectorMetric,
+  VectorStrategyPreference,
+} from './sqlite/vector';
 export type { TypedAn5Adapter, AdapterAPI } from './typed';
 export {
   getLlmConfig, setLlmConfig,

package/typescript/src/sqlite/browserEngine.ts

@@ -1,4 +1,5 @@
 import type { Dialect, QueryEngine, TransactionHandle } from '../base/types';
+import { SqliteVectorSupport } from './vector';
 
 // ─── Browser SQLite Driver & Config ──────────────────────────────────────────────────
 
@@ -13,18 +14,41 @@ export interface SqliteBrowserConfig {
   driver?: SqliteDriver;
   exec?: <T = any>(query: string, params?: Record<string, any>) => Promise<T[]> | T[];
   executeRaw?: (query: string, params?: Record<string, any>) => Promise<number> | number;
+  /** Path to the sqlite-vec extension, for WASM builds that allow loading one. */
+  sqliteVec?: string;
+  /** Pin the vector search strategy instead of probing for one. */
+  vectorStrategy?: 'auto' | 'sqlite-vec' | 'udf' | 'sql' | 'memory';
+  /** Register a scalar function with the driver, when its API allows it. */
+  registerFunction?: (name: string, fn: (...args: any[]) => any) => void;
 }
 
 // ─── Browser SQLite Engine ──────────────────────────────────────────────────────────
 
 export class SqliteBrowserEngine implements QueryEngine {
   dialect: Dialect = 'sqlite';
+  /**
+   * A WASM build cannot register a JS callback as an SQL function, so this only
+   * reaches the `sql` strategy (json_each in plain SQL) and the in-memory one.
+   * A custom `registerFunction` hook unlocks `udf` as well.
+   */
+  readonly vectorSupport: SqliteVectorSupport;
   private db: any = null;
   private driver: SqliteDriver | null = null;
   private customExec: ((query: string, params?: Record<string, any>) => Promise<any[]> | any[]) | null = null;
   private customExecuteRaw: ((query: string, params?: Record<string, any>) => Promise<number> | number) | null = null;
 
   constructor(config?: SqliteBrowserConfig | any) {
+    this.vectorSupport = new SqliteVectorSupport({
+      native: () => this.db,
+      registerFunction: (name, fn) => {
+        const register = config?.registerFunction;
+        if (typeof register === 'function') return register(name, fn);
+        const db = this.db;
+        if (db && typeof db.create_function === 'function') return db.create_function(name, fn);
+        throw new Error('this SQLite build cannot register functions');
+      },
+    }, { sqliteVec: config?.sqliteVec, vectorStrategy: config?.vectorStrategy });
+
     if (!config) return;
 
     if (config.exec && typeof config.exec === 'function') {

package/typescript/src/sqlite/engine.ts

@@ -1,4 +1,5 @@
 import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
+import { SqliteVectorSupport } from './vector';
 
 // ─── SQLite Engine ─────────────────────────────────────────────────────────────────
 
@@ -7,6 +8,8 @@ try { BetterSqlite3 = require('better-sqlite3'); } catch { }
 
 export class SqliteEngine implements QueryEngine {
   dialect: Dialect = 'sqlite';
+  /** Registers `an5_vec_*` and loads sqlite-vec for in-database vector search. */
+  readonly vectorSupport: SqliteVectorSupport;
   private db: any = null;
   private readonly filePath: string;
 
@@ -16,6 +19,15 @@ export class SqliteEngine implements QueryEngine {
       .replace(/^sqlite:\/\/\//i, '/')
       .replace(/^sqlite:\/\//i, '')
       .replace(/^sqlite:/i, '');
+    this.vectorSupport = new SqliteVectorSupport({
+      native: () => this.getDb(),
+      registerFunction: (name, fn) => this.getDb().function(name, { deterministic: true }, fn),
+    }, { sqliteVec: adapterConfig.sqliteVec, vectorStrategy: adapterConfig.vectorStrategy });
+  }
+
+  /** The better-sqlite3 handle, needed for extension loading. */
+  native(): any {
+    return this.getDb();
   }
 
   private getDb(): any {
@@ -42,6 +54,7 @@ export class SqliteEngine implements QueryEngine {
 
   async disconnect(): Promise<void> {
     if (this.db) { this.db.close(); this.db = null; }
+    this.vectorSupport.reset();
   }
 
   async beginTransaction(): Promise<TransactionHandle> {

package/typescript/src/sqlite/index.ts

@@ -1,3 +1,3 @@
 export * from './engine';
 export * from './browserEngine';
-
+export * from './vector';