@lvce-editor/server 0.9.2 → 0.10.0

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorer.js

@@ -178,7 +178,6 @@ const getExcluded = () => {
 
 export const loadContent = async (state, savedState) => {
   const root = state.root || Workspace.state.workspacePath
-  console.log({ root })
   // TODO path separator could be restored from saved state
   const pathSeparator = await getPathSeparator(root) // TODO only load path separator once
   const excluded = getExcluded()
@@ -188,7 +187,6 @@ export const loadContent = async (state, savedState) => {
     pathSeparator,
     excluded
   )
-  console.log({ restoredDirents })
   const { itemHeight, height } = state
   return {
     ...state,
@@ -1217,7 +1215,7 @@ const orderDirents = (dirents) => {
         dirent.depth === parent.depth + 1 &&
         dirent.path.startsWith(parent.path)
       ) {
-        children.push(dirent)
+        children.push(dirent, ...withDeepChildren(dirent))
       }
     }
     return [parent, ...children]
@@ -1228,9 +1226,31 @@ const orderDirents = (dirents) => {
   return ordered
 }
 
+const scrollInto = (index, minLineY, maxLineY) => {
+  const diff = maxLineY - minLineY
+  const smallerHalf = Math.floor(diff / 2)
+  const largerHalf = diff - smallerHalf
+  if (index < minLineY) {
+    return {
+      newMinLineY: index - smallerHalf,
+      newMaxLineY: index + largerHalf,
+    }
+  }
+  if (index >= maxLineY) {
+    return {
+      newMinLineY: index - smallerHalf,
+      newMaxLineY: index + largerHalf,
+    }
+  }
+  return {
+    newMinLineY: minLineY,
+    newMaxLineY: maxLineY,
+  }
+}
+
 // TODO maybe just insert items into explorer and refresh whole explorer
 const revealItemHidden = async (state, uri) => {
-  const { root, pathSeparator, items } = state
+  const { root, pathSeparator, items, minLineY, maxLineY } = state
   const pathParts = getPathParts(root, uri, pathSeparator)
   const pathPartsToReveal = getPathPartsToReveal(root, pathParts, items)
   const pathPartsChildren = await Promise.all(
@@ -1240,19 +1260,29 @@ const revealItemHidden = async (state, uri) => {
   const orderedPathParts = orderDirents(pathPartsChildrenFlat)
   const mergedDirents = mergeVisibleWithHiddenItems(items, orderedPathParts)
   const index = getIndex(mergedDirents, uri)
+  if (index === -1) {
+    throw new Error(`File not found in explorer ${uri}`)
+  }
+  const { newMinLineY, newMaxLineY } = scrollInto(index, minLineY, maxLineY)
   return {
     ...state,
     items: mergedDirents,
     focused: true,
     focusedIndex: index,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
   }
 }
 
 const revealItemVisible = (state, index) => {
+  const { minLineY, maxLineY } = state
+  const { newMinLineY, newMaxLineY } = scrollInto(index, minLineY, maxLineY)
   return {
     ...state,
     focused: true,
     focusedIndex: index,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
   }
 }
 

package/static/ce87b6f/packages/renderer-worker/src/parts/ViewletExtensionDetail/ViewletExtensionDetail.ipc.js

@@ -0,0 +1,9 @@
+import * as ViewletExtensionDetail from './ViewletExtensionDetail.js'
+
+// prettier-ignore
+export const Commands = {
+  'ExtensionDetail.handleIconError':  ViewletExtensionDetail.handleIconError,
+  'ExtensionDetail.handleReadmeContextMenu':  ViewletExtensionDetail.handleReadmeContextMenu,
+}
+
+export * from './ViewletExtensionDetail.js'

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletExtensionDetail/ViewletExtensionDetail.js

@@ -1,8 +1,10 @@
+import * as Command from '../Command/Command.js'
 import * as ExtensionDisplay from '../ExtensionDisplay/ExtensionDisplay.js'
 import * as ExtensionManagement from '../ExtensionManagement/ExtensionManagement.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as Icon from '../Icon/Icon.js'
 import * as MarkDown from '../Markdown/Markdown.js'
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as PlatformType from '../PlatformType/PlatformType.js'
@@ -83,6 +85,16 @@ export const handleIconError = (state) => {
   }
 }
 
+export const handleReadmeContextMenu = async (state, x, y) => {
+  await Command.execute(
+    /* ContextMenu.show */ 'ContextMenu.show',
+    /* x */ x,
+    /* y */ y,
+    /* id */ MenuEntryId.ExtensionDetailReadme
+  )
+  return state
+}
+
 export const hasFunctionalRender = true
 
 const renderName = {

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletExtensions/ViewletExtensions.ipc.js

@@ -1,4 +1,3 @@
-import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as ViewletExtensions from './ViewletExtensions.js'
 import * as LazyCommand from '../LazyCommand/LazyCommand.js'
 
@@ -21,7 +20,7 @@ const Imports = {
 
 // prettier-ignore
 export const Commands = {
-  'Extensions.closeSuggest': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.closeSuggest),
+  'Extensions.closeSuggest': ViewletExtensions.closeSuggest,
   'Extensions.focusFirst': LazyCommand.create(ViewletExtensions.name, Imports.FocusFirst, 'focusFirst'),
   'Extensions.focusIndex': LazyCommand.create(ViewletExtensions.name, Imports.FocusIndex, 'focusIndex'),
   'Extensions.focusLast': LazyCommand.create(ViewletExtensions.name, Imports.FocusLast, 'focusLast'),
@@ -32,19 +31,19 @@ export const Commands = {
   'Extensions.handleClick': LazyCommand.create(ViewletExtensions.name, Imports.HandleClick, 'handleClick'),
   'Extensions.handleClickCurrent': LazyCommand.create(ViewletExtensions.name, Imports.HandleClickCurrent, 'handleClickCurrent'),
   'Extensions.handleClickCurrentButKeepFocus': LazyCommand.create(ViewletExtensions.name, Imports.HandleClickCurrentButKeepFocus, 'handleClickCurrentButKeepFocus'),
-  'Extensions.handleContextMenu': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleContextMenu),
-  'Extensions.handleInput': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleInput),
-  'Extensions.handleInstall': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleInstall),
-  'Extensions.handleScrollBarClick': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleScrollBarClick),
-  'Extensions.handleScrollBarMove': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleScrollBarMove),
+  'Extensions.handleContextMenu': ViewletExtensions.handleContextMenu,
+  'Extensions.handleInput': ViewletExtensions.handleInput,
+  'Extensions.handleInstall': ViewletExtensions.handleInstall,
+  'Extensions.handleScrollBarClick': ViewletExtensions.handleScrollBarClick,
+  'Extensions.handleScrollBarMove': ViewletExtensions.handleScrollBarMove,
   'Extensions.handleTouchEnd':LazyCommand.create(ViewletExtensions.name, Imports.HandleTouchEnd, 'handleTouchEnd'),
   'Extensions.handleTouchMove':LazyCommand.create(ViewletExtensions.name, Imports.HandleTouchMove, 'handleTouchMove'),
   'Extensions.handleTouchStart': LazyCommand.create(ViewletExtensions.name, Imports.HandleTouchStart, 'handleTouchStart'),
-  'Extensions.handleUninstall': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleUninstall),
-  'Extensions.handleWheel': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.handleWheel),
-  'Extensions.openSuggest': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.openSuggest),
-  'Extensions.setDeltaY': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.setDeltaY),
-  'Extensions.toggleSuggest': Viewlet.wrapViewletCommand(ViewletExtensions.name, ViewletExtensions.toggleSuggest),
+  'Extensions.handleUninstall': ViewletExtensions.handleUninstall,
+  'Extensions.handleWheel': ViewletExtensions.handleWheel,
+  'Extensions.openSuggest': ViewletExtensions.openSuggest,
+  'Extensions.setDeltaY': ViewletExtensions.setDeltaY,
+  'Extensions.toggleSuggest': ViewletExtensions.toggleSuggest,
 }
 
 export * from './ViewletExtensions.js'

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletImplementations/ViewletImplementations.js

@@ -1,6 +1,5 @@
 import * as ExtensionHostImplementation from '../ExtensionHost/ExtensionHostImplementation.js'
 import * as TextDocument from '../TextDocument/TextDocument.js'
-import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as ViewletLocations from '../ViewletLocations/ViewletLocations.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 

package/static/ce87b6f/packages/renderer-worker/src/parts/ViewletKeyBindings/ViewletKeyBindings.ipc.js

@@ -0,0 +1,10 @@
+import * as ViewletKeyBindings from './ViewletKeyBindings.js'
+
+// prettier-ignore
+export const Commands = {
+  'KeyBindings.handleInput':ViewletKeyBindings.handleInput,
+  'KeyBindings.handleWheel':ViewletKeyBindings.handleWheel,
+  'KeyBindings.handleClick':ViewletKeyBindings.handleClick,
+}
+
+export * from './ViewletKeyBindings.js'

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletKeyBindings/ViewletKeyBindings.js

@@ -22,6 +22,8 @@ export const create = (id, uri, left, top, width, height) => {
     width,
     height,
     value: '',
+    selectedIndex: -1,
+    focusedIndex: -1,
   }
 }
 
@@ -120,6 +122,16 @@ export const handleWheel = (state, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY)
 }
 
+export const handleClick = (state, index) => {
+  const { minLineY } = state
+  const selectedIndex = minLineY + index
+  return {
+    ...state,
+    focusedIndex: selectedIndex,
+    selectedIndex,
+  }
+}
+
 export const hasFunctionalRender = true
 
 export * from './ViewletKeyBindingsRender.js'

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletKeyBindings/ViewletKeyBindingsRender.js

@@ -64,13 +64,29 @@ const tableCellProps = {
 
 const tableCell = td(tableCellProps, 1)
 
+const getRowClassName = (isEven, selected) => {
+  let className = ''
+  if (isEven) {
+    className += 'KeyBindingsTableRowEven'
+  } else {
+    className += 'KeyBindingsTableRowOdd'
+  }
+  if (selected) {
+    className += ' KeyBindingsTableRowSelected'
+  }
+  return className
+}
+
 const getTableRowDom = (keyBinding) => {
   const { children, childCount } = getKeyBindingCellChildren(keyBinding)
+  const { rowIndex, selected } = keyBinding
+  const isEven = rowIndex % 2 === 0
+  const className = getRowClassName(isEven, selected)
   return [
     tr(
       {
         ariaRowIndex: keyBinding.rowIndex,
-        className: ClassNames.KeyBindingsTableRow,
+        className,
       },
       3
     ),
@@ -112,6 +128,7 @@ const tableHeadDom = [
 ]
 
 const getTableBodyDom = (displayKeyBindings) => {
+  console.log({ displayKeyBindings })
   return [
     tbody(
       {
@@ -139,7 +156,7 @@ const getTableDom = (filteredKeyBindings, displayKeyBindings) => {
   return tableDom
 }
 
-const getVisible = (filteredKeyBindings, minLineY, maxLineY) => {
+const getVisible = (filteredKeyBindings, minLineY, maxLineY, selectedIndex) => {
   const visibleKeyBindings = []
   const slicedKeyBindings = filteredKeyBindings.slice(minLineY, maxLineY)
   for (let i = 0; i < slicedKeyBindings.length; i++) {
@@ -151,6 +168,7 @@ const getVisible = (filteredKeyBindings, minLineY, maxLineY) => {
       key: slicedKeyBinding.key,
       when: slicedKeyBinding.when,
       command: slicedKeyBinding.command,
+      selected: i === selectedIndex,
     })
   }
   return visibleKeyBindings
@@ -178,15 +196,18 @@ const renderKeyBindings = {
     return (
       oldState.filteredKeyBindings === newState.filteredKeyBindings &&
       oldState.minLineY === newState.minLineY &&
-      oldState.maxLineY === newState.maxLineY
+      oldState.maxLineY === newState.maxLineY &&
+      oldState.selectedIndex === newState.selectedIndex &&
+      oldState.focusedIndex === newState.focusedIndex
     )
   },
   apply(oldState, newState) {
-    const { filteredKeyBindings, minLineY, maxLineY } = newState
+    const { filteredKeyBindings, minLineY, maxLineY, selectedIndex } = newState
     const displayKeyBindings = getVisible(
       filteredKeyBindings,
       minLineY,
-      maxLineY
+      maxLineY,
+      selectedIndex
     )
     // TODO do dom diffing for faster incremental updates, e.g. when scrolling
     // console.time('tableDom')

package/static/ce87b6f/packages/renderer-worker/src/parts/ViewletLocations/ViewletLocations.ipc.js

@@ -0,0 +1,12 @@
+import * as ViewletLocations from './ViewletLocations.js'
+
+// prettier-ignore
+export const Commands = {
+  'Locations.focusFirst': ViewletLocations.focusFirst,
+  'Locations.focusIndex': ViewletLocations.focusIndex,
+  'Locations.focusLast': ViewletLocations.focusLast,
+  'Locations.focusNext': ViewletLocations.focusNext,
+  'Locations.focusPrevious': ViewletLocations.focusPrevious,
+  'Locations.selectCurrent': ViewletLocations.selectCurrent,
+  'Locations.selectIndex': ViewletLocations.selectIndex,
+}

package/static/ce87b6f/packages/renderer-worker/src/parts/ViewletMain/ViewletMain.ipc.js

@@ -0,0 +1,24 @@
+import * as ViewletMain from './ViewletMain.js'
+
+// prettier-ignore
+export const Commands = {
+  'Main.closeActiveEditor': ViewletMain.closeActiveEditor,
+  'Main.closeAllEditors': ViewletMain.closeAllEditors,
+  'Main.closeEditor': ViewletMain.closeEditor,
+  'Main.closeFocusedTab': ViewletMain.closeFocusedTab,
+  'Main.closeOthers': ViewletMain.closeOthers,
+  'Main.closeTabsLeft': ViewletMain.closeTabsLeft,
+  'Main.closeTabsRight': ViewletMain.closeTabsRight,
+  'Main.focusFirst': ViewletMain.focusFirst,
+  'Main.focusLast': ViewletMain.focusLast,
+  'Main.focusNext': ViewletMain.focusNext,
+  'Main.focusPrevious': ViewletMain.focusPrevious,
+  'Main.handleDrop': ViewletMain.handleDrop,
+  'Main.handleTabClick': ViewletMain.handleTabClick,
+  'Main.handleTabContextMenu': ViewletMain.handleTabContextMenu,
+  'Main.openUri': ViewletMain.openUri,
+  'Main.save': ViewletMain.save,
+  // 'Main.hydrate': ViewletMain.hydrate,
+}
+
+export * from './ViewletMain.js'

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletMain/ViewletMain.js

@@ -543,7 +543,12 @@ export const resize = (state, dimensions) => {
     width,
     height,
   }
-  const commands = Viewlet.resize('EditorText', childDimensions)
+  const editor = state.editors[0]
+  let commands = []
+  if (editor) {
+    const id = ViewletMap.getId(editor.uri)
+    commands = Viewlet.resize(id, childDimensions)
+  }
   return {
     newState: {
       ...state,

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletManager/ViewletManager.js

@@ -2,10 +2,10 @@ import * as Assert from '../Assert/Assert.js'
 import * as Command from '../Command/Command.js'
 import { CancelationError } from '../Errors/CancelationError.js'
 import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
-import * as LocalStorage from '../LocalStorage/LocalStorage.js'
+import * as NameAnonymousFunction from '../NameAnonymousFunction/NameAnonymousFunction.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
-import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as SaveState from '../SaveState/SaveState.js'
+import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 
 const ViewletState = {
   Default: 0,
@@ -16,6 +16,44 @@ const ViewletState = {
   Appended: 5,
 }
 
+// TODO maybe wrapViewletCommand should accept module instead of id string
+// then check if instance.factory matches module -> only compare reference (int) instead of string
+// should be faster
+const wrapViewletCommand = (id, fn) => {
+  const wrappedViewletCommand = async (...args) => {
+    // TODO get actual focused instance
+    const activeInstance = ViewletStates.getInstance(id)
+    if (!activeInstance) {
+      console.info(
+        `cannot execute viewlet command ${id}.${fn.name}: no active instance for ${id}`
+      )
+      return
+    }
+    if (activeInstance.factory && activeInstance.factory.hasFunctionalRender) {
+      const oldState = activeInstance.state
+      const newState = await fn(oldState, ...args)
+      if (!newState) {
+        console.log({ fn })
+      }
+      Assert.object(newState)
+      // console.log({ fn, newState })
+      if (oldState === newState) {
+        return
+      }
+      const commands = render(activeInstance.factory, oldState, newState)
+      ViewletStates.setState(id, newState)
+      await RendererProcess.invoke(
+        /* Viewlet.sendMultiple */ 'Viewlet.sendMultiple',
+        /* commands */ commands
+      )
+    } else {
+      return fn(activeInstance.state, ...args)
+    }
+  }
+  NameAnonymousFunction.nameAnonymousFunction(wrappedViewletCommand, fn.name)
+  return wrappedViewletCommand
+}
+
 /**
  *
  * @param {()=>any} getModule
@@ -72,6 +110,16 @@ const getRenderCommands = (module, oldState, newState) => {
   return module.render(oldState, newState)
 }
 
+const maybeRegisterWrappedCommands = (module) => {
+  if (!module.Commands) {
+    return
+  }
+  for (const [key, value] of Object.entries(module.Commands)) {
+    const wrappedCommand = wrapViewletCommand(module.name, value)
+    Command.register(key, wrappedCommand)
+  }
+}
+
 // TODO add lots of unit tests for this
 /**
  *
@@ -96,9 +144,7 @@ export const load = async (viewlet, focus = false, restore = false) => {
     if (viewlet.disposed) {
       return
     }
-    if (module.Commands) {
-      Command.registerMultitpe(module.Commands)
-    }
+    maybeRegisterWrappedCommands(module)
     state = ViewletState.ModuleLoaded
 
     let left = viewlet.left
@@ -144,9 +190,7 @@ export const load = async (viewlet, focus = false, restore = false) => {
           /* Viewlet.load */ 'Viewlet.loadModule',
           /* id */ childModule.name
         )
-        if (childModule.Commands) {
-          Command.registerMultitpe(childModule.Commands)
-        }
+        maybeRegisterWrappedCommands(childModule)
       }
 
       for (const childModule of childModules) {

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletMap/ViewletMap.js

@@ -24,5 +24,8 @@ export const getId = (uri) => {
   if (uri.startsWith('extension-detail://')) {
     return ViewletModuleId.ExtensionDetail
   }
+  if (uri === 'simple-browser://') {
+    return ViewletModuleId.SimpleBrowser
+  }
   return ViewletModuleId.EditorText
 }

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletModule/ViewletModule.js

@@ -60,6 +60,8 @@ export const load = (moduleId) => {
       return import('../ViewletTitleBarButtons/ViewletTitleBarButtons.ipc.js')
     case ViewletModuleId.TitleBarMenuBar:
       return import('../ViewletTitleBarMenuBar/ViewletTitleBarMenuBar.ipc.js')
+    case ViewletModuleId.SimpleBrowser:
+      return import('../ViewletSimpleBrowser/ViewletSimpleBrowser.ipc.js')
     default:
       throw new Error(`unknown module "${moduleId}"`)
   }

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletModuleId/ViewletModuleId.js

@@ -44,6 +44,8 @@ export const Search = 'Search'
 
 export const SideBar = 'SideBar'
 
+export const SimpleBrowser = 'SimpleBrowser'
+
 export const SourceControl = 'Source Control'
 
 export const StatusBar = 'StatusBar'

package/static/{0e8e702 → ce87b6f}/packages/renderer-worker/src/parts/ViewletPanel/ViewletPanel.ipc.js

@@ -1,9 +1,8 @@
 import * as ViewletPanel from '../ViewletPanel/ViewletPanel.js'
-import * as Viewlet from '../Viewlet/Viewlet.js'
 
 // prettier-ignore
 export const Commands = {
-  'Panel.selectIndex': Viewlet.wrapViewletCommand(ViewletPanel.name, ViewletPanel.selectIndex)
+  'Panel.selectIndex': ViewletPanel.selectIndex
 }
 
 export * from './ViewletPanel.js'

package/static/ce87b6f/packages/renderer-worker/src/parts/ViewletProblems/ViewletProblems.ipc.js

@@ -0,0 +1,8 @@
+import * as ViewletProblems from './ViewletProblems.js'
+
+// prettier-ignore
+export const Commands = {
+  'ViewletProblems.focusIndex': ViewletProblems.focusIndex,
+}
+
+export * from './ViewletProblems.js'