@lvce-editor/server 0.3.0 → 0.4.0

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/Module/Module.js

@@ -2,111 +2,111 @@ import * as ModuleId from '../ModuleId/ModuleId.js'
 
 export const load = (moduleId) => {
   switch (moduleId) {
-    case ModuleId.ContextMenu:
-      return import('../ContextMenu/ContextMenu.ipc.js')
-    case ModuleId.Notification:
-      return import('../Notification/Notification.ipc.js')
-    case ModuleId.Window:
-      return import('../Window/Window.ipc.js')
-    case ModuleId.ContextMenu:
-      return import('../ContextMenu/ContextMenu.ipc.js')
-    case ModuleId.Layout:
-      return import('../Layout/Layout.ipc.js')
-    case ModuleId.Viewlet:
-      return import('../Viewlet/Viewlet.ipc.js')
-    case ModuleId.Workbench:
-      return import('../Workbench/Workbench.ipc.js')
-    case ModuleId.ViewletQuickPick:
-      return import('../ViewletQuickPick/ViewletQuickPick.ipc.js')
-    case ModuleId.FindWidget:
-      return import('../FindWidget/FindWidget.ipc.js')
-    case ModuleId.Preferences:
-      return import('../Preferences/Preferences.ipc.js')
-    case ModuleId.Developer:
-      return import('../Developer/Developer.ipc.js')
-    case ModuleId.KeyBindings:
-      return import('../KeyBindings/KeyBindings.ipc.js')
-    case ModuleId.ColorPicker:
-      return import('../ColorPicker/ColorPicker.ipc.js')
-    case ModuleId.ClipBoard:
-      return import('../ClipBoard/ClipBoard.ipc.js')
     case ModuleId.Ajax:
       return import('../Ajax/Ajax.ipc.js')
-    case ModuleId.Format:
-      return import('../Format/Format.ipc.js')
-    case ModuleId.ColorTheme:
-      return import('../ColorTheme/ColorTheme.ipc.js')
-    case ModuleId.IconTheme:
-      return import('../IconTheme/IconTheme.ipc.js')
-    case ModuleId.Menu:
-      return import('../Menu/Menu.ipc.js')
-    case ModuleId.TitleBarMenu:
-      return import('../TitleBarMenuBar/TitleBarMenuBar.ipc.js')
-    case ModuleId.ErrorHandling:
-      return import('../ErrorHandling/ErrorHandling.ipc.js')
-    case ModuleId.Navigatiom:
-      return import('../Navigation/Navigation.ipc.js')
+    case ModuleId.Audio:
+      return import('../Audio/Audio.ipc.js')
+    case ModuleId.Base64:
+      return import('../Base64/Base64.ipc.js')
+    case ModuleId.Blob:
+      return import('../Blob/Blob.ipc.js')
     case ModuleId.CacheStorage:
       return import('../CacheStorage/CacheStorage.ipc.js')
-    case ModuleId.LocalStorage:
-      return import('../LocalStorage/LocalStorage.ipc.js')
-    case ModuleId.SessionStorage:
-      return import('../SessionStorage/SessionStorage.ipc.js')
     case ModuleId.Callback:
       return import('../Callback/Callback.ipc.js')
-    case ModuleId.Dialog:
-      return import('../Dialog/Dialog.ipc.js')
-    case ModuleId.Workspace:
-      return import('../Workspace/Workspace.ipc.js')
+    case ModuleId.ClipBoard:
+      return import('../ClipBoard/ClipBoard.ipc.js')
+    case ModuleId.ColorPicker:
+      return import('../ColorPicker/ColorPicker.ipc.js')
+    case ModuleId.ColorTheme:
+      return import('../ColorTheme/ColorTheme.ipc.js')
     case ModuleId.ColorThemeFromJson:
       return import('../ColorThemeFromJson/ColorThemeFromJson.ipc.js')
-    case ModuleId.RecentlyOpened:
-      return import('../RecentlyOpened/RecentlyOpened.ipc.js')
-    case ModuleId.FileSystem:
-      return import('../FileSystem/FileSystem.ipc.js')
+    case ModuleId.ContentTracing:
+      return import('../ContentTracing/ContentTracing.ipc.js')
+    case ModuleId.ContextMenu:
+      return import('../ContextMenu/ContextMenu.ipc.js')
+    case ModuleId.Developer:
+      return import('../Developer/Developer.ipc.js')
+    case ModuleId.Dialog:
+      return import('../Dialog/Dialog.ipc.js')
+    case ModuleId.Download:
+      return import('../Download/Download.ipc.js')
     case ModuleId.EditorDiagnostics:
       return import('../EditorDiagnostics/EditorDiagnostics.ipc.js')
-    case ModuleId.EditorRename:
-      return import('../EditorRename/EditorRename.ipc.js')
     case ModuleId.EditorError:
       return import('../EditorError/EditorError.ipc.js')
+    case ModuleId.EditorRename:
+      return import('../EditorRename/EditorRename.ipc.js')
+    case ModuleId.ErrorHandling:
+      return import('../ErrorHandling/ErrorHandling.ipc.js')
+    case ModuleId.ExtensionHostCode:
+      return import('../ExtensionHost/ExtensionHostCore.ipc.js')
+    case ModuleId.ExtensionMeta:
+      return import('../ExtensionMeta/ExtensionMeta.ipc.js')
+    case ModuleId.Extensions:
+      return import('../Extensions/Extensions.ipc.js')
+    case ModuleId.FileSystem:
+      return import('../FileSystem/FileSystem.ipc.js')
+    case ModuleId.FindWidget:
+      return import('../FindWidget/FindWidget.ipc.js')
+    case ModuleId.Format:
+      return import('../Format/Format.ipc.js')
+    case ModuleId.IconTheme:
+      return import('../IconTheme/IconTheme.ipc.js')
+    case ModuleId.ImagePreview:
+      return import('../ImagePreview/ImagePreview.ipc.js')
+    case ModuleId.KeyBindings:
+      return import('../KeyBindings/KeyBindings.ipc.js')
     case ModuleId.KeyBindingsInitial:
       return import('../KeyBindingsInitial/KeyBindingsInitial.ipc.js')
+    case ModuleId.Layout:
+      return import('../Layout/Layout.ipc.js')
+    case ModuleId.Listener:
+      return import('../Listener/Listener.ipc.js')
+    case ModuleId.LocalStorage:
+      return import('../LocalStorage/LocalStorage.ipc.js')
+    case ModuleId.Menu:
+      return import('../Menu/Menu.ipc.js')
+    case ModuleId.Navigatiom:
+      return import('../Navigation/Navigation.ipc.js')
+    case ModuleId.Notification:
+      return import('../Notification/Notification.ipc.js')
+    case ModuleId.Open:
+      return import('../Open/Open.ipc.js')
+    case ModuleId.OpenNativeFolder:
+      return import('../OpenNativeFolder/OpenNativeFolder.ipc.js')
+    case ModuleId.Preferences:
+      return import('../Preferences/Preferences.ipc.js')
+    case ModuleId.RecentlyOpened:
+      return import('../RecentlyOpened/RecentlyOpened.ipc.js')
     case ModuleId.SaveState:
       return import('../SaveState/SaveState.ipc.js')
     case ModuleId.ServiceWorker:
       return import('../ServiceWorker/ServiceWorker.ipc.js')
-    case ModuleId.ImagePreview:
-      return import('../ImagePreview/ImagePreview.ipc.js')
-    case ModuleId.Base64:
-      return import('../Base64/Base64.ipc.js')
-    case ModuleId.Blob:
-      return import('../Blob/Blob.ipc.js')
-    case ModuleId.Open:
-      return import('../Open/Open.ipc.js')
-    case ModuleId.Audio:
-      return import('../Audio/Audio.ipc.js')
-    case ModuleId.Listener:
-      return import('../Listener/Listener.ipc.js')
     case ModuleId.SessionReplay:
       return import('../SessionReplay/SessionReplay.ipc.js')
-    case ModuleId.Download:
-      return import('../Download/Download.ipc.js')
-    case ModuleId.ExtensionHostCode:
-      return import('../ExtensionHost/ExtensionHostCore.ipc.js')
-    case ModuleId.ExtensionMeta:
-      return import('../ExtensionMeta/ExtensionMeta.ipc.js')
+    case ModuleId.SessionStorage:
+      return import('../SessionStorage/SessionStorage.ipc.js')
     case ModuleId.Test:
       return import('../Test/Test.ipc.js')
     case ModuleId.TestFramework:
       return import('../TestFrameWork/TestFrameWork.js')
     case ModuleId.TestFrameworkComponent:
       return import('../TestFrameWorkComponent/TestFrameWorkComponent.js')
-    case ModuleId.Extensions:
-      return import('../Extensions/Extensions.ipc.js')
-    case ModuleId.ContentTracing:
-      return import('../ContentTracing/ContentTracing.ipc.js')
+    case ModuleId.TitleBarMenu:
+      return import('../TitleBarMenuBar/TitleBarMenuBar.ipc.js')
+    case ModuleId.Viewlet:
+      return import('../Viewlet/Viewlet.ipc.js')
+    case ModuleId.ViewletQuickPick:
+      return import('../ViewletQuickPick/ViewletQuickPick.ipc.js')
+    case ModuleId.Window:
+      return import('../Window/Window.ipc.js')
+    case ModuleId.Workbench:
+      return import('../Workbench/Workbench.ipc.js')
+    case ModuleId.Workspace:
+      return import('../Workspace/Workspace.ipc.js')
     default:
-      throw new Error(`unknown module "${moduleId}"`)
+      throw new Error(`module ${moduleId} not found`)
   }
 }

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/ModuleId/ModuleId.js

@@ -53,3 +53,4 @@ export const Window = 51
 export const Workbench = 52
 export const Workspace = 53
 export const ContentTracing = 55
+export const OpenNativeFolder = 56

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/ModuleMap/ModuleMap.js

@@ -32,6 +32,9 @@ export const getModuleId = (commandId) => {
       return ModuleId.ColorTheme
     case 'ColorThemeFromJson.createColorThemeFromJson':
       return ModuleId.ColorThemeFromJson
+    case 'ContentTracing.start':
+    case 'ContentTracing.stop':
+      return ModuleId.ContentTracing
     case 'ContextMenu.focusFirst':
     case 'ContextMenu.focusLast':
     case 'ContextMenu.focusNext':
@@ -168,9 +171,10 @@ export const getModuleId = (commandId) => {
     case 'Notification.handleClick':
     case 'Notification.showWithOptions':
       return ModuleId.Notification
-    case 'Open.openNativeFolder':
     case 'Open.openUrl':
       return ModuleId.Open
+    case 'OpenNativeFolder.openNativeFolder':
+      return ModuleId.OpenNativeFolder
     case 'Preferences.hydrate':
     case 'Preferences.openKeyBindingsJson':
     case 'Preferences.openSettingsJson':
@@ -246,9 +250,6 @@ export const getModuleId = (commandId) => {
     case 'Workspace.setPath':
     case 'Workspace.setUri':
       return ModuleId.Workspace
-    case 'ContentTracing.start':
-    case 'ContentTracing.stop':
-      return ModuleId.ContentTracing
     default:
       throw new Error(`command ${commandId} not found`)
   }

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/Open/Open.ipc.js

@@ -1,6 +1,5 @@
 import * as Open from './Open.js'
 
 export const Commands = {
-  'Open.openNativeFolder': Open.openNativeFolder,
   'Open.openUrl': Open.openUrl,
 }

package/static/de5e461/packages/renderer-worker/src/parts/Open/Open.js

@@ -0,0 +1,29 @@
+import * as ElectronWindow from '../ElectronWindow/ElectronWindow.js'
+import * as Platform from '../Platform/Platform.js'
+import * as PlatformType from '../PlatformType/PlatformType.js'
+import * as RendererProcess from '../RendererProcess/RendererProcess.js'
+import { VError } from '../VError/VError.js'
+
+const openUrlWeb = async (url) => {
+  try {
+    await RendererProcess.invoke(
+      /* Open.openUrl */ 'Open.openUrl',
+      /* url */ url
+    )
+  } catch (error) {
+    throw new VError(error, `Failed to open url ${url}`)
+  }
+}
+
+const openUrlElectron = async (url) => {
+  await ElectronWindow.openNew(url)
+}
+
+export const openUrl = async (url) => {
+  switch (Platform.platform) {
+    case PlatformType.Electron:
+      return openUrlElectron(url)
+    default:
+      return openUrlWeb(url)
+  }
+}

package/static/de5e461/packages/renderer-worker/src/parts/OpenNativeFolder/OpenNativeFolder.ipc.js

@@ -0,0 +1,5 @@
+import * as OpenNativeFolder from './OpenNativeFolder.js'
+
+export const Commands = {
+  'OpenNativeFolder.openNativeFolder': OpenNativeFolder.openNativeFolder,
+}

package/static/{37517d2/packages/renderer-worker/src/parts/Open/Open.js → de5e461/packages/renderer-worker/src/parts/OpenNativeFolder/OpenNativeFolder.js}

@@ -36,14 +36,3 @@ export const openNativeFolder = async (absolutePath) => {
       return
   }
 }
-
-export const openUrl = async (url) => {
-  try {
-    await RendererProcess.invoke(
-      /* Open.openUrl */ 'Open.openUrl',
-      /* url */ url
-    )
-  } catch (error) {
-    throw new VError(error, `Failed to open url ${url}`)
-  }
-}

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/Platform/Platform.js

@@ -12,7 +12,7 @@ export const isMobileOrTablet = () => {
   }
   // @ts-ignore
   const userAgentData = navigator.userAgentData
-  if (userAgentData && userAgentData.mobile) {
+  if (userAgentData && userAgentData.mobile === true) {
     return true
   }
   // copied from https://stackoverflow.com/questions/11381673/detecting-a-mobile-browser
@@ -106,9 +106,9 @@ export const platform = getPlatform()
 
 export const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/37517d2' !== 'undefined') {
+  if (typeof '/de5e461' !== 'undefined') {
     // @ts-ignore
-    return '/37517d2'
+    return '/de5e461'
   }
   if (getPlatform() === PlatformType.Electron) {
     return '../../../../..'

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/QuickPick/QuickPickFile.js

@@ -1,5 +1,5 @@
 import * as Command from '../Command/Command.js'
-import * as Languages from '../Languages/Languages.js'
+import * as IconTheme from '../IconTheme/IconTheme.js'
 import * as SearchFile from '../SearchFile/SearchFile.js'
 import * as Workspace from '../Workspace/Workspace.js'
 
@@ -15,13 +15,16 @@ const openUri = (path) => {
   return Command.execute(/* Main.openUri */ 'Main.openUri', /* uri */ path)
 }
 
+const getIcon = (file) => {
+  const baseName = Workspace.pathBaseName(file)
+  return IconTheme.getFileIcon({ name: baseName })
+}
+
 const toPick = (file) => {
+  const icon = getIcon(file)
   return {
     label: file,
-    dataset: {
-      // TODO compute language id lazily on demand inside renderer process (don't compute for hidden items)
-      languageId: Languages.getLanguageId(file),
-    },
+    icon,
   }
 }
 

package/static/de5e461/packages/renderer-worker/src/parts/SafeTokenizeLine/SafeTokenizeLine.js

@@ -0,0 +1,39 @@
+const flattenTokensArray = (tokens) => {
+  const flattened = []
+  for (const token of tokens) {
+    flattened.push(token.type, token.length)
+  }
+  return flattened
+}
+/**
+ *
+ * @param {(line:string, lineState)=>any} tokenizeLine
+ * @param {string} line
+ * @param {any} lineStateAtStart
+ * @param {boolean} hasArrayReturn
+ * @returns
+ */
+export const safeTokenizeLine = (
+  tokenizeLine,
+  line,
+  lineStateAtStart,
+  hasArrayReturn
+) => {
+  try {
+    const lineState = tokenizeLine(line, lineStateAtStart)
+    if (!lineState || !lineState.tokens || !lineState.state) {
+      throw new Error('invalid tokenization result')
+    }
+    if (!hasArrayReturn) {
+      // workaround for old tokenizers
+      lineState.tokens = flattenTokensArray(lineState.tokens)
+    }
+    return lineState
+  } catch (error) {
+    console.error(error)
+    return {
+      tokens: [/* type */ 0, /* length */ line.length],
+      lineState: lineStateAtStart,
+    }
+  }
+}

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/SaveState/SaveState.js

@@ -22,7 +22,6 @@ const getStateToSave = () => {
 }
 
 export const handleVisibilityChange = async (visibilityState) => {
-  console.log('[renderer worker] visibility changed to', visibilityState)
   if (visibilityState === 'hidden') {
     const stateToSave = getStateToSave()
     await Promise.all([

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/SessionReplay/SessionReplay.js

@@ -69,6 +69,9 @@ export const replaySession = async (sessionId) => {
   RendererProcess.state.ipc.send = () => {}
   RendererProcess.state.ipc.onmessage = (event) => {
     const data = event.data
+    if (typeof data === 'string') {
+      return
+    }
     if ('result' in data) {
       callbacks[data.id].resolve(data.result)
     } else if ('error' in data) {
@@ -117,10 +120,7 @@ export const getEvents = async (sessionId) => {
     )
     return events
   } catch (error) {
-    ErrorHandling.handleError(error)
-    // console.info(`failed to get events from indexeddb: ${error}`)
-    // ignore
-    return []
+    throw new VError(error, `failed to get session replay events`)
   }
 }
 

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/TestFrameWork/TestFrameWork.js

@@ -138,6 +138,12 @@ export const expect = (locator) => {
         className,
       })
     },
+    async toHaveId(id) {
+      Assert.string(id, 'id must be of type string')
+      return await this.checkSingleElementCondition('toHaveId', {
+        id,
+      })
+    },
     async toHaveCount(count) {
       Assert.number(count, 'count must be of type string')
       return this.checkMultiElementCondition('toHaveCount', { count })

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/TestFrameWorkComponent/TestFrameWorkComponentQuickPick.js

@@ -12,6 +12,14 @@ export const focusNext = async () => {
   await Command.execute('QuickPick.focusNext')
 }
 
+export const focusIndex = async (index) => {
+  await Command.execute('QuickPick.focusIndex', index)
+}
+
+export const focusPrevious = async () => {
+  await Command.execute('QuickPick.focusPrevious')
+}
+
 export const selectItem = async (label) => {
   await Command.execute('QuickPick.selectItem', label)
 }

package/static/{37517d2 → de5e461}/packages/renderer-worker/src/parts/VError/VError.js

@@ -6,7 +6,9 @@ const getCombinedMessage = (error, message) => {
 }
 
 const mergeStacks = (parent, child) => {
-  console.log({ parent, child })
+  if (!child) {
+    return parent
+  }
   let i = 1
   const childLines = child.split('\n')
   const parentLines = parent.split('\n')
@@ -17,16 +19,11 @@ const mergeStacks = (parent, child) => {
     if (
       childLines[childLinesLength - i] !== parentLines[parentLinesLength - i]
     ) {
-      console.log({
-        linesDifferent: childLines[childLinesLength - i],
-        b: parentLines[parentLinesLength - i],
-      })
       break
     }
   }
   const topPart = parentLines.slice(0, parentLinesLength - i + 1)
   const bottomPart = childLines.slice(childLinesLength - i)
-  console.log({ i, topPart, bottomPart, minLines })
   const combined = topPart.join('\n') + '\n' + bottomPart.join('\n')
   return combined
 }