WIP

ymc9 · ymc9 · commit 42970eaf8a5a · 2022-10-12T23:33:14.000+08:00
diff --git a/packages/generated/auth.d.ts b/packages/generated/auth.d.ts
@@ -0,0 +1 @@
+export * from '.zenstack/auth';
diff --git a/packages/generated/auth.js b/packages/generated/auth.js
@@ -0,0 +1,3 @@
+module.exports = {
+    ...require('.zenstack/auth/index'),
+};
diff --git a/packages/generated/hooks.d.ts b/packages/generated/hooks.d.ts
@@ -0,0 +1 @@
+export * from '.zenstack/hooks';
diff --git a/packages/generated/hooks.js b/packages/generated/hooks.js
@@ -0,0 +1,3 @@
+module.exports = {
+    ...require('.zenstack/hooks/index'),
+};
diff --git a/packages/generated/index.d.ts b/packages/generated/index.d.ts
@@ -0,0 +1,3 @@
+export * from '.zenstack';
+import service from '.zenstack';
+export default service;
diff --git a/packages/generated/index.js b/packages/generated/index.js
@@ -0,0 +1 @@
+module.exports = require('.zenstack/index').default;
diff --git a/packages/generated/package-lock.json b/packages/generated/package-lock.json
diff --git a/packages/generated/package.json b/packages/generated/package.json
@@ -0,0 +1,12 @@
+{
+    "name": "@zenstackhq/generated",
+    "version": "0.1.7",
+    "description": "ZenStack generated code",
+    "main": "index.js",
+    "types": "index.d.ts",
+    "scripts": {
+        "npm-publish": "pnpm publish --no-git-checks --access public"
+    },
+    "author": "ZenStack",
+    "license": "MIT"
+}
diff --git a/packages/generated/types.d.ts b/packages/generated/types.d.ts
@@ -0,0 +1 @@
+export * from '.zenstack/.prisma';
diff --git a/packages/generated/types.js b/packages/generated/types.js
@@ -0,0 +1,3 @@
+module.exports = {
+    ...require('.zenstack/.prisma/index'),
+};
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "0.1.1",
+    "version": "0.1.3",
     "description": "ZenStack runtime library",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "target": "ES6",
-        "module": "ESNext",
+        "module": "CommonJS",
         "lib": ["ESNext", "DOM"],
         "sourceMap": true,
         "outDir": "lib",
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -49,7 +49,7 @@
     "main": "./out/extension.js",
     "scripts": {
         "vscode:prepublish": "npm run build && npm run lint",
-        "build": "tsc && tsc-alias && cp src/language-server/stdlib.zmodel ./out/language-server/",
+        "build": "tsc && tsc-alias && cp src/language-server/stdlib.zmodel ./out/language-server/ && cp src/generator/*.template.json ./out/generator/",
         "ts:watch": "tsc --watch",
         "tsc-alias:watch": "tsc-alias --watch",
         "lint": "eslint src --ext ts",
@@ -65,6 +65,7 @@
         "colors": "^1.4.0",
         "commander": "^8.0.0",
         "langium": "^0.4.0",
+        "prisma": "^4.4.0",
         "promisify": "^0.0.3",
         "ts-morph": "^16.0.0",
         "vscode-jsonrpc": "^8.0.2",
diff --git a/packages/schema/src/cli/index.ts b/packages/schema/src/cli/index.ts
@@ -4,13 +4,7 @@ import { ZModelLanguageMetaData } from '../language-server/generated/module';
 import { createZModelServices } from '../language-server/zmodel-module';
 import { extractAstNode } from './cli-util';
 import { Context } from '../generator/types';
-import * as path from 'path';
-import * as fs from 'fs';
-import colors from 'colors';
-import PrismaGenerator from '../generator/prisma';
-import ServiceGenerator from '../generator/service';
-import ReactHooksGenerator from '../generator/react-hooks';
-import NextAuthGenerator from '../generator/next-auth';
+import { ZenStackGenerator } from '../generator';
 
 export const generateAction = async (
     fileName: string,
@@ -21,33 +15,14 @@ export const generateAction = async (
 
     const context: Context = {
         schema: model,
-        outDir: path.resolve(opts.destination),
+        outDir: opts.destination || 'node_modules/.zenstack',
     };
 
-    if (!fs.existsSync(context.outDir)) {
-        fs.mkdirSync(context.outDir);
-    }
-
-    console.log(colors.bold('⌛️ Running ZenStack generators'));
-
-    const generators = [
-        new PrismaGenerator(),
-        new ServiceGenerator(),
-        new ReactHooksGenerator(),
-        new NextAuthGenerator(),
-    ];
-
-    for (const generator of generators) {
-        await generator.generate(context);
-    }
-
-    console.log(
-        colors.green(colors.bold('👻 All generators completed successfully!'))
-    );
+    await new ZenStackGenerator().generate(context);
 };
 
 export type GenerateOptions = {
-    destination: string;
+    destination?: string;
 };
 
 export default function (): void {
@@ -66,8 +41,7 @@ export default function (): void {
         )
         .option(
             '-d, --destination <dir>',
-            'destination directory of generating',
-            '.zenstack'
+            'destination directory of generating'
         )
         .description(
             'generates JavaScript code that prints "Hello, {name}!" for each greeting in a source file'
diff --git a/packages/schema/src/generator/index.ts b/packages/schema/src/generator/index.ts
@@ -0,0 +1,59 @@
+import { Context } from './types';
+import * as fs from 'fs';
+import colors from 'colors';
+import PrismaGenerator from './prisma';
+import ServiceGenerator from './service';
+import ReactHooksGenerator from './react-hooks';
+import NextAuthGenerator from './next-auth';
+import path from 'path';
+import { execSync } from 'child_process';
+
+export class ZenStackGenerator {
+    async generate(context: Context) {
+        if (!fs.existsSync(context.outDir)) {
+            fs.mkdirSync(context.outDir);
+        }
+
+        console.log(colors.bold('⌛️ Running ZenStack generators'));
+
+        const generators = [
+            new PrismaGenerator(),
+            new ServiceGenerator(),
+            new ReactHooksGenerator(),
+            new NextAuthGenerator(),
+        ];
+
+        for (const generator of generators) {
+            await generator.generate(context);
+        }
+
+        // generate package.json
+        const packageJson = require(path.join(
+            __dirname,
+            'package.template.json'
+        ));
+        fs.writeFileSync(
+            path.join(context.outDir, 'package.json'),
+            JSON.stringify(packageJson, undefined, 4)
+        );
+
+        // compile ts sources
+        const tsConfig = require(path.join(
+            __dirname,
+            'tsconfig.template.json'
+        ));
+        fs.writeFileSync(
+            path.join(context.outDir, 'tsconfig.json'),
+            JSON.stringify(tsConfig, undefined, 4)
+        );
+
+        execSync(`npx tsc -p "${path.join(context.outDir, 'tsconfig.json')}"`);
+        console.log(colors.blue('  ✔️ Typescript source files transpiled'));
+
+        console.log(
+            colors.green(
+                colors.bold('👻 All generators completed successfully!')
+            )
+        );
+    }
+}
diff --git a/packages/schema/src/generator/next-auth/index.ts b/packages/schema/src/generator/next-auth/index.ts
@@ -30,9 +30,9 @@ export default class NextAuthGenerator implements Generator {
 
     generateAdapter(project: Project, context: Context) {
         const content = `
-        import { ZenStackService } from '../service';
+        import { ZenStackService } from '..';
         import { Adapter } from 'next-auth/adapters';
-        import { Prisma } from '@zenstack/.prisma';
+        import { Prisma } from '../.prisma';
         
         export function NextAuthAdapter(service: ZenStackService): Adapter {
             const db = service.db;
@@ -101,7 +101,7 @@ export default class NextAuthGenerator implements Generator {
 
     generateAuthorize(project: Project, context: Context) {
         const content = `
-        import { ZenStackService } from '../service';
+        import { ZenStackService } from '..';
         import { hash, compare } from 'bcryptjs';
         
         async function hashPassword(password: string) {
diff --git a/packages/schema/src/generator/package.template.json b/packages/schema/src/generator/package.template.json
@@ -0,0 +1,9 @@
+{
+    "name": ".zenstack",
+    "version": "1.0.0",
+    "description": "ZenStack generated code",
+    "main": "index.js",
+    "types": "index.d.ts",
+    "author": "ZenStack",
+    "license": "MIT"
+}
diff --git a/packages/schema/src/generator/prisma/index.ts b/packages/schema/src/generator/prisma/index.ts
@@ -19,13 +19,6 @@ export default class PrismaGenerator implements Generator {
     }
 
     async generatePrismaClient(schemaFile: string) {
-        try {
-            execSync('npx prisma -v');
-        } catch (err) {
-            execSync(`npm i prisma @prisma/client`);
-            console.log(colors.blue('  ✔️ Prisma package installed'));
-        }
-
         execSync(`npx prisma generate --schema "${schemaFile}"`);
     }
 }
diff --git a/packages/schema/src/generator/prisma/prisma-builder.ts b/packages/schema/src/generator/prisma/prisma-builder.ts
@@ -103,7 +103,7 @@ export class Generator {
                 ? indentString(
                       `previewFeatures = [${this.previewFeatures
                           ?.map((f) => '"' + f + '"')
-                          .join(',')}]\n`
+                          .join(', ')}]\n`
                   )
                 : '') +
             `}`
diff --git a/packages/schema/src/generator/prisma/schema-generator.ts b/packages/schema/src/generator/prisma/schema-generator.ts
@@ -153,12 +153,10 @@ export default class PrismaSchemaGenerator {
     }
 
     private generateGenerator(prisma: PrismaModel) {
-        prisma.addGenerator(
-            'client',
-            'prisma-client-js',
-            path.join(this.context.outDir, '.prisma'),
-            ['fieldReference', 'interactiveTransactions']
-        );
+        prisma.addGenerator('client', 'prisma-client-js', '.prisma', [
+            'fieldReference',
+            'interactiveTransactions',
+        ]);
     }
 
     private generateModel(prisma: PrismaModel, decl: DataModel) {
diff --git a/packages/schema/src/generator/service/index.ts b/packages/schema/src/generator/service/index.ts
@@ -8,7 +8,7 @@ export default class ServiceGenerator implements Generator {
     async generate(context: Context) {
         const project = new Project();
         const sf = project.createSourceFile(
-            path.join(context.outDir, 'service.ts'),
+            path.join(context.outDir, 'index.ts'),
             undefined,
             { overwrite: true }
         );
diff --git a/packages/schema/src/generator/tsconfig.template.json b/packages/schema/src/generator/tsconfig.template.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "CommonJS",
+        "lib": ["ESNext", "DOM"],
+        "sourceMap": true,
+        "outDir": ".",
+        "strict": true,
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "declaration": true,
+        "resolveJsonModule": true
+    },
+    "include": ["**/*.ts"],
+    "exclude": ["node_modules", ".prisma"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/samples/todo/package-lock.json b/samples/todo/package-lock.json
diff --git a/samples/todo/package.json b/samples/todo/package.json
diff --git a/samples/todo/pages/api/auth/[...nextauth].ts b/samples/todo/pages/api/auth/[...nextauth].ts
diff --git a/samples/todo/pages/api/zen/[...path].ts b/samples/todo/pages/api/zen/[...path].ts
diff --git a/samples/todo/pages/index.tsx b/samples/todo/pages/index.tsx

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = {`
	`2`	`+ ...require('.zenstack/auth/index'),`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = {`
	`2`	`+ ...require('.zenstack/hooks/index'),`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export * from '.zenstack';`
	`2`	`+import service from '.zenstack';`
	`3`	`+export default service;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require('.zenstack/index').default;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = {`
	`2`	`+ ...require('.zenstack/.prisma/index'),`
	`3`	`+};`