@travetto/model-sql 5.0.20 → 6.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "5.0.20",
+  "version": "6.0.0-rc.0",
   "description": "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,14 +27,14 @@
     "directory": "module/model-sql"
   },
   "dependencies": {
-    "@travetto/cli": "^5.0.19",
-    "@travetto/config": "^5.0.16",
-    "@travetto/context": "^5.0.16",
-    "@travetto/model": "^5.0.17",
-    "@travetto/model-query": "^5.0.17"
+    "@travetto/cli": "^6.0.0-rc.0",
+    "@travetto/config": "^6.0.0-rc.0",
+    "@travetto/context": "^6.0.0-rc.0",
+    "@travetto/model": "^6.0.0-rc.0",
+    "@travetto/model-query": "^6.0.0-rc.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.18"
+    "@travetto/test": "^6.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/connection/base.ts

@@ -1,8 +1,5 @@
 import { castTo, Util } from '@travetto/runtime';
-import { AsyncContext } from '@travetto/context';
-
-const ContextActiveSymbol: unique symbol = Symbol.for('@travetto/model:sql-active');
-const TxActiveSymbol: unique symbol = Symbol.for('@travetto/model:sql-transaction');
+import { AsyncContext, AsyncContextValue } from '@travetto/context';
 
 export type TransactionType = 'required' | 'isolated' | 'force';
 
@@ -26,22 +23,27 @@ export abstract class Connection<C = unknown> {
     commitNested: 'RELEASE SAVEPOINT $1;'
   };
 
-  constructor(public readonly context: AsyncContext) {
+  readonly context: AsyncContext;
+
+  #active = new AsyncContextValue<C>(this);
+  #activeTx = new AsyncContextValue<boolean>(this);
 
+  constructor(context: AsyncContext) {
+    this.context = context;
   }
 
   /**
    * Get active connection
    */
-  get active(): C {
-    return this.context.get<C>(ContextActiveSymbol);
+  get active(): C | undefined {
+    return this.#active.get();
   }
 
   /**
    * Get active tx state
    */
   get activeTx(): boolean {
-    return !!this.context.get<boolean>(TxActiveSymbol);
+    return !!this.#activeTx.get();
   }
 
   /**
@@ -78,12 +80,14 @@ export abstract class Connection<C = unknown> {
     }
 
     return this.context.run(async () => {
+      let conn;
       try {
-        this.context.set(ContextActiveSymbol, await this.acquire());
+        conn = await this.acquire();
+        this.#active.set(conn);
         return await op();
       } finally {
-        if (this.active) {
-          this.release(this.active);
+        if (conn) {
+          this.release(conn);
         }
       }
     });
@@ -103,7 +107,7 @@ export abstract class Connection<C = unknown> {
     const self = castTo<Connection>(this);
     yield* this.context.iterate(async function* () {
       try {
-        self.context.set(ContextActiveSymbol, await self.acquire());
+        self.#active.set(await self.acquire());
         yield* op();
       } finally {
         if (self.active) {
@@ -121,12 +125,12 @@ export abstract class Connection<C = unknown> {
       if (mode === 'isolated' || mode === 'force') {
         const txId = mode === 'isolated' ? `tx${Util.uuid()}` : undefined;
         try {
-          await this.startTx(this.active, txId);
+          await this.startTx(this.active!, txId);
           const res = await op();
-          await this.commitTx(this.active, txId);
+          await this.commitTx(this.active!, txId);
           return res;
         } catch (err) {
-          try { await this.rollbackTx(this.active, txId); } catch { }
+          try { await this.rollbackTx(this.active!, txId); } catch { }
           throw err;
         }
       } else {
@@ -134,7 +138,7 @@ export abstract class Connection<C = unknown> {
       }
     } else {
       return this.runWithActive(() => {
-        this.context.set(TxActiveSymbol, true);
+        this.#activeTx.set(true);
         return this.runWithTransaction('force', op);
       });
     }

package/src/dialect/base.ts

@@ -134,15 +134,13 @@ export abstract class SQLDialect implements DialectState {
   rootAlias = '_ROOT';
 
   aliasCache = new Map<Class, Map<string, Alias>>();
+  ns: string;
 
-  constructor(public ns: string) {
+  constructor(ns: string) {
     this.namespace = this.namespace.bind(this);
     this.table = this.table.bind(this);
     this.ident = this.ident.bind(this);
-
-    if (this.ns) {
-      this.ns = `${this.ns}_`;
-    }
+    this.ns = ns ? `${ns}_` : ns;
   }
 
   /**

package/src/table-manager.ts

@@ -15,12 +15,11 @@ import { Connection } from './connection/base';
 export class TableManager {
 
   #dialect: SQLDialect;
+  context: AsyncContext;
 
-  constructor(
-    public context: AsyncContext,
-    dialect: SQLDialect
-  ) {
+  constructor(context: AsyncContext, dialect: SQLDialect) {
     this.#dialect = dialect;
+    this.context = context;
   }
 
   #exec<T = unknown>(sql: string): Promise<{ records: T[], count: number }> {
@@ -47,7 +46,7 @@ export class TableManager {
   /**
    * Create all needed tables for a given class
    */
-  @WithAsyncContext({})
+  @WithAsyncContext()
   @Connected()
   @Transactional()
   async createTables(cls: Class): Promise<void> {
@@ -74,7 +73,7 @@ export class TableManager {
   /**
    * Drop all tables for a given class
    */
-  @WithAsyncContext({})
+  @WithAsyncContext()
   @Connected()
   @Transactional()
   async dropTables(cls: Class): Promise<void> {
@@ -86,7 +85,7 @@ export class TableManager {
   /**
    * Drop all tables for a given class
    */
-  @WithAsyncContext({})
+  @WithAsyncContext()
   @Connected()
   @Transactional()
   async truncateTables(cls: Class): Promise<void> {
@@ -105,7 +104,7 @@ export class TableManager {
   /**
    * When the schema changes, update SQL
    */
-  @WithAsyncContext({})
+  @WithAsyncContext()
   @Transactional()
   @Connected()
   async changeSchema(cls: Class, change: SchemaChange): Promise<void> {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 ArcSine Technologies
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.