@travetto/model-mysql 6.0.0-rc.1 → 6.0.0-rc.3

package/README.md

@@ -13,17 +13,18 @@ npm install @travetto/model-mysql
 yarn add @travetto/model-mysql
 ```
 
-This module provides a [MySQL](https://www.mysql.com/)-based implementation for the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") module.  This source allows the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") module to read, write and query against [SQL](https://en.wikipedia.org/wiki/SQL) databases. In development mode, the [SQLModelService](https://github.com/travetto/travetto/tree/main/module/model-sql/src/service.ts#L39) will also modify the database schema in real time to minimize impact to development. 
+This module provides a [MySQL](https://www.mysql.com/)-based implementation for the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") module.  This source allows the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") module to read, write and query against [SQL](https://en.wikipedia.org/wiki/SQL) databases. In development mode, the [SQLModelService](https://github.com/travetto/travetto/tree/main/module/model-sql/src/service.ts#L32) will also modify the database schema in real time to minimize impact to development. 
 
 The schema generated will not generally map to existing tables as it is attempting to produce a document store like experience on top of a [SQL](https://en.wikipedia.org/wiki/SQL) database.  Every table generated will have a `path_id` which determines it's location in the document hierarchy as well as sub tables will have a `parent_path_id` to associate records with the parent values. 
 
 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#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)
-   *  [Suggest](https://github.com/travetto/travetto/tree/main/module/model-query/src/service/suggest.ts#L12)
+   *  [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/types/crud.ts#L11)
+   *  [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/types/bulk.ts#L64)
+   *  [Query Crud](https://github.com/travetto/travetto/tree/main/module/model-query/src/types/crud.ts#L11)
+   *  [Facet](https://github.com/travetto/travetto/tree/main/module/model-query/src/types/facet.ts#L14)
+   *  [Query](https://github.com/travetto/travetto/tree/main/module/model-query/src/types/query.ts#L10)
+   *  [Suggest](https://github.com/travetto/travetto/tree/main/module/model-query/src/types/suggest.ts#L12)
+
 Out of the box, by installing the module, everything should be wired up by default.If you need to customize any aspect of the source or config, you can override and register it with the [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support.") module.
 
 **Code: Wiring up a custom Model Source**
@@ -46,12 +47,6 @@ where the [SQLModelConfig](https://github.com/travetto/travetto/tree/main/module
 
 **Code: Structure of SQLModelConfig**
 ```typescript
-import { Config } from '@travetto/config';
-import { asFull } from '@travetto/runtime';
-
-/**
- * SQL Model Config
- */
 @Config('model.sql')
 export class SQLModelConfig<T extends {} = {}> {
   /**

package/__index__.ts

@@ -1,2 +1,2 @@
-export * from './src/dialect';
-export * from './src/connection';
+export * from './src/dialect.ts';
+export * from './src/connection.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mysql",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.3",
   "description": "MySQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,13 +27,13 @@
     "directory": "module/model-mysql"
   },
   "dependencies": {
-    "@travetto/cli": "^6.0.0-rc.1",
-    "@travetto/config": "^6.0.0-rc.1",
-    "@travetto/context": "^6.0.0-rc.1",
-    "@travetto/model": "^6.0.0-rc.1",
-    "@travetto/model-query": "^6.0.0-rc.1",
-    "@travetto/model-sql": "^6.0.0-rc.1",
-    "mysql2": "^3.12.0"
+    "@travetto/cli": "^6.0.0-rc.3",
+    "@travetto/config": "^6.0.0-rc.2",
+    "@travetto/context": "^6.0.0-rc.2",
+    "@travetto/model": "^6.0.0-rc.2",
+    "@travetto/model-query": "^6.0.0-rc.2",
+    "@travetto/model-sql": "^6.0.0-rc.3",
+    "mysql2": "^3.14.0"
   },
   "travetto": {
     "displayName": "MySQL Model Service"

package/src/connection.ts

@@ -48,15 +48,15 @@ export class MySQLConnection extends Connection<PoolConnection> {
    * Support some basic type support for JSON data
    */
   typeCast(field: unknown, next: () => unknown): unknown {
-    const res = next();
-    if (typeof res === 'string' && (field && typeof field === 'object' && 'type' in field) && (field.type === 'JSON' || field.type === 'BLOB')) {
-      if (res.charAt(0) === '{' && res.charAt(res.length - 1) === '}') {
+    const result = next();
+    if (typeof result === 'string' && (field && typeof field === 'object' && 'type' in field) && (field.type === 'JSON' || field.type === 'BLOB')) {
+      if (result.charAt(0) === '{' && result.charAt(result.length - 1) === '}') {
         try {
-          return JSON.parse(res);
+          return JSON.parse(result);
         } catch { }
       }
     }
-    return res;
+    return result;
   }
 
   async execute<T = unknown>(conn: PoolConnection, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {

package/src/dialect.ts

@@ -4,10 +4,9 @@ import { AsyncContext } from '@travetto/context';
 import { WhereClause } from '@travetto/model-query';
 import { castTo, Class } from '@travetto/runtime';
 import { ModelType } from '@travetto/model';
-import { SQLModelConfig, SQLDialect } from '@travetto/model-sql';
-import { VisitStack } from '@travetto/model-sql/src/internal/util';
+import { SQLModelConfig, SQLDialect, VisitStack } from '@travetto/model-sql';
 
-import { MySQLConnection } from './connection';
+import { MySQLConnection } from './connection.ts';
 
 /**
  * MYSQL Dialect for the SQL Model Source