uni-run 1.1.15 → 1.1.16

package/README.md

@@ -90,7 +90,7 @@ module.exports = [
     exts: ['ext'],
     getRuntime(args, options, config) {
       return {
-        start: ['YOUR_BIN', ...args],
+        exec: ['YOUR_BIN', ...args],
       }
     },
   },
@@ -115,7 +115,7 @@ uniRun.addExecutorBefore({
   exts: ['ext'],
   getRuntime(args, options, config) {
     return {
-      start: ['YOUR_BIN', ...args],
+      exec: ['YOUR_BIN', ...args],
     }
   },
 })
@@ -142,7 +142,7 @@ uniRun.addExecutorBefore({
   exts: ['ext'],
   getRuntime(args, options, config) {
     return {
-      start: ['YOUR_BIN', ...args],
+      exec: ['YOUR_BIN', ...args],
     }
   },
 })

package/dist/index.d.ts

@@ -1,5 +1,10 @@
 import './app';
+import getConfig from './helpers/getConfig';
+import currentModule from './lib/currentModule';
+import getUserExecutors from './helpers/getUserExecutors';
 import { ScriptExecutorOptions } from './scriptExecutors/types.t';
+export { currentModule, getConfig, getUserExecutors };
+export * from './scriptExecutors/types.t';
 declare const _default: {
     addExecutorBefore(executor: ScriptExecutorOptions): void;
     addExecutorAfter(executor: ScriptExecutorOptions): void;

package/dist/index.js

@@ -1,11 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUserExecutors = exports.getConfig = exports.currentModule = void 0;
 require("./app");
 const arg_1 = require("./arg");
+const getConfig_1 = __importDefault(require("./helpers/getConfig"));
+exports.getConfig = getConfig_1.default;
+const currentModule_1 = __importDefault(require("./lib/currentModule"));
+exports.currentModule = currentModule_1.default;
 const scriptExecutors_1 = __importDefault(require("./scriptExecutors"));
+const getUserExecutors_1 = __importDefault(require("./helpers/getUserExecutors"));
+exports.getUserExecutors = getUserExecutors_1.default;
+__exportStar(require("./scriptExecutors/types.t"), exports);
 exports.default = {
     addExecutorBefore(executor) {
         scriptExecutors_1.default.unshift(executor);

package/dist/scriptExecutors/checkRuntime.js

@@ -18,29 +18,28 @@ const confirm_1 = __importDefault(require("@inquirer/confirm"));
 const cross_spawn_1 = require("cross-spawn");
 function default_1(runtime) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const install = runtime.install;
-        if (!install)
+        var _a, _b;
+        if (!runtime.install && !runtime.installHints)
             return true;
-        if (!((_a = install.check) === null || _a === void 0 ? void 0 : _a.length))
+        const command = runtime.exec[0];
+        if (!command)
             return true;
-        const [checkCmd, ...checkArgs] = install.check;
-        const result = (0, cross_spawn_1.sync)(checkCmd, checkArgs, { stdio: 'ignore' });
+        const result = (0, cross_spawn_1.sync)('which', [command], { 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))
+        console.error(colors_1.default.yellow(command) + colors_1.default.red(' is not installed.'));
+        if (!((_a = runtime.install) === null || _a === void 0 ? void 0 : _a.length))
             return false;
         const ans = yield (0, confirm_1.default)({ message: 'Do you want to install it?' }, { clearPromptOnDone: true });
         process.stdin.resume();
         if (ans) {
-            const [installCmd, ...installArgs] = install.command;
+            const [installCmd, ...installArgs] = runtime.install;
             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) {
+        if ((_b = runtime.installHints) === null || _b === void 0 ? void 0 : _b.length) {
             console.log(colors_1.default.bold('How to install:'));
-            install.hints.forEach((hint) => console.log(hint));
+            runtime.installHints.forEach((hint) => console.log(hint));
         }
         return false;
     });

package/dist/scriptExecutors/index.js

@@ -25,10 +25,7 @@ exports.default = (0, as_1.default)([
             }
             return {
                 exec: [runtime, ...args],
-                install: {
-                    check: [runtime, '--version'],
-                    hints: installHints,
-                },
+                installHints,
             };
         },
     },
@@ -57,10 +54,7 @@ exports.default = (0, as_1.default)([
             return {
                 exec: [runtime, ...args],
                 watchExts: ['js', 'javascript', 'jsx', 'cjs', 'cjsx', 'mjs', 'mjsx'],
-                install: {
-                    check: [runtime, '--version'],
-                    hints: installHints,
-                },
+                installHints,
             };
         },
     },
@@ -70,10 +64,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['python', ...args],
-                install: {
-                    check: ['python', '--version'],
-                    hints: ['Please install Python from https://www.python.org'],
-                },
+                installHints: ['Please install Python from https://www.python.org'],
             };
         },
     },
@@ -83,10 +74,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['java', ...args],
-                install: {
-                    check: ['java', '--version'],
-                    hints: ['Please install Java from https://www.oracle.com/java'],
-                },
+                installHints: ['Please install Java from https://www.oracle.com/java'],
             };
         },
     },
@@ -96,12 +84,9 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['powershell', '-File', ...args],
-                install: {
-                    check: ['powershell', '-command', 'echo ok'],
-                    hints: [
-                        'Please install Powershell from https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell',
-                    ],
-                },
+                installHints: [
+                    'Please install Powershell from https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell',
+                ],
             };
         },
     },
@@ -111,10 +96,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['cmd', '/c', ...args],
-                install: {
-                    check: ['cmd', '/c', 'echo ok'],
-                    hints: ['Please install Command Prompt from Windows'],
-                },
+                installHints: ['Please install Command Prompt from Windows'],
             };
         },
     },
@@ -124,10 +106,9 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['bash', ...args],
-                install: {
-                    check: ['bash', '--version'],
-                    hints: ['Please install Bash from https://www.gnu.org/software/bash'],
-                },
+                installHints: [
+                    'Please install Bash from https://www.gnu.org/software/bash',
+                ],
             };
         },
     },
@@ -137,10 +118,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['fish', ...args],
-                install: {
-                    check: ['fish', '--version'],
-                    hints: ['Please install Fish from https://fishshell.com'],
-                },
+                installHints: ['Please install Fish from https://fishshell.com'],
             };
         },
     },
@@ -150,10 +128,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['lua', ...args],
-                install: {
-                    check: ['lua', '-v'],
-                    hints: ['Please install Lua from https://www.lua.org'],
-                },
+                installHints: ['Please install Lua from https://www.lua.org'],
             };
         },
     },
@@ -163,10 +138,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['ruby', ...args],
-                install: {
-                    check: ['ruby', '-v'],
-                    hints: ['Please install Ruby from https://www.ruby-lang.org'],
-                },
+                installHints: ['Please install Ruby from https://www.ruby-lang.org'],
             };
         },
     },
@@ -176,10 +148,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['go', 'run', ...args],
-                install: {
-                    check: ['go', 'version'],
-                    hints: ['Please install Ruby from https://www.ruby-lang.org'],
-                },
+                installHints: ['Please install Ruby from https://www.ruby-lang.org'],
             };
         },
     },
@@ -191,10 +160,7 @@ exports.default = (0, as_1.default)([
             return {
                 compile: ['gcc', script, '-o', output],
                 exec: [output, ...args],
-                install: {
-                    check: ['gcc', '--version'],
-                    hints: ['Please install GCC from https://gcc.gnu.org'],
-                },
+                installHints: ['Please install GCC from https://gcc.gnu.org'],
             };
         },
     },
@@ -206,10 +172,7 @@ exports.default = (0, as_1.default)([
             return {
                 compile: ['g++', script, '-o', output],
                 exec: [output, ...args],
-                install: {
-                    check: ['g++', '--version'],
-                    hints: ['Please install GCC from https://gcc.gnu.org'],
-                },
+                installHints: ['Please install GCC from https://gcc.gnu.org'],
             };
         },
     },
@@ -221,10 +184,7 @@ exports.default = (0, as_1.default)([
             return {
                 compile: ['mcs', '-out:' + output, script],
                 exec: [output, ...args],
-                install: {
-                    check: ['mcs', '--version'],
-                    hints: ['Please install Mono from https://www.mono-project.com'],
-                },
+                installHints: ['Please install Mono from https://www.mono-project.com'],
             };
         },
     },
@@ -236,10 +196,7 @@ exports.default = (0, as_1.default)([
             return {
                 compile: ['rustc', script, '-o', output],
                 exec: [output, ...args],
-                install: {
-                    check: ['rustc', '--version'],
-                    hints: ['Please install Rust from https://www.rust-lang.org'],
-                },
+                installHints: ['Please install Rust from https://www.rust-lang.org'],
             };
         },
     },
@@ -249,11 +206,8 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['sass', ...args],
-                install: {
-                    check: ['sass', '--version'],
-                    command: ['npm', 'install', '-g', 'sass'],
-                    hints: ['Please install SASS from https://sass-lang.com'],
-                },
+                install: ['npm', 'install', '-g', 'sass'],
+                installHints: ['Please install SASS from https://sass-lang.com'],
             };
         },
     },
@@ -263,10 +217,7 @@ exports.default = (0, as_1.default)([
         getRuntime(args, options, config) {
             return {
                 exec: ['php', ...args],
-                install: {
-                    check: ['php', '--version'],
-                    hints: ['Please install PHP from https://www.php.net'],
-                },
+                installHints: ['Please install PHP from https://www.php.net'],
             };
         },
     },
@@ -277,13 +228,10 @@ exports.default = (0, as_1.default)([
             return {
                 exec: ['light-express-server', script, ...args],
                 watchExts: ['css', 'js', 'javascript'],
-                install: {
-                    check: ['light-express-server', '--help'],
-                    command: ['npm', 'install', '-g', 'light-express-server'],
-                    hints: [
-                        'Please install light-express-server from https://www.npmjs.com/package/light-express-server',
-                    ],
-                },
+                install: ['npm', 'install', '-g', 'light-express-server'],
+                installHints: [
+                    'Please install light-express-server from https://www.npmjs.com/package/light-express-server',
+                ],
             };
         },
     },

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

@@ -7,11 +7,8 @@ export type RuntimeOptions = {
     exec: string[];
     compile?: string[];
     watchExts?: string[];
-    install?: {
-        check: string[];
-        hints?: string[];
-        command?: string[];
-    };
+    install?: string[];
+    installHints?: string[];
 };
 export type ScriptExecutorOptions = {
     name: string;

package/package.json

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