Skip to content

Commit a4acf35

Browse files
ymc9ymc9
authored
merge dev to main (v2.12.3) (#2043)
2 parents d4fb5ab + 7632f24 commit a4acf35

File tree

27 files changed

+160
-98
lines changed

27 files changed

+160
-98
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.12.2",
3+
"version": "2.12.3",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r --filter=\"!./packages/ide/*\" build",

‎packages/ide/jetbrains/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.12.2"
12+
version = "2.12.3"
1313

1414
repositories {
1515
mavenCentral()

‎packages/ide/jetbrains/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jetbrains",
3-
"version": "2.12.2",
3+
"version": "2.12.3",
44
"displayName": "ZenStack JetBrains IDE Plugin",
55
"description": "ZenStack JetBrains IDE plugin",
66
"homepage": "https://zenstack.dev",

‎packages/language/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/language",
3-
"version": "2.12.2",
3+
"version": "2.12.3",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

‎packages/misc/redwood/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/redwood",
33
"displayName": "ZenStack RedwoodJS Integration",
4-
"version": "2.12.2",
4+
"version": "2.12.3",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

‎packages/plugins/openapi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/openapi",
33
"displayName": "ZenStack Plugin and Runtime for OpenAPI",
4-
"version": "2.12.2",
4+
"version": "2.12.3",
55
"description": "ZenStack plugin and runtime supporting OpenAPI",
66
"main": "index.js",
77
"repository": {

‎packages/plugins/swr/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/swr",
33
"displayName": "ZenStack plugin for generating SWR hooks",
4-
"version": "2.12.2",
4+
"version": "2.12.3",
55
"description": "ZenStack plugin for generating SWR hooks",
66
"main": "index.js",
77
"repository": {

‎packages/plugins/tanstack-query/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/tanstack-query",
33
"displayName": "ZenStack plugin for generating tanstack-query hooks",
4-
"version": "2.12.2",
4+
"version": "2.12.3",
55
"description": "ZenStack plugin for generating tanstack-query hooks",
66
"main": "index.js",
77
"exports": {

‎packages/plugins/trpc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/trpc",
33
"displayName": "ZenStack plugin for tRPC",
4-
"version": "2.12.2",
4+
"version": "2.12.3",
55
"description": "ZenStack plugin for tRPC",
66
"main": "index.js",
77
"repository": {

‎packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"postinstall": "nuxt prepare"
1111
},
1212
"dependencies": {
13-
"@prisma/client": "6.4.x",
13+
"@prisma/client": "6.5.x",
1414
"@trpc/client": "^10.45.2",
1515
"@trpc/server": "^10.45.2",
1616
"nuxt": "^3.14.1592",
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"esbuild": "^0.24.0",
24-
"prisma": "6.4.x",
24+
"prisma": "6.5.x",
2525
"typescript": "^5.6.2",
2626
"vue-tsc": "^2.1.10"
2727
}

‎packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"postinstall": "nuxt prepare"
1111
},
1212
"dependencies": {
13-
"@prisma/client": "6.4.x",
13+
"@prisma/client": "6.5.x",
1414
"@trpc/client": "^11.0.0-rc.563",
1515
"@trpc/server": "^11.0.0-rc.563",
1616
"nuxt": "^3.14.1592",
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"esbuild": "^0.24.0",
24-
"prisma": "6.4.x",
24+
"prisma": "6.5.x",
2525
"typescript": "^5.6.2",
2626
"vue-tsc": "^2.1.10"
2727
}

‎packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"start": "next start"
1616
},
1717
"dependencies": {
18-
"@prisma/client": "6.4.x",
18+
"@prisma/client": "6.5.x",
1919
"@t3-oss/env-nextjs": "^0.10.1",
2020
"@tanstack/react-query": "^5.50.0",
2121
"@trpc/client": "^11.0.0-rc.446",
@@ -39,7 +39,7 @@
3939
"@typescript-eslint/parser": "^8.1.0",
4040
"eslint": "^8.57.0",
4141
"eslint-config-next": "^14.2.4",
42-
"prisma": "6.4.x",
42+
"prisma": "6.5.x",
4343
"typescript": "^5.5.3"
4444
},
4545
"ct3aMetadata": {

‎packages/runtime/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/runtime",
33
"displayName": "ZenStack Runtime Library",
4-
"version": "2.12.2",
4+
"version": "2.12.3",
55
"description": "Runtime of ZenStack for both client-side and server-side environments.",
66
"repository": {
77
"type": "git",
@@ -115,7 +115,7 @@
115115
"zod-validation-error": "^1.5.0"
116116
},
117117
"peerDependencies": {
118-
"@prisma/client": "5.0.0 - 6.4.x"
118+
"@prisma/client": "5.0.0 - 6.5.x"
119119
},
120120
"author": {
121121
"name": "ZenStack Team"

‎packages/schema/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"publisher": "zenstack",
44
"displayName": "ZenStack Language Tools",
55
"description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
6-
"version": "2.12.2",
6+
"version": "2.12.3",
77
"author": {
88
"name": "ZenStack Team"
99
},
@@ -123,10 +123,10 @@
123123
"zod-validation-error": "^1.5.0"
124124
},
125125
"peerDependencies": {
126-
"prisma": "5.0.0 - 6.4.x"
126+
"prisma": "5.0.0 - 6.5.x"
127127
},
128128
"devDependencies": {
129-
"@prisma/client": "6.4.x",
129+
"@prisma/client": "6.5.x",
130130
"@types/async-exit-hook": "^2.0.0",
131131
"@types/pluralize": "^0.0.29",
132132
"@types/semver": "^7.3.13",

‎packages/schema/src/language-server/validator/attribute-application-validator.ts

+7
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@ function assignableToAttributeParam(arg: AttributeArg, param: AttributeParam, at
267267
if (dstType === 'ContextType') {
268268
// ContextType is inferred from the attribute's container's type
269269
if (isDataModelField(attr.$container)) {
270+
// If the field is Typed JSON, and the param is @default, the argument must be a string
271+
const dstIsTypedJson = hasAttribute(attr.$container, '@json');
272+
if (dstIsTypedJson && param.default) {
273+
return argResolvedType.decl === 'String';
274+
}
275+
270276
dstIsArray = attr.$container.type.array;
271277
}
272278
}
@@ -327,6 +333,7 @@ function assignableToAttributeParam(arg: AttributeArg, param: AttributeParam, at
327333
if (!attr.$container?.type?.type) {
328334
return false;
329335
}
336+
330337
dstType = mapBuiltinTypeToExpressionType(attr.$container.type.type);
331338
dstIsArray = attr.$container.type.array;
332339
} else {

‎packages/schema/src/plugins/enhancer/enhance/index.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,9 @@ export type { PrismaClient };
237237
private createLogicalPrismaEnhanceFunction(authTypeParam: string) {
238238
const prismaVersion = getPrismaVersion();
239239

240-
// Prisma 5.16.0 introduced a new generic parameter to `DynamicClientExtensionThis`
241-
const hasClientOptions = prismaVersion && semver.gte(prismaVersion, '5.16.0');
240+
// Prisma 5.16.0...6.5.0 introduced a new generic parameter to `DynamicClientExtensionThis`
241+
const hasClientOptions =
242+
prismaVersion && semver.gte(prismaVersion, '5.16.0') && semver.lt(prismaVersion, '6.5.0');
242243

243244
return `
244245
// overload for plain PrismaClient

‎packages/schema/src/plugins/zod/transformer.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ export default class Transformer {
197197
if (replaceJsonWithTypeDef) {
198198
const dmField = contextDataModel?.fields.find((f) => f.name === field.name);
199199
if (isTypeDef(dmField?.type.reference?.ref)) {
200-
alternatives = [`z.lazy(() => ${upperCaseFirst(dmField?.type.reference!.$refText)}Schema)`];
200+
const isList = dmField.type.array;
201+
const lazyStr = `z.lazy(() => ${upperCaseFirst(dmField.type.reference!.$refText)}Schema)`;
202+
alternatives = [isList ? `${lazyStr}.array()` : lazyStr];
201203
}
202204
}
203205

‎packages/sdk/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/sdk",
3-
"version": "2.12.2",
3+
"version": "2.12.3",
44
"description": "ZenStack plugin development SDK",
55
"main": "index.js",
66
"scripts": {
@@ -18,8 +18,8 @@
1818
"author": "",
1919
"license": "MIT",
2020
"dependencies": {
21-
"@prisma/generator-helper": "6.4.x",
22-
"@prisma/internals": "6.4.x",
21+
"@prisma/generator-helper": "6.5.x",
22+
"@prisma/internals": "6.5.x",
2323
"@zenstackhq/language": "workspace:*",
2424
"@zenstackhq/runtime": "workspace:*",
2525
"langium": "1.3.1",

‎packages/server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/server",
3-
"version": "2.12.2",
3+
"version": "2.12.3",
44
"displayName": "ZenStack Server-side Adapters",
55
"description": "ZenStack server-side adapters",
66
"homepage": "https://zenstack.dev",

‎packages/testtools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/testtools",
3-
"version": "2.12.2",
3+
"version": "2.12.3",
44
"description": "ZenStack Test Tools",
55
"main": "index.js",
66
"private": true,

0 commit comments

Comments
 (0)