@lvce-editor/extension-host-worker 1.4.2 → 1.6.0

package/dist/extensionHostWorkerMain.js

@@ -89,7 +89,7 @@ const fn = value => {
   }
 };
 
-const state$b = {
+const state$a = {
   /** @type{any[]} */
   onDidOpenEditorListeners: [],
   /** @type{any[]} */
@@ -101,19 +101,19 @@ const state$b = {
   textDocuments: Object.create(null)
 };
 const setDocument = (textDocumentId, textDocument) => {
-  state$b.textDocuments[textDocumentId] = textDocument;
+  state$a.textDocuments[textDocumentId] = textDocument;
 };
 const getDidOpenListeners = () => {
-  return state$b.onDidSaveTextDocumentListeners;
+  return state$a.onDidSaveTextDocumentListeners;
 };
 const getWillChangeListeners = () => {
-  return state$b.onWillChangeEditorListeners;
+  return state$a.onWillChangeEditorListeners;
 };
 const getDidChangeListeners = () => {
-  return state$b.onDidChangeTextDocumentListeners;
+  return state$a.onDidChangeTextDocumentListeners;
 };
 const getDocument = textDocumentId => {
-  return state$b.textDocuments[textDocumentId];
+  return state$a.textDocuments[textDocumentId];
 };
 
 const getOffset$1 = (textDocument, position) => {
@@ -303,7 +303,7 @@ const syncIncremental = (textDocumentId, changes) => {
   textDocument.text = before + syntheticChange.inserted + after;
   runListenersSafe(getDidChangeListeners(), textDocument, syntheticChanges);
 };
-const get$4 = textDocumentId => {
+const get$5 = textDocumentId => {
   const textDocument = getDocument(textDocumentId);
   return textDocument;
 };
@@ -536,7 +536,7 @@ const registerMethod = ({
 }) => {
   context[`execute${name}Provider`] = async function (textDocumentId, ...params) {
     try {
-      const textDocument = get$4(textDocumentId);
+      const textDocument = get$5(textDocumentId);
       if (!textDocument) {
         throw new Error(`textDocument with id ${textDocumentId} not found`);
       }
@@ -671,12 +671,12 @@ const executeOrganizeImports = async uid => {
   if (!organizeImportsAction) {
     return [];
   }
-  const textDocument = get$4(uid);
+  const textDocument = get$5(uid);
   const edits = await organizeImportsAction.execute(textDocument);
   return edits;
 };
 
-const state$a = {
+const state$9 = {
   commands: Object.create(null)
 };
 const getCommandDisplay = command => {
@@ -699,10 +699,10 @@ const registerCommand = command => {
     if (!command.execute) {
       throw new Error('command is missing execute function');
     }
-    if (command.id in state$a.commands) {
+    if (command.id in state$9.commands) {
       throw new Error(`command cannot be registered multiple times`);
     }
-    state$a.commands[command.id] = command;
+    state$9.commands[command.id] = command;
   } catch (error) {
     const commandDisplayId = getCommandDisplay(command);
     throw new VError$1(error, `Failed to register command${commandDisplayId}`);
@@ -710,7 +710,7 @@ const registerCommand = command => {
 };
 const executeCommand = async (id, ...args) => {
   try {
-    const command = state$a.commands[id];
+    const command = state$9.commands[id];
     if (!command) {
       throw new Error(`command ${id} not found`);
     }
@@ -749,14 +749,14 @@ const {
   }]
 });
 
-const state$9 = {
+const state$8 = {
   configuration: Object.create(null)
 };
 const getConfiguration = key => {
-  return state$9.configuration[key] ?? '';
+  return state$8.configuration[key] ?? '';
 };
 const setConfigurations = preferences => {
-  state$9.configuration = preferences;
+  state$8.configuration = preferences;
 };
 
 const Two = '2.0';
@@ -804,20 +804,20 @@ const number = value => {
 const state$1$1 = {
   callbacks: Object.create(null)
 };
-const set$3 = (id, fn) => {
+const set$4 = (id, fn) => {
   state$1$1.callbacks[id] = fn;
 };
-const get$3 = id => {
+const get$4 = id => {
   return state$1$1.callbacks[id];
 };
 const remove = id => {
   delete state$1$1.callbacks[id];
 };
-const state$8 = {
+const state$7 = {
   id: 0
 };
 const create$3$1 = () => {
-  return ++state$8.id;
+  return ++state$7.id;
 };
 const warn = (...args) => {
   console.warn(...args);
@@ -841,7 +841,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = withResolvers$2();
-  set$3(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -849,7 +849,7 @@ const registerPromise = () => {
 };
 const resolve = (id, args) => {
   number(id);
-  const fn = get$3(id);
+  const fn = get$4(id);
   if (!fn) {
     console.log(args);
     warn(`callback ${id} may already be disposed`);
@@ -1159,13 +1159,13 @@ class CommandNotFoundError extends Error {
   }
 }
 
-const state$7 = {};
+const state$6 = {};
 const register$1 = commandMap => {
-  Object.assign(state$7, commandMap);
+  Object.assign(state$6, commandMap);
 };
 const execute = (method, ...params) => {
   // @ts-ignore
-  const fn = state$7[method];
+  const fn = state$6[method];
   // @ts-ignore
   if (!fn) {
     throw new CommandNotFoundError(method);
@@ -1191,41 +1191,41 @@ const handleIpc = ipc => {
   ipc.addEventListener('message', handleMessage);
 };
 
-const state$6 = {
+const state$5 = {
   /**
    * @type {any}
    */
   ipc: undefined
 };
-const get$2 = () => {
-  return state$6.ipc;
+const get$3 = () => {
+  return state$5.ipc;
 };
-const set$2 = ipc => {
-  state$6.ipc = ipc;
+const set$3 = ipc => {
+  state$5.ipc = ipc;
 };
 
 const send = (method, ...params) => {
-  const ipc = get$2();
+  const ipc = get$3();
   send$1(ipc, method, ...params);
 };
 const invoke = (method, ...params) => {
-  const ipc = get$2();
+  const ipc = get$3();
   return invoke$1(ipc, method, ...params);
 };
 const invokeAndTransfer = (method, ...params) => {
-  const ipc = get$2();
+  const ipc = get$3();
   return invokeAndTransfer$1(ipc, method, ...params);
 };
 const listen$2 = ipc => {
   handleIpc(ipc);
-  set$2(ipc);
+  set$3(ipc);
 };
 
-const state$5 = {
+const state$4 = {
   debugProviderMap: Object.create(null)
 };
 const getDebugProvider = id => {
-  const provider = state$5.debugProviderMap[id];
+  const provider = state$4.debugProviderMap[id];
   if (!provider) {
     // @ts-ignore
     throw new VError$1(`no debug provider "${id}" found`);
@@ -1236,7 +1236,7 @@ const registerDebugProvider = debugProvider => {
   if (!debugProvider.id) {
     throw new Error('Failed to register debug system provider: missing id');
   }
-  state$5.debugProviderMap[debugProvider.id] = debugProvider;
+  state$4.debugProviderMap[debugProvider.id] = debugProvider;
 };
 const start = async (protocol, path) => {
   try {
@@ -1391,26 +1391,31 @@ const exec = async (command, args, options) => {
   throw new DepecratedError(`vscode.exec is deprecated, use createNodeRpc instead`);
 };
 
-const state$4 = {
-  fileSystemProviderMap: Object.create(null)
-};
-const getFileSystemProvider = protocol => {
-  const provider = state$4.fileSystemProviderMap[protocol];
+const fileSystemProviderMap = Object.create(null);
+const get$2 = protocol => {
+  const provider = fileSystemProviderMap[protocol];
   if (!provider) {
     // @ts-ignore
     throw new VError$1(`no file system provider for protocol "${protocol}" found`);
   }
   return provider;
 };
+const set$2 = (id, provider) => {
+  if (!id) {
+    throw new Error('Failed to register file system provider: missing id');
+  }
+  fileSystemProviderMap[id] = provider;
+};
+
 const registerFileSystemProvider = fileSystemProvider => {
   if (!fileSystemProvider.id) {
     throw new Error('Failed to register file system provider: missing id');
   }
-  state$4.fileSystemProviderMap[fileSystemProvider.id] = fileSystemProvider;
+  set$2(fileSystemProvider.id, fileSystemProvider);
 };
 const readDirWithFileTypes = async (protocol, path) => {
   try {
-    const provider = getFileSystemProvider(protocol);
+    const provider = get$2(protocol);
     return await provider.readDirWithFileTypes(path);
   } catch (error) {
     throw new VError$1(error, 'Failed to execute file system provider');
@@ -1418,7 +1423,7 @@ const readDirWithFileTypes = async (protocol, path) => {
 };
 const readFile = async (protocol, path) => {
   try {
-    const provider = getFileSystemProvider(protocol);
+    const provider = get$2(protocol);
     return await provider.readFile(path);
   } catch (error) {
     throw new VError$1(error, 'Failed to execute file system provider');
@@ -1434,9 +1439,19 @@ const readFileExternal = async path => {
   const content = await invoke('FileSystem.readFile', path);
   return content;
 };
+const readDirWithFileTypesExternal = async path => {
+  // TODO when file is local,
+  // don't ask renderer worker
+  // instead read file directly from shared process
+  // this avoid parsing the potentially large message
+  // and improve performance by not blocking the renderer worker
+  // when reading / writing large files
+  const content = await invoke('FileSystem.readDirWithFileTypes', path);
+  return content;
+};
 const writeFile = async (protocol, uri, content) => {
   try {
-    const provider = getFileSystemProvider(protocol);
+    const provider = get$2(protocol);
     return await provider.writeFile(uri, content);
   } catch (error) {
     throw new VError$1(error, 'Failed to execute file system provider');
@@ -1444,95 +1459,13 @@ const writeFile = async (protocol, uri, content) => {
 };
 const getPathSeparator = protocol => {
   try {
-    const provider = getFileSystemProvider(protocol);
+    const provider = get$2(protocol);
     return provider.pathSeparator;
   } catch (error) {
     throw new VError$1(error, 'Failed to execute file system provider');
   }
 };
 
-const webViews = Object.create(null);
-const webViewProviders = Object.create(null);
-const getProvider = providerId => {
-  return webViewProviders[providerId];
-};
-const setProvider = (providerId, provider) => {
-  webViewProviders[providerId] = provider;
-};
-const getWebView = id => {
-  return webViews[id];
-};
-const setWebView = (id, webView) => {
-  webViews[id] = webView;
-};
-
-// TODO pass uuid to allow having multiple webviews open at the same time
-const createWebView = async (providerId, port, uri, uid, origin) => {
-  const provider = getProvider(providerId);
-  if (!provider) {
-    throw new Error(`webview provider ${providerId} not found`);
-  }
-
-  // TODO cancel promise when webview is disposed before sending message
-  // TODO handle case when webview doesn't send ready message
-  // TODO handle error
-  await new Promise(resolve => {
-    port.onmessage = resolve;
-  });
-
-  // TODO use ipc module
-  const handlePortMessage = async event => {
-    const {
-      data,
-      target
-    } = event;
-    const {
-      method,
-      params,
-      id
-    } = data;
-    if (provider && provider.commands && provider.commands[method]) {
-      const fn = provider.commands[method];
-      const result = await fn(...params);
-      if (id) {
-        target.postMessage({
-          jsonrpc: '2.0',
-          id,
-          result
-        });
-      }
-    }
-  };
-  port.onmessage = handlePortMessage;
-  const rpc = {
-    uri,
-    provider,
-    uid,
-    origin,
-    invoke(method, ...params) {
-      // TODO return promise with result
-      port.postMessage({
-        jsonrpc: '2.0',
-        method,
-        params
-      });
-    }
-  };
-  // TODO allow creating multiple webviews per provider
-  setWebView(providerId, rpc);
-};
-const load = async providerId => {
-  const rpc = getWebView(providerId);
-  await rpc.provider.create(rpc, rpc.uri);
-};
-const disposeWebView = id => {
-  // TODO race condition
-  // const webView=webViews[id]
-};
-const registerWebViewProvider = provider => {
-  setProvider(provider.id, provider);
-};
-
 const {
   registerFormattingProvider,
   executeFormattingProvider,
@@ -2080,32 +2013,6 @@ const {
   }
 });
 
-const createWorker = async ({
-  method,
-  url,
-  name
-}) => {
-  string(method);
-  string(url);
-  string(name);
-  const ipc = create$7({
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
-    url,
-    name
-  });
-  return ipc;
-};
-
-const state$1 = {
-  workspacePath: ''
-};
-const setWorkspacePath = path => {
-  state$1.workspacePath = path;
-};
-const getWorkspaceFolder = path => {
-  return state$1.workspacePath;
-};
-
 const RE_PROTOCOL = /^([a-z\-]+):\/\//;
 const getProtocol = uri => {
   const protocolMatch = uri.match(RE_PROTOCOL);
@@ -2168,6 +2075,21 @@ const createWebViewIpc = async webView => {
   return ipc;
 };
 
+const webViews = Object.create(null);
+const webViewProviders = Object.create(null);
+const getProvider = providerId => {
+  return webViewProviders[providerId];
+};
+const setProvider = (providerId, provider) => {
+  webViewProviders[providerId] = provider;
+};
+const getWebView = id => {
+  return webViews[id];
+};
+const setWebView = (id, webView) => {
+  webViews[id] = webView;
+};
+
 // TODO if webViewId is provided,
 // 1. read file as blob
 // 2. send blob to webview
@@ -2228,6 +2150,99 @@ const getRemoteUrl = async (uri, options = {}) => {
   throw new Error(`unsupported platform for remote url`);
 };
 
+// TODO pass uuid to allow having multiple webviews open at the same time
+const createWebView = async (providerId, port, uri, uid, origin) => {
+  const provider = getProvider(providerId);
+  if (!provider) {
+    throw new Error(`webview provider ${providerId} not found`);
+  }
+
+  // TODO cancel promise when webview is disposed before sending message
+  // TODO handle case when webview doesn't send ready message
+  // TODO handle error
+  await new Promise(resolve => {
+    port.onmessage = resolve;
+  });
+
+  // TODO use ipc module
+  const handlePortMessage = async event => {
+    const {
+      data,
+      target
+    } = event;
+    const {
+      method,
+      params,
+      id
+    } = data;
+    if (provider && provider.commands && provider.commands[method]) {
+      const fn = provider.commands[method];
+      const result = await fn(...params);
+      if (id) {
+        target.postMessage({
+          jsonrpc: '2.0',
+          id,
+          result
+        });
+      }
+    }
+  };
+  port.onmessage = handlePortMessage;
+  const rpc = {
+    uri,
+    provider,
+    uid,
+    origin,
+    invoke(method, ...params) {
+      // TODO return promise with result
+      port.postMessage({
+        jsonrpc: '2.0',
+        method,
+        params
+      });
+    }
+  };
+  // TODO allow creating multiple webviews per provider
+  setWebView(providerId, rpc);
+};
+const load = async providerId => {
+  const rpc = getWebView(providerId);
+  await rpc.provider.create(rpc, rpc.uri);
+};
+const disposeWebView = id => {
+  // TODO race condition
+  // const webView=webViews[id]
+};
+const registerWebViewProvider = provider => {
+  setProvider(provider.id, provider);
+};
+
+const createWorker = async ({
+  method,
+  url,
+  name
+}) => {
+  string(method);
+  string(url);
+  string(name);
+  const ipc = create$7({
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
+    url,
+    name
+  });
+  return ipc;
+};
+
+const state$1 = {
+  workspacePath: ''
+};
+const setWorkspacePath = path => {
+  state$1.workspacePath = path;
+};
+const getWorkspaceFolder = path => {
+  return state$1.workspacePath;
+};
+
 class FormattingError extends Error {
   constructor(message, codeFrame) {
     super(message);
@@ -2286,6 +2301,7 @@ const api = {
   // File System
   registerFileSystemProvider: registerFileSystemProvider,
   readFile: readFileExternal,
+  readDirWithFileTypes: readDirWithFileTypesExternal,
   // Formatting
   registerFormattingProvider: registerFormattingProvider,
   executeFormattingProvider: executeFormattingProvider,
@@ -2909,6 +2925,12 @@ const registerChangeListener = () => {
   // TODO
 };
 
+const handleBeforeUnload = () => {
+  // TODO save all webviews in localstorage
+  // cannot use indexeddb during unload
+  console.log('before unload');
+};
+
 const MessagePort$1 = 1;
 const ModuleWorker = 2;
 const ModuleWorkerWithMessagePort = 4;
@@ -3385,6 +3407,7 @@ const commandMap = {
   ['ExtensionHostWebView.create']: createWebView,
   ['ExtensionHostWebView.dispose']: disposeWebView,
   ['ExtensionHostWebView.load']: load,
+  ['HandleBeforeUnload.handleBeforeUnload']: handleBeforeUnload,
   ['HandleMessagePort.handleMessagePort']: handleMessagePort,
   [BraceCompletionExecuteBraceCompletionProvider]: executeBraceCompletionProvider,
   [ClosingTagExecuteClosingTagProvider]: executeClosingTagProvider,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "1.4.2",
+  "version": "1.6.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "main": "dist/extensionHostWorkerMain.js",
   "type": "module",