@lvce-editor/renderer-process 24.8.0 → 25.0.0

package/dist/rendererProcessMain.js

@@ -3898,8 +3898,6 @@ const ElementActions = {
   type
 };
 
-const htmlElements = ['a', 'abbr', 'address', 'area', 'article', 'aside', 'audio', 'b', 'base', 'bdo', 'body', 'br', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'command', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'iframe', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'link', 'map', 'mark', 'menu', 'meta', 'meter', 'nav', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'p', 'param', 'pre', 'progress', 'q', 'rp', 'rt', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'u', 'ul', 'var', 'video', 'wbr'];
-
 const querySelectorByText = (root, text) => {
   let node;
   const elements = [];
@@ -3916,47 +3914,73 @@ const querySelectorByCss = selector => {
   // @ts-ignore
   return [...document.querySelectorAll(selector)];
 };
-const isElement = selector => {
-  return htmlElements.includes(selector);
-};
-const querySelector = selector => {
-  if (typeof selector !== 'string') {
-    throw new TypeError('selector must be of type string');
-  }
-  if (selector.startsWith('text=')) {
-    return querySelectorByText(document.body, selector.slice('text='.length));
-  }
-  if (selector.includes('text=')) {
-    const index = selector.indexOf('text=');
-    const elements = querySelectorByCss(selector.slice(0, index));
-    const text = selector.slice(index + 'text='.length);
-    return elements.flatMap(element => {
-      return querySelectorByText(element, text);
-    });
-    // for(const element of elements)
-  }
-  if (selector.startsWith('.')) {
+const querySelectorByCssFromRoot = (root, selector) => {
+  if (root === document.body) {
     return querySelectorByCss(selector);
   }
-  if (selector.startsWith('#')) {
-    return querySelectorByCss(selector);
+  // @ts-ignore
+  return [...root.querySelectorAll(selector)];
+};
+const selectorToString = parsedSelector => {
+  let result = '';
+  for (const part of parsedSelector) {
+    if (part.type === 'css') {
+      if (!result) {
+        result = part.selector;
+        continue;
+      }
+      result = `${result} >> ${part.selector}`;
+      continue;
+    }
+    if (part.type === 'text') {
+      if (!result) {
+        result = `text=${part.text}`;
+        continue;
+      }
+      result = `${result} text=${part.text}`;
+      continue;
+    }
+    if (part.type === 'has-text') {
+      result = `${result} "${part.text}"`;
+      continue;
+    }
+    result = `${result}:nth(${part.index})`;
   }
-  if (selector.startsWith('[data') || selector.startsWith('[title') || selector.startsWith('[name') || selector.startsWith('[aria-label') || selector.startsWith('[role')) {
-    return querySelectorByCss(selector);
+  return result;
+};
+const querySelector = parsedSelector => {
+  if (!Array.isArray(parsedSelector)) {
+    throw new TypeError('parsedSelector must be of type array');
   }
-  if (isElement(selector)) {
-    return querySelectorByCss(selector);
+  let elements = [document.body];
+  for (const part of parsedSelector) {
+    if (part.type === 'text') {
+      elements = elements.flatMap(element => {
+        return querySelectorByText(element, part.text);
+      });
+      continue;
+    }
+    if (part.type === 'css') {
+      elements = elements.flatMap(element => {
+        return querySelectorByCssFromRoot(element, part.selector);
+      });
+      continue;
+    }
+    if (part.type === 'has-text') {
+      elements = elements.filter(element => element.textContent === part.text);
+      continue;
+    }
+    if (part.type === 'nth') {
+      const element = elements[part.index];
+      elements = element ? [element] : [];
+      continue;
+    }
+    throw new Error(`unsupported selector: ${selectorToString(parsedSelector)}`);
   }
-  throw new Error(`unsupported selector: ${selector}`);
+  return elements;
 };
-const querySelectorWithOptions = (selector, {
-  hasText = '',
-  nth = -1
-} = {}) => {
-  let elements = querySelector(selector);
-  if (hasText) {
-    elements = elements.filter(element => element.textContent === hasText);
-  }
+const querySelectorOne = parsedSelector => {
+  const elements = querySelector(parsedSelector);
   if (elements.length === 0) {
     return undefined;
   }
@@ -3964,14 +3988,7 @@ const querySelectorWithOptions = (selector, {
     const element = elements[0];
     return element;
   }
-  if (nth === -1) {
-    throw new Error(`too many matching elements for ${selector}, matching ${elements.length}`);
-  }
-  const element = elements[nth];
-  if (!element) {
-    throw new Error(`selector not found: ${selector}`);
-  }
-  return element;
+  throw new Error(`too many matching elements for ${selectorToString(parsedSelector)}, matching ${elements.length}`);
 };
 
 const performAction2 = async (locator, fnName, options) => {
@@ -3979,10 +3996,7 @@ const performAction2 = async (locator, fnName, options) => {
   string(fnName);
   object(options);
   const fn = ElementActions[fnName];
-  const element = querySelectorWithOptions(locator._selector, {
-    hasText: locator._hasText,
-    nth: locator._nth
-  });
+  const element = querySelectorOne(locator._parsed);
   if (!element) {
     throw new Error(`element not found`);
   }
@@ -3991,10 +4005,7 @@ const performAction2 = async (locator, fnName, options) => {
 };
 
 const toHaveText$1 = locator => {
-  const element = querySelectorWithOptions(locator._selector, {
-    hasText: locator._hasText,
-    nth: locator._nth
-  });
+  const element = querySelectorOne(locator._parsed);
   if (!element) {
     return {
       actual: '',
@@ -4010,10 +4021,7 @@ const toHaveAttribute$1 = (locator, {
   key,
   value
 }) => {
-  const element = querySelectorWithOptions(locator._selector, {
-    hasText: locator._hasText,
-    nth: locator._nth
-  });
+  const element = querySelectorOne(locator._parsed);
   if (!element) {
     return {
       actual: '',
@@ -4027,7 +4035,7 @@ const toHaveAttribute$1 = (locator, {
   };
 };
 const toHaveCount$1 = locator => {
-  const elements = querySelector(locator._selector);
+  const elements = querySelector(locator._parsed);
   const actualCount = elements.length;
   return {
     actual: actualCount
@@ -4055,7 +4063,7 @@ const toBeFocused$1 = locator => {
 const toHaveClass$1 = (locator, {
   className
 }) => {
-  const [element] = querySelector(locator._selector);
+  const [element] = querySelector(locator._parsed);
   if (!element) {
     return {
       actual: '',
@@ -4068,7 +4076,7 @@ const toHaveClass$1 = (locator, {
   };
 };
 const toHaveId$1 = locator => {
-  const [element] = querySelector(locator._selector);
+  const [element] = querySelector(locator._parsed);
   if (!element) {
     return {
       actual: '',
@@ -4083,7 +4091,7 @@ const toHaveId$1 = locator => {
 const toHaveCss$1 = (locator, {
   key
 }) => {
-  const [element] = querySelector(locator._selector);
+  const [element] = querySelector(locator._parsed);
   if (!element) {
     return {
       actual: '',
@@ -4100,7 +4108,7 @@ const toHaveCss$1 = (locator, {
 const toHaveJSProperty$1 = (locator, {
   key
 }) => {
-  const [element] = querySelector(locator._selector);
+  const [element] = querySelector(locator._parsed);
   if (!element) {
     return {
       actual: '',
@@ -4252,10 +4260,7 @@ const performAction = async (locator, fnName, options) => {
   string(fnName);
   object(options);
   const fn = ElementActions[fnName];
-  const element = querySelectorWithOptions(locator._selector, {
-    hasText: locator._hasText,
-    nth: locator._nth
-  });
+  const element = querySelectorOne(locator._parsed);
   if (!element) {
     throw new Error(`element not found`);
   }
@@ -4270,10 +4275,7 @@ const performKeyBoardAction = (fnName, options) => {
 };
 const checkSingleElementCondition = async (locator, fnName, options) => {
   const fn = SingleElementConditions[fnName];
-  const element = querySelectorWithOptions(locator._selector, {
-    hasText: locator._hasText,
-    nth: locator._nth
-  });
+  const element = querySelectorOne(locator._parsed);
   if (element) {
     const successful = fn(element, options);
     if (successful) {
@@ -4288,7 +4290,7 @@ const checkSingleElementCondition = async (locator, fnName, options) => {
 };
 const checkMultiElementCondition = async (locator, fnName, options) => {
   const fn = MultiElementConditions[fnName];
-  const elements = querySelector(locator._selector);
+  const elements = querySelector(locator._parsed);
   const successful = fn(elements, options);
   if (successful) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "24.8.0",
+  "version": "25.0.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"