@lvce-editor/server 0.3.0 → 0.4.0

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

@@ -4,6 +4,7 @@ import * as Command from '../Command/Command.js'
 import * as Assert from '../Assert/Assert.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 
 /**
  * @deprecated
@@ -216,7 +217,7 @@ export const openWidget = async (id, ...args) => {
   const hasInstance = ViewletStates.hasInstance(id)
   const type = args[0]
   const commands = await ViewletManager.load({
-    getModule: ViewletManager.getModule,
+    getModule: ViewletModule.load,
     id,
     type: 0,
     uri: `quickPick://${type}`,

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

@@ -39,7 +39,6 @@ export const name = 'EditorText'
 
 // TODO uri?
 export const create = (id, uri, left, top, width, height) => {
-  console.log({ id })
   const instanceId = Id.create()
   const state = Editor.create(instanceId, uri, 'unknown', '')
   const newState = Editor.setBounds(state, top, left, height, COLUMN_WIDTH)
@@ -143,7 +142,6 @@ const handleLanguagesChanged = async () => {
   )
 
   const newEditor = instances.EditorText.state
-  console.log({ newEditor })
 
   GlobalEventBus.emitEvent('editor.languageChange', newEditor, newLanguageId)
   // console.log({ state })

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

@@ -4,16 +4,18 @@ import * as LazyCommand from '../LazyCommand/LazyCommand.js'
 
 // prettier-ignore
 const Imports = {
+  ExpandRecursively: () => import('./ViewletExplorerExpandRecursively.js'),
   Focus: () => import('./ViewletExplorerFocus.js'),
   FocusFirst: () => import('./ViewletExplorerFocusFirst.js'),
   FocusIndex: () => import('./ViewletExplorerFocusIndex.js'),
   FocusLast: () => import('./ViewletExplorerFocusLast.js'),
   FocusNext: () => import('./ViewletExplorerFocusNext.js'),
-  FocusPrevious: () => import('./ViewletExplorerFocusPrevious.js'),
   FocusNone: () => import('./ViewletExplorerFocusNone.js'),
+  FocusPrevious: () => import('./ViewletExplorerFocusPrevious.js'),
   HandleContextMenuKeyboard: () => import('./ViewletExplorerHandleContextMenuKeyboard.js'),
   HandleContextMenuMouseAt: ()=>import('./ViewletExplorerHandleContextMenuMouseAt.js'),
-  ExpandRecursively: () => import('./ViewletExplorerExpandRecursively.js'),
+  HandleDragOver: () => import('./ViewletExplorerHandleDragOver.js'),
+  HandleDrop: () => import('./ViewletExplorerHandleDrop.js'),
 
 }
 
@@ -45,6 +47,8 @@ export const Commands = {
   'Explorer.handleContextMenuKeyboard': LazyCommand.create('Explorer', Imports.HandleContextMenuKeyboard, 'handleContextMenuKeyboard'),
   'Explorer.handleContextMenuMouseAt':  LazyCommand.create('Explorer', Imports.HandleContextMenuMouseAt, 'handleContextMenuMouseAt'),
   'Explorer.handleCopy':                Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleCopy),
+  'Explorer.handleDragOver':            LazyCommand.create('Explorer', Imports.HandleDragOver, 'handleDragOver'),
+  'Explorer.handleDrop':                LazyCommand.create('Explorer', Imports.HandleDrop, 'handleDrop'),
   'Explorer.handleMouseEnter':          Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleMouseEnter),
   'Explorer.handleMouseLeave':          Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleMouseLeave),
   'Explorer.handlePaste':               Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handlePaste),

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

@@ -14,6 +14,7 @@ import {
   getIndexFromPosition,
   getParentEndIndex,
   getParentStartIndex,
+  mergeDirents,
 } from './ViewletExplorerShared.js'
 // TODO viewlet should only have create and refresh functions
 // every thing else can be in a separate module <viewlet>.lazy.js
@@ -43,6 +44,7 @@ export const create = (id, uri, left, top, width, height) => {
     version: 0,
     editingIndex: -1,
     itemHeight: 22,
+    dropTargets: [],
   }
 }
 
@@ -440,7 +442,7 @@ const getContaingingFolder = (root, dirents, focusedIndex, pathSeparator) => {
 export const openContainingFolder = async (state) => {
   const { focusedIndex, root, dirents, pathSeparator } = state
   const path = getContaingingFolder(root, dirents, focusedIndex, pathSeparator)
-  await Command.execute('Open.openNativeFolder', /* path */ path)
+  await Command.execute('OpenNativeFolder.openNativeFolder', /* path */ path)
   return state
 }
 
@@ -635,14 +637,10 @@ const handleClickDirectory = async (state, dirent, index) => {
 const handleClickDirectoryExpanding = async (state, dirent, index) => {
   dirent.type = DirentType.Directory
   dirent.icon = IconTheme.getIcon(dirent)
-  await RendererProcess.invoke(
-    /* viewSend */ 'Viewlet.send',
-    /* id */ 'Explorer',
-    /* method */ 'collapse',
-    /* index */ index,
-    /* removeCount */ 0
-  )
-  return state
+  return {
+    ...state,
+    focusedIndex: index,
+  }
 }
 
 const handleClickDirectoryExpanded = (state, dirent, index) => {
@@ -656,14 +654,16 @@ const handleClickDirectoryExpanded = (state, dirent, index) => {
   return {
     ...state,
     dirents: newDirents,
+    focusedIndex: index,
   }
 }
 
-export const handleClick = async (state, index) => {
+export const handleClick = (state, index) => {
   if (index === -1) {
     return focusIndex(state, -1)
   }
   const actualIndex = index + state.minLineY
+  console.log('actual index', actualIndex)
   const dirent = state.dirents[actualIndex]
   if (!dirent) {
     console.warn(`[explorer] dirent at index ${actualIndex} not found`, state)
@@ -884,22 +884,6 @@ const handlePasteNone = (state, nativeFiles) => {
   return state
 }
 
-const mergeDirents = (oldDirents, newDirents) => {
-  const merged = []
-  let oldIndex = 0
-  for (const newDirent of newDirents) {
-    merged.push(newDirent)
-    for (let i = oldIndex; i < oldDirents.length; i++) {
-      if (oldDirents[i].path === newDirent.path) {
-        // TOOD copy children of old dirent
-        oldIndex = i
-        break
-      }
-    }
-  }
-  return merged
-}
-
 // TODO add lots of tests for this
 export const updateRoot = async () => {
   const state1 = Viewlet.getState('Explorer')
@@ -1315,4 +1299,19 @@ const renderFocusedIndex = {
   },
 }
 
-export const render = [renderItems, renderFocusedIndex]
+const renderDropTargets = {
+  isEqual(oldState, newState) {
+    return oldState.dropTargets === newState.dropTargets
+  },
+  apply(oldState, newState) {
+    return [
+      /* Viewlet.send */ 'Viewlet.send',
+      /* id */ 'Explorer',
+      /* method */ 'setDropTargets',
+      /* oldDropTargets */ oldState.dropTargets,
+      /* newDropTargets */ newState.dropTargets,
+    ]
+  },
+}
+
+export const render = [renderItems, renderDropTargets, renderFocusedIndex]

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

@@ -1,6 +1,16 @@
 import * as DirentType from '../DirentType/DirentType.js'
 import { getChildDirents, getParentEndIndex } from './ViewletExplorerShared.js'
 
+const makeExpanded = (dirent) => {
+  if (dirent.type === DirentType.Directory) {
+    return {
+      ...dirent,
+      type: DirentType.DirectoryExpanded,
+    }
+  }
+  return dirent
+}
+
 export const expandRecursively = async (state) => {
   const { dirents, focusedIndex, pathSeparator, root } = state
   const dirent =
@@ -24,7 +34,7 @@ export const expandRecursively = async (state) => {
         return [dirent]
       case DirentType.Directory:
         const childDirents = await getChildDirents(root, pathSeparator, dirent)
-        const all = [dirent]
+        const all = [makeExpanded(dirent)]
         for (const childDirent of childDirents) {
           const childAll = await getChildDirentsRecursively(childDirent)
           all.push(...childAll)

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

@@ -0,0 +1,30 @@
+import * as Assert from '../Assert/Assert.js'
+import { getIndexFromPosition } from './ViewletExplorerShared.js'
+
+const isEqual = (a, b) => {
+  if (a.length !== b.length) {
+    return false
+  }
+  const length = a.length
+  for (let i = 0; i < length; i++) {
+    if (a[i] !== b[i]) {
+      return false
+    }
+  }
+  return true
+}
+
+export const handleDragOver = (state, x, y) => {
+  Assert.number(x)
+  Assert.number(y)
+  const { dropTargets } = state
+  const index = getIndexFromPosition(state, x, y)
+  const newDropTargets = [index]
+  if (isEqual(dropTargets, newDropTargets)) {
+    return state
+  }
+  return {
+    ...state,
+    dropTargets: newDropTargets,
+  }
+}

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

@@ -0,0 +1,13 @@
+import { handleDropIndex } from './ViewletExplorerHandleDropIndex.js'
+import { handleDropRoot } from './ViewletExplorerHandleDropRoot.js'
+import { getIndexFromPosition } from './ViewletExplorerShared.js'
+
+export const handleDrop = (state, x, y, files) => {
+  const index = getIndexFromPosition(state, x, y)
+  switch (index) {
+    case -1:
+      return handleDropRoot(state, files)
+    default:
+      return handleDropIndex(state, index, files)
+  }
+}

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

@@ -0,0 +1,60 @@
+import {
+  getChildDirents,
+  getParentStartIndex,
+} from './ViewletExplorerShared.js'
+import * as DirentType from '../DirentType/DirentType.js'
+import * as FileSystem from '../FileSystem/FileSystem.js'
+import { handleDropRoot } from './ViewletExplorerHandleDropRoot.js'
+
+const handleDropIntoFolder = async (state, dirent, index, files) => {
+  console.log({ dirent, files })
+  const { pathSeparator, root, dirents } = state
+  for (const file of files) {
+    const from = file.path
+    const to = dirent.path + pathSeparator + file.name
+    await FileSystem.copy(from, to)
+  }
+  const childDirents = await getChildDirents(root, pathSeparator, dirent)
+  // TODO merge with child dirents
+  const middleDirents = []
+  const startIndex = index + 1
+  const endIndex = index + 2
+  const mergedDirents = [
+    ...dirents.slice(0, startIndex),
+    ...childDirents,
+    ...dirents.slice(endIndex),
+  ]
+
+  // const mergedDirents = mergeDirents(dirents, childDirents)
+  console.log({ childDirents })
+  return {
+    ...state,
+    dirents: mergedDirents,
+    dropTargets: [],
+  }
+}
+
+const handleDropIntoFile = (state, dirent, index, files) => {
+  const { dirents } = state
+  const parentIndex = getParentStartIndex(dirents, index)
+  if (parentIndex === -1) {
+    return handleDropRoot(state, files)
+  }
+  return handleDropIndex(parentIndex)
+}
+
+export const handleDropIndex = (state, index, files) => {
+  const { dirents } = state
+  const dirent = dirents[index]
+  // TODO if it is a file, drop into the folder of the file
+  // TODO if it is a folder, drop into the folder
+  // TODO if it is a symlink, read symlink and determine if file can be dropped
+  switch (dirent.type) {
+    case DirentType.Directory:
+      return handleDropIntoFolder(state, dirent, index, files)
+    case DirentType.File:
+      return handleDropIntoFile(state, dirent, index, files)
+    default:
+      return state
+  }
+}

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

@@ -0,0 +1,30 @@
+import * as FileSystem from '../FileSystem/FileSystem.js'
+import { getChildDirents } from './ViewletExplorerShared.js'
+
+const mergeDirents = (oldDirents, newDirents) => {
+  return newDirents
+}
+
+// TODO copy files in parallel
+const copyFiles = async (root, pathSeparator, files) => {
+  for (const file of files) {
+    const from = file.path
+    const to = root + pathSeparator + file.name
+    await FileSystem.copy(from, to)
+  }
+}
+
+export const handleDropRoot = async (state, files) => {
+  const { root, pathSeparator, dirents } = state
+  await copyFiles(root, pathSeparator, files)
+  const childDirents = await getChildDirents(root, pathSeparator, {
+    path: root,
+    depth: 0,
+  })
+  const mergedDirents = mergeDirents(dirents, childDirents)
+  return {
+    ...state,
+    dirents: mergedDirents,
+    dropTargets: [],
+  }
+}

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

@@ -10,7 +10,7 @@ export const getIndexFromPosition = (state, x, y) => {
   if (index < 0) {
     return 0
   }
-  if (index > dirents.length) {
+  if (index >= dirents.length) {
     return -1
   }
   return index
@@ -98,3 +98,19 @@ export const getChildDirents = async (root, pathSeparator, parentDirent) => {
   )
   return displayDirents
 }
+
+export const mergeDirents = (oldDirents, newDirents) => {
+  const merged = []
+  let oldIndex = 0
+  for (const newDirent of newDirents) {
+    merged.push(newDirent)
+    for (let i = oldIndex; i < oldDirents.length; i++) {
+      if (oldDirents[i].path === newDirent.path) {
+        // TOOD copy children of old dirent
+        oldIndex = i
+        break
+      }
+    }
+  }
+  return merged
+}

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

@@ -8,7 +8,7 @@ import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as Workspace from '../Workspace/Workspace.js'
-
+import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 const COLUMN_WIDTH = 9 // TODO compute this automatically once
 
 // interface Editor {
@@ -193,7 +193,7 @@ export const contentLoaded = async (state) => {
   const width = state.width
   const height = state.height - TAB_HEIGHT
   const instance = ViewletManager.create(
-    ViewletManager.getModule,
+    ViewletModule.load,
     id,
     'Main',
     editor.uri,
@@ -229,7 +229,7 @@ export const openUri = async (state, uri) => {
   for (const editor of state.editors) {
     if (editor.uri === uri) {
       const instance = ViewletManager.create(
-        ViewletManager.getModule,
+        ViewletModule.load,
         id,
         'Main',
         uri,
@@ -245,7 +245,7 @@ export const openUri = async (state, uri) => {
     }
   }
   const instance = ViewletManager.create(
-    ViewletManager.getModule,
+    ViewletModule.load,
     id,
     'Main',
     uri,
@@ -410,7 +410,7 @@ export const focusIndex = (state, index) => {
   const height = state.height - TAB_HEIGHT
 
   const viewlet = ViewletManager.create(
-    ViewletManager.getModule,
+    ViewletModule.load,
     id,
     'Main',
     editor.uri,

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

@@ -4,6 +4,7 @@ import { CancelationError } from '../Errors/CancelationError.js'
 import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 import * as Command from '../Command/Command.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 
 const ViewletState = {
   Default: 0,
@@ -14,64 +15,6 @@ const ViewletState = {
   Appended: 5,
 }
 
-export const getModule = (id) => {
-  console.assert(typeof id === 'string')
-  switch (id) {
-    // TODO use numeric identifier instead
-    case 'Explorer':
-      return import('../ViewletExplorer/ViewletExplorer.ipc.js')
-    case 'Run and Debug':
-      return import('../ViewletRunAndDebug/ViewletRunAndDebug.ipc.js')
-    case 'Search':
-      return import('../ViewletSearch/ViewletSearch.ipc.js')
-    case 'Source Control':
-      return import('../ViewletSourceControl/ViewletSourceControl.ipc.js')
-    case 'Terminal':
-      return import('../ViewletTerminal/ViewletTerminal.ipc.js')
-    case 'Debug Console':
-      return import('../ViewletDebugConsole/ViewletDebugConsole.ipc.js')
-    case 'Extensions':
-      return import('../ViewletExtensions/ViewletExtensions.ipc.js')
-    case 'Output':
-      return import('../ViewletOutput/ViewletOutput.ipc.js')
-    case 'Problems':
-      return import('../ViewletProblems/ViewletProblems.ipc.js')
-    case 'Noop':
-      return import('../ViewletNoop/ViewletNoop.ipc.js')
-    case 'EditorText':
-      return import('../ViewletEditorText/ViewletEditorText.ipc.js')
-    case 'EditorPlainText':
-      return import('../ViewletEditorPlainText/ViewletEditorPlainText.js')
-    case 'EditorImage':
-      return import('../ViewletEditorImage/ViewletEditorImage.ipc.js')
-    case 'Clock':
-      return import('../ViewletClock/ViewletClock.ipc.js')
-    case 'ActivityBar':
-      return import('../ViewletActivityBar/ViewletActivityBar.ipc.js')
-    case 'Panel':
-      return import('../ViewletPanel/ViewletPanel.ipc.js')
-    case 'SideBar':
-      return import('../ViewletSideBar/ViewletSideBar.ipc.js')
-    case 'TitleBar':
-      return import('../ViewletTitleBar/ViewletTitleBar.ipc.js')
-    case 'StatusBar':
-      return import('../ViewletStatusBar/ViewletStatusBar.ipc.js')
-    case 'Main':
-      return import('../ViewletMain/ViewletMain.ipc.js')
-    case 'EditorCompletion':
-      return import('../ViewletEditorCompletion/ViewletEditorCompletion.ipc.js')
-    case 'References':
-      return import('../ViewletReferences/ViewletReferences.ipc.js')
-    case 'Implementations':
-      return import('../ViewletImplementations/ViewletImplementations.ipc.js')
-    case 'QuickPick':
-      return import('../ViewletQuickPick/ViewletQuickPick.ipc.js')
-    default:
-      // TODO use ErrorHandling.handleError instead
-      throw new Error(`unknown viewlet: "${id}", ${id === 'Output'}`)
-  }
-}
-
 /**
  *
  * @param {()=>any} getModule