@lvce-editor/editor-worker 2.6.0 → 3.0.0

package/dist/editorWorkerMain.js

@@ -1372,67 +1372,6 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
-const isMessagePort = value => {
-  return typeof MessagePort !== 'undefined' && value instanceof MessagePort;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isMessagePortMain = value => {
-  return isInstanceOf(value, 'MessagePortMain');
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
-};
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
-  }
-  return false;
-};
-const walkValue = (value, transferrables) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables);
-    }
-  }
-};
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue(value, transferrables);
-  return transferrables;
-};
-const isSingleTransferrable = value => {
-  return isSocket(value);
-};
-const getTransferrableParams = value => {
-  const transferrables = getTransferrables(value);
-  if (transferrables.length === 0) {
-    return undefined;
-  }
-  if (isSingleTransferrable(transferrables[0])) {
-    return transferrables[0];
-  }
-  return transferrables;
-};
 const create$1$1 = (message, error) => {
   return {
     jsonrpc: Two,
@@ -1555,17 +1494,15 @@ const invoke$5 = async (ipc, method, ...params) => {
 // TODO deprecated old typings,
 // always use automatic transferrable detection
 const invokeAndTransfer$2 = async (ipc, handle, method, ...params) => {
-  let transfer = handle;
   if (typeof handle === 'string') {
     params = [method, ...params];
     method = handle;
-    transfer = getTransferrableParams(params);
   }
   const {
     message,
     promise
   } = create$2$1(method, params);
-  ipc.sendAndTransfer(message, transfer);
+  ipc.sendAndTransfer(message);
   const responseMessage = await promise;
   const result = unwrapJsonRpcResult(responseMessage);
   return result;
@@ -3417,7 +3354,7 @@ const goTo = async ({
       endRowIndex: definition.endRowIndex,
       endColumnIndex: definition.endColumnIndex
     };
-    await invoke$3( /* Main.openUri */'Main.openUri', /* uri */uri, /* focus */true, context);
+    await invoke$3(/* Main.openUri */'Main.openUri', /* uri */uri, /* focus */true, context);
     return editor;
   } catch (error) {
     // TODO if editor is already disposed at this point, do nothing
@@ -3542,7 +3479,7 @@ const goToTypeDefinition = (editor, explicit = true) => {
 const Editor = 3;
 
 const handleContextMenu = async (editor, button, x, y) => {
-  await invoke$3( /* ContextMenu.show */'ContextMenu.show', /* x */x, /* y */y, /* id */Editor);
+  await invoke$3(/* ContextMenu.show */'ContextMenu.show', /* x */x, /* y */y, /* id */Editor);
   return editor;
 };
 
@@ -6412,7 +6349,7 @@ const toggleComment = async editor => {
   } catch (error$1) {
     error(error$1);
     // TODO use correct position
-    await editorShowMessage( /* editor */editor, /* rowIndex */0, /* columnIndex */0, /* message */`${error$1}`, /* isError */true);
+    await editorShowMessage(/* editor */editor, /* rowIndex */0, /* columnIndex */0, /* message */`${error$1}`, /* isError */true);
     return editor;
   }
 };
@@ -8894,6 +8831,56 @@ const Auto = () => {
 const getData$1 = event => {
   return event.data;
 };
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
+};
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
+};
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
+};
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
+};
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
+};
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
+    }
+  }
+  return false;
+};
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
+};
 const attachEvents = that => {
   const handleMessage = (...args) => {
     const data = that.getData(...args);
@@ -8915,14 +8902,14 @@ class Ipc extends EventTarget {
   }
 }
 const readyMessage = 'ready';
-const listen$3 = () => {
+const listen$4 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$2 = global => {
+const signal$3 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -8933,7 +8920,8 @@ class IpcChildWithModuleWorker extends Ipc {
     // @ts-ignore
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, transfer) {
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
     // @ts-ignore
     this._rawIpc.postMessage(message, transfer);
   }
@@ -8947,14 +8935,14 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$5 = global => {
+const wrap$6 = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const IpcChildWithModuleWorker$1 = {
   __proto__: null,
-  listen: listen$3,
-  signal: signal$2,
-  wrap: wrap$5
+  listen: listen$4,
+  signal: signal$3,
+  wrap: wrap$6
 };
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
 const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
@@ -8966,6 +8954,18 @@ const joinLines = lines => {
 const splitLines = lines => {
   return lines.split(NewLine$1);
 };
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
+};
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
+  return {
+    message,
+    code: ERR_MODULE_NOT_FOUND
+  };
+};
 const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
 const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
@@ -9014,18 +9014,6 @@ const isModuleNotFoundError = stderr => {
   }
   return stderr.includes('ERR_MODULE_NOT_FOUND');
 };
-const isModuleNotFoundMessage = line => {
-  return line.includes('ERR_MODULE_NOT_FOUND');
-};
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
-  return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
-  };
-};
 const isNormalStackLine = line => {
   return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
@@ -9172,16 +9160,21 @@ const waitForFirstMessage = async port => {
   // @ts-ignore
   return event.data;
 };
-const listen$2 = async () => {
-  const parentIpcRaw = listen$3();
-  signal$2(parentIpcRaw);
-  const parentIpc = wrap$5(parentIpcRaw);
+const listen$3 = async () => {
+  const parentIpcRaw = listen$4();
+  signal$3(parentIpcRaw);
+  const parentIpc = wrap$6(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
   }
   const type = firstMessage.params[0];
   if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
     parentIpc.dispose();
     const port = firstMessage.params[1];
     return port;
@@ -9198,7 +9191,8 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
   send(message) {
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, transfer) {
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
@@ -9214,15 +9208,15 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$4 = port => {
+const wrap$5 = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$2,
-  wrap: wrap$4
+  listen: listen$3,
+  wrap: wrap$5
 };
-const listen$4 = ({
+const listen$2 = ({
   port
 }) => {
   return port;
@@ -9240,7 +9234,8 @@ class IpcChildWithMessagePort extends Ipc {
   send(message) {
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, transfer) {
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
@@ -9259,7 +9254,7 @@ const wrap$2 = port => {
 };
 const IpcChildWithMessagePort$1 = {
   __proto__: null,
-  listen: listen$4,
+  listen: listen$2,
   signal,
   wrap: wrap$2
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "2.6.0",
+  "version": "3.0.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",