@lvce-editor/editor-worker 14.4.0 → 15.1.0

package/dist/editorWorkerMain.js

@@ -249,8 +249,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -273,14 +273,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -299,8 +299,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -310,8 +310,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -372,8 +372,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -393,8 +393,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -451,8 +451,8 @@ const removeListener = (emitter, type, callback) => {
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
@@ -464,8 +464,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = event => {
       cleanup({
-        type,
-        event
+        event,
+        type
       });
     };
     addListener(eventEmitter, event, listener);
@@ -475,8 +475,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
 };
 const Message$1 = 3;
 const create$5$2 = async ({
-  messagePort,
-  isMessagePortOpen
+  isMessagePortOpen,
+  messagePort
 }) => {
   if (!isMessagePort(messagePort)) {
     throw new IpcError('port must be of type MessagePort');
@@ -489,8 +489,8 @@ const create$5$2 = async ({
   });
   messagePort.start();
   const {
-    type,
-    event
+    event,
+    type
   } = await eventPromise;
   if (type !== Message$1) {
     throw new IpcError('Failed to wait for ipc message');
@@ -539,7 +539,7 @@ const create$4$2 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$c = (id, fn) => {
+const set$d = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$8 = id => {
@@ -558,7 +558,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$c(id, resolve);
+  set$d(id, resolve);
   return {
     id,
     promise
@@ -903,7 +903,7 @@ const send$1 = (transport, method, ...params) => {
   const message = create$4$2(method, params);
   transport.send(message);
 };
-const invoke$d = (ipc, method, ...params) => {
+const invoke$e = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer$3 = (ipc, method, ...params) => {
@@ -942,7 +942,7 @@ const createRpc = ipc => {
       send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$d(ipc, method, ...params);
+      return invoke$e(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer$3(ipc, method, ...params);
@@ -1140,6 +1140,7 @@ const CompletionWorker = 301;
 const DebugWorker = 55;
 const EditorWorker = 99;
 const ExtensionHostWorker = 44;
+const ExtensionManagementWorker = 9006;
 const MarkdownWorker = 300;
 const RendererWorker = 1;
 const TextMeasurementWorker = 7011;
@@ -1147,7 +1148,7 @@ const TextMeasurementWorker = 7011;
 const FocusEditorText$1 = 12;
 
 const rpcs = Object.create(null);
-const set$b = (id, rpc) => {
+const set$c = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$7 = id => {
@@ -1159,6 +1160,10 @@ const remove$8 = id => {
 
 const create$9 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$7(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$7(rpcId);
@@ -1172,38 +1177,34 @@ const create$9 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$b(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$7(rpcId);
-      await rpc.dispose();
+      set$c(rpcId, rpc);
     }
   };
 };
 
 const {
-  invoke: invoke$c,
+  dispose: dispose$2,
+  invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$2,
-  set: set$a,
-  dispose: dispose$2
+  set: set$b
 } = create$9(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
-  return invoke$c('ExtensionHostReference.executeReferenceProvider', id, offset);
+  return invoke$d('ExtensionHostReference.executeReferenceProvider', id, offset);
 };
 const executeFileReferenceProvider = async id => {
   // @ts-ignore
-  return invoke$c('ExtensionHostReference.executeFileReferenceProvider', id);
+  return invoke$d('ExtensionHostReference.executeFileReferenceProvider', id);
 };
 const getRuntimeStatus = async extensionId => {
   // @ts-ignore
-  return invoke$c('ExtensionHost.getRuntimeStatus', extensionId);
+  return invoke$d('ExtensionHost.getRuntimeStatus', extensionId);
 };
 const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
   });
-  set$a(mockRpc);
+  set$b(mockRpc);
   return mockRpc;
 };
 
@@ -1213,16 +1214,22 @@ const ExtensionHost = {
   executeFileReferenceProvider,
   executeReferenceProvider,
   getRuntimeStatus,
-  invoke: invoke$c,
+  invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$a
+  set: set$b
 };
 
+const {
+  invoke: invoke$c,
+  set: set$a
+} = create$9(ExtensionManagementWorker);
+
 const {
   invoke: invoke$b,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$9} = create$9(RendererWorker);
+  set: set$9
+} = create$9(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1236,12 +1243,16 @@ const sendMessagePortToTextMeasurementWorker = async port => {
   // @ts-ignore
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
+const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
+  const command = 'Extensions.handleMessagePort';
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
+};
 
 const {
+  dispose: dispose$1,
   invoke: invoke$a,
   invokeAndTransfer,
-  set: set$8,
-  dispose: dispose$1
+  set: set$8
 } = create$9(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
@@ -1257,7 +1268,7 @@ const createLazyRpc = rpcId => {
   let factory;
   const createRpc = async () => {
     const rpc = await factory();
-    set$b(rpcId, rpc);
+    set$c(rpcId, rpc);
   };
   const ensureRpc = async () => {
     if (!rpcPromise) {
@@ -1266,20 +1277,28 @@ const createLazyRpc = rpcId => {
     await rpcPromise;
   };
   return {
-    setFactory(value) {
-      factory = value;
-    },
     async invoke(method, ...params) {
       await ensureRpc();
       const rpc = get$7(rpcId);
       return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      await ensureRpc();
+      const rpc = get$7(rpcId);
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    setFactory(value) {
+      factory = value;
     }
   };
 };
 
 // TODO add tests for this
-const activateByEvent = async event => {
-  await invoke$b('ExtensionHostManagement.activateByEvent', event);
+const activateByEvent = async (event, assetDir, platform) => {
+  string(event);
+  string(assetDir);
+  number(platform);
+  await invoke$b('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
 };
 
 const codeGeneratorAccept = state => {
@@ -3111,9 +3130,10 @@ const getLanguageId$1 = (uri, languages) => {
   return 'unknown';
 };
 
-const getLanguages = async () => {
-  // @ts-ignore
-  const languages = await invoke$6('Languages.getLanguages');
+const getLanguages = async (platform, assetDir) => {
+  number(platform);
+  string(assetDir);
+  const languages = await invoke$c('Extensions.getLanguages', platform, assetDir);
   return languages;
 };
 
@@ -3132,25 +3152,34 @@ const OnTabCompletion = 'onTabCompletion';
 
 const execute = async ({
   args,
+  assetDir,
   editor,
   event,
   method,
   noProviderFoundMessage,
-  noProviderFoundResult = undefined
+  noProviderFoundResult = undefined,
+  platform
 }) => {
   const fullEvent = `${event}:${editor.languageId}`;
-  await activateByEvent(fullEvent);
+  await activateByEvent(fullEvent, assetDir, platform);
   const result = await invoke$6(method, editor.uid, ...args);
   return result;
 };
 
 const executeDiagnosticProvider = editor => {
+  const {
+    assetDir,
+    platform
+  } = editor;
   return execute({
     args: [],
+    assetDir,
     editor,
     event: OnDiagnostic,
     method: 'ExtensionHost.executeDiagnosticProvider',
-    noProviderFoundMessage: 'no diagnostic provider found'});
+    noProviderFoundMessage: 'no diagnostic provider found',
+    platform
+  });
 };
 
 const getDiagnosticType = diagnostic => {
@@ -3235,6 +3264,7 @@ const updateDiagnostics = async newState => {
 };
 
 const createEditor = async ({
+  assetDir,
   columnToReveal,
   completionTriggerCharacters,
   content,
@@ -3256,6 +3286,7 @@ const createEditor = async ({
   lineNumbers,
   lineToReveal,
   links,
+  platform,
   rowHeight,
   savedDeltaY,
   savedSelections,
@@ -3269,9 +3300,10 @@ const createEditor = async ({
   string(content);
   // TODO support overwriting language id by setting it explicitly or via settings
   const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
-  const languages = await getLanguages();
+  const languages = await getLanguages(platform, assetDir);
   const computedlanguageId = getLanguageId$1(uri, languages);
   const editor = {
+    assetDir,
     charWidth,
     columnWidth: 0,
     completionState: '',
@@ -3313,6 +3345,7 @@ const createEditor = async ({
     minLineY: 0,
     numberOfVisiblelines: 0,
     numberOfVisibleLines: 0,
+    platform,
     primarySelectionIndex: 0,
     rowHeight,
     savedSelections,
@@ -6268,7 +6301,7 @@ const launch = async () => {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$b(rpcId, rpc);
+  set$c(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
   const rpc = get$7(rpcId);
@@ -7584,12 +7617,16 @@ const tabCompletion = async editor => {
 };
 
 const getBlockComment = async (editor, offset) => {
+  const {
+    assetDir,
+    platform
+  } = editor;
   // TODO ask extension host worker,
   // execute block comment provider with
   // uri, language id, offset
   // and the extension returns a matching block comment or undefined
   try {
-    await activateByEvent(`onLanguage:${editor.languageId}`);
+    await activateByEvent(`onLanguage:${editor.languageId}`, assetDir, platform);
     // @ts-ignore
     const blockComment = await invoke$6(`ExtensionHostCommment.execute`, editor.uid, offset);
     if (blockComment) {
@@ -9759,7 +9796,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId) {
-    set$b(rpcId, rpc);
+    set$c(rpcId, rpc);
   }
 };
 
@@ -9891,6 +9928,29 @@ const initializeExtensionHost = async () => {
   set$1(extensionHostRpc);
 };
 
+const createExtensionManagementWorkerRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      async send(port) {
+        await sendMessagePortToExtensionManagementWorker(port, EditorWorker);
+      }
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension management worker rpc`);
+  }
+};
+
+const initializeExtensionManagementWorker = async () => {
+  try {
+    const rpc = await createExtensionManagementWorkerRpc();
+    set$a(rpc);
+  } catch {
+    // ignore
+  }
+};
+
 const sendMessagePortToSyntaxHighlightingWorker = async port => {
   try {
     await invokeAndTransfer$1(
@@ -9936,7 +9996,7 @@ const launchCompletionWorker = async () => {
 
 const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   setFactory(launchCompletionWorker);
-  await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost()]);
+  await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost(), initializeExtensionManagementWorker()]);
 };
 
 // TODO move cursor

package/package.json

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