@enspirit/emb 0.3.2 → 0.4.0

package/README.md

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

package/dist/src/cli/commands/down.js

@@ -11,8 +11,8 @@ export default class DownCommand extends FlavoredCommand {
         const runner = new Listr([
             {
                 rendererOptions: { persistentOutput: true },
-                async task() {
-                    return monorepo.run(new ComposeDownOperation(), {});
+                async task(ctx, task) {
+                    return monorepo.run(new ComposeDownOperation(task.stdout()), {});
                 },
                 title: 'Stopping project',
             },

package/dist/src/docker/compose/operations/ComposeDownOperation.d.ts

@@ -1,4 +1,4 @@
-import { Readable } from 'node:stream';
+import { Readable, Writable } from 'node:stream';
 import * as z from 'zod';
 import { AbstractOperation } from '../../../operations/index.js';
 /**
@@ -6,7 +6,8 @@ import { AbstractOperation } from '../../../operations/index.js';
  */
 declare const schema: z.ZodOptional<z.ZodObject<{}, z.core.$strip>>;
 export declare class ComposeDownOperation extends AbstractOperation<typeof schema, Readable> {
-    constructor();
+    protected out: Writable;
+    constructor(out: Writable);
     protected _run(_input: z.input<typeof schema>): Promise<Readable>;
 }
 export {};

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

@@ -7,13 +7,15 @@ import { AbstractOperation } from '../../../operations/index.js';
  */
 const schema = z.object({}).optional();
 export class ComposeDownOperation extends AbstractOperation {
-    constructor() {
+    out;
+    constructor(out) {
         super(schema);
+        this.out = out;
     }
     async _run(_input) {
         const { monorepo } = getContext();
         const command = ['docker', 'compose', 'down'];
-        return monorepo.run(new ExecuteLocalCommandOperation(), {
+        return monorepo.run(new ExecuteLocalCommandOperation(this.out), {
             script: command.join(' '),
             workingDir: monorepo.rootDir,
         });

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

@@ -26,8 +26,8 @@ export class ComposeUpOperation extends AbstractOperation {
         }
         manager.add([
             {
-                async task() {
-                    return monorepo.run(new ExecuteLocalCommandOperation(), {
+                async task(ctx, task) {
+                    return monorepo.run(new ExecuteLocalCommandOperation(task.stdout()), {
                         script: command.join(' '),
                         workingDir: monorepo.rootDir,
                     });

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

@@ -1,3 +1,4 @@
+import { PassThrough } from 'node:stream';
 import * as z from 'zod';
 import { decodeBuildkitStatusResponse } from '../../index.js';
 import { AbstractOperation } from '../../../operations/index.js';
@@ -36,8 +37,13 @@ export class BuildImageOperation extends AbstractOperation {
         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 tee = new PassThrough();
+        const logFile = await this.context.monorepo.store.createWriteStream(`logs/docker/build/${input.tag}.log`);
+        tee.pipe(logFile);
+        if (this.out) {
+            tee.pipe(this.out);
+        }
+        tee.write('Sending build context to Docker\n');
         const stream = await this.context.docker.buildImage({
             context: input.context,
             src: [...input.src],
@@ -49,22 +55,21 @@ export class BuildImageOperation extends AbstractOperation {
             target: input.target,
             version: '2',
         });
-        this.out?.write('Starting build\n');
+        tee.write('Starting build\n');
         return new Promise((resolve, reject) => {
             this.context.docker.modem.followProgress(stream, (err, traces) => {
-                logStream.close();
+                // logFile.close();
                 return err ? reject(err) : resolve(traces);
             }, async (trace) => {
                 if (trace.error) {
-                    logStream.close();
+                    // logFile.close();
                     reject(new Error(trace.error));
                 }
                 else {
                     try {
                         const { vertexes } = await decodeBuildkitStatusResponse(trace.aux);
                         vertexes.forEach((v) => {
-                            // logStream.write(JSON.stringify(v) + '\n');
-                            this.out?.write(v.name + '\n');
+                            tee.write(v.name + '\n');
                         });
                     }
                     catch (error) {

package/dist/src/monorepo/monorepo.js

@@ -165,7 +165,6 @@ export class Monorepo {
         return operation.run(args);
     }
     async expandPatches(patches) {
-        console.log('PATCHES', patches);
         const expanded = Promise.all(patches.map(async (patch) => {
             if (!('value' in patch)) {
                 return patch;
@@ -175,7 +174,6 @@ export class Monorepo {
                 value: await this.expand(patch.value),
             };
         }));
-        console.log('EXPANDED', patches);
         return expanded;
     }
     async withFlavor(flavorName) {

package/dist/src/monorepo/operations/shell/ExecuteLocalCommandOperation.d.ts

@@ -1,4 +1,4 @@
-import { Readable } from 'node:stream';
+import { Readable, Writable } from 'node:stream';
 import * as z from 'zod';
 import { AbstractOperation } from '../../../operations/index.js';
 /**
@@ -10,7 +10,8 @@ declare const schema: z.ZodObject<{
     workingDir: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare class ExecuteLocalCommandOperation extends AbstractOperation<typeof schema, Readable> {
-    constructor();
+    protected out: Writable;
+    constructor(out: Writable);
     protected _run(input: z.input<typeof schema>): Promise<Readable>;
 }
 export {};

package/dist/src/monorepo/operations/shell/ExecuteLocalCommandOperation.js

@@ -16,8 +16,10 @@ const schema = z.object({
         .describe('The working directory for the exec process inside the container'),
 });
 export class ExecuteLocalCommandOperation extends AbstractOperation {
-    constructor() {
+    out;
+    constructor(out) {
         super(schema);
+        this.out = out;
     }
     async _run(input) {
         const process = execa(input.script, {
@@ -25,6 +27,7 @@ export class ExecuteLocalCommandOperation extends AbstractOperation {
             cwd: input.workingDir,
             shell: true,
         });
+        process.all.pipe(this.out);
         return process.all;
     }
 }

package/dist/src/monorepo/operations/tasks/RunTasksOperation.d.ts

@@ -16,5 +16,5 @@ export type TaskWithScript = TaskInfo & {
 export declare class RunTasksOperation implements IOperation<RunTasksOperationParams, Array<TaskInfo>> {
     run(params: RunTasksOperationParams): Promise<Array<TaskInfo>>;
     protected runDocker(task: TaskWithScript, out?: Writable): Promise<void>;
-    protected runLocal(task: TaskWithScript): Promise<import("stream").Readable>;
+    protected runLocal(task: TaskWithScript, out: Writable): Promise<import("stream").Readable>;
 }

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

@@ -1,4 +1,5 @@
 import { getContext } from '../../../index.js';
+import { PassThrough } from 'node:stream';
 import { ComposeExecOperation } from '../../../docker/index.js';
 import { EMBCollection, findRunOrder, taskManagerFactory, } from '../../index.js';
 import { ExecuteLocalCommandOperation } from '../index.js';
@@ -33,12 +34,16 @@ export class RunTasksOperation {
                     if (executor === ExecutorType.container && !task.component) {
                         throw new Error('Cannot use the container executor with global tasks');
                     }
+                    const tee = new PassThrough();
+                    const logFile = await monorepo.store.createWriteStream(`logs/tasks/${task.id}.logs`);
+                    tee.pipe(listrTask.stdout());
+                    tee.pipe(logFile);
                     switch (executor) {
                         case ExecutorType.container: {
-                            return this.runDocker(task, listrTask.stdout());
+                            return this.runDocker(task, tee);
                         }
                         case ExecutorType.local: {
-                            return this.runLocal(task);
+                            return this.runLocal(task, tee);
                         }
                         default: {
                             throw new Error(`Unssuported executor type: ${executor}`);
@@ -60,12 +65,12 @@ export class RunTasksOperation {
             command: task.script,
         });
     }
-    async runLocal(task) {
+    async runLocal(task, out) {
         const { monorepo } = getContext();
         const cwd = task.component
             ? monorepo.join(monorepo.component(task.component).rootDir)
             : monorepo.rootDir;
-        return monorepo.run(new ExecuteLocalCommandOperation(), {
+        return monorepo.run(new ExecuteLocalCommandOperation(out), {
             script: task.script,
             workingDir: cwd,
         });

package/oclif.manifest.json

@@ -520,18 +520,12 @@
         "prune.js"
       ]
     },
-    "resources:build": {
+    "tasks": {
       "aliases": [],
-      "args": {
-        "component": {
-          "description": "List of resources to build (defaults to all)",
-          "name": "component",
-          "required": false
-        }
-      },
-      "description": "Build the resources of the monorepo",
+      "args": {},
+      "description": "List tasks.",
       "examples": [
-        "<%= config.bin %> <%= command.id %> build --flavor development"
+        "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
         "json": {
@@ -540,38 +534,15 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "dry-run": {
-          "description": "Do not build the resources but only produce build meta information",
-          "name": "dry-run",
-          "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,
       "hiddenAliases": [],
-      "id": "resources:build",
+      "id": "tasks",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -579,14 +550,20 @@
         "src",
         "cli",
         "commands",
-        "resources",
-        "build.js"
+        "tasks",
+        "index.js"
       ]
     },
-    "resources": {
+    "tasks:run": {
       "aliases": [],
-      "args": {},
-      "description": "List resources.",
+      "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 %>"
       ],
@@ -598,21 +575,33 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
-          "required": false,
+        "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": "Run all tasks matching (when multiple matches)",
+          "name": "all-matching",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "resources",
+      "id": "tasks:run",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -620,16 +609,22 @@
         "src",
         "cli",
         "commands",
-        "resources",
-        "index.js"
+        "tasks",
+        "run.js"
       ]
     },
-    "tasks": {
+    "resources:build": {
       "aliases": [],
-      "args": {},
-      "description": "List tasks.",
+      "args": {
+        "component": {
+          "description": "List of resources to build (defaults to all)",
+          "name": "component",
+          "required": false
+        }
+      },
+      "description": "Build the resources of the monorepo",
       "examples": [
-        "<%= config.bin %> <%= command.id %>"
+        "<%= config.bin %> <%= command.id %> build --flavor development"
       ],
       "flags": {
         "json": {
@@ -638,15 +633,38 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "dry-run": {
+          "description": "Do not build the resources but only produce build meta information",
+          "name": "dry-run",
+          "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,
       "hiddenAliases": [],
-      "id": "tasks",
+      "id": "resources:build",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -654,20 +672,14 @@
         "src",
         "cli",
         "commands",
-        "tasks",
-        "index.js"
+        "resources",
+        "build.js"
       ]
     },
-    "tasks:run": {
+    "resources": {
       "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 resources.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -679,33 +691,21 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "executor": {
-          "char": "x",
-          "description": "Where to run the task. (experimental!)",
-          "name": "executor",
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "container",
-            "local"
-          ],
           "type": "option"
-        },
-        "all-matching": {
-          "char": "a",
-          "description": "Run all tasks matching (when multiple matches)",
-          "name": "all-matching",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tasks:run",
+      "id": "resources",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -713,10 +713,10 @@
         "src",
         "cli",
         "commands",
-        "tasks",
-        "run.js"
+        "resources",
+        "index.js"
       ]
     }
   },
-  "version": "0.3.2"
+  "version": "0.4.0"
 }

package/package.json

@@ -1,8 +1,16 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.3.2",
-  "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
+  "version": "0.4.0",
+  "keywords": [
+    "monorepo",
+    "docker",
+    "taskrunner",
+    "ci",
+    "docker compose",
+    "sentinel",
+    "makefile"
+  ],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",
   "description": "A replacement for our Makefile-for-monorepos",
@@ -114,12 +122,25 @@
     ],
     "topicSeparator": " ",
     "topics": {
-      "images": {"description": "List, delete, prune docker containers" },
-      "containers": {"description": "List, delete, prune docker images" },
-      "resources": {"description": "List, clean, build resources" },
-      "components": {"description": "List & build components resources" },
-      "config": {"description": "It's all about config" },
-      "tasks": {"description": "List and run tasks" }
+      "images": {
+        "description": "List, delete, prune docker containers"
+      },
+      "containers": {
+        "description": "List, delete, prune docker images"
+      },
+      "resources": {
+        "description": "List, clean, build resources"
+      },
+      "components": {
+        "description": "List & build components resources"
+      },
+      "config": {
+        "description": "It's all about config"
+      },
+      "tasks": {
+        "description": "List and run tasks"
+      }
     }
-  }
+  },
+  "packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
 }