zenstack 0.2.3 → 0.2.9

package/package.json

@@ -3,7 +3,7 @@
   "publisher": "zenstack",
   "displayName": "ZenStack Language Tools",
   "description": "ZenStack is a toolkit that simplifies full-stack development",
-  "version": "0.2.3",
+  "version": "0.2.9",
   "author": {
     "name": "ZenStack Team"
   },
@@ -64,7 +64,7 @@
   },
   "main": "./bundle/extension.js",
   "dependencies": {
-    "@zenstackhq/internal": "0.2.3",
+    "@zenstackhq/internal": "0.2.9",
     "change-case": "^4.1.2",
     "chevrotain": "^9.1.0",
     "colors": "^1.4.0",
@@ -106,9 +106,9 @@
   },
   "scripts": {
     "vscode:publish": "vsce publish --no-dependencies",
-    "vscode:prepublish": "cp ../../README.md ./ && pnpm lint && pnpm build && pnpm bundle",
+    "vscode:prepublish": "cp ../../README.md ./ && pnpm lint && pnpm build",
     "vscode:package": "vsce package --no-dependencies",
-    "build": "cp -r src/res/* bundle/res/ && pnpm langium:generate && tsc --noEmit",
+    "build": "pnpm langium:generate && tsc --noEmit && pnpm bundle && cp -r src/res/* bundle/res/",
     "bundle": "node build/bundle.js --minify",
     "bundle-watch": "node build/bundle.js --watch",
     "ts:watch": "tsc --watch --noEmit",

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

@@ -3,6 +3,7 @@ import { Project } from 'ts-morph';
 import * as path from 'path';
 import colors from 'colors';
 import { DataModel, isDataModel, Model } from '@lang/generated/ast';
+import { execSync } from 'child_process';
 
 /**
  * Generates NextAuth adaptor code
@@ -20,7 +21,7 @@ export default class NextAuthGenerator implements Generator {
 
     async generate(context: Context): Promise<void> {
         try {
-            require('next-auth');
+            execSync('npm ls next-auth');
         } catch (err) {
             console.warn(
                 colors.yellow(

package/src/generator/prisma/schema-generator.ts

@@ -35,7 +35,7 @@ import {
     ModelFieldType,
 } from './prisma-builder';
 
-const excludedAttributes = ['@@allow', '@@deny', '@password'];
+const excludedAttributes = ['@@allow', '@@deny', '@password', '@omit'];
 
 /**
  * Generates Prisma schema file

package/src/generator/service/index.ts

@@ -1,5 +1,5 @@
 import { Context, Generator } from '../types';
-import { Project, StructureKind, VariableDeclarationKind } from 'ts-morph';
+import { Project } from 'ts-morph';
 import * as path from 'path';
 import colors from 'colors';
 import { INTERNAL_PACKAGE } from '../constants';
@@ -16,90 +16,31 @@ export default class ServiceGenerator implements Generator {
             { overwrite: true }
         );
 
-        sf.addImportDeclaration({
-            namedImports: ['PrismaClient'],
-            moduleSpecifier: '../.prisma',
-        });
-
-        sf.addImportDeclaration({
-            namedImports: ['Service', 'PolicyOperationKind', 'QueryContext'],
-            moduleSpecifier: INTERNAL_PACKAGE,
-            isTypeOnly: true,
-        });
-
-        sf.addVariableStatement({
-            declarationKind: VariableDeclarationKind.Let,
-            declarations: [
-                {
-                    name: 'guardModule',
-                    type: 'any',
-                },
-            ],
-        });
+        sf.addStatements([
+            `import { PrismaClient } from "../.prisma";`,
+            `import { DefaultService } from "${INTERNAL_PACKAGE}";`,
+        ]);
 
         const cls = sf.addClass({
             name: 'ZenStackService',
             isExported: true,
-            implements: ['Service<PrismaClient>'],
-        });
-        cls.addMember({
-            kind: StructureKind.Property,
-            name: 'private readonly _prisma',
-            initializer: 'new PrismaClient()',
+            extends: 'DefaultService<PrismaClient>',
         });
 
-        cls.addGetAccessor({
-            name: 'db',
-        })
-            .addBody()
-            .setBodyText('return this._prisma;');
-
-        cls
-            .addMethod({
-                name: 'resolveField',
-                isAsync: true,
-                parameters: [
-                    {
-                        name: 'model',
-                        type: 'string',
-                    },
-                    {
-                        name: 'field',
-                        type: 'string',
-                    },
-                ],
-            })
-            .addBody().setBodyText(`
-                if (!guardModule) {
-                    guardModule = await import('./query/guard');
-                }
-                return guardModule._fieldMapping?.[model]?.[field];
-            `);
-
-        cls
-            .addMethod({
-                name: 'buildQueryGuard',
-                isAsync: true,
-                parameters: [
-                    {
-                        name: 'model',
-                        type: 'string',
-                    },
-                    {
-                        name: 'operation',
-                        type: 'PolicyOperationKind',
-                    },
-                    {
-                        name: 'context',
-                        type: 'QueryContext',
-                    },
-                ],
-            })
-            .addBody().setBodyText(`
-                const module: any = await import('./query/guard');
-                const provider: (context: QueryContext) => any = module[model+ '_' + operation];
-                return provider(context);
-            `);
+        cls.addMethod({
+            name: 'initializePrisma',
+        }).setBodyText(`
+            const logConfig = (this.config.log || [])
+                .filter(item => typeof item === 'string' ? ['info', 'warn', 'error', 'query'].includes(item): ['info', 'warn', 'error', 'query'].includes(item.level));
+            return new PrismaClient({log: logConfig as any });
+        `);
+
+        cls.addMethod({
+            name: 'loadGuardModule',
+            isAsync: true,
+        }).setBodyText(`
+            return import('./query/guard');
+        `);
 
         // Recommended by Prisma for Next.js
         // https://www.prisma.io/docs/guides/database/troubleshooting-orm/help-articles/nextjs-prisma-client-dev-practices#problem