innetjs 3.1.0 → 3.2.0

package/_virtual/_rollup-plugin-process-env.js

@@ -1,7 +1,7 @@
 'use strict';
 
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"3.1.0"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"3.2.0"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/_virtual/_rollup-plugin-process-env.mjs

@@ -1,5 +1,5 @@
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"3.1.0"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"3.2.0"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/bin/innet

@@ -3,6 +3,7 @@
 
 var commander = require('commander');
 var tslib = require('tslib');
+var codeFrame = require('@babel/code-frame');
 var logger = require('@cantinc/logger');
 var commonjs = require('@rollup/plugin-commonjs');
 var eslint = require('@rollup/plugin-eslint');
@@ -167,6 +168,71 @@ function getNpmTag(version) {
     const match = version.match(NPM_TAG);
     return match ? match[1] : 'latest';
 }
+function printErrorWithFrame(output, deep = 0, hide = false) {
+    var _a, _b, _c, _d, _e;
+    if (!output)
+        return '';
+    const input = output.split('\n');
+    const start = input.findIndex(line => line.trim().startsWith(deep ? '[cause]: Error:' : 'Error:'));
+    if (!~start)
+        return output;
+    const inputFrame = input.slice(0, start);
+    const end = input.slice(start + 1).findIndex(line => line.trim().startsWith('[cause]: Error:'));
+    const inputBody = input.slice(start, ~end ? start + end - 1 : undefined);
+    const inputCauses = ~end ? input.slice(start + end - 1) : [];
+    const bodyStackStart = inputBody.findIndex(line => line.trim().startsWith('at '));
+    const bodyText = ~bodyStackStart ? inputBody.slice(0, bodyStackStart).join('\n') : inputBody.join('\n');
+    const bodyStack = ~bodyStackStart ? inputBody.slice(bodyStackStart) : [];
+    const filePathWithNumber = bodyStack.length ? (_a = bodyStack[0].match(/\(([^(]+)\)$/)) === null || _a === void 0 ? void 0 : _a[1] : undefined;
+    const splitFilePath = (_b = filePathWithNumber === null || filePathWithNumber === void 0 ? void 0 : filePathWithNumber.split(':')) !== null && _b !== void 0 ? _b : [];
+    const filePath = (_c = splitFilePath[0]) === null || _c === void 0 ? void 0 : _c.trim();
+    const line = Number((_d = splitFilePath[1]) !== null && _d !== void 0 ? _d : 1);
+    const column = Number((_e = splitFilePath[2]) !== null && _e !== void 0 ? _e : 1);
+    let frame = '';
+    if (filePath && !filePath.includes('node_modules')) {
+        try {
+            const source = fs__default["default"].readFileSync(filePath, 'utf8');
+            frame = codeFrame.codeFrameColumns(source, { start: { line, column } }, { highlightCode: true });
+        }
+        catch (e) { }
+    }
+    else {
+        frame = inputFrame.join('\n');
+    }
+    const title = bodyText.trim();
+    const baseOffset = ' '.repeat(2);
+    const offset = baseOffset.repeat(deep);
+    const titleOffset = offset + baseOffset + baseOffset;
+    let hiddenCount = 0;
+    let collapse = titleOffset + 'at ... (0 more node_modules calls)';
+    const stack = hide
+        ? bodyStack.slice(1).reduce((cur, line) => {
+            if (line.includes('node_modules')) {
+                if (cur.at(-1) === collapse) {
+                    collapse = collapse.replace(`${hiddenCount} more`, `${++hiddenCount} more`);
+                    return [
+                        ...cur.slice(0, -1),
+                        collapse,
+                    ];
+                }
+                collapse = collapse.replace(`${hiddenCount} more`, `${++hiddenCount} more`);
+                return [...cur, collapse];
+            }
+            hiddenCount = 0;
+            collapse = titleOffset + 'at ... (0 more node_modules calls)';
+            return [...cur, line];
+        }, [])
+        : bodyStack.slice(1);
+    return [
+        chalk__default["default"].red(`${titleOffset}${title}`),
+        bodyStack[0],
+        frame && `${offset}${frame.replaceAll('\n', `\n${offset}`)}`,
+        ...stack
+            .filter(line => line.trim() !== '}')
+            .map(line => line.includes('node_modules') ? chalk__default["default"].gray(line) : line),
+        printErrorWithFrame(inputCauses.join('\n'), deep + 1, hide),
+    ].filter(Boolean).join('\n');
+}
 const scriptExtensions = ['ts', 'js', 'tsx', 'jsx'];
 const indexExt = scriptExtensions.join(',');
 class InnetJS {
@@ -359,7 +425,7 @@ class InnetJS {
             }
         });
     }
-    start({ node = false, inject = false, error = false, index = 'index', } = {}) {
+    start({ node = false, inject = false, error = false, usualConsoleOutput = false, index = 'index', } = {}) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const pkg = yield this.getPackage();
             const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
@@ -389,8 +455,11 @@ class InnetJS {
                     if (warning.code === 'THIS_IS_UNDEFINED' || warning.code === 'SOURCEMAP_ERROR')
                         return;
                     if (warning.plugin === 'typescript') {
-                        const { loc: { line, column, file }, frame, message } = warning;
-                        console.log(`ERROR in ${file}:${line}:${column}`);
+                        const { loc, frame, message } = warning;
+                        if (loc) {
+                            const { line, column, file } = loc;
+                            console.log(`ERROR in ${file}:${line}:${column}`);
+                        }
                         console.log(message);
                         console.log(frame);
                         return;
@@ -408,7 +477,7 @@ class InnetJS {
                 options.plugins.push(pluginNodeResolve.nodeResolve(), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer(input));
+                }), this.createServer(input, error, usualConsoleOutput));
             }
             else {
                 const key = path__default["default"].basename(this.sslKey) !== this.sslKey
@@ -801,17 +870,34 @@ class InnetJS {
             }),
         };
     }
-    createServer(input) {
+    createServer(input, error = false, usualConsoleOutput = false) {
         const apps = {};
         return {
             name: 'server',
             writeBundle: () => tslib.__awaiter(this, void 0, void 0, function* () {
                 var _a;
                 for (const file of input) {
+                    let stderrBuffer = '';
                     const { name } = path__default["default"].parse(file);
                     (_a = apps[name]) === null || _a === void 0 ? void 0 : _a.kill();
                     const filePath = path__default["default"].resolve(this.devBuildFolder, `${name}.js`);
-                    apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                    if (usualConsoleOutput) {
+                        apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                        return;
+                    }
+                    const child = spawn('node', ['-r', 'source-map-support/register', filePath], {
+                        stdio: ['inherit', 'pipe'],
+                    });
+                    apps[name] = child;
+                    child.stderr.on('data', (chunk) => {
+                        stderrBuffer += chunk.toString();
+                    });
+                    child.on('close', (code) => {
+                        if (code !== 0 && stderrBuffer) {
+                            console.error(printErrorWithFrame(stderrBuffer, 0, !error));
+                            stderrBuffer = '';
+                        }
+                    });
                 }
             }),
         };
@@ -819,7 +905,7 @@ class InnetJS {
 }
 
 (function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"3.1.0"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"3.2.0"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {
@@ -864,11 +950,12 @@ commander.program
     .command('start')
     .description('Start development with innet boilerplate')
     .option('-n, --node', 'Start development for Node.js')
+    .option('-uco, --usual-console-output', 'Removes custom error output (code-frame, colors...)')
     .option('-in, --inject', 'Injects script element into index.html')
     .option('-i, --index <index>', 'Root index file name', 'index')
     .addOption(errorOption)
-    .action(({ error, node, index, inject }) => {
-    innetJS.start({ node, error, index, inject }).catch(e => {
+    .action(({ error, node, index, inject, usualConsoleOutput }) => {
+    innetJS.start({ node, error, index, inject, usualConsoleOutput }).catch(e => {
         if (error) {
             console.error(e);
             process.exit(1);

package/index.d.ts

@@ -62,10 +62,11 @@ export declare class InnetJS {
         inject?: boolean;
         index?: string;
     }): Promise<void>;
-    start({ node, inject, error, index, }?: {
+    start({ node, inject, error, usualConsoleOutput, index, }?: {
         node?: boolean;
         inject?: boolean;
         error?: boolean;
+        usualConsoleOutput?: boolean;
         index?: string;
     }): Promise<void>;
     run(file: any, { config, exposeGc }?: {
@@ -79,5 +80,5 @@ export declare class InnetJS {
     increaseVersion(release: string): Promise<void>;
     getPackage(): Promise<Record<string, any>>;
     createClient(key: any, cert: any, pkg: any, index: string, inject: boolean): rollup.Plugin;
-    createServer(input: string[]): rollup.Plugin;
+    createServer(input: string[], error?: boolean, usualConsoleOutput?: boolean): rollup.Plugin;
 }

package/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./_virtual/_rollup-plugin-process-env.js');
 var tslib = require('tslib');
+var codeFrame = require('@babel/code-frame');
 var logger = require('@cantinc/logger');
 var commonjs = require('@rollup/plugin-commonjs');
 var eslint = require('@rollup/plugin-eslint');
@@ -95,6 +96,71 @@ function getNpmTag(version) {
     const match = version.match(NPM_TAG);
     return match ? match[1] : 'latest';
 }
+function printErrorWithFrame(output, deep = 0, hide = false) {
+    var _a, _b, _c, _d, _e;
+    if (!output)
+        return '';
+    const input = output.split('\n');
+    const start = input.findIndex(line => line.trim().startsWith(deep ? '[cause]: Error:' : 'Error:'));
+    if (!~start)
+        return output;
+    const inputFrame = input.slice(0, start);
+    const end = input.slice(start + 1).findIndex(line => line.trim().startsWith('[cause]: Error:'));
+    const inputBody = input.slice(start, ~end ? start + end - 1 : undefined);
+    const inputCauses = ~end ? input.slice(start + end - 1) : [];
+    const bodyStackStart = inputBody.findIndex(line => line.trim().startsWith('at '));
+    const bodyText = ~bodyStackStart ? inputBody.slice(0, bodyStackStart).join('\n') : inputBody.join('\n');
+    const bodyStack = ~bodyStackStart ? inputBody.slice(bodyStackStart) : [];
+    const filePathWithNumber = bodyStack.length ? (_a = bodyStack[0].match(/\(([^(]+)\)$/)) === null || _a === void 0 ? void 0 : _a[1] : undefined;
+    const splitFilePath = (_b = filePathWithNumber === null || filePathWithNumber === void 0 ? void 0 : filePathWithNumber.split(':')) !== null && _b !== void 0 ? _b : [];
+    const filePath = (_c = splitFilePath[0]) === null || _c === void 0 ? void 0 : _c.trim();
+    const line = Number((_d = splitFilePath[1]) !== null && _d !== void 0 ? _d : 1);
+    const column = Number((_e = splitFilePath[2]) !== null && _e !== void 0 ? _e : 1);
+    let frame = '';
+    if (filePath && !filePath.includes('node_modules')) {
+        try {
+            const source = fs__default["default"].readFileSync(filePath, 'utf8');
+            frame = codeFrame.codeFrameColumns(source, { start: { line, column } }, { highlightCode: true });
+        }
+        catch (e) { }
+    }
+    else {
+        frame = inputFrame.join('\n');
+    }
+    const title = bodyText.trim();
+    const baseOffset = ' '.repeat(2);
+    const offset = baseOffset.repeat(deep);
+    const titleOffset = offset + baseOffset + baseOffset;
+    let hiddenCount = 0;
+    let collapse = titleOffset + 'at ... (0 more node_modules calls)';
+    const stack = hide
+        ? bodyStack.slice(1).reduce((cur, line) => {
+            if (line.includes('node_modules')) {
+                if (cur.at(-1) === collapse) {
+                    collapse = collapse.replace(`${hiddenCount} more`, `${++hiddenCount} more`);
+                    return [
+                        ...cur.slice(0, -1),
+                        collapse,
+                    ];
+                }
+                collapse = collapse.replace(`${hiddenCount} more`, `${++hiddenCount} more`);
+                return [...cur, collapse];
+            }
+            hiddenCount = 0;
+            collapse = titleOffset + 'at ... (0 more node_modules calls)';
+            return [...cur, line];
+        }, [])
+        : bodyStack.slice(1);
+    return [
+        chalk__default["default"].red(`${titleOffset}${title}`),
+        bodyStack[0],
+        frame && `${offset}${frame.replaceAll('\n', `\n${offset}`)}`,
+        ...stack
+            .filter(line => line.trim() !== '}')
+            .map(line => line.includes('node_modules') ? chalk__default["default"].gray(line) : line),
+        printErrorWithFrame(inputCauses.join('\n'), deep + 1, hide),
+    ].filter(Boolean).join('\n');
+}
 const scriptExtensions = ['ts', 'js', 'tsx', 'jsx'];
 const indexExt = scriptExtensions.join(',');
 class InnetJS {
@@ -287,7 +353,7 @@ class InnetJS {
             }
         });
     }
-    start({ node = false, inject = false, error = false, index = 'index', } = {}) {
+    start({ node = false, inject = false, error = false, usualConsoleOutput = false, index = 'index', } = {}) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const pkg = yield this.getPackage();
             const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
@@ -317,8 +383,11 @@ class InnetJS {
                     if (warning.code === 'THIS_IS_UNDEFINED' || warning.code === 'SOURCEMAP_ERROR')
                         return;
                     if (warning.plugin === 'typescript') {
-                        const { loc: { line, column, file }, frame, message } = warning;
-                        console.log(`ERROR in ${file}:${line}:${column}`);
+                        const { loc, frame, message } = warning;
+                        if (loc) {
+                            const { line, column, file } = loc;
+                            console.log(`ERROR in ${file}:${line}:${column}`);
+                        }
                         console.log(message);
                         console.log(frame);
                         return;
@@ -336,7 +405,7 @@ class InnetJS {
                 options.plugins.push(pluginNodeResolve.nodeResolve(), string({
                     include: '**/*.*',
                     exclude: constants.stringExcludeNode,
-                }), this.createServer(input));
+                }), this.createServer(input, error, usualConsoleOutput));
             }
             else {
                 const key = path__default["default"].basename(this.sslKey) !== this.sslKey
@@ -729,17 +798,34 @@ class InnetJS {
             }),
         };
     }
-    createServer(input) {
+    createServer(input, error = false, usualConsoleOutput = false) {
         const apps = {};
         return {
             name: 'server',
             writeBundle: () => tslib.__awaiter(this, void 0, void 0, function* () {
                 var _a;
                 for (const file of input) {
+                    let stderrBuffer = '';
                     const { name } = path__default["default"].parse(file);
                     (_a = apps[name]) === null || _a === void 0 ? void 0 : _a.kill();
                     const filePath = path__default["default"].resolve(this.devBuildFolder, `${name}.js`);
-                    apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                    if (usualConsoleOutput) {
+                        apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                        return;
+                    }
+                    const child = spawn('node', ['-r', 'source-map-support/register', filePath], {
+                        stdio: ['inherit', 'pipe'],
+                    });
+                    apps[name] = child;
+                    child.stderr.on('data', (chunk) => {
+                        stderrBuffer += chunk.toString();
+                    });
+                    child.on('close', (code) => {
+                        if (code !== 0 && stderrBuffer) {
+                            console.error(printErrorWithFrame(stderrBuffer, 0, !error));
+                            stderrBuffer = '';
+                        }
+                    });
                 }
             }),
         };

package/index.mjs

@@ -1,5 +1,6 @@
 import './_virtual/_rollup-plugin-process-env.mjs';
 import { __awaiter } from 'tslib';
+import { codeFrameColumns } from '@babel/code-frame';
 import logger from '@cantinc/logger';
 import commonjs from '@rollup/plugin-commonjs';
 import eslint from '@rollup/plugin-eslint';
@@ -58,6 +59,71 @@ function getNpmTag(version) {
     const match = version.match(NPM_TAG);
     return match ? match[1] : 'latest';
 }
+function printErrorWithFrame(output, deep = 0, hide = false) {
+    var _a, _b, _c, _d, _e;
+    if (!output)
+        return '';
+    const input = output.split('\n');
+    const start = input.findIndex(line => line.trim().startsWith(deep ? '[cause]: Error:' : 'Error:'));
+    if (!~start)
+        return output;
+    const inputFrame = input.slice(0, start);
+    const end = input.slice(start + 1).findIndex(line => line.trim().startsWith('[cause]: Error:'));
+    const inputBody = input.slice(start, ~end ? start + end - 1 : undefined);
+    const inputCauses = ~end ? input.slice(start + end - 1) : [];
+    const bodyStackStart = inputBody.findIndex(line => line.trim().startsWith('at '));
+    const bodyText = ~bodyStackStart ? inputBody.slice(0, bodyStackStart).join('\n') : inputBody.join('\n');
+    const bodyStack = ~bodyStackStart ? inputBody.slice(bodyStackStart) : [];
+    const filePathWithNumber = bodyStack.length ? (_a = bodyStack[0].match(/\(([^(]+)\)$/)) === null || _a === void 0 ? void 0 : _a[1] : undefined;
+    const splitFilePath = (_b = filePathWithNumber === null || filePathWithNumber === void 0 ? void 0 : filePathWithNumber.split(':')) !== null && _b !== void 0 ? _b : [];
+    const filePath = (_c = splitFilePath[0]) === null || _c === void 0 ? void 0 : _c.trim();
+    const line = Number((_d = splitFilePath[1]) !== null && _d !== void 0 ? _d : 1);
+    const column = Number((_e = splitFilePath[2]) !== null && _e !== void 0 ? _e : 1);
+    let frame = '';
+    if (filePath && !filePath.includes('node_modules')) {
+        try {
+            const source = fs.readFileSync(filePath, 'utf8');
+            frame = codeFrameColumns(source, { start: { line, column } }, { highlightCode: true });
+        }
+        catch (e) { }
+    }
+    else {
+        frame = inputFrame.join('\n');
+    }
+    const title = bodyText.trim();
+    const baseOffset = ' '.repeat(2);
+    const offset = baseOffset.repeat(deep);
+    const titleOffset = offset + baseOffset + baseOffset;
+    let hiddenCount = 0;
+    let collapse = titleOffset + 'at ... (0 more node_modules calls)';
+    const stack = hide
+        ? bodyStack.slice(1).reduce((cur, line) => {
+            if (line.includes('node_modules')) {
+                if (cur.at(-1) === collapse) {
+                    collapse = collapse.replace(`${hiddenCount} more`, `${++hiddenCount} more`);
+                    return [
+                        ...cur.slice(0, -1),
+                        collapse,
+                    ];
+                }
+                collapse = collapse.replace(`${hiddenCount} more`, `${++hiddenCount} more`);
+                return [...cur, collapse];
+            }
+            hiddenCount = 0;
+            collapse = titleOffset + 'at ... (0 more node_modules calls)';
+            return [...cur, line];
+        }, [])
+        : bodyStack.slice(1);
+    return [
+        chalk.red(`${titleOffset}${title}`),
+        bodyStack[0],
+        frame && `${offset}${frame.replaceAll('\n', `\n${offset}`)}`,
+        ...stack
+            .filter(line => line.trim() !== '}')
+            .map(line => line.includes('node_modules') ? chalk.gray(line) : line),
+        printErrorWithFrame(inputCauses.join('\n'), deep + 1, hide),
+    ].filter(Boolean).join('\n');
+}
 const scriptExtensions = ['ts', 'js', 'tsx', 'jsx'];
 const indexExt = scriptExtensions.join(',');
 class InnetJS {
@@ -250,7 +316,7 @@ class InnetJS {
             }
         });
     }
-    start({ node = false, inject = false, error = false, index = 'index', } = {}) {
+    start({ node = false, inject = false, error = false, usualConsoleOutput = false, index = 'index', } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const pkg = yield this.getPackage();
             const input = glob.sync(`src/${index}.{${indexExt}}`);
@@ -280,8 +346,11 @@ class InnetJS {
                     if (warning.code === 'THIS_IS_UNDEFINED' || warning.code === 'SOURCEMAP_ERROR')
                         return;
                     if (warning.plugin === 'typescript') {
-                        const { loc: { line, column, file }, frame, message } = warning;
-                        console.log(`ERROR in ${file}:${line}:${column}`);
+                        const { loc, frame, message } = warning;
+                        if (loc) {
+                            const { line, column, file } = loc;
+                            console.log(`ERROR in ${file}:${line}:${column}`);
+                        }
                         console.log(message);
                         console.log(frame);
                         return;
@@ -299,7 +368,7 @@ class InnetJS {
                 options.plugins.push(nodeResolve(), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer(input));
+                }), this.createServer(input, error, usualConsoleOutput));
             }
             else {
                 const key = path.basename(this.sslKey) !== this.sslKey
@@ -692,17 +761,34 @@ class InnetJS {
             }),
         };
     }
-    createServer(input) {
+    createServer(input, error = false, usualConsoleOutput = false) {
         const apps = {};
         return {
             name: 'server',
             writeBundle: () => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 for (const file of input) {
+                    let stderrBuffer = '';
                     const { name } = path.parse(file);
                     (_a = apps[name]) === null || _a === void 0 ? void 0 : _a.kill();
                     const filePath = path.resolve(this.devBuildFolder, `${name}.js`);
-                    apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                    if (usualConsoleOutput) {
+                        apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                        return;
+                    }
+                    const child = spawn('node', ['-r', 'source-map-support/register', filePath], {
+                        stdio: ['inherit', 'pipe'],
+                    });
+                    apps[name] = child;
+                    child.stderr.on('data', (chunk) => {
+                        stderrBuffer += chunk.toString();
+                    });
+                    child.on('close', (code) => {
+                        if (code !== 0 && stderrBuffer) {
+                            console.error(printErrorWithFrame(stderrBuffer, 0, !error));
+                            stderrBuffer = '';
+                        }
+                    });
                 }
             }),
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -49,6 +49,7 @@
     "url": "https://github.com/d8corp/innetjs/issues"
   },
   "dependencies": {
+    "@babel/code-frame": "^7.29.0",
     "@cantinc/logger": "^1.1.0",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-eslint": "^9.0.1",
@@ -86,7 +87,6 @@
     "rollup-plugin-styles": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "sass": "^1.55.0",
-    "tmp": "^0.2.1",
-    "typescript": "^4.8.4"
+    "tmp": "^0.2.1"
   }
 }