@lvce-editor/shared-process 0.11.9 → 0.11.10

package/extensions/builtin.language-basics-xml/extension.json

@@ -68,7 +68,8 @@
         ".xoml",
         ".xpdl",
         ".xsd",
-        ".xul"
+        ".xul",
+        ".tmtheme"
       ],
       "fileNames": [".project"],
       "tokenize": "src/tokenizeXml.js"

package/extensions/builtin.language-basics-xml/src/tokenizeXml.js

@@ -83,6 +83,7 @@ const RE_TAGNAME = /^[!\w\-]+/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/
+const RE_QUESTION_MARK_TAG_NAME = /^\?\w+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -143,6 +144,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_QUESTION_MARK_TAG_NAME))) {
+          token = TokenType.TagName
+          state = State.InsideOpeningTag
         } else if ((next = part.match(RE_ANY_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -205,6 +209,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
         } else if ((next = part.match(RE_TAG_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent

package/extensions/builtin.language-basics-yaml/src/tokenizeYaml.js

@@ -109,6 +109,7 @@ export const initialLineState = {
   tokens: [],
   indent: '',
   keyOffset: 0,
+  stack: [],
 }
 
 export const hasArrayReturn = true
@@ -137,6 +138,7 @@ export const tokenizeLine = (line, lineState) => {
   let token = TokenType.None
   let state = lineState.state
   let keyOffset = lineState.keyOffset
+  const stack = lineState.stack
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -184,7 +186,7 @@ export const tokenizeLine = (line, lineState) => {
       case State.InsideLineComment:
         if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Comment
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else {
           throw new Error('no')
         }
@@ -245,6 +247,10 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterPipe
+        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideLineComment
+          stack.push(State.AfterPipe)
         } else {
           throw new Error('no')
         }
@@ -387,5 +393,6 @@ export const tokenizeLine = (line, lineState) => {
     state,
     tokens,
     keyOffset,
+    stack,
   }
 }

package/extensions/builtin.theme-cobalt2/color-theme.json

@@ -151,6 +151,10 @@
     {
       "name": "KeywordReturn",
       "foreground": "#FF9D00"
+    },
+    {
+      "name": "KeywordOperator",
+      "foreground": "#FF9D00"
     }
   ]
 }

package/extensions/builtin.theme-gruvbox/color-theme.json

@@ -137,6 +137,10 @@
       "name": "KeywordControl",
       "foreground": "#EA6962"
     },
+    {
+      "name": "KeywordOperator",
+      "foreground": "#EA6962"
+    },
     {
       "name": "Regex",
       "foreground": "#D8A657"

package/extensions/builtin.theme-palenight/color-theme.json

@@ -192,6 +192,10 @@
     {
       "name": "KeywordReturn",
       "foreground": "#89DDFF"
+    },
+    {
+      "name": "KeywordOperator",
+      "foreground": "#89DDFF"
     }
   ]
 }

package/extensions/builtin.theme-slime/color-theme.json

@@ -30,6 +30,8 @@
 
     "MainBackground": "#1e2324",
 
+    "MenuItemHoverBackground": "rgb(81, 95, 89)",
+
     "PanelBackground": "#1b2020",
     "PanelBorderTopColor": "rgba(128, 128, 128, 0.35)",
     "PanelTabForeground": "rgba(231, 231, 231, 0.6)",
@@ -52,7 +54,9 @@
     "TitleBarBackground": "rgb(40, 46, 47)",
     "TitleBarBorderBottomColor": "#222",
     "TitleBarColor": "#cccccc",
-    "TitleBarColorInactive": "rgba(204, 204, 204, 0.6)"
+    "TitleBarColorInactive": "rgba(204, 204, 204, 0.6)",
+
+    "WorkbenchForeground": "#cccccc"
   },
   "tokenColors": [
     {
@@ -230,6 +234,10 @@
     {
       "name": "KeywordThis",
       "foreground": "#BE9296"
+    },
+    {
+      "name": "KeywordOperator",
+      "foreground": "#B4B4B4"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.11.9",
+  "version": "0.11.10",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@lvce-editor/extension-host": "0.11.9",
-    "@lvce-editor/extension-host-helper-process": "0.11.9",
-    "@lvce-editor/pty-host": "0.11.9",
+    "@lvce-editor/extension-host": "0.11.10",
+    "@lvce-editor/extension-host-helper-process": "0.11.10",
+    "@lvce-editor/pty-host": "0.11.10",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
     "exit-hook": "^3.1.4",
@@ -29,7 +29,7 @@
     "open": "^8.4.0",
     "p-queue": "^7.3.0",
     "parse-json": "^6.0.2",
-    "tail": "^2.2.4",
+    "tail": "^2.2.5",
     "tar-fs": "^2.1.1",
     "tmp-promise": "^3.0.3",
     "trash": "^8.1.0",

package/src/parts/Cli/Cli.js

@@ -16,12 +16,12 @@ const getModule = (argv0) => {
   }
 }
 
-export const handleCliArgs = async (argv, console, process) => {
+export const handleCliArgs = async (argv) => {
   const argv0 = argv[0]
   const module = await getModule(argv0)
   // console.log('handle cli args')
   try {
-    await module.handleCliArgs(argv, console, process)
+    await module.handleCliArgs(argv)
   } catch (error) {
     Logger.error(error)
     Process.setExitCode(1)

package/src/parts/CliInstall/CliInstall.js

@@ -1,11 +1,26 @@
 import * as ExtensionInstall from '../ExtensionInstall/ExtensionInstall.js'
 import * as Logger from '../Logger/Logger.js'
+import * as Process from '../Process/Process.js'
 
-export const handleCliArgs = async (argv, console) => {
-  const extension = argv[1]
-  if (!extension) {
-    Logger.error('extension argument is required')
-    return
+export const handleCliArgs = async (argv) => {
+  try {
+    const extension = argv[1]
+    if (!extension) {
+      Logger.error('extension argument is required')
+      return
+    }
+    await ExtensionInstall.install(extension)
+  } catch (error) {
+    if (error && error.message && error.message.includes('Response code')) {
+      Logger.error(error.message)
+      Process.setExitCode(128)
+      return
+    }
+    if (error && error.message && error.message.includes('getaddrinfo EAI_AGAIN')) {
+      Logger.error(error.message)
+      Process.setExitCode(128)
+      return
+    }
+    throw error
   }
-  await ExtensionInstall.install(extension)
 }

package/src/parts/CliList/CliList.js

@@ -1,4 +1,5 @@
 import * as ExtensionList from '../ExtensionList/ExtensionList.js'
+import * as Logger from '../Logger/Logger.js'
 
 const getOutputLine = (extension) => {
   return `${extension.id}: ${extension.version}`
@@ -8,8 +9,8 @@ const getOutput = (extensions) => {
   return extensions.map(getOutputLine).join('\n')
 }
 
-export const handleCliArgs = async (argv, console) => {
+export const handleCliArgs = async (argv) => {
   const extensions = await ExtensionList.list()
   const output = getOutput(extensions)
-  console.info(output)
+  Logger.info(output)
 }

package/src/parts/CliUnlink/CliUnlink.js

@@ -1,7 +1,7 @@
 import * as ExtensionUnlink from '../ExtensionUnlink/ExtensionUnlink.js'
 import * as Process from '../Process/Process.js'
 
-export const handleCliArgs = async (argv, console, process) => {
+export const handleCliArgs = async (argv) => {
   const path = argv.length > 1 ? argv[1] : Process.cwd()
   await ExtensionUnlink.unlink(path)
 }

package/src/parts/DownloadAndExtract/DownloadAndExtract.js

@@ -1,14 +1,24 @@
-import got from 'got'
+import got, { RequestError } from 'got'
 import { pipeline } from 'stream/promises'
 import tar from 'tar-fs'
 import { createGunzip } from 'zlib'
+import { VError } from '../VError/VError.js'
 
 export const downloadAndExtractTarGz = async ({ url, outDir, strip }) => {
-  await pipeline(
-    got.stream(url),
-    createGunzip(),
-    tar.extract(outDir, {
-      strip,
-    })
-  )
+  try {
+    await pipeline(
+      got.stream(url),
+      createGunzip(),
+      tar.extract(outDir, {
+        strip,
+      })
+    )
+  } catch (error) {
+    // console.log({ error })
+    if (error && error instanceof RequestError) {
+      console.log('is req error')
+      throw new VError(`Failed to download ${url}: ${error.message}`)
+    }
+    throw error
+  }
 }

package/src/parts/ErrorHandling/ErrorHandling.js

@@ -2,6 +2,7 @@ import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as PrettyError from '../PrettyError/PrettyError.js'
 import * as Socket from '../Socket/Socket.js'
 import * as Process from '../Process/Process.js'
+import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
 
 export const state = {
   seenErrors: [],
@@ -17,9 +18,7 @@ const preparePrettyError = (error) => {
 }
 
 const printPrettyError = (prettyError) => {
-  console.error(
-    `${prettyError.message}\n${prettyError.codeFrame}\n${prettyError.stack}`
-  )
+  console.error(`${prettyError.message}\n${prettyError.codeFrame}\n${prettyError.stack}`)
 }
 
 export const handleError = (error) => {
@@ -29,7 +28,7 @@ export const handleError = (error) => {
   state.seenErrors.push(error.message)
   const prettyError = preparePrettyError(error)
   Socket.send({
-    jsonrpc: '2.0',
+    jsonrpc: JsonRpcVersion.Two,
     method: /* Dialog.showErrorDialogWithOptions */ 'Dialog.showMessage',
     params: [
       {
@@ -62,11 +61,7 @@ export const handleUncaughtExceptionMonitor = (error, origin) => {
     // parent process is disposed, ignore
     return
   }
-  if (
-    error &&
-    error.code === ErrorCodes.ERR_IPC_CHANNEL_CLOSED &&
-    !Process.isConnected()
-  ) {
+  if (error && error.code === ErrorCodes.ERR_IPC_CHANNEL_CLOSED && !Process.isConnected()) {
     // parent process is disposed, ignore
     return
   }