@lvce-editor/server 0.10.3 → 0.10.5

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/Viewlet/Viewlet.js

@@ -8,15 +8,31 @@ import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as ViewletElectron from './ViewletElectron.js'
 
-/**
- * @deprecated
- */
-export const focus = (id) => {
-  // if(state.instances[id]){
-  // }
-  // console.log('focus', { id })
-  // // TODO open if it is not already open
-  // RendererProcess.send([/* viewletFocus */ 3027, /* id */ id])
+export const focus = async (id) => {
+  const instance = ViewletStates.getInstance(id)
+  if (!instance) {
+    return
+  }
+  const commands = []
+  if (instance && instance.factory.focus) {
+    const oldState = instance.state
+    const newState = instance.factory.focus(oldState)
+    commands.push(
+      ...ViewletManager.render(instance.factory, oldState, newState)
+    )
+  }
+  const oldInstance = ViewletStates.getFocusedInstance()
+  if (oldInstance) {
+    if (oldInstance && oldInstance.factory.handleBlur) {
+      const oldState = oldInstance.state
+      const newState = oldInstance.factory.handleBlur(oldState)
+      commands.push(
+        ...ViewletManager.render(oldInstance.factory, oldState, newState)
+      )
+    }
+  }
+  ViewletStates.setFocusedInstance(instance)
+  await RendererProcess.invoke('Viewlet.sendMultiple', commands)
 }
 // export const createOrFocus = async id=>{
 //   const instance = state.instances[id] || await create(id)
@@ -114,6 +130,33 @@ export const dispose = async (id) => {
   await GlobalEventBus.emitEvent(`Viewlet.dispose.${id}`)
 }
 
+export const disposeFunctional = (id) => {
+  try {
+    if (!id) {
+      console.warn('no instance to dispose')
+      return []
+    }
+    const instance = ViewletStates.getInstance(id)
+    if (!instance) {
+      console.info('instance may already be disposed')
+      return []
+    }
+    // TODO status should have enum
+    instance.status = 'disposing'
+    if (!instance.factory) {
+      throw new Error(`${id} is missing a factory function`)
+    }
+    instance.factory.dispose(instance.state)
+    instance.status = 'disposed'
+    ViewletStates.remove(id)
+    return [[/* Viewlet.dispose */ 'Viewlet.dispose', /* id */ id]]
+  } catch (error) {
+    console.error(error)
+    // TODO use Error.cause once proper stack traces are supported by chrome
+    throw new Error(`Failed to dispose viewlet ${id}: ${error}`)
+  }
+}
+
 /**
  * @deprecated
  */
@@ -176,7 +219,7 @@ export const getAllStates = () => {
 export const openWidget = async (id, ...args) => {
   const hasInstance = ViewletStates.hasInstance(id)
   const type = args[0]
-  if (ElectronBrowserView.isOpen() && id === 'QuickPick') {
+  if (ElectronBrowserView.isOpen() && id === ViewletModuleId.QuickPick) {
     // TODO recycle quickpick instance
     if (hasInstance) {
       await ViewletElectron.closeWidgetElectronQuickPick()
@@ -199,6 +242,8 @@ export const openWidget = async (id, ...args) => {
   if (hasInstance) {
     commands.unshift(['Viewlet.dispose', id])
   }
+  commands.push(['Viewlet.append', 'Layout', id])
+  commands.push(['Viewlet.focus', id])
   await RendererProcess.invoke('Viewlet.executeCommands', commands)
   // TODO commands should be like this
   // viewlet.create quickpick
@@ -210,7 +255,10 @@ export const openWidget = async (id, ...args) => {
 }
 
 export const closeWidget = async (id) => {
-  if (ElectronBrowserView.isOpen() && id === ViewletModuleId.QuickPick) {
+  if (
+    ElectronBrowserView.isOpen() &&
+    id === ViewletElectron.isQuickPickOpen()
+  ) {
     return ViewletElectron.closeWidgetElectronQuickPick()
   }
   ViewletStates.remove(id)

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/Viewlet/ViewletElectron.js

@@ -4,11 +4,15 @@ import * as ElectronWindow from '../ElectronWindow/ElectronWindow.js'
 import * as IpcParent from '../IpcParent/IpcParent.js'
 import * as IpcParentType from '../IpcParentType/IpcParentType.js'
 import * as KeyBindings from '../KeyBindings/KeyBindings.js'
-import * as Layout from '../Layout/Layout.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+
+export const state = {
+  isQuickPickOpen: false,
+}
 
 const isQuickPickKeyBinding = (keyBinding) => {
   return keyBinding.when === 'focus.quickPickInput'
@@ -18,11 +22,19 @@ const getQuickPickKeyBindings = (keyBindings) => {
   return keyBindings.filter(isQuickPickKeyBinding)
 }
 
+export const isQuickPickOpen = () => {
+  return state.isQuickPickOpen
+}
+
 export const openElectronQuickPick = async (...args) => {
-  const id = 'QuickPick'
+  // TODO avoid side effect
+  state.isQuickPickOpen = true
+  const id = ViewletModuleId.QuickPick
   const width = 600
   const height = 300
-  const left = Math.round((Layout.state.windowWidth - width) / 2)
+  const viewletLayout = ViewletStates.getState(ViewletModuleId.Layout)
+  const windowWidth = viewletLayout.points[0]
+  const left = Math.round((windowWidth - width) / 2)
   const top = 50
   const keyBindings = await KeyBindings.getKeyBindings()
   const quickPickKeyBindings = getQuickPickKeyBindings(keyBindings)
@@ -117,7 +129,8 @@ export const openWidget = async (id, ...args) => {
 }
 
 export const closeWidgetElectronQuickPick = async () => {
-  const id = 'QuickPick'
+  const id = ViewletModuleId.QuickPick
+  state.isQuickPickOpen = false
   ViewletStates.remove(id)
   await ElectronBrowserViewQuickPick.disposeBrowserViewQuickPick()
   // TODO restore focus to previously focused element

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/Viewlet/ViewletExtension.js

@@ -2,6 +2,4 @@ export const create = () => {}
 
 export const loadContent = () => {}
 
-export const contentLoaded = () => {}
-
 export const dispose = () => {}

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/Viewlet/ViewletExtensionsHeader.js

@@ -37,8 +37,6 @@ export const loadContent = async (state) => {
   return state
 }
 
-export const contentLoaded = async (state) => {}
-
 export const handleInput = async (state, value) => {
   // TODO call props.handleInput
 }

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/Viewlet/ViewletExtensionsList.js

@@ -60,27 +60,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {
-  // if (state.searchValue === '') {
-  //   const visible = getVisible(state)
-  //   await RendererProcess.invoke(
-  //     /* Viewlet.invoke */ 'Viewlet.send',
-  //     /* id */ 'Extensions',
-  //     /* method */ 'setExtensions',
-  //     /* viewObjects */ visible,
-  //     /* negativeMargin */ -state.deltaY
-  //   )
-  //   return
-  // }
-  // await RendererProcess.invoke(
-  //   /* Viewlet.invoke */ 'Viewlet.send',
-  //   /* id */ 'Extensions',
-  //   /* method */ 'setExtensions',
-  //   /* viewObjects */ [],
-  //   /* negativeMargin */ 0
-  // )
-}
-
 const RE_PUBLISHER = /^[a-z\d\-]+/
 
 // TODO handle case when extension is of type number|array|null|string

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBar.ipc.js

@@ -20,6 +20,7 @@ export const Commands = {
   'ActivityBar.focusNext': LazyCommand.create(ViewletActivityBar.name, Imports.FocusNext, 'focusNext'),
   'ActivityBar.focusPrevious': LazyCommand.create(ViewletActivityBar.name, Imports.FocusPrevious, 'focusPrevious'),
   'ActivityBar.getHiddenItems': ViewletActivityBar.getHiddenItems,
+  'ActivityBar.handleBlur':  ViewletActivityBar.handleBlur,
   'ActivityBar.handleClick': LazyCommand.create(ViewletActivityBar.name, Imports.HandleClick, 'handleClick'),
   'ActivityBar.handleContextMenu':  ViewletActivityBar.handleContextMenu,
   'ActivityBar.handleSideBarHidden': ViewletActivityBar.handleSideBarHidden,
@@ -29,4 +30,10 @@ export const Commands = {
   'ActivityBar.updateSourceControlCount':  ViewletActivityBar.updateSourceControlCount,
 }
 
+export const Events = {
+  'SourceControl.changeBadgeCount': ViewletActivityBar.updateSourceControlCount,
+  'Layout.hideSideBar': ViewletActivityBar.handleSideBarHidden,
+  'SideBar.viewletChange': ViewletActivityBar.handleSideBarViewletChange,
+}
+
 export * from './ViewletActivityBar.js'

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBar.js

@@ -1,12 +1,11 @@
 import * as ActivityBarItemFlags from '../ActivityBarItemFlags/ActvityBarItemFlags.js'
 import * as Command from '../Command/Command.js'
-import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 import * as I18nString from '../I18NString/I18NString.js'
-import * as RendererProcess from '../RendererProcess/RendererProcess.js'
-import * as ViewletStates from '../ViewletStates/ViewletStates.js'
-import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 import * as Icon from '../Icon/Icon.js'
-
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import { focusIndex } from './ViewletActivityBarFocusIndex.js'
 /**
  * @enum {string}
  */
@@ -20,7 +19,7 @@ const UiStrings = {
   AdditionalViews: 'Additional Views',
 }
 
-export const name = 'ActivityBar'
+export const name = ViewletModuleId.ActivityBar
 
 // TODO rename viewlet parameter to something else (e.g. clicking settings opens context menu not settings viewlet)
 // TODO should just pass index
@@ -81,6 +80,7 @@ export const create = (id, uri, left, top, width, height) => {
     activityBarItems: [],
     focusedIndex: -1,
     selectedIndex: -1,
+    focused: false,
     left,
     top,
     width,
@@ -157,32 +157,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
-export const contentLoadedEffects = (state) => {
-  // TODO
-  GlobalEventBus.addListener(
-    'SourceControl.changeBadgeCount',
-    updateSourceControlCount
-  )
-  GlobalEventBus.addListener('Layout.hideSideBar', handleSideBarHidden)
-  GlobalEventBus.addListener('SideBar.viewletChange', (id) =>
-    handleSideBarViewletChange(state, id)
-  )
-}
-
-export const dispose = () => {
-  GlobalEventBus.removeListener(
-    'SourceControl.changeBadgeCount',
-    updateSourceControlCount
-  )
-  GlobalEventBus.removeListener('Layout.hideSideBar', handleSideBarHidden)
-  GlobalEventBus.removeListener(
-    'SideBar.viewletChange',
-    handleSideBarViewletChange
-  )
-}
-
 const findIndex = (activityBarItems, id) => {
   for (let i = 0; i < activityBarItems.length; i++) {
     if (activityBarItems[i].id === id) {
@@ -192,29 +166,20 @@ const findIndex = (activityBarItems, id) => {
   return -1
 }
 
-export const handleSideBarViewletChange = async (state, id, ...args) => {
+export const handleSideBarViewletChange = (state, id, ...args) => {
   const index = findIndex(state.activityBarItems, id)
-  const oldIndex = state.selectedIndex
-  state.selectedIndex = index
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'selectIndex',
-    /* oldIndex */ oldIndex,
-    /* newIndex */ index
-  )
+  return {
+    ...state,
+    selectedIndex: index,
+  }
 }
 
-export const handleSideBarHidden = async (state) => {
-  const oldIndex = state.focusedIndex
-  state.focusedIndex = -1
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'selectIndex',
-    /* oldIndex */ oldIndex,
-    /* newIndex */ -1
-  )
+export const handleSideBarHidden = (state) => {
+  return {
+    ...state,
+    focusedIndex: -1,
+    selectedIndex: -1,
+  }
 }
 
 export const updateSourceControlCount = async (state, count) => {
@@ -227,13 +192,10 @@ export const updateSourceControlCount = async (state, count) => {
   if (index === -1) {
     return
   }
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'setBadgeCount',
-    /* index */ index,
-    /* count */ count
-  )
+  return {
+    ...state,
+    badgeCount: count,
+  }
 
   // TODO send count to renderer process (if activity bar is visible)
 }
@@ -251,13 +213,10 @@ export const toggleActivityBarItem = async (state, item) => {
     (activityBarItem) => activityBarItem.id === item.label
   )
   activityBarItem.enabled = !activityBarItem.enabled
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'setItems',
-    /* items */ state.activityBarItems.filter(isEnabled),
-    /* index */ state.selectedIndex
-  )
+  return {
+    ...state,
+    items: state.activityBarItems.filter(isEnabled),
+  }
 }
 
 export const handleContextMenu = async (state, x, y) => {
@@ -270,6 +229,19 @@ export const handleContextMenu = async (state, x, y) => {
   return state
 }
 
+export const handleBlur = (state) => {
+  return {
+    ...state,
+    focused: false,
+  }
+}
+
+export const focus = (state) => {
+  const { focusedIndex } = state
+  const indexToFocus = focusedIndex === -1 ? 0 : focusedIndex
+  return focusIndex(state, indexToFocus)
+}
+
 export const hasFunctionalResize = true
 
 export const resize = (state, dimensions) => {
@@ -299,7 +271,10 @@ const renderActivityBarItems = {
 
 const renderFocusedIndex = {
   isEqual(oldState, newState) {
-    return oldState.focusedIndex === newState.focusedIndex
+    return (
+      oldState.focusedIndex === newState.focusedIndex &&
+      oldState.focused === newState.focused
+    )
   },
   apply(oldState, newState) {
     return [
@@ -308,10 +283,30 @@ const renderFocusedIndex = {
       /* method */ 'setFocusedIndex',
       /* unFocusIndex */ oldState.focusedIndex,
       /* focusIndex */ newState.focusedIndex,
+      /* focused */ newState.focused,
+    ]
+  },
+}
+
+const renderSelectedIndex = {
+  isEqual(oldState, newState) {
+    return oldState.selectedIndex === newState.selectedIndex
+  },
+  apply(oldState, newState) {
+    return [
+      /* Viewlet.send */ 'Viewlet.send',
+      /* id */ 'ActivityBar',
+      /* method */ 'setSelectedIndex',
+      /* oldIndex */ oldState.selectedIndex,
+      /* newIndex */ newState.selectedIndex,
     ]
   },
 }
 
-export const render = [renderActivityBarItems, renderFocusedIndex]
+export const render = [
+  renderActivityBarItems,
+  renderFocusedIndex,
+  renderSelectedIndex,
+]
 
 export const hasFunctionalRender = true

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBarFocusIndex.js

@@ -2,5 +2,6 @@ export const focusIndex = (state, index) => {
   return {
     ...state,
     focusedIndex: index,
+    focused: true,
   }
 }

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBarHandleClick.js

@@ -1,6 +1,7 @@
 import * as Command from '../Command/Command.js'
-import * as Layout from '../Layout/Layout.js'
 import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
+import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
 const handleClickSettings = async (state, x, y, viewletId) => {
   await Command.execute(
@@ -23,20 +24,32 @@ const handleClickAdditionalViews = async (state, x, y, viewletId) => {
 }
 
 const handleClickOther = async (state, x, y, viewletId) => {
-  if (Layout.isSideBarVisible()) {
-    await Command.execute(
-      /* SideBar.showOrHideViewlet */ 'SideBar.showOrHideViewlet',
-      /* id */ viewletId
-    )
+  console.log({ state })
+  const layoutInstance = ViewletStates.getInstance(ViewletModuleId.Layout)
+  const sideBarVisible = layoutInstance.factory.isSideBarVisible(
+    layoutInstance.state
+  )
+  if (sideBarVisible) {
+    const sideBarState = ViewletStates.getState(ViewletModuleId.SideBar)
+    if (sideBarState.currentViewletId === viewletId) {
+      await Command.execute('Layout.hideSideBar')
+    } else {
+      console.log({ sideBarState })
+      await Command.execute(
+        /* SideBar.show */ 'SideBar.show',
+        /* id */ viewletId
+      )
+    }
   } else {
     // TODO should show side bar with viewletId
-    await Layout.showSideBar()
+    await Command.execute('Layout.showSideBar')
   }
   return state
 }
 
 export const handleClick = async (state, index, x, y) => {
-  const viewletId = state.activityBarItems[index].id
+  const { activityBarItems } = state
+  const viewletId = activityBarItems[index].id
   switch (viewletId) {
     case 'Settings':
       return handleClickSettings(state, x, y, viewletId)

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletClock/ViewletClock.js

@@ -1,6 +1,7 @@
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'Clock'
+export const name = ViewletModuleId.Clock
 
 export const create = (id, uri, left, top, width, height) => {
   return {
@@ -27,8 +28,6 @@ export const loadContent = (state) => {
 
 // TODO use contentLoadedEffects
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = (state) => {
   clearInterval(state.interval)
   state.interval = -1

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletContextMenu/ViewletContextMenu.js

@@ -58,13 +58,15 @@ export const contentLoaded = async (state) => {
   if (y + contextMenuHeight > windowHeight) {
     y -= contextMenuHeight
   }
-  await RendererProcess.invoke(
-    /* Viewlet.load */ 'Viewlet.load',
-    /* id */ 'ContextMenu',
-    /* top */ y,
-    /* left */ x,
-    /* width */ contextMenuWidth,
-    /* height */ contextMenuHeight,
-    /* items */ state.items
-  )
+  return [
+    [
+      /* Viewlet.load */ 'Viewlet.load',
+      /* id */ 'ContextMenu',
+      /* top */ y,
+      /* left */ x,
+      /* width */ contextMenuWidth,
+      /* height */ contextMenuHeight,
+      /* items */ state.items,
+    ],
+  ]
 }

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletCounter/ViewletCounter.js

@@ -1,4 +1,6 @@
-export const name = 'Counter'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+
+export const name = ViewletModuleId.Counter
 
 export const create = () => {
   return {

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletDebugConsole/ViewletDebugConsole.js

@@ -1,4 +1,6 @@
-export const name = 'Debug Console'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+
+export const name = ViewletModuleId.DebugConsole
 
 export const create = () => {
   return {
@@ -10,8 +12,6 @@ export const loadContent = async (state) => {
   return state
 }
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = (state) => {
   return {
     ...state,

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEditorCompletion/ViewletEditorCompletion.js

@@ -109,10 +109,6 @@ export const loadingContent = () => {
   return changes
 }
 
-export const contentLoaded = () => {
-  // noop
-}
-
 export const handleSelectionChange = (state, selectionChanges) => {}
 
 export const advance = (state, word) => {

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEditorFindWidget/ViewletEditorFindWidget.js

@@ -1,6 +1,7 @@
 import * as Command from '../Command/Command.js'
 import * as I18nString from '../I18NString/I18NString.js'
 import * as TextDocumentSearch from '../TextDocumentSearch/TextDocumentSearch.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 
 /**
@@ -11,7 +12,7 @@ const UiStrings = {
   MatchOf: `{PH1} of {PH2}`,
 }
 
-export const name = 'EditorFindWidget'
+export const name = ViewletModuleId.EditorFindWidget
 
 export const create = () => {
   return {

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEditorImage/ViewletEditorImage.js

@@ -2,9 +2,9 @@ import * as Assert from '../Assert/Assert.js'
 import * as Clamp from '../Clamp/Clamp.js'
 import * as Command from '../Command/Command.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
-import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'EditorImage'
+export const name = ViewletModuleId.EditorImage
 
 export const create = (id, uri, left, top, width, height) => {
   return {
@@ -68,8 +68,6 @@ export const loadContent = async (state, savedState) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = async (state) => {
   const { src } = state
   if (src.startsWith('blob:')) {

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEditorPlainText/ViewletEditorPlainText.js

@@ -1,6 +1,7 @@
 import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'PlainText'
+export const name = ViewletModuleId.EditorPlainText
 
 export const create = (id, uri, left, top, width, height) => {
   return {
@@ -18,8 +19,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = (state) => {
   return {
     ...state,