@travetto/model-sql 4.1.3 → 4.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,10 +27,10 @@
     "directory": "module/model-sql"
   },
   "dependencies": {
-    "@travetto/config": "^4.1.1",
+    "@travetto/config": "^4.1.2",
     "@travetto/context": "^4.1.1",
     "@travetto/model": "^4.1.3",
-    "@travetto/model-query": "^4.1.3"
+    "@travetto/model-query": "^4.1.4"
   },
   "peerDependencies": {
     "@travetto/command": "^4.1.1",

package/src/internal/util.ts

@@ -1,6 +1,6 @@
 import { Class, TypedObject, ObjectUtil } from '@travetto/base';
 import { SelectClause, SortClause } from '@travetto/model-query';
-import { ModelRegistry, ModelType } from '@travetto/model';
+import { ModelRegistry, ModelType, OptionalId } from '@travetto/model';
 import { SchemaRegistry, ClassConfig, FieldConfig } from '@travetto/schema';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 
@@ -173,7 +173,7 @@ export class SQLUtil {
   /**
    * Process a schema instance by visiting it synchronously.  This is synchronous to prevent concurrent calls from breaking
    */
-  static visitSchemaInstance<T extends ModelType>(cls: Class<T>, instance: T, handler: VisitHandler<unknown, VisitInstanceNode<unknown>>): void {
+  static visitSchemaInstance<T extends ModelType>(cls: Class<T>, instance: T | OptionalId<T>, handler: VisitHandler<unknown, VisitInstanceNode<unknown>>): void {
     const pathObj: unknown[] = [instance];
     this.visitSchemaSync(SchemaRegistry.get(cls), {
       onRoot: (config) => {
@@ -334,7 +334,7 @@ export class SQLUtil {
   /**
    * Get insert statements for a given class, and its child tables
    */
-  static async getInserts<T extends ModelType>(cls: Class<T>, els: T[]): Promise<InsertWrapper[]> {
+  static async getInserts<T extends ModelType>(cls: Class<T>, els: (T | OptionalId<T>)[]): Promise<InsertWrapper[]> {
     const ins: Record<string, InsertWrapper> = {};
 
     const track = (stack: VisitStack[], value: unknown): void => {

package/src/service.ts

@@ -223,8 +223,9 @@ export class SQLModelService implements
       new Map([...existingUpsertedIds.entries()].map(([k, v]) => [v, k]))
     );
 
-    const get = (k: keyof BulkOp<T>): T[] =>
-      operations.map(x => x[k]).filter((x): x is T => !!x);
+    const get = <K extends keyof BulkOp<T>>(k: K): Required<BulkOp<T>>[K][] =>
+      operations.map(x => x[k]).filter((x): x is Required<BulkOp<T>>[K] => !!x);
+
     const getStatements = async (k: keyof BulkOp<T>): Promise<InsertWrapper[]> =>
       (await SQLUtil.getInserts(cls, get(k))).filter(x => !!x.records.length);