@lvce-editor/shared-process 0.11.0 → 0.11.1

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

@@ -190,6 +190,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SELECTOR))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
+        } else if ((next = part.match(RE_SELECTOR_ID))) {
+          token = TokenType.CssSelectorId
+          state = State.AfterSelector
         } else if ((next = part.match(RE_COMMA))) {
           token = TokenType.Punctuation
           state = State.AfterSelector

package/extensions/builtin.language-basics-shellscript/src/tokenizeShellScript.js

@@ -57,7 +57,7 @@ const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_KEYWORD =
   /^(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)\b/
 
-const RE_VARIABLE_NAME = /^[a-zA-Z\_]+/
+const RE_VARIABLE_NAME = /^[a-zA-Z\_\/\-]+/
 const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>]/
 const RE_NUMERIC = /^\d+/
 

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

@@ -220,6 +220,10 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#8CAEC1"
+    },
+    {
+      "name": "CssAtRule",
+      "foreground": "#E78484"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -20,12 +20,12 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.11.0",
-    "@lvce-editor/pty-host": "0.11.0",
+    "@lvce-editor/extension-host": "0.11.1",
+    "@lvce-editor/pty-host": "0.11.1",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
     "exit-hook": "^3.1.2",
-    "got": "^12.5.2",
+    "got": "^12.5.3",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",
     "open": "^8.4.0",
@@ -42,7 +42,7 @@
   "optionalDependencies": {
     "electron-clipboard-ex": "^1.3.3",
     "keytar": "^7.9.0",
-    "vscode-ripgrep-with-github-api-error-fix": "^2.5.0",
+    "vscode-ripgrep-with-github-api-error-fix": "^2.6.0",
     "extract-zip": "^2.0.1"
   },
   "devDependencies": {

package/src/parts/CliLink/CliLink.js

@@ -1,12 +1,12 @@
 import * as ExtensionLink from '../ExtensionLink/ExtensionLink.js'
-import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 export const handleCliArgs = async (argv) => {
   try {
     const path = argv.length > 1 ? argv[1] : process.cwd()
     await ExtensionLink.link(path)
   } catch (error) {
-    if (error && error.code === FileSystemErrorCodes.E_MANIFEST_NOT_FOUND) {
+    if (error && error.code === ErrorCodes.E_MANIFEST_NOT_FOUND) {
       console.error(error.message)
       process.exitCode = 128
       return

package/src/parts/DirentType/DirentType.js

@@ -1,13 +1,11 @@
-export const File = 'file'
-
-export const Direcory = 'directory'
-
-export const Symlink = 'symlink'
-
-export const Socket = 'socket'
-
-export const BlockDevice = 'block-device'
-
-export const CharacterDevice = 'character-device'
-
-export const Unknown = 'unknown'
+export const BlockDevice = 1
+export const CharacterDevice = 2
+export const Directory = 3
+export const DirectoryExpanded = 4
+export const DirectoryExpanding = 5
+export const File = 6
+export const Socket = 7
+export const Symlink = 8
+export const SymLinkFile = 9
+export const SymLinkFolder = 10
+export const Unknown = 11

package/src/parts/Error/FileNotFoundError.js

@@ -1,10 +1,10 @@
 import VError from 'verror'
-import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 export class FileNotFoundError extends VError {
   constructor(path) {
     super(`File not found '${path}'`)
     this.name = 'FileNotFoundError'
-    this.code = FileSystemErrorCodes.ENOENT
+    this.code = ErrorCodes.ENOENT
   }
 }

package/src/parts/ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js

@@ -0,0 +1,51 @@
+import * as ChildProcess from '../ChildProcess/ChildProcess.js'
+import * as Platform from '../Platform/Platform.js'
+
+export const create = () => {
+  const extensionHostHelperProcessPath =
+    Platform.getExtensionHostHelperProcessPath()
+  const childProcess = ChildProcess.fork(
+    extensionHostHelperProcessPath,
+    ['--ipc-type=websocket', '--max-old-space-size=60', '--enable-source-maps'],
+    {}
+  )
+  return {
+    on(event, listener) {
+      switch (event) {
+        case 'message':
+          childProcess.on('message', listener)
+          break
+        case 'error':
+          childProcess.on('error', listener)
+          break
+        case 'exit':
+          childProcess.on('exit', listener)
+          break
+        default:
+          throw new Error(`unsupported event type ${event}`)
+      }
+    },
+    off(event, listener) {
+      switch (event) {
+        case 'message':
+          childProcess.off('message', listener)
+          break
+        case 'error':
+          childProcess.off('error', listener)
+          break
+        case 'exit':
+          childProcess.off('exit', listener)
+          break
+        default:
+          throw new Error(`unsupported event type ${event}`)
+      }
+    },
+    send(message) {
+      childProcess.send(message)
+    },
+    dispose() {
+      childProcess.kill()
+    },
+    _process: childProcess,
+  }
+}

package/src/parts/ExtensionLink/ExtensionLink.js

@@ -2,7 +2,7 @@ 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 FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as SymLink from '../SymLink/SymLink.js'
@@ -35,7 +35,7 @@ export const link = async (path) => {
     const to = Path.join(linkedExtensionsPath, manifest.id)
     await SymLink.createSymLink(path, to)
   } catch (error) {
-    if (error && error.code === FileSystemErrorCodes.EEXIST) {
+    if (error && error.code === ErrorCodes.EEXIST) {
       return linkFallBack(path)
     }
     throw new VError(error, `Failed to link extension`)

package/src/parts/ExtensionManifest/ExtensionManifest.js

@@ -3,7 +3,7 @@ import VError from 'verror'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
 import * as ReadJson from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
-import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 const RE_EXTENSION_FRAGMENT = /.+(\/|\\)(.+)$/
 
@@ -35,9 +35,9 @@ export const get = async (path) => {
       error,
       `Failed to load extension manifest for ${id}`
     )
-    if (error.code === FileSystemErrorCodes.ENOENT) {
+    if (error.code === ErrorCodes.ENOENT) {
       // @ts-ignore
-      enhancedError.code = FileSystemErrorCodes.E_MANIFEST_NOT_FOUND
+      enhancedError.code = ErrorCodes.E_MANIFEST_NOT_FOUND
     } else {
       // @ts-ignore
       enhancedError.code = error.code

package/src/parts/ExtensionManifests/ExtensionManifestsFromFolder.js

@@ -2,7 +2,7 @@ import VError from 'verror'
 import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as Path from '../Path/Path.js'
-import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 const toAbsolutePaths = (path, dirents) => {
   const absolutePaths = []
@@ -26,7 +26,7 @@ export const getExtensionManifests = async (path) => {
   } catch (error) {
     // TODO how to make typescript happy?
     // @ts-ignore
-    if (error.code === FileSystemErrorCodes.ENOENT) {
+    if (error.code === ErrorCodes.ENOENT) {
       return []
     }
     throw new VError(error, 'Failed to get extension manifests')

package/src/parts/FileSystem/FileSystem.js

@@ -4,7 +4,7 @@ import * as os from 'node:os'
 import VError from 'verror'
 import * as DirentType from '../DirentType/DirentType.js'
 import { FileNotFoundError } from '../Error/FileNotFoundError.js'
-import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as Trash from '../Trash/Trash.js'
@@ -52,7 +52,7 @@ export const readFile = async (path, encoding = EncodingType.Utf8) => {
     // console.timeEnd(`read ${path}`)
     return content
   } catch (error) {
-    if (error && error.code === FileSystemErrorCodes.ENOENT) {
+    if (error && error.code === ErrorCodes.ENOENT) {
       throw new FileNotFoundError(path)
     }
     throw new VError(error, `Failed to read file "${path}"`)
@@ -75,7 +75,7 @@ export const writeFile = async (
     // Queue.add(`writeFile/${path}`, () =>
     await fs.writeFile(path, content, encoding)
   } catch (error) {
-    if (error && error.code === FileSystemErrorCodes.ENOENT) {
+    if (error && error.code === ErrorCodes.ENOENT) {
       throw new FileNotFoundError(path)
     }
     throw new VError(error, `Failed to write to file "${path}"`)
@@ -152,7 +152,7 @@ const getType = (dirent) => {
     return DirentType.File
   }
   if (dirent.isDirectory()) {
-    return DirentType.Direcory
+    return DirentType.Directory
   }
   if (dirent.isSymbolicLink()) {
     return DirentType.Symlink
@@ -194,7 +194,7 @@ export const readDir = async (path) => {
     const dirents = await fs.readdir(path)
     return dirents
   } catch (error) {
-    if (error && error.code === FileSystemErrorCodes.ENOENT) {
+    if (error && error.code === ErrorCodes.ENOENT) {
       throw new FileNotFoundError(path)
     }
     throw new VError(error, `Failed to read directory "${path}"`)
@@ -222,7 +222,7 @@ export const rename = async (oldPath, newPath) => {
   try {
     await fs.rename(oldPath, newPath)
   } catch (error) {
-    if (error && error.code === FileSystemErrorCodes.EXDEV) {
+    if (error && error.code === ErrorCodes.EXDEV) {
       return fallbackRename(oldPath, newPath)
     }
     throw new VError(error, `Failed to rename "${oldPath}" to "${newPath}"`)
@@ -258,7 +258,7 @@ export const getRealPath = async (path) => {
       error &&
       error instanceof globalThis.Error &&
       // @ts-ignore
-      error.code === FileSystemErrorCodes.ENOENT
+      error.code === ErrorCodes.ENOENT
     ) {
       let content
       try {

package/src/parts/ParentIpc/ParentIpc.js

@@ -8,6 +8,7 @@ import { requiresSocket } from '../RequiresSocket/RequiresSocket.js'
 import * as Platform from '../Platform/Platform.js'
 import * as ExtensionHostIpc from '../ExtensionHostIpc/ExtensionHostIpc.js'
 import * as ExtensionHostRpc from '../ExtensionHostRpc/ExtensionHostRpc.js'
+import * as ExtensionHostHelperProcessIpc from '../ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js'
 // TODO add tests for this
 
 // TODO handle structure: one shared process multiple extension hosts
@@ -61,6 +62,11 @@ const handleWebSocketExtensionHost = async (message, handle) => {
   // console.log(rpc)
 }
 
+const handleWebSocketExtensionHostHelperProcess = (message, handle) => {
+  const ipc = ExtensionHostHelperProcessIpc.create()
+  ipc._process.send(message, handle)
+}
+
 const handleWebSocket = (message, handle) => {
   const headers = message.headers
   if (!headers) {
@@ -75,6 +81,8 @@ const handleWebSocket = (message, handle) => {
       return handleWebSocketSharedProcess(message, handle)
     case 'lvce.extension-host':
       return handleWebSocketExtensionHost(message, handle)
+    case 'lvce.extension-host-helper-process':
+      return handleWebSocketExtensionHostHelperProcess(message, handle)
     default:
       throw new VError(`unsupported sec-websocket-procotol ${protocol}`)
   }
@@ -209,7 +217,6 @@ const electronInitialize = (initializeMessage) => {
               },
             })
           }
-
         }
       } else {
         Command.execute(message.method, fakeSocket, ...message.params)

package/src/parts/Platform/Platform.js

@@ -101,6 +101,16 @@ export const getExtensionHostPath = () => {
   return extensionHostPath
 }
 
+export const getExtensionHostHelperProcessPath = () => {
+  return Path.join(
+    Root.root,
+    'packages',
+    'extension-host-helper-process',
+    'src',
+    'extensionHostHelperProcessMain.js'
+  )
+}
+
 export const getRecentlyOpenedPath = () => {
   return Path.join(cacheDir, 'recently-opened.json')
 }