@alipay/ams-checkout 2.0.21 → 2.0.23

package/esm/config/index.js

@@ -30,7 +30,7 @@ export var v2AppMarmotMap = {
   light_sandbox: 'https://checkout.antom.com',
   prod: 'https://checkout.antom.com'
 };
-export var sdkVersion = "2.0.21";
+export var sdkVersion = "2.0.23";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

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

@@ -36,6 +36,7 @@ import { convertPaymentMethods } from "../elementProcessor/convertPaymentMethods
 import { generateIframeSrc as _generateIframeSrc, isElementPad, isElementPC, safeParse, safeStringify } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
 import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
+import { shouldQueryOneAccount } from "../../../utils/connectConfig";
 var logger = new Logger(LogConfig, true);
 var isExpressCheckout = function isExpressCheckout(extendInfo) {
   try {
@@ -421,7 +422,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
         var _paymentSessionObj$co,
           _this$options5,
           _this3 = this;
-        var requestService, _this$elementContaine7, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options4, environment, locale, _ref6, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, previewMode, IS_PREVIEW, SHOULD_USE_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
+        var requestService, _this$elementContaine7, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options4, environment, locale, _ref6, paymentSessionConfig, hostSign, isConnect, shouldQueryOneAccountFlag, LOCAL_MOCK, previewMode, IS_PREVIEW, SHOULD_USE_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -433,6 +434,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               _ref6 = paymentSessionObj || {}, paymentSessionConfig = _ref6.paymentSessionConfig;
               hostSign = paymentSession.split('&&')[1] || '';
               isConnect = paymentSessionObj === null || paymentSessionObj === void 0 || (_paymentSessionObj$co = paymentSessionObj.connectFactor) === null || _paymentSessionObj$co === void 0 ? void 0 : _paymentSessionObj$co.enableConnect;
+              shouldQueryOneAccountFlag = shouldQueryOneAccount(isConnect, paymentSessionObj === null || paymentSessionObj === void 0 ? void 0 : paymentSessionObj.extendInfo);
               LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock); // 兼容三种预览开关取值：true / 'web' / 'mobile'
               previewMode = (_this$options5 = this.options) === null || _this$options5 === void 0 ? void 0 : _this$options5.preview;
               IS_PREVIEW = previewMode === true || previewMode === 'web' || previewMode === 'mobile';
@@ -579,9 +581,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   });
                 });
               };
-              _context3.next = 18;
-              return Promise.all(isConnect ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
-            case 18:
+              _context3.next = 19;
+              return Promise.all(shouldQueryOneAccountFlag ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
+            case 19:
               _yield$Promise$all = _context3.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               originActionQueryResult = _yield$Promise$all2[0];
@@ -594,7 +596,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               });
-            case 24:
+            case 25:
             case "end":
               return _context3.stop();
           }

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

@@ -11,6 +11,7 @@ export function adaptSubmitResult(result) {
     error: result.error ? {
       code: result.error.code,
       message: result.error.message,
+      traceId: result.error.traceId,
       needChangeSessionForRetry: result.error.needChangeSessionForRetry
     } : undefined,
     userCanceled3D: result.userCanceled3D,

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

@@ -28,7 +28,6 @@ export declare class ModernElementController implements IElementController {
     private modalBridge;
     private modalDestroy;
     private modalIframe;
-    private _closeConfirmResolve;
     private notRedirectAfterComplete;
     private _sdkInitTime;
     private _mountStartTime;
@@ -43,6 +42,7 @@ export declare class ModernElementController implements IElementController {
     private isSubmitting;
     constructor({ onStatusChange, ...options }: ModernElementControllerOptions);
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<ICommonApiResponse>;
+    private doMount;
     /**
      * setup() — 解析 sessionData 获取 metaData，发起 sdkQuery 获取渲染数据，准备 HANDSHAKE 配置
      *
@@ -116,9 +116,11 @@ export declare class ModernElementController implements IElementController {
      */
     private waitForHandshakeAck;
     submitPayment(params: SubmitFuncParams): Promise<IPaymentApiResponse>;
+    private doSubmitPayment;
     validateFields(): Promise<{
         isValid: boolean;
     }>;
+    private doValidateFields;
     updatePayment(paymentSessionData: string): Promise<boolean>;
     on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
     destroy(): void;