zenstack 0.1.12 → 0.1.13

package/out/generator/index.js

@@ -69,13 +69,11 @@ class ZenStackGenerator {
             // compile ts sources
             const tsConfig = require(path_1.default.join(__dirname, 'tsconfig.template.json'));
             fs.writeFileSync(path_1.default.join(context.outDir, 'tsconfig.json'), JSON.stringify(tsConfig, undefined, 4));
-            let tscOutput = '';
             try {
-                tscOutput = (0, child_process_1.execSync)(`npx tsc -p "${path_1.default.join(context.outDir, 'tsconfig.json')}"`, { encoding: 'utf-8' });
+                (0, child_process_1.execSync)(`npx tsc -p "${path_1.default.join(context.outDir, 'tsconfig.json')}"`, { encoding: 'utf-8', stdio: 'inherit' });
             }
             catch (_a) {
                 console.error(colors_1.default.red('Something went wrong, generated runtime code failed to compile...'));
-                console.log(tscOutput);
                 return;
             }
             console.log(colors_1.default.blue('  ✔️ Typescript source files transpiled'));

package/out/generator/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,oDAA4B;AAC5B,sDAAuC;AACvC,wDAAyC;AACzC,gEAAgD;AAChD,4DAA4C;AAC5C,gDAAwB;AACxB,iDAAyC;AAEzC,MAAa,iBAAiB;IACpB,QAAQ,CAAC,OAAgB;;YAC3B,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC/B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aAC/D;iBAAM;gBACH,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAChC;YAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC;YAE3D,MAAM,UAAU,GAAG;gBACf,IAAI,gBAAe,EAAE;gBACrB,IAAI,iBAAgB,EAAE;gBACtB,IAAI,qBAAmB,EAAE;gBACzB,IAAI,mBAAiB,EAAE;aAC1B,CAAC;YAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAChC,MAAM,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aACrC;YAED,wBAAwB;YACxB,MAAM,WAAW,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CACjC,SAAS,EACT,uBAAuB,CAC1B,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,EACzC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAC5C,CAAC;YAEF,qBAAqB;YACrB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CAC9B,SAAS,EACT,wBAAwB,CAC3B,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CACzC,CAAC;YAEF,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI;gBACA,SAAS,GAAG,IAAA,wBAAQ,EAChB,eAAe,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,EAC5D,EAAE,QAAQ,EAAE,OAAO,EAAE,CACxB,CAAC;aACL;YAAC,WAAM;gBACJ,OAAO,CAAC,KAAK,CACT,gBAAM,CAAC,GAAG,CACN,mEAAmE,CACtE,CACJ,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACvB,OAAO;aACV;YAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC,CAAC;YAEpE,OAAO,CAAC,GAAG,CACP,gBAAM,CAAC,KAAK,CACR,gBAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAC3D,CACJ,CAAC;QACN,CAAC;KAAA;CACJ;AAjED,8CAiEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,oDAA4B;AAC5B,sDAAuC;AACvC,wDAAyC;AACzC,gEAAgD;AAChD,4DAA4C;AAC5C,gDAAwB;AACxB,iDAAyC;AAEzC,MAAa,iBAAiB;IACpB,QAAQ,CAAC,OAAgB;;YAC3B,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC/B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aAC/D;iBAAM;gBACH,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAChC;YAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC;YAE3D,MAAM,UAAU,GAAG;gBACf,IAAI,gBAAe,EAAE;gBACrB,IAAI,iBAAgB,EAAE;gBACtB,IAAI,qBAAmB,EAAE;gBACzB,IAAI,mBAAiB,EAAE;aAC1B,CAAC;YAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAChC,MAAM,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aACrC;YAED,wBAAwB;YACxB,MAAM,WAAW,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CACjC,SAAS,EACT,uBAAuB,CAC1B,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,EACzC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAC5C,CAAC;YAEF,qBAAqB;YACrB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CAC9B,SAAS,EACT,wBAAwB,CAC3B,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CACzC,CAAC;YAEF,IAAI;gBACA,IAAA,wBAAQ,EACJ,eAAe,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,EAC5D,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAC1C,CAAC;aACL;YAAC,WAAM;gBACJ,OAAO,CAAC,KAAK,CACT,gBAAM,CAAC,GAAG,CACN,mEAAmE,CACtE,CACJ,CAAC;gBACF,OAAO;aACV;YAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC,CAAC;YAEpE,OAAO,CAAC,GAAG,CACP,gBAAM,CAAC,KAAK,CACR,gBAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAC3D,CACJ,CAAC;QACN,CAAC;KAAA;CACJ;AA/DD,8CA+DC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "zenstack",
   "displayName": "ZenStack CLI and Language Tools",
   "description": "ZenStack CLI and Language Tools",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "engines": {
     "vscode": "^1.56.0"
   },
@@ -40,8 +40,7 @@
   ],
   "files": [
     "bin",
-    "out",
-    "src"
+    "out"
   ],
   "bin": {
     "zenstack": "./bin/cli"

package/src/cli/cli-util.ts

@@ -1,80 +0,0 @@
-import colors from 'colors';
-import path from 'path';
-import fs from 'fs';
-import { AstNode, LangiumDocument, LangiumServices } from 'langium';
-import { URI } from 'vscode-uri';
-
-export async function extractDocument(
-    fileName: string,
-    services: LangiumServices
-): Promise<LangiumDocument> {
-    const extensions = services.LanguageMetaData.fileExtensions;
-    if (!extensions.includes(path.extname(fileName))) {
-        console.error(
-            colors.yellow(
-                `Please choose a file with one of these extensions: ${extensions}.`
-            )
-        );
-        process.exit(1);
-    }
-
-    if (!fs.existsSync(fileName)) {
-        console.error(colors.red(`File ${fileName} does not exist.`));
-        process.exit(1);
-    }
-
-    const stdLib =
-        services.shared.workspace.LangiumDocuments.getOrCreateDocument(
-            URI.file(path.join(__dirname, '../language-server/stdlib.zmodel'))
-        );
-    const document =
-        services.shared.workspace.LangiumDocuments.getOrCreateDocument(
-            URI.file(path.resolve(fileName))
-        );
-    await services.shared.workspace.DocumentBuilder.build([stdLib, document], {
-        validationChecks: 'all',
-    });
-
-    const validationErrors = (document.diagnostics ?? []).filter(
-        (e) => e.severity === 1
-    );
-    if (validationErrors.length > 0) {
-        console.error(colors.red('There are validation errors:'));
-        for (const validationError of validationErrors) {
-            console.error(
-                colors.red(
-                    `line ${validationError.range.start.line + 1}: ${
-                        validationError.message
-                    } [${document.textDocument.getText(validationError.range)}]`
-                )
-            );
-        }
-        process.exit(1);
-    }
-
-    return document;
-}
-
-export async function extractAstNode<T extends AstNode>(
-    fileName: string,
-    services: LangiumServices
-): Promise<T> {
-    return (await extractDocument(fileName, services)).parseResult?.value as T;
-}
-
-interface FilePathData {
-    destination: string;
-    name: string;
-}
-
-export function extractDestinationAndName(
-    filePath: string,
-    destination: string | undefined
-): FilePathData {
-    filePath = filePath.replace(/\..*$/, '').replace(/[.-]/g, '');
-    return {
-        destination:
-            destination ?? path.join(path.dirname(filePath), 'generated'),
-        name: path.basename(filePath),
-    };
-}

package/src/cli/index.ts

@@ -1,52 +0,0 @@
-import { Command } from 'commander';
-import { Model } from '../language-server/generated/ast';
-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 { ZenStackGenerator } from '../generator';
-
-export const generateAction = async (
-    fileName: string,
-    opts: GenerateOptions
-): Promise<void> => {
-    const services = createZModelServices().ZModel;
-    const model = await extractAstNode<Model>(fileName, services);
-
-    const context: Context = {
-        schema: model,
-        outDir: opts.destination || 'node_modules/.zenstack',
-    };
-
-    await new ZenStackGenerator().generate(context);
-};
-
-export type GenerateOptions = {
-    destination?: string;
-};
-
-export default function (): void {
-    const program = new Command();
-
-    program
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        .version(require('../../package.json').version);
-
-    const fileExtensions = ZModelLanguageMetaData.fileExtensions.join(', ');
-    program
-        .command('generate')
-        .argument(
-            '<file>',
-            `source file (possible file extensions: ${fileExtensions})`
-        )
-        .option(
-            '-d, --destination <dir>',
-            'destination directory of generating'
-        )
-        .description(
-            'generates JavaScript code that prints "Hello, {name}!" for each greeting in a source file'
-        )
-        .action(generateAction);
-
-    program.parse(process.argv);
-}

package/src/extension.ts

@@ -1,76 +0,0 @@
-import * as vscode from 'vscode';
-import * as path from 'path';
-import {
-    LanguageClient,
-    LanguageClientOptions,
-    ServerOptions,
-    TransportKind,
-} from 'vscode-languageclient/node';
-
-let client: LanguageClient;
-
-// This function is called when the extension is activated.
-export function activate(context: vscode.ExtensionContext): void {
-    client = startLanguageClient(context);
-}
-
-// This function is called when the extension is deactivated.
-export function deactivate(): Thenable<void> | undefined {
-    if (client) {
-        return client.stop();
-    }
-    return undefined;
-}
-
-function startLanguageClient(context: vscode.ExtensionContext): LanguageClient {
-    const serverModule = context.asAbsolutePath(
-        path.join('out', 'language-server', 'main')
-    );
-    // The debug options for the server
-    // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging.
-    // By setting `process.env.DEBUG_BREAK` to a truthy value, the language server will wait until a debugger is attached.
-    const debugOptions = {
-        execArgv: [
-            '--nolazy',
-            `--inspect${process.env.DEBUG_BREAK ? '-brk' : ''}=${
-                process.env.DEBUG_SOCKET || '6009'
-            }`,
-        ],
-    };
-
-    // If the extension is launched in debug mode then the debug server options are used
-    // Otherwise the run options are used
-    const serverOptions: ServerOptions = {
-        run: { module: serverModule, transport: TransportKind.ipc },
-        debug: {
-            module: serverModule,
-            transport: TransportKind.ipc,
-            options: debugOptions,
-        },
-    };
-
-    const fileSystemWatcher =
-        vscode.workspace.createFileSystemWatcher('**/*.zmodel');
-    context.subscriptions.push(fileSystemWatcher);
-
-    // Options to control the language client
-    const clientOptions: LanguageClientOptions = {
-        documentSelector: [{ scheme: 'file', language: 'zmodel' }],
-        synchronize: {
-            // Notify the server about file changes to files contained in the workspace
-            fileEvents: fileSystemWatcher,
-        },
-    };
-
-    // Create the language client and start the client.
-    const client = new LanguageClient(
-        'zmodel',
-        'ZenStack Model',
-        serverOptions,
-        clientOptions
-    );
-
-    // Start the client. This will also launch the server
-    client.start();
-    return client;
-}

package/src/generator/constants.ts

@@ -1,2 +0,0 @@
-export const RUNTIME_PACKAGE = '@zenstackhq/runtime';
-export const GUARD_FIELD_NAME = 'zenstack_guard';

package/src/generator/index.ts

@@ -1,76 +0,0 @@
-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.rmSync(context.outDir, { force: true, recursive: true });
-        } else {
-            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)
-        );
-
-        let tscOutput = '';
-        try {
-            tscOutput = execSync(
-                `npx tsc -p "${path.join(context.outDir, 'tsconfig.json')}"`,
-                { encoding: 'utf-8' }
-            );
-        } catch {
-            console.error(
-                colors.red(
-                    'Something went wrong, generated runtime code failed to compile...'
-                )
-            );
-            console.log(tscOutput);
-            return;
-        }
-
-        console.log(colors.blue('  ✔️ Typescript source files transpiled'));
-
-        console.log(
-            colors.green(
-                colors.bold('👻 All generators completed successfully!')
-            )
-        );
-    }
-}

package/src/generator/next-auth/index.ts

@@ -1,183 +0,0 @@
-import { Context, Generator } from '../types';
-import { Project } from 'ts-morph';
-import * as path from 'path';
-
-export default class NextAuthGenerator implements Generator {
-    async generate(context: Context) {
-        const project = new Project();
-
-        this.generateIndex(project, context);
-        this.generateAdapter(project, context);
-        this.generateAuthorize(project, context);
-
-        await project.save();
-    }
-
-    generateIndex(project: Project, context: Context) {
-        const sf = project.createSourceFile(
-            path.join(context.outDir, 'auth/index.ts'),
-            undefined,
-            { overwrite: true }
-        );
-
-        sf.addStatements([
-            `export * from './next-auth-adapter';`,
-            `export * from './authorize';`,
-        ]);
-
-        sf.formatText();
-    }
-
-    generateAdapter(project: Project, context: Context) {
-        const content = `
-        import { ZenStackService } from '..';
-        import { Adapter } from 'next-auth/adapters';
-        import { Prisma } from '../.prisma';
-        
-        export function NextAuthAdapter(service: ZenStackService): Adapter {
-            const db = service.db;
-            return {
-                createUser: (data) => db.user.create({ data: data as Prisma.UserCreateInput }),
-                getUser: (id) => db.user.findUnique({ where: { id } }),
-                getUserByEmail: (email) => db.user.findUnique({ where: { email } }),
-                async getUserByAccount(provider_providerAccountId) {
-                    const account = await db.account.findUnique({
-                        where: { provider_providerAccountId },
-                        select: { user: true },
-                    });
-                    return account?.user ?? null;
-                },
-                updateUser: (data) => db.user.update({ where: { id: data.id }, data: data as Prisma.UserUpdateInput }),
-                deleteUser: (id) => db.user.delete({ where: { id } }),
-                linkAccount: (data) => db.account.create({ data }) as any,
-                unlinkAccount: (provider_providerAccountId) =>
-                    db.account.delete({ where: { provider_providerAccountId } }) as any,
-                async getSessionAndUser(sessionToken) {
-                    const userAndSession = await db.session.findUnique({
-                        where: { sessionToken },
-                        include: { user: true },
-                    });
-                    if (!userAndSession) return null;
-                    const { user, ...session } = userAndSession;
-                    return { user, session };
-                },
-                createSession: (data) => db.session.create({ data }),
-                updateSession: (data) =>
-                    db.session.update({
-                        data,
-                        where: { sessionToken: data.sessionToken },
-                    }),
-                deleteSession: (sessionToken) =>
-                    db.session.delete({ where: { sessionToken } }),
-                createVerificationToken: (data) => db.verificationToken.create({ data }),
-                async useVerificationToken(identifier_token) {
-                    try {
-                        return await db.verificationToken.delete({
-                            where: { identifier_token },
-                        });
-                    } catch (error) {
-                        // If token already used/deleted, just return null
-                        // https://www.prisma.io/docs/reference/api-reference/error-reference#p2025
-                        if (
-                            (error as Prisma.PrismaClientKnownRequestError).code ===
-                            'P2025'
-                        )
-                            return null;
-                        throw error;
-                    }
-                },
-            };
-        }                
-        `;
-
-        const sf = project.createSourceFile(
-            path.join(context.outDir, 'auth/next-auth-adapter.ts'),
-            content,
-            { overwrite: true }
-        );
-
-        sf.formatText();
-    }
-
-    generateAuthorize(project: Project, context: Context) {
-        const content = `
-        import { ZenStackService } from '..';
-        import { hash, compare } from 'bcryptjs';
-        
-        async function hashPassword(password: string) {
-            const hashedPassword = await hash(password, 12);
-            return hashedPassword;
-        }
-        
-        async function verifyPassword(password: string, hashedPassword: string) {
-            const isValid = await compare(password, hashedPassword);
-            return isValid;
-        }
-        
-        export function authorize(service: ZenStackService) {
-            return async (
-                credentials: Record<'email' | 'password', string> | undefined
-            ) => {
-                try {
-                    let maybeUser = await service.db.user.findFirst({
-                        where: {
-                            email: credentials!.email,
-                        },
-                        select: {
-                            id: true,
-                            email: true,
-                            password: true,
-                            name: true,
-                        },
-                    });
-        
-                    if (!maybeUser) {
-                        if (!credentials!.password || !credentials!.email) {
-                            throw new Error('Invalid Credentials');
-                        }
-        
-                        maybeUser = await service.db.user.create({
-                            data: {
-                                email: credentials!.email,
-                                password: await hashPassword(credentials!.password),
-                            },
-                            select: {
-                                id: true,
-                                email: true,
-                                password: true,
-                                name: true,
-                            },
-                        });
-                    } else {
-                        const isValid = await verifyPassword(
-                            credentials!.password,
-                            maybeUser.password
-                        );
-        
-                        if (!isValid) {
-                            throw new Error('Invalid Credentials');
-                        }
-                    }
-        
-                    return {
-                        id: maybeUser.id,
-                        email: maybeUser.email,
-                        name: maybeUser.name,
-                    };
-                } catch (error) {
-                    console.log(error);
-                    throw error;
-                }
-            };
-        }
-        `;
-
-        const sf = project.createSourceFile(
-            path.join(context.outDir, 'auth/authorize.ts'),
-            content,
-            { overwrite: true }
-        );
-
-        sf.formatText();
-    }
-}

package/src/generator/package.template.json

@@ -1,9 +0,0 @@
-{
-    "name": ".zenstack",
-    "version": "1.0.0",
-    "description": "ZenStack generated code",
-    "main": "index.js",
-    "types": "index.d.ts",
-    "author": "ZenStack",
-    "license": "MIT"
-}