Merge pull request #163 from zenstackhq/dev

ymc9 · web-flow · commit 726b826dd031 · 2025-08-13T14:32:40.000Z
merge dev to main (v3.0.0-alpha.23)
diff --git a/README.md b/README.md
@@ -351,9 +351,9 @@ db.$use({
         return {
             intercept: model === 'User',
             // load entities affected before the mutation (defaults to false)
-            loadBeforeMutationEntity: true,
+            loadBeforeMutationEntities: true,
             // load entities affected after the mutation (defaults to false)
-            loadAfterMutationEntity: true,
+            loadAfterMutationEntities: true,
         };
     },
     beforeEntityMutation({ model, action, entities }) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "ZenStack",
     "packageManager": "pnpm@10.12.1",
     "scripts": {
diff --git a/packages/cli/package.json b/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.22",
+    "version": "3.0.0-alpha.23",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/dialects/sql.js/package.json b/packages/dialects/sql.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/kysely-sql-js",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {
diff --git a/packages/runtime/src/client/executor/zenstack-query-executor.ts b/packages/runtime/src/client/executor/zenstack-query-executor.ts
@@ -72,7 +72,7 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
             const oldQueryNode = queryNode;
             if (
                 (InsertQueryNode.is(queryNode) || UpdateQueryNode.is(queryNode)) &&
-                mutationInterceptionInfo?.loadAfterMutationEntity
+                mutationInterceptionInfo?.loadAfterMutationEntities
             ) {
                 // need to make sure the query node has "returnAll"
                 // for insert and update queries
@@ -283,13 +283,13 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
                         queryNode,
                     });
                     result.intercept ||= filterResult.intercept;
-                    result.loadBeforeMutationEntity ||= filterResult.loadBeforeMutationEntity;
-                    result.loadAfterMutationEntity ||= filterResult.loadAfterMutationEntity;
+                    result.loadBeforeMutationEntities ||= filterResult.loadBeforeMutationEntities;
+                    result.loadAfterMutationEntities ||= filterResult.loadAfterMutationEntities;
                 }
             }
 
             let beforeMutationEntities: Record<string, unknown>[] | undefined;
-            if (result.loadBeforeMutationEntity && (UpdateQueryNode.is(queryNode) || DeleteQueryNode.is(queryNode))) {
+            if (result.loadBeforeMutationEntities && (UpdateQueryNode.is(queryNode) || DeleteQueryNode.is(queryNode))) {
                 beforeMutationEntities = await this.loadEntities(mutationModel, where);
             }
 
@@ -354,7 +354,7 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
 
         for (const hook of hooks) {
             let afterMutationEntities: Record<string, unknown>[] | undefined = undefined;
-            if (mutationInterceptionInfo.loadAfterMutationEntity) {
+            if (mutationInterceptionInfo.loadAfterMutationEntities) {
                 if (InsertQueryNode.is(queryNode) || UpdateQueryNode.is(queryNode)) {
                     afterMutationEntities = queryResult.rows as Record<string, unknown>[];
                 }
diff --git a/packages/runtime/src/client/plugin.ts b/packages/runtime/src/client/plugin.ts
@@ -39,12 +39,12 @@ export type MutationInterceptionFilterResult = {
     /**
      * Whether entities should be loaded before the mutation.
      */
-    loadBeforeMutationEntity?: boolean;
+    loadBeforeMutationEntities?: boolean;
 
     /**
      * Whether entities should be loaded after the mutation.
      */
-    loadAfterMutationEntity?: boolean;
+    loadAfterMutationEntities?: boolean;
 };
 
 type MutationHooksArgs<Schema extends SchemaDef> = {
@@ -149,16 +149,16 @@ export interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
 
     /**
      * Called before an entity is mutated.
-     * @param args.entity Only available if `loadBeforeMutationEntity` is set to true in the
+     * @param args.entity Only available if `loadBeforeMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     beforeEntityMutation?: BeforeEntityMutationCallback<Schema>;
 
     /**
      * Called after an entity is mutated.
-     * @param args.beforeMutationEntity Only available if `loadBeforeMutationEntity` is set to true in the
+     * @param args.beforeMutationEntity Only available if `loadBeforeMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
-     * @param args.afterMutationEntity Only available if `loadAfterMutationEntity` is set to true in the
+     * @param args.afterMutationEntity Only available if `loadAfterMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     afterEntityMutation?: AfterEntityMutationCallback<Schema>;
diff --git a/packages/runtime/test/plugin/mutation-hooks.test.ts b/packages/runtime/test/plugin/mutation-hooks.test.ts
@@ -112,7 +112,7 @@ describe('Entity  lifecycle tests', () => {
             mutationInterceptionFilter: () => {
                 return {
                     intercept: true,
-                    loadBeforeMutationEntity: true,
+                    loadBeforeMutationEntities: true,
                 };
             },
             beforeEntityMutation(args) {
@@ -159,7 +159,7 @@ describe('Entity  lifecycle tests', () => {
             mutationInterceptionFilter: () => {
                 return {
                     intercept: true,
-                    loadAfterMutationEntity: true,
+                    loadAfterMutationEntities: true,
                 };
             },
             afterEntityMutation(args) {
@@ -205,7 +205,7 @@ describe('Entity  lifecycle tests', () => {
             mutationInterceptionFilter: () => {
                 return {
                     intercept: true,
-                    loadAfterMutationEntity: true,
+                    loadAfterMutationEntities: true,
                 };
             },
             afterEntityMutation(args) {
@@ -263,7 +263,7 @@ describe('Entity  lifecycle tests', () => {
             mutationInterceptionFilter: (args) => {
                 return {
                     intercept: args.action === 'create' || args.action === 'update',
-                    loadAfterMutationEntity: true,
+                    loadAfterMutationEntities: true,
                 };
             },
             afterEntityMutation(args) {
@@ -350,8 +350,8 @@ describe('Entity  lifecycle tests', () => {
             mutationInterceptionFilter: () => {
                 return {
                     intercept: true,
-                    loadBeforeMutationEntity: true,
-                    loadAfterMutationEntity: true,
+                    loadBeforeMutationEntities: true,
+                    loadAfterMutationEntities: true,
                 };
             },
             afterEntityMutation(args) {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "",
     "main": "index.js",
     "type": "module",
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/vitest-config/package.json b/packages/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/samples/blog/package.json b/samples/blog/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "description": "",
     "main": "index.js",
     "scripts": {
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.0.0-alpha.22",
+    "version": "3.0.0-alpha.23",
     "private": true,
     "type": "module",
     "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`		`- "version": "3.0.0-alpha.22",`
	`3`	`+ "version": "3.0.0-alpha.23",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "[email protected]",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/common-helpers",`
`3`		`- "version": "3.0.0-alpha.22",`
	`3`	`+ "version": "3.0.0-alpha.23",`
`4`	`4`	`"description": "ZenStack Common Helpers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-zenstack",`
`3`		`- "version": "3.0.0-alpha.22",`
	`3`	`+ "version": "3.0.0-alpha.23",`
`4`	`4`	`"description": "Create a new ZenStack project",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/kysely-sql-js",`
`3`		`- "version": "3.0.0-alpha.22",`
	`3`	`+ "version": "3.0.0-alpha.23",`
`4`	`4`	`"description": "Kysely dialect for sql.js",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-alpha.22",`
	`3`	`+ "version": "3.0.0-alpha.23",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack",`
`3`	`3`	`"publisher": "zenstack",`
`4`		`- "version": "3.0.0-alpha.22",`
	`4`	`+ "version": "3.0.0-alpha.23",`
`5`	`5`	`"displayName": "ZenStack Language Tools",`
`6`	`6`	`"description": "VSCode extension for ZenStack ZModel language",`
`7`	`7`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`	`3`	`"description": "ZenStack ZModel language specification",`
`4`		`- "version": "3.0.0-alpha.22",`
	`4`	`+ "version": "3.0.0-alpha.23",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "ZenStack Team",`
`7`	`7`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/runtime",`
`3`		`- "version": "3.0.0-alpha.22",`
	`3`	`+ "version": "3.0.0-alpha.23",`
`4`	`4`	`"description": "ZenStack Runtime",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`