@lvce-editor/editor-worker 6.0.0 → 6.1.0

package/dist/editorWorkerMain.js

@@ -13,6 +13,389 @@ const execute$1 = (command, ...args) => {
   return fn(...args);
 };
 
+const state$9 = {
+  /**
+   * @type {any}
+   */
+  ipc: undefined
+};
+const get$7 = () => {
+  return state$9.ipc;
+};
+const set$7 = ipc => {
+  state$9.ipc = ipc;
+};
+
+const Two = '2.0';
+const create$4$1 = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const callbacks = Object.create(null);
+const set$6 = (id, fn) => {
+  callbacks[id] = fn;
+};
+const get$6 = id => {
+  return callbacks[id];
+};
+const remove$8 = id => {
+  delete callbacks[id];
+};
+let id = 0;
+const create$3$1 = () => {
+  return ++id;
+};
+const registerPromise = () => {
+  const id = create$3$1();
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  set$6(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);
+    this.name = 'JsonRpcError';
+  }
+}
+const NewLine$3 = '\n';
+const DomException = 'DOMException';
+const ReferenceError$1 = 'ReferenceError';
+const SyntaxError$1 = 'SyntaxError';
+const TypeError$1 = 'TypeError';
+const getErrorConstructor = (message, type) => {
+  if (type) {
+    switch (type) {
+      case DomException:
+        return DOMException;
+      case TypeError$1:
+        return TypeError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case ReferenceError$1:
+        return ReferenceError;
+      default:
+        return Error;
+    }
+  }
+  if (message.startsWith('TypeError: ')) {
+    return TypeError;
+  }
+  if (message.startsWith('SyntaxError: ')) {
+    return SyntaxError;
+  }
+  if (message.startsWith('ReferenceError: ')) {
+    return ReferenceError;
+  }
+  return Error;
+};
+const constructError = (message, type, name) => {
+  const ErrorConstructor = getErrorConstructor(message, type);
+  if (ErrorConstructor === DOMException && name) {
+    return new ErrorConstructor(message, name);
+  }
+  if (ErrorConstructor === Error) {
+    const error = new Error(message);
+    if (name && name !== 'VError') {
+      error.name = name;
+    }
+    return error;
+  }
+  return new ErrorConstructor(message);
+};
+const getNewLineIndex$1 = (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$2 = lines => {
+  return lines.join(NewLine$3);
+};
+const MethodNotFound = -32601;
+const Custom = -32001;
+const splitLines$2 = lines => {
+  return lines.split(NewLine$3);
+};
+const restoreJsonRpcError = error => {
+  if (error && error instanceof Error) {
+    return error;
+  }
+  const currentStack = joinLines$2(splitLines$2(new Error().stack || '').slice(1));
+  if (error && error.code && error.code === MethodNotFound) {
+    const restoredError = new JsonRpcError(error.message);
+    const parentStack = getParentStack(error);
+    restoredError.stack = parentStack + NewLine$3 + currentStack;
+    return restoredError;
+  }
+  if (error && error.message) {
+    const restoredError = constructError(error.message, error.type, error.name);
+    if (error.data) {
+      if (error.data.stack && error.data.type && error.message) {
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine$3 + error.data.stack + NewLine$3 + currentStack;
+      } else if (error.data.stack) {
+        restoredError.stack = error.data.stack;
+      }
+      if (error.data.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.data.codeFrame;
+      }
+      if (error.data.code) {
+        // @ts-ignore
+        restoredError.code = error.data.code;
+      }
+      if (error.data.type) {
+        // @ts-ignore
+        restoredError.name = error.data.type;
+      }
+    } else {
+      if (error.stack) {
+        const lowerStack = restoredError.stack || '';
+        // @ts-ignore
+        const indexNewLine = getNewLineIndex$1(lowerStack);
+        const parentStack = getParentStack(error);
+        // @ts-ignore
+        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+      }
+      if (error.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.codeFrame;
+      }
+    }
+    return restoredError;
+  }
+  if (typeof error === 'string') {
+    return new Error(`JsonRpc Error: ${error}`);
+  }
+  return new Error(`JsonRpc Error: ${error}`);
+};
+const unwrapJsonRpcResult = responseMessage => {
+  if ('error' in responseMessage) {
+    const restoredError = restoreJsonRpcError(responseMessage.error);
+    throw restoredError;
+  }
+  if ('result' in responseMessage) {
+    return responseMessage.result;
+  }
+  throw new JsonRpcError('unexpected response message');
+};
+const warn$1 = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get$6(id);
+  if (!fn) {
+    console.log(response);
+    warn$1(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove$8(id);
+};
+const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const getErrorType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
+  }
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
+  }
+  return undefined;
+};
+const getErrorProperty = (error, prettyError) => {
+  if (error && error.code === E_COMMAND_NOT_FOUND) {
+    return {
+      code: MethodNotFound,
+      message: error.message,
+      data: error.stack
+    };
+  }
+  return {
+    code: Custom,
+    message: prettyError.message,
+    data: {
+      stack: prettyError.stack,
+      codeFrame: prettyError.codeFrame,
+      type: getErrorType(prettyError),
+      code: prettyError.code,
+      name: prettyError.name
+    }
+  };
+};
+const create$1$1 = (message, error) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    error
+  };
+};
+const getErrorResponse = (message, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1$1(message, errorProperty);
+};
+const create$e = (message, result) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    result: result ?? null
+  };
+};
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$e(message, resultProperty);
+};
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    return getErrorResponse(message, error, preparePrettyError, logError);
+  }
+};
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
+  if (args.length === 1) {
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
+    };
+  }
+  return {
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
+  };
+};
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
+  const {
+    message,
+    ipc,
+    execute,
+    resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
+    }
+    resolve(message.id, message);
+    return;
+  }
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
+  }
+  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 = (transport, method, ...params) => {
+  const message = create$4$1(method, params);
+  transport.send(message);
+};
+const invoke$6 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, false);
+};
+const invokeAndTransfer$2 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, true);
+};
+
+const invoke$5 = async (method, ...params) => {
+  const ipc = get$7();
+  return invoke$6(ipc, method, ...params);
+};
+const invokeAndTransfer$1 = async (method, ...params) => {
+  const ipc = get$7();
+  return invokeAndTransfer$2(ipc, method, ...params);
+};
+const listen$5 = ipc => {
+  set$7(ipc);
+};
+
+const invoke$4 = async (method, ...params) => {
+  return invoke$5(method, ...params);
+};
+const invokeAndTransfer = async (method, ...params) => {
+  return invokeAndTransfer$1(method, ...params);
+};
+
+// TODO add tests for this
+const activateByEvent = async event => {
+  await invoke$4('ExtensionHostManagement.activateByEvent', event);
+};
+
 const codeGeneratorAccept = state => {
   // TODO close code generator widget
   return state;
@@ -34,16 +417,16 @@ const getCombinedMessage = (error, message) => {
   }
   return stringifiedError;
 };
-const NewLine$3 = '\n';
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$3, startIndex);
+const NewLine$2 = '\n';
+const getNewLineIndex = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
 };
 const mergeStacks = (parent, child) => {
   if (!child) {
     return parent;
   }
-  const parentNewLineIndex = getNewLineIndex$1(parent);
-  const childNewLineIndex = getNewLineIndex$1(child);
+  const parentNewLineIndex = getNewLineIndex(parent);
+  const childNewLineIndex = getNewLineIndex(child);
   if (childNewLineIndex === -1) {
     return parent;
   }
@@ -206,9 +589,9 @@ class Ipc extends EventTarget {
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
 const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
 const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$2 = '\n';
-const joinLines$2 = lines => {
-  return lines.join(NewLine$2);
+const NewLine$1 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
 };
 const RE_AT = /^\s+at/;
 const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
@@ -219,7 +602,7 @@ const getDetails = lines => {
   const index = lines.findIndex(isNormalStackLine);
   if (index === -1) {
     return {
-      actualMessage: joinLines$2(lines),
+      actualMessage: joinLines$1(lines),
       rest: []
     };
   }
@@ -234,8 +617,8 @@ const getDetails = lines => {
     rest: lines.slice(index, lastIndex)
   };
 };
-const splitLines$2 = lines => {
-  return lines.split(NewLine$2);
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
 };
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
 const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
@@ -246,7 +629,7 @@ const isMessageCodeBlockEndIndex = line => {
   return RE_MESSAGE_CODE_BLOCK_END.test(line);
 };
 const getMessageCodeBlock = stderr => {
-  const lines = splitLines$2(stderr);
+  const lines = splitLines$1(stderr);
   const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
   const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
   const relevantLines = lines.slice(startIndex, endIndex);
@@ -257,7 +640,7 @@ const isModuleNotFoundMessage = line => {
   return line.includes('[ERR_MODULE_NOT_FOUND]');
 };
 const getModuleNotFoundError = stderr => {
-  const lines = splitLines$2(stderr);
+  const lines = splitLines$1(stderr);
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
@@ -305,7 +688,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
   if (isModuleNotFoundError(stderr)) {
     return getModuleNotFoundError(stderr);
   }
-  const lines = splitLines$2(stderr);
+  const lines = splitLines$1(stderr);
   const {
     actualMessage,
     rest
@@ -378,559 +761,213 @@ class IpcChildWithMessagePort extends Ipc {
 }
 const wrap$g = port => {
   return new IpcChildWithMessagePort(port);
-};
-const IpcChildWithMessagePort$1 = {
-  __proto__: null,
-  listen: listen$8,
-  signal: signal$9,
-  wrap: wrap$g
-};
-const listen$7 = () => {
-  // @ts-ignore
-  if (typeof WorkerGlobalScope === 'undefined') {
-    throw new TypeError('module is not in web worker scope');
-  }
-  return globalThis;
-};
-const signal$8 = global => {
-  global.postMessage(readyMessage);
-};
-class IpcChildWithModuleWorker extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    // @ts-ignore
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    // @ts-ignore
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    // ignore
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-  }
-}
-const wrap$f = global => {
-  return new IpcChildWithModuleWorker(global);
-};
-const IpcChildWithModuleWorker$1 = {
-  __proto__: null,
-  listen: listen$7,
-  signal: signal$8,
-  wrap: wrap$f
-};
-const waitForFirstMessage$1 = async port => {
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
-};
-const listen$6 = async () => {
-  const parentIpcRaw = listen$7();
-  signal$8(parentIpcRaw);
-  const parentIpc = wrap$f(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage$1(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError$1('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;
-  }
-  return globalThis;
-};
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
-    }
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
-  }
-}
-const wrap$e = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
-};
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
-  __proto__: null,
-  listen: listen$6,
-  wrap: wrap$e
-};
-const addListener = (emitter, type, callback) => {
-  if ('addEventListener' in emitter) {
-    emitter.addEventListener(type, callback);
-  } else {
-    emitter.on(type, callback);
-  }
-};
-const removeListener = (emitter, type, callback) => {
-  if ('removeEventListener' in emitter) {
-    emitter.removeEventListener(type, callback);
-  } else {
-    emitter.off(type, callback);
-  }
-};
-const getFirstEvent = (eventEmitter, eventMap) => {
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  const listenerMap = Object.create(null);
-  const cleanup = value => {
-    for (const event of Object.keys(eventMap)) {
-      removeListener(eventEmitter, event, listenerMap[event]);
-    }
-    resolve(value);
-  };
-  for (const [event, type] of Object.entries(eventMap)) {
-    const listener = event => {
-      cleanup({
-        type,
-        event
-      });
-    };
-    addListener(eventEmitter, event, listener);
-    listenerMap[event] = listener;
-  }
-  return promise;
-};
-const Message$1 = 3;
-const create$5$1 = async ({
-  messagePort,
-  isMessagePortOpen
-}) => {
-  if (!isMessagePort(messagePort)) {
-    throw new IpcError$1('port must be of type MessagePort');
-  }
-  if (isMessagePortOpen) {
-    return messagePort;
-  }
-  const eventPromise = getFirstEvent(messagePort, {
-    message: Message$1
-  });
-  messagePort.start();
-  const {
-    type,
-    event
-  } = await eventPromise;
-  if (type !== Message$1) {
-    throw new IpcError$1('Failed to wait for ipc message');
-  }
-  if (event.data !== readyMessage) {
-    throw new IpcError$1('unexpected first message');
+};
+const IpcChildWithMessagePort$1 = {
+  __proto__: null,
+  listen: listen$8,
+  signal: signal$9,
+  wrap: wrap$g
+};
+const listen$7 = () => {
+  // @ts-ignore
+  if (typeof WorkerGlobalScope === 'undefined') {
+    throw new TypeError('module is not in web worker scope');
   }
-  return messagePort;
+  return globalThis;
 };
-const signal$1 = messagePort => {
-  messagePort.start();
+const signal$8 = global => {
+  global.postMessage(readyMessage);
 };
-class IpcParentWithMessagePort extends Ipc {
-  getData = getData$2;
+class IpcChildWithModuleWorker extends Ipc {
+  getData(event) {
+    return getData$2(event);
+  }
   send(message) {
+    // @ts-ignore
     this._rawIpc.postMessage(message);
   }
   sendAndTransfer(message) {
     const transfer = getTransferrables(message);
+    // @ts-ignore
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
-    this._rawIpc.close();
+    // ignore
+  }
+  onClose(callback) {
+    // ignore
   }
   onMessage(callback) {
     this._rawIpc.addEventListener('message', callback);
   }
-  onClose(callback) {}
 }
-const wrap$5 = messagePort => {
-  return new IpcParentWithMessagePort(messagePort);
+const wrap$f = global => {
+  return new IpcChildWithModuleWorker(global);
 };
-const IpcParentWithMessagePort$1 = {
+const IpcChildWithModuleWorker$1 = {
   __proto__: null,
-  create: create$5$1,
-  signal: signal$1,
-  wrap: wrap$5
-};
-
-const Two = '2.0';
-const create$4$1 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
-const callbacks = Object.create(null);
-const set$7 = (id, fn) => {
-  callbacks[id] = fn;
-};
-const get$7 = id => {
-  return callbacks[id];
-};
-const remove$8 = id => {
-  delete callbacks[id];
-};
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
+  listen: listen$7,
+  signal: signal$8,
+  wrap: wrap$f
 };
-const registerPromise = () => {
-  const id = create$3$1();
+const waitForFirstMessage$1 = async port => {
   const {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$7(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);
-    this.name = 'JsonRpcError';
-  }
-}
-const NewLine$1 = '\n';
-const DomException = 'DOMException';
-const ReferenceError$1 = 'ReferenceError';
-const SyntaxError$1 = 'SyntaxError';
-const TypeError$1 = 'TypeError';
-const getErrorConstructor = (message, type) => {
-  if (type) {
-    switch (type) {
-      case DomException:
-        return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
-      case ReferenceError$1:
-        return ReferenceError;
-      default:
-        return Error;
-    }
-  }
-  if (message.startsWith('TypeError: ')) {
-    return TypeError;
-  }
-  if (message.startsWith('SyntaxError: ')) {
-    return SyntaxError;
-  }
-  if (message.startsWith('ReferenceError: ')) {
-    return ReferenceError;
-  }
-  return Error;
+  port.addEventListener('message', resolve, {
+    once: true
+  });
+  const event = await promise;
+  // @ts-ignore
+  return event.data;
 };
-const constructError = (message, type, name) => {
-  const ErrorConstructor = getErrorConstructor(message, type);
-  if (ErrorConstructor === DOMException && name) {
-    return new ErrorConstructor(message, name);
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
+  const firstMessage = await waitForFirstMessage$1(parentIpc);
+  if (firstMessage.method !== 'initialize') {
+    throw new IpcError$1('unexpected first message');
   }
-  if (ErrorConstructor === Error) {
-    const error = new Error(message);
-    if (name && name !== 'VError') {
-      error.name = name;
-    }
-    return error;
+  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;
   }
-  return new ErrorConstructor(message);
-};
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$1, startIndex);
+  return globalThis;
 };
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$1 + parentStack;
+class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
+  getData(event) {
+    return getData$2(event);
   }
-  return parentStack;
-};
-const joinLines$1 = lines => {
-  return lines.join(NewLine$1);
-};
-const MethodNotFound = -32601;
-const Custom = -32001;
-const splitLines$1 = lines => {
-  return lines.split(NewLine$1);
-};
-const restoreJsonRpcError = error => {
-  if (error && error instanceof Error) {
-    return error;
+  send(message) {
+    this._rawIpc.postMessage(message);
   }
-  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);
-    restoredError.stack = parentStack + NewLine$1 + currentStack;
-    return restoredError;
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
   }
-  if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$1 + error.data.stack + NewLine$1 + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
+  dispose() {
+    if (this._rawIpc.close) {
+      this._rawIpc.close();
     }
-    return restoredError;
-  }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
-};
-const unwrapJsonRpcResult = responseMessage => {
-  if ('error' in responseMessage) {
-    const restoredError = restoreJsonRpcError(responseMessage.error);
-    throw restoredError;
-  }
-  if ('result' in responseMessage) {
-    return responseMessage.result;
-  }
-  throw new JsonRpcError('unexpected response message');
-};
-const warn$1 = (...args) => {
-  console.warn(...args);
-};
-const resolve = (id, response) => {
-  const fn = get$7(id);
-  if (!fn) {
-    console.log(response);
-    warn$1(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(response);
-  remove$8(id);
-};
-const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getErrorType = prettyError => {
-  if (prettyError && prettyError.type) {
-    return prettyError.type;
   }
-  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
-    return prettyError.constructor.name;
+  onClose(callback) {
+    // ignore
   }
-  return undefined;
-};
-const getErrorProperty = (error, prettyError) => {
-  if (error && error.code === E_COMMAND_NOT_FOUND) {
-    return {
-      code: MethodNotFound,
-      message: error.message,
-      data: error.stack
-    };
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
   }
-  return {
-    code: Custom,
-    message: prettyError.message,
-    data: {
-      stack: prettyError.stack,
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
-      code: prettyError.code,
-      name: prettyError.name
-    }
-  };
-};
-const create$1$1 = (message, error) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    error
-  };
-};
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(message, errorProperty);
-};
-const create$e = (message, result) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    result: result ?? null
-  };
+}
+const wrap$e = port => {
+  return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create$e(message, resultProperty);
+const IpcChildWithModuleWorkerAndMessagePort$1 = {
+  __proto__: null,
+  listen: listen$6,
+  wrap: wrap$e
 };
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
-  try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
-  } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
   }
 };
-const defaultPreparePrettyError = error => {
-  return error;
-};
-const defaultLogError = () => {
-  // ignore
-};
-const defaultRequiresSocket = () => {
-  return false;
-};
-const defaultResolve = resolve;
-
-// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
-const normalizeParams = args => {
-  if (args.length === 1) {
-    const options = args[0];
-    return {
-      ipc: options.ipc,
-      message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
-      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
-    };
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
   }
-  return {
-    ipc: args[0],
-    message: args[1],
-    execute: args[2],
-    resolve: args[3],
-    preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
-  };
 };
-const handleJsonRpcMessage = async (...args) => {
-  const options = normalizeParams(args);
+const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    message,
-    ipc,
-    execute,
     resolve,
-    preparePrettyError,
-    logError,
-    requiresSocket
-  } = options;
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
+    promise
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
     }
-    resolve(message.id, message);
-    return;
-  }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-    return;
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        type,
+        event
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
   }
-  throw new JsonRpcError('unexpected message');
+  return promise;
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+const Message$1 = 3;
+const create$5$1 = async ({
+  messagePort,
+  isMessagePortOpen
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError$1('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
   const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
+    type,
+    event
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError$1('Failed to wait for ipc message');
   }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
+  if (event.data !== readyMessage) {
+    throw new IpcError$1('unexpected first message');
+  }
+  return messagePort;
 };
-const send = (transport, method, ...params) => {
-  const message = create$4$1(method, params);
-  transport.send(message);
+const signal$1 = messagePort => {
+  messagePort.start();
 };
-const invoke$6 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
 };
-const invokeAndTransfer$2 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
 };
 
 const createRpc$1 = ipc => {
@@ -1009,38 +1046,6 @@ const getPortTuple = () => {
   };
 };
 
-const state$9 = {
-  /**
-   * @type {any}
-   */
-  ipc: undefined
-};
-const get$6 = () => {
-  return state$9.ipc;
-};
-const set$6 = ipc => {
-  state$9.ipc = ipc;
-};
-
-const invoke$5 = async (method, ...params) => {
-  const ipc = get$6();
-  return invoke$6(ipc, method, ...params);
-};
-const invokeAndTransfer$1 = async (method, ...params) => {
-  const ipc = get$6();
-  return invokeAndTransfer$2(ipc, method, ...params);
-};
-const listen$5 = ipc => {
-  set$6(ipc);
-};
-
-const invoke$4 = async (method, ...params) => {
-  return invoke$5(method, ...params);
-};
-const invokeAndTransfer = async (method, ...params) => {
-  return invokeAndTransfer$1(method, ...params);
-};
-
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
 const launchColorPickerWorker = async () => {
@@ -2077,6 +2082,9 @@ class IpcError extends Error {
 const sendMessagePortToExtensionHostWorker = async port => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, 'HandleMessagePort.handleMessagePort');
 };
+const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, initialCommand, rpcId);
+};
 
 const withResolvers = () => {
   let _resolve;
@@ -2301,16 +2309,19 @@ const createRpc = method => {
   const invoke = async (method, ...params) => {
     return invoke$6(_ipc, method, ...params);
   };
+  const invokeAndTransfer = async (method, ...params) => {
+    return invokeAndTransfer$2(_ipc, method, ...params);
+  };
   return {
     listen,
-    invoke
+    invoke,
+    invokeAndTransfer
   };
 };
 
 const {
   listen: listen$4,
-  invoke: invoke$2
-} = createRpc(ExtensionHostWorker);
+  invoke: invoke$2} = createRpc(ExtensionHostWorker);
 
 const ColorPicker$1 = 41;
 const CompletionDetail$1 = 999;
@@ -2339,11 +2350,6 @@ const OnDiagnostic = 'onDiagnostic';
 const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
 
-// TODO add tests for this
-const activateByEvent = async event => {
-  await invoke$4('ExtensionHostManagement.activateByEvent', event);
-};
-
 const execute = async ({
   editor,
   args,
@@ -10529,7 +10535,7 @@ const keep = [
 // 'ColorPicker.loadContent',
 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'Editor.getKeyBindings', 'Editor.getPositionAtCursor', 'Editor.getWordAt2', 'Editor.getQuickPickMenuEntries',
 // 'ColorPicker.render',
-'Editor.getText', 'Editor.getSelections', 'Font.ensure', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize'];
+'Editor.getText', 'Editor.getSelections', 'Font.ensure', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'ActivateByEvent.activateByEvent'];
 
 const wrapWidgetCommand = (widgetId, fn) => {
   const isWidget = widget => {
@@ -10609,14 +10615,13 @@ const wrapCommands = commands => {
 };
 
 const commandMap = {
+  'ActivateByEvent.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.loadContent': loadContent$3,
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
   'Editor.applyEdit': applyEdit,
   'Editor.braceCompletion': braceCompletion,
-  'Editor.getPositionAtCursor': getPositionAtCursor,
-  'Editor.getWordAt2': getWordAt,
   'Editor.cancelSelection': cancelSelection,
   'Editor.closeCodeGenerator': closeCodeGenerator,
   'Editor.closeCompletion': closeCompletion,
@@ -10660,10 +10665,12 @@ const commandMap = {
   'Editor.findAllReferences': findAllReferences,
   'Editor.format': format,
   'Editor.getKeyBindings': getKeyBindings,
+  'Editor.getPositionAtCursor': getPositionAtCursor,
   'Editor.getQuickPickMenuEntries': getQuickPickMenuEntries,
   'Editor.getSelections': getSelections,
   'Editor.getText': getText,
   'Editor.getWordAt': getWordAt$1,
+  'Editor.getWordAt2': getWordAt,
   'Editor.getWordBefore': getWordBefore,
   'Editor.goToDefinition': goToDefinition,
   'Editor.goToTypeDefinition': goToTypeDefinition,
@@ -10801,7 +10808,8 @@ const commandMap = {
   'Hover.handleSashPointerUp': handleSashPointerUp,
   'Hover.loadContent': loadContent,
   'Hover.render': renderHover,
-  'Initialize.initialize': intialize
+  'Initialize.initialize': intialize,
+  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendMessagePortToExtensionHostWorker2
 };
 wrapCommands(commandMap);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "",
   "license": "MIT",
   "author": "Lvce Editor",