@alipay/ams-checkout 2.0.20 → 2.0.22

package/esm/config/index.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2022 International Business Group, Ant Group. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), the rights to use, copy, modify, merge, and/or distribute the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
+ * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
+ */
 export declare const marmotMap: Record<string, string>;
 export declare const marmotConfigMap: Record<string, string>;
 export declare const v2AppMarmotMap: Record<string, string>;

package/esm/config/index.js

@@ -5,7 +5,7 @@
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
-import json from "../../package.json";
+
 export var marmotMap = {
   dev: 'http://page.alipay.net/page/antom-web-checkout/src/component-app',
   sit: 'http://page.test.alipay.net/page/antom-web-checkout/src/component-app',
@@ -30,7 +30,7 @@ export var v2AppMarmotMap = {
   light_sandbox: 'https://checkout.antom.com',
   prod: 'https://checkout.antom.com'
 };
-export var sdkVersion = json.version;
+export var sdkVersion = "2.0.22";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

package/esm/constant/element.d.ts

@@ -22,5 +22,6 @@ export declare enum ELEMENT_PAGE_URL {
     INSTRUCTION_GUIDE = "/elements/pages/instruction-guide/index.html",
     THREED_PAGE = "/elements/pages/threed-page/index.html",
     ELEMENT_AUTH = "/auth-element/pages/element_auth/index.html",
-    ADDRESS = "/element-address/pages/address/index.html"
+    ADDRESS = "/element-address/pages/address/index.html",
+    NEW_ELEMENT_PAYMENT = "/elements2/pages/element_payment/index.html"
 }

package/esm/constant/element.js

@@ -26,5 +26,6 @@ export var ELEMENT_PAGE_URL = /*#__PURE__*/function (ELEMENT_PAGE_URL) {
   ELEMENT_PAGE_URL["THREED_PAGE"] = "/elements/pages/threed-page/index.html";
   ELEMENT_PAGE_URL["ELEMENT_AUTH"] = "/auth-element/pages/element_auth/index.html";
   ELEMENT_PAGE_URL["ADDRESS"] = "/element-address/pages/address/index.html";
+  ELEMENT_PAGE_URL["NEW_ELEMENT_PAYMENT"] = "/elements2/pages/element_payment/index.html";
   return ELEMENT_PAGE_URL;
 }({});

package/esm/constant/index.d.ts

@@ -325,24 +325,7 @@ export declare const LOADINGIMG = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgA
 /**
  * @description Promise回调code映射
  */
-export declare const PROMISE_CALLBACK_CODE: {
-    SUCCESS: {
-        code: string;
-    };
-    UNKNOWN_EXCEPTION: {
-        code: string;
-        message: string;
-    };
-    REPEAT_REQ_REJECT: {
-        code: string;
-        message: string;
-    };
-    PROCESS_FAIL: {
-        code: string;
-        message: string;
-    };
-    INQUIRY_PAYMENT_SESSION_FAILED: {
-        code: string;
-        message: string;
-    };
-};
+export declare const PROMISE_CALLBACK_CODE: Record<string, {
+    code: string;
+    message?: string;
+}>;

package/esm/core/component/element/elementController/index.d.ts

@@ -1,5 +1,5 @@
-import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
-declare class ElementController {
+import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementController, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
+declare class ElementController implements IElementController {
     private options;
     private elementContainer;
     private serviceMap;
@@ -44,7 +44,7 @@ declare class ElementController {
     private getErrorFromResponse;
     private areAllContainersReady;
     private sendReady;
-    updatePayment(paymentSessionData: any): Promise<unknown>;
+    updatePayment(paymentSessionData: string): Promise<boolean>;
     private destroyHandle;
     destroy(): void;
     private setControllerStatusOrView;

package/esm/core/component/element/elementController/index.js

@@ -37,7 +37,7 @@ import { ServiceProvider } from "../../../../foundation/service";
 import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
 import { ProductSceneEnum } from "../../../../types";
 import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
-import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS, MERCHANT_CONFIRM_ABORT_CODE, MERCHANT_CONFIRM_TIMEOUT_CODE } from "../../../../util/beforeConfirm";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
@@ -233,6 +233,7 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "initializeAndMountProcessor",
     value: function initializeAndMountProcessor(type, selector, options) {
+      var _this$serviceMap$Log, _options$appearance;
       this.initElementProcessors(type);
       // 创建 iframe，拉起应用页面，同时监听全局的数据更新和获取事件
       this.elementContainerService.mount({
@@ -248,6 +249,12 @@ var ElementController = /*#__PURE__*/function () {
       ServiceProvider.getInstance(newInstanceId).update(paymentContext);
       // 更新埋点service
       this.serviceMap.Log = ServiceProvider.getInstance(newInstanceId).getService('Log');
+      (_this$serviceMap$Log = this.serviceMap.Log) === null || _this$serviceMap$Log === void 0 || _this$serviceMap$Log.logInfo({
+        title: 'sdk_event_appearance'
+      }, {
+        variables: options !== null && options !== void 0 && (_options$appearance = options.appearance) !== null && _options$appearance !== void 0 && _options$appearance.variables ? true : false,
+        theme: options === null || options === void 0 ? void 0 : options.theme
+      });
       this.elementProcessors[type].beforeMount();
     }
     // 处理业务流程启动失败
@@ -375,7 +382,7 @@ var ElementController = /*#__PURE__*/function () {
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
-        var startEventId, res, logParams, isApplePay, paymentMethodType, startTime, _yield$executeWithTim, shouldContinue, timedOut, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, startTime, _yield$executeWithTim, shouldContinue, timedOut, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -405,7 +412,7 @@ var ElementController = /*#__PURE__*/function () {
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
               paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 34;
+                _context4.next = 40;
                 break;
               }
               this.serviceMap.Log.logInfo({
@@ -424,49 +431,65 @@ var ElementController = /*#__PURE__*/function () {
               _yield$executeWithTim = _context4.sent;
               shouldContinue = _yield$executeWithTim.result;
               timedOut = _yield$executeWithTim.timedOut;
-              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
-                _context4.next = 23;
+              isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+              if (!isTimeout) {
+                _context4.next = 24;
                 break;
               }
-              if (timedOut) {
-                this.serviceMap.Log.logError({
-                  title: 'sdk_before_confirm_timeout'
-                }, {
-                  paymentMethodType: paymentMethodType,
-                  path: 'nonApplePay_sync'
-                });
-              } else {
-                this.serviceMap.Log.logInfo({
-                  title: 'sdk_before_confirm_abort'
-                }, {
-                  paymentMethodType: paymentMethodType,
-                  path: 'nonApplePay_sync'
-                });
+              this.serviceMap.Log.logError({
+                title: 'sdk_before_confirm_timeout'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: MERCHANT_CONFIRM_TIMEOUT_CODE
+              });
+              return _context4.abrupt("return", {
+                status: PaymentStatus.FAIL,
+                error: {
+                  code: MERCHANT_CONFIRM_TIMEOUT_CODE,
+                  message: 'Merchant confirmation timed out.',
+                  needChangeSessionForRetry: false
+                }
+              });
+            case 24:
+              if (shouldContinue) {
+                _context4.next = 29;
+                break;
               }
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_abort'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
               this.changeLoading(false);
               this.elementEventCenter.endEvent(startEventId, {
                 eventCode: PaymentStatus.FAIL,
-                errorName: 'MERCHANT_CONFIRM_ABORT'
+                errorName: MERCHANT_CONFIRM_ABORT_CODE
               });
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
-                  code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Merchant canceled payment.',
+                  code: MERCHANT_CONFIRM_ABORT_CODE,
+                  message: 'Payment was cancelled by merchant before confirmation.',
                   needChangeSessionForRetry: false
                 }
               });
-            case 23:
+            case 29:
               this.serviceMap.Log.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'nonApplePay_sync'
               });
-              _context4.next = 32;
+              _context4.next = 38;
               break;
-            case 26:
-              _context4.prev = 26;
+            case 32:
+              _context4.prev = 32;
               _context4.t0 = _context4["catch"](11);
               this.serviceMap.Log.logError({
                 title: 'sdk_before_confirm_error'
@@ -478,20 +501,20 @@ var ElementController = /*#__PURE__*/function () {
               this.changeLoading(false);
               this.elementEventCenter.endEvent(startEventId, {
                 eventCode: PaymentStatus.FAIL,
-                errorName: 'MERCHANT_CONFIRM_ABORT'
+                errorName: MERCHANT_CONFIRM_ABORT_CODE
               });
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
-                  code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Merchant canceled payment.',
+                  code: MERCHANT_CONFIRM_ABORT_CODE,
+                  message: 'Payment was cancelled by merchant before confirmation.',
                   needChangeSessionForRetry: false
                 }
               });
-            case 32:
-              _context4.next = 35;
+            case 38:
+              _context4.next = 41;
               break;
-            case 34:
+            case 40:
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
                 this.serviceMap.Log.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -500,10 +523,10 @@ var ElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 35:
+            case 41:
               recordResult = null;
-              _context4.prev = 36;
-              _context4.next = 39;
+              _context4.prev = 42;
+              _context4.next = 45;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
                   var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _yield$_this3$onValid2, _data, errorString, errorResult;
@@ -592,7 +615,8 @@ var ElementController = /*#__PURE__*/function () {
                         }, {
                           msg: safeStringify({
                             hasBeforeConfirmForApplePay: hasBeforeConfirmForApplePay,
-                            isApplePay: isApplePay
+                            isApplePay: isApplePay,
+                            amount: "".concat(submitParams === null || submitParams === void 0 ? void 0 : submitParams.amount, ", ").concat(submitParams === null || submitParams === void 0 ? void 0 : submitParams.currency)
                           })
                         });
                         _this3.elementProcessors[ElementType.payment].setOnBeforeConfirm(hasBeforeConfirmForApplePay ? submitParams.onBeforeConfirm : null);
@@ -660,10 +684,10 @@ var ElementController = /*#__PURE__*/function () {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 39:
+            case 45:
               return _context4.abrupt("return", _context4.sent);
-            case 40:
-              _context4.prev = 40;
+            case 46:
+              _context4.prev = 46;
               _logParams = {
                 eventCode: (_recordResult = recordResult) === null || _recordResult === void 0 ? void 0 : _recordResult.status,
                 errorName: (_recordResult2 = recordResult) === null || _recordResult2 === void 0 || (_recordResult2 = _recordResult2.error) === null || _recordResult2 === void 0 ? void 0 : _recordResult2.code,
@@ -674,12 +698,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(40);
-            case 45:
+              return _context4.finish(46);
+            case 51:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[11, 26], [36,, 40, 45]]);
+        }, _callee4, this, [[11, 32], [42,, 46, 51]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -230,7 +230,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       // requests SDK layer to execute merchant's onBeforeConfirm callback via beforeConfirm event,
       // and returns the result (continue/abort) to iframe via dispatchToApp.
       this.eventCenter.listen(EVENT.beforeConfirm.name, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var paymentMethodType, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
+        var paymentMethodType, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue, isTimeout;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -270,8 +270,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               _yield$executeWithTim = _context.sent;
               rawResult = _yield$executeWithTim.result;
               timedOut = _yield$executeWithTim.timedOut;
-              shouldContinue = rawResult; // 双重校验：timedOut（Promise race） + startTime（实际时间差），防止竞态误判
-              if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+              shouldContinue = rawResult;
+              isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS; // 双重校验：timedOut（Promise race） + startTime（实际时间差），防止竞态误判
+              if (isTimeout) {
                 logger.logError({
                   title: 'sdk_before_confirm_timeout'
                 });
@@ -284,15 +285,17 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
-                data: {
+                data: _objectSpread({
                   success: true,
                   result: !!shouldContinue
-                }
+                }, isTimeout ? {
+                  isTimeout: true
+                } : {})
               });
-              _context.next = 23;
+              _context.next = 24;
               break;
-            case 19:
-              _context.prev = 19;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](6);
               logger.logError({
                 title: 'sdk_before_confirm_error'
@@ -308,11 +311,11 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: false
                 }
               });
-            case 23:
+            case 24:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[6, 19]]);
+        }, _callee, null, [[6, 20]]);
       })));
     }
   }, {

package/esm/core/component/element/index.d.ts

@@ -3,7 +3,10 @@ export declare class ElementComponent {
     private options;
     private controller;
     constructor(options: IElementOptions);
-    updatePayment(paymentSessionData: any): Promise<unknown>;
+    /**
+     * @deprecated 不要使用，internal experiment方法
+     */
+    updatePayment(paymentSessionData: any): Promise<boolean>;
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<import("./type").ICommonApiResponse>;
     validateFields(): Promise<{
         isValid: boolean;

package/esm/core/component/element/index.js

@@ -1,16 +1,18 @@
 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); }); }; }
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 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(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); }
+import { adjustSessionData, isElements2 } from "../../../modern/tools";
 import ElementController from "./elementController";
+import { ModernElementController } from "./modernElementController";
 import { InvalidElementConfigError } from "./type";
 import { formatElementOption, validateElementOption } from "./util";
 export var ElementComponent = /*#__PURE__*/function () {
@@ -23,11 +25,23 @@ export var ElementComponent = /*#__PURE__*/function () {
       throw new InvalidElementConfigError(validate.errors);
     }
     this.options = formatElementOption(options);
-    this.controller = new ElementController(options);
+
+    // 核心分流逻辑
+    if (isElements2(options.sessionData)) {
+      this.controller = new ModernElementController(_objectSpread(_objectSpread({}, this.options), {}, {
+        sessionData: adjustSessionData(this.options.sessionData)
+      }));
+    } else {
+      this.controller = new ElementController(this.options);
+    }
   }
+
+  /**
+   * @deprecated 不要使用，internal experiment方法
+   */
   _createClass(ElementComponent, [{
     key: "updatePayment",
-    value: function () {
+    value: (function () {
       var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(paymentSessionData) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -47,6 +61,7 @@ export var ElementComponent = /*#__PURE__*/function () {
     // mount(renderOptions: LinkAuthMountOptions, sdkSelector: string): LinkAuthMountResult;
     // mount(renderOptions: AddressMountOptions, sdkSelector: string): AddressMountResult;
     // mount(renderOptions: PaymentMountOptions, sdkSelector: string);
+    )
   }, {
     key: "mount",
     value: function mount(renderOptions, sdkSelector) {

package/esm/core/component/element/mock.js

@@ -327,7 +327,7 @@ export var sdkAction1 = {
     recommend: false,
     webRedirectType: 'PAGE_REFRESH'
   }],
-  redirectUrl: 'https://www.baidu.com',
+  redirectUrl: '',
   savedPaymentMethods: [],
   shippingInfo: {
     shippingAddress: {

package/esm/core/component/element/modernElementController/adapter.d.ts

@@ -0,0 +1,19 @@
+import type { IMerchantAppointParam } from "../../../../types";
+import type { IPaymentApiResponse, PaymentMountOptions } from '../type';
+import { EventCallbackCode } from '../type';
+import type { PaymentSubmitResult, ErrorPayload } from "../../../../modern/tools";
+export declare function adaptSubmitResult(result: PaymentSubmitResult): IPaymentApiResponse;
+export declare function adaptErrorToEventCallback(error: ErrorPayload): {
+    code: EventCallbackCode;
+    message: string;
+};
+/**
+ * 将老架构的 appearance 格式转换为新架构格式
+ *
+ * 转换规则：
+ * 1. theme: kebab-case → camelCase（如 'nostalgic-gray' → 'nostalgicGray'），其余保持不变
+ * 2. variables: 直接透传（kebab-case CSS 变量 key-value）
+ * 3. card.showBrandIcon → displaySetting.showCardBrandIcon
+ * 4. layout: 直接透传
+ */
+export declare function adaptAppearance(appearance?: PaymentMountOptions['appearance'], merchantAppointParam?: IMerchantAppointParam): any;

package/esm/core/component/element/modernElementController/adapter.js

@@ -0,0 +1,79 @@
+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(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 _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); }
+import { EventCallbackCode } from "../type";
+export function adaptSubmitResult(result) {
+  return {
+    status: result.status || 'FAIL',
+    error: result.error ? {
+      code: result.error.code,
+      message: result.error.message,
+      needChangeSessionForRetry: result.error.needChangeSessionForRetry
+    } : undefined,
+    userCanceled3D: result.userCanceled3D,
+    session: result.paymentSession ? {
+      nextAction: {
+        applinkUrl: result.paymentSession.returnAppUrl,
+        normalUrl: result.paymentSession.returnUrl,
+        schemeUrl: result.paymentSession.returnAppScheme
+      }
+    } : undefined
+  };
+}
+export function adaptErrorToEventCallback(error) {
+  return {
+    code: error.code || EventCallbackCode.SDK_PAYMENT_ERROR,
+    message: error.message || ''
+  };
+}
+
+/**
+ * 将老架构的 appearance 格式转换为新架构格式
+ *
+ * 转换规则：
+ * 1. theme: kebab-case → camelCase（如 'nostalgic-gray' → 'nostalgicGray'），其余保持不变
+ * 2. variables: 直接透传（kebab-case CSS 变量 key-value）
+ * 3. card.showBrandIcon → displaySetting.showCardBrandIcon
+ * 4. layout: 直接透传
+ */
+export function adaptAppearance(appearance, merchantAppointParam) {
+  var _merchantAppointParam, _appearance$card, _appearance$accordion;
+  var merchantDisplaySetting = {
+    showCardCVV: !!(merchantAppointParam !== null && merchantAppointParam !== void 0 && (_merchantAppointParam = merchantAppointParam.storedCard) !== null && _merchantAppointParam !== void 0 && _merchantAppointParam.needCVV),
+    showPaymentMethodListWhenSingleOption: (merchantAppointParam === null || merchantAppointParam === void 0 ? void 0 : merchantAppointParam.singleOption) === 'list'
+  };
+  if (!appearance) {
+    return merchantAppointParam ? {
+      displaySetting: merchantDisplaySetting
+    } : undefined;
+  }
+  var result = {};
+
+  // Theme mapping: kebab-case → camelCase
+  if (appearance.theme) {
+    result.theme = appearance.theme;
+  }
+
+  // Variables: 直接透传
+  if (appearance.variables && _typeof(appearance.variables) === 'object') {
+    var filtered = _objectSpread({}, appearance.variables);
+    if (Object.keys(filtered).length > 0) {
+      result.variables = filtered;
+    }
+  }
+  result.displaySetting = _objectSpread(_objectSpread({
+    showCardBrandIcon: !!((_appearance$card = appearance.card) !== null && _appearance$card !== void 0 && _appearance$card.showBrandIcon)
+  }, merchantDisplaySetting), {}, {
+    showRadioWhenAccordionLayout: !!((_appearance$accordion = appearance.accordion) !== null && _appearance$accordion !== void 0 && _appearance$accordion.showRadio)
+  });
+
+  // Layout: 直接透传
+  if (appearance.layout) {
+    var _appearance$layout$ty;
+    result.layout = ((_appearance$layout$ty = appearance.layout.type) === null || _appearance$layout$ty === void 0 ? void 0 : _appearance$layout$ty.toLowerCase()) || 'accordion';
+  }
+  return result;
+}