easy-soft-develop 2.1.13 → 2.1.14

package/bin/cli.js

@@ -57,7 +57,7 @@ program
   .command('publish')
   .description('publish public packages to npm')
   .option('--packages <string>', 'the packages will publish')
-  .requiredOption('--opt <string>', 'use npm one-time password', false)
+  .option('--opt <boolean>', 'use npm one-time password', false)
   .action((a, o) => {
     publishToNpm.run(a, o);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {
@@ -29,9 +29,9 @@
     "commitlint": "npx commitlint --edit",
     "test:bin:check-all-package-version": "node ./bin/cli.js check-all-package-version",
     "test:bin:code": "node ./bin/cli.js code --dataPath ./develop/generatorCodeSource/code.json",
-    "test:bin:commit-refresh": "node ./bin/cli.js commit-refresh",
     "test:bin:create-assist-scripts": "node ./bin/cli.js create-assist-scripts",
     "test:bin:create-lerna-project": "node ./bin/cli.js create-lerna-project",
+    "test:bin:publish": "node ./bin/cli.js publish --packages ss --opt true",
     "test:bin:sleep": "node ./bin/cli.js sleep --second 2 --showInfo true",
     "test:bin:update-all-package-version": "node ./bin/cli.js update-all-package-version",
     "test:commitRefresh": "node ./test/commitRefresh.test.js",
@@ -61,6 +61,7 @@
     "commander": "^10.0.0",
     "download": "^8.0.0",
     "download-git-repo": "^3.0.2",
+    "enquirer": "^2.3.6",
     "fs-extra": "^11.1.1",
     "hpagent": "^1.2.0",
     "ping": "^0.4.4",

package/src/cliCollection/publish-to-npm.js

@@ -1,3 +1,5 @@
+const { prompt: promptAssist } = require('enquirer');
+
 const { loopPackage } = require('../tools/package.tools');
 const {
   exit,
@@ -11,17 +13,11 @@ const {
   promptEmptyLine,
 } = require('../tools/meta');
 
-exports.run = function (s, o) {
-  const {
-    _optionValues: { packages, opt },
-  } = o;
-
+function publishToNpm(packages, o, useOpt, opt) {
   if (checkStringIsEmpty(packages)) {
     exit();
   }
 
-  const useOpt = !!opt;
-
   const packageList = packages.split(',');
 
   promptInfo('publish public packages to npm');
@@ -33,13 +29,13 @@ exports.run = function (s, o) {
       try {
         promptInfo(
           `package ${name}: npm publish --registry https://registry.npmjs.org/${
-            useOpt ? ' --opt' : ''
+            useOpt ? ` --opt ${opt}` : ''
           }`,
         );
 
         exec(
           `npm publish --registry https://registry.npmjs.org/${
-            useOpt ? ' --opt' : ''
+            useOpt ? ` --opt ${opt}` : ''
           }`,
         );
 
@@ -53,4 +49,24 @@ exports.run = function (s, o) {
   promptSuccess('publish complete');
 
   exit();
+}
+
+exports.run = async function (s, o) {
+  const { packages, opt: useOpt } = s;
+
+  const useOptAdjust = !!useOpt;
+
+  if (!useOptAdjust) {
+    publishToNpm(packages, o, useOptAdjust, '');
+
+    return;
+  }
+
+  const { opt } = await promptAssist({
+    type: 'input',
+    name: 'opt',
+    message: 'input npm one-time password',
+  });
+
+  publishToNpm(packages, o, useOptAdjust, opt);
 };

package/types/cliCollection/publish-to-npm.d.ts

@@ -1 +1 @@
-export function run(s: any, o: any): void;
+export function run(s: any, o: any): Promise<void>;