@sqb/sqljs 4.0.2 → 4.0.3

package/dist/SqljsAdapter.d.ts

@@ -8,3 +8,4 @@ export declare class SqljsAdapter implements Adapter {
     };
     connect(config: ClientConfiguration): Promise<Adapter.Connection>;
 }
+export declare function closeMemoryDatabase(name?: string): Promise<void>;

package/dist/SqljsAdapter.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqljsAdapter = void 0;
+exports.closeMemoryDatabase = exports.SqljsAdapter = void 0;
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 require("@sqb/sqlite-dialect");
 const sql_js_1 = __importDefault(require("sql.js"));
 const SqljsConnection_1 = require("./SqljsConnection");
-const dbCache = {};
+const path_1 = __importDefault(require("path"));
+const putil_promisify_1 = __importDefault(require("putil-promisify"));
+const dbCache = new Map();
 class SqljsAdapter {
     constructor() {
         this.driver = 'sqljs';
@@ -22,14 +23,51 @@ class SqljsAdapter {
     async connect(config) {
         if (!config.database)
             throw new Error('You must provide sqlite database file for sql.js driver');
-        const filename = path_1.default.resolve(process.cwd(), config.database);
-        if (dbCache[filename])
-            return new SqljsConnection_1.SqljsConnection(dbCache[filename]);
-        const filebuffer = fs_1.default.readFileSync(filename);
-        const SQL = await (0, sql_js_1.default)();
-        const db = new SQL.Database(filebuffer);
-        dbCache[filename] = db;
-        return new SqljsConnection_1.SqljsConnection(db);
+        let dbName = '';
+        let isMemory = false;
+        const m = config.database.match(/^(:memory:)(\w+)?$/);
+        if (m) {
+            isMemory = true;
+            dbName = config.database;
+        }
+        else {
+            dbName = path_1.default.resolve(config.database);
+        }
+        let intlDb = dbCache.get(dbName);
+        if (intlDb) {
+            intlDb._refCount++;
+        }
+        else {
+            const SQL = await (0, sql_js_1.default)();
+            if (isMemory) {
+                intlDb = new SQL.Database();
+                intlDb._refCount = 0;
+            }
+            else {
+                const buf = await putil_promisify_1.default.fromCallback(cb => fs_1.default.readFile(dbName, cb));
+                intlDb = new SQL.Database(buf);
+                intlDb._refCount = 1;
+            }
+            dbCache.set(dbName, intlDb);
+        }
+        const _intlDb = intlDb;
+        return new SqljsConnection_1.SqljsConnection(_intlDb, () => {
+            if (isMemory)
+                return;
+            if (--_intlDb._refCount <= 0) {
+                _intlDb.close();
+                dbCache.delete(dbName);
+            }
+        });
     }
 }
 exports.SqljsAdapter = SqljsAdapter;
+async function closeMemoryDatabase(name) {
+    const memoryDbName = name || ':memory:';
+    const memDb = dbCache.get(memoryDbName);
+    if (memDb) {
+        dbCache.delete(memoryDbName);
+        memDb.close();
+    }
+}
+exports.closeMemoryDatabase = closeMemoryDatabase;

package/dist/SqljsConnection.d.ts

@@ -1,7 +1,9 @@
+import { Database } from 'sql.js';
 import { Adapter, QueryRequest } from '@sqb/connect';
 export declare class SqljsConnection implements Adapter.Connection {
-    private readonly intlcon;
-    constructor(db: any);
+    private _onClose;
+    private intlcon?;
+    constructor(db: Database, _onClose: Function);
     get sessionId(): any;
     close(): Promise<void>;
     reset(): Promise<void>;
@@ -10,5 +12,5 @@ export declare class SqljsConnection implements Adapter.Connection {
     rollback(): Promise<void>;
     test(): Promise<void>;
     execute(query: QueryRequest): Promise<Adapter.Response>;
-    _convertFields(fields: string[]): any[];
+    private _convertFields;
 }

package/dist/SqljsConnection.js

@@ -3,19 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqljsConnection = void 0;
 const SqljsCursor_1 = require("./SqljsCursor");
 class SqljsConnection {
-    constructor(db) {
+    constructor(db, _onClose) {
+        this._onClose = _onClose;
         this.intlcon = db;
     }
     get sessionId() {
         return 0;
     }
     async close() {
-        // Dont close
+        if (this.intlcon) {
+            this.intlcon = undefined;
+            await this._onClose();
+        }
     }
     async reset() {
         return this.rollback();
     }
     async startTransaction() {
+        assertDefined(this.intlcon);
         try {
             this.intlcon.exec('BEGIN TRANSACTION;');
         }
@@ -26,6 +31,7 @@ class SqljsConnection {
         }
     }
     async commit() {
+        assertDefined(this.intlcon);
         try {
             this.intlcon.exec('COMMIT;');
         }
@@ -36,6 +42,7 @@ class SqljsConnection {
         }
     }
     async rollback() {
+        assertDefined(this.intlcon);
         try {
             this.intlcon.exec('ROLLBACK;');
         }
@@ -46,16 +53,19 @@ class SqljsConnection {
         }
     }
     async test() {
+        assertDefined(this.intlcon);
         this.intlcon.exec('select 1');
     }
     async execute(query) {
+        assertDefined(this.intlcon);
         if (!query.autoCommit)
             await this.startTransaction();
         const out = {};
         let params;
         if (query.params) {
-            params = Object.keys(query.params).reduce((obj, k) => {
-                obj[':' + k] = query.params[k];
+            const prms = query.params;
+            params = Object.keys(prms).reduce((obj, k) => {
+                obj[':' + k] = prms[k];
                 return obj;
             }, {});
         }
@@ -130,3 +140,7 @@ class SqljsConnection {
     }
 }
 exports.SqljsConnection = SqljsConnection;
+function assertDefined(d) {
+    if (d == null)
+        throw new Error("Invalid data");
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/sqljs",
   "description": "SQB serialization extension for sql.js driver",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "author": "Panates Ltd.",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"