@enspirit/emb 0.3.0 → 0.3.1

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @enspirit/emb
 $ emb COMMAND
 running command...
 $ emb (--version)
-@enspirit/emb/0.3.0 darwin-x64 node-v22.12.0
+@enspirit/emb/0.3.1 darwin-x64 node-v22.12.0
 $ emb --help [COMMAND]
 USAGE
   $ emb COMMAND

package/dist/src/cli/commands/tasks/index.js

@@ -9,19 +9,31 @@ export default class TasksIndex extends BaseCommand {
     async run() {
         const { flags } = await this.parse(TasksIndex);
         const { monorepo: { tasks }, } = await getContext();
+        const sortedTasks = tasks.toSorted((a, b) => {
+            const ac = a.component;
+            const bc = b.component;
+            // Put null/undefined first
+            if (!ac && bc) {
+                return -1;
+            }
+            if (Boolean(ac) && !bc) {
+                return 1;
+            }
+            // Compare components (if both not null)
+            if (Boolean(ac) && Boolean(bc)) {
+                const cmp = ac.localeCompare(bc);
+                if (cmp !== 0) {
+                    return cmp;
+                }
+            }
+            // Compare names as fallback
+            return a.name.localeCompare(b.name);
+        });
         if (!flags.json) {
             printTable({
                 ...TABLE_DEFAULTS,
                 columns: ['name', 'component', 'description', 'id'],
-                data: tasks.toSorted((a, b) => {
-                    if (a.component === b.component) {
-                        return a.name < b.name ? -1 : 1;
-                    }
-                    if (!a.component && b.component) {
-                        return -1;
-                    }
-                    return 0;
-                }),
+                data: sortedTasks,
             });
         }
         return tasks;

package/dist/src/docker/operations/images/BuildImageOperation.d.ts

@@ -1,3 +1,4 @@
+import { Writable } from 'node:stream';
 import * as z from 'zod';
 import { AbstractOperation } from '../../../operations/index.js';
 /**
@@ -13,7 +14,7 @@ export declare const BuildImageOperationInputSchema: z.ZodObject<{
     target: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare class BuildImageOperation extends AbstractOperation<typeof BuildImageOperationInputSchema, Array<unknown>> {
-    private observer?;
-    constructor(observer?: ((progress: string) => void) | undefined);
+    private out?;
+    constructor(out?: Writable | undefined);
     protected _run(input: z.input<typeof BuildImageOperationInputSchema>): Promise<Array<unknown>>;
 }

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

@@ -30,13 +30,14 @@ export const BuildImageOperationInputSchema = z.object({
     target: z.string().optional().describe('Target build stage'),
 });
 export class BuildImageOperation extends AbstractOperation {
-    observer;
-    constructor(observer) {
+    out;
+    constructor(out) {
         super(BuildImageOperationInputSchema);
-        this.observer = observer;
+        this.out = out;
     }
     async _run(input) {
         const logStream = await this.context.monorepo.store.createWriteStream(`logs/docker/build/${input.tag}.log`);
+        this.out?.write('Sending build context to Docker\n');
         const stream = await this.context.docker.buildImage({
             context: input.context,
             src: [...input.src],
@@ -48,6 +49,7 @@ export class BuildImageOperation extends AbstractOperation {
             target: input.target,
             version: '2',
         });
+        this.out?.write('Starting build\n');
         return new Promise((resolve, reject) => {
             this.context.docker.modem.followProgress(stream, (err, traces) => {
                 logStream.close();
@@ -62,7 +64,7 @@ export class BuildImageOperation extends AbstractOperation {
                         const { vertexes } = await decodeBuildkitStatusResponse(trace.aux);
                         vertexes.forEach((v) => {
                             // logStream.write(JSON.stringify(v) + '\n');
-                            this.observer?.(v.name);
+                            this.out?.write(v.name + '\n');
                         });
                     }
                     catch (error) {

package/dist/src/docker/resources/DockerImageResource.js

@@ -1,4 +1,5 @@
-import { readdir, stat, statfs } from 'node:fs/promises';
+import { fdir as Fdir } from 'fdir';
+import { stat, statfs } from 'node:fs/promises';
 import { join } from 'node:path';
 import pMap from 'p-map';
 import { GitPrerequisitePlugin } from '../../prerequisites/index.js';
@@ -24,7 +25,7 @@ class DockerImageResourceBuilder {
     get component() {
         return this.buildContext.component;
     }
-    async build() {
+    async build(out) {
         // Ensure the folder exists
         await statfs(this.context);
         const imageName = [
@@ -32,7 +33,11 @@ class DockerImageResourceBuilder {
             this.config.tag || this.component.name,
         ].join('/');
         const tagName = this.config.tag || this.monorepo.defaults.docker?.tag || 'latest';
-        const sources = await readdir(this.context, { recursive: true });
+        const crawler = new Fdir();
+        const sources = await crawler
+            .withRelativePaths()
+            .crawl(this.context)
+            .withPromise();
         const buildParams = {
             context: this.context,
             dockerfile: this.config.dockerfile || 'Dockerfile',
@@ -52,7 +57,7 @@ class DockerImageResourceBuilder {
         };
         return {
             input: buildParams,
-            operation: new BuildImageOperation(),
+            operation: new BuildImageOperation(out),
         };
     }
     async mustBuild(sentinel) {

package/dist/src/monorepo/operations/resources/BuildResourcesOperation.js

@@ -1,3 +1,4 @@
+import { PRESET_TIMER, } from 'listr2';
 import * as z from 'zod';
 import { EMBCollection, findRunOrder, taskManagerFactory, } from '../../index.js';
 import { ResourceFactory, } from '../../resources/ResourceFactory.js';
@@ -63,6 +64,9 @@ export class BuildResourcesOperation extends AbstractOperation {
             rendererOptions: {
                 collapseSkips: true,
                 collapseSubtasks: true,
+                timer: {
+                    ...PRESET_TIMER,
+                },
             },
             ctx: {},
         });
@@ -106,7 +110,7 @@ export class BuildResourcesOperation extends AbstractOperation {
                     if (ctx.cacheHit && !ctx.force && !ctx.dryRun) {
                         return skip('[cache hit]');
                     }
-                    const { input, operation } = await ctx.builder.build();
+                    const { input, operation } = await ctx.builder.build(task.stdout());
                     ctx.builderInput = input;
                     if (ctx.dryRun) {
                         return skip('[dry run]');

package/dist/src/monorepo/resources/ResourceFactory.d.ts

@@ -1,4 +1,5 @@
 import { Component, Monorepo, ResourceInfo } from '../../index.js';
+import { Writable } from 'node:stream';
 import { IOperation } from '../../operations/types.js';
 export type ResourceBuildContext = {
     config: ResourceInfo;
@@ -10,7 +11,15 @@ export type SentinelData<T = void> = {
     data: T;
 };
 export type ResourceBuilderInfo<I, O, D = unknown> = {
-    build(): Promise<{
+    /**
+     * Returns input and operation required to actually
+     * build the resources.
+     * This allows the dry-run mechanism to be implemented outside
+     * resource builder implementations
+     *
+     * @param out The Writable to use to write logs
+     */
+    build(out?: Writable): Promise<{
         input: I;
         operation: IOperation<I, O>;
     }>;

package/oclif.manifest.json

@@ -268,10 +268,12 @@
         "shell.js"
       ]
     },
-    "config:print": {
-      "aliases": [],
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
       "args": {},
-      "description": "Print the current config.",
+      "description": "List docker containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -283,21 +285,22 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
+        "all": {
+          "char": "a",
+          "description": "Retun all containers. By default, only running containers are shown",
+          "name": "all",
           "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "config:print",
+      "id": "containers",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -305,16 +308,14 @@
         "src",
         "cli",
         "commands",
-        "config",
-        "print.js"
+        "containers",
+        "index.js"
       ]
     },
-    "containers": {
-      "aliases": [
-        "ps"
-      ],
+    "containers:prune": {
+      "aliases": [],
       "args": {},
-      "description": "List docker containers.",
+      "description": "Prune containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -325,19 +326,11 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "all": {
-          "char": "a",
-          "description": "Retun all containers. By default, only running containers are shown",
-          "name": "all",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers",
+      "id": "containers:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -350,13 +343,13 @@
         "cli",
         "commands",
         "containers",
-        "index.js"
+        "prune.js"
       ]
     },
-    "containers:prune": {
+    "config:print": {
       "aliases": [],
       "args": {},
-      "description": "Prune containers.",
+      "description": "Print the current config.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -367,15 +360,22 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers:prune",
+      "id": "config:print",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -383,8 +383,8 @@
         "src",
         "cli",
         "commands",
-        "containers",
-        "prune.js"
+        "config",
+        "print.js"
       ]
     },
     "images:delete": {
@@ -718,5 +718,5 @@
       ]
     }
   },
-  "version": "0.3.0"
+  "version": "0.3.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",
@@ -47,6 +47,7 @@
     "dotenv": "^17.2.1",
     "execa": "^9.6.0",
     "fast-json-patch": "^3.1.1",
+    "fdir": "^6.4.6",
     "find-up": "^7.0.0",
     "glob": "^11.0.3",
     "graphlib": "^2.1.8",