ff-dom 3.0.3-beta.1 → 3.0.3-beta.3

package/dist/index.cdn.js

@@ -540,6 +540,22 @@
         String(attribute.value),
     ].join("::");
     const computeBlockedAttributeDecision = (attribute, targetElement, isTarget) => {
+        if (attribute.name === "class" &&
+            attribute.value
+                .split(/\s+/)
+                .some((token) => INTERNAL_CLASS_TOKENS.has(token))) {
+            const alreadyTracked = modifiedElementAttributes.some((modifiedAttribute) => modifiedAttribute.doc === targetElement.ownerDocument &&
+                modifiedAttribute.element === targetElement &&
+                modifiedAttribute.attributeName === "class");
+            if (!alreadyTracked) {
+                modifiedElementAttributes.push({
+                    url: targetElement.baseURI,
+                    attributeName: "class",
+                    element: targetElement,
+                    doc: targetElement.ownerDocument,
+                });
+            }
+        }
         const sanitizedValue = sanitizeAttributeValue(attribute.name, attribute.value);
         if (!sanitizedValue || typeof attribute?.value === "boolean") {
             return false;
@@ -662,6 +678,12 @@
                     if (count === 1 && !isIndex) {
                         return pattern;
                     }
+                    else {
+                        const indexedXPath = findXpathWithIndex(pattern, element, docmt, count);
+                        if (indexedXPath) {
+                            return indexedXPath;
+                        }
+                    }
                 }
                 return;
             }
@@ -687,6 +709,12 @@
                 if (count === 1 && !isIndex) {
                     return pattern;
                 }
+                else {
+                    const indexedXPath = findXpathWithIndex(pattern, element, docmt, count);
+                    if (indexedXPath) {
+                        return indexedXPath;
+                    }
+                }
             }
             if (isAttributeProp && hasNumericAttributeValue(value)) {
                 // Strict numeric-attribute validation: do not split numeric attribute
@@ -1021,7 +1049,13 @@
             }
             // Combine all parts into the final XPath
             const finalXPath = `${xpathParts.join("")}`;
-            const xpathToReturn = getCountOfXPath(finalXPath, domNode, docmt) === 1 ? finalXPath : (getAbsoluteXPath(domNode, docmt));
+            const finalXPathCount = getCountOfXPath(finalXPath, domNode, docmt);
+            const indexedXPath = finalXPathCount > 1 && isIndex ?
+                findXpathWithIndex(finalXPath, domNode, docmt, finalXPathCount)
+                : undefined;
+            const xpathToReturn = finalXPathCount === 1 ? finalXPath
+                : indexedXPath ? indexedXPath
+                    : getAbsoluteXPath(domNode, docmt);
             // Cache the final XPath for this node
             nodeCache.set(cacheKey, xpathToReturn);
             return xpathToReturn;
@@ -1841,7 +1875,7 @@
         if (!xpaths1?.length) {
             const xpaths = addAttributeSplitCombineXpaths(domNode.attributes, domNode, docmt, isTarget);
             if (xpaths?.length) {
-                xpaths1.concat(xpaths);
+                xpaths1.push(...xpaths);
             }
         }
         return xpaths1;
@@ -1974,7 +2008,12 @@
         createObserver,
         startObserver,
         stopObserver,
-        modifiedElementAttributes,
+        get modifiedElementAttributes() {
+            return modifiedElementAttributes;
+        },
+        set modifiedElementAttributes(attributes) {
+            modifiedElementAttributes = Array.isArray(attributes) ? attributes : [];
+        },
         cspEnabled,
         getXPathPattern,
         getNormalizedPropertyXPath,
@@ -2001,13 +2040,13 @@
     let referenceElementMode = false;
     let parentXpathCache = new WeakMap();
     let childRelativeXpathCache = new WeakMap();
-    const getElementSignature = (element) => element
-        ? [
+    const getElementSignature = (element) => element ?
+        [
             element.tagName,
             Array.from(element.attributes || [])
                 .map((attribute) => `${attribute.name}=${attribute.value}`)
                 .join("|"),
-            element.textContent || ""
+            element.textContent || "",
         ].join("::")
         : "";
     const clearXPathModuleCaches = () => {
@@ -2025,7 +2064,7 @@
         axes: "axes",
         index: "index",
         hardCodedText: "text",
-        tillTag: "tag"
+        tillTag: "tag",
     };
     const getStrategyName = (strategy) => {
         return STRATEGY_MAP[strategy] || strategy;
@@ -2034,9 +2073,9 @@
     const withStrategyKey = (strategy, entries) => {
         return entries.map((entry) => ({
             ...entry,
-            key: entry?.key?.includes(strategy)
-                ? entry.key
-                : `${strategy} ${entry.key}`.trim()
+            key: entry?.key?.includes(strategy) ?
+                entry.key
+                : `${strategy} ${entry.key}`.trim(),
         }));
     };
     const getUniqueXpathEntries = (entries) => {
@@ -2077,9 +2116,7 @@
         }
         return false;
     };
-    const removePositionalIndexXpaths = (entries, isIndex) => isIndex
-        ? entries
-        : entries.filter((entry) => !hasPositionalIndex(entry.value));
+    const removePositionalIndexXpaths = (entries, isIndex) => isIndex ? entries : (entries.filter((entry) => !hasPositionalIndex(entry.value)));
     const getNormalizedText = (element) => {
         return element?.textContent?.replace(/\s+/g, " ")?.trim() || "";
     };
@@ -2099,12 +2136,9 @@
         const xpaths = [];
         const attributes = Array.from(element.attributes || []).filter((attribute) => attribute?.value && checkBlockedAttributes(attribute, element, isTarget));
         const text = getNormalizedText(element);
-        const getStrategyXPath = strategy === "contains"
-            ? getContainsPropertyXPath
-            : strategy === "startsWith"
-                ? getStartsWithPropertyXPath
-                : strategy === "normalizeSpace"
-                    ? getNormalizedPropertyXPath
+        const getStrategyXPath = strategy === "contains" ? getContainsPropertyXPath
+            : strategy === "startsWith" ? getStartsWithPropertyXPath
+                : strategy === "normalizeSpace" ? getNormalizedPropertyXPath
                     : null;
         if (!getStrategyXPath) {
             return xpaths;
@@ -2125,7 +2159,7 @@
                     if (xpath) {
                         xpaths.push({
                             key: `xpath by ${strategy} class`,
-                            value: xpath
+                            value: xpath,
                         });
                     }
                 });
@@ -2135,7 +2169,7 @@
             if (xpath) {
                 xpaths.push({
                     key: `xpath by ${strategy} ${attribute.name}`,
-                    value: xpath
+                    value: xpath,
                 });
             }
         });
@@ -2148,7 +2182,7 @@
             if (xpath) {
                 xpaths.push({
                     key: `xpath by ${strategy} text`,
-                    value: xpath
+                    value: xpath,
                 });
             }
         }
@@ -2158,8 +2192,8 @@
         const attributes = Array.from(element.attributes || []).filter((attribute) => attribute?.value && checkBlockedAttributes(attribute, element, isTarget));
         if (strategy === "and") {
             const combinationXpath = getAttributeCombinationXpath(element, docmt, attributes, isTarget);
-            return combinationXpath
-                ? [{ key: "xpath by combination", value: combinationXpath }]
+            return combinationXpath ?
+                [{ key: "xpath by combination", value: combinationXpath }]
                 : [];
         }
         if (strategy === "or" && attributes.length >= 1) {
@@ -2185,16 +2219,16 @@
     };
     const getSiblingNodes = (element, direction) => {
         const nodes = [];
-        let currentNode = direction === "previous"
-            ? element.previousElementSibling
+        let currentNode = direction === "previous" ?
+            element.previousElementSibling
             : element.nextElementSibling;
         while (currentNode) {
             if (!currentNode.classList?.contains("flntooltip")) {
                 nodes.push(currentNode);
             }
             currentNode =
-                direction === "previous"
-                    ? currentNode.previousElementSibling
+                direction === "previous" ?
+                    currentNode.previousElementSibling
                     : currentNode.nextElementSibling;
         }
         return nodes;
@@ -2202,20 +2236,20 @@
     const getDirectionalAxisSeedNodes = (element, direction) => {
         const nodes = [];
         for (let currentNode = element; currentNode?.parentElement; currentNode = currentNode.parentElement) {
-            let sibling = direction === "previous"
-                ? currentNode.previousElementSibling
+            let sibling = direction === "previous" ?
+                currentNode.previousElementSibling
                 : currentNode.nextElementSibling;
             while (sibling) {
                 if (!sibling.classList?.contains("flntooltip")) {
                     nodes.push(sibling);
                     nodes.push({
                         node: sibling,
-                        expand: () => collectSubtreeElements(sibling)
+                        expand: () => collectSubtreeElements(sibling),
                     });
                 }
                 sibling =
-                    direction === "previous"
-                        ? sibling.previousElementSibling
+                    direction === "previous" ?
+                        sibling.previousElementSibling
                         : sibling.nextElementSibling;
             }
         }
@@ -2249,8 +2283,8 @@
     };
     const buildAxisXpathsForNodes = (nodes, axis, targetElement, docmt, isTarget, key, isIndex) => {
         const textPredicate = getTextXpathFunction(targetElement);
-        const targetNodeTest = textPredicate
-            ? `${getAxisNodeTest(targetElement)}[${textPredicate}]`
+        const targetNodeTest = textPredicate ?
+            `${getAxisNodeTest(targetElement)}[${textPredicate}]`
             : getAxisNodeTest(targetElement);
         const MAX_INDEX_TRY = 3;
         const MAX_CANDIDATES = 5;
@@ -2286,7 +2320,7 @@
                         }
                     }
                     return anchors;
-                }
+                },
             ];
             for (let stageIndex = 0; stageIndex < anchorStages.length; stageIndex++) {
                 let anchors = anchorStages[stageIndex]();
@@ -2396,8 +2430,8 @@
     };
     const getTargetPathFromScope = (scope, targetElement) => {
         const targetNodeTest = getAxisNodeTest(targetElement);
-        return targetElement.parentElement === scope
-            ? [`/${targetNodeTest}`, `/descendant::${targetNodeTest}`]
+        return targetElement.parentElement === scope ?
+            [`/${targetNodeTest}`, `/descendant::${targetNodeTest}`]
             : [`/descendant::${targetNodeTest}`];
     };
     const collectChainedAxisAnchorNodes = (element) => {
@@ -2420,7 +2454,7 @@
         for (let scope = element.parentElement, depth = 0; scope && depth < MAX_SCOPE_DEPTH && anchors.length < MAX_ANCHORS; scope = scope.parentElement, depth++) {
             const siblingGroups = [
                 getSiblingNodes(scope, "previous").slice(0, MAX_SIBLINGS_PER_SCOPE),
-                getSiblingNodes(scope, "next").slice(0, MAX_SIBLINGS_PER_SCOPE)
+                getSiblingNodes(scope, "next").slice(0, MAX_SIBLINGS_PER_SCOPE),
             ];
             for (const siblings of siblingGroups) {
                 for (const sibling of siblings) {
@@ -2470,7 +2504,7 @@
                             if (isExactUniqueXpath(xpath, element, docmt)) {
                                 candidates.push({
                                     key: "chained axes fallback",
-                                    value: xpath
+                                    value: xpath,
                                 });
                                 if (candidates.length >= 2) {
                                     return candidates;
@@ -2570,7 +2604,7 @@
         // Keep existing unique attribute/text anchors as secondary options.
         return [
             ...anchors,
-            ...getUniqueNodeAnchorXpaths(anchorNode, docmt, isTarget)
+            ...getUniqueNodeAnchorXpaths(anchorNode, docmt, isTarget),
         ];
     };
     const buildAncestorDescendantBridgeAxesXpaths = (element, docmt, isTarget) => {
@@ -2602,7 +2636,7 @@
                             // variants for the same target in single mode.
                             candidates.push({
                                 key: "ancestor descendant bridge",
-                                value: xpath
+                                value: xpath,
                             });
                             if (candidates.length >= 1) {
                                 return candidates;
@@ -2630,8 +2664,8 @@
         // Single-mode axis anchors may use a stable prefix before a numeric suffix.
         const valueBeforeNumber = attributeValue.split(/\d/)[0] || "";
         const stableValue = valueBeforeNumber.replace(/[-_:\s.]+$/g, "").trim();
-        return stableValue.length > 2 && /[a-zA-Z]/.test(stableValue)
-            ? stableValue
+        return stableValue.length > 2 && /[a-zA-Z]/.test(stableValue) ?
+            stableValue
             : "";
     };
     const canUseStableAxisAttribute = (attribute) => {
@@ -2686,7 +2720,7 @@
                 if (isExactUniqueXpath(xpath, element, docmt)) {
                     candidates.push({
                         key: "child chain",
-                        value: xpath
+                        value: xpath,
                     });
                     if (candidates.length >= 2) {
                         return candidates;
@@ -2726,48 +2760,52 @@
                 {
                     nodes: limitNodes(nextSiblings),
                     axis: "preceding-sibling",
-                    key: "preceding-sibling"
+                    key: "preceding-sibling",
                 },
                 {
                     nodes: limitNodes(previousSiblings),
                     axis: "following-sibling",
-                    key: "following-sibling"
-                }
+                    key: "following-sibling",
+                },
             ],
             [
                 { nodes: limitNodes(ancestors), axis: "child", key: "child" },
                 {
                     nodes: limitNodes(descendants, 15),
                     axis: "parent",
-                    key: "parent"
-                }
+                    key: "parent",
+                },
             ],
             [
                 { nodes: limitNodes(ancestors), axis: "descendant", key: "descendant" },
                 {
                     nodes: limitNodes(ancestors),
                     axis: "descendant-or-self",
-                    key: "descendant-or-self"
+                    key: "descendant-or-self",
                 },
                 {
                     nodes: limitNodes(descendants, 10),
                     axis: "ancestor",
-                    key: "ancestor"
+                    key: "ancestor",
                 },
                 {
                     nodes: limitNodes(descendants, 10),
                     axis: "ancestor-or-self",
-                    key: "ancestor-or-self"
-                }
+                    key: "ancestor-or-self",
+                },
             ],
             [
                 {
                     nodes: limitNodes(precedingSeeds),
                     axis: "following",
-                    key: "following"
+                    key: "following",
+                },
+                {
+                    nodes: limitNodes(followingSeeds),
+                    axis: "preceding",
+                    key: "preceding",
                 },
-                { nodes: limitNodes(followingSeeds), axis: "preceding", key: "preceding" }
-            ]
+            ],
         ];
         // timeLog("nodes sorting", t);
         const childChainResults = buildAnchoredChildChainAxesXpaths(element, docmt, isTarget, isIndex);
@@ -2803,14 +2841,14 @@
         // global must always exist)
         results.push({
             key: "xpath by index",
-            value: `(//${tag})[${idx}]`
+            value: `(//${tag})[${idx}]`,
         });
         // Add at most one scoped/indexed XPath anchored by the nearest stable ancestor.
         let current = element.parentElement;
         while (current && current !== docmt.body) {
             if (current.id || current.className) {
-                const scopeXpaths = current.id
-                    ? getXpathStrings(current, "id", current.id)
+                const scopeXpaths = current.id ?
+                    getXpathStrings(current, "id", current.id)
                     : getXpathStrings(current, "class", current.className.toString());
                 // Scoped index anchors should also try every stable class token before
                 // walking to a higher ancestor.
@@ -2820,7 +2858,7 @@
                     if (scopedIdx > 0) {
                         results.push({
                             key: "xpath by index",
-                            value: `(${scopeXpath}//${tag})[${scopedIdx}]`
+                            value: `(${scopeXpath}//${tag})[${scopedIdx}]`,
                         });
                         break;
                     }
@@ -2852,7 +2890,7 @@
         }
         if (strategyName === "tag") {
             return withStrategyKey(strategy, [
-                { key: "xpath till tag", value: getTagOnlyXPath(element, docmt) }
+                { key: "xpath till tag", value: getTagOnlyXPath(element, docmt) },
             ]);
         }
         return [];
@@ -2864,14 +2902,14 @@
                 xpaths = [
                     // `${nodeXpath1}/descendant::${nodeXpath2}`,
                     `${nodeXpath1}/descendant-or-self::${nodeXpath2}`,
-                    `${nodeXpath1}/following::${nodeXpath2}`
+                    `${nodeXpath1}/following::${nodeXpath2}`,
                 ];
             }
             else {
                 xpaths = [
                     // `${nodeXpath1}/descendant::${nodeXpath2}`,
                     `${nodeXpath1}/ancestor-or-self::${nodeXpath2}`,
-                    `${nodeXpath1}/preceding::${nodeXpath2}`
+                    `${nodeXpath1}/preceding::${nodeXpath2}`,
                 ];
             }
             // Iterate through XPath patterns
@@ -2888,7 +2926,7 @@
                             xpathDataWithIndex$1.push({
                                 key: `relative xpath by unique parent ${isIndex ? "index" : ""}`,
                                 value: xpath,
-                                count
+                                count,
                             });
                         }
                     }
@@ -2896,7 +2934,7 @@
                         xpathDataWithIndex$1.push({
                             key: `relative xpath by unique parent ${isIndex ? "index" : ""}`,
                             value: xpath,
-                            count
+                            count,
                         });
                     }
                 }
@@ -2908,7 +2946,7 @@
                         getCountOfXPath(indexedXpath, targetElemt, docmt) === 1) {
                         xpathData$1.push({
                             key: `relative xpath by unique parent ${isIndex ? "index" : ""}`,
-                            value: indexedXpath
+                            value: indexedXpath,
                         });
                     }
                 }
@@ -2922,7 +2960,7 @@
                 isTarget ? "target" : "reference",
                 isIndex ? "index" : "no-index",
                 nodeXpath,
-                getElementSignature(node)
+                getElementSignature(node),
             ].join("::");
             let nodeCache = parentXpathCache.get(domNode);
             if (!nodeCache) {
@@ -2962,14 +3000,16 @@
                         (isTarget && !isNumberExist(currentNode.textContent))) {
                         let xpathe;
                         if (!reWhiteSpace$1.test(currentNode.textContent)) {
-                            xpathe = isSvg(currentNode)
-                                ? `//*[local-name()='${currentNode.tagName}' and normalize-space(.)=${escapeCharacters(getFilteredText(currentNode))}]`
-                                : `//${currentNode.tagName || "*"}[normalize-space(.)=${escapeCharacters(getFilteredText(currentNode))}]`;
+                            xpathe =
+                                isSvg(currentNode) ?
+                                    `//*[local-name()='${currentNode.tagName}' and normalize-space(.)=${escapeCharacters(getFilteredText(currentNode))}]`
+                                    : `//${currentNode.tagName || "*"}[normalize-space(.)=${escapeCharacters(getFilteredText(currentNode))}]`;
                         }
                         else {
-                            xpathe = isSvg(currentNode)
-                                ? `//*[local-name()='${currentNode.tagName}' and .=${escapeCharacters(getFilteredText(currentNode))}]`
-                                : `//${currentNode.tagName || "*"}[.=${escapeCharacters(getFilteredText(currentNode))}]`;
+                            xpathe =
+                                isSvg(currentNode) ?
+                                    `//*[local-name()='${currentNode.tagName}' and .=${escapeCharacters(getFilteredText(currentNode))}]`
+                                    : `//${currentNode.tagName || "*"}[.=${escapeCharacters(getFilteredText(currentNode))}]`;
                         }
                         const othersWithAttr = checkRelativeXpathRelation(xpathe, nodeXpath, node, docmt, isIndex, "parent");
                         if (othersWithAttr) {
@@ -2979,7 +3019,7 @@
                     else {
                         const combinePattern = [];
                         const contentRes = [
-                            ...new Set(getFilteredText(currentNode).match(/([^0-9]+)/g))
+                            ...new Set(getFilteredText(currentNode).match(/([^0-9]+)/g)),
                         ];
                         const reWhiteSpace = new RegExp(/^[\S]+( [\S]+)*$/gi);
                         if (contentRes?.length) {
@@ -2995,8 +3035,8 @@
                             }
                         }
                         if (combinePattern?.length) {
-                            const xpathe = isSvg(currentNode)
-                                ? `//*[local-name()='${currentNode.tagName}' and ${combinePattern.join(" and ")}]`
+                            const xpathe = isSvg(currentNode) ?
+                                `//*[local-name()='${currentNode.tagName}' and ${combinePattern.join(" and ")}]`
                                 : `//${currentNode.tagName || "*"}[${combinePattern.join(" and ")}]`;
                             const othersWithAttr = checkRelativeXpathRelation(xpathe, nodeXpath, node, docmt, isIndex, "parent");
                             if (othersWithAttr) {
@@ -3007,8 +3047,8 @@
                 }
                 // Construct the XPath based on the tag name
                 if (!hasUniqueAttr) {
-                    const xpathe = isSvg(currentNode)
-                        ? `/*[local-name()='${currentNode.tagName}']`
+                    const xpathe = isSvg(currentNode) ?
+                        `/*[local-name()='${currentNode.tagName}']`
                         : `/${currentNode.tagName}`;
                     xpathParts.unshift(xpathe);
                 }
@@ -3078,8 +3118,8 @@
                 }
                 if (!uniqueAttrFound) {
                     // Construct the XPath based on the tag name
-                    const xpathe = isSvg(currentNode)
-                        ? `/*[local-name()='${currentNode.tagName}']`
+                    const xpathe = isSvg(currentNode) ?
+                        `/*[local-name()='${currentNode.tagName}']`
                         : `/${currentNode.tagName}`;
                     // Prepend the current XPath part to the array
                     xpathParts.unshift(xpathe);
@@ -3164,8 +3204,8 @@
                     }
                     if (!uniqueAttrFound) {
                         // Construct the XPath based on the tag name
-                        const xpathe = isSvg(currentNode)
-                            ? `/*[local-name()='${currentNode.tagName}']`
+                        const xpathe = isSvg(currentNode) ?
+                            `/*[local-name()='${currentNode.tagName}']`
                             : `/${currentNode.tagName}`;
                         // Prepend the current XPath part to the array
                         xpathParts.push(xpathe);
@@ -3214,7 +3254,7 @@
                 for (const attr of Array.from(sibling.attributes)) {
                     const xpaths = intermediateXpathSteps(sibling, {
                         name: attr.name,
-                        value: attr.value
+                        value: attr.value,
                     }, isTarget);
                     for (let xpathe of xpaths) {
                         xpathe += `/${axis}::${nodeXpath}`;
@@ -3222,7 +3262,7 @@
                         if (count === 1) {
                             xpathData$1.push({
                                 key: `xpath by ${axis}`,
-                                value: xpathe
+                                value: xpathe,
                             });
                             return;
                         }
@@ -3233,7 +3273,7 @@
                                     xpathDataWithIndex$1.push({
                                         key: `relative xpath by ${axis}`,
                                         value: xpathe,
-                                        count
+                                        count,
                                     });
                                 }
                             }
@@ -3241,7 +3281,7 @@
                                 xpathDataWithIndex$1.push({
                                     key: `relative xpath by ${axis}`,
                                     value: xpathe,
-                                    count
+                                    count,
                                 });
                             }
                         }
@@ -3252,14 +3292,14 @@
                 let xpathe;
                 xpathe = intermediateXpathStep(sibling, {
                     name: "text",
-                    value: sibling.textContent
+                    value: sibling.textContent,
                 }, isTarget);
                 if (xpathe) {
                     const count = getCountOfXPath(xpathe, sibling, docmt);
                     if (count === 1) {
                         xpathData$1.push({
                             key: `xpath by ${axis}`,
-                            value: xpathe
+                            value: xpathe,
                         });
                         return;
                     }
@@ -3270,7 +3310,7 @@
                                 xpathDataWithIndex$1.push({
                                     key: `relative xpath by ${axis}`,
                                     value: xpathe,
-                                    count
+                                    count,
                                 });
                             }
                         }
@@ -3278,7 +3318,7 @@
                             xpathDataWithIndex$1.push({
                                 key: `relative xpath by ${axis}`,
                                 value: xpathe,
-                                count
+                                count,
                             });
                         }
                     }
@@ -3300,20 +3340,17 @@
         if (hasNumericAttributeValue(normalizedTextContent) && !stableTargetText) {
             return;
         }
-        const textForPredicate = hasNumericAttributeValue(normalizedTextContent)
-            ? stableTargetText
-            : normalizedTextContent;
+        const textForPredicate = hasNumericAttributeValue(normalizedTextContent) ? stableTargetText : (normalizedTextContent);
         const containerTextCondition = getContainerTextCondition(targetElemt, textForPredicate);
         for (const attrName of attributes) {
             if (checkBlockedAttributes(attrName, targetElemt, isTarget)) {
                 let attrValue = sanitizeAttributeValue(attrName.name, attrName.nodeValue);
                 const elementName = attrName.name;
-                const textCondition = containerTextCondition
-                    ? containerTextCondition
-                    : hasNumericAttributeValue(normalizedTextContent)
-                        ? `contains(normalize-space(.),${escapeCharacters(textForPredicate)})`
-                        : /\s/.test(textContent)
-                            ? `normalize-space(.)=${escapeCharacters(textForPredicate)}`
+                const textCondition = containerTextCondition ? containerTextCondition
+                    : hasNumericAttributeValue(normalizedTextContent) ?
+                        `contains(normalize-space(.),${escapeCharacters(textForPredicate)})`
+                        : /\s/.test(textContent) ?
+                            `normalize-space(.)=${escapeCharacters(textForPredicate)}`
                             : `text()=${escapeCharacters(textForPredicate)}`;
                 const xpath = `//${tagName}[@${elementName}='${attrValue}' and ${textCondition}]`;
                 if (xpath) {
@@ -3335,7 +3372,7 @@
                 for (const attrName of attribute) {
                     const expressions = intermediateXpathSteps(targetElemt, {
                         name: attrName.name,
-                        value: attrName.value
+                        value: attrName.value,
                     }, isTarget);
                     for (const expression of expressions) {
                         if (expression) {
@@ -3347,7 +3384,7 @@
             if (targetElemt.textContent) {
                 let expression = intermediateXpathStep(targetElemt, {
                     name: "text",
-                    value: targetElemt.textContent
+                    value: targetElemt.textContent,
                 }, isTarget);
                 if (expression) {
                     nodeXpath.push(expression);
@@ -3372,7 +3409,7 @@
                                 if (count === 1) {
                                     xpathData$1.push({
                                         key: "relative xpath by relative parent",
-                                        value: fullRelativeXpath
+                                        value: fullRelativeXpath,
                                     });
                                 }
                                 else if (count > 1 && isIndex) {
@@ -3381,7 +3418,7 @@
                                         getCountOfXPath(relativeXpathIndex, targetElemt, docmt) === 1) {
                                         xpathData$1.push({
                                             key: `relative xpath by relative parent  ${isIndex ? "index" : ""}`,
-                                            value: relativeXpathIndex
+                                            value: relativeXpathIndex,
                                         });
                                     }
                                 }
@@ -3402,7 +3439,7 @@
                                 if (count === 1) {
                                     xpathData$1.push({
                                         key: "relative xpath by relative child",
-                                        value: fullRelativeXpath
+                                        value: fullRelativeXpath,
                                     });
                                 }
                                 else if (count > 1 && isIndex) {
@@ -3411,7 +3448,7 @@
                                         getCountOfXPath(relativeXpathIndex, targetElemt, docmt) === 1) {
                                         xpathData$1.push({
                                             key: `relative xpath by relative parent  ${isIndex ? "index" : ""}`,
-                                            value: relativeXpathIndex
+                                            value: relativeXpathIndex,
                                         });
                                     }
                                 }
@@ -3425,7 +3462,7 @@
                                 if (txtXpath) {
                                     xpathData$1.unshift({
                                         key: `xpath by text${isIndex ? "index" : ""}`,
-                                        value: txtXpath
+                                        value: txtXpath,
                                     });
                                 }
                             }
@@ -3435,7 +3472,7 @@
                             if (tempRelativeXpath) {
                                 xpathData$1.push({
                                     key: "xpath by unique parent",
-                                    value: tempRelativeXpath
+                                    value: tempRelativeXpath,
                                 });
                             }
                         }
@@ -3492,7 +3529,7 @@
                         if (xpth) {
                             xpathData$1.push({
                                 key: `xpath by ${attr.name}${isIndex ? " index" : ""}`,
-                                value: xpth
+                                value: xpth,
                             });
                         }
                     }
@@ -3502,7 +3539,7 @@
             if (txtXpath) {
                 xpathData$1.push({
                     key: `xpath by text${isIndex ? " index" : ""}`,
-                    value: txtXpath
+                    value: txtXpath,
                 });
             }
             if (attributesArray.find((element) => ["className", "class"].includes(element.name)) &&
@@ -3511,16 +3548,16 @@
                 if (xpath) {
                     xpathData$1.push({
                         key: "xpath by class",
-                        value: xpath
+                        value: xpath,
                     });
                 }
             }
-            if (!xpathData$1.length && attributesArray.length > 1) {
+            if (attributesArray.length > 1) {
                 const combinationXpath = getAttributeCombinationXpath(targetElemt, docmt, attributesArray, isTarget);
                 if (combinationXpath)
                     xpathData$1.push({
                         key: "xpath by combination",
-                        value: combinationXpath
+                        value: combinationXpath,
                     });
             }
             if (!xpathData$1.length) {
@@ -3528,7 +3565,7 @@
                 if (textAttribute)
                     xpathData$1.push({
                         key: "xpath by textAttribute",
-                        value: textAttribute
+                        value: textAttribute,
                     });
             }
         }
@@ -3566,7 +3603,7 @@
                     if (count === 1) {
                         xpathData$1.push({
                             key: `${xpathData$1[i].key} regex`,
-                            value: xpth
+                            value: xpth,
                         });
                     }
                 }
@@ -3590,7 +3627,7 @@
         getParentRelativeXpath,
         getUniqueParentXpath,
         checkRelativeXpathRelation,
-        buildAxesStrategyXpaths
+        buildAxesStrategyXpaths,
     };
 
     let xpathDataWithIndex = [];
@@ -3744,7 +3781,9 @@
         // Share target candidate work across all relation attempts in this run.
         const targetCandidateContext = createTargetCandidateContext(element2, docmt, xpaths2);
         let finalXpaths = [];
-        const relations = allowedRelations || [];
+        const relations = allowedRelations?.length ?
+            allowedRelations
+            : getSmartRelations(element1, element2);
         if (!isIndex) {
             // Fresh non-index runs should start from a clean candidate list for this
             // reference/target pair; only candidates found in this pass are reusable.
@@ -5205,6 +5244,19 @@
         const trimmed = value.trim();
         return Boolean(trimmed) && trimmed.length <= 120 && !/^\d+$/.test(trimmed);
     };
+    const isStableSemanticId = (el, idAttribute) => {
+        const value = idAttribute.value.trim();
+        if (!isStableAttributeValue(value))
+            return false;
+        const wasModified = modifiedElementAttributes.some((modifiedAttribute) => modifiedAttribute.doc === el.ownerDocument &&
+            modifiedAttribute.element === el &&
+            modifiedAttribute.attributeName === "id");
+        if (wasModified)
+            return false;
+        // Keep semantic levels/versions such as "level2-shadow-host", but reject
+        // IDs containing long numeric runs, which are more likely generated.
+        return !/\d{4,}/.test(value);
+    };
     const isCssSelectorUnique = (selector, el, root) => {
         try {
             const matches = root.querySelectorAll(selector);
@@ -5262,8 +5314,8 @@
             return;
         const idAttribute = el.getAttributeNode("id");
         if (!idAttribute ||
-            !isStableAttributeValue(idAttribute.value) ||
-            !checkBlockedAttributes(idAttribute, el, true)) {
+            (!checkBlockedAttributes(idAttribute, el, true) &&
+                !isStableSemanticId(el, idAttribute))) {
             return;
         }
         return `#${escapeCssIdentifier(el.id, el)}`;
@@ -5383,6 +5435,59 @@
         }
         return;
     };
+    const getNthOfType = (el) => {
+        let index = 1;
+        let sibling = el.previousElementSibling;
+        while (sibling) {
+            if (sibling.tagName === el.tagName)
+                index++;
+            sibling = sibling.previousElementSibling;
+        }
+        return index;
+    };
+    const getRelativeCssSegment = (el) => {
+        const parent = el.parentElement;
+        const tag = el.tagName.toLowerCase();
+        if (parent) {
+            const stableSelectors = getDirectStableSelectors(el, {
+                includeTag: true,
+                preferredAttributesOnly: true
+            })
+                .filter((selector) => isCssSelectorUnique(selector, el, parent))
+                .sort((a, b) => a.length - b.length);
+            if (stableSelectors.length)
+                return stableSelectors[0];
+            const sameTagSiblings = Array.from(parent.children).filter((child) => child.tagName === el.tagName);
+            if (sameTagSiblings.length > 1) {
+                return `${tag}:nth-of-type(${getNthOfType(el)})`;
+            }
+        }
+        return tag;
+    };
+    const getShortestPositionalCssPath = (el) => {
+        if (!isElementNode(el) || isIgnoredTag(el))
+            return;
+        const root = el.getRootNode();
+        const descendantSegments = [];
+        let current = el;
+        while (current && isElementNode(current) && !isIgnoredTag(current)) {
+            const anchorSelectors = getDirectStableSelectors(current, {
+                includeTag: true,
+                preferredAttributesOnly: true
+            });
+            for (const anchorSelector of anchorSelectors) {
+                if (!isCssSelectorUnique(anchorSelector, current, root))
+                    continue;
+                const candidate = [anchorSelector, ...descendantSegments].join(" > ");
+                if (isCssSelectorUnique(candidate, el, root)) {
+                    return candidate;
+                }
+            }
+            descendantSegments.unshift(getRelativeCssSegment(current));
+            current = current.parentElement;
+        }
+        return getAbsoluteCssPath(el);
+    };
     const getAbsoluteCssPath = (el) => {
         const view = el.ownerDocument?.defaultView;
         if (!view || !(el instanceof view.Element))
@@ -5410,6 +5515,7 @@
         getIdCssPath,
         getAttributeCssPath,
         getClassCssPath,
+        getShortestPositionalCssPath,
         getAbsoluteCssPath
     };