@cabloy/cli 3.1.13 → 3.1.14

package/dist/index.js

@@ -2,6 +2,7 @@ import { glob } from '@cabloy/module-glob';
 import boxen from 'boxen';
 import chalk from 'chalk';
 import { createRequire } from 'node:module';
+import path from 'node:path';
 import semver from 'semver';
 import urllib from 'urllib';
 import NPMConfig from '@npmcli/config';
@@ -9,7 +10,6 @@ import npmDefinitions from '@npmcli/config/lib/definitions/index.js';
 import DeepEqual from 'deep-equal';
 import fse from 'fs-extra';
 import { globby } from 'globby';
-import path from 'node:path';
 import * as ModuleInfo from '@cabloy/module-info';
 import { ProcessHelper } from '@cabloy/process-helper';
 import { combineResourceName, catchError, isNil, evaluate } from '@cabloy/utils';
@@ -130,6 +130,12 @@ async function getPackageInfo(packageName) {
 function patchFlavor(flavor) {
   return Array.isArray(flavor) ? flavor[flavor.length - 1] : flavor;
 }
+function parseProjectPath(projectPath) {
+  const projectPathDefault = process.cwd();
+  if (!projectPath) return projectPathDefault;
+  if (path.isAbsolute(projectPath)) return projectPath;
+  return path.join(projectPathDefault, projectPath);
+}
 
 class LocalCommon {
   constructor(cli) {
@@ -1603,13 +1609,14 @@ class CabloyCommand extends BaseCommand {
     const parsed = await this[PARSE](this.rawArgv);
     // argv
     const argv = {
-      projectPath: process.cwd()
+      projectPath: parseProjectPath(parsed.projectPath)
     };
     // indexBrandName
-    const indexBrandName = this.rawArgv.indexOf(this.brandName);
+    const indexBrandName = parsed._.indexOf(this.brandName);
     // cli
-    const indexCommand = indexBrandName > -1 ? indexBrandName + 1 : 0;
-    Object.assign(argv, this._prepareCliFullName(parsed._[indexCommand]));
+    const commandName = parsed._[indexBrandName + 1];
+    const indexCommand = this.rawArgv.indexOf(commandName);
+    Object.assign(argv, this._prepareCliFullName(commandName));
     // cli meta
     const context = {
       brandName: this.brandName,
@@ -1620,12 +1627,7 @@ class CabloyCommand extends BaseCommand {
       context
     });
     // cli run
-    const rawArgv = this.rawArgv.slice();
-    if (indexBrandName > -1) {
-      rawArgv.splice(0, indexBrandName + 2);
-    } else {
-      rawArgv.splice(0, 1);
-    }
+    const rawArgv = this.rawArgv.slice(indexCommand + 1);
     const command = new CliCommand(rawArgv, {
       meta,
       argv
@@ -1680,4 +1682,4 @@ function metadataCustomSnippet(snippet) {
   return snippet;
 }
 
-export { BeanCli, BeanCliBase, CabloyCommand, CliCommand, LocalConsole, LocalHelper, LocalTemplate, checkForUpdates, collectCommands, commandsConfig, findCommand, getCommandsMeta, getPackageInfo, getRegistry, metadataCustomSnippet, patchFlavor };
+export { BeanCli, BeanCliBase, CabloyCommand, CliCommand, LocalConsole, LocalHelper, LocalTemplate, checkForUpdates, collectCommands, commandsConfig, findCommand, getCommandsMeta, getPackageInfo, getRegistry, metadataCustomSnippet, parseProjectPath, patchFlavor };

package/dist/utils.d.ts

@@ -2,3 +2,4 @@ import type { VonaMetaFlavor } from '@cabloy/module-info';
 export declare function checkForUpdates(packageName: string): Promise<void>;
 export declare function getPackageInfo(packageName: string): Promise<any>;
 export declare function patchFlavor(flavor?: VonaMetaFlavor | VonaMetaFlavor[]): VonaMetaFlavor | undefined;
+export declare function parseProjectPath(projectPath?: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.13",
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
+  "version": "3.1.14",
+  "gitHead": "77e7d321e21482a08f743d441a017f3fb7be43cc",
   "description": "@cabloy/cli",
   "keywords": [
     "cabloy-cli",
@@ -26,9 +26,19 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
   "dependencies": {
     "@babel/parser": "^7.29.2",
+    "@cabloy/module-glob": "^5.3.10",
     "@cabloy/module-info": "^2.0.0",
+    "@cabloy/process-helper": "^3.1.5",
+    "@cabloy/utils": "^2.1.19",
     "@cabloy/word-utils": "^2.1.8",
     "@npmcli/config": "^10.8.1",
     "@zhennann/common-bin": "^4.0.1",
@@ -45,13 +55,6 @@
     "istextorbinary": "^3.3.0",
     "semver": "^7.7.4",
     "tmp": "^0.2.5",
-    "urllib": "^4.9.0",
-    "@cabloy/module-glob": "^5.3.10",
-    "@cabloy/process-helper": "^3.1.5",
-    "@cabloy/utils": "^2.1.19"
-  },
-  "scripts": {
-    "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc"
+    "urllib": "^4.9.0"
   }
-}
+}