@lvce-editor/renderer-process 29.0.0 → 29.2.0

package/dist/rendererProcessMain.js

@@ -264,21 +264,38 @@ const applyDragInfoMaybe = event => {
 const PointerMove$1 = 'pointermove';
 const lostpointercapture = 'lostpointercapture';
 
-let ignore = false;
+const createEventState = () => {
+  let ignore = false;
+  return {
+    startIgnore() {
+      ignore = true;
+    },
+    stopIgnore() {
+      ignore = false;
+    },
+    enabled() {
+      return ignore;
+    }
+  };
+};
+const eventState = createEventState();
 const startIgnore = () => {
-  ignore = true;
+  eventState.startIgnore();
 };
 const stopIgnore = () => {
-  ignore = false;
+  eventState.stopIgnore();
 };
 const enabled = () => {
-  return ignore;
+  return eventState.enabled();
 };
 
-let id$1 = 0;
-const create$L = () => {
-  return ++id$1;
+const createIdGenerator = () => {
+  let id = 0;
+  return () => {
+    return ++id;
+  };
 };
+const create$L = createIdGenerator();
 
 const state$9 = Object.create(null);
 const acquire$1 = id => {
@@ -1282,26 +1299,57 @@ const attachEvent = ($Node, eventMap, key, value, newEventMap) => {
   });
   attachedListeners.set($Node, listenersByEvent);
 };
+const detachEvent = ($Node, key) => {
+  const keyLower = key.toLowerCase();
+  const listenersByEvent = attachedListeners.get($Node);
+  const previous = listenersByEvent?.get(keyLower);
+  if (!previous) {
+    return;
+  }
+  $Node.removeEventListener(keyLower, previous.listener, previous.options);
+  listenersByEvent?.delete(keyLower);
+};
 
-const STYLE_REGEX = /([^:;]+):\s*([^;]+)/g;
-const KEBAB_CASE_REGEX = /-([a-z])/g;
+const toCamelCase = key => {
+  let camelCaseKey = '';
+  let shouldUpperCase = false;
+  for (const char of key) {
+    if (char === '-') {
+      shouldUpperCase = true;
+      continue;
+    }
+    camelCaseKey += shouldUpperCase ? char.toUpperCase() : char;
+    shouldUpperCase = false;
+  }
+  return camelCaseKey;
+};
 const setStyle = ($Element, styleString) => {
   if (typeof styleString !== 'string') {
     return;
   }
-  let match;
-  while ((match = STYLE_REGEX.exec(styleString)) !== null) {
-    const key = match[1].trim();
-    const value = match[2].trim();
-    // Convert kebab-case to camelCase for CSS properties with dashes
-    const camelCaseKey = key.replaceAll(KEBAB_CASE_REGEX, (_, char) => char.toUpperCase());
+  for (const declaration of styleString.split(';')) {
+    const colonIndex = declaration.indexOf(':');
+    if (colonIndex === -1) {
+      continue;
+    }
+    const key = declaration.slice(0, colonIndex).trim();
+    const value = declaration.slice(colonIndex + 1).trim();
+    if (!key || !value) {
+      continue;
+    }
+    if (key.startsWith('--')) {
+      $Element.style.setProperty(key, value);
+      continue;
+    }
+    const camelCaseKey = toCamelCase(key);
     $Element.style[camelCaseKey] = value;
   }
 };
 
 const optionalAttributeProps = new Map([['ariaActivedescendant', 'aria-activedescendant'], ['ariaOwns', 'aria-owns']]);
 const mappedAttributeProps = new Map([['ariaControls', 'aria-controls'], ['ariaLabelledBy', 'aria-labelledby']]);
-const pixelStyleProps = new Set(['left', 'marginTop', 'paddingLeft', 'paddingRight', 'top']);
+const removedAttributeProps = new Map([['ariaActivedescendant', 'aria-activedescendant'], ['ariaControls', 'aria-controls'], ['ariaLabelledBy', 'aria-labelledby'], ['ariaOwns', 'aria-owns'], ['className', 'class'], ['htmlFor', 'for'], ['inputType', 'type']]);
+const pixelStyleProps = new Set(['height', 'left', 'marginTop', 'paddingLeft', 'paddingRight', 'top', 'width']);
 const eventProps = new Set(['onBlur', 'onChange', 'onClick', 'onContextMenu', 'onBeforeInput', 'onDblClick', 'onDragEnd', 'onDragEnter', 'onDragLeave', 'onDragOver', 'onDragStart', 'onDrop', 'onFocus', 'onFocusIn', 'onFocusOut', 'onInput', 'onKeydown', 'onKeyDown', 'onKeyUp', 'onMouseDown', 'onMouseMove', 'onMouseOut', 'onMouseOver', 'onMouseUp', 'onPointerDown', 'onPointerMove', 'onPointerOut', 'onPointerOver', 'onScroll', 'onSelectionChange', 'onSubmit', 'onWheel']);
 const setOptionalAttribute = ($Element, attributeName, value) => {
   if (value) {
@@ -1327,6 +1375,19 @@ const setEventProp = ($Element, key, value, eventMap, newEventMap) => {
   const eventName = key.slice(2).toLowerCase();
   attachEvent($Element, eventMap, eventName, value, newEventMap);
 };
+const removeProp = ($Element, key) => {
+  if (eventProps.has(key)) {
+    const eventName = key.slice(2).toLowerCase();
+    detachEvent($Element, eventName);
+    return;
+  }
+  if (pixelStyleProps.has(key)) {
+    $Element.style[key] = '';
+    return;
+  }
+  const attributeName = removedAttributeProps.get(key) || key;
+  $Element.removeAttribute(attributeName);
+};
 const setProp = ($Element, key, value, eventMap, newEventMap) => {
   const optionalAttributeName = optionalAttributeProps.get(key);
   if (optionalAttributeName) {
@@ -1468,28 +1529,6 @@ const rememberFocus2 = ($Viewlet, dom, eventMap, uid = 0) => {
   return $Viewlet;
 };
 
-// Map of property names to attribute names for cases where they differ
-const propertyToAttribute = {
-  className: 'class',
-  htmlFor: 'for',
-  ariaActivedescendant: 'aria-activedescendant',
-  ariaControls: 'aria-controls',
-  ariaLabelledBy: 'aria-labelledby',
-  ariaOwns: 'aria-owns',
-  inputType: 'type'
-};
-// Style properties that need to be set on element.style
-const styleProperties = new Set(['width', 'height', 'top', 'left', 'marginTop', 'paddingLeft', 'paddingRight']);
-const removeAttribute = ($Element, key) => {
-  // Handle style properties
-  if (styleProperties.has(key)) {
-    // @ts-ignore - dynamic style property access
-    $Element.style[key] = '';
-    return;
-  }
-  const attributeName = propertyToAttribute[key] || key;
-  $Element.removeAttribute(attributeName);
-};
 const setText$1 = ($Element, value) => {
   $Element.nodeValue = value;
 };
@@ -1618,7 +1657,7 @@ const applyMutationPatch = (state, patch, events) => {
       state.hasAppliedMutation = true;
       break;
     case RemoveAttribute:
-      removeAttribute(state.current, patch.key);
+      removeProp(state.current, patch.key);
       state.hasAppliedMutation = true;
       break;
     case RemoveChild:
@@ -1768,15 +1807,15 @@ const rememberFocus$1 = ($Viewlet, dom, eventMap, uid = 0) => {
   const isRootTree = $Viewlet.getAttribute('role') === 'tree' && activeElement === $Viewlet;
   const focused = activeElement?.getAttribute('name') || null;
   const $Hidden = createHiddenContainer(activeElement, focused);
-  const inputMap = getInputMap($Viewlet);
   if (uid) {
     const numericUid = Number(uid);
+    const inputMap = getInputMap($Viewlet);
     $Viewlet = renderWithUid($Viewlet, dom, eventMap, numericUid, inputMap, focused, $Hidden);
-    $Hidden.remove();
-  } else {
+  }
+  if (!uid) {
     renderInto($Viewlet, dom, eventMap);
-    $Hidden.remove();
   }
+  $Hidden.remove();
   restoreFocus($Viewlet, isRootTree, isTreeFocused, focused);
   $Viewlet.style.top = oldTop;
   $Viewlet.style.left = oldLeft;
@@ -1838,16 +1877,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 +1928,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 +4356,7 @@ const selectorToString = parsedSelector => {
         result = part.selector;
         continue;
       }
-      result = `${result} >> ${part.selector}`;
+      result += ` >> ${part.selector}`;
       continue;
     }
     if (part.type === 'text') {
@@ -4350,14 +4364,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 +4703,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 +8478,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 +8502,8 @@ const focusSelector = (viewletId, selector) => {
     if ($Element.isConnected) {
       $Element.focus();
     } else {
-      focusCallback = {
-        id: viewletId,
-        selector
-      };
+      focusCallback.id = viewletId;
+      focusCallback.selector = selector;
     }
   }
 };
@@ -8774,14 +8799,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 +8815,6 @@ const applyLateFocusMaybe = () => {
     const $Element = $Viewlet.querySelector(selector);
     if ($Element) {
       $Element.focus();
-      focusCallback = emptyFocusCallback;
     }
   }
 };
@@ -8949,17 +8973,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 +9019,7 @@ const waitForFrameToLoad = $Frame => {
     promise,
     resolve
   } = withResolvers();
-  $Frame.addEventListener('load', resolve, {
+  $Frame.addEventListener('load', () => resolve(), {
     once: true
   });
   return promise;
@@ -9120,6 +9143,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 +9334,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 +9348,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 +9398,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 +9474,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 +9499,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 +9514,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.2.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"