@jujulego/jill 2.5.1 → 3.0.0-alpha.1

package/dist/{core.plugin-D4KeO5G0.js → core.plugin-CxgfxFUI.js}

@@ -3,10 +3,11 @@ import { _ as _$1 } from '@swc/helpers/_/_ts_param';
 import { Logger, withLabel } from '@jujulego/logger';
 import { inject } from 'inversify';
 import symbols from 'log-symbols';
-import { b as LazyCurrentProject, L as LoadProject, T as TaskExpressionService, k as TaskExpressionError, l as TaskSyntaxError, S as ScriptsFilter, a as PrivateFilter, A as AffectedFilter, P as Pipeline, d as LazyCurrentWorkspace, c as LoadWorkspace, j as combine, W as WorkspaceTree, f as Plugin } from './workspace-tree-BJ9EO1FB.js';
-import { f as Command, E as ExitException, I as InkCommand, y as printJson, a as List } from './ink-command-dQCqkmg0.js';
-import { T as TaskCommand } from './jill.application-BEjmcH4e.js';
+import { b as LazyCurrentProject, L as LoadProject, T as TaskExpressionService, k as TaskExpressionError, l as TaskSyntaxError, S as ScriptsFilter, a as PrivateFilter, A as AffectedFilter, P as Pipeline, d as LazyCurrentWorkspace, c as LoadWorkspace, W as WorkspaceTree, f as Plugin } from './workspace-tree-VWKE0B6b.js';
+import { f as Command, E as ExitException, I as InkCommand, y as printJson, a as List } from './ink-command-CsbkuRbm.js';
+import { T as TaskCommand } from './jill.application-DNJpmnCF.js';
 import cp from 'node:child_process';
+import process$1 from 'node:process';
 import { jsx } from 'react/jsx-runtime';
 import chalk from 'chalk';
 import path from 'node:path';
@@ -47,49 +48,49 @@ class EachCommand extends TaskCommand {
     // Methods
     builder(parser) {
         return this.addTaskOptions(parser)// Run options
-        .positional("expr", {
-            type: "string",
+        .positional('expr', {
+            type: 'string',
             demandOption: true,
-            desc: "Script or task expression"
-        }).option("build-script", {
-            default: "build",
-            desc: "Script to use to build dependencies"
-        }).option("deps-mode", {
-            alias: "d",
+            desc: 'Script or task expression'
+        }).option('build-script', {
+            default: 'build',
+            desc: 'Script to use to build dependencies'
+        }).option('deps-mode', {
+            alias: 'd',
             choice: [
-                "all",
-                "prod",
-                "none"
+                'all',
+                'prod',
+                'none'
             ],
-            default: "all",
-            desc: "Dependency selection mode:\n" + " - all = dependencies AND devDependencies\n" + " - prod = dependencies\n" + " - none = nothing"
-        }).option("allow-no-workspaces", {
-            type: "boolean",
+            default: 'all',
+            desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
+        }).option('allow-no-workspaces', {
+            type: 'boolean',
             default: false,
-            desc: "Allow no matching workspaces. Without it jill will exit with code 1 if no workspace matches"
+            desc: 'Allow no matching workspaces. Without it jill will exit with code 1 if no workspace matches'
         })// Filters
-        .option("private", {
-            type: "boolean",
-            group: "Filters:",
-            desc: "Print only private workspaces"
-        }).option("affected", {
-            alias: "a",
-            type: "string",
-            coerce: (rev)=>rev === "" ? "master" : rev,
-            group: "Filters:",
-            desc: "Print only affected workspaces towards given git revision. If no revision is given, it will check towards master. Replaces %name by workspace name."
-        }).option("affected-rev-sort", {
-            type: "string",
-            group: "Filters:",
-            desc: "Sort applied to git tag / git branch command"
-        }).option("affected-rev-fallback", {
-            type: "string",
-            default: "master",
-            group: "Filters:",
-            desc: "Fallback revision, used if no revision matching the given format is found"
+        .option('private', {
+            type: 'boolean',
+            group: 'Filters:',
+            desc: 'Print only private workspaces'
+        }).option('affected', {
+            alias: 'a',
+            type: 'string',
+            coerce: (rev)=>rev === '' ? 'master' : rev,
+            group: 'Filters:',
+            desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master. Replaces %name by workspace name.'
+        }).option('affected-rev-sort', {
+            type: 'string',
+            group: 'Filters:',
+            desc: 'Sort applied to git tag / git branch command'
+        }).option('affected-rev-fallback', {
+            type: 'string',
+            default: 'master',
+            group: 'Filters:',
+            desc: 'Fallback revision, used if no revision matching the given format is found'
         })// Config
         .strict(false).parserConfiguration({
-            "unknown-options-as-args": true
+            'unknown-options-as-args': true
         });
     }
     async *prepare(argv) {
@@ -97,11 +98,11 @@ class EachCommand extends TaskCommand {
         try {
             // Extract expression
             const expr = argv._.map((arg)=>arg.toString());
-            if (expr[0] === "each") {
+            if (expr[0] === 'each') {
                 expr.splice(0, 1);
             }
             expr.unshift(argv.expr);
-            const tree = this.taskExpression.parse(expr.join(" "));
+            const tree = this.taskExpression.parse(expr.join(' '));
             const scripts = Array.from(this.taskExpression.extractScripts(tree));
             // Create script tasks
             const pipeline = this._preparePipeline(argv, scripts);
@@ -150,8 +151,8 @@ _([
 ], EachCommand.prototype, "project", void 0);
 EachCommand = _([
     Command({
-        command: "each <expr>",
-        describe: "Run a task expression in many workspace, after having built all theirs dependencies.",
+        command: 'each <expr>',
+        describe: 'Run a task expression in many workspace, after having built all theirs dependencies.',
         middlewares: [
             LoadProject
         ]
@@ -164,81 +165,67 @@ class ExecCommand extends TaskCommand {
     // Constructor
     constructor(logger){
         super();
-        this._logger = logger.child(withLabel("exec"));
+        this._logger = logger.child(withLabel('exec'));
     }
     // Methods
     builder(parser) {
-        return this.addTaskOptions(parser).positional("command", {
-            type: "string",
+        return this.addTaskOptions(parser).positional('command', {
+            type: 'string',
             demandOption: true
-        }).option("build-script", {
-            default: "build",
-            desc: "Script to use to build dependencies"
-        }).option("deps-mode", {
-            alias: "d",
+        }).option('build-script', {
+            default: 'build',
+            desc: 'Script to use to build dependencies'
+        }).option('deps-mode', {
+            alias: 'd',
             choice: [
-                "all",
-                "prod",
-                "none"
+                'all',
+                'prod',
+                'none'
             ],
-            default: "all",
-            desc: "Dependency selection mode:\n" + " - all = dependencies AND devDependencies\n" + " - prod = dependencies\n" + " - none = nothing"
+            default: 'all',
+            desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
         })// Documentation
-        .example("jill eslint", "").example("jill eslint --env-info", "Unknown arguments are passed down to command. Here it would run eslint --env-info").example("jill eslint -- -v", "You can use -- to stop argument parsing. Here it would run eslint -v")// Config
+        .example('jill eslint', '').example('jill eslint --env-info', 'Unknown arguments are passed down to command. Here it would run eslint --env-info').example('jill eslint -- -v', 'You can use -- to stop argument parsing. Here it would run eslint -v')// Config
         .strict(false).parserConfiguration({
-            "unknown-options-as-args": true
+            'unknown-options-as-args': true
         });
     }
     async *prepare(args) {
-        // Generators
-        const generators = [];
-        switch(args.depsMode ?? "all"){
-            case "all":
-                generators.unshift(this.workspace.devDependencies());
-            // eslint-disable-next no-fallthrough
-            case "prod":
-                generators.unshift(this.workspace.dependencies());
+        // Extract arguments
+        const rest = args._.map((arg)=>arg.toString());
+        if (rest[0] === 'exec') {
+            rest.splice(0, 1);
         }
-        // Build deps
-        for await (const dep of combine(...generators)){
-            const build = await dep.build({
-                buildScript: args.buildScript,
-                buildDeps: args.depsMode
-            });
-            if (build) {
-                yield build;
-            }
+        // Run script in workspace
+        const task = await this.workspace.exec(args.command, rest, {
+            buildScript: args.buildScript,
+            buildDeps: args.depsMode
+        });
+        if (args.plan) {
+            yield task;
+        } else {
+            this._finalTask = task;
+            yield* task.dependencies;
         }
     }
     async handler(args) {
         await super.handler(args);
         if (!args.plan) {
             this.app.unmount();
-            // Extract arguments
-            const rest = args._.map((arg)=>arg.toString());
-            if (rest[0] === "exec") {
-                rest.splice(0, 1);
-            }
             // Execute command
-            const pm = await this.project.packageManager();
-            let command = args.command;
-            if (pm === "yarn") {
-                command = "yarn";
-                rest.unshift("exec", args.command);
-            }
-            this._logger.debug`${command} ${rest.join(" ")}`;
-            const child = cp.spawn(command, rest, {
-                stdio: "inherit",
-                cwd: this.workspace.cwd,
+            this._logger.debug`${this._finalTask.cmd} ${this._finalTask.args.join(' ')}`;
+            const child = cp.spawn(this._finalTask.cmd, this._finalTask.args, {
+                stdio: 'inherit',
+                cwd: this._finalTask.cwd,
                 env: {
-                    ...process.env,
-                    FORCE_COLOR: "1"
+                    ...process$1.env,
+                    ...this._finalTask.env
                 },
                 shell: true,
                 windowsHide: true
             });
             const code = await new Promise((resolve)=>{
-                child.on("close", (code)=>{
+                child.on('close', (code)=>{
                     resolve(code ?? 0);
                 });
             });
@@ -256,11 +243,11 @@ _([
 ], ExecCommand.prototype, "workspace", void 0);
 ExecCommand = _([
     Command({
-        command: "exec <command>",
+        command: 'exec <command>',
         aliases: [
-            "$0"
+            '$0'
         ],
-        describe: "Run command inside workspace, after all its dependencies has been built.",
+        describe: 'Run command inside workspace, after all its dependencies has been built.',
         middlewares: [
             LoadProject,
             LoadWorkspace
@@ -277,22 +264,22 @@ class GroupCommand extends TaskCommand {
     }
     // Methods
     builder(parser) {
-        return this.addTaskOptions(parser).positional("script", {
+        return this.addTaskOptions(parser).positional('script', {
             demandOption: true,
-            desc: "Task expression",
-            coerce: (expr)=>this.taskExpr.parse(expr.join(" "))
-        }).option("build-script", {
-            default: "build",
-            desc: "Script to use to build dependencies"
-        }).option("deps-mode", {
-            alias: "d",
+            desc: 'Task expression',
+            coerce: (expr)=>this.taskExpr.parse(expr.join(' '))
+        }).option('build-script', {
+            default: 'build',
+            desc: 'Script to use to build dependencies'
+        }).option('deps-mode', {
+            alias: 'd',
             choice: [
-                "all",
-                "prod",
-                "none"
+                'all',
+                'prod',
+                'none'
             ],
-            default: "all",
-            desc: "Dependency selection mode:\n" + " - all = dependencies AND devDependencies\n" + " - prod = dependencies\n" + " - none = nothing"
+            default: 'all',
+            desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
         });
     }
     async *prepare(args) {
@@ -309,8 +296,8 @@ _([
 ], GroupCommand.prototype, "workspace", void 0);
 GroupCommand = _([
     Command({
-        command: "group <script..>",
-        describe: "Run many scripts inside a workspace (experimental)",
+        command: 'group <script..>',
+        describe: 'Run many scripts inside a workspace (experimental)',
         deprecated: true,
         middlewares: [
             LoadProject,
@@ -322,30 +309,30 @@ GroupCommand = _([
 
 // Constants
 const LONG_ATTRIBUTES = [
-    "name",
-    "version",
-    "root"
+    'name',
+    'version',
+    'root'
 ];
 const JSON_ATTRIBUTES = [
-    "name",
-    "version",
-    "slug",
-    "root"
+    'name',
+    'version',
+    'slug',
+    'root'
 ];
 const DEFAULT_ATTRIBUTES = [
-    "name"
+    'name'
 ];
 const EXTRACTORS = {
     name: (wks)=>wks.name,
-    version: (wks, json)=>wks.manifest.version || (json ? undefined : chalk.grey("unset")),
+    version: (wks, json)=>wks.manifest.version || (json ? undefined : chalk.grey('unset')),
     root: (wks)=>wks.cwd,
     slug: (wks)=>slugify.default(wks.name)
 };
 const COMPARATORS = {
-    name: (a = "", b = "")=>a.localeCompare(b),
-    version: (a, b)=>compare(parse(a) ?? "0.0.0", parse(b) ?? "0.0.0"),
-    root: (a = "", b = "")=>a.localeCompare(b),
-    slug: (a = "", b = "")=>a.localeCompare(b)
+    name: (a = '', b = '')=>a.localeCompare(b),
+    version: (a, b)=>compare(parse(a) ?? '0.0.0', parse(b) ?? '0.0.0'),
+    root: (a = '', b = '')=>a.localeCompare(b),
+    slug: (a = '', b = '')=>a.localeCompare(b)
 };
 // Utils
 function buildExtractor(attrs) {
@@ -366,76 +353,76 @@ class ListCommand extends InkCommand {
     // Methods
     builder(parser) {
         return parser// Filters
-        .option("private", {
-            type: "boolean",
-            group: "Filters:",
-            desc: "Print only private workspaces"
-        }).option("with-script", {
-            type: "array",
+        .option('private', {
+            type: 'boolean',
+            group: 'Filters:',
+            desc: 'Print only private workspaces'
+        }).option('with-script', {
+            type: 'array',
             string: true,
-            group: "Filters:",
-            desc: "Print only workspaces having the given script"
-        }).option("affected", {
-            alias: "a",
-            type: "string",
-            coerce: (rev)=>rev === "" ? "master" : rev,
-            group: "Filters:",
-            desc: "Print only affected workspaces towards given git revision. If no revision is given, it will check towards master. Replaces %name by workspace name."
-        }).option("affected-rev-sort", {
-            type: "string",
-            group: "Filters:",
-            desc: "Sort applied to git tag / git branch command"
-        }).option("affected-rev-fallback", {
-            type: "string",
-            default: "master",
-            group: "Filters:",
-            desc: "Fallback revision, used if no revision matching the given format is found"
+            group: 'Filters:',
+            desc: 'Print only workspaces having the given script'
+        }).option('affected', {
+            alias: 'a',
+            type: 'string',
+            coerce: (rev)=>rev === '' ? 'master' : rev,
+            group: 'Filters:',
+            desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master. Replaces %name by workspace name.'
+        }).option('affected-rev-sort', {
+            type: 'string',
+            group: 'Filters:',
+            desc: 'Sort applied to git tag / git branch command'
+        }).option('affected-rev-fallback', {
+            type: 'string',
+            default: 'master',
+            group: 'Filters:',
+            desc: 'Fallback revision, used if no revision matching the given format is found'
         })// Format
-        .option("attrs", {
-            type: "array",
+        .option('attrs', {
+            type: 'array',
             choices: [
-                "name",
-                "version",
-                "root",
-                "slug"
+                'name',
+                'version',
+                'root',
+                'slug'
             ],
-            group: "Format:",
-            desc: "Select printed attributes"
-        }).option("headers", {
-            type: "boolean",
-            group: "Format:",
-            desc: "Prints columns headers"
-        }).option("long", {
-            alias: "l",
-            type: "boolean",
-            group: "Format:",
-            desc: "Prints name, version and root of all workspaces"
-        }).option("json", {
-            type: "boolean",
-            group: "Format:",
-            desc: "Prints data as a JSON array"
+            group: 'Format:',
+            desc: 'Select printed attributes'
+        }).option('headers', {
+            type: 'boolean',
+            group: 'Format:',
+            desc: 'Prints columns headers'
+        }).option('long', {
+            alias: 'l',
+            type: 'boolean',
+            group: 'Format:',
+            desc: 'Prints name, version and root of all workspaces'
+        }).option('json', {
+            type: 'boolean',
+            group: 'Format:',
+            desc: 'Prints data as a JSON array'
         })// Sort
-        .option("sort-by", {
-            alias: "s",
-            type: "array",
+        .option('sort-by', {
+            alias: 's',
+            type: 'array',
             choices: [
-                "name",
-                "version",
-                "root",
-                "slug"
+                'name',
+                'version',
+                'root',
+                'slug'
             ],
-            group: "Sort:",
-            desc: "Sort output by given attribute. By default sorts by name if printed"
-        }).option("order", {
-            alias: "o",
-            type: "string",
+            group: 'Sort:',
+            desc: 'Sort output by given attribute. By default sorts by name if printed'
+        }).option('order', {
+            alias: 'o',
+            type: 'string',
             choices: [
-                "asc",
-                "desc"
+                'asc',
+                'desc'
             ],
-            default: "asc",
-            group: "Sort:",
-            desc: "Sort order"
+            default: 'asc',
+            group: 'Sort:',
+            desc: 'Sort order'
         });
     }
     async *render(args) {
@@ -457,7 +444,7 @@ class ListCommand extends InkCommand {
         } else {
             for (const d of data){
                 if (d.root) {
-                    d.root = path.relative(process.cwd(), d.root) || ".";
+                    d.root = path.relative(process.cwd(), d.root) || '.';
                 }
             }
             yield /*#__PURE__*/ jsx(List, {
@@ -483,13 +470,13 @@ class ListCommand extends InkCommand {
         if (attrs.length > 0 && sortBy.length > 0) {
             const miss = sortBy.filter((attr)=>!attrs.includes(attr));
             if (miss.length > 0) {
-                this.logger.error(`Cannot sort by non printed attributes. Missing ${miss.join(", ")}.`);
+                this.logger.error(`Cannot sort by non printed attributes. Missing ${miss.join(', ')}.`);
                 throw new ExitException(1);
             }
         }
-        if (sortBy.length === 0 && attrs.includes("name")) {
+        if (sortBy.length === 0 && attrs.includes('name')) {
             sortBy = [
-                "name"
+                'name'
             ];
         }
         return {
@@ -511,7 +498,7 @@ class ListCommand extends InkCommand {
         return pipeline;
     }
     _dataComparator(sortBy, order) {
-        const factor = order === "asc" ? 1 : -1;
+        const factor = order === 'asc' ? 1 : -1;
         return (a, b)=>{
             for (const attr of sortBy){
                 const diff = COMPARATORS[attr](a[attr], b[attr]);
@@ -528,11 +515,11 @@ _([
 ], ListCommand.prototype, "project", void 0);
 ListCommand = _([
     Command({
-        command: "list",
+        command: 'list',
         aliases: [
-            "ls"
+            'ls'
         ],
-        describe: "List workspace",
+        describe: 'List workspace',
         middlewares: [
             LoadProject
         ]
@@ -549,37 +536,37 @@ class RunCommand extends TaskCommand {
     }
     // Methods
     builder(parser) {
-        return this.addTaskOptions(parser).positional("expr", {
-            type: "string",
+        return this.addTaskOptions(parser).positional('expr', {
+            type: 'string',
             demandOption: true,
-            desc: "Script or task expression"
-        }).option("build-script", {
-            default: "build",
-            desc: "Script to use to build dependencies"
-        }).option("deps-mode", {
-            alias: "d",
+            desc: 'Script or task expression'
+        }).option('build-script', {
+            default: 'build',
+            desc: 'Script to use to build dependencies'
+        }).option('deps-mode', {
+            alias: 'd',
             choice: [
-                "all",
-                "prod",
-                "none"
+                'all',
+                'prod',
+                'none'
             ],
-            default: "all",
-            desc: "Dependency selection mode:\n" + " - all = dependencies AND devDependencies\n" + " - prod = dependencies\n" + " - none = nothing"
+            default: 'all',
+            desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
         })// Config
         .strict(false).parserConfiguration({
-            "unknown-options-as-args": true
+            'unknown-options-as-args': true
         });
     }
     async *prepare(args) {
         // Extract expression
         const expr = args._.map((arg)=>arg.toString());
-        if (expr[0] === "run") {
+        if (expr[0] === 'run') {
             expr.splice(0, 1);
         }
         expr.unshift(args.expr);
         // Parse task expression
         try {
-            const tree = this.taskExpression.parse(expr.join(" "));
+            const tree = this.taskExpression.parse(expr.join(' '));
             yield await this.taskExpression.buildTask(tree.roots[0], this.workspace, {
                 buildScript: args.buildScript,
                 buildDeps: args.depsMode
@@ -602,8 +589,8 @@ _([
 ], RunCommand.prototype, "workspace", void 0);
 RunCommand = _([
     Command({
-        command: "run <expr>",
-        describe: "Run a task expression in a workspace, after having built all its dependencies.",
+        command: 'run <expr>',
+        describe: 'Run a task expression in a workspace, after having built all its dependencies.',
         middlewares: [
             LoadProject,
             LoadWorkspace
@@ -626,8 +613,8 @@ _([
 ], TreeCommand.prototype, "workspace", void 0);
 TreeCommand = _([
     Command({
-        command: "tree",
-        describe: "Print workspace dependency tree",
+        command: 'tree',
+        describe: 'Print workspace dependency tree',
         middlewares: [
             LoadProject,
             LoadWorkspace
@@ -639,7 +626,7 @@ class CorePlugin {
 }
 CorePlugin = _([
     Plugin({
-        name: "core",
+        name: 'core',
         commands: [
             EachCommand,
             ExecCommand,
@@ -652,4 +639,4 @@ CorePlugin = _([
 ], CorePlugin);
 
 export { CorePlugin };
-//# sourceMappingURL=core.plugin-D4KeO5G0.js.map
+//# sourceMappingURL=core.plugin-CxgfxFUI.js.map