@lvce-editor/server 0.5.0 → 0.6.1

package/ThirdPartyNotices.txt

@@ -2,7 +2,7 @@ This project incorporates components from the projects listed below, that may ha
 differing from this project:
 
 
-1) License Notice for static/4d80653/icons (from https://github.com/microsoft/vscode-icons)
+1) License Notice for static/9b6f42d/icons (from https://github.com/microsoft/vscode-icons)
 ---------------------------------------
 
 Attribution 4.0 International
@@ -402,7 +402,7 @@ public licenses.
 Creative Commons may be contacted at creativecommons.org.
 
 
-2) License Notice for static/4d80653/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/9b6f42d/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
 ---------------------------------------
 
 Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/server",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -18,6 +18,6 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/shared-process": "0.5.0"
+    "@lvce-editor/shared-process": "0.6.1"
   }
 }

package/src/server.js

@@ -3,7 +3,7 @@
 import { sharedProcessPath } from '@lvce-editor/shared-process'
 import { ChildProcess, fork } from 'node:child_process'
 import { createReadStream } from 'node:fs'
-import { readdir, stat } from 'node:fs/promises'
+import { readdir, readFile, stat } from 'node:fs/promises'
 import { createServer, IncomingMessage, ServerResponse } from 'node:http'
 import { dirname, extname, join, resolve } from 'node:path'
 import { pipeline } from 'node:stream/promises'
@@ -15,7 +15,7 @@ const ROOT = resolve(__dirname, '../')
 const STATIC = resolve(__dirname, '../static')
 const PORT = process.env.PORT || 3000
 
-const argv = process.argv
+const { argv } = process
 
 let argv2 = argv[2]
 
@@ -255,12 +255,89 @@ const serveTests = async (req, res, next) => {
     }
     return
   }
+
+  next()
+}
+
+const getAbsolutePath = (extensionName) => {
+  return join(ROOT, 'extensions', extensionName, 'extension.json')
+}
+
+const isLanguageBasics = (name) => {
+  return name.startsWith('builtin.language-basics')
+}
+
+const readJson = async (path) => {
+  const content = await readFile(path, 'utf8')
+  return JSON.parse(content)
+}
+
+const combineLanguages = (extensions) => {
+  const languages = []
+  for (const extension of extensions) {
+    if (extension.languages) {
+      for (const language of extension.languages) {
+        languages.push({
+          ...language,
+          tokenize: `/extensions/${extension.id}/${language.tokenize}`,
+        })
+      }
+    }
+  }
+  return languages
+}
+
+const getLanguagesJson = async () => {
+  const extensionNames = await readdir(join(ROOT, 'extensions'))
+  const languageBasics = extensionNames.filter(isLanguageBasics)
+  const extensionPaths = languageBasics.map(getAbsolutePath)
+  const extensions = await Promise.all(extensionPaths.map(readJson))
+  const languages = combineLanguages(extensions)
+  return languages
+}
+
+const sendFile = async (path, res) => {
+  try {
+    await pipeline(createReadStream(path), res)
+  } catch (error) {
+    // @ts-ignore
+    if (error && error.code === 'EISDIR') {
+      res.statusCode = 404
+      res.end()
+      return
+    }
+    console.info('failed to send request', error)
+    res.statusCode = 500
+    // TODO escape error html
+    res.end(`${error}`)
+  }
+  return
+}
+
+const serveConfig = async (req, res, next) => {
+  const parsedUrl = parseUrl(req.url || '')
+  const pathName = parsedUrl.pathname || ''
+  if (pathName === '/config/languages.json') {
+    const languagesJson = await getLanguagesJson()
+    res.statusCode = 200
+    res.end(JSON.stringify(languagesJson, null, 2))
+    return
+  }
+  switch (pathName) {
+    case '/config/defaultKeyBindings.json':
+    case '/config/builtinCommands.json':
+    case '/config/defaultSettings.json':
+      return sendFile(join(ROOT, 'static', pathName), res)
+    default:
+      break
+  }
   next()
 }
 
 app.use('/github', serveGitHub, serve404())
 app.use('/remote', serveStatic('', '/remote'), serve404())
 app.use('/tests', serveTests, serve404())
+app.use('/config', serveConfig, serve404())
 app.use('*', serveStatic(ROOT), serveStatic(STATIC), serve404())
 
 const state = {
@@ -325,7 +402,7 @@ const launchSharedProcess = () => {
   const sharedProcess = fork(
     sharedProcessPath,
     // execArgv: ['--trace-deopt'],
-    ['--enable-source-maps'],
+    ['--enable-source-maps', ...argvSliced],
     {
       stdio: 'inherit',
       env: {

package/static/{4d80653 → 9b6f42d}/config/builtinCommands.json

@@ -201,9 +201,10 @@
     "label": "Developer: Open Data Folder"
   },
   {
-    "id": "Preferences.selectColorTheme",
+    "id": "Viewlet.openWidget",
     "label": "Preferences: Color Theme",
-    "aliases": ["Select Color Theme", "Switch Color Theme", "Theme Color"]
+    "aliases": ["Select Color Theme", "Switch Color Theme", "Theme Color"],
+    "args": ["QuickPick", "color-theme"]
   },
   {
     "id": "Developer.measureLatencyBetweenExtensionHostAndSharedProcess",
@@ -403,5 +404,17 @@
   {
     "id": "ContentTracing.stop",
     "label": "Developer: Stop Content Tracing"
+  },
+  {
+    "id": "Window.zoomIn",
+    "label": "Window: Zoom In"
+  },
+  {
+    "id": "Window.zoomOut",
+    "label": "Window: Zoom Out"
+  },
+  {
+    "id": "Window.zoomReset",
+    "label": "Window: Reset Zoom"
   }
 ]

package/static/{4d80653 → 9b6f42d}/config/defaultKeyBindings.json

@@ -19,6 +19,12 @@
     "command": "EditorCompletion.close",
     "when": "focus.editorCompletions"
   },
+  {
+    "key": "Escape",
+    "command": "Viewlet.closeWidget",
+    "when": "focus.EditorFindWidget",
+    "args": ["EditorFindWidget"]
+  },
   {
     "key": "ctrl+ArrowRight",
     "command": "Editor.cursorWordRight",
@@ -663,5 +669,32 @@
   {
     "key": "shift+ArrowDown",
     "command": "Editor.selectDown"
+  },
+  {
+    "key": "ctrl+f",
+    "command": "Editor.openFind"
+  },
+  {
+    "key": "Enter",
+    "command": "EditorFindWidget.focusNext",
+    "when": "focus.EditorFindWidget"
+  },
+  {
+    "key": "shift+F4",
+    "command": "EditorFindWidget.focusPrevious",
+    "when": "focus.EditorFindWidget"
+  },
+  {
+    "key": "F4",
+    "command": "EditorFindWidget.focusNext",
+    "when": "focus.EditorFindWidget"
+  },
+  {
+    "key": "ctrl+=",
+    "command": "Window.zoomIn"
+  },
+  {
+    "key": "ctrl+-",
+    "command": "Window.zoomOut"
   }
 ]

package/static/{4d80653 → 9b6f42d}/config/defaultSettings.json

@@ -11,7 +11,9 @@
 
   "serviceWorker.enabled": false,
 
-  "window.titleBarStyle": "custom",
+  "window.titleBarStyle": "native",
+  "window.zoomLevel": 0.5,
+  "window.controlsOverlay.enabled": true,
 
   "workbench.colorTheme": "slime",
   "workbench.iconTheme": "vscode-icons",

package/static/{4d80653 → 9b6f42d}/css/App.css

@@ -350,7 +350,7 @@ body {
 /*************/
 @font-face {
   font-family: 'Fira Code';
-  src: url(/4d80653/fonts/FiraCode-VariableFont.ttf) format('truetype');
+  src: url(/9b6f42d/fonts/FiraCode-VariableFont.ttf) format('truetype');
 }
 
 /* TODO check if contain strict also makes sense for html and body */
@@ -843,8 +843,8 @@ body {
   height: 16px;
   contain: strict;
   background: #c5c5c5;
-  -webkit-mask: url(/4d80653/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
-  mask: url(/4d80653/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  -webkit-mask: url(/9b6f42d/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  mask: url(/9b6f42d/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
 }
 
 .NegativeMargin {
@@ -874,13 +874,6 @@ body {
   display: flex;
 }
 
-.TreeItemLabel {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: inline-block;
-  white-space: nowrap;
-}
-
 /* .TreeItem:focus {
   background: rgba(59, 71, 66, 0.5);
 } */
@@ -1026,6 +1019,39 @@ body {
 .Dragging {
   cursor: grabbing ;
 }/*************/
+/* ViewletEditorFindWidget.css */
+/*************/
+.Viewlet[data-viewlet-id='EditorFindWidget'] {
+  background: var(--ActivityBarBackground);
+  z-index: 1;
+  color: wheat;
+  display: flex;
+  align-items: center;
+}
+
+.EditorFindWidgetMatchCount {
+  width: 70px;
+  white-space: nowrap;
+  flex-shrink: 0;
+  contain: strict;
+  height: 100%;
+}
+
+.EditorFindWidgetButton {
+  width: 25px;
+  height: 25px;
+  contain: strict;
+  flex-shrink: 0;
+}
+
+.EditorFindWidgetButton:hover {
+  background-color: hsla(0, 0%, 100%, 0.1);
+}
+
+.EditorFindWidgetButton:focus-visible {
+  outline: 1px solid green;
+}
+/*************/
 /* ViewletDebugConsole.css */
 /*************/
 .Viewlet[data-viewlet-id='DebugConsole'] {
@@ -1098,6 +1124,7 @@ body {
 #TitleBarButtons {
   margin-left: auto;
   contain: content;
+  app-region: no-drag;
 }
 
 .TitleBarButton {
@@ -1128,6 +1155,7 @@ body {
   -webkit-mask-repeat: no-repeat;
   -webkit-mask-size: 16px;
   -webkit-mask-position: 50% 50%;
+  pointer-events: none;
 }
 
 .MaskIconMinimize {
@@ -1316,25 +1344,18 @@ body {
 
 .QuickPickItem {
   display: flex;
-  /* column-gap: 1rem; */
-  /* padding: 0 6px 0 11px; */
   white-space: nowrap;
-  /* height: 23px; */
-  /* contain: strict; */
   align-items: center;
-
   width: 100%;
   height: 22px;
   font-size: 13px;
-  contain: strict;
   margin: 0;
-  padding: 0;
-  /* position: absolute; */
   padding: 0 6px;
   contain: strict;
   gap: 4px;
 }
 
+
 .QuickPickItem:hover {
   background: var(--ListHoverBackground);
   color: var(--ListHoverForeground);
@@ -1345,10 +1366,6 @@ body {
   background: var(--ListActiveSelectionBackground);
 }
 
-.QuickPickItemLabel {
-  /* pointer-events: none; */
-  font-size: 13px;
-}
 
 .QuickPickItemDescription {
   font-size: 0.8rem;
@@ -1402,6 +1419,7 @@ body {
   background-repeat: no-repeat;
   width: 16px;
   height: 22px;
+  flex-shrink: 0;
 }
 
 /* TODO remove icon from dom when it is not needed */
@@ -1603,7 +1621,7 @@ body {
   width: 0.75rem;
   height: 0.75rem;
   background: orchid;
-  -webkit-mask-image: url(/4d80653/icons/check.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/check.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1618,7 +1636,7 @@ body {
   height: 16px;
   content: '';
   display: block;
-  -webkit-mask-image: url(/4d80653/icons/chevron-right.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/chevron-right.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1696,6 +1714,15 @@ body {
   cursor: col-resize;
 }
 /*************/
+/* Label.css */
+/*************/
+.Label {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: inline-block;
+  white-space: nowrap;
+}
+/*************/
 /* InputBox.css */
 /*************/
 .InputBox {
@@ -1938,7 +1965,7 @@ body {
   position: absolute;
   inset: 0;
   background: var(--TabActiveForeground);
-  -webkit-mask-image: url(/4d80653/icons/icon-close.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/icon-close.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -2019,7 +2046,7 @@ body {
   content: '';
   position: absolute;
   inset: 0;
-  /* -webkit-mask-image: url(/4d80653/icons/icon-close.svg); */
+  /* -webkit-mask-image: url(/9b6f42d/icons/icon-close.svg); */
   /* -webkit-mask-repeat: no-repeat; */
   /* mask-repeat: no-repeat; */
   /* -webkit-mask-position: center; */
@@ -2029,27 +2056,27 @@ body {
 }
 
 .IconProperty::before {
-  -webkit-mask-image: url(/4d80653/icons/symbol-property.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/symbol-property.svg);
   background: #c5c5c5;
 }
 
 .IconValue::before {
-  -webkit-mask-image: url(/4d80653/icons/symbol-enum.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/symbol-enum.svg);
   background: #ee9d28;
 }
 
 .IconVariable::before {
-  -webkit-mask-image: url(/4d80653/icons/symbol-variable.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/symbol-variable.svg);
   background: #75beff;
 }
 
 .IconFunction::before {
-  -webkit-mask-image: url(/4d80653/icons/symbol-method.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/symbol-method.svg);
   background: #b180d7;
 }
 
 .IconKeyword::before {
-  -webkit-mask-image: url(/4d80653/icons/symbol-keyword.svg);
+  -webkit-mask-image: url(/9b6f42d/icons/symbol-keyword.svg);
   background: #c5c5c5;
 }
 

package/static/9b6f42d/icons/arrow-down.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.14667 9.00001L8.14665 14L8.85376 14L13.8538 9.00001L13.1467 8.2929L9.00021 12.4393L9.00022 2.00001L8.00022 2.00001L8.00022 12.4393L3.85378 8.2929L3.14667 9.00001Z" fill="#424242"/>
+</svg>

package/static/9b6f42d/icons/arrow-left.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.00024 3.0929L2.00024 8.09288L2.00024 8.79999L7.00024 13.8L7.70734 13.0929L3.56091 8.94644L14.0002 8.94644L14.0002 7.94644L3.56091 7.94644L7.70734 3.8L7.00024 3.0929Z" fill="#424242"/>
+</svg>

package/static/9b6f42d/icons/arrow-up.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8538 6.99999L8.85384 2H8.14673L3.14673 6.99999L3.85384 7.7071L8.00027 3.56066V14H9.00027V3.56066L13.1467 7.7071L13.8538 6.99999Z" fill="#424242"/>
+</svg>