@alipay/ams-checkout 1.29.0 → 1.30.0

package/esm/plugin/component/index.js

@@ -28,7 +28,7 @@ import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
 import { handlePaymentSessionConfig } from "../payment-element/utils";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
-import { ApplePayService, getChannelBehavior, handleGooglePay } from "./channel";
+import { ApplePaySdk, getChannelBehavior, handleGooglePay } from "./channel";
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
 import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup, slideInAndOutKeyframes } from "./component.popup.style";
 import { createModal, destroyModal, insertStyleSheet, removePopupLoading } from "./popupWindow.style";
@@ -1342,15 +1342,33 @@ var ComponentApp = /*#__PURE__*/function () {
         });
       }
       if ((data === null || data === void 0 || (_data$context3 = data.context) === null || _data$context3 === void 0 ? void 0 : _data$context3.event) === EVENT.getApplePayToken.name) {
-        var _data$context4, _this$_renderParams16, _this$_renderParams17;
-        var applePayService = new ApplePayService({
-          paymentMethod: data === null || data === void 0 || (_data$context4 = data.context) === null || _data$context4 === void 0 || (_data$context4 = _data$context4.data) === null || _data$context4 === void 0 ? void 0 : _data$context4.paymentMethod,
-          sessionData: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.sessionData,
-          paymentSessionMetaData: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.paymentSessionMetaData,
-          logger: this.AMSSDK.logger,
-          dispatchToApp: this.dispatchToApp.bind(this)
+        var _this$_renderParams16, _this$_renderParams17;
+        var applePayService = new ApplePaySdk({
+          paymentSessionData: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.sessionData,
+          parseData: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.paymentSessionMetaData,
+          logger: this.AMSSDK.logger
+        });
+        applePayService.startPay().then(function (res) {
+          _this7.dispatchToApp({
+            context: {
+              event: 'getApplePayToken',
+              data: {
+                success: true,
+                result: res
+              }
+            }
+          });
+        }).catch(function (err) {
+          _this7.dispatchToApp({
+            context: {
+              event: 'getApplePayToken',
+              data: {
+                success: false,
+                result: err
+              }
+            }
+          });
         });
-        applePayService.submit();
         return;
       }
       // log event before sending the callback
@@ -1368,11 +1386,11 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "logEventCallback",
     value: function logEventCallback(data, title) {
       if (data.context.event === EVENT.eventCallback.name) {
-        var _data$context6;
+        var _data$context5;
         var callbackData = '';
         try {
-          var _data$context5;
-          callbackData = JSON.stringify((data === null || data === void 0 || (_data$context5 = data.context) === null || _data$context5 === void 0 ? void 0 : _data$context5.data) || '');
+          var _data$context4;
+          callbackData = JSON.stringify((data === null || data === void 0 || (_data$context4 = data.context) === null || _data$context4 === void 0 ? void 0 : _data$context4.data) || '');
         } catch (e) {
           console.error(e);
         }
@@ -1380,7 +1398,7 @@ var ComponentApp = /*#__PURE__*/function () {
           title: title
         }, {
           callbackData: callbackData,
-          callbackId: (data === null || data === void 0 || (_data$context6 = data.context) === null || _data$context6 === void 0 ? void 0 : _data$context6.eventCallbackId) || ''
+          callbackId: (data === null || data === void 0 || (_data$context5 = data.context) === null || _data$context5 === void 0 ? void 0 : _data$context5.eventCallbackId) || ''
         }).send();
       }
     }

package/esm/plugin/const.js

@@ -5,7 +5,7 @@ export var ExtendPlugin = [{
     productScene: ProductSceneEnum.CASHIER_PAYMENT,
     productSceneVersion: ProductSceneVersion.V1,
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum.CARD,
-    paymentMethodTypes: ['CARD_APPLE_PAY']
+    paymentMethodTypes: ['APPLEPAY']
   },
   paymentChannelMatcher: {
     paymentMethod: 'ApplePay'

package/esm/types/index.d.ts

@@ -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 { IApplePayContactField } from '../plugin/applepay/interface';
 export * from '../core/component/element/type';
 export type onChange = () => onCnageResult;
 interface onCnageResult {
@@ -264,6 +265,8 @@ export interface IPaymentSessionMetaData {
         extendInfo?: {
             merchantCapabilities?: string[];
             supportedNetworks?: string[];
+            requiredBillingContactFields: IApplePayContactField[];
+            requiredShippingContactFields: IApplePayContactField[];
         };
         merchantInfo?: {
             registeredCountry?: string;
@@ -878,7 +881,8 @@ export declare enum ElementPaymentEvent {
     LAUNCH = "onLaunch",
     CALLBACK = "callback",
     SEND_MUITI_APP_EVENT_TO_SDK = "sendMuitiAppEventToSdk",
-    LOG = "log"
+    LOG = "log",
+    HANDLE_PAYMENT = "handlePayment"
 }
 export declare enum ConnectErrorCode {
     RISK_REJECT = "RISK_REJECT",

package/esm/types/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.
  */
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 export * from "../core/component/element/type";
 
@@ -247,6 +248,7 @@ export var ElementPaymentEvent = /*#__PURE__*/function (ElementPaymentEvent) {
   ElementPaymentEvent["CALLBACK"] = "callback";
   ElementPaymentEvent["SEND_MUITI_APP_EVENT_TO_SDK"] = "sendMuitiAppEventToSdk";
   ElementPaymentEvent["LOG"] = "log";
+  ElementPaymentEvent["HANDLE_PAYMENT"] = "handlePayment";
   return ElementPaymentEvent;
 }({});
 export var ConnectErrorCode = /*#__PURE__*/function (ConnectErrorCode) {

package/esm/util/index.d.ts

@@ -46,4 +46,5 @@ declare function loadSDKScript({ src, attrOptions, timeOut, loadCallback }: {
     timeOut?: number;
     loadCallback?: any;
 }, logger: any): Promise<unknown>;
-export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, };
+declare const isEmpty: (value: any) => boolean;
+export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, isEmpty, };

package/esm/util/index.js

@@ -328,4 +328,19 @@ function loadSDKScript(_ref, logger) {
     document.head.appendChild(script);
   });
 }
-export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript };
+var isEmpty = function isEmpty(value) {
+  // 判断空对象
+  if (value && _typeof(value) === 'object' && Object.keys(value).length === 0) {
+    return true;
+  }
+  // 判断空数组
+  if (Array.isArray(value) && value.length === 0) {
+    return true;
+  }
+  // 判断空值
+  if (value === null || value === undefined || value === '') {
+    return true;
+  }
+  return false;
+};
+export { getType, EventCenter, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, isEmpty };

package/esm/util/versionCompare.d.ts

@@ -3,7 +3,7 @@
  * @param v1
  * @param v2
  */
-export declare function compareVersion(v1: string, v2: string): 0 | 1 | -1;
+export declare function compareVersion(v1: string, v2: string): 1 | 0 | -1;
 /**
  * 判断version版本是否在range参数版本的范围内
  * @param version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "1.29.0",
+  "version": "1.30.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",