@lvce-editor/shared-process 0.16.16 → 0.16.18

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

@@ -0,0 +1,16 @@
+# Language Basics CSON
+
+CSON syntax highlighting for Lvce Editor.
+
+## Contributing
+
+```sh
+git clone git@github.com:lvce-editor/language-basics-cson.git &&
+cd language-basics-cson &&
+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-cson)

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

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

package/extensions/builtin.language-basics-cson/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-cson/src/tokenizeCson.js

@@ -0,0 +1,207 @@
+/**
+ * @enum number
+ */
+export const State = {
+  TopLevelContent: 1,
+  AfterSelector: 2,
+  InsideSelector: 3,
+  AfterPropertyName: 4,
+  AfterPropertyNameAfterColon: 5,
+  InsideBlockComment: 7,
+  InsidePseudoSelector: 8,
+  InsideAttributeSelector: 9,
+  AfterQuery: 10,
+  InsideRound: 11,
+  AfterQueryWithRules: 12,
+  InsideRule: 13,
+  AfterFunctionName: 14,
+  InsideDoubleQuoteString: 15,
+  InsideSingleQuoteString: 16,
+  AfterFunctionNameInsideArguments: 17,
+  AfterKeywordImport: 18,
+}
+
+export const StateMap = {
+  [State.TopLevelContent]: 'TopLevelContent',
+  [State.AfterSelector]: 'AfterSelector',
+  [State.InsideSelector]: 'InsideSelector',
+  [State.AfterPropertyName]: 'AfterPropertyName',
+  [State.AfterPropertyNameAfterColon]: 'AfterPropertyNameAfterColon',
+}
+
+/**
+ * @enum number
+ */
+export const TokenType = {
+  CssSelector: 1,
+  Whitespace: 2,
+  Punctuation: 3,
+  CssPropertyName: 4,
+  CssPropertyValue: 5,
+  CurlyOpen: 6,
+  CurlyClose: 7,
+  PropertyColon: 8,
+  CssPropertySemicolon: 9,
+  Variable: 10,
+  None: 57,
+  Unknown: 881,
+  CssPropertyColon: 882,
+  Numeric: 883,
+  NewLine: 884,
+  Comment: 885,
+  Query: 886,
+  Text: 887,
+  CssSelectorId: 889,
+  FuntionName: 890,
+  String: 891,
+  KeywordImport: 892,
+  CssSelectorClass: 893,
+}
+
+export const TokenMap = {
+  [TokenType.CssSelector]: 'CssSelector',
+  [TokenType.Whitespace]: 'Whitespace',
+  [TokenType.Punctuation]: 'Punctuation',
+  [TokenType.CssPropertyName]: 'CssPropertyName',
+  [TokenType.CssPropertyValue]: 'CssPropertyValue',
+  [TokenType.CurlyOpen]: 'Punctuation',
+  [TokenType.CurlyClose]: 'Punctuation',
+  [TokenType.PropertyColon]: 'Punctuation',
+  [TokenType.CssPropertySemicolon]: 'Punctuation',
+  [TokenType.Variable]: 'VariableName',
+  [TokenType.None]: 'None',
+  [TokenType.CssPropertyValue]: 'CssPropertyValue',
+  [TokenType.Unknown]: 'Unknown',
+  [TokenType.CssPropertyColon]: 'Punctuation',
+  [TokenType.Numeric]: 'Numeric',
+  [TokenType.NewLine]: 'NewLine',
+  [TokenType.Comment]: 'Comment',
+  [TokenType.Query]: 'CssAtRule',
+  [TokenType.Text]: 'Text',
+  [TokenType.CssSelectorId]: 'CssSelectorId',
+  [TokenType.FuntionName]: 'Function',
+  [TokenType.String]: 'String',
+  [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.CssSelectorClass]: 'CssSelectorClass',
+}
+
+const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>\+\~\_%\\]+/
+const RE_SELECTOR_ID = /^#[\w\-\_]+/
+const RE_SELECTOR_CLASS = /^\.[\w\-\_]+/
+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_PROPERTY_VALUE = /^[^;\}]+/
+const RE_PROPERTY_VALUE_SHORT = /^[^;\}\s\)]+/
+const RE_PROPERTY_VALUE_INSIDE_FUNCTION = /^[^\}\s\)]+/
+const RE_SEMICOLON = /^;/
+const RE_COMMA = /^,/
+const RE_ANYTHING = /^.+/s
+const RE_NUMERIC = /^\-?(([0-9]+\.?[0-9]*)|(\.[0-9]+))/
+const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
+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\-\_]+/
+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 = /^#.*/
+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_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          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')
+        }
+        break
+      case State.InsideSingleQuoteString:
+        if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideSingleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      default:
+        console.log({ state, line })
+        throw new Error('no')
+    }
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
+  }
+  if (state === State.AfterPropertyName) {
+    state = State.InsideSelector
+  }
+  return {
+    state,
+    tokens,
+    stack,
+  }
+}

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

@@ -32,7 +32,8 @@
         ".tour",
         ".heapsnapshot",
         ".code-workspace",
-        ".code-profile"
+        ".code-profile",
+        ".github-issues"
       ],
       "fileNames": [
         "composer.lock",

package/extensions/builtin.language-basics-json/src/tokenizeJson.js

@@ -298,6 +298,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
           state = State.AfterPropertyValue
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+          stack.push(State.AfterPropertyValue)
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.AfterCurlyOpen

package/package.json

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

package/src/parts/GetElectronRebuildPath/GetElectronRebuildPath.js

@@ -1,6 +1,10 @@
+import * as IsElectron from '../IsElectron/IsElectron.js'
 import * as Path from '../Path/Path.js'
 import * as Root from '../Root/Root.js'
 
 export const getElectronRebuildPath = () => {
+  if (IsElectron.isElectron()) {
+    return Path.join(Root.root, 'packages', 'main-process', 'node_modules', '.bin', 'electron-rebuild.cmd')
+  }
   return Path.join(Root.root, 'packages', 'main-process', 'node_modules', '.bin', 'electron-rebuild')
 }

package/src/parts/GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js

@@ -5,8 +5,10 @@ export const getFirstNodeChildProcessEvent = async (childProcess) => {
     let stderr = ''
     let stdout = ''
     const cleanup = (value) => {
-      childProcess.stderr.off('data', handleStdErrData)
-      childProcess.stdout.off('data', handleStdoutData)
+      if (childProcess.stdout && childProcess.stderr) {
+        childProcess.stderr.off('data', handleStdErrData)
+        childProcess.stdout.off('data', handleStdoutData)
+      }
       childProcess.off('message', handleMessage)
       childProcess.off('exit', handleExit)
       childProcess.off('error', handleError)
@@ -27,8 +29,10 @@ export const getFirstNodeChildProcessEvent = async (childProcess) => {
     const handleError = (event) => {
       cleanup({ type: FirstNodeWorkerEventType.Error, event, stdout, stderr })
     }
-    childProcess.stderr.on('data', handleStdErrData)
-    childProcess.stdout.on('data', handleStdoutData)
+    if (childProcess.stdout && childProcess.stderr) {
+      childProcess.stderr.on('data', handleStdErrData)
+      childProcess.stdout.on('data', handleStdoutData)
+    }
     childProcess.on('message', handleMessage)
     childProcess.on('exit', handleExit)
     childProcess.on('error', handleError)

package/src/parts/IsDlOpenError/IsDlOpenError.js

@@ -0,0 +1,5 @@
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+
+export const isDlOpenError = (error) => {
+  return error && error instanceof Error && 'code' in error && error.code === ErrorCodes.ERR_DLOPEN_FAILED
+}

package/src/parts/LoadWindowsProcessTree/LoadWindowsProcessTree.js

@@ -1,12 +1,12 @@
+import * as IsDlOpenError from '../IsDlOpenError/IsDlOpenError.js'
 import { VError } from '../VError/VError.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 export const loadWindowProcessTree = async () => {
   try {
     // @ts-ignore
     return await import('@vscode/windows-process-tree')
   } catch (error) {
-    if (error && error instanceof Error && 'code' in error && error.code === ErrorCodes.ERR_DLOPEN_FAILED) {
+    if (IsDlOpenError.isDlOpenError(error)) {
       throw new VError(
         `Failed to load windows process tree: The native module "@vscode/windows-process-tree" is not compatible with this node version and must be compiled against a matching electron version using electron-rebuild`
       )

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.16'
+export const version = '0.16.18'
 
-export const commit = 'd2454d3'
+export const commit = 'd5caee6'
 
-export const date = '2023-07-19T15:35:04.000Z'
+export const date = '2023-07-20T14:53:13.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/RebuildNodePty/RebuildNodePty.js

@@ -1,5 +1,7 @@
 import { spawn } from 'node:child_process'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
 import * as GetElectronRebuildPath from '../GetElectronRebuildPath/GetElectronRebuildPath.js'
+import * as GetFirstNodeChildProcessEvent from '../GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js'
 import * as IsElectron from '../IsElectron/IsElectron.js'
 import * as Path from '../Path/Path.js'
 import * as Root from '../Root/Root.js'
@@ -18,7 +20,10 @@ const rebuildNodePtyElectron = async (cwd) => {
     cwd,
     stdio: 'inherit',
   })
-  // TODO wait for child process to be finished
+  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
+  if (type === FirstNodeWorkerEventType.Error) {
+    throw new Error(`Failed to rebuild native module: ${event}`)
+  }
 }
 
 /**
@@ -29,6 +34,10 @@ const rebuildNodePtyNode = async (cwd) => {
     cwd,
     stdio: 'inherit',
   })
+  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
+  if (type === FirstNodeWorkerEventType.Error) {
+    throw new Error(`Failed to rebuild native module: ${event}`)
+  }
 }
 
 const getFn = () => {