@lvce-editor/shared-process 0.10.6 → 0.10.8

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

@@ -21,6 +21,10 @@ const State = {
   AfterTypeExpression: 18,
   AfterVariableName: 19,
   BeforePropertyAccess: 20,
+  AfterKeywordEnum: 21,
+  AfterKeywordEnumAfterVariableName: 22,
+  InsideEnum: 23,
+  InsideEnumAfterVariableName: 24,
 }
 
 /**
@@ -78,6 +82,9 @@ export const TokenMap = {
 
 export const initialLineState = {
   state: State.TopLevelContent,
+  /**
+   * @type {any[]}
+   */
   stack: [],
 }
 
@@ -125,10 +132,12 @@ const RE_DOT = /^\./
 const RE_SQUARE_OPEN = /^\[/
 const RE_SQUARE_CLOSE = /^\]/
 
+export const hasArrayReturn = true
+
 /**
  *
  * @param {string} line
- * @param {object} lineState
+ * @param {any} lineState
  * @returns
  */
 export const tokenizeLine = (line, lineState) => {
@@ -140,13 +149,14 @@ export const tokenizeLine = (line, lineState) => {
   let stack = lineState.stack
   while (index < line.length) {
     const part = line.slice(index)
+    part
+    state
     switch (state) {
       case State.TopLevelContent:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
-          next[0] //?
           switch (next[0]) {
             case 'true':
             case 'false':
@@ -273,6 +283,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_COLON))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_KEYWORD_ENUM))) {
+          token = TokenType.Keyword
+          state = State.AfterKeywordEnum
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.AfterKeywordDeclaration
@@ -280,6 +293,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.TopLevelContent
         } else {
+          line
           part
           throw new Error('no')
         }
@@ -429,7 +443,6 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterKeywordDeclare:
-        part
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterKeywordDeclare
@@ -441,7 +454,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterKeywordDeclare
         } else if ((next = part.match(RE_KEYWORD_ENUM))) {
           token = TokenType.Keyword
-          state = State.AfterKeywordDeclare
+          state = State.AfterKeywordEnum
         } else if ((next = part.match(RE_KEYWORD_CLASS))) {
           token = TokenType.Keyword
           state = State.AfterKeywordClass
@@ -453,6 +466,51 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+
+      case State.AfterKeywordEnum:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordEnum
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Type
+          state = State.AfterKeywordEnumAfterVariableName
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.AfterKeywordEnumAfterVariableName:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordEnumAfterVariableName
+        } else if ((next = part.match(RE_CURLY_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideEnum
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideEnum:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideEnum
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.VariableName
+          state = State.InsideEnumAfterVariableName
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideEnumAfterVariableName:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideEnumAfterVariableName
+        } else if ((next = part.match(RE_EQUAL))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
       case State.InsideLineComment:
         if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Comment
@@ -533,11 +591,9 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   if (state === State.AfterType && stack[0] === State.InsideClass) {
     state = State.InsideClass

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.10.6",
+  "version": "0.10.8",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -20,11 +20,11 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.10.6",
-    "@lvce-editor/pty-host": "0.10.6",
+    "@lvce-editor/extension-host": "0.10.8",
+    "@lvce-editor/pty-host": "0.10.8",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
-    "exit-hook": "^3.1.1",
+    "exit-hook": "^3.1.2",
     "got": "^12.5.2",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",

package/src/parts/ExportStatic/ExportStatic.js

@@ -514,23 +514,19 @@ const addExtensionLanguages = async ({
     Path.join(root, 'README.md'),
     Path.join(root, 'dist', commitHash, 'extensions', extensionId, 'README.md')
   )
-  await FileSystem.copy(
-    Path.join(extensionPath, 'src'),
-    Path.join(root, 'dist', commitHash, 'extensions', extensionId, 'src')
-  )
-  await FileSystem.copyFile(
-    Path.join(extensionPath, 'extension.json'),
-    Path.join(
-      root,
-      'dist',
-      commitHash,
-      'extensions',
-      extensionId,
-      'extension.json'
-    )
-  )
+  for (const file of ['src', 'data', 'extension.json']) {
+    if (await FileSystem.exists(Path.join(extensionPath, file))) {
+      await FileSystem.copy(
+        Path.join(extensionPath, file),
+        Path.join(root, 'dist', commitHash, 'extensions', extensionId, file)
+      )
+    }
+  }
   const extensionLanguages = []
   for (const language of languages) {
+    if (!language.tokenize) {
+      continue
+    }
     extensionLanguages.push({
       ...language,
       tokenize: `${pathPrefix}/${commitHash}/extensions/${extensionId}/${language.tokenize}`,