@lvce-editor/extension-host-worker 5.8.0 → 5.10.0

package/dist/extensionHostWorkerMain.js

@@ -568,7 +568,7 @@ const registerMethod = ({
     }
   };
 };
-const create$c = ({
+const create$d = ({
   name,
   resultShape,
   executeKey = '',
@@ -618,7 +618,7 @@ const String$1 = 'string';
 
 const {
   registerBraceCompletionProvider,
-  executeBraceCompletionProvider} = create$c({
+  executeBraceCompletionProvider} = create$d({
   name: 'BraceCompletion',
   resultShape: {
     type: Boolean$1
@@ -628,7 +628,7 @@ const {
 const {
   registerClosingTagProvider,
   executeClosingTagProvider
-} = create$c({
+} = create$d({
   name: 'ClosingTag',
   returnUndefinedWhenNoProviderFound: true,
   resultShape: {
@@ -640,7 +640,7 @@ const {
 const {
   registerCodeActionProvider,
   executeCodeActionProvider
-} = create$c({
+} = create$d({
   name: 'CodeAction',
   resultShape: {
     type: Array$1,
@@ -723,7 +723,7 @@ const {
   registerCompletionProvider,
   executeCompletionProvider,
   executeresolveCompletionItemProvider
-} = create$c({
+} = create$d({
   name: 'Completion',
   resultShape: {
     type: Array$1,
@@ -754,21 +754,48 @@ const setConfigurations = preferences => {
 };
 
 const rpcs$2 = Object.create(null);
-const set$a = (id, rpc) => {
+const set$d = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
 const get$a = id => {
   return rpcs$2[id];
 };
 
-const RendererWorker = 1;
-const DebugWorker = 55;
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 
-// TODO use invoke
-const send$1 = async (method, ...params) => {
-  const rpc = get$a(DebugWorker);
-  rpc.send(method, ...params);
+const create$c = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$a(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$a(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$d(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get$a(rpcId);
+      await rpc.dispose();
+    }
+  };
 };
+const DebugWorker$1 = 55;
+const {
+  invoke: invoke$c} = create$c(DebugWorker$1);
+const DebugWorker = {
+  __proto__: null,
+  invoke: invoke$c};
+
+const {
+  invoke: invoke$3
+} = DebugWorker;
 
 const state$a = {
   debugProviderMap: Object.create(null)
@@ -787,23 +814,33 @@ const registerDebugProvider = debugProvider => {
   }
   state$a.debugProviderMap[debugProvider.id] = debugProvider;
 };
+const handlePaused = async params => {
+  // @ts-ignore
+  await invoke$3('Debug.paused', params);
+};
+const handleResumed = async () => {
+  // @ts-ignore
+  await invoke$3('Debug.resumed');
+};
+const handleScriptParsed = async parsedScript => {
+  // @ts-ignore
+  await invoke$3('Debug.scriptParsed', parsedScript);
+};
+const handleChange = async params => {
+  object(params);
+  // @ts-ignore
+  await invoke$3('Debug.handleChange', params);
+};
 const start = async (protocol, path) => {
   try {
-    const handlePaused = params => {
-      send$1('Debug.paused', params);
-    };
-    const handleResumed = () => {
-      send$1('Debug.resumed');
-    };
-    const handleScriptParsed = parsedScript => {
-      send$1('Debug.scriptParsed', parsedScript);
-    };
     const provider = getDebugProvider(protocol);
-    await provider.start({
+    const emitter = {
       handlePaused,
       handleResumed,
-      handleScriptParsed
-    }, path);
+      handleScriptParsed,
+      handleChange
+    };
+    await provider.start(emitter, path);
   } catch (error) {
     throw new VError(error, 'Failed to execute debug provider');
   }
@@ -834,6 +871,49 @@ const pause = async protocol => {
     throw new VError(error, 'Failed to execute debug provider');
   }
 };
+const getScriptSource = async (protocol, scriptId) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getScriptSource(scriptId);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
+
+// TODO create direct connection from debug worker to extension, not needing extension host worker apis
+
+const getStatus = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getStatus();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
+const getCallStack = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getCallStack();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
+const getScopeChain = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getScopeChain();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
+const getScripts = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getScripts();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
 const stepInto = async protocol => {
   try {
     const provider = getDebugProvider(protocol);
@@ -893,7 +973,7 @@ const setPauseOnExceptions = async (protocol, value) => {
 
 const {
   registerDefinitionProvider,
-  executeDefinitionProvider} = create$c({
+  executeDefinitionProvider} = create$d({
   name: 'Definition',
   resultShape: {
     allowUndefined: true,
@@ -915,7 +995,7 @@ const {
 const {
   registerDiagnosticProvider,
   executeDiagnosticProvider
-} = create$c({
+} = create$d({
   name: 'Diagnostic',
   resultShape: {
     type: Array$1,
@@ -925,6 +1005,8 @@ const {
   }
 });
 
+const RendererWorker = 1;
+
 const invoke$2 = (method, ...params) => {
   const rpc = get$a(RendererWorker);
   return rpc.invoke(method, ...params);
@@ -1031,7 +1113,7 @@ const getPathSeparator = protocol => {
 
 const {
   registerFormattingProvider,
-  executeFormattingProvider} = create$c({
+  executeFormattingProvider} = create$d({
   name: 'Formatting',
   executeKey: 'format',
   resultShape: {
@@ -1093,7 +1175,7 @@ const getPosition = (textDocument, offset) => {
 
 const {
   registerHoverProvider,
-  executeHoverProvider} = create$c({
+  executeHoverProvider} = create$d({
   name: 'Hover',
   resultShape: {
     allowUndefined: true,
@@ -1104,7 +1186,7 @@ const {
 
 const {
   registerImplementationProvider,
-  executeImplementationProvider} = create$c({
+  executeImplementationProvider} = create$d({
   name: 'Implementation',
   resultShape: {
     type: Array$1,
@@ -1730,6 +1812,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine$1);
+};
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines$1(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine$1, startIndex);
 };
@@ -1740,19 +1832,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine$1);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines$1 = lines => {
-  return lines.split(NewLine$1);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine$1 + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines$1(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -1864,18 +1953,18 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$2 = (message, error) => {
+const create$1$2 = (id, error) => {
   return {
     jsonrpc: Two,
-    id: message.id,
+    id,
     error
   };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(message, errorProperty);
+  return create$1$2(id, errorProperty);
 };
 const create$8 = (message, result) => {
   return {
@@ -1888,12 +1977,27 @@ const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
   return create$8(message, resultProperty);
 };
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
+    }
+  };
+};
 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);
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
   }
 };
 const defaultPreparePrettyError = error => {
@@ -1948,7 +2052,7 @@ const handleJsonRpcMessage = async (...args) => {
       try {
         ipc.send(response);
       } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
         ipc.send(errorResponse);
       }
       return;
@@ -2279,6 +2383,7 @@ const getPlatform = () => {
     // @ts-ignore
     return PLATFORM;
   }
+  // @ts-ignore
   if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
     return Test;
   }
@@ -2388,7 +2493,7 @@ const showQuickPick = async ({
 const {
   registerReferenceProvider,
   executeReferenceProvider,
-  executefileReferenceProvider} = create$c({
+  executefileReferenceProvider} = create$d({
   name: 'Reference',
   resultShape: {
     type: Array$1,
@@ -2413,7 +2518,7 @@ const {
 const {
   registerRenameProvider,
   executeRenameProvider,
-  executeprepareRenameProvider} = create$c({
+  executeprepareRenameProvider} = create$d({
   name: 'Rename',
   resultShape: {
     type: Object$1,
@@ -2573,7 +2678,7 @@ const createRpc = ({
 
 const {
   registerSelectionProvider,
-  executeSelectionProvider} = create$c({
+  executeSelectionProvider} = create$d({
   name: 'Selection',
   resultShape: {
     allowUndefined: true,
@@ -2679,7 +2784,7 @@ const getEnabledProviderIds = async (scheme, root) => {
 
 const {
   registerTabCompletionProvider,
-  executeTabCompletionProvider} = create$c({
+  executeTabCompletionProvider} = create$d({
   name: 'TabCompletion',
   resultShape: {
     type: Object$1,
@@ -2718,7 +2823,7 @@ const executeTextSearchProvider = async (scheme, query) => {
 
 const {
   registerTypeDefinitionProvider,
-  executeTypeDefinitionProvider} = create$c({
+  executeTypeDefinitionProvider} = create$d({
   name: 'TypeDefinition',
   resultShape: {
     allowUndefined: true,
@@ -5011,7 +5116,7 @@ const handleMessagePort2 = async (port, rpcId) => {
     commandMap: {}
   });
   if (rpcId) {
-    set$a(rpcId, rpc);
+    set$d(rpcId, rpc);
   }
 };
 
@@ -5021,7 +5126,7 @@ const handleMessagePort = async (port, rpcId) => {
     commandMap: {}
   });
   if (rpcId) {
-    set$a(rpcId, rpc);
+    set$d(rpcId, rpc);
   }
 };
 
@@ -5587,6 +5692,7 @@ const commandMap = {
   'ExecuteExternalCommand.executeExternalCommand': executeExternalCommand,
   'ExtensionHostDebug.evaluate': evaluate,
   'ExtensionHostDebug.getProperties': getProperties,
+  'ExtensionHostDebug.getScriptSource': getScriptSource,
   'ExtensionHostDebug.listProcesses': listProcesses,
   'ExtensionHostDebug.pause': pause,
   'ExtensionHostDebug.resume': resume,
@@ -5596,6 +5702,10 @@ const commandMap = {
   'ExtensionHostDebug.stepInto': stepInto,
   'ExtensionHostDebug.stepOut': stepOut,
   'ExtensionHostDebug.stepOver': stepOver,
+  'ExtensionHostDebug.getStatus': getStatus,
+  'ExtensionHostDebug.getCallStack': getCallStack,
+  'ExtensionHostDebug.getScopeChain': getScopeChain,
+  'ExtensionHostDebug.getScripts': getScripts,
   'ExtensionHostRename.executeprepareRenameProvider': executeprepareRenameProvider,
   'ExtensionHostRename.executeRenameProvider': executeRenameProvider,
   'ExtensionHostWebView.create': createWebView,
@@ -5697,7 +5807,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$a(RendererWorker, rpc);
+  set$d(RendererWorker, rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "5.8.0",
+  "version": "5.10.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "keywords": [
     "web-worker"