@lvce-editor/shared-process 0.10.8 → 0.11.0

package/config/defaultKeyBindings.json

@@ -22,8 +22,8 @@
   {
     "key": "Escape",
     "command": "Viewlet.closeWidget",
-    "when": "focus.EditorFindWidget",
-    "args": ["EditorFindWidget"]
+    "when": "focus.FindWidget",
+    "args": ["FindWidget"]
   },
   {
     "key": "ctrl+ArrowRight",
@@ -329,23 +329,13 @@
   },
   {
     "key": "Escape",
-    "command": "Explorer.cancelRename",
-    "when": "focus.ExplorerRename"
+    "command": "Explorer.cancelEdit",
+    "when": "focus.ExplorerEditBox"
   },
   {
     "key": "Enter",
-    "command": "Explorer.acceptRename",
-    "when": "focus.ExplorerRename"
-  },
-  {
-    "key": "Escape",
-    "command": "Explorer.cancelNewFile",
-    "when": "focus.ExplorerCreateFile"
-  },
-  {
-    "key": "Enter",
-    "command": "Explorer.acceptNewFile",
-    "when": "focus.ExplorerCreateFile"
+    "command": "Explorer.acceptEdit",
+    "when": "focus.ExplorerEditBox"
   },
   {
     "key": "Delete",
@@ -687,18 +677,18 @@
   },
   {
     "key": "Enter",
-    "command": "EditorFindWidget.focusNext",
-    "when": "focus.EditorFindWidget"
+    "command": "FindWidget.focusNext",
+    "when": "focus.FindWidget"
   },
   {
     "key": "shift+F4",
-    "command": "EditorFindWidget.focusPrevious",
-    "when": "focus.EditorFindWidget"
+    "command": "FindWidget.focusPrevious",
+    "when": "focus.FindWidget"
   },
   {
     "key": "F4",
-    "command": "EditorFindWidget.focusNext",
-    "when": "focus.EditorFindWidget"
+    "command": "FindWidget.focusNext",
+    "when": "focus.FindWidget"
   },
   {
     "key": "ctrl+=",

package/config/defaultSettings.json

@@ -6,6 +6,7 @@
   "editor.fontSize": 15,
   "editor.fontFamily": "'Fira Code'",
   "editor.lineHeight": 20,
+  "editor.formatOnSave": false,
 
   "extensions.autoUpdate": true,
 
@@ -17,7 +18,7 @@
     "Thumbs.db": true
   },
 
-  "sessionReplay.enabled": true,
+  "sessionReplay.enabled": false,
 
   "serviceWorker.enabled": false,
 
@@ -38,6 +39,7 @@
     "ctrl+p",
     "ctrl+shift+p",
     "ctrl+b",
-    "ctrl+m"
+    "ctrl+m",
+    "ctrl+Tab"
   ]
 }

package/extensions/builtin.language-basics-html/src/tokenizeHtml.js

@@ -84,7 +84,7 @@ const RE_TAGNAME = /^[!\w]+/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/
-const RE_ATTRIBUTE_VALUE_UNQUOTED=/^[^<>]+/
+const RE_ATTRIBUTE_VALUE_UNQUOTED = /^[^<>]+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -145,6 +145,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANGLE_BRACKET_OPEN))) {
+          token = TokenType.PunctuationTag
+          state = State.AfterOpeningAngleBracket
         } else if ((next = part.match(RE_ANY_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -178,6 +181,9 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_TAGNAME))) {
           token = TokenType.TagName
           state = State.AfterClosingTagName
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_ANY_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -250,9 +256,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-        }else if((next=part.match(RE_ATTRIBUTE_VALUE_UNQUOTED))){
-          token=TokenType.String
-          state=State.InsideOpeningTag
+        } else if ((next = part.match(RE_ATTRIBUTE_VALUE_UNQUOTED))) {
+          token = TokenType.String
+          state = State.InsideOpeningTag
         } else {
           part
           throw new Error('no')
@@ -299,10 +305,14 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
+
     const tokenLength = next[0].length
     index += tokenLength
     tokens.push(token, tokenLength)
   }
+  if (state === State.AfterClosingTagAngleBrackets) {
+    state = State.TopLevelContent
+  }
   return {
     state,
     tokens,

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

@@ -49,6 +49,7 @@ export const TokenType = {
   KeywordReturn: 883,
   KeywordNew: 884,
   FunctionName: 885,
+  KeywordThis: 886,
 }
 
 export const TokenMap = {
@@ -75,6 +76,7 @@ export const TokenMap = {
   [TokenType.KeywordReturn]: 'KeywordReturn',
   [TokenType.KeywordNew]: 'KeywordNew',
   [TokenType.FunctionName]: 'Function',
+  [TokenType.KeywordThis]: 'KeywordThis',
 }
 
 const RE_KEYWORD =
@@ -113,7 +115,7 @@ const RE_QUOTE_DOUBLE = /^"/
 const RE_QUOTE_BACKTICK = /^`/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^'\\]+/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\\]+/
-const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`]+/
+const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`\\]+/
 const RE_STRING_ESCAPE = /^\\./
 const RE_SHEBANG = /^#!.*/
 const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\(|\=\s*function|\=\s*\())/
@@ -179,6 +181,9 @@ export const tokenizeLine = (line, lineState) => {
             case 'new':
               token = TokenType.KeywordNew
               break
+            case 'this':
+              token = TokenType.KeywordThis
+              break
             default:
               token = TokenType.Keyword
               break
@@ -251,12 +256,12 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.InsideBlockComment:
-        if ((next = part.match(RE_BLOCK_COMMENT_CONTENT))) {
-          token = TokenType.Comment
-          state = State.InsideBlockComment
-        } else if ((next = part.match(RE_BLOCK_COMMENT_END))) {
+        if ((next = part.match(RE_BLOCK_COMMENT_END))) {
           token = TokenType.Comment
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_CONTENT))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Comment
           state = State.InsideBlockComment
@@ -299,6 +304,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_STRING_BACKTICK_QUOTE_CONTENT))) {
           token = TokenType.String
           state = State.InsideBacktickString
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
+          token = TokenType.String
+          state = State.InsideBacktickString
         } else {
           throw new Error('no')
         }

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

@@ -41,7 +41,9 @@
         ".stylelintrc",
         ".parcelrc",
         ".publishrc",
-        ".whitesource"
+        ".whitesource",
+        ".mention-bot",
+        "pdfjs.config"
       ],
       "tokenize": "src/tokenizeJson.js"
     }

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

@@ -255,7 +255,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterPropertyValue
         } else if ((next = part.match(RE_TEXT))) {
           token = TokenType.Text
-          state = State.TopLevelContent
+          state = State.AfterCurlyOpen
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
           state = State.AfterCurlyOpen
@@ -311,6 +311,9 @@ export const tokenizeLine = (line, lineState) => {
   if (state === State.InsideLineComment) {
     state = State.TopLevelContent
   }
+  if (state === State.AfterPropertyValue) {
+    state = State.AfterCurlyOpen
+  }
   return {
     state,
     stack,

package/extensions/builtin.theme-gruvbox/extension.json

@@ -1,6 +1,6 @@
 {
   "id": "builtin.theme-gruvbox",
-  "name": "Gruvbox",
+  "name": "Gruvbox Theme",
   "description": "Theme based on gruvbox-material-vscode theme by sainnhe",
   "colorThemes": [
     {

package/extensions/builtin.theme-noctis-uva/extension.json

@@ -1,6 +1,6 @@
 {
   "id": "builtin.theme-noctis-uva",
-  "name": "Theme Noctis Uva",
+  "name": "Noctis Uva Theme",
   "description": "",
   "colorThemes": [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.10.8",
+  "version": "0.11.0",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -20,8 +20,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.10.8",
-    "@lvce-editor/pty-host": "0.10.8",
+    "@lvce-editor/extension-host": "0.11.0",
+    "@lvce-editor/pty-host": "0.11.0",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
     "exit-hook": "^3.1.2",
@@ -36,7 +36,7 @@
     "tmp-promise": "^3.0.3",
     "trash": "^8.1.0",
     "verror": "^1.10.1",
-    "ws": "^8.9.0",
+    "ws": "^8.11.0",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {

package/src/parts/ChromeExtension/ChromeExtension.ipc.js

@@ -1,6 +1,8 @@
 import * as ChromeExtension from './ChromeExtension.js'
 
+export const name = 'ChromeExtension'
+
 export const Commands = {
-  'ChromeExtension.install': ChromeExtension.install,
-  'ChromeExtension.uninstall': ChromeExtension.uninstall,
+  install: ChromeExtension.install,
+  uninstall: ChromeExtension.uninstall,
 }

package/src/parts/CliLink/CliLink.js

@@ -1,6 +1,16 @@
 import * as ExtensionLink from '../ExtensionLink/ExtensionLink.js'
+import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
 
-export const handleCliArgs = async (argv, console) => {
-  const path = argv.length > 1 ? argv[1] : process.cwd()
-  await ExtensionLink.link(path)
+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) {
+      console.error(error.message)
+      process.exitCode = 128
+      return
+    }
+    throw error
+  }
 }

package/src/parts/ClipBoard/ClipBoard.ipc.js

@@ -1,6 +1,8 @@
 import * as ClipBoard from './ClipBoard.js'
 
+export const name = 'ClipBoard'
+
 export const Commands = {
-  'ClipBoard.readFiles': ClipBoard.readFiles,
-  'ClipBoard.writeFiles': ClipBoard.writeFiles,
+  readFiles: ClipBoard.readFiles,
+  writeFiles: ClipBoard.writeFiles,
 }

package/src/parts/Command/Command.js

@@ -8,7 +8,12 @@ const pendingModules = Object.create(null)
 const initializeModule = (module) => {
   if (module.Commands) {
     for (const [key, value] of Object.entries(module.Commands)) {
-      register(key, value)
+      if (module.name) {
+        const actualKey = `${module.name}.${key}`
+        register(actualKey, value)
+      } else {
+        register(key, value)
+      }
     }
     return
   }

package/src/parts/Developer/Developer.ipc.js

@@ -1,13 +1,15 @@
 import * as Developer from './Developer.js'
 
+export const name = 'Developer'
+
 // prettier-ignore
 export const Commands = {
-  'Developer.allocateMemory': Developer.allocateMemory,
-  'Developer.crashSharedProcess': Developer.crashSharedProcess,
-  'Developer.createHeapSnapshot': Developer.createHeapSnapshot,
-  'Developer.createProfile': Developer.createProfile,
-  'Developer.getNodeStartupTime': Developer.getNodeStartupTiming,
-  'Developer.getNodeStartupTiming': Developer.getNodeStartupTiming,
-  'Developer.sharedProcessMemoryUsage': Developer.sharedProcessMemoryUsage,
-  'Developer.sharedProcessStartupPerformance': Developer.sharedProcessStartupPerformance,
+  allocateMemory: Developer.allocateMemory,
+  crashSharedProcess: Developer.crashSharedProcess,
+  createHeapSnapshot: Developer.createHeapSnapshot,
+  createProfile: Developer.createProfile,
+  getNodeStartupTime: Developer.getNodeStartupTiming,
+  getNodeStartupTiming: Developer.getNodeStartupTiming,
+  sharedProcessMemoryUsage: Developer.sharedProcessMemoryUsage,
+  sharedProcessStartupPerformance: Developer.sharedProcessStartupPerformance,
 }

package/src/parts/Download/Download.ipc.js

@@ -0,0 +1,8 @@
+import * as Download from './Download.js'
+
+export const name = 'Download'
+
+// prettier-ignore
+export const Commands = {
+  download: Download.download,
+}

package/src/parts/EncodingType/EncodingType.js

@@ -0,0 +1 @@
+export const Utf8 = 'utf8'

package/src/parts/ExportStatic/ExportStatic.js

@@ -358,9 +358,15 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
     `/${commitHash}`,
     `${pathPrefix}/${commitHash}`
   )
-
   await replace(
-    Path.join(root, 'dist', commitHash, 'css', 'App.css'),
+    Path.join(
+      root,
+      'dist',
+      commitHash,
+      'css',
+      'parts',
+      'ViewletTitleBarButtons.css'
+    ),
     `/${commitHash}`,
     `${pathPrefix}/${commitHash}`
   )

package/src/parts/ExtensionInstallFromUrl/ExtensionInstallFromUrl.js

@@ -5,6 +5,7 @@ import * as Download from '../Download/Download.js'
 import * as Extract from '../Extract/Extract.js'
 import * as Platform from '../Platform/Platform.js'
 import * as TmpFile from '../TmpFile/TmpFile.js'
+import * as EncodingType from '../EncodingType/EncodingType.js'
 
 export const install = async ({ url }) => {
   try {
@@ -17,7 +18,7 @@ export const install = async ({ url }) => {
     const tmpDir = await TmpFile.getTmpDir()
     await Extract.extractTarBr(tmpFile, tmpDir)
     const manifestPath = join(tmpDir, 'extension.json')
-    const manifestContent = await readFile(manifestPath, 'utf8')
+    const manifestContent = await readFile(manifestPath, EncodingType.Utf8)
     const manifestJson = JSON.parse(manifestContent)
     const id = manifestJson.id
     if (!id) {

package/src/parts/FileSystem/FileSystem.ipc.js

@@ -13,20 +13,22 @@ const fileSystemWatch = (socket, id, path) => {
   // })
 }
 
+export const name = 'FileSystem'
+
 // TODO separate ipc from code like in renderer worker
 export const Commands = {
-  'FileSystem.chmod': FileSystem.chmod,
-  'FileSystem.copy': FileSystem.copy,
-  'FileSystem.createFile': FileSystem.createFile,
-  'FileSystem.createFolder': FileSystem.createFolder,
-  'FileSystem.ensureFile': FileSystem.ensureFile,
-  'FileSystem.getPathSeparator': FileSystem.getPathSeparator,
-  'FileSystem.getRealPath': FileSystem.getRealPath,
-  'FileSystem.mkdir': FileSystem.mkdir,
-  'FileSystem.readDirWithFileTypes': FileSystem.readDirWithFileTypes,
-  'FileSystem.readFile': FileSystem.readFile,
-  'FileSystem.remove': FileSystem.remove,
-  'FileSystem.rename': FileSystem.rename,
-  'FileSystem.stat': FileSystem.stat,
-  'FileSystem.writeFile': FileSystem.writeFile,
+  chmod: FileSystem.chmod,
+  copy: FileSystem.copy,
+  createFile: FileSystem.createFile,
+  createFolder: FileSystem.createFolder,
+  ensureFile: FileSystem.ensureFile,
+  getPathSeparator: FileSystem.getPathSeparator,
+  getRealPath: FileSystem.getRealPath,
+  mkdir: FileSystem.mkdir,
+  readDirWithFileTypes: FileSystem.readDirWithFileTypes,
+  readFile: FileSystem.readFile,
+  remove: FileSystem.remove,
+  rename: FileSystem.rename,
+  stat: FileSystem.stat,
+  writeFile: FileSystem.writeFile,
 }

package/src/parts/FileSystem/FileSystem.js

@@ -3,11 +3,12 @@ import * as fs from 'node:fs/promises'
 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 Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as Trash from '../Trash/Trash.js'
-import * as FileSystemErrorCodes from '../FileSystemErrorCodes/FileSystemErrorCodes.js'
-import { FileNotFoundError } from '../Error/FileNotFoundError.js'
+import * as EncodingType from '../EncodingType/EncodingType.js'
 
 export const state = {
   watcherMap: Object.create(null),
@@ -33,12 +34,19 @@ export const copy = async (source, target) => {
 }
 
 // TODO extensions should only be accessed once on startup
-export const readFile = async (path) => {
+
+/**
+ *
+ * @param {string} path
+ * @param {BufferEncoding} encoding
+ * @returns
+ */
+export const readFile = async (path, encoding = EncodingType.Utf8) => {
   // console.info('[shared-process] read file', path)
   try {
     // const start = performance.now()
     // console.time(`read ${path}`)
-    const content = await fs.readFile(path, 'utf8')
+    const content = await fs.readFile(path, encoding)
     // const end = performance.now()
     // console.log('read', path, 'took', (end - start).toFixed(2), 'ms')
     // console.timeEnd(`read ${path}`)
@@ -57,7 +65,11 @@ export const readFile = async (path) => {
  * @param {string} content
  * @param {BufferEncoding} encoding
  */
-export const writeFile = async (path, content, encoding = 'utf8') => {
+export const writeFile = async (
+  path,
+  content,
+  encoding = EncodingType.Utf8
+) => {
   try {
     // queue would be more correct for concurrent writes but also slower
     // Queue.add(`writeFile/${path}`, () =>

package/src/parts/Module/Module.js

@@ -8,6 +8,8 @@ export const load = (moduleId) => {
       return import('../ClipBoard/ClipBoard.ipc.js')
     case ModuleId.Developer:
       return import('../Developer/Developer.ipc.js')
+    case ModuleId.Download:
+      return import('../Download/Download.ipc.js')
     case ModuleId.ExtensionHost:
       return import('../ExtensionHost/ExtensionHost.ipc.js')
     case ModuleId.ExtensionManagement:

package/src/parts/ModuleId/ModuleId.js

@@ -15,3 +15,4 @@ export const TextDocument = 14
 export const WebSocketServer = 15
 export const Workspace = 16
 export const ChromeExtension = 17
+export const Download = 18

package/src/parts/ModuleMap/ModuleMap.js

@@ -17,7 +17,8 @@ export const getModuleId = (commandId) => {
     case 'Developer.sharedProcessMemoryUsage':
     case 'Developer.sharedProcessStartupPerformance':
       return ModuleId.Developer
-    case 'EXtensionHostRename.executePrepareRename':
+    case 'Download.download':
+      return ModuleId.Download
     case 'ExtensionHost.dispose':
     case 'ExtensionHost.enableExtension':
     case 'ExtensionHost.executeCommand':
@@ -52,14 +53,15 @@ export const getModuleId = (commandId) => {
     case 'ExtensionHostOutput.getOutputChannels':
     case 'ExtensionHostQuickPick.handleQuickPickResult':
     case 'ExtensionHostReferences.executeReferenceProvider':
+    case 'EXtensionHostRename.executePrepareRename':
     case 'ExtensionHostRename.executeRename':
     case 'ExtensionHostSemanticTokens.executeSemanticTokenProvider':
     case 'ExtensionHostSourceControl.acceptInput':
-    case 'ExtensionHostTextDocument':
     case 'ExtensionHostTextDocument.setLanguageId':
     case 'ExtensionHostTextDocument.syncFull':
     case 'ExtensionHostTextDocument.syncIncremental':
     case 'ExtensionHostTextDocument.syncInitial':
+    case 'ExtensionHostTextDocument':
     case 'ExtensionHostWorkspace.setWorkspacePath':
       return ModuleId.ExtensionHost
     case 'ExtensionHost.getColorThemeJson':
@@ -97,11 +99,12 @@ export const getModuleId = (commandId) => {
       return ModuleId.OutputChannel
     case 'Platform.getAppDir':
     case 'Platform.getBuiltinExtensionsPath':
-    case 'Platform.getCacheDir':
     case 'Platform.getCachedExtensionsPath':
+    case 'Platform.getCacheDir':
     case 'Platform.getConfigDir':
     case 'Platform.getDataDir':
     case 'Platform.getDisabledExtensionsPath':
+    case 'Platform.getDownloadDir':
     case 'Platform.getExtensionsPath':
     case 'Platform.getHomeDir':
     case 'Platform.getLogsDir':

package/src/parts/Native/Native.ipc.js

@@ -1,5 +1,7 @@
 import * as Native from './Native.js'
 
+export const name = 'Native'
+
 export const Commands = {
-  'Native.openFolder': Native.openFolder,
+  openFolder: Native.openFolder,
 }

package/src/parts/OutputChannel/OutputChannel.ipc.js

@@ -42,7 +42,9 @@ const close = (socket, id) => {
   delete state.outputChannels[id]
 }
 
+export const name = 'OutputChannel'
+
 export const Commands = {
-  'OutputChannel.close': close,
-  'OutputChannel.open': open,
+  close: close,
+  open: open,
 }

package/src/parts/Platform/Platform.ipc.js

@@ -1,22 +1,25 @@
 import * as Platform from '../Platform/Platform.js'
 
+export const name = 'Platform'
+
 // prettier-ignore
 export const Commands = {
-  'Platform.getAppDir': Platform.getAppDir,
-  'Platform.getBuiltinExtensionsPath': Platform.getBuiltinExtensionsPath,
-  'Platform.getCacheDir': Platform.getCacheDir,
-  'Platform.getCachedExtensionsPath': Platform.getCachedExtensionsPath,
-  'Platform.getConfigDir': Platform.getConfigDir,
-  'Platform.getDataDir': Platform.getDataDir,
-  'Platform.getDisabledExtensionsPath': Platform.getDisabledExtensionsPath,
-  'Platform.getExtensionsPath': Platform.getExtensionsPath,
-  'Platform.getHomeDir': Platform.getHomeDir,
-  'Platform.getLogsDir': Platform.getLogsDir,
-  'Platform.getMarketplaceUrl': Platform.getMarketplaceUrl,
-  'Platform.getNodePath': Platform.getNodePath,
-  'Platform.getRecentlyOpenedPath': Platform.getRecentlyOpenedPath,
-  'Platform.getTestPath': Platform.getTestPath,
-  'Platform.getTmpDir': Platform.getTmpDir,
-  'Platform.getUserSettingsPath': Platform.getUserSettingsPath,
-  'Platform.setEnvironmentVariables': Platform.setEnvironmentVariables,
+  getAppDir: Platform.getAppDir,
+  getBuiltinExtensionsPath: Platform.getBuiltinExtensionsPath,
+  getCachedExtensionsPath: Platform.getCachedExtensionsPath,
+  getCacheDir: Platform.getCacheDir,
+  getConfigDir: Platform.getConfigDir,
+  getDataDir: Platform.getDataDir,
+  getDisabledExtensionsPath: Platform.getDisabledExtensionsPath,
+  getDownloadDir: Platform.getDownloadDir,
+  getExtensionsPath: Platform.getExtensionsPath,
+  getHomeDir: Platform.getHomeDir,
+  getLogsDir: Platform.getLogsDir,
+  getMarketplaceUrl: Platform.getMarketplaceUrl,
+  getNodePath: Platform.getNodePath,
+  getRecentlyOpenedPath: Platform.getRecentlyOpenedPath,
+  getTestPath: Platform.getTestPath,
+  getTmpDir: Platform.getTmpDir,
+  getUserSettingsPath: Platform.getUserSettingsPath,
+  setEnvironmentVariables: Platform.setEnvironmentVariables,
 }

package/src/parts/Platform/Platform.js

@@ -1,16 +1,18 @@
 import { extensionHostPath } from '@lvce-editor/extension-host'
 import { homedir, tmpdir } from 'node:os'
-import { resolve, sep } from 'node:path'
+import { join, resolve, sep } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { xdgCache, xdgConfig, xdgData, xdgState } from 'xdg-basedir'
 import * as Path from '../Path/Path.js'
 import * as Root from '../Root/Root.js'
 
+const { env, platform } = process
+
 export const applicationName = 'lvce-oss'
 
-export const isWindows = process.platform === 'win32'
+export const isWindows = platform === 'win32'
 
-export const isMacOs = process.platform === 'darwin'
+export const isMacOs = platform === 'darwin'
 
 export const dataDir = Path.join(xdgData || tmpdir(), applicationName)
 
@@ -52,28 +54,28 @@ export const getChromeExtensionsPath = () => {
 
 export const getMarketplaceUrl = () => {
   return (
-    process.env.LVCE_MARKETPLACE_URL ||
-    'https://marketplace.22e924c84de072d4b25b.com'
+    env.LVCE_MARKETPLACE_URL || 'https://marketplace.22e924c84de072d4b25b.com'
   )
 }
 
 export const getDesktop = () => {
+  const { ORIGINAL_XDG_CURRENT_DESKTOP, XDG_CURRENT_DESKTOP } = env
   if (
-    process.env.ORIGINAL_XDG_CURRENT_DESKTOP &&
-    process.env.ORIGINAL_XDG_CURRENT_DESKTOP !== 'undefined'
+    ORIGINAL_XDG_CURRENT_DESKTOP &&
+    ORIGINAL_XDG_CURRENT_DESKTOP !== 'undefined'
   ) {
-    if (process.env.ORIGINAL_XDG_CURRENT_DESKTOP === 'ubuntu:GNOME') {
+    if (ORIGINAL_XDG_CURRENT_DESKTOP === 'ubuntu:GNOME') {
       return 'gnome'
     }
-    return process.env.ORIGINAL_XDG_CURRENT_DESKTOP
+    return ORIGINAL_XDG_CURRENT_DESKTOP
   }
-  if (process.env.XDG_CURRENT_DESKTOP) {
-    if (process.env.XDG_CURRENT_DESKTOP === 'ubuntu:GNOME') {
+  if (XDG_CURRENT_DESKTOP) {
+    if (XDG_CURRENT_DESKTOP === 'ubuntu:GNOME') {
       return 'gnome'
     }
-    return process.env.XDG_CURRENT_DESKTOP
+    return XDG_CURRENT_DESKTOP
   }
-  if (process.platform === 'win32') {
+  if (isWindows) {
     return 'windows'
   }
   return ''
@@ -108,17 +110,15 @@ export const getDefaultSettingsPath = () => {
 }
 export const setEnvironmentVariables = (variables) => {
   for (const [key, value] of Object.entries(variables)) {
-    process.env[key] = value
+    env[key] = value
   }
 }
 
 export const getTestPath = () => {
-  if (process.env.TEST_PATH) {
+  if (env.TEST_PATH) {
     const testPath =
       '/remote' +
-      pathToFileURL(Path.join(process.cwd(), process.env.TEST_PATH))
-        .toString()
-        .slice(7)
+      pathToFileURL(Path.join(process.cwd(), env.TEST_PATH)).toString().slice(7)
     return testPath
   }
   return '/packages/extension-host-worker-tests'
@@ -133,7 +133,7 @@ export const getTmpDir = () => {
 }
 
 export const getOnlyExtensionPath = () => {
-  const onlyExtensionPath = process.env.ONLY_EXTENSION
+  const onlyExtensionPath = env.ONLY_EXTENSION
   if (onlyExtensionPath) {
     return resolve(onlyExtensionPath)
   }
@@ -159,3 +159,8 @@ export const getDataDir = () => {
 export const getHomeDir = () => {
   return homeDir
 }
+
+export const getDownloadDir = () => {
+  const { XDG_DOWNLOAD_DIR } = env
+  return XDG_DOWNLOAD_DIR || join(homeDir, 'Downloads')
+}

package/src/parts/Preferences/Preferences.ipc.js

@@ -1,5 +1,7 @@
 import * as Preferences from '../Preferences/Preferences.js'
 
+export const name = 'Preferences'
+
 export const Commands = {
-  'Preferences.getAll': Preferences.getAll,
+  getAll: Preferences.getAll,
 }

package/src/parts/PtyHostPath/PtyHostPath.js

@@ -0,0 +1,11 @@
+import * as Root from '../Root/Root.js'
+import * as Path from '../Path/Path.js'
+
+export const getPtyHostPath = async () => {
+  try {
+    const { ptyHostPath } = await import('@lvce-editor/pty-host')
+    return ptyHostPath
+  } catch {
+    return Path.join(Root.root, 'packages', 'pty-host', 'src', 'ptyHostMain.js')
+  }
+}

package/src/parts/RecentlyOpened/RecentlyOpened.ipc.js

@@ -1,5 +1,7 @@
 import * as RecentlyOpened from './RecentlyOpened.js'
 
+export const name = 'RecentlyOpened'
+
 export const Commands = {
-  'RecentlyOpened.addPath': RecentlyOpened.addPath,
+  addPath: RecentlyOpened.addPath,
 }

package/src/parts/Search/Search.ipc.js

@@ -1,5 +1,7 @@
 import * as Search from './Search.js'
 
+export const name = 'Search'
+
 export const Commands = {
-  'Search.search': Search.search,
+  search: Search.search,
 }

package/src/parts/Search/Search.js

@@ -4,10 +4,13 @@ import * as Platform from '../Platform/Platform.js'
 
 const MAX_SEARCH_RESULTS = 300
 
-const toSearchResult = (parsedLine) => ({
-  preview: parsedLine.data.lines.text,
-  absoluteOffset: parsedLine.data.absolute_offset,
-})
+const toSearchResult = (parsedLine) => {
+  return {
+    preview: parsedLine.data.lines.text,
+    absoluteOffset: parsedLine.data.absolute_offset,
+    lineNumber: parsedLine.data.line_number - 1,
+  }
+}
 
 // TODO update vscode-ripgrep when https://github.com/mhinz/vim-grepper/issues/244, https://github.com/BurntSushi/ripgrep/issues/1892 is fixed
 
@@ -59,7 +62,8 @@ export const search = async (searchDir, searchString) => {
     let stats = {}
     let numberOfResults = 0
     // TODO use pipeline / transform stream maybe
-    childProcess.stdout.on('data', (chunk) => {
+
+    const handleData = (chunk) => {
       buffer += chunk
       const lines = buffer.split('\n')
       // @ts-ignore
@@ -88,20 +92,24 @@ export const search = async (searchDir, searchString) => {
       if (numberOfResults > MAX_SEARCH_RESULTS) {
         childProcess.kill()
       }
-    })
-    childProcess.once('close', () => {
+    }
+
+    const handleClose = () => {
       resolve({
         results: Object.entries(allSearchResults),
         stats,
       })
-    })
-    childProcess.once('error', (error) => {
+    }
+    const handleError = (error) => {
       // TODO check type of error
       console.error(error)
       resolve({
         results: [],
         stats,
       })
-    })
+    }
+    childProcess.stdout.on('data', handleData)
+    childProcess.once('close', handleClose)
+    childProcess.once('error', handleError)
   })
 }

package/src/parts/SearchFile/SearchFile.ipc.js

@@ -1,5 +1,7 @@
 import * as SearchFile from './SearchFile.js'
 
+export const name = 'SearchFile'
+
 export const Commands = {
-  'SearchFile.searchFile': SearchFile.searchFile,
+  searchFile: SearchFile.searchFile,
 }

package/src/parts/Terminal/Terminal.ipc.js

@@ -37,9 +37,11 @@ const dispose = (socket, id) => {
   Terminal.dispose(id)
 }
 
+export const name = 'Terminal'
+
 export const Commands = {
-  'Terminal.create': create,
-  'Terminal.dispose': dispose,
-  'Terminal.resize': resize,
-  'Terminal.write': write,
+  create: create,
+  dispose: dispose,
+  resize: resize,
+  write: write,
 }

package/src/parts/Terminal/Terminal.js

@@ -1,10 +1,8 @@
-import { ChildProcess, fork } from 'node:child_process'
 import exitHook from 'exit-hook'
-import { ptyHostPath } from '@lvce-editor/pty-host'
-import * as Debug from '../Debug/Debug.js'
-import * as Path from '../Path/Path.js'
-import * as Root from '../Root/Root.js'
+import { ChildProcess, fork } from 'node:child_process'
 import * as Assert from '../Assert/Assert.js'
+import * as Debug from '../Debug/Debug.js'
+import * as PtyHostPath from '../PtyHostPath/PtyHostPath.js'
 
 export const state = {
   /**
@@ -45,8 +43,9 @@ const handleProcessExit = () => {
   cleanUpAll()
 }
 
-const createPtyHost = () => {
+const createPtyHost = async () => {
   exitHook(handleProcessExit)
+  const ptyHostPath = await PtyHostPath.getPtyHostPath()
   const ptyHost = fork(ptyHostPath, { stdio: 'inherit' })
   return ptyHost
 }
@@ -60,17 +59,16 @@ const createPtyHost = () => {
 //   })
 // }
 
-export const create = (socket, id, cwd) => {
+export const create = async (socket, id, cwd) => {
   Assert.object(socket)
   Assert.number(id)
   Assert.string(cwd)
 
-  console.log('create terminal')
   Debug.debug('creating pty host')
   switch (state.ptyHostState) {
     case /* None */ 0: {
       state.ptyHostState = /* Creating */ 1
-      const ptyHost = createPtyHost()
+      const ptyHost = await createPtyHost()
       const handleFirstMessage = () => {
         Debug.debug('pty host ready')
         state.ptyHostState = /* Ready */ 2