uni-run 1.1.3 → 1.1.5

package/dist/app.js

@@ -36,35 +36,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const arg = __importStar(require("./arg"));
+const colors_1 = __importDefault(require("./lib/colors"));
 const execution_1 = __importDefault(require("./execution"));
 const getConfig_1 = __importDefault(require("./helpers/getConfig"));
 const argHelper_1 = require("./argHelper");
 const scriptExecutors_1 = __importDefault(require("./scriptExecutors"));
 const checkRuntime_1 = __importDefault(require("./scriptExecutors/checkRuntime"));
 const getUserExecutors_1 = __importDefault(require("./helpers/getUserExecutors"));
-const colors_1 = __importDefault(require("./lib/colors"));
 arg.app.on((_a, flags_1) => __awaiter(void 0, [_a, flags_1], void 0, function* ([script, listArs, trailingArgs], flags) {
     var _b;
-    const userExecutors = (0, getUserExecutors_1.default)(flags.cwd);
     const executionConfig = (0, getConfig_1.default)(flags.cwd);
+    const userExecutors = (0, getUserExecutors_1.default)(flags.cwd);
     const totalExecutors = [
         ...(Array.isArray(userExecutors) ? userExecutors : []),
         ...scriptExecutors_1.default,
     ];
     const scriptExecutor = totalExecutors.find((executor) => executor.exts.includes(script.split('.').pop()));
     if (!scriptExecutor) {
-        console.error('Unsupported script:', script);
-        return console.log('You may try "run exec YOUR_BIN script.ext -- --flags"');
+        console.error(colors_1.default.red('Unsupported script:'), colors_1.default.yellow(script));
+        return console.log(colors_1.default.bgGreen('TIPS:'), 'You may try', colors_1.default.cyan(`run exec <YOUR_BIN> ${colors_1.default.yellow(script)}`));
     }
     const executionOptions = (0, argHelper_1.mapFlagsToOptions)(flags);
     const runtime = scriptExecutor.getRuntime([script, ...listArs, ...trailingArgs], executionOptions, executionConfig);
-    (0, checkRuntime_1.default)(runtime);
-    execution_1.default.start(runtime.start, Object.assign(Object.assign({}, executionOptions), { watchExtensions: executionOptions.watchExtensions.length
+    if (!(yield (0, checkRuntime_1.default)(runtime)))
+        return;
+    const exec = new execution_1.default(Object.assign(Object.assign({}, executionOptions), { watchExtensions: executionOptions.watchExtensions.length
             ? executionOptions.watchExtensions
-            : [...scriptExecutor.exts, ...((_b = runtime.watchExts) !== null && _b !== void 0 ? _b : [])] }));
+            : [...scriptExecutor.exts, ...((_b = runtime.watchExts) !== null && _b !== void 0 ? _b : [])] }), runtime.exec, runtime.compile);
+    exec.start();
 }));
 arg.exec.on(([listArs, trailingArgs], flags) => {
-    execution_1.default.start([...listArs, ...trailingArgs], (0, argHelper_1.mapFlagsToOptions)(flags));
+    new execution_1.default((0, argHelper_1.mapFlagsToOptions)(flags), [...listArs, ...trailingArgs]).start();
 });
 arg.list.on(() => {
     const userExecutors = (0, getUserExecutors_1.default)();
@@ -74,6 +76,6 @@ arg.list.on(() => {
     ];
     console.log(colors_1.default.bold('Supported scripts:'));
     totalExecutors.forEach(({ name, exts }) => {
-        console.log(`- ${colors_1.default.magenta(name)}`, `[${exts.map((e) => '.' + colors_1.default.green(e)).join(', ')}]`);
+        console.log(`- ${colors_1.default.blue(name)}`, `[${exts.map((e) => '.' + colors_1.default.green(e)).join(', ')}]`);
     });
 });

package/dist/execution/index.d.ts

@@ -1,14 +1,16 @@
 import { ExecuteOptions } from '../argHelper';
 export default class Execution {
-    private command;
-    private args;
     private options;
+    private startArgs;
+    private preStartArgs?;
     private child;
     private benchMarkText;
     private isBenchmarkRunning;
     private isExecutionExecutedAnyTime;
-    static start([command, ...args]: string[], options: ExecuteOptions): Execution;
-    constructor(command: string, args: string[], options: ExecuteOptions);
+    constructor(options: ExecuteOptions, startArgs: string[], preStartArgs?: string[] | undefined);
+    start(): void;
+    private spawnSync;
+    private spawnAsync;
     private setup;
     private startProcess;
     private killProcess;

package/dist/execution/index.js

@@ -26,26 +26,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cross_spawn_1 = require("cross-spawn");
 const readline = __importStar(require("readline"));
+const cross_spawn_1 = require("cross-spawn");
 const watcher_1 = __importDefault(require("./watcher"));
 const colors_1 = __importDefault(require("../lib/colors"));
 const kill_process_1 = __importDefault(require("./kill-process"));
 class Execution {
-    static start([command, ...args], options) {
-        return new Execution(command, args, options);
-    }
-    constructor(command, args, options) {
-        this.command = command;
-        this.args = args;
+    constructor(options, startArgs, preStartArgs) {
         this.options = options;
+        this.startArgs = startArgs;
+        this.preStartArgs = preStartArgs;
         this.child = null;
         this.benchMarkText = colors_1.default.dim.green('# Execution time');
         this.isBenchmarkRunning = false;
         this.isExecutionExecutedAnyTime = false;
         this.setup();
+    }
+    start() {
         this.startProcess();
     }
+    spawnSync(args) {
+        const [command, ...args_] = args;
+        return (0, cross_spawn_1.sync)(command, args_, {
+            argv0: command,
+            cwd: this.options.cwd,
+            shell: this.options.shell,
+            env: Object.assign(Object.assign({}, process.env), this.options.env),
+            stdio: this.options.silent ? 'ignore' : 'inherit',
+        });
+    }
+    spawnAsync(args) {
+        const [command, ...args_] = args;
+        return (0, cross_spawn_1.spawn)(command, args_, {
+            argv0: command,
+            cwd: this.options.cwd,
+            shell: this.options.shell,
+            env: Object.assign(Object.assign({}, process.env), this.options.env),
+            stdio: this.options.silent ? 'ignore' : 'inherit',
+        });
+    }
     setup() {
         var _a, _b;
         if (this.options.benchmarkPrefix) {
@@ -80,13 +99,9 @@ class Execution {
         this.clearBeforeStart();
         this.renderInfoLogs();
         this.isExecutionExecutedAnyTime = true;
-        this.child = (0, cross_spawn_1.spawn)(this.command, this.args, {
-            argv0: this.command,
-            cwd: this.options.cwd,
-            shell: this.options.shell,
-            env: Object.assign(Object.assign({}, process.env), this.options.env),
-            stdio: this.options.silent ? 'ignore' : 'inherit',
-        });
+        if (this.preStartArgs)
+            this.spawnSync(this.preStartArgs);
+        this.child = this.spawnAsync(this.startArgs);
         this.child.on('exit', (code) => {
             if (code && code > 0) {
                 console.log(colors_1.default.red(`Process exited with code: ${colors_1.default.yellow(String(code))}`));

package/dist/helpers/getConfig.js

@@ -7,7 +7,7 @@ exports.default = default_1;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
-function default_1(...extraDirs) {
+function inner(...extraDirs) {
     const userPath = (0, utils_1.getUserPath)();
     if (!userPath)
         return;
@@ -18,7 +18,9 @@ function default_1(...extraDirs) {
         const config = fs_1.default.readFileSync(configFile, 'utf-8');
         return JSON.parse(config);
     }
-    catch (_a) {
-        return {};
-    }
+    catch (_a) { }
+}
+function default_1(...extraDirs) {
+    var _a;
+    return (_a = inner(...extraDirs)) !== null && _a !== void 0 ? _a : {};
 }

package/dist/scriptExecutors/checkRuntime.d.ts

@@ -1,2 +1,2 @@
 import { RuntimeOptions } from './types.t';
-export default function (runtime: RuntimeOptions): void;
+export default function (runtime: RuntimeOptions): Promise<boolean>;

package/dist/scriptExecutors/checkRuntime.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,25 +17,30 @@ const colors_1 = __importDefault(require("../lib/colors"));
 const confirm_1 = __importDefault(require("@inquirer/confirm"));
 const cross_spawn_1 = require("cross-spawn");
 function default_1(runtime) {
-    var _a, _b, _c, _d;
-    if (!((_b = (_a = runtime.install) === null || _a === void 0 ? void 0 : _a.check) === null || _b === void 0 ? void 0 : _b.length))
-        return;
-    const [command, ...args] = runtime.install.check;
-    const result = (0, cross_spawn_1.sync)(command, args, { stdio: 'ignore' });
-    if (result.status === 0)
-        return;
-    if ((_c = runtime.install.hints) === null || _c === void 0 ? void 0 : _c.length) {
-        console.error(`${runtime.start[0]} is not installed.`);
-        console.log(colors_1.default.bold('How to install:'));
-        runtime.install.hints.forEach((hint) => console.log(hint));
-    }
-    if ((_d = runtime.install.command) === null || _d === void 0 ? void 0 : _d.length) {
-        (0, confirm_1.default)({ message: 'Do you want to install it?' }).then((ans) => {
-            var _a;
-            if (!ans)
-                return;
-            const [command, ...args] = (_a = runtime.install) === null || _a === void 0 ? void 0 : _a.command;
-            (0, cross_spawn_1.sync)(command, args, { stdio: 'inherit' });
-        });
-    }
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        const install = runtime.install;
+        if (!install)
+            return true;
+        if (!((_a = install.check) === null || _a === void 0 ? void 0 : _a.length))
+            return true;
+        const [checkCmd, ...checkArgs] = install.check;
+        const result = (0, cross_spawn_1.sync)(checkCmd, checkArgs, { stdio: 'ignore' });
+        if (result.status === 0)
+            return true;
+        console.error(colors_1.default.yellow(runtime.exec[0]) + colors_1.default.red(' is not installed.'));
+        if (!((_b = install.command) === null || _b === void 0 ? void 0 : _b.length))
+            return false;
+        const ans = yield (0, confirm_1.default)({ message: 'Do you want to install it?' });
+        if (ans) {
+            const [installCmd, ...installArgs] = install.command;
+            const result = (0, cross_spawn_1.sync)(installCmd, installArgs, { stdio: 'inherit' });
+            return result.status === 0;
+        }
+        if ((_c = install.hints) === null || _c === void 0 ? void 0 : _c.length) {
+            console.log(colors_1.default.bold('How to install:'));
+            install.hints.forEach((hint) => console.log(hint));
+        }
+        return false;
+    });
 }

package/dist/scriptExecutors/index.js

@@ -23,7 +23,8 @@ exports.default = (0, as_1.default)([
                     break;
             }
             return {
-                start: [runtime, ...args],
+                exec: [runtime, ...args],
+                compile: ['echo', 'hello'],
                 install: {
                     check: [runtime, '--version'],
                     hints: installHints,
@@ -56,7 +57,7 @@ exports.default = (0, as_1.default)([
                     break;
             }
             return {
-                start: [runtime, ...args],
+                exec: [runtime, ...args],
                 watchExts: ['js', 'javascript', 'jsx', 'cjs', 'cjsx', 'mjs', 'mjsx'],
                 install: {
                     check: [runtime, '--version'],
@@ -70,7 +71,7 @@ exports.default = (0, as_1.default)([
         exts: ['py'],
         getRuntime(args, options, config) {
             return {
-                start: ['python', ...args],
+                exec: ['python', ...args],
                 install: {
                     check: ['python', '--version'],
                     hints: ['Please install Python from https://www.python.org'],
@@ -83,7 +84,7 @@ exports.default = (0, as_1.default)([
         exts: ['java'],
         getRuntime(args, options, config) {
             return {
-                start: ['java', ...args],
+                exec: ['java', ...args],
                 install: {
                     check: ['java', '--version'],
                     hints: ['Please install Java from https://www.oracle.com/java'],
@@ -96,7 +97,7 @@ exports.default = (0, as_1.default)([
         exts: ['ps1'],
         getRuntime(args, options, config) {
             return {
-                start: ['powershell', '-File', ...args],
+                exec: ['powershell', '-File', ...args],
                 install: {
                     check: ['powershell', '-command', 'echo ok'],
                     hints: [
@@ -111,7 +112,7 @@ exports.default = (0, as_1.default)([
         exts: ['cmd', 'bat'],
         getRuntime(args, options, config) {
             return {
-                start: ['cmd', '/c', ...args],
+                exec: ['cmd', '/c', ...args],
                 install: {
                     check: ['cmd', '/c', 'echo ok'],
                     hints: ['Please install Command Prompt from Windows'],
@@ -124,7 +125,7 @@ exports.default = (0, as_1.default)([
         exts: ['sh'],
         getRuntime(args, options, config) {
             return {
-                start: ['bash', ...args],
+                exec: ['bash', ...args],
                 install: {
                     check: ['bash', '--version'],
                     hints: ['Please install Bash from https://www.gnu.org/software/bash'],
@@ -137,7 +138,7 @@ exports.default = (0, as_1.default)([
         exts: ['fish'],
         getRuntime(args, options, config) {
             return {
-                start: ['fish', ...args],
+                exec: ['fish', ...args],
                 install: {
                     check: ['fish', '--version'],
                     hints: ['Please install Fish from https://fishshell.com'],
@@ -150,7 +151,7 @@ exports.default = (0, as_1.default)([
         exts: ['lua'],
         getRuntime(args, options, config) {
             return {
-                start: ['lua', ...args],
+                exec: ['lua', ...args],
                 install: {
                     check: ['lua', '-v'],
                     hints: ['Please install Lua from https://www.lua.org'],
@@ -163,7 +164,7 @@ exports.default = (0, as_1.default)([
         exts: ['rb'],
         getRuntime(args, options, config) {
             return {
-                start: ['ruby', ...args],
+                exec: ['ruby', ...args],
                 install: {
                     check: ['ruby', '-v'],
                     hints: ['Please install Ruby from https://www.ruby-lang.org'],
@@ -176,7 +177,7 @@ exports.default = (0, as_1.default)([
         exts: ['go'],
         getRuntime(args, options, config) {
             return {
-                start: ['go', 'run', ...args],
+                exec: ['go', 'run', ...args],
                 install: {
                     check: ['go', '-v'],
                     hints: ['Please install Ruby from https://www.ruby-lang.org'],
@@ -184,14 +185,57 @@ exports.default = (0, as_1.default)([
             };
         },
     },
+    {
+        name: 'C - GCC',
+        exts: ['c'],
+        getRuntime([script, ...args], options, config) {
+            return {
+                compile: ['gcc', script, '-o', 'dist/output'],
+                exec: ['./dist/output', ...args],
+                install: {
+                    check: ['gcc', '--version'],
+                    hints: ['Please install GCC from https://gcc.gnu.org'],
+                },
+            };
+        },
+    },
+    {
+        name: 'C++ - GCC',
+        exts: ['cpp'],
+        getRuntime([script, ...args], options, config) {
+            return {
+                compile: ['g++', script, '-o', 'dist/output'],
+                exec: ['./dist/output', ...args],
+                install: {
+                    check: ['g++', '--version'],
+                    hints: ['Please install GCC from https://gcc.gnu.org'],
+                },
+            };
+        },
+    },
+    {
+        name: 'C# - Mono',
+        exts: ['cs'],
+        getRuntime([script, ...args], options, config) {
+            return {
+                compile: ['mcs', script, '-out:dist/output.exe'],
+                exec: ['./dist/output'],
+                install: {
+                    check: ['mcs', '--version'],
+                    hints: ['Please install Mono from https://www.mono-project.com'],
+                },
+            };
+        },
+    },
     {
         name: 'SASS (CSS)',
         exts: ['sass', 'scss'],
         getRuntime(args, options, config) {
             return {
-                start: ['sass', ...args],
+                exec: ['sass', ...args],
                 install: {
                     check: ['sass', '--version'],
+                    command: ['npm', 'install', '-g', 'sass'],
                     hints: ['Please install SASS from https://sass-lang.com'],
                 },
             };
@@ -200,14 +244,15 @@ exports.default = (0, as_1.default)([
     {
         name: 'HTML Server',
         exts: ['html', 'htm'],
-        getRuntime(args, options, config) {
+        getRuntime([script, ...args], options, config) {
             return {
-                start: ['http-server', ...args],
-                watchExts: ['css', 'js', 'javascript', 'json'],
+                exec: ['lite-server', script, ...args],
+                watchExts: ['css', 'js', 'javascript'],
                 install: {
-                    check: ['http-server', '--version'],
+                    check: ['lite-server', '--version'],
+                    command: ['npm', 'install', '-g', 'lite-server'],
                     hints: [
-                        'Please install http-server from https://www.npmjs.com/package/http-server',
+                        'Please install lite-server from https://www.npmjs.com/package/lite-server',
                     ],
                 },
             };

package/dist/scriptExecutors/types.t.d.ts

@@ -4,10 +4,11 @@ export type ExecutorConfig = Partial<{
     'typescript-runtime': string;
 }>;
 export type RuntimeOptions = {
-    start: string[];
+    exec: string[];
+    compile?: string[];
     watchExts?: string[];
     install?: {
-        check?: string[];
+        check: string[];
         hints?: string[];
         command?: string[];
     };

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "uni-run",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Universal Runner for many language",
   "type": "commonjs",
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
     "tsc": "tsc --watch --noEmit",
+    "live": "node --watch ./dist/__lab__/index.js",
     "lab": "run ./src/__lab__/index.ts --focus ./src"
   },
   "main": "./dist/index.js",