@alipay/ams-checkout 0.0.1766664288-dev.3 → 0.0.1766664288-dev.5

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

@@ -23,8 +23,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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 { ServiceProvider } from "../../../../foundation/service";
-import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
+import { productEventScenarios, ProductScene } from "../config";
 import { cleanMockup, removeRetentionPopup } from "../../../../component/component.popup.style";
 import { destroyModal } from "../../../../component/popupWindow.style";
 import { ERRORMESSAGE, EVENT, PROMISE_CALLBACK_CODE } from "../../../../constant";
@@ -34,15 +33,16 @@ import PaymentProcessor from "../../../../core/component/element/elementProcesso
 import { IElementStatus } from "../../../../foundation";
 import { AntomSDKCore } from "../../../../foundation/core";
 import { ElementProcessor } from "../../../../foundation/product-processor/element";
+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 { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
 import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
 import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
-import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
-import { productEventScenarios, ProductScene } from "../config";
 var TIMEOUT_DURATION = 10000;
 var ElementController = /*#__PURE__*/function () {
   function ElementController(options) {
@@ -370,7 +370,7 @@ var ElementController = /*#__PURE__*/function () {
               _context4.next = 11;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, _submitParams$handleA, _yield$_this3$onValid2, _data, errorResult;
+                  var that, recordResultCallback, params, processStep, _submitParams$handleA, _yield$_this3$onValid2, _data, errorString, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -446,28 +446,31 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 22;
+                          _context3.next = 21;
                           break;
                         }
-                        params.handleActions = (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true;
-                        _context3.next = 18;
-                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
-                      case 18:
+                        _context3.next = 17;
+                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, _objectSpread(_objectSpread({}, params), {}, {
+                          handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true
+                        }));
+                      case 17:
                         _yield$_this3$onValid2 = _context3.sent;
                         _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
                         recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 22:
+                      case 21:
                         _context3.next = 30;
                         break;
-                      case 24:
-                        _context3.prev = 24;
+                      case 23:
+                        _context3.prev = 23;
                         _context3.t0 = _context3["catch"](2);
+                        // 修复error为{}空对象的问题，上报stack&message
+                        errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
                         errorResult = {
                           error: _objectSpread(_objectSpread({}, ERRORMESSAGE.ERR_DATA_STRUCT_UNRECOGNIZED), {}, {
-                            context: JSON.stringify(_context3.t0)
+                            context: errorString
                           }),
                           status: PaymentStatus.FAIL
                         };
@@ -482,7 +485,7 @@ var ElementController = /*#__PURE__*/function () {
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 24]]);
+                  }, _callee3, null, [[2, 23]]);
                 }));
                 return function (_x2) {
                   return _ref3.apply(this, arguments);

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

@@ -261,20 +261,12 @@ export interface AddressSubmitData {
     shippingId: string;
     actionFlag?: 'I' | 'U' | 'D';
 }
-export interface HandleAction {
-    APM?: boolean;
-    CARD?: boolean;
-    VA?: boolean;
-    AC_WALLET?: boolean;
-}
-export type HandleActionType = boolean | HandleAction;
 export interface SubmitFuncParams {
-    handleActions?: HandleActionType;
+    handleActions?: boolean;
 }
 export interface SubmitServiceParams extends PaymentSubmitData {
     accountInfo: AuthSubmitData['accountInfo'];
     shipping?: AddressSubmitData;
-    handleActions?: HandleActionType;
 }
 interface SubmitResultActionForm extends ActionForm {
     paymentCodeExpireTime: string;

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

@@ -63,14 +63,20 @@ export function checkCanMount(_ref) {
     return {
       success: false,
       errorMsg: "Element with selector ".concat(sdkSelector, " not found."),
-      error: ERRORMESSAGE.PARAM_INVALID
+      error: {
+        code: ERRORMESSAGE.PARAM_INVALID.code,
+        message: "Element with selector ".concat(sdkSelector, " not found.")
+      }
     };
   }
   if (status === IElementStatus.DESTROYED) {
     return {
       success: false,
       errorMsg: "Creating components in the destroyed state is forbidden.",
-      error: ERRORMESSAGE.UI_STATE_ERROR
+      error: {
+        code: ERRORMESSAGE.UI_STATE_ERROR.code,
+        message: "Creating components in the destroyed state is forbidden."
+      }
     };
   }
   if (status === IElementStatus.READY) {
@@ -82,7 +88,10 @@ export function checkCanMount(_ref) {
     return {
       success: false,
       errorMsg: "SDK status error.",
-      error: ERRORMESSAGE.UI_STATE_ERROR
+      error: {
+        code: ERRORMESSAGE.UI_STATE_ERROR.code,
+        message: "SDK status error."
+      }
     };
   }
   return {

package/esm/foundation/service/log/index.d.ts

@@ -35,6 +35,7 @@ export declare class LogService implements Service {
     log(type: string, payload: LogPayload, extra?: LogExtra, enableExtractCompliance?: boolean): LogService;
     private reportLogs;
     private loadScript;
+    private fallbackLoadScript;
     private initTracker;
     send(): void;
     setComponentStartTime(val: number): void;

package/esm/foundation/service/log/index.js

@@ -183,6 +183,43 @@ export var LogService = /*#__PURE__*/function () {
   }, {
     key: "loadScript",
     value: function loadScript(url, callback) {
+      var _this3 = this;
+      /*
+      * 如果宿主环境存在AMD加载器，通过直接创建script标签的方式加载会造成宿主环境报错：
+      * Message: Mismatched anonymous define() module
+      * 原因是直接通过script标签加载的模块如果没有定义模块名，会被AMD加载器认为是匿名模块，
+      * 而宿主环境中已经存在匿名模块，导致报错。
+      *
+      * TODO: 所有通过window.iTracker调用的方法都需要判断
+      *  是否是AMD环境，如果是，需要通过require加载获取iTracker实例
+      * */
+      if (typeof window.define === 'function' && window.define.amd && typeof window.require === 'function') {
+        var moduleId = 'antom_iTracker';
+        try {
+          var _specified, _ref;
+          // 避免重复 config
+          if (!((_specified = (_ref = window.require).specified) !== null && _specified !== void 0 && _specified.call(_ref, moduleId))) {
+            // @ts-expect-error amd
+            window.require.config({
+              paths: _defineProperty({}, moduleId, url.replace(/\.js$/, ''))
+            });
+          }
+
+          // @ts-expect-error amd
+          window.require([moduleId], callback, function (err) {
+            console.error('AMD load failed, falling back to script tag', err);
+            _this3.fallbackLoadScript(url, callback);
+          });
+          return;
+        } catch (e) {
+          console.warn('require not available, using script tag', e);
+        }
+      }
+      this.fallbackLoadScript(url, callback);
+    }
+  }, {
+    key: "fallbackLoadScript",
+    value: function fallbackLoadScript(url, callback) {
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = url;
@@ -195,16 +232,16 @@ export var LogService = /*#__PURE__*/function () {
   }, {
     key: "initTracker",
     value: function initTracker() {
-      var _this3 = this;
+      var _this4 = this;
       if (this.isLoaded) return;
       this.isLoaded = true;
       try {
         if (typeof localStorage !== 'undefined') {
           this.loadScript(this.config.scriptUrl, function () {
             var _window4;
-            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this3.config);
+            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this4.config);
             setTimeout(function () {
-              _this3.reportLogs();
+              _this4.reportLogs();
             }, 80);
           });
         }

package/esm/main.d.ts

@@ -1,7 +1,7 @@
 import { AddressComponent } from './core/component/address';
 import { ElementComponent } from './core/component/element';
 import { AMSComponent } from './core/component/index';
-import { ComponentSignEnum, IcreateComponent, IElementOptions, IoptionsAddressParams, IoptionsParams, IPreloadOptions } from './types';
+import { ComponentSignEnum, IcreateComponent, IElementOptions, IoptionsAddressParams, IoptionsParams, IPreloadOptions, ValidationResult } from './types';
 export { AMSCheckoutPage } from './core/component/ckp';
 export * from './types';
 export declare class AMSCheckout extends AMSComponent {
@@ -14,6 +14,15 @@ export declare class AMSAutoDebitPay extends AMSCheckout {
 export declare class AMSCashierPayment extends AMSCheckout {
     constructor(options: IoptionsParams);
     static preload(options?: IPreloadOptions): void;
+    /**
+     * Form validation function
+     * If the form is currently displayed:
+     *   - Successful validation: isValid is true
+     *   - Failed validation: isValid is false, and error messages are displayed on the form page
+     * If not on the form display page, isValid returns false
+     * @returns {Promise<ValidationResult>} Returns a Promise containing the validation result
+     */
+    validateFields(): Promise<ValidationResult>;
 }
 export declare class AMSVaulting extends AMSCheckout {
     constructor(options: IoptionsParams);

package/esm/main.js

@@ -112,7 +112,21 @@ export var AMSCashierPayment = /*#__PURE__*/function (_AMSCheckout2) {
     }
     return _super3.call(this, _options, currentChannelType);
   }
-  _createClass(AMSCashierPayment, null, [{
+  _createClass(AMSCashierPayment, [{
+    key: "validateFields",
+    value:
+    /**
+     * Form validation function
+     * If the form is currently displayed:
+     *   - Successful validation: isValid is true
+     *   - Failed validation: isValid is false, and error messages are displayed on the form page
+     * If not on the form display page, isValid returns false
+     * @returns {Promise<ValidationResult>} Returns a Promise containing the validation result
+     */
+    function validateFields() {
+      return this._validateFields();
+    }
+  }], [{
     key: "preload",
     value: function preload() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
@@ -238,7 +252,8 @@ export var AMSEasyPay = /*#__PURE__*/function () {
         displayInfo: {
           type: DisplayTypeEnum.popup
         },
-        isAppWebview: params.isAppWebview
+        isAppWebview: params.isAppWebview,
+        isNativeAppWebview: params.isNativeAppWebview
       });
     }
   }, {

package/esm/util/logger.d.ts

@@ -56,6 +56,7 @@ export declare class Logger {
     reportRPC(rpcData: LogPayload, extra?: Extra): Logger;
     reportLogs(): void;
     loadScript(url: string, callback: () => void): void;
+    private fallbackLoadScript;
     initTracker(): void;
     send(): void;
     setComponentStartTime(val: number): void;

package/esm/util/logger.js

@@ -176,6 +176,43 @@ export var Logger = /*#__PURE__*/function () {
   }, {
     key: "loadScript",
     value: function loadScript(url, callback) {
+      var _this5 = this;
+      /*
+       * 如果宿主环境存在AMD加载器，通过直接创建script标签的方式加载会造成宿主环境报错：
+       * Message: Mismatched anonymous define() module
+       * 原因是直接通过script标签加载的模块如果没有定义模块名，会被AMD加载器认为是匿名模块，
+       * 而宿主环境中已经存在匿名模块，导致报错。
+       *
+       * TODO: 所有通过window.iTracker调用的方法都需要判断
+       *  是否是AMD环境，如果是，需要通过require加载获取iTracker实例
+       * */
+      if (typeof window.define === 'function' && window.define.amd && typeof window.require === 'function') {
+        var moduleId = 'antom_iTracker';
+        try {
+          var _specified, _ref;
+          // 避免重复 config
+          if (!((_specified = (_ref = window.require).specified) !== null && _specified !== void 0 && _specified.call(_ref, moduleId))) {
+            // @ts-expect-error amd
+            window.require.config({
+              paths: _defineProperty({}, moduleId, url.replace(/\.js$/, ''))
+            });
+          }
+
+          // @ts-expect-error amd
+          window.require([moduleId], callback, function (err) {
+            console.error('AMD load failed, falling back to script tag', err);
+            _this5.fallbackLoadScript(url, callback);
+          });
+          return;
+        } catch (e) {
+          console.warn('require not available, using script tag', e);
+        }
+      }
+      this.fallbackLoadScript(url, callback);
+    }
+  }, {
+    key: "fallbackLoadScript",
+    value: function fallbackLoadScript(url, callback) {
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = url;
@@ -188,16 +225,16 @@ export var Logger = /*#__PURE__*/function () {
   }, {
     key: "initTracker",
     value: function initTracker() {
-      var _this5 = this;
+      var _this6 = this;
       if (this.isLoaded) return;
       this.isLoaded = true;
       try {
         if (typeof localStorage !== 'undefined') {
           this.loadScript(this.config.scriptUrl, function () {
             var _window4;
-            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this5.config);
+            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this6.config);
             setTimeout(function () {
-              _this5.reportLogs();
+              _this6.reportLogs();
             }, 80);
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1766664288-dev.3",
+  "version": "0.0.1766664288-dev.5",
   "description": "",
   "author": "",
   "main": "esm/index.js",