@alipay/ams-checkout 0.0.1779094014-dev.0 → 0.0.1779094014-dev.2

package/esm/constant/element.d.ts

@@ -22,5 +22,6 @@ export declare enum ELEMENT_PAGE_URL {
     INSTRUCTION_GUIDE = "/elements/pages/instruction-guide/index.html",
     THREED_PAGE = "/elements/pages/threed-page/index.html",
     ELEMENT_AUTH = "/auth-element/pages/element_auth/index.html",
-    ADDRESS = "/element-address/pages/address/index.html"
+    ADDRESS = "/element-address/pages/address/index.html",
+    NEW_ELEMENT_PAYMENT = "/elements2/pages/element_payment/index.html"
 }

package/esm/constant/element.js

@@ -26,5 +26,6 @@ export var ELEMENT_PAGE_URL = /*#__PURE__*/function (ELEMENT_PAGE_URL) {
   ELEMENT_PAGE_URL["THREED_PAGE"] = "/elements/pages/threed-page/index.html";
   ELEMENT_PAGE_URL["ELEMENT_AUTH"] = "/auth-element/pages/element_auth/index.html";
   ELEMENT_PAGE_URL["ADDRESS"] = "/element-address/pages/address/index.html";
+  ELEMENT_PAGE_URL["NEW_ELEMENT_PAYMENT"] = "/elements2/pages/element_payment/index.html";
   return ELEMENT_PAGE_URL;
 }({});

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

@@ -1,5 +1,5 @@
-import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
-declare class ElementController {
+import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementController, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
+declare class ElementController implements IElementController {
     private options;
     private elementContainer;
     private serviceMap;
@@ -42,7 +42,7 @@ declare class ElementController {
     private getErrorFromResponse;
     private areAllContainersReady;
     private sendReady;
-    updatePayment(paymentSessionData: any): Promise<unknown>;
+    updatePayment(paymentSessionData: string): Promise<boolean>;
     private destroyHandle;
     destroy(): void;
     private setControllerStatusOrView;

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

@@ -3,7 +3,7 @@ export declare class ElementComponent {
     private options;
     private controller;
     constructor(options: IElementOptions);
-    updatePayment(paymentSessionData: any): Promise<unknown>;
+    updatePayment(paymentSessionData: any): Promise<boolean>;
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<import("./type").ICommonApiResponse>;
     validateFields(): Promise<{
         isValid: boolean;

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

@@ -10,7 +10,9 @@ 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 { getMetaData } from "../../../modern/tools/getMetaData";
 import ElementController from "./elementController";
+import { ModernElementController } from "./modernElementController";
 import { InvalidElementConfigError } from "./type";
 import { formatElementOption, validateElementOption } from "./util";
 export var ElementComponent = /*#__PURE__*/function () {
@@ -23,7 +25,15 @@ export var ElementComponent = /*#__PURE__*/function () {
       throw new InvalidElementConfigError(validate.errors);
     }
     this.options = formatElementOption(options);
-    this.controller = new ElementController(options);
+
+    // 核心分流逻辑
+    var parseData = getMetaData(options.sessionData);
+    if (parseData !== null && parseData !== void 0 && parseData.modernWeb) {
+      console.log('新payment');
+      this.controller = new ModernElementController(this.options);
+    } else {
+      this.controller = new ElementController(this.options);
+    }
   }
   _createClass(ElementComponent, [{
     key: "updatePayment",

package/esm/core/component/element/modernElementController/adapter.d.ts

@@ -0,0 +1,19 @@
+import type { ErrorPayload } from '@antintl/opensdk-core';
+import type { IPaymentApiResponse } from '../type';
+import { EventCallbackCode } from '../type';
+import type { SubmitResult } from "../../../../modern/sdk/types";
+export declare function adaptSubmitResult(result: SubmitResult): IPaymentApiResponse;
+export declare function adaptErrorToEventCallback(error: ErrorPayload): {
+    code: EventCallbackCode;
+    message: string;
+};
+/**
+ * 将老架构的 appearance 格式转换为新架构格式
+ *
+ * 转换规则：
+ * 1. theme: kebab-case → camelCase（如 'nostalgic-gray' → 'nostalgicGray'），其余保持不变
+ * 2. variables: 直接透传（kebab-case CSS 变量 key-value）
+ * 3. card.showBrandIcon → displaySetting.showCardBrandIcon
+ * 4. layout: 直接透传
+ */
+export declare function adaptAppearance(appearance?: any): any;

package/esm/core/component/element/modernElementController/adapter.js

@@ -0,0 +1,74 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import { EventCallbackCode } from "../type";
+export function adaptSubmitResult(result) {
+  return {
+    status: result.status || 'FAIL',
+    error: result.status === 'FAIL' || result.code ? {
+      code: result.code || 'UNKNOWN_ERROR',
+      message: result.message || ''
+    } : undefined,
+    userCanceled3D: result.userCanceled3D
+  };
+}
+export function adaptErrorToEventCallback(error) {
+  return {
+    code: error.code || EventCallbackCode.SDK_PAYMENT_ERROR,
+    message: error.message || ''
+  };
+}
+
+/**
+ * 老架构 theme (kebab-case) → 新架构 theme (camelCase) 映射表
+ */
+var THEME_MAP = {
+  'nostalgic-gray': 'nostalgicGray',
+  'cherry-blossom-pink': 'cherryBlossomPink',
+  'gaming-purple': 'gamingPurple',
+  'agate-green': 'agateGreen'
+};
+
+/**
+ * 将老架构的 appearance 格式转换为新架构格式
+ *
+ * 转换规则：
+ * 1. theme: kebab-case → camelCase（如 'nostalgic-gray' → 'nostalgicGray'），其余保持不变
+ * 2. variables: 直接透传（kebab-case CSS 变量 key-value）
+ * 3. card.showBrandIcon → displaySetting.showCardBrandIcon
+ * 4. layout: 直接透传
+ */
+export function adaptAppearance(appearance) {
+  var _appearance$card;
+  if (!appearance) return undefined;
+  var result = {};
+
+  // Theme mapping: kebab-case → camelCase
+  if (appearance.theme) {
+    result.theme = THEME_MAP[appearance.theme] || appearance.theme;
+  }
+
+  // Variables: 直接透传
+  if (appearance.variables && _typeof(appearance.variables) === 'object') {
+    var filtered = _objectSpread({}, appearance.variables);
+    if (Object.keys(filtered).length > 0) {
+      result.variables = filtered;
+    }
+  }
+
+  // card.showBrandIcon → displaySetting.showCardBrandIcon
+  if (((_appearance$card = appearance.card) === null || _appearance$card === void 0 ? void 0 : _appearance$card.showBrandIcon) !== undefined) {
+    result.displaySetting = {
+      showCardBrandIcon: appearance.card.showBrandIcon
+    };
+  }
+
+  // Layout: 直接透传
+  if (appearance.layout) {
+    result.layout = _objectSpread({}, appearance.layout);
+  }
+  return Object.keys(result).length > 0 ? result : undefined;
+}

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

@@ -0,0 +1,80 @@
+import { IElementController, IElementOptions, ICommonApiResponse, IPaymentApiResponse, PaymentMountOptions, SubmitFuncParams, EVENTNAME, EventDataMap } from '../type';
+/**
+ * ModernElementController 使用 opensdk-core 的 HostBridge 实现新架构通信。
+ *
+ * Mount 流程（正确）:
+ * 1. setup() — 解析 sessionData 获取 metaData，准备 HANDSHAKE 配置
+ * 2. 创建 iframe，设置 src
+ * 3. 将 iframe 添加到容器
+ * 4. 监听 READY_HANDSHAKE → setTarget(iframe.contentWindow) → send(HANDSHAKE, mergedConfig)
+ * 5. 等待 HANDSHAKE_ACK → 设置 status = 'ready'
+ * 6. ready 后发送缓存的消息
+ */
+export declare class ModernElementController implements IElementController {
+    private options;
+    private bridge;
+    private iframe;
+    private status;
+    private eventListeners;
+    private cachedSend;
+    private modalIframe;
+    private modalBridge;
+    private modalDestroy;
+    private _closeConfirmResolve;
+    constructor(options: IElementOptions);
+    mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<ICommonApiResponse>;
+    /**
+     * setup() — 解析 sessionData 获取 metaData，发起 sdkQuery 获取渲染数据，准备 HANDSHAKE 配置
+     *
+     * 完整实现：
+     * 1. 解析 sessionData 获取 paymentSessionConfig
+     * 2. 初始化 request 全局配置（hostSign, env, sdkVersion）
+     * 3. 调用 sdkQuery 获取 renderData
+     * 4. 处理请求错误，将错误信息放入 renderDataError（不阻塞 mount 流程）
+     * 5. 从 renderData 中提取 preferredLocale
+     */
+    private setup;
+    /**
+     * 执行握手流程:
+     * - 监听 READY_HANDSHAKE → setTarget → send(HANDSHAKE, mergedConfig)
+     * - 等待 HANDSHAKE_ACK → resolve
+     */
+    private performHandshake;
+    /**
+     * 绑定持续监听的 bridge 事件
+     */
+    private bindBridgeEvents;
+    submitPayment(params: SubmitFuncParams): Promise<IPaymentApiResponse>;
+    validateFields(): Promise<{
+        isValid: boolean;
+    }>;
+    updatePayment(paymentSessionData: string): Promise<boolean>;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
+    destroy(): void;
+    private cleanup;
+    /**
+     * 带缓存的消息发送：当 status 不是 ready 时，缓存消息；ready 后由 flushCachedMessages 批量发送
+     */
+    private send;
+    /**
+     * 批量发送缓存的消息
+     */
+    private flushCachedMessages;
+    /**
+     * 处理 webapp 请求打开 modal 弹窗
+     *
+     * 流程（参照 BaseFactory 桥接流程）：
+     * 1. 调用 openModal 工具函数创建 modal DOM（overlay + modal + iframe + 动画 + close icon + loading）
+     * 2. 为 modal 创建独立的 HostBridge 用于通信
+     * 3. iframe 加载后 setTarget 到 modal iframe 的 contentWindow
+     * 4. 监听 modal 的 READY_HANDSHAKE → 发送配置消息
+     * 5. 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送
+     * 6. 如果 payload 有 closeConfirm，创建 MessageChannel port 用于确认关闭
+     */
+    private handleOpenModal;
+    /**
+     * 销毁 modal bridge、调用 openModal 返回的 destroy 方法清理 modal DOM
+     */
+    private handleCloseModal;
+    private buildIframeUrl;
+}