@lvce-editor/renderer-process 14.0.0 → 14.0.2

package/dist/rendererProcessMain.js

@@ -2038,7 +2038,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send$2 = (transport, method, ...params) => {
+const send$1 = (transport, method, ...params) => {
   const message = create$4$2(method, params);
   transport.send(message);
 };
@@ -2072,7 +2072,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      send$2(ipc, method, ...params);
+      send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
       return invoke$2(ipc, method, ...params);
@@ -2303,7 +2303,7 @@ const dispose$k = () => {
     state$7.rpc.dispose();
   }
 };
-const send$1 = (method, ...params) => {
+const send = (method, ...params) => {
   // @ts-ignore
   state$7.rpc.send(method, ...params);
 };
@@ -2326,7 +2326,7 @@ const RendererWorker = {
   hydrate: hydrate$3,
   invoke: invoke$1,
   invokeAndTransfer,
-  send: send$1,
+  send,
   sendAndTransfer,
   state: state$7
 };
@@ -2467,7 +2467,7 @@ const handleNotificationClick = event => {
   switch ($Target.className) {
     case 'NotificationOption':
       const index = findIndex$1($Target);
-      send$1(/* Notification.handleClick */'Notification.handleClick', /* index */index);
+      send(/* Notification.handleClick */'Notification.handleClick', /* index */index);
       break;
   }
 };
@@ -2745,7 +2745,7 @@ const handleMouseDown$4 = event => {
   }
   preventDefault(event);
   const level = getLevel($Menu);
-  send$1(/* Menu.handleClick */'Menu.selectIndex', /* level */level, /* index */index);
+  send(/* Menu.handleClick */'Menu.selectIndex', /* level */level, /* index */index);
 };
 
 // const handleKeyDown = (event) => {
@@ -2790,7 +2790,7 @@ const handleMouseEnter = event => {
     return;
   }
   const level = getLevel($Menu);
-  send$1(/* Menu.handleMouseEnter */'Menu.handleMouseEnter', /* level */level, /* index */index, /* x */clientX, /* y */clientY, /* timeStamp */timeStamp);
+  send(/* Menu.handleMouseEnter */'Menu.handleMouseEnter', /* level */level, /* index */index, /* x */clientX, /* y */clientY, /* timeStamp */timeStamp);
 };
 const handleMouseLeave = event => {
   const $RelatedTarget = event.relatedTarget;
@@ -2852,7 +2852,7 @@ const focusIndex = (level, oldFocusedIndex, newFocusedIndex) => {
 const handleBackDropMouseDown = event => {
   preventDefault(event);
   stopPropagation(event);
-  send$1(/* Menu.hide */'Menu.hide');
+  send(/* Menu.hide */'Menu.hide');
 };
 const handleContextMenu$b = event => {
   preventDefault(event);
@@ -2883,7 +2883,7 @@ const showMenu = (x, y, width, height, items, level, parentIndex = -1, dom, mous
   append$1($Menu);
   if (level === 0) {
     focus$h($Menu);
-    send$1('Focus.setFocus', FocusMenu);
+    send('Focus.setFocus', FocusMenu);
   }
 };
 const hideSubMenu = level => {
@@ -3204,7 +3204,7 @@ const KeyBoardActions = {
   press
 };
 
-const toHaveCount = (elements, {
+const toHaveCount$1 = (elements, {
   count
 }) => {
   return elements.length === count;
@@ -3216,7 +3216,7 @@ const toBeHidden = elements => {
 const MultiElementConditions = {
   __proto__: null,
   toBeHidden,
-  toHaveCount
+  toHaveCount: toHaveCount$1
 };
 
 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'];
@@ -3305,7 +3305,7 @@ const toHaveValue = (element, {
 }) => {
   return element.value === value;
 };
-const toHaveText = (element, {
+const toHaveText$1 = (element, {
   text
 }) => {
   return element.textContent === text;
@@ -3315,27 +3315,27 @@ const toContainText = (element, {
 }) => {
   return element.textContent.includes(text);
 };
-const toHaveAttribute = (element, {
+const toHaveAttribute$1 = (element, {
   key,
   value
 }) => {
   const attribute = element.getAttribute(key);
   return attribute === value;
 };
-const toBeFocused = element => {
+const toBeFocused$1 = element => {
   return element === document.activeElement;
 };
-const toHaveClass = (element, {
+const toHaveClass$1 = (element, {
   className
 }) => {
   return element.classList.contains(className);
 };
-const toHaveId = (element, {
+const toHaveId$1 = (element, {
   id
 }) => {
   return element.id === id;
 };
-const toHaveCss = (element, {
+const toHaveCss$1 = (element, {
   key,
   value
 }) => {
@@ -3349,15 +3349,134 @@ const toHaveCss = (element, {
 
 const SingleElementConditions = {
   __proto__: null,
-  toBeFocused,
+  toBeFocused: toBeFocused$1,
   toBeVisible,
   toContainText,
+  toHaveAttribute: toHaveAttribute$1,
+  toHaveClass: toHaveClass$1,
+  toHaveCss: toHaveCss$1,
+  toHaveId: toHaveId$1,
+  toHaveText: toHaveText$1,
+  toHaveValue
+};
+
+const toHaveText = locator => {
+  const element = querySelectorWithOptions(locator._selector, {
+    nth: locator._nth,
+    hasText: locator._hasText
+  });
+  if (!element) {
+    return {
+      wasFound: false,
+      actual: ''
+    };
+  }
+  return {
+    wasFound: true,
+    actual: element.textContent
+  };
+};
+const toHaveAttribute = (locator, {
+  key,
+  value
+}) => {
+  const element = querySelectorWithOptions(locator._selector, {
+    nth: locator._nth,
+    hasText: locator._hasText
+  });
+  if (!element) {
+    return {
+      wasFound: false,
+      actual: ''
+    };
+  }
+  const actual = element.getAttribute(key);
+  return {
+    wasFound: true,
+    actual
+  };
+};
+const toHaveCount = locator => {
+  const elements = querySelector(locator._selector);
+  const actualCount = elements.length;
+  return {
+    actual: actualCount
+  };
+};
+const stringifyElement = element => {
+  if (element.id) {
+    return `#${element.id}`;
+  }
+  if (element.className) {
+    return `.${element.className}`;
+  }
+  if (element === document.body) {
+    return 'document.body';
+  }
+  return element.tagName;
+};
+const toBeFocused = locator => {
+  const activeElement = document.activeElement;
+  const stringifiedActiveElement = stringifyElement(activeElement);
+  return {
+    actual: stringifiedActiveElement
+  };
+};
+const toHaveClass = (locator, {
+  className
+}) => {
+  const [element] = querySelector(locator._selector);
+  if (!element) {
+    return {
+      wasFound: false,
+      actual: ''
+    };
+  }
+  return {
+    wasFound: true,
+    actual: className
+  };
+};
+const toHaveId = locator => {
+  const [element] = querySelector(locator._selector);
+  if (!element) {
+    return {
+      wasFound: false,
+      actual: ''
+    };
+  }
+  return {
+    wasFound: true,
+    actual: element.id
+  };
+};
+const toHaveCss = (locator, {
+  key
+}) => {
+  const [element] = querySelector(locator._selector);
+  if (!element) {
+    return {
+      wasFound: false,
+      actual: ''
+    };
+  }
+  const style = getComputedStyle(element);
+  const actual = style[key];
+  return {
+    wasFound: true,
+    actual
+  };
+};
+
+const ConditionValues = {
+  __proto__: null,
+  toBeFocused,
   toHaveAttribute,
   toHaveClass,
+  toHaveCount,
   toHaveCss,
   toHaveId,
-  toHaveText,
-  toHaveValue
+  toHaveText
 };
 
 // TODO this should also come in via options
@@ -3476,6 +3595,10 @@ const checkMultiElementCondition = async (locator, fnName, options) => {
     error: true
   };
 };
+const checkConditionError = (fnName, ...params) => {
+  const fn = ConditionValues[fnName];
+  return fn(...params);
+};
 
 const webViews = Object.create(null);
 const set$4 = (id, webView) => {
@@ -3699,7 +3822,7 @@ const ViewletActivityBar = {
 
 const executeViewletCommand = (uid, command, ...args) => {
   number(uid);
-  send$1('Viewlet.executeViewletCommand', uid, command, ...args);
+  send('Viewlet.executeViewletCommand', uid, command, ...args);
 };
 
 const nameAnonymousFunction = (fn, name) => {
@@ -3900,7 +4023,7 @@ const create$B = (pointerDown, pointerMove, pointerUp) => {
       return;
     }
     const uid = fromEvent(event);
-    send$1('Viewlet.executeViewletCommand', uid, ...message);
+    send('Viewlet.executeViewletCommand', uid, ...message);
   };
   const handlePointerMove = event => {
     shared(pointerMove, event);
@@ -4105,7 +4228,7 @@ const create$Button = (label, icon) => {
 };
 
 const handleClick$5 = index => {
-  send$1(/* Dialog.handleClick */'Dialog.handleClick', /* index */index);
+  send(/* Dialog.handleClick */'Dialog.handleClick', /* index */index);
 };
 
 const handleClick$4 = event => {
@@ -4380,7 +4503,7 @@ const sendToIframe = (contentWindow, message, origin, transfer) => {
 const handleLoad$1 = event => {
   // eslint-disable-next-line no-console
   console.log(event.target.src);
-  send$1('E2eTests.handleLoad');
+  send('E2eTests.handleLoad');
 };
 const setIframe$1 = (state, src, sandbox = []) => {
   if (!src) {
@@ -5094,7 +5217,7 @@ const getWrappedListener = (listener, returnValue) => {
       if (result.length === 0) {
         return;
       }
-      send$1('Viewlet.executeViewletCommand', uid, ...result);
+      send('Viewlet.executeViewletCommand', uid, ...result);
     };
     nameAnonymousFunction(wrapped, listener.name);
     cache.set(listener, wrapped);
@@ -6202,9 +6325,9 @@ const handleLocationsMouseDown = event => {
   const $Target = event.target;
   if ($Target.classList.contains('TreeItem')) {
     const index = getNodeIndex($Target);
-    send$1(/* ViewletLocations.selectIndex */'Locations.selectIndex', /* index */index);
+    send(/* ViewletLocations.selectIndex */'Locations.selectIndex', /* index */index);
   } else if ($Target.classList.contains('LocationList')) {
-    send$1(/* ViewletLocations.focusIndex */'Locations.focusIndex', /* index */-1);
+    send(/* ViewletLocations.focusIndex */'Locations.focusIndex', /* index */-1);
   }
 };
 
@@ -6242,7 +6365,7 @@ const focus$a = state => {
   } = state;
   $Locations.classList.add('FocusOutline');
   $Locations.focus();
-  send$1('Focus.setFocus', FocusLocationList);
+  send('Focus.setFocus', FocusLocationList);
 };
 
 const ViewletImplementations = {
@@ -6756,7 +6879,7 @@ const isMatchingKeyBinding = (identifiers, identifier) => {
 };
 
 const handleMatchingKeyBinding = identifier => {
-  send$1(/* KeyBindings.handleKeyBinding */'KeyBindings.handleKeyBinding', /* keyBinding */identifier);
+  send(/* KeyBindings.handleKeyBinding */'KeyBindings.handleKeyBinding', /* keyBinding */identifier);
 };
 const handleKeyDown$2 = event => {
   const identifier = getKeyBindingIdentifier(event);
@@ -6771,27 +6894,27 @@ const handleKeyDown$2 = event => {
 const handleKeyUp$1 = event => {};
 
 const handleSashPointerMove$1 = (x, y) => {
-  send$1('Layout.handleSashPointerMove', x, y);
+  send('Layout.handleSashPointerMove', x, y);
 };
 const handleSashPointerDown$1 = id => {
-  send$1('Layout.handleSashPointerDown', id);
+  send('Layout.handleSashPointerDown', id);
 };
 
 // TODO send component uid
 const handleSashPointerUp = id => {
-  send$1('Layout.handleSashPointerUp', id);
+  send('Layout.handleSashPointerUp', id);
 };
 const handleSashDoubleClick$1 = id => {
-  send$1('Layout.handleSashDoubleClick', id);
+  send('Layout.handleSashDoubleClick', id);
 };
 const handleResize$1 = (width, height) => {
-  send$1('Layout.handleResize', width, height);
+  send('Layout.handleResize', width, height);
 };
 const handleFocus$3 = () => {
-  send$1('Layout.handleFocus');
+  send('Layout.handleFocus');
 };
 const handleBlur$4 = () => {
-  send$1('Layout.handleBlur');
+  send('Layout.handleBlur');
 };
 
 const handleSashPointerMove = event => {
@@ -7315,7 +7438,7 @@ const handleError$2 = (state, error) => {
 const focus$8 = state => {
   object(state);
   focus$h(state.$ViewletOutputContent);
-  send$1('Focus.setFocus', FocusOutput);
+  send('Focus.setFocus', FocusOutput);
 };
 
 // TODO handle case when output is opened -> find widget is opened -> output is disposed before find widget is ready
@@ -7709,22 +7832,22 @@ const ViewletSideBar = {
 };
 
 const handleInput$3 = value => {
-  send$1('SimpleBrowser.handleInput', value);
+  send('SimpleBrowser.handleInput', value);
 };
 const forward = () => {
-  send$1('SimpleBrowser.forward');
+  send('SimpleBrowser.forward');
 };
 const backward = () => {
-  send$1('SimpleBrowser.backward');
+  send('SimpleBrowser.backward');
 };
 const reload$1 = () => {
-  send$1('SimpleBrowser.reload');
+  send('SimpleBrowser.reload');
 };
 const cancelNavigation = () => {
-  send$1('SimpleBrowser.cancelNavigation');
+  send('SimpleBrowser.cancelNavigation');
 };
 const openExternal = () => {
-  send$1('SimpleBrowser.openExternal');
+  send('SimpleBrowser.openExternal');
 };
 
 const handleInput$2 = event => {
@@ -7740,7 +7863,7 @@ const handleFocus$1 = event => {
   const {
     target
   } = event;
-  send$1('Focus.setFocus', FocusSimpleBrowserInput);
+  send('Focus.setFocus', FocusSimpleBrowserInput);
   setTimeout(() => {
     target.select();
   });
@@ -8435,7 +8558,7 @@ const ViewletTitleBarTitle = {
 };
 
 const handleVideoError$1 = (code, message) => {
-  send$1('Video.handleVideoError', code, message);
+  send('Video.handleVideoError', code, message);
 };
 
 const handleVideoError = event => {
@@ -8861,19 +8984,6 @@ const refresh$1 = (viewletId, viewletContext) => {
     state$1.refreshContext[viewletId] = viewletContext;
   }
 };
-
-// TODO handle error when viewlet creation fails
-
-// TODO remove send -> use invoke instead
-const send = (viewletId, method, ...args) => {
-  const instance = state$1.instances[viewletId];
-  if (instance) {
-    instance.factory[method](...args);
-  } else {
-    // TODO
-    warn$1('instance not present');
-  }
-};
 const specialIds = new Set(['TitleBar', 'SideBar', 'Main', 'ActivityBar', 'StatusBar', 'Panel']);
 const isSpecial = id => {
   return specialIds.has(id);
@@ -9334,7 +9444,7 @@ const close = () => {
   // window.close()
 };
 const sendVisibilityChangeHint = () => {
-  send$1(/* SaveState.handleVisibilityChange */'SaveState.handleVisibilityChange', /* visibilityState */'hidden');
+  send(/* SaveState.handleVisibilityChange */'SaveState.handleVisibilityChange', /* visibilityState */'hidden');
 };
 const handleBeforeUnload = () => {
   sendVisibilityChangeHint();
@@ -9544,6 +9654,7 @@ const commandMap = {
   'TestFrameWork.showOverlay': showOverlay,
   'TestFrameWork.transfer': transfer,
   'TestFrameWork.transferToWebView': transferToWebView,
+  'TestFrameWork.checkConditionError': checkConditionError,
   'Viewlet.addKeyBindings': addKeyBindings,
   'Viewlet.appendViewlet': appendViewlet,
   'Viewlet.dispose': dispose$3,
@@ -9557,7 +9668,7 @@ const commandMap = {
   'Viewlet.refresh': refresh$1,
   'Viewlet.registerEventListeners': registerEventListeners,
   'Viewlet.removeKeyBindings': removeKeyBindings,
-  'Viewlet.send': send,
+  'Viewlet.send': invoke,
   'Viewlet.sendMultiple': sendMultiple,
   'Viewlet.setBounds': setBounds$1,
   'Viewlet.show': show,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "14.0.0",
+  "version": "14.0.2",
   "description": "",
   "keywords": [
     "lvce-editor",