@lvce-editor/test-worker 3.18.0 → 3.20.0

package/dist/testWorkerMain.js

@@ -430,10 +430,10 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$1 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$1 = id => {
+const get$2 = id => {
   return callbacks[id];
 };
 const remove = id => {
@@ -449,7 +449,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$1(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -606,7 +606,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$1(id);
+  const fn = get$2(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -849,19 +849,19 @@ const WebWorkerRpcClient = {
 const RendererWorker = 1;
 
 const rpcs = Object.create(null);
-const set = (id, rpc) => {
+const set$1 = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 
 const invoke = (method, ...params) => {
-  const rpc = get(RendererWorker);
+  const rpc = get$1(RendererWorker);
   return rpc.invoke(method, ...params);
 };
 const invokeAndTransfer = (method, ...params) => {
-  const rpc = get(RendererWorker);
+  const rpc = get$1(RendererWorker);
   return rpc.invokeAndTransfer(method, ...params);
 };
 
@@ -959,6 +959,21 @@ const importTest = async url => {
   }
 };
 
+const webViews = Object.create(null);
+const set = (id, webView) => {
+  webViews[id] = webView;
+};
+const get = id => {
+  return webViews[id];
+};
+
+const getLocatorRpc = locator => {
+  if (locator.webViewId) {
+    return get(locator.webViewId);
+  }
+  return Rpc;
+};
+
 // @ts-nocheck
 
 const Assert = {
@@ -976,7 +991,7 @@ const Assert = {
 const expect$1 = locator => {
   const {
     invoke
-  } = locator.webView || Rpc;
+  } = getLocatorRpc(locator);
   return {
     async checkSingleElementCondition(fnName, options) {
       Assert.string(fnName);
@@ -1092,36 +1107,37 @@ const setMockRpc = mockRpc => {
   state.mockRpcs[mockRpc.name] = mockRpc;
 };
 
-// @ts-nocheck
+const toButtonNumber = buttonType => {
+  switch (buttonType) {
+    case 'left':
+      return 0;
+    case 'middle':
+      return 1;
+    case 'right':
+      return 2;
+    default:
+      throw new Error(`unsupported button type: ${buttonType}`);
+  }
+};
 
 const create = (selector, options = {}) => {
+  // @ts-ignore
   return new Locator(selector, options);
 };
 const Locator = function (selector, {
   nth = -1,
   hasText = ''
 } = {}) {
+  // @ts-ignore
   this._selector = selector;
+  // @ts-ignore
   this._nth = nth;
+  // @ts-ignore
   this._hasText = hasText;
 };
 const performAction = async (locator, action, options) => {
-  const {
-    invoke
-  } = locator.webView || Rpc;
-  return invoke('TestFrameWork.performAction', locator, action, options);
-};
-const toButtonNumber = buttonType => {
-  switch (buttonType) {
-    case 'left':
-      return 0;
-    case 'middle':
-      return 1;
-    case 'right':
-      return 2;
-    default:
-      throw new Error(`unsupported button type: ${buttonType}`);
-  }
+  const rpc = getLocatorRpc(locator);
+  return rpc.invoke('TestFrameWork.performAction', locator, action, options);
 };
 Locator.prototype.click = async function ({
   button = 'left'
@@ -2278,13 +2294,13 @@ const fromId = async webViewId => {
       return invoke$1(ipc, method, ...params);
     }
   };
+  set(webViewId, webViewRpc);
   return {
     locator(selector, options) {
       const baseLocator = create(selector, options);
-      baseLocator.webView = webViewRpc;
+      baseLocator.webViewId = webViewId;
       return baseLocator;
-    },
-    expect: expect$1
+    }
   };
 };
 
@@ -2376,7 +2392,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(RendererWorker, rpc);
+  set$1(RendererWorker, rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-worker",
-  "version": "3.18.0",
+  "version": "3.20.0",
   "description": "",
   "license": "MIT",
   "author": "",