pjj 0.2.0 → 0.2.2

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "pjj",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "禁止在项目的根目录执行 npm publish，防止意外发布。该脚本命令需在 `prepublishOnly`  ` 钩子中配置",
   "license": "ISC",
   "dependencies": {
     "@qqi/dev-log": ">=0.1.0 <1.0.0",
-    "a-command": ">=2.1.2 <3.0.0",
-    "a-js-tools": ">=0.5.4 <1.0.0",
-    "a-node-tools": ">=2.2.0 <3.0.0",
-    "color-pen": "^1.2.2"
+    "a-command": ">=2.1.5 <3.0.0",
+    "a-js-tools": ">=0.6.0 <1.0.0",
+    "a-node-tools": ">=2.2.1 <3.0.0",
+    "color-pen": ">=1.2.2 <2.0.0"
   },
   "author": {
     "name": "🥜",
@@ -17,9 +17,8 @@
     "url": "https://earthnut.dev"
   },
   "files": [
-    "bin.js",
     "src",
-    "index.mjs"
+    "bin.mjs"
   ],
   "keywords": [
     "pjj"
@@ -38,6 +37,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "bin": {
-    "pjj": "bin.js"
+    "pjj": "bin.mjs"
   }
 }

package/src/colorText.mjs

@@ -1,3 +1,4 @@
+import { dog } from './dog.mjs';
 import { truncateStringWithChar, strInTerminalLength, pen } from 'color-pen';
 import { noColor } from './command.mjs';
 import { dataStore } from './data-store.mjs';
@@ -13,10 +14,18 @@ import { getRandomInt } from 'a-js-tools';
  */
 function colorText(str) {
     const { screenWith, safeWidth } = dataStore;
+    dog('开始计算文本长度');
     /**  安全区空白  */
     const blankSpace = ' '.repeat(safeWidth);
-    const computerStr = `${blankSpace}${truncateStringWithChar(str, screenWith)}${blankSpace}`;
-    strInTerminalLength(computerStr);
+    dog('空白长度为', safeWidth);
+    let computerStr = `${blankSpace}${truncateStringWithChar(str, screenWith)}${blankSpace}`;
+    dog('计算完毕字符串为', computerStr);
+    const strLen = strInTerminalLength(computerStr);
+    dog.warn('现在字符串的长度为：', strLen);
+    dog.warn('终端共可显示长度为：', screenWith);
+    if (strLen < screenWith) {
+        computerStr += ' ';
+    }
     return computerStr
         .split('')
         .map(char => noColor ? char : pen.number(getRandomInt(1, 225)).bgBlack(char))

package/src/main.mjs

@@ -5,6 +5,7 @@ import { line } from './line.mjs';
 import { _p } from 'a-node-tools';
 import { dog } from './dog.mjs';
 import { blackSpace } from './blackSpace.mjs';
+import { isNode } from 'a-js-tools';
 
 /**
  *  空行
@@ -14,7 +15,7 @@ const space = '\n'.repeat(3);
  * 主程序入口
  */
 function main() {
-    if (process && process.env && process.env.npm_lifecycle_event === script) {
+    if (isNode() && process.env.npm_lifecycle_event === script) {
         _p(space);
         _p(line());
         _p();
@@ -29,7 +30,7 @@ function main() {
         command.error();
     }
     else {
-        dog.error(process && process.env && process.env.npm_lifecycle_event);
+        dog.error(isNode() && process.env.npm_lifecycle_event);
         const m = '     所以，看见这段文本，说明你哪里 ❌ 了     ';
         _p('====================================');
         _p('跳过了禁止发布，而且该命令可能不会显示在终端\n');

package/bin.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-import './index.mjs';
-