@lvce-editor/shared-process 0.13.0 → 0.14.1

package/extensions/builtin.language-basics-jsx/src/tokenizeJsx.js

@@ -22,6 +22,7 @@ const State = {
   InsideBacktickString: 17,
   AfterPropertyDot: 18,
   InsideTag: 19,
+  AfterSemicolon: 20,
 }
 
 /**
@@ -124,13 +125,13 @@ const RE_STRING_DOUBLE_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*\())/
+const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\`|\(|\=\s*function|\=\s*\())/
 const RE_DECORATOR = /^@\w+/
 const RE_BACKSLASH = /^\\/
 const RE_DOLLAR_CURLY_OPEN = /^\$\{/
 const RE_DOLLAR = /^\$/
 const RE_ANYTHING = /^.+/u
-const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?![\s!<=])/
+const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?![\s!<=\d])/
 const RE_ANGLE_BRACKET_CLOSE_TAG = /^<\/(?![\s!])/
 const RE_TAGNAME = /^[!\w\:\.]+/
 const RE_ANGLE_BRACKET_CLOSE = /^>/
@@ -155,6 +156,8 @@ const RE_EMPTY_FRAGMENT = /^<\s*\>/
 const RE_VAR_CONST_LET_EXPORT =
   /^\s*(?=(?:if|class|export|var|const|let)(?:\s+|$))/
 
+const RE_EXPRESSION = /;\w+$/
+
 export const initialLineState = {
   state: State.TopLevelContent,
   /**
@@ -260,8 +263,13 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Numeric
           state = State.TopLevelContent
         } else if ((next = part.match(RE_ANGLE_BRACKET_OPEN_TAG))) {
-          token = TokenType.PunctuationTag
-          state = State.AfterOpeningAngleBracket
+          if (RE_EXPRESSION.test(line.slice(0, index))) {
+            next = part.match(RE_ANGLE_BRACKET_OPEN)
+            token = TokenType.Punctuation
+          } else {
+            token = TokenType.PunctuationTag
+            state = State.AfterOpeningAngleBracket
+          }
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
@@ -275,7 +283,11 @@ export const tokenizeLine = (line, lineState) => {
             state = State.AfterPropertyDot
           } else if (next[0] === '}') {
             state = stack.pop() || State.TopLevelContent
-          } else {
+          }
+          // else if (next[0] === ';') {
+          // state = State.AfterSemicolon
+          // }
+          else {
             state = State.TopLevelContent
           }
         } else if ((next = part.match(RE_SLASH))) {
@@ -570,6 +582,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.InsideTag
         } else {
           part
+          line
           throw new Error('no')
         }
         break

package/extensions/builtin.language-basics-typescript/src/tokenizeTypeScript.js

@@ -174,6 +174,8 @@ const RE_KEYWORD_TYPE = /^type\b/
 const RE_KEYWORD_IN = /^in\b/
 const RE_KEYWORD_OF = /^of\b/
 const RE_KEYWORD_EXTENDS = /^extends\b/
+const RE_KEYWORD_READONLY = /^readonly\b/
+const RE_SHEBANG = /^\#\!\/.*/
 
 export const hasArrayReturn = true
 /**
@@ -284,6 +286,9 @@ export const tokenizeLine = (line, lineState) => {
               state = State.TopLevelContent
               break
           }
+        } else if (index === 0 && (next = part.match(RE_SHEBANG))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.TopLevelContent
@@ -777,6 +782,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_METHOD_NAME))) {
           token = TokenType.Function
           state = State.AfterMethodName
+        } else if ((next = part.match(RE_KEYWORD_READONLY))) {
+          token = TokenType.KeywordModifier
+          state = State.InsideTypeObject
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.InsideTypeObject
@@ -796,6 +804,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_VERTICAL_LINE))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeObject
+        } else if ((next = part.match(RE_SQUARE_CLOSE))) {
+          token = TokenType.Punctuation
+          state = State.InsideTypeObject
         } else {
           part
           throw new Error('no')
@@ -806,6 +820,12 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.InsideMethodParameters
           // stack.push()
+        } else if ((next = part.match(RE_COLON))) {
+          token = TokenType.Punctuation
+          state = State.AfterMethodName
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterMethodName
         } else {
           throw new Error('no')
         }
@@ -842,6 +862,12 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.BeforeType
           stack.push(State.InsideTypeObject)
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterMethodParameters
+        } else if ((next = part.match(RE_ARROW))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
         } else {
           throw new Error('no')
         }

package/extensions/builtin.language-basics-vue/src/tokenizeVue.js

@@ -58,7 +58,7 @@ const RE_ANGLE_BRACKET_ONLY = /^</
 const RE_ANGLE_BRACKET_OPEN = /^</
 const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?![\s!])/
 const RE_ANY_TEXT = /^[^\n]+/
-const RE_ATTRIBUTE_NAME = /^[a-zA-Z\d\-\:]+/
+const RE_ATTRIBUTE_NAME = /^[\@a-zA-Z\d\-\:\.]+/
 const RE_BLOCK_COMMENT_CONTENT_1 = /^.+?(?=-->)/s
 const RE_BLOCK_COMMENT_CONTENT_2 = /^.+$/s
 const RE_BLOCK_COMMENT_END = /^-->/

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

@@ -70,7 +70,9 @@
         ".xsd",
         ".xul",
         ".tmtheme",
-        ".mm"
+        ".mm",
+        ".tmDragCommand",
+        ".tmCommand"
       ],
       "fileNames": [".project", "resources.grd"],
       "tokenize": "src/tokenizeXml.js"

package/extensions/builtin.theme-atom-one-dark/color-theme.json

@@ -55,8 +55,8 @@
 
     "TitleBarBackground": "#21252B",
     "TitleBarBorderBottomColor": "",
-    "TitleBarColor": "",
-    "TitleBarColorInactive": "",
+    "TitleBarForeground": "rgb(157, 165, 180)",
+    "TitleBarForegroundActive": "rgb(157, 165, 180)",
 
     "TreeItemHoverBackground": "rgba(44, 49, 58, 0.4)"
   },

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

@@ -38,6 +38,7 @@
 
     "MenuItemHoverForeground": "rgb(92, 97, 102)",
     "MenuItemHoverBackground": "rgba(86, 114, 143, 0.12)",
+    "MenuItemSeparatorBackground": "#d4d4d4",
 
     "PanelBackground": "#f8f9fa",
     "PanelBorderTopColor": "#6b7d8f1f",
@@ -59,11 +60,14 @@
     "TabActiveBackground": "",
     "TabInactiveBackground": "",
 
-    "TitleBarBackground": "",
+    "TitleBarBackground": "rgb(248, 249, 250)",
     "TitleBarBorderBottomColor": "",
-    "TitleBarForeground": "#8a9199",
+    "TitleBarForeground": "rgb(138, 145, 153)",
     "TitleBarColorInactive": "",
     "TitleBarItemHoverForeground": "rgba(0, 0, 0, 0.1)",
+    "TitleBarForegroundActive": "rgb(92, 97, 102)",
+
+    "TitleBarButtonCloseHoverForeground": "#fff",
 
     "TreeItemForeground": "#8a9199",
     "TreeItemActiveBackground": "rgba(86, 114, 143, 0.12)"

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

@@ -58,10 +58,13 @@
 
     "TabsBackground": "rgb(18, 39, 56)",
 
-    "TitleBarBackground": "#15232D",
+    "TitleBarBackground": "rgb(25, 53, 73)",
     "TitleBarBorderBottomColor": "",
     "TitleBarColor": "",
-    "TitleBarColorInactive": "rgba(204, 204, 204, 0.6)"
+    "TitleBarColorInactive": "rgba(204, 204, 204, 0.6)",
+    "TitleBarActiveBackground": "#15232D",
+    "TitleBarForeground": "rgba(255, 255, 255, 0.2)",
+    "TitleBarForegroundActive": "rgb(255, 255, 255)"
   },
   "tokenColors": [
     {

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

@@ -6,8 +6,8 @@
     "ActivityBarActiveBackground": "#1f2727",
     "ActivityBarActiveForeground": "rgb(135, 143, 140)",
 
-    "BadgeBackground": "purple",
-    "BadgeForeground": "#fff",
+    "BadgeBackground": "#90599b",
+    "BadgeForeground": "#eeeeee",
 
     "EditorBackGround": "#1e2324",
     "EditorScrollBarBackground": "rgba(57, 71, 71, 0.6)",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.13.0",
+  "version": "0.14.1",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,30 +17,29 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@lvce-editor/extension-host": "0.13.0",
-    "@lvce-editor/extension-host-helper-process": "0.13.0",
-    "@lvce-editor/pty-host": "0.13.0",
+    "@lvce-editor/extension-host": "0.14.1",
+    "@lvce-editor/extension-host-helper-process": "0.14.1",
+    "@lvce-editor/pty-host": "0.14.1",
     "debug": "^4.3.4",
-    "execa": "^6.1.0",
+    "execa": "^7.1.1",
     "exit-hook": "^3.2.0",
-    "got": "^12.5.3",
+    "got": "^12.6.0",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",
-    "open": "^8.4.1",
+    "open": "^9.0.0",
     "p-queue": "^7.3.4",
     "parse-json": "^6.0.2",
     "symlink-dir": "^5.1.1",
     "tail": "^2.2.6",
     "tar-fs": "^2.1.1",
     "tmp-promise": "^3.0.3",
-    "trash": "^8.1.0",
-    "verror": "^1.10.1",
-    "ws": "^8.12.0",
+    "trash": "^8.1.1",
+    "ws": "^8.13.0",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
     "extract-zip": "^2.0.1",
     "keytar": "^7.9.0",
-    "vscode-ripgrep-with-github-api-error-fix": "^2.6.0"
+    "vscode-ripgrep-with-github-api-error-fix": "^2.8.0"
   }
 }

package/src/parts/Assert/Assert.js

@@ -1,9 +1,4 @@
-class AssertionError extends Error {
-  constructor(message) {
-    super(message)
-    this.name = 'AssertionError'
-  }
-}
+import { AssertionError } from '../AssertionError/AssertionError.js'
 
 const getType = (value) => {
   switch (typeof value) {

package/src/parts/AssertionError/AssertionError.js

@@ -0,0 +1,6 @@
+export class AssertionError extends Error {
+  constructor(message) {
+    super(message)
+    this.name = 'AssertionError'
+  }
+}

package/src/parts/BulkReplacement/BulkReplacement.ipc.js

@@ -0,0 +1,7 @@
+import * as BulkReplacement from './BulkReplacement.js'
+
+export const name = 'BulkReplacement'
+
+export const Commands = {
+  applyBulkReplacement: BulkReplacement.applyBulkReplacement,
+}

package/src/parts/BulkReplacement/BulkReplacement.js

@@ -0,0 +1,20 @@
+import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as BulkReplacementContent from '../BulkReplacementContent/BulkReplacementContent.js'
+
+const applyEdit = async (path, ranges, replacement) => {
+  const content = await FileSystem.readFile(path)
+  const newContent = BulkReplacementContent.getNewContent(content, ranges, replacement)
+  await FileSystem.writeFile(path, newContent)
+}
+
+export const applyBulkReplacement = async (files, ranges, replacement) => {
+  let rangeIndex = 0
+  for (const file of files) {
+    const rangeLength = ranges[rangeIndex]
+    const rangeStartIndex = rangeIndex + 1
+    const rangeEndIndex = rangeStartIndex + rangeLength
+    const fileRanges = ranges.slice(rangeStartIndex, rangeEndIndex)
+    await applyEdit(file, fileRanges, replacement)
+    rangeIndex = rangeEndIndex
+  }
+}

package/src/parts/BulkReplacementContent/BulkReplacementContent.js

@@ -0,0 +1,30 @@
+import * as GetNewLineIndex from '../GetNewLineIndex/GetNewLineIndex.js'
+
+export const getNewContent = (content, ranges, replacement) => {
+  if (ranges.length === 0) {
+    return content
+  }
+  let rowIndex = 0
+  let newLineIndex = -1
+  let copiedContentIndex = 0
+  let newContent = ''
+  let previousNewLineIndex = -1
+  for (let i = 0; i < ranges.length; i += 4) {
+    while (rowIndex < ranges[i]) {
+      previousNewLineIndex = newLineIndex
+      newLineIndex = GetNewLineIndex.getNewLineIndex(content, newLineIndex + 1)
+      rowIndex++
+    }
+    const startRowIndex = ranges[i]
+    const startColumnIndex = ranges[i + 1]
+    const endRowIndex = ranges[i + 2]
+    const endColumnIndex = ranges[i + 3]
+    if (copiedContentIndex <= newLineIndex) {
+      newContent += content.slice(copiedContentIndex, newLineIndex + 1)
+      copiedContentIndex = newLineIndex + 1
+    }
+    newContent += replacement
+    copiedContentIndex += endColumnIndex - startColumnIndex
+  }
+  return newContent
+}

package/src/parts/ChildProcessError/ChildProcessError.js

@@ -0,0 +1,45 @@
+import * as SplitLines from '../SplitLines/SplitLines.js'
+
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/
+
+const RE_MASSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/
+const RE_MASSAGE_CODE_BLOCK_END = /^\s* at/
+
+const isUnhelpfulNativeModuleError = (stderr) => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr)
+}
+
+const isMessageCodeBlockStartIndex = (line) => {
+  return RE_MASSAGE_CODE_BLOCK_START.test(line)
+}
+
+const isMessageCodeBlockEndIndex = (line) => {
+  return RE_MASSAGE_CODE_BLOCK_END.test(line)
+}
+
+const getMessageCodeBlock = (stderr) => {
+  const lines = SplitLines.splitLines(stderr)
+  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex)
+  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex)
+  const relevantLines = lines.slice(startIndex, endIndex)
+  const relevantMessage = relevantLines.join(' ').slice('Error: '.length)
+  return relevantMessage
+}
+
+const getNativeModuleErrorMessage = (stderr) => {
+  const message = getMessageCodeBlock(stderr)
+  return `incompatible native node module: ${message}`
+}
+
+export class ChildProcessError extends Error {
+  constructor(stderr) {
+    if (isUnhelpfulNativeModuleError(stderr)) {
+      const message = getNativeModuleErrorMessage(stderr)
+      super(message)
+    } else {
+      super('child process error')
+    }
+    this.name = 'ChildProcessError'
+  }
+}

package/src/parts/ChromeExtension/ChromeExtension.js

@@ -1,10 +1,10 @@
-import VError from 'verror'
 import * as Assert from '../Assert/Assert.js'
 import * as Download from '../Download/Download.js'
 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 { VError } from '../VError/VError.js'
 
 const getExtensionPath = async (tmpDir) => {
   const dirents = await FileSystem.readDirWithFileTypes(tmpDir)
@@ -19,10 +19,7 @@ export const install = async (name, url) => {
     Assert.string(name)
     Assert.string(url)
     const cachedChromeExtensionsPath = Platform.getCachedExtensionsPath()
-    const tempFileCompressed = Path.join(
-      cachedChromeExtensionsPath,
-      `${name}.zip`
-    )
+    const tempFileCompressed = Path.join(cachedChromeExtensionsPath, `${name}.zip`)
     const tmpDir = Path.join(cachedChromeExtensionsPath, name)
     const chromeExtensionsPath = Platform.getChromeExtensionsPath()
     await Download.download(url, tempFileCompressed)

package/src/parts/CleanStack/CleanStack.js

@@ -1,5 +1,93 @@
-import npmCleanStack from 'clean-stack'
+import * as SplitLines from '../SplitLines/SplitLines.js'
+
+const RE_AT = /^\s+at/
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/
+const RE_OBJECT_AS = /^\s*at (async )?Object\.\w+ \[as ([\w\.]+)\]/
+const RE_GET_RESPONSE = /^\s*at async getResponse/
+const RE_WEBSOCKET_HANDLE_MESSAGE = /^\s*at async WebSocket.handleMessage/
+const RE_EXECUTE_COMMAND_ASYNC = /^\s*at executeCommandAsync/
+const RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT = /^\s*at async MessagePort\.handleOtherMessagesFromMessagePort/
+
+const isInternalLine = (line) => {
+  return line.includes('node:') || RE_AT_PROMISE_INDEX.test(line) || line.includes('node_modules/ws')
+}
+
+const isRelevantLine = (line) => {
+  return !isInternalLine(line)
+}
+
+const isApplicationUsefulLine = (line, index) => {
+  if (index === 0) {
+    return true
+  }
+  if (RE_GET_RESPONSE.test(line)) {
+    return false
+  }
+  if (RE_WEBSOCKET_HANDLE_MESSAGE.test(line)) {
+    return false
+  }
+  if (RE_EXECUTE_COMMAND_ASYNC.test(line)) {
+    return false
+  }
+  if (RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT.test(line)) {
+    return false
+  }
+  return true
+}
+
+const isNormalStackLine = (line) => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line)
+}
+
+const cleanLine = (line) => {
+  if (line.startsWith('    at exports.')) {
+    return '    at ' + line.slice('    at exports.'.length)
+  }
+  if (line.startsWith('    at async exports.')) {
+    return '    at async ' + line.slice('    at async exports.'.length)
+  }
+  if (line.startsWith('    at async Module.')) {
+    return '    at async ' + line.slice('    at async Module.'.length)
+  }
+  if (line.startsWith('    at Module.')) {
+    return '    at ' + line.slice('    at Module.'.length)
+  }
+  const objectMatch = line.match(RE_OBJECT_AS)
+  if (objectMatch) {
+    const rest = line.slice(objectMatch[0].length)
+    if (objectMatch[1]) {
+      return '    at ' + objectMatch[1] + objectMatch[2] + rest
+    }
+    return '    at ' + objectMatch[2] + rest
+  }
+  return line
+}
+
+const getDetails = (lines) => {
+  const index = lines.findIndex(isNormalStackLine)
+  return {
+    custom: lines.slice(0, index),
+    actualStack: lines.slice(index).map(cleanLine),
+  }
+}
+
+const RE_PATH_1 = /^\/(.*)(\d+)$/
+
+const mergeCustom = (custom, relevantStack) => {
+  if (custom.length === 0) {
+    return relevantStack
+  }
+  const firstLine = custom[0]
+  if (RE_PATH_1.test(firstLine)) {
+    return [`    at ${firstLine}`, ...relevantStack]
+  }
+  return relevantStack
+}
 
 export const cleanStack = (stack) => {
-  return npmCleanStack(stack)
+  const lines = SplitLines.splitLines(stack)
+  const { custom, actualStack } = getDetails(lines)
+  const relevantStack = actualStack.filter(isRelevantLine).filter(isApplicationUsefulLine)
+  const merged = mergeCustom(custom, relevantStack)
+  return merged
 }

package/src/parts/CliList/CliList.js

@@ -3,6 +3,9 @@ import * as JoinLines from '../JoinLines/JoinLines.js'
 import * as Logger from '../Logger/Logger.js'
 
 const getOutputLine = (extension) => {
+  if (extension.symlink) {
+    return `${extension.id} -> ${extension.symlink}`
+  }
   return `${extension.id}: ${extension.version}`
 }
 

package/src/parts/ClipBoard/ClipBoard.js

@@ -1,8 +1,8 @@
-import * as Platform from '../Platform/Platform.js'
+import * as Desktop from '../Desktop/Desktop.js'
 import * as DesktopType from '../DesktopType/DesktopType.js'
 
 const getClipboard = () => {
-  const desktop = Platform.getDesktop()
+  const desktop = Desktop.getDesktop()
   switch (desktop) {
     case DesktopType.Gnome:
       return import('./ClipBoardGnome.js')

package/src/parts/ClipBoard/ClipBoardGnome.js

@@ -2,10 +2,10 @@
 // see also http://manpages.ubuntu.com/manpages/bionic/man1/xclip.1.html
 // on gnome, get current selection targets with `xclip -selection clipboard -t TARGETS -o`
 
-import VError from 'verror'
 import * as Exec from '../Exec/Exec.js'
 import * as JoinLines from '../JoinLines/JoinLines.js'
 import * as SplitLines from '../SplitLines/SplitLines.js'
+import { VError } from '../VError/VError.js'
 
 const removePrefix = (file) => {
   if (file.startsWith('file://')) {
@@ -57,7 +57,6 @@ export const writeFiles = async (type, files) => {
       input: plainContent,
     })
   } catch (error) {
-    // @ts-ignore
     throw new VError(error, 'Failed to copy files to clipboard')
   }
 }

package/src/parts/ClipBoard/ClipBoardNoop.js

@@ -1,4 +1,4 @@
-import * as Platform from '../Platform/Platform.js'
+import * as Desktop from '../Desktop/Desktop.js'
 
 export const readFiles = async () => {
   return {
@@ -9,6 +9,6 @@ export const readFiles = async () => {
 }
 
 export const writeFiles = (type, files) => {
-  const desktop = Platform.getDesktop()
+  const desktop = Desktop.getDesktop()
   console.info(`writing files to clipboard is not yet supported on ${desktop}`)
 }

package/src/parts/ClipBoard/ClipBoardWindows.js

@@ -1,6 +1,5 @@
 import clipboardEx from 'electron-clipboard-ex'
-
-import VError from 'verror'
+import { VError } from '../VError/VError.js'
 
 export const readFiles = async () => {
   const filePaths = clipboardEx.readFilePaths()
@@ -16,7 +15,6 @@ export const writeFiles = async (type, files) => {
   try {
     clipboardEx.writeFilePaths(files)
   } catch (error) {
-    // @ts-ignore
     throw new VError(error, 'Failed to copy files to clipboard')
   }
 }

package/src/parts/Command/Command.js

@@ -1,3 +1,4 @@
+import { CommandNotFoundError } from '../CommandNotFoundError/CommandNotFoundError.js'
 import * as ModuleMap from '../ModuleMap/ModuleMap.js'
 import { VError } from '../VError/VError.js'
 
@@ -19,9 +20,7 @@ const initializeModule = (module) => {
     }
     return
   }
-  throw new Error(
-    `module ${module.name} is missing an initialize function and commands`
-  )
+  throw new Error(`module ${module.name} is missing an initialize function and commands`)
 }
 
 const loadModule = async (moduleId) => {
@@ -29,11 +28,7 @@ const loadModule = async (moduleId) => {
     const module = await state.load(moduleId)
     initializeModule(module)
   } catch (error) {
-    if (
-      error &&
-      error instanceof SyntaxError &&
-      error.stack === `SyntaxError: ${error.message}`
-    ) {
+    if (error && error instanceof SyntaxError && error.stack === `SyntaxError: ${error.message}`) {
       Error.captureStackTrace(error, loadModule)
     }
     throw new VError(error, `failed to load module ${moduleId}`)
@@ -68,9 +63,9 @@ const executeCommandAsync = async (command, ...args) => {
       return
     }
     hasThrown.add(command)
-    throw new Error(`Command did not register "${command}"`)
+    throw new CommandNotFoundError(command)
   }
-  return execute(command, ...args)
+  return state.commands[command](...args)
 }
 
 export const execute = (command, ...args) => {

package/src/parts/Credentials/Credentials.ipc.js

@@ -1,9 +1,9 @@
 import * as Credentials from './Credentials.js'
 
 export const Commands = {
-  801: Credentials.getPassword,
-  802: Credentials.setPassword,
-  803: Credentials.deletePassword,
-  804: Credentials.findPassword,
-  805: Credentials.findCredentials,
+  getPassword: Credentials.getPassword,
+  setPassword: Credentials.setPassword,
+  deletePassword: Credentials.deletePassword,
+  findPassword: Credentials.findPassword,
+  findCredentials: Credentials.findCredentials,
 }