merge dev to main (v3.0.0-alpha.14)

TODO.md

@@ -11,6 +11,7 @@
     - [ ] format
     - [ ] db seed
 - [ ] ZModel
+    - [ ] Import
     - [ ] View support
 - [ ] ORM
     - [x] Create
@@ -80,8 +81,8 @@
         - [ ] Strict undefined checks
         - [ ] DbNull vs JsonNull
     - [ ] Benchmark
-- [ ] Plugin
-    - [ ] Post-mutation hooks should be called after transaction is committed
+- [x] Plugin
+    - [x] Post-mutation hooks should be called after transaction is committed
 - [x] TypeDef and mixin
 - [ ] Strongly typed JSON
 - [x] Polymorphism

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "description": "ZenStack",
     "packageManager": "[email protected]",
     "scripts": {

packages/cli/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/common-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {

packages/create-zenstack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "type": "module",
     "private": true,
     "license": "MIT"

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,

packages/language/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [

packages/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.13",
+    "version": "3.0.0-alpha.14",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {

packages/runtime/src/client/client-impl.ts

@@ -255,23 +255,33 @@ export class ClientImpl<Schema extends SchemaDef> {
     }
 
     $use(plugin: RuntimePlugin<Schema>) {
-        const newOptions = {
+        // tsc perf
+        const newPlugins: RuntimePlugin<Schema>[] = [...(this.$options.plugins ?? []), plugin];
+        const newOptions: ClientOptions<Schema> = {
             ...this.options,
-            plugins: [...(this.options.plugins ?? []), plugin],
+            plugins: newPlugins,
         };
         return new ClientImpl<Schema>(this.schema, newOptions, this);
     }
 
     $unuse(pluginId: string) {
-        const newOptions = {
+        // tsc perf
+        const newPlugins: RuntimePlugin<Schema>[] = [];
+        for (const plugin of this.options.plugins ?? []) {
+            if (plugin.id !== pluginId) {
+                newPlugins.push(plugin);
+            }
+        }
+        const newOptions: ClientOptions<Schema> = {
             ...this.options,
-            plugins: this.options.plugins?.filter((p) => p.id !== pluginId),
+            plugins: newPlugins,
         };
         return new ClientImpl<Schema>(this.schema, newOptions, this);
     }
 
     $unuseAll() {
-        const newOptions = {
+        // tsc perf
+        const newOptions: ClientOptions<Schema> = {
             ...this.options,
             plugins: [] as RuntimePlugin<Schema>[],
         };
@@ -388,7 +398,7 @@ function createModelCrudHandler<Schema extends SchemaDef, Model extends GetModel
             for (const plugin of plugins) {
                 if (plugin.onQuery && typeof plugin.onQuery === 'object') {
                     // for each model key or "$allModels"
-                    for (const [_model, modelHooks] of Object.entries(plugin.onQuery)) {
+                    for (const [_model, modelHooks] of Object.entries<any>(plugin.onQuery)) {
                         if (_model === lowerCaseFirst(model) || _model === '$allModels') {
                             if (modelHooks && typeof modelHooks === 'object') {
                                 // for each operation key or "$allOperations"

packages/runtime/src/client/crud/operations/aggregate.ts

@@ -112,11 +112,11 @@ export class AggregateOperationHandler<Schema extends SchemaDef> extends BaseOpe
             }
         }
 
-        const result = await query.executeTakeFirstOrThrow();
+        const result = await this.executeQuery(this.kysely, query, 'aggregate');
         const ret: any = {};
 
         // postprocess result to convert flat fields into nested objects
-        for (const [key, value] of Object.entries(result as object)) {
+        for (const [key, value] of Object.entries(result.rows[0] as object)) {
             if (key === '_count') {
                 ret[key] = value;
                 continue;

packages/runtime/src/client/crud/operations/base.ts

@@ -6,8 +6,10 @@ import {
     ExpressionWrapper,
     sql,
     UpdateResult,
+    type Compilable,
     type IsolationLevel,
     type Expression as KyselyExpression,
+    type QueryResult,
     type SelectQueryBuilder,
 } from 'kysely';
 import { nanoid } from 'nanoid';
@@ -125,7 +127,11 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
         return getField(this.schema, model, field);
     }
 
-    protected exists(kysely: ToKysely<Schema>, model: GetModels<Schema>, filter: any): Promise<unknown | undefined> {
+    protected async exists(
+        kysely: ToKysely<Schema>,
+        model: GetModels<Schema>,
+        filter: any,
+    ): Promise<unknown | undefined> {
         const idFields = getIdFields(this.schema, model);
         const _filter = flattenCompoundUniqueFilters(this.schema, model, filter);
         const query = kysely
@@ -134,7 +140,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
             .select(idFields.map((f) => kysely.dynamic.ref(f)))
             .limit(1)
             .modifyEnd(this.makeContextComment({ model, operation: 'read' }));
-        return query.executeTakeFirst();
+        return this.executeQueryTakeFirst(kysely, query, 'exists');
     }
 
     protected async read(
@@ -444,7 +450,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                                     operation: 'update',
                                 }),
                             );
-                        return query.execute();
+                        return this.executeQuery(kysely, query, 'update');
                     };
                 }
             }
@@ -511,10 +517,10 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                 }),
             );
 
-        const createdEntity = await query.executeTakeFirst();
+        const createdEntity = await this.executeQueryTakeFirst(kysely, query, 'create');
 
         // try {
-        //     createdEntity = await query.executeTakeFirst();
+        //     createdEntity = await this.executeQueryTakeFirst(kysely, query, 'create');
         // } catch (err) {
         //     const { sql, parameters } = query.compile();
         //     throw new QueryError(
@@ -893,8 +899,8 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
             );
 
         if (!returnData) {
-            const result = await query.executeTakeFirstOrThrow();
-            return { count: Number(result.numInsertedOrUpdatedRows) } as Result;
+            const result = await this.executeQuery(kysely, query, 'createMany');
+            return { count: Number(result.numAffectedRows) } as Result;
         } else {
             const idFields = getIdFields(this.schema, model);
             const result = await query.returning(idFields as any).execute();
@@ -1160,10 +1166,10 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                     }),
                 );
 
-            const updatedEntity = await query.executeTakeFirst();
+            const updatedEntity = await this.executeQueryTakeFirst(kysely, query, 'update');
 
             // try {
-            //     updatedEntity = await query.executeTakeFirst();
+            //     updatedEntity = await this.executeQueryTakeFirst(kysely, query, 'update');
             // } catch (err) {
             //     const { sql, parameters } = query.compile();
             //     throw new QueryError(
@@ -1401,8 +1407,8 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
         query = query.modifyEnd(this.makeContextComment({ model, operation: 'update' }));
 
         if (!returnData) {
-            const result = await query.executeTakeFirstOrThrow();
-            return { count: Number(result.numUpdatedRows) } as Result;
+            const result = await this.executeQuery(kysely, query, 'update');
+            return { count: Number(result.numAffectedRows) } as Result;
         } else {
             const idFields = getIdFields(this.schema, model);
             const result = await query.returning(idFields as any).execute();
@@ -1636,7 +1642,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                 fromRelation.model,
                 fromRelation.field,
             );
-            let updateResult: UpdateResult;
+            let updateResult: QueryResult<unknown>;
 
             if (ownedByModel) {
                 // set parent fk directly
@@ -1665,7 +1671,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                             operation: 'update',
                         }),
                     );
-                updateResult = await query.executeTakeFirstOrThrow();
+                updateResult = await this.executeQuery(kysely, query, 'connect');
             } else {
                 // disconnect current if it's a one-one relation
                 const relationFieldDef = this.requireField(fromRelation.model, fromRelation.field);
@@ -1681,7 +1687,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                                 operation: 'update',
                             }),
                         );
-                    await query.execute();
+                    await this.executeQuery(kysely, query, 'disconnect');
                 }
 
                 // connect
@@ -1703,11 +1709,11 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                             operation: 'update',
                         }),
                     );
-                updateResult = await query.executeTakeFirstOrThrow();
+                updateResult = await this.executeQuery(kysely, query, 'connect');
             }
 
             // validate connect result
-            if (_data.length > updateResult.numUpdatedRows) {
+            if (_data.length > updateResult.numAffectedRows!) {
                 // some entities were not connected
                 throw new NotFoundError(model);
             }
@@ -1821,7 +1827,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                             operation: 'update',
                         }),
                     );
-                await query.executeTakeFirstOrThrow();
+                await this.executeQuery(kysely, query, 'disconnect');
             } else {
                 // disconnect
                 const query = kysely
@@ -1841,7 +1847,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                             operation: 'update',
                         }),
                     );
-                await query.executeTakeFirstOrThrow();
+                await this.executeQuery(kysely, query, 'disconnect');
             }
         }
     }
@@ -1920,7 +1926,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                         operation: 'update',
                     }),
                 );
-            await query.execute();
+            await this.executeQuery(kysely, query, 'disconnect');
 
             // connect
             if (_data.length > 0) {
@@ -1942,10 +1948,10 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
                             operation: 'update',
                         }),
                     );
-                const r = await query.executeTakeFirstOrThrow();
+                const r = await this.executeQuery(kysely, query, 'connect');
 
                 // validate result
-                if (_data.length > r.numUpdatedRows!) {
+                if (_data.length > r.numAffectedRows!) {
                     // some entities were not connected
                     throw new NotFoundError(model);
                 }
@@ -2109,8 +2115,8 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
         await this.processDelegateRelationDelete(kysely, modelDef, where, limit);
 
         query = query.modifyEnd(this.makeContextComment({ model, operation: 'delete' }));
-        const result = await query.executeTakeFirstOrThrow();
-        return { count: Number(result.numDeletedRows) };
+        const result = await this.executeQuery(kysely, query, 'delete');
+        return { count: Number(result.numAffectedRows) };
     }
 
     private async processDelegateRelationDelete(
@@ -2240,4 +2246,25 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
             }
         }
     }
+
+    protected makeQueryId(operation: string) {
+        return { queryId: `${operation}-${createId()}` };
+    }
+
+    protected executeQuery(kysely: ToKysely<Schema>, query: Compilable, operation: string) {
+        return kysely.executeQuery(query.compile(), this.makeQueryId(operation));
+    }
+
+    protected async executeQueryTakeFirst(kysely: ToKysely<Schema>, query: Compilable, operation: string) {
+        const result = await kysely.executeQuery(query.compile(), this.makeQueryId(operation));
+        return result.rows[0];
+    }
+
+    protected async executeQueryTakeFirstOrThrow(kysely: ToKysely<Schema>, query: Compilable, operation: string) {
+        const result = await kysely.executeQuery(query.compile(), this.makeQueryId(operation));
+        if (result.rows.length === 0) {
+            throw new QueryError('No rows found');
+        }
+        return result.rows[0];
+    }
 }

packages/runtime/src/client/crud/operations/count.ts

@@ -44,13 +44,13 @@ export class CountOperationHandler<Schema extends SchemaDef> extends BaseOperati
                         : eb.cast(eb.fn.count(sql.ref(`${subQueryName}.${key}`)), 'integer').as(key),
                 ),
             );
-
-            return query.executeTakeFirstOrThrow();
+            const result = await this.executeQuery(this.kysely, query, 'count');
+            return result.rows[0];
         } else {
             // simple count all
             query = query.select((eb) => eb.cast(eb.fn.countAll(), 'integer').as('count'));
-            const result = await query.executeTakeFirstOrThrow();
-            return (result as any).count as number;
+            const result = await this.executeQuery(this.kysely, query, 'count');
+            return (result.rows[0] as any).count as number;
         }
     }
 }

packages/runtime/src/client/crud/operations/delete.ts

@@ -30,7 +30,7 @@ export class DeleteOperationHandler<Schema extends SchemaDef> extends BaseOperat
 
         // TODO: avoid using transaction for simple delete
         await this.safeTransaction(async (tx) => {
-            const result = await this.delete(tx, this.model, args.where, undefined);
+            const result = await this.delete(tx, this.model, args.where);
             if (result.count === 0) {
                 throw new NotFoundError(this.model);
             }

packages/runtime/src/client/crud/operations/group-by.ts

@@ -108,8 +108,8 @@ export class GroupByOperationHandler<Schema extends SchemaDef> extends BaseOpera
             }
         }
 
-        const result = await query.execute();
-        return result.map((row) => this.postProcessRow(row));
+        const result = await this.executeQuery(this.kysely, query, 'groupBy');
+        return result.rows.map((row) => this.postProcessRow(row));
     }
 
     private postProcessRow(row: any) {