zenstack 0.3.12 → 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.12",
+  "version": "0.3.13",
   "author": {
     "name": "ZenStack Team"
   },
@@ -65,7 +65,7 @@
   },
   "main": "./bundle/extension.js",
   "dependencies": {
-    "@zenstackhq/runtime": "0.3.12",
+    "@zenstackhq/runtime": "0.3.13",
     "async-exit-hook": "^2.0.1",
     "change-case": "^4.1.2",
     "chevrotain": "^9.1.0",
@@ -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

@@ -20,6 +20,11 @@ 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;
 
@@ -103,12 +108,14 @@ model Post {
     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!'));
 }
 
 /**
@@ -176,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

@@ -13,7 +13,7 @@ import { initProject, runGenerator } from './cli-util';
 export const initAction = async (
     projectPath: string,
     options: {
-        packageManager: PackageManagers | 'auto detect';
+        packageManager: PackageManagers | undefined;
     }
 ): Promise<void> => {
     await telemetry.trackSpan(
@@ -21,19 +21,13 @@ export const initAction = async (
         'cli:command:complete',
         'cli:command:error',
         { command: 'init' },
-        () =>
-            initProject(
-                projectPath ?? '.',
-                options.packageManager === 'auto detect'
-                    ? undefined
-                    : options.packageManager
-            )
+        () => initProject(projectPath, options.packageManager)
     );
 };
 
 export const generateAction = async (options: {
     schema: string;
-    packageManager: string;
+    packageManager: PackageManagers | undefined;
 }): Promise<void> => {
     await telemetry.trackSpan(
         'cli:command:start',
@@ -130,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
 
@@ -140,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

@@ -21,12 +21,12 @@ export function installPackage(
     projectPath = '.'
 ) {
     const manager = pkgManager ?? getPackageManager(projectPath);
-    console.log(`Installing package "${pkg}@dev" with ${manager}`);
+    console.log(`Installing package "${pkg}" with ${manager}`);
     switch (manager) {
         case 'yarn':
             execSync(
                 `yarn --cwd "${projectPath}" add ${pkg} ${
-                    dev ? ' --save-dev' : ''
+                    dev ? ' --dev' : ''
                 } --ignore-engines`
             );
             break;