@jujulego/jill 2.0.0-alpha.4 → 2.0.0-alpha.5

package/dist/commands/each.d.ts

@@ -0,0 +1,16 @@
+import yargs from 'yargs';
+import { WorkspaceDepsMode } from '../project';
+declare const _default: yargs.CommandModule<unknown, {
+    script: string;
+} & {
+    "deps-mode": WorkspaceDepsMode;
+} & {
+    private: boolean | undefined;
+} & {
+    affected: string | undefined;
+} & {
+    "affected-rev-sort": string | undefined;
+} & {
+    "affected-rev-fallback": string;
+}>;
+export default _default;

package/dist/commands/each.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"sources":["commands/each.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAA6B,iBAAiB,EAAE,MAAM,YAAY,CAAC;;;;;;;;;;;;;;AAM1E,wBA+GG","file":"each.d.ts","sourcesContent":["import { waitForEvent } from '@jujulego/event-tree';\nimport { TaskManager, TaskSet } from '@jujulego/tasks';\nimport ink from 'ink';\nimport yargs from 'yargs';\n\nimport { AffectedFilter, Pipeline, PrivateFilter, ScriptsFilter } from '../filters';\nimport { loadProject, setupInk } from '../middlewares';\nimport { Project, WorkspaceContext, WorkspaceDepsMode } from '../project';\nimport { container, CURRENT, INK_APP, SpinnerService } from '../services';\nimport { Layout, TasksSpinner } from '../ui';\nimport { applyMiddlewares, defineCommand } from '../utils';\n\n// Command\nexport default defineCommand({\n  command: 'each <script>',\n  describe: 'Run script on many workspaces',\n  builder: (yargs) =>\n    applyMiddlewares(yargs, [\n      setupInk,\n      loadProject,\n    ])\n    // Run options\n    .positional('script', { type: 'string', demandOption: true })\n    .option('deps-mode', {\n      choice: ['all', 'prod', 'none'],\n      default: 'all' as WorkspaceDepsMode,\n      desc: 'Dependency selection mode:\\n' +\n        ' - all = dependencies AND devDependencies\\n' +\n        ' - prod = dependencies\\n' +\n        ' - none = nothing'\n    })\n\n    // Filters\n    .option('private', {\n      type: 'boolean',\n      group: 'Filters:',\n      desc: 'Print only private workspaces',\n    })\n\n    // Affected filter\n    .option('affected', {\n      alias: 'a',\n      type: 'string',\n      coerce: (rev: string) => rev === '' ? 'master' : rev,\n      group: 'Affected:',\n      desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master.\\n' +\n        'Replaces %name by workspace name.',\n    })\n    .option('affected-rev-sort', {\n      type: 'string',\n      group: 'Affected:',\n      desc: 'Sort applied to git tag / git branch command',\n    })\n    .option('affected-rev-fallback', {\n      type: 'string',\n      default: 'master',\n      group: 'Affected:',\n      desc: 'Fallback revision, used if no revision matching the given format is found',\n    }),\n  async handler(args) {\n    const app = container.get<ink.Instance>(INK_APP);\n    const project = container.getNamed(Project, CURRENT);\n    const manager = container.get(TaskManager);\n    const spinner = container.get(SpinnerService);\n\n    try {\n      spinner.spin('Loading workspaces ...');\n\n      // Setup pipeline\n      const pipeline = new Pipeline();\n      pipeline.add(new ScriptsFilter([args.script]));\n\n      if (args.private !== undefined) {\n        pipeline.add(new PrivateFilter(args.private));\n      }\n\n      if (args.affected !== undefined) {\n        pipeline.add(new AffectedFilter(\n          args.affected,\n          args.affectedRevFallback,\n          args.affectedRevSort\n        ));\n      }\n\n      // Extract arguments\n      const rest = args._.map(arg => arg.toString());\n\n      if (rest[0] === 'each') {\n        rest.splice(0, 1);\n      }\n\n      // Create script tasks\n      const tasks = new TaskSet<WorkspaceContext>(manager);\n\n      for await (const wks of pipeline.filter(project.workspaces())) {\n        tasks.add(await wks.run(args.script, rest, {\n          buildDeps: args.depsMode,\n        }));\n      }\n\n      if (tasks.tasks.length === 0) {\n        spinner.failed('No workspace found !');\n        return yargs.exit(1, new Error('No workspace found !'));\n      }\n\n      spinner.stop();\n\n      // Start and wait for result\n      tasks.start();\n      app.rerender(\n        <Layout>\n          <TasksSpinner manager={manager} />\n        </Layout>\n      );\n\n      const result = await waitForEvent(tasks, 'finished');\n\n      if (result.failed > 0) {\n        return yargs.exit(1, new Error('A tasks failed !'));\n      }\n    } finally {\n      spinner.stop();\n    }\n  }\n});\n"]}

package/dist/commands/each.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, // Command
+"default", {
+    enumerable: true,
+    get: ()=>_default
+});
+const _jsxRuntime = require("react/jsx-runtime");
+const _eventTree = require("@jujulego/event-tree");
+const _tasks = require("@jujulego/tasks");
+const _yargs = /*#__PURE__*/ _interopRequireDefault(require("yargs"));
+const _filters = require("../filters");
+const _middlewares = require("../middlewares");
+const _project = require("../project");
+const _services = require("../services");
+const _ui = require("../ui");
+const _utils = require("../utils");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const _default = (0, _utils.defineCommand)({
+    command: 'each <script>',
+    describe: 'Run script on many workspaces',
+    builder: (yargs)=>(0, _utils.applyMiddlewares)(yargs, [
+            _middlewares.setupInk,
+            _middlewares.loadProject
+        ])// Run options
+        .positional('script', {
+            type: 'string',
+            demandOption: true
+        }).option('deps-mode', {
+            choice: [
+                'all',
+                'prod',
+                'none'
+            ],
+            default: 'all',
+            desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
+        })// Filters
+        .option('private', {
+            type: 'boolean',
+            group: 'Filters:',
+            desc: 'Print only private workspaces'
+        })// Affected filter
+        .option('affected', {
+            alias: 'a',
+            type: 'string',
+            coerce: (rev)=>rev === '' ? 'master' : rev,
+            group: 'Affected:',
+            desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master.\n' + 'Replaces %name by workspace name.'
+        }).option('affected-rev-sort', {
+            type: 'string',
+            group: 'Affected:',
+            desc: 'Sort applied to git tag / git branch command'
+        }).option('affected-rev-fallback', {
+            type: 'string',
+            default: 'master',
+            group: 'Affected:',
+            desc: 'Fallback revision, used if no revision matching the given format is found'
+        }),
+    async handler (args) {
+        const app = _services.container.get(_services.INK_APP);
+        const project = _services.container.getNamed(_project.Project, _services.CURRENT);
+        const manager = _services.container.get(_tasks.TaskManager);
+        const spinner = _services.container.get(_services.SpinnerService);
+        try {
+            spinner.spin('Loading workspaces ...');
+            // Setup pipeline
+            const pipeline = new _filters.Pipeline();
+            pipeline.add(new _filters.ScriptsFilter([
+                args.script
+            ]));
+            if (args.private !== undefined) {
+                pipeline.add(new _filters.PrivateFilter(args.private));
+            }
+            if (args.affected !== undefined) {
+                pipeline.add(new _filters.AffectedFilter(args.affected, args.affectedRevFallback, args.affectedRevSort));
+            }
+            // Extract arguments
+            const rest = args._.map((arg)=>arg.toString());
+            if (rest[0] === 'each') {
+                rest.splice(0, 1);
+            }
+            // Create script tasks
+            const tasks = new _tasks.TaskSet(manager);
+            for await (const wks of pipeline.filter(project.workspaces())){
+                tasks.add(await wks.run(args.script, rest, {
+                    buildDeps: args.depsMode
+                }));
+            }
+            if (tasks.tasks.length === 0) {
+                spinner.failed('No workspace found !');
+                return _yargs.default.exit(1, new Error('No workspace found !'));
+            }
+            spinner.stop();
+            // Start and wait for result
+            tasks.start();
+            app.rerender(/*#__PURE__*/ (0, _jsxRuntime.jsx)(_ui.Layout, {
+                children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ui.TasksSpinner, {
+                    manager: manager
+                })
+            }));
+            const result = await (0, _eventTree.waitForEvent)(tasks, 'finished');
+            if (result.failed > 0) {
+                return _yargs.default.exit(1, new Error('A tasks failed !'));
+            }
+        } finally{
+            spinner.stop();
+        }
+    }
+});
+
+//# sourceMappingURL=each.js.map

package/dist/commands/each.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["commands/each.js"],"sourcesContent":["import { waitForEvent } from '@jujulego/event-tree';\nimport { TaskManager, TaskSet } from '@jujulego/tasks';\nimport ink from 'ink';\nimport yargs from 'yargs';\n\nimport { AffectedFilter, Pipeline, PrivateFilter, ScriptsFilter } from '../filters';\nimport { loadProject, setupInk } from '../middlewares';\nimport { Project, WorkspaceContext, WorkspaceDepsMode } from '../project';\nimport { container, CURRENT, INK_APP, SpinnerService } from '../services';\nimport { Layout, TasksSpinner } from '../ui';\nimport { applyMiddlewares, defineCommand } from '../utils';\n\n// Command\nexport default defineCommand({\n  command: 'each <script>',\n  describe: 'Run script on many workspaces',\n  builder: (yargs) =>\n    applyMiddlewares(yargs, [\n      setupInk,\n      loadProject,\n    ])\n    // Run options\n    .positional('script', { type: 'string', demandOption: true })\n    .option('deps-mode', {\n      choice: ['all', 'prod', 'none'],\n      default: 'all' as WorkspaceDepsMode,\n      desc: 'Dependency selection mode:\\n' +\n        ' - all = dependencies AND devDependencies\\n' +\n        ' - prod = dependencies\\n' +\n        ' - none = nothing'\n    })\n\n    // Filters\n    .option('private', {\n      type: 'boolean',\n      group: 'Filters:',\n      desc: 'Print only private workspaces',\n    })\n\n    // Affected filter\n    .option('affected', {\n      alias: 'a',\n      type: 'string',\n      coerce: (rev: string) => rev === '' ? 'master' : rev,\n      group: 'Affected:',\n      desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master.\\n' +\n        'Replaces %name by workspace name.',\n    })\n    .option('affected-rev-sort', {\n      type: 'string',\n      group: 'Affected:',\n      desc: 'Sort applied to git tag / git branch command',\n    })\n    .option('affected-rev-fallback', {\n      type: 'string',\n      default: 'master',\n      group: 'Affected:',\n      desc: 'Fallback revision, used if no revision matching the given format is found',\n    }),\n  async handler(args) {\n    const app = container.get<ink.Instance>(INK_APP);\n    const project = container.getNamed(Project, CURRENT);\n    const manager = container.get(TaskManager);\n    const spinner = container.get(SpinnerService);\n\n    try {\n      spinner.spin('Loading workspaces ...');\n\n      // Setup pipeline\n      const pipeline = new Pipeline();\n      pipeline.add(new ScriptsFilter([args.script]));\n\n      if (args.private !== undefined) {\n        pipeline.add(new PrivateFilter(args.private));\n      }\n\n      if (args.affected !== undefined) {\n        pipeline.add(new AffectedFilter(\n          args.affected,\n          args.affectedRevFallback,\n          args.affectedRevSort\n        ));\n      }\n\n      // Extract arguments\n      const rest = args._.map(arg => arg.toString());\n\n      if (rest[0] === 'each') {\n        rest.splice(0, 1);\n      }\n\n      // Create script tasks\n      const tasks = new TaskSet<WorkspaceContext>(manager);\n\n      for await (const wks of pipeline.filter(project.workspaces())) {\n        tasks.add(await wks.run(args.script, rest, {\n          buildDeps: args.depsMode,\n        }));\n      }\n\n      if (tasks.tasks.length === 0) {\n        spinner.failed('No workspace found !');\n        return yargs.exit(1, new Error('No workspace found !'));\n      }\n\n      spinner.stop();\n\n      // Start and wait for result\n      tasks.start();\n      app.rerender(\n        <Layout>\n          <TasksSpinner manager={manager} />\n        </Layout>\n      );\n\n      const result = await waitForEvent(tasks, 'finished');\n\n      if (result.failed > 0) {\n        return yargs.exit(1, new Error('A tasks failed !'));\n      }\n    } finally {\n      spinner.stop();\n    }\n  }\n});\n"],"names":["defineCommand","command","describe","builder","yargs","applyMiddlewares","setupInk","loadProject","positional","type","demandOption","option","choice","default","desc","group","alias","coerce","rev","handler","args","app","container","get","INK_APP","project","getNamed","Project","CURRENT","manager","TaskManager","spinner","SpinnerService","spin","pipeline","Pipeline","add","ScriptsFilter","script","private","undefined","PrivateFilter","affected","AffectedFilter","affectedRevFallback","affectedRevSort","rest","_","map","arg","toString","splice","tasks","TaskSet","wks","filter","workspaces","run","buildDeps","depsMode","length","failed","exit","Error","stop","start","rerender","Layout","TasksSpinner","result","waitForEvent"],"mappings":"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","file":"each.js"}

package/dist/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["commands/run.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAa,iBAAiB,EAAE,MAAM,YAAY,CAAC;;;;;;AAM1D,wBA2CG","file":"run.d.ts","sourcesContent":["import { TaskManager } from '@jujulego/tasks';\nimport ink from 'ink';\n\nimport { loadProject, loadWorkspace, setupInk } from '../middlewares';\nimport { Workspace, WorkspaceDepsMode } from '../project';\nimport { container, CURRENT, INK_APP } from '../services';\nimport { Layout, TasksSpinner } from '../ui';\nimport { applyMiddlewares, defineCommand } from '../utils';\n\n// Command\nexport default defineCommand({\n  command: 'run <script>',\n  describe: 'Run script inside workspace',\n  builder: (yargs) =>\n    applyMiddlewares(yargs, [\n      setupInk,\n      loadProject,\n      loadWorkspace\n    ])\n      .positional('script', { type: 'string', demandOption: true })\n      .option('deps-mode', {\n        choice: ['all', 'prod', 'none'],\n        default: 'all' as WorkspaceDepsMode,\n        desc: 'Dependency selection mode:\\n' +\n          ' - all = dependencies AND devDependencies\\n' +\n          ' - prod = dependencies\\n' +\n          ' - none = nothing'\n      }),\n  async handler(args) {\n    const app = container.get<ink.Instance>(INK_APP);\n    const workspace = container.getNamed(Workspace, CURRENT);\n    const manager = container.get(TaskManager);\n\n    // Extract arguments\n    const rest = args._.map(arg => arg.toString());\n\n    if (rest[0] === 'run') {\n      rest.splice(0, 1);\n    }\n\n    // Run build task\n    const task = await workspace.run(args.script, rest, {\n      buildDeps: args.depsMode,\n    });\n    manager.add(task);\n\n    // Render\n    app.rerender(\n      <Layout>\n        <TasksSpinner manager={manager} />\n      </Layout>\n    );\n  }\n});\n"]}
+{"version":3,"sources":["commands/run.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAa,iBAAiB,EAAE,MAAM,YAAY,CAAC;;;;;;AAM1D,wBA2CG","file":"run.d.ts","sourcesContent":["import { TaskManager } from '@jujulego/tasks';\nimport ink from 'ink';\n\nimport { loadProject, loadWorkspace, setupInk } from '../middlewares';\nimport { Workspace, WorkspaceDepsMode } from '../project';\nimport { container, CURRENT, INK_APP } from '../services';\nimport { Layout, TasksSpinner } from '../ui';\nimport { applyMiddlewares, defineCommand } from '../utils';\n\n// Command\nexport default defineCommand({\n  command: 'run <script>',\n  describe: 'Run script inside workspace',\n  builder: (yargs) =>\n    applyMiddlewares(yargs, [\n      setupInk,\n      loadProject,\n      loadWorkspace\n    ])\n      .positional('script', { type: 'string', demandOption: true })\n      .option('deps-mode', {\n        choice: ['all', 'prod', 'none'],\n        default: 'all' as WorkspaceDepsMode,\n        desc: 'Dependency selection mode:\\n' +\n          ' - all = dependencies AND devDependencies\\n' +\n          ' - prod = dependencies\\n' +\n          ' - none = nothing'\n      }),\n  async handler(args) {\n    const app = container.get<ink.Instance>(INK_APP);\n    const workspace = container.getNamed(Workspace, CURRENT);\n    const manager = container.get(TaskManager);\n\n    // Extract arguments\n    const rest = args._.map(arg => arg.toString());\n\n    if (rest[0] === 'run') {\n      rest.splice(0, 1);\n    }\n\n    // Run script in workspace\n    const task = await workspace.run(args.script, rest, {\n      buildDeps: args.depsMode,\n    });\n    manager.add(task);\n\n    // Render\n    app.rerender(\n      <Layout>\n        <TasksSpinner manager={manager} />\n      </Layout>\n    );\n  }\n});\n"]}

package/dist/commands/run.js

@@ -42,7 +42,7 @@ const _default = (0, _utils.defineCommand)({
         if (rest[0] === 'run') {
             rest.splice(0, 1);
         }
-        // Run build task
+        // Run script in workspace
         const task = await workspace.run(args.script, rest, {
             buildDeps: args.depsMode
         });

package/dist/commands/run.js.map

@@ -1 +1 @@
-{"version":3,"sources":["commands/run.js"],"sourcesContent":["import { TaskManager } from '@jujulego/tasks';\nimport ink from 'ink';\n\nimport { loadProject, loadWorkspace, setupInk } from '../middlewares';\nimport { Workspace, WorkspaceDepsMode } from '../project';\nimport { container, CURRENT, INK_APP } from '../services';\nimport { Layout, TasksSpinner } from '../ui';\nimport { applyMiddlewares, defineCommand } from '../utils';\n\n// Command\nexport default defineCommand({\n  command: 'run <script>',\n  describe: 'Run script inside workspace',\n  builder: (yargs) =>\n    applyMiddlewares(yargs, [\n      setupInk,\n      loadProject,\n      loadWorkspace\n    ])\n      .positional('script', { type: 'string', demandOption: true })\n      .option('deps-mode', {\n        choice: ['all', 'prod', 'none'],\n        default: 'all' as WorkspaceDepsMode,\n        desc: 'Dependency selection mode:\\n' +\n          ' - all = dependencies AND devDependencies\\n' +\n          ' - prod = dependencies\\n' +\n          ' - none = nothing'\n      }),\n  async handler(args) {\n    const app = container.get<ink.Instance>(INK_APP);\n    const workspace = container.getNamed(Workspace, CURRENT);\n    const manager = container.get(TaskManager);\n\n    // Extract arguments\n    const rest = args._.map(arg => arg.toString());\n\n    if (rest[0] === 'run') {\n      rest.splice(0, 1);\n    }\n\n    // Run build task\n    const task = await workspace.run(args.script, rest, {\n      buildDeps: args.depsMode,\n    });\n    manager.add(task);\n\n    // Render\n    app.rerender(\n      <Layout>\n        <TasksSpinner manager={manager} />\n      </Layout>\n    );\n  }\n});\n"],"names":["defineCommand","command","describe","builder","yargs","applyMiddlewares","setupInk","loadProject","loadWorkspace","positional","type","demandOption","option","choice","default","desc","handler","args","app","container","get","INK_APP","workspace","getNamed","Workspace","CURRENT","manager","TaskManager","rest","_","map","arg","toString","splice","task","run","script","buildDeps","depsMode","add","rerender","Layout","TasksSpinner"],"mappings":"AAAA;;;;+BASA,UAAU;AACV;;aAAA;;;uBAV4B;6BAGyB;yBACR;0BACD;oBACP;uBACW;MAGhD,WAAeA,IAAAA,oBAAa,EAAC;IAC3BC,SAAS;IACTC,UAAU;IACVC,SAAS,CAACC,QACRC,IAAAA,uBAAgB,EAACD,OAAO;YACtBE,qBAAQ;YACRC,wBAAW;YACXC,0BAAa;SACd,EACEC,UAAU,CAAC,UAAU;YAAEC,MAAM;YAAUC,cAAc,IAAI;QAAC,GAC1DC,MAAM,CAAC,aAAa;YACnBC,QAAQ;gBAAC;gBAAO;gBAAQ;aAAO;YAC/BC,SAAS;YACTC,MAAM,iCACJ,gDACA,6BACA;QACJ;IACJ,MAAMC,SAAQC,IAAI,EAAE;QAClB,MAAMC,MAAMC,mBAAS,CAACC,GAAG,CAAeC,iBAAO;QAC/C,MAAMC,YAAYH,mBAAS,CAACI,QAAQ,CAACC,kBAAS,EAAEC,iBAAO;QACvD,MAAMC,UAAUP,mBAAS,CAACC,GAAG,CAACO,kBAAW;QAEzC,oBAAoB;QACpB,MAAMC,OAAOX,KAAKY,CAAC,CAACC,GAAG,CAACC,CAAAA,MAAOA,IAAIC,QAAQ;QAE3C,IAAIJ,IAAI,CAAC,EAAE,KAAK,OAAO;YACrBA,KAAKK,MAAM,CAAC,GAAG;QACjB,CAAC;QAED,iBAAiB;QACjB,MAAMC,OAAO,MAAMZ,UAAUa,GAAG,CAAClB,KAAKmB,MAAM,EAAER,MAAM;YAClDS,WAAWpB,KAAKqB,QAAQ;QAC1B;QACAZ,QAAQa,GAAG,CAACL;QAEZ,SAAS;QACThB,IAAIsB,QAAQ,eACV,qBAACC,UAAM;sBACL,cAAA,qBAACC,gBAAY;gBAAChB,SAASA;;;IAG7B;AACF","file":"run.js"}
+{"version":3,"sources":["commands/run.js"],"sourcesContent":["import { TaskManager } from '@jujulego/tasks';\nimport ink from 'ink';\n\nimport { loadProject, loadWorkspace, setupInk } from '../middlewares';\nimport { Workspace, WorkspaceDepsMode } from '../project';\nimport { container, CURRENT, INK_APP } from '../services';\nimport { Layout, TasksSpinner } from '../ui';\nimport { applyMiddlewares, defineCommand } from '../utils';\n\n// Command\nexport default defineCommand({\n  command: 'run <script>',\n  describe: 'Run script inside workspace',\n  builder: (yargs) =>\n    applyMiddlewares(yargs, [\n      setupInk,\n      loadProject,\n      loadWorkspace\n    ])\n      .positional('script', { type: 'string', demandOption: true })\n      .option('deps-mode', {\n        choice: ['all', 'prod', 'none'],\n        default: 'all' as WorkspaceDepsMode,\n        desc: 'Dependency selection mode:\\n' +\n          ' - all = dependencies AND devDependencies\\n' +\n          ' - prod = dependencies\\n' +\n          ' - none = nothing'\n      }),\n  async handler(args) {\n    const app = container.get<ink.Instance>(INK_APP);\n    const workspace = container.getNamed(Workspace, CURRENT);\n    const manager = container.get(TaskManager);\n\n    // Extract arguments\n    const rest = args._.map(arg => arg.toString());\n\n    if (rest[0] === 'run') {\n      rest.splice(0, 1);\n    }\n\n    // Run script in workspace\n    const task = await workspace.run(args.script, rest, {\n      buildDeps: args.depsMode,\n    });\n    manager.add(task);\n\n    // Render\n    app.rerender(\n      <Layout>\n        <TasksSpinner manager={manager} />\n      </Layout>\n    );\n  }\n});\n"],"names":["defineCommand","command","describe","builder","yargs","applyMiddlewares","setupInk","loadProject","loadWorkspace","positional","type","demandOption","option","choice","default","desc","handler","args","app","container","get","INK_APP","workspace","getNamed","Workspace","CURRENT","manager","TaskManager","rest","_","map","arg","toString","splice","task","run","script","buildDeps","depsMode","add","rerender","Layout","TasksSpinner"],"mappings":"AAAA;;;;+BASA,UAAU;AACV;;aAAA;;;uBAV4B;6BAGyB;yBACR;0BACD;oBACP;uBACW;MAGhD,WAAeA,IAAAA,oBAAa,EAAC;IAC3BC,SAAS;IACTC,UAAU;IACVC,SAAS,CAACC,QACRC,IAAAA,uBAAgB,EAACD,OAAO;YACtBE,qBAAQ;YACRC,wBAAW;YACXC,0BAAa;SACd,EACEC,UAAU,CAAC,UAAU;YAAEC,MAAM;YAAUC,cAAc,IAAI;QAAC,GAC1DC,MAAM,CAAC,aAAa;YACnBC,QAAQ;gBAAC;gBAAO;gBAAQ;aAAO;YAC/BC,SAAS;YACTC,MAAM,iCACJ,gDACA,6BACA;QACJ;IACJ,MAAMC,SAAQC,IAAI,EAAE;QAClB,MAAMC,MAAMC,mBAAS,CAACC,GAAG,CAAeC,iBAAO;QAC/C,MAAMC,YAAYH,mBAAS,CAACI,QAAQ,CAACC,kBAAS,EAAEC,iBAAO;QACvD,MAAMC,UAAUP,mBAAS,CAACC,GAAG,CAACO,kBAAW;QAEzC,oBAAoB;QACpB,MAAMC,OAAOX,KAAKY,CAAC,CAACC,GAAG,CAACC,CAAAA,MAAOA,IAAIC,QAAQ;QAE3C,IAAIJ,IAAI,CAAC,EAAE,KAAK,OAAO;YACrBA,KAAKK,MAAM,CAAC,GAAG;QACjB,CAAC;QAED,0BAA0B;QAC1B,MAAMC,OAAO,MAAMZ,UAAUa,GAAG,CAAClB,KAAKmB,MAAM,EAAER,MAAM;YAClDS,WAAWpB,KAAKqB,QAAQ;QAC1B;QACAZ,QAAQa,GAAG,CAACL;QAEZ,SAAS;QACThB,IAAIsB,QAAQ,eACV,qBAACC,UAAM;sBACL,cAAA,qBAACC,gBAAY;gBAAChB,SAASA;;;IAG7B;AACF","file":"run.js"}

package/dist/project/workspace.d.ts

@@ -4,6 +4,7 @@ import { Project } from './project';
 export declare type WorkspaceDepsMode = 'all' | 'prod' | 'none';
 export interface WorkspaceContext extends TaskContext {
     workspace: Workspace;
+    script: string;
 }
 export interface WorkspaceRunOptions extends Omit<SpawnTaskOptions, 'cwd'> {
     buildDeps?: WorkspaceDepsMode;
@@ -23,6 +24,7 @@ export declare class Workspace {
     private _loadDependencies;
     dependencies(): AsyncGenerator<Workspace, void>;
     devDependencies(): AsyncGenerator<Workspace, void>;
+    private _streamLogs;
     run(script: string, args?: string[], opts?: WorkspaceRunOptions): Promise<SpawnTask<WorkspaceContext>>;
     build(opts?: WorkspaceRunOptions): Promise<SpawnTask | null>;
     get name(): string;

package/dist/project/workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["project/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAOjD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,oBAAY,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAExD,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC;IACxE,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC/B;AAGD,qBAAa,SAAS;IAQlB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuC;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;gBAItD,IAAI,EAAE,MAAM,EACpB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO;IAO3B,OAAO,CAAC,UAAU;YAYJ,kBAAkB;YAuBlB,WAAW;IAqBnB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAWtC,iBAAiB;IAczB,YAAY,IAAI,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC;IAQ/C,eAAe,IAAI,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC;IAQnD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,EAAE,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IA2B9G,KAAK,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAYlE,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,GAAG,IAAI,MAAM,CAEhB;CACF","file":"workspace.d.ts","sourcesContent":["import { SpawnTask, SpawnTaskOptions, TaskContext } from '@jujulego/tasks';\nimport path from 'node:path';\nimport { Package } from 'normalize-package-data';\nimport { satisfies } from 'semver';\nimport winston from 'winston';\n\nimport { Git } from '../git';\nimport { container, Logger } from '../services';\nimport { combine, each, streamLines } from '../utils';\nimport { Project } from './project';\n\n// Types\nexport type WorkspaceDepsMode = 'all' | 'prod' | 'none';\n\nexport interface WorkspaceContext extends TaskContext {\n  workspace: Workspace;\n}\n\nexport interface WorkspaceRunOptions extends Omit<SpawnTaskOptions, 'cwd'> {\n  buildDeps?: WorkspaceDepsMode;\n}\n\n// Class\nexport class Workspace {\n  // Attributes\n  private readonly _logger: winston.Logger;\n  private readonly _affectedCache = new Map<string, Promise<boolean>>();\n  private readonly _tasks = new Map<string, SpawnTask<WorkspaceContext>>();\n\n  // Constructor\n  constructor(\n    private readonly _cwd: string,\n    readonly manifest: Package,\n    readonly project: Project\n  ) {\n    const logger = container.get(Logger);\n    this._logger = logger.child({ label: this.manifest.name });\n  }\n\n  // Methods\n  private _satisfies(from: Workspace, range: string): boolean {\n    if (range.startsWith('file:')) {\n      return path.resolve(from.cwd, range.substring(5)) === this.cwd;\n    }\n\n    if (range.startsWith('workspace:')) {\n      range = range.substring(10);\n    }\n\n    return !this.version || satisfies(this.version, range);\n  }\n\n  private async _buildDependencies(task: SpawnTask, deps: WorkspaceDepsMode = 'all') {\n    // Generators\n    const generators: AsyncGenerator<Workspace, void>[] = [];\n\n    switch (deps) {\n      case 'all':\n        generators.unshift(this.devDependencies());\n\n      // eslint-disable-next no-fallthrough\n      case 'prod':\n        generators.unshift(this.dependencies());\n    }\n\n    // Build deps\n    for await (const dep of combine(...generators)) {\n      const build = await dep.build();\n\n      if (build) {\n        task.dependsOn(build);\n      }\n    }\n  }\n\n  private async _isAffected(reference: string): Promise<boolean> {\n    const isAffected = await Git.isAffected(reference, ['--', this.cwd], {\n      cwd: this.project.root,\n      logger: this._logger,\n    });\n\n    if (isAffected) {\n      return true;\n    }\n\n    // Test dependencies\n    const proms: Promise<boolean>[] = [];\n\n    for await (const dep of combine(this.dependencies(), this.devDependencies())) {\n      proms.push(dep.isAffected(reference));\n    }\n\n    const results = await Promise.all(proms);\n    return results.some(r => r);\n  }\n\n  async isAffected(reference: string): Promise<boolean> {\n    let isAffected = this._affectedCache.get(reference);\n\n    if (!isAffected) {\n      isAffected = this._isAffected(reference);\n      this._affectedCache.set(reference, isAffected);\n    }\n\n    return await isAffected;\n  }\n\n  private async* _loadDependencies(dependencies: Record<string, string>, kind: string): AsyncGenerator<Workspace, void> {\n    for (const [dep, range] of Object.entries(dependencies)) {\n      const ws = await this.project.workspace(dep);\n\n      if (ws) {\n        if (ws._satisfies(this, range)) {\n          yield ws;\n        } else {\n          this._logger.verbose(`Ignoring ${kind} ${ws.reference} as it does not match requirement ${range}`);\n        }\n      }\n    }\n  }\n\n  async* dependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.dependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.dependencies, 'dependency')) {\n      yield ws;\n    }\n  }\n\n  async* devDependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.devDependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.devDependencies, 'devDependency')) {\n      yield ws;\n    }\n  }\n\n  async run(script: string, args: string[] = [], opts: WorkspaceRunOptions = {}): Promise<SpawnTask<WorkspaceContext>> {\n    let task = this._tasks.get(script);\n\n    if (!task) {\n      const pm = await this.project.packageManager();\n\n      task = new SpawnTask(pm, ['run', script, ...args], { workspace: this }, {\n        ...opts,\n        cwd: this.cwd,\n        logger: this._logger,\n        env: {\n          FORCE_COLOR: '1',\n          ...opts.env\n        }\n      });\n\n      each(streamLines(task, 'stdout'), (line) => this._logger.info(line));\n      each(streamLines(task, 'stderr'), (line) => this._logger.warn(line));\n\n      await this._buildDependencies(task, opts.buildDeps);\n\n      this._tasks.set(script, task);\n    }\n\n    return task;\n  }\n\n  async build(opts?: WorkspaceRunOptions): Promise<SpawnTask | null> {\n    const { scripts = {} } = this.manifest;\n\n    if (!scripts.build) {\n      this._logger.warn('Will not be built (no build script)');\n      return null;\n    }\n\n    return await this.run('build', [], opts);\n  }\n\n  // Properties\n  get name(): string {\n    return this.manifest.name;\n  }\n\n  get version(): string {\n    return this.manifest.version;\n  }\n\n  get reference(): string {\n    return this.version ? `${this.name}@${this.version}` : this.name;\n  }\n\n  get cwd(): string {\n    return path.resolve(this.project.root, this._cwd);\n  }\n}\n"]}
+{"version":3,"sources":["project/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAmB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE5F,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAOjD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,oBAAY,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAExD,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC;IACxE,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC/B;AAGD,qBAAa,SAAS;IAQlB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuC;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;gBAItD,IAAI,EAAE,MAAM,EACpB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO;IAO3B,OAAO,CAAC,UAAU;YAYJ,kBAAkB;YAuBlB,WAAW;IAqBnB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAWtC,iBAAiB;IAczB,YAAY,IAAI,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC;IAQ/C,eAAe,IAAI,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC;YAQ3C,WAAW;IAYnB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,EAAE,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IA2B9G,KAAK,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAYlE,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,GAAG,IAAI,MAAM,CAEhB;CACF","file":"workspace.d.ts","sourcesContent":["import { SpawnTask, SpawnTaskOptions, SpawnTaskStream, TaskContext } from '@jujulego/tasks';\nimport path from 'node:path';\nimport { Package } from 'normalize-package-data';\nimport { satisfies } from 'semver';\nimport winston from 'winston';\n\nimport { Git } from '../git';\nimport { container, Logger } from '../services';\nimport { combine, streamLines } from '../utils';\nimport { Project } from './project';\n\n// Types\nexport type WorkspaceDepsMode = 'all' | 'prod' | 'none';\n\nexport interface WorkspaceContext extends TaskContext {\n  workspace: Workspace;\n  script: string;\n}\n\nexport interface WorkspaceRunOptions extends Omit<SpawnTaskOptions, 'cwd'> {\n  buildDeps?: WorkspaceDepsMode;\n}\n\n// Class\nexport class Workspace {\n  // Attributes\n  private readonly _logger: winston.Logger;\n  private readonly _affectedCache = new Map<string, Promise<boolean>>();\n  private readonly _tasks = new Map<string, SpawnTask<WorkspaceContext>>();\n\n  // Constructor\n  constructor(\n    private readonly _cwd: string,\n    readonly manifest: Package,\n    readonly project: Project\n  ) {\n    const logger = container.get(Logger);\n    this._logger = logger.child({ label: this.manifest.name });\n  }\n\n  // Methods\n  private _satisfies(from: Workspace, range: string): boolean {\n    if (range.startsWith('file:')) {\n      return path.resolve(from.cwd, range.substring(5)) === this.cwd;\n    }\n\n    if (range.startsWith('workspace:')) {\n      range = range.substring(10);\n    }\n\n    return !this.version || satisfies(this.version, range);\n  }\n\n  private async _buildDependencies(task: SpawnTask, deps: WorkspaceDepsMode = 'all') {\n    // Generators\n    const generators: AsyncGenerator<Workspace, void>[] = [];\n\n    switch (deps) {\n      case 'all':\n        generators.unshift(this.devDependencies());\n\n      // eslint-disable-next no-fallthrough\n      case 'prod':\n        generators.unshift(this.dependencies());\n    }\n\n    // Build deps\n    for await (const dep of combine(...generators)) {\n      const build = await dep.build();\n\n      if (build) {\n        task.dependsOn(build);\n      }\n    }\n  }\n\n  private async _isAffected(reference: string): Promise<boolean> {\n    const isAffected = await Git.isAffected(reference, ['--', this.cwd], {\n      cwd: this.project.root,\n      logger: this._logger,\n    });\n\n    if (isAffected) {\n      return true;\n    }\n\n    // Test dependencies\n    const proms: Promise<boolean>[] = [];\n\n    for await (const dep of combine(this.dependencies(), this.devDependencies())) {\n      proms.push(dep.isAffected(reference));\n    }\n\n    const results = await Promise.all(proms);\n    return results.some(r => r);\n  }\n\n  async isAffected(reference: string): Promise<boolean> {\n    let isAffected = this._affectedCache.get(reference);\n\n    if (!isAffected) {\n      isAffected = this._isAffected(reference);\n      this._affectedCache.set(reference, isAffected);\n    }\n\n    return await isAffected;\n  }\n\n  private async* _loadDependencies(dependencies: Record<string, string>, kind: string): AsyncGenerator<Workspace, void> {\n    for (const [dep, range] of Object.entries(dependencies)) {\n      const ws = await this.project.workspace(dep);\n\n      if (ws) {\n        if (ws._satisfies(this, range)) {\n          yield ws;\n        } else {\n          this._logger.verbose(`Ignoring ${kind} ${ws.reference} as it does not match requirement ${range}`);\n        }\n      }\n    }\n  }\n\n  async* dependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.dependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.dependencies, 'dependency')) {\n      yield ws;\n    }\n  }\n\n  async* devDependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.devDependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.devDependencies, 'devDependency')) {\n      yield ws;\n    }\n  }\n\n  private async _streamLogs(task: SpawnTask<WorkspaceContext>, stream: SpawnTaskStream, level: string) {\n    try {\n      for await (const line of streamLines(task, stream)) {\n        this._logger.log(level, line);\n      }\n    } catch (err) {\n      if (err) {\n        this._logger.warn(`Error while streaming task ${stream}`, err);\n      }\n    }\n  }\n\n  async run(script: string, args: string[] = [], opts: WorkspaceRunOptions = {}): Promise<SpawnTask<WorkspaceContext>> {\n    let task = this._tasks.get(script);\n\n    if (!task) {\n      const pm = await this.project.packageManager();\n\n      task = new SpawnTask(pm, ['run', script, ...args], { workspace: this, script }, {\n        ...opts,\n        cwd: this.cwd,\n        logger: this._logger,\n        env: {\n          FORCE_COLOR: '1',\n          ...opts.env\n        }\n      });\n\n      this._streamLogs(task, 'stdout', 'info');\n      this._streamLogs(task, 'stderr', 'info');\n\n      await this._buildDependencies(task, opts.buildDeps);\n\n      this._tasks.set(script, task);\n    }\n\n    return task;\n  }\n\n  async build(opts?: WorkspaceRunOptions): Promise<SpawnTask | null> {\n    const { scripts = {} } = this.manifest;\n\n    if (!scripts.build) {\n      this._logger.warn('Will not be built (no build script)');\n      return null;\n    }\n\n    return await this.run('build', [], opts);\n  }\n\n  // Properties\n  get name(): string {\n    return this.manifest.name;\n  }\n\n  get version(): string {\n    return this.manifest.version;\n  }\n\n  get reference(): string {\n    return this.version ? `${this.name}@${this.version}` : this.name;\n  }\n\n  get cwd(): string {\n    return path.resolve(this.project.root, this._cwd);\n  }\n}\n"]}

package/dist/project/workspace.js

@@ -109,6 +109,17 @@ class Workspace {
             yield ws;
         }
     }
+    async _streamLogs(task, stream, level) {
+        try {
+            for await (const line of (0, _utils.streamLines)(task, stream)){
+                this._logger.log(level, line);
+            }
+        } catch (err) {
+            if (err) {
+                this._logger.warn(`Error while streaming task ${stream}`, err);
+            }
+        }
+    }
     async run(script, args = [], opts = {}) {
         let task = this._tasks.get(script);
         if (!task) {
@@ -118,7 +129,8 @@ class Workspace {
                 script,
                 ...args
             ], {
-                workspace: this
+                workspace: this,
+                script
             }, {
                 ...opts,
                 cwd: this.cwd,
@@ -128,8 +140,8 @@ class Workspace {
                     ...opts.env
                 }
             });
-            (0, _utils.each)((0, _utils.streamLines)(task, 'stdout'), (line)=>this._logger.info(line));
-            (0, _utils.each)((0, _utils.streamLines)(task, 'stderr'), (line)=>this._logger.warn(line));
+            this._streamLogs(task, 'stdout', 'info');
+            this._streamLogs(task, 'stderr', 'info');
             await this._buildDependencies(task, opts.buildDeps);
             this._tasks.set(script, task);
         }

package/dist/project/workspace.js.map

@@ -1 +1 @@
-{"version":3,"sources":["project/workspace.js"],"sourcesContent":["import { SpawnTask, SpawnTaskOptions, TaskContext } from '@jujulego/tasks';\nimport path from 'node:path';\nimport { Package } from 'normalize-package-data';\nimport { satisfies } from 'semver';\nimport winston from 'winston';\n\nimport { Git } from '../git';\nimport { container, Logger } from '../services';\nimport { combine, each, streamLines } from '../utils';\nimport { Project } from './project';\n\n// Types\nexport type WorkspaceDepsMode = 'all' | 'prod' | 'none';\n\nexport interface WorkspaceContext extends TaskContext {\n  workspace: Workspace;\n}\n\nexport interface WorkspaceRunOptions extends Omit<SpawnTaskOptions, 'cwd'> {\n  buildDeps?: WorkspaceDepsMode;\n}\n\n// Class\nexport class Workspace {\n  // Attributes\n  private readonly _logger: winston.Logger;\n  private readonly _affectedCache = new Map<string, Promise<boolean>>();\n  private readonly _tasks = new Map<string, SpawnTask<WorkspaceContext>>();\n\n  // Constructor\n  constructor(\n    private readonly _cwd: string,\n    readonly manifest: Package,\n    readonly project: Project\n  ) {\n    const logger = container.get(Logger);\n    this._logger = logger.child({ label: this.manifest.name });\n  }\n\n  // Methods\n  private _satisfies(from: Workspace, range: string): boolean {\n    if (range.startsWith('file:')) {\n      return path.resolve(from.cwd, range.substring(5)) === this.cwd;\n    }\n\n    if (range.startsWith('workspace:')) {\n      range = range.substring(10);\n    }\n\n    return !this.version || satisfies(this.version, range);\n  }\n\n  private async _buildDependencies(task: SpawnTask, deps: WorkspaceDepsMode = 'all') {\n    // Generators\n    const generators: AsyncGenerator<Workspace, void>[] = [];\n\n    switch (deps) {\n      case 'all':\n        generators.unshift(this.devDependencies());\n\n      // eslint-disable-next no-fallthrough\n      case 'prod':\n        generators.unshift(this.dependencies());\n    }\n\n    // Build deps\n    for await (const dep of combine(...generators)) {\n      const build = await dep.build();\n\n      if (build) {\n        task.dependsOn(build);\n      }\n    }\n  }\n\n  private async _isAffected(reference: string): Promise<boolean> {\n    const isAffected = await Git.isAffected(reference, ['--', this.cwd], {\n      cwd: this.project.root,\n      logger: this._logger,\n    });\n\n    if (isAffected) {\n      return true;\n    }\n\n    // Test dependencies\n    const proms: Promise<boolean>[] = [];\n\n    for await (const dep of combine(this.dependencies(), this.devDependencies())) {\n      proms.push(dep.isAffected(reference));\n    }\n\n    const results = await Promise.all(proms);\n    return results.some(r => r);\n  }\n\n  async isAffected(reference: string): Promise<boolean> {\n    let isAffected = this._affectedCache.get(reference);\n\n    if (!isAffected) {\n      isAffected = this._isAffected(reference);\n      this._affectedCache.set(reference, isAffected);\n    }\n\n    return await isAffected;\n  }\n\n  private async* _loadDependencies(dependencies: Record<string, string>, kind: string): AsyncGenerator<Workspace, void> {\n    for (const [dep, range] of Object.entries(dependencies)) {\n      const ws = await this.project.workspace(dep);\n\n      if (ws) {\n        if (ws._satisfies(this, range)) {\n          yield ws;\n        } else {\n          this._logger.verbose(`Ignoring ${kind} ${ws.reference} as it does not match requirement ${range}`);\n        }\n      }\n    }\n  }\n\n  async* dependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.dependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.dependencies, 'dependency')) {\n      yield ws;\n    }\n  }\n\n  async* devDependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.devDependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.devDependencies, 'devDependency')) {\n      yield ws;\n    }\n  }\n\n  async run(script: string, args: string[] = [], opts: WorkspaceRunOptions = {}): Promise<SpawnTask<WorkspaceContext>> {\n    let task = this._tasks.get(script);\n\n    if (!task) {\n      const pm = await this.project.packageManager();\n\n      task = new SpawnTask(pm, ['run', script, ...args], { workspace: this }, {\n        ...opts,\n        cwd: this.cwd,\n        logger: this._logger,\n        env: {\n          FORCE_COLOR: '1',\n          ...opts.env\n        }\n      });\n\n      each(streamLines(task, 'stdout'), (line) => this._logger.info(line));\n      each(streamLines(task, 'stderr'), (line) => this._logger.warn(line));\n\n      await this._buildDependencies(task, opts.buildDeps);\n\n      this._tasks.set(script, task);\n    }\n\n    return task;\n  }\n\n  async build(opts?: WorkspaceRunOptions): Promise<SpawnTask | null> {\n    const { scripts = {} } = this.manifest;\n\n    if (!scripts.build) {\n      this._logger.warn('Will not be built (no build script)');\n      return null;\n    }\n\n    return await this.run('build', [], opts);\n  }\n\n  // Properties\n  get name(): string {\n    return this.manifest.name;\n  }\n\n  get version(): string {\n    return this.manifest.version;\n  }\n\n  get reference(): string {\n    return this.version ? `${this.name}@${this.version}` : this.name;\n  }\n\n  get cwd(): string {\n    return path.resolve(this.project.root, this._cwd);\n  }\n}\n"],"names":["Workspace","constructor","_cwd","manifest","project","_affectedCache","Map","_tasks","logger","container","get","Logger","_logger","child","label","name","_satisfies","from","range","startsWith","path","resolve","cwd","substring","version","satisfies","_buildDependencies","task","deps","generators","unshift","devDependencies","dependencies","dep","combine","build","dependsOn","_isAffected","reference","isAffected","Git","root","proms","push","results","Promise","all","some","r","set","_loadDependencies","kind","Object","entries","ws","workspace","verbose","run","script","args","opts","pm","packageManager","SpawnTask","env","FORCE_COLOR","each","streamLines","line","info","warn","buildDeps","scripts"],"mappings":"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","file":"workspace.js"}
+{"version":3,"sources":["project/workspace.js"],"sourcesContent":["import { SpawnTask, SpawnTaskOptions, SpawnTaskStream, TaskContext } from '@jujulego/tasks';\nimport path from 'node:path';\nimport { Package } from 'normalize-package-data';\nimport { satisfies } from 'semver';\nimport winston from 'winston';\n\nimport { Git } from '../git';\nimport { container, Logger } from '../services';\nimport { combine, streamLines } from '../utils';\nimport { Project } from './project';\n\n// Types\nexport type WorkspaceDepsMode = 'all' | 'prod' | 'none';\n\nexport interface WorkspaceContext extends TaskContext {\n  workspace: Workspace;\n  script: string;\n}\n\nexport interface WorkspaceRunOptions extends Omit<SpawnTaskOptions, 'cwd'> {\n  buildDeps?: WorkspaceDepsMode;\n}\n\n// Class\nexport class Workspace {\n  // Attributes\n  private readonly _logger: winston.Logger;\n  private readonly _affectedCache = new Map<string, Promise<boolean>>();\n  private readonly _tasks = new Map<string, SpawnTask<WorkspaceContext>>();\n\n  // Constructor\n  constructor(\n    private readonly _cwd: string,\n    readonly manifest: Package,\n    readonly project: Project\n  ) {\n    const logger = container.get(Logger);\n    this._logger = logger.child({ label: this.manifest.name });\n  }\n\n  // Methods\n  private _satisfies(from: Workspace, range: string): boolean {\n    if (range.startsWith('file:')) {\n      return path.resolve(from.cwd, range.substring(5)) === this.cwd;\n    }\n\n    if (range.startsWith('workspace:')) {\n      range = range.substring(10);\n    }\n\n    return !this.version || satisfies(this.version, range);\n  }\n\n  private async _buildDependencies(task: SpawnTask, deps: WorkspaceDepsMode = 'all') {\n    // Generators\n    const generators: AsyncGenerator<Workspace, void>[] = [];\n\n    switch (deps) {\n      case 'all':\n        generators.unshift(this.devDependencies());\n\n      // eslint-disable-next no-fallthrough\n      case 'prod':\n        generators.unshift(this.dependencies());\n    }\n\n    // Build deps\n    for await (const dep of combine(...generators)) {\n      const build = await dep.build();\n\n      if (build) {\n        task.dependsOn(build);\n      }\n    }\n  }\n\n  private async _isAffected(reference: string): Promise<boolean> {\n    const isAffected = await Git.isAffected(reference, ['--', this.cwd], {\n      cwd: this.project.root,\n      logger: this._logger,\n    });\n\n    if (isAffected) {\n      return true;\n    }\n\n    // Test dependencies\n    const proms: Promise<boolean>[] = [];\n\n    for await (const dep of combine(this.dependencies(), this.devDependencies())) {\n      proms.push(dep.isAffected(reference));\n    }\n\n    const results = await Promise.all(proms);\n    return results.some(r => r);\n  }\n\n  async isAffected(reference: string): Promise<boolean> {\n    let isAffected = this._affectedCache.get(reference);\n\n    if (!isAffected) {\n      isAffected = this._isAffected(reference);\n      this._affectedCache.set(reference, isAffected);\n    }\n\n    return await isAffected;\n  }\n\n  private async* _loadDependencies(dependencies: Record<string, string>, kind: string): AsyncGenerator<Workspace, void> {\n    for (const [dep, range] of Object.entries(dependencies)) {\n      const ws = await this.project.workspace(dep);\n\n      if (ws) {\n        if (ws._satisfies(this, range)) {\n          yield ws;\n        } else {\n          this._logger.verbose(`Ignoring ${kind} ${ws.reference} as it does not match requirement ${range}`);\n        }\n      }\n    }\n  }\n\n  async* dependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.dependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.dependencies, 'dependency')) {\n      yield ws;\n    }\n  }\n\n  async* devDependencies(): AsyncGenerator<Workspace, void> {\n    if (!this.manifest.devDependencies) return;\n\n    for await (const ws of this._loadDependencies(this.manifest.devDependencies, 'devDependency')) {\n      yield ws;\n    }\n  }\n\n  private async _streamLogs(task: SpawnTask<WorkspaceContext>, stream: SpawnTaskStream, level: string) {\n    try {\n      for await (const line of streamLines(task, stream)) {\n        this._logger.log(level, line);\n      }\n    } catch (err) {\n      if (err) {\n        this._logger.warn(`Error while streaming task ${stream}`, err);\n      }\n    }\n  }\n\n  async run(script: string, args: string[] = [], opts: WorkspaceRunOptions = {}): Promise<SpawnTask<WorkspaceContext>> {\n    let task = this._tasks.get(script);\n\n    if (!task) {\n      const pm = await this.project.packageManager();\n\n      task = new SpawnTask(pm, ['run', script, ...args], { workspace: this, script }, {\n        ...opts,\n        cwd: this.cwd,\n        logger: this._logger,\n        env: {\n          FORCE_COLOR: '1',\n          ...opts.env\n        }\n      });\n\n      this._streamLogs(task, 'stdout', 'info');\n      this._streamLogs(task, 'stderr', 'info');\n\n      await this._buildDependencies(task, opts.buildDeps);\n\n      this._tasks.set(script, task);\n    }\n\n    return task;\n  }\n\n  async build(opts?: WorkspaceRunOptions): Promise<SpawnTask | null> {\n    const { scripts = {} } = this.manifest;\n\n    if (!scripts.build) {\n      this._logger.warn('Will not be built (no build script)');\n      return null;\n    }\n\n    return await this.run('build', [], opts);\n  }\n\n  // Properties\n  get name(): string {\n    return this.manifest.name;\n  }\n\n  get version(): string {\n    return this.manifest.version;\n  }\n\n  get reference(): string {\n    return this.version ? `${this.name}@${this.version}` : this.name;\n  }\n\n  get cwd(): string {\n    return path.resolve(this.project.root, this._cwd);\n  }\n}\n"],"names":["Workspace","constructor","_cwd","manifest","project","_affectedCache","Map","_tasks","logger","container","get","Logger","_logger","child","label","name","_satisfies","from","range","startsWith","path","resolve","cwd","substring","version","satisfies","_buildDependencies","task","deps","generators","unshift","devDependencies","dependencies","dep","combine","build","dependsOn","_isAffected","reference","isAffected","Git","root","proms","push","results","Promise","all","some","r","set","_loadDependencies","kind","Object","entries","ws","workspace","verbose","_streamLogs","stream","level","line","streamLines","log","err","warn","run","script","args","opts","pm","packageManager","SpawnTask","env","FORCE_COLOR","buildDeps","scripts"],"mappings":"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","file":"workspace.js"}

package/dist/services/logger.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["services/logger.service.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAC;AAW9B,eAAO,MAAM,aAAa,wBAwBzB,CAAC;AAGF,qBACa,MAAM;CAAG;AAGtB,MAAM,WAAW,MAAO,SAAQ,OAAO,CAAC,MAAM;CAAG","file":"logger.service.d.ts","sourcesContent":["import chalk from 'chalk';\nimport { injectable } from 'inversify';\nimport winston from 'winston';\n\nimport { type GlobalConfig, GLOBAL_CONFIG, container } from './inversify.config';\n\n// Constants\nconst VERBOSITY_LEVEL: Record<number, string> = {\n  1: 'verbose',\n  2: 'debug',\n};\n\n// Utils\nexport const consoleFormat = winston.format.combine(\n  winston.format.errors(),\n  winston.format.colorize({\n    message: true,\n    colors: { debug: 'grey', verbose: 'blue', info: 'white', error: 'red' }\n  }),\n  winston.format.printf(({ label, message, ms }) => {\n    const lines = message.split('\\n');\n\n    // Format\n    let spaces = '';\n    let formatted = `${lines[0]} ${chalk.magenta(ms)}`;\n\n    if (label) {\n      spaces = ' '.repeat(label.length + 3);\n      formatted = `${chalk.grey(`[${label}]`)} ${lines[0]} ${chalk.magenta(ms)}`;\n    }\n\n    for (let i = 1; i < lines.length; ++i) {\n      formatted += `\\n${spaces}${lines[i]}`;\n    }\n\n    return formatted;\n  }),\n);\n\n// Service\n@injectable()\nexport class Logger {}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface Logger extends winston.Logger {}\n\ncontainer.bind(Logger)\n  .toDynamicValue((context) => {\n    const config = context.container.get<GlobalConfig>(GLOBAL_CONFIG);\n\n    return winston.createLogger({\n      level: VERBOSITY_LEVEL[Math.min(config.verbose, 2)],\n      format: winston.format.combine(\n        winston.format.timestamp(),\n        winston.format.ms(),\n      ),\n      transports: [\n        new winston.transports.Console({\n          format: consoleFormat\n        })\n      ]\n    });\n  })\n  .inSingletonScope();\n"]}
+{"version":3,"sources":["services/logger.service.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAC;AAW9B,eAAO,MAAM,aAAa,wBAwBzB,CAAC;AAGF,qBACa,MAAM;CAAG;AAGtB,MAAM,WAAW,MAAO,SAAQ,OAAO,CAAC,MAAM;CAAG","file":"logger.service.d.ts","sourcesContent":["import chalk from 'chalk';\nimport { injectable } from 'inversify';\nimport winston from 'winston';\n\nimport { type GlobalConfig, GLOBAL_CONFIG, container } from './inversify.config';\n\n// Constants\nconst VERBOSITY_LEVEL: Record<number, string> = {\n  1: 'verbose',\n  2: 'debug',\n};\n\n// Utils\nexport const consoleFormat = winston.format.combine(\n  winston.format.errors(),\n  winston.format.colorize({\n    message: true,\n    colors: { debug: 'grey', verbose: 'blue', info: 'white', error: 'red' }\n  }),\n  winston.format.printf(({ label, message }) => {\n    const lines = message.split('\\n');\n\n    // Format\n    let spaces = '';\n    let formatted = lines[0];\n\n    if (label) {\n      spaces = ' '.repeat(label.length + 3);\n      formatted = `${chalk.grey(`[${label}]`)} ${lines[0]}`;\n    }\n\n    for (let i = 1; i < lines.length; ++i) {\n      formatted += `\\n${spaces}${lines[i]}`;\n    }\n\n    return formatted;\n  }),\n);\n\n// Service\n@injectable()\nexport class Logger {}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface Logger extends winston.Logger {}\n\ncontainer.bind(Logger)\n  .toDynamicValue((context) => {\n    const config = context.container.get<GlobalConfig>(GLOBAL_CONFIG);\n\n    return winston.createLogger({\n      level: VERBOSITY_LEVEL[Math.min(config.verbose, 2)],\n      format: winston.format.combine(\n        winston.format.timestamp(),\n      ),\n      transports: [\n        new winston.transports.Console({\n          format: consoleFormat\n        })\n      ]\n    });\n  })\n  .inSingletonScope();\n"]}

package/dist/services/logger.service.js

@@ -40,14 +40,14 @@ const consoleFormat = _winston.default.format.combine(_winston.default.format.er
         info: 'white',
         error: 'red'
     }
-}), _winston.default.format.printf(({ label , message , ms  })=>{
+}), _winston.default.format.printf(({ label , message  })=>{
     const lines = message.split('\n');
     // Format
     let spaces = '';
-    let formatted = `${lines[0]} ${_chalk.default.magenta(ms)}`;
+    let formatted = lines[0];
     if (label) {
         spaces = ' '.repeat(label.length + 3);
-        formatted = `${_chalk.default.grey(`[${label}]`)} ${lines[0]} ${_chalk.default.magenta(ms)}`;
+        formatted = `${_chalk.default.grey(`[${label}]`)} ${lines[0]}`;
     }
     for(let i = 1; i < lines.length; ++i){
         formatted += `\n${spaces}${lines[i]}`;
@@ -63,7 +63,7 @@ _inversifyConfig.container.bind(Logger).toDynamicValue((context)=>{
     const config = context.container.get(_inversifyConfig.GLOBAL_CONFIG);
     return _winston.default.createLogger({
         level: VERBOSITY_LEVEL[Math.min(config.verbose, 2)],
-        format: _winston.default.format.combine(_winston.default.format.timestamp(), _winston.default.format.ms()),
+        format: _winston.default.format.combine(_winston.default.format.timestamp()),
         transports: [
             new _winston.default.transports.Console({
                 format: consoleFormat

package/dist/services/logger.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["services/logger.service.js"],"sourcesContent":["import chalk from 'chalk';\nimport { injectable } from 'inversify';\nimport winston from 'winston';\n\nimport { type GlobalConfig, GLOBAL_CONFIG, container } from './inversify.config';\n\n// Constants\nconst VERBOSITY_LEVEL: Record<number, string> = {\n  1: 'verbose',\n  2: 'debug',\n};\n\n// Utils\nexport const consoleFormat = winston.format.combine(\n  winston.format.errors(),\n  winston.format.colorize({\n    message: true,\n    colors: { debug: 'grey', verbose: 'blue', info: 'white', error: 'red' }\n  }),\n  winston.format.printf(({ label, message, ms }) => {\n    const lines = message.split('\\n');\n\n    // Format\n    let spaces = '';\n    let formatted = `${lines[0]} ${chalk.magenta(ms)}`;\n\n    if (label) {\n      spaces = ' '.repeat(label.length + 3);\n      formatted = `${chalk.grey(`[${label}]`)} ${lines[0]} ${chalk.magenta(ms)}`;\n    }\n\n    for (let i = 1; i < lines.length; ++i) {\n      formatted += `\\n${spaces}${lines[i]}`;\n    }\n\n    return formatted;\n  }),\n);\n\n// Service\n@injectable()\nexport class Logger {}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface Logger extends winston.Logger {}\n\ncontainer.bind(Logger)\n  .toDynamicValue((context) => {\n    const config = context.container.get<GlobalConfig>(GLOBAL_CONFIG);\n\n    return winston.createLogger({\n      level: VERBOSITY_LEVEL[Math.min(config.verbose, 2)],\n      format: winston.format.combine(\n        winston.format.timestamp(),\n        winston.format.ms(),\n      ),\n      transports: [\n        new winston.transports.Console({\n          format: consoleFormat\n        })\n      ]\n    });\n  })\n  .inSingletonScope();\n"],"names":["consoleFormat","Logger","VERBOSITY_LEVEL","winston","format","combine","errors","colorize","message","colors","debug","verbose","info","error","printf","label","ms","lines","split","spaces","formatted","chalk","magenta","repeat","length","grey","i","injectable","container","bind","toDynamicValue","context","config","get","GLOBAL_CONFIG","createLogger","level","Math","min","timestamp","transports","Console","inSingletonScope"],"mappings":"AAAA;;;;;;;;;;;IAaaA,aAAa,MAAbA;IA4BAC,MAAM,MAANA;;4DAzCK;2BACS;8DACP;iCAEwC;;;;;;;;;;;;AAE5D,YAAY;AACZ,MAAMC,kBAA0C;IAC9C,GAAG;IACH,GAAG;AACL;AAGO,MAAMF,gBAAgBG,gBAAO,CAACC,MAAM,CAACC,OAAO,CACjDF,gBAAO,CAACC,MAAM,CAACE,MAAM,IACrBH,gBAAO,CAACC,MAAM,CAACG,QAAQ,CAAC;IACtBC,SAAS,IAAI;IACbC,QAAQ;QAAEC,OAAO;QAAQC,SAAS;QAAQC,MAAM;QAASC,OAAO;IAAM;AACxE,IACAV,gBAAO,CAACC,MAAM,CAACU,MAAM,CAAC,CAAC,EAAEC,MAAK,EAAEP,QAAO,EAAEQ,GAAE,EAAE,GAAK;IAChD,MAAMC,QAAQT,QAAQU,KAAK,CAAC;IAE5B,SAAS;IACT,IAAIC,SAAS;IACb,IAAIC,YAAY,CAAC,EAAEH,KAAK,CAAC,EAAE,CAAC,CAAC,EAAEI,cAAK,CAACC,OAAO,CAACN,IAAI,CAAC;IAElD,IAAID,OAAO;QACTI,SAAS,IAAII,MAAM,CAACR,MAAMS,MAAM,GAAG;QACnCJ,YAAY,CAAC,EAAEC,cAAK,CAACI,IAAI,CAAC,CAAC,CAAC,EAAEV,MAAM,CAAC,CAAC,EAAE,CAAC,EAAEE,KAAK,CAAC,EAAE,CAAC,CAAC,EAAEI,cAAK,CAACC,OAAO,CAACN,IAAI,CAAC;IAC5E,CAAC;IAED,IAAK,IAAIU,IAAI,GAAGA,IAAIT,MAAMO,MAAM,EAAE,EAAEE,EAAG;QACrCN,aAAa,CAAC,EAAE,EAAED,OAAO,EAAEF,KAAK,CAACS,EAAE,CAAC,CAAC;IACvC;IAEA,OAAON;AACT;IAKWnB,SAAN;AAAc;AAARA;IADZ0B,IAAAA,qBAAU;GACE1B;AAKb2B,0BAAS,CAACC,IAAI,CAAC5B,QACZ6B,cAAc,CAAC,CAACC,UAAY;IAC3B,MAAMC,SAASD,QAAQH,SAAS,CAACK,GAAG,CAAeC,8BAAa;IAEhE,OAAO/B,gBAAO,CAACgC,YAAY,CAAC;QAC1BC,OAAOlC,eAAe,CAACmC,KAAKC,GAAG,CAACN,OAAOrB,OAAO,EAAE,GAAG;QACnDP,QAAQD,gBAAO,CAACC,MAAM,CAACC,OAAO,CAC5BF,gBAAO,CAACC,MAAM,CAACmC,SAAS,IACxBpC,gBAAO,CAACC,MAAM,CAACY,EAAE;QAEnBwB,YAAY;YACV,IAAIrC,gBAAO,CAACqC,UAAU,CAACC,OAAO,CAAC;gBAC7BrC,QAAQJ;YACV;SACD;IACH;AACF,GACC0C,gBAAgB","file":"logger.service.js"}
+{"version":3,"sources":["services/logger.service.js"],"sourcesContent":["import chalk from 'chalk';\nimport { injectable } from 'inversify';\nimport winston from 'winston';\n\nimport { type GlobalConfig, GLOBAL_CONFIG, container } from './inversify.config';\n\n// Constants\nconst VERBOSITY_LEVEL: Record<number, string> = {\n  1: 'verbose',\n  2: 'debug',\n};\n\n// Utils\nexport const consoleFormat = winston.format.combine(\n  winston.format.errors(),\n  winston.format.colorize({\n    message: true,\n    colors: { debug: 'grey', verbose: 'blue', info: 'white', error: 'red' }\n  }),\n  winston.format.printf(({ label, message }) => {\n    const lines = message.split('\\n');\n\n    // Format\n    let spaces = '';\n    let formatted = lines[0];\n\n    if (label) {\n      spaces = ' '.repeat(label.length + 3);\n      formatted = `${chalk.grey(`[${label}]`)} ${lines[0]}`;\n    }\n\n    for (let i = 1; i < lines.length; ++i) {\n      formatted += `\\n${spaces}${lines[i]}`;\n    }\n\n    return formatted;\n  }),\n);\n\n// Service\n@injectable()\nexport class Logger {}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface Logger extends winston.Logger {}\n\ncontainer.bind(Logger)\n  .toDynamicValue((context) => {\n    const config = context.container.get<GlobalConfig>(GLOBAL_CONFIG);\n\n    return winston.createLogger({\n      level: VERBOSITY_LEVEL[Math.min(config.verbose, 2)],\n      format: winston.format.combine(\n        winston.format.timestamp(),\n      ),\n      transports: [\n        new winston.transports.Console({\n          format: consoleFormat\n        })\n      ]\n    });\n  })\n  .inSingletonScope();\n"],"names":["consoleFormat","Logger","VERBOSITY_LEVEL","winston","format","combine","errors","colorize","message","colors","debug","verbose","info","error","printf","label","lines","split","spaces","formatted","repeat","length","chalk","grey","i","injectable","container","bind","toDynamicValue","context","config","get","GLOBAL_CONFIG","createLogger","level","Math","min","timestamp","transports","Console","inSingletonScope"],"mappings":"AAAA;;;;;;;;;;;IAaaA,aAAa,MAAbA;IA4BAC,MAAM,MAANA;;4DAzCK;2BACS;8DACP;iCAEwC;;;;;;;;;;;;AAE5D,YAAY;AACZ,MAAMC,kBAA0C;IAC9C,GAAG;IACH,GAAG;AACL;AAGO,MAAMF,gBAAgBG,gBAAO,CAACC,MAAM,CAACC,OAAO,CACjDF,gBAAO,CAACC,MAAM,CAACE,MAAM,IACrBH,gBAAO,CAACC,MAAM,CAACG,QAAQ,CAAC;IACtBC,SAAS,IAAI;IACbC,QAAQ;QAAEC,OAAO;QAAQC,SAAS;QAAQC,MAAM;QAASC,OAAO;IAAM;AACxE,IACAV,gBAAO,CAACC,MAAM,CAACU,MAAM,CAAC,CAAC,EAAEC,MAAK,EAAEP,QAAO,EAAE,GAAK;IAC5C,MAAMQ,QAAQR,QAAQS,KAAK,CAAC;IAE5B,SAAS;IACT,IAAIC,SAAS;IACb,IAAIC,YAAYH,KAAK,CAAC,EAAE;IAExB,IAAID,OAAO;QACTG,SAAS,IAAIE,MAAM,CAACL,MAAMM,MAAM,GAAG;QACnCF,YAAY,CAAC,EAAEG,cAAK,CAACC,IAAI,CAAC,CAAC,CAAC,EAAER,MAAM,CAAC,CAAC,EAAE,CAAC,EAAEC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,IAAK,IAAIQ,IAAI,GAAGA,IAAIR,MAAMK,MAAM,EAAE,EAAEG,EAAG;QACrCL,aAAa,CAAC,EAAE,EAAED,OAAO,EAAEF,KAAK,CAACQ,EAAE,CAAC,CAAC;IACvC;IAEA,OAAOL;AACT;IAKWlB,SAAN;AAAc;AAARA;IADZwB,IAAAA,qBAAU;GACExB;AAKbyB,0BAAS,CAACC,IAAI,CAAC1B,QACZ2B,cAAc,CAAC,CAACC,UAAY;IAC3B,MAAMC,SAASD,QAAQH,SAAS,CAACK,GAAG,CAAeC,8BAAa;IAEhE,OAAO7B,gBAAO,CAAC8B,YAAY,CAAC;QAC1BC,OAAOhC,eAAe,CAACiC,KAAKC,GAAG,CAACN,OAAOnB,OAAO,EAAE,GAAG;QACnDP,QAAQD,gBAAO,CAACC,MAAM,CAACC,OAAO,CAC5BF,gBAAO,CAACC,MAAM,CAACiC,SAAS;QAE1BC,YAAY;YACV,IAAInC,gBAAO,CAACmC,UAAU,CAACC,OAAO,CAAC;gBAC7BnC,QAAQJ;YACV;SACD;IACH;AACF,GACCwC,gBAAgB","file":"logger.service.js"}

package/dist/ui/task-name.d.ts

@@ -0,0 +1,6 @@
+import { Task } from '@jujulego/tasks';
+import { FC } from 'react';
+export interface TaskNameProps {
+    task: Task;
+}
+export declare const TaskName: FC<TaskNameProps>;

package/dist/ui/task-name.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"sources":["ui/task-name.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAe,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAK3B,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,IAAI,CAAC;CACZ;AAQD,eAAO,MAAM,QAAQ,EAAE,EAAE,CAAC,aAAa,CAUtC,CAAC","file":"task-name.d.ts","sourcesContent":["import { Task, TaskContext } from '@jujulego/tasks';\nimport { Text } from 'ink';\nimport { FC } from 'react';\n\nimport { WorkspaceContext } from '../project';\n\n// Types\nexport interface TaskNameProps {\n  task: Task;\n}\n\n// Utils\nfunction isWorkspaceCtx(ctx: Readonly<TaskContext>): ctx is Readonly<WorkspaceContext> {\n  return 'workspace' in ctx;\n}\n\n// Components\nexport const TaskName: FC<TaskNameProps> = ({ task }) => {\n  if (isWorkspaceCtx(task.context)) {\n    return (\n      <Text>\n        Running <Text bold>{ task.context.script }</Text> in { task.context.workspace.name }\n      </Text>\n    );\n  } else {\n    return <Text>{ task.name }</Text>;\n  }\n};\n"]}

package/dist/ui/task-name.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "TaskName", {
+    enumerable: true,
+    get: ()=>TaskName
+});
+const _jsxRuntime = require("react/jsx-runtime");
+const _ink = require("ink");
+// Utils
+function isWorkspaceCtx(ctx) {
+    return 'workspace' in ctx;
+}
+const TaskName = ({ task  })=>{
+    if (isWorkspaceCtx(task.context)) {
+        return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_ink.Text, {
+            children: [
+                "Running ",
+                /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ink.Text, {
+                    bold: true,
+                    children: task.context.script
+                }),
+                " in ",
+                task.context.workspace.name
+            ]
+        });
+    } else {
+        return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ink.Text, {
+            children: task.name
+        });
+    }
+};
+
+//# sourceMappingURL=task-name.js.map

package/dist/ui/task-name.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["ui/task-name.js"],"sourcesContent":["import { Task, TaskContext } from '@jujulego/tasks';\nimport { Text } from 'ink';\nimport { FC } from 'react';\n\nimport { WorkspaceContext } from '../project';\n\n// Types\nexport interface TaskNameProps {\n  task: Task;\n}\n\n// Utils\nfunction isWorkspaceCtx(ctx: Readonly<TaskContext>): ctx is Readonly<WorkspaceContext> {\n  return 'workspace' in ctx;\n}\n\n// Components\nexport const TaskName: FC<TaskNameProps> = ({ task }) => {\n  if (isWorkspaceCtx(task.context)) {\n    return (\n      <Text>\n        Running <Text bold>{ task.context.script }</Text> in { task.context.workspace.name }\n      </Text>\n    );\n  } else {\n    return <Text>{ task.name }</Text>;\n  }\n};\n"],"names":["TaskName","isWorkspaceCtx","ctx","task","context","Text","bold","script","workspace","name"],"mappings":"AAAA;;;;+BAiBaA;;aAAAA;;;qBAhBQ;AAUrB,QAAQ;AACR,SAASC,eAAeC,GAA0B,EAAqC;IACrF,OAAO,eAAeA;AACxB;AAGO,MAAMF,WAA8B,CAAC,EAAEG,KAAI,EAAE,GAAK;IACvD,IAAIF,eAAeE,KAAKC,OAAO,GAAG;QAChC,qBACE,sBAACC,SAAI;;gBAAC;8BACI,qBAACA,SAAI;oBAACC,IAAI;8BAAGH,KAAKC,OAAO,CAACG,MAAM;;gBAAS;gBAAMJ,KAAKC,OAAO,CAACI,SAAS,CAACC,IAAI;;;IAGxF,OAAO;QACL,qBAAO,qBAACJ,SAAI;sBAAGF,KAAKM,IAAI;;IAC1B,CAAC;AACH","file":"task-name.js"}

package/dist/ui/task-spinner.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["ui/task-spinner.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAe,MAAM,iBAAiB,CAAC;AAIpD,OAAO,EAAE,EAAE,EAAsC,MAAM,OAAO,CAAC;AAM/D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,IAAI,CAAC;CACZ;AAQD,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAyF5C,CAAC","file":"task-spinner.d.ts","sourcesContent":["import { Task, TaskContext } from '@jujulego/tasks';\nimport { Text } from 'ink';\nimport Spinner from 'ink-spinner';\nimport symbols from 'log-symbols';\nimport { FC, useLayoutEffect, useMemo, useState } from 'react';\n\nimport { WorkspaceContext } from '../project';\nimport { waitForEvent } from '@jujulego/event-tree';\n\n// Types\nexport interface TaskSpinnerProps {\n  task: Task;\n}\n\n// Utils\nfunction isWorkspaceCtx(ctx: Readonly<TaskContext>): ctx is Readonly<WorkspaceContext> {\n  return 'workspace' in ctx;\n}\n\n// Components\nexport const TaskSpinner: FC<TaskSpinnerProps> = ({ task }) => {\n  // State\n  const [status, setStatus] = useState(task.status);\n  const [time, setTime] = useState(0);\n\n  // Memos\n  const label = useMemo(() => {\n    const ctx = task.context;\n\n    if (isWorkspaceCtx(ctx)) {\n      return `in ${ctx.workspace.name}`;\n    }\n\n    return null;\n  }, [task]);\n\n  // Effects\n  useLayoutEffect(() => {\n    return task.subscribe('status', (event) => {\n      setStatus(event.status);\n    });\n  }, [task]);\n\n  useLayoutEffect(() => {\n    const ctrl = new AbortController();\n\n    (async () => {\n      try {\n        if (['blocked', 'ready']?.includes(task.status)) {\n          await waitForEvent(task, 'status.running', { signal: ctrl.signal });\n        }\n\n        const start = Date.now();\n\n        if (task.status === 'running') {\n          await Promise.race([\n            waitForEvent(task, 'status.done', { signal: ctrl.signal }),\n            waitForEvent(task, 'status.failed', { signal: ctrl.signal })\n          ]);\n        }\n\n        setTime(Date.now() - start);\n      } catch (err) {\n        if (err.name !== 'AbortError') {\n          throw err;\n        }\n      }\n    })();\n\n    return () => ctrl.abort();\n  }, [task]);\n\n  // Render\n  switch (status) {\n    case 'blocked':\n    case 'ready':\n      return (\n        <Text color=\"grey\">\n          <Spinner type=\"line2\" />{ ' ' + task.name }\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n        </Text>\n      );\n\n    case 'running':\n      return (\n        <Text>\n          <Spinner />{ ' ' + task.name }\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n        </Text>\n      );\n\n    case 'done':\n      return (\n        <Text>\n          <Text color=\"green\">{ symbols.success } { task.name }</Text>\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n          <Text color=\"magenta\">{' '}took { time }ms</Text>\n        </Text>\n      );\n\n    case 'failed':\n      return (\n        <Text>\n          <Text color=\"red\">{ symbols.error } { task.name }</Text>\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n          <Text color=\"magenta\">{' '}took { time }ms</Text>\n        </Text>\n      );\n  }\n};\n"]}
+{"version":3,"sources":["ui/task-spinner.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAKvC,OAAO,EAAE,EAAE,EAA6B,MAAM,OAAO,CAAC;AAKtD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,IAAI,CAAC;CACZ;AAGD,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CA0E5C,CAAC","file":"task-spinner.d.ts","sourcesContent":["import { waitForEvent } from '@jujulego/event-tree';\nimport { Task } from '@jujulego/tasks';\nimport { Text } from 'ink';\nimport Spinner from 'ink-spinner';\nimport symbols from 'log-symbols';\nimport ms from 'ms';\nimport { FC, useLayoutEffect, useState } from 'react';\n\nimport { TaskName } from './task-name';\n\n// Types\nexport interface TaskSpinnerProps {\n  task: Task;\n}\n\n// Components\nexport const TaskSpinner: FC<TaskSpinnerProps> = ({ task }) => {\n  // State\n  const [status, setStatus] = useState(task.status);\n  const [time, setTime] = useState(0);\n\n  // Effects\n  useLayoutEffect(() => {\n    return task.subscribe('status', (event) => {\n      setStatus(event.status);\n    });\n  }, [task]);\n\n  useLayoutEffect(() => {\n    const ctrl = new AbortController();\n\n    (async () => {\n      try {\n        if (['blocked', 'ready']?.includes(task.status)) {\n          await waitForEvent(task, 'status.running', { signal: ctrl.signal });\n        }\n\n        const start = Date.now();\n\n        if (task.status === 'running') {\n          await Promise.race([\n            waitForEvent(task, 'status.done', { signal: ctrl.signal }),\n            waitForEvent(task, 'status.failed', { signal: ctrl.signal })\n          ]);\n        }\n\n        setTime(Date.now() - start);\n      } catch (err) {\n        if (err) {\n          throw err;\n        }\n      }\n    })();\n\n    return () => ctrl.abort();\n  }, [task]);\n\n  // Render\n  switch (status) {\n    case 'blocked':\n    case 'ready':\n      return (\n        <Text color=\"grey\">\n          <Spinner type=\"line2\" />{' '}<TaskName task={task} />\n        </Text>\n      );\n\n    case 'running':\n      return (\n        <Text>\n          <Spinner />{' '}<TaskName task={task} />\n        </Text>\n      );\n\n    case 'done':\n      return (\n        <Text>\n          <Text color=\"green\">{ symbols.success }{' '}<TaskName task={task} /></Text>\n          <Text color=\"magenta\">{' '}took { ms(time) }</Text>\n        </Text>\n      );\n\n    case 'failed':\n      return (\n        <Text>\n          <Text color=\"red\">{ symbols.error }{' '}<TaskName task={task} /></Text>\n          <Text color=\"magenta\">{' '}took { ms(time) }</Text>\n        </Text>\n      );\n  }\n};\n"]}

package/dist/ui/task-spinner.js

@@ -7,34 +7,22 @@ Object.defineProperty(exports, "TaskSpinner", {
     get: ()=>TaskSpinner
 });
 const _jsxRuntime = require("react/jsx-runtime");
+const _eventTree = require("@jujulego/event-tree");
 const _ink = require("ink");
 const _inkSpinner = /*#__PURE__*/ _interopRequireDefault(require("ink-spinner"));
 const _logSymbols = /*#__PURE__*/ _interopRequireDefault(require("log-symbols"));
+const _ms = /*#__PURE__*/ _interopRequireDefault(require("ms"));
 const _react = require("react");
-const _eventTree = require("@jujulego/event-tree");
+const _taskName = require("./task-name");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-// Utils
-function isWorkspaceCtx(ctx) {
-    return 'workspace' in ctx;
-}
 const TaskSpinner = ({ task  })=>{
     // State
     const [status, setStatus] = (0, _react.useState)(task.status);
     const [time, setTime] = (0, _react.useState)(0);
-    // Memos
-    const label = (0, _react.useMemo)(()=>{
-        const ctx = task.context;
-        if (isWorkspaceCtx(ctx)) {
-            return `in ${ctx.workspace.name}`;
-        }
-        return null;
-    }, [
-        task
-    ]);
     // Effects
     (0, _react.useLayoutEffect)(()=>{
         return task.subscribe('status', (event)=>{
@@ -68,7 +56,7 @@ const TaskSpinner = ({ task  })=>{
                 }
                 setTime(Date.now() - start);
             } catch (err) {
-                if (err.name !== 'AbortError') {
+                if (err) {
                     throw err;
                 }
             }
@@ -87,10 +75,9 @@ const TaskSpinner = ({ task  })=>{
                     /*#__PURE__*/ (0, _jsxRuntime.jsx)(_inkSpinner.default, {
                         type: "line2"
                     }),
-                    ' ' + task.name,
-                    label && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ink.Text, {
-                        color: "grey",
-                        children: ' ' + label
+                    ' ',
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_taskName.TaskName, {
+                        task: task
                     })
                 ]
             });
@@ -98,10 +85,9 @@ const TaskSpinner = ({ task  })=>{
             return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_ink.Text, {
                 children: [
                     /*#__PURE__*/ (0, _jsxRuntime.jsx)(_inkSpinner.default, {}),
-                    ' ' + task.name,
-                    label && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ink.Text, {
-                        color: "grey",
-                        children: ' ' + label
+                    ' ',
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_taskName.TaskName, {
+                        task: task
                     })
                 ]
             });
@@ -112,21 +98,18 @@ const TaskSpinner = ({ task  })=>{
                         color: "green",
                         children: [
                             _logSymbols.default.success,
-                            " ",
-                            task.name
+                            ' ',
+                            /*#__PURE__*/ (0, _jsxRuntime.jsx)(_taskName.TaskName, {
+                                task: task
+                            })
                         ]
                     }),
-                    label && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ink.Text, {
-                        color: "grey",
-                        children: ' ' + label
-                    }),
                     /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_ink.Text, {
                         color: "magenta",
                         children: [
                             ' ',
                             "took ",
-                            time,
-                            "ms"
+                            (0, _ms.default)(time)
                         ]
                     })
                 ]
@@ -138,21 +121,18 @@ const TaskSpinner = ({ task  })=>{
                         color: "red",
                         children: [
                             _logSymbols.default.error,
-                            " ",
-                            task.name
+                            ' ',
+                            /*#__PURE__*/ (0, _jsxRuntime.jsx)(_taskName.TaskName, {
+                                task: task
+                            })
                         ]
                     }),
-                    label && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_ink.Text, {
-                        color: "grey",
-                        children: ' ' + label
-                    }),
                     /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_ink.Text, {
                         color: "magenta",
                         children: [
                             ' ',
                             "took ",
-                            time,
-                            "ms"
+                            (0, _ms.default)(time)
                         ]
                     })
                 ]

package/dist/ui/task-spinner.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ui/task-spinner.js"],"sourcesContent":["import { Task, TaskContext } from '@jujulego/tasks';\nimport { Text } from 'ink';\nimport Spinner from 'ink-spinner';\nimport symbols from 'log-symbols';\nimport { FC, useLayoutEffect, useMemo, useState } from 'react';\n\nimport { WorkspaceContext } from '../project';\nimport { waitForEvent } from '@jujulego/event-tree';\n\n// Types\nexport interface TaskSpinnerProps {\n  task: Task;\n}\n\n// Utils\nfunction isWorkspaceCtx(ctx: Readonly<TaskContext>): ctx is Readonly<WorkspaceContext> {\n  return 'workspace' in ctx;\n}\n\n// Components\nexport const TaskSpinner: FC<TaskSpinnerProps> = ({ task }) => {\n  // State\n  const [status, setStatus] = useState(task.status);\n  const [time, setTime] = useState(0);\n\n  // Memos\n  const label = useMemo(() => {\n    const ctx = task.context;\n\n    if (isWorkspaceCtx(ctx)) {\n      return `in ${ctx.workspace.name}`;\n    }\n\n    return null;\n  }, [task]);\n\n  // Effects\n  useLayoutEffect(() => {\n    return task.subscribe('status', (event) => {\n      setStatus(event.status);\n    });\n  }, [task]);\n\n  useLayoutEffect(() => {\n    const ctrl = new AbortController();\n\n    (async () => {\n      try {\n        if (['blocked', 'ready']?.includes(task.status)) {\n          await waitForEvent(task, 'status.running', { signal: ctrl.signal });\n        }\n\n        const start = Date.now();\n\n        if (task.status === 'running') {\n          await Promise.race([\n            waitForEvent(task, 'status.done', { signal: ctrl.signal }),\n            waitForEvent(task, 'status.failed', { signal: ctrl.signal })\n          ]);\n        }\n\n        setTime(Date.now() - start);\n      } catch (err) {\n        if (err.name !== 'AbortError') {\n          throw err;\n        }\n      }\n    })();\n\n    return () => ctrl.abort();\n  }, [task]);\n\n  // Render\n  switch (status) {\n    case 'blocked':\n    case 'ready':\n      return (\n        <Text color=\"grey\">\n          <Spinner type=\"line2\" />{ ' ' + task.name }\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n        </Text>\n      );\n\n    case 'running':\n      return (\n        <Text>\n          <Spinner />{ ' ' + task.name }\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n        </Text>\n      );\n\n    case 'done':\n      return (\n        <Text>\n          <Text color=\"green\">{ symbols.success } { task.name }</Text>\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n          <Text color=\"magenta\">{' '}took { time }ms</Text>\n        </Text>\n      );\n\n    case 'failed':\n      return (\n        <Text>\n          <Text color=\"red\">{ symbols.error } { task.name }</Text>\n          { label && <Text color=\"grey\">{ ' ' + label }</Text> }\n          <Text color=\"magenta\">{' '}took { time }ms</Text>\n        </Text>\n      );\n  }\n};\n"],"names":["TaskSpinner","isWorkspaceCtx","ctx","task","status","setStatus","useState","time","setTime","label","useMemo","context","workspace","name","useLayoutEffect","subscribe","event","ctrl","AbortController","includes","waitForEvent","signal","start","Date","now","Promise","race","err","abort","Text","color","Spinner","type","symbols","success","error"],"mappings":"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","file":"task-spinner.js"}
+{"version":3,"sources":["ui/task-spinner.js"],"sourcesContent":["import { waitForEvent } from '@jujulego/event-tree';\nimport { Task } from '@jujulego/tasks';\nimport { Text } from 'ink';\nimport Spinner from 'ink-spinner';\nimport symbols from 'log-symbols';\nimport ms from 'ms';\nimport { FC, useLayoutEffect, useState } from 'react';\n\nimport { TaskName } from './task-name';\n\n// Types\nexport interface TaskSpinnerProps {\n  task: Task;\n}\n\n// Components\nexport const TaskSpinner: FC<TaskSpinnerProps> = ({ task }) => {\n  // State\n  const [status, setStatus] = useState(task.status);\n  const [time, setTime] = useState(0);\n\n  // Effects\n  useLayoutEffect(() => {\n    return task.subscribe('status', (event) => {\n      setStatus(event.status);\n    });\n  }, [task]);\n\n  useLayoutEffect(() => {\n    const ctrl = new AbortController();\n\n    (async () => {\n      try {\n        if (['blocked', 'ready']?.includes(task.status)) {\n          await waitForEvent(task, 'status.running', { signal: ctrl.signal });\n        }\n\n        const start = Date.now();\n\n        if (task.status === 'running') {\n          await Promise.race([\n            waitForEvent(task, 'status.done', { signal: ctrl.signal }),\n            waitForEvent(task, 'status.failed', { signal: ctrl.signal })\n          ]);\n        }\n\n        setTime(Date.now() - start);\n      } catch (err) {\n        if (err) {\n          throw err;\n        }\n      }\n    })();\n\n    return () => ctrl.abort();\n  }, [task]);\n\n  // Render\n  switch (status) {\n    case 'blocked':\n    case 'ready':\n      return (\n        <Text color=\"grey\">\n          <Spinner type=\"line2\" />{' '}<TaskName task={task} />\n        </Text>\n      );\n\n    case 'running':\n      return (\n        <Text>\n          <Spinner />{' '}<TaskName task={task} />\n        </Text>\n      );\n\n    case 'done':\n      return (\n        <Text>\n          <Text color=\"green\">{ symbols.success }{' '}<TaskName task={task} /></Text>\n          <Text color=\"magenta\">{' '}took { ms(time) }</Text>\n        </Text>\n      );\n\n    case 'failed':\n      return (\n        <Text>\n          <Text color=\"red\">{ symbols.error }{' '}<TaskName task={task} /></Text>\n          <Text color=\"magenta\">{' '}took { ms(time) }</Text>\n        </Text>\n      );\n  }\n};\n"],"names":["TaskSpinner","task","status","setStatus","useState","time","setTime","useLayoutEffect","subscribe","event","ctrl","AbortController","includes","waitForEvent","signal","start","Date","now","Promise","race","err","abort","Text","color","Spinner","type","TaskName","symbols","success","ms","error"],"mappings":"AAAA;;;;+BAgBaA;;aAAAA;;;2BAhBgB;qBAER;iEACD;iEACA;yDACL;uBAC+B;0BAErB;;;;;;AAQlB,MAAMA,cAAoC,CAAC,EAAEC,KAAI,EAAE,GAAK;IAC7D,QAAQ;IACR,MAAM,CAACC,QAAQC,UAAU,GAAGC,IAAAA,eAAQ,EAACH,KAAKC,MAAM;IAChD,MAAM,CAACG,MAAMC,QAAQ,GAAGF,IAAAA,eAAQ,EAAC;IAEjC,UAAU;IACVG,IAAAA,sBAAe,EAAC,IAAM;QACpB,OAAON,KAAKO,SAAS,CAAC,UAAU,CAACC,QAAU;YACzCN,UAAUM,MAAMP,MAAM;QACxB;IACF,GAAG;QAACD;KAAK;IAETM,IAAAA,sBAAe,EAAC,IAAM;QACpB,MAAMG,OAAO,IAAIC;QAEhB,CAAA,UAAY;YACX,IAAI;gBACF,IAAI;oBAAC;oBAAW;iBAAQ,EAAEC,SAASX,KAAKC,MAAM,GAAG;oBAC/C,MAAMW,IAAAA,uBAAY,EAACZ,MAAM,kBAAkB;wBAAEa,QAAQJ,KAAKI,MAAM;oBAAC;gBACnE,CAAC;gBAED,MAAMC,QAAQC,KAAKC,GAAG;gBAEtB,IAAIhB,KAAKC,MAAM,KAAK,WAAW;oBAC7B,MAAMgB,QAAQC,IAAI,CAAC;wBACjBN,IAAAA,uBAAY,EAACZ,MAAM,eAAe;4BAAEa,QAAQJ,KAAKI,MAAM;wBAAC;wBACxDD,IAAAA,uBAAY,EAACZ,MAAM,iBAAiB;4BAAEa,QAAQJ,KAAKI,MAAM;wBAAC;qBAC3D;gBACH,CAAC;gBAEDR,QAAQU,KAAKC,GAAG,KAAKF;YACvB,EAAE,OAAOK,KAAK;gBACZ,IAAIA,KAAK;oBACP,MAAMA,IAAI;gBACZ,CAAC;YACH;QACF,CAAA;QAEA,OAAO,IAAMV,KAAKW,KAAK;IACzB,GAAG;QAACpB;KAAK;IAET,SAAS;IACT,OAAQC;QACN,KAAK;QACL,KAAK;YACH,qBACE,sBAACoB,SAAI;gBAACC,OAAM;;kCACV,qBAACC,mBAAO;wBAACC,MAAK;;oBAAW;kCAAI,qBAACC,kBAAQ;wBAACzB,MAAMA;;;;QAInD,KAAK;YACH,qBACE,sBAACqB,SAAI;;kCACH,qBAACE,mBAAO;oBAAI;kCAAI,qBAACE,kBAAQ;wBAACzB,MAAMA;;;;QAItC,KAAK;YACH,qBACE,sBAACqB,SAAI;;kCACH,sBAACA,SAAI;wBAACC,OAAM;;4BAAUI,mBAAO,CAACC,OAAO;4BAAG;0CAAI,qBAACF,kBAAQ;gCAACzB,MAAMA;;;;kCAC5D,sBAACqB,SAAI;wBAACC,OAAM;;4BAAW;4BAAI;4BAAOM,IAAAA,WAAE,EAACxB;;;;;QAI3C,KAAK;YACH,qBACE,sBAACiB,SAAI;;kCACH,sBAACA,SAAI;wBAACC,OAAM;;4BAAQI,mBAAO,CAACG,KAAK;4BAAG;0CAAI,qBAACJ,kBAAQ;gCAACzB,MAAMA;;;;kCACxD,sBAACqB,SAAI;wBAACC,OAAM;;4BAAW;4BAAI;4BAAOM,IAAAA,WAAE,EAACxB;;;;;IAG7C;AACF","file":"task-spinner.js"}

package/dist/utils.d.ts

@@ -3,7 +3,6 @@ import { Arguments, Argv, CommandModule } from 'yargs';
 import { Awaitable } from './types';
 export declare function combine<T>(...generators: AsyncGenerator<T>[]): AsyncGenerator<T>;
 export declare function streamLines(task: SpawnTask, stream: SpawnTaskStream): AsyncGenerator<string>;
-export declare function each<T>(generator: AsyncGenerator<T>, callback: (val: T) => void): Promise<void>;
 export interface Middleware<T = unknown, U = unknown> {
     builder?: (yargs: Argv<T>) => Argv<U>;
     handler(args: Arguments<U>): Awaitable<void>;

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,wBAAuB,OAAO,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAIvF;AAED,wBAAuB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,CA8BnG;AAED,wBAAsB,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrG;AAGD,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO;IAClD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACtC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;CAC9C;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAYtF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAErF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAErF;AAGD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE9C","file":"utils.d.ts","sourcesContent":["import { streamEvents } from '@jujulego/event-tree';\nimport { SpawnTask, SpawnTaskStream } from '@jujulego/tasks';\nimport { Arguments, Argv, CommandModule } from 'yargs';\nimport { Awaitable } from './types';\n\n// Stream utils\nexport async function* combine<T>(...generators: AsyncGenerator<T>[]): AsyncGenerator<T> {\n  for (const gen of generators) {\n    yield* gen;\n  }\n}\n\nexport async function *streamLines(task: SpawnTask, stream: SpawnTaskStream): AsyncGenerator<string> {\n  // Abort\n  const ctrl = new AbortController();\n\n  task.subscribe('status.done', () => ctrl.abort());\n  task.subscribe('status.failed', () => ctrl.abort());\n\n  // Stream\n  let current = '';\n\n  try {\n    for await (const chunk of streamEvents(task, `stream.${stream}`, { signal: ctrl.signal })) {\n      const data = current + chunk.data.toString('utf-8');\n      const lines = data.split(/\\r?\\n/g);\n\n      current = lines.pop() ?? '';\n\n      for (const line of lines) {\n        yield line;\n      }\n    }\n  } catch (err) {\n    if (task.exitCode !== 0) {\n      throw err;\n    }\n\n    if (current) {\n      yield current;\n    }\n  }\n}\n\nexport async function each<T>(generator: AsyncGenerator<T>, callback: (val: T) => void): Promise<void> {\n  for await (const val of generator) {\n    callback(val);\n  }\n}\n\n// Command utils\nexport interface Middleware<T = unknown, U = unknown> {\n  builder?: (yargs: Argv<T>) => Argv<U>;\n  handler(args: Arguments<U>): Awaitable<void>;\n}\n\nexport function applyMiddlewares<T>(yargs: Argv<T>, middlewares: Middleware[]): Argv<T> {\n  let tmp: Argv<unknown> = yargs;\n\n  for (const middleware of middlewares) {\n    if (middleware.builder) {\n      tmp = middleware.builder(tmp);\n    }\n\n    tmp.middleware(middleware.handler);\n  }\n\n  return tmp as Argv<T>;\n}\n\nexport function defineCommand<T, U>(command: CommandModule<T, U>): CommandModule<T, U> {\n  return command;\n}\n\nexport function defineMiddleware<T, U>(middleware: Middleware<T, U>): Middleware<T, U> {\n  return middleware;\n}\n\n// String utils\nexport function capitalize(txt: string): string {\n  return txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase();\n}\n"]}
+{"version":3,"sources":["utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,wBAAuB,OAAO,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAIvF;AAED,wBAAuB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,CA8BnG;AAGD,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO;IAClD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACtC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;CAC9C;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAYtF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAErF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAErF;AAGD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE9C","file":"utils.d.ts","sourcesContent":["import { streamEvents } from '@jujulego/event-tree';\nimport { SpawnTask, SpawnTaskStream } from '@jujulego/tasks';\nimport { Arguments, Argv, CommandModule } from 'yargs';\nimport { Awaitable } from './types';\n\n// Stream utils\nexport async function* combine<T>(...generators: AsyncGenerator<T>[]): AsyncGenerator<T> {\n  for (const gen of generators) {\n    yield* gen;\n  }\n}\n\nexport async function *streamLines(task: SpawnTask, stream: SpawnTaskStream): AsyncGenerator<string> {\n  // Abort\n  const ctrl = new AbortController();\n\n  task.subscribe('status.done', () => ctrl.abort());\n  task.subscribe('status.failed', () => ctrl.abort());\n\n  // Stream\n  let current = '';\n\n  try {\n    for await (const chunk of streamEvents(task, `stream.${stream}`, { signal: ctrl.signal })) {\n      const data = current + chunk.data.toString('utf-8');\n      const lines = data.split(/\\r?\\n/g);\n\n      current = lines.pop() ?? '';\n\n      for (const line of lines) {\n        yield line;\n      }\n    }\n  } catch (err) {\n    if (task.exitCode !== 0) {\n      throw err;\n    }\n\n    if (current) {\n      yield current;\n    }\n  }\n}\n\n// Command utils\nexport interface Middleware<T = unknown, U = unknown> {\n  builder?: (yargs: Argv<T>) => Argv<U>;\n  handler(args: Arguments<U>): Awaitable<void>;\n}\n\nexport function applyMiddlewares<T>(yargs: Argv<T>, middlewares: Middleware[]): Argv<T> {\n  let tmp: Argv<unknown> = yargs;\n\n  for (const middleware of middlewares) {\n    if (middleware.builder) {\n      tmp = middleware.builder(tmp);\n    }\n\n    tmp.middleware(middleware.handler);\n  }\n\n  return tmp as Argv<T>;\n}\n\nexport function defineCommand<T, U>(command: CommandModule<T, U>): CommandModule<T, U> {\n  return command;\n}\n\nexport function defineMiddleware<T, U>(middleware: Middleware<T, U>): Middleware<T, U> {\n  return middleware;\n}\n\n// String utils\nexport function capitalize(txt: string): string {\n  return txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase();\n}\n"]}

package/dist/utils.js

@@ -11,7 +11,6 @@ function _export(target, all) {
 _export(exports, {
     combine: ()=>combine,
     streamLines: ()=>streamLines,
-    each: ()=>each,
     applyMiddlewares: ()=>applyMiddlewares,
     defineCommand: ()=>defineCommand,
     defineMiddleware: ()=>defineMiddleware,
@@ -50,11 +49,6 @@ async function* streamLines(task, stream) {
         }
     }
 }
-async function each(generator, callback) {
-    for await (const val of generator){
-        callback(val);
-    }
-}
 function applyMiddlewares(yargs, middlewares) {
     let tmp = yargs;
     for (const middleware of middlewares){

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["utils.js"],"sourcesContent":["import { streamEvents } from '@jujulego/event-tree';\nimport { SpawnTask, SpawnTaskStream } from '@jujulego/tasks';\nimport { Arguments, Argv, CommandModule } from 'yargs';\nimport { Awaitable } from './types';\n\n// Stream utils\nexport async function* combine<T>(...generators: AsyncGenerator<T>[]): AsyncGenerator<T> {\n  for (const gen of generators) {\n    yield* gen;\n  }\n}\n\nexport async function *streamLines(task: SpawnTask, stream: SpawnTaskStream): AsyncGenerator<string> {\n  // Abort\n  const ctrl = new AbortController();\n\n  task.subscribe('status.done', () => ctrl.abort());\n  task.subscribe('status.failed', () => ctrl.abort());\n\n  // Stream\n  let current = '';\n\n  try {\n    for await (const chunk of streamEvents(task, `stream.${stream}`, { signal: ctrl.signal })) {\n      const data = current + chunk.data.toString('utf-8');\n      const lines = data.split(/\\r?\\n/g);\n\n      current = lines.pop() ?? '';\n\n      for (const line of lines) {\n        yield line;\n      }\n    }\n  } catch (err) {\n    if (task.exitCode !== 0) {\n      throw err;\n    }\n\n    if (current) {\n      yield current;\n    }\n  }\n}\n\nexport async function each<T>(generator: AsyncGenerator<T>, callback: (val: T) => void): Promise<void> {\n  for await (const val of generator) {\n    callback(val);\n  }\n}\n\n// Command utils\nexport interface Middleware<T = unknown, U = unknown> {\n  builder?: (yargs: Argv<T>) => Argv<U>;\n  handler(args: Arguments<U>): Awaitable<void>;\n}\n\nexport function applyMiddlewares<T>(yargs: Argv<T>, middlewares: Middleware[]): Argv<T> {\n  let tmp: Argv<unknown> = yargs;\n\n  for (const middleware of middlewares) {\n    if (middleware.builder) {\n      tmp = middleware.builder(tmp);\n    }\n\n    tmp.middleware(middleware.handler);\n  }\n\n  return tmp as Argv<T>;\n}\n\nexport function defineCommand<T, U>(command: CommandModule<T, U>): CommandModule<T, U> {\n  return command;\n}\n\nexport function defineMiddleware<T, U>(middleware: Middleware<T, U>): Middleware<T, U> {\n  return middleware;\n}\n\n// String utils\nexport function capitalize(txt: string): string {\n  return txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase();\n}\n"],"names":["combine","streamLines","each","applyMiddlewares","defineCommand","defineMiddleware","capitalize","generators","gen","task","stream","ctrl","AbortController","subscribe","abort","current","chunk","streamEvents","signal","data","toString","lines","split","pop","line","err","exitCode","generator","callback","val","yargs","middlewares","tmp","middleware","builder","handler","command","txt","charAt","toUpperCase","substring","toLowerCase"],"mappings":"AAAA;;;;;;;;;;;IAMuBA,OAAO,MAAPA;IAMAC,WAAW,MAAXA;IAgCDC,IAAI,MAAJA;IAYNC,gBAAgB,MAAhBA;IAcAC,aAAa,MAAbA;IAIAC,gBAAgB,MAAhBA;IAKAC,UAAU,MAAVA;;2BA/Ea;AAMtB,gBAAgBN,QAAW,GAAGO,UAA+B,EAAqB;IACvF,KAAK,MAAMC,OAAOD,WAAY;QAC5B,OAAOC;IACT;AACF;AAEO,gBAAgBP,YAAYQ,IAAe,EAAEC,MAAuB,EAA0B;IACnG,QAAQ;IACR,MAAMC,OAAO,IAAIC;IAEjBH,KAAKI,SAAS,CAAC,eAAe,IAAMF,KAAKG,KAAK;IAC9CL,KAAKI,SAAS,CAAC,iBAAiB,IAAMF,KAAKG,KAAK;IAEhD,SAAS;IACT,IAAIC,UAAU;IAEd,IAAI;QACF,WAAW,MAAMC,SAASC,IAAAA,uBAAY,EAACR,MAAM,CAAC,OAAO,EAAEC,OAAO,CAAC,EAAE;YAAEQ,QAAQP,KAAKO,MAAM;QAAC,GAAI;YACzF,MAAMC,OAAOJ,UAAUC,MAAMG,IAAI,CAACC,QAAQ,CAAC;YAC3C,MAAMC,QAAQF,KAAKG,KAAK,CAAC;YAEzBP,UAAUM,MAAME,GAAG,MAAM;YAEzB,KAAK,MAAMC,QAAQH,MAAO;gBACxB,MAAMG;YACR;QACF;IACF,EAAE,OAAOC,KAAK;QACZ,IAAIhB,KAAKiB,QAAQ,KAAK,GAAG;YACvB,MAAMD,IAAI;QACZ,CAAC;QAED,IAAIV,SAAS;YACX,MAAMA;QACR,CAAC;IACH;AACF;AAEO,eAAeb,KAAQyB,SAA4B,EAAEC,QAA0B,EAAiB;IACrG,WAAW,MAAMC,OAAOF,UAAW;QACjCC,SAASC;IACX;AACF;AAQO,SAAS1B,iBAAoB2B,KAAc,EAAEC,WAAyB,EAAW;IACtF,IAAIC,MAAqBF;IAEzB,KAAK,MAAMG,cAAcF,YAAa;QACpC,IAAIE,WAAWC,OAAO,EAAE;YACtBF,MAAMC,WAAWC,OAAO,CAACF;QAC3B,CAAC;QAEDA,IAAIC,UAAU,CAACA,WAAWE,OAAO;IACnC;IAEA,OAAOH;AACT;AAEO,SAAS5B,cAAoBgC,OAA4B,EAAuB;IACrF,OAAOA;AACT;AAEO,SAAS/B,iBAAuB4B,UAA4B,EAAoB;IACrF,OAAOA;AACT;AAGO,SAAS3B,WAAW+B,GAAW,EAAU;IAC9C,OAAOA,IAAIC,MAAM,CAAC,GAAGC,WAAW,KAAKF,IAAIG,SAAS,CAAC,GAAGC,WAAW;AACnE","file":"utils.js"}
+{"version":3,"sources":["utils.js"],"sourcesContent":["import { streamEvents } from '@jujulego/event-tree';\nimport { SpawnTask, SpawnTaskStream } from '@jujulego/tasks';\nimport { Arguments, Argv, CommandModule } from 'yargs';\nimport { Awaitable } from './types';\n\n// Stream utils\nexport async function* combine<T>(...generators: AsyncGenerator<T>[]): AsyncGenerator<T> {\n  for (const gen of generators) {\n    yield* gen;\n  }\n}\n\nexport async function *streamLines(task: SpawnTask, stream: SpawnTaskStream): AsyncGenerator<string> {\n  // Abort\n  const ctrl = new AbortController();\n\n  task.subscribe('status.done', () => ctrl.abort());\n  task.subscribe('status.failed', () => ctrl.abort());\n\n  // Stream\n  let current = '';\n\n  try {\n    for await (const chunk of streamEvents(task, `stream.${stream}`, { signal: ctrl.signal })) {\n      const data = current + chunk.data.toString('utf-8');\n      const lines = data.split(/\\r?\\n/g);\n\n      current = lines.pop() ?? '';\n\n      for (const line of lines) {\n        yield line;\n      }\n    }\n  } catch (err) {\n    if (task.exitCode !== 0) {\n      throw err;\n    }\n\n    if (current) {\n      yield current;\n    }\n  }\n}\n\n// Command utils\nexport interface Middleware<T = unknown, U = unknown> {\n  builder?: (yargs: Argv<T>) => Argv<U>;\n  handler(args: Arguments<U>): Awaitable<void>;\n}\n\nexport function applyMiddlewares<T>(yargs: Argv<T>, middlewares: Middleware[]): Argv<T> {\n  let tmp: Argv<unknown> = yargs;\n\n  for (const middleware of middlewares) {\n    if (middleware.builder) {\n      tmp = middleware.builder(tmp);\n    }\n\n    tmp.middleware(middleware.handler);\n  }\n\n  return tmp as Argv<T>;\n}\n\nexport function defineCommand<T, U>(command: CommandModule<T, U>): CommandModule<T, U> {\n  return command;\n}\n\nexport function defineMiddleware<T, U>(middleware: Middleware<T, U>): Middleware<T, U> {\n  return middleware;\n}\n\n// String utils\nexport function capitalize(txt: string): string {\n  return txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase();\n}\n"],"names":["combine","streamLines","applyMiddlewares","defineCommand","defineMiddleware","capitalize","generators","gen","task","stream","ctrl","AbortController","subscribe","abort","current","chunk","streamEvents","signal","data","toString","lines","split","pop","line","err","exitCode","yargs","middlewares","tmp","middleware","builder","handler","command","txt","charAt","toUpperCase","substring","toLowerCase"],"mappings":"AAAA;;;;;;;;;;;IAMuBA,OAAO,MAAPA;IAMAC,WAAW,MAAXA;IAsCPC,gBAAgB,MAAhBA;IAcAC,aAAa,MAAbA;IAIAC,gBAAgB,MAAhBA;IAKAC,UAAU,MAAVA;;2BAzEa;AAMtB,gBAAgBL,QAAW,GAAGM,UAA+B,EAAqB;IACvF,KAAK,MAAMC,OAAOD,WAAY;QAC5B,OAAOC;IACT;AACF;AAEO,gBAAgBN,YAAYO,IAAe,EAAEC,MAAuB,EAA0B;IACnG,QAAQ;IACR,MAAMC,OAAO,IAAIC;IAEjBH,KAAKI,SAAS,CAAC,eAAe,IAAMF,KAAKG,KAAK;IAC9CL,KAAKI,SAAS,CAAC,iBAAiB,IAAMF,KAAKG,KAAK;IAEhD,SAAS;IACT,IAAIC,UAAU;IAEd,IAAI;QACF,WAAW,MAAMC,SAASC,IAAAA,uBAAY,EAACR,MAAM,CAAC,OAAO,EAAEC,OAAO,CAAC,EAAE;YAAEQ,QAAQP,KAAKO,MAAM;QAAC,GAAI;YACzF,MAAMC,OAAOJ,UAAUC,MAAMG,IAAI,CAACC,QAAQ,CAAC;YAC3C,MAAMC,QAAQF,KAAKG,KAAK,CAAC;YAEzBP,UAAUM,MAAME,GAAG,MAAM;YAEzB,KAAK,MAAMC,QAAQH,MAAO;gBACxB,MAAMG;YACR;QACF;IACF,EAAE,OAAOC,KAAK;QACZ,IAAIhB,KAAKiB,QAAQ,KAAK,GAAG;YACvB,MAAMD,IAAI;QACZ,CAAC;QAED,IAAIV,SAAS;YACX,MAAMA;QACR,CAAC;IACH;AACF;AAQO,SAASZ,iBAAoBwB,KAAc,EAAEC,WAAyB,EAAW;IACtF,IAAIC,MAAqBF;IAEzB,KAAK,MAAMG,cAAcF,YAAa;QACpC,IAAIE,WAAWC,OAAO,EAAE;YACtBF,MAAMC,WAAWC,OAAO,CAACF;QAC3B,CAAC;QAEDA,IAAIC,UAAU,CAACA,WAAWE,OAAO;IACnC;IAEA,OAAOH;AACT;AAEO,SAASzB,cAAoB6B,OAA4B,EAAuB;IACrF,OAAOA;AACT;AAEO,SAAS5B,iBAAuByB,UAA4B,EAAoB;IACrF,OAAOA;AACT;AAGO,SAASxB,WAAW4B,GAAW,EAAU;IAC9C,OAAOA,IAAIC,MAAM,CAAC,GAAGC,WAAW,KAAKF,IAAIG,SAAS,CAAC,GAAGC,WAAW;AACnE","file":"utils.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jujulego/jill",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,6 +37,7 @@
     "inversify": "^6.0.1",
     "inversify-inject-decorators": "^3.1.0",
     "log-symbols": "^4.1.0",
+    "ms": "^2.1.3",
     "normalize-package-data": "^4.0.0",
     "react": "^17.0.2",
     "reflect-metadata": "^0.1.13",
@@ -57,6 +58,7 @@
     "@types/gulp": "4.0.9",
     "@types/gulp-sourcemaps": "0.0.35",
     "@types/jest": "28.1.3",
+    "@types/ms": "0.7.31",
     "@types/node": "16.11.64",
     "@types/normalize-package-data": "2.4.1",
     "@types/react": "17.0.50",