@lvce-editor/shared-process 0.7.5 → 0.7.6

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

@@ -1,6 +1,6 @@
 {
   "id": "builtin.language-basics-docker",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "name": "Language Basics Docker",
   "description": "Provides syntax highlighting and bracket matching in Dockerfile files.",
   "languages": [

package/extensions/builtin.language-basics-docker/src/tokenizeDockerfile.js

@@ -15,6 +15,7 @@ export const State = {
   InsideRound: 11,
   AfterQueryWithRules: 12,
   InsideLineComment: 5,
+  InsideString: 2,
 }
 
 /**
@@ -27,6 +28,8 @@ export const TokenType = {
   Keyword: 3,
   Whitespace: 4,
   Comment: 885,
+  String: 886,
+  PunctuationString: 13,
 }
 
 export const TokenMap = {
@@ -35,6 +38,8 @@ export const TokenMap = {
   [TokenType.Whitespace]: 'Whitespace',
   [TokenType.Keyword]: 'Keyword',
   [TokenType.Comment]: 'Comment',
+  [TokenType.String]: 'String',
+  [TokenType.PunctuationString]: 'PunctuationString',
 }
 
 export const initialLineState = {
@@ -47,8 +52,11 @@ const RE_ANYTHING = /^.*/
 const RE_KEYWORD =
   /^(?:ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\b/
 const RE_LINE_COMMENT_START = /^#/
+const RE_PLAIN_TEXT = /^[^"\\]+/
+const RE_QUOTE_DOUBLE = /^"/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 
-export const hasArrayReturnValue = true
+export const hasArrayReturn = true
 
 /**
  * @param {string} line
@@ -73,6 +81,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_LINE_COMMENT_START))) {
           token = TokenType.Comment
           state = State.InsideLineComment
+        } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideString
+        } else if ((next = part.match(RE_PLAIN_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -88,15 +102,24 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.InsideString:
+        if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.PunctuationString
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideString
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         console.log({ state, line })
         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.InsideLineComment) {
     state = State.TopLevelContent

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

@@ -5,7 +5,8 @@
   "languages": [
     {
       "id": "dotenv",
-      "extensions": [".env", ".env.local"],
+      "extensions": [".env"],
+      "fileNames": ["sampledotenv", ".env.local", ".env.example"],
       "configuration": "./languageConfiguration.json",
       "tokenize": "src/tokenizeDotenv.js"
     }

package/extensions/builtin.language-basics-dotenv/src/tokenizeDotenv.js

@@ -65,8 +65,8 @@ export const TokenMap = {
   [TokenType.KeywordExport]: 'KeywordExport',
   [TokenType.VariableValueString]: 'String',
   [TokenType.LanguageConstant]: 'LanguageConstant',
-  [TokenType.VariableValue]: 'VariableValue',
-  [TokenType.VariableName]: 'VariableName',
+  [TokenType.VariableValue]: 'String',
+  [TokenType.VariableName]: 'JsonPropertyName',
   [TokenType.NewLine]: 'NewLine',
 }
 
@@ -125,6 +125,8 @@ export const initialLineState = {
   state: State.TopLevelContent,
 }
 
+export const hasArrayReturn = true
+
 /**
  * @param {string} line
  */
@@ -277,11 +279,17 @@ 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)
+  }
+  switch (state) {
+    case State.AfterVariableName:
+    case State.AfterAssignmentEqualSign:
+      state = State.TopLevelContent
+      break
+    default:
+      break
   }
   if (state === State.AfterVariableValue) {
     state = State.TopLevelContent
@@ -291,7 +299,3 @@ export const tokenizeLine = (line, lineState) => {
     tokens,
   }
 }
-
-// tokenizeLine(initialContext, '# comment') //?
-
-// tokenizeLine('KEY=42"', initialLineState) //?

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

@@ -30,7 +30,12 @@
         ".sublime-project",
         ".code-snippets"
       ],
-      "fileNames": ["composer.lock", ".watchmanconfig"],
+      "fileNames": [
+        "composer.lock",
+        ".watchmanconfig",
+        ".all-contributorsrc",
+        ".imgbotconfig"
+      ],
       "tokenize": "src/tokenizeJson.js"
     }
   ]

package/extensions/builtin.language-basics-yaml/src/tokenizeYaml.js

@@ -12,6 +12,7 @@ export const State = {
   InsideMultiLineString: 8,
   InsideMultiLineStringAfterWhitespace: 9,
   AfterPropertyValue: 10,
+  InsidePropertyNameString: 11,
 }
 
 export const StateMap = {
@@ -60,7 +61,9 @@ const RE_LINE_COMMENT_START = /^#/
 const RE_WHITESPACE = /^ +/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
-const RE_PROPERTY_NAME = /^[a-zA-Z\-\_\d\s]+\b(?=\s*:(\s+|$))/
+const RE_PROPERTY_NAME = /^[\:@\/\\a-zA-Z\-\_\d\.]+(?=\s*:(\s+|$))/
+const RE_PROPERTY_NAME_2 =
+  /^[\:@\/\\a-zA-Z\-\_\d\.\s]*[@\/\\a-zA-Z\-\_\d\.](?=\s*:(\s+|$))/
 const RE_PROPERTY_VALUE_1 = /^.+(?=\s+#)/s
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
@@ -88,6 +91,8 @@ const RE_DASH = /^\-/
 const RE_WORDS = /^[\w\s]*\w/
 const RE_MULTI_LINE_STRING_START = /^(?:\||>\-|>)/
 const RE_KEY_PRE = /^\s*(\-\s*)?/
+const RE_SINGLE_QUOTE = /^'/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -141,12 +146,18 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_PROPERTY_NAME))) {
           token = TokenType.PropertyName
           state = State.AfterPropertyName
+        } else if ((next = part.match(RE_PROPERTY_NAME_2))) {
+          token = TokenType.PropertyName
+          state = State.AfterPropertyName
         } else if ((next = part.match(RE_NUMERIC))) {
           token = TokenType.Numeric
           state = State.TopLevelContent
         } else if ((next = part.match(RE_WORDS))) {
           token = TokenType.Text
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsidePropertyNameString
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -265,11 +276,25 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_LINE_COMMENT_START))) {
           token = TokenType.Comment
           state = State.InsideLineComment
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsidePropertyNameString
         } else {
           part
           throw new Error('no')
         }
         break
+      case State.InsidePropertyNameString:
+        if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyName
+        } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsidePropertyNameString
+        } else {
+          throw new Error('no')
+        }
+        break
       case State.InsideMultiLineString:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -20,8 +20,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.7.5",
-    "@lvce-editor/pty-host": "0.7.5",
+    "@lvce-editor/extension-host": "0.7.6",
+    "@lvce-editor/pty-host": "0.7.6",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "execa": "^6.1.0",

package/src/parts/ExtensionUnlink/ExtensionUnlink.js

@@ -1,17 +1,19 @@
 import VError from 'verror'
+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'
 
 export const unlink = async (path) => {
   try {
-    const manifestPath = Path.join(path, 'extension.json')
-    if (!(await FileSystem.exists(manifestPath))) {
-      throw new Error('no extension manifest found')
+    const manifest = await ExtensionManifest.get(path)
+    if (manifest.status === ExtensionManifestStatus.Rejected) {
+      throw manifest.reason
     }
     const linkedExtensionsPath = Platform.getLinkedExtensionsPath()
-    const baseName = Path.basename(path)
-    const to = Path.join(linkedExtensionsPath, baseName)
+    // @ts-ignore
+    const to = Path.join(linkedExtensionsPath, manifest.id)
     await FileSystem.remove(to)
   } catch (error) {
     throw new VError(error, `Failed to unlink extension`)