@lvce-editor/test-worker 7.1.0 → 7.3.0

package/dist/api.d.ts

@@ -46,6 +46,15 @@ interface LocatorConstructor {
 }
 
 
+export interface Diagnostic {
+	readonly rowIndex: number;
+	readonly columnIndex: number;
+	readonly endRowIndex: number;
+	readonly endColumnIndex: number;
+	readonly message: string;
+	readonly type: "error" | "warning";
+}
+
 export interface DroppedFileHandle {
 	readonly id: number;
 	readonly file: File;
@@ -168,6 +177,7 @@ interface Editor {
   readonly setCursor: (rowIndex: number, columnIndex: number) => Promise<void>;
   readonly setDeltaY: (deltaY: number) => Promise<void>;
   readonly setSelections: (selections: any) => Promise<void>;
+  readonly shouldHaveDiagnostics: (expectedDiagnostics: readonly Diagnostic[]) => Promise<void>;
   readonly shouldHaveSelections: (expectedSelections: Uint32Array) => Promise<void>;
   readonly shouldHaveText: (expectedText: string) => Promise<void>;
   readonly showHover: () => Promise<void>;
@@ -182,6 +192,7 @@ interface Editor {
 
 interface EditorCompletion {
   readonly close: () => Promise<void>;
+  readonly handlePointerdown: (clientX: number, clientY: number) => Promise<void>;
   readonly handleWheel: (deltaMode: number, deltaY: number) => Promise<void>;
   readonly selectCurrentIndex: () => Promise<void>;
   readonly selectIndex: (index: number) => Promise<void>;
@@ -276,6 +287,7 @@ interface FileSystem {
   readonly getTmpDir: ({ scheme }?: FileSystemTmpDirOptions) => Promise<string>;
   readonly loadFixture: (url: string) => Promise<string>;
   readonly mkdir: (uri: string) => Promise<void>;
+  readonly readDir: (uri: string) => Promise<void>;
   readonly readFile: (uri: string) => Promise<string>;
   readonly remove: (uri: string) => Promise<void>;
   readonly writeFile: (uri: string, content: string) => Promise<void>;
@@ -449,6 +461,8 @@ interface Search {
 }
 
 interface Settings {
+  readonly disableDiagnostics: () => Promise<void>;
+  readonly enableDiagnostics: () => Promise<void>;
   readonly update: (settings: any) => Promise<void>;
 }
 

package/dist/testWorkerMain.js

@@ -1034,6 +1034,8 @@ const WebWorkerRpcClient = {
   create: create$2
 };
 
+const Directory = 3;
+
 const Web = 1;
 const Electron = 2;
 const Remote = 3;
@@ -1109,6 +1111,42 @@ const createLazyRpc = rpcId => {
   };
 };
 
+// @ts-nocheck
+
+const getPlatform = () => {
+  // @ts-expect-error
+  if (typeof PLATFORM !== 'undefined') {
+    // @ts-expect-error
+    return PLATFORM;
+  }
+  if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
+    return 'test';
+  }
+  // Check if running in web environment
+  if (globalThis.window !== undefined && typeof document !== 'undefined') {
+    return Web;
+  }
+  // TODO find a better way to pass runtime environment
+  if (typeof name !== 'undefined' && name.endsWith('(Electron)')) {
+    return Electron;
+  }
+  return Remote;
+};
+const platform = getPlatform(); // TODO tree-shake this out in production
+
+const getAssetDir = () => {
+  // @ts-expect-error
+  if (typeof ASSET_DIR !== 'undefined') {
+    // @ts-expect-error
+    return ASSET_DIR;
+  }
+  if (platform === Electron) {
+    return '../../../../..';
+  }
+  return '';
+};
+const assetDir = getAssetDir();
+
 class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -1619,42 +1657,6 @@ const ActivityBar = {
   selectCurrent
 };
 
-// @ts-nocheck
-
-const getPlatform = () => {
-  // @ts-expect-error
-  if (typeof PLATFORM !== 'undefined') {
-    // @ts-expect-error
-    return PLATFORM;
-  }
-  if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
-    return 'test';
-  }
-  // Check if running in web environment
-  if (globalThis.window !== undefined && typeof document !== 'undefined') {
-    return Web;
-  }
-  // TODO find a better way to pass runtime environment
-  if (typeof name !== 'undefined' && name.endsWith('(Electron)')) {
-    return Electron;
-  }
-  return Remote;
-};
-const platform = getPlatform(); // TODO tree-shake this out in production
-
-const getAssetDir = () => {
-  // @ts-expect-error
-  if (typeof ASSET_DIR !== 'undefined') {
-    // @ts-expect-error
-    return ASSET_DIR;
-  }
-  if (platform === Electron) {
-    return '../../../../..';
-  }
-  return '';
-};
-const assetDir = getAssetDir();
-
 const getBaseUrl = () => {
   return `${location.origin}/${assetDir}`;
 };
@@ -1807,6 +1809,22 @@ const Dialog = {
   showSaveFilePicker
 };
 
+const isDiagnosticEqual = (actual, expected) => {
+  return actual.rowIndex === expected.rowIndex && actual.columnIndex === expected.columnIndex && actual.endRowIndex === expected.endRowIndex && actual.endColumnIndex === expected.endColumnIndex && actual.message === expected.message && actual.type === expected.type;
+};
+
+const areDiagnosticsEqual = (actual, expected) => {
+  if (actual.length !== expected.length) {
+    return false;
+  }
+  for (let i = 0; i < actual.length; i++) {
+    if (!isDiagnosticEqual(actual[i], expected[i])) {
+      return false;
+    }
+  }
+  return true;
+};
+
 const areSelectionsEqual = (a, b) => {
   if (a.length !== b.length) {
     return false;
@@ -1819,10 +1837,21 @@ const areSelectionsEqual = (a, b) => {
   return true;
 };
 
+const lazyRpc = createLazyRpc(EditorWorker);
 const {
   invoke,
   setFactory
-} = createLazyRpc(EditorWorker);
+} = lazyRpc;
+
+const getEditorKey = async () => {
+  const keys = await invoke('Editor.getKeys');
+  if (keys.length === 0) {
+    throw new Error(`no editor found`);
+  }
+  const key = keys.at(-1);
+  const numeric = Number.parseInt(key);
+  return numeric;
+};
 
 const Script = 2;
 
@@ -2003,30 +2032,19 @@ const growSelection = async () => {
   await invoke$1('Editor.selectionGrow');
 };
 const getSelections = async () => {
-  const keys = await invoke('Editor.getKeys');
-  const key = keys.at(-1);
-  const numeric = Number.parseInt(key);
+  const key = await getEditorKey();
   // @ts-ignore
-  return invoke('Editor.getSelections', numeric);
-};
-const getKey = async () => {
-  const keys = await invoke('Editor.getKeys');
-  if (keys.length === 0) {
-    throw new Error(`no editor found`);
-  }
-  const key = keys.at(-1);
-  const numeric = Number.parseInt(key);
-  return numeric;
+  return invoke('Editor.getSelections', key);
 };
 const shouldHaveText = async expectedText => {
-  const key = await getKey();
+  const key = await getEditorKey();
   const text = await invoke('Editor.getText', key);
   if (text !== expectedText) {
     throw new Error(`Expected editor to have text ${expectedText} but was ${text}`);
   }
 };
 const shouldHaveSelections = async expectedSelections => {
-  const key = await getKey();
+  const key = await getEditorKey();
   const selections = await invoke('Editor.getSelections', key);
   if (!areSelectionsEqual(selections, expectedSelections)) {
     throw new Error(`Expected editor to have selections ${expectedSelections} but was ${selections}`);
@@ -2040,6 +2058,15 @@ const redo = async () => {
   // @ts-ignore
   await invoke('Editor.redo');
 };
+const shouldHaveDiagnostics = async expectedDiagnostics => {
+  const key = await getEditorKey();
+  const diagnostics = await invoke('Editor.getDiagnostics', key);
+  if (!areDiagnosticsEqual(diagnostics, expectedDiagnostics)) {
+    const stringifiedActual = JSON.stringify(diagnostics);
+    const stringifiedExpected = JSON.stringify(expectedDiagnostics);
+    throw new Error(`Expected editor to have diagnostics ${stringifiedActual} but was ${stringifiedExpected}`);
+  }
+};
 
 const Editor = {
   __proto__: null,
@@ -2092,6 +2119,7 @@ const Editor = {
   setCursor,
   setDeltaY,
   setSelections,
+  shouldHaveDiagnostics,
   shouldHaveSelections,
   shouldHaveText,
   showHover,
@@ -2118,10 +2146,15 @@ const handleWheel$2 = async (deltaMode, deltaY) => {
   // @ts-ignore
   await invoke$1('EditorCompletion.handleWheel', deltaMode, deltaY);
 };
+const handlePointerdown = async (clientX, clientY) => {
+  // @ts-ignore
+  await invoke$1('EditorCompletion.handlePointerdown', clientX, clientY);
+};
 
 const EditorCompletion = {
   __proto__: null,
   close: close$2,
+  handlePointerdown,
   handleWheel: handleWheel$2,
   selectCurrentIndex: selectCurrentIndex$2,
   selectIndex: selectIndex$6
@@ -2439,6 +2472,40 @@ const ExtensionDetail = {
 
 const Memfs = 'memfs';
 
+const toFileUrl = url => {
+  const urlObject = new URL(url);
+  const pathName = urlObject.pathname;
+  if (!pathName.startsWith('/remote')) {
+    throw new Error(`url must start with /remote`);
+  }
+  const rest = pathName.slice('/remote'.length);
+  return `file://${rest}`;
+};
+
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+const getDirents = async (allDirents, fileUrl) => {
+  const dirents = await invoke$1('FileSystem.readDirWithFileTypes', fileUrl);
+  for (const dirent of dirents) {
+    if (dirent.type === Directory) {
+      await getDirents(allDirents, `${fileUrl}/${dirent.name}`);
+    } else {
+      allDirents.push(`${fileUrl}/${dirent.name}`);
+    }
+  }
+};
+const getFileMapNode = async url => {
+  const fileUrl = toFileUrl(url);
+  const allFiles = [];
+  await getDirents(allFiles, fileUrl);
+  const fileMap = Object.create(null);
+  for (const filePath of allFiles) {
+    const content = await invoke$1(`FileSystem.readFile`, filePath);
+    const relativePaths = filePath.slice(fileUrl.length + 1);
+    fileMap[relativePaths] = content;
+  }
+  return fileMap;
+};
+
 const isObject = value => {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
 };
@@ -2470,6 +2537,12 @@ const loadFileMap = async fileMapUrl => {
   }
 };
 
+const getFileMapWeb = async url => {
+  const fileMapUrl = `${url}/fileMap.json`;
+  const fileMap = await loadFileMap(fileMapUrl);
+  return fileMap;
+};
+
 const Backslash = '\\';
 const Slash$1 = '/';
 
@@ -2487,16 +2560,6 @@ const stringifyJson = data => {
   return JSON.stringify(data, null, 2) + '\n';
 };
 
-const toFileUrl = url => {
-  const urlObject = new URL(url);
-  const pathName = urlObject.pathname;
-  if (!pathName.startsWith('/remote')) {
-    throw new Error(`url must start with /remote`);
-  }
-  const rest = pathName.slice('/remote'.length);
-  return `file://${rest}`;
-};
-
 const writeFile = async (uri, content) => {
   await invoke$1('FileSystem.writeFile', uri, content);
 };
@@ -2510,6 +2573,10 @@ const readFile = async uri => {
 const mkdir = async uri => {
   await invoke$1('FileSystem.mkdir', uri);
 };
+const readDir = async uri => {
+  // @ts-ignore
+  return invoke$1('FileSystem.readDirWithFileTypes', uri);
+};
 const remove = async uri => {
   await invoke$1('FileSystem.remove', uri);
 };
@@ -2565,20 +2632,12 @@ 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`;
-    const fileMap = await loadFileMap(fileMapUrl);
-    for (const [key, value] of Object.entries(fileMap)) {
-      await writeFile(`memfs:///${key}`, value);
-    }
-    return 'memfs:///';
+  const fn = platform === Web ? getFileMapWeb : getFileMapNode;
+  const fileMap = await fn(url);
+  for (const [key, value] of Object.entries(fileMap)) {
+    await writeFile(`memfs:///${key}`, value);
   }
-
-  // TODO maybe also create a memory file system for consistency with web
-  // TODO covert remote url to file url
-  // then set that as workspace path
-  return toFileUrl(url);
+  return 'memfs://';
 };
 
 const FileSystem = {
@@ -2590,6 +2649,7 @@ const FileSystem = {
   getTmpDir,
   loadFixture,
   mkdir,
+  readDir,
   readFile,
   remove,
   writeFile,
@@ -3297,9 +3357,23 @@ const update$1 = settings => {
   // @ts-ignore
   return invoke$1('Preferences.update', settings);
 };
+const enableDiagnostics = () => {
+  // @ts-ignore
+  return invoke$1('Preferences.update', {
+    'editor.diagnostics': true
+  });
+};
+const disableDiagnostics = () => {
+  // @ts-ignore
+  return invoke$1('Preferences.update', {
+    'editor.diagnostics': false
+  });
+};
 
 const Settings = {
   __proto__: null,
+  disableDiagnostics,
+  enableDiagnostics,
   update: update$1
 };
 
@@ -3577,11 +3651,16 @@ const Workspace = {
   setPath
 };
 
-const createApi = platform => {
+const createApi = (platform, assetDir$1) => {
   return {
     About,
     ActivityBar,
-    BaseUrl,
+    BaseUrl: {
+      ...BaseUrl,
+      getBaseUrl() {
+        return assetDir$1 || assetDir;
+      }
+    },
     ClipBoard,
     Command,
     ContextMenu,
@@ -3738,8 +3817,8 @@ const importTest = async url => {
 // 1. import test module
 // 2. execute test
 // 3. print out results
-const execute = async (href, platform) => {
-  const globals = createApi(platform);
+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)

package/package.json

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