@lvce-editor/extension-host-worker 3.17.0 → 3.18.0

package/dist/extensionHostWorkerMain.js

@@ -3574,22 +3574,47 @@ const getColorThemeCssCached = async (colorThemeId, getData) => {
   return newData;
 };
 
-const getColorThemeJson$2 = colorThemeId => {
-  return invoke$2(/* ExtensionHost.getColorThemeJson */'ExtensionHost.getColorThemeJson', /* colorThemeId */colorThemeId);
+const readJson = url => {
+  return invoke$2('FileSystem.readJson', url);
 };
 
-const getAssetDir = () => {
-  // @ts-ignore
-  if (typeof ASSET_DIR !== 'undefined') {
-    // @ts-ignore
-    return ASSET_DIR;
+const dirname = (pathSeparator, path) => {
+  const index = path.lastIndexOf(pathSeparator);
+  if (index === -1) {
+    return path;
   }
-  if (platform === Electron) {
-    return '../../../../..';
+  return path.slice(0, index);
+};
+const extname = path => {
+  const index = path.lastIndexOf('.');
+  if (index === -1) {
+    return '';
+  }
+  return path.slice(index);
+};
+const join = (pathSeparator, ...parts) => {
+  return parts.join(pathSeparator);
+};
+
+const getColorThemeUri = (extensions, colorThemeId) => {
+  for (const extension of extensions) {
+    if (!extension.colorThemes) {
+      continue;
+    }
+    for (const colorTheme of extension.colorThemes) {
+      if (colorTheme.id !== colorThemeId) {
+        continue;
+      }
+      const absolutePath = join('/', extension.uri, colorTheme.path);
+      return absolutePath;
+    }
   }
   return '';
 };
-const assetDir = getAssetDir();
+
+const state$5 = {
+  webExtensions: []
+};
 
 const getJson = async url => {
   try {
@@ -3604,6 +3629,97 @@ const getJson = async url => {
   }
 };
 
+const getAssetDir = () => {
+  // @ts-ignore
+  if (typeof ASSET_DIR !== 'undefined') {
+    // @ts-ignore
+    return ASSET_DIR;
+  }
+  if (platform === Electron) {
+    return '../../../../..';
+  }
+  return '';
+};
+const assetDir = getAssetDir();
+
+const webExtensionsUrl = `${assetDir}/config/webExtensions.json`;
+
+const getSharedProcessExtensions$1 = () => {
+  return invoke$2(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
+};
+const getStaticWebExtensions = () => {
+  return getJson(webExtensionsUrl);
+};
+const getWebExtensionsWeb = async () => {
+  const staticWebExtensions = await getStaticWebExtensions();
+  return [...staticWebExtensions, ...state$5.webExtensions];
+};
+const isWebExtension = extension => {
+  return extension && typeof extension.browser === 'string';
+};
+const getWebExtensionsDefault = async () => {
+  const staticWebExtensions = await getStaticWebExtensions();
+  const sharedProcessExtensions = await getSharedProcessExtensions$1();
+  const sharedProcessWebExtensions = sharedProcessExtensions.filter(isWebExtension);
+  return [...staticWebExtensions, sharedProcessWebExtensions, ...state$5.webExtensions];
+};
+const getWebExtensions = async () => {
+  try {
+    switch (platform) {
+      case Web:
+        return await getWebExtensionsWeb();
+      default:
+        return await getWebExtensionsDefault();
+    }
+  } catch {
+    return state$5.webExtensions;
+  }
+};
+
+const getSharedProcessExtensions = () => {
+  return invoke$2(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
+};
+const getExtensions$1 = async () => {
+  if (platform === Web) {
+    const webExtensions = await getWebExtensions();
+    return webExtensions;
+  }
+  if (platform === Remote) {
+    const webExtensions = await getWebExtensions();
+    const sharedProcessExtensions = await getSharedProcessExtensions();
+    return [...sharedProcessExtensions, ...webExtensions];
+  }
+  const extensions = await getSharedProcessExtensions();
+  return extensions;
+};
+
+const cache = Object.create(null);
+const id = 1;
+const get = () => {
+  return cache[id];
+};
+const has = () => {
+  return id in cache;
+};
+const set = value => {
+  cache[id] = value;
+};
+
+// TODO getExtensions is still called 6 times on startup instead of 1
+const getExtensions = () => {
+  if (!has()) {
+    set(getExtensions$1());
+  }
+  return get();
+};
+
+const getColorThemeJson$2 = async colorThemeId => {
+  const extensions = await getExtensions();
+  const colorThemeUri = getColorThemeUri(extensions, colorThemeId);
+  const json = await readJson(colorThemeUri);
+  return json;
+};
+
 const getColorThemeUrlWeb = colorThemeId => {
   return `${assetDir}/extensions/builtin.theme-${colorThemeId}/color-theme.json`;
 };
@@ -3645,7 +3761,7 @@ const setThemeColor = async themeColor => {
 // TODO by default color theme should come from local storage, session storage, cache storage, indexeddb or blob url -> fast initial load
 // actual color theme can be computed after workbench has loaded (most times will be the same and doesn't need to be computed)
 
-const state$5 = {
+const state$4 = {
   watchedTheme: ''
 };
 const FALLBACK_COLOR_THEME_ID = 'slime';
@@ -3656,7 +3772,7 @@ const FALLBACK_COLOR_THEME_ID = 'slime';
 const applyColorTheme = async colorThemeId => {
   try {
     string(colorThemeId);
-    state$5.colorTheme = colorThemeId;
+    state$4.colorTheme = colorThemeId;
     const colorThemeCss = await getColorThemeCss(colorThemeId);
     await addCssStyleSheet('ContributedColorTheme', colorThemeCss);
     if (platform === Web) {
@@ -3671,10 +3787,10 @@ const applyColorTheme = async colorThemeId => {
   }
 };
 const watch = async id => {
-  if (state$5.watchedTheme === id) {
+  if (state$4.watchedTheme === id) {
     return;
   }
-  state$5.watchedTheme = id;
+  state$4.watchedTheme = id;
   await invoke$2('ExtensionHost.watchColorTheme', id);
 };
 const getPreferredColorTheme = () => {
@@ -3709,11 +3825,11 @@ const getConfiguredIframeWorkerUrl = async () => {
   return configuredWorkerUrl;
 };
 
-const state$4 = {
+const state$3 = {
   id: 0
 };
 const create$1 = () => {
-  return ++state$4.id;
+  return ++state$3.id;
 };
 
 const commandMap$1 = {
@@ -4467,21 +4583,6 @@ const getMimeType = fileExtension => {
   }
 };
 
-const dirname = (pathSeparator, path) => {
-  const index = path.lastIndexOf(pathSeparator);
-  if (index === -1) {
-    return path;
-  }
-  return path.slice(0, index);
-};
-const extname = path => {
-  const index = path.lastIndexOf('.');
-  if (index === -1) {
-    return '';
-  }
-  return path.slice(index);
-};
-
 const getContentType = uri => {
   const extension = extname(uri);
   const mime = getMimeType(extension);
@@ -4490,11 +4591,11 @@ const getContentType = uri => {
 
 // TODO move this to an extension?
 
-const state$3 = {
+const state$2 = {
   files: Object.create(null)
 };
 const getDirent = uri => {
-  return state$3.files[uri];
+  return state$2.files[uri];
 };
 const readFile = uri => {
   const dirent = getDirent(uri);
@@ -4511,7 +4612,7 @@ const ensureParentDir = uri => {
   let endIndex = uri.indexOf(Slash);
   while (endIndex >= 0) {
     const part = uri.slice(startIndex, endIndex + 1);
-    state$3.files[part] = {
+    state$2.files[part] = {
       type: Directory$1,
       content: ''
     };
@@ -4526,7 +4627,7 @@ const writeFile = (uri, content) => {
     dirent.content = content;
   } else {
     ensureParentDir(uri);
-    state$3.files[uri] = {
+    state$2.files[uri] = {
       type: File$1,
       content
     };
@@ -4537,20 +4638,20 @@ const mkdir = uri => {
     uri += Slash;
   }
   ensureParentDir(uri);
-  state$3.files[uri] = {
+  state$2.files[uri] = {
     type: Directory$1,
     content: ''
   };
 };
 const remove = uri => {
   const toDelete = [];
-  for (const key of Object.keys(state$3.files)) {
+  for (const key of Object.keys(state$2.files)) {
     if (key.startsWith(uri)) {
       toDelete.push(key);
     }
   }
   for (const key of toDelete) {
-    delete state$3.files[key];
+    delete state$2.files[key];
   }
 };
 const readDirWithFileTypes = uri => {
@@ -4558,7 +4659,7 @@ const readDirWithFileTypes = uri => {
     uri += Slash;
   }
   const dirents = [];
-  for (const [key, value] of Object.entries(state$3.files)) {
+  for (const [key, value] of Object.entries(state$2.files)) {
     if (key.startsWith(uri)) {
       // @ts-ignore
       switch (value.type) {
@@ -4602,15 +4703,7 @@ const chmod = () => {
   throw new Error('[memfs] chmod not implemented');
 };
 const getFiles = () => {
-  return state$3.files;
-};
-
-const state$2 = {
-  webExtensions: []
-};
-
-const readJson = url => {
-  return invoke$2('FileSystem.readJson', url);
+  return state$2.files;
 };
 
 const findMatchingIconThemeExtension = (extensions, iconThemeId) => {
@@ -4629,76 +4722,6 @@ const findMatchingIconThemeExtension = (extensions, iconThemeId) => {
   return undefined;
 };
 
-const webExtensionsUrl = `${assetDir}/config/webExtensions.json`;
-
-const getSharedProcessExtensions$1 = () => {
-  return invoke$2(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
-};
-const getStaticWebExtensions = () => {
-  return getJson(webExtensionsUrl);
-};
-const getWebExtensionsWeb = async () => {
-  const staticWebExtensions = await getStaticWebExtensions();
-  return [...staticWebExtensions, ...state$2.webExtensions];
-};
-const isWebExtension = extension => {
-  return extension && typeof extension.browser === 'string';
-};
-const getWebExtensionsDefault = async () => {
-  const staticWebExtensions = await getStaticWebExtensions();
-  const sharedProcessExtensions = await getSharedProcessExtensions$1();
-  const sharedProcessWebExtensions = sharedProcessExtensions.filter(isWebExtension);
-  return [...staticWebExtensions, sharedProcessWebExtensions, ...state$2.webExtensions];
-};
-const getWebExtensions = async () => {
-  try {
-    switch (platform) {
-      case Web:
-        return await getWebExtensionsWeb();
-      default:
-        return await getWebExtensionsDefault();
-    }
-  } catch {
-    return state$2.webExtensions;
-  }
-};
-
-const getSharedProcessExtensions = () => {
-  return invoke$2(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
-};
-const getExtensions$1 = async () => {
-  if (platform === Web) {
-    const webExtensions = await getWebExtensions();
-    return webExtensions;
-  }
-  if (platform === Remote) {
-    const webExtensions = await getWebExtensions();
-    const sharedProcessExtensions = await getSharedProcessExtensions();
-    return [...sharedProcessExtensions, ...webExtensions];
-  }
-  const extensions = await getSharedProcessExtensions();
-  return extensions;
-};
-
-const cache = Object.create(null);
-const id = 1;
-const get = () => {
-  return cache[id];
-};
-const has = () => {
-  return id in cache;
-};
-const set = value => {
-  cache[id] = value;
-};
-
-const getExtensions = () => {
-  if (!has()) {
-    set(getExtensions$1());
-  }
-  return get();
-};
-
 const getIconThemeUrl = iconThemeId => {
   return `${assetDir}/extensions/builtin.${iconThemeId}/icon-theme.json`;
 };
@@ -4712,7 +4735,7 @@ const getIconThemeJson = async iconThemeId => {
       extensionPath: `${assetDir}/extensions/builtin.${iconThemeId}`
     };
   }
-  for (const webExtension of state$2.webExtensions) {
+  for (const webExtension of state$5.webExtensions) {
     if (webExtension.iconThemes) {
       for (const iconTheme of webExtension.iconThemes) {
         // TODO handle error when icon theme path is not of type string
@@ -4893,6 +4916,51 @@ const getHandle$1 = async uri => {
   return handle;
 };
 
+const getLanguagesFromExtension = extension => {
+  // 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?
+  if (!extension) {
+    return [];
+  }
+  if (!extension.languages) {
+    return [];
+  }
+  const extensionPath = extension.path;
+  const getLanguageFromExtension = language => {
+    if (language.tokenize) {
+      if (typeof language.tokenize !== 'string') {
+        console.warn(`[info] ${language.id}: language.tokenize must be of type string but was of type ${typeof language.tokenize}`);
+        return {
+          ...language,
+          extensionPath,
+          tokenize: ''
+        };
+      }
+      return {
+        ...language,
+        extensionPath,
+        tokenize: `${extensionPath}/${language.tokenize}`
+      };
+    }
+    return language;
+  };
+  return extension.languages.map(getLanguageFromExtension);
+};
+
+const getLanguages = async () => {
+  try {
+    const extensions = await getExtensions();
+    const languages = extensions.flatMap(getLanguagesFromExtension);
+    console.log({
+      languages
+    });
+    return languages;
+  } catch (error) {
+    throw new VError(error, 'Failed to load languages');
+  }
+};
+
 const loadWebView = async (providerId, savedState) => {
   const rpc = getWebView(providerId);
   await rpc.provider.create(rpc, rpc.uri, savedState);
@@ -5253,6 +5321,8 @@ const textSearch = async (scheme, root, query, options, assetDir) => {
 
 const commandMap = {
   'BulkReplacement.applyBulkReplacement': applyBulkReplacement,
+  'ColorTheme.getColorThemeCssFromJson': getColorThemeCssFromJson,
+  'ColorTheme.getColorThemeJson': getColorThemeJson,
   'ColorTheme.hydrate': hydrate$1,
   'ExtensionHost.launchIframeWorker': launchIframeWorker,
   'ExtensionHostRename.executeprepareRenameProvider': executeprepareRenameProvider,
@@ -5265,6 +5335,7 @@ const commandMap = {
   'FileSystemFetch.remove': remove$1,
   'FileSystemFetch.writeFile': writeFile$1,
   'FileSystemMemory.chmod': chmod,
+  'Languages.getLanguages': getLanguages,
   'FileSystemMemory.getBlob': getBlob,
   'FileSystemMemory.getBlobUrl': getBlobUrl,
   'FileSystemMemory.getFiles': getFiles,
@@ -5273,8 +5344,8 @@ const commandMap = {
   'FileSystemMemory.readFile': readFile,
   'FileSystemMemory.remove': remove,
   'FileSystemMemory.writeFile': writeFile,
-  'IconTheme.getState': getState,
   'IconTheme.getJson': getIconThemeJson,
+  'IconTheme.getState': getState,
   'IconTheme.hydrate': hydrate,
   'IconTheme.setIconTheme': setIconTheme,
   'IndexedDb.addHandle': addHandle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "main": "dist/extensionHostWorkerMain.js",
   "type": "module",