@lvce-editor/shared-process 0.16.23 → 0.17.1

package/extensions/builtin.language-basics-css/src/tokenizeCss.js

@@ -87,10 +87,10 @@ export const TokenMap = {
   [TokenType.CssPseudoSelector]: 'CssPseudoSelector',
 }
 
-const RE_SELECTOR = /^[\.a-zA-Z\d\->+~_%\\\p{L}]+/u
-const RE_SELECTOR_ID = /^#[\w\-\_]+/
+const RE_SELECTOR_ELEMENT = /^[a-zA-Z\d\->+~_%\\\p{L}]+/u
+const RE_SELECTOR_ID = /^#[\w\-\_\\]+/
 const RE_PSEUDO_SELECTOR = /^:[\p{L}\-]+/u
-const RE_SELECTOR_CLASS = /^\.[\w\-_\p{L}]+/u
+const RE_SELECTOR_CLASS = /^\.[\w\-_\p{L}\p{Emoji_Presentation}]+/u
 const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
@@ -165,7 +165,7 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_SELECTOR_CLASS))) {
           token = TokenType.CssSelectorClass
           state = State.AfterSelector
-        } else if ((next = part.match(RE_SELECTOR))) {
+        } else if ((next = part.match(RE_SELECTOR_ELEMENT))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
         } else if ((next = part.match(RE_SELECTOR_ID))) {
@@ -232,7 +232,7 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SELECTOR_CLASS))) {
           token = TokenType.CssSelectorClass
           state = State.AfterSelector
-        } else if ((next = part.match(RE_SELECTOR))) {
+        } else if ((next = part.match(RE_SELECTOR_ELEMENT))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
         } else if ((next = part.match(RE_SELECTOR_ID))) {
@@ -253,6 +253,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_VERTICAL_LINE))) {
           token = TokenType.Punctuation
           state = State.AfterSelector
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.Punctuation
           state = State.AfterSelector

package/extensions/builtin.language-basics-java/src/tokenizeJava.js

@@ -29,7 +29,9 @@ export const TokenType = {
   KeywordThis: 12,
   Class: 13,
   Comment: 14,
+  Text: 117,
   FunctionName: 885,
+  KeywordImport: 215,
 }
 
 export const TokenMap = {
@@ -49,6 +51,8 @@ export const TokenMap = {
   [TokenType.Class]: 'Class',
   [TokenType.Comment]: 'Comment',
   [TokenType.FunctionName]: 'Function',
+  [TokenType.Text]: 'Text',
+  [TokenType.KeywordImport]: 'KeywordImport',
 }
 
 export const initialLineState = {
@@ -77,6 +81,7 @@ const RE_CURLY_OPEN = /^\{/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_SLASH = /^\//
 const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\())/
+const RE_ANYTHING = /^.+/u
 
 export const hasArrayReturn = true
 
@@ -128,6 +133,8 @@ export const tokenizeLine = (line, lineState) => {
             case 'extends':
               token = TokenType.Keyword
               state = State.AfterKeywordBeforeClass
+            case 'import':
+              token = TokenType.KeywordImport
               break
             default:
               token = TokenType.Keyword
@@ -166,6 +173,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ATTRIBUTE))) {
           token = TokenType.Attribute
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           part //?
           throw new Error('no')

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

@@ -22,6 +22,7 @@ const State = {
   InsideBacktickString: 17,
   AfterPropertyDot: 18,
   AfterKeywordClass: 19,
+  AfterKeywordVariableDeclaration: 20,
 }
 
 /**
@@ -55,6 +56,7 @@ export const TokenType = {
   KeywordOperator: 887,
   KeywordFunction: 889,
   Class: 890,
+  KeywordVoid: 891,
 }
 
 export const TokenMap = {
@@ -84,6 +86,7 @@ export const TokenMap = {
   [TokenType.KeywordThis]: 'KeywordThis',
   [TokenType.KeywordOperator]: 'KeywordOperator',
   [TokenType.KeywordFunction]: 'KeywordFunction',
+  [TokenType.KeywordVoid]: 'KeywordVoid',
   [TokenType.Class]: 'Class',
 }
 
@@ -129,7 +132,7 @@ const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`\\\$]+/
 const RE_STRING_ESCAPE = /^\\./
 const RE_SHEBANG = /^#!.*/
 const RE_FUNCTION_CALL_NAME =
-  /^[\w]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
+  /^[\w\$]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
 
 const RE_DECORATOR = /^@\w+/
 const RE_BACKSLASH = /^\\/
@@ -144,7 +147,10 @@ const RE_REGEX =
 const RE_VARIABLE_NAME_SPECIAL = /\p{L}/u
 const RE_VARIABLE_NAME_SPECIAL_2 = /./u
 const RE_BUILTIN_CLASS =
-  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement)\b/
+  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement|HTMLFormElement)\b/
+
+const RE_PROPERTY_NAME = /^[a-z]\w*(?=\s*\:)/
+const RE_PROPERTY_NAME_FUNCTION = /^[a-z]\w*(?=\s*\()/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -176,6 +182,71 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_PROPERTY_NAME_FUNCTION))) {
+          switch (next[0]) {
+            case 'function':
+              token = TokenType.KeywordFunction
+              state = State.TopLevelContent
+              break
+            case 'async':
+              token = TokenType.KeywordModifier
+              state = State.TopLevelContent
+              break
+            case 'await':
+              token = TokenType.KeywordModifier
+              state = State.TopLevelContent
+              break
+            case 'as':
+            case 'switch':
+            case 'default':
+            case 'case':
+            case 'else':
+            case 'if':
+            case 'break':
+            case 'throw':
+            case 'for':
+            case 'try':
+            case 'catch':
+            case 'finally':
+            case 'continue':
+            case 'while':
+              token = TokenType.KeywordControl
+              state = State.TopLevelContent
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              state = State.TopLevelContent
+              break
+            case 'new':
+              token = TokenType.KeywordNew
+              state = State.TopLevelContent
+              break
+            case 'this':
+              token = TokenType.KeywordThis
+              state = State.TopLevelContent
+              break
+            case 'import':
+            case 'export':
+            case 'from':
+              token = TokenType.KeywordImport
+              state = State.TopLevelContent
+              break
+            case 'constructor':
+            case 'super':
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+            default:
+              token = TokenType.FunctionName
+              state = State.TopLevelContent
+              break
+          }
+        } else if ((next = part.match(RE_PROPERTY_NAME))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+          if (part === 'default:') {
+            token = TokenType.KeywordControl
+          }
         } else if ((next = part.match(RE_KEYWORD))) {
           switch (next[0]) {
             case 'true':
@@ -257,6 +328,16 @@ export const tokenizeLine = (line, lineState) => {
               token = TokenType.Keyword
               state = State.AfterKeywordClass
               break
+            case 'var':
+            case 'let':
+            case 'const':
+              token = TokenType.Keyword
+              state = State.AfterKeywordVariableDeclaration
+              break
+            case 'void':
+              token = TokenType.KeywordVoid
+              state = State.TopLevelContent
+              break
             default:
               token = TokenType.Keyword
               state = State.TopLevelContent
@@ -478,6 +559,39 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterKeywordVariableDeclaration:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordVariableDeclaration
+        } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
+          token = TokenType.FunctionName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_CURLY_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.AfterKeywordVariableDeclaration
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME_SPECIAL))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME_SPECIAL_2))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+        } else {
+          throw new Error(`no`)
+        }
+        break
       default:
         state
         throw new Error('no')

package/extensions/builtin.language-basics-typescript/src/tokenizeTypeScript.js

@@ -196,7 +196,7 @@ const RE_KEYWORD_READONLY = /^readonly\b/
 const RE_SHEBANG = /^\#\!\/.*/
 const RE_SPREAD = /^\.\.\./
 const RE_BUILTIN_CLASS =
-  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement)\b/
+  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement|MutationRecord|HTMLVideoElement)\b/
 
 const RE_KEYWORD_NEW = /^new\b/
 const RE_KEYWORD_IMPLEMENTS = /^implements\b/
@@ -700,7 +700,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterType
         } else if ((next = part.match(RE_EQUAL))) {
           token = TokenType.Punctuation
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_QUESTION_MARK_COLON))) {
           token = TokenType.Punctuation
           state = State.BeforeType
@@ -1120,7 +1120,6 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.BeforeType
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
-          stack
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_SEMICOLON))) {
@@ -1161,6 +1160,10 @@ export const tokenizeLine = (line, lineState) => {
           stack.push(state)
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_ROUND_OPEN))) {
+          stack.push(State.AfterMethodParameters)
+          token = TokenType.Punctuation
+          state = State.InsideMethodParameters
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -1375,6 +1378,8 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterMethodParameters
         } else if ((next = part.match(RE_ARROW))) {
           token = TokenType.Punctuation
+          // TODO depending on whether this is a type function
+          // this can be either a type or a value
           state = State.BeforeType
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Punctuation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.16.23",
+  "version": "0.17.1",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.22.5",
-    "@lvce-editor/extension-host": "0.16.23",
-    "@lvce-editor/extension-host-helper-process": "0.16.23",
-    "@lvce-editor/pty-host": "0.16.23",
+    "@lvce-editor/extension-host": "0.17.1",
+    "@lvce-editor/extension-host-helper-process": "0.17.1",
+    "@lvce-editor/pty-host": "0.17.1",
     "debug": "^4.3.4",
-    "execa": "^7.1.1",
+    "execa": "^7.2.0",
     "exit-hook": "^3.2.0",
     "got": "^13.0.0",
     "is-object": "^1.0.2",

package/src/parts/AutoUpdaterWindowsNsis/AutoUpdaterWindowsNsis.js

@@ -1,19 +1,15 @@
 import { spawn } from 'node:child_process'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
 import * as Assert from '../Assert/Assert.js'
 import * as Download from '../Download/Download.js'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import * as GetFirstSpawnedProcessEvent from '../GetFirstSpawnedProcessEvent/GetFirstSpawnedProcessEvent.js'
+import * as GetNsisUpdateArgs from '../GetNsisUpdateArgs/GetNsisUpdateArgs.js'
+import * as GetNsisDownloadPath from '../GetNsisUpdateDownloadPath/GetNsisUpdateDownloadPath.js'
 import * as GetWindowsNsisDownloadUrl from '../GetWindowsNsisDownloadUrl/GetWindowsNsisDownloadUrl.js'
 import * as Logger from '../Logger/Logger.js'
 import * as Platform from '../Platform/Platform.js'
 import { VError } from '../VError/VError.js'
 
-const getOutfilePath = (version) => {
-  Assert.string(version)
-  const outFile = join(tmpdir(), `nsis-update-${version}`)
-  return outFile
-}
-
 export const downloadUpdate = async (version) => {
   try {
     Assert.string(version)
@@ -21,7 +17,7 @@ export const downloadUpdate = async (version) => {
     const setupName = Platform.getSetupName()
     const fileName = `${setupName}-v${version}.exe`
     const downLoadUrl = GetWindowsNsisDownloadUrl.getDownloadUrl(repository, version, fileName)
-    const outFile = getOutfilePath(version)
+    const outFile = GetNsisDownloadPath.getNsisUpdateDownloadPath(version)
     Logger.info(`[shared-process] downloading nsis update: ${downLoadUrl} -> ${outFile}`)
     await Download.download(downLoadUrl, outFile)
     Logger.info(`[shared-process] downloaded nsis update: ${outFile}`)
@@ -31,44 +27,17 @@ export const downloadUpdate = async (version) => {
   }
 }
 
-const getNsisUpdateArgs = () => {
-  const args = []
-  args.push('--updated')
-  args.push('/S')
-  args.push('--force-run')
-  return args
-}
-
-const getFirstNsisProcessEvent = async (childProcess) => {
-  const { type, event } = await new Promise((resolve) => {
-    const cleanup = (value) => {
-      childProcess.off('error', handleError)
-      childProcess.off('exit', handleExit)
-      resolve(value)
-    }
-    const handleError = (event) => {
-      cleanup({ type: 'error', event })
-    }
-    const handleExit = (event) => {
-      cleanup({ type: 'exit', event })
-    }
-    childProcess.on('error', handleError)
-    childProcess.on('exit', handleExit)
-  })
-  return {
-    type,
-    event,
-  }
-}
-
 export const installAndRestart = async (downloadPath) => {
   try {
     Assert.string(downloadPath)
-    const args = getNsisUpdateArgs()
+    const args = GetNsisUpdateArgs.getNsisUpdateArgs()
     Logger.info(`[shared-process] spawning nsis update: ${downloadPath}`)
-    const child = spawn(downloadPath, args, { stdio: 'inherit' })
-    const { type, event } = await getFirstNsisProcessEvent(child)
-    if (type === 'error') {
+    const child = spawn(downloadPath, args, {
+      stdio: 'inherit',
+      detached: true,
+    })
+    const { type, event } = await GetFirstSpawnedProcessEvent.getFirstSpawnedProcessEvent(child)
+    if (type === FirstNodeWorkerEventType.Error) {
       throw new Error(`Child process error: ${event}`)
     }
     Logger.info(`[shared-process] finished nsis update`)

package/src/parts/ExtensionLink/ExtensionLink.js

@@ -34,6 +34,9 @@ export const link = async (path) => {
     const to = Path.join(linkedExtensionsPath, manifest.id)
     await SymLink.createSymLink(path, to)
   } catch (error) {
+    if (error && error.code === ErrorCodes.E_MANIFEST_NOT_FOUND) {
+      throw new VError(`Failed to link extension: Extension manifest not found '${error.path}'`)
+    }
     if (error && error.code === ErrorCodes.EEXIST) {
       return linkFallBack(path)
     }

package/src/parts/ExtensionManifest/ExtensionManifest.js

@@ -1,25 +1,16 @@
 import isObject from 'is-object'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
+import * as InferExtensionId from '../InferExtensionId/InferExtensionId.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as ReadJson from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
-import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import { VError } from '../VError/VError.js'
 
-const RE_EXTENSION_FRAGMENT = /.+(\/|\\)(.+)$/
-
-const inferExtensionId = (absolutePath) => {
-  const match = absolutePath.match(RE_EXTENSION_FRAGMENT)
-  if (match) {
-    return match[2]
-  }
-  return ''
-}
-
 // TODO json parsing and error handling should happen in renderer process
 export const get = async (path) => {
+  const absolutePath = Path.join(path, 'extension.json')
   try {
-    const absolutePath = Path.join(path, 'extension.json')
     const json = await ReadJson.readJson(absolutePath)
     if (!isObject(json)) {
       // TODO should include stack of extension json file here
@@ -31,7 +22,7 @@ export const get = async (path) => {
       status: ExtensionManifestStatus.Resolved,
     }
   } catch (error) {
-    const id = inferExtensionId(path)
+    const id = InferExtensionId.inferExtensionId(path)
     const enhancedError = new VError(error, `Failed to load extension manifest for ${id}`)
     if (IsEnoentError.isEnoentError(error)) {
       try {
@@ -48,6 +39,8 @@ export const get = async (path) => {
         }
       } catch {}
       // @ts-ignore
+      enhancedError.path = absolutePath
+      // @ts-ignore
       enhancedError.code = ErrorCodes.E_MANIFEST_NOT_FOUND
     } else {
       // @ts-ignore

package/src/parts/GetFirstSpawnedProcessEvent/GetFirstSpawnedProcessEvent.js

@@ -0,0 +1,9 @@
+import * as GetFirstEvent from '../GetFirstEvent/GetFirstEvent.js'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+
+export const getFirstSpawnedProcessEvent = (childProcess) => {
+  return GetFirstEvent.getFirstEvent(childProcess, {
+    error: FirstNodeWorkerEventType.Error,
+    exit: FirstNodeWorkerEventType.Exit,
+  })
+}

package/src/parts/GetNsisUpdateArgs/GetNsisUpdateArgs.js

@@ -0,0 +1,7 @@
+export const getNsisUpdateArgs = () => {
+  const args = []
+  args.push('--updated')
+  args.push('/S')
+  args.push('--force-run')
+  return args
+}

package/src/parts/GetNsisUpdateDownloadPath/GetNsisUpdateDownloadPath.js

@@ -0,0 +1,11 @@
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import * as Assert from '../Assert/Assert.js'
+import * as Platform from '../Platform/Platform.js'
+
+export const getNsisUpdateDownloadPath = (version) => {
+  Assert.string(version)
+  const name = Platform.applicationName
+  const outFile = join(tmpdir(), `${name}-update-${version}.exe`)
+  return outFile
+}

package/src/parts/GetWindowsNsisDownloadUrl/GetWindowsNsisDownloadUrl.js

@@ -1,6 +1,8 @@
 import * as Assert from '../Assert/Assert.js'
 
 export const getDownloadUrl = (repository, version, fileName) => {
+  Assert.string(repository)
   Assert.string(version)
+  Assert.string(fileName)
   return `https://github.com/${repository}/releases/download/v${version}/${fileName}`
 }

package/src/parts/InferExtensionId/InferExtensionId.js

@@ -0,0 +1,9 @@
+const RE_EXTENSION_FRAGMENT = /.+(\/|\\)(.+)$/
+
+export const inferExtensionId = (absolutePath) => {
+  const match = absolutePath.match(RE_EXTENSION_FRAGMENT)
+  if (match) {
+    return match[2]
+  }
+  return ''
+}

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.23'
+export const version = '0.17.1'
 
-export const commit = 'd1cdc79'
+export const commit = 'b3e9c7f'
 
-export const date = '2023-08-04T20:52:23.000Z'
+export const date = '2023-08-05T20:50:47.000Z'
 
 export const getVersion = () => {
   return version