@enspirit/emb 0.0.6 → 0.0.8

package/dist/src/monorepo/utils/findRunOrder.js

@@ -0,0 +1,165 @@
+import graphlib from 'graphlib';
+import { AmbiguousTaskError, CircularDependencyError, TaskNameCollisionError, UnkownReferenceError, } from '../../errors.js';
+export class EMBCollection {
+    items;
+    idField;
+    depField;
+    byId;
+    byName;
+    constructor(items, cfg) {
+        this.items = [];
+        this.idField = cfg.idField;
+        this.depField = cfg.depField;
+        this.byId = new Map();
+        this.byName = new Map();
+        // single-pass validation state
+        const seenIds = new Set();
+        const seenNames = new Set();
+        const dupIdReports = [];
+        const collisions = [];
+        for (const t of items) {
+            const id = t[this.idField];
+            const { name } = t;
+            // duplicate id?
+            if (seenIds.has(id)) {
+                const firstOwner = this.byId.get(id); // first occurrence already stored
+                dupIdReports.push(`id "${id}" used by "${firstOwner.name}" and "${name}"`);
+                // keep the first owner in byId; do not overwrite
+            }
+            else {
+                this.byId.set(id, t);
+                seenIds.add(id);
+            }
+            // --- Optional validation: forbid id <-> name collisions ---
+            const checkCollisions = cfg.forbidIdNameCollision && this.idField !== 'name';
+            if (checkCollisions) {
+                if (seenNames.has(id)) {
+                    const nameOwners = this.byName.get(id) ?? [];
+                    const ownerIds = nameOwners.map((o) => o[this.idField]).join(', ');
+                    collisions.push(`value "${id}" is an id of "${name}" and also a name of item(s) with id(s): [${ownerIds}]`);
+                }
+                if (seenIds.has(name)) {
+                    const idOwner = this.byId.get(name);
+                    collisions.push(`value "${name}" is a name of "${t.name}" and also an id of "${idOwner.name}"`);
+                }
+            }
+            // byName index
+            const list = this.byName.get(name);
+            if (list)
+                list.push(t);
+            else
+                this.byName.set(name, [t]);
+            // keep item list (stable order)
+            this.items.push(t);
+            // record name after checks so current name won’t collide with itself
+            seenNames.add(name);
+        }
+        if (dupIdReports.length > 0 || collisions.length > 0) {
+            const parts = [];
+            if (dupIdReports.length > 0) {
+                parts.push(`Duplicate ${String(this.idField)} values (${dupIdReports.length}):\n` +
+                    dupIdReports.join('\n'));
+            }
+            if (collisions.length > 0) {
+                parts.push(`id↔name collisions (${collisions.length}):\n` +
+                    collisions.join('\n'));
+            }
+            throw new TaskNameCollisionError('Collision between task names and ids', parts);
+        }
+    }
+    /** All items (stable array iteration) */
+    get all() {
+        return this.items;
+    }
+    idOf(t) {
+        return t[this.idField];
+    }
+    depsOf(t) {
+        return (t[this.depField] ?? []);
+    }
+    matches(ref, opts) {
+        const idHit = this.byId.get(ref);
+        if (idHit)
+            return opts?.multiple ? [idHit] : idHit;
+        const nameHits = this.byName.get(ref) ?? [];
+        if (nameHits.length === 0) {
+            throw new UnkownReferenceError(`Unknown reference "${ref}"`);
+        }
+        if (opts?.multiple)
+            return nameHits;
+        if (nameHits.length > 1) {
+            const ids = nameHits.map((t) => this.idOf(t));
+            throw new AmbiguousTaskError(`Ambiguous reference "${ref}" matches multiple id/name`, ids);
+        }
+        return nameHits[0];
+    }
+}
+/* ----------------- run-order helpers unchanged (for completeness) ---------------- */
+function resolveRefSet(col, ref, policy) {
+    if (policy === 'runAll')
+        return col.matches(ref, { multiple: true }).map((t) => col.idOf(t));
+    return [col.idOf(col.matches(ref))];
+}
+function collectPredecessorClosure(g, seeds) {
+    const seen = new Set();
+    const q = [];
+    for (const s of seeds) {
+        if (!seen.has(s)) {
+            seen.add(s);
+            q.push(s);
+        }
+    }
+    while (q.length > 0) {
+        const cur = q.shift();
+        for (const p of g.predecessors(cur) ?? [])
+            if (!seen.has(p)) {
+                seen.add(p);
+                q.push(p);
+            }
+    }
+    return seen;
+}
+function buildGraph(col, policy) {
+    const g = new graphlib.Graph({ directed: true });
+    for (const t of col.all)
+        g.setNode(col.idOf(t));
+    for (const t of col.all) {
+        const toId = col.idOf(t);
+        for (const ref of col.depsOf(t)) {
+            for (const fromId of resolveRefSet(col, ref, policy))
+                g.setEdge(fromId, toId);
+        }
+    }
+    return g;
+}
+export function findRunOrder(selection, collection, { onAmbiguous = 'error' } = {}) {
+    const g = buildGraph(collection, onAmbiguous);
+    const cycles = graphlib.alg.findCycles(g);
+    if (cycles.length > 0) {
+        throw new CircularDependencyError(`Circular dependencies detected: ${JSON.stringify(cycles)}`);
+    }
+    const selectedIds = new Set();
+    for (const ref of selection)
+        for (const id of resolveRefSet(collection, ref, onAmbiguous))
+            selectedIds.add(id);
+    if (selectedIds.size === 0)
+        throw new Error('Selection resolved to no items.');
+    const include = collectPredecessorClosure(g, selectedIds.values());
+    const sub = new graphlib.Graph({ directed: true });
+    for (const id of include)
+        sub.setNode(id);
+    for (const id of include)
+        for (const p of g.predecessors(id) ?? [])
+            if (include.has(p))
+                sub.setEdge(p, id);
+    const ids = graphlib.alg.topsort(sub);
+    const byId = new Map();
+    for (const t of collection.all)
+        byId.set(collection.idOf(t), t);
+    return ids.map((id) => {
+        const t = byId.get(id);
+        if (!t)
+            throw new Error(`Internal error: missing item for id "${id}"`);
+        return t;
+    });
+}

package/dist/src/monorepo/utils/index.d.ts

@@ -1 +1 @@
-export * from './findBuildOrder.js';
+export * from './findRunOrder.js';

package/dist/src/monorepo/utils/index.js

@@ -1 +1 @@
-export * from './findBuildOrder.js';
+export * from './findRunOrder.js';

package/oclif.manifest.json

@@ -14,6 +14,13 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "force": {
+          "char": "f",
+          "description": "Force the deletion of containers & images",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -47,6 +54,14 @@
           "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,
@@ -89,10 +104,10 @@
           "multiple": false,
           "type": "option"
         },
-        "force-recreate": {
+        "force": {
           "char": "f",
-          "description": "Recreate containers even if their configuration and image haven't changed",
-          "name": "force-recreate",
+          "description": "Bypass caches, force the recreation of containers, etc",
+          "name": "force",
           "allowNo": false,
           "type": "boolean"
         }
@@ -118,7 +133,7 @@
       "aliases": [],
       "args": {
         "component": {
-          "description": "List of components to build",
+          "description": "List of components to build (defaults to all)",
           "name": "component",
           "required": false
         }
@@ -142,6 +157,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "dry-run": {
+          "description": "Do not build the components but only produce build meta information",
+          "name": "dry-run",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -324,10 +346,10 @@
         "prune.js"
       ]
     },
-    "images:delete": {
+    "tasks": {
       "aliases": [],
       "args": {},
-      "description": "Delete project images.",
+      "description": "List tasks.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -338,19 +360,11 @@
           "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": "images:delete",
+      "id": "tasks",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -362,14 +376,20 @@
         "src",
         "cli",
         "commands",
-        "images",
-        "delete.js"
+        "tasks",
+        "index.js"
       ]
     },
-    "images": {
+    "tasks:run": {
       "aliases": [],
-      "args": {},
-      "description": "List docker 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 %>"
       ],
@@ -381,22 +401,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": "Show all images. Only images from a final layer (no children) are shown by default.",
-          "name": "all",
-          "required": false,
+          "description": "Run all tasks matching (when multiple matches)",
+          "name": "all-matching",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images",
+      "id": "tasks:run",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -404,14 +435,14 @@
         "src",
         "cli",
         "commands",
-        "images",
-        "index.js"
+        "tasks",
+        "run.js"
       ]
     },
-    "images:prune": {
+    "images:delete": {
       "aliases": [],
       "args": {},
-      "description": "Prune project images.",
+      "description": "Delete project images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -423,10 +454,10 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "all": {
-          "char": "a",
-          "description": "Prune all images. When set to true all images will be pruned, not only dangling ones",
-          "name": "all",
+        "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"
@@ -434,7 +465,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images:prune",
+      "id": "images:delete",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -447,13 +478,13 @@
         "cli",
         "commands",
         "images",
-        "prune.js"
+        "delete.js"
       ]
     },
-    "tasks": {
+    "images": {
       "aliases": [],
       "args": {},
-      "description": "List tasks.",
+      "description": "List docker images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -464,11 +495,19 @@
           "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": "tasks",
+      "id": "images",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -480,20 +519,14 @@
         "src",
         "cli",
         "commands",
-        "tasks",
+        "images",
         "index.js"
       ]
     },
-    "tasks:run": {
+    "images:prune": {
       "aliases": [],
-      "args": {
-        "task": {
-          "description": "List of tasks ids to run (eg: component:task)",
-          "name": "task",
-          "required": false
-        }
-      },
-      "description": "Run a task.",
+      "args": {},
+      "description": "Prune project images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -505,25 +538,22 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "executor": {
-          "char": "x",
-          "name": "executor",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "container",
-            "local"
-          ],
-          "type": "option"
+        "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"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tasks:run",
+      "id": "images:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -531,10 +561,10 @@
         "src",
         "cli",
         "commands",
-        "tasks",
-        "run.js"
+        "images",
+        "prune.js"
       ]
     }
   },
-  "version": "0.0.6"
+  "version": "0.0.8"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",
@@ -35,6 +35,7 @@
     "@oclif/plugin-autocomplete": "^3.2.34",
     "@oclif/plugin-help": "^6.2.32",
     "@oclif/plugin-not-found": "^3.2.63",
+    "@oclif/plugin-update": "^4.7.3",
     "@oclif/table": "^0.4.12",
     "ajv": "^8.17.1",
     "colorette": "^2.0.20",
@@ -103,10 +104,16 @@
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-autocomplete",
-      "@oclif/plugin-not-found"
+      "@oclif/plugin-not-found",
+      "@oclif/plugin-update"
     ],
     "topicSeparator": " ",
     "topics": {
+      "images": {"description": "List, delete, prune docker containers" },
+      "containers": {"description": "List, delete, prune docker images" },
+      "components": {"description": "List & build components resources" },
+      "config": {"description": "It's all about config" },
+      "tasks": {"description": "List and run tasks" }
     }
   }
 }

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

@@ -1,18 +0,0 @@
-import { Writable } from 'node:stream';
-import { TaskInfo } from '../../types.js';
-import { IOperation } from '../../../operations/types.js';
-export declare enum ExecutorType {
-    container = "container",
-    local = "local"
-}
-export type RunTaskOperationParams = {
-    executor: ExecutorType;
-    task: TaskInfo;
-};
-export declare class RunTaskOperation implements IOperation<RunTaskOperationParams, void> {
-    protected out?: Writable | undefined;
-    constructor(out?: Writable | undefined);
-    run(params: RunTaskOperationParams): Promise<void>;
-    private runDocker;
-    private runLocal;
-}

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

@@ -1,50 +0,0 @@
-import { getContext } from '../../../index.js';
-import { ContainerExecOperation } from '../../../docker/index.js';
-import { ExecuteLocalCommandOperation, GetComponentContainerOperation, } from '../index.js';
-export var ExecutorType;
-(function (ExecutorType) {
-    ExecutorType["container"] = "container";
-    ExecutorType["local"] = "local";
-})(ExecutorType || (ExecutorType = {}));
-export class RunTaskOperation {
-    out;
-    constructor(out) {
-        this.out = out;
-    }
-    async run(params) {
-        switch (params.executor) {
-            case ExecutorType.container: {
-                return this.runDocker(params);
-            }
-            case ExecutorType.local: {
-                return this.runLocal(params);
-            }
-            default: {
-                throw new Error(`Unsupported executor type: ${params.executor}`);
-            }
-        }
-    }
-    async runDocker(params) {
-        const { monorepo } = getContext();
-        if (!params.task.component) {
-            throw new Error(`Support for non-component tasks not implemented`);
-        }
-        const containerInfo = await monorepo.run(new GetComponentContainerOperation(), params.task.component);
-        await monorepo.run(new ContainerExecOperation(this.out), {
-            attachStderr: true,
-            attachStdout: true,
-            container: containerInfo.Id,
-            script: params.task.script,
-        });
-    }
-    async runLocal(params) {
-        const { monorepo } = getContext();
-        const cwd = params.task.component
-            ? monorepo.component(params.task.component).rootdir
-            : monorepo.rootDir;
-        await monorepo.run(new ExecuteLocalCommandOperation(this.out), {
-            script: params.task.script,
-            workingDir: cwd,
-        });
-    }
-}

package/dist/src/monorepo/utils/findBuildOrder.d.ts

@@ -1,2 +0,0 @@
-import { Component } from '../index.js';
-export declare const findBuildOrder: (components: Array<Component>, selection?: Array<string>) => Array<Component>;

package/dist/src/monorepo/utils/findBuildOrder.js

@@ -1,41 +0,0 @@
-import graphlib from 'graphlib';
-const toGraph = (components) => {
-    const graph = new graphlib.Graph();
-    // Add all components as nodes
-    for (const comp of components) {
-        graph.setNode(comp.name);
-    }
-    // Add edges
-    for (const comp of components) {
-        for (const dep of comp.dependencies ?? []) {
-            graph.setEdge(dep.name, comp.name);
-        }
-    }
-    return graph;
-};
-export const findBuildOrder = (components, selection) => {
-    const hash = components.reduce((cmps, cmp) => {
-        cmps[cmp.name] = cmp;
-        return cmps;
-    }, {});
-    const graph = toGraph(components);
-    // Detect cycles
-    const cycles = graphlib.alg.findCycles(graph);
-    if (cycles.length > 0) {
-        throw new Error('Circular dependencies detected: ' + JSON.stringify(cycles));
-    }
-    // Pick nodes that we want to build and rebuild a graph only with these
-    const toBuild = selection || components.map((c) => c.name);
-    const includingDeps = toBuild
-        .reduce((set, name) => {
-        graph.predecessors(name)?.forEach((name) => {
-            set.add(name);
-        });
-        return set;
-    }, new Set(toBuild))
-        .values();
-    const newGraph = toGraph([...includingDeps].map((name) => hash[name]));
-    // Get build order
-    const order = graphlib.alg.topsort(newGraph);
-    return order.map((name) => hash[name]);
-};