@lvce-editor/shared-process 0.21.8 → 0.21.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.21.8",
+  "version": "0.21.10",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -17,21 +17,19 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.23.5",
     "@lvce-editor/assert": "^1.0.1",
-    "@lvce-editor/extension-host": "0.21.8",
-    "@lvce-editor/extension-host-helper-process": "0.21.8",
-    "@lvce-editor/json-rpc": "^0.4.0",
+    "@lvce-editor/extension-host": "0.21.10",
+    "@lvce-editor/extension-host-helper-process": "0.21.10",
+    "@lvce-editor/json-rpc": "^1.0.0",
     "@lvce-editor/jsonc-parser": "^1.1.0",
     "@lvce-editor/pretty-error": "^1.3.0",
-    "@lvce-editor/pty-host": "0.21.8",
+    "@lvce-editor/pty-host": "0.21.10",
     "@lvce-editor/verror": "^1.1.2",
     "debug": "^4.3.4",
     "execa": "^8.0.1",
     "exit-hook": "^4.0.0",
     "got": "^13.0.0",
     "is-object": "^1.0.2",
-    "lines-and-columns": "^2.0.4",
     "p-queue": "^8.0.1",
     "parse-json": "^8.1.0",
     "tar-fs": "^3.0.4",
@@ -39,10 +37,9 @@
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
-    "@lvce-editor/ripgrep": "^1.0.1",
+    "@lvce-editor/ripgrep": "^1.0.2",
     "extract-zip": "^2.0.1",
-    "open": "^10.0.1",
-    "symlink-dir": "^5.2.1",
+    "open": "^10.0.2",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",
     "trash": "^8.1.1"

package/src/parts/Json/Json.js

@@ -1,15 +1,17 @@
 // parsing error handling based on https://github.com/sindresorhus/parse-json/blob/main/index.js
 
-import { JsonParsingError } from '../JsonParsingError/JsonParsingError.js'
+import { VError } from '../VError/VError.js'
 import * as Character from '../Character/Character.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 export const parse = async (string, filePath) => {
   try {
     return JSON.parse(string)
   } catch (error) {
-    const JsonError = await import('../JsonError/JsonError.js')
-    const errorProps = JsonError.getErrorPropsFromError(error, string, filePath)
-    throw new JsonParsingError(errorProps.message, errorProps.codeFrame, errorProps.stack)
+    const betterError = new VError(error, `Failed to parse json at ${filePath}`)
+    // @ts-ignore
+    betterError.code = ErrorCodes.E_JSON_PARSE
+    throw betterError
   }
 }
 

package/src/parts/Platform/Platform.js

@@ -61,11 +61,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.21.8'
+export const version = '0.21.10'
 
-export const commit = 'b6072b1'
+export const commit = '09a5bdd'
 
-export const date = '2023-12-27T09:35:13.000Z'
+export const date = '2023-12-31T11:01:11.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/JsonError/JsonError.js

@@ -1,66 +0,0 @@
-import { codeFrameColumns } from '@babel/code-frame'
-import { LinesAndColumns } from 'lines-and-columns'
-
-// parsing error handling based on https://github.com/sindresorhus/parse-json/blob/main/index.js
-
-const emptyError = {
-  message: '',
-  stack: '',
-  codeFrame: '',
-}
-
-const RE_POSITION = /in JSON at position (\d+)/
-
-export const getErrorPropsFromError = (error, string, filePath) => {
-  const indexMatch = error.message.match(RE_POSITION)
-  if (indexMatch && indexMatch.length > 0) {
-    const lines = new LinesAndColumns(string)
-    const index = Number(indexMatch[1])
-    const location = lines.locationForIndex(index)
-    if (location) {
-      const line = location.line + 1
-      const column = location.column + 1
-      const codeFrame = codeFrameColumns(string, { start: { line, column } }, { highlightCode: false })
-      return {
-        codeFrame,
-        message: 'Json Parsing Error',
-        stack: `    at ${filePath}:${line}:${column}`,
-      }
-    }
-  }
-  if (string.length === 0) {
-    return {
-      codeFrame: ``,
-      message: 'Json Parsing Error: Cannot parse empty string',
-      stack: `    at ${filePath}`,
-    }
-  }
-
-  if (error.message === 'Unexpected end of JSON input') {
-    const lines = new LinesAndColumns(string)
-    const index = string.length - 1
-    const location = lines.locationForIndex(index)
-    if (location) {
-      const codeFrame = codeFrameColumns(string, { start: { line: location.line + 1, column: location.column + 1 } }, { highlightCode: false })
-      return {
-        codeFrame,
-        message: 'Json Parsing Error',
-        stack: `    at ${filePath}`,
-      }
-    }
-  }
-  return {
-    codeFrame: ``,
-    message: 'Json Parsing Error',
-    stack: `    at ${filePath}`,
-  }
-}
-
-export const getErrorProps = (string, filePath) => {
-  try {
-    JSON.parse(string)
-    return emptyError
-  } catch (error) {
-    return getErrorPropsFromError(error, string, filePath)
-  }
-}