@testid/antd-testid-runtime 1.0.11 → 1.0.13

package/dist/index.d.mts

@@ -400,8 +400,8 @@ declare class TestIdObserver {
     /**
      * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
      *
-     * 每个浮层实例独立计数: 以浮层根节点 data-testid 作为隔离 key，
-     * 重复打开相同类型的浮层，子元素 ID 均从 0 重新开始。
+     * 同类型浮层的子节点共享全局计数器 (key: popupType_tag)，
+     * 确保页面上多个同类下拉选择框的下拉选项 testid 全局唯一。
      *
      * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
      * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2

package/dist/index.d.ts

@@ -400,8 +400,8 @@ declare class TestIdObserver {
     /**
      * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
      *
-     * 每个浮层实例独立计数: 以浮层根节点 data-testid 作为隔离 key，
-     * 重复打开相同类型的浮层，子元素 ID 均从 0 重新开始。
+     * 同类型浮层的子节点共享全局计数器 (key: popupType_tag)，
+     * 确保页面上多个同类下拉选择框的下拉选项 testid 全局唯一。
      *
      * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
      * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2

package/dist/index.js

@@ -1,8 +1,25 @@
 "use strict";
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -103,18 +120,13 @@ var defaultConfig = {
 };
 function mergeConfig(userConfig) {
   if (!userConfig) {
-    const cfg = { ...defaultConfig };
+    const cfg = __spreadValues({}, defaultConfig);
     return applyGlobalPrefix(cfg);
   }
-  const merged = {
-    ...defaultConfig,
-    ...userConfig,
+  const merged = __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), userConfig), {
     // popupPrefixMap 需要深度合并: 允许用户只覆盖部分浮层前缀
-    popupPrefixMap: {
-      ...defaultConfig.popupPrefixMap,
-      ...userConfig.popupPrefixMap || {}
-    }
-  };
+    popupPrefixMap: __spreadValues(__spreadValues({}, defaultConfig.popupPrefixMap), userConfig.popupPrefixMap || {})
+  });
   return applyGlobalPrefix(merged);
 }
 function applyGlobalPrefix(cfg) {
@@ -122,17 +134,16 @@ function applyGlobalPrefix(cfg) {
   if (!g) return cfg;
   const prefix = `${g}_`;
   const prepend = (val) => val.startsWith(prefix) ? val : `${prefix}${val}`;
-  return {
-    ...cfg,
+  return __spreadProps(__spreadValues({}, cfg), {
     compilePrefix: prepend(cfg.compilePrefix),
     runtimePagePrefix: prepend(cfg.runtimePagePrefix),
     // 注意: popupPrefixMap 不拼接 globalPrefix
     // 浮层 testid 格式为 ${runtimePagePrefix}${popupPrefixMap[type]}...，
     // runtimePagePrefix 已携带 globalPrefix，避免重复
-    popupPrefixMap: { ...cfg.popupPrefixMap }
-  };
+    popupPrefixMap: __spreadValues({}, cfg.popupPrefixMap)
+  });
 }
-var globalConfig = { ...defaultConfig };
+var globalConfig = __spreadValues({}, defaultConfig);
 function initConfig(custom) {
   globalConfig = mergeConfig(custom);
 }
@@ -200,8 +211,9 @@ function buildAnchorKey(anchorTestId, componentName, tagName) {
   return `${anchorTestId}__${componentName}__${tagName}`;
 }
 function getNextAnchorLocalIndex(anchorTestId, componentName, tagName) {
+  var _a;
   const key = buildAnchorKey(anchorTestId, componentName, tagName);
-  const current = anchorCounterMap.get(key) ?? 0;
+  const current = (_a = anchorCounterMap.get(key)) != null ? _a : 0;
   anchorCounterMap.set(key, current + 1);
   return current;
 }
@@ -254,7 +266,7 @@ function resetPopupCounter(type) {
   }
 }
 function getPopupCounterSnapshot() {
-  return { ...popupCounters };
+  return __spreadValues({}, popupCounters);
 }
 function buildPopupTestId(type, tag, counterId) {
   const config = getConfig();
@@ -359,7 +371,8 @@ var TestIdObserver = class {
    * 停止 Observer
    */
   stop() {
-    this.state.observer?.disconnect();
+    var _a;
+    (_a = this.state.observer) == null ? void 0 : _a.disconnect();
     this.state.observer = null;
     this.state.isRunning = false;
   }
@@ -428,7 +441,7 @@ var TestIdObserver = class {
     }
     const popupAncestor = this.detectPopupAncestor(node);
     if (popupAncestor) {
-      this.handlePopupChildNode(node, popupAncestor.type, popupAncestor.element, config);
+      this.handlePopupChildNode(node, popupAncestor.type, config);
       return;
     }
     const popupType = this.detectPopupType(node);
@@ -583,11 +596,12 @@ var TestIdObserver = class {
    * ID 格式: ${runtimePagePrefix}${route}_${tag}_${counter}
    */
   handleDynamicNode(node, config) {
+    var _a;
     if (config.onlyInteractive && !this.isInteractive(node)) return;
     const tag = this.getSimpleTag(node);
     const route = this.state.currentRoute || "unknown";
     const key = `${route}_${tag}`;
-    const current = this.state.dynamicCounter.get(key) ?? 0;
+    const current = (_a = this.state.dynamicCounter.get(key)) != null ? _a : 0;
     this.state.dynamicCounter.set(key, current + 1);
     const testId = `${config.runtimePagePrefix}${route}_${tag}_${current}`;
     node.setAttribute("data-testid", testId);
@@ -595,20 +609,20 @@ var TestIdObserver = class {
   /**
    * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
    *
-   * 每个浮层实例独立计数: 以浮层根节点 data-testid 作为隔离 key，
-   * 重复打开相同类型的浮层，子元素 ID 均从 0 重新开始。
+   * 同类型浮层的子节点共享全局计数器 (key: popupType_tag)，
+   * 确保页面上多个同类下拉选择框的下拉选项 testid 全局唯一。
    *
    * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
    * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
    *
    * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
    */
-  handlePopupChildNode(node, popupType, popupElement, config) {
+  handlePopupChildNode(node, popupType, config) {
+    var _a;
     if (config.onlyInteractive && !this.isInteractive(node)) return;
     const tag = this.getSimpleTag(node);
-    const popupRootTestId = popupElement.getAttribute("data-testid") || `${popupType}_unknown`;
-    const key = `${popupRootTestId}_${tag}`;
-    const current = this.state.popupChildCounter.get(key) ?? 0;
+    const key = `${popupType}_${tag}`;
+    const current = (_a = this.state.popupChildCounter.get(key)) != null ? _a : 0;
     this.state.popupChildCounter.set(key, current + 1);
     const popupPrefix = config.popupPrefixMap[popupType] || `${popupType}_`;
     const testId = `${config.runtimePagePrefix}${popupPrefix}${tag}_${current}`;

package/dist/index.mjs

@@ -1,3 +1,23 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+
 // src/adapters/antd.ts
 var popupClassSuffixMap = {
   modal: [["-modal"]],
@@ -60,18 +80,13 @@ var defaultConfig = {
 };
 function mergeConfig(userConfig) {
   if (!userConfig) {
-    const cfg = { ...defaultConfig };
+    const cfg = __spreadValues({}, defaultConfig);
     return applyGlobalPrefix(cfg);
   }
-  const merged = {
-    ...defaultConfig,
-    ...userConfig,
+  const merged = __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), userConfig), {
     // popupPrefixMap 需要深度合并: 允许用户只覆盖部分浮层前缀
-    popupPrefixMap: {
-      ...defaultConfig.popupPrefixMap,
-      ...userConfig.popupPrefixMap || {}
-    }
-  };
+    popupPrefixMap: __spreadValues(__spreadValues({}, defaultConfig.popupPrefixMap), userConfig.popupPrefixMap || {})
+  });
   return applyGlobalPrefix(merged);
 }
 function applyGlobalPrefix(cfg) {
@@ -79,17 +94,16 @@ function applyGlobalPrefix(cfg) {
   if (!g) return cfg;
   const prefix = `${g}_`;
   const prepend = (val) => val.startsWith(prefix) ? val : `${prefix}${val}`;
-  return {
-    ...cfg,
+  return __spreadProps(__spreadValues({}, cfg), {
     compilePrefix: prepend(cfg.compilePrefix),
     runtimePagePrefix: prepend(cfg.runtimePagePrefix),
     // 注意: popupPrefixMap 不拼接 globalPrefix
     // 浮层 testid 格式为 ${runtimePagePrefix}${popupPrefixMap[type]}...，
     // runtimePagePrefix 已携带 globalPrefix，避免重复
-    popupPrefixMap: { ...cfg.popupPrefixMap }
-  };
+    popupPrefixMap: __spreadValues({}, cfg.popupPrefixMap)
+  });
 }
-var globalConfig = { ...defaultConfig };
+var globalConfig = __spreadValues({}, defaultConfig);
 function initConfig(custom) {
   globalConfig = mergeConfig(custom);
 }
@@ -157,8 +171,9 @@ function buildAnchorKey(anchorTestId, componentName, tagName) {
   return `${anchorTestId}__${componentName}__${tagName}`;
 }
 function getNextAnchorLocalIndex(anchorTestId, componentName, tagName) {
+  var _a;
   const key = buildAnchorKey(anchorTestId, componentName, tagName);
-  const current = anchorCounterMap.get(key) ?? 0;
+  const current = (_a = anchorCounterMap.get(key)) != null ? _a : 0;
   anchorCounterMap.set(key, current + 1);
   return current;
 }
@@ -211,7 +226,7 @@ function resetPopupCounter(type) {
   }
 }
 function getPopupCounterSnapshot() {
-  return { ...popupCounters };
+  return __spreadValues({}, popupCounters);
 }
 function buildPopupTestId(type, tag, counterId) {
   const config = getConfig();
@@ -316,7 +331,8 @@ var TestIdObserver = class {
    * 停止 Observer
    */
   stop() {
-    this.state.observer?.disconnect();
+    var _a;
+    (_a = this.state.observer) == null ? void 0 : _a.disconnect();
     this.state.observer = null;
     this.state.isRunning = false;
   }
@@ -385,7 +401,7 @@ var TestIdObserver = class {
     }
     const popupAncestor = this.detectPopupAncestor(node);
     if (popupAncestor) {
-      this.handlePopupChildNode(node, popupAncestor.type, popupAncestor.element, config);
+      this.handlePopupChildNode(node, popupAncestor.type, config);
       return;
     }
     const popupType = this.detectPopupType(node);
@@ -540,11 +556,12 @@ var TestIdObserver = class {
    * ID 格式: ${runtimePagePrefix}${route}_${tag}_${counter}
    */
   handleDynamicNode(node, config) {
+    var _a;
     if (config.onlyInteractive && !this.isInteractive(node)) return;
     const tag = this.getSimpleTag(node);
     const route = this.state.currentRoute || "unknown";
     const key = `${route}_${tag}`;
-    const current = this.state.dynamicCounter.get(key) ?? 0;
+    const current = (_a = this.state.dynamicCounter.get(key)) != null ? _a : 0;
     this.state.dynamicCounter.set(key, current + 1);
     const testId = `${config.runtimePagePrefix}${route}_${tag}_${current}`;
     node.setAttribute("data-testid", testId);
@@ -552,20 +569,20 @@ var TestIdObserver = class {
   /**
    * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
    *
-   * 每个浮层实例独立计数: 以浮层根节点 data-testid 作为隔离 key，
-   * 重复打开相同类型的浮层，子元素 ID 均从 0 重新开始。
+   * 同类型浮层的子节点共享全局计数器 (key: popupType_tag)，
+   * 确保页面上多个同类下拉选择框的下拉选项 testid 全局唯一。
    *
    * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
    * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
    *
    * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
    */
-  handlePopupChildNode(node, popupType, popupElement, config) {
+  handlePopupChildNode(node, popupType, config) {
+    var _a;
     if (config.onlyInteractive && !this.isInteractive(node)) return;
     const tag = this.getSimpleTag(node);
-    const popupRootTestId = popupElement.getAttribute("data-testid") || `${popupType}_unknown`;
-    const key = `${popupRootTestId}_${tag}`;
-    const current = this.state.popupChildCounter.get(key) ?? 0;
+    const key = `${popupType}_${tag}`;
+    const current = (_a = this.state.popupChildCounter.get(key)) != null ? _a : 0;
     this.state.popupChildCounter.set(key, current + 1);
     const popupPrefix = config.popupPrefixMap[popupType] || `${popupType}_`;
     const testId = `${config.runtimePagePrefix}${popupPrefix}${tag}_${current}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testid/antd-testid-runtime",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "运行时兜底打标模块 — MutationObserver + 锚点计数器 + 浮层计数器 + ID 重复检测",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -21,8 +21,8 @@
     "directory": "packages/antd-testid-runtime"
   },
   "scripts": {
-    "build": "tsup src/index.ts --dts --format esm,cjs --clean",
-    "dev": "tsup src/index.ts --dts --format esm,cjs --watch"
+    "build": "tsup src/index.ts --dts --format esm,cjs --clean --target es2015",
+    "dev": "tsup src/index.ts --dts --format esm,cjs --watch --target es2015"
   },
   "dependencies": {},
   "devDependencies": {