@pisell/common 0.0.68 → 0.0.70

package/es/script/args.js

@@ -0,0 +1,176 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var ENV_CHOICES = ['release', 'pre', 'prod'];
+var BUMP_CHOICES = ['patch', 'minor', 'major'];
+var getFlagValue = function getFlagValue(_ref) {
+  var args = _ref.args,
+    index = _ref.index,
+    flagName = _ref.flagName;
+  var current = args[index];
+  var _current$split = current.split('='),
+    _current$split2 = _slicedToArray(_current$split, 2),
+    _current$split2$ = _current$split2[1],
+    valueFromEqual = _current$split2$ === void 0 ? '' : _current$split2$;
+  if (valueFromEqual) {
+    return {
+      value: valueFromEqual,
+      nextIndex: index
+    };
+  }
+  var next = args[index + 1];
+  if (!next || next.startsWith('-')) {
+    return {
+      error: "\u53C2\u6570 ".concat(flagName, " \u7F3A\u5C11\u503C"),
+      nextIndex: index
+    };
+  }
+  return {
+    value: next,
+    nextIndex: index + 1
+  };
+};
+var parseDeployArgs = function parseDeployArgs() {
+  var rawArgs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var parsed = {
+    action: null,
+    env: '',
+    version: '',
+    bump: '',
+    changelog: '',
+    isRelease: true,
+    whetherBuild: true,
+    isConfirm: true,
+    isManuallyUploadOss: false,
+    hasCliOptions: false,
+    errors: []
+  };
+  for (var index = 0; index < rawArgs.length; index++) {
+    var arg = rawArgs[index];
+    if (!arg.startsWith('-')) {
+      continue;
+    }
+    parsed.hasCliOptions = true;
+    if (arg === '--release') {
+      if (parsed.action && parsed.action !== 'release') {
+        parsed.errors.push('不能同时指定 --release 和 --upload');
+      }
+      parsed.action = 'release';
+      continue;
+    }
+    if (arg === '--upload') {
+      if (parsed.action && parsed.action !== 'uploadCode') {
+        parsed.errors.push('不能同时指定 --release 和 --upload');
+      }
+      parsed.action = 'uploadCode';
+      continue;
+    }
+    if (arg === '--yes') {
+      parsed.isConfirm = true;
+      continue;
+    }
+    if (arg === '--no-release') {
+      parsed.isRelease = false;
+      continue;
+    }
+    if (arg === '--build') {
+      parsed.whetherBuild = true;
+      continue;
+    }
+    if (arg === '--no-build') {
+      parsed.whetherBuild = false;
+      continue;
+    }
+    if (arg === '--manual-oss') {
+      parsed.isManuallyUploadOss = true;
+      continue;
+    }
+    if (arg === '--no-manual-oss') {
+      parsed.isManuallyUploadOss = false;
+      continue;
+    }
+    if (arg === '--patch' || arg === '--minor' || arg === '--major') {
+      parsed.bump = arg.replace('--', '');
+      continue;
+    }
+    if (arg === '--env' || arg.startsWith('--env=')) {
+      var _getFlagValue = getFlagValue({
+          args: rawArgs,
+          index: index,
+          flagName: '--env'
+        }),
+        value = _getFlagValue.value,
+        nextIndex = _getFlagValue.nextIndex,
+        error = _getFlagValue.error;
+      if (error) {
+        parsed.errors.push(error);
+        continue;
+      }
+      parsed.env = value;
+      index = nextIndex;
+      continue;
+    }
+    if (arg === '--version' || arg.startsWith('--version=')) {
+      var _getFlagValue2 = getFlagValue({
+          args: rawArgs,
+          index: index,
+          flagName: '--version'
+        }),
+        _value = _getFlagValue2.value,
+        _nextIndex = _getFlagValue2.nextIndex,
+        _error = _getFlagValue2.error;
+      if (_error) {
+        parsed.errors.push(_error);
+        continue;
+      }
+      parsed.version = _value;
+      index = _nextIndex;
+      continue;
+    }
+    if (arg === '--bump' || arg.startsWith('--bump=')) {
+      var _getFlagValue3 = getFlagValue({
+          args: rawArgs,
+          index: index,
+          flagName: '--bump'
+        }),
+        _value2 = _getFlagValue3.value,
+        _nextIndex2 = _getFlagValue3.nextIndex,
+        _error2 = _getFlagValue3.error;
+      if (_error2) {
+        parsed.errors.push(_error2);
+        continue;
+      }
+      parsed.bump = _value2;
+      index = _nextIndex2;
+      continue;
+    }
+    if (arg === '--changelog' || arg.startsWith('--changelog=')) {
+      var _getFlagValue4 = getFlagValue({
+          args: rawArgs,
+          index: index,
+          flagName: '--changelog'
+        }),
+        _value3 = _getFlagValue4.value,
+        _nextIndex3 = _getFlagValue4.nextIndex,
+        _error3 = _getFlagValue4.error;
+      if (_error3) {
+        parsed.errors.push(_error3);
+        continue;
+      }
+      parsed.changelog = _value3;
+      index = _nextIndex3;
+      continue;
+    }
+  }
+  if (parsed.env && !ENV_CHOICES.includes(parsed.env)) {
+    parsed.errors.push("--env \u4EC5\u652F\u6301 ".concat(ENV_CHOICES.join(', '), "\uFF0C\u5F53\u524D\u503C\u4E3A ").concat(parsed.env));
+  }
+  if (parsed.bump && !BUMP_CHOICES.includes(parsed.bump)) {
+    parsed.errors.push("--bump \u4EC5\u652F\u6301 ".concat(BUMP_CHOICES.join(', '), "\uFF0C\u5F53\u524D\u503C\u4E3A ").concat(parsed.bump));
+  }
+  return parsed;
+};
+export { ENV_CHOICES, BUMP_CHOICES, parseDeployArgs };

package/es/script/deploy.js

@@ -3,6 +3,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import inquirer from 'inquirer';
+import { parseDeployArgs } from "./args.js";
 import release from "./release/index.js";
 import uploadCode from "./uploadCode/index.js";
 var actions = {
@@ -25,16 +26,37 @@ var inquirerResult = function inquirerResult() {
 };
 var deploy = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res;
+    var _len,
+      rawArgs,
+      _key,
+      cliArgs,
+      res,
+      _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          for (_len = _args.length, rawArgs = new Array(_len), _key = 0; _key < _len; _key++) {
+            rawArgs[_key] = _args[_key];
+          }
+          cliArgs = parseDeployArgs(rawArgs);
+          if (cliArgs.errors.length) {
+            cliArgs.errors.forEach(function (item) {
+              return console.log("\u274C ".concat(item));
+            });
+            process.exit(1);
+          }
+          if (!cliArgs.action) {
+            _context.next = 5;
+            break;
+          }
+          return _context.abrupt("return", actions[cliArgs.action](cliArgs));
+        case 5:
+          _context.next = 7;
           return inquirerResult();
-        case 2:
+        case 7:
           res = _context.sent;
-          return _context.abrupt("return", actions[res.action]());
-        case 4:
+          return _context.abrupt("return", actions[res.action](cliArgs));
+        case 9:
         case "end":
           return _context.stop();
       }

package/es/script/index.js

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import path from 'path';
 import { fileURLToPath } from 'url';
 import deploy from "./deploy.js";
 import { loadJSON } from "./utils/index.js";
@@ -29,6 +30,9 @@ var __dirname = path.dirname(fileURLToPath(import.meta.url));
         console.log('pisell -h  --help  -H [全部命令]');
         console.log('pisell -v  --version  -V [显示版本]');
         console.log('pisell deploy [上传代码|发布代码]');
+        console.log('pisell deploy --release --env=release [直接发布, 未传--version默认最新版本]');
+        console.log('pisell deploy --upload --env=pre --patch --changelog="xxx" --no-release --yes');
+        console.log('deploy 参数: --release --upload --env --version --bump --patch --minor --major --changelog --no-release --build --no-build --manual-oss --yes');
         break;
       default:
         break;

package/es/script/release/index.js

@@ -107,14 +107,33 @@ function init() {
 }
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var projectAndEnv, versionList, res, releaseInstance;
+    var cliArgs,
+      projectAndEnv,
+      versionList,
+      isCliMode,
+      res,
+      releaseInstance,
+      _args2 = arguments;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context2.next = 2;
+          cliArgs = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          if (!cliArgs.env) {
+            _context2.next = 5;
+            break;
+          }
+          _context2.t0 = {
+            env: cliArgs.env
+          };
+          _context2.next = 8;
+          break;
+        case 5:
+          _context2.next = 7;
           return selectProject();
-        case 2:
-          projectAndEnv = _context2.sent;
+        case 7:
+          _context2.t0 = _context2.sent;
+        case 8:
+          projectAndEnv = _context2.t0;
           /** 之前选择项目模式改为获取当前主项目 */
           projectAndEnv.project = {
             path: './',
@@ -122,39 +141,74 @@ function _init() {
           };
 
           /** 通过项目和环境查询对应版本号 */
-          _context2.next = 6;
+          _context2.next = 12;
           return getVersionList(projectAndEnv);
-        case 6:
+        case 12:
           versionList = _context2.sent;
-          _context2.next = 9;
+          if (versionList.length) {
+            _context2.next = 16;
+            break;
+          }
+          console.log('未获取到可发布版本');
+          return _context2.abrupt("return");
+        case 16:
+          isCliMode = Boolean(cliArgs.action === 'release' || cliArgs.version);
+          if (!(cliArgs.version && !versionList.includes(cliArgs.version))) {
+            _context2.next = 20;
+            break;
+          }
+          console.log("\u672A\u627E\u5230\u7248\u672C ".concat(cliArgs.version, "\uFF0C\u53EF\u9009\u7248\u672C: ").concat(versionList.join(', ')));
+          return _context2.abrupt("return");
+        case 20:
+          if (!isCliMode) {
+            _context2.next = 24;
+            break;
+          }
+          _context2.t1 = {
+            version: cliArgs.version || versionList[0],
+            is_release: cliArgs.isConfirm
+          };
+          _context2.next = 27;
+          break;
+        case 24:
+          _context2.next = 26;
           return inquirerResult(versionList);
-        case 9:
-          res = _context2.sent;
+        case 26:
+          _context2.t1 = _context2.sent;
+        case 27:
+          res = _context2.t1;
+          if (res.is_release) {
+            _context2.next = 31;
+            break;
+          }
+          console.log('取消发布');
+          return _context2.abrupt("return");
+        case 31:
           releaseInstance = new Release(_objectSpread(_objectSpread({}, res), projectAndEnv));
-          _context2.prev = 11;
-          _context2.next = 14;
+          _context2.prev = 32;
+          _context2.next = 35;
           return releaseInstance.setConfig();
-        case 14:
-          _context2.next = 16;
+        case 35:
+          _context2.next = 37;
           return releaseInstance.connectServer();
-        case 16:
-          _context2.next = 18;
+        case 37:
+          _context2.next = 39;
           return releaseInstance.release();
-        case 18:
-          _context2.next = 20;
+        case 39:
+          _context2.next = 41;
           return releaseInstance.disconnectServer();
-        case 20:
-          _context2.next = 25;
+        case 41:
+          _context2.next = 46;
           break;
-        case 22:
-          _context2.prev = 22;
-          _context2.t0 = _context2["catch"](11);
-          console.log(_context2.t0);
-        case 25:
+        case 43:
+          _context2.prev = 43;
+          _context2.t2 = _context2["catch"](32);
+          console.log(_context2.t2);
+        case 46:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[11, 22]]);
+    }, _callee2, null, [[32, 43]]);
   }));
   return _init.apply(this, arguments);
 }

package/es/script/uploadCode/index.js

@@ -111,32 +111,83 @@ function init() {
  */
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res, isManuallyOss, isManuallyOssRes, uploadCode, version, currentUserName, result, _fileName, ossRes, conn, releaseInstance, branch, grayBranch;
+    var cliArgs,
+      isCliMode,
+      isBumpVersion,
+      res,
+      isManuallyOss,
+      isManuallyOssRes,
+      uploadCode,
+      version,
+      currentUserName,
+      result,
+      _fileName,
+      ossRes,
+      conn,
+      releaseInstance,
+      branch,
+      grayBranch,
+      _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          cliArgs = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          isCliMode = Boolean(cliArgs.action === 'uploadCode');
+          isBumpVersion = cliArgs.version === 'patch' || cliArgs.version === 'minor' || cliArgs.version === 'major';
+          if (!(isCliMode && cliArgs.version && !isBumpVersion && !cliArgs.bump)) {
+            _context.next = 6;
+            break;
+          }
+          console.log("upload \u6A21\u5F0F\u4E0B --version \u4EC5\u652F\u6301 patch/minor/major\uFF0C\u6216\u6539\u7528 --bump\uFF0C\u5F53\u524D\u503C\u4E3A ".concat(cliArgs.version));
+          return _context.abrupt("return");
+        case 6:
+          if (!isCliMode) {
+            _context.next = 10;
+            break;
+          }
+          _context.t0 = {
+            env: cliArgs.env || 'release',
+            version: cliArgs.bump || cliArgs.version || 'patch',
+            changelog: cliArgs.changelog || 'update',
+            is_release: cliArgs.isRelease,
+            whether_build: cliArgs.whetherBuild,
+            is_confirm: cliArgs.isConfirm
+          };
+          _context.next = 13;
+          break;
+        case 10:
+          _context.next = 12;
           return inquirerResult();
-        case 2:
-          res = _context.sent;
+        case 12:
+          _context.t0 = _context.sent;
+        case 13:
+          res = _context.t0;
           isManuallyOss = false;
           if (res.is_confirm) {
-            _context.next = 7;
+            _context.next = 18;
             break;
           }
           console.log('取消发布');
           return _context.abrupt("return");
-        case 7:
+        case 18:
           if (!(res.env === 'prod')) {
-            _context.next = 12;
+            _context.next = 27;
+            break;
+          }
+          if (!isCliMode) {
+            _context.next = 23;
             break;
           }
-          _context.next = 10;
+          isManuallyOss = cliArgs.isManuallyUploadOss;
+          _context.next = 27;
+          break;
+        case 23:
+          _context.next = 25;
           return isManuallyUploadOss();
-        case 10:
+        case 25:
           isManuallyOssRes = _context.sent;
           isManuallyOss = isManuallyOssRes.is_manually_upload_OSS;
-        case 12:
+        case 27:
           /** 之前选择项目模式改为获取当前主项目 */
           res.project = {
             path: './',
@@ -146,30 +197,30 @@ function _init() {
           // const data = await $`curl -X POST -H "Content-Type: application/json" -d '{"msg_type":"post","content":""}' https://open.feishu.cn/open-apis/bot/v2/hook/08349b0d-016c-4133-9442-9e95d4adc1e8`
 
           // 删除本地在远程不存在的tag
-          _context.next = 15;
+          _context.next = 30;
           return $(_templateObject || (_templateObject = _taggedTemplateLiteral(["git fetch --prune-tags"])));
-        case 15:
+        case 30:
           uploadCode = new UploadCode(res);
-          _context.next = 18;
+          _context.next = 33;
           return uploadCode.check();
-        case 18:
+        case 33:
           if (_context.sent) {
-            _context.next = 20;
+            _context.next = 35;
             break;
           }
           return _context.abrupt("return");
-        case 20:
+        case 35:
           console.log('开始更新版本号');
-          _context.next = 23;
+          _context.next = 38;
           return uploadCode.updateVersion();
-        case 23:
+        case 38:
           version = _context.sent;
           console.log('✅ 版本更新完成');
-          _context.next = 27;
+          _context.next = 42;
           return getCurrentUserName();
-        case 27:
+        case 42:
           currentUserName = _context.sent;
-          _context.next = 30;
+          _context.next = 45;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883\u5F00\u59CB").concat(res.is_release ? '上传并发布' : '上传'),
             content: [{
@@ -183,68 +234,72 @@ function _init() {
               value: version || ''
             }]
           });
-        case 30:
+        case 45:
           result = _context.sent;
           console.log(result, 'result');
-          _context.prev = 32;
+          _context.prev = 47;
           if (!res.whether_build) {
-            _context.next = 40;
+            _context.next = 55;
             break;
           }
           console.log('开始打包');
-          _context.next = 37;
+          _context.next = 52;
           return uploadCode.build();
-        case 37:
+        case 52:
           console.log('✅ 打包完成');
-          _context.next = 41;
+          _context.next = 56;
           break;
-        case 40:
+        case 55:
           console.log('使用本地/dist');
-        case 41:
+        case 56:
           if (!(res.env === 'prod')) {
-            _context.next = 51;
+            _context.next = 67;
             break;
           }
           if (isManuallyOss) {
-            _context.next = 51;
+            _context.next = 67;
             break;
           }
           _fileName = res.project.fileName; // 上传oss
-          _context.next = 46;
+          _context.next = 61;
           return uploadStaticToOSS(_fileName);
-        case 46:
-          _context.next = 48;
+        case 61:
+          if (isCliMode) {
+            _context.next = 67;
+            break;
+          }
+          _context.next = 64;
           return inquirerOss();
-        case 48:
+        case 64:
           ossRes = _context.sent;
           if (ossRes.is_upload_completed_OSS) {
-            _context.next = 51;
+            _context.next = 67;
             break;
           }
           return _context.abrupt("return");
-        case 51:
+        case 67:
           console.log('开始压缩');
-          _context.next = 54;
+          _context.next = 70;
           return uploadCode.compress();
-        case 54:
+        case 70:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 58;
+          _context.next = 74;
           return uploadCode.connectServer();
-        case 58:
+        case 74:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 63;
+          _context.next = 79;
           return uploadCode.serverUpload();
-        case 63:
+        case 79:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 67;
+          _context.next = 83;
           return uploadCode.serverUnpack();
-        case 67:
+        case 83:
           if (!res.is_release) {
-            _context.next = 77;
+            _context.next = 93;
             break;
           }
           releaseInstance = new Release({
@@ -254,40 +309,40 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 72;
+          _context.next = 88;
           return getGitCurrentBranch();
-        case 72:
+        case 88:
           branch = _context.sent;
           grayBranch = 'master';
           if (!originBranch.includes(branch.trim())) {
             grayBranch = branch;
           }
-          _context.next = 77;
+          _context.next = 93;
           return releaseInstance.release(grayBranch);
-        case 77:
-          _context.next = 79;
+        case 93:
+          _context.next = 95;
           return uploadCode.disconnectServer();
-        case 79:
-          _context.next = 81;
+        case 95:
+          _context.next = 97;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 81:
-          _context.next = 83;
+        case 97:
+          _context.next = 99;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 83:
+        case 99:
           console.log('✅ 成功后推送到git');
 
           // 只有在shop端发布
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 87;
+            _context.next = 103;
             break;
           }
-          _context.next = 87;
+          _context.next = 103;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 87:
-          _context.next = 89;
+        case 103:
+          _context.next = 105;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -301,20 +356,20 @@ function _init() {
               value: version || ''
             }]
           });
-        case 89:
-          _context.next = 100;
+        case 105:
+          _context.next = 116;
           break;
-        case 91:
-          _context.prev = 91;
-          _context.t0 = _context["catch"](32);
-          console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 96;
+        case 107:
+          _context.prev = 107;
+          _context.t1 = _context["catch"](47);
+          console.log(_context.t1, '执行出错 请排查重试');
+          _context.next = 112;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 96:
-          _context.next = 98;
+        case 112:
+          _context.next = 114;
           return deleteGitTag("v".concat(uploadCode.currentVersion));
-        case 98:
-          _context.next = 100;
+        case 114:
+          _context.next = 116;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -328,16 +383,16 @@ function _init() {
               value: version || ''
             }, {
               key: '错误信息',
-              value: "".concat(_context.t0) || ''
+              value: "".concat(_context.t1) || ''
             }]
           });
-        case 100:
+        case 116:
           uploadCode.deleteLocalZip();
-        case 101:
+        case 117:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[32, 91]]);
+    }, _callee, null, [[47, 107]]);
   }));
   return _init.apply(this, arguments);
 }

package/es/script/utils/index.js

@@ -172,7 +172,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
         reject(err);
         return;
       }
-      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd /tmp\n             mv ").concat(fullFileName, " ").concat(path, "\n             cd ").concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n             ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
+      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd /tmp\n             mv ").concat(fullFileName, " ").concat(path, "\n             cd ").concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && \\mv -f ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n             ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md

package/lib/script/args.js

@@ -0,0 +1,180 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/script/args.js
+var args_exports = {};
+__export(args_exports, {
+  BUMP_CHOICES: () => BUMP_CHOICES,
+  ENV_CHOICES: () => ENV_CHOICES,
+  parseDeployArgs: () => parseDeployArgs
+});
+module.exports = __toCommonJS(args_exports);
+var ENV_CHOICES = ["release", "pre", "prod"];
+var BUMP_CHOICES = ["patch", "minor", "major"];
+var getFlagValue = ({ args, index, flagName }) => {
+  const current = args[index];
+  const [, valueFromEqual = ""] = current.split("=");
+  if (valueFromEqual) {
+    return { value: valueFromEqual, nextIndex: index };
+  }
+  const next = args[index + 1];
+  if (!next || next.startsWith("-")) {
+    return {
+      error: `参数 ${flagName} 缺少值`,
+      nextIndex: index
+    };
+  }
+  return { value: next, nextIndex: index + 1 };
+};
+var parseDeployArgs = (rawArgs = []) => {
+  const parsed = {
+    action: null,
+    env: "",
+    version: "",
+    bump: "",
+    changelog: "",
+    isRelease: true,
+    whetherBuild: true,
+    isConfirm: true,
+    isManuallyUploadOss: false,
+    hasCliOptions: false,
+    errors: []
+  };
+  for (let index = 0; index < rawArgs.length; index++) {
+    const arg = rawArgs[index];
+    if (!arg.startsWith("-")) {
+      continue;
+    }
+    parsed.hasCliOptions = true;
+    if (arg === "--release") {
+      if (parsed.action && parsed.action !== "release") {
+        parsed.errors.push("不能同时指定 --release 和 --upload");
+      }
+      parsed.action = "release";
+      continue;
+    }
+    if (arg === "--upload") {
+      if (parsed.action && parsed.action !== "uploadCode") {
+        parsed.errors.push("不能同时指定 --release 和 --upload");
+      }
+      parsed.action = "uploadCode";
+      continue;
+    }
+    if (arg === "--yes") {
+      parsed.isConfirm = true;
+      continue;
+    }
+    if (arg === "--no-release") {
+      parsed.isRelease = false;
+      continue;
+    }
+    if (arg === "--build") {
+      parsed.whetherBuild = true;
+      continue;
+    }
+    if (arg === "--no-build") {
+      parsed.whetherBuild = false;
+      continue;
+    }
+    if (arg === "--manual-oss") {
+      parsed.isManuallyUploadOss = true;
+      continue;
+    }
+    if (arg === "--no-manual-oss") {
+      parsed.isManuallyUploadOss = false;
+      continue;
+    }
+    if (arg === "--patch" || arg === "--minor" || arg === "--major") {
+      parsed.bump = arg.replace("--", "");
+      continue;
+    }
+    if (arg === "--env" || arg.startsWith("--env=")) {
+      const { value, nextIndex, error } = getFlagValue({
+        args: rawArgs,
+        index,
+        flagName: "--env"
+      });
+      if (error) {
+        parsed.errors.push(error);
+        continue;
+      }
+      parsed.env = value;
+      index = nextIndex;
+      continue;
+    }
+    if (arg === "--version" || arg.startsWith("--version=")) {
+      const { value, nextIndex, error } = getFlagValue({
+        args: rawArgs,
+        index,
+        flagName: "--version"
+      });
+      if (error) {
+        parsed.errors.push(error);
+        continue;
+      }
+      parsed.version = value;
+      index = nextIndex;
+      continue;
+    }
+    if (arg === "--bump" || arg.startsWith("--bump=")) {
+      const { value, nextIndex, error } = getFlagValue({
+        args: rawArgs,
+        index,
+        flagName: "--bump"
+      });
+      if (error) {
+        parsed.errors.push(error);
+        continue;
+      }
+      parsed.bump = value;
+      index = nextIndex;
+      continue;
+    }
+    if (arg === "--changelog" || arg.startsWith("--changelog=")) {
+      const { value, nextIndex, error } = getFlagValue({
+        args: rawArgs,
+        index,
+        flagName: "--changelog"
+      });
+      if (error) {
+        parsed.errors.push(error);
+        continue;
+      }
+      parsed.changelog = value;
+      index = nextIndex;
+      continue;
+    }
+  }
+  if (parsed.env && !ENV_CHOICES.includes(parsed.env)) {
+    parsed.errors.push(
+      `--env 仅支持 ${ENV_CHOICES.join(", ")}，当前值为 ${parsed.env}`
+    );
+  }
+  if (parsed.bump && !BUMP_CHOICES.includes(parsed.bump)) {
+    parsed.errors.push(
+      `--bump 仅支持 ${BUMP_CHOICES.join(", ")}，当前值为 ${parsed.bump}`
+    );
+  }
+  return parsed;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUMP_CHOICES,
+  ENV_CHOICES,
+  parseDeployArgs
+});

package/lib/script/deploy.js

@@ -33,6 +33,7 @@ __export(deploy_exports, {
 });
 module.exports = __toCommonJS(deploy_exports);
 var import_inquirer = __toESM(require("inquirer"));
+var import_args = require("./args.js");
 var import_release = __toESM(require("./release/index.js"));
 var import_uploadCode = __toESM(require("./uploadCode/index.js"));
 var actions = {
@@ -52,9 +53,17 @@ var inquirerResult = () => {
     }
   ]);
 };
-var deploy = async () => {
+var deploy = async (...rawArgs) => {
+  const cliArgs = (0, import_args.parseDeployArgs)(rawArgs);
+  if (cliArgs.errors.length) {
+    cliArgs.errors.forEach((item) => console.log(`❌ ${item}`));
+    process.exit(1);
+  }
+  if (cliArgs.action) {
+    return actions[cliArgs.action](cliArgs);
+  }
   let res = await inquirerResult();
-  return actions[res.action]();
+  return actions[res.action](cliArgs);
 };
 var deploy_default = deploy;
 // Annotate the CommonJS export names for ESM import in node:

package/lib/script/index.js

@@ -22,6 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/script/index.js
+var import_path = __toESM(require("path"));
 var import_url = require("url");
 var import_deploy = __toESM(require("./deploy.js"));
 var import_utils = require("./utils/index.js");
@@ -33,7 +34,7 @@ var isVersion = (v) => {
 var isHelp = (v) => {
   return ["-h", "--help", "-H"].includes(v);
 };
-var __dirname = path.dirname((0, import_url.fileURLToPath)(import_meta.url));
+var __dirname = import_path.default.dirname((0, import_url.fileURLToPath)(import_meta.url));
 (() => {
   try {
     const params = args.slice(1);
@@ -43,13 +44,22 @@ var __dirname = path.dirname((0, import_url.fileURLToPath)(import_meta.url));
         break;
       case isVersion(args[0]):
         console.log(
-          `@pisell/common@${(0, import_utils.loadJSON)(path.join(__dirname, "../../package.json")).version}`
+          `@pisell/common@${(0, import_utils.loadJSON)(import_path.default.join(__dirname, "../../package.json")).version}`
         );
         break;
       case isHelp(args[0]):
         console.log("pisell -h  --help  -H [全部命令]");
         console.log("pisell -v  --version  -V [显示版本]");
         console.log("pisell deploy [上传代码|发布代码]");
+        console.log(
+          "pisell deploy --release --env=release [直接发布, 未传--version默认最新版本]"
+        );
+        console.log(
+          'pisell deploy --upload --env=pre --patch --changelog="xxx" --no-release --yes'
+        );
+        console.log(
+          "deploy 参数: --release --upload --env --version --bump --patch --minor --major --changelog --no-release --build --no-build --manual-oss --yes"
+        );
         break;
       default:
         break;

package/lib/script/release/index.js

@@ -94,14 +94,32 @@ var getVersionList = async ({ env, project }) => {
   ).then((res) => res.json());
   return (0, import_utils.versionSort)(versionList.filter((item) => !ignoreName.includes(item)));
 };
-async function init() {
-  let projectAndEnv = await selectProject();
+async function init(cliArgs = {}) {
+  let projectAndEnv = cliArgs.env ? { env: cliArgs.env } : await selectProject();
   projectAndEnv.project = {
     path: "./",
     fileName: (0, import_utils.getCurrentProjectName)()
   };
   const versionList = await getVersionList(projectAndEnv);
-  const res = await inquirerResult(versionList);
+  if (!versionList.length) {
+    console.log("未获取到可发布版本");
+    return;
+  }
+  const isCliMode = Boolean(cliArgs.action === "release" || cliArgs.version);
+  if (cliArgs.version && !versionList.includes(cliArgs.version)) {
+    console.log(
+      `未找到版本 ${cliArgs.version}，可选版本: ${versionList.join(", ")}`
+    );
+    return;
+  }
+  const res = isCliMode ? {
+    version: cliArgs.version || versionList[0],
+    is_release: cliArgs.isConfirm
+  } : await inquirerResult(versionList);
+  if (!res.is_release) {
+    console.log("取消发布");
+    return;
+  }
   const releaseInstance = new import_release.default({ ...res, ...projectAndEnv });
   try {
     await releaseInstance.setConfig();

package/lib/script/uploadCode/index.js

@@ -121,16 +121,35 @@ var inquirerOss = () => {
     }
   ]);
 };
-async function init() {
-  let res = await inquirerResult();
+async function init(cliArgs = {}) {
+  const isCliMode = Boolean(cliArgs.action === "uploadCode");
+  const isBumpVersion = cliArgs.version === "patch" || cliArgs.version === "minor" || cliArgs.version === "major";
+  if (isCliMode && cliArgs.version && !isBumpVersion && !cliArgs.bump) {
+    console.log(
+      `upload 模式下 --version 仅支持 patch/minor/major，或改用 --bump，当前值为 ${cliArgs.version}`
+    );
+    return;
+  }
+  let res = isCliMode ? {
+    env: cliArgs.env || "release",
+    version: cliArgs.bump || cliArgs.version || "patch",
+    changelog: cliArgs.changelog || "update",
+    is_release: cliArgs.isRelease,
+    whether_build: cliArgs.whetherBuild,
+    is_confirm: cliArgs.isConfirm
+  } : await inquirerResult();
   let isManuallyOss = false;
   if (!res.is_confirm) {
     console.log("取消发布");
     return;
   }
   if (res.env === "prod") {
-    const isManuallyOssRes = await isManuallyUploadOss();
-    isManuallyOss = isManuallyOssRes.is_manually_upload_OSS;
+    if (isCliMode) {
+      isManuallyOss = cliArgs.isManuallyUploadOss;
+    } else {
+      const isManuallyOssRes = await isManuallyUploadOss();
+      isManuallyOss = isManuallyOssRes.is_manually_upload_OSS;
+    }
   }
   res.project = {
     path: "./",
@@ -175,9 +194,11 @@ async function init() {
       if (!isManuallyOss) {
         let _fileName = res.project.fileName;
         await (0, import_aws.uploadStaticToOSS)(_fileName);
-        const ossRes = await inquirerOss();
-        if (!ossRes.is_upload_completed_OSS) {
-          return;
+        if (!isCliMode) {
+          const ossRes = await inquirerOss();
+          if (!ossRes.is_upload_completed_OSS) {
+            return;
+          }
         }
       }
     }

package/lib/script/utils/index.js

@@ -130,7 +130,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
              cd /tmp
              mv ${fullFileName} ${path2}
              cd ${path2}
-             unzip ${fullFileName} -d ${fileName} && mv ${fileName}/dist/* ${fileName}/ && rmdir ${fileName}/dist
+             unzip ${fullFileName} -d ${fileName} && \\mv -f ${fileName}/dist/* ${fileName}/ && rmdir ${fileName}/dist
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "description": "A collection of reusable UI components for web development",
   "license": "MIT",
   "sideEffects": [