@lvce-editor/server 0.0.33 → 0.0.36

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/b576f0e/icons (from https://github.com/microsoft/vscode-icons)
+1) License Notice for static/99a5133/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/b576f0e/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/99a5133/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.0.33",
+  "version": "0.0.36",
   "description": "",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -18,6 +18,6 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/shared-process": "0.0.33"
+    "@lvce-editor/shared-process": "0.0.36"
   }
 }

package/src/server.js

@@ -1,18 +1,13 @@
 // based on https://github.com/microsoft/vscode/tree/1.64.2/src/vs/server/node/webClientServer.ts (License MIT)
 
 import { sharedProcessPath } from '@lvce-editor/shared-process'
-import { ChildProcess, fork } from 'child_process'
-import { createReadStream } from 'fs'
-import { readdir, stat } from 'fs/promises'
-import {
-  createServer,
-  IncomingMessage,
-  OutgoingMessage,
-  ServerResponse,
-} from 'http'
-import { dirname, extname, join, resolve } from 'path'
-import { pipeline } from 'stream/promises'
-import { fileURLToPath } from 'url'
+import { ChildProcess, fork } from 'node:child_process'
+import { createReadStream } from 'node:fs'
+import { readdir, 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'
+import { fileURLToPath } from 'node:url'
 
 // @ts-ignore
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -24,6 +19,15 @@ const argv = process.argv
 
 let argv2 = argv[2]
 
+const argvSliced = argv.slice(2)
+for (const arg of argvSliced) {
+  if (arg.startsWith('--only-extension=')) {
+    process.env['ONLY_EXTENSION'] = arg.slice('--only-extension='.length)
+  } else if (arg.startsWith('--test-path=')) {
+    process.env['TEST_PATH'] = arg.slice('--test-path='.length)
+  }
+}
+
 if (!argv2) {
   argv2 = resolve(__dirname, '../../../playground')
 }
@@ -181,9 +185,7 @@ const generateTestOverviewHtml = (dirents) => {
   return pre + middle + post
 }
 
-const createTestOverview = async () => {
-  const testPath = getTestPath()
-  const testPathSrc = join(testPath, 'src')
+const createTestOverview = async (testPathSrc) => {
   const dirents = await readdir(testPathSrc)
   const testOverviewHtml = generateTestOverviewHtml(dirents)
   return testOverviewHtml
@@ -200,14 +202,36 @@ const serveTests = async (req, res, next) => {
       await pipeline(createReadStream(join(ROOT, 'static', 'index.html')), res)
     } catch (error) {
       console.info('failed to send request', error)
+      res.statusCode = 500
+      // TODO escape error html
+      res.end(`${error}`)
     }
-  } else if (req.url === '/tests/') {
-    const testOverview = await createTestOverview()
-    res.statusCode = 300
-    res.end(testOverview)
-  } else {
-    next()
+    return
+  }
+  if (req.url === '/tests/') {
+    const testPath = getTestPath()
+    const testPathSrc = join(testPath, 'src')
+
+    try {
+      const testOverview = await createTestOverview(testPathSrc)
+      res.setHeader('Cache-Control', 'public, max-age=0, must-revalidate')
+      res.statusCode = 300
+      res.end(testOverview)
+    } catch (error) {
+      // @ts-ignore
+      if (error && error.code === 'ENOENT') {
+        res.statusCode = 404
+        // TODO escape path for html
+        res.end(`No test files found at ${testPathSrc}`)
+        return
+      }
+      res.statusCode = 500
+      // TODO escape error html
+      res.end(`${error}`)
+    }
+    return
   }
+  next()
 }
 
 app.use('/github', serveGitHub, serve404())
@@ -274,15 +298,18 @@ const launchSharedProcess = () => {
   state.sharedProcessState = /* launching */ 1
   delete process.env.ELECTRON_RUN_AS_NODE
 
-  const sharedProcess = fork(sharedProcessPath, {
-    stdio: 'inherit',
+  const sharedProcess = fork(
+    sharedProcessPath,
     // execArgv: ['--trace-deopt'],
-    execArgv: ['--enable-source-maps'],
-    env: {
-      ...process.env,
-      ELECTRON_RUN_AS_NODE: '1',
-    },
-  })
+    ['--enable-source-maps'],
+    {
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        ELECTRON_RUN_AS_NODE: '1', // TODO only needed when server is run inside electron app
+      },
+    }
+  )
   const handleFirstMessage = (message) => {
     state.sharedProcessState = /* on */ 2
     for (const listener of state.onSharedProcessReady) {

package/static/{b576f0e → 99a5133}/config/builtinCommands.json

@@ -280,6 +280,14 @@
     "id": "Editor.toggleComment",
     "label": "Editor: Toggle Comment"
   },
+  {
+    "id": "Editor.selectUp",
+    "label": "Editor: Select Up"
+  },
+  {
+    "id": "Editor.selectDown",
+    "label": "Editor: Select Down"
+  },
   {
     "id": "Editor.toggleBlockComment",
     "label": "Editor: Toggle Block Comment"

package/static/{b576f0e → 99a5133}/config/defaultKeyBindings.json

@@ -650,5 +650,13 @@
   {
     "key": "ctrl+1",
     "command": "Main.focus"
+  },
+  {
+    "key": "shift+ArrowUp",
+    "command": "Editor.selectUp"
+  },
+  {
+    "key": "shift+ArrowDown",
+    "command": "Editor.selectDown"
   }
 ]

package/static/{b576f0e → 99a5133}/css/App.css

@@ -350,7 +350,7 @@ body {
 /*************/
 @font-face {
   font-family: 'Fira Code';
-  src: url(/b576f0e/fonts/FiraCode-VariableFont.ttf) format('truetype');
+  src: url(/99a5133/fonts/FiraCode-VariableFont.ttf) format('truetype');
 }
 
 /* TODO check if contain strict also makes sense for html and body */
@@ -776,8 +776,8 @@ body {
   height: 16px;
   contain: strict;
   background: #c5c5c5;
-  -webkit-mask: url(/b576f0e/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
-  mask: url(/b576f0e/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  -webkit-mask: url(/99a5133/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  mask: url(/99a5133/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
 }
 
 .NegativeMargin {
@@ -1455,7 +1455,7 @@ body {
   width: 0.75rem;
   height: 0.75rem;
   background: orchid;
-  -webkit-mask-image: url(/b576f0e/icons/check.svg);
+  -webkit-mask-image: url(/99a5133/icons/check.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1470,7 +1470,7 @@ body {
   height: 16px;
   content: '';
   display: block;
-  -webkit-mask-image: url(/b576f0e/icons/chevron-right.svg);
+  -webkit-mask-image: url(/99a5133/icons/chevron-right.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1789,7 +1789,7 @@ body {
   position: absolute;
   inset: 0;
   background: var(--TabActiveForeground);
-  -webkit-mask-image: url(/b576f0e/icons/icon-close.svg);
+  -webkit-mask-image: url(/99a5133/icons/icon-close.svg);
   -webkit-mask-repeat: no-repeat;
   mask-repeat: no-repeat;
   -webkit-mask-position: center;
@@ -1870,7 +1870,7 @@ body {
   content: '';
   position: absolute;
   inset: 0;
-  /* -webkit-mask-image: url(/b576f0e/icons/icon-close.svg); */
+  /* -webkit-mask-image: url(/99a5133/icons/icon-close.svg); */
   /* -webkit-mask-repeat: no-repeat; */
   /* mask-repeat: no-repeat; */
   /* -webkit-mask-position: center; */
@@ -1880,27 +1880,27 @@ body {
 }
 
 .IconProperty::before {
-  -webkit-mask-image: url(/b576f0e/icons/symbol-property.svg);
+  -webkit-mask-image: url(/99a5133/icons/symbol-property.svg);
   background: #c5c5c5;
 }
 
 .IconValue::before {
-  -webkit-mask-image: url(/b576f0e/icons/symbol-enum.svg);
+  -webkit-mask-image: url(/99a5133/icons/symbol-enum.svg);
   background: #ee9d28;
 }
 
 .IconVariable::before {
-  -webkit-mask-image: url(/b576f0e/icons/symbol-variable.svg);
+  -webkit-mask-image: url(/99a5133/icons/symbol-variable.svg);
   background: #75beff;
 }
 
 .IconFunction::before {
-  -webkit-mask-image: url(/b576f0e/icons/symbol-method.svg);
+  -webkit-mask-image: url(/99a5133/icons/symbol-method.svg);
   background: #b180d7;
 }
 
 .IconKeyword::before {
-  -webkit-mask-image: url(/b576f0e/icons/symbol-keyword.svg);
+  -webkit-mask-image: url(/99a5133/icons/symbol-keyword.svg);
   background: #c5c5c5;
 }
 

package/static/{b576f0e → 99a5133}/packages/renderer-process/dist/rendererProcessMain.js

@@ -363,7 +363,7 @@ var init_Platform = __esm({
       },
       getAssetDir() {
         if (true) {
-          return "/b576f0e";
+          return "/99a5133";
         }
         if (platform === "electron") {
           return "../../../../..";
@@ -4445,12 +4445,15 @@ var init_LayerSelections = __esm({
   "src/parts/Editor/LayerSelections.js"() {
     "use strict";
     init_Platform();
+    init_Assert();
     create$Selection = () => {
       const $Selection = document.createElement("div");
       $Selection.className = "EditorSelection";
       return $Selection;
     };
     render$Selection = ($Selection, selections, i) => {
+      object($Selection);
+      number(i);
       const top = selections[i * 4];
       const left = selections[i * 4 + 1];
       const width = selections[i * 4 + 2];
@@ -4462,7 +4465,7 @@ var init_LayerSelections = __esm({
     };
     render$SelectionsLess = ($Selections, childCount, selections, selectionCount) => {
       for (let i = 0, j = 0; i < childCount; i++, j += 4) {
-        render$Selection($Selections.children[i], selections[i]);
+        render$Selection($Selections.children[i], selections, i);
       }
       const fragment = document.createDocumentFragment();
       for (let i = childCount; i < selectionCount; i++) {