Skip to content

merge dev to main (v3.0.0-beta.17) #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2025
Merged

merge dev to main (v3.0.0-beta.17) #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cdda90
chore: bump version 3.0.0-beta.17 (#363)
github-actions[bot] Nov 4, 2025
b9294bb
fix: tsjapi esm compatibility issue (#362)
ymc9 Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/clients/tanstack-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/common-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/config/eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/config/typescript-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/typescript-config",
"version": "3.0.0-beta.16",
"version": "3.0.0-beta.17",
"private": true,
"license": "MIT"
}
2 changes: 1 addition & 1 deletion packages/config/vitest-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-zenstack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/dialects/sql.js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/language/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion packages/orm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/policy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
22 changes: 12 additions & 10 deletions packages/server/src/api/rest/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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}`),
),
},
Expand Down Expand Up @@ -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)}`),
Expand All @@ -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: {
Expand Down Expand Up @@ -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}`,
),
Expand Down
2 changes: 1 addition & 1 deletion packages/testtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/zod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion samples/next.js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion samples/orm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "e2e",
"version": "3.0.0-beta.16",
"version": "3.0.0-beta.17",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "regression",
"version": "3.0.0-beta.16",
"version": "3.0.0-beta.17",
"private": true,
"type": "module",
"scripts": {
Expand Down