@lvce-editor/shared-process 0.11.7 → 0.11.9

package/src/parts/PrettyError/PrettyError.js

@@ -3,6 +3,8 @@ import cleanStack from 'clean-stack'
 import { LinesAndColumns } from 'lines-and-columns'
 import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as Json from '../Json/Json.js'
 import * as SplitLines from '../SplitLines/SplitLines.js'
 
 const getActualPath = (fileUri) => {
@@ -12,7 +14,59 @@ const getActualPath = (fileUri) => {
   return fileUri
 }
 
+const RE_MODULE_NOT_FOUND_STACK =
+  /Cannot find package '([^']+)' imported from (.+)$/
+
+const prepareModuleNotFoundError = (error) => {
+  const message = error.message
+  const match = message.match(RE_MODULE_NOT_FOUND_STACK)
+  if (!match) {
+    return {
+      message,
+      stack: error.stack,
+      codeFrame: '',
+    }
+  }
+  const notFoundModule = match[1]
+  const importedFrom = match[2]
+  const rawLines = readFileSync(importedFrom, 'utf-8')
+  let line = 0
+  let column = 0
+  const splittedLines = rawLines.split('\n')
+  for (let i = 0; i < splittedLines.length; i++) {
+    const splittedLine = splittedLines[i]
+    const index = splittedLine.indexOf(notFoundModule)
+    if (index !== -1) {
+      line = i + 1
+      column = index
+      break
+    }
+  }
+  const location = {
+    start: {
+      line,
+      column,
+    },
+  }
+  const codeFrame = codeFrameColumns(rawLines, location)
+  const stackLines = SplitLines.splitLines(error.stack)
+  const newStackLines = [
+    stackLines[0],
+    `    at ${importedFrom}:${line}:${column}`,
+    ...stackLines.slice(1),
+  ]
+  const newStack = newStackLines.join('\n')
+  return {
+    message,
+    stack: newStack,
+    codeFrame,
+  }
+}
+
 export const prepare = (error) => {
+  if (error && error.code === ErrorCodes.ERR_MODULE_NOT_FOUND) {
+    return prepareModuleNotFoundError(error)
+  }
   const message = error.message
   if (error && error.cause) {
     const cause = error.cause()
@@ -57,12 +111,8 @@ const fixBackslashes = (string) => {
   return string.replaceAll('\\\\', '\\')
 }
 
-const stringifyJson = (json) => {
-  return JSON.stringify(json, null, 2) + '\n'
-}
-
 export const prepareJsonError = (json, property, message) => {
-  const string = fixBackslashes(stringifyJson(json))
+  const string = fixBackslashes(Json.stringify(json))
   const stringifiedPropertyName = `"${property}"`
   const index = string.indexOf(stringifiedPropertyName) // TODO this could be wrong in some cases, find a better way
   console.log({ string, index })

package/src/parts/RipGrep/RipGrep.js

@@ -0,0 +1,30 @@
+import * as NodeChildProcess from 'node:child_process'
+import * as Assert from '../Assert/Assert.js'
+import * as Exec from '../Exec/Exec.js'
+import * as RgPath from '../RgPath/RgPath.js'
+
+export const ripGrepPath = process.env.RIP_GREP_PATH || RgPath.rgPath
+
+export const spawn = (args, options) => {
+  const childProcess = NodeChildProcess.spawn(RgPath.rgPath, args, options)
+  return {
+    on(event, listener) {
+      childProcess.on(event, listener)
+    },
+    once(event, listener) {
+      childProcess.once(event, listener)
+    },
+    stdout: childProcess.stdout,
+    stderr: childProcess.stderr,
+    kill() {
+      childProcess.kill()
+    },
+  }
+}
+
+export const exec = async (args, options) => {
+  Assert.array(args)
+  Assert.object(options)
+  const { stdout, stderr } = await Exec.exec(ripGrepPath, args, options)
+  return { stdout, stderr }
+}

package/src/parts/SearchFile/SearchFile.js

@@ -1,10 +1,8 @@
 import * as Assert from '../Assert/Assert.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
-import * as Exec from '../Exec/Exec.js'
 import * as LimitString from '../LimitString/LimitString.js'
-import * as RgPath from '../RgPath/RgPath.js'
-
-const ripGrepPath = process.env.RIP_GREP_PATH || RgPath.rgPath
+import * as RipGrep from '../RipGrep/RipGrep.js'
+import * as Logger from '../Logger/Logger.js'
 
 const isEnoentErrorLinux = (error) => {
   return error.code === ErrorCodes.ENOENT
@@ -32,25 +30,23 @@ export const searchFile = async (path, searchTerm, limit) => {
     Assert.string(path)
     Assert.string(searchTerm)
     Assert.number(limit)
-    const { stdout, stderr } = await Exec.exec(
-      ripGrepPath,
-      ['--files', '--sort-files'],
-      {
-        cwd: path,
-      }
-    )
+    const { stdout, stderr } = await RipGrep.exec(['--files', '--sort-files'], {
+      cwd: path,
+    })
     return LimitString.limitString(stdout, limit)
   } catch (error) {
     // @ts-ignore
     if (isEnoentError(error)) {
-      console.info(`[info] ripgrep could not be found at "${ripGrepPath}"`)
-      return []
+      Logger.info(
+        `[shared-process] ripgrep could not be found at "${RipGrep.ripGrepPath}"`
+      )
+      return ``
     }
     // @ts-ignore
     if (error && error.stderr === '') {
-      return []
+      return ``
     }
-    console.error(error)
-    return []
+    Logger.error(error)
+    return ``
   }
 }

package/src/parts/TextSearch/TextSearch.ipc.js

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

package/src/parts/{Search/Search.js → TextSearch/TextSearch.js}

@@ -1,21 +1,19 @@
-import { spawn } from 'node:child_process'
-import * as Platform from '../Platform/Platform.js'
-import * as RgPath from '../RgPath/RgPath.js'
+import * as RipGrep from '../RipGrep/RipGrep.js'
 import * as RipGrepParsedLineType from '../RipGrepParsedLineType/RipGrepParsedLineType.js'
 import * as TextSearchResultType from '../TextSearchResultType/TextSearchResultType.js'
 
 const MAX_SEARCH_RESULTS = 300
 
-const BEFORE = 20
-const AFTER = 20
+const CHARS_BEFORE = 20
+const CHARS_AFTER = 50
 
 const toSearchResult = (parsedLine) => {
   const results = []
   const lines = parsedLine.data.lines.text
   const lineNumber = parsedLine.data.line_number
   for (const submatch of parsedLine.data.submatches) {
-    const previewStart = Math.max(submatch.start - BEFORE, 0)
-    const previewEnd = Math.min(submatch.end + AFTER, lines.length)
+    const previewStart = Math.max(submatch.start - CHARS_BEFORE, 0)
+    const previewEnd = Math.min(submatch.end + CHARS_AFTER, lines.length)
     const previewText = lines.slice(previewStart, previewEnd)
     results.push({
       type: TextSearchResultType.Match,
@@ -35,30 +33,26 @@ const toSearchResult = (parsedLine) => {
 // issue 2 https://github.com/BurntSushi/ripgrep/issues/1892
 // remove workaround when ripgrep is fixed
 
-// TODO no function call at toplevel!
-const useNice = !Platform.isWindows
 // TODO stats flag might not be necessary
 // TODO update client
 // TODO not always run nice, maybe configure nice via flag/options
 
-export const search = async (searchDir, searchString) => {
+export const search = async (searchDir, searchString, { threads = 1 } = {}) => {
   // TODO reject promise when ripgrep search fails
   return new Promise((resolve, reject) => {
     const ripGrepArgs = [
       '--smart-case',
       '--stats',
       '--json',
+      '--threads',
+      `${threads}`,
       '--fixed-strings',
       searchString,
       '.',
     ]
-    const childProcess = useNice
-      ? spawn('nice', ['-20', RgPath.rgPath, ...ripGrepArgs], {
-          cwd: searchDir,
-        })
-      : spawn(RgPath.rgPath, ripGrepArgs, {
-          cwd: searchDir,
-        })
+    const childProcess = RipGrep.spawn(ripGrepArgs, {
+      cwd: searchDir,
+    })
     const allSearchResults = Object.create(null)
     let buffer = ''
     let stats = {}

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

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