@lvce-editor/shared-process 0.18.1 → 0.18.3

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

@@ -89,7 +89,7 @@ export const TokenMap = {
 
 const RE_SELECTOR_ELEMENT = /^[a-zA-Z\d\->+~_%\\\p{L}]+/u
 const RE_SELECTOR_ID = /^#[\w\-\_\\]+/
-const RE_PSEUDO_SELECTOR = /^:[\p{L}\-]+/u
+const RE_PSEUDO_SELECTOR = /^::?[\p{L}\-]+/u
 const RE_SELECTOR_CLASS = /^\.[\w\-_\p{L}\p{Emoji_Presentation}]+/u
 const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
@@ -102,6 +102,7 @@ const RE_PROPERTY_VALUE_INSIDE_FUNCTION = /^[^\}\s\)]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
 const RE_ANYTHING = /^.+/s
+const RE_AMPERSAND = /^\&/
 const RE_NUMERIC = /^\-?(([0-9]+\.?[0-9]*)|(\.[0-9]+))/
 const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_BLOCK_COMMENT_START = /^\/\*/
@@ -370,12 +371,16 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SEMICOLON))) {
           token = TokenType.Punctuation
           state = State.InsideSelector
+        } else if ((next = part.match(RE_AMPERSAND))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+          stack.push(State.InsideSelector)
         } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
           token = TokenType.Unknown
           state = State.InsideSelector
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.CurlyClose
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else {
           throw new Error('no')
         }
@@ -415,9 +420,6 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_FUNCTION))) {
           token = TokenType.FuntionName
           state = State.AfterFunctionName
-        } else if ((next = part.match(RE_FUNCTION))) {
-          token = TokenType.FuntionName
-          state = State.AfterFunctionName
         } else if ((next = part.match(RE_SINGLE_QUOTE))) {
           token = TokenType.Punctuation
           state = State.InsideSingleQuoteString
@@ -437,7 +439,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterPropertyNameAfterColon
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
           stack.push(state)
           token = TokenType.Comment
@@ -527,7 +529,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterFunctionName
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
           stack.push(state)
           token = TokenType.Comment

package/extensions/builtin.language-basics-kotlin/src/tokenizeKotlin.js

@@ -4,6 +4,7 @@
 export const State = {
   TopLevelContent: 1,
   InsideString: 2,
+  InsideBlockComment: 10,
 }
 
 export const StateMap = {
@@ -22,6 +23,22 @@ export const TokenType = {
   Numeric: 6,
   Punctuation: 7,
   VariableName: 8,
+  Comment: 60,
+  Error: 141,
+  NewLine: 771,
+  LanguageConstant: 13,
+  Regex: 14,
+  KeywordImport: 215,
+  KeywordControl: 881,
+  KeywordModifier: 882,
+  KeywordReturn: 883,
+  KeywordNew: 884,
+  FunctionName: 885,
+  KeywordThis: 886,
+  KeywordOperator: 887,
+  KeywordFunction: 889,
+  Class: 890,
+  KeywordVoid: 891,
 }
 
 export const TokenMap = {
@@ -33,6 +50,25 @@ export const TokenMap = {
   [TokenType.Numeric]: 'Numeric',
   [TokenType.Punctuation]: 'Punctuation',
   [TokenType.VariableName]: 'VariableName',
+  [TokenType.Comment]: 'Comment',
+  [TokenType.Error]: 'Error',
+  [TokenType.PunctuationString]: 'PunctuationString',
+  [TokenType.NewLine]: 'NewLine',
+  [TokenType.Keyword]: 'Keyword',
+  [TokenType.VariableName]: 'VariableName',
+  [TokenType.LanguageConstant]: 'LanguageConstant',
+  [TokenType.Regex]: 'Regex',
+  [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.KeywordControl]: 'KeywordControl',
+  [TokenType.KeywordModifier]: 'KeywordModifier',
+  [TokenType.KeywordReturn]: 'KeywordReturn',
+  [TokenType.KeywordNew]: 'KeywordNew',
+  [TokenType.FunctionName]: 'Function',
+  [TokenType.KeywordThis]: 'KeywordThis',
+  [TokenType.KeywordOperator]: 'KeywordOperator',
+  [TokenType.KeywordFunction]: 'KeywordFunction',
+  [TokenType.KeywordVoid]: 'KeywordVoid',
+  [TokenType.Class]: 'Class',
 }
 
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>]+/
@@ -52,11 +88,20 @@ const RE_KEYWORD =
   /^(?:while|when|var|val|typeof|typealias|try|true|throw|this|super|return|package|object|null|is|interface|in|if|fun|for|false|else|do|continue|class|break|as|enum|String)\b/
 
 const RE_VARIABLE_NAME = /^[a-zA-Z\_\$]+/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\-]/
 const RE_NUMERIC = /^\d+/
+const RE_LINE_COMMENT = /^\/\/[^\n]*/
+const RE_BLOCK_COMMENT_START = /^\/\*/
+const RE_BLOCK_COMMENT_CONTENT = /^.+?(?=\*\/)/
+const RE_BLOCK_COMMENT_END = /^\*\//
+const RE_ANYTHING_UNTIL_END = /^.+/s
+const RE_PUNCTUATION = /^[\(\)=\+\-><\.:;\{\}\[\]!,&\|\^\?\*%~]/
+const RE_SLASH = /^\//
 
 export const initialLineState = {
   state: State.TopLevelContent,
+  /**
+   * @type {any[]}
+   */
   tokens: [],
 }
 
@@ -90,8 +135,71 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
-          token = TokenType.Keyword
-          state = State.TopLevelContent
+          switch (next[0]) {
+            case 'true':
+            case 'false':
+            case 'null':
+              token = TokenType.LanguageConstant
+              state = State.TopLevelContent
+              break
+            case 'switch':
+            case 'default':
+            case 'case':
+            case 'else':
+            case 'if':
+            case 'break':
+            case 'throw':
+            case 'for':
+            case 'try':
+            case 'catch':
+            case 'finally':
+            case 'continue':
+            case 'when':
+            case 'while':
+            case 'do':
+            case 'in':
+              token = TokenType.KeywordControl
+              state = State.TopLevelContent
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              state = State.TopLevelContent
+              break
+            case 'new':
+              token = TokenType.KeywordNew
+              state = State.TopLevelContent
+              break
+            case 'this':
+              token = TokenType.KeywordThis
+              state = State.TopLevelContent
+              break
+            case 'fun':
+              token = TokenType.KeywordFunction
+              state = State.TopLevelContent
+              break
+            case 'Infinity':
+              token = TokenType.Numeric
+              state = State.TopLevelContent
+              break
+            case 'of':
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+            case 'class':
+            case 'extends':
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+            case 'var':
+            case 'val':
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+            default:
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+          }
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
@@ -104,6 +212,24 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.PunctuationString
           state = State.InsideString
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_SLASH))) {
+          if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+            token = TokenType.Comment
+            state = State.InsideBlockComment
+          } else if ((next = part.match(RE_LINE_COMMENT))) {
+            token = TokenType.Comment
+            state = State.TopLevelContent
+          } else {
+            next = part.match(RE_SLASH)
+            token = TokenType.Punctuation
+            state = State.TopLevelContent
+          }
         } else {
           part //?
           throw new Error('no')
@@ -120,6 +246,20 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.InsideBlockComment:
+        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
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         throw new Error('no')
     }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "main": "index.js",
   "type": "module",
   "dependencies": {
     "@babel/code-frame": "^7.22.13",
-    "@lvce-editor/extension-host": "0.18.1",
-    "@lvce-editor/extension-host-helper-process": "0.18.1",
+    "@lvce-editor/extension-host": "0.18.3",
+    "@lvce-editor/extension-host-helper-process": "0.18.3",
     "@lvce-editor/jsonc-parser": "^1.1.0",
     "@lvce-editor/pretty-error": "^1.2.0",
-    "@lvce-editor/pty-host": "0.18.1",
+    "@lvce-editor/pty-host": "0.18.3",
     "@lvce-editor/verror": "^1.1.1",
     "debug": "^4.3.4",
     "execa": "^8.0.1",

package/src/parts/ChromeExtension/ChromeExtension.js

@@ -4,6 +4,7 @@ import * as ExtractZip from '../ExtractZip/ExtractZip.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 const getExtensionPath = async (tmpDir) => {
@@ -18,10 +19,10 @@ export const install = async (name, url) => {
   try {
     Assert.string(name)
     Assert.string(url)
-    const cachedChromeExtensionsPath = Platform.getCachedExtensionsPath()
+    const cachedChromeExtensionsPath = PlatformPaths.getCachedExtensionsPath()
     const tempFileCompressed = Path.join(cachedChromeExtensionsPath, `${name}.zip`)
     const tmpDir = Path.join(cachedChromeExtensionsPath, name)
-    const chromeExtensionsPath = Platform.getChromeExtensionsPath()
+    const chromeExtensionsPath = PlatformPaths.getChromeExtensionsPath()
     await Download.download(url, tempFileCompressed)
     await ExtractZip.extractZip({ inFile: tempFileCompressed, outDir: tmpDir })
     const cachedExtensionPath = await getExtensionPath(tmpDir)

package/src/parts/ExportStatic/ExportStatic.js

@@ -97,42 +97,37 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'),
     'platform = getPlatform();',
-    'platform = "web"'
+    'platform = "web"',
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'),
-    `return "/${commitHash}";`,
-    `return "${pathPrefix}/${commitHash}";`
-  )
-  await replace(
-    Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
-    'platform = getPlatform();',
-    'platform = "web"'
+    `/${commitHash}`,
+    `${pathPrefix}/${commitHash}`,
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
-    `platform2 = "remote";`,
-    'platform2 = "web";'
+    'platform = Remote;',
+    'platform = Web;',
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
     `return "/${commitHash}";`,
-    `return "${pathPrefix}/${commitHash}";`
+    `return "${pathPrefix}/${commitHash}";`,
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
     `return \`\${assetDir}/extensions/builtin.theme-\${colorThemeId}/color-theme.json\``,
-    `return \`\${assetDir}/themes/\${colorThemeId}.json\``
+    `return \`\${assetDir}/themes/\${colorThemeId}.json\``,
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.js'),
     `/${commitHash}`,
-    `${pathPrefix}/${commitHash}`
+    `${pathPrefix}/${commitHash}`,
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
     `return \`\${assetDir}/extensions/builtin.\${iconThemeId}/icon-theme.json\``,
-    `return \`\${assetDir}/icon-themes/\${iconThemeId}.json\``
+    `return \`\${assetDir}/icon-themes/\${iconThemeId}.json\``,
   )
 
   const extensionDirents = await FileSystem.readDir(Path.join(root, 'node_modules', '@lvce-editor', 'shared-process', 'extensions'))
@@ -167,7 +162,7 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
   for (const languageBasicsDirent of languageBasicsDirents) {
     await FileSystem.copy(
       Path.join(root, 'node_modules', '@lvce-editor', 'shared-process', 'extensions', languageBasicsDirent),
-      Path.join(root, 'dist', commitHash, 'extensions', languageBasicsDirent)
+      Path.join(root, 'dist', commitHash, 'extensions', languageBasicsDirent),
     )
   }
 
@@ -175,7 +170,7 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
     const themeId = getThemeName(themeDirent)
     await FileSystem.copy(
       Path.join(root, 'node_modules', '@lvce-editor', 'shared-process', 'extensions', themeDirent, 'color-theme.json'),
-      Path.join(root, 'dist', commitHash, 'themes', `${themeId}.json`)
+      Path.join(root, 'dist', commitHash, 'themes', `${themeId}.json`),
     )
   }
 
@@ -186,7 +181,7 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
     const iconThemeId = iconThemeDirent.slice('builtin.'.length)
     await FileSystem.copy(
       Path.join(root, 'node_modules', '@lvce-editor', 'shared-process', 'extensions', iconThemeDirent, 'icon-theme.json'),
-      Path.join(root, 'dist', commitHash, 'icon-themes', `${iconThemeId}.json`)
+      Path.join(root, 'dist', commitHash, 'icon-themes', `${iconThemeId}.json`),
     )
   }
   await replace(Path.join(root, 'dist', 'index.html'), `/${commitHash}`, `${pathPrefix}/${commitHash}`)
@@ -197,14 +192,14 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
       Path.join(root, 'dist', 'index.html'),
       '</title>',
       `</title>
-    <link rel="shortcut icon" type="image/x-icon" href="${pathPrefix}/favicon.ico">`
+    <link rel="shortcut icon" type="image/x-icon" href="${pathPrefix}/favicon.ico">`,
     )
   } else {
     await replace(
       Path.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">`,
     )
   }
   if (pathPrefix) {
@@ -223,7 +218,7 @@ const addExtensionSeo = async ({ root, name, description }) => {
   await replace(
     Path.join(root, 'dist', 'index.html'),
     '<meta name="description" content="Online Code Editor" />',
-    `<meta name="description" content="${description}" />`
+    `<meta name="description" content="${description}" />`,
   )
 }
 
@@ -243,16 +238,16 @@ const addExtensionThemes = async ({ root, extensionPath, extensionJson, commitHa
     await replace(
       Path.join(root, 'dist', commitHash, 'config', 'defaultSettings.json'),
       `"workbench.colorTheme": "slime"`,
-      `"workbench.colorTheme": "${id}"`
+      `"workbench.colorTheme": "${id}"`,
     )
     await FileSystem.copyFile(Path.join(root, 'README.md'), Path.join(root, 'dist', commitHash, 'extensions', `builtin.theme-${id}`, 'README.md'))
     await FileSystem.copyFile(
       Path.join(extensionPath, 'extension.json'),
-      Path.join(root, 'dist', commitHash, 'extensions', `builtin.theme-${id}`, 'extension.json')
+      Path.join(root, 'dist', commitHash, 'extensions', `builtin.theme-${id}`, 'extension.json'),
     )
     await FileSystem.copyFile(
       Path.join(extensionPath, 'color-theme.json'),
-      Path.join(root, 'dist', commitHash, 'extensions', `builtin.theme-${id}`, 'color-theme.json')
+      Path.join(root, 'dist', commitHash, 'extensions', `builtin.theme-${id}`, 'color-theme.json'),
     )
   }
   const themesJson = await JsonFile.readJson(Path.join(root, 'dist', commitHash, 'config', 'themes.json'))

package/src/parts/ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js

@@ -1,8 +1,8 @@
 import * as IpcParent from '../IpcParent/IpcParent.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 
 export const create = async ({ method }) => {
-  const extensionHostHelperProcessPath = await Platform.getExtensionHostHelperProcessPath()
+  const extensionHostHelperProcessPath = await PlatformPaths.getExtensionHostHelperProcessPath()
   const ipc = await IpcParent.create({
     method,
     path: extensionHostHelperProcessPath,

package/src/parts/ExtensionHostIpcWithChildProcess/ExtensionHostIpcWithChildProcess.js

@@ -1,18 +1,18 @@
 import * as ChildProcess from '../ChildProcess/ChildProcess.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 
 export const create = async () => {
-  const extensionHostPath = await Platform.getExtensionHostPath()
+  const extensionHostPath = await PlatformPaths.getExtensionHostPath()
   const childProcess = ChildProcess.fork(
     extensionHostPath,
     ['--ipc-type=websocket', '--experimental-json-modules', '--max-old-space-size=60', '--enable-source-maps'],
     {
       env: {
         ...process.env,
-        LOGS_DIR: Platform.getLogsDir(),
-        CONFIG_DIR: Platform.getConfigDir(),
+        LOGS_DIR: PlatformPaths.getLogsDir(),
+        CONFIG_DIR: PlatformPaths.getConfigDir(),
       },
-    }
+    },
   )
   return {
     on(event, listener) {

package/src/parts/ExtensionInstallFromFile/ExtensionInstallFromFile.js

@@ -2,7 +2,7 @@ import * as Extract from '../Extract/Extract.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 const getCachedExtensionFolderName = (path) => {
@@ -15,11 +15,11 @@ const getCachedExtensionFolderName = (path) => {
 
 export const install = async ({ path }) => {
   try {
-    const cachedExtensionsPath = Platform.getCachedExtensionsPath()
+    const cachedExtensionsPath = PlatformPaths.getCachedExtensionsPath()
     const cachedExtensionFolderName = getCachedExtensionFolderName(path)
     const cachedExtensionPath = Path.join(cachedExtensionsPath, cachedExtensionFolderName)
     await Extract.extractTarBr(path, cachedExtensionPath)
-    const extensionsPath = Platform.getExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
     const manifestPath = Path.join(cachedExtensionPath, 'extension.json')
     const manifestJson = await JsonFile.readJson(manifestPath)
     const { id } = manifestJson

package/src/parts/ExtensionInstallFromGitHub/ExtensionInstallFromGitHub.js

@@ -2,12 +2,12 @@ import * as DownloadAndExtract from '../DownloadAndExtract/DownloadAndExtract.js
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 export const install = async ({ user, repo, branch }) => {
   try {
-    const cachedExtensionsPath = Platform.getCachedExtensionsPath()
+    const cachedExtensionsPath = PlatformPaths.getCachedExtensionsPath()
     const url = `https://codeload.github.com/${user}/${repo}/tar.gz/${branch}`
     const cachedExtensionPath = Path.join(cachedExtensionsPath, `github-${user}-${repo}-${branch}`)
     await DownloadAndExtract.downloadAndExtractTarGz({
@@ -15,7 +15,7 @@ export const install = async ({ user, repo, branch }) => {
       outDir: cachedExtensionPath,
       strip: 1,
     })
-    const extensionsPath = Platform.getExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
     const manifestPath = Path.join(cachedExtensionPath, 'extension.json')
     const manifestJson = await JsonFile.readJson(manifestPath)
     const { id } = manifestJson

package/src/parts/ExtensionInstallFromUrl/ExtensionInstallFromUrl.js

@@ -3,7 +3,7 @@ import { join } from 'node:path'
 import * as Download from '../Download/Download.js'
 import * as Extract from '../Extract/Extract.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as TmpFile from '../TmpFile/TmpFile.js'
 import { VError } from '../VError/VError.js'
 
@@ -12,7 +12,7 @@ export const install = async ({ url }) => {
     // TODO cache extension tar br file, probably by url <cachedExtensions>/user/repo/releases/<tag>/<fileName>
     // const cachedExtensionsPath = Platform.getCachedExtensionsPath()
     // const outFile = join(cachedExtensionsPath, 'installed-extension.tar.br')
-    const extensionsPath = Platform.getExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
     const tmpFile = await TmpFile.getTmpFile()
     await Download.download(url, tmpFile)
     const tmpDir = await TmpFile.getTmpDir()

package/src/parts/ExtensionLink/ExtensionLink.js

@@ -3,7 +3,7 @@ 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'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as SymLink from '../SymLink/SymLink.js'
 import { VError } from '../VError/VError.js'
 
@@ -13,7 +13,7 @@ const linkFallBack = async (path) => {
     if (manifest.status === ExtensionManifestStatus.Rejected) {
       throw manifest.reason
     }
-    const linkedExtensionsPath = Platform.getLinkedExtensionsPath()
+    const linkedExtensionsPath = PlatformPaths.getLinkedExtensionsPath()
     // @ts-ignore
     const to = Path.join(linkedExtensionsPath, manifest.id)
     await FileSystem.remove(to)
@@ -29,7 +29,7 @@ export const link = async (path) => {
     if (manifest.status === ExtensionManifestStatus.Rejected) {
       throw manifest.reason
     }
-    const linkedExtensionsPath = Platform.getLinkedExtensionsPath()
+    const linkedExtensionsPath = PlatformPaths.getLinkedExtensionsPath()
     // @ts-ignore
     const to = Path.join(linkedExtensionsPath, manifest.id)
     await SymLink.createSymLink(path, to)

package/src/parts/ExtensionList/ExtensionList.js

@@ -1,8 +1,8 @@
 import { basename } from 'node:path'
 import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js'
-import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js'
-import * as Platform from '../Platform/Platform.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
+import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 const getManifestVersion = (json) => {
@@ -51,15 +51,15 @@ export const list = async () => {
     const manifests = await ExtensionManifests.getAll([
       {
         type: ExtensionManifestInputType.LinkedExtensionsFolder,
-        path: Platform.getLinkedExtensionsPath(),
+        path: PlatformPaths.getLinkedExtensionsPath(),
       },
       {
         type: ExtensionManifestInputType.Folder,
-        path: Platform.getExtensionsPath(),
+        path: PlatformPaths.getExtensionsPath(),
       },
       {
         type: ExtensionManifestInputType.Folder,
-        path: Platform.getBuiltinExtensionsPath(),
+        path: PlatformPaths.getBuiltinExtensionsPath(),
       },
     ])
     const infos = getManifestInfos(manifests)

package/src/parts/ExtensionManagement/ExtensionManagement.js

@@ -3,14 +3,14 @@ import * as Debug from '../Debug/Debug.js'
 import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js'
 import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 export const enable = async (id) => {
   try {
     Debug.debug(`ExtensionManagement#enable ${id}`)
-    const extensionsPath = Platform.getExtensionsPath()
-    const disabledExtensionsPath = Platform.getDisabledExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
+    const disabledExtensionsPath = PlatformPaths.getDisabledExtensionsPath()
     await mkdir(extensionsPath, { recursive: true })
     await rename(Path.join(disabledExtensionsPath, id), Path.join(extensionsPath, id))
   } catch (error) {
@@ -21,8 +21,8 @@ export const enable = async (id) => {
 export const disable = async (id) => {
   try {
     Debug.debug(`ExtensionManagement#disable ${id}`)
-    const disabledExtensionsPath = Platform.getDisabledExtensionsPath()
-    const extensionsPath = Platform.getExtensionsPath()
+    const disabledExtensionsPath = PlatformPaths.getDisabledExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
     await mkdir(disabledExtensionsPath, { recursive: true })
     await rename(Path.join(extensionsPath, id), Path.join(disabledExtensionsPath, id))
   } catch (error) {
@@ -34,7 +34,7 @@ export const getBuiltinExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.Folder,
-      path: Platform.getBuiltinExtensionsPath(),
+      path: PlatformPaths.getBuiltinExtensionsPath(),
     },
   ])
 }
@@ -43,7 +43,7 @@ export const getInstalledExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.Folder,
-      path: Platform.getExtensionsPath(),
+      path: PlatformPaths.getExtensionsPath(),
     },
   ])
 }
@@ -52,19 +52,19 @@ export const getExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.OnlyExtension,
-      path: Platform.getOnlyExtensionPath(),
+      path: PlatformPaths.getOnlyExtensionPath(),
     },
     {
       type: ExtensionManifestInputType.Folder,
-      path: Platform.getLinkedExtensionsPath(),
+      path: PlatformPaths.getLinkedExtensionsPath(),
     },
     {
       type: ExtensionManifestInputType.Folder,
-      path: Platform.getExtensionsPath(),
+      path: PlatformPaths.getExtensionsPath(),
     },
     {
       type: ExtensionManifestInputType.Folder,
-      path: Platform.getBuiltinExtensionsPath(),
+      path: PlatformPaths.getBuiltinExtensionsPath(),
     },
   ])
 }
@@ -73,7 +73,7 @@ export const getDisabledExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.Folder,
-      path: Platform.getDisabledExtensionsPath(),
+      path: PlatformPaths.getDisabledExtensionsPath(),
     },
   ])
 }

package/src/parts/ExtensionUninstall/ExtensionUninstall.js

@@ -1,13 +1,13 @@
 import { rm } from 'node:fs/promises'
 import * as Debug from '../Debug/Debug.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 export const uninstall = async (id) => {
   try {
     Debug.debug(`ExtensionManagement#uninstall ${id}`)
-    const extensionsPath = Platform.getExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
     await rm(Path.join(extensionsPath, id), { recursive: true })
   } catch (error) {
     // if (error.code === 'ENOENT') {

package/src/parts/ExtensionUnlink/ExtensionUnlink.js

@@ -1,7 +1,7 @@
 import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as RemoveSymlink from '../RemoveSymlink/RemoveSymlink.js'
 import { VError } from '../VError/VError.js'
 
@@ -11,7 +11,7 @@ export const unlink = async (path) => {
     if (manifest.status === ExtensionManifestStatus.Rejected) {
       throw manifest.reason
     }
-    const linkedExtensionsPath = Platform.getLinkedExtensionsPath()
+    const linkedExtensionsPath = PlatformPaths.getLinkedExtensionsPath()
     // @ts-ignore
     const to = Path.join(linkedExtensionsPath, manifest.id)
     await RemoveSymlink.removeSymlink(to)

package/src/parts/InstallExtension/InstallExtension.js

@@ -2,7 +2,7 @@ import * as Debug from '../Debug/Debug.js'
 import * as Download from '../Download/Download.js'
 import * as Extract from '../Extract/Extract.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as Queue from '../Queue/Queue.js'
 import { VError } from '../VError/VError.js'
 
@@ -10,10 +10,10 @@ export const installExtension = async (id) => {
   // TODO this should be a stateless function, renderer-worker should have info on marketplace url
   // TODO use command.execute
   try {
-    const marketplaceUrl = Platform.getMarketplaceUrl()
+    const marketplaceUrl = PlatformPaths.getMarketplaceUrl()
     Debug.debug(`ExtensionManagement#install ${id}`)
-    const cachedExtensionsPath = Platform.getCachedExtensionsPath()
-    const extensionsPath = Platform.getExtensionsPath()
+    const cachedExtensionsPath = PlatformPaths.getCachedExtensionsPath()
+    const extensionsPath = PlatformPaths.getExtensionsPath()
     // TODO maybe a queue is over engineering here
     await Queue.add('download', async () => {
       Debug.debug(`ExtensionManagement#download ${id}`)

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

@@ -1,30 +1,31 @@
 import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 
 export const name = 'Platform'
 
 export const Commands = {
-  getAppDir: Platform.getAppDir,
-  getBuiltinExtensionsPath: Platform.getBuiltinExtensionsPath,
-  getCachedExtensionsPath: Platform.getCachedExtensionsPath,
-  getCacheDir: Platform.getCacheDir,
+  getAppDir: PlatformPaths.getAppDir,
+  getBuiltinExtensionsPath: PlatformPaths.getBuiltinExtensionsPath,
+  getCachedExtensionsPath: PlatformPaths.getCachedExtensionsPath,
+  getCacheDir: PlatformPaths.getCacheDir,
   getApplicationName: Platform.getApplicationName,
   getCommit: Platform.getCommit,
-  getConfigDir: Platform.getConfigDir,
-  getDataDir: Platform.getDataDir,
+  getConfigDir: PlatformPaths.getConfigDir,
+  getDataDir: PlatformPaths.getDataDir,
   getDate: Platform.getDate,
-  getDisabledExtensionsPath: Platform.getDisabledExtensionsPath,
-  getDownloadDir: Platform.getDownloadDir,
-  getExtensionsPath: Platform.getExtensionsPath,
-  getHomeDir: Platform.getHomeDir,
-  getLogsDir: Platform.getLogsDir,
-  getMarketplaceUrl: Platform.getMarketplaceUrl,
+  getDisabledExtensionsPath: PlatformPaths.getDisabledExtensionsPath,
+  getDownloadDir: PlatformPaths.getDownloadDir,
+  getExtensionsPath: PlatformPaths.getExtensionsPath,
+  getHomeDir: PlatformPaths.getHomeDir,
+  getLogsDir: PlatformPaths.getLogsDir,
+  getMarketplaceUrl: PlatformPaths.getMarketplaceUrl,
   getNodePath: Platform.getNodePath,
   getProductNameLong: Platform.getProductNameLong,
-  getRecentlyOpenedPath: Platform.getRecentlyOpenedPath,
-  getTestPath: Platform.getTestPath,
+  getRecentlyOpenedPath: PlatformPaths.getRecentlyOpenedPath,
+  getTestPath: PlatformPaths.getTestPath,
   getTmpDir: Platform.getTmpDir,
-  getUserKeyBindingsPath: Platform.getUserKeyBindingsPath,
-  getUserSettingsPath: Platform.getUserSettingsPath,
+  getUserKeyBindingsPath: PlatformPaths.getUserKeyBindingsPath,
+  getUserSettingsPath: PlatformPaths.getUserSettingsPath,
   getVersion: Platform.getVersion,
   setEnvironmentVariables: Platform.setEnvironmentVariables,
 }

package/src/parts/Platform/Platform.js

@@ -1,10 +1,7 @@
-import { homedir, tmpdir } from 'node:os'
-import { isAbsolute, 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 { tmpdir } from 'node:os'
+import { sep } from 'node:path'
+import { xdgState } from 'xdg-basedir'
 import * as Process from '../Process/Process.js'
-import * as Root from '../Root/Root.js'
 
 const { env, platform } = process
 
@@ -14,54 +11,12 @@ export const isWindows = platform === 'win32'
 
 export const isMacOs = platform === 'darwin'
 
-export const dataDir = Path.join(xdgData || tmpdir(), applicationName)
-
-export const configDir = Path.join(xdgConfig || tmpdir(), applicationName)
-
-export const cacheDir = Path.join(xdgCache || tmpdir(), applicationName)
-
-export const homeDir = isWindows ? '' : homedir()
-
-export const appDir = Root.root
-
 export const isDeb = false
 
 export const isAppImage = () => {
   return Boolean(env.APPIMAGE)
 }
 
-export const getExtensionsPath = () => {
-  return Path.join(dataDir, 'extensions')
-}
-
-export const getBuiltinExtensionsPath = () => {
-  return Path.join(Root.root, 'extensions')
-}
-
-export const getDisabledExtensionsPath = () => {
-  return Path.join(dataDir, 'disabled-extensions')
-}
-
-export const getCachedExtensionsPath = () => {
-  return Path.join(cacheDir, 'cached-extensions')
-}
-
-export const getCachedChromeExtensionsPath = () => {
-  return Path.join(cacheDir, 'cached-electron-browser-view-chrome-extensions')
-}
-
-export const getLinkedExtensionsPath = () => {
-  return Path.join(dataDir, 'linked-extensions')
-}
-
-export const getChromeExtensionsPath = () => {
-  return Path.join(dataDir, 'electron-browser-view-chrome-extensions')
-}
-
-export const getMarketplaceUrl = () => {
-  return env.LVCE_MARKETPLACE_URL || 'https://marketplace.22e924c84de072d4b25b.com'
-}
-
 export const getPathSeparator = () => {
   return sep
 }
@@ -70,54 +25,12 @@ export const getStateDir = () => {
   return xdgState
 }
 
-export const getLogsDir = () => {
-  return Path.join(xdgState || tmpdir(), applicationName, 'logs')
-}
-
-export const getUserSettingsPath = () => {
-  return Path.join(configDir, 'settings.json')
-}
-
-export const getUserKeyBindingsPath = () => {
-  return Path.join(configDir, 'keybindings.json')
-}
-
-export const getExtensionHostPath = async () => {
-  const { extensionHostPath } = await import(
-    '@lvce-editor/extension-host'
-  )
-  return extensionHostPath
-}
-
-export const getExtensionHostHelperProcessPath = async () => {
-  const { extensionHostHelperProcessPath } = await import(
-    '@lvce-editor/extension-host-helper-process'
-  )
-  return extensionHostHelperProcessPath
-}
-
-export const getRecentlyOpenedPath = () => {
-  return Path.join(cacheDir, 'recently-opened.json')
-}
-
-export const getDefaultSettingsPath = () => {
-  return Path.join(Root.root, 'config', 'defaultSettings.json')
-}
 export const setEnvironmentVariables = (variables) => {
   for (const [key, value] of Object.entries(variables)) {
     env[key] = value
   }
 }
 
-export const getTestPath = () => {
-  if (env.TEST_PATH) {
-    const absolutePath = isAbsolute(env.TEST_PATH) ? env.TEST_PATH : Path.join(process.cwd(), env.TEST_PATH)
-    const testPath = '/remote' + pathToFileURL(absolutePath).toString().slice(7)
-    return testPath
-  }
-  return '/packages/extension-host-worker-tests'
-}
-
 export const getNodePath = () => {
   return Process.argv[0]
 }
@@ -126,39 +39,6 @@ export const getTmpDir = () => {
   return tmpdir()
 }
 
-export const getOnlyExtensionPath = () => {
-  const onlyExtensionPath = env.ONLY_EXTENSION
-  if (onlyExtensionPath) {
-    return resolve(onlyExtensionPath)
-  }
-  return ''
-}
-
-export const getAppDir = () => {
-  return appDir
-}
-
-export const getCacheDir = () => {
-  return cacheDir
-}
-
-export const getConfigDir = () => {
-  return configDir
-}
-
-export const getDataDir = () => {
-  return dataDir
-}
-
-export const getHomeDir = () => {
-  return homeDir
-}
-
-export const getDownloadDir = () => {
-  const { XDG_DOWNLOAD_DIR } = env
-  return XDG_DOWNLOAD_DIR || join(homeDir, 'Downloads')
-}
-
 export const getRepository = () => {
   return `lvce-editor/lvce-editor`
 }
@@ -175,11 +55,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.18.1'
+export const version = '0.18.3'
 
-export const commit = 'c866b4f'
+export const commit = 'a397116'
 
-export const date = '2023-09-24T18:45:21.000Z'
+export const date = '2023-10-02T06:55:32.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/PlatformPaths/PlatformPaths.ipc.js

@@ -0,0 +1,24 @@
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
+
+export const name = 'PlatformPaths'
+
+export const Commands = {
+  getAppDir: PlatformPaths.getAppDir,
+  getBuiltinExtensionsPath: PlatformPaths.getBuiltinExtensionsPath,
+  getCachedExtensionsPath: PlatformPaths.getCachedExtensionsPath,
+  getCacheDir: PlatformPaths.getCacheDir,
+  getConfigDir: PlatformPaths.getConfigDir,
+  getDataDir: PlatformPaths.getDataDir,
+  getDisabledExtensionsPath: PlatformPaths.getDisabledExtensionsPath,
+  getDownloadDir: PlatformPaths.getDownloadDir,
+  getExtensionsPath: PlatformPaths.getExtensionsPath,
+  getHomeDir: PlatformPaths.getHomeDir,
+  getLogsDir: PlatformPaths.getLogsDir,
+  getMarketplaceUrl: PlatformPaths.getMarketplaceUrl,
+  getNodePath: PlatformPaths.getNodePath,
+  getRecentlyOpenedPath: PlatformPaths.getRecentlyOpenedPath,
+  getTestPath: PlatformPaths.getTestPath,
+  getTmpDir: PlatformPaths.getTmpDir,
+  getUserKeyBindingsPath: PlatformPaths.getUserKeyBindingsPath,
+  getUserSettingsPath: PlatformPaths.getUserSettingsPath,
+}

package/src/parts/PlatformPaths/PlatformPaths.js

@@ -0,0 +1,148 @@
+import { homedir, tmpdir } from 'node:os'
+import { isAbsolute, 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 Platform from '../Platform/Platform.js'
+import * as Process from '../Process/Process.js'
+import * as Root from '../Root/Root.js'
+
+const { env } = process
+
+export const dataDir = Path.join(xdgData || tmpdir(), Platform.applicationName)
+
+export const configDir = Path.join(xdgConfig || tmpdir(), Platform.applicationName)
+
+export const cacheDir = Path.join(xdgCache || tmpdir(), Platform.applicationName)
+
+export const homeDir = Platform.isWindows ? '' : homedir()
+
+export const appDir = Root.root
+
+export const getExtensionsPath = () => {
+  return Path.join(dataDir, 'extensions')
+}
+
+export const getBuiltinExtensionsPath = () => {
+  return Path.join(Root.root, 'extensions')
+}
+
+export const getDisabledExtensionsPath = () => {
+  return Path.join(dataDir, 'disabled-extensions')
+}
+
+export const getCachedExtensionsPath = () => {
+  return Path.join(cacheDir, 'cached-extensions')
+}
+
+export const getCachedChromeExtensionsPath = () => {
+  return Path.join(cacheDir, 'cached-electron-browser-view-chrome-extensions')
+}
+
+export const getLinkedExtensionsPath = () => {
+  return Path.join(dataDir, 'linked-extensions')
+}
+
+export const getChromeExtensionsPath = () => {
+  return Path.join(dataDir, 'electron-browser-view-chrome-extensions')
+}
+
+export const getMarketplaceUrl = () => {
+  return env.LVCE_MARKETPLACE_URL || 'https://marketplace.22e924c84de072d4b25b.com'
+}
+
+export const getPathSeparator = () => {
+  return sep
+}
+
+export const getStateDir = () => {
+  return xdgState
+}
+
+export const getLogsDir = () => {
+  return Path.join(xdgState || tmpdir(), Platform.applicationName, 'logs')
+}
+
+export const getUserSettingsPath = () => {
+  return Path.join(configDir, 'settings.json')
+}
+
+export const getUserKeyBindingsPath = () => {
+  return Path.join(configDir, 'keybindings.json')
+}
+
+export const getExtensionHostPath = async () => {
+  const { extensionHostPath } = await import(
+    '@lvce-editor/extension-host'
+  )
+  return extensionHostPath
+}
+
+export const getExtensionHostHelperProcessPath = async () => {
+  const { extensionHostHelperProcessPath } = await import(
+    '@lvce-editor/extension-host-helper-process'
+  )
+  return extensionHostHelperProcessPath
+}
+
+export const getRecentlyOpenedPath = () => {
+  return Path.join(cacheDir, 'recently-opened.json')
+}
+
+export const getDefaultSettingsPath = () => {
+  return Path.join(Root.root, 'config', 'defaultSettings.json')
+}
+
+export const getTestPath = () => {
+  if (env.TEST_PATH) {
+    const absolutePath = isAbsolute(env.TEST_PATH) ? env.TEST_PATH : Path.join(process.cwd(), env.TEST_PATH)
+    const testPath = '/remote' + pathToFileURL(absolutePath).toString().slice(7)
+    return testPath
+  }
+  return '/packages/extension-host-worker-tests'
+}
+
+export const getNodePath = () => {
+  return Process.argv[0]
+}
+
+export const getTmpDir = () => {
+  return tmpdir()
+}
+
+export const getOnlyExtensionPath = () => {
+  const onlyExtensionPath = env.ONLY_EXTENSION
+  if (onlyExtensionPath) {
+    return resolve(onlyExtensionPath)
+  }
+  return ''
+}
+
+export const getAppDir = () => {
+  return appDir
+}
+
+export const getCacheDir = () => {
+  return cacheDir
+}
+
+export const getConfigDir = () => {
+  return configDir
+}
+
+export const getDataDir = () => {
+  return dataDir
+}
+
+export const getHomeDir = () => {
+  return homeDir
+}
+
+export const getDownloadDir = () => {
+  const { XDG_DOWNLOAD_DIR } = env
+  return XDG_DOWNLOAD_DIR || join(homeDir, 'Downloads')
+}
+
+export const getRepository = () => {
+  return `lvce-editor/lvce-editor`
+}

package/src/parts/Preferences/Preferences.js

@@ -1,14 +1,13 @@
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as JsoncFile from '../JsoncFile/JsoncFile.js'
-import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as Process from '../Process/Process.js'
-import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import { VError } from '../VError/VError.js'
 // TODO need jsonc parser for settings with comments
 
 export const getUserPreferences = async () => {
   try {
-    const userSettingsPath = Platform.getUserSettingsPath()
+    const userSettingsPath = PlatformPaths.getUserSettingsPath()
     let json
     try {
       json = await JsoncFile.readJsonc(userSettingsPath)
@@ -27,7 +26,7 @@ export const getUserPreferences = async () => {
 // TODO handle error
 export const getDefaultPreferences = async () => {
   try {
-    const defaultSettingsPath = Platform.getDefaultSettingsPath()
+    const defaultSettingsPath = PlatformPaths.getDefaultSettingsPath()
     return await JsoncFile.readJsonc(defaultSettingsPath)
   } catch (error) {
     throw new VError(error, 'Failed to load default preferences')

package/src/parts/RecentlyOpened/RecentlyOpened.js

@@ -2,10 +2,10 @@ import { dirname } from 'node:path'
 import * as Assert from '../Assert/Assert.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as Json from '../Json/Json.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
-import * as Platform from '../Platform/Platform.js'
-import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 const addToArrayUnique = (recentlyOpened, path) => {
@@ -49,7 +49,7 @@ const setRecentlyOpened = async (recentlyOpenedPath, newRecentlyOpened) => {
 export const addPath = async (path) => {
   try {
     Assert.string(path)
-    const recentlyOpenedPath = Platform.getRecentlyOpenedPath()
+    const recentlyOpenedPath = PlatformPaths.getRecentlyOpenedPath()
     const parsed = await getRecentlyOpened(recentlyOpenedPath)
     const newRecentlyOpened = addToArrayUnique(parsed, path)
     await setRecentlyOpened(recentlyOpenedPath, newRecentlyOpened)

package/src/parts/Workspace/Workspace.js

@@ -7,6 +7,7 @@ import * as IsAbsolutePath from '../IsAbsolutePath/IsAbsolutePath.js'
 import * as IsElectron from '../IsElectron/IsElectron.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as Root from '../Root/Root.js'
 import * as WorkspaceSource from '../WorkspaceSource/WorkspaceSource.js'
 
@@ -48,7 +49,7 @@ export const resolveRoot = async () => {
         path: last,
         uri: toUri(last),
         workspaceId: GetWorkspaceId.getWorkspaceId(last),
-        homeDir: Platform.getHomeDir(),
+        homeDir: PlatformPaths.getHomeDir(),
         pathSeparator: Platform.getPathSeparator(),
         source: 'shared-process-default',
       }
@@ -63,7 +64,7 @@ export const resolveRoot = async () => {
       path,
       uri: toUri(path),
       workspaceId: GetWorkspaceId.getWorkspaceId(path),
-      homeDir: Platform.getHomeDir(),
+      homeDir: PlatformPaths.getHomeDir(),
       pathSeparator: Platform.getPathSeparator(),
       source: WorkspaceSource.SharedProcessEnv,
     }
@@ -76,7 +77,7 @@ export const resolveRoot = async () => {
     path: absolutePath,
     uri: toUri(absolutePath),
     workspaceId,
-    homeDir: Platform.getHomeDir(),
+    homeDir: PlatformPaths.getHomeDir(),
     pathSeparator: Platform.getPathSeparator(),
     source: WorkspaceSource.SharedProcessDefault,
   }
@@ -87,7 +88,7 @@ export const resolveUri = (uri) => {
   return {
     path,
     uri,
-    homeDir: Platform.getHomeDir(),
+    homeDir: PlatformPaths.getHomeDir(),
     pathSeparator: Platform.getPathSeparator(),
   }
 }