From a0ce48546c4f770120a1e5d44df48f483b8cdb95 Mon Sep 17 00:00:00 2001 From: Yiming Date: Sun, 31 Mar 2024 13:43:29 -0700 Subject: [PATCH 1/3] chore: include nuxt sample in github CI update (#1202) --- .github/workflows/update-samples.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-samples.yml b/.github/workflows/update-samples.yml index 4fd474843..4cc0216df 100644 --- a/.github/workflows/update-samples.yml +++ b/.github/workflows/update-samples.yml @@ -16,6 +16,7 @@ jobs: 'zenstackhq/sample-todo-nextjs-tanstack', 'zenstackhq/sample-todo-trpc', 'zenstackhq/sample-todo-sveltekit', + 'zenstackhq/sample-todo-nuxt', ] steps: From 7d2114f97fef16f21597398382a2ac3762076b35 Mon Sep 17 00:00:00 2001 From: Saksham Goyal Date: Tue, 2 Apr 2024 17:08:08 -0400 Subject: [PATCH 2/3] fix @db.Uuid (corrected) (#1207) Co-authored-by: ymc9 <104139426+ymc9@users.noreply.github.com> --- packages/schema/src/plugins/zod/utils/schema-gen.ts | 4 ++++ tests/integration/tests/plugins/zod.test.ts | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/packages/schema/src/plugins/zod/utils/schema-gen.ts b/packages/schema/src/plugins/zod/utils/schema-gen.ts index a13a316b4..c660ad606 100644 --- a/packages/schema/src/plugins/zod/utils/schema-gen.ts +++ b/packages/schema/src/plugins/zod/utils/schema-gen.ts @@ -102,6 +102,10 @@ export function makeFieldSchema(field: DataModelField, respectDefault = false) { schema += `.toUpperCase()`; break; } + case '@db.Uuid': { + schema += `.uuid()`; + break; + } case '@datetime': { schema += `.datetime({ offset: true${message ? ', message: ' + JSON.stringify(message) : ''} })`; break; diff --git a/tests/integration/tests/plugins/zod.test.ts b/tests/integration/tests/plugins/zod.test.ts index dd82f6786..d27d2bb45 100644 --- a/tests/integration/tests/plugins/zod.test.ts +++ b/tests/integration/tests/plugins/zod.test.ts @@ -2,6 +2,7 @@ /// import { loadSchema } from '@zenstackhq/testtools'; +import { randomUUID } from 'crypto'; import fs from 'fs'; import path from 'path'; @@ -235,6 +236,7 @@ describe('Zod plugin tests', () => { o Int? @lt(1, 'must be less than 1') p Int? @lte(1, 'must be less than or equal to 1') q Int[] + r String? @db.Uuid } `; @@ -295,6 +297,9 @@ describe('Zod plugin tests', () => { expect(schema.safeParse({ q: [1] }).success).toBeTruthy(); expect(schema.safeParse({ q: ['abc'] }).success).toBeFalsy(); + + expect(schema.safeParse({ r: 'abc' }).success).toBeFalsy(); + expect(schema.safeParse({ r: randomUUID() }).success).toBeTruthy(); }); it('refinement scalar fields', async () => { From e3fb73ab5a54a51170e9f9c7f13e9d6384dacce1 Mon Sep 17 00:00:00 2001 From: Yiming Date: Sun, 7 Apr 2024 09:24:21 +0800 Subject: [PATCH 3/3] chore: bump version (#1219) --- package.json | 2 +- packages/ide/jetbrains/build.gradle.kts | 2 +- packages/ide/jetbrains/package.json | 2 +- packages/language/package.json | 2 +- packages/misc/redwood/package.json | 2 +- packages/plugins/openapi/package.json | 2 +- packages/plugins/swr/package.json | 2 +- packages/plugins/tanstack-query/package.json | 2 +- packages/plugins/trpc/package.json | 2 +- packages/runtime/package.json | 2 +- packages/schema/package.json | 2 +- packages/sdk/package.json | 2 +- packages/server/package.json | 2 +- packages/testtools/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 686c94f72..210b3bc26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zenstack-monorepo", - "version": "1.12.0", + "version": "1.12.1", "description": "", "scripts": { "build": "pnpm -r build", diff --git a/packages/ide/jetbrains/build.gradle.kts b/packages/ide/jetbrains/build.gradle.kts index a24b3cb4a..657247bbb 100644 --- a/packages/ide/jetbrains/build.gradle.kts +++ b/packages/ide/jetbrains/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "dev.zenstack" -version = "1.12.0" +version = "1.12.1" repositories { mavenCentral() diff --git a/packages/ide/jetbrains/package.json b/packages/ide/jetbrains/package.json index bca28240f..6b0f54ce6 100644 --- a/packages/ide/jetbrains/package.json +++ b/packages/ide/jetbrains/package.json @@ -1,6 +1,6 @@ { "name": "jetbrains", - "version": "1.12.0", + "version": "1.12.1", "displayName": "ZenStack JetBrains IDE Plugin", "description": "ZenStack JetBrains IDE plugin", "homepage": "https://zenstack.dev", diff --git a/packages/language/package.json b/packages/language/package.json index b26a5badd..a67823340 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/language", - "version": "1.12.0", + "version": "1.12.1", "displayName": "ZenStack modeling language compiler", "description": "ZenStack modeling language compiler", "homepage": "https://zenstack.dev", diff --git a/packages/misc/redwood/package.json b/packages/misc/redwood/package.json index 64126d931..dc1ae4fa4 100644 --- a/packages/misc/redwood/package.json +++ b/packages/misc/redwood/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/redwood", "displayName": "ZenStack RedwoodJS Integration", - "version": "1.12.0", + "version": "1.12.1", "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.", "repository": { "type": "git", diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json index 67717aeca..1e9601db0 100644 --- a/packages/plugins/openapi/package.json +++ b/packages/plugins/openapi/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/openapi", "displayName": "ZenStack Plugin and Runtime for OpenAPI", - "version": "1.12.0", + "version": "1.12.1", "description": "ZenStack plugin and runtime supporting OpenAPI", "main": "index.js", "repository": { diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json index 4612e4040..1f2117dfa 100644 --- a/packages/plugins/swr/package.json +++ b/packages/plugins/swr/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/swr", "displayName": "ZenStack plugin for generating SWR hooks", - "version": "1.12.0", + "version": "1.12.1", "description": "ZenStack plugin for generating SWR hooks", "main": "index.js", "repository": { diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json index de3a02ce7..b7ba53b4b 100644 --- a/packages/plugins/tanstack-query/package.json +++ b/packages/plugins/tanstack-query/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/tanstack-query", "displayName": "ZenStack plugin for generating tanstack-query hooks", - "version": "1.12.0", + "version": "1.12.1", "description": "ZenStack plugin for generating tanstack-query hooks", "main": "index.js", "exports": { diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json index 51c93d85b..a1fd04eb6 100644 --- a/packages/plugins/trpc/package.json +++ b/packages/plugins/trpc/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/trpc", "displayName": "ZenStack plugin for tRPC", - "version": "1.12.0", + "version": "1.12.1", "description": "ZenStack plugin for tRPC", "main": "index.js", "repository": { diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 24d24178c..6914796a1 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/runtime", "displayName": "ZenStack Runtime Library", - "version": "1.12.0", + "version": "1.12.1", "description": "Runtime of ZenStack for both client-side and server-side environments.", "repository": { "type": "git", diff --git a/packages/schema/package.json b/packages/schema/package.json index b7d284889..78f016aec 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -3,7 +3,7 @@ "publisher": "zenstack", "displayName": "ZenStack Language Tools", "description": "Build scalable web apps with minimum code by defining authorization and validation rules inside the data schema that closer to the database", - "version": "1.12.0", + "version": "1.12.1", "author": { "name": "ZenStack Team" }, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 992604f8a..f6608efb3 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/sdk", - "version": "1.12.0", + "version": "1.12.1", "description": "ZenStack plugin development SDK", "main": "index.js", "scripts": { diff --git a/packages/server/package.json b/packages/server/package.json index 13891e920..24d3c0b47 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/server", - "version": "1.12.0", + "version": "1.12.1", "displayName": "ZenStack Server-side Adapters", "description": "ZenStack server-side adapters", "homepage": "https://zenstack.dev", diff --git a/packages/testtools/package.json b/packages/testtools/package.json index 1acb82f59..5ddfc0fe7 100644 --- a/packages/testtools/package.json +++ b/packages/testtools/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/testtools", - "version": "1.12.0", + "version": "1.12.1", "description": "ZenStack Test Tools", "main": "index.js", "private": true,