@lvce-editor/extension-management-worker 1.9.0 → 1.11.0

package/dist/extensionManagementWorkerMain.js

@@ -1353,6 +1353,50 @@ const activateExtension2 = async (extensionId, extension, absolutePath) => {
   }
 };
 
+const importExtension = async (extensionId, absolutePath, activationEvent) => {
+  try {
+    string(absolutePath);
+    const startTime = performance.now();
+    set$2({
+      activationEndTime: 0,
+      activationEvent: activationEvent,
+      activationStartTime: performance.now(),
+      activationTime: 0,
+      id: extensionId,
+      importEndTime: 0,
+      importStartTime: startTime,
+      importTime: 0,
+      status: Importing
+    });
+    try {
+      await invoke$3('ExtensionHost.importExtension2', extensionId, absolutePath);
+      const endTime = performance.now();
+      const time = endTime - startTime;
+      update$1(extensionId, {
+        importEndTime: endTime,
+        importTime: time
+      });
+    } catch (error) {
+      update$1(extensionId, {
+        status: Error$1 // TODO maybe store error also in runtime status state
+      });
+      if (isImportError(error)) {
+        const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
+        throw new Error(actualErrorMessage);
+      }
+      throw error;
+    }
+  } catch (error) {
+    throw new VError(error, `Failed to import extension ${extensionId}`);
+  }
+};
+
+const activateExtension3 = async (extension, absolutePath, activationEvent) => {
+  const extensionId = extension.id;
+  await importExtension(extensionId, absolutePath, activationEvent);
+  await activateExtension2(extensionId, extension, absolutePath);
+};
+
 const cache = Object.create(null);
 const id = 1;
 const clear = () => {
@@ -1660,20 +1704,18 @@ const getColorThemeJson$2 = async colorThemeId => {
   return json;
 };
 
-const assetDir = '';
-
-const getColorThemeUrlWeb = colorThemeId => {
+const getColorThemeUrlWeb = (assetDir, colorThemeId) => {
   return `${assetDir}/extensions/builtin.theme-${colorThemeId}/color-theme.json`;
 };
-const getColorThemeJson$1 = colorThemeId => {
-  const url = getColorThemeUrlWeb(colorThemeId);
+const getColorThemeJson$1 = (colorThemeId, assetDir) => {
+  const url = getColorThemeUrlWeb(assetDir, colorThemeId);
   // TODO handle error ?
   return getJson(url);
 };
 
-const getColorThemeJson = (colorThemeId, platform) => {
+const getColorThemeJson = (colorThemeId, platform, assetDir) => {
   if (platform === Web) {
-    return getColorThemeJson$1(colorThemeId);
+    return getColorThemeJson$1(colorThemeId, assetDir);
   }
   return getColorThemeJson$2(colorThemeId);
 };
@@ -1683,8 +1725,8 @@ const getColorThemeCssFromJson = async (colorThemeId, colorThemeJson) => {
   return colorThemeCss;
   // TODO generate color theme from jsonc
 };
-const getColorThemeCssNew = async (colorThemeId, platform) => {
-  const colorThemeJson = await getColorThemeJson(colorThemeId, platform);
+const getColorThemeCssNew = async (colorThemeId, platform, assetDir) => {
+  const colorThemeJson = await getColorThemeJson(colorThemeId, platform, assetDir);
   const colorThemeCss = await getColorThemeCssFromJson(colorThemeId, colorThemeJson);
   return colorThemeCss;
 };
@@ -1746,44 +1788,6 @@ const handleMessagePort = async port => {
   });
 };
 
-const importExtension = async (extensionId, absolutePath, activationEvent) => {
-  try {
-    string(absolutePath);
-    const startTime = performance.now();
-    set$2({
-      activationEndTime: 0,
-      activationEvent: activationEvent,
-      activationStartTime: performance.now(),
-      activationTime: 0,
-      id: extensionId,
-      importEndTime: 0,
-      importStartTime: startTime,
-      importTime: 0,
-      status: Importing
-    });
-    try {
-      await invoke$3('ExtneionHost.importExtension2', extensionId, absolutePath);
-      const endTime = performance.now();
-      const time = endTime - startTime;
-      update$1(extensionId, {
-        importEndTime: endTime,
-        importTime: time
-      });
-    } catch (error) {
-      update$1(extensionId, {
-        status: Error$1 // TODO maybe store error also in runtime status state
-      });
-      if (isImportError(error)) {
-        const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-        throw new Error(actualErrorMessage);
-      }
-      throw error;
-    }
-  } catch (error) {
-    throw new VError(error, `Failed to import extension ${extensionId}`);
-  }
-};
-
 const initializeExtensionHostWorker = async () => {
   const rpc = await TransferMessagePortRpcParent.create({
     commandMap: commandMapRef,
@@ -1842,7 +1846,14 @@ const installExtension = async () => {
   // TODO
 };
 
-const getLanguagesFromExtension = extension => {
+const getRemoteUrl = uri => {
+  if (uri.startsWith('/')) {
+    return `/remote${uri}`;
+  }
+  return `/remote/${uri}`;
+};
+
+const getLanguagesFromExtension = (extension, platform) => {
   // TODO what if extension is null? should not crash process, handle error gracefully
   // TODO what if extension languages is not of type array?
   // TODO what if language is null?
@@ -1864,7 +1875,7 @@ const getLanguagesFromExtension = extension => {
         };
       }
       const relativePath = `${extensionPath}/${language.tokenize}`;
-      const absolutePath = relativePath ;
+      const absolutePath = platform === Web ? relativePath : getRemoteUrl(relativePath);
       return {
         ...language,
         extensionPath,
@@ -1876,10 +1887,10 @@ const getLanguagesFromExtension = extension => {
   return extension.languages.map(getLanguageFromExtension);
 };
 
-const getLanguages = async () => {
+const getLanguages = async platform => {
   try {
     const extensions = await getAllExtensions();
-    const languages = extensions.flatMap(getLanguagesFromExtension);
+    const languages = extensions.flatMap(extension => getLanguagesFromExtension(extension, platform));
     return languages;
   } catch (error) {
     throw new VError(error, 'Failed to load languages');
@@ -1892,6 +1903,7 @@ const uninstallExtension = async () => {
 
 const commandMap = {
   'Extensions.activate2': activateExtension2,
+  'Extensions.activate3': activateExtension3,
   'Extensions.addWebExtension': addWebExtension,
   'Extensions.disable': disableExtension,
   'Extensions.enable': enableExtension,

package/package.json

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