@lvce-editor/server 0.10.4 → 0.10.6

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletMain/ViewletMain.js

@@ -11,8 +11,8 @@ import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as ViewletMap from '../ViewletMap/ViewletMap.js'
 import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
-import * as Workspace from '../Workspace/Workspace.js'
 import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+import * as Workspace from '../Workspace/Workspace.js'
 
 const COLUMN_WIDTH = 9 // TODO compute this automatically once
 
@@ -95,7 +95,7 @@ const hydrateLazy = async () => {
   )
 }
 
-export const name = 'Main'
+export const name = ViewletModuleId.Main
 
 export const create = (id, uri, left, top, width, height) => {
   return {
@@ -167,6 +167,7 @@ const getRestoredEditors = async (savedState) => {
 }
 
 export const loadContent = async (state, savedState) => {
+  console.log({ savedState })
   // TODO get restored editors from saved state
   const editors = await getRestoredEditors(savedState)
   // @ts-ignore
@@ -191,9 +192,11 @@ export const getChildren = (state) => {
   ]
 }
 
+// TODO content loaded should return commands which
+// get picked up by viewletlayout and sent to renderer process
 export const contentLoaded = async (state) => {
   if (state.editors.length === 0) {
-    return
+    return []
   }
   const editor = Arrays.last(state.editors)
   const top = state.top + TAB_HEIGHT
@@ -201,29 +204,42 @@ export const contentLoaded = async (state) => {
   const width = state.width
   const height = state.height - TAB_HEIGHT
   const id = ViewletMap.getId(editor.uri)
-  const instance = ViewletManager.create(
-    ViewletModule.load,
-    id,
-    'Main',
-    editor.uri,
-    left,
-    top,
-    width,
-    height
-  )
   const tabLabel = Workspace.pathBaseName(editor.uri)
   const tabTitle = getTabTitle(editor.uri)
-  RendererProcess.invoke(
-    /* Viewlet.send */ 'Viewlet.send',
-    /* id */ 'Main',
-    /* method */ 'openViewlet',
-    /* tabLabel */ tabLabel,
-    /* tabTitle */ tabTitle
-  )
-  // TODO race condition: Viewlet may have been resized before it has loaded
-  // @ts-ignore
+  const commands = [
+    [
+      /* Viewlet.send */ 'Viewlet.send',
+      /* id */ 'Main',
+      /* method */ 'openViewlet',
+      /* tabLabel */ tabLabel,
+      /* tabTitle */ tabTitle,
+    ],
+  ]
 
-  await ViewletManager.load(instance, /* focus */ false, /* restore */ true)
+  // // TODO race condition: Viewlet may have been resized before it has loaded
+  // // @ts-ignore
+  const extraCommands = await ViewletManager.load(
+    {
+      getModule: ViewletModule.load,
+      id,
+      // @ts-ignore
+      parentId: 'Main',
+      uri: editor.uri,
+      left,
+      top,
+      width,
+      height,
+      show: false,
+      focus: false,
+      type: 0,
+      setBounds: false,
+    },
+    /* focus */ false,
+    /* restore */ true
+  )
+  commands.push(...extraCommands)
+  commands.push(['Viewlet.appendViewlet', 'Main', id])
+  return commands
 }
 
 export const openUri = async (state, uri, focus = true) => {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletManager/ViewletManager.js

@@ -330,13 +330,17 @@ export const load = async (
         factory: module,
       })
     }
-
+    const commands = []
     if (viewletState !== newState && module.contentLoaded) {
-      await module.contentLoaded(newState)
+      const additionalExtraCommands = await module.contentLoaded(newState)
+      console.log({ additionalExtraCommands })
+      Assert.array(additionalExtraCommands)
+      commands.push(...additionalExtraCommands)
     }
 
     if (module.hasFunctionalRender) {
-      const commands = getRenderCommands(module, viewletState, newState)
+      const renderCommands = getRenderCommands(module, viewletState, newState)
+      commands.push(...renderCommands)
       if (viewlet.show === false) {
         const allCommands = [
           ['Viewlet.create', viewlet.id],
@@ -354,6 +358,9 @@ export const load = async (
             height,
           ])
         }
+        if (module.contentLoadedEffects) {
+          module.contentLoadedEffects(newState)
+        }
         return allCommands
       }
       // console.log('else', viewlet.id, { commands })
@@ -363,7 +370,6 @@ export const load = async (
         /* commands */ commands
       )
     }
-
     if (module.contentLoadedEffects) {
       module.contentLoadedEffects(newState)
     }

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletModuleId/ViewletModuleId.js

@@ -2,6 +2,8 @@ export const ActivityBar = 'ActivityBar'
 
 export const Clock = 'Clock'
 
+export const Counter = 'Counter'
+
 export const DebugConsole = 'Debug Console'
 
 export const EditorCompletion = 'EditorCompletion'
@@ -20,12 +22,18 @@ export const ExtensionDetail = 'ExtensionDetail'
 
 export const Extensions = 'Extensions'
 
+export const Iframe = 'Iframe'
+
 export const Implementations = 'Implementations'
 
 export const KeyBindings = 'KeyBindings'
 
 export const Layout = 'Layout'
 
+export const List = 'List'
+
+export const Locations = 'Locations'
+
 export const Main = 'Main'
 
 export const Noop = 'Noop'
@@ -59,3 +67,5 @@ export const TitleBar = 'TitleBar'
 export const TitleBarButtons = 'TitleBarButtons'
 
 export const TitleBarMenuBar = 'TitleBarMenuBar'
+
+export const TodoList = 'TodoList'

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletNoop/ViewletNoop.js

@@ -9,8 +9,6 @@ export const loadContent = async (state) => {
   return state
 }
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = (state) => {
   return {
     ...state,

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletOutput/ViewletOutput.js

@@ -1,8 +1,9 @@
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as SharedProcess from '../SharedProcess/SharedProcess.js'
 import * as ExtensionHostOutputChannel from '../ExtensionHost/ExtensionHostOutput.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'Output'
+export const name = ViewletModuleId.Output
 
 export const create = () => {
   return {
@@ -46,13 +47,15 @@ export const loadContent = async (state) => {
 }
 
 export const contentLoaded = async (state) => {
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'Output',
-    /* method */ 'setOptions',
-    /* options */ state.options,
-    /* selectedOptionIndex */ state.selectedIndex
-  )
+  return [
+    [
+      /* Viewlet.invoke */ 'Viewlet.send',
+      /* id */ 'Output',
+      /* method */ 'setOptions',
+      /* options */ state.options,
+      /* selectedOptionIndex */ state.selectedIndex,
+    ],
+  ]
 }
 
 export const setOutputChannel = async (state, option) => {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletPanel/ViewletPanel.js

@@ -1,8 +1,9 @@
 import * as Command from '../Command/Command.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as ViewletModule from '../ViewletModule/ViewletModule.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'Panel'
+export const name = ViewletModuleId.Panel
 
 export const create = () => {
   return {
@@ -25,16 +26,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {
-  // await RendererProcess.invoke(
-  //   /* Viewlet.send */ 'Viewlet.send',
-  //   /* id */ 'Panel',
-  //   /* method */ 'setTabs',
-  //   /* tabs */ state.views
-  // )
-  // await openViewlet(state, state.currentViewlet)
-}
-
 export const dispose = (state) => {
   return {
     ...state,

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletProblems/ViewletProblems.js

@@ -1,7 +1,8 @@
 import * as ExtensionHostDiagnostic from '../ExtensionHost/ExtensionHostDiagnostic.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'Problems'
+export const name = ViewletModuleId.Problems
 
 export const create = () => {
   return {
@@ -31,8 +32,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
 export const focusIndex = (state, index) => {
   return {
     ...state,

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletQuickPick/ViewletQuickPick.js

@@ -4,6 +4,8 @@ import * as FuzzySearch from '../FuzzySearch/FuzzySearch.js'
 import * as QuickPickEntries from '../QuickPickEntries/QuickPickEntries.js'
 import * as QuickPickEveryThing from '../QuickPickEntriesEverything/QuickPickEntriesEverything.js'
 import * as Viewlet from '../Viewlet/Viewlet.js'
+import * as QuickPickReturnValue from '../QuickPickReturnValue/QuickPickReturnValue.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
 // TODO send open signal to renderer process before items are ready
 // that way user can already type while items are still loading
@@ -23,7 +25,7 @@ const QuickPickState = {
   Finished: 2,
 }
 
-export const name = 'QuickPick'
+export const name = ViewletModuleId.QuickPick
 
 export const create = (id, uri, top, left, width, height) => {
   return {
@@ -154,8 +156,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = () => {}
-
 export const dispose = (state) => {
   return state
 }
@@ -205,8 +205,8 @@ export const selectIndex = async (state, index, button = /* left */ 0) => {
   Assert.string(selectPickResult.command)
   const { command } = selectPickResult
   switch (command) {
-    case 'hide':
-      await Viewlet.closeWidget('QuickPick')
+    case QuickPickReturnValue.Hide:
+      await Viewlet.closeWidget(ViewletModuleId.QuickPick)
       return state
     default:
       return state

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletReferences/ViewletReferences.js

@@ -2,6 +2,7 @@ import * as ExtensionHostReferences from '../ExtensionHost/ExtensionHostReferenc
 import * as TextDocument from '../TextDocument/TextDocument.js'
 import * as ViewletLocations from '../ViewletLocations/ViewletLocations.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
 const getReferences = async () => {
   const editor = ViewletStates.getState('EditorText')
@@ -15,7 +16,7 @@ const getReferences = async () => {
   return references
 }
 
-export const name = 'References'
+export const name = ViewletModuleId.References
 
 export const create = ViewletLocations.create
 
@@ -31,6 +32,7 @@ export const contentLoaded = (state) => {
     factory: ViewletLocations,
     state,
   })
+  return []
 }
 
 export const dispose = ViewletLocations.dispose

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletRunAndDebug/ViewletRunAndDebug.js

@@ -1,4 +1,6 @@
-export const name = 'RunAndDebug'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+
+export const name = ViewletModuleId.RunAndDebug
 
 export const create = (id) => {
   return {
@@ -11,8 +13,6 @@ export const loadContent = async (state) => {
   return state
 }
 
-export const contentLoaded = async (state) => {}
-
 // TODO make sure dispose is actually called
 export const dispose = (state) => {
   return {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletSearch/ViewletSearch.js

@@ -7,6 +7,8 @@ import * as Assert from '../Assert/Assert.js'
 import * as IconTheme from '../IconTheme/IconTheme.js'
 import * as SearchResultType from '../SearchResultType/SearchResultType.js'
 import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+
 // TODO maybe create should have a container as param like vscode?
 // maybe not?
 
@@ -23,7 +25,7 @@ import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 
 const SEARCH_ORDER_FILE_NAMES = 1
 
-export const name = 'Search'
+export const name = ViewletModuleId.Search
 
 export const uiStrings = {
   NoResults: 'No results found',
@@ -62,8 +64,6 @@ export const loadContent = async (state, savedState) => {
   return state
 }
 
-export const contentLoaded = async () => {}
-
 const getStatusMessage = (resultCount, fileResultCount) => {
   if (resultCount === 0) {
     return I18nString.i18nString(uiStrings.NoResults)

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletSideBar/ViewletSideBar.js

@@ -8,7 +8,7 @@ import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 
 const SIDE_BAR_TITLE_AREA_HEIGHT = 35
 
-export const name = 'SideBar'
+export const name = ViewletModuleId.SideBar
 
 export const create = (id, uri, left, top, width, height) => {
   return {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletSimpleBrowser/ViewletSimpleBrowser.ipc.js

@@ -9,6 +9,7 @@ export const Commands = {
   'SimpleBrowser.handleWillNavigate': SimpleBrowser.handleWillNavigate,
   'SimpleBrowser.openDevtools': SimpleBrowser.openDevtools,
   'SimpleBrowser.reload': SimpleBrowser.reload,
+  'SimpleBrowser.handleTitleUpdated': SimpleBrowser.handleTitleUpdated,
 }
 
 export * from './ViewletSimpleBrowser.js'

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletSimpleBrowser/ViewletSimpleBrowser.js

@@ -3,8 +3,9 @@
 import * as ElectronBrowserView from '../ElectronBrowserView/ElectronBrowserView.js'
 import * as ElectronBrowserViewFunctions from '../ElectronBrowserViewFunctions/ElectronBrowserViewFunctions.js'
 import * as KeyBindings from '../KeyBindings/KeyBindings.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'SimpleBrowser'
+export const name = ViewletModuleId.SimpleBrowser
 
 export const create = (id, uri, left, top, width, height) => {
   return {
@@ -17,6 +18,7 @@ export const create = (id, uri, left, top, width, height) => {
     headerHeight: 30,
     iframeSrc: '',
     inputValue: '',
+    title: '',
   }
 }
 
@@ -44,6 +46,7 @@ export const loadContent = async (state) => {
   return {
     ...state,
     iframeSrc,
+    title: 'Simple Browser',
   }
 }
 
@@ -123,6 +126,13 @@ export const handleWillNavigate = (state, url) => {
   }
 }
 
+export const handleTitleUpdated = (state, title) => {
+  return {
+    ...state,
+    title,
+  }
+}
+
 export const hasFunctionalResize = true
 
 export const resize = (state, dimensions) => {
@@ -154,4 +164,14 @@ const renderIframeSrc = {
   },
 }
 
-export const render = [renderIframeSrc]
+const renderTitle = {
+  isEqual(oldState, newState) {
+    return oldState.title === newState.title
+  },
+  apply(oldState, newState) {
+    console.log({ title: newState.title })
+    return ['Viewlet.send', 'Main', 'updateTab', 0, newState.title]
+  },
+}
+
+export const render = [renderIframeSrc, renderTitle]

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletSourceControl/ViewletSourceControl.js

@@ -1,9 +1,10 @@
 import * as ExtensionHostSourceControl from '../ExtensionHost/ExtensionHostSourceControl.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
 // TODO when accept input is invoked multiple times, it should not lead to errors
 
-export const name = 'Source Control'
+export const name = ViewletModuleId.SourceControl
 
 export const create = () => {
   return {
@@ -55,8 +56,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
 export const handleClick = async (state, index) => {
   const item = state.workingTree[index]
   const absolutePath = `${state.gitRoot}/${item.file}`

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletStatusBar/ViewletStatusBar.js

@@ -1,6 +1,7 @@
 import * as ExtensionHostStatusBarItems from '../ExtensionHost/ExtensionHostStatusBarItems.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'Status Bar'
+export const name = ViewletModuleId.StatusBar
 
 export const create = () => {
   return {
@@ -45,8 +46,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
 export const updateStatusBarItems = async (state) => {
   const newState = await loadContent(state)
   return newState

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletTerminal/ViewletTerminal.js

@@ -2,8 +2,9 @@ import * as SharedProcess from '../SharedProcess/SharedProcess.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as Workspace from '../Workspace/Workspace.js'
 import * as Id from '../Id/Id.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'Terminal'
+export const name = ViewletModuleId.Terminal
 
 export const create = () => {
   return {
@@ -20,10 +21,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = (state) => {
-  // Terminal.refresh(state)
-}
-
 export const contentLoadedEffects = async (state) => {
   // TODO this should be invoke
   SharedProcess.send(

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletTitleBar/ViewletTitleBar.js

@@ -1,6 +1,6 @@
 import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'TitleBar'
+export const name = ViewletModuleId.TitleBar
 
 export const create = (id, uri, top, left, width, height) => {
   return {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletTitleBarButtons/ViewletTitleBarButtons.js

@@ -1,7 +1,8 @@
 import * as Command from '../Command/Command.js'
 import * as TitleBarButtons from '../TitleBarButtons/TitleBarButtons.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'TitleBarButtons'
+export const name = ViewletModuleId.TitleBarButtons
 
 export const create = (id, uri, top, left, width, height) => {
   return {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletTitleBarMenuBar/ViewletTitleBarMenuBar.js

@@ -1,12 +1,13 @@
 // TODO menu should not be needed initially, only when item is selected and menu is opened
+import * as Command from '../Command/Command.js'
 import * as Menu from '../Menu/Menu.js'
 import * as MenuEntries from '../MenuEntries/MenuEntries.js'
 import * as MenuItemFlags from '../MenuItemFlags/MenuItemFlags.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as TitleBarMenuBarEntries from '../TitleBarMenuBarEntries/TitleBarMenuBarEntries.js'
-import * as Command from '../Command/Command.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'TitleBarMenuBar'
+export const name = ViewletModuleId.TitleBarMenuBar
 
 export const create = () => {
   return {

package/static/{a06e404 → 7860a11}/packages/renderer-worker/src/parts/ViewletTodoList/ViewletTodoList.js

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