@lvce-editor/editor-worker 15.1.0 → 15.2.0

package/dist/editorWorkerMain.js

@@ -474,7 +474,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$2 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -525,61 +525,19 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$2,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4$2 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$d = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$8 = id => {
   return callbacks[id];
 };
 const remove$9 = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$2 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$2();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$d(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -773,9 +731,9 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (id, error) => {
+const create$1$2 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -784,22 +742,22 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+  return create$1$2(id, errorProperty);
 };
-const create$b = (message, result) => {
+const create$a = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$b(message, resultProperty);
+  return create$a(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -886,29 +844,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send$1 = (transport, method, ...params) => {
-  const message = create$4$2(method, params);
-  transport.send(message);
-};
-const invoke$e = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$3 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -931,24 +866,87 @@ const execute$1 = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$s = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$r = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$q = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$q();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$r(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send$1(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$e(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$3(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -965,7 +963,7 @@ const logError$1 = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute$1;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError$1, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError$1, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -983,35 +981,63 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$e = async ({
+
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+const create$i = async ({
   commandMap,
-  messagePort,
-  isMessagePortOpen
+  isMessagePortOpen,
+  send
 }) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen
+  return createSharedLazyRpc(() => {
+    return create$2$1({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
   });
-  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  return rpc;
 };
-const MessagePortRpcParent = {
+const LazyTransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$e
+  create: create$i
 };
-const create$5$1 = async ({
+const create$4$1 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -1019,21 +1045,22 @@ const create$5$1 = async ({
   messagePort.start();
   return rpc;
 };
-const create$4$1 = async ({
+const create$3$1 = async ({
   commandMap,
   messagePort
 }) => {
-  return create$5$1({
+  return create$4$1({
     commandMap,
     messagePort
   });
 };
 const PlainMessagePortRpcParent = {
   __proto__: null,
-  create: create$4$1
+  create: create$3$1
 };
-const create$3$1 = async ({
+const create$2$1 = async ({
   commandMap,
+  isMessagePortOpen,
   send
 }) => {
   const {
@@ -1041,16 +1068,17 @@ const create$3$1 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5$1({
+  return create$4$1({
     commandMap,
+    isMessagePortOpen,
     messagePort: port2
   });
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$3$1
+  create: create$2$1
 };
-const create$a = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1062,7 +1090,7 @@ const create$a = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$a
+  create: create$1$1
 };
 const createMockRpc = ({
   commandMap
@@ -1077,9 +1105,9 @@ const createMockRpc = ({
     return command(...params);
   };
   const mockRpc = {
+    invocations,
     invoke,
-    invokeAndTransfer: invoke,
-    invocations
+    invokeAndTransfer: invoke
   };
   return mockRpc;
 };
@@ -1141,14 +1169,15 @@ const DebugWorker = 55;
 const EditorWorker = 99;
 const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
+const IconThemeWorker = 7009;
 const MarkdownWorker = 300;
-const RendererWorker = 1;
+const RendererWorker$1 = 1;
 const TextMeasurementWorker = 7011;
 
 const FocusEditorText$1 = 12;
 
 const rpcs = Object.create(null);
-const set$c = (id, rpc) => {
+const set$d = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$7 = id => {
@@ -1158,6 +1187,7 @@ const remove$8 = id => {
   delete rpcs[id];
 };
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$9 = rpcId => {
   return {
     async dispose() {
@@ -1176,8 +1206,20 @@ const create$9 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$d(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove$8(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
-      set$c(rpcId, rpc);
+      set$d(rpcId, rpc);
     }
   };
 };
@@ -1186,7 +1228,8 @@ const {
   dispose: dispose$2,
   invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$2,
-  set: set$b
+  registerMockRpc,
+  set: set$c
 } = create$9(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
@@ -1200,12 +1243,9 @@ const getRuntimeStatus = async extensionId => {
   // @ts-ignore
   return invoke$d('ExtensionHost.getRuntimeStatus', extensionId);
 };
-const registerMockRpc = commandMap => {
-  const mockRpc = createMockRpc({
-    commandMap
-  });
-  set$b(mockRpc);
-  return mockRpc;
+const getEnabledOutputProviderIds = async () => {
+  const channels = await invoke$d('Output.getEnabledProviders');
+  return channels;
 };
 
 const ExtensionHost = {
@@ -1213,23 +1253,24 @@ const ExtensionHost = {
   dispose: dispose$2,
   executeFileReferenceProvider,
   executeReferenceProvider,
+  getEnabledOutputProviderIds,
   getRuntimeStatus,
   invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$b
+  set: set$c
 };
 
 const {
   invoke: invoke$c,
-  set: set$a
+  set: set$b
 } = create$9(ExtensionManagementWorker);
 
 const {
   invoke: invoke$b,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$9
-} = create$9(RendererWorker);
+  set: set$a
+} = create$9(RendererWorker$1);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1248,6 +1289,10 @@ const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 
+const {
+  set: set$9
+} = create$9(IconThemeWorker);
+
 const {
   dispose: dispose$1,
   invoke: invoke$a,
@@ -1268,7 +1313,7 @@ const createLazyRpc = rpcId => {
   let factory;
   const createRpc = async () => {
     const rpc = await factory();
-    set$c(rpcId, rpc);
+    set$d(rpcId, rpc);
   };
   const ensureRpc = async () => {
     if (!rpcPromise) {
@@ -1296,8 +1341,8 @@ const createLazyRpc = rpcId => {
 // TODO add tests for this
 const activateByEvent = async (event, assetDir, platform) => {
   string(event);
-  string(assetDir);
-  number(platform);
+  // Assert.string(assetDir)
+  // Assert.number(platform)
   await invoke$b('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
 };
 
@@ -1306,39 +1351,22 @@ const codeGeneratorAccept = state => {
   return state;
 };
 
-const getPortTuple = () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  return {
-    port1,
-    port2
-  };
-};
-
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
 const launchWorker = async (name, url, intializeCommand) => {
-  // TODO use transferMessagePortRpc
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  // @ts-ignore
-  await invokeAndTransfer$1('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    name: name,
-    port: port1,
-    raw: true,
-    url
-  });
-  const rpc = await MessagePortRpcParent.create({
+  const rpc = await TransferMessagePortRpcParent.create({
     commandMap: {},
     isMessagePortOpen: true,
-    messagePort: port2
+    async send(port) {
+      await invokeAndTransfer$1('IpcParent.create', {
+        method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+        name,
+        port,
+        raw: true,
+        url
+      });
+    }
   });
-  port2.start();
   if (intializeCommand) {
     await rpc.invoke(intializeCommand);
   }
@@ -5280,7 +5308,7 @@ const handleContextMenu = async (editor, button, x, y) => {
   const {
     uid
   } = editor;
-  await showContextMenu2(uid, Editor, /* x */x, /* y */y, {
+  await showContextMenu2(uid, Editor, x, y, {
     menuId: Editor
   });
   return editor;
@@ -6301,7 +6329,7 @@ const launch = async () => {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$c(rpcId, rpc);
+  set$d(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
   const rpc = get$7(rpcId);
@@ -9796,7 +9824,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId) {
-    set$c(rpcId, rpc);
+    set$d(rpcId, rpc);
   }
 };
 
@@ -9945,7 +9973,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$a(rpc);
+    set$b(rpc);
   } catch {
     // ignore
   }
@@ -9986,6 +10014,22 @@ const initializeSyntaxHighlighting = async (syntaxHighlightingEnabled, syncIncre
   }
 };
 
+const send$1 = port => {
+  // @ts-ignore
+  return RendererWorker.sendMessagePortToTextMeasurementWorker(port);
+};
+const initializeTextMeasurementWorker = async () => {
+  try {
+    const rpc = await LazyTransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: send$1
+    });
+    set$9(rpc);
+  } catch {
+    // ignore
+  }
+};
+
 const launchCompletionWorker = async () => {
   const name = 'Completion Worker';
   const url = 'completionWorkerMain.js';
@@ -9996,7 +10040,7 @@ const launchCompletionWorker = async () => {
 
 const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   setFactory(launchCompletionWorker);
-  await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost(), initializeExtensionManagementWorker()]);
+  await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker()]);
 };
 
 // TODO move cursor
@@ -10465,7 +10509,7 @@ const updateDebugInfo = async debugId => {
   await invoke$b('Editor.rerender', key);
 };
 
-const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.hotReload', 'Editor.getSelections2', 'Editor.getDiagnostics', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Editor.getMenuIds', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
+const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.hotReload', 'Editor.getSelections2', 'Editor.getDiagnostics', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Editor.getMenuIds', 'Editor.getMenuEntries', 'Editor.getMenuEntries2', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
@@ -10787,7 +10831,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$9(rpc);
+  set$a(rpc);
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "15.1.0",
+  "version": "15.2.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"