zenstack 0.3.10 → 0.3.11

package/package.json

@@ -3,7 +3,7 @@
   "publisher": "zenstack",
   "displayName": "ZenStack Language Tools",
   "description": "A toolkit for modeling data and access policies in full-stack development with Next.js and Typescript",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "author": {
     "name": "ZenStack Team"
   },
@@ -65,7 +65,7 @@
   },
   "main": "./bundle/extension.js",
   "dependencies": {
-    "@zenstackhq/internal": "0.3.10",
+    "@zenstackhq/runtime": "0.3.11",
     "async-exit-hook": "^2.0.1",
     "change-case": "^4.1.2",
     "chevrotain": "^9.1.0",

package/src/cli/cli-util.ts

@@ -6,8 +6,9 @@ import fs from 'fs';
 import { LangiumServices } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 import path from 'path';
-import { ZenStackGenerator } from '../generator';
+import { installPackage } from 'src/utils/pkg-utils';
 import { URI } from 'vscode-uri';
+import { ZenStackGenerator } from '../generator';
 import { GENERATED_CODE_PATH } from '../generator/constants';
 import { Context, GeneratorError } from '../generator/types';
 import { CliError } from './cli-error';
@@ -17,19 +18,19 @@ import { CliError } from './cli-error';
  */
 export async function initProject(projectPath: string) {
     const schema = path.join(projectPath, 'zenstack', 'schema.zmodel');
+    let schemaGenerated = false;
+
     if (fs.existsSync(schema)) {
         console.warn(colors.yellow(`Model already exists: ${schema}`));
-        throw new CliError(`schema file already exists`);
-    }
-
-    // create a default model
-    if (!fs.existsSync(path.join(projectPath, 'zenstack'))) {
-        fs.mkdirSync(path.join(projectPath, 'zenstack'));
-    }
+    } else {
+        // create a default model
+        if (!fs.existsSync(path.join(projectPath, 'zenstack'))) {
+            fs.mkdirSync(path.join(projectPath, 'zenstack'));
+        }
 
-    fs.writeFileSync(
-        schema,
-        `// This is a sample model to get you started.
+        fs.writeFileSync(
+            schema,
+            `// This is a sample model to get you started.
 // Learn how to model you app: https://zenstack.dev/#/modeling-your-app.
 
 /*
@@ -77,26 +78,34 @@ model Post {
     @@allow('all', author == auth())
 }
 `
-    );
+        );
 
-    // add zenstack/schema.prisma to .gitignore
-    const gitIgnorePath = path.join(projectPath, '.gitignore');
-    let gitIgnoreContent = '';
-    if (fs.existsSync(gitIgnorePath)) {
-        gitIgnoreContent =
-            fs.readFileSync(gitIgnorePath, { encoding: 'utf-8' }) + '\n';
-    }
+        // add zenstack/schema.prisma to .gitignore
+        const gitIgnorePath = path.join(projectPath, '.gitignore');
+        let gitIgnoreContent = '';
+        if (fs.existsSync(gitIgnorePath)) {
+            gitIgnoreContent =
+                fs.readFileSync(gitIgnorePath, { encoding: 'utf-8' }) + '\n';
+        }
 
-    if (!gitIgnoreContent.includes('zenstack/schema.prisma')) {
-        gitIgnoreContent += 'zenstack/schema.prisma\n';
-        fs.writeFileSync(gitIgnorePath, gitIgnoreContent);
+        if (!gitIgnoreContent.includes('zenstack/schema.prisma')) {
+            gitIgnoreContent += 'zenstack/schema.prisma\n';
+            fs.writeFileSync(gitIgnorePath, gitIgnoreContent);
+        }
+
+        schemaGenerated = true;
     }
 
-    console.log(`Sample model generated at: ${colors.green(schema)}
+    installPackage('zenstack', true, undefined, projectPath);
+    installPackage('@zenstackhq/runtime', false, undefined, projectPath);
+
+    if (schemaGenerated) {
+        console.log(`Sample model generated at: ${colors.green(schema)}
 
-Please check the following guide on how to model your app:
-    https://zenstack.dev/#/modeling-your-app.
-`);
+        Please check the following guide on how to model your app:
+            https://zenstack.dev/#/modeling-your-app.
+        `);
+    }
 }
 
 /**
@@ -164,7 +173,7 @@ export async function loadDocument(
 }
 
 export async function runGenerator(
-    options: { schema: string },
+    options: { schema: string; packageManager: string },
     includedGenerators?: string[],
     clearOutput = true
 ) {

package/src/cli/index.ts

@@ -21,6 +21,7 @@ export const initAction = async (projectPath: string): Promise<void> => {
 
 export const generateAction = async (options: {
     schema: string;
+    packageManager: string;
 }): Promise<void> => {
     await telemetry.trackSpan(
         'cli:command:start',
@@ -116,11 +117,17 @@ export default async function (): Promise<void> {
                 `schema file (with extension ${schemaExtensions})`
             ).default('./zenstack/schema.zmodel');
 
+            const pmOption = new Option(
+                '--package-manager, -p',
+                'package manager to use: "npm", "yarn" or "pnpm"'
+            ).default('auto detect');
+
             //#region wraps Prisma commands
 
             program
                 .command('init')
                 .description('Set up a new ZenStack project.')
+                .addOption(pmOption)
                 .argument('<path>', 'project path')
                 .action(initAction);
 
@@ -130,6 +137,7 @@ export default async function (): Promise<void> {
                     'Generates RESTful API and Typescript client for your data model.'
                 )
                 .addOption(schemaOption)
+                .addOption(pmOption)
                 .action(generateAction);
 
             const migrate = program

package/src/generator/constants.ts

@@ -1,4 +1,4 @@
-export const INTERNAL_PACKAGE = '@zenstackhq/internal';
+export const RUNTIME_PACKAGE = '@zenstackhq/runtime';
 export const GUARD_FIELD_NAME = 'zenstack_guard';
 export const TRANSACTION_FIELD_NAME = 'zenstack_transaction';
 export const API_ROUTE_NAME = 'zenstack';

package/src/generator/prisma/query-guard-generator.ts

@@ -10,12 +10,12 @@ import {
     PolicyKind,
     PolicyOperationKind,
     RuntimeAttribute,
-} from '@zenstackhq/internal';
+} from '@zenstackhq/runtime/server';
 import path from 'path';
 import { Project, SourceFile, VariableDeclarationKind } from 'ts-morph';
 import {
     GUARD_FIELD_NAME,
-    INTERNAL_PACKAGE,
+    RUNTIME_PACKAGE,
     UNKNOWN_USER_ID,
 } from '../constants';
 import { Context } from '../types';
@@ -38,7 +38,7 @@ export default class QueryGuardGenerator {
 
         sf.addImportDeclaration({
             namedImports: [{ name: 'QueryContext' }],
-            moduleSpecifier: INTERNAL_PACKAGE,
+            moduleSpecifier: `${RUNTIME_PACKAGE}/server`,
             isTypeOnly: true,
         });
 

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

@@ -5,7 +5,7 @@ import { paramCase } from 'change-case';
 import { DataModel } from '@lang/generated/ast';
 import colors from 'colors';
 import { extractDataModelsWithAllowRules } from '../ast-utils';
-import { API_ROUTE_NAME } from '../constants';
+import { API_ROUTE_NAME, RUNTIME_PACKAGE } from '../constants';
 
 /**
  * Generate react data query hooks code
@@ -51,7 +51,9 @@ export default class ReactHooksGenerator implements Generator {
             moduleSpecifier: '../../.prisma',
         });
         sf.addStatements([
-            `import { request, validate, ServerErrorCode, RequestOptions } from '@zenstackhq/runtime/client';`,
+            `import * as request from '${RUNTIME_PACKAGE}/lib/request';`,
+            `import { ServerErrorCode, RequestOptions } from '${RUNTIME_PACKAGE}/lib/types';`,
+            `import { validate } from '${RUNTIME_PACKAGE}/lib/validation';`,
             `import { type SWRResponse } from 'swr';`,
             `import { ${this.getValidator(
                 model,

package/src/generator/service/index.ts

@@ -2,7 +2,7 @@ import { Context, Generator } from '../types';
 import { Project } from 'ts-morph';
 import * as path from 'path';
 import colors from 'colors';
-import { INTERNAL_PACKAGE } from '../constants';
+import { RUNTIME_PACKAGE } from '../constants';
 
 /**
  * Generates ZenStack service code
@@ -22,7 +22,7 @@ export default class ServiceGenerator implements Generator {
 
         sf.addStatements([
             `import { PrismaClient } from "../.prisma";`,
-            `import { DefaultService } from "${INTERNAL_PACKAGE}";`,
+            `import { DefaultService } from "${RUNTIME_PACKAGE}/lib/service";`,
         ]);
 
         const cls = sf.addClass({

package/src/utils/pkg-utils.ts

@@ -0,0 +1,63 @@
+import fs from 'fs';
+import path from 'path';
+import { execSync } from './exec-utils';
+
+type PackageManagers = 'npm' | 'yarn' | 'pnpm';
+
+function getPackageManager(projectPath = '.'): PackageManagers {
+    if (fs.existsSync(path.join(projectPath, 'yarn.lock'))) {
+        return 'yarn';
+    } else if (fs.existsSync(path.join(projectPath, 'pnpm-lock.yaml'))) {
+        return 'pnpm';
+    } else {
+        return 'npm';
+    }
+}
+
+export function installPackage(
+    pkg: string,
+    dev: boolean,
+    pkgManager: PackageManagers | undefined = undefined,
+    projectPath = '.'
+) {
+    const manager = pkgManager ?? getPackageManager(projectPath);
+    console.log(`Installing package "${pkg}" with ${manager}`);
+    switch (manager) {
+        case 'yarn':
+            execSync(
+                `yarn add --cwd "${projectPath}" ${
+                    dev ? ' --save-dev' : ''
+                } ${pkg}`
+            );
+            break;
+
+        case 'pnpm':
+            execSync(
+                `pnpm add -C "${projectPath}" ${
+                    dev ? ' --save-dev' : ''
+                } ${pkg}`
+            );
+            break;
+
+        default:
+            execSync(
+                `npm install --prefix "${projectPath}" ${
+                    dev ? ' --save-dev' : ''
+                } ${pkg}`
+            );
+            break;
+    }
+}
+
+export function ensurePackage(
+    pkg: string,
+    dev: boolean,
+    pkgManager: PackageManagers | undefined = undefined,
+    projectPath = '.'
+) {
+    try {
+        require(pkg);
+    } catch {
+        installPackage(pkg, dev, pkgManager, projectPath);
+    }
+}