zenstack 0.4.1 → 0.4.2

package/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": "0.4.1",
+  "version": "0.4.2",
   "author": {
     "name": "ZenStack Team"
   },
@@ -75,6 +75,7 @@
     "langium": "^0.5.0",
     "mixpanel": "^0.17.0",
     "node-machine-id": "^1.1.12",
+    "ora": "^6.1.2",
     "pluralize": "^8.0.0",
     "prisma": "~4.7.0",
     "promisify": "^0.0.3",
@@ -86,7 +87,7 @@
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-uri": "^3.0.6",
-    "@zenstackhq/runtime": "0.4.1"
+    "@zenstackhq/runtime": "0.4.2"
   },
   "devDependencies": {
     "@prisma/internals": "~4.7.0",

package/src/generator/field-constraint/index.ts

@@ -1,7 +1,3 @@
-import { Context, Generator } from '../types';
-import { Project, SourceFile } from 'ts-morph';
-import * as path from 'path';
-import colors from 'colors';
 import {
     DataModel,
     DataModelField,
@@ -10,6 +6,9 @@ import {
     isLiteralExpr,
     LiteralExpr,
 } from '@lang/generated/ast';
+import * as path from 'path';
+import { Project, SourceFile } from 'ts-morph';
+import { Context, Generator } from '../types';
 
 /**
  * Generates field constraint validators (run on both client and server side)
@@ -19,7 +18,15 @@ export default class FieldConstraintGenerator implements Generator {
         return 'field-constraint';
     }
 
-    async generate(context: Context): Promise<void> {
+    get startMessage() {
+        return 'Generating field constraints...';
+    }
+
+    get successMessage() {
+        return 'Successfully generated field constraints';
+    }
+
+    async generate(context: Context) {
         const project = new Project();
         const sf = project.createSourceFile(
             path.join(
@@ -41,7 +48,7 @@ export default class FieldConstraintGenerator implements Generator {
         sf.formatText();
         await project.save();
 
-        console.log(colors.blue(`  ✔️ Field constraint validators generated`));
+        return [];
     }
 
     private generateConstraints(sf: SourceFile, model: DataModel) {

package/src/generator/index.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-import { Context } from './types';
+import { Context, Generator } from './types';
 import * as fs from 'fs';
 import colors from 'colors';
 import PrismaGenerator from './prisma';
@@ -8,6 +8,7 @@ import ReactHooksGenerator from './react-hooks';
 import { TypescriptCompilation } from './tsc';
 import FieldConstraintGenerator from './field-constraint';
 import telemetry from '../telemetry';
+import ora from 'ora';
 
 /**
  * ZenStack code generator
@@ -37,11 +38,8 @@ export class ZenStackGenerator {
             fs.mkdirSync(context.generatedCodeDir);
         }
 
-        const version = require('../../package.json').version;
-        console.log(colors.bold(`⌛️ Running ZenStack generator v${version}`));
-
         // TODO: plugin mechanism
-        const generators = [
+        const generators: Generator[] = [
             new PrismaGenerator(),
             new ServiceGenerator(),
             new ReactHooksGenerator(),
@@ -49,6 +47,10 @@ export class ZenStackGenerator {
             new TypescriptCompilation(),
         ];
 
+        const version = require('../../package.json').version;
+        console.log(colors.bold(`⌛️ Running ZenStack generator v${version}`));
+
+        const warnings: string[] = [];
         for (const generator of generators) {
             if (
                 includeGenerators &&
@@ -57,6 +59,7 @@ export class ZenStackGenerator {
                 continue;
             }
 
+            const spinner = ora(generator.startMessage).start();
             await telemetry.trackSpan(
                 'cli:generator:start',
                 'cli:generator:complete',
@@ -64,8 +67,12 @@ export class ZenStackGenerator {
                 {
                     generator: generator.name,
                 },
-                () => generator.generate(context)
+                async () => {
+                    const genWarnings = await generator.generate(context);
+                    warnings.push(...genWarnings);
+                }
             );
+            spinner.succeed(`${colors.cyan(generator.successMessage)}`);
         }
 
         console.log(
@@ -73,5 +80,7 @@ export class ZenStackGenerator {
                 colors.bold('👻 All generators completed successfully!')
             )
         );
+
+        warnings.forEach((w) => console.warn(colors.yellow(w)));
     }
 }

package/src/generator/prisma/index.ts

@@ -1,8 +1,7 @@
-import colors from 'colors';
-import { Context, Generator, GeneratorError } from '../types';
 import { execSync } from '../../utils/exec-utils';
-import PrismaSchemaGenerator from './schema-generator';
+import { Context, Generator, GeneratorError } from '../types';
 import QueryGuardGenerator from './query-guard-generator';
+import PrismaSchemaGenerator from './schema-generator';
 
 /**
  * Generates Prisma schema and db client
@@ -12,7 +11,15 @@ export default class PrismaGenerator implements Generator {
         return 'prisma';
     }
 
-    async generate(context: Context): Promise<void> {
+    get startMessage() {
+        return 'Generating Prisma client...';
+    }
+
+    get successMessage() {
+        return 'Successfully generated Prisma client';
+    }
+
+    async generate(context: Context) {
         // generate prisma schema
         const schemaFile = await new PrismaSchemaGenerator(context).generate();
 
@@ -22,9 +29,7 @@ export default class PrismaGenerator implements Generator {
         // generate prisma query guard
         await new QueryGuardGenerator(context).generate();
 
-        console.log(
-            colors.blue(`  ✔️ Prisma schema and query guard generated`)
-        );
+        return [];
     }
 
     private async generatePrismaClient(schemaFile: string) {

package/src/generator/react-hooks/index.ts

@@ -1,10 +1,9 @@
-import { Context, Generator } from '../types';
-import { Project } from 'ts-morph';
-import * as path from 'path';
-import { paramCase } from 'change-case';
 import { DataModel, isDataModel } from '@lang/generated/ast';
-import colors from 'colors';
+import { paramCase } from 'change-case';
+import * as path from 'path';
+import { Project } from 'ts-morph';
 import { API_ROUTE_NAME, RUNTIME_PACKAGE } from '../constants';
+import { Context, Generator } from '../types';
 
 /**
  * Generate react data query hooks code
@@ -14,9 +13,18 @@ export default class ReactHooksGenerator implements Generator {
         return 'react-hooks';
     }
 
-    async generate(context: Context): Promise<void> {
+    get startMessage() {
+        return 'Generating React hooks...';
+    }
+
+    get successMessage(): string {
+        return 'Successfully generated React hooks';
+    }
+
+    async generate(context: Context) {
         const project = new Project();
         const models: DataModel[] = [];
+        const warnings: string[] = [];
 
         for (const model of context.schema.declarations.filter(
             (d): d is DataModel => isDataModel(d)
@@ -25,10 +33,8 @@ export default class ReactHooksGenerator implements Generator {
                 (attr) => attr.decl.ref?.name === '@@allow'
             );
             if (!hasAllowRule) {
-                console.warn(
-                    colors.yellow(
-                        `Not generating hooks for "${model.name}" because it doesn't have any @@allow rule`
-                    )
+                warnings.push(
+                    `Not generating hooks for "${model.name}" because it doesn't have any @@allow rule`
                 );
             } else {
                 models.push(model);
@@ -40,8 +46,7 @@ export default class ReactHooksGenerator implements Generator {
         models.forEach((d) => this.generateModelHooks(project, context, d));
 
         await project.save();
-
-        console.log(colors.blue('  ✔️ React hooks generated'));
+        return warnings;
     }
 
     private getValidator(model: DataModel, mode: 'create' | 'update') {

package/src/generator/service/index.ts

@@ -1,6 +1,5 @@
 import { DataModel, isDataModel } from '@lang/generated/ast';
 import { camelCase } from 'change-case';
-import colors from 'colors';
 import * as path from 'path';
 import { Project } from 'ts-morph';
 import { RUNTIME_PACKAGE } from '../constants';
@@ -14,7 +13,15 @@ export default class ServiceGenerator implements Generator {
         return 'service';
     }
 
-    async generate(context: Context): Promise<void> {
+    get startMessage() {
+        return 'Generating ZenStack service...';
+    }
+
+    get successMessage() {
+        return 'Successfully generated ZenStack service';
+    }
+
+    async generate(context: Context) {
         const project = new Project();
         const sf = project.createSourceFile(
             path.join(context.generatedCodeDir, 'src/index.ts'),
@@ -101,6 +108,6 @@ export default class ServiceGenerator implements Generator {
         sf.formatText();
         await project.save();
 
-        console.log(colors.blue(`  ✔️ ZenStack service generated`));
+        return [];
     }
 }

package/src/generator/tsc/index.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-import colors from 'colors';
 import * as fs from 'fs';
 import path from 'path';
 import { execSync } from '../../utils/exec-utils';
@@ -10,6 +9,14 @@ export class TypescriptCompilation implements Generator {
         return 'tsc';
     }
 
+    get startMessage() {
+        return 'Transpiling generated code...';
+    }
+
+    get successMessage() {
+        return 'Successfully transpiled all generated code';
+    }
+
     async generate(context: Context) {
         // generate package.json
         const packageJson = require(path.join(
@@ -47,6 +54,6 @@ export class TypescriptCompilation implements Generator {
             );
         }
 
-        console.log(colors.blue('  ✔️ Typescript source files transpiled'));
+        return [];
     }
 }

package/src/generator/types.ts

@@ -8,7 +8,9 @@ export interface Context {
 
 export interface Generator {
     get name(): string;
-    generate(context: Context): Promise<void>;
+    get startMessage(): string;
+    get successMessage(): string;
+    generate(context: Context): Promise<string[]>;
 }
 
 export class GeneratorError extends Error {