From 53b3c4290b3027928567d1cc18c123f34d597a46 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Mon, 1 May 2023 09:57:38 -0700 Subject: [PATCH] fix: make core plugins compile generated ts files by default --- package.json | 2 +- packages/language/package.json | 2 +- packages/next/package.json | 2 +- packages/plugins/openapi/package.json | 2 +- packages/plugins/react/package.json | 2 +- packages/plugins/trpc/package.json | 2 +- packages/runtime/package.json | 2 +- packages/schema/package.json | 2 +- .../src/plugins/access-policy/policy-guard-generator.ts | 3 +-- packages/schema/src/plugins/model-meta/index.ts | 3 +-- packages/schema/src/plugins/zod/generator.ts | 3 +-- packages/schema/tests/schema/cal-com.zmodel | 4 ---- packages/sdk/package.json | 2 +- packages/server/package.json | 2 +- packages/testtools/package.json | 2 +- packages/testtools/src/schema.ts | 6 ------ tests/integration/test-run/package-lock.json | 4 ++-- tests/integration/tests/nextjs/test-project/postgres.zmodel | 4 ---- tests/integration/tests/nextjs/test-project/sqlite.zmodel | 4 ---- tests/integration/tests/schema/cal-com.zmodel | 6 ------ tests/integration/tests/schema/todo.zmodel | 6 ------ tests/integration/tests/trpc/test-project/todo.zmodel | 4 ---- 22 files changed, 16 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 18f28bd3e..3f8f59a91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zenstack-monorepo", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "description": "", "scripts": { "build": "pnpm -r build", diff --git a/packages/language/package.json b/packages/language/package.json index 08437ad08..cb38faa65 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/language", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "displayName": "ZenStack modeling language compiler", "description": "ZenStack modeling language compiler", "homepage": "https://zenstack.dev", diff --git a/packages/next/package.json b/packages/next/package.json index ff5f2d7c0..45467ec7d 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/next", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "displayName": "ZenStack Next.js integration", "description": "ZenStack Next.js integration", "homepage": "https://zenstack.dev", diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json index a266fd8ee..f796dd14f 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.0.0-alpha.111", + "version": "1.0.0-alpha.112", "description": "ZenStack plugin and runtime supporting OpenAPI", "main": "index.js", "repository": { diff --git a/packages/plugins/react/package.json b/packages/plugins/react/package.json index 77f31cd6c..4c8e8f80a 100644 --- a/packages/plugins/react/package.json +++ b/packages/plugins/react/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/react", "displayName": "ZenStack plugin and runtime for ReactJS", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "description": "ZenStack plugin and runtime for ReactJS", "main": "index.js", "repository": { diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json index 8470a62bb..719c8c83b 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.0.0-alpha.111", + "version": "1.0.0-alpha.112", "description": "ZenStack plugin for tRPC", "main": "index.js", "repository": { diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 5846f1ce7..a902a5654 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/runtime", "displayName": "ZenStack Runtime Library", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "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 e9e37bfb9..b4b3806d9 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -3,7 +3,7 @@ "publisher": "zenstack", "displayName": "ZenStack Language Tools", "description": "A toolkit for building secure CRUD apps with Next.js + Typescript", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "author": { "name": "ZenStack Team" }, diff --git a/packages/schema/src/plugins/access-policy/policy-guard-generator.ts b/packages/schema/src/plugins/access-policy/policy-guard-generator.ts index 62079cef0..31274dd13 100644 --- a/packages/schema/src/plugins/access-policy/policy-guard-generator.ts +++ b/packages/schema/src/plugins/access-policy/policy-guard-generator.ts @@ -123,8 +123,7 @@ export default class PolicyGenerator { sf.addStatements('export default policy'); - // emit if generated into standard location or compilation is forced - const shouldCompile = !options.output || options.compile === true; + const shouldCompile = options.compile !== false; if (!shouldCompile || options.preserveTsFiles === true) { // save ts files await saveProject(project); diff --git a/packages/schema/src/plugins/model-meta/index.ts b/packages/schema/src/plugins/model-meta/index.ts index 61a539e78..2d65224bf 100644 --- a/packages/schema/src/plugins/model-meta/index.ts +++ b/packages/schema/src/plugins/model-meta/index.ts @@ -50,8 +50,7 @@ export default async function run(model: Model, options: PluginOptions) { }); sf.addStatements('export default metadata;'); - // emit if generated into standard location or compilation is forced - const shouldCompile = !options.output || options.compile === true; + const shouldCompile = options.compile !== false; if (!shouldCompile || options.preserveTsFiles === true) { // save ts files await saveProject(project); diff --git a/packages/schema/src/plugins/zod/generator.ts b/packages/schema/src/plugins/zod/generator.ts index 310f78918..0f8ba70a8 100644 --- a/packages/schema/src/plugins/zod/generator.ts +++ b/packages/schema/src/plugins/zod/generator.ts @@ -59,8 +59,7 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF. await generateObjectSchemas(inputObjectTypes, project, output); await generateModelSchemas(models, modelOperations, aggregateOperationSupport, project); - // emit if generated into standard location or compilation is forced - const shouldCompile = !options.output || options.compile === true; + const shouldCompile = options.compile !== false; if (!shouldCompile || options.preserveTsFiles === true) { // save ts files await saveProject(project); diff --git a/packages/schema/tests/schema/cal-com.zmodel b/packages/schema/tests/schema/cal-com.zmodel index 15025f0ef..c6e874304 100644 --- a/packages/schema/tests/schema/cal-com.zmodel +++ b/packages/schema/tests/schema/cal-com.zmodel @@ -14,15 +14,11 @@ generator client { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } enum SchedulingType { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4e9d0f9b0..1fe8e20b4 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/sdk", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "description": "ZenStack plugin development SDK", "main": "index.js", "scripts": { diff --git a/packages/server/package.json b/packages/server/package.json index 396838550..1914bd143 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/server", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "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 eb07ba3ac..b92305198 100644 --- a/packages/testtools/package.json +++ b/packages/testtools/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/testtools", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "description": "ZenStack Test Tools", "main": "index.js", "publishConfig": { diff --git a/packages/testtools/src/schema.ts b/packages/testtools/src/schema.ts index 40271f069..82f91b06d 100644 --- a/packages/testtools/src/schema.ts +++ b/packages/testtools/src/schema.ts @@ -69,22 +69,16 @@ generator js { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin zod { provider = '@core/zod' output = '.zenstack/zod' - compile = true - preserveTsFiles = true } `; diff --git a/tests/integration/test-run/package-lock.json b/tests/integration/test-run/package-lock.json index f6310c5f8..d93b7a941 100644 --- a/tests/integration/test-run/package-lock.json +++ b/tests/integration/test-run/package-lock.json @@ -126,7 +126,7 @@ }, "../../../packages/runtime/dist": { "name": "@zenstackhq/runtime", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "license": "MIT", "dependencies": { "@paralleldrive/cuid2": "^2.2.0", @@ -158,7 +158,7 @@ }, "../../../packages/schema/dist": { "name": "zenstack", - "version": "1.0.0-alpha.111", + "version": "1.0.0-alpha.112", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/tests/integration/tests/nextjs/test-project/postgres.zmodel b/tests/integration/tests/nextjs/test-project/postgres.zmodel index ea755a92b..d0de3e795 100644 --- a/tests/integration/tests/nextjs/test-project/postgres.zmodel +++ b/tests/integration/tests/nextjs/test-project/postgres.zmodel @@ -10,15 +10,11 @@ generator js { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin react { diff --git a/tests/integration/tests/nextjs/test-project/sqlite.zmodel b/tests/integration/tests/nextjs/test-project/sqlite.zmodel index 7d91e20cf..d69c28c89 100644 --- a/tests/integration/tests/nextjs/test-project/sqlite.zmodel +++ b/tests/integration/tests/nextjs/test-project/sqlite.zmodel @@ -10,15 +10,11 @@ generator js { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin react { diff --git a/tests/integration/tests/schema/cal-com.zmodel b/tests/integration/tests/schema/cal-com.zmodel index 4e48b3102..583fd14ab 100644 --- a/tests/integration/tests/schema/cal-com.zmodel +++ b/tests/integration/tests/schema/cal-com.zmodel @@ -14,22 +14,16 @@ generator client { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin zod { provider = '@core/zod' output = '.zenstack/zod' - compile = true - preserveTsFiles = true } enum SchedulingType { diff --git a/tests/integration/tests/schema/todo.zmodel b/tests/integration/tests/schema/todo.zmodel index 5c8eab6ad..eac571be3 100644 --- a/tests/integration/tests/schema/todo.zmodel +++ b/tests/integration/tests/schema/todo.zmodel @@ -15,22 +15,16 @@ generator js { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin zod { provider = '@core/zod' output = '.zenstack/zod' - compile = true - preserveTsFiles = true } /* diff --git a/tests/integration/tests/trpc/test-project/todo.zmodel b/tests/integration/tests/trpc/test-project/todo.zmodel index 04c997427..4ad089642 100644 --- a/tests/integration/tests/trpc/test-project/todo.zmodel +++ b/tests/integration/tests/trpc/test-project/todo.zmodel @@ -10,15 +10,11 @@ generator js { plugin meta { provider = '@core/model-meta' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin policy { provider = '@core/access-policy' output = '.zenstack' - compile = true - preserveTsFiles = true } plugin trpc {