@travetto/model-sqlite 3.0.0-rc.3 → 3.0.0-rc.6

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-sqlite/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-sqlite/DOC.ts and execute "npx trv doc" to rebuild -->
 # SQLite Model Service
 ## SQLite backing for the travetto model module, with real-time modeling support for SQL schemas.
 
@@ -16,7 +16,7 @@ a [SQL](https://en.wikipedia.org/wiki/SQL) database.  Every table generated will
 Supported features:
    
    *  [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts#L11)
-   *  [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L23)
+   *  [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L19)
    *  [Query Crud](https://github.com/travetto/travetto/tree/main/module/model-query/src/service/crud.ts#L11)
    *  [Facet](https://github.com/travetto/travetto/tree/main/module/model-query/src/service/facet.ts#L12)
    *  [Query](https://github.com/travetto/travetto/tree/main/module/model-query/src/service/query.ts#L10)
@@ -53,7 +53,7 @@ import { Config } from '@travetto/config';
  * SQL Model Config
  */
 @Config('model.sql')
-export class SQLModelConfig {
+export class SQLModelConfig<T extends {} = {}> {
   /**
    * Host to connect to
    */
@@ -89,9 +89,10 @@ export class SQLModelConfig {
   /**
    * Raw client options
    */
-  options = {};
+
+  options: T = {} as T;
 }
 ```
 
-  Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L9) annotation, and so these values can be overridden using the 
-  standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Environment-aware config management using yaml files")resolution paths.
+  Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L13) annotation, and so these values can be overridden using the 
+  standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Configuration support")resolution paths.

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@travetto/model-sqlite",
-  "displayName": "SQLite Model Service",
-  "version": "3.0.0-rc.3",
+  "version": "3.0.0-rc.6",
   "description": "SQLite backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -18,25 +17,25 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
+    "__index__.ts",
     "src"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/model-sqlite"
   },
   "dependencies": {
-    "@travetto/config": "^3.0.0-rc.3",
-    "@travetto/context": "^3.0.0-rc.3",
-    "@travetto/model": "^3.0.0-rc.3",
-    "@travetto/model-query": "3.0.0-rc.3",
-    "@travetto/model-sql": "3.0.0-rc.3",
-    "better-sqlite3": "^7.6.2",
-    "@types/better-sqlite3": "^7.6.0"
+    "@travetto/config": "^3.0.0-rc.6",
+    "@travetto/context": "^3.0.0-rc.6",
+    "@travetto/model": "^3.0.0-rc.6",
+    "@travetto/model-query": "^3.0.0-rc.6",
+    "@travetto/model-sql": "^3.0.0-rc.6",
+    "@types/better-sqlite3": "^7.6.3",
+    "better-sqlite3": "^7.6.2"
   },
-  "devDependencies": {
-    "@travetto/app": "^3.0.0-rc.3"
+  "travetto": {
+    "displayName": "SQLite Model Service"
   },
   "publishConfig": {
     "access": "public"

package/src/connection.ts

@@ -1,11 +1,10 @@
-import type * as sqlite3 from 'better-sqlite3';
-import Db = require('better-sqlite3');
-import * as pool from 'generic-pool';
+import Db, * as sqlite3 from 'better-sqlite3';
+import pool from 'generic-pool';
 
-import { ShutdownManager, Util } from '@travetto/base';
+import { path } from '@travetto/manifest';
+import { ShutdownManager, TimeUtil } from '@travetto/base';
 import { AsyncContext, WithAsyncContext } from '@travetto/context';
 import { ExistsError } from '@travetto/model';
-import { AppCache } from '@travetto/boot';
 import { SQLModelConfig, Connection } from '@travetto/model-sql';
 
 /**
@@ -15,12 +14,12 @@ export class SqliteConnection extends Connection<sqlite3.Database> {
 
   isolatedTransactions = false;
 
-  #config: SQLModelConfig;
+  #config: SQLModelConfig<sqlite3.Options & { file?: string }>;
   #pool: pool.Pool<sqlite3.Database>;
 
   constructor(
     context: AsyncContext,
-    config: SQLModelConfig
+    config: SQLModelConfig<sqlite3.Options & { file?: string }>
   ) {
     super(context);
     this.#config = config;
@@ -33,7 +32,7 @@ export class SqliteConnection extends Connection<sqlite3.Database> {
       } catch (err) {
         if (err instanceof Error && retries > 1 && err.message.includes('database is locked')) {
           console.error('Failed, and waiting', retries);
-          await Util.wait(delay);
+          await TimeUtil.wait(delay);
           retries -= 1;
         } else {
           throw err;
@@ -42,26 +41,29 @@ export class SqliteConnection extends Connection<sqlite3.Database> {
     }
   }
 
+  async #create(): Promise<sqlite3.Database> {
+    const file = path.resolve(this.#config.options.file ?? '.trv-sqlite_db');
+    const db = new Db(file, this.#config.options);
+    await db.pragma('foreign_keys = ON');
+    await db.pragma('journal_mode = WAL');
+    db.function('regexp', (a, b) => new RegExp(a).test(b) ? 1 : 0);
+    return db;
+  }
+
   /**
    * Initializes connection and establishes crypto extension for use with hashing
    */
   @WithAsyncContext()
   override async init(): Promise<void> {
-    this.#pool = pool.createPool({
-      create: () => this.#withRetries(async () => {
-        const db = Db(AppCache.toEntryName('sqlite_db'),
-          this.#config.options
-        );
-        await db.pragma('foreign_keys = ON');
-        await db.pragma('journal_mode = WAL');
-        db.function('regexp', (a, b) => new RegExp(a).test(b) ? 1 : 0);
-        return db;
-      }),
+    await this.#create();
+
+    this.#pool = pool.createPool<sqlite3.Database>({
+      create: () => this.#withRetries(() => this.#create()),
       destroy: async db => { db.close(); }
     }, { max: 1 });
 
     // Close postgres
-    ShutdownManager.onShutdown(this.constructor.ᚕid, () => this.#pool.clear());
+    ShutdownManager.onShutdown(this, () => this.#pool.clear());
   }
 
   async execute<T = unknown>(conn: sqlite3.Database, query: string): Promise<{ count: number, records: T[] }> {
@@ -86,7 +88,7 @@ export class SqliteConnection extends Connection<sqlite3.Database> {
   }
 
   async acquire(): Promise<Db.Database> {
-    return this.#pool.acquire();
+    return await this.#pool.acquire();
   }
 
   async release(db: sqlite3.Database): Promise<void> {