@enspirit/emb 0.0.8 → 0.0.9

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @enspirit/emb
 $ emb COMMAND
 running command...
 $ emb (--version)
-@enspirit/emb/0.0.8 darwin-x64 node-v22.12.0
+@enspirit/emb/0.0.9 darwin-x64 node-v22.18.0
 $ emb --help [COMMAND]
 USAGE
   $ emb COMMAND
@@ -120,14 +120,15 @@ Build the components of the monorepo
 
 ```
 USAGE
-  $ emb components build [COMPONENT...] [--json] [--flavor <value>] [--dry-run]
+  $ emb components build [COMPONENT...] [--json] [--flavor <value>] [--dry-run] [-f]
 
 ARGUMENTS
   COMPONENT...  List of components to build (defaults to all)
 
 FLAGS
-  --dry-run         Do not build the components but only produce build meta information
-  --flavor=<value>  Specify the flavor to use.
+  -f, --force           Bypass the cache and force the build
+      --dry-run         Do not build the components but only produce build meta information
+      --flavor=<value>  Specify the flavor to use.
 
 GLOBAL FLAGS
   --json  Format output as json.

package/dist/src/cli/commands/components/build.d.ts

@@ -8,6 +8,7 @@ export default class BuildCommand extends FlavoredCommand<typeof BuildCommand> {
     static examples: string[];
     static flags: {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static enableJsonFlag: boolean;
     static strict: boolean;

package/dist/src/cli/commands/components/build.js

@@ -17,6 +17,12 @@ export default class BuildCommand extends FlavoredCommand {
             required: false,
             description: 'Do not build the components but only produce build meta information',
         }),
+        force: Flags.boolean({
+            name: 'force',
+            char: 'f',
+            required: false,
+            description: 'Bypass the cache and force the build',
+        }),
     };
     static enableJsonFlag = true;
     static strict = false;
@@ -25,6 +31,7 @@ export default class BuildCommand extends FlavoredCommand {
         const { monorepo } = getContext();
         return monorepo.run(new BuildComponentsOperation(), {
             dryRun: flags['dry-run'],
+            force: flags.force,
             silent: flags.json,
             components: argv.length > 0
                 ? argv

package/dist/src/docker/compose/operations/ComposeUpOperation.js

@@ -1,7 +1,6 @@
 import { getContext } from '../../../index.js';
-import { Listr } from 'listr2';
 import * as z from 'zod';
-import { ExecuteLocalCommandOperation } from '../../../monorepo/index.js';
+import { ExecuteLocalCommandOperation, taskManagerFactory } from '../../../monorepo/index.js';
 import { AbstractOperation } from '../../../operations/index.js';
 /**
  * https://docs.docker.com/reference/cli/docker/compose/up/
@@ -20,20 +19,22 @@ export class ComposeUpOperation extends AbstractOperation {
     }
     async _run(input) {
         const { monorepo } = getContext();
+        const manager = taskManagerFactory();
         const command = ['docker', 'compose', 'up', '-d'];
         if (input?.forceRecreate) {
             command.push('--force-recreate');
         }
-        const task = new Listr({
-            rendererOptions: { persistentOutput: true },
-            async task() {
-                return monorepo.run(new ExecuteLocalCommandOperation(), {
-                    script: command.join(' '),
-                    workingDir: monorepo.rootDir,
-                });
+        manager.add([
+            {
+                async task() {
+                    return monorepo.run(new ExecuteLocalCommandOperation(), {
+                        script: command.join(' '),
+                        workingDir: monorepo.rootDir,
+                    });
+                },
+                title: 'Starting project',
             },
-            title: 'Starting project',
-        });
-        await task.run();
+        ]);
+        await manager.runAll();
     }
 }

package/dist/src/docker/operations/images/BuildImageOperation.js

@@ -55,7 +55,7 @@ export class BuildImageOperation extends AbstractOperation {
                     try {
                         const { vertexes } = await decodeBuildkitStatusResponse(trace.aux);
                         vertexes.forEach((v) => {
-                            logStream.write(JSON.stringify(v) + '\n');
+                            // logStream.write(JSON.stringify(v) + '\n');
                             this.observer?.(v.name);
                         });
                     }

package/dist/src/monorepo/operations/components/BuildComponentsOperation.d.ts

@@ -4,6 +4,7 @@ import { AbstractOperation } from '../../../operations/index.js';
 export type BuildComponentMeta = {
     dryRun?: boolean;
     cacheHit?: boolean;
+    force?: boolean;
     build: DockerComponentBuild;
     preBuildMeta?: string;
     sentinelFile: string;
@@ -12,6 +13,7 @@ declare const schema: z.ZodObject<{
     components: z.ZodOptional<z.ZodArray<z.ZodString>>;
     dryRun: z.ZodOptional<z.ZodBoolean>;
     silent: z.ZodOptional<z.ZodBoolean>;
+    force: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 export declare class BuildComponentsOperation extends AbstractOperation<typeof schema, Record<string, BuildComponentMeta>> {
     constructor();

package/dist/src/monorepo/operations/components/BuildComponentsOperation.js

@@ -17,6 +17,10 @@ const schema = z.object({
         .boolean()
         .optional()
         .describe('Do not produce any output on the terminal'),
+    force: z
+        .boolean()
+        .optional()
+        .describe('Bypass the cache and force the build'),
 });
 export class BuildComponentsOperation extends AbstractOperation {
     constructor() {
@@ -32,23 +36,39 @@ export class BuildComponentsOperation extends AbstractOperation {
             forbidIdNameCollision: true,
         });
         const ordered = findRunOrder(selection.map((s) => s.name), collection);
-        const tasks = await Promise.all(ordered.map((cmp) => {
+        const tasks = ordered.map((cmp) => {
             return {
                 task: async (context, task) => {
-                    return this.buildComponent(cmp, task, context, input.dryRun);
+                    return this.buildComponent(cmp, task, context, {
+                        dryRun: input.dryRun,
+                        force: input.force,
+                    });
                 },
                 title: `Building ${cmp.name}`,
             };
-        }));
-        const list = manager.newListr([...tasks], {
-            renderer: input.silent ? 'silent' : 'default',
-            rendererOptions: { persistentOutput: true },
+        });
+        manager.add([
+            {
+                title: 'Build images',
+                async task(ctx, task) {
+                    return task.newListr([...tasks], {
+                        rendererOptions: {
+                            collapseSubtasks: true,
+                        },
+                    });
+                },
+            },
+        ], {
+            rendererOptions: {
+                collapseSkips: false,
+                collapseSubtasks: false,
+            },
             ctx: {},
         });
-        const results = await list.run();
+        const results = await manager.runAll();
         return results;
     }
-    async buildComponent(cmp, parentTask, parentContext, dryRun = false) {
+    async buildComponent(cmp, parentTask, parentContext, options) {
         const prereqPlugin = new FilePrerequisitePlugin();
         const list = parentTask.newListr([
             // Collect all the prerequisites and other build infos
@@ -57,6 +77,7 @@ export class BuildComponentsOperation extends AbstractOperation {
                 async task(ctx) {
                     // Install the context for this specific component build chain
                     ctx.cacheHit = false;
+                    ctx.force = options?.force;
                     ctx.sentinelFile = getSentinelFile(cmp);
                     ctx.build = await cmp.toDockerBuild();
                 },
@@ -64,6 +85,9 @@ export class BuildComponentsOperation extends AbstractOperation {
             },
             // Check for sentinal information to see if the build can be skipped
             {
+                skip(ctx) {
+                    return Boolean(ctx.force);
+                },
                 task: async (ctx) => {
                     ctx.preBuildMeta = await prereqPlugin.meta(cmp, ctx.build.prerequisites, 'pre');
                     let lastValue;
@@ -75,7 +99,7 @@ export class BuildComponentsOperation extends AbstractOperation {
                     }
                     if (lastValue) {
                         const diff = await prereqPlugin.diff(cmp, ctx.build.prerequisites, lastValue, ctx.preBuildMeta);
-                        if (!diff) {
+                        if (!ctx.force && !diff) {
                             ctx.cacheHit = true;
                             parentTask.skip(`${parentTask.title} (cache hit)`);
                         }
@@ -84,10 +108,8 @@ export class BuildComponentsOperation extends AbstractOperation {
                 title: 'Checking prerequisites',
             },
             {
+                skip: (ctx) => !ctx.force && (Boolean(ctx.cacheHit) || Boolean(ctx.dryRun)),
                 task: async (ctx, task) => {
-                    if (ctx.cacheHit || ctx.dryRun) {
-                        return task.skip();
-                    }
                     const title = `Building image ${ctx.build.name}:${ctx.build.tag}`;
                     task.title = title;
                     const op = new BuildImageOperation((progress) => {
@@ -109,10 +131,8 @@ export class BuildComponentsOperation extends AbstractOperation {
             },
             // Update sentinel file
             {
-                task: async (ctx, task) => {
-                    if (ctx.cacheHit || ctx.dryRun) {
-                        return task.skip();
-                    }
+                skip: (ctx) => !ctx.force && (Boolean(ctx.cacheHit) || Boolean(ctx.dryRun)),
+                task: async (ctx) => {
                     const sentinelValue = await prereqPlugin.meta(cmp, ctx.build.prerequisites, 'post');
                     await this.context.monorepo.store.writeFile(ctx.sentinelFile, sentinelValue);
                 },
@@ -122,13 +142,15 @@ export class BuildComponentsOperation extends AbstractOperation {
                 // Return build meta data
                 async task(ctx) {
                     parentContext[cmp.name] = ctx;
-                    if (ctx.dryRun) {
+                    if (!ctx.force && ctx.dryRun) {
                         parentTask.skip(`${parentTask.title} (dry run)`);
                     }
                 },
             },
         ], {
-            ctx: { dryRun },
+            ctx: {
+                ...options,
+            },
         });
         return list;
     }

package/dist/src/monorepo/operations/tasks/RunTasksOperation.js

@@ -1,7 +1,6 @@
 import { getContext } from '../../../index.js';
-import { Manager } from '@listr2/manager';
 import { ContainerExecOperation } from '../../../docker/index.js';
-import { EMBCollection, findRunOrder } from '../../index.js';
+import { EMBCollection, findRunOrder, taskManagerFactory, } from '../../index.js';
 import { ExecuteLocalCommandOperation, GetComponentContainerOperation, } from '../index.js';
 export var ExecutorType;
 (function (ExecutorType) {
@@ -19,15 +18,8 @@ export class RunTasksOperation {
         const ordered = findRunOrder(params.tasks, collection, {
             onAmbiguous: params.allMatching ? 'runAll' : 'error',
         });
-        const runner = new Manager({
-            concurrent: false,
-            exitOnError: false,
-            rendererOptions: {
-                collapseSubtasks: false,
-                collapseSkips: false,
-            },
-        });
-        const list = runner.newListr(ordered.map((task) => {
+        const manager = taskManagerFactory();
+        manager.add(ordered.map((task) => {
             return {
                 rendererOptions: {
                     persistentOutput: true,
@@ -56,7 +48,7 @@ export class RunTasksOperation {
                 title: `Running ${task.id}`,
             };
         }));
-        await list.run();
+        await manager.runAll();
         return ordered;
     }
     async runDocker(task, out) {

package/dist/src/monorepo/taskManagerFactory.js

@@ -8,6 +8,7 @@ export function taskManagerFactory(override) {
         rendererOptions: {
             collapseErrors: false,
             collapseSubtasks: false,
+            collapseSkips: false,
             icon: {
                 [ListrDefaultRendererLogLevels.SKIPPED_WITH_COLLAPSE]: '♺',
             },

package/oclif.manifest.json

@@ -164,6 +164,14 @@
           "required": false,
           "allowNo": false,
           "type": "boolean"
+        },
+        "force": {
+          "char": "f",
+          "description": "Bypass the cache and force the build",
+          "name": "force",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -346,10 +354,10 @@
         "prune.js"
       ]
     },
-    "tasks": {
+    "images:delete": {
       "aliases": [],
       "args": {},
-      "description": "List tasks.",
+      "description": "Delete project images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -360,11 +368,19 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "force": {
+          "char": "f",
+          "description": "Remove the image even if it is being used by stopped containers or has other tags",
+          "name": "force",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tasks",
+      "id": "images:delete",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -376,20 +392,14 @@
         "src",
         "cli",
         "commands",
-        "tasks",
-        "index.js"
+        "images",
+        "delete.js"
       ]
     },
-    "tasks:run": {
+    "images": {
       "aliases": [],
-      "args": {
-        "task": {
-          "description": "List of tasks to run. You can provide either ids or names (eg: component:task or task)",
-          "name": "task",
-          "required": true
-        }
-      },
-      "description": "Run tasks.",
+      "args": {},
+      "description": "List docker images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -401,33 +411,22 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "executor": {
-          "char": "x",
-          "description": "Where to run the task. (experimental!)",
-          "name": "executor",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "container",
-            "local"
-          ],
-          "type": "option"
-        },
-        "all-matching": {
+        "all": {
           "char": "a",
-          "description": "Run all tasks matching (when multiple matches)",
-          "name": "all-matching",
+          "description": "Show all images. Only images from a final layer (no children) are shown by default.",
+          "name": "all",
+          "required": false,
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tasks:run",
+      "id": "images",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -435,14 +434,14 @@
         "src",
         "cli",
         "commands",
-        "tasks",
-        "run.js"
+        "images",
+        "index.js"
       ]
     },
-    "images:delete": {
+    "images:prune": {
       "aliases": [],
       "args": {},
-      "description": "Delete project images.",
+      "description": "Prune project images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -454,10 +453,10 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "force": {
-          "char": "f",
-          "description": "Remove the image even if it is being used by stopped containers or has other tags",
-          "name": "force",
+        "all": {
+          "char": "a",
+          "description": "Prune all images. When set to true all images will be pruned, not only dangling ones",
+          "name": "all",
           "required": false,
           "allowNo": false,
           "type": "boolean"
@@ -465,7 +464,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images:delete",
+      "id": "images:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -478,13 +477,13 @@
         "cli",
         "commands",
         "images",
-        "delete.js"
+        "prune.js"
       ]
     },
-    "images": {
+    "tasks": {
       "aliases": [],
       "args": {},
-      "description": "List docker images.",
+      "description": "List tasks.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -495,19 +494,11 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "all": {
-          "char": "a",
-          "description": "Show all images. Only images from a final layer (no children) are shown by default.",
-          "name": "all",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images",
+      "id": "tasks",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -519,14 +510,20 @@
         "src",
         "cli",
         "commands",
-        "images",
+        "tasks",
         "index.js"
       ]
     },
-    "images:prune": {
+    "tasks:run": {
       "aliases": [],
-      "args": {},
-      "description": "Prune project images.",
+      "args": {
+        "task": {
+          "description": "List of tasks to run. You can provide either ids or names (eg: component:task or task)",
+          "name": "task",
+          "required": true
+        }
+      },
+      "description": "Run tasks.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -538,22 +535,33 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "all": {
+        "executor": {
+          "char": "x",
+          "description": "Where to run the task. (experimental!)",
+          "name": "executor",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "container",
+            "local"
+          ],
+          "type": "option"
+        },
+        "all-matching": {
           "char": "a",
-          "description": "Prune all images. When set to true all images will be pruned, not only dangling ones",
-          "name": "all",
-          "required": false,
+          "description": "Run all tasks matching (when multiple matches)",
+          "name": "all-matching",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images:prune",
+      "id": "tasks:run",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -561,10 +569,10 @@
         "src",
         "cli",
         "commands",
-        "images",
-        "prune.js"
+        "tasks",
+        "run.js"
       ]
     }
   },
-  "version": "0.0.8"
+  "version": "0.0.9"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",