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

package/dist/extensionHostWorkerMain.js

@@ -89,7 +89,7 @@ const fn = value => {
   }
 };
 
-const state$e = {
+const state$f = {
   /** @type{any[]} */
   onDidOpenEditorListeners: [],
   /** @type{any[]} */
@@ -101,19 +101,19 @@ const state$e = {
   textDocuments: Object.create(null)
 };
 const setDocument = (textDocumentId, textDocument) => {
-  state$e.textDocuments[textDocumentId] = textDocument;
+  state$f.textDocuments[textDocumentId] = textDocument;
 };
 const getDidOpenListeners = () => {
-  return state$e.onDidSaveTextDocumentListeners;
+  return state$f.onDidSaveTextDocumentListeners;
 };
 const getWillChangeListeners = () => {
-  return state$e.onWillChangeEditorListeners;
+  return state$f.onWillChangeEditorListeners;
 };
 const getDidChangeListeners = () => {
-  return state$e.onDidChangeTextDocumentListeners;
+  return state$f.onDidChangeTextDocumentListeners;
 };
 const getDocument = textDocumentId => {
-  return state$e.textDocuments[textDocumentId];
+  return state$f.textDocuments[textDocumentId];
 };
 
 const getOffset$1 = (textDocument, position) => {
@@ -675,7 +675,7 @@ const executeOrganizeImports = async uid => {
   return edits;
 };
 
-const state$d = {
+const state$e = {
   commands: Object.create(null)
 };
 const getCommandDisplay = command => {
@@ -698,10 +698,10 @@ const registerCommand = command => {
     if (!command.execute) {
       throw new Error('command is missing execute function');
     }
-    if (command.id in state$d.commands) {
+    if (command.id in state$e.commands) {
       throw new Error(`command cannot be registered multiple times`);
     }
-    state$d.commands[command.id] = command;
+    state$e.commands[command.id] = command;
   } catch (error) {
     const commandDisplayId = getCommandDisplay(command);
     throw new VError(error, `Failed to register command${commandDisplayId}`);
@@ -709,7 +709,7 @@ const registerCommand = command => {
 };
 const executeCommand = async (id, ...args) => {
   try {
-    const command = state$d.commands[id];
+    const command = state$e.commands[id];
     if (!command) {
       throw new Error(`command ${id} not found`);
     }
@@ -748,40 +748,40 @@ const {
   }]
 });
 
-const state$c = {
+const state$d = {
   configuration: Object.create(null)
 };
 const getConfiguration = key => {
-  return state$c.configuration[key] ?? '';
+  return state$d.configuration[key] ?? '';
 };
 const setConfigurations = preferences => {
-  state$c.configuration = preferences;
+  state$d.configuration = preferences;
 };
 
-const state$b = {
+const state$c = {
   rpc: undefined
 };
 const invoke$2 = (method, ...params) => {
-  const rpc = state$b.rpc;
+  const rpc = state$c.rpc;
   return rpc.invoke(method, ...params);
 };
 const send$1 = (method, ...params) => {
-  const rpc = state$b.rpc;
+  const rpc = state$c.rpc;
   return rpc.send(method, ...params);
 };
 const invokeAndTransfer$1 = (method, ...params) => {
-  const rpc = state$b.rpc;
+  const rpc = state$c.rpc;
   return rpc.invokeAndTransfer(method, ...params);
 };
 const setRpc = rpc => {
-  state$b.rpc = rpc;
+  state$c.rpc = rpc;
 };
 
-const state$a = {
+const state$b = {
   debugProviderMap: Object.create(null)
 };
 const getDebugProvider = id => {
-  const provider = state$a.debugProviderMap[id];
+  const provider = state$b.debugProviderMap[id];
   if (!provider) {
     // @ts-ignore
     throw new VError(`no debug provider "${id}" found`);
@@ -792,7 +792,7 @@ const registerDebugProvider = debugProvider => {
   if (!debugProvider.id) {
     throw new Error('Failed to register debug system provider: missing id');
   }
-  state$a.debugProviderMap[debugProvider.id] = debugProvider;
+  state$b.debugProviderMap[debugProvider.id] = debugProvider;
 };
 const start = async (protocol, path) => {
   try {
@@ -2551,17 +2551,17 @@ const {
   }
 });
 
-const state$9 = {
+const state$a = {
   providers: Object.create(null)
 };
 const registerSourceControlProvider = provider => {
-  state$9.providers[provider.id] = provider;
+  state$a.providers[provider.id] = provider;
 };
 const getFilesFromProvider = provider => {
   return provider.getChangedFiles();
 };
 const getChangedFiles = async providerId => {
-  const provider = state$9.providers[providerId];
+  const provider = state$a.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
@@ -2572,7 +2572,7 @@ const getChangedFiles = async providerId => {
 const getFileBefore = async (providerId, uri) => {
   string(providerId);
   string(uri);
-  const provider = state$9.providers[providerId];
+  const provider = state$a.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
@@ -2594,7 +2594,7 @@ const getGroupsFromProvider = async (provider, cwd) => {
   throw new Error('source control provider is missing required function getGroups');
 };
 const getGroups = async (providerId, cwd) => {
-  const provider = state$9.providers[providerId];
+  const provider = state$a.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
@@ -2602,14 +2602,14 @@ const getGroups = async (providerId, cwd) => {
   return groups;
 };
 const acceptInput = async (providerId, value) => {
-  const provider = state$9.providers[providerId];
+  const provider = state$a.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
   await provider.acceptInput(value);
 };
 const add = async path => {
-  const provider = Object.values(state$9.providers)[0];
+  const provider = Object.values(state$a.providers)[0];
   if (!provider) {
     return;
   }
@@ -2617,7 +2617,7 @@ const add = async path => {
   await provider.add(path);
 };
 const discard = async path => {
-  const provider = Object.values(state$9.providers)[0];
+  const provider = Object.values(state$a.providers)[0];
   if (!provider) {
     return;
   }
@@ -2627,7 +2627,7 @@ const discard = async path => {
 const getEnabledProviderIds = async (scheme, root) => {
   string(scheme);
   string(root);
-  const providers = Object.values(state$9.providers);
+  const providers = Object.values(state$a.providers);
   const enabledIds = [];
   for (const provider of providers) {
     // @ts-ignore
@@ -2656,7 +2656,7 @@ const {
   }
 });
 
-const state$8 = {
+const state$9 = {
   textSearchProviders: Object.create(null)
 };
 const registerTextSearchProvider = textSearchProvider => {
@@ -2667,14 +2667,14 @@ const registerTextSearchProvider = textSearchProvider => {
     if (!textSearchProvider.scheme) {
       throw new Error('textSearchProvider is missing scheme');
     }
-    state$8.textSearchProviders[textSearchProvider.scheme] = textSearchProvider;
+    state$9.textSearchProviders[textSearchProvider.scheme] = textSearchProvider;
   } catch (error) {
     throw new VError(error, 'Failed to register text search provider');
   }
 };
 const executeTextSearchProvider = async (scheme, query) => {
   try {
-    const textSearchProvider = state$8.textSearchProviders[scheme];
+    const textSearchProvider = state$9.textSearchProviders[scheme];
     if (!textSearchProvider) {
       throw new Error(`No text search provider for ${scheme} found`);
     }
@@ -2864,14 +2864,14 @@ const createWorker = async ({
   return rpc;
 };
 
-const state$7 = {
+const state$8 = {
   workspacePath: ''
 };
 const setWorkspacePath = path => {
-  state$7.workspacePath = path;
+  state$8.workspacePath = path;
 };
 const getWorkspaceFolder = path => {
-  return state$7.workspacePath;
+  return state$8.workspacePath;
 };
 
 class FormattingError extends Error {
@@ -3024,7 +3024,7 @@ const handleUnhandledRejection = event => {
   console.error(output);
 };
 
-const state$6 = {
+const state$7 = {
   /**
    * @type {any[]}
    */
@@ -3032,10 +3032,10 @@ const state$6 = {
 };
 const addError = error => {
   // @ts-ignore
-  state$6.errors.push(error);
+  state$7.errors.push(error);
 };
 const hasRecentErrors = () => {
-  return state$6.errors.length > 0;
+  return state$7.errors.length > 0;
 };
 const getRecentError = () => {
 };
@@ -3450,13 +3450,13 @@ const storeId = 'lvce-keyvalue';
 
 // TODO high memory usage in idb because of transactionDoneMap
 
-const state$5 = {
+const state$6 = {
   databases: Object.create(null),
   dbVersion: 2,
   cachedDb: undefined
 };
 const getDb$1 = async () => {
-  const db = await openDB(storeId, state$5.dbVersion, {
+  const db = await openDB(storeId, state$6.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains(storeId)) {
         await db.createObjectStore(storeId, {
@@ -3468,8 +3468,8 @@ const getDb$1 = async () => {
   return db;
 };
 const getDbMemoized$1 = async () => {
-  state$5.cachedDb ||= await getDb$1();
-  return state$5.cachedDb;
+  state$6.cachedDb ||= await getDb$1();
+  return state$6.cachedDb;
 };
 
 // TODO high memory usage in idb because of transactionDoneMap
@@ -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`;
 };
@@ -4321,7 +4437,7 @@ const mockRpc = () => {
 };
 
 const getStatusBarItems = async () => {
-  const providers = Object.values(state$9.providers);
+  const providers = Object.values(state$a.providers);
   const statusBarItems = [];
   for (const provider of providers) {
     // @ts-ignore
@@ -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);
@@ -4605,35 +4706,6 @@ const getFiles = () => {
   return state$2.files;
 };
 
-const getRpcInfo = rpcId => {
-  const info = get$7(rpcId);
-  if (!info) {
-    throw new Error(`Rpc not found ${rpcId}`);
-  }
-  return info;
-};
-
-const handleBeforeUnload = () => {
-  // TODO save all webviews in localstorage
-  // cannot use indexeddb during unload
-  console.log('before unload');
-};
-
-const handleMessagePort = async port => {
-  await MessagePortRpcClient.create({
-    messagePort: port,
-    commandMap: {}
-  });
-};
-
-const state$1 = {
-  webExtensions: []
-};
-
-const readJson = url => {
-  return invoke$2('FileSystem.readJson', url);
-};
-
 const findMatchingIconThemeExtension = (extensions, iconThemeId) => {
   for (const extension of extensions) {
     if (extension && extension.iconThemes) {
@@ -4650,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$1.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$1.webExtensions];
-};
-const getWebExtensions = async () => {
-  try {
-    switch (platform) {
-      case Web:
-        return await getWebExtensionsWeb();
-      default:
-        return await getWebExtensionsDefault();
-    }
-  } catch {
-    return state$1.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`;
 };
@@ -4733,7 +4735,7 @@ const getIconThemeJson = async iconThemeId => {
       extensionPath: `${assetDir}/extensions/builtin.${iconThemeId}`
     };
   }
-  for (const webExtension of state$1.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
@@ -4759,11 +4761,49 @@ const getIconThemeJson = async iconThemeId => {
   };
 };
 
+const getRpcInfo = rpcId => {
+  const info = get$7(rpcId);
+  if (!info) {
+    throw new Error(`Rpc not found ${rpcId}`);
+  }
+  return info;
+};
+
+const handleBeforeUnload = () => {
+  // TODO save all webviews in localstorage
+  // cannot use indexeddb during unload
+  console.log('before unload');
+};
+
+const handleMessagePort = async port => {
+  await MessagePortRpcClient.create({
+    messagePort: port,
+    commandMap: {}
+  });
+};
+
 const handleIconThemeChange = async () => {
   await invoke$2('IconTheme.handleIconThemeChange');
 };
 
+const initialIconTheme = undefined;
+
+const state$1 = {
+  seenFiles: [],
+  seenFolders: [],
+  hasWarned: [],
+  /**
+   * @type{any}
+   */
+  iconTheme: initialIconTheme,
+  extensionPath: ''
+};
 const setTheme = iconTheme => {
+  state$1.iconTheme = iconTheme.json;
+  state$1.extensionPath = iconTheme.extensionPath;
+};
+const getState = () => {
+  return state$1;
 };
 
 const setIconTheme = async iconThemeId => {
@@ -4876,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);
@@ -5236,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,
@@ -5248,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,
@@ -5256,6 +5344,8 @@ const commandMap = {
   'FileSystemMemory.readFile': readFile,
   'FileSystemMemory.remove': remove,
   'FileSystemMemory.writeFile': writeFile,
+  '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.16.0",
+  "version": "3.18.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "main": "dist/extensionHostWorkerMain.js",
   "type": "module",