@lvce-editor/server 0.0.26 → 0.0.27

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/FindWidget/FindWidget.js

@@ -13,10 +13,10 @@ export const create = ({ getText }) => {
     // textContent: '',
     getText,
   }
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* FindWidget.create */ 4100,
-    /* id */ state.activeWidget.id,
-  ])
+    /* id */ state.activeWidget.id
+  )
 }
 
 const update = async (widget) => {
@@ -27,11 +27,11 @@ const update = async (widget) => {
       results.push(i)
     }
   }
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* findWidgetSetResults */ 4103,
     /* id */ widget.id,
-    /* results */ results,
-  ])
+    /* results */ results
+  )
 }
 
 export const setValue = async (value) => {
@@ -47,9 +47,9 @@ export const dispose = () => {
   if (!state.activeWidget) {
     return
   }
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* FindWidget.dispose */ 4102,
-    /* id */ state.activeWidget.id,
-  ])
+    /* id */ state.activeWidget.id
+  )
   state.activeWidget = undefined
 }

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/Menu/Menu.js

@@ -110,10 +110,10 @@ export const show = async (x, y, id, mouseBlocking = false) => {
 export const closeSubMenu = () => {
   const menu = state.menus.pop()
   const parentMenu = state.menus.at(-1)
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* Menu.hideSubMenu */ 7903,
-    /* parentIndex */ parentMenu.focusedIndex,
-  ])
+    /* parentIndex */ parentMenu.focusedIndex
+  )
 }
 
 const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
@@ -134,7 +134,7 @@ const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
   })
   const width = getMenuWidth()
   const height = getMenuHeight(subMenuItems)
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* Menu.showMenu */ 'Menu.showMenu',
     /* x */ subMenu.x,
     /* y */ subMenu.y,
@@ -142,8 +142,8 @@ const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
     /* height */ height,
     /* items */ subMenu.items,
     /* level */ subMenu.level,
-    /* parentIndex */ index,
-  ])
+    /* parentIndex */ index
+  )
 }
 
 export const showSubMenu = async (level, index) => {

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/MenuEntries/MenuEntriesExplorer.js

@@ -1,4 +1,4 @@
-import * as Command from '../Command/Command.js'
+import * as Viewlet from '../Viewlet/Viewlet.js'
 
 const ALL_ENTRIES = [
   {
@@ -92,12 +92,19 @@ const isFileEntry = (entry) => {
   return entry.id !== 'newFile' && entry.id !== 'newFolder'
 }
 
-export const getMenuEntries = async () => {
-  // TODO need a way to access state of other components synchronously
-  // TODO explorer might already be disposed (race condition)
-  const focusedDirent = await Command.execute(
-    /* Explorer.getFocusedDirent */ 'Explorer.getFocusedDirent'
-  )
+// TODO there are two possible ways of getting the focused dirent of explorer
+// 1. directly access state of explorer (bad because it directly accesses state of another component)
+// 2. expose getFocusedDirent method in explorer (bad because explorer code should not know about for menuEntriesExplorer, which needs that method)
+const getFocusedDirent = () => {
+  const explorerState = Viewlet.getState('Explorer')
+  if (!explorerState || explorerState.focusedIndex < 0) {
+    return undefined
+  }
+  return explorerState.dirents[explorerState.focusedIndex]
+}
+
+export const getMenuEntries = () => {
+  const focusedDirent = getFocusedDirent()
   if (!focusedDirent) {
     return ALL_ENTRIES
   }

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/Platform/Platform.js

@@ -31,9 +31,9 @@ export const state = {
   },
   getAssetDir() {
     // @ts-ignore
-    if (typeof '/0895dce' !== 'undefined') {
+    if (typeof '/eb65b4e' !== 'undefined') {
       // @ts-ignore
-      return '/0895dce'
+      return '/eb65b4e'
     }
     if (this.getPlatform() === 'electron') {
       return '../../../../..'

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/QuickPick/QuickPick.js

@@ -274,13 +274,13 @@ export const handleInput = async (value) => {
   const filterValue = state.provider.getFilterValue(value)
   const visiblePicks = getVisiblePicks(newPicks, filterValue)
 
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* Viewlet.send */ 'Viewlet.send',
     /* id */ 'QuickPick',
     /* method */ 'updatePicks',
     /* picks */ visiblePicks,
-    /* unFocusIndex */ state.focusedIndex,
-  ])
+    /* unFocusIndex */ state.focusedIndex
+  )
   state.picks = newPicks
   state.visiblePicks = visiblePicks
   state.focusedIndex = 0

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/RendererProcess/RendererProcess.js

@@ -10,16 +10,16 @@ export const state = {
   ipc: undefined,
 }
 
-const handleMessageFromRendererProcess = (event) => {
+const handleMessageFromRendererProcess = async (event) => {
   const message = event.data
-  switch (message[0]) {
-    case 67330:
-    case 67331:
-      Callback.resolve(message[1], message[2])
-      break
-    default:
-      Command.execute(...message)
-      break
+  if (message.id) {
+    if ('result' in message) {
+      Callback.resolve(message.id, message.result)
+    } else {
+      Callback.reject(message.id, message.error)
+    }
+  } else {
+    await Command.execute(...message)
   }
 }
 
@@ -94,12 +94,12 @@ export const send = (message) => {
 export const invoke = async (method, ...params) => {
   const responseMessage = await new Promise((resolve, reject) => {
     const callbackId = Callback.register(resolve, reject)
-    state.ipc.send([
-      /* RendererWorker.invoke */ 909090,
-      /* callbackId */ callbackId,
-      /* method */ method,
-      /* params */ ...params,
-    ])
+    state.ipc.send({
+      jsonrpc: '2.0',
+      method,
+      params,
+      id: callbackId,
+    })
   })
   if (responseMessage instanceof Error) {
     throw responseMessage

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/TitleBarMenuBar/TitleBarMenuBar.js

@@ -53,7 +53,7 @@ const openMenuAtIndex = async (index, shouldBeFocused) => {
     x,
     y,
   })
-  RendererProcess.send([
+  RendererProcess.invoke(
     /* Viewlet.send */ 'Viewlet.send',
     /* id */ 'TitleBar',
     /* method */ 'menuOpen',
@@ -66,8 +66,8 @@ const openMenuAtIndex = async (index, shouldBeFocused) => {
     /* x */ x,
     /* y */ y,
     /* width */ width,
-    /* height */ height,
-  ])
+    /* height */ height
+  )
   state.isMenuOpen = true
 }
 

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/Viewlet/Viewlet.js

@@ -140,10 +140,10 @@ export const wrapViewletCommand = (id, fn) => {
         return
       }
       const commands = activeInstance.factory.render(oldState, newState)
-      RendererProcess.send([
+      RendererProcess.invoke(
         /* Viewlet.sendMultiple */ 'Viewlet.sendMultiple',
-        /* commands */ commands,
-      ])
+        /* commands */ commands
+      )
       state.instances[id].state = newState
     } else {
       return fn(activeInstance.state, ...args)
@@ -174,15 +174,15 @@ export const getState = (id) => {
   return instance.state
 }
 
-export const setState = (id, newState) => {
+export const setState = async (id, newState) => {
   const instance = state.instances[id]
   if (instance && instance.factory && instance.factory.hasFunctionalRender) {
     const oldState = instance.state
     const commands = instance.factory.render(oldState, newState)
-    RendererProcess.send([
-      /* Viewlet.sendMultiple */ 'Viewlet.sendMultiple',
-      /* commands */ commands,
-    ])
     instance.state = newState
+    await RendererProcess.invoke(
+      /* Viewlet.sendMultiple */ 'Viewlet.sendMultiple',
+      /* commands */ commands
+    )
   }
 }

package/static/{0895dce → eb65b4e}/packages/renderer-worker/src/parts/Viewlet/ViewletExplorer.ipc.js

@@ -16,10 +16,12 @@ export const __initialize__ = () => {
   Command.register('Explorer.focusIndex',           Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.focusIndex))
   Command.register('Explorer.focusLast',            Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.focusLast))
   Command.register('Explorer.focusNext',            Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.focusNext))
+  Command.register('Explorer.focusNone',            Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.focusNone))
   Command.register('Explorer.focusPrevious',        Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.focusPrevious))
   Command.register('Explorer.getFocusedDirent',     Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.getFocusedDirent))
   Command.register('Explorer.handleArrowLeft',      Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleArrowLeft))
   Command.register('Explorer.handleArrowRight',     Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleArrowRight))
+  Command.register('Explorer.handleBlur',           Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleBlur))
   Command.register('Explorer.handleClick',          Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleClick))
   Command.register('Explorer.handleClickCurrent',   Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleClickCurrent))
   Command.register('Explorer.handleContextMenu',    Viewlet.wrapViewletCommand('Explorer', ViewletExplorer.handleContextMenu))