@lvce-editor/extension-management-worker 4.26.0 → 4.28.0

package/dist/extensionManagementWorkerMain.js

@@ -1212,7 +1212,7 @@ const createMockRpc = ({
 };
 
 const rpcs$2 = Object.create(null);
-const set$9 = (id, rpc) => {
+const set$a = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
 const get$5 = id => {
@@ -1245,7 +1245,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$9(rpcId, mockRpc);
+      set$a(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$1(rpcId);
@@ -1254,11 +1254,16 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$9(rpcId, rpc);
+      set$a(rpcId, rpc);
     }
   };
 };
 
+const {
+  invoke: invoke$6,
+  set: set$9
+} = create$1(6010);
+
 const Web = 1;
 const Electron = 2;
 const Remote = 3;
@@ -1334,6 +1339,10 @@ const {
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$5
 } = create$1(RendererWorker);
+const sendMessagePortToAuthWorker = async (port, rpcId) => {
+  const command = 'HandleMessagePort.handleMessagePort';
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
+};
 const sendMessagePortToErrorWorker = async (port, rpcId) => {
   const command = 'Errors.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
@@ -2319,6 +2328,73 @@ const executeExtensionCommand = async (extensionsState, id, ...args) => {
   };
 };
 
+const hasUriScheme = value => {
+  return /^[a-z][a-z\d+.-]*:/i.test(value);
+};
+const toExtensionBaseUri = extensionPath => {
+  if (hasUriScheme(extensionPath)) {
+    return extensionPath.endsWith('/') ? extensionPath : `${extensionPath}/`;
+  }
+  if (extensionPath.startsWith('/')) {
+    return `file://${extensionPath}/`;
+  }
+  throw new Error(`Language server extension path must be an absolute path or URI`);
+};
+const resolveLanguageServerUri = (extension, languageServerUri) => {
+  if (languageServerUri.startsWith('/')) {
+    return `file://${languageServerUri}`;
+  }
+  if (hasUriScheme(languageServerUri)) {
+    return languageServerUri;
+  }
+  const extensionPath = extension.uri || extension.path || '';
+  return new URL(languageServerUri, toExtensionBaseUri(extensionPath)).href;
+};
+const getContribution = (extension, languageId) => {
+  return extension.languageServers?.find(contribution => contribution.languageId === languageId);
+};
+const getRegisteredLanguageServer = (snapshot, contribution, languageId) => {
+  const languageServer = snapshot.languageServers.find(registered => registered.id === contribution.id && registered.languageId === languageId);
+  if (!languageServer) {
+    throw new Error(`language server ${contribution.id || '<unknown>'} is contributed in extension.json but not registered`);
+  }
+  return languageServer;
+};
+const sanitizeCompletionItem = item => {
+  if (!item || typeof item !== 'object' || typeof item.label !== 'string') {
+    return undefined;
+  }
+  const snippet = item.insertText || item.textEdit?.newText || item.label;
+  return {
+    ...item,
+    flags: 0,
+    kind: typeof item.kind === 'number' ? item.kind : 0,
+    label: item.label,
+    matches: [],
+    snippet
+  };
+};
+const executeLanguageServerCompletion = async (rpc, extension, textDocument, offset) => {
+  if (typeof textDocument.text !== 'string' || typeof textDocument.uri !== 'string') {
+    return [];
+  }
+  const contribution = getContribution(extension, textDocument.languageId);
+  if (!contribution) {
+    return [];
+  }
+  const snapshot = await rpc.invoke('ExtensionApi.getLanguageServerRegistrySnapshot');
+  const languageServer = getRegisteredLanguageServer(snapshot, contribution, textDocument.languageId);
+  const uri = resolveLanguageServerUri(extension, languageServer.uri);
+  const result = await invoke$1('LanguageServer.complete', {
+    argv: languageServer.argv,
+    id: `${extension.id || extension.uri || extension.path || 'extension'}.${languageServer.id}`,
+    offset,
+    textDocument,
+    uri
+  });
+  return result.map(sanitizeCompletionItem).filter(item => item !== undefined);
+};
+
 const getOrigin = () => {
   return globalThis.location?.origin || 'http://localhost';
 };
@@ -2344,13 +2420,23 @@ const getRpc$1 = async (extension, assetDir, platform) => {
 const contributesCompletionProvider = (extension, languageId) => {
   return Array.isArray(extension.completionProviders) && extension.completionProviders.some(provider => provider.languageId === languageId);
 };
+const contributesLanguageServer = (extension, languageId) => {
+  return Array.isArray(extension.languageServers) && extension.languageServers.some(languageServer => languageServer.languageId === languageId);
+};
 const getMatchingExtensions$4 = async (extensionsState, textDocument, assetDir, platform) => {
   const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform);
-  return extensions.filter(extension => isExtensionIsolated(extension) && contributesCompletionProvider(extension, textDocument.languageId));
+  return extensions.filter(extension => isExtensionIsolated(extension) && (contributesCompletionProvider(extension, textDocument.languageId) || contributesLanguageServer(extension, textDocument.languageId)));
 };
 const executeRpcCompletionProvider = async (rpc, textDocument, args) => {
   return rpc.invoke('ExtensionApi.executeCompletionProvider', textDocument, ...args);
 };
+const executeExtensionCompletionProvider = async (rpc, extension, textDocument, args) => {
+  if (contributesLanguageServer(extension, textDocument.languageId)) {
+    const offset = typeof args[0] === 'number' ? args[0] : 0;
+    return executeLanguageServerCompletion(rpc, extension, textDocument, offset);
+  }
+  return executeRpcCompletionProvider(rpc, textDocument, args);
+};
 const executeRpcResolveCompletionItemProvider = async (rpc, textDocument, args) => {
   return rpc.invoke('ExtensionApi.executeResolveCompletionItemProvider', textDocument, ...args);
 };
@@ -2361,7 +2447,7 @@ const executeCompletionProvider = async (extensionsState, textDocument, ...args)
   } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
-  const results = await Promise.all(rpcs.map(rpc => executeRpcCompletionProvider(rpc, textDocument, args)));
+  const results = await Promise.all(rpcs.map((rpc, index) => executeExtensionCompletionProvider(rpc, extensions[index], textDocument, args)));
   return results[0] || [];
 };
 const executeResolveCompletionItemProvider = async (extensionsState, textDocument, ...args) => {
@@ -2369,7 +2455,8 @@ const executeResolveCompletionItemProvider = async (extensionsState, textDocumen
     assetDir,
     platform
   } = await getRuntimeContext('', extensionsState.platform);
-  const extensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
+  const matchingExtensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
+  const extensions = matchingExtensions.filter(extension => contributesCompletionProvider(extension, textDocument.languageId));
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcResolveCompletionItemProvider(rpc, textDocument, args)));
   return results[0];
@@ -2648,6 +2735,10 @@ const saveViewInstanceState = async (viewId, uid, assetDir, platform) => {
   return rpc.invoke('ExtensionApi.saveViewInstanceState', uid);
 };
 
+const getAccessToken = () => {
+  return invoke$6('Auth.getAccessToken');
+};
+
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 const warn = (...args) => {
   console.warn(...args);
@@ -3317,6 +3408,7 @@ const commandMap = {
   'Extensions.executeLanguageProvider': wrapCommand(executeLanguageProvider),
   'Extensions.executeOrganizeImportsProvider': wrapCommand(executeOrganizeImportsProvider),
   'Extensions.executeResolveCompletionItemProvider': wrapCommand(executeResolveCompletionItemProvider),
+  'Extensions.getAccessToken': getAccessToken,
   'Extensions.getAllExtensions': getAllExtensions,
   'Extensions.getColorThemeCss': getColorThemeCss,
   'Extensions.getColorThemeCssFromJson': getColorThemeCssFromJson,
@@ -3354,6 +3446,16 @@ const commandMap = {
   'StatusBar.handleChange': handleChange
 };
 
+const initializeAuthWorker = async () => {
+  const rpc = await create$6({
+    commandMap: commandMapRef,
+    async send(port) {
+      await sendMessagePortToAuthWorker(port, 0);
+    }
+  });
+  set$9(rpc);
+};
+
 const initializeErrorWorker = async () => {
   const rpc = await create$6({
     commandMap: commandMapRef,
@@ -3403,7 +3505,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   Object.assign(commandMapRef, commandMap);
-  await Promise.all([initializeRendererWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker(), initializeExtensionHostWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker(), initializeExtensionHostWorker()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-management-worker",
-  "version": "4.26.0",
+  "version": "4.28.0",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"