@pisell/common 1.0.44 → 1.0.46

package/es/script/utils/index.js

@@ -1,17 +1,18 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _templateObject, _templateObject2, _templateObject3;
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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 * as dotenv from 'dotenv';
 import npmCheck from 'npm-check';
 import path from 'path';
+import fs from 'fs';
 import ssh2 from 'ssh2';
 
 /**
@@ -72,7 +73,7 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
  * monorepo项目名称
  * @type {string[]}
  */
-var monorepoProjectNameArr = ['admin'];
+var monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
@@ -84,20 +85,21 @@ var getServerConfig = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
+          console.log(project, 'project');
           if (!monorepoProjectNameArr.includes(project)) {
-            _context3.next = 4;
+            _context3.next = 5;
             break;
           }
-          _context3.next = 3;
-          return fs.readJson('../../../lm_config.json');
-        case 3:
-          return _context3.abrupt("return", _context3.sent);
+          _context3.next = 4;
+          return JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'));
         case 4:
-          _context3.next = 6;
-          return fs.readJson('../lm_config.json');
-        case 6:
           return _context3.abrupt("return", _context3.sent);
+        case 5:
+          _context3.next = 7;
+          return JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'));
         case 7:
+          return _context3.abrupt("return", _context3.sent);
+        case 8:
         case "end":
           return _context3.stop();
       }
@@ -315,21 +317,21 @@ var getNonExcludedPackages = function getNonExcludedPackages(excludedPackages) {
 };
 var sendWebhook = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref8) {
-    var _dotenv$config, _dotenv$config$parsed, _dotenv$config2, _dotenv$config2$parse;
+    var _dotenv$config, _dotenv$config2;
     var title, content, contentStr, response;
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           title = _ref8.title, content = _ref8.content;
           contentStr = createFeishuMessageContent(content);
-          if ((_dotenv$config = dotenv.config()) !== null && _dotenv$config !== void 0 && (_dotenv$config$parsed = _dotenv$config.parsed) !== null && _dotenv$config$parsed !== void 0 && _dotenv$config$parsed.WEBHOOK) {
+          if ((_dotenv$config = dotenv.config()) !== null && _dotenv$config !== void 0 && (_dotenv$config = _dotenv$config.parsed) !== null && _dotenv$config !== void 0 && _dotenv$config.WEBHOOK) {
             _context5.next = 4;
             break;
           }
           return _context5.abrupt("return");
         case 4:
           _context5.next = 6;
-          return fetch((_dotenv$config2 = dotenv.config()) === null || _dotenv$config2 === void 0 ? void 0 : (_dotenv$config2$parse = _dotenv$config2.parsed) === null || _dotenv$config2$parse === void 0 ? void 0 : _dotenv$config2$parse.WEBHOOK, {
+          return fetch((_dotenv$config2 = dotenv.config()) === null || _dotenv$config2 === void 0 || (_dotenv$config2 = _dotenv$config2.parsed) === null || _dotenv$config2 === void 0 ? void 0 : _dotenv$config2.WEBHOOK, {
             headers: {
               'Content-Type': 'application/json'
             },

package/lib/script/aws/index.js

@@ -42,9 +42,9 @@ var filterFiles = ["index.html", "umi.server.js", "umi.server.d.ts"];
 var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = "";
-var init = async () => {
+var init = async (directory) => {
   try {
-    const serverConfig = await (0, import_utils.getServerConfig)("admin");
+    const serverConfig = await (0, import_utils.getServerConfig)(directory);
     let awsConfig = serverConfig.aws;
     if (awsConfig) {
       bucketName = awsConfig.bucketName;
@@ -115,7 +115,7 @@ var uploadFolderContents = async (directory, folderPath = import_path.default.re
   });
 };
 var uploadStaticToOSS = async (directory, folderPath = import_path.default.resolve(__dirname, "dist")) => {
-  await init();
+  await init(directory);
   return uploadFolderContents(directory, folderPath);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/script/constants/index.js

@@ -59,6 +59,16 @@ var outPathMap = {
     prod: "../data/release/project/saas_shop",
     release: "../data/release/project/saas_shop",
     pre: "../data/release/project/saas_shop"
+  },
+  saas_kds: {
+    prod: "../data/release/project/saas_kds",
+    release: "../data/release/project/saas_kds",
+    pre: "../data/release/project/saas_kds"
+  },
+  saas_ads: {
+    prod: "../data/release/project/saas_ads",
+    release: "../data/release/project/saas_ads",
+    pre: "../data/release/project/saas_ads"
   }
 };
 var isSsrMap = {
@@ -68,7 +78,9 @@ var isSsrMap = {
   my_pisel_h5_v2: true,
   xzero: false,
   saas_admin: false,
-  saas_shop: false
+  saas_shop: false,
+  saas_kds: false,
+  saas_ads: false
 };
 var checkPackages = [
   "@pisell/date-picker",

package/lib/script/uploadCode/index.js

@@ -153,7 +153,11 @@ async function init() {
       if (_fileName === "admin") {
         _fileName = "my_pisell_v2";
       }
-      await (0, import_aws.uploadStaticToOSS)(_fileName);
+      if (!["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads"].includes(
+        _fileName
+      )) {
+        await (0, import_aws.uploadStaticToOSS)(_fileName);
+      }
     }
     console.log("开始压缩");
     await uploadCode.compress();

package/lib/script/uploadCode/uploadCode.js

@@ -90,6 +90,12 @@ var UploadCode = class {
     if (this.env === "prod") {
       serverConfig = this.setConfig(serverConfigMap["prod3"]);
     }
+    if (this.env === "prod" && ["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads"].includes(
+      this.projectName
+    )) {
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
+    }
     if (this.env === "prod" && this.projectName === "admin") {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");

package/lib/script/utils/index.js

@@ -47,6 +47,7 @@ module.exports = __toCommonJS(utils_exports);
 var dotenv = __toESM(require("dotenv"));
 var import_npm_check = __toESM(require("npm-check"));
 var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
 var import_ssh2 = __toESM(require("ssh2"));
 var isWorkingTreeClean = async () => {
   const v = await $`git status --porcelain`;
@@ -56,12 +57,13 @@ var getGitCurrentBranch = async () => {
   const v = await $`git symbolic-ref --short HEAD`;
   return v.stdout;
 };
-var monorepoProjectNameArr = ["admin"];
+var monorepoProjectNameArr = ["admin", "my_pisell_v2"];
 var getServerConfig = async (project) => {
+  console.log(project, "project");
   if (monorepoProjectNameArr.includes(project)) {
-    return await fs.readJson("../../../lm_config.json");
+    return await JSON.parse(import_fs.default.readFileSync("../../../lm_config.json", "utf8"));
   }
-  return await fs.readJson("../lm_config.json");
+  return await JSON.parse(import_fs.default.readFileSync("../lm_config.json", "utf8"));
 };
 var connectServer = (config2) => {
   const conn = new import_ssh2.default.Client();
@@ -75,8 +77,7 @@ var connectServer = (config2) => {
   });
 };
 var serverUpload = (conn, { localPath, remotePath }) => {
-  if (!conn)
-    return Promise.reject("未连接服务器");
+  if (!conn) return Promise.reject("未连接服务器");
   return new Promise((resolve, reject) => {
     conn.sftp((err, sftp) => {
       if (err) {
@@ -119,8 +120,7 @@ var serverUpload = (conn, { localPath, remotePath }) => {
   });
 };
 var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env }) => {
-  if (!conn)
-    return Promise.reject("未连接服务器");
+  if (!conn) return Promise.reject("未连接服务器");
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -213,7 +213,7 @@ var getCurrentProjectName = () => {
 var getCurrentProjectPkg = () => {
   return loadJSON(import_path.default.join(process.cwd(), "./package.json"));
 };
-var loadJSON = (path2) => JSON.parse(fs.readFileSync(path2));
+var loadJSON = (path2) => JSON.parse(import_fs.default.readFileSync(path2));
 var getCurrentUserName = async () => {
   const { stdout } = await $`git config user.name`;
   return stdout;
@@ -242,8 +242,7 @@ var getNonExcludedPackages = (excludedPackages) => {
 var sendWebhook = async ({ title, content }) => {
   var _a, _b, _c, _d;
   const contentStr = createFeishuMessageContent(content);
-  if (!((_b = (_a = dotenv.config()) == null ? void 0 : _a.parsed) == null ? void 0 : _b.WEBHOOK))
-    return;
+  if (!((_b = (_a = dotenv.config()) == null ? void 0 : _a.parsed) == null ? void 0 : _b.WEBHOOK)) return;
   const response = await fetch((_d = (_c = dotenv.config()) == null ? void 0 : _c.parsed) == null ? void 0 : _d.WEBHOOK, {
     headers: {
       "Content-Type": "application/json"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "sideEffects": [
     "*.less"
   ],
@@ -20,7 +20,7 @@
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "1.0.43"
+    "@pisell/utils": "1.0.45"
   },
   "devDependencies": {
     "father": "^4.1.6"

package/src/script/aws/index.js

@@ -15,10 +15,10 @@ let bucketName = '';
  * @Author: zhiwei.Wang
  * @Date: 2023-11-24 14:05
  */
-const init = async () => {
+const init = async (directory) => {
   try {
     // 读取本地config
-    const serverConfig = await getServerConfig('admin');
+    const serverConfig = await getServerConfig(directory);
 
     // aws配置
     let awsConfig = serverConfig.aws;
@@ -84,7 +84,7 @@ const uploadFile = async (directory, fileKey, filePath) => {
  */
 export const uploadFolderContents = async (
   directory,
-  folderPath = path.resolve(__dirname, 'dist'),
+  folderPath = path.resolve(__dirname, 'dist')
 ) => {
   const files = fs.readdirSync(folderPath);
 
@@ -129,10 +129,10 @@ export const uploadFolderContents = async (
  */
 export const uploadStaticToOSS = async (
   directory,
-  folderPath = path.resolve(__dirname, 'dist'),
+  folderPath = path.resolve(__dirname, 'dist')
 ) => {
   // 初始化aws
-  await init();
+  await init(directory);
 
   return uploadFolderContents(directory, folderPath);
 };

package/src/script/constants/index.js

@@ -34,6 +34,16 @@ const outPathMap = {
     release: '../data/release/project/saas_shop',
     pre: '../data/release/project/saas_shop',
   },
+  saas_kds: {
+    prod: '../data/release/project/saas_kds',
+    release: '../data/release/project/saas_kds',
+    pre: '../data/release/project/saas_kds',
+  },
+  saas_ads: {
+    prod: '../data/release/project/saas_ads',
+    release: '../data/release/project/saas_ads',
+    pre: '../data/release/project/saas_ads',
+  },
 };
 
 const isSsrMap = {
@@ -44,6 +54,8 @@ const isSsrMap = {
   xzero: false,
   saas_admin: false,
   saas_shop: false,
+  saas_kds: false,
+  saas_ads: false,
 };
 
 const checkPackages = [

package/src/script/uploadCode/index.js

@@ -144,10 +144,16 @@ async function init() {
         _fileName = 'pre_' + _fileName;
       }
       if (_fileName === 'admin') {
-        _fileName = 'my_pisell_v2'
+        _fileName = 'my_pisell_v2';
+      }
+      if (
+        !['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads'].includes(
+          _fileName
+        )
+      ) {
+        // 上传oss
+        await uploadStaticToOSS(_fileName);
       }
-      // 上传oss
-      await uploadStaticToOSS(_fileName);
     }
 
     console.log('开始压缩');

package/src/script/uploadCode/uploadCode.js

@@ -1,6 +1,6 @@
-import archiver from "archiver";
-import path from "path";
-import { checkPackages, isSsrMap, outPathMap } from "../constants/index.js";
+import archiver from 'archiver';
+import path from 'path';
+import { checkPackages, isSsrMap, outPathMap } from '../constants/index.js';
 import {
   checkPkgVersion,
   connectServer,
@@ -9,7 +9,7 @@ import {
   isWorkingTreeClean,
   serverUnpack,
   serverUpload,
-} from "../utils/index.js";
+} from '../utils/index.js';
 
 /**
  * @Title: 上传代码至服务器类
@@ -26,8 +26,8 @@ class UploadCode {
     this.changelog = changelog;
     this.is_release = is_release;
 
-    this.currentVersion = "";
-    this.projectAbsolutePath = "";
+    this.currentVersion = '';
+    this.projectAbsolutePath = '';
     this.conn = null;
     this.serverConfig = null;
     // 是否是ssr项目
@@ -55,7 +55,7 @@ class UploadCode {
     const serverConfigMap = await getServerConfig(this.projectName);
 
     if (!serverConfigMap) {
-      console.log("未找到发布脚本!");
+      console.log('未找到发布脚本!');
       return false;
     }
 
@@ -69,7 +69,7 @@ class UploadCode {
     this.projectAbsolutePath = process.cwd();
 
     if (!(await isWorkingTreeClean())) {
-      console.log("工作区不干净, 请先提交代码");
+      console.log('工作区不干净, 请先提交代码');
       return false;
     }
 
@@ -83,33 +83,43 @@ class UploadCode {
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
 
     // 选择release默认用国内cn服务器
-    if (this.env === "release") {
+    if (this.env === 'release') {
       serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
     }
 
-    if (this.env === "prod") {
+    if (this.env === 'prod') {
       serverConfig = this.setConfig(serverConfigMap['prod3']);
       // serverConfig.privateKey = fs.readFileSync(
       //   path.join(process.env.HOME, '.ssh', 'id_rsa'),
       // );
     }
 
+    if (
+      this.env === 'prod' &&
+      ['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads'].includes(
+        this.projectName
+      )
+    ) {
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
+    }
+
     // pisell2.0正式环境使用亚马逊服务器
-    if (this.env === "prod" && this.projectName === "admin") {
+    if (this.env === 'prod' && this.projectName === 'admin') {
       serverConfig = serverConfigMap.aws.service[this.env];
-      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+      serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
     }
 
-    console.log(serverConfig,'serverConfig')
+    console.log(serverConfig, 'serverConfig');
 
     this.setConfig(serverConfig);
 
     if (!serverConfig) {
-      console.log("您当前没有权限!");
+      console.log('您当前没有权限!');
       return false;
     }
 
-    console.log("当前主项目分支", await getGitCurrentBranch());
+    console.log('当前主项目分支', await getGitCurrentBranch());
 
     return true;
   }
@@ -120,15 +130,15 @@ class UploadCode {
    * @Author: Zsj
    */
   async updateVersion() {
-    if (this.env === "prod") {
+    if (this.env === 'prod') {
       await $`npm version ${this.version} -m "%s ${this.changelog}"`;
-      let { version } = await fs.readJson("./package.json");
+      let { version } = await fs.readJson('./package.json');
       this.currentVersion = version;
     }
-    if (this.env !== "prod") {
+    if (this.env !== 'prod') {
       await $`npm version ${this.version} --no-git-tag-version`;
       await $`git add package.json`;
-      let { version } = await fs.readJson("./package.json");
+      let { version } = await fs.readJson('./package.json');
       this.currentVersion = version;
       await $`git commit -m "chore: ${this.currentVersion} ${this.changelog}"`;
     }
@@ -153,22 +163,22 @@ class UploadCode {
     return new Promise((resolve, reject) => {
       const __dirname = process.cwd();
       const zipFile = path.resolve(__dirname, `${this.currentVersion}.zip`);
-      const originFilePath = path.resolve(__dirname, "dist");
+      const originFilePath = path.resolve(__dirname, 'dist');
       const output = fs.createWriteStream(zipFile);
-      const archive = archiver("zip", {
+      const archive = archiver('zip', {
         zlib: { level: 9 }, // 设置压缩级别
       });
-      archive.on("error", function (err) {
+      archive.on('error', function (err) {
         reject(err);
       });
 
-      output.on("close", function () {
+      output.on('close', function () {
         resolve(true);
       });
 
       archive.pipe(output);
 
-      archive.directory(originFilePath, "/dist"); //将srcPath路径对应的内容添加到zip包中/dist路径
+      archive.directory(originFilePath, '/dist'); //将srcPath路径对应的内容添加到zip包中/dist路径
 
       archive.finalize();
     });
@@ -181,7 +191,7 @@ class UploadCode {
    */
   async connectServer() {
     if (!this.serverConfig) {
-      console.log("未找到发布配置!");
+      console.log('未找到发布配置!');
       return null;
     }
     this.conn = await connectServer(this.serverConfig);

package/src/script/utils/index.js

@@ -1,6 +1,7 @@
 import * as dotenv from 'dotenv';
 import npmCheck from 'npm-check';
 import path from 'path';
+import fs from 'fs';
 import ssh2 from 'ssh2';
 
 /**
@@ -27,7 +28,7 @@ const getGitCurrentBranch = async () => {
  * monorepo项目名称
  * @type {string[]}
  */
-const monorepoProjectNameArr = ['admin'];
+const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
@@ -35,10 +36,11 @@ const monorepoProjectNameArr = ['admin'];
  * @Author: Zsj
  */
 const getServerConfig = async (project) => {
+  console.log(project,'project')
   if (monorepoProjectNameArr.includes(project)) {
-    return await fs.readJson('../../../lm_config.json');
+    return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'))
   }
-  return await fs.readJson('../lm_config.json');
+  return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'))
 };
 
 /**