@alipay/ams-checkout 0.0.1711691167-dev.2 → 0.0.1711691167-dev.21

package/esm/plugin/paypal/index.js

@@ -1,4 +1,6 @@
 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); }
+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 _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 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); }); }; }
@@ -17,7 +19,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 import { BusManager, BusMessage, BusSubscriber } from "../../core/bus";
 import { PaypalActionEnum, SDKCallbackActionEnum } from "../../core/bus/interface";
-import { submitPayInfo } from "../../service";
+import { queryPaymentInfo } from "../../service";
 import { eventCodeEnum, payPalConfigurationIntentEnum, PaypalMethodEnum } from "../../types";
 import { isFunction } from "../../util";
 import { appendLoadingIcon, isShowLoading } from "../utils";
@@ -90,6 +92,8 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
           });
         }
         var paypalScript = _this.createPaypalScript(paypalPluginProps);
+        // 将script标签添加到DOM中
+        document.body.appendChild(paypalScript);
         // 在script加载完成后执行回调函数
         paypalScript.onload = function () {
           resolve('loading successfully');
@@ -98,16 +102,14 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
         paypalScript.onerror = function (error) {
           reject(error);
         };
-        // 将script标签添加到DOM中
-        document.body.appendChild(paypalScript);
       });
     });
     _defineProperty(_assertThisInitialized(_this), "createPaypalScript", function (paypalPluginProps) {
       var _paypalPluginProps$pa3, _paypalPluginProps$pa4, _paypalPluginProps$pa5, _paypalPluginProps$pa6;
-      var channelMerchantAccountId = (_paypalPluginProps$pa3 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa3 === void 0 || (_paypalPluginProps$pa3 = _paypalPluginProps$pa3.merchantInfo) === null || _paypalPluginProps$pa3 === void 0 ? void 0 : _paypalPluginProps$pa3.channelMerchantAccountId;
-      var accessToken = (_paypalPluginProps$pa4 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa4 === void 0 || (_paypalPluginProps$pa4 = _paypalPluginProps$pa4.paymentMethodInfo) === null || _paypalPluginProps$pa4 === void 0 || (_paypalPluginProps$pa4 = _paypalPluginProps$pa4.paypal) === null || _paypalPluginProps$pa4 === void 0 ? void 0 : _paypalPluginProps$pa4.accessToken;
+      var channelMerchantAccountId = (_paypalPluginProps$pa3 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa3 === void 0 || (_paypalPluginProps$pa3 = _paypalPluginProps$pa3.merchantInfo) === null || _paypalPluginProps$pa3 === void 0 ? void 0 : _paypalPluginProps$pa3.channelMerchantClientId;
+      var accessToken = (_paypalPluginProps$pa4 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa4 === void 0 || (_paypalPluginProps$pa4 = _paypalPluginProps$pa4.paypal) === null || _paypalPluginProps$pa4 === void 0 ? void 0 : _paypalPluginProps$pa4.accessToken;
       var locale = paypalPluginProps.locale;
-      var currency = (_paypalPluginProps$pa5 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa5 === void 0 || (_paypalPluginProps$pa5 = _paypalPluginProps$pa5.paymentMethodInfo) === null || _paypalPluginProps$pa5 === void 0 || (_paypalPluginProps$pa5 = _paypalPluginProps$pa5.paymentAmount) === null || _paypalPluginProps$pa5 === void 0 ? void 0 : _paypalPluginProps$pa5.currency;
+      var currency = (_paypalPluginProps$pa5 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa5 === void 0 || (_paypalPluginProps$pa5 = _paypalPluginProps$pa5.paymentAmount) === null || _paypalPluginProps$pa5 === void 0 ? void 0 : _paypalPluginProps$pa5.currency;
       var paymentMethodType = (_paypalPluginProps$pa6 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa6 === void 0 || (_paypalPluginProps$pa6 = _paypalPluginProps$pa6.paymentMethodInfo) === null || _paypalPluginProps$pa6 === void 0 ? void 0 : _paypalPluginProps$pa6.paymentMethodType;
       var _ref2 = (paypalPluginProps === null || paypalPluginProps === void 0 ? void 0 : paypalPluginProps.paypalConfiguration) || {},
         blockPayPalCreditButton = _ref2.blockPayPalCreditButton,
@@ -122,19 +124,15 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
         locale: locale,
         'client-id': channelMerchantAccountId
       });
-      if (displayPayPalPayLaterButtonOnly) {
-        urlSearchParams.append('disable-funding', 'credit,card');
-      } else {
-        var disableFundingArr = [];
-        if (blockPayPalCreditButton) {
-          disableFundingArr.push('card');
-        }
-        if (blockPayPalPayLaterButton) {
-          disableFundingArr.push('credit');
-        }
-        if (disableFundingArr.length) {
-          urlSearchParams.append('disable-funding', disableFundingArr.join(','));
-        }
+      var disableFundingArr = [];
+      if (blockPayPalCreditButton && !displayPayPalPayLaterButtonOnly) {
+        disableFundingArr.push('card');
+      }
+      if (blockPayPalPayLaterButton && !displayPayPalPayLaterButtonOnly) {
+        disableFundingArr.push('credit');
+      }
+      if (disableFundingArr.length) {
+        urlSearchParams.append('disable-funding', disableFundingArr.join(','));
       }
       if (enableMessages) {
         urlSearchParams.append('components', 'messages,buttons');
@@ -150,7 +148,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
       }
       src += urlSearchParams.toString();
       script.src = src;
-      script['data-user-id-token'] = accessToken;
+      script.setAttribute('data-user-id-token', accessToken);
       return script;
     });
     _defineProperty(_assertThisInitialized(_this), "onShippingChange", /*#__PURE__*/function () {
@@ -175,17 +173,23 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
       };
     }());
     _defineProperty(_assertThisInitialized(_this), "createOrder", /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_data, _action, paymentSessionData) {
-        var _submitPayInfoRes$ext;
-        var submitPayInfoRes;
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_data, _action, paymentSessionData, env, paymentSessionConfig) {
+        var _queryPaymentInfoRes$;
+        var queryPaymentInfoRes;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return submitPayInfo(paymentSessionData, {}, _this.logger);
+              return queryPaymentInfo({
+                paymentSessionData: paymentSessionData,
+                paymentSessionConfig: paymentSessionConfig
+              }, {
+                env: env,
+                timeout: 15000
+              }, _this.logger);
             case 2:
-              submitPayInfoRes = _context2.sent;
-              if (!(!(submitPayInfoRes !== null && submitPayInfoRes !== void 0 && submitPayInfoRes.success) || !(submitPayInfoRes !== null && submitPayInfoRes !== void 0 && (_submitPayInfoRes$ext = submitPayInfoRes.extendInfo) !== null && _submitPayInfoRes$ext !== void 0 && _submitPayInfoRes$ext.channelOrderId))) {
+              queryPaymentInfoRes = _context2.sent;
+              if (!(!(queryPaymentInfoRes !== null && queryPaymentInfoRes !== void 0 && queryPaymentInfoRes.success) || !(queryPaymentInfoRes !== null && queryPaymentInfoRes !== void 0 && (_queryPaymentInfoRes$ = queryPaymentInfoRes.extendInfo) !== null && _queryPaymentInfoRes$ !== void 0 && _queryPaymentInfoRes$.channelOrderId))) {
                 _context2.next = 7;
                 break;
               }
@@ -198,14 +202,14 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
               });
               return _context2.abrupt("return");
             case 7:
-              return _context2.abrupt("return", submitPayInfoRes.extendInfo.channelOrderId);
+              return _context2.abrupt("return", queryPaymentInfoRes.extendInfo.channelOrderId);
             case 8:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2, _x3, _x4) {
+      return function (_x2, _x3, _x4, _x5, _x6) {
         return _ref4.apply(this, arguments);
       };
     }());
@@ -231,7 +235,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
           }
         }, _callee3);
       }));
-      return function (_x5) {
+      return function (_x7) {
         return _ref5.apply(this, arguments);
       };
     }());
@@ -257,7 +261,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
           }
         }, _callee4);
       }));
-      return function (_x6) {
+      return function (_x8) {
         return _ref6.apply(this, arguments);
       };
     }());
@@ -281,7 +285,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
           }
         }, _callee5);
       }));
-      return function (_x7, _x8) {
+      return function (_x9, _x10) {
         return _ref7.apply(this, arguments);
       };
     }());
@@ -297,35 +301,43 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
     key: "renderPaypalButton",
     value: function renderPaypalButton(context, message) {
       var _data$options,
+        _data$options2,
         _data$appendParams,
         _data$appendParams2,
         _data$appendParams3,
         _data$appendParams4,
         _data$appendParams5,
+        _data$appendParams6,
         _this2 = this;
       var data = message.getJSONObject();
       var paypalPluginProps = {
         locale: (_data$options = data.options) === null || _data$options === void 0 ? void 0 : _data$options.locale,
+        environment: (_data$options2 = data.options) === null || _data$options2 === void 0 ? void 0 : _data$options2.environment,
         paymentSessionData: (_data$appendParams = data.appendParams) === null || _data$appendParams === void 0 || (_data$appendParams = _data$appendParams.iframeNodesParams) === null || _data$appendParams === void 0 ? void 0 : _data$appendParams.sessionData,
         paymentSessionFactor: (_data$appendParams2 = data.appendParams) === null || _data$appendParams2 === void 0 || (_data$appendParams2 = _data$appendParams2.iframeNodesParams) === null || _data$appendParams2 === void 0 || (_data$appendParams2 = _data$appendParams2.paymentSessionMetaData) === null || _data$appendParams2 === void 0 ? void 0 : _data$appendParams2.paymentSessionFactor,
         selector: (_data$appendParams3 = data.appendParams) === null || _data$appendParams3 === void 0 || (_data$appendParams3 = _data$appendParams3.iframeNodesParams) === null || _data$appendParams3 === void 0 ? void 0 : _data$appendParams3.selector,
         paypalConfiguration: (_data$appendParams4 = data.appendParams) === null || _data$appendParams4 === void 0 || (_data$appendParams4 = _data$appendParams4.iframeNodesParams) === null || _data$appendParams4 === void 0 ? void 0 : _data$appendParams4.paypalConfiguration,
-        appearance: (_data$appendParams5 = data.appendParams) === null || _data$appendParams5 === void 0 || (_data$appendParams5 = _data$appendParams5.iframeNodesParams) === null || _data$appendParams5 === void 0 ? void 0 : _data$appendParams5.appearance
+        appearance: (_data$appendParams5 = data.appendParams) === null || _data$appendParams5 === void 0 || (_data$appendParams5 = _data$appendParams5.iframeNodesParams) === null || _data$appendParams5 === void 0 ? void 0 : _data$appendParams5.appearance,
+        paymentSessionConfig: (_data$appendParams6 = data.appendParams) === null || _data$appendParams6 === void 0 || (_data$appendParams6 = _data$appendParams6.iframeNodesParams) === null || _data$appendParams6 === void 0 || (_data$appendParams6 = _data$appendParams6.paymentSessionMetaData) === null || _data$appendParams6 === void 0 ? void 0 : _data$appendParams6.paymentSessionConfig
       };
       return this.preCheck(paypalPluginProps).then(function (paypalPluginProps) {
         return _this2.loadPaypalResource(paypalPluginProps).then(function () {
-          var _paypalPluginProps$pa7, _paypalPluginProps$pa8, _paypalPluginProps$pa9;
+          var _paypalPluginProps$pa7, _paypalPluginProps$pa8;
           var createButtonConfig = {
-            style: (_paypalPluginProps$pa7 = (_paypalPluginProps$pa8 = paypalPluginProps.paypalConfiguration) === null || _paypalPluginProps$pa8 === void 0 ? void 0 : _paypalPluginProps$pa8.style) !== null && _paypalPluginProps$pa7 !== void 0 ? _paypalPluginProps$pa7 : {},
+            style: _objectSpread({
+              layout: 'vertical',
+              color: 'gold',
+              shape: 'rect'
+            }, ((_paypalPluginProps$pa7 = paypalPluginProps.paypalConfiguration) === null || _paypalPluginProps$pa7 === void 0 ? void 0 : _paypalPluginProps$pa7.style) || {}),
             fundingSource: undefined,
             onShippingChange: _this2.onShippingChange,
             createOrder: function createOrder(data, action) {
-              return _this2.createOrder(data, action, paypalPluginProps.paymentSessionData);
+              return _this2.createOrder(data, action, paypalPluginProps.paymentSessionData, paypalPluginProps.environment, paypalPluginProps.paymentSessionConfig);
             },
             onApprove: _this2.onApprove,
             onCancel: _this2.onCancel
           };
-          if ((_paypalPluginProps$pa9 = paypalPluginProps.paypalConfiguration) !== null && _paypalPluginProps$pa9 !== void 0 && _paypalPluginProps$pa9.displayPayPalPayLaterButtonOnly) {
+          if ((_paypalPluginProps$pa8 = paypalPluginProps.paypalConfiguration) !== null && _paypalPluginProps$pa8 !== void 0 && _paypalPluginProps$pa8.displayPayPalPayLaterButtonOnly) {
             createButtonConfig.fundingSource = window.paypal.FUNDING.PAYLATER;
           }
           try {

package/esm/request/index.js

@@ -50,8 +50,6 @@ function requestInstance(options) {
     withCredentials: (_options$withCredenti = options.withCredentials) !== null && _options$withCredenti !== void 0 ? _options$withCredenti : true,
     method: (options === null || options === void 0 ? void 0 : options.method) || 'POST'
   });
-  console.log('baseURL', baseURL);
-  console.log('_headers', _headers);
   return instance.request;
 }
 
@@ -99,25 +97,21 @@ function _request() {
           })];
           startTime = Date.now();
           _context.prev = 5;
-          console.log('requestInstance options', options);
-          console.log('requestInstance -data', _data);
           myRequest = requestInstance(options);
-          _context.next = 11;
+          _context.next = 9;
           return myRequest({
             data: _data
           });
-        case 11:
+        case 9:
           _yield$myRequest = _context.sent;
           data = _yield$myRequest.data;
           headers = _yield$myRequest.headers;
-          console.log('requestInstance data', data);
-          console.log('requestInstance headers', headers);
           resData = data || {};
           traceId = get(headers, 'Mgw-TraceId') || get(headers, 'mgw-traceid', '');
           resData.traceId = traceId || '';
           handleGetWayError = fomatGetwayError(headers, traceId);
           if (!(handleGetWayError !== null && handleGetWayError !== void 0 && handleGetWayError.errorCode)) {
-            _context.next = 25;
+            _context.next = 21;
             break;
           }
           errorMessage = (resData === null || resData === void 0 ? void 0 : resData.errorMessage) || (handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorMessage);
@@ -136,7 +130,7 @@ function _request() {
             errorCode: errorCode,
             success: false
           }));
-        case 25:
+        case 21:
           logger.reportRPC({
             name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
             label: 'request',
@@ -147,8 +141,8 @@ function _request() {
             traceId: traceId
           }).send();
           return _context.abrupt("return", resData);
-        case 29:
-          _context.prev = 29;
+        case 25:
+          _context.prev = 25;
           _context.t0 = _context["catch"](5);
           _error = safeJson(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message, {
             success: false,
@@ -170,11 +164,11 @@ function _request() {
             errorCode: _errorCode,
             errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
           }));
-        case 36:
+        case 32:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 29]]);
+    }, _callee, null, [[5, 25]]);
   }));
   return _request.apply(this, arguments);
 }

package/esm/types/index.d.ts

@@ -112,7 +112,7 @@ export interface IbillingAddress {
 export interface Isubmit {
     billingAddress?: IbillingAddress;
 }
-interface IpaymentSessionConfig {
+export interface IpaymentSessionConfig {
     productScene: productSceneEnum;
     paymentMethodCategoryType: paymentMethodCategoryTypeEnum;
     productSceneVersion: string;
@@ -146,6 +146,11 @@ export interface IpaymentSessionMetaData {
     action?: {
         autoDebitWithToken: boolean;
         skipSdkQuery: boolean;
+        skipSdkQueryForm?: {
+            value: boolean;
+            version: string;
+            platform: string;
+        };
     };
     paymentSessionFactor?: {
         extendInfo?: {
@@ -212,12 +217,12 @@ export interface IpaymentSessionMetaData {
 export interface IPaymentSessionFactor {
     merchantInfo?: IMerchantInfo;
     paymentMethodInfo: IPaymentMethodInfo;
+    paymentAmount?: IPaymentAmount;
+    paypal?: IPaypalConfig;
 }
 export interface IPaymentMethodInfo {
-    paymentAmount?: IPaymentAmount;
     paymentMethodMetaData?: IPaymentMethodMetaData;
     paymentMethodType?: PaypalMethodEnum;
-    paypal?: IPaypalConfig;
 }
 export type IPaypalConfig = {
     accessToken: string;
@@ -227,7 +232,7 @@ export interface IPaymentMethodMetaData {
     boundPaymentMethod?: string;
 }
 export interface IMerchantInfo {
-    channelMerchantAccountId?: string;
+    channelMerchantClientId?: string;
 }
 export interface IPaymentAmount {
     value?: string;
@@ -437,6 +442,9 @@ export interface CashierSdkActionQueryResult {
     applinkUrl?: string;
     schemeUrl?: string;
     authUrl?: string;
+    extendInfo?: {
+        channelOrderId?: string;
+    };
 }
 /**
  * Get App Pay Payment Session Request.
@@ -535,4 +543,3 @@ export type IAppendParams = {
     componentSign: componentSignEnum;
     iframeNodesParams: IappendIframeNodesParams;
 };
-export {};

package/esm/util/versionCompare.d.ts

@@ -4,3 +4,5 @@
  * @param v2
  */
 export declare function compareVersion(v1: string, v2: string): 0 | 1 | -1;
+export declare function isVersionInRange(currentVersion: any, minVersion: any, maxVersion: any): boolean;
+export declare function matchVersion(config: any, currentVersion: any): boolean;

package/esm/util/versionCompare.js

@@ -1,3 +1,9 @@
+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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /**
  * 返回值0标识一样大，1表示v1大，-1表示v2大
  * @param v1
@@ -42,4 +48,73 @@ export function compareVersion(v1, v2) {
   } else {
     return 1;
   }
+}
+export function isVersionInRange(currentVersion, minVersion, maxVersion) {
+  function splitVersion(version) {
+    return version.split('.').map(function (num) {
+      return parseInt(num, 10);
+    });
+  }
+  function compareVersions(v1, v2) {
+    for (var i = 0; i < Math.max(v1.length, v2.length); i++) {
+      var num1 = v1[i] === undefined ? 0 : v1[i];
+      var num2 = v2[i] === undefined ? 0 : v2[i];
+      if (num1 > num2) return 1;
+      if (num1 < num2) return -1;
+    }
+    return 0;
+  }
+  var current = splitVersion(currentVersion);
+  var min = minVersion ? splitVersion(minVersion) : null;
+  var max = maxVersion ? splitVersion(maxVersion) : null;
+  if (min && compareVersions(current, min) < 0) {
+    // 当前版本小于最小允许版本
+    return false;
+  }
+  if (max && compareVersions(current, max) > 0) {
+    // 当前版本大于最大允许版本
+    return false;
+  }
+  // 当前版本在允许的版本范围内
+  return true;
+}
+export function matchVersion(config, currentVersion) {
+  var value = config.value,
+    version = config.version,
+    platform = config.platform;
+  var CURRENT_PLATFORM = 'WEB';
+  var isMatchVersion = false;
+  var isMatchPlatform = false;
+
+  // 平台判断
+  if (platform) {
+    var platformList = platform.split('|').map(function (platform) {
+      return platform.toLocaleUpperCase();
+    });
+    isMatchPlatform = platformList.includes(CURRENT_PLATFORM);
+  } else {
+    // 没有表示平台全匹配
+    isMatchPlatform = true;
+  }
+  // 版本判断
+  if (!version) {
+    // 为空全匹配
+    isMatchVersion = true;
+  } else if (version.indexOf('|') !== -1) {
+    // | 范围匹配
+    var _version$split = version.split('|'),
+      _version$split2 = _slicedToArray(_version$split, 2),
+      _version$split2$ = _version$split2[0],
+      minVersion = _version$split2$ === void 0 ? '' : _version$split2$,
+      _version$split2$2 = _version$split2[1],
+      maxVersion = _version$split2$2 === void 0 ? '' : _version$split2$2;
+    isMatchVersion = isVersionInRange(currentVersion, minVersion, maxVersion);
+  } else if (version.indexOf(',') !== -1) {
+    // , 枚举匹配
+    var versionList = version.split(',');
+    isMatchVersion = versionList.includes(currentVersion);
+  } else {
+    isMatchVersion = version === currentVersion;
+  }
+  return value && isMatchPlatform && isMatchVersion;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1711691167-dev.2",
+  "version": "0.0.1711691167-dev.21",
   "description": "",
   "author": "",
   "main": "esm/index.js",