@lvce-editor/shared-process 0.16.19 → 0.16.20

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

@@ -183,11 +183,13 @@ export const tokenizeLine = (line, lineState) => {
             case 'null':
             case 'undefined':
               token = TokenType.LanguageConstant
+              state = State.TopLevelContent
               break
             case 'import':
             case 'export':
             case 'from':
               token = TokenType.KeywordImport
+              state = State.TopLevelContent
               break
             case 'as':
             case 'switch':
@@ -204,6 +206,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'continue':
             case 'while':
               token = TokenType.KeywordControl
+              state = State.TopLevelContent
               break
             case 'assert':
               if (line.includes('import')) {
@@ -211,28 +214,35 @@ export const tokenizeLine = (line, lineState) => {
               } else {
                 token = TokenType.FunctionName
               }
+              state = State.TopLevelContent
               break
             case 'async':
             case 'await':
               token = TokenType.KeywordModifier
+              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 'delete':
             case 'typeof':
             case 'in':
             case 'instanceof':
               token = TokenType.KeywordOperator
+              state = State.TopLevelContent
               break
             case 'function':
               token = TokenType.KeywordFunction
+              state = State.TopLevelContent
               break
             case 'Infinity':
               token = TokenType.Numeric
@@ -240,16 +250,18 @@ export const tokenizeLine = (line, lineState) => {
               break
             case 'of':
               token = TokenType.KeywordOperator
+              state = State.TopLevelContent
               break
             case 'class':
+            case 'extends':
               token = TokenType.Keyword
               state = State.AfterKeywordClass
               break
             default:
               token = TokenType.Keyword
+              state = State.TopLevelContent
               break
           }
-          state = State.TopLevelContent
         } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
           token = TokenType.FunctionName
           state = State.TopLevelContent
@@ -456,6 +468,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_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           throw new Error('no')
         }

package/extensions/builtin.language-basics-wgsl/README.md

@@ -0,0 +1,16 @@
+# Language Basics Wgsl
+
+Wgsl syntax highlighting for Lvce Editor.
+
+## Contributing
+
+```sh
+git clone git@github.com:lvce-editor/language-basics-wgsl.git &&
+cd language-basics-wgsl &&
+npm ci &&
+npm test
+```
+
+## Gitpod
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/lvce-editor/language-basics-wgsl)

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

@@ -0,0 +1,13 @@
+{
+  "id": "builtin.language-basics-wgsl",
+  "name": "Language Basics WGSL",
+  "description": "Provides syntax highlighting and bracket matching in WebGPU Shader Language files.",
+  "languages": [
+    {
+      "id": "wgsl",
+      "extensions": [".wgsl"],
+      "tokenize": "src/tokenizeWgsl.js",
+      "configuration": "languageConfiguration.json"
+    }
+  ]
+}

package/extensions/builtin.language-basics-wgsl/languageConfiguration.json

@@ -0,0 +1,21 @@
+{
+  "comments": {
+    "blockComment": ["/*", "*/"]
+  },
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    { "open": "{", "close": "}", "notIn": ["string", "comment"] },
+    { "open": "[", "close": "]", "notIn": ["string", "comment"] },
+    { "open": "(", "close": ")", "notIn": ["string", "comment"] },
+    { "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
+    { "open": "'", "close": "'", "notIn": ["string", "comment"] }
+  ],
+  "indentationRules": {
+    "increaseIndentPattern": "(^.*\\{[^}]*$)",
+    "decreaseIndentPattern": "^\\s*\\}"
+  }
+}

package/extensions/builtin.language-basics-wgsl/src/tokenizeWgsl.js

@@ -0,0 +1,226 @@
+/**
+ * @enum number
+ */
+export const State = {
+  TopLevelContent: 1,
+  AfterKeywordDeclaration: 2,
+  AfterKeywordStruct: 3,
+}
+
+/**
+ * @enum number
+ */
+export const TokenType = {
+  Whitespace: 2,
+  Punctuation: 3,
+  CurlyOpen: 6,
+  CurlyClose: 7,
+  PropertyColon: 8,
+  Variable: 10,
+  None: 57,
+  Unknown: 881,
+  Numeric: 883,
+  NewLine: 884,
+  Comment: 885,
+  Text: 887,
+  FuntionName: 890,
+  String: 891,
+  KeywordImport: 892,
+  Keyword: 123,
+  KeywordControl: 124,
+  KeywordReturn: 125,
+  Type: 126,
+}
+
+export const TokenMap = {
+  [TokenType.Whitespace]: 'Whitespace',
+  [TokenType.Punctuation]: 'Punctuation',
+  [TokenType.CurlyOpen]: 'Punctuation',
+  [TokenType.CurlyClose]: 'Punctuation',
+  [TokenType.PropertyColon]: 'Punctuation',
+  [TokenType.Variable]: 'VariableName',
+  [TokenType.None]: 'None',
+  [TokenType.Unknown]: 'Unknown',
+  [TokenType.Numeric]: 'Numeric',
+  [TokenType.NewLine]: 'NewLine',
+  [TokenType.Comment]: 'Comment',
+  [TokenType.Text]: 'Text',
+  [TokenType.FuntionName]: 'Function',
+  [TokenType.String]: 'String',
+  [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.Keyword]: 'Keyword',
+  [TokenType.KeywordControl]: 'KeywordControl',
+  [TokenType.KeywordReturn]: 'KeywordReturn',
+  [TokenType.Type]: 'Type',
+}
+
+const RE_WHITESPACE = /^\s+/
+const RE_CURLY_OPEN = /^\{/
+const RE_CURLY_CLOSE = /^\}/
+const RE_PROPERTY_NAME = /^[a-zA-Z\-\w]+/
+const RE_COLON = /^:/
+const RE_SEMICOLON = /^;/
+const RE_COMMA = /^,/
+const RE_ANYTHING = /^.+/s
+const RE_NUMERIC = /^\-?(([0-9]+\.?[0-9]*)|(\.[0-9]+))/
+const RE_BLOCK_COMMENT_START = /^\/\*/
+const RE_BLOCK_COMMENT_END = /^\*\//
+const RE_BLOCK_COMMENT_CONTENT = /^.+?(?=\*\/|$)/s
+const RE_ROUND_OPEN = /^\(/
+const RE_ROUND_CLOSE = /^\)/
+const RE_PSEUDO_SELECTOR_CONTENT = /^[^\)]+/
+const RE_SQUARE_OPEN = /^\[/
+const RE_SQUARE_CLOSE = /^\]/
+const RE_ATTRIBUTE_SELECTOR_CONTENT = /^[^\]]+/
+const RE_QUERY = /^@[a-z\-]+/
+const RE_STAR = /^\*/
+const RE_QUERY_NAME = /^[a-zA-Z\w\-\d\_]+/
+const RE_QUERY_CONTENT = /^[^\)]+/
+const RE_COMBINATOR = /^[\+\>\~]/
+const RE_FUNCTION = /^[a-zA-Z][a-zA-Z\-]+(?=\()/
+const RE_VARIABLE_NAME = /^[a-zA-Z\w\-\_\d]+/
+const RE_PERCENT = /^\%/
+const RE_OPERATOR = /^[\-\/\*\+]/
+const RE_DOUBLE_QUOTE = /^"/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
+const RE_SINGLE_QUOTE = /^'/
+const RE_ANYTHING_BUT_CURLY = /^[^\{\}]+/s
+const RE_LINE_COMMENT = /^\/\/.*/s
+const RE_KEYWORD =
+  /^(?:var|let|fn|for|struct|vec2|f32|if|elseif|else|mat4x4|vec4|return)\b/
+
+const RE_PUNCTUATION = /^[\{\}\[\]\(\)\.\;\<\>\=\+\-\:\*\/\&>\?\@\<\>\,]/
+
+export const initialLineState = {
+  state: State.TopLevelContent,
+  tokens: [],
+  stack: [],
+}
+
+/**
+ * @param {any} lineStateA
+ * @param {any} lineStateB
+ */
+export const isEqualLineState = (lineStateA, lineStateB) => {
+  return lineStateA.state === lineStateB.state
+}
+
+export const hasArrayReturn = true
+
+/**
+ * @param {string} line
+ * @param {any} lineState
+ */
+export const tokenizeLine = (line, lineState) => {
+  let next = null
+  let index = 0
+  let tokens = []
+  let token = TokenType.None
+  let state = lineState.state
+  const stack = lineState.stack
+  while (index < line.length) {
+    const part = line.slice(index)
+    switch (state) {
+      case State.TopLevelContent:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_KEYWORD))) {
+          switch (next[0]) {
+            case 'let':
+            case 'var':
+              token = TokenType.Keyword
+              state = State.AfterKeywordDeclaration
+              break
+            case 'if':
+            case 'elseif':
+            case 'else':
+              token = TokenType.KeywordControl
+              state = State.TopLevelContent
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              state = State.TopLevelContent
+              break
+            case 'vec4':
+            case 'vec2':
+            case 'f32':
+            case 'i32':
+            case 'mat4x4':
+              token = TokenType.Type
+              state = State.TopLevelContent
+              break
+            case 'struct':
+              token = TokenType.Keyword
+              state = State.AfterKeywordStruct
+              break
+            default:
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+          }
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Variable
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Unknown
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.AfterKeywordDeclaration:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordDeclaration
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.AfterKeywordDeclaration
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Variable
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Unknown
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.AfterKeywordStruct:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordStruct
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Type
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Unknown
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
+      default:
+        throw new Error('no')
+    }
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
+  }
+  return {
+    state,
+    tokens,
+    stack,
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.16.19",
+  "version": "0.16.20",
   "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.19",
-    "@lvce-editor/extension-host-helper-process": "0.16.19",
-    "@lvce-editor/pty-host": "0.16.19",
+    "@lvce-editor/extension-host": "0.16.20",
+    "@lvce-editor/extension-host-helper-process": "0.16.20",
+    "@lvce-editor/pty-host": "0.16.20",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/ExtensionUnlink/ExtensionUnlink.js

@@ -1,8 +1,8 @@
 import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
-import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
+import * as RemoveSymlink from '../RemoveSymlink/RemoveSymlink.js'
 import { VError } from '../VError/VError.js'
 
 export const unlink = async (path) => {
@@ -14,7 +14,7 @@ export const unlink = async (path) => {
     const linkedExtensionsPath = Platform.getLinkedExtensionsPath()
     // @ts-ignore
     const to = Path.join(linkedExtensionsPath, manifest.id)
-    await FileSystem.remove(to)
+    await RemoveSymlink.removeSymlink(to)
   } catch (error) {
     throw new VError(error, `Failed to unlink extension`)
   }

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.19'
+export const version = '0.16.20'
 
-export const commit = '6594144'
+export const commit = '2a4c633'
 
-export const date = '2023-07-27T00:13:37.000Z'
+export const date = '2023-07-29T10:35:52.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/RemoveSymlink/RemoveSymlink.js

@@ -0,0 +1,12 @@
+import { rm } from 'node:fs/promises'
+import * as Assert from '../Assert/Assert.js'
+import { VError } from '../VError/VError.js'
+
+export const removeSymlink = async (path) => {
+  try {
+    Assert.string(path)
+    await rm(path, { force: true })
+  } catch (error) {
+    throw new VError(error, `Failed to remove symlink ${path}`)
+  }
+}