@lvce-editor/shared-process 0.10.0 → 0.10.1

package/extensions/builtin.language-basics-css/src/tokenizeCss.js

@@ -14,6 +14,7 @@ export const State = {
   AfterQuery: 10,
   InsideRound: 11,
   AfterQueryWithRules: 12,
+  InsideRule: 13,
 }
 
 export const StateMap = {
@@ -60,7 +61,7 @@ export const TokenMap = {
   [TokenType.CurlyClose]: 'Punctuation',
   [TokenType.PropertyColon]: 'Punctuation',
   [TokenType.CssPropertySemicolon]: 'Punctuation',
-  [TokenType.Variable]: 'Variable',
+  [TokenType.Variable]: 'VariableName',
   [TokenType.None]: 'None',
   [TokenType.CssPropertyValue]: 'CssPropertyValue',
   [TokenType.Unknown]: 'Unknown',
@@ -68,12 +69,12 @@ export const TokenMap = {
   [TokenType.Numeric]: 'Numeric',
   [TokenType.NewLine]: 'NewLine',
   [TokenType.Comment]: 'Comment',
-  [TokenType.Query]: 'Query',
+  [TokenType.Query]: 'CssAtRule',
   [TokenType.Text]: 'Text',
   [TokenType.CssSelectorId]: 'CssSelectorId',
 }
 
-const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>\+\~]+/
+const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>\+\~\_%]+/
 const RE_SELECTOR_ID = /^#\w+/
 const RE_WHITESPACE = /^ +/
 const RE_CURLY_OPEN = /^\{/
@@ -151,17 +152,19 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.InsideAttributeSelector
         } else if ((next = part.match(RE_QUERY))) {
-          if (
-            next[0] === '@font-face' ||
-            next[0] === '@-ms-viewport' ||
-            next[0] === '@-o-viewport' ||
-            next[0] === '@viewport'
-          ) {
-            token = TokenType.Query
-            state = State.AfterQueryWithRules
-          } else {
-            token = TokenType.Query
-            state = State.AfterQuery
+          switch (next[0]) {
+            case '@font-face':
+            case '@-ms-viewport':
+            case '@-o-viewport':
+            case '@viewport':
+              token = TokenType.Query
+              state = State.AfterQueryWithRules
+              break
+            case '@keyframes':
+            default:
+              token = TokenType.Query
+              state = State.AfterQuery
+              break
           }
         } else if ((next = part.match(RE_STAR))) {
           token = TokenType.CssSelector
@@ -238,7 +241,7 @@ export const tokenizeLine = (line, lineState) => {
       case State.InsideBlockComment:
         if ((next = part.match(RE_BLOCK_COMMENT_END))) {
           token = TokenType.Comment
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_BLOCK_COMMENT_CONTENT))) {
           token = TokenType.Comment
           state = State.InsideBlockComment
@@ -257,6 +260,10 @@ export const tokenizeLine = (line, lineState) => {
           if (next[0].startsWith('--')) {
             token = TokenType.Variable
           }
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+          stack.push(State.InsideSelector)
         } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
           token = TokenType.Unknown
           state = State.InsideSelector

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

@@ -85,6 +85,7 @@ const RE_COMMA = /^,/
 const RE_COLON = /^:/
 const RE_NUMERIC =
   /^((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
+const RE_NUMERIC_OCTAL = /0(?:o|O)?[0-7][0-7_]*(n)?\b/
 const RE_LINE_COMMENT_START = /^\/\//
 const RE_LINE_COMMENT_CONTENT = /^[^\n]+/
 const RE_NEWLINE_WHITESPACE = /^\n\s*/
@@ -94,14 +95,14 @@ const RE_BLOCK_COMMENT_END = /^\*\//
 const RE_UNKNOWN_VALUE = /^[^\}\{\s,"]+/
 const RE_IMPORT = /^[a-zA-Z\.]+/
 const RE_SEMICOLON = /^;/
-const RE_VARIABLE_NAME = /^[a-zA-Z_][a-zA-Z\d\_]*/
+const RE_VARIABLE_NAME = /^[a-zA-Z_$][a-zA-Z\d\_]*/
 const RE_LINE_COMMENT = /^\/\/[^\n]*/
 const RE_ROUND_OPEN = /^\(/
 const RE_ROUND_CLOSE = /^\)/
 const RE_DOT = /^\./
 const RE_EQUAL_SIGN = /^=/
 const RE_SINGLE_QUOTE = /^'/
-const RE_PUNCTUATION = /^[\(\)=\+\-><\.:;\{\}\[\]!,&\|\^\?\*]/
+const RE_PUNCTUATION = /^[\(\)=\+\-><\.:;\{\}\[\]!,&\|\^\?\*%]/
 const RE_SLASH = /^\//
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_WHITESPACE = /^\s+/
@@ -198,7 +199,7 @@ export const tokenizeLine = (line, lineState) => {
             token = TokenType.Comment
             state = State.InsideLineComment
           } else {
-            next = part.match(RE_PUNCTUATION)
+            next = part.match(RE_SLASH)
             token = TokenType.Punctuation
             state = State.TopLevelContent
           }
@@ -211,6 +212,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_QUOTE_BACKTICK))) {
           token = TokenType.Punctuation
           state = State.InsideBacktickString
+        } else if ((next = part.match(RE_NUMERIC_OCTAL))) {
+          token = TokenType.Numeric
+          state = State.TopLevelContent
         } else {
           line.slice(0, index) //?
           part //?

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

@@ -93,8 +93,10 @@ const RE_ANYTHING = /^.+/s
 const RE_NUMERIC =
   /^((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
 const RE_TEXT = /^[^\s\{\}\[\]]+/
-const RE_ESCAPED_QUOTE = /^\\"/
-const RE_BACK_SLASH = /^\\/
+// const RE_ESCAPED_QUOTE = /^\\"/
+// const RE_BACK_SLASH = /^\\/
+const RE_STRING_ESCAPE = /^\\.?/
+const RE_WORD = /^\w+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -165,7 +167,6 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterCurlyOpen:
-        part
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterCurlyOpen
@@ -182,6 +183,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
           state = State.AfterCurlyOpen
+        } else if ((next = part.match(RE_WORD))) {
+          token = TokenType.Text
+          state = State.AfterPropertyName
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.AfterCurlyOpen
         } else {
           part //?
           throw new Error('no')
@@ -195,10 +202,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = stack.pop()
           state
-        } else if ((next = part.match(RE_ESCAPED_QUOTE))) {
-          token = TokenType.JsonPropertyName
-          state = State.InsidePropertyNameString
-        } else if ((next = part.match(RE_BACK_SLASH))) {
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
           token = TokenType.JsonPropertyName
           state = State.InsidePropertyNameString
         } else {
@@ -212,10 +216,7 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.Punctuation
           state = stack.pop()
-        } else if ((next = part.match(RE_ESCAPED_QUOTE))) {
-          token = TokenType.String
-          state = State.InsideString
-        } else if ((next = part.match(RE_BACK_SLASH))) {
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
           token = TokenType.String
           state = State.InsideString
         } else {
@@ -239,7 +240,6 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterPropertyNameAfterColon:
-        part
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterPropertyNameAfterColon

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

@@ -38,6 +38,8 @@ export const TokenType = {
   String: 188,
   YamlPropertyName: 123,
   YamlPropertyValueString: 124,
+  Alias: 125,
+  Anchor: 126,
 }
 
 export const TokenMap = {
@@ -55,6 +57,8 @@ export const TokenMap = {
   [TokenType.String]: 'String',
   [TokenType.YamlPropertyName]: 'YamlPropertyName',
   [TokenType.YamlPropertyValueString]: 'YamlPropertyValueString',
+  [TokenType.Alias]: 'VariableName',
+  [TokenType.Anchor]: 'VariableName',
 }
 
 const RE_LINE_COMMENT_START = /^#/
@@ -64,7 +68,7 @@ const RE_CURLY_CLOSE = /^\}/
 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_PROPERTY_VALUE_1 = /^[^&].*(?=\s+#)/s
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
 const RE_ANYTHING = /^.+/s
@@ -93,6 +97,9 @@ const RE_MULTI_LINE_STRING_START = /^(?:\||>\-|>)/
 const RE_KEY_PRE = /^\s*(\-\s*)?/
 const RE_SINGLE_QUOTE = /^'/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
+const RE_ALIAS = /^\*.+/
+const RE_ANCHOR = /^\&.+/
+const RE_MERGE_KEY = /^<<\:(?=\s)/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -158,6 +165,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SINGLE_QUOTE))) {
           token = TokenType.Punctuation
           state = State.InsidePropertyNameString
+        } else if ((next = part.match(RE_MERGE_KEY))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyNameAfterColon
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -204,6 +214,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_PROPERTY_VALUE_1))) {
           token = TokenType.YamlPropertyValueString
           state = State.AfterPropertyValue
+        } else if ((next = part.match(RE_ANCHOR))) {
+          token = TokenType.Anchor
+          state = State.AfterPropertyNameAfterColon
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.YamlPropertyValueString
           state = State.TopLevelContent
@@ -247,6 +260,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_MULTI_LINE_STRING_START))) {
           token = TokenType.Punctuation
           state = State.AfterPipe
+        } else if ((next = part.match(RE_ALIAS))) {
+          token = TokenType.Alias
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.YamlPropertyValueString
           state = State.TopLevelContent
@@ -309,6 +325,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_DASH))) {
           token = TokenType.Punctuation
           state = State.AfterDash
+        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideLineComment
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent

package/extensions/builtin.theme-slime/color-theme.json

@@ -85,6 +85,10 @@
       "name": "CssSelector",
       "foreground": "#BEB558"
     },
+    {
+      "name": "CssSelectorId",
+      "foreground": "#BE7C81"
+    },
     {
       "name": "CssPropertyValue",
       "foreground": "#C0C0C3"

package/package.json

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

package/src/parts/ExportStatic/ExportStatic.js

@@ -10,6 +10,10 @@ const readExtensionManifest = (path) => {
   return { ...JSON.parse(content), path }
 }
 
+const getThemeName = (dirent) => {
+  return dirent.slice('builtin.theme-'.length)
+}
+
 /**
  *
  * @param {{root:string, pathPrefix:string  }} param0
@@ -25,13 +29,21 @@ export const exportStatic = async ({ root, pathPrefix }) => {
   const commitHash = dirents.find(isCommitHash) || ''
 
   const extensionJson = readExtensionManifest(join(root, 'extension.json'))
-  const name = extensionJson.id.slice('builtin.theme-'.length)
+  const colorThemeName = extensionJson.id.slice('builtin.theme-'.length)
+  const name = extensionJson.name || extensionJson.id || ''
+  const description = extensionJson.description || ''
   fs.rmSync(join(root, 'dist'), { recursive: true, force: true })
 
   fs.mkdirSync(path.join(root, 'dist'))
 
   fs.mkdirSync(
-    join(root, 'dist', commitHash, 'extensions', `builtin.theme-${name}`),
+    join(
+      root,
+      'dist',
+      commitHash,
+      'extensions',
+      `builtin.theme-${colorThemeName}`
+    ),
     {
       recursive: true,
     }
@@ -187,7 +199,7 @@ export const exportStatic = async ({ root, pathPrefix }) => {
   replaceSync(
     join(root, 'dist', commitHash, 'config', 'defaultSettings.json'),
     `"workbench.colorTheme": "slime"`,
-    `"workbench.colorTheme": "${name}"`
+    `"workbench.colorTheme": "${colorThemeName}"`
   )
   replaceSync(
     join(root, 'dist', commitHash, 'config', 'defaultSettings.json'),
@@ -267,10 +279,6 @@ export const exportStatic = async ({ root, pathPrefix }) => {
     )
   }
 
-  const getThemeName = (dirent) => {
-    return dirent.slice('builtin.theme-'.length)
-  }
-
   for (const themeDirent of themeDirents) {
     const themeId = getThemeName(themeDirent)
     cpSync(
@@ -312,7 +320,7 @@ export const exportStatic = async ({ root, pathPrefix }) => {
     return sorted
   }
 
-  const themeIds = mergeThemes(themeDirents.map(getThemeName), [name])
+  const themeIds = mergeThemes(themeDirents.map(getThemeName), [colorThemeName])
   writeJson(join(root, 'dist', commitHash, 'config', 'themes.json'), themeIds)
 
   for (const iconThemeDirent of iconThemeDirents) {
@@ -348,7 +356,7 @@ export const exportStatic = async ({ root, pathPrefix }) => {
 
   cpSync(
     join(root, 'color-theme.json'),
-    join(root, 'dist', commitHash, 'themes', `${name}.json`)
+    join(root, 'dist', commitHash, 'themes', `${colorThemeName}.json`)
   )
   replaceSync(
     join(root, 'dist', 'index.html'),
@@ -360,11 +368,36 @@ export const exportStatic = async ({ root, pathPrefix }) => {
     `/manifest.json`,
     `${pathPrefix}/manifest.json`
   )
+  replaceSync(
+    join(root, 'dist', 'index.html'),
+    '<title>Code Editor</title>',
+    `<title>${name}</title>`
+  )
+  replaceSync(
+    join(root, 'dist', 'manifest.json'),
+    `"name": "Code Editor Web - OSS"`,
+    `"name": "${name}"`
+  )
+  replaceSync(
+    join(root, 'dist', 'manifest.json'),
+    `"short_name": "Web - OSS"`,
+    `"short_name": "${name}"`
+  )
+  replaceSync(
+    join(root, 'dist', 'manifest.json'),
+    `"description": "Web Code Editor."`,
+    `"description": "${description}"`
+  )
+  replaceSync(
+    join(root, 'dist', 'index.html'),
+    '<meta name="description" content="Online Code Editor" />',
+    `<meta name="description" content="${description}" />`
+  )
   replaceSync(
     join(root, 'dist', 'index.html'),
     '</title>',
     `</title>
-<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">`
+    <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">`
   )
   replaceSync(
     join(root, 'dist', 'manifest.json'),
@@ -379,7 +412,7 @@ export const exportStatic = async ({ root, pathPrefix }) => {
       'dist',
       commitHash,
       'extensions',
-      `builtin.theme-${name}`,
+      `builtin.theme-${colorThemeName}`,
       'README.md'
     )
   )
@@ -390,7 +423,7 @@ export const exportStatic = async ({ root, pathPrefix }) => {
       'dist',
       commitHash,
       'extensions',
-      `builtin.theme-${name}`,
+      `builtin.theme-${colorThemeName}`,
       'extension.json'
     )
   )
@@ -401,7 +434,7 @@ export const exportStatic = async ({ root, pathPrefix }) => {
       'dist',
       commitHash,
       'extensions',
-      `builtin.theme-${name}`,
+      `builtin.theme-${colorThemeName}`,
       'color-theme.json'
     )
   )