@cabloy/cli 3.0.13 → 3.0.15

package/dist/lib/local.helper.js

@@ -11,7 +11,7 @@ import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import * as ModuleInfo from '@cabloy/module-info';
 import { ProcessHelper } from '@cabloy/process-helper';
-import { combineWordsDeduplicate, parseFirstWord } from '@cabloy/word-utils';
+import { combineResourceName } from '@cabloy/utils';
 import Boxen from 'boxen';
 import Chalk from 'chalk';
 import TableClass from 'cli-table3';
@@ -235,12 +235,7 @@ export class LocalHelper {
         }
     }
     combineModuleNameAndResource(moduleName, resourceName) {
-        let name = combineWordsDeduplicate(ModuleInfo.relativeNameToCapitalize(moduleName, false), this.firstCharToUpperCase(resourceName));
-        const firstWord = parseFirstWord(name);
-        if (firstWord === 'a') {
-            name = this.firstCharToLowerCase(name.substring(1));
-        }
-        return name;
+        return combineResourceName(resourceName, moduleName, true, true);
     }
     async importDynamic(fileName, fn) {
         // load

package/dist/lib/local.template.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
+import { catchError } from '@cabloy/utils';
 import ejs from '@zhennann/ejs';
 import { globby } from 'globby';
 import gogocode from 'gogocode';
@@ -145,7 +146,9 @@ export class LocalTemplate {
             fs.writeFileSync(targetFile, result);
             // format
             if (changed) {
-                await this.helper.formatFile({ fileName: targetFile, logPrefix: 'format: ' });
+                await catchError(() => {
+                    return this.helper.formatFile({ fileName: targetFile, logPrefix: 'format: ' });
+                });
             }
         }
         else {
@@ -272,7 +275,9 @@ export class LocalTemplate {
             // save
             fs.writeFileSync(targetFile, outputCode);
             // format
-            await this.helper.formatFile({ fileName: targetFile, logPrefix: 'format: ' });
+            await catchError(() => {
+                return this.helper.formatFile({ fileName: targetFile, logPrefix: 'format: ' });
+            });
         }
     }
     _parseSnippetFilePrefix(fileName) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
   "type": "module",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "@cabloy/cli",
   "publishConfig": {
     "access": "public"
@@ -25,8 +25,20 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "lint": "eslint .",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "tsc:publish": "npm run clean && tsc",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
   "dependencies": {
     "@babel/parser": "^7.26.5",
+    "@cabloy/module-glob": "^5.2.3",
+    "@cabloy/module-info": "^1.3.10",
+    "@cabloy/process-helper": "^2.0.8",
+    "@cabloy/utils": "^1.0.17",
     "@cabloy/word-utils": "^2.0.1",
     "@npmcli/config": "^8.3.4",
     "@zhennann/common-bin": "^4.0.0",
@@ -42,11 +54,7 @@
     "istextorbinary": "^3.3.0",
     "semver": "^7.6.2",
     "tmp": "^0.2.3",
-    "urllib": "^3.24.0",
-    "@cabloy/module-glob": "^5.2.1",
-    "@cabloy/module-info": "^1.3.8",
-    "@cabloy/process-helper": "^2.0.6",
-    "@cabloy/utils": "^1.0.15"
+    "urllib": "^3.24.0"
   },
-  "gitHead": "2d40c063c115b230fdbc89f5a78b4412ebd0dfc9"
-}
+  "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b"
+}