@lvce-editor/server 0.0.30 → 0.0.31

package/static/{56ac02a → 0e4d46a}/packages/renderer-worker/src/parts/ViewletQuickPick/ViewletQuickPick.ipc.js

@@ -12,6 +12,7 @@ export const Commands = {
   'QuickPick.focusNext': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.focusNext),
   'QuickPick.handleBlur': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleBlur),
   'QuickPick.handleBeforeInput': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleBeforeInput),
+  'QuickPick.handleWheel': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleWheel),
 }
 
 export * from './ViewletQuickPick.js'

package/static/{56ac02a → 0e4d46a}/packages/renderer-worker/src/parts/ViewletQuickPick/ViewletQuickPick.js

@@ -31,7 +31,7 @@ export const create = (id, uri, top, left, width, height) => {
   return {
     state: QuickPickState.Default,
     picks: [],
-    filteredPicks: [],
+    items: [],
     recentPicks: [],
     recentPickIds: new Map(), // TODO use object.create(null) instead
     versionId: 0,
@@ -44,6 +44,9 @@ export const create = (id, uri, top, left, width, height) => {
     maxVisibleItems: 10,
     uri,
     cursorOffset: 0,
+    deltaY: 0,
+    itemHeight: 22,
+    height: 300,
   }
 }
 
@@ -66,7 +69,7 @@ const filterPicks = (state, picks, exclude, value) => {
     }
     // TODO also filtering for aliases might be expensive
     // TODO maybe only filter for aliases if prefix is longer than 4-5 characters
-    // otherwise both will be found anyway
+    // otherwise both will be found anywayf
     // e.g. "Relo" matches  "Window Reload"  and "Reload Window"
     // But "Reload Win" only matches "Reload Window"
     if (pick.aliases) {
@@ -78,39 +81,34 @@ const filterPicks = (state, picks, exclude, value) => {
     }
     return false
   }
-  const filteredPicks = picks.filter(filterPick)
-  return filteredPicks
-}
-
-const slicePicks = (filteredPicks) => {
-  return filteredPicks.slice(0, 10)
-}
-
-const toDisplayPicks = (picks) => {
-  const toDisplayPick = (pick, index) => {
-    return {
-      label: pick.label,
-      posInSet: index + 1,
-      setSize: picks.length,
-    }
+  const items = picks.filter(filterPick)
+  return items
+}
+
+const getVisible = (items, minLineY, maxLineY) => {
+  const visibleItems = []
+  const setSize = items.length
+  for (let i = minLineY; i < maxLineY; i++) {
+    const item = items[i]
+    visibleItems.push({
+      label: item.label,
+      posInSet: i + 1,
+      setSize,
+    })
   }
-  return picks.map(toDisplayPick)
+  return visibleItems
 }
 
-const getVisiblePicks = (state, picks, filterValue) => {
+const getFilteredItems = (state, picks, filterValue) => {
   Assert.object(state)
   Assert.array(picks)
   Assert.string(filterValue)
-  const filteredPicks = filterPicks(
-    state,
-    picks,
-    state.recentPickIds,
-    filterValue
-  )
+  const items = filterPicks(state, picks, state.recentPickIds, filterValue)
+  return items
   // TODO avoid mutation
-  state.filteredPicks = filteredPicks
-  const slicedPicks = slicePicks(filteredPicks)
-  return toDisplayPicks(slicedPicks)
+  // state.items = items
+  // const slicedPicks = slicePicks(items)
+  // return toDisplayPicks(slicedPicks)
 }
 
 const getProvider = (uri) => {
@@ -167,7 +165,7 @@ export const loadContent = async (state) => {
     return
   }
   const filterValue = provider.getFilterValue(value)
-  const visiblePicks = getVisiblePicks(state, newPicks, filterValue)
+  const items = getFilteredItems(state, newPicks, filterValue)
   const placeholder = provider.getPlaceholder()
   const label = provider.getLabel()
   const minLineY = 0
@@ -178,7 +176,7 @@ export const loadContent = async (state) => {
   return {
     ...state,
     picks: newPicks,
-    visiblePicks,
+    items,
     focusedIndex: 0,
     state: QuickPickState.Finished,
     minLineY,
@@ -205,15 +203,20 @@ const getPick = (state, index) => {
   //   return state.recentPicks[index]
   // }
   // index -= state.recentPicks.length
-  if (index < state.filteredPicks.length) {
-    return state.filteredPicks[index]
+  if (index < state.items.length) {
+    return state.items[index]
   }
   console.warn('no pick matching index', index)
 }
 
 export const selectIndex = async (state, index, button = /* left */ 0) => {
-  const pick = getPick(state, index)
-  const selectPickResult = await state.provider.selectPick(pick, index, button)
+  const actualIndex = index + state.minLineY
+  const pick = getPick(state, actualIndex)
+  const selectPickResult = await state.provider.selectPick(
+    pick,
+    actualIndex,
+    button
+  )
   Assert.object(selectPickResult)
   Assert.string(selectPickResult.command)
   const { command } = selectPickResult
@@ -247,12 +250,12 @@ export const handleInput = async (state, value, cursorOffset) => {
   }
   const newPicks = await state.provider.getPicks(value)
   const filterValue = state.provider.getFilterValue(value)
-  const visiblePicks = getVisiblePicks(state, newPicks, filterValue)
+  const items = getFilteredItems(state, newPicks, filterValue)
   return {
     ...state,
     value,
     picks: newPicks,
-    visiblePicks,
+    items,
     focusedIndex: 0,
     cursorOffset,
   }
@@ -433,27 +436,19 @@ export const focusIndex = async (state, index) => {
   // @ts-ignore
   if (state.provider.focusPick) {
     // @ts-ignore
-    await state.provider.focusPick(state.filteredPicks[index])
+    await state.provider.focusPick(state.items[index])
   }
   if (index < state.minLineY) {
     const minLineY = index
     const maxLineY = Math.min(
       index + state.maxVisibleItems,
-      state.filteredPicks.length - 1
+      state.items.length - 1
     )
-    const slicedPicks = state.filteredPicks.slice(
-      state.minLineY,
-      state.maxLineY
-    )
-    const displayPicks = toDisplayPicks(slicedPicks)
-    const relativeFocusIndex = index - state.minLineY
-    const relativeUnFocusIndex = state.focusedIndex - state.minLineY
     // TODO need to scroll up
     return {
       ...state,
       minLineY,
       maxLineY,
-      displayPicks,
       focusedIndex: index,
     }
   }
@@ -462,18 +457,10 @@ export const focusIndex = async (state, index) => {
     const minLineY = Math.max(0, index - state.maxVisibleItems)
     const maxLineY = Math.min(
       index + state.maxVisibleItems - 1,
-      state.filteredPicks.length - 1
-    )
-    const slicedPicks = state.filteredPicks.slice(
-      state.minLineY,
-      state.maxLineY
+      state.items.length - 1
     )
-    const displayPicks = toDisplayPicks(slicedPicks)
-    const relativeFocusIndex = index - state.minLineY
-    const relativeUnFocusIndex = state.focusedIndex - state.minLineY
     return {
       ...state,
-      displayPicks,
       minLineY,
       maxLineY,
       focusedIndex: index,
@@ -490,22 +477,51 @@ export const focusFirst = (state) => {
 }
 
 export const focusLast = (state) => {
-  return focusIndex(state, state.filteredPicks.length - 1)
+  return focusIndex(state, state.items.length - 1)
 }
 
 export const focusPrevious = (state) => {
   const previousIndex =
-    state.focusedIndex === 0
-      ? state.filteredPicks.length - 1
-      : state.focusedIndex - 1
+    state.focusedIndex === 0 ? state.items.length - 1 : state.focusedIndex - 1
   return focusIndex(state, previousIndex)
 }
 
 export const focusNext = (state) => {
-  const nextIndex = (state.focusedIndex + 1) % state.filteredPicks.length
+  const nextIndex = (state.focusedIndex + 1) % state.items.length
   return focusIndex(state, nextIndex)
 }
 
+export const setDeltaY = (state, deltaY) => {
+  Assert.object(state)
+  Assert.number(deltaY)
+  const { itemHeight, items, height } = state
+  const itemsLength = items.length
+  if (deltaY < 0) {
+    deltaY = 0
+  } else if (deltaY > itemsLength * itemHeight - height) {
+    deltaY = Math.max(itemsLength * itemHeight - height, 0)
+  }
+  if (state.deltaY === deltaY) {
+    return state
+  }
+  const minLineY = Math.round(deltaY / itemHeight)
+  const maxLineY = minLineY + Math.round(height / itemHeight)
+  Assert.number(minLineY)
+  Assert.number(maxLineY)
+  return {
+    ...state,
+    deltaY,
+    minLineY,
+    maxLineY,
+  }
+}
+
+export const handleWheel = (state, deltaY) => {
+  Assert.object(state)
+  Assert.number(deltaY)
+  return setDeltaY(state, state.deltaY + deltaY)
+}
+
 export const hasFunctionalRender = true
 
 const renderValue = {
@@ -539,15 +555,23 @@ const renderCursorOffset = {
 
 const renderItems = {
   isEqual(oldState, newState) {
-    return oldState.visiblePicks === newState.visiblePicks
+    return (
+      oldState.items === newState.items &&
+      oldState.minLineY === newState.minLineY &&
+      oldState.maxLineY === newState.maxLineY
+    )
   },
   apply(oldState, newState) {
-    // TODO compute visible picks here from filteredPicks and minLineY / maxLineY, maybe also do filtering here
+    const visibleItems = getVisible(
+      newState.items,
+      newState.minLineY,
+      newState.maxLineY
+    )
     return [
       /* Viewlet.send */ 'Viewlet.send',
       /* id */ 'QuickPick',
       /* method */ 'setVisiblePicks',
-      /* visiblePicks */ newState.visiblePicks,
+      /* visiblePicks */ visibleItems,
     ]
   },
 }
@@ -568,8 +592,8 @@ const renderFocusedIndex = {
 }
 
 export const render = [
-  renderFocusedIndex,
-  renderCursorOffset,
   renderItems,
   renderValue,
+  renderCursorOffset,
+  renderFocusedIndex,
 ]

package/static/{56ac02a → 0e4d46a}/packages/renderer-worker/src/parts/ViewletSearch/ViewletSearch.js

@@ -2,6 +2,7 @@ import * as SharedProcess from '../SharedProcess/SharedProcess.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as Command from '../Command/Command.js'
 import * as Workspace from '../Workspace/Workspace.js'
+import * as FindInWorkspace from '../FindInWorkspace/FindInWorkspace.js'
 
 // TODO maybe create should have a container as param like vscode?
 // maybe not?
@@ -105,10 +106,7 @@ export const handleInput = async (state, value) => {
   // TODO support cancellation
   // TODO handle error
   // TODO use command.execute or use module directly?
-  const results = await Command.execute(
-    /* FindInWorkspace.findInWorkspace */ 5200,
-    /* searchTerm */ value
-  )
+  const results = await FindInWorkspace.findInWorkspace(value)
   // TODO send results to renderer process
   // TODO use virtual list because there might be many results
   console.log({
@@ -122,18 +120,20 @@ export const handleInput = async (state, value) => {
   const displayResults = toDisplayResults(results.results)
   return {
     ...state,
-    searchResults: displayResults,
+    items: displayResults,
     fileCount: results.results.length, // TODO this is weird
+    value,
   }
 }
 
 export const handleClick = async (state, index) => {
-  const searchResult = state.searchResults[index]
+  const searchResult = state.items[index]
   console.log({ searchResult })
   await Command.execute(
     /* Main.openUri */ 'Main.openUri',
     /* uri */ searchResult.path
   )
+  return state
 }
 
 export const hasFunctionalResize = true
@@ -147,20 +147,21 @@ export const resize = (state, dimensions) => {
 
 export const hasFunctionalRender = true
 
-const renderResults = {
+const renderItems = {
   isEqual(oldState, newState) {
-    return oldState.searchResults === newState.searchResults
+    return oldState.items === newState.items
   },
   apply(oldState, newState) {
+    console.log(newState.items)
     return [
       /* viewletSend */ 'Viewlet.send',
       /* id */ 'Search',
       /* method */ 'setResults',
-      /* results */ newState.searchResults,
-      /* resultCount */ newState.searchResults.length,
+      /* results */ newState.items,
+      /* resultCount */ newState.items.length,
       /* fileCount */ newState.fileCount,
     ]
   },
 }
 
-export const render = [renderResults]
+export const render = [renderItems]

package/static/index.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="Online Code Editor" />
     <title>Code Editor</title>
-    <link rel="stylesheet" href="/56ac02a/css/App.css" />
+    <link rel="stylesheet" href="/0e4d46a/css/App.css" />
     <link
       rel="preload"
-      href="/56ac02a/fonts/FiraCode-VariableFont.ttf"
+      href="/0e4d46a/fonts/FiraCode-VariableFont.ttf"
       as="font"
       type="font/ttf"
       crossorigin
@@ -17,21 +17,21 @@
     <link rel="manifest" href="/manifest.json" />
     <script
       type="module"
-      src="/56ac02a/packages/renderer-process/dist/rendererProcessMain.js"
+      src="/0e4d46a/packages/renderer-process/dist/rendererProcessMain.js"
     ></script>
     <link
       rel="modulepreload"
-      href="/56ac02a/packages/renderer-worker/dist/rendererWorkerMain.js"
+      href="/0e4d46a/packages/renderer-worker/dist/rendererWorkerMain.js"
     />
-    <link rel="apple-touch-icon" href="/56ac02a/icons/pwa-icon-192.png" />
+    <link rel="apple-touch-icon" href="/0e4d46a/icons/pwa-icon-192.png" />
     <meta name="theme-color" content="#282e2f" />
     <link
       rel="preload"
-      href="/56ac02a/config/defaultKeyBindings.json"
+      href="/0e4d46a/config/defaultKeyBindings.json"
       as="fetch"
       crossorigin
     />
-    <link rel="preload" href="/56ac02a/config/defaultSettings.json" as="fetch" crossorigin>
+    <link rel="preload" href="/0e4d46a/config/defaultSettings.json" as="fetch" crossorigin>
   </head>
   <body>
     <noscript title="No JavaScript Support">

package/static/manifest.json

@@ -11,13 +11,13 @@
   "display_override": ["window-controls-overlay", "minimal-ui"],
   "icons": [
     {
-      "src": "/56ac02a/icons/pwa-icon-192.png",
+      "src": "/0e4d46a/icons/pwa-icon-192.png",
       "type": "image/png",
       "sizes": "192x192",
       "purpose": "any maskable"
     },
     {
-      "src": "/56ac02a/icons/pwa-icon-512.png",
+      "src": "/0e4d46a/icons/pwa-icon-512.png",
       "type": "image/png",
       "sizes": "512x512",
       "purpose": "any maskable"

package/static/serviceWorker.js

@@ -1,4 +1,4 @@
-const CACHE_STATIC_NAME = 'static-56ac02a'
+const CACHE_STATIC_NAME = 'static-0e4d46a'
 const CACHE_DYNAMIC_NAME = 'dynamic-v2'
 
 const getPathName = (url) => {

package/static/56ac02a/packages/renderer-process/dist/Audio.ipc.js

@@ -1,13 +0,0 @@
-import { r as register } from './rendererProcessMain.js';
-
-const play = async (src) => {
-  const audio = new Audio(src);
-  await audio.play();
-};
-
-const __initialize__ = () => {
-  register('Audio.play', play);
-};
-
-export { __initialize__ };
-//# sourceMappingURL=Audio.ipc.js.map

package/static/56ac02a/packages/renderer-process/dist/Audio.ipc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Audio.ipc.js","sources":["../src/parts/Audio/Audio.js","../src/parts/Audio/Audio.ipc.js"],"sourcesContent":["export const play = async (src) => {\n  const audio = new Audio(src)\n  await audio.play()\n}\n","import * as Command from '../Command/Command.js'\nimport * as Audio from './Audio.js'\n\nexport const __initialize__ = () => {\n  Command.register('Audio.play', Audio.play)\n}\n"],"names":["Command.register","Audio.play"],"mappings":";;AAAO,MAAM,IAAI,GAAG,OAAO,GAAG,KAAK;AACnC,EAAE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,EAAC;AAC9B,EAAE,MAAM,KAAK,CAAC,IAAI,GAAE;AACpB;;ACAY,MAAC,cAAc,GAAG,MAAM;AACpC,EAAEA,QAAgB,CAAC,YAAY,EAAEC,IAAU,EAAC;AAC5C;;;;"}

package/static/56ac02a/packages/renderer-process/dist/ClipBoard.ipc.js

@@ -1,18 +0,0 @@
-import { m as string, r as register } from './rendererProcessMain.js';
-
-const readText = async () => {
-  return navigator.clipboard.readText()
-};
-
-const writeText = async (text) => {
-  string(text);
-  await navigator.clipboard.writeText(text);
-};
-
-const __initialize__ = () => {
-  register('ClipBoard.readText', readText);
-  register('ClipBoard.writeText', writeText);
-};
-
-export { __initialize__ };
-//# sourceMappingURL=ClipBoard.ipc.js.map

package/static/56ac02a/packages/renderer-process/dist/ClipBoard.ipc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ClipBoard.ipc.js","sources":["../src/parts/ClipBoard/ClipBoard.js","../src/parts/ClipBoard/ClipBoard.ipc.js"],"sourcesContent":["import { VError } from '../VError/VError.js'\nimport * as Assert from '../Assert/Assert.js'\n\nexport const readText = async () => {\n  return navigator.clipboard.readText()\n}\n\nexport const writeText = async (text) => {\n  Assert.string(text)\n  await navigator.clipboard.writeText(text)\n}\n","import * as Command from '../Command/Command.js'\nimport * as ClipBoard from './ClipBoard.js'\n\nexport const __initialize__ = () => {\n  Command.register('ClipBoard.readText', ClipBoard.readText)\n  Command.register('ClipBoard.writeText', ClipBoard.writeText)\n}\n"],"names":["Assert.string","Command.register","ClipBoard.readText","ClipBoard.writeText"],"mappings":";;AAGO,MAAM,QAAQ,GAAG,YAAY;AACpC,EAAE,OAAO,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE;AACvC,EAAC;AACD;AACO,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK;AACzC,EAAEA,MAAa,CAAC,IAAI,EAAC;AACrB,EAAE,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAC;AAC3C;;ACPY,MAAC,cAAc,GAAG,MAAM;AACpC,EAAEC,QAAgB,CAAC,oBAAoB,EAAEC,QAAkB,EAAC;AAC5D,EAAED,QAAgB,CAAC,qBAAqB,EAAEE,SAAmB,EAAC;AAC9D;;;;"}