@lvce-editor/test-worker 16.1.0 → 16.3.0

package/dist/api.d.ts

@@ -268,6 +268,7 @@ export type SelectItemWaitUntil = "done" | "quickPick" | "none";
 export type SearchInputType = "SearchValue" | "ReplaceValue" | "IncludeValue" | "ExcludeValue";
 
 interface Workspace {
+  readonly close: () => Promise<void>;
   readonly openTmpDir: () => Promise<string>;
   readonly setPath: (path: string) => Promise<void>;
 }
@@ -505,9 +506,13 @@ interface Editor {
   readonly goToDefinition: () => Promise<void>;
   readonly goToTypeDefinition: () => Promise<void>;
   readonly growSelection: () => Promise<void>;
+  readonly handleTab: () => Promise<void>;
+  readonly indentLess: () => Promise<void>;
+  readonly indentMore: () => Promise<void>;
   readonly insertLineBreak: () => Promise<void>;
   readonly invokeBraceCompletion: (text: string) => Promise<void>;
   readonly invokeTabCompletion: () => Promise<void>;
+  readonly moveLineDown: () => Promise<void>;
   readonly openColorPicker: () => Promise<void>;
   readonly openCompletion: () => Promise<void>;
   readonly openCompletionDetails: () => Promise<void>;
@@ -519,6 +524,7 @@ interface Editor {
   readonly openRename: () => Promise<void>;
   readonly openSourceActions: () => Promise<void>;
   readonly organizeImports: () => Promise<void>;
+  readonly pasteText: (text: string) => Promise<void>;
   readonly redo: () => Promise<void>;
   readonly rename: () => Promise<void>;
   readonly rename2: (newName: string) => Promise<void>;
@@ -533,6 +539,8 @@ interface Editor {
   readonly selectNextOccurrence: () => Promise<void>;
   readonly selectPreviousOccurrence: () => Promise<void>;
   readonly selectUp: () => Promise<void>;
+  readonly selectWordLeft: () => Promise<void>;
+  readonly selectWordRight: () => Promise<void>;
   readonly selectionGrow: () => Promise<void>;
   readonly setCursor: (rowIndex: number, columnIndex: number) => Promise<void>;
   readonly setDeltaY: (deltaY: number) => Promise<void>;
@@ -545,11 +553,13 @@ interface Editor {
   readonly shouldHaveTokens: (expectedTokens: readonly TokenRow[]) => Promise<void>;
   readonly showHover: () => Promise<void>;
   readonly sortImports: () => Promise<void>;
+  readonly sortLinesAscending: () => Promise<void>;
   readonly sourceActionsSelectCurrent: () => Promise<void>;
   readonly toggleBlockComment: () => Promise<void>;
   readonly toggleCompletionDetails: () => Promise<void>;
   readonly toggleLineComment: () => Promise<void>;
   readonly type: (text: string) => Promise<void>;
+  readonly typeWithAutoClosing: (text: string) => Promise<void>;
   readonly unIndent: () => Promise<void>;
   readonly undo: () => Promise<void>;
 }

package/dist/testWorkerMain.js

@@ -1265,15 +1265,17 @@ const initializeOpenerWorker = async () => {
   set$3(rpc);
 };
 
-let autoFixError;
+const state$3 = {
+  autoFixError: undefined
+};
 const get$1 = () => {
-  return autoFixError;
+  return state$3.autoFixError;
 };
 const set$1 = value => {
-  autoFixError = value;
+  state$3.autoFixError = value;
 };
 const clear$3 = () => {
-  autoFixError = undefined;
+  state$3.autoFixError = undefined;
 };
 
 class AssertionError extends Error {
@@ -1316,7 +1318,7 @@ const printLocator = locator => {
         result = part.selector;
         continue;
       }
-      result = `${result} >> ${part.selector}`;
+      result += ` >> ${part.selector}`;
       continue;
     }
     if (part.type === 'text') {
@@ -1324,14 +1326,14 @@ const printLocator = locator => {
         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;
 };
@@ -1618,7 +1620,7 @@ const nameAnonymousFunction = (fn, name) => {
 
 // @ts-nocheck
 
-const state = {
+const state$2 = {
   mockRpcs: Object.create(null),
   /**
    * @type {any[]}
@@ -1626,7 +1628,7 @@ const state = {
   pendingTests: []
 };
 const addTest = (name, fn) => {
-  state.pendingTests.push({
+  state$2.pendingTests.push({
     fn,
     name
   });
@@ -1634,7 +1636,7 @@ const addTest = (name, fn) => {
 const setMockRpc = mockRpc => {
   object(mockRpc);
   string$1(mockRpc.name);
-  state.mockRpcs[mockRpc.name] = mockRpc;
+  state$2.mockRpcs[mockRpc.name] = mockRpc;
 };
 
 class CssParsingError extends Error {
@@ -1922,6 +1924,7 @@ const execute$1 = async (id, ...args) => {
   return invoke(id, ...args);
 };
 const executeExtensionCommand = async (commandId, ...args) => {
+  // TODO maybe ask extension-management-worker instead
   return invoke('ExtensionHost.executeCommand', commandId, ...args);
 };
 
@@ -2235,11 +2238,11 @@ const assertObjectMatches = (actual, expected, path) => {
   if (!isObject$3(actual)) {
     throw new TypeError(`Expected ${path} to be an object but got ${formatValue(actual)}`);
   }
-  for (const key of Object.keys(expected)) {
+  for (const [key, expectedValue] of Object.entries(expected)) {
     if (!Object.hasOwn(actual, key)) {
       throw new Error(`Expected ${path}.${key} to exist`);
     }
-    assertPayloadMatches(actual[key], expected[key], `${path}.${key}`);
+    assertPayloadMatches(actual[key], expectedValue, `${path}.${key}`);
   }
 };
 const assertPrimitiveMatches = (actual, expected, path) => {
@@ -2608,6 +2611,9 @@ const directionMap = {
   horizontal: 1,
   vertical: 2
 };
+const isLayoutDirectionName = value => {
+  return value === 'horizontal' || value === 'vertical';
+};
 const isObject$2 = value => {
   return typeof value === 'object' && value !== null && !Array.isArray(value) && !(value instanceof RegExp);
 };
@@ -2637,8 +2643,11 @@ const matchesExpectedObject = (actual, expected) => {
   return true;
 };
 const matchesExpected = (actual, expected, key = '') => {
-  if (key === 'direction' && typeof expected === 'string' && expected in directionMap) {
-    return Object.is(actual, directionMap[expected]);
+  if (key === 'direction' && typeof expected === 'string' && isLayoutDirectionName(expected)) {
+    if (expected === 'horizontal') {
+      return Object.is(actual, directionMap.horizontal);
+    }
+    return Object.is(actual, directionMap.vertical);
   }
   if (expected instanceof RegExp) {
     return typeof actual === 'string' && expected.test(actual);
@@ -2830,13 +2839,32 @@ const areSelectionsEqual = (a, b) => {
   return true;
 };
 
+const areTokensEqual = (actual, expected) => {
+  if (actual.length !== expected.length) {
+    return false;
+  }
+  for (let i = 0; i < actual.length; i++) {
+    const actualRow = actual[i];
+    const expectedRow = expected[i];
+    if (actualRow.length !== expectedRow.length) {
+      return false;
+    }
+    for (let j = 0; j < actualRow.length; j++) {
+      if (actualRow[j] !== expectedRow[j]) {
+        return false;
+      }
+    }
+  }
+  return true;
+};
+
 const getEditorKey = async () => {
   const keys = await invoke$4('Editor.getKeys');
   if (keys.length === 0) {
     throw new Error(`no editor found`);
   }
   const key = keys.at(-1);
-  const numeric = Number.parseFloat(key);
+  const numeric = Number(key);
   return numeric;
 };
 
@@ -2925,6 +2953,12 @@ const cursorUp = async () => {
 const cursorWordLeft = async () => {
   await invoke('Editor.cursorWordLeft');
 };
+const selectWordLeft = async () => {
+  await invoke('Editor.selectWordLeft');
+};
+const selectWordRight = async () => {
+  await invoke('Editor.selectWordRight');
+};
 const setText = async text => {
   await invoke('Editor.setText', text);
 };
@@ -2997,6 +3031,27 @@ const setDeltaY$1 = async deltaY => {
 const format = async () => {
   await invoke('Editor.format');
 };
+const indentMore = async () => {
+  await invoke('Editor.indentMore');
+};
+const indentLess = async () => {
+  await invoke('Editor.indentLess');
+};
+const moveLineDown = async () => {
+  await invoke('Editor.moveLineDown');
+};
+const pasteText = async text => {
+  await invoke('Editor.pasteText', text);
+};
+const sortLinesAscending = async () => {
+  await invoke('Editor.sortLinesAscending');
+};
+const typeWithAutoClosing = async text => {
+  await invoke('Editor.typeWithAutoClosing', text);
+};
+const handleTab = async () => {
+  await invoke('Editor.handleTab');
+};
 const unIndent = async () => {
   await invoke('Editor.unIndent');
 };
@@ -3106,24 +3161,6 @@ const shouldHaveText = async expectedText => {
     throw new Error(`Expected editor to have text ${expectedText} but was ${text}`);
   }
 };
-const areTokensEqual = (actual, expected) => {
-  if (actual.length !== expected.length) {
-    return false;
-  }
-  for (let i = 0; i < actual.length; i++) {
-    const actualRow = actual[i];
-    const expectedRow = expected[i];
-    if (actualRow.length !== expectedRow.length) {
-      return false;
-    }
-    for (let j = 0; j < actualRow.length; j++) {
-      if (actualRow[j] !== expectedRow[j]) {
-        return false;
-      }
-    }
-  }
-  return true;
-};
 const shouldHaveTokens = async expectedTokens => {
   const key = await getEditorKey();
   const text = await invoke$4('Editor.getTokens', key);
@@ -3226,9 +3263,13 @@ const Editor = {
   goToDefinition,
   goToTypeDefinition,
   growSelection,
+  handleTab,
+  indentLess,
+  indentMore,
   insertLineBreak,
   invokeBraceCompletion,
   invokeTabCompletion,
+  moveLineDown,
   openColorPicker,
   openCompletion,
   openCompletionDetails,
@@ -3240,6 +3281,7 @@ const Editor = {
   openRename,
   openSourceActions,
   organizeImports,
+  pasteText,
   redo,
   rename: rename$1,
   rename2,
@@ -3254,6 +3296,8 @@ const Editor = {
   selectNextOccurrence,
   selectPreviousOccurrence,
   selectUp: selectUp$1,
+  selectWordLeft,
+  selectWordRight,
   selectionGrow,
   setCursor,
   setDeltaY: setDeltaY$1,
@@ -3266,11 +3310,13 @@ const Editor = {
   shouldHaveTokens,
   showHover,
   sortImports,
+  sortLinesAscending,
   sourceActionsSelectCurrent,
   toggleBlockComment,
   toggleCompletionDetails,
   toggleLineComment,
   type,
+  typeWithAutoClosing,
   unIndent,
   undo
 };
@@ -3281,7 +3327,7 @@ const selectIndex$6 = async index => {
 const selectCurrentIndex$2 = async () => {
   await invoke('EditorCompletion.selectCurrentIndex');
 };
-const close$2 = async () => {
+const close$3 = async () => {
   await invoke('EditorCompletion.close');
 };
 const handleWheel$2 = async (deltaMode, deltaY) => {
@@ -3292,7 +3338,7 @@ const handlePointerdown = async (clientX, clientY) => {
 };
 
 const EditorCompletion = {
-  close: close$2,
+  close: close$3,
   handlePointerdown,
   handleWheel: handleWheel$2,
   selectCurrentIndex: selectCurrentIndex$2,
@@ -3302,12 +3348,12 @@ const EditorCompletion = {
 const show$6 = async () => {
   await invoke('Editor.showHover2');
 };
-const close$1 = async () => {
+const close$2 = async () => {
   await invoke('EditorHover.close');
 };
 
 const EditorHover = {
-  close: close$1,
+  close: close$2,
   show: show$6
 };
 
@@ -3721,11 +3767,11 @@ const getFileMapNode = async url => {
   const contents = await Promise.all(allFiles.map(filePath => {
     return readFile$1(filePath);
   }));
-  allFiles.map((filePath, index) => {
+  for (const [index, filePath] of allFiles.entries()) {
     const content = contents[index];
     const relativePaths = filePath.slice(fileUrl.length + 1);
     fileMap[relativePaths] = content;
-  });
+  }
   return fileMap;
 };
 
@@ -3819,7 +3865,7 @@ const getParentUri = uri => {
   const pathSegments = url.pathname.split('/').filter(Boolean);
   pathSegments.pop();
   url.pathname = pathSegments.length === 0 ? '/' : `/${pathSegments.join('/')}`;
-  return url.toString();
+  return url.href;
 };
 const getBaseName = uri => {
   const url = new URL(uri);
@@ -3947,7 +3993,7 @@ const focusNext$5 = async () => {
 const focusPrevious$5 = async () => {
   await invoke('FindWidget.focusPrevious');
 };
-const close = async () => {
+const close$1 = async () => {
   await invoke('FindWidget.close');
 };
 const setReplaceValue$1 = async value => {
@@ -3988,7 +4034,7 @@ const focusPreviousElement = async () => {
 };
 
 const FindWidget = {
-  close,
+  close: close$1,
   focusElement,
   focusNext: focusNext$5,
   focusNextElement,
@@ -4323,33 +4369,41 @@ const Control = 'Control';
 const Space = 'Space';
 const Alt = 'Alt';
 
+const applyKeyPart = (part, options) => {
+  switch (part) {
+    case Alt:
+      {
+        options.altKey = true;
+        return;
+      }
+    case Control:
+      {
+        options.ctrlKey = true;
+        return;
+      }
+    case Space:
+      {
+        options.key = ' ';
+        return;
+      }
+    default:
+      {
+        options.key = part;
+      }
+  }
+};
 const getKeyOptions = rawKey => {
   if (rawKey.includes('+')) {
     const parts = rawKey.split('+');
-    let ctrlKey = false;
-    let altKey = false;
-    let key = '';
+    const options = {
+      altKey: false,
+      ctrlKey: false,
+      key: ''
+    };
     for (const part of parts) {
-      switch (part) {
-        case Alt:
-          altKey = true;
-          break;
-        case Control:
-          ctrlKey = true;
-          break;
-        case Space:
-          key = ' ';
-          break;
-        default:
-          key = part;
-          break;
-      }
+      applyKeyPart(part, options);
     }
-    return {
-      altKey,
-      ctrlKey,
-      key
-    };
+    return options;
   }
   return {
     altKey: false,
@@ -4487,11 +4541,12 @@ const getIsFirefox = () => {
   if (typeof navigator === 'undefined') {
     return false;
   }
-  if (
   // @ts-expect-error
-  navigator.userAgentData?.brands) {
-    // @ts-expect-error
-    return navigator.userAgentData.brands.includes('Firefox');
+  const {
+    userAgentData
+  } = navigator;
+  if (userAgentData?.brands) {
+    return userAgentData.brands.includes('Firefox');
   }
   return navigator.userAgent.toLowerCase().includes('firefox');
 };
@@ -4647,6 +4702,13 @@ const focusIndex$2 = async index => {
 const focusPrevious$2 = async () => {
   await invoke('QuickPick.focusPrevious');
 };
+const ignoreSelectionFailure = async promise => {
+  try {
+    await promise;
+  } catch {
+    // ignore selection failures for fire-and-forget selection flows
+  }
+};
 const selectItem = async (label, {
   waitUntil = 'done'
 } = {}) => {
@@ -4657,10 +4719,10 @@ const selectItem = async (label, {
   const visiblePromise = waitUntil === 'quickPick' ? invoke('QuickPick.waitUntilVisible') : undefined;
   const promise = Promise.resolve(invoke('QuickPick.selectItem', label));
   if (waitUntil === 'none') {
-    void promise.catch(() => undefined);
+    void ignoreSelectionFailure(promise);
     return;
   }
-  void promise.catch(() => undefined);
+  void ignoreSelectionFailure(promise);
   await visiblePromise;
 };
 const selectIndex$3 = async index => {
@@ -5089,12 +5151,15 @@ const TitleBarMenuBar = {
   toggleMenu
 };
 
-let url = '';
+const state$1 = {
+  url: ''
+};
 const setUrl = newUrl => {
-  url = newUrl;
+  state$1.url = newUrl;
 };
 const resolve = relativePath => {
-  return new URL(relativePath, url).toString();
+  const resolvedUrl = new URL(relativePath, state$1.url);
+  return resolvedUrl.href;
 };
 
 const Url = {
@@ -5186,8 +5251,12 @@ const openTmpDir = async () => {
   await setPath(tmpDir);
   return tmpDir;
 };
+const close = async () => {
+  await invoke('Workspace.close');
+};
 
 const Workspace = {
+  close,
   openTmpDir,
   setPath
 };
@@ -5354,14 +5423,18 @@ const printError = error => {
 };
 
 const prepareError = 'Errors.prepare';
+const ignoredCodeFrameStackLines = ['testWorkerMain.js', 'testWorkerMain.ts'];
 const formatPreparedError = preparedError => {
   const codeFrame = preparedError.codeframe || preparedError.codeFrame;
   return [preparedError.message, codeFrame, preparedError.stack].filter(Boolean).join('\n');
 };
 const printTestError = async error => {
   try {
-    const preparedError = await invoke$3(prepareError, error);
-    console.error(formatPreparedError(preparedError));
+    const preparedError = await invoke$3(prepareError, error, {
+      ignoredCodeFrameStackLines
+    });
+    const formatted = formatPreparedError(preparedError);
+    console.error(formatted);
   } catch {
     printError(error);
   }
@@ -5406,7 +5479,7 @@ const importScript = async url => {
   } catch (error) {
     throw error;
     // TODO
-    // const actualErrorMessage = await TryToGetactualImportErrorMessage.tryToGetActualImportErrorMessage(url, error)
+    // const actualErrorMessage = await TryToGetactualImportErrorMessage.tryToGetActualImportErrorMessage(URL, error)
     // throw new Error(actualErrorMessage)
   }
 };
@@ -5419,12 +5492,14 @@ const importTest = async url => {
   }
 };
 
-let items = [];
+const state = {
+  items: []
+};
 const push = item => {
-  items = [...items, item];
+  state.items = [...state.items, item];
 };
 const maybeLast = () => {
-  return items.at(-1);
+  return state.items.at(-1);
 };
 
 const getFileUri = href => {
@@ -5459,7 +5534,7 @@ const execute = async (href, platform, assetDir) => {
   const globals = createApi(platform, assetDir);
   // TODO
   // 0. wait for page to be ready
-  // 1. get script to import from renderer process (url or from html)
+  // 1. get script to import from renderer process (URL or from HTML)
   const scriptUrl = href;
   setUrl(scriptUrl); // TODO avoid side effect
   try {
@@ -5514,8 +5589,8 @@ const doHotReload = async (url, platform, assetDir) => {
 
 const createUrlWithQueryParameter = (url, locationHref, time) => {
   const parsedUrl = new URL(url, locationHref);
-  parsedUrl.searchParams.set('time', `${time}`);
-  const string = parsedUrl.toString();
+  parsedUrl.searchParams.set('time', String(time));
+  const string = parsedUrl.href;
   return string;
 };
 
@@ -5626,7 +5701,7 @@ const consumeComment = (inBlockComment, inLineComment, character, nextCharacter)
 };
 
 const isStringDelimiter = character => {
-  return character === "'" || character === '"' || character === '`';
+  return [`'`, '"', '`'].includes(character);
 };
 
 const consumeString = (stringDelimiter, character) => {
@@ -5753,11 +5828,11 @@ const projectActualOntoExpected = (actualValue, expectedValue) => {
       return actualValue;
     }
     const result = {};
-    for (const key of Object.keys(expectedValue)) {
+    for (const [key, nestedExpectedValue] of Object.entries(expectedValue)) {
       if (!Object.hasOwn(actualValue, key)) {
         continue;
       }
-      result[key] = projectActualOntoExpected(actualValue[key], expectedValue[key]);
+      result[key] = projectActualOntoExpected(actualValue[key], nestedExpectedValue);
     }
     return result;
   }
@@ -5869,7 +5944,7 @@ const toFileUrl = (url, locationHref) => {
   if (parsedUrl.protocol === 'file:') {
     parsedUrl.hash = '';
     parsedUrl.search = '';
-    return parsedUrl.toString();
+    return parsedUrl.href;
   }
   return getFileUrlFromRemotePath(parsedUrl.pathname);
 };

package/package.json

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