@cabloy/cli 3.1.18 → 3.1.21

package/dist/index.js

@@ -492,19 +492,49 @@ class LocalHelper {
     if (!moduleInfo) throw new Error(`module name is not valid: ${moduleName}`);
     return moduleInfo;
   }
+  parseModuleInfoCanonical(moduleName, moduleRole = 'module') {
+    const moduleInfo = this.parseModuleInfo(moduleName);
+    if (moduleInfo.relativeName !== moduleName) {
+      throw new Error(`${moduleRole} name must use the canonical relative module name: ${moduleInfo.relativeName}. Received: ${moduleName}. Use names like training-student, not package names or extra-suffixed names.`);
+    }
+    return moduleInfo;
+  }
   findModule(moduleName) {
     const moduleInfo = this.parseModuleInfo(moduleName);
     return this.cli.modulesMeta.modules[moduleInfo.relativeName];
   }
+  findModuleCanonical(moduleName, moduleRole = 'module') {
+    const moduleInfo = this.parseModuleInfoCanonical(moduleName, moduleRole);
+    const module = this.cli.modulesMeta.modules[moduleInfo.relativeName];
+    if (!module) {
+      throw new Error(`${moduleRole} does not exist: ${moduleName}`);
+    }
+    return module;
+  }
   parseSuiteInfo(suiteName) {
     const suiteInfo = ModuleInfo.parseInfoPro(suiteName, process.env.CabloyCliBrandName, 'suite');
     if (!suiteInfo) throw new Error(`suite name is not valid: ${suiteName}`);
     return suiteInfo;
   }
+  parseSuiteInfoCanonical(suiteName, suiteRole = 'suite') {
+    const suiteInfo = this.parseSuiteInfo(suiteName);
+    if (suiteInfo.relativeName !== suiteName) {
+      throw new Error(`${suiteRole} name must use the canonical relative suite name: ${suiteInfo.relativeName}. Received: ${suiteName}. Use names like a-training, not package names or extra-suffixed names.`);
+    }
+    return suiteInfo;
+  }
   findSuite(suiteName) {
     const suiteInfo = this.parseSuiteInfo(suiteName);
     return this.cli.modulesMeta.suites[suiteInfo.relativeName];
   }
+  findSuiteCanonical(suiteName, suiteRole = 'suite') {
+    const suiteInfo = this.parseSuiteInfoCanonical(suiteName, suiteRole);
+    const suite = this.cli.modulesMeta.suites[suiteInfo.relativeName];
+    if (!suite) {
+      throw new Error(`${suiteRole} does not exist: ${suiteName}`);
+    }
+    return suite;
+  }
   async ensureDir(dir) {
     await fse.ensureDir(dir);
     return dir;

package/dist/lib/local.helper.d.ts

@@ -79,9 +79,13 @@ export declare class LocalHelper {
     slashPrefixForPath(count: number): string;
     parseNameMeta(name: string, ignores?: string[]): NameMeta;
     parseModuleInfo(moduleName: any): ModuleInfo.IModuleInfo;
+    parseModuleInfoCanonical(moduleName: any, moduleRole?: string): ModuleInfo.IModuleInfo;
     findModule(moduleName: any): ModuleInfo.IModule;
+    findModuleCanonical(moduleName: any, moduleRole?: string): ModuleInfo.IModule;
     parseSuiteInfo(suiteName: any): ModuleInfo.IModuleInfo;
+    parseSuiteInfoCanonical(suiteName: any, suiteRole?: string): ModuleInfo.IModuleInfo;
     findSuite(suiteName: any): ModuleInfo.ISuite;
+    findSuiteCanonical(suiteName: any, suiteRole?: string): ModuleInfo.ISuite;
     ensureDir(dir: any): Promise<any>;
     pnpmInstall(): Promise<void>;
     formatFile({ fileName, logPrefix }: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.18",
-  "gitHead": "ca10457f38716ad28bf5918dd67c85dd1f7dc9d0",
+  "version": "3.1.21",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "@cabloy/cli",
   "keywords": [
     "cabloy-cli",
@@ -26,19 +26,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && node ../cli/src/bin/vona.ts :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.13",
     "@cabloy/module-info": "^2.0.0",
-    "@cabloy/process-helper": "^3.1.8",
-    "@cabloy/utils": "^2.1.22",
     "@cabloy/word-utils": "^2.1.8",
     "@npmcli/config": "^10.8.1",
     "@zhennann/common-bin": "^4.0.1",
@@ -55,6 +45,13 @@
     "istextorbinary": "^3.3.0",
     "semver": "^7.7.4",
     "tmp": "^0.2.7",
-    "urllib": "^4.9.0"
+    "urllib": "^4.9.0",
+    "@cabloy/module-glob": "^5.3.13",
+    "@cabloy/process-helper": "^3.1.8",
+    "@cabloy/utils": "^2.1.22"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "tsc:publish": "npm run clean && node ../cli/src/bin/vona.ts :bin:buildGeneral && tsc"
   }
-}
+}