@lvce-editor/shared-process 0.17.4 → 0.17.5

package/extensions/builtin.language-basics-go/src/tokenizeGo.js

@@ -5,6 +5,8 @@ export const State = {
   TopLevelContent: 1,
   InsideDoubleQuoteString: 2,
   InsideLineComment: 3,
+  InsideBacktickString: 4,
+  AfterKeywordFunc: 5,
 }
 
 /**
@@ -19,7 +21,7 @@ export const TokenType = {
   String: 50,
   Numeric: 30,
   FunctionName: 112,
-  TypeNamePrimitive: 36,
+  TypePrimitive: 36,
   Text: 117,
   PunctuationTag: 228,
   TagName: 118,
@@ -32,6 +34,8 @@ export const TokenType = {
   VariableName: 952,
   LanguageConstant: 953,
   KeywordControl: 954,
+  KeywordImport: 955,
+  KeywordReturn: 956,
 }
 
 export const TokenMap = {
@@ -41,8 +45,8 @@ export const TokenMap = {
   [TokenType.Comment]: 'Comment',
   [TokenType.String]: 'String',
   [TokenType.Numeric]: 'Numeric',
-  [TokenType.FunctionName]: 'FunctionName',
-  [TokenType.TypeNamePrimitive]: 'TypeNamePrimitive',
+  [TokenType.FunctionName]: 'Function',
+  [TokenType.TypePrimitive]: 'TypePrimitive',
   [TokenType.Text]: 'Text',
   [TokenType.PunctuationTag]: 'PunctuationTag',
   [TokenType.TagName]: 'TagName',
@@ -55,6 +59,8 @@ export const TokenMap = {
   [TokenType.VariableName]: 'VariableName',
   [TokenType.LanguageConstant]: 'LanguageConstant',
   [TokenType.KeywordControl]: 'KeywordControl',
+  [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.KeywordReturn]: 'KeywordReturn',
 }
 
 const RE_WHITESPACE = /^\s+/
@@ -84,7 +90,7 @@ const RE_ROUND_CLOSE = /^\)/
 const RE_DOT = /^\./
 const RE_EQUAL_SIGN = /^=/
 const RE_SINGLE_QUOTE = /^'/
-const RE_PUNCTUATION = /^[\(\)=\+\-><\.,\/\*\^\[\]\{\}\|:\;\%]/
+const RE_PUNCTUATION = /^[\(\)=\+\-><\.,\/\*\^\[\]\{\}\|:\;\%!\&\*]/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_START_OF_FUNCTION = /^( )*\(/
 const RE_COLON_COLON = /^::/
@@ -94,7 +100,7 @@ const RE_SQUARE_OPEN_SQUARE_OPEN = /^\[\[/
 const RE_SQUARE_CLOSE_SQUARE_CLOSE = /^\]\]/
 const RE_STRING_MULTILINE_CONTENT = /^.+?(?=\]\]|$)/s
 const RE_KEYWORD =
-  /^(?:var|type|true|switch|struct|select|return|range|package|map|interface|import|if|goto|go|for|func|false|default|continue|const|chan|case|break)\b/
+  /^(?:var|type|true|switch|struct|select|return|range|package|map|interface|import|if|goto|go|for|func|false|default|continue|const|chan|case|break|nil|else|string|int64|bool)\b/
 const RE_TEXT = /^.+/s
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
@@ -141,9 +147,11 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
+          state = State.TopLevelContent
           switch (next[0]) {
             case 'true':
             case 'false':
+            case 'nil':
               token = TokenType.LanguageConstant
               break
             case 'as':
@@ -162,11 +170,28 @@ export const tokenizeLine = (line, lineState) => {
             case 'while':
               token = TokenType.KeywordControl
               break
+            case 'import':
+              token = TokenType.KeywordImport
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              break
+            case 'bool':
+            case 'string':
+            case 'int64':
+              token = TokenType.TypePrimitive
+              break
+            case 'range':
+              token = TokenType.FunctionName
+              break
+            case 'func':
+              token = TokenType.Keyword
+              state = State.AfterKeywordFunc
+              break
             default:
               token = TokenType.Keyword
               break
           }
-          state = State.TopLevelContent
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.TopLevelContent
@@ -182,6 +207,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_QUOTE_BACKTICK))) {
+          token = TokenType.String
+          state = State.InsideBacktickString
         } else if ((next = part.match(RE_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -207,6 +235,23 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.InsideBacktickString:
+        if ((next = part.match(RE_QUOTE_BACKTICK))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_BACKTICK_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideBacktickString
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
+          token = TokenType.String
+          state = State.InsideBacktickString
+        } else if ((next = part.match(RE_BACKSLASH))) {
+          token = TokenType.String
+          state = State.InsideBacktickString
+        } else {
+          throw new Error('no')
+        }
+        break
       case State.InsideLineComment:
         if ((next = part.match(RE_TEXT))) {
           token = TokenType.Comment
@@ -215,6 +260,26 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterKeywordFunc:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordFunc
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.FunctionName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.AfterKeywordFunc
+        } 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`)
+        }
+        break
       default:
         state
         throw new Error('no')

package/extensions/builtin.language-basics-kotlin/src/tokenizeKotlin.js

@@ -49,10 +49,10 @@ const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_KEYWORD =
-  /^(?:while|when|var|val|typeof|typealias|try|true|throw|this|super|return|package|object|null|is|interface|in|if|fun|for|false|else|do|continue|class|break|as)\b/
+  /^(?:while|when|var|val|typeof|typealias|try|true|throw|this|super|return|package|object|null|is|interface|in|if|fun|for|false|else|do|continue|class|break|as|enum|String)\b/
 
-const RE_VARIABLE_NAME = /^[a-zA-Z]+/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>]/
+const RE_VARIABLE_NAME = /^[a-zA-Z\_\$]+/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\-]/
 const RE_NUMERIC = /^\d+/
 
 export const initialLineState = {
@@ -62,12 +62,19 @@ export const initialLineState = {
 
 export const hasArrayReturn = true
 
+/**
+ *
+ * @param {any} lineStateA
+ * @param {*} lineStateB
+ * @returns
+ */
 export const isEqualLineState = (lineStateA, lineStateB) => {
   return lineStateA.state === lineStateB.state
 }
 
 /**
  * @param {string} line
+ * @param {any} lineState
  */
 export const tokenizeLine = (line, lineState) => {
   let next = null

package/extensions/builtin.language-basics-less/src/tokenizeLess.js

@@ -75,6 +75,7 @@ export const State = {
   InsideSingleQuoteString: 16,
   AfterFunctionNameInsideArguments: 17,
   AfterKeywordImport: 18,
+  AfterLessVariableName: 19,
 }
 
 export const initialLineState = {
@@ -127,6 +128,7 @@ const RE_ANYTHING_BUT_CURLY = /^[^\{\}]+/s
 const RE_LINE_COMMENT = /\/\/.*/
 const RE_NESTED_SELECTOR = /^[\w\.\-\s]+(?=\s*(?:\{|,))/
 const RE_AMPERSAND = /^\&/
+const RE_LESS_VARIABLE_NAME = /^@[\w\-]+(?=\:)/
 
 /**
  * @param {string} line
@@ -167,6 +169,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SQUARE_OPEN))) {
           token = TokenType.Punctuation
           state = State.InsideAttributeSelector
+        } else if ((next = part.match(RE_LESS_VARIABLE_NAME))) {
+          token = TokenType.Variable
+          state = State.AfterLessVariableName
         } else if ((next = part.match(RE_QUERY))) {
           switch (next[0]) {
             case '@font-face':
@@ -565,6 +570,26 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterLessVariableName:
+        if ((next = part.match(RE_COLON))) {
+          token = TokenType.Punctuation
+          state = State.AfterLessVariableName
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterLessVariableName
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.AfterLessVariableName
+        } else if ((next = part.match(RE_SEMICOLON))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_PROPERTY_VALUE))) {
+          token = TokenType.CssPropertyValue
+          state = State.AfterLessVariableName
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         console.log({ state, line })
         throw new Error('no')

package/extensions/builtin.language-basics-perl/src/tokenizePerl.js

@@ -62,13 +62,15 @@ const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_KEYWORD =
-  /^(?:case|continue|default|die|no|else|elsif|eval|exit|for|foreach|given|goto|if|last|next|push|redo|require|return|select|shift|sub|switch|unless|until|use|wait|when|while)\b/
+  /^(?:case|continue|default|die|my|no|else|elsif|eval|exit|for|foreach|given|goto|if|last|next|push|print|redo|require|return|select|shift|sub|switch|unless|unshift|until|use|wait|when|while)\b/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 const RE_VARIABLE_NAME = /^[$a-zA-Z\_@%]+/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\\\-\?]/
+const RE_PUNCTUATION =
+  /^[:,;\{\}\[\]\.=\(\)<>\\\-\?~\|\/\[\\*\$\]^!&\+\{\}\(\)]/
 const RE_NUMERIC = /^\d+/
 const RE_QUOTE_BACKTICK = /^`/
 const RE_QUOTE_SINGLE = /^'/
+const RE_FUNCTION_NAME = /^\w+(?=\s*\()/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -120,10 +122,12 @@ export const tokenizeLine = (line, lineState) => {
               token = TokenType.KeywordReturn
               break
             case 'shift':
+            case 'unshift':
             case 'push':
             case 'eval':
             case 'exit':
             case 'die':
+            case 'print':
               token = TokenType.Function
               break
             default:
@@ -134,6 +138,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_FUNCTION_NAME))) {
+          token = TokenType.Function
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.TopLevelContent

package/extensions/builtin.language-basics-python/src/tokenizePython.js

@@ -153,6 +153,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'break':
             case 'pass':
             case 'assert':
+            case 'is':
               token = TokenType.KeywordControl
               break
             case 'or':

package/extensions/builtin.language-basics-shellscript/src/tokenizeShellScript.js

@@ -74,17 +74,17 @@ const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\\]+/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`]+/
 const RE_KEYWORD =
-  /^(?:7z|7za|7zr|Xdialog|alias|anacron|apk|apt-get|ar|asciidoctor|awk|base64|basename|bash|bg|bind|blkid|break|brew|brotli|builtin|bunzip|bunzip2|caller|cargo|case|cat|catdoc|cd|chmod|chown|circleci|clear|cmp|command|compgen|complete|continue|cp|cryptsetup|curl|curl|cut|cygstart|dde-open|defaults|deno|diff|dirname|dirs|disown|do|docker|done|done|dpkg-trigger|dpkg|du|echo|egrep|elif|else|emulate|enable|enlightenment_open|esac|eval|eval_gettext|exec|exit|expr|false|fc|fg|fi|find|for|free|function|fuzzponent|fzf|g\+\+|gatsby|gcc|gcloud|gdbus|getopts|gio|git|gnome-open|google-chrome-beta|google-chrome|grep|groupadd|grub-mount|gs|gulp|gvfs-open|gzip|hash|hdiutil|head|help|hexdump|history|identity|if|ifconfig|in|install-plugin|install|ip|jobs|jq|kbd_mode|kde-open|kdialog|kfmclient|kill|killall|ldconfig|less|let|lha|ln|loadkeys|local|logout|ls|ls|lunzip|lzip|lzma|makepkg|miniunz|miniunzip|mkdir|mktemp|mount|mpicc|mv|node|nohup|npm|npx|open|pacman|pcmanfm|pdftotext|pkg|plutil|pnpm|popd|prezip-bin|printf|println|ps|pushd|pwd|python3|rar|read|readlink|readonly|realpath|return|rm|route|rpm|rsync|sed|set|setfont|sh|sha256sum|shift|shopt|sleep|snap|sort|source|sponge|start-stop-daemon|stty|sudo|suspend|tail|tar|tee|test|texi2dvi|then|times|touch|trap|true|tty|tune2fs|type|ulimit|umask|umask|unalias|unarj|unmkinitramfs|unmount|unrar|unset|unwrapdiff|unzip|unzoo|update-alternatives|update-desktop-database|update-mime-database|useradd|vim|wait|wc|wget|which|while|wp|xargs|xprop|xz|yarn|yum|zenity|zip|zoo|zsh|zstd)\b/
+  /^(?:7z|7za|7zr|Xdialog|alias|anacron|apk|apt-get|ar|asciidoctor|awk|base64|basename|bash|bg|bind|blkid|break|brew|brotli|builtin|bunzip|bunzip2|caller|cargo|case|cat|catdoc|cd|chmod|chown|circleci|clear|cmp|command|compgen|complete|composite|continue|convert|cp|cryptsetup|curl|curl|cut|cygstart|dde-open|defaults|deno|diff|dirname|dirs|disown|do|docker|done|done|dpkg-trigger|dpkg|du|echo|egrep|elif|else|emulate|enable|enlightenment_open|esac|eval|eval_gettext|exec|exit|expr|false|fc|fg|fi|find|for|free|function|fuzzponent|fzf|g\+\+|gatsby|gcc|gcloud|gdbus|getopts|gio|git|gnome-open|google-chrome-beta|google-chrome|go|grep|groupadd|grub-mount|gs|gulp|gvfs-open|gzip|hash|hdiutil|head|help|hexdump|history|icotool|identity|if|ifconfig|install-plugin|in|install|ip|jobs|jq|kbd_mode|kde-open|kdialog|kfmclient|kill|killall|killproc|ldconfig|less|let|lha|ln|loadkeys|local|logout|ls|ls|lunzip|lzip|lzma|makepkg|miniunz|miniunzip|mkdir|mktemp|mount|mpicc|mv|node|nohup|npm|npx|open|pacman|paste|pcmanfm|pdftotext|pkg|pkill|plutil|png2icns|pnpm|popd|prezip-bin|print|printf|println|ps|pushd|pwd|python3|rar|read|readlink|readonly|realpath|return|rm|route|rpm|rsvg-convert|rsync|sed|set|setfont|sh|sha256sum|shift|shopt|sleep|snap|sort|source|sponge|start-stop-daemon|stty|sudo|suspend|tail|tar|tee|test|texi2dvi|then|times|touch|trap|true|tty|tune2fs|type|ulimit|umask|umask|unalias|unarj|unmkinitramfs|unmount|unrar|unset|unwrapdiff|unzip|unzoo|update-alternatives|update-desktop-database|update-mime-database|useradd|vim|wait|wc|wget|which|while|wp|xargs|xprop|xunit-viewer|xz|yarn|yum|zenity|zip|zoo|zsh|zstd)\b/
 
 const RE_VARIABLE_NAME = /^[a-zA-Z\_\/\-\$][a-zA-Z\_\/\-\$#\d\-]*/
 const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\!\|\+\&\>\)]/
-const RE_NUMERIC = /^\d+(?=\s|$)/
+const RE_NUMERIC = /^\d+(?=\s|;|$)/
 const RE_FUNCTION_NAME = /^\w+(?=\s*\()/
 const RE_EOF_START = /^<<\s*([\w\!]+)/
 const RE_EOF_CONTENT = /.*/s
 const RE_STRING_ESCAPE = /^\\./
 const RE_BACKSLASH_AT_END = /^\\$/
-const RE_OR = /\|\|/
+const RE_OR = /^\|\|/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -180,6 +180,8 @@ export const tokenizeLine = (line, lineState) => {
             case 'command':
             case 'compgen':
             case 'complete':
+            case 'composite':
+            case 'convert':
             case 'cp':
             case 'cryptsetup':
             case 'curl':
@@ -222,6 +224,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'gio':
             case 'git':
             case 'gnome-open':
+            case 'go':
             case 'google-chrome':
             case 'google-chrome-beta':
             case 'grep':
@@ -237,6 +240,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'help':
             case 'hexdump':
             case 'history':
+            case 'icotool':
             case 'identity':
             case 'ifconfig':
             case 'install':
@@ -250,6 +254,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'kfmclient':
             case 'kill':
             case 'killall':
+            case 'killproc':
             case 'ldconfig':
             case 'less':
             case 'lha':
@@ -275,10 +280,13 @@ export const tokenizeLine = (line, lineState) => {
             case 'npx':
             case 'open':
             case 'pacman':
+            case 'paste':
             case 'pcmanfm':
             case 'pdftotext':
             case 'pkg':
+            case 'pkill':
             case 'plutil':
+            case 'png2icns':
             case 'pnpm':
             case 'popd':
             case 'prezip-bin':
@@ -295,6 +303,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'rm':
             case 'route':
             case 'rpm':
+            case 'rsvg-convert':
             case 'rsync':
             case 'sed':
             case 'set':
@@ -346,7 +355,9 @@ export const tokenizeLine = (line, lineState) => {
             case 'which':
             case 'wp':
             case 'xargs':
+            case 'Xdialog':
             case 'xprop':
+            case 'xunit-viewer':
             case 'xz':
             case 'yarn':
             case 'yum':
@@ -355,7 +366,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'zoo':
             case 'zsh':
             case 'zstd':
-            case 'Xdialog':
+            case 'print':
               token = TokenType.Function
               state = State.AfterFunctionName
               break

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

@@ -75,7 +75,8 @@
         ".tmCommand",
         ".natvis",
         ".xcscheme",
-        ".xcsettings"
+        ".xcsettings",
+        ".xsl"
       ],
       "fileNames": [".project", "resources.grd"],
       "tokenize": "src/tokenizeXml.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.17.4",
+  "version": "0.17.5",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,10 +17,10 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.22.10",
-    "@lvce-editor/extension-host": "0.17.4",
-    "@lvce-editor/extension-host-helper-process": "0.17.4",
+    "@lvce-editor/extension-host": "0.17.5",
+    "@lvce-editor/extension-host-helper-process": "0.17.5",
     "@lvce-editor/pretty-error": "^1.0.0",
-    "@lvce-editor/pty-host": "0.17.4",
+    "@lvce-editor/pty-host": "0.17.5",
     "debug": "^4.3.4",
     "execa": "^7.2.0",
     "exit-hook": "^3.2.0",

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.17.4'
+export const version = '0.17.5'
 
-export const commit = '7260a79'
+export const commit = '0138fc9'
 
-export const date = '2023-08-15T20:41:15.000Z'
+export const date = '2023-08-16T21:34:45.000Z'
 
 export const getVersion = () => {
   return version