zenstack 0.3.11 → 0.3.13

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.11",
+  "version": "0.3.13",
   "author": {
     "name": "ZenStack Team"
   },
@@ -65,7 +65,7 @@
   },
   "main": "./bundle/extension.js",
   "dependencies": {
-    "@zenstackhq/runtime": "0.3.11",
+    "@zenstackhq/runtime": "0.3.13",
     "async-exit-hook": "^2.0.1",
     "change-case": "^4.1.2",
     "chevrotain": "^9.1.0",
@@ -118,7 +118,7 @@
     "vscode:prepublish": "cp ../../README.md ./ && pnpm lint && pnpm build",
     "vscode:package": "vsce package --no-dependencies",
     "clean": "rimraf bundle",
-    "build": "pnpm langium:generate && tsc --noEmit && pnpm bundle && cp -r src/res/* bundle/res/",
+    "build": "pnpm -C ../runtime build && pnpm langium:generate && tsc --noEmit && pnpm bundle && cp -r src/res/* bundle/res/",
     "bundle": "npm run clean && node build/bundle.js --minify",
     "bundle-watch": "node build/bundle.js --watch",
     "ts:watch": "tsc --watch --noEmit",
@@ -127,6 +127,7 @@
     "langium:generate": "langium generate",
     "langium:watch": "langium generate --watch",
     "watch": "concurrently --kill-others \"npm:langium:watch\" \"npm:bundle-watch\"",
-    "test": "jest"
+    "test": "jest",
+    "postinstall": "bin/post-install.js"
   }
 }

package/src/cli/cli-util.ts

@@ -6,7 +6,7 @@ import fs from 'fs';
 import { LangiumServices } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 import path from 'path';
-import { installPackage } from 'src/utils/pkg-utils';
+import { installPackage, PackageManagers } from '../utils/pkg-utils';
 import { URI } from 'vscode-uri';
 import { ZenStackGenerator } from '../generator';
 import { GENERATED_CODE_PATH } from '../generator/constants';
@@ -16,7 +16,15 @@ import { CliError } from './cli-error';
 /**
  * Initializes an existing project for ZenStack
  */
-export async function initProject(projectPath: string) {
+export async function initProject(
+    projectPath: string,
+    packageManager: PackageManagers | undefined
+) {
+    if (!fs.existsSync(projectPath)) {
+        console.error(`Path does not exist: ${projectPath}`);
+        throw new CliError('project path does not exist');
+    }
+
     const schema = path.join(projectPath, 'zenstack', 'schema.zmodel');
     let schemaGenerated = false;
 
@@ -96,16 +104,18 @@ model Post {
         schemaGenerated = true;
     }
 
-    installPackage('zenstack', true, undefined, projectPath);
-    installPackage('@zenstackhq/runtime', false, undefined, projectPath);
+    installPackage('zenstack', true, packageManager, projectPath);
+    installPackage('@zenstackhq/runtime', false, packageManager, projectPath);
 
     if (schemaGenerated) {
-        console.log(`Sample model generated at: ${colors.green(schema)}
+        console.log(`Sample model generated at: ${colors.blue(schema)}
 
         Please check the following guide on how to model your app:
             https://zenstack.dev/#/modeling-your-app.
-        `);
+            `);
     }
+
+    console.log(colors.green('\nProject initialized successfully!'));
 }
 
 /**
@@ -173,7 +183,7 @@ export async function loadDocument(
 }
 
 export async function runGenerator(
-    options: { schema: string; packageManager: string },
+    options: { schema: string; packageManager: PackageManagers | undefined },
     includedGenerators?: string[],
     clearOutput = true
 ) {

package/src/cli/index.ts

@@ -3,25 +3,31 @@ import { paramCase } from 'change-case';
 import colors from 'colors';
 import { Command, Option } from 'commander';
 import path from 'path';
+import { PackageManagers } from '../utils/pkg-utils';
 import { ZModelLanguageMetaData } from '../language-server/generated/module';
 import telemetry from '../telemetry';
 import { execSync } from '../utils/exec-utils';
 import { CliError } from './cli-error';
 import { initProject, runGenerator } from './cli-util';
 
-export const initAction = async (projectPath: string): Promise<void> => {
+export const initAction = async (
+    projectPath: string,
+    options: {
+        packageManager: PackageManagers | undefined;
+    }
+): Promise<void> => {
     await telemetry.trackSpan(
         'cli:command:start',
         'cli:command:complete',
         'cli:command:error',
         { command: 'init' },
-        () => initProject(projectPath)
+        () => initProject(projectPath, options.packageManager)
     );
 };
 
 export const generateAction = async (options: {
     schema: string;
-    packageManager: string;
+    packageManager: PackageManagers | undefined;
 }): Promise<void> => {
     await telemetry.trackSpan(
         'cli:command:start',
@@ -118,9 +124,9 @@ export default async function (): Promise<void> {
             ).default('./zenstack/schema.zmodel');
 
             const pmOption = new Option(
-                '--package-manager, -p',
-                'package manager to use: "npm", "yarn" or "pnpm"'
-            ).default('auto detect');
+                '-p, --package-manager <pm>',
+                'package manager to use'
+            ).choices(['npm', 'yarn', 'pnpm']);
 
             //#region wraps Prisma commands
 
@@ -128,7 +134,7 @@ export default async function (): Promise<void> {
                 .command('init')
                 .description('Set up a new ZenStack project.')
                 .addOption(pmOption)
-                .argument('<path>', 'project path')
+                .argument('[path]', 'project path', '.')
                 .action(initAction);
 
             program

package/src/utils/pkg-utils.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { execSync } from './exec-utils';
 
-type PackageManagers = 'npm' | 'yarn' | 'pnpm';
+export type PackageManagers = 'npm' | 'yarn' | 'pnpm';
 
 function getPackageManager(projectPath = '.'): PackageManagers {
     if (fs.existsSync(path.join(projectPath, 'yarn.lock'))) {
@@ -25,9 +25,9 @@ export function installPackage(
     switch (manager) {
         case 'yarn':
             execSync(
-                `yarn add --cwd "${projectPath}" ${
-                    dev ? ' --save-dev' : ''
-                } ${pkg}`
+                `yarn --cwd "${projectPath}" add ${pkg} ${
+                    dev ? ' --dev' : ''
+                } --ignore-engines`
             );
             break;