@travetto/model-sql 3.1.0-rc.0 → 3.1.0-rc.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "3.1.0-rc.0",
+  "version": "3.1.0-rc.10",
   "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/config": "^3.1.0-rc.0",
-    "@travetto/context": "^3.1.0-rc.0",
-    "@travetto/model": "^3.1.0-rc.0",
-    "@travetto/model-query": "^3.1.0-rc.0"
+    "@travetto/config": "^3.1.0-rc.8",
+    "@travetto/context": "^3.1.0-rc.5",
+    "@travetto/model": "^3.1.0-rc.10",
+    "@travetto/model-query": "^3.1.0-rc.10"
   },
   "peerDependencies": {
-    "@travetto/command": "^3.1.0-rc.0",
-    "@travetto/test": "^3.1.0-rc.0"
+    "@travetto/command": "^3.1.0-rc.5",
+    "@travetto/test": "^3.1.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/dialect/base.ts

@@ -6,7 +6,6 @@ import { BulkResponse, IndexConfig } from '@travetto/model';
 import { PointImpl } from '@travetto/model-query/src/internal/model/point';
 import { ModelType } from '@travetto/model/src/types/model';
 import { ModelQueryUtil } from '@travetto/model-query/src/internal/service/query';
-import { ModelUtil } from '@travetto/model/src/internal/util';
 
 import { SQLUtil, VisitStack } from '../internal/util';
 import { DeleteWrapper, InsertWrapper, DialectState } from '../internal/types';
@@ -46,7 +45,13 @@ export abstract class SQLDialect implements DialectState {
   /**
    * Default length of unique ids
    */
-  KEY_LEN = 64;
+  ID_LEN = 32;
+
+  /**
+   * Hash Length
+   */
+  HASH_LEN = 64;
+
   /**
    * Default length for varchar
    */
@@ -104,8 +109,8 @@ export abstract class SQLDialect implements DialectState {
    * Generate an id field
    */
   idField = makeField('id', String, true, {
-    maxlength: { n: 32 },
-    minlength: { n: 32 }
+    maxlength: { n: this.ID_LEN },
+    minlength: { n: this.ID_LEN }
   });
 
   /**
@@ -117,8 +122,8 @@ export abstract class SQLDialect implements DialectState {
    * Parent path reference
    */
   parentPathField = makeField('__parent_path', String, true, {
-    maxlength: { n: this.KEY_LEN },
-    minlength: { n: this.KEY_LEN },
+    maxlength: { n: this.HASH_LEN },
+    minlength: { n: this.HASH_LEN },
     required: { active: true }
   });
 
@@ -126,8 +131,8 @@ export abstract class SQLDialect implements DialectState {
    * Path reference
    */
   pathField = makeField('__path', String, true, {
-    maxlength: { n: this.KEY_LEN },
-    minlength: { n: this.KEY_LEN },
+    maxlength: { n: this.HASH_LEN },
+    minlength: { n: this.HASH_LEN },
     required: { active: true }
   });
 
@@ -242,7 +247,7 @@ export abstract class SQLDialect implements DialectState {
     } else if (conf.type === Boolean) {
       type = this.COLUMN_TYPES.BOOLEAN;
     } else if (conf.type === String) {
-      if (conf.specifier && conf.specifier.startsWith('text')) {
+      if (conf.specifiers?.includes('text')) {
         type = this.COLUMN_TYPES.TEXT;
       } else {
         type = this.PARAMETERIZED_COLUMN_TYPES.VARCHAR(conf.maxlength ? conf.maxlength.n : this.DEFAULT_STRING_LEN);
@@ -307,13 +312,6 @@ export abstract class SQLDialect implements DialectState {
    */
   abstract getModifyColumnSQL(stack: VisitStack[]): string;
 
-  /**
-   * Generate a UUID
-   */
-  generateId(): string {
-    return ModelUtil.uuid(this.KEY_LEN);
-  }
-
   /**
    * Determine table/field namespace for a given stack location
    */
@@ -646,7 +644,7 @@ ${this.getLimitSQL(cls, query)}`;
       if (!idField) {
         fields.push(idField = this.idField);
       } else {
-        idField.maxlength = { n: this.KEY_LEN };
+        idField.maxlength = { n: this.ID_LEN };
       }
     }
 

package/src/service.ts

@@ -1,7 +1,8 @@
 import {
   ModelType,
   BulkOp, BulkResponse, ModelCrudSupport, ModelStorageSupport, ModelBulkSupport,
-  NotFoundError, ModelRegistry, ExistsError, OptionalId
+  NotFoundError, ModelRegistry, ExistsError, OptionalId,
+  ModelUuidGenerator
 } from '@travetto/model';
 import { DataUtil, Class } from '@travetto/base';
 import { SchemaChange } from '@travetto/schema';
@@ -9,7 +10,7 @@ import { AsyncContext } from '@travetto/context';
 import { Injectable } from '@travetto/di';
 import {
   ModelQuery, ModelQueryCrudSupport, ModelQueryFacetSupport, ModelQuerySupport,
-  PageableModelQuery, ValidStringFields, WhereClauseRaw
+  PageableModelQuery, ValidStringFields, WhereClauseRaw,
 } from '@travetto/model-query';
 
 import { ModelQueryUtil } from '@travetto/model-query/src/internal/service/query';
@@ -44,6 +45,7 @@ export class SQLModelService implements
   #manager: TableManager;
   #context: AsyncContext;
   #dialect: SQLDialect;
+  uuid: ModelUuidGenerator;
 
   readonly config: SQLModelConfig;
 
@@ -107,6 +109,7 @@ export class SQLModelService implements
       if (this.#dialect.conn.init) {
         await this.#dialect.conn.init();
       }
+      this.uuid = ModelCrudUtil.uuidGenerator(this.#dialect.ID_LEN);
       this.#manager = new TableManager(this.#context, this.#dialect);
       await ModelStorageUtil.registerModelChangeListener(this);
       ModelExpiryUtil.registerCull(this);
@@ -117,10 +120,6 @@ export class SQLModelService implements
     return this.#dialect.conn;
   }
 
-  uuid(): string {
-    return this.#dialect.generateId();
-  }
-
   async exportModel<T extends ModelType>(e: Class<T>): Promise<string> {
     return (await this.#manager.exportTables(e)).join('\n');
   }
@@ -259,8 +258,8 @@ export class SQLModelService implements
 
   @Connected()
   async queryOne<T extends ModelType>(cls: Class<T>, builder: ModelQuery<T>, failOnMany = true): Promise<T> {
-    const res = await this.query(cls, { ...builder, limit: failOnMany ? 2 : 1 });
-    return ModelQueryUtil.verifyGetSingleCounts(cls, res, failOnMany);
+    const res = await this.query<T>(cls, { ...builder, limit: failOnMany ? 2 : 1 });
+    return ModelQueryUtil.verifyGetSingleCounts<T>(cls, res, failOnMany);
   }
 
   @Connected()
@@ -285,8 +284,8 @@ export class SQLModelService implements
 
   @Connected()
   async suggest<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, prefix?: string, query?: PageableModelQuery<T>): Promise<T[]> {
-    const q = ModelQuerySuggestUtil.getSuggestQuery(cls, field, prefix, query);
-    const results = await this.query(cls, q);
+    const q = ModelQuerySuggestUtil.getSuggestQuery<T>(cls, field, prefix, query);
+    const results = await this.query<T>(cls, q);
     return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, results, (a, b) => b, query?.limit);
   }