@enspirit/emb 0.0.5 → 0.0.7

package/dist/src/monorepo/plugins/{ComponentsDiscover.js → ComponentDiscoverPlugin.js}

@@ -3,18 +3,32 @@ import { glob } from 'glob';
 import { dirname } from 'node:path';
 import { MonorepoConfig } from '../index.js';
 import { AbstractPlugin } from './plugin.js';
+export const ComponentDiscoverPluginDefaultOptions = {
+    glob: '*/Dockerfile',
+};
 export class ComponentDiscoverPlugin extends AbstractPlugin {
+    monorepo;
     static name = 'autodiscover';
+    constructor(config, monorepo) {
+        super({
+            ...ComponentDiscoverPluginDefaultOptions,
+            ...config,
+        }, monorepo);
+        this.monorepo = monorepo;
+    }
     async extendConfig(config) {
-        const files = await glob('*/Dockerfile', {
+        const files = await glob(this.config.glob || ComponentDiscoverPluginDefaultOptions.glob, {
+            ...this.config,
             cwd: config.project.rootDir,
         });
         const overrides = files.map((path) => {
             const name = dirname(path);
             const component = config.components.find((cmp) => cmp.name === name);
             const cfg = {
-                context: name,
                 name,
+                docker: {
+                    context: name,
+                },
             };
             return component ? deepmerge()(component, cfg) : cfg;
         });

package/dist/src/monorepo/plugins/EmbfileLoaderPlugin.d.ts

@@ -0,0 +1,14 @@
+import { Monorepo, MonorepoConfig } from '../index.js';
+import { AbstractPlugin } from './plugin.js';
+export type EmbfileLoaderPluginOptions = {
+    glob?: string | string[];
+};
+export declare const EmbfileLoaderPluginDefaultOptions: {
+    glob: string;
+};
+export declare class EmbfileLoaderPlugin extends AbstractPlugin<Required<EmbfileLoaderPluginOptions>> {
+    protected monorepo: Monorepo;
+    static name: string;
+    constructor(cfg: Partial<EmbfileLoaderPluginOptions>, monorepo: Monorepo);
+    extendConfig(config: MonorepoConfig): Promise<MonorepoConfig>;
+}

package/dist/src/monorepo/plugins/EmbfileLoaderPlugin.js

@@ -0,0 +1,37 @@
+import { glob } from 'glob';
+import { join } from 'node:path';
+import { validateEmbfile } from '../../config/index.js';
+import { AbstractPlugin } from './plugin.js';
+export const EmbfileLoaderPluginDefaultOptions = {
+    glob: '*/Embfile.{yaml,yml}',
+};
+export class EmbfileLoaderPlugin extends AbstractPlugin {
+    monorepo;
+    static name = 'embfiles';
+    constructor(cfg, monorepo) {
+        const config = {
+            ...EmbfileLoaderPluginDefaultOptions,
+            ...cfg,
+        };
+        if (!Array.isArray(config.glob)) {
+            config.glob = [config.glob];
+        }
+        super(config, monorepo);
+        this.monorepo = monorepo;
+    }
+    async extendConfig(config) {
+        const files = await glob(this.config.glob, {
+            ...this.config,
+            cwd: config.project.rootDir,
+        });
+        const newConfig = await files.reduce(async (pConfig, path) => {
+            const config = await pConfig;
+            const embfile = await join(config.project.rootDir, path);
+            const component = await validateEmbfile(embfile);
+            return config.with({
+                components: [component],
+            });
+        }, Promise.resolve(config));
+        return newConfig;
+    }
+}

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

@@ -1,7 +1,8 @@
 import { AbstractPlugin } from './plugin.js';
-export * from './ComponentsDiscover.js';
+export * from './ComponentDiscoverPlugin.js';
 export * from './DotEnvPlugin.js';
-import { Monorepo } from '../monorepo.js';
+export * from './EmbfileLoaderPlugin.js';
+import { Monorepo } from '../index.js';
 export type AbstractPluginConstructor = new <C, P extends AbstractPlugin<C>>(config: C, monorepo: Monorepo) => P;
 export declare const registerPlugin: (plugin: AbstractPluginConstructor) => void;
 export declare const getPlugin: (name: string) => AbstractPluginConstructor;

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

@@ -1,7 +1,9 @@
-export * from './ComponentsDiscover.js';
+export * from './ComponentDiscoverPlugin.js';
 export * from './DotEnvPlugin.js';
-import { ComponentDiscoverPlugin } from './ComponentsDiscover.js';
+export * from './EmbfileLoaderPlugin.js';
+import { ComponentDiscoverPlugin } from './ComponentDiscoverPlugin.js';
 import { DotEnvPlugin } from './DotEnvPlugin.js';
+import { EmbfileLoaderPlugin } from './EmbfileLoaderPlugin.js';
 const PluginRegistry = new Map();
 export const registerPlugin = (plugin) => {
     if (PluginRegistry.has(plugin.name)) {
@@ -18,3 +20,4 @@ export const getPlugin = (name) => {
 /** Not sure why we need casting */
 registerPlugin(ComponentDiscoverPlugin);
 registerPlugin(DotEnvPlugin);
+registerPlugin(EmbfileLoaderPlugin);

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

@@ -10,9 +10,11 @@ import { dirname, join, normalize } from 'node:path';
 export class EMBStore {
     monorepo;
     path;
-    constructor(monorepo, dirname = '.emb') {
+    constructor(monorepo, dirname) {
         this.monorepo = monorepo;
-        this.path = this.monorepo.join(dirname);
+        // By default, we use the flavor name to build that root of the store
+        // so that logs and sentinel files for different flavors are keps separate
+        this.path = this.monorepo.join(dirname || '.emb');
     }
     async createReadStream(path) {
         await this.mkdirp(dirname(path));
@@ -45,7 +47,7 @@ export class EMBStore {
         }
     }
     join(path) {
-        return join(this.path, path);
+        return join(this.path, this.monorepo.currentFlavor, path);
     }
     async mkdirp(path) {
         // Avoid getting out of the store by ensuring nothing goes past ../

package/dist/src/monorepo/taskManagerFactory.d.ts

@@ -0,0 +1,3 @@
+import { Manager } from '@listr2/manager';
+import { ListrBaseClassOptions } from 'listr2';
+export declare function taskManagerFactory<T extends Record<PropertyKey, unknown>>(override?: ListrBaseClassOptions): Manager<T>;

package/dist/src/monorepo/taskManagerFactory.js

@@ -0,0 +1,20 @@
+import { Manager } from '@listr2/manager';
+import { ListrDefaultRendererLogLevels, PRESET_TIMER, } from 'listr2';
+export function taskManagerFactory(override) {
+    return new Manager({
+        collectErrors: 'minimal',
+        concurrent: false,
+        exitOnError: true,
+        rendererOptions: {
+            collapseErrors: false,
+            collapseSubtasks: false,
+            icon: {
+                [ListrDefaultRendererLogLevels.SKIPPED_WITH_COLLAPSE]: '♺',
+            },
+            timer: {
+                ...PRESET_TIMER,
+            },
+        },
+        ...override,
+    });
+}

package/dist/src/monorepo/types.d.ts

@@ -3,5 +3,6 @@ export type TaskInfo = {
     description?: string;
     id: string;
     name: string;
-    script: string;
+    script?: string;
+    pre?: Array<string>;
 };

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

@@ -0,0 +1,34 @@
+type DepList = readonly string[] | string[] | undefined;
+type CollectionConfig<IDK extends PropertyKey, DPK extends PropertyKey> = {
+    idField: IDK;
+    depField: DPK;
+    /** If true, throw when an item's id equals some other item's name (or vice versa). */
+    forbidIdNameCollision?: boolean;
+};
+type AmbiguityPolicy = 'error' | 'runAll';
+export declare class EMBCollection<T extends Partial<Record<DPK, DepList>> & Record<IDK, string> & {
+    name: string;
+}, IDK extends keyof T, DPK extends keyof T> {
+    private items;
+    readonly idField: IDK;
+    readonly depField: DPK;
+    private byId;
+    private byName;
+    constructor(items: Iterable<T>, cfg: CollectionConfig<IDK, DPK>);
+    /** All items (stable array iteration) */
+    get all(): Iterable<T>;
+    idOf(t: T): string;
+    depsOf(t: T): readonly string[];
+    matches(ref: string, opts?: {
+        multiple?: false;
+    }): T;
+    matches(ref: string, opts: {
+        multiple: true;
+    }): T[];
+}
+export declare function findRunOrder<T extends Partial<Record<DPK, DepList>> & Record<IDK, string> & {
+    name: string;
+}, IDK extends keyof T, DPK extends keyof T>(selection: readonly string[], collection: EMBCollection<T, IDK, DPK>, { onAmbiguous }?: {
+    onAmbiguous?: AmbiguityPolicy | undefined;
+}): T[];
+export {};

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

@@ -0,0 +1,165 @@
+import graphlib from 'graphlib';
+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'));
+            }
+            // eslint-disable-next-line unicorn/error-message
+            throw new Error(parts.join('\n\n'));
+        }
+    }
+    /** 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 Error(`Unknown reference "${ref}"`);
+        }
+        if (opts?.multiple)
+            return nameHits;
+        if (nameHits.length > 1) {
+            const ids = nameHits.map((t) => this.idOf(t)).join(', ');
+            throw new Error(`Ambiguous reference "${ref}" matches multiple ids: [${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 Error(`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/dist/src/operations/abstract/AbstractOperation.d.ts

@@ -1,6 +1,6 @@
 import { EmbContext } from '../../index.js';
 import * as z from 'zod';
-import { IOperation } from '../types.js';
+import { IOperation } from '../index.js';
 export declare abstract class AbstractOperation<S extends z.Schema, O = unknown> implements IOperation<z.infer<S>, O> {
     protected inputSchema: S;
     protected context: EmbContext;

package/dist/src/utils/deepMergeArray.d.ts

@@ -1 +1,4 @@
+export declare const byName: <T extends {
+    name: string;
+}>(item: T) => string;
 export declare const deepMergeArray: <T>(target: Array<T>, source: Array<T>, identifierFn?: (item: T) => unknown) => Array<T>;

package/dist/src/utils/deepMergeArray.js

@@ -1,4 +1,5 @@
 import deepmerge from '@fastify/deepmerge';
+export const byName = (item) => item.name;
 export const deepMergeArray = (target, source, identifierFn) => {
     if (!identifierFn) {
         return deepmerge()(target, source);

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,
@@ -204,10 +226,12 @@
         "index.js"
       ]
     },
-    "config:print": {
-      "aliases": [],
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
       "args": {},
-      "description": "Print the current config.",
+      "description": "List docker containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -219,18 +243,18 @@
           "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",
@@ -242,16 +266,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 %>"
       ],
@@ -262,19 +284,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",
@@ -287,13 +301,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 %>"
       ],
@@ -304,11 +318,19 @@
           "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",
@@ -320,8 +342,8 @@
         "src",
         "cli",
         "commands",
-        "containers",
-        "prune.js"
+        "config",
+        "print.js"
       ]
     },
     "images:delete": {
@@ -450,40 +472,6 @@
         "prune.js"
       ]
     },
-    "run": {
-      "aliases": [],
-      "args": {
-        "component": {
-          "description": "Component name",
-          "name": "component",
-          "required": true
-        },
-        "script": {
-          "description": "NPM script to run",
-          "name": "script",
-          "required": true
-        }
-      },
-      "description": "Run an npm script from a component's package.json",
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "run",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "run",
-        "index.js"
-      ]
-    },
     "tasks": {
       "aliases": [],
       "args": {},
@@ -522,12 +510,12 @@
       "aliases": [],
       "args": {
         "task": {
-          "description": "List of tasks ids to run (eg: component:task)",
+          "description": "List of tasks to run. You can provide either ids or names (eg: component:task or task)",
           "name": "task",
-          "required": false
+          "required": true
         }
       },
-      "description": "Run a task.",
+      "description": "Run tasks.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -541,6 +529,7 @@
         },
         "executor": {
           "char": "x",
+          "description": "Where to run the task. (experimental!)",
           "name": "executor",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -570,5 +559,5 @@
       ]
     }
   },
-  "version": "0.0.5"
+  "version": "0.0.7"
 }