@testid/antd-testid-runtime 1.0.3 → 1.0.4

package/dist/index.d.mts

@@ -176,11 +176,13 @@ declare function resetPopupCounter(type: PopupType): void;
  */
 declare function getPopupCounterSnapshot(): Record<PopupType, number>;
 /**
- * 生成浮层节点 testid
+ * 生成浮层根节点 testid
  *
- * 格式: ${prefix}${tag}_${counterId}
+ * 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counterId}
+ * 例: hall_dynamic_modal_div_0, hall_dynamic_select_div_2
  *
- * 例: modal_button_0, select_div_2
+ * 浮层均为运行时注入，因此统一使用 runtimePagePrefix 作为前缀，
+ * 与页面内动态节点保持一致。
  *
  * @param type - 浮层类型
  * @param tag - HTML 标签名 (简化后)
@@ -308,8 +310,10 @@ declare class TestIdObserver {
     /**
      * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
      *
-     * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-     * 例: hall_modal_button_0, hall_select_div_2
+     * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+     * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+     *
+     * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
      */
     private handlePopupChildNode;
     /**

package/dist/index.d.ts

@@ -176,11 +176,13 @@ declare function resetPopupCounter(type: PopupType): void;
  */
 declare function getPopupCounterSnapshot(): Record<PopupType, number>;
 /**
- * 生成浮层节点 testid
+ * 生成浮层根节点 testid
  *
- * 格式: ${prefix}${tag}_${counterId}
+ * 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counterId}
+ * 例: hall_dynamic_modal_div_0, hall_dynamic_select_div_2
  *
- * 例: modal_button_0, select_div_2
+ * 浮层均为运行时注入，因此统一使用 runtimePagePrefix 作为前缀，
+ * 与页面内动态节点保持一致。
  *
  * @param type - 浮层类型
  * @param tag - HTML 标签名 (简化后)
@@ -308,8 +310,10 @@ declare class TestIdObserver {
     /**
      * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
      *
-     * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-     * 例: hall_modal_button_0, hall_select_div_2
+     * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+     * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+     *
+     * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
      */
     private handlePopupChildNode;
     /**

package/dist/index.js

@@ -101,9 +101,10 @@ function applyGlobalPrefix(cfg) {
     ...cfg,
     compilePrefix: prepend(cfg.compilePrefix),
     runtimePagePrefix: prepend(cfg.runtimePagePrefix),
-    popupPrefixMap: Object.fromEntries(
-      Object.entries(cfg.popupPrefixMap).map(([k, v]) => [k, prepend(v)])
-    )
+    // 注意: popupPrefixMap 不拼接 globalPrefix
+    // 浮层 testid 格式为 ${runtimePagePrefix}${popupPrefixMap[type]}...，
+    // runtimePagePrefix 已携带 globalPrefix，避免重复
+    popupPrefixMap: { ...cfg.popupPrefixMap }
   };
 }
 var globalConfig = { ...defaultConfig };
@@ -177,8 +178,8 @@ function getPopupCounterSnapshot() {
 }
 function buildPopupTestId(type, tag, counterId) {
   const config = getConfig();
-  const prefix = config.popupPrefixMap[type] || `${type}_`;
-  return `${prefix}${tag}_${counterId}`;
+  const popupPrefix = config.popupPrefixMap[type] || `${type}_`;
+  return `${config.runtimePagePrefix}${popupPrefix}${tag}_${counterId}`;
 }
 
 // src/utils/testIdObserver.ts
@@ -485,8 +486,10 @@ var TestIdObserver = class {
   /**
    * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
    *
-   * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-   * 例: hall_modal_button_0, hall_select_div_2
+   * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+   * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+   *
+   * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
    */
   handlePopupChildNode(node, popupType, config) {
     if (config.onlyInteractive && !this.isInteractive(node)) return;
@@ -494,8 +497,8 @@ var TestIdObserver = class {
     const key = `${popupType}_${tag}`;
     const current = this.state.popupChildCounter.get(key) ?? 0;
     this.state.popupChildCounter.set(key, current + 1);
-    const prefix = config.popupPrefixMap[popupType] || `${popupType}_`;
-    const testId = `${prefix}${tag}_${current}`;
+    const popupPrefix = config.popupPrefixMap[popupType] || `${popupType}_`;
+    const testId = `${config.runtimePagePrefix}${popupPrefix}${tag}_${current}`;
     node.setAttribute("data-testid", testId);
   }
   // ==========================================================

package/dist/index.mjs

@@ -59,9 +59,10 @@ function applyGlobalPrefix(cfg) {
     ...cfg,
     compilePrefix: prepend(cfg.compilePrefix),
     runtimePagePrefix: prepend(cfg.runtimePagePrefix),
-    popupPrefixMap: Object.fromEntries(
-      Object.entries(cfg.popupPrefixMap).map(([k, v]) => [k, prepend(v)])
-    )
+    // 注意: popupPrefixMap 不拼接 globalPrefix
+    // 浮层 testid 格式为 ${runtimePagePrefix}${popupPrefixMap[type]}...，
+    // runtimePagePrefix 已携带 globalPrefix，避免重复
+    popupPrefixMap: { ...cfg.popupPrefixMap }
   };
 }
 var globalConfig = { ...defaultConfig };
@@ -135,8 +136,8 @@ function getPopupCounterSnapshot() {
 }
 function buildPopupTestId(type, tag, counterId) {
   const config = getConfig();
-  const prefix = config.popupPrefixMap[type] || `${type}_`;
-  return `${prefix}${tag}_${counterId}`;
+  const popupPrefix = config.popupPrefixMap[type] || `${type}_`;
+  return `${config.runtimePagePrefix}${popupPrefix}${tag}_${counterId}`;
 }
 
 // src/utils/testIdObserver.ts
@@ -443,8 +444,10 @@ var TestIdObserver = class {
   /**
    * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
    *
-   * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-   * 例: hall_modal_button_0, hall_select_div_2
+   * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+   * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+   *
+   * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
    */
   handlePopupChildNode(node, popupType, config) {
     if (config.onlyInteractive && !this.isInteractive(node)) return;
@@ -452,8 +455,8 @@ var TestIdObserver = class {
     const key = `${popupType}_${tag}`;
     const current = this.state.popupChildCounter.get(key) ?? 0;
     this.state.popupChildCounter.set(key, current + 1);
-    const prefix = config.popupPrefixMap[popupType] || `${popupType}_`;
-    const testId = `${prefix}${tag}_${current}`;
+    const popupPrefix = config.popupPrefixMap[popupType] || `${popupType}_`;
+    const testId = `${config.runtimePagePrefix}${popupPrefix}${tag}_${current}`;
     node.setAttribute("data-testid", testId);
   }
   // ==========================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testid/antd-testid-runtime",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "运行时兜底打标模块 — MutationObserver + 锚点计数器 + 浮层计数器 + ID 重复检测",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",