fix: make core plugins compile generated ts files by default (#373)

ymc9 · web-flow · commit 4bf1304c6518 · 2023-05-01T10:28:22.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-monorepo",`
`3`		`- "version": "1.0.0-alpha.111",`
	`3`	`+ "version": "1.0.0-alpha.112",`
`4`	`4`	`"description": "",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "pnpm -r build",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`		`- "version": "1.0.0-alpha.111",`
	`3`	`+ "version": "1.0.0-alpha.112",`
`4`	`4`	`"displayName": "ZenStack modeling language compiler",`
`5`	`5`	`"description": "ZenStack modeling language compiler",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/next",`
`3`		`- "version": "1.0.0-alpha.111",`
	`3`	`+ "version": "1.0.0-alpha.112",`
`4`	`4`	`"displayName": "ZenStack Next.js integration",`
`5`	`5`	`"description": "ZenStack Next.js integration",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/openapi",`
`3`	`3`	`"displayName": "ZenStack Plugin and Runtime for OpenAPI",`
`4`		`- "version": "1.0.0-alpha.111",`
	`4`	`+ "version": "1.0.0-alpha.112",`
`5`	`5`	`"description": "ZenStack plugin and runtime supporting OpenAPI",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/react",`
`3`	`3`	`"displayName": "ZenStack plugin and runtime for ReactJS",`
`4`		`- "version": "1.0.0-alpha.111",`
	`4`	`+ "version": "1.0.0-alpha.112",`
`5`	`5`	`"description": "ZenStack plugin and runtime for ReactJS",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/trpc",`
`3`	`3`	`"displayName": "ZenStack plugin for tRPC",`
`4`		`- "version": "1.0.0-alpha.111",`
	`4`	`+ "version": "1.0.0-alpha.112",`
`5`	`5`	`"description": "ZenStack plugin for tRPC",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/runtime",`
`3`	`3`	`"displayName": "ZenStack Runtime Library",`
`4`		`- "version": "1.0.0-alpha.111",`
	`4`	`+ "version": "1.0.0-alpha.112",`
`5`	`5`	`"description": "Runtime of ZenStack for both client-side and server-side environments.",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`