@lvce-editor/shared-process 0.15.18 → 0.15.19

package/extensions/builtin.language-basics-dart/src/tokenizeDart.js

@@ -43,9 +43,10 @@ export const hasArrayReturn = true
 
 const RE_KEYWORD =
   /^(?:abstract|as|assert|async|await|break|case|catch|class|const|continue|covariant|default|deferred|do|dynamic|else|enum|export|extends|extension|external|factory|false|final|finally|for|Function|get|hide|if|implements|import|in|interface|is|late|library|mixin|new|null|on|operator|part|required|rethrow|return|set|show|static|super|switch|sync|this|throw|true|try|typedef|var|void|while|with|yield)\b/
+
 const RE_WHITESPACE = /^\s+/
 const RE_VARIABLE_NAME = /^[a-zA-Z]+/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>]/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>+<]/
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/

package/extensions/builtin.language-basics-html/src/tokenizeHtml.js

@@ -89,6 +89,7 @@ const RE_SCRIPT_CONTENT_END = /^<\/script/
 const RE_STYLE_CONTENT = /^..*?(?=(?:<\/(?:style|head))|$)/s
 const RE_STYLE_CONTENT_END = /^<\/style/
 const RE_STYLE_CONTENT_END_2 = /^<\/head/
+const RE_TYPE = /^[^\s\>]+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -98,6 +99,8 @@ export const initialLineState = {
   embeddedLanguageStart: 0,
   embeddedLanguageEnd: 0,
   embeddedState: undefined,
+  specialTag: false,
+  type: '',
 }
 
 /**
@@ -150,6 +153,54 @@ const getEmbeddedContentState = (tag) => {
   }
 }
 
+/**
+ * @param {string} value
+ */
+const unquote = (value) => {
+  for (const quote of ["'", '"']) {
+    if (value.startsWith(quote) && value.endsWith(quote)) {
+      return value.slice(1, -1)
+    }
+  }
+  return value
+}
+
+/**
+ *
+ * @param {string} value
+ */
+const getType = (value) => {
+  const unquotedValue = unquote(value)
+  switch (unquotedValue) {
+    case 'text/javascript':
+    case 'text/x-javascript':
+    case 'text/jscript':
+    case 'text/livescript':
+    case 'text/babel':
+    case 'text/ecmascript':
+    case 'text/x-ecmascript':
+    case 'application/x-javascript':
+    case 'application/javascript':
+    case 'application/x-ecmascript':
+    case 'application/ecmascript':
+    case 'module':
+      return 'javascript'
+    case 'text/x-handlebars':
+    case 'text/x-handlebars-template':
+    case 'text/handlebars-template':
+    case 'text/template':
+    case 'text/x-template':
+    case 'text/ng-template':
+    case 'text/x-ng-template':
+      return 'html'
+    case 'application/json':
+    case 'application/ld+json':
+      return 'json'
+    default:
+      return ''
+  }
+}
+
 /**
  *
  * @param {string} line
@@ -166,6 +217,9 @@ export const tokenizeLine = (line, lineState) => {
   let embeddedLanguage = lineState.embeddedLanguage
   let embeddedLanguageStart = lineState.embeddedLanguageStart
   let embeddedLanguageEnd = lineState.embeddedLanguageEnd
+  let specialTag = lineState.specialTag
+  let attributeName = ''
+  let type = ''
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -198,6 +252,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.TagName
           state = State.InsideOpeningTag
           tag = next[0]
+          specialTag = tag === 'script' || tag === 'style'
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.PunctuationTag
           state = State.AfterClosingTagAngleBrackets
@@ -219,12 +274,15 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          const embeddedLanguageId = type || getEmbeddedLangageId(tag)
           if (embeddedLanguageId) {
             state = getEmbeddedContentState(tag)
             embeddedLanguage = embeddedLanguageId
             embeddedLanguageStart = index + next[0].length
           }
+          specialTag = false
+          type = ''
+          attributeName = ''
         } else if ((next = part.match(RE_EXCLAMATION_MARK))) {
           token = TokenType.PunctuationTag
           state = State.InsideOpeningTag
@@ -281,18 +339,22 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ATTRIBUTE_NAME))) {
           token = TokenType.AttributeName
           state = State.AfterAttributeName
+          attributeName = next[0]
         } else if ((next = part.match(RE_SELF_CLOSING))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          const embeddedLanguageId = type || getEmbeddedLangageId(tag)
           if (embeddedLanguageId) {
             state = getEmbeddedContentState(tag)
             embeddedLanguage = embeddedLanguageId
             embeddedLanguageStart = index + next[0].length
           }
+          specialTag = false
+          type = ''
+          attributeName = ''
         } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
@@ -314,12 +376,15 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          const embeddedLanguageId = type || getEmbeddedLangageId(tag)
           if (embeddedLanguageId) {
             state = getEmbeddedContentState(tag)
             embeddedLanguage = embeddedLanguageId
             embeddedLanguageStart = index + next[0].length
           }
+          specialTag = false
+          type = ''
+          attributeName = ''
         } else if ((next = part.match(RE_EQUAL_SIGN))) {
           token = TokenType.Punctuation
           state = State.AfterAttributeEqualSign
@@ -345,6 +410,13 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterAttributeEqualSign:
+        if (specialTag && attributeName === 'type') {
+          const valueMatch = part.match(RE_TYPE)
+          if (valueMatch) {
+            const value = valueMatch[0]
+            type = getType(value)
+          }
+        }
         if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.PunctuationString
           state = State.InsideDoubleQuoteString
@@ -473,5 +545,7 @@ export const tokenizeLine = (line, lineState) => {
     embeddedLanguage,
     embeddedLanguageStart,
     embeddedLanguageEnd,
+    specialTag,
+    type,
   }
 }

package/extensions/builtin.language-basics-javascript/src/tokenizeJavaScript.js

@@ -89,6 +89,7 @@ export const TokenMap = {
 
 const RE_KEYWORD =
   /^(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|if|implements|import|in|Infinity|instanceof|interface|let|new|null|of|package|private|protected|public|return|super|switch|static|this|throw|try|true|typeof|undefined|var|void|while|with|yield)\b/
+
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_SQUARE_OPEN = /^\[/
@@ -97,6 +98,7 @@ const RE_COMMA = /^,/
 const RE_COLON = /^:/
 const RE_NUMERIC =
   /^((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
+
 const RE_NUMERIC_OCTAL = /0(?:o|O)?[0-7][0-7_]*(n)?\b/
 const RE_LINE_COMMENT_START = /^\/\//
 const RE_LINE_COMMENT_CONTENT = /^[^\n]+/
@@ -128,6 +130,7 @@ const RE_STRING_ESCAPE = /^\\./
 const RE_SHEBANG = /^#!.*/
 const RE_FUNCTION_CALL_NAME =
   /^[\w]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
+
 const RE_DECORATOR = /^@\w+/
 const RE_BACKSLASH = /^\\/
 const RE_DOLLAR_CURLY_OPEN = /^\$\{/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.18",
+  "version": "0.15.19",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
-    "@lvce-editor/extension-host": "0.15.18",
-    "@lvce-editor/extension-host-helper-process": "0.15.18",
-    "@lvce-editor/pty-host": "0.15.18",
+    "@lvce-editor/extension-host": "0.15.19",
+    "@lvce-editor/extension-host-helper-process": "0.15.19",
+    "@lvce-editor/pty-host": "0.15.19",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",
@@ -28,11 +28,7 @@
     "lines-and-columns": "^2.0.3",
     "p-queue": "^7.3.4",
     "parse-json": "^7.0.0",
-    "symlink-dir": "^5.1.1",
-    "tail": "^2.2.6",
     "tar-fs": "^2.1.1",
-    "tmp-promise": "^3.0.3",
-    "trash": "^8.1.1",
     "ws": "^8.13.0",
     "xdg-basedir": "^5.1.0"
   },
@@ -40,6 +36,10 @@
     "extract-zip": "^2.0.1",
     "keytar": "^7.9.0",
     "vscode-ripgrep-with-github-api-error-fix": "^2.8.0",
-    "open": "^9.1.0"
+    "open": "^9.1.0",
+    "symlink-dir": "^5.1.1",
+    "tmp-promise": "^3.0.3",
+    "trash": "^8.1.1",
+    "tail": "^2.2.6"
   }
 }

package/src/parts/Character/Character.js

@@ -0,0 +1,11 @@
+export const Backslash = '\\'
+export const Dash = '-'
+export const Dot = '.'
+export const EmptyString = ''
+export const NewLine = '\n'
+export const OpenAngleBracket = '<'
+export const Slash = '/'
+export const Space = ' '
+export const Tab = '\t'
+export const Underline = '_'
+export const T = 't'

package/src/parts/Configuration/Configuration.js

@@ -1,6 +1,6 @@
-import { readFile } from 'node:fs/promises'
+import * as Character from '../Character/Character.js'
 import { writeFile } from '../FileSystem/FileSystem.js'
-import * as ReadJson from '../JsonFile/JsonFile.js'
+import * as JsonFile from '../JsonFile/JsonFile.js'
 
 let settings
 let settingsPromise
@@ -9,7 +9,7 @@ const readSettings = async () => {
   // TODO allow jsonc
   if (!settings) {
     if (!settingsPromise) {
-      settingsPromise = ReadJson.readJson('/tmp/settings.json')
+      settingsPromise = JsonFile.readJson('/tmp/settings.json')
     }
     await settingsPromise
   }
@@ -18,10 +18,7 @@ const readSettings = async () => {
 
 const writeSettings = async () => {
   // TODO jsonc
-  await writeFile(
-    '/tmp/settings.json',
-    JSON.stringify(settings, null, 2) + '\n'
-  )
+  await writeFile('/tmp/settings.json', JSON.stringify(settings, null, 2) + Character.NewLine)
 }
 
 export const get = async (key) => {

package/src/parts/ErrorHandling/ErrorHandling.js

@@ -1,3 +1,4 @@
+import * as Character from '../Character/Character.js'
 import * as ExitCode from '../ExitCode/ExitCode.js'
 import * as GetNewLineIndex from '../GetNewLineIndex/GetNewLineIndex.js'
 import * as IsIgnoredError from '../IsIgnoredError/IsIgnoredError.js'
@@ -62,6 +63,6 @@ export const handleUncaughtExceptionMonitor = (error, origin) => {
     return
   }
   const prettyError = PrettyError.prepare(error)
-  Logger.error(prettyError.codeFrame + '\n' + prettyError.stack + '\n')
+  Logger.error(prettyError.codeFrame + Character.NewLine + prettyError.stack + Character.NewLine)
   Process.setExitCode(ExitCode.Error)
 }

package/src/parts/ExportStatic/ExportStatic.js

@@ -119,13 +119,8 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
-    `getColorThemeUrlWeb = (colorThemeId) => {
-      return \`/extensions/builtin.theme-\${colorThemeId}/color-theme.json\`;
-    };`,
-    `const getColorThemeUrlWeb = (colorThemeId) => {
-      const assetDir = getAssetDir()
-      return \`\${assetDir}/themes/\${colorThemeId}.json\`
-    }`
+    `return \`\${assetDir}/extensions/builtin.theme-\${colorThemeId}/color-theme.json\``,
+    `return \`\${assetDir}/themes/\${colorThemeId}.json\``
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.js'),
@@ -134,13 +129,8 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
-    `getIconThemeUrl = (iconThemeId) => {
-      return \`/extensions/builtin.\${iconThemeId}/icon-theme.json\`;
-    }`,
-    `getIconThemeUrl = (iconThemeId) => {
-      const assetDir = getAssetDir()
-      return \`\${assetDir}/icon-themes/\${iconThemeId}.json\`
-    }`
+    `return \`\${assetDir}/extensions/builtin.\${iconThemeId}/icon-theme.json\``,
+    `return \`\${assetDir}/icon-themes/\${iconThemeId}.json\``
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),

package/src/parts/GetNewLineIndex/GetNewLineIndex.js

@@ -1,3 +1,5 @@
+import * as Character from '../Character/Character.js'
+
 /**
  *
  * @param {string} string
@@ -5,5 +7,5 @@
  * @returns
  */
 export const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf('\n', startIndex)
+  return string.indexOf(Character.NewLine, startIndex)
 }

package/src/parts/GetTerminalSpawnOptions/GetTerminalSpawnOptions.ipc.js

@@ -0,0 +1,7 @@
+import * as GetTerminalSpawnOptions from './GetTerminalSpawnOptions.js'
+
+export const name = 'GetTerminalSpawnOptions'
+
+export const Commands = {
+  getTerminalSpawnOptions: GetTerminalSpawnOptions.getTerminalSpawnOptions,
+}

package/src/parts/GetTerminalSpawnOptions/GetTerminalSpawnOptions.js

@@ -0,0 +1,14 @@
+import * as Platform from '../Platform/Platform.js'
+
+export const getTerminalSpawnOptions = () => {
+  if (Platform.isWindows) {
+    return {
+      command: 'powershell.exe',
+      args: [],
+    }
+  }
+  return {
+    command: 'bash',
+    args: ['-i'],
+  }
+}

package/src/parts/JoinLines/JoinLines.js

@@ -1,3 +1,5 @@
+import * as Character from '../Character/Character.js'
+
 export const joinLines = (lines) => {
-  return lines.join('\n')
+  return lines.join(Character.NewLine)
 }

package/src/parts/Json/Json.js

@@ -1,6 +1,7 @@
 // parsing error handling based on https://github.com/sindresorhus/parse-json/blob/main/index.js
 
 import { JsonParsingError } from '../JsonParsingError/JsonParsingError.js'
+import * as Character from '../Character/Character.js'
 
 export const parse = async (string, filePath) => {
   try {
@@ -13,5 +14,5 @@ export const parse = async (string, filePath) => {
 }
 
 export const stringify = (value) => {
-  return JSON.stringify(value, null, 2) + '\n'
+  return JSON.stringify(value, null, 2) + Character.NewLine
 }

package/src/parts/JsonError/JsonError.js

@@ -9,8 +9,10 @@ const emptyError = {
   codeFrame: '',
 }
 
+const RE_POSITION = /in JSON at position (\d+)/
+
 export const getErrorPropsFromError = (error, string, filePath) => {
-  const indexMatch = error.message.match(/in JSON at position (\d+)/)
+  const indexMatch = error.message.match(RE_POSITION)
   if (indexMatch && indexMatch.length > 0) {
     const lines = new LinesAndColumns(string)
     const index = Number(indexMatch[1])

package/src/parts/Module/Module.js

@@ -66,6 +66,8 @@ export const load = (moduleId) => {
       return import('../HandleElectronMessagePort/HandleElectronMessagePort.ipc.js')
     case ModuleId.HandleNodeMessagePort:
       return import('../HandleNodeMessagePort/HandleNodeMessagePort.ipc.js')
+    case ModuleId.GetTerminalSpawnOptions:
+      return import('../GetTerminalSpawnOptions/GetTerminalSpawnOptions.ipc.js')
     default:
       throw new Error(`module ${moduleId} not found`)
   }

package/src/parts/ModuleId/ModuleId.js

@@ -30,3 +30,4 @@ export const Process = 29
 export const AttachDebugger = 30
 export const HandleElectronMessagePort = 31
 export const HandleNodeMessagePort = 32
+export const GetTerminalSpawnOptions = 33

package/src/parts/ModuleMap/ModuleMap.js

@@ -173,6 +173,8 @@ export const getModuleId = (commandId) => {
       return ModuleId.HandleNodeMessagePort
     case 'HandleElectronMessagePort.handleElectronMessagePort':
       return ModuleId.HandleElectronMessagePort
+    case 'GetTerminalSpawnOptions.getTerminalSpawnOptions':
+      return ModuleId.GetTerminalSpawnOptions
     default:
       throw new CommandNotFoundError(commandId)
   }

package/src/parts/PrettyError/PrettyError.js

@@ -8,6 +8,7 @@ import * as GetActualPath from '../GetActualPath/GetActualPath.js'
 import * as JoinLines from '../JoinLines/JoinLines.js'
 import * as Json from '../Json/Json.js'
 import * as SplitLines from '../SplitLines/SplitLines.js'
+import * as Logger from '../Logger/Logger.js'
 
 const RE_MODULE_NOT_FOUND_STACK = /Cannot find package '([^']+)' imported from (.+)$/
 
@@ -54,46 +55,51 @@ const prepareModuleNotFoundError = (error) => {
 }
 
 export const prepare = (error) => {
-  if (error && error.code === ErrorCodes.ERR_MODULE_NOT_FOUND) {
-    return prepareModuleNotFoundError(error)
-  }
-  const { message } = error
-  if (error && error.cause) {
-    const cause = error.cause()
-    if (cause) {
-      error = cause
+  try {
+    if (error && error.code === ErrorCodes.ERR_MODULE_NOT_FOUND) {
+      return prepareModuleNotFoundError(error)
     }
-  }
-  const lines = CleanStack.cleanStack(error.stack)
-  const file = lines[0]
-  let codeFrame = ''
-  if (error.codeFrame) {
-    codeFrame = error.codeFrame
-  } else if (file) {
-    let match = file.match(/\((.*):(\d+):(\d+)\)$/)
-    if (!match) {
-      match = file.match(/at (.*):(\d+):(\d+)$/)
+    const { message } = error
+    if (error && error.cause) {
+      const cause = error.cause()
+      if (cause) {
+        error = cause
+      }
     }
-    if (match) {
-      const [_, path, line, column] = match
-      const actualPath = GetActualPath.getActualPath(path)
-      const rawLines = readFileSync(actualPath, EncodingType.Utf8)
-      const location = {
-        start: {
-          line: Number.parseInt(line),
-          column: Number.parseInt(column),
-        },
+    const lines = CleanStack.cleanStack(error.stack)
+    const file = lines[0]
+    let codeFrame = ''
+    if (error.codeFrame) {
+      codeFrame = error.codeFrame
+    } else if (file) {
+      let match = file.match(/\((.*):(\d+):(\d+)\)$/)
+      if (!match) {
+        match = file.match(/at (.*):(\d+):(\d+)$/)
+      }
+      if (match) {
+        const [_, path, line, column] = match
+        const actualPath = GetActualPath.getActualPath(path)
+        const rawLines = readFileSync(actualPath, EncodingType.Utf8)
+        const location = {
+          start: {
+            line: Number.parseInt(line),
+            column: Number.parseInt(column),
+          },
+        }
+        codeFrame = codeFrameColumns(rawLines, location)
       }
-      codeFrame = codeFrameColumns(rawLines, location)
     }
-  }
-  const relevantStack = JoinLines.joinLines(lines)
-  return {
-    message,
-    stack: relevantStack,
-    codeFrame,
-    type: error.constructor.name,
-    code: error.code,
+    const relevantStack = JoinLines.joinLines(lines)
+    return {
+      message,
+      stack: relevantStack,
+      codeFrame,
+      type: error.constructor.name,
+      code: error.code,
+    }
+  } catch (otherError) {
+    Logger.warn(`ErrorHandling Error: ${otherError}`)
+    return error
   }
 }
 

package/src/parts/SplitLines/SplitLines.js

@@ -1,3 +1,5 @@
+import * as Character from '../Character/Character.js'
+
 export const splitLines = (lines) => {
-  return lines.split('\n')
+  return lines.split(Character.NewLine)
 }

package/src/parts/Terminal/Terminal.js

@@ -28,7 +28,7 @@ const createTerminal = (ptyHost, socket) => {
   }
 }
 
-export const create = async (socket, id, cwd) => {
+export const create = async (socket, id, cwd, command, args) => {
   try {
     Assert.object(socket)
     Assert.number(id)
@@ -41,7 +41,7 @@ export const create = async (socket, id, cwd) => {
     ptyHost.send({
       jsonrpc: JsonRpcVersion.Two,
       method: 'Terminal.create',
-      params: [id, cwd],
+      params: [id, cwd, command, args],
     })
   } catch (error) {
     throw new VError(error, `Failed to create terminal`)