uni-run 1.0.2 → 1.0.4

package/dist/arg-helper.d.ts

@@ -1,6 +1,5 @@
 import NoArg from 'noarg';
 import type { app } from './arg';
-import { ExecuteOptions } from './execution';
 import Executor from './builtin-bin/Executor';
 export declare const executionConfig: {
     readonly flags: {
@@ -78,6 +77,11 @@ export declare const executionConfig: {
             default: false;
             description: "Set NODE_ENV to \"development\"";
         }>;
+        readonly tsn: import("noarg/dist/schema/TypeBoolean.cjs").TypeBoolean<{
+            required: true;
+            default: false;
+            description: "Run the script with ts-node";
+        }>;
     };
     readonly listArgument: {
         readonly name: "args for script";
@@ -89,4 +93,19 @@ export declare const executionConfig: {
         readonly helpUsageTrailingArgsLabel: "...[args/flags for script]";
     };
 };
-export declare function mapFlagsToOptions(flags: NoArg.InferFlags<typeof app>, bin?: Executor): ExecuteOptions;
+export type ExecuteOptions = ReturnType<typeof mapFlagsToOptions>;
+export declare function mapFlagsToOptions(flags: NoArg.InferFlags<typeof app>, bin?: Executor): {
+    cwd: string;
+    shell: boolean;
+    showInfo: boolean;
+    showTime: boolean;
+    benchmark: boolean;
+    clearOnReload: boolean;
+    readlineReload: boolean;
+    watch: boolean;
+    watchDelay: number;
+    watchIgnore: string[];
+    watchExtensions: string[];
+    tsNode: boolean;
+    env: NodeJS.ProcessEnv;
+};

package/dist/arg-helper.js

@@ -50,6 +50,9 @@ exports.executionConfig = noarg_1.default.defineConfig({
         nodeDev: noarg_1.default.boolean()
             .default(false)
             .description('Set NODE_ENV to "development"'),
+        tsn: noarg_1.default.boolean()
+            .default(false)
+            .description('Run the script with ts-node'),
     },
     listArgument: {
         name: 'args for script',
@@ -62,7 +65,6 @@ exports.executionConfig = noarg_1.default.defineConfig({
     },
 });
 function mapFlagsToOptions(flags, bin) {
-    var _a, _b;
     return {
         cwd: flags.cwd,
         shell: flags.shell,
@@ -73,8 +75,9 @@ function mapFlagsToOptions(flags, bin) {
         readlineReload: flags.reloadKey,
         watch: flags.watch,
         watchDelay: flags.delay,
-        watchExtensions: (_b = (_a = (flags.ext.length ? flags.ext : bin === null || bin === void 0 ? void 0 : bin.config.watchExtensions)) !== null && _a !== void 0 ? _a : bin === null || bin === void 0 ? void 0 : bin.config.extensions) !== null && _b !== void 0 ? _b : [],
         watchIgnore: flags.ignore,
+        watchExtensions: (flags.ext.length ? flags.ext : bin === null || bin === void 0 ? void 0 : bin.getRelatedExts()) || [],
+        tsNode: flags['tsn'],
         env: Object.assign(Object.assign({}, flags.env.reduce((acc, env) => {
             const [key, value] = env.split('=');
             acc[key] = value;

package/dist/arg.d.ts

@@ -96,6 +96,11 @@ export declare const app: NoArg<"uni-run", {
             default: false;
             description: "Set NODE_ENV to \"development\"";
         }>;
+        readonly tsn: import("noarg/dist/schema/TypeBoolean.cjs").TypeBoolean<{
+            required: true;
+            default: false;
+            description: "Run the script with ts-node";
+        }>;
     };
     readonly customRenderHelp: {
         readonly helpUsageTrailingArgsLabel: "...[args/flags for script]";
@@ -193,13 +198,18 @@ export declare const exec: import("noarg/dist/NoArg/NoArgProgram.cjs").NoArgProg
             default: false;
             description: "Set NODE_ENV to \"development\"";
         }>;
+        readonly tsn: import("noarg/dist/schema/TypeBoolean.cjs").TypeBoolean<{
+            required: true;
+            default: false;
+            description: "Run the script with ts-node";
+        }>;
     };
     readonly customRenderHelp: {
         readonly helpUsageTrailingArgsLabel: "...[args/flags for script]";
     };
     globalFlags: {};
 }>;
-export declare const support: import("noarg/dist/NoArg/NoArgProgram.cjs").NoArgProgram<"support", {
+export declare const list: import("noarg/dist/NoArg/NoArgProgram.cjs").NoArgProgram<"list", {
     readonly allowEqualAssign: true;
     readonly booleanNotSyntaxEnding: "\\";
     readonly allowDuplicateFlagForList: true;

package/dist/arg.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.support = exports.exec = exports.app = void 0;
+exports.list = exports.exec = exports.app = void 0;
 const noarg_1 = require("noarg");
 const arg_helper_1 = require("./arg-helper");
 exports.app = noarg_1.default.create('uni-run', Object.assign(Object.assign({}, arg_helper_1.executionConfig), { description: 'A universal runner for scripts', system: { splitListByComma: true }, arguments: [
         { name: 'script', type: noarg_1.default.string(), description: 'Run a script' },
     ] }));
 exports.exec = exports.app.create('exec', Object.assign(Object.assign({}, arg_helper_1.executionConfig), { description: 'Execute a script with the given binary' }));
-exports.support = exports.app.create('support', {
+exports.list = exports.app.create('list', {
     description: 'List supported scripts',
 });

package/dist/builtin-bin/Executor.d.ts

@@ -1,22 +1,21 @@
-type ExecutionBinConfig = {
-    command: string;
+import { ExecuteOptions } from '../arg-helper';
+type BinConfig = {
     extensions: string[];
     watchExtensions?: string[];
-    runArgs?: string[];
-    checkInstallationArgs?: string[];
-    howToInstall?: () => void;
-    installCommands?: {
-        command: string;
-        args: string[];
-    }[];
+    run: (args: string[], options: ExecuteOptions) => string[];
+    installMessage?: string;
+    installCommands?: string[] | ((options: ExecuteOptions) => string[]);
+    checkInstallation?: string[] | ((options: ExecuteOptions) => string[]);
 };
 export default class Executor {
-    name: string;
-    config: ExecutionBinConfig;
-    constructor(name: string, config: ExecutionBinConfig);
-    getArgs(...args: string[]): string[];
+    private name;
+    private config;
+    constructor(name: string, config: BinConfig);
+    getName(): string;
+    getRelatedExts(): string[];
+    start(options: ExecuteOptions, args: string[]): void;
     isSupported(script: string): boolean;
-    isInstalled(): boolean;
-    renderHowToInstall(): void;
+    private isInstalled;
+    private renderHowToInstall;
 }
 export {};

package/dist/builtin-bin/Executor.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const execution_1 = require("../execution");
 const confirm_1 = require("@inquirer/confirm");
 const cross_spawn_1 = require("cross-spawn");
 class Executor {
@@ -9,33 +10,50 @@ class Executor {
         this.config = config;
         (_a = this.config.watchExtensions) === null || _a === void 0 ? void 0 : _a.push(...this.config.extensions);
     }
-    getArgs(...args) {
+    getName() {
+        return this.name;
+    }
+    getRelatedExts() {
         var _a;
-        return [this.config.command, ...((_a = this.config.runArgs) !== null && _a !== void 0 ? _a : []), ...args];
+        return [...this.config.extensions, ...((_a = this.config.watchExtensions) !== null && _a !== void 0 ? _a : [])];
+    }
+    start(options, args) {
+        if (!this.isInstalled(options)) {
+            return this.renderHowToInstall(options);
+        }
+        execution_1.default.start(this.config.run(args, options), options);
     }
     isSupported(script) {
         return this.config.extensions.includes(script.split('.').pop() || '');
     }
-    isInstalled() {
-        const result = (0, cross_spawn_1.sync)(this.config.command, [...(this.config.checkInstallationArgs || [])], { stdio: 'ignore' });
+    isInstalled(options) {
+        if (!this.config.checkInstallation)
+            return true;
+        const [command, ...args] = typeof this.config.checkInstallation === 'function'
+            ? this.config.checkInstallation(options)
+            : this.config.checkInstallation || [];
+        const result = (0, cross_spawn_1.sync)(command, args, {
+            stdio: 'ignore',
+        });
         if (result.status === 1)
             return false;
         return true;
     }
-    renderHowToInstall() {
-        var _a;
+    renderHowToInstall(options) {
         console.error(`${this.name} is not installed.`);
-        if (this.config.howToInstall) {
+        if (this.config.installMessage) {
             console.log('How to install:');
-            this.config.howToInstall();
+            console.log(this.config.installMessage);
         }
-        if (!((_a = this.config.installCommands) === null || _a === void 0 ? void 0 : _a.length))
+        const commands = typeof this.config.installCommands === 'function'
+            ? this.config.installCommands(options)
+            : this.config.installCommands;
+        if (!commands || !commands.length)
             return;
         (0, confirm_1.default)({ message: 'Do you want to install it?' }).then((ans) => {
-            var _a;
             if (!ans)
                 return;
-            (_a = this.config.installCommands) === null || _a === void 0 ? void 0 : _a.forEach(({ command, args }) => {
+            commands.forEach(([command, ...args]) => {
                 if (!command)
                     return;
                 (0, cross_spawn_1.sync)(command, args, { stdio: 'inherit' });

package/dist/builtin-bin/index.js

@@ -3,103 +3,94 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Executor_1 = require("./Executor");
 exports.default = [
     new Executor_1.default('Node.js', {
-        command: 'node',
         extensions: ['js', 'javascript', 'jsx', 'cjs', 'cjsx', 'mjs', 'mjsx'],
-        watchExtensions: ['html', 'css', 'json'],
-        checkInstallationArgs: ['--version'],
-        howToInstall: () => {
-            console.log('Please install Node.js from https://nodejs.org');
+        checkInstallation: ['node', '--version'],
+        installMessage: 'Please install Node.js from https://nodejs.org',
+        run(args) {
+            return ['node', ...args];
         },
     }),
     new Executor_1.default('TypeScript', {
-        command: 'ts-node',
         extensions: ['ts', 'tsx', 'cts', 'ctsx', 'mts', 'mtsx'],
-        watchExtensions: [
-            'html',
-            'css',
-            'json',
-            'js',
-            'javascript',
-            'jsx',
-            'cjs',
-            'cjsx',
-            'mjs',
-            'mjsx',
-        ],
-        checkInstallationArgs: ['--version'],
-        installCommands: [{ command: 'npm', args: ['install', '-g', 'ts-node'] }],
-        howToInstall: () => {
-            console.log('Please install ts-node from https://www.npmjs.com/package/ts-node');
+        watchExtensions: ['js', 'javascript', 'jsx', 'cjs', 'cjsx', 'mjs', 'mjsx'],
+        checkInstallation(options) {
+            return options.tsNode ? ['ts-node', '--version'] : ['tsx', '--version'];
+        },
+        installCommands(options) {
+            return options.tsNode
+                ? ['npm install -g ts-node']
+                : ['npm install -g tsx'];
+        },
+        installMessage: 'Please install tsx. More: https://tsx.is',
+        run(args, options) {
+            return options.tsNode ? ['ts-node', ...args] : ['tsx', ...args];
         },
     }),
     new Executor_1.default('Python', {
-        command: 'python',
         extensions: ['py'],
-        checkInstallationArgs: ['--version'],
-        howToInstall: () => {
-            console.log('Please install Python from https://www.python.org');
+        checkInstallation: ['python', '--version'],
+        installMessage: 'Please install Python from https://www.python.org',
+        run(args) {
+            return ['python', ...args];
         },
     }),
     new Executor_1.default('Java - Oracle', {
-        command: 'java',
         extensions: ['java'],
-        checkInstallationArgs: ['--version'],
-        howToInstall: () => {
-            console.log('Please install Java from https://www.oracle.com/java');
+        checkInstallation: ['java', '--version'],
+        installMessage: 'Please install Java from https://www.oracle.com/java',
+        run(args) {
+            return ['java', ...args];
         },
     }),
     new Executor_1.default('Powershell', {
-        command: 'powershell',
         extensions: ['ps1'],
-        checkInstallationArgs: ['-command', '"Get-Host"'],
-        howToInstall: () => {
-            console.log('Please install Powershell from https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell');
+        checkInstallation: ['powershell', '-command', 'echo ok'],
+        installMessage: 'Please install Powershell from https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell',
+        run(args) {
+            return ['powershell', '-File', ...args];
         },
     }),
     new Executor_1.default('Command Prompt', {
-        command: 'cmd',
-        runArgs: ['/c'],
         extensions: ['cmd', 'bat'],
-        checkInstallationArgs: ['/c', 'echo', 'ok'],
-        howToInstall: () => {
-            console.log('Please install Command Prompt from Windows');
+        checkInstallation: ['cmd', '/c', 'echo ok'],
+        installMessage: 'Please install Command Prompt from Windows',
+        run(args) {
+            return ['cmd', '/c', ...args];
         },
     }),
     new Executor_1.default('Shell', {
-        command: 'bash',
         extensions: ['sh'],
-        checkInstallationArgs: ['--version'],
-        howToInstall: () => {
-            console.log('Please install Bash from https://www.gnu.org/software/bash');
+        checkInstallation: ['bash', '--version'],
+        installMessage: 'Please install Bash from https://www.gnu.org/software/bash',
+        run(args) {
+            return ['bash', ...args];
         },
     }),
     new Executor_1.default('Lua', {
-        command: 'lua',
         extensions: ['lua'],
-        checkInstallationArgs: ['--version'],
-        howToInstall: () => {
-            console.log('Please install Lua from https://www.lua.org');
+        checkInstallation: ['lua', '--version'],
+        installMessage: 'Please install Lua from https://www.lua.org',
+        run(args) {
+            return ['lua', ...args];
         },
     }),
     new Executor_1.default('SASS (CSS)', {
-        command: 'sass',
         extensions: ['sass', 'scss'],
-        checkInstallationArgs: ['--version'],
-        installCommands: [{ command: 'npm', args: ['install', '-g', 'sass'] }],
-        howToInstall: () => {
-            console.log('Please install SASS from https://sass-lang.com');
+        checkInstallation: ['sass', '--version'],
+        installCommands: ['npm install -g sass'],
+        installMessage: 'Please install SASS from https://sass-lang.com',
+        run(args) {
+            return ['sass', ...args];
         },
     }),
     new Executor_1.default('HTML Server', {
-        command: 'http-server',
         extensions: ['html', 'htm'],
         watchExtensions: ['css', 'js', 'javascript', 'json'],
-        checkInstallationArgs: ['--version'],
-        installCommands: [
-            { command: 'npm', args: ['install', '-g', 'http-server'] },
-        ],
-        howToInstall: () => {
-            console.log('Please install http-server from https://www.npmjs.com/package/http-server');
+        checkInstallation: ['http-server', '--version'],
+        installCommands: ['npm install -g http-server'],
+        installMessage: 'Please install http-server from https://www.npmjs.com/package/http-server',
+        run(args) {
+            return ['http-server', ...args];
         },
     }),
 ];

package/dist/execution/index.d.ts

@@ -1,3 +1,4 @@
+import { ExecuteOptions } from '../arg-helper';
 export default class Execution {
     private command;
     private args;
@@ -10,17 +11,3 @@ export default class Execution {
     private killProcess;
     private clearBeforeStart;
 }
-export type ExecuteOptions = {
-    cwd: string;
-    clearOnReload: boolean;
-    readlineReload: boolean;
-    watch: boolean;
-    watchDelay: number;
-    watchIgnore: string[];
-    watchExtensions: string[];
-    env: Record<string, string>;
-    shell: boolean;
-    showInfo: boolean;
-    showTime: boolean;
-    benchmark: boolean;
-};

package/dist/execution/index.js

@@ -84,7 +84,6 @@ class Execution {
         this.child = null;
     }
     clearBeforeStart() {
-        return;
         if (this.options.clearOnReload) {
             process.stdout.write('\x1Bc');
             console.clear();

package/dist/index.js

@@ -10,25 +10,25 @@ arg.app.on(([script, listArs, trailingArgs], flags) => {
         console.log('Unsupported script:', script);
         return console.log('You may try "ur exec bin script.ext - --flags"');
     }
-    if (!bin.isInstalled()) {
-        return bin.renderHowToInstall();
-    }
-    execution_1.default.start(bin.getArgs(script, ...listArs, ...trailingArgs), (0, arg_helper_1.mapFlagsToOptions)(flags, bin));
+    const executionOptions = (0, arg_helper_1.mapFlagsToOptions)(flags, bin);
+    bin.start(executionOptions, [script, ...listArs, ...trailingArgs]);
 });
 arg.exec.on(([listArs, trailingArgs], flags) => {
     execution_1.default.start([...listArs, ...trailingArgs], (0, arg_helper_1.mapFlagsToOptions)(flags));
 });
-arg.support.on(() => {
+arg.list.on(() => {
     console.log('Supported scripts:');
     builtin_bin_1.default
         .sort((a, b) => {
-        if (a.name < b.name)
+        const aName = a.getName();
+        const bName = b.getName();
+        if (aName < bName)
             return -1;
-        if (a.name > b.name)
+        if (aName > bName)
             return 1;
         return 0;
     })
         .forEach((bin) => {
-        console.log(`- ${bin.name}`);
+        console.log(`- ${bin.getName()}`);
     });
 });

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "uni-run",
   "description": "Universal Runner for many language",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "commonjs",
   "scripts": {
-    "ts": "run ./src/__lab__/index.ts",
-    "js": "run ./dist/__lab__/index.js",
+    "ts": "tsx --watch ./src/__lab__/index.ts",
+    "js": "node --watch ./dist/__lab__/index.js",
+    "tsc": "tsc --watch --noEmit",
     "dev": "tsc --watch",
     "build": "node ./build.cjs"
   },