@an5/adapters 0.2.1 → 0.2.2

package/typescript/an5Adapter.js

@@ -7,10 +7,6 @@ const googlesheets_1 = require("./googlesheets");
 const parseConnectionString_1 = require("./googlesheets/parseConnectionString");
 const sql_1 = require("./base/sql");
 const metadata_1 = require("./base/metadata");
-const mssql_1 = require("./mssql");
-const postgres_1 = require("./postgres");
-const mysql_1 = require("./mysql");
-const sqlite_1 = require("./sqlite");
 var metadata_2 = require("./base/metadata");
 Object.defineProperty(exports, "setAdapterMetadata", { enumerable: true, get: function () { return metadata_2.setAdapterMetadata; } });
 function isSheetsConfig(config) {
@@ -18,9 +14,23 @@ function isSheetsConfig(config) {
 }
 // ─── An5Adapter ────────────────────────────────────────────────────────────────────
 class An5Adapter {
-    get dialect() { return this.sheetsAdapter ? 'googlesheets' : this.requireEngine().dialect; }
+    get dialect() {
+        if (this.sheetsAdapter)
+            return 'googlesheets';
+        if (this._engine)
+            return this._engine.dialect;
+        if (this._engineType === 'postgres')
+            return 'postgres';
+        if (this._engineType === 'mysql')
+            return 'mysql';
+        if (this._engineType === 'sqlite')
+            return 'sqlite';
+        return 'mssql';
+    }
     constructor(adapterConfig) {
-        this.engine = null;
+        this._engine = null;
+        this._engineType = null;
+        this._engineConfig = null;
         this.sheetsAdapter = null;
         if (isSheetsConfig(adapterConfig)) {
             this.sheetsAdapter = new googlesheets_1.An5SheetsAdapter(adapterConfig);
@@ -31,23 +41,48 @@ class An5Adapter {
             this.sheetsAdapter = new googlesheets_1.An5SheetsAdapter((0, parseConnectionString_1.parseSheetsConnectionString)(cs));
             return;
         }
+        this._engineConfig = adapterConfig;
         if (cs.startsWith('postgres://') || cs.startsWith('postgresql://')) {
-            this.engine = new postgres_1.PostgresEngine(adapterConfig);
+            this._engineType = 'postgres';
         }
         else if (cs.startsWith('mysql://') || cs.startsWith('mariadb://')) {
-            this.engine = new mysql_1.MysqlEngine(adapterConfig);
+            this._engineType = 'mysql';
         }
         else if (cs.startsWith('sqlite://') || cs.endsWith('.sqlite') || cs.endsWith('.db')) {
-            this.engine = new sqlite_1.SqliteEngine(adapterConfig);
+            this._engineType = 'sqlite';
         }
         else {
-            this.engine = new mssql_1.MssqlEngine(adapterConfig);
+            this._engineType = 'mssql';
         }
     }
-    requireEngine() {
-        if (!this.engine)
+    async requireEngine() {
+        if (!this._engine && this._engineType) {
+            switch (this._engineType) {
+                case 'postgres': {
+                    const { PostgresEngine } = require('./postgres.js');
+                    this._engine = new PostgresEngine(this._engineConfig);
+                    break;
+                }
+                case 'mysql': {
+                    const { MysqlEngine } = require('./mysql.js');
+                    this._engine = new MysqlEngine(this._engineConfig);
+                    break;
+                }
+                case 'sqlite': {
+                    const { SqliteEngine } = require('./sqlite.js');
+                    this._engine = new SqliteEngine(this._engineConfig);
+                    break;
+                }
+                case 'mssql': {
+                    const { MssqlEngine } = require('./mssql.js');
+                    this._engine = new MssqlEngine(this._engineConfig);
+                    break;
+                }
+            }
+        }
+        if (!this._engine)
             throw new Error('SQL engine is not available for Google Sheets adapter');
-        return this.engine;
+        return this._engine;
     }
     requireSheetsAdapter() {
         if (!this.sheetsAdapter)
@@ -57,19 +92,19 @@ class An5Adapter {
     async exec(query, params) {
         if (this.sheetsAdapter)
             return this.sheetsAdapter.exec(query, params);
-        return this.requireEngine().exec(query, params);
+        return (await this.requireEngine()).exec(query, params);
     }
     /** INTERNAL: used by AdapterTableClient for DML statements needing row count */
     async _executeRaw(query, params) {
-        return this.requireEngine().executeRaw(query, params);
+        return (await this.requireEngine()).executeRaw(query, params);
     }
     /** Execute a raw query with positional values → @p_0, @p_1, ... per dialect */
     async $queryRawUnsafe(query, ...values) {
         if (this.sheetsAdapter)
             return this.sheetsAdapter.$queryRawUnsafe(query, ...values);
+        const engine = await this.requireEngine();
         const params = {};
         values.forEach((v, i) => { params[`p_${i}`] = v; });
-        // Normalise external positional placeholders → @p_N so each engine can re-transform
         let q = query;
         if (this.dialect === 'postgres') {
             let idx = 0;
@@ -79,11 +114,12 @@ class An5Adapter {
             let idx = 0;
             q = q.replace(/\?/g, () => `@p_${idx++}`);
         }
-        return this.exec(q, params);
+        return engine.exec(q, params);
     }
     async $executeRaw(query, ...values) {
         if (this.sheetsAdapter)
             return this.sheetsAdapter.$executeRaw(query, ...values);
+        const engine = await this.requireEngine();
         const params = {};
         values.forEach((v, i) => { params[`p_${i}`] = v; });
         let q = query;
@@ -95,7 +131,7 @@ class An5Adapter {
             let idx = 0;
             q = q.replace(/\?/g, () => `@p_${idx++}`);
         }
-        return this.requireEngine().executeRaw(q, params);
+        return engine.executeRaw(q, params);
     }
     async $executeRawUnsafe(query, ...values) {
         return this.$executeRaw(query, ...values);
@@ -103,19 +139,20 @@ class An5Adapter {
     async $connect() {
         if (this.sheetsAdapter)
             return this.sheetsAdapter.$connect();
-        await this.requireEngine().connect();
+        await (await this.requireEngine()).connect();
     }
     async $disconnect() {
         if (this.sheetsAdapter)
             return this.sheetsAdapter.$disconnect();
-        await this.requireEngine().disconnect();
+        await (await this.requireEngine()).disconnect();
     }
     async $transaction(fn, _options) {
         if (this.sheetsAdapter)
             return this.sheetsAdapter.$transaction(fn, _options);
         if (Array.isArray(fn))
             return Promise.all(fn);
-        const handle = await this.requireEngine().beginTransaction();
+        const engine = await this.requireEngine();
+        const handle = await engine.beginTransaction();
         const txAdapter = new An5AdapterTx(handle, this.dialect);
         try {
             const result = await fn(txAdapter);

package/typescript/browser.d.ts

@@ -0,0 +1,5 @@
+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';

package/typescript/browser.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setAdapterMetadata = exports.getModelToTable = exports.getFieldsForModel = exports.createAn5SheetsAdapter = exports.SheetsTableClient = exports.An5SheetsAdapter = void 0;
+// Browser-safe entry — no SQL engine imports
+var googlesheets_1 = require("./googlesheets");
+Object.defineProperty(exports, "An5SheetsAdapter", { enumerable: true, get: function () { return googlesheets_1.An5SheetsAdapter; } });
+Object.defineProperty(exports, "SheetsTableClient", { enumerable: true, get: function () { return googlesheets_1.SheetsTableClient; } });
+Object.defineProperty(exports, "createAn5SheetsAdapter", { enumerable: true, get: function () { return googlesheets_1.createAn5SheetsAdapter; } });
+var metadata_1 = require("./base/metadata");
+Object.defineProperty(exports, "getFieldsForModel", { enumerable: true, get: function () { return metadata_1.getFieldsForModel; } });
+Object.defineProperty(exports, "getModelToTable", { enumerable: true, get: function () { return metadata_1.getModelToTable; } });
+Object.defineProperty(exports, "setAdapterMetadata", { enumerable: true, get: function () { return metadata_1.setAdapterMetadata; } });

package/typescript/googlesheets/adapter.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.An5SheetsAdapter = void 0;
 exports.createAn5SheetsAdapter = createAn5SheetsAdapter;
-const googleapis_1 = require("googleapis");
 const config_1 = require("./config");
 const sqlExecutor_1 = require("./sqlExecutor");
 const tableClient_1 = require("./tableClient");
@@ -85,12 +84,13 @@ class An5SheetsAdapter {
             return this.fetchApi;
         }
         if (!this.sheets) {
-            const auth = new googleapis_1.google.auth.JWT({
+            const { google } = await import('googleapis');
+            const auth = new google.auth.JWT({
                 email: this.config.clientEmail,
                 key: this.config.privateKey,
                 scopes: ['https://www.googleapis.com/auth/spreadsheets'],
             });
-            this.sheets = googleapis_1.google.sheets({ version: 'v4', auth });
+            this.sheets = google.sheets({ version: 'v4', auth });
         }
         return this.sheets;
     }

package/typescript/googlesheets/an5SheetsAdapter.d.ts

@@ -1,3 +1,3 @@
 export { An5SheetsAdapter, createAn5SheetsAdapter } from './adapter';
 export { SheetsTableClient } from './tableClient';
-export { An5SheetsAdapterConfig } from './config';
+export type { An5SheetsAdapterConfig } from './config';

package/typescript/googlesheets/index.d.ts

@@ -1,2 +1,3 @@
-export { An5SheetsAdapter, SheetsTableClient, createAn5SheetsAdapter, An5SheetsAdapterConfig } from './an5SheetsAdapter';
+export { An5SheetsAdapter, SheetsTableClient, createAn5SheetsAdapter } from './an5SheetsAdapter';
+export type { An5SheetsAdapterConfig } from './an5SheetsAdapter';
 export { parseSheetsConnectionString } from './parseConnectionString';

package/typescript/index.d.ts

@@ -1,2 +1,4 @@
-export { An5Adapter, AdapterTableClient, createAn5Adapter, setAdapterMetadata, An5AdapterConfig, AdapterMetadata, Dialect, } from './an5Adapter';
-export { getLlmConfig, setLlmConfig, getEmbeddingConfig, setEmbeddingConfig, resetAdapter, LlmConfigData, EmbeddingConfigData, } from './config';
+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';