Merge pull request #364 from zenstackhq/dev

ymc9 · web-flow · commit 25041d26950b · 2025-11-04T21:31:08.000Z
merge dev to main (v3.0.0-beta.17)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack",
     "packageManager": "pnpm@10.20.0",
     "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-beta.16",
+    "version": "3.0.0-beta.17",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
@@ -1,10 +1,9 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "main": "index.js",
     "type": "module",
-    "private": true,
     "scripts": {
         "build": "tsc --noEmit && tsup-node && pnpm test:generate && pnpm test:typecheck",
         "watch": "tsup-node --watch",
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-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/config/vitest-config/package.json b/packages/config/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "private": true,
     "license": "MIT",
     "exports": {
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-beta.16",
+    "version": "3.0.0-beta.17",
     "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-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {
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-beta.16",
+    "version": "3.0.0-beta.17",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/orm/package.json b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {
diff --git a/packages/server/src/api/rest/index.ts b/packages/server/src/api/rest/index.ts
@@ -10,7 +10,7 @@ import {
 import type { FieldDef, ModelDef, SchemaDef } from '@zenstackhq/orm/schema';
 import { Decimal } from 'decimal.js';
 import SuperJSON from 'superjson';
-import { Linker, Paginator, Relator, Serializer, type SerializerOptions } from 'ts-japi';
+import tsjapi, { type Linker, type Paginator, type Relator, type Serializer, type SerializerOptions } from 'ts-japi';
 import UrlPattern from 'url-pattern';
 import z from 'zod';
 import type { ApiHandler, LogConfig, RequestContext, Response } from '../../types';
@@ -610,7 +610,9 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
                 status: 200,
                 body: await this.serializeItems(relationInfo.type, entity[relationship], {
                     linkers: {
-                        document: new Linker(() => this.makeLinkUrl(`/${mappedType}/${resourceId}/${relationship}`)),
+                        document: new tsjapi.Linker(() =>
+                            this.makeLinkUrl(`/${mappedType}/${resourceId}/${relationship}`),
+                        ),
                         paginator,
                     },
                     include,
@@ -670,7 +672,7 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
         if (entity?.[relationship]) {
             const serialized: any = await this.serializeItems(relationInfo.type, entity[relationship], {
                 linkers: {
-                    document: new Linker(() =>
+                    document: new tsjapi.Linker(() =>
                         this.makeLinkUrl(`/${mappedType}/${resourceId}/relationships/${relationship}`),
                     ),
                     paginator,
@@ -827,7 +829,7 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
 
         const totalPages = Math.ceil(total / limit);
 
-        return new Paginator(() => ({
+        return new tsjapi.Paginator(() => ({
             first: this.replaceURLSearchParams(baseUrl, { 'page[limit]': limit }),
             last: this.replaceURLSearchParams(baseUrl, {
                 'page[offset]': (totalPages - 1) * limit,
@@ -1110,7 +1112,7 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
 
         const serialized: any = await this.serializeItems(relationInfo.type, entity[relationship], {
             linkers: {
-                document: new Linker(() =>
+                document: new tsjapi.Linker(() =>
                     this.makeLinkUrl(`/${mappedType}/${resourceId}/relationships/${relationship}`),
                 ),
             },
@@ -1308,7 +1310,7 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
                 continue;
             }
 
-            const linker = new Linker((items) =>
+            const linker = new tsjapi.Linker((items) =>
                 Array.isArray(items)
                     ? this.makeLinkUrl(`/${mappedModel}`)
                     : this.makeLinkUrl(`/${mappedModel}/${this.getId(model, items)}`),
@@ -1326,7 +1328,7 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
                 projection = null;
             }
 
-            const serializer = new Serializer(model, {
+            const serializer = new tsjapi.Serializer(model, {
                 version: '1.1',
                 idKey: this.makeIdKey(ids),
                 linkers: {
@@ -1360,18 +1362,18 @@ export class RestApiHandler<Schema extends SchemaDef> implements ApiHandler<Sche
                 if (fieldIds.length > 0) {
                     const mappedModel = this.mapModelName(modelLower);
 
-                    const relator = new Relator(
+                    const relator = new tsjapi.Relator(
                         async (data) => {
                             return (data as any)[field];
                         },
                         fieldSerializer,
                         {
                             relatedName: field,
                             linkers: {
-                                related: new Linker((primary) =>
+                                related: new tsjapi.Linker((primary) =>
                                     this.makeLinkUrl(`/${mappedModel}/${this.getId(model, primary)}/${field}`),
                                 ),
-                                relationship: new Linker((primary) =>
+                                relationship: new tsjapi.Linker((primary) =>
                                     this.makeLinkUrl(
                                         `/${mappedModel}/${this.getId(model, primary)}/relationships/${field}`,
                                     ),
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/samples/next.js/package.json b/samples/next.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "next.js",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "private": true,
     "scripts": {
         "generate": "zen generate --lite",
diff --git a/samples/orm/package.json b/samples/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "description": "",
     "main": "index.js",
     "private": true,
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/package.json b/tests/regression/package.json
@@ -1,6 +1,6 @@
 {
     "name": "regression",
-    "version": "3.0.0-beta.16",
+    "version": "3.0.0-beta.17",
     "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-beta.16",`
	`3`	`+ "version": "3.0.0-beta.17",`
`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-beta.16",`
	`3`	`+ "version": "3.0.0-beta.17",`
`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": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-beta.16",`
	`3`	`+ "version": "3.0.0-beta.17",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/typescript-config",`
`3`		`- "version": "3.0.0-beta.16",`
	`3`	`+ "version": "3.0.0-beta.17",`
`4`	`4`	`"private": true,`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/vitest-config",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "3.0.0-beta.16",`
	`4`	`+ "version": "3.0.0-beta.17",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"exports": {`
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-beta.16",`
	`3`	`+ "version": "3.0.0-beta.17",`
`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-beta.16",`
	`3`	`+ "version": "3.0.0-beta.17",`
`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,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`	`3`	`"description": "ZenStack ZModel language specification",`
`4`		`- "version": "3.0.0-beta.16",`
	`4`	`+ "version": "3.0.0-beta.17",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "ZenStack Team",`
`7`	`7`	`"files": [`