@travetto/model-mysql 3.0.0-rc.4 → 3.0.0-rc.7

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-mysql/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-mysql/DOC.ts and execute "npx trv doc" to rebuild -->
 # MySQL Model Service
 ## MySQL 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-mysql",
-  "displayName": "MySQL Model Service",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.7",
   "description": "MySQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -18,26 +17,34 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
+    "__index__.ts",
     "src",
     "support"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/model-mysql"
   },
   "dependencies": {
-    "@travetto/config": "^3.0.0-rc.4",
-    "@travetto/context": "^3.0.0-rc.4",
-    "@travetto/model": "^3.0.0-rc.4",
-    "@travetto/model-query": "3.0.0-rc.4",
-    "@travetto/model-sql": "^3.0.0-rc.4",
-    "mysql": "^2.18.1",
-    "@types/mysql": "^2.15.21"
+    "@travetto/config": "^3.0.0-rc.7",
+    "@travetto/context": "^3.0.0-rc.7",
+    "@travetto/model": "^3.0.0-rc.7",
+    "@travetto/model-query": "^3.0.0-rc.7",
+    "@travetto/model-sql": "^3.0.0-rc.7",
+    "@types/mysql": "^2.15.21",
+    "mysql": "^2.18.1"
   },
-  "devDependencies": {
-    "@travetto/app": "^3.0.0-rc.4"
+  "peerDependencies": {
+    "@travetto/command": "^3.0.0-rc.5"
+  },
+  "peerDependenciesMeta": {
+    "@travetto/command": {
+      "optional": true
+    }
+  },
+  "travetto": {
+    "displayName": "MySQL Model Service"
   },
   "publishConfig": {
     "access": "public"

package/src/connection.ts

@@ -1,4 +1,4 @@
-import * as mysql from 'mysql';
+import mysql from 'mysql';
 
 import { ShutdownManager } from '@travetto/base';
 import { AsyncContext } from '@travetto/context';
@@ -34,7 +34,7 @@ export class MySQLConnection extends Connection<mysql.PoolConnection> {
     });
 
     // Close mysql
-    ShutdownManager.onShutdown(this.constructor.ᚕid, () => new Promise(r => this.#pool.end(r)));
+    ShutdownManager.onShutdown(this, () => new Promise(r => this.#pool.end(r)));
   }
 
   /**

package/src/dialect.ts

@@ -5,7 +5,7 @@ import { WhereClause } from '@travetto/model-query';
 import { Class } from '@travetto/base';
 import { ModelType } from '@travetto/model';
 import { SQLModelConfig, SQLDialect } from '@travetto/model-sql';
-import { SQLDialect } from '@travetto/model-sql/srcinternal/util';
+import { VisitStack } from '@travetto/model-sql/src/internal/util';
 
 import { MySQLConnection } from './connection';
 

package/support/service.mysql.ts

@@ -1,7 +1,7 @@
-import { EnvUtil } from '@travetto/boot';
-import type { Service } from '@travetto/command/bin/lib/service';
+import { Env } from '@travetto/base';
+import type { Service } from '@travetto/command/support/bin/service';
 
-const version = EnvUtil.get('TRV_SERVICE_MYSQL', '5.6');
+const version = Env.get('MYSQL_VERSION', '5.6');
 
 export const service: Service = {
   name: 'mysql',