@lvce-editor/renderer-process 29.0.0 → 29.1.0

package/dist/rendererProcessMain.js

@@ -1838,16 +1838,7 @@ const getHref = () => {
   return location.href;
 };
 const matchesPathName = (a, b) => {
-  if (a === b) {
-    return true;
-  }
-  if (a === '/' && b === '') {
-    return true;
-  }
-  if (a === '' && b === '/') {
-    return true;
-  }
-  return false;
+  return a === b || a === '/' && b === '' || a === '' && b === '/';
 };
 
 // TODO should do nothing if it is already at this path
@@ -1898,23 +1889,7 @@ const Message$2 = 'message';
 const Error$3 = 'error';
 
 const withResolvers = () => {
-  /**
-   * @type {any}
-   */
-  let _resolve;
-  /**
-   * @type {any}
-   */
-  let _reject;
-  const promise = new Promise((resolve, reject) => {
-    _resolve = resolve;
-    _reject = reject;
-  });
-  return {
-    promise,
-    reject: _reject,
-    resolve: _resolve
-  };
+  return Promise.withResolvers();
 };
 
 const getFirstEvent$1 = (eventTarget, eventMap) => {
@@ -4342,7 +4317,7 @@ const selectorToString = parsedSelector => {
         result = part.selector;
         continue;
       }
-      result = `${result} >> ${part.selector}`;
+      result += ` >> ${part.selector}`;
       continue;
     }
     if (part.type === 'text') {
@@ -4350,14 +4325,14 @@ const selectorToString = parsedSelector => {
         result = `text=${part.text}`;
         continue;
       }
-      result = `${result} text=${part.text}`;
+      result += ` text=${part.text}`;
       continue;
     }
     if (part.type === 'has-text') {
-      result = `${result} "${part.text}"`;
+      result += ` "${part.text}"`;
       continue;
     }
-    result = `${result}:nth(${part.index})`;
+    result += `:nth(${part.index})`;
   }
   return result;
 };
@@ -4689,6 +4664,16 @@ const showOverlay = (state, background, text, actions = []) => {
   $TestOverlay.append(span, ...$actions);
   document.body.append($TestOverlay);
 };
+const showTestResults = text => {
+  const existing = document.querySelector('.TestResults');
+  const $TestResults = existing || document.createElement('div');
+  $TestResults.className = 'TestResults';
+  $TestResults.hidden = true;
+  $TestResults.textContent = text;
+  if (!existing) {
+    document.body.append($TestResults);
+  }
+};
 const performAction = async (locator, fnName, options) => {
   object(locator);
   string(fnName);
@@ -8454,11 +8439,14 @@ const setUid = (viewletId, uid) => {
   } = instance.state;
   set$3($Viewlet, uid);
 };
-const emptyFocusCallback = {
+const focusCallback = {
   id: 0,
   selector: ''
 };
-let focusCallback = emptyFocusCallback;
+const resetFocusCallback = () => {
+  focusCallback.id = 0;
+  focusCallback.selector = '';
+};
 const focusSelector = (viewletId, selector) => {
   const instance = get$a(viewletId);
   if (!instance) {
@@ -8475,10 +8463,8 @@ const focusSelector = (viewletId, selector) => {
     if ($Element.isConnected) {
       $Element.focus();
     } else {
-      focusCallback = {
-        id: viewletId,
-        selector
-      };
+      focusCallback.id = viewletId;
+      focusCallback.selector = selector;
     }
   }
 };
@@ -8774,14 +8760,14 @@ const replaceChildren = (parentId, childIds) => {
   $Parent.replaceChildren($Fragment);
 };
 const applyLateFocusMaybe = () => {
-  if (focusCallback === emptyFocusCallback) {
+  if (!focusCallback.id) {
     return;
   }
   const {
     id,
     selector
   } = focusCallback;
-  focusCallback = emptyFocusCallback;
+  resetFocusCallback();
   const instance = get$a(id);
   if (instance) {
     const {
@@ -8790,7 +8776,6 @@ const applyLateFocusMaybe = () => {
     const $Element = $Viewlet.querySelector(selector);
     if ($Element) {
       $Element.focus();
-      focusCallback = emptyFocusCallback;
     }
   }
 };
@@ -8949,17 +8934,16 @@ const set$1 = title => {
 
 // workaround for not being setPointerCapture() not working on
 // synthetic events
-let originalSetPointerCapture;
-let originalReleasePointerCapture;
+const originalPointerCapture = {};
 const mock = () => {
-  originalSetPointerCapture = Element.prototype.setPointerCapture;
-  originalReleasePointerCapture = Element.prototype.releasePointerCapture;
+  originalPointerCapture.setPointerCapture = Element.prototype.setPointerCapture;
+  originalPointerCapture.releasePointerCapture = Element.prototype.releasePointerCapture;
   Element.prototype.setPointerCapture = () => {};
   Element.prototype.releasePointerCapture = () => {};
 };
 const unmock = () => {
-  Element.prototype.setPointerCapture = originalSetPointerCapture;
-  Element.prototype.releasePointerCapture = originalReleasePointerCapture;
+  Element.prototype.setPointerCapture = originalPointerCapture.setPointerCapture;
+  Element.prototype.releasePointerCapture = originalPointerCapture.releasePointerCapture;
 };
 
 const isFile = value => {
@@ -8996,7 +8980,7 @@ const waitForFrameToLoad = $Frame => {
     promise,
     resolve
   } = withResolvers();
-  $Frame.addEventListener('load', resolve, {
+  $Frame.addEventListener('load', () => resolve(), {
     once: true
   });
   return promise;
@@ -9120,6 +9104,7 @@ const commandMap = {
   'TestFrameWork.performAction2': performAction2,
   'TestFrameWork.performKeyBoardAction': performKeyboardAction,
   'TestFrameWork.showOverlay': showOverlay,
+  'TestFrameWork.showTestResults': showTestResults,
   'TestFrameWork.transfer': transfer,
   'TestFrameWork.transferToWebView': transferToWebView,
   'Viewlet.addKeyBindings': addKeyBindings,
@@ -9310,9 +9295,8 @@ const RE_AT = /^\s+at/;
 const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
 const RE_OBJECT_AS = /^\s*at Object\.\w+ \[as ([\w.]+)]/;
 const RE_OBJECT = /^\s*at Object\.(\w+)/;
-const RE_PATH_1$1 = /\((.*):(\d+):(\d+)\)$/;
-const RE_PATH_2$1 = /at (.*):(\d+):(\d+)$/;
-const RE_PATH_3$1 = /@(.*):(\d+):(\d+)$/; // Firefox
+const RE_PATH_1$1 = /\(([^()]*):(\d+):(\d+)\)$/;
+const RE_PATH_2$1 = /at ([^\n]*):(\d+):(\d+)$/;
 const RE_RESTORE_JSON_RPC_ERROR = /^\s*at restoreJsonRpcError/;
 const RE_UNWRAP_JSON_RPC_RESULT = /^\s*at unwrapJsonRpcResult/;
 const RE_HANDLE_JSON_RPC_MESSAGE = /^\s*at handleJsonRpcMessage/;
@@ -9325,8 +9309,14 @@ const isInternalLine = line => {
 const isRelevantLine = line => {
   return !isInternalLine(line);
 };
+const isFirefoxStackLine = line => {
+  const atIndex = line.indexOf('@');
+  const columnIndex = line.lastIndexOf(':');
+  const lineIndex = line.lastIndexOf(':', columnIndex - 1);
+  return Boolean(atIndex !== -1 && lineIndex > atIndex && columnIndex > lineIndex && line.slice(lineIndex + 1, columnIndex) && line.slice(columnIndex + 1));
+};
 const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line) || RE_PATH_2$1.test(line) || RE_PATH_3$1.test(line);
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line) || RE_PATH_2$1.test(line) || isFirefoxStackLine(line);
 };
 const isApplicationUsefulLine = (line, index) => {
   if (index === 0) {
@@ -9369,7 +9359,7 @@ const mergeCustom = (custom, relevantStack) => {
   if (RE_PATH_2$1.test(firstLine)) {
     return [`    at ${firstLine}`, ...relevantStack];
   }
-  if (RE_PATH_3$1.test(firstLine)) {
+  if (isFirefoxStackLine(firstLine)) {
     return [firstLine, ...relevantStack];
   }
   return relevantStack;
@@ -9445,9 +9435,23 @@ const prepareErrorMessageWithCodeFrame = error => {
     stderr: error.stderr
   };
 };
-const RE_PATH_1 = /\((.*):(\d+):(\d+)\)$/;
-const RE_PATH_2 = /at (.*):(\d+):(\d+)$/;
-const RE_PATH_3 = /@(.*):(\d+):(\d+)$/; // Firefox
+const RE_PATH_1 = /\(([^()]*):(\d+):(\d+)\)$/;
+const RE_PATH_2 = /at ([^\n]*):(\d+):(\d+)$/;
+const getFirefoxStackMatch = line => {
+  const atIndex = line.indexOf('@');
+  const columnIndex = line.lastIndexOf(':');
+  const lineIndex = line.lastIndexOf(':', columnIndex - 1);
+  if (atIndex === -1 || lineIndex <= atIndex || columnIndex <= lineIndex) {
+    return undefined;
+  }
+  const path = line.slice(atIndex + 1, lineIndex);
+  const lineNumber = line.slice(lineIndex + 1, columnIndex);
+  const column = line.slice(columnIndex + 1);
+  if (!path || !lineNumber || !column) {
+    return undefined;
+  }
+  return [line, path, lineNumber, column];
+};
 
 /**
  *
@@ -9456,7 +9460,7 @@ const RE_PATH_3 = /@(.*):(\d+):(\d+)$/; // Firefox
  */
 const getFile = lines => {
   for (const line of lines) {
-    if (RE_PATH_1.test(line) || RE_PATH_2.test(line) || RE_PATH_3.test(line)) {
+    if (RE_PATH_1.test(line) || RE_PATH_2.test(line) || getFirefoxStackMatch(line)) {
       return line;
     }
   }
@@ -9471,7 +9475,7 @@ const prepareErrorMessageWithoutCodeFrame = async error => {
       match = file.match(RE_PATH_2);
     }
     if (!match) {
-      match = file.match(RE_PATH_3);
+      match = getFirefoxStackMatch(file);
     }
     if (!match) {
       return error;

package/package.json

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