@alipay/ams-checkout 2.0.2 → 2.0.5

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

@@ -8,10 +8,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { EnvironmentEnum } from "../../../types";
-import { LogComplianceProcessor } from "./processor";
 import { isPC } from "../../../util";
-import { getStorageString, setStorageString } from "../../../util/storage";
 import { SPM_MAP } from "../../../util/spm-map";
+import { getStorageString, setStorageString } from "../../../util/storage";
+import { LogComplianceProcessor } from "./processor";
 
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
@@ -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;
@@ -190,21 +227,26 @@ export var LogService = /*#__PURE__*/function () {
       script.onerror = function () {
         console.error("unable to load Antom script: ".concat(url));
       };
-      document.body.appendChild(script);
+      // CDN 方式接入 sdk，执行时机可能在 body 创建之前
+      if (document.body) {
+        document.body.appendChild(script);
+      } else if (document.head) {
+        document.head.appendChild(script);
+      }
     }
   }, {
     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/plugin/component/channel.js

@@ -193,7 +193,9 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     _context2.prev = 0;
                     requestParams = {
                       validateUrl: event === null || event === void 0 ? void 0 : event.validationURL,
-                      paymentSessionData: _this.paymentSessionData
+                      paymentSessionData: _this.paymentSessionData,
+                      // TODO: 新增appplay入参
+                      merchantDomain: window.location.hostname
                     };
                     _context2.t0 = getApplePayPaymentSession;
                     _context2.t1 = _this.paymentSessionData;
@@ -395,7 +397,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "initApplePaySession",
     value: function () {
       var _initApplePaySession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$logger7, _this$parseData3, _this$logger6, _this$parseData$payme2, recurringInfo, version, _this$logger8;
+        var _this$logger7, _this$parseData3, _this$logger6, _ref4, recurringInfo, version, _this$logger8;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -430,7 +432,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
               }
               throw new Error('Apple Pay not supported');
             case 12:
-              _this$parseData$payme2 = (_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.paymentSessionFactor, recurringInfo = _this$parseData$payme2.recurringInfo;
+              _ref4 = ((_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.paymentSessionFactor) || {}, recurringInfo = _ref4.recurringInfo;
               version = recurringInfo ? APPLE_PAY_RECURRING_VERSION : APPLE_PAY_VERSION;
               if (this.isCanMakePayments(version)) {
                 _context5.next = 16;
@@ -478,12 +480,12 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "initSessionParams",
     get: function get() {
       var _this$parseData4;
-      var _ref4 = ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.paymentSessionFactor) || {},
-        merchantInfo = _ref4.merchantInfo,
-        order = _ref4.order,
-        paymentAmount = _ref4.paymentAmount,
-        recurringInfo = _ref4.recurringInfo,
-        extendInfo = _ref4.extendInfo;
+      var _ref5 = ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.paymentSessionFactor) || {},
+        merchantInfo = _ref5.merchantInfo,
+        order = _ref5.order,
+        paymentAmount = _ref5.paymentAmount,
+        recurringInfo = _ref5.recurringInfo,
+        extendInfo = _ref5.extendInfo;
       var request = {
         countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
         currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
@@ -529,10 +531,10 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "isRequiredParameters",
     get: function get() {
       var _this$parseData5;
-      var _ref5 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {},
-        merchantInfo = _ref5.merchantInfo,
-        extendInfo = _ref5.extendInfo,
-        paymentAmount = _ref5.paymentAmount;
+      var _ref6 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {},
+        merchantInfo = _ref6.merchantInfo,
+        extendInfo = _ref6.extendInfo,
+        paymentAmount = _ref6.paymentAmount;
       return !isEmpty(merchantInfo) && !isEmpty(paymentAmount) && !isEmpty(extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.supportedNetworks) && !isEmpty(extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantCapabilities);
     }
   }, {

package/esm/types/index.d.ts

@@ -620,6 +620,7 @@ export interface CashierSdkActionQuerySessionResult extends IPaymentSessionMetaD
 export interface ApplePayPaymentSessionRequest {
     validateUrl: string;
     paymentSessionData: string;
+    merchantDomain?: string;
 }
 /**
  * Get App Pay Payment Session Result.

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;
@@ -183,21 +220,26 @@ export var Logger = /*#__PURE__*/function () {
       script.onerror = function () {
         console.error("unable to load Antom script: ".concat(url));
       };
-      document.body.appendChild(script);
+      // CDN 方式接入 sdk，执行时机可能在 body 创建之前
+      if (document.body) {
+        document.body.appendChild(script);
+      } else if (document.head) {
+        document.head.appendChild(script);
+      }
     }
   }, {
     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": "2.0.2",
+  "version": "2.0.5",
   "description": "",
   "author": "",
   "main": "esm/index.js",