@lvce-editor/extension-management-worker 4.88.3 → 4.88.5

package/dist/extensionManagementWorkerMain.js

@@ -127,11 +127,21 @@ const removeWebExtension = (id, applicationId) => {
   }, applicationId);
   return true;
 };
-const clearCachedExtensions = applicationId => {
+const clearCachedExtensions = (applicationId, expected) => {
+  const current = get$7(applicationId);
+  if (expected !== undefined && current.cachedExtensions?.extensions !== expected) {
+    return;
+  }
   update({
     cachedExtensions: undefined
   }, applicationId);
 };
+const clearAllCachedExtensions = () => {
+  clearCachedExtensions();
+  for (const applicationId of applications$2.keys()) {
+    clearCachedExtensions(applicationId);
+  }
+};
 const getOrCreateWebExtensionsCache = extensionsState => {
   const existing = webExtensionsCaches.get(extensionsState);
   if (existing) {
@@ -2166,6 +2176,32 @@ const getExtensionsWithState = async (extensions, extensionsState, platform) =>
   } = await getWorkspaceExtensionEnablementSafe();
   return withDisabledState(extensionsWithDisabledState, workspaceDisabledIds, workspaceEnabledIds);
 };
+const getSharedProcessExtensions = (extensionsState, fields) => {
+  const current = get$7(extensionsState.applicationId);
+  const requestedFields = fields === undefined ? undefined : [...new Set([...fields, 'id', 'disabled'])];
+  const cached = current.cachedExtensions;
+  if (cached) {
+    const cachedFields = cached.fields;
+    if (cachedFields === undefined || requestedFields !== undefined && requestedFields.every(field => cachedFields.includes(field))) {
+      return cached.extensions;
+    }
+  }
+  const extensions = Promise.try(() => requestedFields === undefined ? invoke$3('ExtensionManagement.getAllExtensions') : invoke$3('ExtensionManagement.getAllExtensions', requestedFields));
+  update({
+    cachedExtensions: {
+      extensions,
+      fields: requestedFields
+    }
+  }, extensionsState.applicationId);
+  void extensions.catch(() => {
+    try {
+      clearCachedExtensions(extensionsState.applicationId, extensions);
+    } catch {
+      // The application may have been disposed while discovery was pending.
+    }
+  });
+  return extensions;
+};
 const getAllExtensionsWithState = async (extensionsState, assetDir, platform, fields) => {
   const {
     assetDir: resolvedAssetDir,
@@ -2187,7 +2223,7 @@ const getAllExtensionsWithState = async (extensionsState, assetDir, platform, fi
     const compatibleExtensions = [...webExtensions, ...meta].filter(extension => isExtensionCompatible(extension, resolvedPlatform));
     extensions = await getExtensionsWithState(compatibleExtensions, extensionsState, resolvedPlatform);
   } else {
-    const local = await invoke$3('ExtensionManagement.getAllExtensions');
+    const local = await getSharedProcessExtensions(extensionsState, fields);
     extensions = await getExtensionsWithState([...local, ...meta], extensionsState, resolvedPlatform);
   }
   if (fields === undefined) {
@@ -3414,6 +3450,7 @@ const activateByEvent = async (event, assetDir, platform, application) => {
 };
 
 const invalidateExtensionsCache = async (extensionId, disabled) => {
+  clearAllCachedExtensions();
   try {
     if (extensionId) {
       await invoke$4('ExtensionManagement.handleExtensionsCacheInvalidated', extensionId, disabled);
@@ -3916,6 +3953,9 @@ const executeLanguageServerCompletion = async (rpc, extension, textDocument, off
   return result.map(sanitizeCompletionItem).filter(item => item !== undefined);
 };
 
+// Preserve provider activation, RPC permissions, application identity and language-server metadata.
+const languageProviderManifestFields = ['applicationGeneration', 'applicationId', 'browser', 'builtin', 'completionProviders', 'contentSecurityPolicy', 'diagnosticProviders', 'disabled', 'id', 'isolated', 'isWeb', 'languageServers', 'path', 'rpc', 'uri', 'workerName'];
+
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
 const contributesCompletionProvider = (extension, languageId) => {
@@ -3925,7 +3965,7 @@ const contributesLanguageServer$3 = (extension, languageId) => {
   return Array.isArray(extension.languageServers) && extension.languageServers.some(languageServer => languageServer.languageId === languageId);
 };
 const getMatchingExtensions$6 = async (extensionsState, textDocument, assetDir, platform) => {
-  const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform);
+  const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform, languageProviderManifestFields);
   return extensions.filter(extension => !extension.disabled && isExtensionIsolated(extension) && (contributesCompletionProvider(extension, textDocument.languageId) || contributesLanguageServer$3(extension, textDocument.languageId)));
 };
 const executeRpcCompletionProvider = async (rpc, textDocument, args) => {
@@ -4015,7 +4055,7 @@ const contributesLanguageServer$2 = (extension, languageId) => {
   return Array.isArray(extension.languageServers) && extension.languageServers.some(languageServer => languageServer.languageId === languageId);
 };
 const getMatchingExtensions$5 = async (extensionsState, textDocument, assetDir, platform) => {
-  const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform);
+  const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform, languageProviderManifestFields);
   return extensions.filter(extension => !extension.disabled && isExtensionIsolated(extension) && (contributesDiagnosticProvider(extension, textDocument.languageId) || contributesLanguageServer$2(extension, textDocument.languageId)));
 };
 const executeRpcDiagnosticProvider = async (rpc, textDocument, args) => {

package/package.json

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