more fixes

Author: ymc9

package.json

@@ -21,7 +21,7 @@
     "license": "MIT",
     "devDependencies": {
         "@eslint/js": "^9.29.0",
-        "@types/node": "^20.17.24",
+        "@types/node": "catalog:",
         "eslint": "~9.29.0",
         "glob": "^11.0.2",
         "prettier": "^3.5.3",

packages/cli/src/actions/generate.ts

@@ -69,8 +69,13 @@ async function runPlugins(schemaFile: string, model: Model, outputPath: string)
                 throw new CliError(`Unknown core plugin: ${provider}`);
             }
         } else {
+            let moduleSpec = provider;
+            if (moduleSpec.startsWith('.')) {
+                // relative to schema's path
+                moduleSpec = path.resolve(path.dirname(schemaFile), moduleSpec);
+            }
             try {
-                cliPlugin = (await import(provider)).default as CliPlugin;
+                cliPlugin = (await import(moduleSpec)).default as CliPlugin;
             } catch (error) {
                 throw new CliError(`Failed to load plugin ${provider}: ${error}`);
             }

packages/cli/src/plugins/prisma.ts

@@ -6,16 +6,15 @@ const plugin: CliPlugin = {
     name: 'Prisma Schema Generator',
     statusText: 'Generating Prisma schema',
     async generate({ model, defaultOutputPath, pluginOptions }) {
-        let outFile = path.join(defaultOutputPath, 'schema.prisma');
+        let outDir = defaultOutputPath;
         if (typeof pluginOptions['output'] === 'string') {
-            const outDir = path.resolve(defaultOutputPath, pluginOptions['output']);
+            outDir = path.resolve(defaultOutputPath, pluginOptions['output']);
             if (!fs.existsSync(outDir)) {
                 fs.mkdirSync(outDir, { recursive: true });
             }
-            outFile = path.join(outDir, 'schema.prisma');
         }
         const prismaSchema = await new PrismaSchemaGenerator(model).generate();
-        fs.writeFileSync(outFile, prismaSchema);
+        fs.writeFileSync(path.join(outDir, 'schema.prisma'), prismaSchema);
     },
 };
 

packages/cli/test/plugins/custom-plugin.test.ts

@@ -0,0 +1,50 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { createProject, runCli } from '../utils';
+import { execSync } from 'node:child_process';
+
+describe('Custom plugins tests', () => {
+    it('runs custom plugin generator', () => {
+        const workDir = createProject(`
+plugin custom {
+    provider = '../my-plugin.js'
+    output = '../custom-output'
+}
+
+model User {
+    id String @id @default(cuid())
+}
+`);
+
+        fs.writeFileSync(
+            path.join(workDir, 'my-plugin.ts'),
+            `
+import type { CliPlugin } from '@zenstackhq/sdk';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const plugin: CliPlugin = {
+    name: 'Custom Generator',
+    statusText: 'Generating foo.txt',
+    async generate({ model, defaultOutputPath, pluginOptions }) {
+        let outDir = defaultOutputPath;
+        if (typeof pluginOptions['output'] === 'string') {
+            outDir = path.resolve(defaultOutputPath, pluginOptions['output']);
+            if (!fs.existsSync(outDir)) {
+                fs.mkdirSync(outDir, { recursive: true });
+            }
+        }
+        fs.writeFileSync(path.join(outDir, 'foo.txt'), 'from my plugin');
+    },
+};
+
+export default plugin;
+`,
+        );
+
+        execSync('npx tsc', { cwd: workDir });
+        runCli('generate', workDir);
+        expect(fs.existsSync(path.join(workDir, 'custom-output/foo.txt'))).toBe(true);
+    });
+});

packages/testtools/package.json

@@ -41,6 +41,7 @@
         "pg": "^8.13.1"
     },
     "devDependencies": {
+        "@types/node": "catalog:",
         "@types/tmp": "catalog:",
         "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*"

pnpm-lock.yaml

@@ -10,5 +10,6 @@ catalog:
     langium-cli: 3.5.0
     ts-pattern: ^5.7.1
     typescript: ^5.0.0
+    '@types/node': ^20.17.24
     tmp: ^0.2.3
     '@types/tmp': ^0.2.6