@lvce-editor/server 0.0.31 → 0.0.32

package/static/{0e4d46a → 37d2807}/packages/renderer-worker/src/parts/ErrorHandling/ErrorHandling.js

@@ -56,9 +56,15 @@ export const printError = (error) => {
   }
 }
 
-// TODO state is not needed here but because jest doesn't support mocking for esm yet this is a workaround
 export const state = {
-  async handleError(error) {
+  /**
+   * @type {string[]}
+   */
+  seenWarnings: [],
+}
+
+export const handleError = async (error) => {
+  try {
     printError(error)
     const enhancedErrorMessage = enhanceErrorMessage(error)
     await Command.execute(
@@ -66,20 +72,6 @@ export const state = {
       /* type */ 'error',
       /* text */ enhancedErrorMessage.message
     )
-  },
-  async showErrorDialog(error) {
-    const enhancedErrorMessage = enhanceErrorMessage(error)
-    await Command.execute(
-      /* Dialog.showMessage */ 'Dialog.showMessage',
-      /* message */ enhancedErrorMessage
-    )
-  },
-  seenWarnings: [],
-}
-
-export const handleError = async (error) => {
-  try {
-    await state.handleError(error)
   } catch {
     // ignore
   }
@@ -87,7 +79,11 @@ export const handleError = async (error) => {
 
 export const showErrorDialog = async (error) => {
   try {
-    await state.showErrorDialog(error)
+    const enhancedErrorMessage = enhanceErrorMessage(error)
+    await Command.execute(
+      /* Dialog.showMessage */ 'Dialog.showMessage',
+      /* message */ enhancedErrorMessage
+    )
   } catch {
     // ignore
   }

package/static/37d2807/packages/renderer-worker/src/parts/ExtensionHost/ExtensionHostTextSearch.js

@@ -0,0 +1,20 @@
+import * as Assert from '../Assert/Assert.js'
+import * as ExtensionHostShared from './ExtensionHostShared.js'
+
+const combineResults = (results) => {
+  return results[0]
+}
+
+export const executeTextSearchProvider = async (scheme, query) => {
+  const result = await ExtensionHostShared.executeProviders({
+    event: `onTextSearch:${scheme}`,
+    method: 'ExtensionHostTextSearch.executeTextSearchProvider',
+    params: [scheme, query],
+    noProviderFoundMessage: 'no text search providers found',
+    noProviderFoundResult: [],
+    combineResults,
+  })
+  Assert.array(result)
+  console.log({ result })
+  return result
+}

package/static/{0e4d46a → 37d2807}/packages/renderer-worker/src/parts/ExtensionHostIpc/ExtensionHostIpc.js

@@ -2,12 +2,16 @@ import * as Callback from '../Callback/Callback.js'
 import { JsonRpcError } from '../Errors/Errors.js'
 import * as JsonRpc from '../JsonRpc/JsonRpc.js'
 
+/**
+ * @enum {number}
+ */
 export const Methods = {
   SharedProcess: 1,
   ModuleWebWorker: 2,
   WebSocket: 3,
   Messageport: 4,
   ReferencePort: 5,
+  Electron: 6,
 }
 
 const getModule = (method) => {
@@ -22,6 +26,8 @@ const getModule = (method) => {
       return import('./ExtensionHostIpcWithReferencePort.js')
     case Methods.Messageport:
       return import('./ExtensionHostIpcWithMessagePort.js')
+    case Methods.Electron:
+      return import('./ExtensionHostIpcWithElectron.js')
     default:
       throw new Error(`unexpected extension host type: ${method}`)
   }
@@ -46,12 +52,14 @@ const restoreError = (error) => {
     return restoredError
   }
   const restoredError = new Error(error.message)
-  if (error.data.stack) {
-    restoredError.stack = error.data.stack
-  }
-  if (error.data.codeFrame) {
-    // @ts-ignore
-    restoredError.codeFrame = error.data.codeFrame
+  if (error.data) {
+    if (error.data.stack) {
+      restoredError.stack = error.data.stack
+    }
+    if (error.data.codeFrame) {
+      // @ts-ignore
+      restoredError.codeFrame = error.data.codeFrame
+    }
   }
   return restoredError
 }

package/static/37d2807/packages/renderer-worker/src/parts/ExtensionHostIpc/ExtensionHostIpcWithElectron.js

@@ -0,0 +1,8 @@
+import * as IpcParent from '../IpcParent/IpcParent.js'
+
+export const create = async () => {
+  return IpcParent.create({
+    method: IpcParent.Methods.Electron,
+    type: 'extension-host',
+  })
+}

package/static/{0e4d46a → 37d2807}/packages/renderer-worker/src/parts/ExtensionHostManagement/ExtensionHostManagement.js

@@ -9,6 +9,7 @@ import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 import * as ExtensionHostManagementBrowser from './ExtensionHostManagementBrowser.js'
 import * as ExtensionHostManagementNode from './ExtensionHostManagementNode.js'
 import * as ExtensionHostManagementShared from './ExtensionHostManagementShared.js'
+import * as ExtensionHostManagementElectron from './ExtensionHostManagementElectron.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 
 export const state = {
@@ -24,8 +25,9 @@ const getExtensionHostManagementTypes = () => {
     case 'web':
       return [ExtensionHostManagementBrowser]
     case 'remote':
-    case 'electron':
       return [ExtensionHostManagementBrowser, ExtensionHostManagementNode]
+    case 'electron':
+      return [ExtensionHostManagementBrowser, ExtensionHostManagementElectron]
     default:
       throw new Error('unsupported platform')
   }

package/static/37d2807/packages/renderer-worker/src/parts/ExtensionHostManagement/ExtensionHostManagementElectron.js

@@ -0,0 +1,9 @@
+import * as ExtensionHostIpc from '../ExtensionHostIpc/ExtensionHostIpc.js'
+
+export const name = 'nodeExtensionHost'
+
+export const ipc = ExtensionHostIpc.Methods.Electron
+
+export const canActivate = (extension) => {
+  return typeof extension.main === 'string'
+}

package/static/{0e4d46a → 37d2807}/packages/renderer-worker/src/parts/IconTheme/IconTheme.js

@@ -5,6 +5,7 @@ import * as Platform from '../Platform/Platform.js'
 import * as Preferences from '../Preferences/Preferences.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as SharedProcess from '../SharedProcess/SharedProcess.js'
+import { VError } from '../VError/VError.js'
 
 const CACHE_KEY = '/icon-theme.css'
 
@@ -65,9 +66,11 @@ export const getFileIcon = (file) => {
 
 export const getFolderIcon = (folder) => {
   const iconTheme = state.iconTheme
+  // @ts-ignore
   if (!iconTheme || !iconTheme.folderNames) {
     return ''
   }
+  // @ts-ignore
   const folderIcon = iconTheme.folderNames[folder.name.toLowerCase()]
   if (folderIcon) {
     return folderIcon
@@ -80,9 +83,11 @@ const getFolderIconExpanded = (folder) => {
   if (!iconTheme) {
     return ''
   }
+  // @ts-ignore
   if (!iconTheme.folderNamesExpanded) {
     return DEFAULT_FOLDER_ICON_OPEN
   }
+  // @ts-ignore
   const folderName = iconTheme.folderNamesExpanded[folder.name.toLowerCase()]
   if (folderName) {
     return folderName
@@ -164,8 +169,6 @@ export const hydrate = async () => {
     // GlobalEventBus.addListener('dirents.update', handleDirentsUpdate)
     // GlobalEventBus.addListener('languages.changed', handleLanguagesUpdate)
   } catch (error) {
-    // TODO
-    console.info(`[info] ${error.message}`)
-    // console.error(error)
+    console.error(new VError(error, `Failed to load icon theme`))
   }
 }

package/static/{0e4d46a → 37d2807}/packages/renderer-worker/src/parts/IpcParent/IpcParentWithElectron.js

@@ -1,13 +1,16 @@
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
+import * as Assert from '../Assert/Assert.js'
 
-export const create = async (url, name) => {
+export const create = async (options) => {
+  const type = options.type
+  Assert.string(type)
   const originalOnMessage = RendererProcess.state.ipc.onmessage
   const port = await new Promise((resolve, reject) => {
     RendererProcess.state.ipc.onmessage = (event) => {
       const port = event.ports[0]
       resolve(port)
     }
-    RendererProcess.state.ipc.send('get-port')
+    RendererProcess.state.ipc.send({ method: 'get-port', params: [type] })
   })
   RendererProcess.state.ipc.onmessage = originalOnMessage
   let handleMessage

package/static/{0e4d46a → 37d2807}/packages/renderer-worker/src/parts/Languages/Languages.js

@@ -5,19 +5,33 @@ import * as ExtensionHostLanguages from '../ExtensionHost/ExtensionHostLanguages
 import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 
 export const state = {
+  /**
+   * @type {any[]}
+   */
   languages: [],
   loadState: false,
   isHydrating: false,
 }
 
-export const getLanguageId = (path) => {
-  Assert.string(path)
-  const extension = path.slice(path.lastIndexOf('.'))
-  for (const language of state.languages) {
+export const getLanguageId = (fileName) => {
+  Assert.string(fileName)
+  const extension = fileName.slice(fileName.lastIndexOf('.'))
+  // console.log(state.languages)
+  const { languages } = state
+  for (const language of languages) {
     if (language.extensions && language.extensions.includes(extension)) {
       return language.id
     }
   }
+  for (const language of languages) {
+    if (
+      language.fileNames &&
+      Array.isArray(language.fileNames) &&
+      language.fileNames.includes(fileName)
+    ) {
+      return language.id
+    }
+  }
   return 'unknown'
 }
 
@@ -61,7 +75,7 @@ export const waitForLoad = async () => {
   if (state.isHydrating) {
     await new Promise((resolve) => {
       const handleLanguageChange = (editor, languageId) => {
-        resolve()
+        resolve(undefined)
       }
       // TODO remove event listener when promise is resolved
       // TODO what if this event is never emitted (e.g. languages fail to load)