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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
1
+ import { AddressMountOptions, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions } from '../type';
2
2
  declare class ElementController {
3
3
  private options;
4
4
  private elementContainer;
@@ -33,7 +33,7 @@ declare class ElementController {
33
33
  validateFields(): Promise<{
34
34
  isValid: boolean;
35
35
  }>;
36
- submitPayment(submitParams: SubmitFuncParams): Promise<IPaymentApiResponse>;
36
+ submitPayment(): Promise<IPaymentApiResponse>;
37
37
  private changeLoading;
38
38
  private addEventListener;
39
39
  private sendRequestAndWaitWebLaunch;
@@ -44,7 +44,5 @@ declare class ElementController {
44
44
  private destroyHandle;
45
45
  destroy(): void;
46
46
  private setControllerStatusOrView;
47
- on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
48
- private isEventAllowed;
49
47
  }
50
48
  export default ElementController;
@@ -40,9 +40,8 @@ import { IContainerStatus } from "../elementContainerService/containerService";
40
40
  import { EventCenter as ElementEventCenter } from "../EventCenter/index";
41
41
  import { oneAccountUpdate, sdkActionUpdate } from "../mock";
42
42
  import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
43
- import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
43
+ import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeStringify, showToast } from "../util";
44
44
  import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
45
- import { productEventScenarios, ProductScene } from "../config";
46
45
  var TIMEOUT_DURATION = 10000;
47
46
  var ElementController = /*#__PURE__*/function () {
48
47
  function ElementController(options) {
@@ -338,7 +337,7 @@ var ElementController = /*#__PURE__*/function () {
338
337
  }, {
339
338
  key: "submitPayment",
340
339
  value: function () {
341
- var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
340
+ var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
342
341
  var _this3 = this;
343
342
  var startEventId, res, logParams, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
344
343
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -370,7 +369,7 @@ var ElementController = /*#__PURE__*/function () {
370
369
  _context4.next = 11;
371
370
  return new Promise( /*#__PURE__*/function () {
372
371
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
373
- var that, recordResultCallback, params, processStep, _submitParams$handleA, _yield$_this3$onValid2, _data, errorString, errorResult;
372
+ var that, recordResultCallback, params, processStep, _yield$_this3$onValid2, data, errorString, errorResult;
374
373
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
375
374
  while (1) switch (_context3.prev = _context3.next) {
376
375
  case 0:
@@ -423,7 +422,7 @@ var ElementController = /*#__PURE__*/function () {
423
422
  }
424
423
  }, _callee2);
425
424
  }));
426
- return function processStep(_x3, _x4) {
425
+ return function processStep(_x2, _x3) {
427
426
  return _ref4.apply(this, arguments);
428
427
  };
429
428
  }(); // 按顺序处理步骤
@@ -446,25 +445,23 @@ var ElementController = /*#__PURE__*/function () {
446
445
  return _context3.abrupt("return");
447
446
  case 14:
448
447
  if (!_this3.elementProcessors[ElementType.payment]) {
449
- _context3.next = 23;
448
+ _context3.next = 21;
450
449
  break;
451
450
  }
452
- params.handleAction = (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleAction) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true;
453
- params.shipping = submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo;
454
- _context3.next = 19;
451
+ _context3.next = 17;
455
452
  return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
456
- case 19:
453
+ case 17:
457
454
  _yield$_this3$onValid2 = _context3.sent;
458
- _data = _yield$_this3$onValid2.data;
455
+ data = _yield$_this3$onValid2.data;
459
456
  // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
460
457
  // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
461
- recordResult = _data;
458
+ recordResult = data;
462
459
  recordResultCallback(recordResult);
463
- case 23:
464
- _context3.next = 32;
460
+ case 21:
461
+ _context3.next = 30;
465
462
  break;
466
- case 25:
467
- _context3.prev = 25;
463
+ case 23:
464
+ _context3.prev = 23;
468
465
  _context3.t0 = _context3["catch"](2);
469
466
  // 修复error为{}空对象的问题,上报stack&message
470
467
  errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
@@ -481,13 +478,13 @@ var ElementController = /*#__PURE__*/function () {
481
478
  });
482
479
  recordResult = errorResult;
483
480
  recordResultCallback(errorResult);
484
- case 32:
481
+ case 30:
485
482
  case "end":
486
483
  return _context3.stop();
487
484
  }
488
- }, _callee3, null, [[2, 25]]);
485
+ }, _callee3, null, [[2, 23]]);
489
486
  }));
490
- return function (_x2) {
487
+ return function (_x) {
491
488
  return _ref3.apply(this, arguments);
492
489
  };
493
490
  }());
@@ -512,7 +509,7 @@ var ElementController = /*#__PURE__*/function () {
512
509
  }
513
510
  }, _callee4, this, [[8,, 12, 17]]);
514
511
  }));
515
- function submitPayment(_x) {
512
+ function submitPayment() {
516
513
  return _submitPayment.apply(this, arguments);
517
514
  }
518
515
  return submitPayment;
@@ -657,7 +654,7 @@ var ElementController = /*#__PURE__*/function () {
657
654
  }
658
655
  }, _callee5, this, [[1, 20]]);
659
656
  }));
660
- function sendRequestAndWaitWebLaunch(_x5, _x6) {
657
+ function sendRequestAndWaitWebLaunch(_x4, _x5) {
661
658
  return _sendRequestAndWaitWebLaunch.apply(this, arguments);
662
659
  }
663
660
  return sendRequestAndWaitWebLaunch;
@@ -790,7 +787,7 @@ var ElementController = /*#__PURE__*/function () {
790
787
  }
791
788
  }, _callee6);
792
789
  }));
793
- return function (_x8) {
790
+ return function (_x7) {
794
791
  return _ref5.apply(this, arguments);
795
792
  };
796
793
  }()));
@@ -800,7 +797,7 @@ var ElementController = /*#__PURE__*/function () {
800
797
  }
801
798
  }, _callee7);
802
799
  }));
803
- function updatePayment(_x7) {
800
+ function updatePayment(_x6) {
804
801
  return _updatePayment.apply(this, arguments);
805
802
  }
806
803
  return updatePayment;
@@ -837,30 +834,6 @@ var ElementController = /*#__PURE__*/function () {
837
834
  (_this$onStatusChangeC = this.onStatusChangeCallback) === null || _this$onStatusChangeC === void 0 || _this$onStatusChangeC.call(this, "\u72B6\u6001\u7531 ".concat(_status, " \u53D8\u66F4\u4E3A ").concat(status));
838
835
  this.elementContainer.setStatus(status);
839
836
  }
840
- }, {
841
- key: "on",
842
- value: function on(event, callback) {
843
- if (!this.isEventAllowed(event)) {
844
- return console.error("Event \"".concat(event, "\" is not allowed."));
845
- }
846
- this.serviceMap.EventCenter.listen(event, function (data) {
847
- callback === null || callback === void 0 || callback(data);
848
- });
849
- }
850
- }, {
851
- key: "isEventAllowed",
852
- value: function isEventAllowed(event) {
853
- var _safeParse, _this$elementContaine;
854
- // 获取当前场景
855
- 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;
856
- var productScene = isExpressCheckout ? ProductScene.EXPRESS_CHECKOUT : ProductScene.ELEMENT_PAYMENT;
857
- // 查找对应的产品场景
858
- var scenario = productEventScenarios.find(function (s) {
859
- return s.eventName === productScene;
860
- });
861
- // 检查场景存在且事件名称在支持的事件列表中
862
- return scenario !== undefined && scenario.supportedEvents.includes(event);
863
- }
864
837
  }]);
865
838
  return ElementController;
866
839
  }();
@@ -1,4 +1,4 @@
1
- import { EventDataMap, EVENTNAME, IElementOptions, PaymentMountOptions, SubmitFuncParams } from './type';
1
+ import { IElementOptions, PaymentMountOptions } from './type';
2
2
  export declare class ElementComponent {
3
3
  private options;
4
4
  private controller;
@@ -8,7 +8,6 @@ export declare class ElementComponent {
8
8
  validateFields(): Promise<{
9
9
  isValid: boolean;
10
10
  }>;
11
- submitPayment(params: SubmitFuncParams): Promise<import("./type").IPaymentApiResponse>;
11
+ submitPayment(): Promise<import("./type").IPaymentApiResponse>;
12
12
  destroy(): void;
13
- on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
14
13
  }
@@ -62,19 +62,14 @@ export var ElementComponent = /*#__PURE__*/function () {
62
62
  }
63
63
  }, {
64
64
  key: "submitPayment",
65
- value: function submitPayment(params) {
66
- return this.controller.submitPayment(params);
65
+ value: function submitPayment() {
66
+ return this.controller.submitPayment();
67
67
  }
68
68
  }, {
69
69
  key: "destroy",
70
70
  value: function destroy() {
71
71
  this.controller.destroy();
72
72
  }
73
- }, {
74
- key: "on",
75
- value: function on(event, callback) {
76
- this.controller.on(event, callback);
77
- }
78
73
  }]);
79
74
  return ElementComponent;
80
75
  }();
@@ -261,21 +261,9 @@ export interface AddressSubmitData {
261
261
  shippingId: string;
262
262
  actionFlag?: 'I' | 'U' | 'D';
263
263
  }
264
- export interface HandleAction {
265
- threeD?: boolean;
266
- callApp?: boolean;
267
- pageRedirect?: boolean;
268
- qrCode?: boolean;
269
- }
270
- export type HandleActionType = boolean | HandleAction;
271
- export interface SubmitFuncParams {
272
- shippingInfo?: AddressSubmitData;
273
- handleAction?: HandleActionType;
274
- }
275
264
  export interface SubmitServiceParams extends PaymentSubmitData {
276
265
  accountInfo: AuthSubmitData['accountInfo'];
277
266
  shipping?: AddressSubmitData;
278
- handleAction?: HandleActionType;
279
267
  }
280
268
  interface SubmitResultActionForm extends ActionForm {
281
269
  paymentCodeExpireTime: string;
@@ -455,30 +443,4 @@ export declare enum EXPOSURE_API_EVENT {
455
443
  VALIDATAFIELDS = "validateFields",
456
444
  UPDATEPAYMENT = "updatePayment"
457
445
  }
458
- export declare enum EVENTNAME {
459
- PAYMENTMETHODCHANGED = "paymentMethodChanged",
460
- VALUESCHANGED = "valuesChanged"
461
- }
462
- interface PaymentMethodChangedData {
463
- type: string;
464
- name: string;
465
- }
466
- interface ValuesChangedData {
467
- region: string;
468
- state: string;
469
- city: string;
470
- address1: string;
471
- address2: string;
472
- zipCode: string;
473
- phoneNo: string;
474
- name: {
475
- firstName: string;
476
- lastName: string;
477
- middleName: string;
478
- };
479
- }
480
- export interface EventDataMap {
481
- [EVENTNAME.PAYMENTMETHODCHANGED]: PaymentMethodChangedData;
482
- [EVENTNAME.VALUESCHANGED]: ValuesChangedData;
483
- }
484
446
  export {};
@@ -147,11 +147,4 @@ export var EXPOSURE_API_EVENT = /*#__PURE__*/function (EXPOSURE_API_EVENT) {
147
147
  EXPOSURE_API_EVENT["VALIDATAFIELDS"] = "validateFields";
148
148
  EXPOSURE_API_EVENT["UPDATEPAYMENT"] = "updatePayment";
149
149
  return EXPOSURE_API_EVENT;
150
- }({});
151
- export var EVENTNAME = /*#__PURE__*/function (EVENTNAME) {
152
- EVENTNAME["PAYMENTMETHODCHANGED"] = "paymentMethodChanged";
153
- EVENTNAME["VALUESCHANGED"] = "valuesChanged";
154
- return EVENTNAME;
155
- }({});
156
-
157
- // 支付方式改变的回调函数的数据结构
150
+ }({});
@@ -83,4 +83,3 @@ export declare const isElementPC: () => boolean;
83
83
  */
84
84
  export declare const isLoadErrorPage: (params: CashierSdkActionQueryResult) => boolean;
85
85
  export declare const safeStringify: (payload: any, defaultValue?: string) => string;
86
- export declare const safeParse: (payload: any, defaultValue?: Record<string, any>) => Record<string, any>;
@@ -535,14 +535,4 @@ export var safeStringify = function safeStringify(payload) {
535
535
  console.error('JSON.stringify failed:', e);
536
536
  return defaultValue;
537
537
  }
538
- };
539
- export var safeParse = function safeParse(payload) {
540
- var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
541
- if (!payload) return defaultValue;
542
- try {
543
- return JSON.parse(payload) || defaultValue;
544
- } catch (e) {
545
- console.error('JSON.parse failed:', e);
546
- return defaultValue;
547
- }
548
538
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alipay/ams-checkout",
3
- "version": "0.0.1766976687-dev.0",
3
+ "version": "0.0.1767075519-dev.0",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "main": "esm/index.js",
@@ -1,10 +0,0 @@
1
- export declare enum ProductScene {
2
- EXPRESS_CHECKOUT = "EXPRESS_CHECKOUT",
3
- ELEMENT_PAYMENT = "ELEMENT_PAYMENT"
4
- }
5
- interface EventScenario {
6
- eventName: ProductScene;
7
- supportedEvents: string[];
8
- }
9
- export declare const productEventScenarios: EventScenario[];
10
- export {};
@@ -1,17 +0,0 @@
1
- // 定义产品场景的枚举
2
- export var ProductScene = /*#__PURE__*/function (ProductScene) {
3
- ProductScene["EXPRESS_CHECKOUT"] = "EXPRESS_CHECKOUT";
4
- ProductScene["ELEMENT_PAYMENT"] = "ELEMENT_PAYMENT";
5
- return ProductScene;
6
- }({});
7
-
8
- // 定义一个事件场景的接口
9
-
10
- // 存储产品场景及支持的事件名
11
- export var productEventScenarios = [{
12
- eventName: ProductScene.EXPRESS_CHECKOUT,
13
- supportedEvents: [] // 没有支持的事件
14
- }, {
15
- eventName: ProductScene.ELEMENT_PAYMENT,
16
- supportedEvents: ['paymentMethodChanged', 'valuesChanged'] // 支持的事件
17
- }];