refactor: merge core plugins

CONTRIBUTING.md

@@ -63,7 +63,7 @@ The ZModel language's definition, including its syntax definition and parser/lin
 
 ### `schema`
 
-The `zenstack` CLI and ZModel VSCode extension implementation. The package also contains several built-in plugins: `@core/prisma`, `@core/model-meta`, `@core/access-policy`, and `core/zod`.
+The `zenstack` CLI and ZModel VSCode extension implementation. The package also contains several built-in plugins: `@core/prisma`, `@core/enhancer`, and `core/zod`.
 
 ### `runtime`
 

packages/plugins/openapi/src/generator-base.ts

@@ -2,9 +2,10 @@ import type { DMMF } from '@prisma/generator-helper';
 import { PluginError, PluginOptions, getDataModels, hasAttribute } from '@zenstackhq/sdk';
 import { Model } from '@zenstackhq/sdk/ast';
 import type { OpenAPIV3_1 as OAPI } from 'openapi-types';
+import semver from 'semver';
 import { fromZodError } from 'zod-validation-error';
+import { name } from '.';
 import { SecuritySchemesSchema } from './schema';
-import semver from 'semver';
 
 export abstract class OpenAPIGeneratorBase {
     protected readonly DEFAULT_SPEC_VERSION = '3.1.0';
@@ -91,10 +92,7 @@ export abstract class OpenAPIGeneratorBase {
         if (securitySchemes) {
             const parsed = SecuritySchemesSchema.safeParse(securitySchemes);
             if (!parsed.success) {
-                throw new PluginError(
-                    this.options.name,
-                    `"securitySchemes" option is invalid: ${fromZodError(parsed.error)}`
-                );
+                throw new PluginError(name, `"securitySchemes" option is invalid: ${fromZodError(parsed.error)}`);
             }
             return parsed.data;
         }

packages/plugins/openapi/src/rpc-generator.ts

@@ -721,7 +721,7 @@ export class RPCOpenAPIGenerator extends OpenAPIGeneratorBase {
                 return this.wrapArray(this.wrapNullable(this.ref(def.type, false), !def.isRequired), def.isList);
 
             default:
-                throw new PluginError(this.options.name, `Unsupported field kind: ${def.kind}`);
+                throw new PluginError(name, `Unsupported field kind: ${def.kind}`);
         }
     }
 

packages/plugins/swr/src/generator.ts

@@ -38,8 +38,6 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.
 
     await generateModelMeta(project, models, {
         output: path.join(outDir, '__model_meta.ts'),
-        compile: false,
-        preserveTsFiles: true,
         generateAttributes: false,
     });
 

packages/plugins/swr/tests/swr.test.ts

@@ -59,7 +59,12 @@ ${sharedModel}
             {
                 provider: 'postgresql',
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, 'react@18.2.0', '@types/react@18.2.0', 'swr@^2'],
+                extraDependencies: [
+                    path.resolve(__dirname, '../dist'),
+                    'react@18.2.0',
+                    '@types/react@18.2.0',
+                    'swr@^2',
+                ],
                 compile: true,
             }
         );

packages/plugins/tanstack-query/src/generator.ts

@@ -34,21 +34,16 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.
 
     const target = requireOption<string>(options, 'target', name);
     if (!supportedTargets.includes(target)) {
-        throw new PluginError(
-            options.name,
-            `Unsupported target "${target}", supported values: ${supportedTargets.join(', ')}`
-        );
+        throw new PluginError(name, `Unsupported target "${target}", supported values: ${supportedTargets.join(', ')}`);
     }
 
     const version = typeof options.version === 'string' ? options.version : 'v4';
     if (version !== 'v4' && version !== 'v5') {
-        throw new PluginError(options.name, `Unsupported version "${version}": use "v4" or "v5"`);
+        throw new PluginError(name, `Unsupported version "${version}": use "v4" or "v5"`);
     }
 
     await generateModelMeta(project, models, {
         output: path.join(outDir, '__model_meta.ts'),
-        compile: false,
-        preserveTsFiles: true,
         generateAttributes: false,
     });
 

packages/plugins/tanstack-query/tests/plugin.test.ts

@@ -61,7 +61,7 @@ ${sharedModel}
                 provider: 'postgresql',
                 pushDb: false,
                 extraDependencies: ['react@18.2.0', '@types/react@18.2.0', '@tanstack/react-query@4.29.7'],
-                copyDependencies: [`${origDir}/dist`],
+                copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,
             }
         );
@@ -83,7 +83,7 @@ ${sharedModel}
                 provider: 'postgresql',
                 pushDb: false,
                 extraDependencies: ['react@18.2.0', '@types/react@18.2.0', '@tanstack/react-query@^5.0.0'],
-                copyDependencies: [`${origDir}/dist`],
+                copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,
             }
         );
@@ -104,7 +104,7 @@ ${sharedModel}
                 provider: 'postgresql',
                 pushDb: false,
                 extraDependencies: ['vue@^3.3.4', '@tanstack/vue-query@4.37.0'],
-                copyDependencies: [`${origDir}/dist`],
+                copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,
             }
         );
@@ -126,7 +126,7 @@ ${sharedModel}
                 provider: 'postgresql',
                 pushDb: false,
                 extraDependencies: ['vue@^3.3.4', '@tanstack/vue-query@latest'],
-                copyDependencies: [`${origDir}/dist`],
+                copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,
             }
         );
@@ -147,7 +147,7 @@ ${sharedModel}
                 provider: 'postgresql',
                 pushDb: false,
                 extraDependencies: ['svelte@^3.0.0', '@tanstack/svelte-query@4.29.7'],
-                copyDependencies: [`${origDir}/dist`],
+                copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,
             }
         );
@@ -169,7 +169,7 @@ ${sharedModel}
                 provider: 'postgresql',
                 pushDb: false,
                 extraDependencies: ['svelte@^3.0.0', '@tanstack/svelte-query@^5.0.0'],
-                copyDependencies: [`${origDir}/dist`],
+                copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,
             }
         );

packages/plugins/trpc/tests/trpc.test.ts

@@ -56,7 +56,7 @@ model Foo {
             {
                 provider: 'postgresql',
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
                 fullZod: true,
             }
@@ -98,7 +98,7 @@ model Foo {
         `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
                 fullZod: true,
             }
@@ -128,7 +128,7 @@ model Post {
         `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
                 fullZod: true,
                 customSchemaFilePath: 'zenstack/schema.zmodel',
@@ -153,7 +153,7 @@ model Post {
         `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
                 fullZod: true,
                 customSchemaFilePath: 'zenstack/schema.zmodel',
@@ -183,7 +183,7 @@ model Post {
         `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
                 fullZod: true,
                 customSchemaFilePath: 'zenstack/schema.zmodel',
@@ -229,7 +229,12 @@ model Post {
             `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server', '@trpc/react-query'],
+                extraDependencies: [
+                    path.resolve(__dirname, '../dist'),
+                    '@trpc/client',
+                    '@trpc/server',
+                    '@trpc/react-query',
+                ],
                 compile: true,
                 fullZod: true,
             }
@@ -249,7 +254,7 @@ model Post {
             `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server', '@trpc/next'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server', '@trpc/next'],
                 compile: true,
                 fullZod: true,
             }
@@ -279,7 +284,7 @@ model post_item {
         `,
             {
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
                 fullZod: true,
             }
@@ -326,7 +331,7 @@ model Foo {
             {
                 addPrelude: false,
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
             }
         );
@@ -397,7 +402,7 @@ model Foo {
             {
                 addPrelude: false,
                 pushDb: false,
-                extraDependencies: [`${origDir}/dist`, '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
                 compile: true,
             }
         );