@lvce-editor/shared-process 0.16.13 → 0.16.15

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

@@ -88,7 +88,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/
+  /^(?:as|assert|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 = /^\}/
@@ -203,6 +203,13 @@ export const tokenizeLine = (line, lineState) => {
             case 'while':
               token = TokenType.KeywordControl
               break
+            case 'assert':
+              if (line.includes('import')) {
+                token = TokenType.KeywordControl
+              } else {
+                token = TokenType.FunctionName
+              }
+              break
             case 'async':
             case 'await':
               token = TokenType.KeywordModifier

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

@@ -70,6 +70,7 @@ export const TokenType = {
   Function: 20,
   FunctionName: 21,
   KeywordOperator: 22,
+  Text: 23,
 }
 
 export const TokenMap = {
@@ -98,6 +99,7 @@ export const TokenMap = {
   [TokenType.Function]: 'Function',
   [TokenType.FunctionName]: 'Function',
   [TokenType.KeywordOperator]: 'KeywordOperator',
+  [TokenType.Text]: 'Text',
 }
 
 export const initialLineState = {
@@ -111,14 +113,15 @@ export const initialLineState = {
 const RE_LINE_COMMENT = /^\/\/[^\n]*/
 const RE_KEYWORD =
   /^(?:yield|with|while|void|var|typeof|type|true|try|throw|this|static|switch|super|readonly|return|public|protected|private|package|null|new|let|interface|instanceof|in|import|implements|if|function|for|finally|from|false|extends|export|enum|else|do|delete|default|debugger|declare|continue|const|constructor|class|catch|case|break|await|async|abstract)\b/
+
 const RE_WHITESPACE = /^\s+/
 const RE_VARIABLE_NAME = /^[\#\$a-zA-Z\_][\$a-zA-Z\_\d]*/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>\+\-]/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>\+\-\*]/
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^\\']+/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^\\"]+/
-const RE_NUMERIC = /^\d+/
+const RE_NUMERIC = /^(?:-)?\d+/
 const RE_COLON = /^\:/
 const RE_COLON_OPTIONAL = /^\??\:/
 const RE_TYPE_PRIMITIVE = /^(?:string|boolean|number|bigint|symbol|void|any)\b/
@@ -143,6 +146,7 @@ const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_KEYWORD_CLASS_PROPERTY_MODIFIER =
   /^(?:override|public|protected|private|readonly)\b/
+
 const RE_VERTICAL_LINE = /^\|/
 const RE_ROUND_OPEN = /^\(/
 const RE_ROUND_CLOSE = /^\)/
@@ -177,6 +181,7 @@ const RE_KEYWORD_OF = /^of\b/
 const RE_KEYWORD_EXTENDS = /^extends\b/
 const RE_KEYWORD_READONLY = /^readonly\b/
 const RE_SHEBANG = /^\#\!\/.*/
+const RE_SPREAD = /^\.\.\./
 
 export const hasArrayReturn = true
 /**
@@ -429,6 +434,15 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_EQUAL))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_COLON))) {
+          token = TokenType.Punctuation
+          state = State.AfterKeywordTypeDeclaration
+        } else if ((next = part.match(RE_SEMICOLON))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = stack.pop() || State.TopLevelContent
         } else {
           part
           throw new Error('no')
@@ -475,6 +489,28 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_VERTICAL_LINE))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.BeforeType
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.AfterType
+        } else if ((next = part.match(RE_NUMERIC_2))) {
+          token = TokenType.Numeric
+          state = State.AfterType
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_CURLY_CLOSE))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           part
           throw new Error('no')
@@ -490,6 +526,15 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_SQUARE_CLOSE))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
         } else {
           throw new Error('no')
         }
@@ -513,6 +558,24 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_KEYWORD))) {
+          token = TokenType.Keyword
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_SQUARE_CLOSE))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_VERTICAL_LINE))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeExpression
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           part
           throw new Error('no')
@@ -534,6 +597,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
         } else {
           tokens
           part
@@ -589,6 +658,13 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
           state = State.InsideTypeObject
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          stack.push(state)
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           // stack.push(State.AfterType)
           part
@@ -843,6 +919,19 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SQUARE_CLOSE))) {
           token = TokenType.Punctuation
           state = State.InsideTypeObject
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeObject
+        } else if ((next = part.match(RE_QUESTION_MARK))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeObject
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+          stack.push(State.InsideTypeObject)
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           part
           throw new Error('no')
@@ -859,6 +948,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterMethodName
+        } else if ((next = part.match(RE_SPREAD))) {
+          token = TokenType.Punctuation
+          state = State.AfterMethodName
         } else {
           throw new Error('no')
         }
@@ -867,6 +959,9 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.InsideMethodParametersAfterVariableName
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideMethodParameters
         } else if ((next = part.match(RE_ROUND_CLOSE))) {
           token = TokenType.Punctuation
           state = State.AfterMethodParameters
@@ -876,6 +971,29 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_COLON))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_COMMA))) {
+          token = TokenType.Punctuation
+          state = State.InsideMethodParameters
+        } else if ((next = part.match(RE_VERTICAL_LINE))) {
+          stack.push(state)
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_SPREAD))) {
+          token = TokenType.Punctuation
+          state = State.InsideMethodParameters
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideMethodParameters
+        } else if ((next = part.match(RE_SQUARE_CLOSE))) {
+          token = TokenType.Punctuation
+          state = State.InsideMethodParameters
+        } 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.InsideMethodParameters
         } else {
           part
           throw new Error('no')
@@ -886,6 +1004,13 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.BeforeType
           stack.push(State.InsideMethodParameters)
+        } else if ((next = part.match(RE_QUESTION_MARK_COLON))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
+          stack.push(State.InsideMethodParameters)
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = State.InsideMethodParametersAfterVariableName
         } else {
           throw new Error('no')
         }
@@ -901,6 +1026,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ARROW))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
         } else {
           throw new Error('no')
         }
@@ -924,6 +1052,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           throw new Error('no')
         }
@@ -955,6 +1086,35 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.Type
           state = State.AfterInterfaceName
+        } else if ((next = part.match(RE_ANGLE_OPEN))) {
+          stack.push(State.AfterInterfaceName)
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_QUESTION_MARK_COLON))) {
+          token = TokenType.Punctuation
+          state = State.AfterInterfaceName
+        } else if ((next = part.match(RE_ANGLE_CLOSE))) {
+          token = TokenType.Punctuation
+          state = State.AfterInterfaceName
+        } else if ((next = part.match(RE_EQUAL))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_DOT))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyDot
+        } else if ((next = part.match(RE_VERTICAL_LINE))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_COLON))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_COMMA))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.AfterInterfaceName
         } else {
           part
           throw new Error('no')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.16.13",
+  "version": "0.16.15",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.22.5",
-    "@lvce-editor/extension-host": "0.16.13",
-    "@lvce-editor/extension-host-helper-process": "0.16.13",
-    "@lvce-editor/pty-host": "0.16.13",
+    "@lvce-editor/extension-host": "0.16.15",
+    "@lvce-editor/extension-host-helper-process": "0.16.15",
+    "@lvce-editor/pty-host": "0.16.15",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/Developer/Developer.ipc.js

@@ -10,8 +10,6 @@ export const Commands = {
   crashSharedProcess: Crash.crashSharedProcess,
   createHeapSnapshot: HeapSnapshot.createHeapSnapshot,
   createProfile: CpuProfile.createProfile,
-  getNodeStartupTime: Developer.getNodeStartupTiming,
-  getNodeStartupTiming: Developer.getNodeStartupTiming,
   sharedProcessMemoryUsage: Developer.sharedProcessMemoryUsage,
   sharedProcessStartupPerformance: Developer.sharedProcessStartupPerformance,
 }

package/src/parts/Developer/Developer.js

@@ -25,36 +25,6 @@ export const sharedProcessStartupPerformance = () => {
   // performance.eventLoopUtilization
 }
 
-export const getNodeStartupTiming = () => {
-  const {
-    name,
-    entryType,
-    startTime,
-    duration,
-    // @ts-ignore
-    nodeStart,
-    v8Start,
-    bootstrapComplete,
-    environment,
-    loopStart,
-    loopExit,
-    idleTime,
-  } = performance.nodeTiming
-  return {
-    name,
-    entryType,
-    startTime,
-    duration,
-    nodeStart,
-    v8Start,
-    bootstrapComplete,
-    environment,
-    loopStart,
-    loopExit,
-    idleTime,
-  }
-}
-
 export const sharedProcessMemoryUsage = () => {
   // TODO also print out number of watched files
   return Process.memoryUsage()

package/src/parts/Module/Module.js

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

package/src/parts/ModuleId/ModuleId.js

@@ -34,3 +34,4 @@ export const GetTerminalSpawnOptions = 33
 export const HandleCliArgs = 34
 export const ListProcessesWithMemoryUsage = 35
 export const IncrementalTextSearch = 36
+export const Performance = 37

package/src/parts/ModuleMap/ModuleMap.js

@@ -26,11 +26,11 @@ export const getModuleId = (commandId) => {
     case 'Developer.crashSharedProcess':
     case 'Developer.createHeapSnapshot':
     case 'Developer.createProfile':
-    case 'Developer.getNodeStartupTime':
-    case 'Developer.getNodeStartupTiming':
     case 'Developer.sharedProcessMemoryUsage':
     case 'Developer.sharedProcessStartupPerformance':
       return ModuleId.Developer
+    case 'Performance.getNodeStartupTiming':
+      return ModuleId.Performance
     case 'Download.download':
       return ModuleId.Download
     case 'ElectronInitialize.electronInitialize':

package/src/parts/Performance/Performance.ipc.js

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

package/src/parts/Performance/Performance.js

@@ -0,0 +1,29 @@
+export const getNodeStartupTiming = () => {
+  const {
+    name,
+    entryType,
+    startTime,
+    duration,
+    // @ts-ignore
+    nodeStart,
+    v8Start,
+    bootstrapComplete,
+    environment,
+    loopStart,
+    loopExit,
+    idleTime,
+  } = performance.nodeTiming
+  return {
+    name,
+    entryType,
+    startTime,
+    duration,
+    nodeStart,
+    v8Start,
+    bootstrapComplete,
+    environment,
+    loopStart,
+    loopExit,
+    idleTime,
+  }
+}

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.13'
+export const version = '0.16.15'
 
-export const commit = 'ee10956'
+export const commit = '7321f00'
 
-export const date = '2023-07-11T15:00:17.000Z'
+export const date = '2023-07-18T15:56:24.000Z'
 
 export const getVersion = () => {
   return version