@lvce-editor/test-worker 6.6.0 → 6.8.0

package/dist/api.d.ts

@@ -275,7 +275,7 @@ interface FileSystem {
   readonly createExecutable: (content: string) => Promise<string>;
   readonly createExecutableFrom: (uri: string) => Promise<string>;
   readonly getTmpDir: ({ scheme }?: FileSystemTmpDirOptions) => Promise<string>;
-  readonly loadFixture: (platform: number, url: string) => Promise<string>;
+  readonly loadFixture: (url: string) => Promise<string>;
   readonly mkdir: (uri: string) => Promise<void>;
   readonly readFile: (uri: string) => Promise<string>;
   readonly remove: (uri: string) => Promise<void>;

package/dist/testWorkerMain.js

@@ -1109,109 +1109,6 @@ const createLazyRpc = rpcId => {
   };
 };
 
-const callFunction = async (fn, args) => {
-  try {
-    await fn(args);
-    return undefined;
-  } catch (error) {
-    return error;
-  }
-};
-
-const formatDuration = duration => {
-  return duration.toFixed(2) + 'ms';
-};
-
-const Fail = 'fail';
-const Pass = 'pass';
-
-const executeTest2 = async (name, fn, globals, timestampGenerator) => {
-  const getTimestamp = timestampGenerator;
-  const start = getTimestamp();
-  const error = await callFunction(fn, globals);
-  const end = getTimestamp();
-  const duration = end - start;
-  const formattedDuration = formatDuration(duration);
-  if (error) {
-    return {
-      error,
-      start,
-      end,
-      duration,
-      formattedDuration,
-      name,
-      type: Fail,
-      background: 'red',
-      text: `test failed: ${error}`
-    };
-  }
-  return {
-    error: undefined,
-    start,
-    end,
-    duration,
-    formattedDuration,
-    name,
-    type: Pass,
-    background: 'green',
-    text: `test passed in ${formattedDuration}`
-  };
-};
-
-const printError = error => {
-  if (error && error.constructor.name === 'AssertionError') {
-    console.error(error.message);
-  } else {
-    console.error(error);
-  }
-};
-
-const printTestError = async error => {
-  // TODO ask error worker to add codeframe
-  printError(error);
-};
-
-const now = () => {
-  return performance.now();
-};
-
-const executeTest = async (name, fn, globals = {}) => {
-  const {
-    error,
-    formattedDuration,
-    background,
-    text,
-    type
-  } = await executeTest2(name, fn, globals, now);
-  if (error) {
-    await printTestError(error);
-  } else {
-    // eslint-disable-next-line no-console
-    console.info(`PASS ${name} in ${formattedDuration}`);
-  }
-  // @ts-ignore
-  await invoke$1('TestFrameWork.showOverlay', type, background, text);
-};
-
-const importScript = async url => {
-  try {
-    return await import(url);
-  } catch (error) {
-    throw error;
-    // TODO
-    // const actualErrorMessage = await TryToGetactualImportErrorMessage.tryToGetActualImportErrorMessage(url, error)
-    // throw new Error(actualErrorMessage)
-  }
-};
-
-const importTest = async url => {
-  try {
-    return await importScript(url);
-  } catch (error) {
-    throw new VError(error, 'Failed to import test');
-  }
-};
-
 class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -1656,14 +1553,6 @@ const {
   expect
 } = Expect$1;
 
-const TestFrameWork = {
-  __proto__: null,
-  Locator: create,
-  expect,
-  getTmpDir: getTmpDir$1,
-  test
-};
-
 const show$4 = async () => {
   return invoke$1('About.showAbout');
 };
@@ -1683,7 +1572,7 @@ const focusPrevious$8 = async () => {
   return invoke$1('About.focusPrevious');
 };
 
-const TestFrameWorkComponentAbout = {
+const About = {
   __proto__: null,
   focusNext: focusNext$9,
   focusPrevious: focusPrevious$8,
@@ -1718,7 +1607,7 @@ const selectCurrent = async () => {
   await invoke$1('ActivityBar.selectCurrent');
 };
 
-const TestFrameworkComponentActivityBar = {
+const ActivityBar = {
   __proto__: null,
   focus: focus$2,
   focusFirst: focusFirst$7,
@@ -1770,7 +1659,7 @@ const getBaseUrl = () => {
   return `${location.origin}/${assetDir}`;
 };
 
-const TestFrameWorkComponentBaseUrl = {
+const BaseUrl = {
   __proto__: null,
   getBaseUrl
 };
@@ -1804,7 +1693,7 @@ const shouldHaveText$1 = async expectedText => {
   }
 };
 
-const TestFrameworkComponentClipBoard = {
+const ClipBoard = {
   __proto__: null,
   disableMemoryClipBoard,
   enableMemoryClipBoard,
@@ -1818,7 +1707,7 @@ const execute$1 = async (id, ...args) => {
   return invoke$1(id, ...args);
 };
 
-const TestFrameWorkComponentCommand = {
+const Command = {
   __proto__: null,
   execute: execute$1
 };
@@ -1827,7 +1716,7 @@ const selectItem$1 = async text => {
   await invoke$1('Menu.selectItem', text);
 };
 
-const TestFrameWorkComponentContextMenu = {
+const ContextMenu = {
   __proto__: null,
   selectItem: selectItem$1
 };
@@ -1865,7 +1754,7 @@ const toggleDeveloperTools = async () => {
   return invoke$1('Developer.toggleDeveloperTools');
 };
 
-const TestFrameWorkComponentDeveloper = {
+const Developer = {
   __proto__: null,
   openCacheFolder,
   openConfigFolder,
@@ -1910,7 +1799,7 @@ const executeMock = (id, ...args) => {
   return executeMock$1(id, ...args);
 };
 
-const TestFrameWorkComponentDialog = {
+const Dialog = {
   __proto__: null,
   executeMock,
   mockConfirm,
@@ -2152,7 +2041,7 @@ const redo = async () => {
   await invoke('Editor.redo');
 };
 
-const TestFrameWorkComponentEditor = {
+const Editor = {
   __proto__: null,
   addAllMissingImports,
   closeColorPicker,
@@ -2230,7 +2119,7 @@ const handleWheel$2 = async (deltaMode, deltaY) => {
   await invoke$1('EditorCompletion.handleWheel', deltaMode, deltaY);
 };
 
-const TestFrameWorkComponentEditorCompletion = {
+const EditorCompletion = {
   __proto__: null,
   close: close$2,
   handleWheel: handleWheel$2,
@@ -2246,7 +2135,7 @@ const close$1 = async () => {
   await invoke$1('EditorHover.close');
 };
 
-const TestFrameWorkComponentEditorHover = {
+const EditorHover = {
   __proto__: null,
   close: close$1,
   show: show$3
@@ -2265,7 +2154,7 @@ const cancel = async () => {
   await invoke$1('EditorRename.cancel');
 };
 
-const TestFrameWorkComponentEditorRename = {
+const EditorRename = {
   __proto__: null,
   accept,
   cancel,
@@ -2281,7 +2170,7 @@ const selectCurrentIndex$1 = async () => {
   await invoke$1('EditorSourceAction.selectCurrentIndex');
 };
 
-const TestFrameWorkComponentEditorSourceAction = {
+const EditorSourceAction = {
   __proto__: null,
   selectCurrentIndex: selectCurrentIndex$1,
   selectIndex: selectIndex$5
@@ -2407,7 +2296,7 @@ const toggleIndividualSelection = async index => {
   await invoke$1('Explorer.toggleIndividualSelection', index);
 };
 
-const TestFrameWorkComponentExplorer = {
+const Explorer = {
   __proto__: null,
   acceptEdit,
   cancelEdit,
@@ -2458,7 +2347,7 @@ const addNodeExtension = async relativePath => {
   await invoke$1('ExtensionMeta.addNodeExtension', absolutePath);
 };
 
-const TestFrameWorkComponentExtension = {
+const Extension = {
   __proto__: null,
   addNodeExtension,
   addWebExtension
@@ -2526,7 +2415,7 @@ const handleScroll$1 = async scrollTop => {
   return invoke$1('ExtensionDetail.handleScroll', scrollTop);
 };
 
-const TestFrameWorkComponentExtensionDetail = {
+const ExtensionDetail = {
   __proto__: null,
   handleClickCategory,
   handleClickDisable,
@@ -2673,14 +2562,17 @@ const createDroppedFileHandle = async () => {
   };
 };
 const loadFixture = async (platform, url) => {
+  if (typeof url !== 'string') {
+    throw new TypeError(`fixture url must be of type string`);
+  }
   // Handle fixture URLs in web environment
   if (platform === Web) {
     const fileMapUrl = `${url}/fileMap.json`;
-    // @ts-ignore
-    loadFileMap(fileMapUrl);
-    // TODO add those files to memory file system
-    // TODO then return the memory file system url
-    return '';
+    const fileMap = await loadFileMap(fileMapUrl);
+    for (const [key, value] of Object.entries(fileMap)) {
+      await writeFile(`memfs:///${key}`, value);
+    }
+    return 'memfs:///';
   }
 
   // TODO maybe also create a memory file system for consistency with web
@@ -2689,7 +2581,7 @@ const loadFixture = async (platform, url) => {
   return toFileUrl(url);
 };
 
-const TestFrameWorkComponentFileSystem = {
+const FileSystem = {
   __proto__: null,
   chmod,
   createDroppedFileHandle,
@@ -2764,7 +2656,7 @@ const focusPreviousElement = async () => {
   await invoke$1('FindWidget.focusPreviousElement');
 };
 
-const TestFrameWorkComponentFindWidget = {
+const FindWidget = {
   __proto__: null,
   close,
   focusElement,
@@ -2787,7 +2679,7 @@ const setIconTheme = async id => {
   await invoke$1('IconTheme.setIconTheme', id);
 };
 
-const TestFrameWorkComponentIconTheme = {
+const IconTheme = {
   __proto__: null,
   setIconTheme
 };
@@ -2808,7 +2700,7 @@ const focusLast$4 = async () => {
   return invoke$1('IframeInspector.focusLast');
 };
 
-const TestFrameWorkComponentIframeInspector = {
+const IframeInspector = {
   __proto__: null,
   focusFirst: focusFirst$5,
   focusLast: focusLast$4,
@@ -2888,7 +2780,7 @@ const resetKeyBinding = () => {
   return invoke$1('KeyBindings.resetKeyBinding');
 };
 
-const TestFrameWorkComponentKeyBindingsEditor = {
+const KeyBindingsEditor = {
   __proto__: null,
   addKeyBinding,
   changeWhenExpression,
@@ -2965,7 +2857,7 @@ const press = async key => {
   await invoke$1('TestFrameWork.performKeyBoardAction', 'press', options);
 };
 
-const TestFrameWorkComponentKeyBoard = {
+const KeyBoard = {
   __proto__: null,
   press
 };
@@ -3007,7 +2899,7 @@ const focusLast$2 = async () => {
   await invoke$1('Main.focusLast');
 };
 
-const TestFrameWorkComponentMain = {
+const Main = {
   __proto__: null,
   closeActiveEditor,
   closeAllEditors,
@@ -3040,7 +2932,7 @@ const clear$2 = async () => {
   await invoke$1('Output.clear');
 };
 
-const TestFrameWorkComponentOutput = {
+const Output = {
   __proto__: null,
   clear: clear$2,
   handleFilterInput: handleFilterInput$1,
@@ -3057,7 +2949,7 @@ const openProblems = async () => {
   await invoke$1('Panel.selectIndex', 0);
 };
 
-const TestFrameWorkComponentPanel = {
+const Panel = {
   __proto__: null,
   open: open$3,
   openProblems
@@ -3088,7 +2980,7 @@ const isFirefox = () => {
   return getIsFirefox();
 };
 
-const TestFrameWorkComponentPlatform = {
+const Platform = {
   __proto__: null,
   getNodePath,
   isFirefox
@@ -3135,7 +3027,7 @@ const viewAsTable = async () => {
   await invoke$1('Problems.viewAsTable');
 };
 
-const TestFrameWorkComponentProblems = {
+const Problems = {
   __proto__: null,
   copyMessage,
   focusIndex: focusIndex$3,
@@ -3149,11 +3041,11 @@ const TestFrameWorkComponentProblems = {
   viewAsTable
 };
 
-const QuickPick = 'QuickPick';
+const QuickPick$1 = 'QuickPick';
 
 const open$2 = async () => {
   // @ts-ignore
-  await invoke$1('Viewlet.openWidget', QuickPick, 'everything');
+  await invoke$1('Viewlet.openWidget', QuickPick$1, 'everything');
 };
 const handleInput$2 = async value => {
   // @ts-ignore
@@ -3208,7 +3100,7 @@ const executeCommand = async label => {
   await invoke$1('QuickPick.selectItem', label);
 };
 
-const TestFrameWorkComponentQuickPick = {
+const QuickPick = {
   __proto__: null,
   executeCommand,
   focusFirst: focusFirst$2,
@@ -3238,7 +3130,7 @@ const refresh = async () => {
   return invoke$1('References.refresh');
 };
 
-const TestFrameWorkComponentReferences = {
+const References = {
   __proto__: null,
   clear: clear$1,
   collapseAll,
@@ -3278,7 +3170,7 @@ const handleSpace = async () => {
   await invoke$1('Run And Debug.handleSpace');
 };
 
-const TestFrameWorkComponentRunAndDebug = {
+const RunAndDebug = {
   __proto__: null,
   acceptWatchExpressionEdit,
   addWatchExpression,
@@ -3372,7 +3264,7 @@ const setLimit = async limit => {
   await invoke$1('Search.setLimit', limit);
 };
 
-const TestFrameWorkComponentSearch = {
+const Search = {
   __proto__: null,
   clearSearchResults,
   collapseDetails,
@@ -3406,7 +3298,7 @@ const update$1 = settings => {
   return invoke$1('Preferences.update', settings);
 };
 
-const TestFrameWorkComponentSettings = {
+const Settings = {
   __proto__: null,
   update: update$1
 };
@@ -3448,7 +3340,7 @@ const handleScroll = async scrollTop => {
   await invoke$1('Settings.handleScroll', scrollTop, Script);
 };
 
-const TestFrameWorkComponentSettingsView = {
+const SettingsView = {
   __proto__: null,
   clear,
   handleInput: handleInput$1,
@@ -3469,7 +3361,7 @@ const hide = async () => {
   await invoke$1('Layout.hideSideBar');
 };
 
-const TestFrameWorkComponentSideBar = {
+const SideBar = {
   __proto__: null,
   hide,
   open
@@ -3489,7 +3381,7 @@ const handleClickSourceControlButtons = async (index, name) => {
   await invoke$1('Source Control.handleClickSourceControlButtons', index, name);
 };
 
-const TestFrameWorkComponentSourceControl = {
+const SourceControl = {
   __proto__: null,
   acceptInput,
   handleClickSourceControlButtons,
@@ -3501,7 +3393,7 @@ const update = async () => {
   await invoke$1('StatusBar.updateStatusBarItems');
 };
 
-const TestFrameWorkComponentStatusBar = {
+const StatusBar = {
   __proto__: null,
   update
 };
@@ -3559,7 +3451,7 @@ const toggleMenu = async () => {
   await invoke$1('TitleBarMenuBar.toggleMenu');
 };
 
-const TestFrameWorkComponentTitleBarMenuBar = {
+const TitleBarMenuBar = {
   __proto__: null,
   closeMenu,
   focus,
@@ -3588,7 +3480,7 @@ const resolve = relativePath => {
   return new URL(relativePath, url).toString();
 };
 
-const TestFrameWorkComponentUrl = {
+const Url = {
   __proto__: null,
   resolve,
   setUrl
@@ -3665,7 +3557,7 @@ const fromId = async webViewId => {
   };
 };
 
-const TestFrameWorkComponentWebView = {
+const WebView = {
   __proto__: null,
   fromId
 };
@@ -3688,55 +3580,168 @@ const resolveFileUrl = url => {
   return toFileUrl(url);
 };
 
-const TestFrameWorkComponentWorkspace = {
+const Workspace = {
   __proto__: null,
   openTmpDir,
   resolveFileUrl,
   setPath
 };
 
-const TestFrameWorkComponent = {
-  __proto__: null,
-  About: TestFrameWorkComponentAbout,
-  ActivityBar: TestFrameworkComponentActivityBar,
-  BaseUrl: TestFrameWorkComponentBaseUrl,
-  ClipBoard: TestFrameworkComponentClipBoard,
-  Command: TestFrameWorkComponentCommand,
-  ContextMenu: TestFrameWorkComponentContextMenu,
-  Developer: TestFrameWorkComponentDeveloper,
-  Dialog: TestFrameWorkComponentDialog,
-  Editor: TestFrameWorkComponentEditor,
-  EditorCompletion: TestFrameWorkComponentEditorCompletion,
-  EditorHover: TestFrameWorkComponentEditorHover,
-  EditorRename: TestFrameWorkComponentEditorRename,
-  EditorSourceAction: TestFrameWorkComponentEditorSourceAction,
-  Explorer: TestFrameWorkComponentExplorer,
-  Extension: TestFrameWorkComponentExtension,
-  ExtensionDetail: TestFrameWorkComponentExtensionDetail,
-  FileSystem: TestFrameWorkComponentFileSystem,
-  FindWidget: TestFrameWorkComponentFindWidget,
-  IconTheme: TestFrameWorkComponentIconTheme,
-  IframeInspector: TestFrameWorkComponentIframeInspector,
-  KeyBindingsEditor: TestFrameWorkComponentKeyBindingsEditor,
-  KeyBoard: TestFrameWorkComponentKeyBoard,
-  Main: TestFrameWorkComponentMain,
-  Output: TestFrameWorkComponentOutput,
-  Panel: TestFrameWorkComponentPanel,
-  Platform: TestFrameWorkComponentPlatform,
-  Problems: TestFrameWorkComponentProblems,
-  QuickPick: TestFrameWorkComponentQuickPick,
-  References: TestFrameWorkComponentReferences,
-  RunAndDebug: TestFrameWorkComponentRunAndDebug,
-  Search: TestFrameWorkComponentSearch,
-  Settings: TestFrameWorkComponentSettings,
-  SettingsView: TestFrameWorkComponentSettingsView,
-  SideBar: TestFrameWorkComponentSideBar,
-  SourceControl: TestFrameWorkComponentSourceControl,
-  StatusBar: TestFrameWorkComponentStatusBar,
-  TitleBarMenuBar: TestFrameWorkComponentTitleBarMenuBar,
-  Url: TestFrameWorkComponentUrl,
-  WebView: TestFrameWorkComponentWebView,
-  Workspace: TestFrameWorkComponentWorkspace
+const createApi = platform => {
+  return {
+    About,
+    ActivityBar,
+    BaseUrl,
+    ClipBoard,
+    Command,
+    ContextMenu,
+    Developer,
+    Dialog,
+    Editor,
+    EditorCompletion,
+    EditorHover,
+    EditorRename,
+    EditorSourceAction,
+    Explorer,
+    Extension,
+    ExtensionDetail,
+    FileSystem: {
+      ...FileSystem,
+      loadFixture(url) {
+        return loadFixture(platform, url);
+      }
+    },
+    FindWidget,
+    IconTheme,
+    IframeInspector,
+    KeyBindingsEditor,
+    KeyBoard,
+    Main,
+    Output,
+    Panel,
+    Platform,
+    Problems,
+    QuickPick,
+    References,
+    RunAndDebug,
+    Search,
+    Settings,
+    SettingsView,
+    SideBar,
+    SourceControl,
+    StatusBar,
+    TitleBarMenuBar,
+    Url,
+    WebView,
+    Workspace,
+    test,
+    Locator: create,
+    expect,
+    getTmpDir: getTmpDir$1 // TODO maybe deprecate this or move to file system
+  };
+};
+
+const callFunction = async (fn, args) => {
+  try {
+    await fn(args);
+    return undefined;
+  } catch (error) {
+    return error;
+  }
+};
+
+const formatDuration = duration => {
+  return duration.toFixed(2) + 'ms';
+};
+
+const Fail = 'fail';
+const Pass = 'pass';
+
+const executeTest2 = async (name, fn, globals, timestampGenerator) => {
+  const getTimestamp = timestampGenerator;
+  const start = getTimestamp();
+  const error = await callFunction(fn, globals);
+  const end = getTimestamp();
+  const duration = end - start;
+  const formattedDuration = formatDuration(duration);
+  if (error) {
+    return {
+      error,
+      start,
+      end,
+      duration,
+      formattedDuration,
+      name,
+      type: Fail,
+      background: 'red',
+      text: `test failed: ${error}`
+    };
+  }
+  return {
+    error: undefined,
+    start,
+    end,
+    duration,
+    formattedDuration,
+    name,
+    type: Pass,
+    background: 'green',
+    text: `test passed in ${formattedDuration}`
+  };
+};
+
+const printError = error => {
+  if (error && error.constructor.name === 'AssertionError') {
+    console.error(error.message);
+  } else {
+    console.error(error);
+  }
+};
+
+const printTestError = async error => {
+  // TODO ask error worker to add codeframe
+  printError(error);
+};
+
+const now = () => {
+  return performance.now();
+};
+
+const executeTest = async (name, fn, globals = {}) => {
+  const {
+    error,
+    formattedDuration,
+    background,
+    text,
+    type
+  } = await executeTest2(name, fn, globals, now);
+  if (error) {
+    await printTestError(error);
+  } else {
+    // eslint-disable-next-line no-console
+    console.info(`PASS ${name} in ${formattedDuration}`);
+  }
+  // @ts-ignore
+  await invoke$1('TestFrameWork.showOverlay', type, background, text);
+};
+
+const importScript = async url => {
+  try {
+    return await import(url);
+  } catch (error) {
+    throw error;
+    // TODO
+    // const actualErrorMessage = await TryToGetactualImportErrorMessage.tryToGetActualImportErrorMessage(url, error)
+    // throw new Error(actualErrorMessage)
+  }
+};
+
+const importTest = async url => {
+  try {
+    return await importScript(url);
+  } catch (error) {
+    throw new VError(error, 'Failed to import test');
+  }
 };
 
 // TODO move this into three steps:
@@ -3744,21 +3749,12 @@ const TestFrameWorkComponent = {
 // 2. execute test
 // 3. print out results
 const execute = async (href, platform) => {
-  const globals = {
-    ...TestFrameWorkComponent,
-    FileSystem: {
-      ...TestFrameWorkComponentFileSystem,
-      loadFixture(url) {
-        return loadFixture(platform, url);
-      }
-    },
-    ...TestFrameWork
-  };
+  const globals = createApi(platform);
   // TODO
   // 0. wait for page to be ready
   // 1. get script to import from renderer process (url or from html)
   const scriptUrl = href;
-  setUrl(scriptUrl);
+  setUrl(scriptUrl); // TODO avoid side effect
   // 2. import that script
   const module = await importTest(scriptUrl);
   if (module.mockRpc) {

package/package.json

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