@alipay/ams-checkout 0.0.1766756057-dev.0 → 0.0.1766976687-dev.0

package/esm/config/index.d.ts

@@ -1,22 +1,16 @@
-/**
- * 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>;
 export declare const sdkVersion: string;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
+ * TODO 这里考虑直接换成packagejson.version
  */
-export declare const AMSCheckoutAppVersion: string;
-export declare const AMSAutoDebitAppVersion: string;
-export declare const AMSEasyPayAppVersion: string;
-export declare const AMSCashierPaymentAppVersion: string;
-export declare const AMSVaultingAppVersion: string;
-export declare const AMSPaymentElementAppVersion: string;
-export declare const ADDRESSElementAppVersion: string;
-export declare const AUTHElementAppVersion: string;
+export declare const AMSCheckoutAppVersion = "1.47.2";
+export declare const AMSAutoDebitAppVersion = "1.47.2";
+export declare const AMSEasyPayAppVersion = "1.47.2";
+export declare const AMSCashierPaymentAppVersion = "1.47.2";
+export declare const AMSVaultingAppVersion = "1.47.2";
+export declare const AMSPaymentElementAppVersion = "1.47.2";
+export declare const ADDRESSElementAppVersion = "1.47.2";
+export declare const AUTHElementAppVersion = "1.47.2";

package/esm/config/index.js

@@ -5,6 +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',
@@ -29,16 +30,17 @@ export var v2AppMarmotMap = {
   light_sandbox: 'https://checkout.antom.com',
   prod: 'https://checkout.antom.com'
 };
-export var sdkVersion = "".concat("0.0.1766756057-dev.0");
+export var sdkVersion = json.version;
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
+ * TODO 这里考虑直接换成packagejson.version
  */
-export var AMSCheckoutAppVersion = sdkVersion; // 兜底版本号
-export var AMSAutoDebitAppVersion = sdkVersion; // 代扣
-export var AMSEasyPayAppVersion = sdkVersion; // easypay
-export var AMSCashierPaymentAppVersion = sdkVersion; // 收银台（卡、apm）
-export var AMSVaultingAppVersion = sdkVersion; // 绑卡
-export var AMSPaymentElementAppVersion = sdkVersion; // payment element
-export var ADDRESSElementAppVersion = sdkVersion; // address element
-export var AUTHElementAppVersion = sdkVersion; // auth element
+export var AMSCheckoutAppVersion = '1.47.2'; // 兜底版本号
+export var AMSAutoDebitAppVersion = '1.47.2'; // 代扣
+export var AMSEasyPayAppVersion = '1.47.2'; // easypay
+export var AMSCashierPaymentAppVersion = '1.47.2'; // 收银台（卡、apm）
+export var AMSVaultingAppVersion = '1.47.2'; // 绑卡
+export var AMSPaymentElementAppVersion = '1.47.2'; // payment element
+export var ADDRESSElementAppVersion = '1.47.2'; // address element
+export var AUTHElementAppVersion = '1.47.2'; // auth element

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

@@ -0,0 +1,10 @@
+export declare enum ProductScene {
+    EXPRESS_CHECKOUT = "EXPRESS_CHECKOUT",
+    ELEMENT_PAYMENT = "ELEMENT_PAYMENT"
+}
+interface EventScenario {
+    eventName: ProductScene;
+    supportedEvents: string[];
+}
+export declare const productEventScenarios: EventScenario[];
+export {};

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

@@ -0,0 +1,17 @@
+// 定义产品场景的枚举
+export var ProductScene = /*#__PURE__*/function (ProductScene) {
+  ProductScene["EXPRESS_CHECKOUT"] = "EXPRESS_CHECKOUT";
+  ProductScene["ELEMENT_PAYMENT"] = "ELEMENT_PAYMENT";
+  return ProductScene;
+}({});
+
+// 定义一个事件场景的接口
+
+// 存储产品场景及支持的事件名
+export var productEventScenarios = [{
+  eventName: ProductScene.EXPRESS_CHECKOUT,
+  supportedEvents: [] // 没有支持的事件
+}, {
+  eventName: ProductScene.ELEMENT_PAYMENT,
+  supportedEvents: ['paymentMethodChanged', 'valuesChanged'] // 支持的事件
+}];

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

@@ -1,4 +1,4 @@
-import { AddressMountOptions, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions } from '../type';
+import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
 declare class ElementController {
     private options;
     private elementContainer;
@@ -33,7 +33,7 @@ declare class ElementController {
     validateFields(): Promise<{
         isValid: boolean;
     }>;
-    submitPayment(): Promise<IPaymentApiResponse>;
+    submitPayment(submitParams: SubmitFuncParams): Promise<IPaymentApiResponse>;
     private changeLoading;
     private addEventListener;
     private sendRequestAndWaitWebLaunch;
@@ -44,5 +44,7 @@ declare class ElementController {
     private destroyHandle;
     destroy(): void;
     private setControllerStatusOrView;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
+    private isEventAllowed;
 }
 export default ElementController;

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

@@ -40,8 +40,9 @@ 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, safeStringify, showToast } from "../util";
+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) {
@@ -337,7 +338,7 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "submitPayment",
     value: function () {
-      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
         var startEventId, res, logParams, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -369,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, _yield$_this3$onValid2, data, errorString, 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:
@@ -422,7 +423,7 @@ var ElementController = /*#__PURE__*/function () {
                               }
                             }, _callee2);
                           }));
-                          return function processStep(_x2, _x3) {
+                          return function processStep(_x3, _x4) {
                             return _ref4.apply(this, arguments);
                           };
                         }(); // 按顺序处理步骤
@@ -445,23 +446,25 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 21;
+                          _context3.next = 23;
                           break;
                         }
-                        _context3.next = 17;
+                        params.handleAction = (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleAction) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true;
+                        params.shipping = submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo;
+                        _context3.next = 19;
                         return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
-                      case 17:
+                      case 19:
                         _yield$_this3$onValid2 = _context3.sent;
-                        data = _yield$_this3$onValid2.data;
+                        _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
-                        recordResult = data;
+                        recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 21:
-                        _context3.next = 30;
-                        break;
                       case 23:
-                        _context3.prev = 23;
+                        _context3.next = 32;
+                        break;
+                      case 25:
+                        _context3.prev = 25;
                         _context3.t0 = _context3["catch"](2);
                         // 修复error为{}空对象的问题，上报stack&message
                         errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
@@ -478,13 +481,13 @@ var ElementController = /*#__PURE__*/function () {
                         });
                         recordResult = errorResult;
                         recordResultCallback(errorResult);
-                      case 30:
+                      case 32:
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 23]]);
+                  }, _callee3, null, [[2, 25]]);
                 }));
-                return function (_x) {
+                return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
@@ -509,7 +512,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee4, this, [[8,, 12, 17]]);
       }));
-      function submitPayment() {
+      function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);
       }
       return submitPayment;
@@ -654,7 +657,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee5, this, [[1, 20]]);
       }));
-      function sendRequestAndWaitWebLaunch(_x4, _x5) {
+      function sendRequestAndWaitWebLaunch(_x5, _x6) {
         return _sendRequestAndWaitWebLaunch.apply(this, arguments);
       }
       return sendRequestAndWaitWebLaunch;
@@ -787,7 +790,7 @@ var ElementController = /*#__PURE__*/function () {
                     }
                   }, _callee6);
                 }));
-                return function (_x7) {
+                return function (_x8) {
                   return _ref5.apply(this, arguments);
                 };
               }()));
@@ -797,7 +800,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee7);
       }));
-      function updatePayment(_x6) {
+      function updatePayment(_x7) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -834,6 +837,30 @@ var ElementController = /*#__PURE__*/function () {
       (_this$onStatusChangeC = this.onStatusChangeCallback) === null || _this$onStatusChangeC === void 0 || _this$onStatusChangeC.call(this, "\u72B6\u6001\u7531 ".concat(_status, " \u53D8\u66F4\u4E3A ").concat(status));
       this.elementContainer.setStatus(status);
     }
+  }, {
+    key: "on",
+    value: function on(event, callback) {
+      if (!this.isEventAllowed(event)) {
+        return console.error("Event \"".concat(event, "\" is not allowed."));
+      }
+      this.serviceMap.EventCenter.listen(event, function (data) {
+        callback === null || callback === void 0 || callback(data);
+      });
+    }
+  }, {
+    key: "isEventAllowed",
+    value: function isEventAllowed(event) {
+      var _safeParse, _this$elementContaine;
+      // 获取当前场景
+      var isExpressCheckout = (_safeParse = safeParse((_this$elementContaine = this.elementContainer.getPaymentContext()) === null || _this$elementContaine === void 0 || (_this$elementContaine = _this$elementContaine.paymentSessionObj) === null || _this$elementContaine === void 0 ? void 0 : _this$elementContaine.extendInfo)) === null || _safeParse === void 0 ? void 0 : _safeParse.expressCheckout;
+      var productScene = isExpressCheckout ? ProductScene.EXPRESS_CHECKOUT : ProductScene.ELEMENT_PAYMENT;
+      // 查找对应的产品场景
+      var scenario = productEventScenarios.find(function (s) {
+        return s.eventName === productScene;
+      });
+      // 检查场景存在且事件名称在支持的事件列表中
+      return scenario !== undefined && scenario.supportedEvents.includes(event);
+    }
   }]);
   return ElementController;
 }();

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

@@ -1,4 +1,4 @@
-import { IElementOptions, PaymentMountOptions } from './type';
+import { EventDataMap, EVENTNAME, IElementOptions, PaymentMountOptions, SubmitFuncParams } from './type';
 export declare class ElementComponent {
     private options;
     private controller;
@@ -8,6 +8,7 @@ export declare class ElementComponent {
     validateFields(): Promise<{
         isValid: boolean;
     }>;
-    submitPayment(): Promise<import("./type").IPaymentApiResponse>;
+    submitPayment(params: SubmitFuncParams): Promise<import("./type").IPaymentApiResponse>;
     destroy(): void;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
 }

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

@@ -62,14 +62,19 @@ export var ElementComponent = /*#__PURE__*/function () {
     }
   }, {
     key: "submitPayment",
-    value: function submitPayment() {
-      return this.controller.submitPayment();
+    value: function submitPayment(params) {
+      return this.controller.submitPayment(params);
     }
   }, {
     key: "destroy",
     value: function destroy() {
       this.controller.destroy();
     }
+  }, {
+    key: "on",
+    value: function on(event, callback) {
+      this.controller.on(event, callback);
+    }
   }]);
   return ElementComponent;
 }();

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

@@ -261,9 +261,21 @@ export interface AddressSubmitData {
     shippingId: string;
     actionFlag?: 'I' | 'U' | 'D';
 }
+export interface HandleAction {
+    threeD?: boolean;
+    callApp?: boolean;
+    pageRedirect?: boolean;
+    qrCode?: boolean;
+}
+export type HandleActionType = boolean | HandleAction;
+export interface SubmitFuncParams {
+    shippingInfo?: AddressSubmitData;
+    handleAction?: HandleActionType;
+}
 export interface SubmitServiceParams extends PaymentSubmitData {
     accountInfo: AuthSubmitData['accountInfo'];
     shipping?: AddressSubmitData;
+    handleAction?: HandleActionType;
 }
 interface SubmitResultActionForm extends ActionForm {
     paymentCodeExpireTime: string;
@@ -443,4 +455,30 @@ export declare enum EXPOSURE_API_EVENT {
     VALIDATAFIELDS = "validateFields",
     UPDATEPAYMENT = "updatePayment"
 }
+export declare enum EVENTNAME {
+    PAYMENTMETHODCHANGED = "paymentMethodChanged",
+    VALUESCHANGED = "valuesChanged"
+}
+interface PaymentMethodChangedData {
+    type: string;
+    name: string;
+}
+interface ValuesChangedData {
+    region: string;
+    state: string;
+    city: string;
+    address1: string;
+    address2: string;
+    zipCode: string;
+    phoneNo: string;
+    name: {
+        firstName: string;
+        lastName: string;
+        middleName: string;
+    };
+}
+export interface EventDataMap {
+    [EVENTNAME.PAYMENTMETHODCHANGED]: PaymentMethodChangedData;
+    [EVENTNAME.VALUESCHANGED]: ValuesChangedData;
+}
 export {};

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

@@ -147,4 +147,11 @@ export var EXPOSURE_API_EVENT = /*#__PURE__*/function (EXPOSURE_API_EVENT) {
   EXPOSURE_API_EVENT["VALIDATAFIELDS"] = "validateFields";
   EXPOSURE_API_EVENT["UPDATEPAYMENT"] = "updatePayment";
   return EXPOSURE_API_EVENT;
-}({});
+}({});
+export var EVENTNAME = /*#__PURE__*/function (EVENTNAME) {
+  EVENTNAME["PAYMENTMETHODCHANGED"] = "paymentMethodChanged";
+  EVENTNAME["VALUESCHANGED"] = "valuesChanged";
+  return EVENTNAME;
+}({});
+
+// 支付方式改变的回调函数的数据结构

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

@@ -83,3 +83,4 @@ export declare const isElementPC: () => boolean;
  */
 export declare const isLoadErrorPage: (params: CashierSdkActionQueryResult) => boolean;
 export declare const safeStringify: (payload: any, defaultValue?: string) => string;
+export declare const safeParse: (payload: any, defaultValue?: Record<string, any>) => Record<string, any>;

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

@@ -535,4 +535,14 @@ export var safeStringify = function safeStringify(payload) {
     console.error('JSON.stringify failed:', e);
     return defaultValue;
   }
+};
+export var safeParse = function safeParse(payload) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  if (!payload) return defaultValue;
+  try {
+    return JSON.parse(payload) || defaultValue;
+  } catch (e) {
+    console.error('JSON.parse failed:', e);
+    return defaultValue;
+  }
 };

package/esm/util/logger.js

@@ -7,7 +7,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 { sdkVersion } from "../config";
+import json from "../../package.json";
 import { LogComplianceProcessor } from "../foundation/service/log/processor";
 import { SPM_MAP } from "./spm-map";
 export var Logger = /*#__PURE__*/function () {
@@ -292,6 +292,6 @@ export var LogConfig = {
   version: 'iteration/20231021',
   mdata: {
     firstLogTime: Date.now(),
-    sdkVersion: sdkVersion
+    sdkVersion: json === null || json === void 0 ? void 0 : json.version
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1766756057-dev.0",
+  "version": "0.0.1766976687-dev.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",
@@ -68,7 +68,7 @@
     "dts-bundle-generator": "^6.13.0",
     "eslint": "^8.56.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "father": "^4.6.12",
+    "father": "^4.2.3",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.3.1",
     "prettier": "^2.8.4",