@lvce-editor/server 0.2.2 → 0.4.1

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/FileSystem/FileSystem.ipc.js

@@ -2,11 +2,11 @@ import * as FileSystem from './FileSystem.js'
 
 // prettier-ignore
 export const Commands = {
+  'FileSystem.chmod': FileSystem.chmod,
+  'FileSystem.getPathSeparator': FileSystem.getPathSeparator,
+  'FileSystem.mkdir': FileSystem.mkdir,
+  'FileSystem.readDirWithFileTypes': FileSystem.readDirWithFileTypes,
   'FileSystem.readFile': FileSystem.readFile,
   'FileSystem.remove': FileSystem.remove,
-  'FileSystem.readDirWithFileTypes': FileSystem.readDirWithFileTypes,
   'FileSystem.writeFile': FileSystem.writeFile,
-  'FileSystem.mkdir': FileSystem.mkdir,
-  'FileSystem.chmod': FileSystem.chmod,
-  'FileSystem.getPathSeparator': FileSystem.getPathSeparator,
 }

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/FileSystem/FileSystemAppShared.js

@@ -4,11 +4,12 @@ import * as Workspace from '../Workspace/Workspace.js'
 import * as Assert from '../Assert/Assert.js'
 import * as LocalStorage from '../LocalStorage/LocalStorage.js'
 import * as FileSystemDisk from './FileSystemDisk.js'
+import * as PlatformType from '../PlatformType/PlatformType.js'
 
 export const readFileInternal = async (getPath) => {
   const path = await getPath()
   Assert.string(path)
-  if (Platform.platform === 'web') {
+  if (Platform.platform === PlatformType.Web) {
     const settingsJsonContent = await LocalStorage.getText(path)
     if (settingsJsonContent) {
       return settingsJsonContent
@@ -25,7 +26,7 @@ export const readFileInternal = async (getPath) => {
 export const writeFileInternal = async (getPath, content) => {
   const path = await getPath()
   Assert.string(path)
-  if (Platform.platform === 'web') {
+  if (Platform.platform === PlatformType.Web) {
     await Command.execute(
       /* LocalStorage.setText */ 6904,
       /* key */ path,

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/FileSystem/FileSystemDisk.js

@@ -1,5 +1,6 @@
 import * as Platform from '../Platform/Platform.js'
 import * as SharedProcess from '../SharedProcess/SharedProcess.js'
+import * as PlatformType from '../PlatformType/PlatformType.js'
 
 export const name = 'Disk'
 
@@ -62,7 +63,7 @@ export const getBlobUrl = (path) => {
 }
 
 export const getPathSeparator = () => {
-  if (Platform.platform === 'web') {
+  if (Platform.platform === PlatformType.Web) {
     return '/'
   }
   return SharedProcess.invoke(

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/FileSystem/FileSystemMemory.js

@@ -27,7 +27,7 @@ const ensureParentDir = (uri) => {
   while (endIndex >= 0) {
     const part = uri.slice(startIndex, endIndex + 1)
     state.files[part] = {
-      type: 'directory',
+      type: DirentType.Directory,
       content: '',
     }
     endIndex = uri.indexOf('/', endIndex + 1)
@@ -41,7 +41,7 @@ export const writeFile = (uri, content) => {
   } else {
     ensureParentDir(uri)
     state.files[uri] = {
-      type: 'file',
+      type: DirentType.File,
       content,
     }
   }
@@ -53,7 +53,7 @@ export const mkdir = (uri) => {
   }
   ensureParentDir(uri)
   state.files[uri] = {
-    type: 'directory',
+    type: DirentType.Directory,
     content: '',
   }
 }
@@ -82,7 +82,7 @@ export const readDirWithFileTypes = (uri) => {
   for (const [key, value] of Object.entries(state.files)) {
     if (key.startsWith(uri)) {
       switch (value.type) {
-        case 'directory':
+        case DirentType.Directory:
           if (
             !key.slice(0, -1).includes('/', uri.length) &&
             key !== `${uri}/` &&
@@ -94,14 +94,13 @@ export const readDirWithFileTypes = (uri) => {
             })
           }
           break
-        case 'file':
+        case DirentType.File:
           if (!key.includes('/', uri.length + 1)) {
             dirents.push({
               type: value.type,
               name: key.slice(uri.length),
             })
           }
-
           break
         default:
           break

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/FileSystem/FileSystemWeb.js

@@ -1,3 +1,5 @@
+import * as DirentType from '../DirentType/DirentType.js'
+
 // TODO when it rejects, it should throw a custom error,
 // FileSystemError
 
@@ -261,7 +263,7 @@ const getDirent = (path, relativePath) => {
   const rest = path.slice(relativePath.length + 1)
   if (rest.includes('/')) {
     return {
-      type: 'directory',
+      type: DirentType.Directory,
       name: rest.slice(0, rest.indexOf('/')),
     }
   }

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/Format/Format.js

@@ -1,6 +1,7 @@
 import * as Editor from '../Editor/Editor.js'
 import * as Platform from '../Platform/Platform.js'
 import * as SharedProcess from '../SharedProcess/SharedProcess.js'
+import * as PlatformType from '../PlatformType/PlatformType.js'
 
 // TODO format should be executed in parallel with saving
 // -> fast save, no need to wait for formatting
@@ -37,7 +38,7 @@ const onDidSaveEditor = async (editor) => {
 }
 
 export const hydrate = async () => {
-  if (Platform.platform === 'web') {
+  if (Platform.platform === PlatformType.Web) {
   }
   // TODO check preferences if format on save is enabled
   // EditorSave.onDidSave(onDidSaveEditor)

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/IconTheme/IconTheme.ipc.js

@@ -1,9 +1,9 @@
 import * as IconTheme from './IconTheme.js'
 
 export const Commands = {
-  // TODO command necessary?
-  // TODO hydrate should be an alias for reload/load
+  'IconTheme.addIcons': IconTheme.addIcons,
   'IconTheme.getIconThemeCss': IconTheme.getIconThemeCss,
   'IconTheme.hydrate': IconTheme.hydrate,
-  'IconTheme.addIcons': IconTheme.addIcons,
+  // TODO command necessary?
+  // TODO hydrate should be an alias for reload/load
 }

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/IconTheme/IconTheme.js

@@ -7,6 +7,8 @@ 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'
+import * as PlatformType from '../PlatformType/PlatformType.js'
+import * as DefaultIcon from '../DefaultIcon/DefaultIcon.js'
 
 export const state = {
   seenFiles: [],
@@ -18,12 +20,8 @@ export const state = {
   iconTheme: undefined,
 }
 
-const DEFAULT_FILE_ICON = '_file'
-const DEFAULT_FOLDER_ICON = '_folder'
-const DEFAULT_FOLDER_ICON_OPEN = '_folder_open'
-
 const getIconThemeJson = async (iconThemeId) => {
-  if (Platform.platform === 'web') {
+  if (Platform.platform === PlatformType.Web) {
     const assetDir = Platform.getAssetDir()
     const url = `${assetDir}/icon-themes/${iconThemeId}.json`
     const json = await Command.execute(
@@ -55,17 +53,17 @@ export const getFileIcon = (file) => {
   if (fileNameIcon) {
     return fileNameIcon
   }
-  const languageId = Languages.getLanguageId(fileNameLower)
-  const languageIcon = iconTheme.languageIds[languageId]
-  if (languageIcon) {
-    return languageIcon
-  }
   const extension = getExtension(fileNameLower)
   const extensionIcon = iconTheme.fileExtensions[extension]
   if (extensionIcon) {
     return extensionIcon
   }
-  return DEFAULT_FILE_ICON
+  const languageId = Languages.getLanguageId(fileNameLower)
+  const languageIcon = iconTheme.languageIds[languageId]
+  if (languageIcon) {
+    return languageIcon
+  }
+  return DefaultIcon.File
 }
 
 export const getFolderIcon = (folder) => {
@@ -79,7 +77,7 @@ export const getFolderIcon = (folder) => {
   if (folderIcon) {
     return folderIcon
   }
-  return DEFAULT_FOLDER_ICON
+  return DefaultIcon.Folder
 }
 
 const getFolderIconExpanded = (folder) => {
@@ -89,14 +87,14 @@ const getFolderIconExpanded = (folder) => {
   }
   // @ts-ignore
   if (!iconTheme.folderNamesExpanded) {
-    return DEFAULT_FOLDER_ICON_OPEN
+    return DefaultIcon.FolderOpen
   }
   // @ts-ignore
   const folderName = iconTheme.folderNamesExpanded[folder.name.toLowerCase()]
   if (folderName) {
     return folderName
   }
-  return DEFAULT_FOLDER_ICON_OPEN
+  return DefaultIcon.FolderOpen
 }
 
 export const getIcon = (dirent) => {
@@ -108,15 +106,15 @@ export const getIcon = (dirent) => {
     case DirentType.DirectoryExpanded:
       return getFolderIconExpanded(dirent)
     case DirentType.Symlink:
-      return DEFAULT_FILE_ICON
+      return DefaultIcon.File
     default:
       console.warn(`unsupported type ${dirent.type}`)
-      return ''
+      return DefaultIcon.None
   }
 }
 
 const getBackgroundUrl = (extensionPath, value) => {
-  if (Platform.platform === 'web') {
+  if (Platform.platform === PlatformType.Web) {
     return `/file-icons/${value.slice(7)}`
   }
   // TODO what if the file in on linux and includes a backslash?
@@ -131,9 +129,7 @@ const getIconThemeCss2 = (iconTheme) => {
   const rules = []
   for (const [key, value] of Object.entries(iconTheme.json.iconDefinitions)) {
     const backgroundUrl = getBackgroundUrl(iconTheme.extensionPath, value)
-    rules.push(
-      `.Icon${key}::before { background-image: url(${backgroundUrl}) }`
-    )
+    rules.push(`.Icon${key} { background-image: url(${backgroundUrl}) }`)
   }
   const rulesCss = rules.join('\n')
   return rulesCss

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/ImagePreview/ImagePreview.ipc.js

@@ -3,6 +3,6 @@ import * as ImagePreview from './ImagePreview.js'
 // TODO only use ImagePreview module via ipc -> that way is is always lazyloaded
 
 export const Commands = {
-  'ImagePreview.show': ImagePreview.show,
   'ImagePreview.hide': ImagePreview.hide,
+  'ImagePreview.show': ImagePreview.show,
 }

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/Layout/Layout.ipc.js

@@ -2,18 +2,18 @@ import * as Command from '../Command/Command.js'
 import * as Layout from './Layout.js'
 
 export const Commands = {
-  'Layout.showSideBar': Layout.showSideBar,
-  'Layout.hideSideBar': Layout.hideSideBar,
-  'Layout.toggleSideBar': Layout.toggleSideBar,
-  'Layout.showPanel': Layout.showPanel,
+  'Layout.handleResize': Layout.handleResize,
+  'Layout.handleSashPointerDown': Layout.handleSashPointerDown,
+  'Layout.handleSashPointerMove': Layout.handleSashPointerMove,
+  'Layout.hide': Layout.hide,
+  'Layout.hideActivityBar': Layout.hideActivityBar,
   'Layout.hidePanel': Layout.hidePanel,
-  'Layout.togglePanel': Layout.togglePanel,
+  'Layout.hideSideBar': Layout.hideSideBar,
+  'Layout.hydrate': Layout.hydrate,
   'Layout.showActivityBar': Layout.showActivityBar,
-  'Layout.hideActivityBar': Layout.hideActivityBar,
+  'Layout.showPanel': Layout.showPanel,
+  'Layout.showSideBar': Layout.showSideBar,
   'Layout.toggleActivityBar': Layout.toggleActivityBar,
-  'Layout.hydrate': Layout.hydrate,
-  'Layout.hide': Layout.hide,
-  'Layout.handleResize': Layout.handleResize,
-  'Layout.handleSashPointerMove': Layout.handleSashPointerMove,
-  'Layout.handleSashPointerDown': Layout.handleSashPointerDown,
+  'Layout.togglePanel': Layout.togglePanel,
+  'Layout.toggleSideBar': Layout.toggleSideBar,
 }

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/Layout/Layout.js

@@ -2,7 +2,7 @@ import * as Command from '../Command/Command.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
-
+import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 // TODO where to force rendering of contents (need to call sidebar.openViewlet somewhere)
 
 export const state = {
@@ -210,7 +210,7 @@ const show = async (key, id) => {
   })
   const dimensions = getDimensions(state, id)
   const instance = ViewletManager.create(
-    ViewletManager.getModule,
+    ViewletModule.load,
     id,
     '',
     'builtin://',
@@ -231,7 +231,7 @@ const hide = async (key, id) => {
 }
 
 const toggle = async (key, id) => {
-  await (state[key] ? hide(key, id) : show(key, id));
+  await (state[key] ? hide(key, id) : show(key, id))
 }
 
 // TODO replace with one method in renderer process: setSideBarVisibility(true|false)

package/static/b10f46d/packages/renderer-worker/src/parts/LazyCommand/LazyCommand.js

@@ -0,0 +1,16 @@
+import * as Viewlet from '../Viewlet/Viewlet.js'
+import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+
+export const create = (moduleName, importFn, key) => {
+  const lazyCommand = async (editor, ...args) => {
+    const module = await importFn()
+    const fn = module[key]
+    // editor might have changed during import, need to apply function to latest editor
+    const latestEditor = ViewletStates.getState(moduleName)
+    if (typeof fn !== 'function') {
+      throw new Error(`${moduleName}.${key} is not a function`)
+    }
+    return fn(latestEditor, ...args)
+  }
+  return Viewlet.wrapViewletCommand(moduleName, lazyCommand)
+}

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/LocalStorage/LocalStorage.ipc.js

@@ -4,8 +4,8 @@ import * as LocalStorage from './LocalStorage.js'
 
 export const Commands = {
   'LocalStorage.clear': LocalStorage.clear,
-  'LocalStorage.setJson': LocalStorage.setJson,
   'LocalStorage.getJson': LocalStorage.getJson,
   'LocalStorage.getText': LocalStorage.getText,
+  'LocalStorage.setJson': LocalStorage.setJson,
   'LocalStorage.setText': LocalStorage.setText,
 }

package/static/{e2dcaea → b10f46d}/packages/renderer-worker/src/parts/Menu/Menu.js

@@ -1,8 +1,8 @@
-import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as Command from '../Command/Command.js'
+import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 // TODO lazyload menuEntries and use Command.execute (maybe)
-import * as MenuEntries from '../MenuEntries/MenuEntries.js'
 import * as Layout from '../Layout/Layout.js'
+import * as MenuEntries from '../MenuEntries/MenuEntries.js'
 import * as MenuItemFlags from '../MenuItemFlags/MenuItemFlags.js'
 
 export const state = {
@@ -151,26 +151,48 @@ export const showSubMenu = async (level, index) => {
   await showSubMenuAtEnter(level, index, -1, -1)
 }
 
+const selectIndexNone = async (item) => {
+  if (!item.command) {
+    console.warn('item has missing command', item)
+    return
+  }
+  const args = item.args || []
+  await Promise.all([
+    hide(/* restoreFocus */ false),
+    Command.execute(item.command, ...args),
+  ])
+}
+
+const selectIndexRestoreFocus = async (item) => {
+  if (!item.command) {
+    console.warn('item has missing command', item)
+    return
+  }
+  const args = item.args || []
+  await Promise.all([
+    hide(/* restoreFocus */ true),
+    Command.execute(item.command, ...args),
+  ])
+}
+
+const selectIndexSubMenu = async (menu, index) => {
+  if (menu.focusedIndex === index) {
+    return
+  }
+  await showSubMenu(menu.level, menu.focusedIndex)
+}
+
 export const selectIndex = async (level, index) => {
   const menu = state.menus[level]
   menu.focusedIndex = index
   const item = menu.items[menu.focusedIndex]
-  console.log('[menu] select index', item)
   switch (item.flags) {
-    case /* None */ 0:
-      if (!item.command) {
-        console.warn('item has missing command', item)
-        return
-      }
-      const args = item.args || []
-      await Promise.all([hide(), Command.execute(item.command, ...args)])
-      break
-    case /* SubMenu */ 4:
-      if (menu.focusedIndex === index) {
-        return
-      }
-      await showSubMenu(menu.level, menu.focusedIndex)
-      break
+    case MenuItemFlags.None:
+      return selectIndexNone(item)
+    case MenuItemFlags.SubMenu:
+      return selectIndexSubMenu(menu, index)
+    case MenuItemFlags.RestoreFocus:
+      return selectIndexRestoreFocus(item)
     default:
       break
   }
@@ -194,12 +216,15 @@ export const selectCurrent = async (level) => {
   await selectIndex(level, menu.focusedIndex)
 }
 
-export const hide = async () => {
+export const hide = async (restoreFocus = true) => {
   if (state.menus.length === 0) {
     return
   }
   state.menus = []
-  await RendererProcess.invoke(/* Menu.hide */ 'Menu.hide')
+  await RendererProcess.invoke(
+    /* Menu.hide */ 'Menu.hide',
+    /* restoreFocus */ restoreFocus
+  )
 }
 
 // TODO difference between focusing with mouse or keyboard