@lvce-editor/main-process 4.6.0 → 4.8.0

package/dist/mainProcessMain.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { inspect } from 'node:util';
 import { spawn } from 'node:child_process';
 import { Console } from 'node:console';
-import { createWriteStream, readFileSync, existsSync } from 'node:fs';
+import { createWriteStream, readFileSync, openAsBlob, existsSync } from 'node:fs';
 import { tmpdir, homedir } from 'node:os';
 import * as NodePath from 'node:path';
 import { dirname, join as join$1 } from 'node:path';
@@ -1215,7 +1215,7 @@ function requireLib () {
 	}
 	let deprecationWarningShown = false;
 	const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
-	function getMarkerLines(loc, source, opts) {
+	function getMarkerLines(loc, source, opts, startLineBaseZero) {
 	  const startLoc = Object.assign({
 	    column: 0,
 	    line: -1
@@ -1225,9 +1225,9 @@ function requireLib () {
 	    linesAbove = 2,
 	    linesBelow = 3
 	  } = opts || {};
-	  const startLine = startLoc.line;
+	  const startLine = startLoc.line - startLineBaseZero;
 	  const startColumn = startLoc.column;
-	  const endLine = endLoc.line;
+	  const endLine = endLoc.line - startLineBaseZero;
 	  const endColumn = endLoc.column;
 	  let start = Math.max(startLine - (linesAbove + 1), 0);
 	  let end = Math.min(source.length, endLine + linesBelow);
@@ -1273,19 +1273,20 @@ function requireLib () {
 	}
 	function codeFrameColumns(rawLines, loc, opts = {}) {
 	  const shouldHighlight = opts.forceColor || isColorSupported() && opts.highlightCode;
+	  const startLineBaseZero = (opts.startLine || 1) - 1;
 	  const defs = getDefs(shouldHighlight);
 	  const lines = rawLines.split(NEWLINE);
 	  const {
 	    start,
 	    end,
 	    markerLines
-	  } = getMarkerLines(loc, lines, opts);
+	  } = getMarkerLines(loc, lines, opts, startLineBaseZero);
 	  const hasColumns = loc.start && typeof loc.start.column === "number";
-	  const numberMaxWidth = String(end).length;
+	  const numberMaxWidth = String(end + startLineBaseZero).length;
 	  const highlightedLines = shouldHighlight ? highlight(rawLines) : rawLines;
 	  let frame = highlightedLines.split(NEWLINE, end).slice(start, end).map((line, index) => {
 	    const number = start + 1 + index;
-	    const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
+	    const paddedNumber = ` ${number + startLineBaseZero}`.slice(-numberMaxWidth);
 	    const gutter = ` ${paddedNumber} |`;
 	    const hasMarker = markerLines[number];
 	    const lastMarkerLine = !markerLines[number + 1];
@@ -1437,7 +1438,7 @@ const cleanStack = stack => {
 };
 const Utf8 = 'utf8';
 const ERR_MODULE_NOT_FOUND$1 = 'ERR_MODULE_NOT_FOUND';
-const getActualPath = fileUri => {
+const getActualPath$1 = fileUri => {
   if (fileUri.startsWith('file://')) {
     return fileURLToPath(fileUri);
   }
@@ -1519,7 +1520,7 @@ const prepare = error => {
       }
       if (match) {
         const [_, path, line, column] = match;
-        const actualPath = getActualPath(path);
+        const actualPath = getActualPath$1(path);
         const rawLines = readFileSync(actualPath, Utf8);
         const location = {
           start: {
@@ -3121,14 +3122,14 @@ const execute$1 = (command, ...args) => {
 };
 
 const Two = '2.0';
-const create$s = (method, params) => {
+const create$t = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$r = (id, method, params) => {
+const create$s = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -3138,14 +3139,14 @@ const create$r = (id, method, params) => {
   return message;
 };
 let id = 0;
-const create$q = () => {
+const create$r = () => {
   return ++id;
 };
 
 /* eslint-disable n/no-unsupported-features/es-syntax */
 
 const registerPromise = map => {
-  const id = create$q();
+  const id = create$r();
   const {
     promise,
     resolve
@@ -3163,7 +3164,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$r(id, method, params);
+  const message = create$s(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -3199,7 +3200,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$s(method, params);
+      const message = create$t(method, params);
       ipc.send(message);
     }
   };
@@ -3235,7 +3236,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$p = async ({
+const create$q = async ({
   commandMap,
   messagePort,
   requiresSocket
@@ -3254,9 +3255,9 @@ const create$p = async ({
 };
 const ElectronMessagePortRpcClient = {
   __proto__: null,
-  create: create$p
+  create: create$q
 };
-const create$n = async ({
+const create$o = async ({
   argv,
   commandMap,
   env,
@@ -3285,9 +3286,9 @@ const create$n = async ({
 };
 const ElectronUtilityProcessRpcParent = {
   __proto__: null,
-  create: create$n
+  create: create$o
 };
-const create$m = async ({
+const create$n = async ({
   commandMap,
   requiresSocket,
   webContents
@@ -3305,7 +3306,7 @@ const create$m = async ({
 };
 const ElectronWebContentsRpcClient = {
   __proto__: null,
-  create: create$m
+  create: create$n
 };
 
 const commandMapRef = Object.create(null);
@@ -3345,16 +3346,12 @@ const getEntries = () => {
   const uiEntries = entries.map(toUiEntry);
   return uiEntries;
 };
-const clearMarks = () => {
-  performance.clearMarks();
-};
 const {
   timeOrigin
 } = performance;
 
 const Performance = {
 	__proto__: null,
-	clearMarks,
 	getEntries,
 	mark,
 	timeOrigin
@@ -3922,25 +3919,6 @@ const handleSecondInstance = async (event, commandLine, workingDirectory, additi
   await handleReady(parsedArgs, workingDirectory);
 };
 
-const normalizePath = fullPath => {
-  if (fullPath.startsWith('file://')) {
-    return fileURLToPath(fullPath);
-  }
-  return fullPath;
-};
-
-const showItemInFolder = fullPath => {
-  const normalized = normalizePath(fullPath);
-  shell.showItemInFolder(normalized);
-};
-const openPath = async path => {
-  // TODO handle error
-  await shell.openPath(path);
-};
-const openExternal$1 = async url => {
-  await shell.openExternal(url);
-};
-
 const ContextMenu = 'context-menu';
 const WillNavigate = 'will-navigate';
 const DidNavigate = 'did-navigate';
@@ -3951,6 +3929,21 @@ const BeforeInputEvent = 'before-input-event';
 const Allow = 'allow';
 const Deny = 'deny';
 
+const shouldOpenExternal = url => {
+  if (url.startsWith('http:') || url.startsWith('https:')) {
+    return true;
+  }
+  return false;
+};
+
+const openExternal = async url => {
+  string(url);
+  if (!shouldOpenExternal(url)) {
+    throw new VError(`only http or https urls are allowed`);
+  }
+  await shell.openExternal(url);
+};
+
 const state$3 = {
   canceled: Object.create(null),
   fallThroughKeyBindings: [],
@@ -3998,8 +3991,7 @@ const shouldAllowNavigation = webContentsId => {
 const handleWebContentsWindowOpen = ({
   url
 }) => {
-  // @ts-ignore
-  void openExternal$1(url);
+  void openExternal(url);
   return {
     action: Deny
   };
@@ -4187,6 +4179,23 @@ const getElectronFileResponseIpc = async (url, request) => {
   return response;
 };
 
+/* eslint-disable n/no-unsupported-features/node-builtins */
+const getFileResponse = async (absolutePath, headers) => {
+  // TODO support request method head
+  const blob = await openAsBlob(absolutePath);
+  const response = new Response(blob, {
+    headers,
+    status: 200
+  });
+  return response;
+};
+
+const getNotFoundResponse = () => {
+  return new Response('Not Found', {
+    status: 404
+  });
+};
+
 let config;
 const createConfig = () => {
   const configPath = join$1(root, 'config.json');
@@ -4205,6 +4214,15 @@ const getRelativePath = url => {
   const relative = url.slice(scheme.length + 4);
   return relative;
 };
+const getActualPath = relative => {
+  const actual = relative === '/' ? '/index.html' : relative;
+  return actual;
+};
+const getAbsolutePath = relative => {
+  const actual = getActualPath(relative);
+  const absolutePath = join$1(root, 'static', actual);
+  return absolutePath;
+};
 const getElectronFileResponseConfig = async (url, request) => {
   const parsedConfig = getOrCreateConfig();
   const {
@@ -4215,26 +4233,17 @@ const getElectronFileResponseConfig = async (url, request) => {
   if (relative.startsWith('/remote')) {
     return getElectronFileResponseIpc(url, request);
   }
-  const actual = relative === '/' ? '/index.html' : relative;
+  const actual = getActualPath(relative);
   const match = files[actual];
   if (match === undefined) {
-    return new Response('Not Found', {
-      status: 404
-    });
+    return getNotFoundResponse();
   }
   const responseHeaders = headers[match];
-  const absolutePath = join$1(root, 'static', actual);
+  const absolutePath = getAbsolutePath(match);
   if (!existsSync(absolutePath)) {
-    return new Response('Not Found', {
-      status: 404
-    });
+    return getNotFoundResponse();
   }
-  const content = readFileSync(absolutePath, 'utf8');
-  const response = new Response(content, {
-    headers: responseHeaders,
-    status: 200
-  });
-  return response;
+  return getFileResponse(absolutePath, responseHeaders);
 };
 
 const getElectronFileResponse = async (url, request) => {
@@ -4244,18 +4253,9 @@ const getElectronFileResponse = async (url, request) => {
   return getElectronFileResponseConfig(url, request);
 };
 
-/**
- *
- * @param {Headers} headers
- */
 const serializeRequestHeaders = headers => {
   return Object.fromEntries(headers);
 };
-
-/**
- *
- * @param {Request} request
- */
 const serializeRequest = request => {
   return {
     headers: serializeRequestHeaders(request.headers),
@@ -4263,10 +4263,6 @@ const serializeRequest = request => {
   };
 };
 
-/**
- *
- * @param {GlobalRequest} request
- */
 const handleRequest = request => {
   const serialized = serializeRequest(request);
   return getElectronFileResponse(request.url, serialized);
@@ -4950,6 +4946,22 @@ const getBounds = () => {
   };
 };
 
+const normalizePath = fullPath => {
+  if (fullPath.startsWith('file://')) {
+    return fileURLToPath(fullPath);
+  }
+  return fullPath;
+};
+
+const showItemInFolder = fullPath => {
+  const normalized = normalizePath(fullPath);
+  shell.showItemInFolder(normalized);
+};
+const openPath = async path => {
+  // TODO handle error
+  await shell.openPath(path);
+};
+
 const disposeWebContents = webContents => {
   if (webContents.close) {
     // electron v22
@@ -6205,21 +6217,6 @@ const create$1 = async ({
   return ipc;
 };
 
-const shouldOpenExternal = url => {
-  if (url.startsWith('http:') || url.startsWith('https:')) {
-    return true;
-  }
-  return false;
-};
-
-const openExternal = async url => {
-  string(url);
-  if (!shouldOpenExternal(url)) {
-    throw new VError(`only http or https urls are allowed`);
-  }
-  await shell.openExternal(url);
-};
-
 const Dash = '-';
 const Space = ' ';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "4.6.0",
+  "version": "4.8.0",
   "keywords": [
     "lvce-editor",
     "electron"
@@ -14,7 +14,7 @@
   "type": "module",
   "main": "dist/mainProcessMain.js",
   "dependencies": {
-    "electron": "40.0.0"
+    "electron": "40.1.0"
   },
   "engines": {
     "node": ">=22"