@lvce-editor/editor-worker 2.5.0 → 2.6.0

package/dist/editorWorkerMain.js

@@ -1256,7 +1256,6 @@ const getErrorConstructor = (message, type) => {
   if (type) {
     switch (type) {
       case DomException:
-        // @ts-ignore
         return DOMException;
       case TypeError$1:
         return TypeError;
@@ -1281,7 +1280,6 @@ const getErrorConstructor = (message, type) => {
 };
 const constructError = (message, type, name) => {
   const ErrorConstructor = getErrorConstructor(message, type);
-  // @ts-ignore
   if (ErrorConstructor === DOMException && name) {
     return new ErrorConstructor(message, name);
   }
@@ -1297,6 +1295,13 @@ const constructError = (message, type, name) => {
 const getNewLineIndex$2 = (string, startIndex = undefined) => {
   return string.indexOf(NewLine$3, startIndex);
 };
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine$3 + parentStack;
+  }
+  return parentStack;
+};
 const joinLines$1 = lines => {
   return lines.join(NewLine$3);
 };
@@ -1305,18 +1310,11 @@ const Custom = -32001;
 const splitLines$1 = lines => {
   return lines.split(NewLine$3);
 };
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$3 + parentStack;
-  }
-  return parentStack;
-};
 const restoreJsonRpcError = error => {
   if (error && error instanceof Error) {
     return error;
   }
-  const currentStack = joinLines$1(splitLines$1(new Error().stack).slice(1));
+  const currentStack = joinLines$1(splitLines$1(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -1345,7 +1343,6 @@ const restoreJsonRpcError = error => {
       }
     } else {
       if (error.stack) {
-        // TODO accessing stack might be slow
         const lowerStack = restoredError.stack || '';
         // @ts-ignore
         const indexNewLine = getNewLineIndex$2(lowerStack);
@@ -1375,6 +1372,67 @@ 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,
@@ -1427,7 +1485,42 @@ const getResponse = async (message, ipc, execute, preparePrettyError, logError,
     return getErrorResponse(message, error, preparePrettyError, logError);
   }
 };
-const handleJsonRpcMessage = async (ipc, message, execute, resolve, preparePrettyError, logError, requiresSocket) => {
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+const handleJsonRpcMessage = async (...args) => {
+  let message;
+  let ipc;
+  let execute;
+  let preparePrettyError;
+  let logError;
+  let resolve;
+  let requiresSocket;
+  if (args.length === 1) {
+    const arg = args[0];
+    message = arg.message;
+    ipc = arg.ipc;
+    execute = arg.execute;
+    preparePrettyError = arg.preparePrettyError || defaultPreparePrettyError;
+    logError = arg.logError || defaultLogError;
+    requiresSocket = arg.requiresSocket || defaultRequiresSocket;
+    resolve = arg.resolve || defaultResolve;
+  } else {
+    ipc = args[0];
+    message = args[1];
+    execute = args[2];
+    resolve = args[3];
+    preparePrettyError = args[4];
+    logError = args[5];
+    requiresSocket = args[6];
+  }
   if ('id' in message) {
     if ('method' in message) {
       const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
@@ -1458,12 +1551,21 @@ const invoke$5 = async (ipc, method, ...params) => {
   const result = unwrapJsonRpcResult(responseMessage);
   return result;
 };
+
+// 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, handle);
+  ipc.sendAndTransfer(message, transfer);
   const responseMessage = await promise;
   const result = unwrapJsonRpcResult(responseMessage);
   return result;
@@ -1567,9 +1669,9 @@ const invoke$4 = (method, ...params) => {
   const ipc = get$4();
   return invoke$5(ipc, method, ...params);
 };
-const invokeAndTransfer$1 = async (transfer, method, ...params) => {
+const invokeAndTransfer$1 = async (method, ...params) => {
   const ipc = get$4();
-  return invokeAndTransfer$2(ipc, transfer, method, ...params);
+  return invokeAndTransfer$2(ipc, method, ...params);
 };
 const listen$8 = ipc => {
   set$4(ipc);
@@ -1578,12 +1680,12 @@ const listen$8 = ipc => {
 const invoke$3 = async (method, ...params) => {
   return invoke$4(method, ...params);
 };
-const invokeAndTransfer = async (transfer, method, ...params) => {
-  return invokeAndTransfer$1(transfer, method, ...params);
+const invokeAndTransfer = async (method, ...params) => {
+  return invokeAndTransfer$1(method, ...params);
 };
 
 const sendMessagePortToExtensionHostWorker = async port => {
-  await invokeAndTransfer([port], 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, 'HandleMessagePort.handleMessagePort');
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, 'HandleMessagePort.handleMessagePort');
 };
 
 const withResolvers$1 = () => {
@@ -1664,7 +1766,7 @@ const IpcParentWithExtensionHostWorker = {
 };
 
 const sendMessagePortToSyntaxHighlightingWorker = async port => {
-  await invokeAndTransfer([port], 'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
+  await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
 };
 
 const create$3 = async () => {
@@ -1717,7 +1819,7 @@ const IpcParentWithSyntaxHighlightingWorker = {
 };
 
 const sendMessagePortToRendererProcess = async port => {
-  await invokeAndTransfer([port], 'SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
+  await invokeAndTransfer('SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
 };
 
 const create$2 = async () => {
@@ -2364,19 +2466,14 @@ const closeCompletion = editor => {
   };
 };
 
-// @ts-ignore
 const state$6 = {
   isComposing: false,
   compositionText: ''
 };
-
-// @ts-ignore
 const compositionStart = (editor, event) => {
   state$6.isComposing = true;
   return editor;
 };
-
-// @ts-ignore
 const getCompositionChanges = (selections, data) => {
   const changes = [];
   for (let i = 0; i < selections.length; i += 4) {
@@ -2401,16 +2498,12 @@ const getCompositionChanges = (selections, data) => {
   }
   return changes;
 };
-
-// @ts-ignore
 const compositionUpdate = (editor, data) => {
   const selections = editor.selections;
   const changes = getCompositionChanges(selections, data);
   state$6.compositionText = data;
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
-
-// @ts-ignore
 const compositionEnd = (editor, data) => {
   const selections = editor.selections;
   const changes = getCompositionChanges(selections, data);
@@ -8782,14 +8875,14 @@ const commandMap = {
 };
 wrapCommands(commandMap);
 
-const MessagePort = 1;
+const MessagePort$1 = 1;
 const ModuleWorker = 2;
 const ReferencePort = 3;
 const ModuleWorkerAndMessagePort = 8;
 const Auto = () => {
   // @ts-ignore
   if (globalThis.acceptPort) {
-    return MessagePort;
+    return MessagePort$1;
   }
   // @ts-ignore
   if (globalThis.acceptReferencePort) {
@@ -9177,7 +9270,7 @@ const getModule = method => {
       return IpcChildWithModuleWorker$1;
     case ModuleWorkerAndMessagePort:
       return IpcChildWithModuleWorkerAndMessagePort$1;
-    case MessagePort:
+    case MessagePort$1:
       return IpcChildWithMessagePort$1;
     default:
       throw new Error('unexpected ipc type');

package/package.json

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