@lvce-editor/test-worker 11.1.0 → 11.3.0

package/dist/api.d.ts

@@ -19,7 +19,7 @@ interface LocatorClickOptions {
 }
 
 interface ILocatorExternal {
-	readonly click: (options: LocatorClickOptions) => Promise<void>;
+	readonly click: (options?: LocatorClickOptions) => Promise<void>;
 	readonly dispatchEvent: (type: string, init: string) => Promise<void>;
 	readonly first: () => ILocatorExternal;
 	readonly hover: () => Promise<void>;
@@ -28,8 +28,24 @@ interface ILocatorExternal {
 	readonly type: (text: string) => Promise<void>;
 }
 
-interface LocatorConstructor {
-  (selector: string, option?: any): ILocatorExternal
+interface ILocatorCreateOptions {
+	readonly hasText?: string;
+	readonly nth?: number;
+}
+export declare class Locator implements ILocator {
+	readonly _selector: any;
+	readonly _nth: number;
+	readonly _hasText: string;
+	constructor(selector: any, { hasText, nth }?: ILocatorCreateOptions);
+	click({ button }?: {
+		readonly button?: string;
+	}): Promise<void>;
+	hover(): Promise<void>;
+	first(): any;
+	locator(subSelector: string): any;
+	nth(nth: number): any;
+	type(text: string): Promise<void>;
+	dispatchEvent(type: string, init: any): Promise<void>;
 }
 
 export interface Diagnostic {

package/dist/testWorkerMain.js

@@ -517,7 +517,7 @@ const callbacks$1 = Object.create(null);
 const get$2 = id => {
   return callbacks$1[id];
 };
-const remove$1 = id => {
+const remove$2 = id => {
   delete callbacks$1[id];
 };
 class JsonRpcError extends Error {
@@ -670,7 +670,7 @@ const resolve$1 = (id, response) => {
     return;
   }
   fn(response);
-  remove$1(id);
+  remove$2(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -713,7 +713,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$2 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two$1,
     id,
@@ -724,7 +724,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(id, errorProperty);
+  return create$1$1(id, errorProperty);
 };
 const create$3 = (message, result) => {
   return {
@@ -1063,7 +1063,7 @@ const create$2 = async ({
     messagePort: port2
   });
 };
-const create$1$1 = async ({
+const create$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1075,7 +1075,26 @@ const create$1$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1$1
+  create: create$1
+};
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
 };
 
 const Directory = 3;
@@ -1096,8 +1115,12 @@ const set$3 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove$1 = id => {
+  delete rpcs[id];
+};
 
-const create$1 = rpcId => {
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+const create = rpcId => {
   return {
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1115,6 +1138,18 @@ const create$1 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$3(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove$1(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$3(rpcId, rpc);
     }
@@ -1124,18 +1159,21 @@ const create$1 = rpcId => {
 const {
   invoke: invoke$1,
   set: set$2
-} = create$1(EditorWorker);
+} = create(EditorWorker);
 
 const {
   invoke,
   invokeAndTransfer,
   set: set$1
-} = create$1(RendererWorker);
+} = create(RendererWorker);
 const sendMessagePortToEditorWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
+const readFile$1 = async uri => {
+  return invoke('FileSystem.readFile', uri);
+};
 const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
@@ -1499,17 +1537,17 @@ const addTest = (name, fn) => {
     name
   });
 };
-const getTests = () => {
-  const tests = state.pendingTests;
-  state.pendingTests = [];
-  return tests;
-};
 const setMockRpc = mockRpc => {
   object(mockRpc);
   string$1(mockRpc.name);
   state.mockRpcs[mockRpc.name] = mockRpc;
 };
 
+const performAction = async (locator, action, options) => {
+  const invoke = getLocatorInvoke(locator);
+  return invoke('TestFrameWork.performAction', locator, action, options);
+};
+
 const toButtonNumber = buttonType => {
   switch (buttonType) {
     case 'left':
@@ -1523,13 +1561,6 @@ const toButtonNumber = buttonType => {
   }
 };
 
-const create = (selector, options = {}) => {
-  return new Locator(selector, options);
-};
-const performAction = async (locator, action, options) => {
-  const invoke = getLocatorInvoke(locator);
-  return invoke('TestFrameWork.performAction', locator, action, options);
-};
 class Locator {
   constructor(selector, {
     hasText = '',
@@ -1558,18 +1589,18 @@ class Locator {
     return performAction(this, 'hover', options);
   }
   first() {
-    return create(this._selector, {
+    return new Locator(this._selector, {
       nth: 0
     });
   }
   locator(subSelector) {
     if (this._nth !== -1) {
-      return create(`${this._selector}:nth-of-type(${this._nth + 1}) ${subSelector}`);
+      return new Locator(`${this._selector}:nth-of-type(${this._nth + 1}) ${subSelector}`);
     }
-    return create(`${this._selector} ${subSelector}`);
+    return new Locator(`${this._selector} ${subSelector}`);
   }
   nth(nth) {
-    return create(this._selector, {
+    return new Locator(this._selector, {
       nth
     });
   }
@@ -1587,6 +1618,10 @@ class Locator {
   }
 }
 
+const createLocator = (selector, options = {}) => {
+  return new Locator(selector, options);
+};
+
 const getTmpDir$1 = async () => {
   return 'memfs://';
 };
@@ -1594,7 +1629,7 @@ const test = async (name, fn) => {
   nameAnonymousFunction(fn, `test/${name}`);
   addTest(name, fn);
 };
-test.skip = async id => {
+const skipTest = async id => {
   const state = 'skip';
   const background = 'yellow';
   const text = `test skipped ${id}`;
@@ -2574,24 +2609,25 @@ const toFileUrl = url => {
   return `file://${rest}`;
 };
 
-/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
-const getDirents = async (allDirents, fileUrl) => {
+const getDirents = async fileUrl => {
+  const allDirents = [];
   const dirents = await invoke('FileSystem.readDirWithFileTypes', fileUrl);
   for (const dirent of dirents) {
     if (dirent.type === Directory) {
-      await getDirents(allDirents, `${fileUrl}/${dirent.name}`);
+      const subDirents = await getDirents(`${fileUrl}/${dirent.name}`);
+      allDirents.push(...subDirents);
     } else {
       allDirents.push(`${fileUrl}/${dirent.name}`);
     }
   }
+  return allDirents;
 };
 const getFileMapNode = async url => {
   const fileUrl = toFileUrl(url);
-  const allFiles = [];
-  await getDirents(allFiles, fileUrl);
+  const allFiles = await getDirents(fileUrl);
   const fileMap = Object.create(null);
   for (const filePath of allFiles) {
-    const content = await invoke(`FileSystem.readFile`, filePath);
+    const content = await readFile$1(filePath);
     const relativePaths = filePath.slice(fileUrl.length + 1);
     fileMap[relativePaths] = content;
   }
@@ -3061,7 +3097,22 @@ const Main = {
   splitRight
 };
 
+const open$2 = async id => {
+  await invoke('Layout.showPanel', id);
+};
+const openProblems = async () => {
+  await open$2('Problems');
+  await invoke('Panel.selectIndex', 0);
+};
+
+const Panel = {
+  __proto__: null,
+  open: open$2,
+  openProblems
+};
+
 const show$4 = async () => {
+  await open$2('Output');
   await invoke('Panel.selectIndex', 1);
 };
 const handleFilterInput$1 = async text => {
@@ -3086,20 +3137,6 @@ const Output = {
   show: show$4
 };
 
-const open$2 = async id => {
-  await invoke('Layout.showPanel', id);
-};
-const openProblems = async () => {
-  await open$2('Problems');
-  await invoke('Panel.selectIndex', 0);
-};
-
-const Panel = {
-  __proto__: null,
-  open: open$2,
-  openProblems
-};
-
 const getIsFirefox = () => {
   if (typeof navigator === 'undefined') {
     return false;
@@ -3428,7 +3465,7 @@ const handleInputContextMenu = async (name, button, x, y) => {
   await invoke('Search.handleInputConextMenu', name, button, x, y);
 };
 const handleContextMenu$2 = async (button, x, y) => {
-  await invoke('Search.handleContextMenu', name, button, x, y);
+  await invoke('Search.handleContextMenu', button, x, y);
 };
 
 const Search = {
@@ -3486,8 +3523,7 @@ const clear = async searchValue => {
   return invoke('Settings.clear', searchValue, Script);
 };
 const clearHistory = async () => {
-  // @ts-ignore
-  return invoke('Settings.clearHistory', searchValue, Script);
+  return invoke('Settings.clearHistory');
 };
 const selectTab = async tabId => {
   return invoke('Settings.handleClickTab', tabId);
@@ -3720,7 +3756,7 @@ const fromId = async webViewId => {
   set(webViewId, rpc);
   return {
     locator(selector, options) {
-      const baseLocator = create(selector, options);
+      const baseLocator = createLocator(selector, options);
 
       // @ts-ignore
       baseLocator.webViewId = webViewId;
@@ -3787,7 +3823,7 @@ const createApi = (platform, assetDir) => {
     IframeInspector,
     KeyBindingsEditor,
     KeyBoard,
-    Locator: create,
+    Locator: createLocator,
     Main,
     Output,
     Panel,
@@ -3974,22 +4010,11 @@ const execute = async (href, platform, assetDir) => {
   }
   if (module.test) {
     if (module.skip) {
-      await test.skip(module.name);
+      await skipTest(module.name);
     } else {
       await executeTest(module.name, module.test, globals);
     }
-  } else {
-    const tests = getTests();
-    for (const test of tests) {
-      await executeTest(test.name, test.fn);
-    }
   }
-  // 3. if import fails, display error message
-
-  // 4. run the test
-  // 5. if test fails, display error message
-  // 6. if test succeeds, display success message
-
   // TODO maybe setup file watcher earlier, to not miss events?
 
   push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-worker",
-  "version": "11.1.0",
+  "version": "11.3.0",
   "description": "Test Worker",
   "repository": {
     "type": "git",