uni-run 1.1.0 → 1.1.2

package/README.md

@@ -69,7 +69,7 @@ Here `--some someValue` will be passed to `node` and will be ignored by `uni-run
 
 ## Define Custom Configuration
 
-Create `.uni-run.json` file in your user home directory.
+Create `.uni-run.json` file in your user home directory or current working directory.
 
 ```json
 {
@@ -82,7 +82,7 @@ Now you can run your script with `run script.js` or `run script.ts` with your ow
 
 ## Setup Custom Executors
 
-Create `.uni-run.cjs` file in your user home directory.
+Create `.uni-run.cjs` file in your user home directory or current working directory.
 
 ```js
 module.exports = [

package/dist/app.js

@@ -42,6 +42,7 @@ 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);
@@ -52,7 +53,7 @@ arg.app.on((_a, flags_1) => __awaiter(void 0, [_a, flags_1], void 0, function* (
     ];
     const scriptExecutor = totalExecutors.find((executor) => executor.exts.includes(script.split('.').pop()));
     if (!scriptExecutor) {
-        console.log('Unsupported script:', script);
+        console.error('Unsupported script:', script);
         return console.log('You may try "run exec YOUR_BIN script.ext -- --flags"');
     }
     const executionOptions = (0, argHelper_1.mapFlagsToOptions)(flags);
@@ -66,14 +67,13 @@ arg.exec.on(([listArs, trailingArgs], flags) => {
     execution_1.default.start([...listArs, ...trailingArgs], (0, argHelper_1.mapFlagsToOptions)(flags));
 });
 arg.list.on(() => {
-    console.log('Supported scripts:');
-    scriptExecutors_1.default
-        .sort((a, b) => {
-        if (a.name < b.name)
-            return -1;
-        if (a.name > b.name)
-            return 1;
-        return 0;
-    })
-        .forEach(({ name }) => console.log(`- ${name}`));
+    const userExecutors = (0, getUserExecutors_1.default)();
+    const totalExecutors = [
+        ...(Array.isArray(userExecutors) ? userExecutors : []),
+        ...scriptExecutors_1.default,
+    ];
+    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(', ')}]`);
+    });
 });

package/dist/scriptExecutors/checkRuntime.d.ts

@@ -1,2 +1,2 @@
 import { RuntimeOptions } from './types.t';
-export default function (runtime: RuntimeOptions): false | undefined;
+export default function (runtime: RuntimeOptions): void;

package/dist/scriptExecutors/checkRuntime.js

@@ -4,39 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+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) {
-    if (!isInstalled(runtime.isInstalled)) {
-        renderHowToInstall(runtime.run[0], runtime.installHints);
-        return canBeInstalled(runtime.install);
-    }
-}
-function isInstalled(commands) {
-    if (!(commands === null || commands === void 0 ? void 0 : commands.length))
-        return true;
-    const [command, ...args] = commands;
-    const result = (0, cross_spawn_1.sync)(command, args, {
-        stdio: 'ignore',
-    });
-    if (result.status === 1)
-        return false;
-    return true;
-}
-function renderHowToInstall(name, hints) {
-    if (!(hints === null || hints === void 0 ? void 0 : hints.length))
+    var _a, _b, _c;
+    if (!((_a = runtime.isInstalled) === null || _a === void 0 ? void 0 : _a.length))
         return;
-    console.error(`${name} is not installed.`);
-    console.log('How to install:');
-    hints.forEach((hint) => console.log(hint));
-}
-function canBeInstalled(installCommands) {
-    if (!(installCommands === null || installCommands === void 0 ? void 0 : installCommands.length))
-        return false;
-    (0, confirm_1.default)({ message: 'Do you want to install it?' }).then((ans) => {
-        if (!ans)
-            return;
-        const [command, ...args] = installCommands;
-        (0, cross_spawn_1.sync)(command, args, { stdio: 'inherit' });
-    });
+    const [command, ...args] = runtime.isInstalled;
+    const result = (0, cross_spawn_1.sync)(command, args, { stdio: 'ignore' });
+    if (result.status === 0)
+        return;
+    if ((_b = runtime.installHints) === null || _b === void 0 ? void 0 : _b.length) {
+        console.error(`${runtime.run[0]} is not installed.`);
+        console.log(colors_1.default.bold('How to install:'));
+        runtime.installHints.forEach((hint) => console.log(hint));
+    }
+    if ((_c = runtime.install) === null || _c === void 0 ? void 0 : _c.length) {
+        (0, confirm_1.default)({ message: 'Do you want to install it?' }).then((ans) => {
+            if (!ans)
+                return;
+            const [command, ...args] = runtime.install;
+            (0, cross_spawn_1.sync)(command, args, { stdio: 'inherit' });
+        });
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-run",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Universal Runner for many language",
   "type": "commonjs",
   "scripts": {