@zenstackhq/cli 3.0.0-alpha.26 → 3.0.0-alpha.28

package/test/{validate.test.ts → check.test.ts}

@@ -40,14 +40,14 @@ describe('CLI validate command test', () => {
         const workDir = createProject(validModel);
 
         // Should not throw an error
-        expect(() => runCli('validate', workDir)).not.toThrow();
+        expect(() => runCli('check', workDir)).not.toThrow();
     });
 
     it('should fail validation for invalid schema', () => {
         const workDir = createProject(invalidModel);
 
         // Should throw an error due to validation failure
-        expect(() => runCli('validate', workDir)).toThrow();
+        expect(() => runCli('check', workDir)).toThrow();
     });
 
     it('should respect custom schema location', () => {
@@ -55,14 +55,14 @@ describe('CLI validate command test', () => {
         fs.renameSync(path.join(workDir, 'zenstack/schema.zmodel'), path.join(workDir, 'zenstack/custom.zmodel'));
 
         // Should not throw an error when using custom schema path
-        expect(() => runCli('validate --schema ./zenstack/custom.zmodel', workDir)).not.toThrow();
+        expect(() => runCli('check --schema ./zenstack/custom.zmodel', workDir)).not.toThrow();
     });
 
     it('should fail when schema file does not exist', () => {
         const workDir = createProject(validModel);
 
         // Should throw an error when schema file doesn't exist
-        expect(() => runCli('validate --schema ./nonexistent.zmodel', workDir)).toThrow();
+        expect(() => runCli('check --schema ./nonexistent.zmodel', workDir)).toThrow();
     });
 
     it('should respect package.json config', () => {
@@ -78,7 +78,7 @@ describe('CLI validate command test', () => {
         fs.writeFileSync(path.join(workDir, 'package.json'), JSON.stringify(pkgJson, null, 2));
 
         // Should not throw an error when using package.json config
-        expect(() => runCli('validate', workDir)).not.toThrow();
+        expect(() => runCli('check', workDir)).not.toThrow();
     });
 
     it('should validate schema with syntax errors', () => {
@@ -96,6 +96,6 @@ model User {
         const workDir = createProject(modelWithSyntaxError, false);
 
         // Should throw an error due to syntax error
-        expect(() => runCli('validate', workDir)).toThrow();
+        expect(() => runCli('check', workDir)).toThrow();
     });
 });

package/test/generate.test.ts

@@ -30,18 +30,6 @@ describe('CLI generate command test', () => {
         expect(fs.existsSync(path.join(workDir, 'zenstack/schema.ts'))).toBe(true);
     });
 
-    it('should respect save prisma schema option', () => {
-        const workDir = createProject(model);
-        runCli('generate --save-prisma-schema', workDir);
-        expect(fs.existsSync(path.join(workDir, 'zenstack/schema.prisma'))).toBe(true);
-    });
-
-    it('should respect save prisma schema custom path option', () => {
-        const workDir = createProject(model);
-        runCli('generate --save-prisma-schema "../prisma/schema.prisma"', workDir);
-        expect(fs.existsSync(path.join(workDir, 'prisma/schema.prisma'))).toBe(true);
-    });
-
     it('should respect package.json config', () => {
         const workDir = createProject(model);
         fs.mkdirSync(path.join(workDir, 'foo'));

package/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);
+    });
+});

package/test/plugins/prisma-plugin.test.ts

@@ -0,0 +1,60 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { createProject, runCli } from '../utils';
+
+describe('Core plugins tests', () => {
+    it('can automatically generate a TypeScript schema with default output', () => {
+        const workDir = createProject(`
+model User {
+    id String @id @default(cuid())
+}
+`);
+        runCli('generate', workDir);
+        expect(fs.existsSync(path.join(workDir, 'zenstack/schema.ts'))).toBe(true);
+    });
+
+    it('can automatically generate a TypeScript schema with custom output', () => {
+        const workDir = createProject(`
+plugin typescript {
+    provider = '@core/typescript'
+    output = '../generated-schema'
+}
+
+model User {
+    id String @id @default(cuid())
+}
+`);
+        runCli('generate', workDir);
+        expect(fs.existsSync(path.join(workDir, 'generated-schema/schema.ts'))).toBe(true);
+    });
+
+    it('can generate a Prisma schema with default output', () => {
+        const workDir = createProject(`
+plugin prisma {
+    provider = '@core/prisma'
+}
+
+model User {
+    id String @id @default(cuid())
+}
+`);
+        runCli('generate', workDir);
+        expect(fs.existsSync(path.join(workDir, 'zenstack/schema.prisma'))).toBe(true);
+    });
+
+    it('can generate a Prisma schema with custom output', () => {
+        const workDir = createProject(`
+plugin prisma {
+    provider = '@core/prisma'
+    output = './prisma'
+}
+
+model User {
+    id String @id @default(cuid())
+}
+`);
+        runCli('generate', workDir);
+        expect(fs.existsSync(path.join(workDir, 'zenstack/prisma/schema.prisma'))).toBe(true);
+    });
+});

package/tsconfig.json

@@ -1,7 +1,4 @@
 {
     "extends": "@zenstackhq/typescript-config/base.json",
-    "compilerOptions": {
-        "baseUrl": "."
-    },
     "include": ["src/**/*.ts"]
 }