Skip to content

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

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.

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 1 commit into from
May 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/language/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/openapi/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/react/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/trpc/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions packages/schema/src/plugins/model-meta/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions packages/schema/src/plugins/zod/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions packages/schema/tests/schema/cal-com.zmodel
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/testtools/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
6 changes: 0 additions & 6 deletions packages/testtools/src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
`;

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test-run/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions tests/integration/tests/nextjs/test-project/postgres.zmodel
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/tests/nextjs/test-project/sqlite.zmodel
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 0 additions & 6 deletions tests/integration/tests/schema/cal-com.zmodel
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 0 additions & 6 deletions tests/integration/tests/schema/todo.zmodel
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

/*
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/tests/trpc/test-project/todo.zmodel
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down