playwright-ui5 1.6.0 → 1.6.1

package/README.md

@@ -81,21 +81,6 @@ in this case, `//sap.m.Button[@id='foo']` will work, but `//sap.m.Button[@text='
 
 the XML view matches the control tree from the [ui5 diagnostics window](https://sapui5.hana.ondemand.com/sdk/#/topic/04b75eae78ef4bae9b40cd7540ae8bdc) and the [ui5 inspector chrome extension](https://chromewebstore.google.com/detail/ui5-inspector/bebecogbafbighhaildooiibipcnbngo), so we recommend using one of these when working with the ui5 xpath selector engine.
 
-#### the root node
-
-since the ui5 control tree can have multiple root nodes, the xpath selector engine wraps `sap-ui-area` nodes inside a `root` node:
-
-```xml
-<root>
-    <sap-ui-area id="sap-ui-static">
-        <sap.m.Page id="__page0">
-            <sap.m.Button id="foo"></sap.m.Button>
-        </sap.m.Page>
-    </sap-ui-area>
-    <sap-ui-area id="canvas">
-</root>
-```
-
 #### API
 
 the following xpath functions are available in the `ui5:` namespace:
@@ -119,7 +104,7 @@ gets the value for the property with the specified name from the specified eleme
 raises an exception containining the XML control tree with the specified element as the root. this function is only intended for debugging purposes.
 
 ```xpath
-ui5:debug-xml(root)
+ui5:debug-xml(/*)
 ```
 
 this will throw an exception containing the entire control tree for the page in XML format:
@@ -127,9 +112,7 @@ this will throw an exception containing the entire control tree for the page in
 ```
 playwright-ui5 debug-xml function was called. here is the XML element tree:
 
-<root>
-    <sap-ui-area id="sap-ui-static">
-        <!-- ... -->
-    </sap-ui-area>
-</root>
+<sap-ui-area id="sap-ui-static">
+    <!-- ... -->
+</sap-ui-area>
 ```

package/dist/browser/xpath.js

@@ -29053,11 +29053,8 @@ var createTreeModelNodes = (node) => {
   inner(node, result);
   return result;
 };
-var createXmlFromTreeNodes = (treeModelNodes) => {
+var createXmlFromTreeNode = (treeModelNode) => {
   let xml = (0, import_xmlbuilder2.create)({ version: "1.0" });
-  if (treeModelNodes[0]?.name === "sap-ui-area") {
-    xml = xml.ele("root");
-  }
   const inner = (nodes) => {
     nodes.forEach((node) => {
       xml = xml.ele(node.name, { id: node.id });
@@ -29065,10 +29062,10 @@ var createXmlFromTreeNodes = (treeModelNodes) => {
       xml = xml.up();
     });
   };
-  inner(treeModelNodes);
+  inner([treeModelNode]);
   return xml.end({ prettyPrint: true });
 };
-var createXml = (nodeElement) => createXmlFromTreeNodes(createTreeModelNodes(nodeElement));
+var createXml = (nodeElement) => createTreeModelNodes(nodeElement).map(createXmlFromTreeNode);
 var namespaceURI = "ui5";
 registerCustomXPathFunction(
   { namespaceURI, localName: "property" },
@@ -29106,20 +29103,26 @@ ${element.outerHTML}`
 var options = {
   namespaceResolver: (prefix) => prefix === namespaceURI ? prefix : null
 };
-var getRootElement = (node) => node instanceof Element ? node : node.querySelector("*");
-var createXmlDom = (node) => new DOMParser().parseFromString(createXml(node), "text/xml");
-var matchXmlElementToHtmlElement = (root, element) => root.querySelector(`[id='${element.id}']`) ?? void 0;
+var getRootElements = (htmlNode) => Array.from(htmlNode.childNodes).filter((childNode) => childNode instanceof Element);
+var createXmlDoms = (node) => createXml(node).map((xml) => new DOMParser().parseFromString(xml, "text/xml"));
+var matchXmlElementToHtmlElement = (htmlRoot, xmlElement) => {
+  const result = htmlRoot.querySelector(`[id='${xmlElement.id}']`);
+  if (result === null) {
+    return [];
+  }
+  return [result];
+};
 var xpath_default = {
   queryAll: (root, selector) => {
     try {
       if (!isUi5()) {
         return [];
       }
-      const node = getRootElement(root);
-      if (node === null) {
-        return [];
-      }
-      return evaluateXPathToNodes(selector, createXmlDom(node), null, null, options).map((element) => matchXmlElementToHtmlElement(root, element)).filter((element) => element !== void 0);
+      return getRootElements(root).flatMap(
+        (node) => createXmlDoms(node).flatMap(
+          (xmlDom) => evaluateXPathToNodes(selector, xmlDom, null, null, options)
+        ).flatMap((element) => matchXmlElementToHtmlElement(root, element))
+      );
     } catch (e4) {
       throw new Ui5SelectorEngineError(selector, e4);
     }
@@ -29129,18 +29132,21 @@ var xpath_default = {
       if (!isUi5()) {
         return void 0;
       }
-      const node = getRootElement(root);
-      if (node === null) {
-        return void 0;
+      for (const node of getRootElements(root)) {
+        for (const xmlDom of createXmlDoms(node)) {
+          const result = evaluateXPathToFirstNode(
+            selector,
+            xmlDom,
+            null,
+            null,
+            options
+          );
+          if (result) {
+            return matchXmlElementToHtmlElement(root, result)[0];
+          }
+        }
       }
-      const result = evaluateXPathToFirstNode(
-        selector,
-        createXmlDom(node),
-        null,
-        null,
-        options
-      );
-      return result ? matchXmlElementToHtmlElement(root, result) : void 0;
+      return void 0;
     } catch (e4) {
       throw new Ui5SelectorEngineError(selector, e4);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playwright-ui5",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "files": [
     "dist",
     "src/node"