@enspirit/emb 0.0.8 → 0.1.0

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.1.0 darwin-x64 node-v22.12.0
 $ emb --help [COMMAND]
 USAGE
   $ emb COMMAND
@@ -26,7 +26,6 @@ USAGE
 * [`emb autocomplete [SHELL]`](#emb-autocomplete-shell)
 * [`emb clean`](#emb-clean)
 * [`emb components`](#emb-components)
-* [`emb components build [COMPONENT]`](#emb-components-build-component)
 * [`emb config print`](#emb-config-print)
 * [`emb containers`](#emb-containers)
 * [`emb containers prune`](#emb-containers-prune)
@@ -36,6 +35,8 @@ USAGE
 * [`emb images delete`](#emb-images-delete)
 * [`emb images prune`](#emb-images-prune)
 * [`emb ps`](#emb-ps)
+* [`emb resources`](#emb-resources)
+* [`emb resources build [COMPONENT]`](#emb-resources-build-component)
 * [`emb tasks`](#emb-tasks)
 * [`emb tasks run TASK`](#emb-tasks-run-task)
 * [`emb up`](#emb-up)
@@ -114,31 +115,6 @@ EXAMPLES
   $ emb components
 ```
 
-## `emb components build [COMPONENT]`
-
-Build the components of the monorepo
-
-```
-USAGE
-  $ emb components build [COMPONENT...] [--json] [--flavor <value>] [--dry-run]
-
-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.
-
-GLOBAL FLAGS
-  --json  Format output as json.
-
-DESCRIPTION
-  Build the components of the monorepo
-
-EXAMPLES
-  $ emb components build build --flavor development
-```
-
 ## `emb config print`
 
 Print the current config.
@@ -330,6 +306,53 @@ EXAMPLES
   $ emb ps
 ```
 
+## `emb resources`
+
+List resources.
+
+```
+USAGE
+  $ emb resources [--json] [--flavor <value>]
+
+FLAGS
+  --flavor=<value>  Specify the flavor to use.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  List resources.
+
+EXAMPLES
+  $ emb resources
+```
+
+## `emb resources build [COMPONENT]`
+
+Build the resources of the monorepo
+
+```
+USAGE
+  $ emb resources build [COMPONENT...] [--json] [--flavor <value>] [--dry-run] [-f]
+
+ARGUMENTS
+  COMPONENT...  List of resources to build (defaults to all)
+
+FLAGS
+  -f, --force           Bypass the cache and force the build
+      --dry-run         Do not build the resources but only produce build meta information
+      --flavor=<value>  Specify the flavor to use.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Build the resources of the monorepo
+
+EXAMPLES
+  $ emb resources build build --flavor development
+```
+
 ## `emb tasks`
 
 List tasks.

package/dist/src/cli/abstract/BaseCommand.d.ts

@@ -0,0 +1,6 @@
+import { EmbContext } from '../../index.js';
+import { Command } from '@oclif/core';
+export declare abstract class BaseCommand extends Command {
+    protected context: EmbContext;
+    init(): Promise<void>;
+}

package/dist/src/cli/abstract/BaseCommand.js

@@ -0,0 +1,33 @@
+import { getContext, setContext } from '../../index.js';
+import { Command, Performance } from '@oclif/core';
+import Dockerode from 'dockerode';
+import { loadConfig } from '../../config/index.js';
+import { Monorepo } from '../../monorepo/monorepo.js';
+const withMarker = async (owner, name, cb) => {
+    const marker = Performance.mark(owner, name);
+    const res = await cb();
+    marker?.stop();
+    return res;
+};
+export class BaseCommand extends Command {
+    context;
+    async init() {
+        await super.init();
+        if (getContext()) {
+            return;
+        }
+        try {
+            const config = await withMarker('emb:config', 'load', () => loadConfig());
+            const monorepo = await withMarker('emb:monorepo', 'init', () => {
+                return new Monorepo(config).init();
+            });
+            this.context = setContext({
+                docker: new Dockerode(),
+                monorepo,
+            });
+        }
+        catch (error) {
+            this.error(error);
+        }
+    }
+}

package/dist/src/cli/abstract/FlavouredCommand.d.ts

@@ -1,7 +1,8 @@
 import { Command, Interfaces } from '@oclif/core';
+import { BaseCommand } from './BaseCommand.js';
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof FlavoredCommand)['baseFlags'] & T['flags']>;
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
-export declare abstract class FlavoredCommand<T extends typeof Command> extends Command {
+export declare abstract class FlavoredCommand<T extends typeof Command> extends BaseCommand {
     static baseFlags: {
         flavor: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
     };

package/dist/src/cli/abstract/FlavouredCommand.js

@@ -1,6 +1,7 @@
 import { getContext, setContext } from '../../index.js';
-import { Command, Flags } from '@oclif/core';
-export class FlavoredCommand extends Command {
+import { Flags } from '@oclif/core';
+import { BaseCommand } from './BaseCommand.js';
+export class FlavoredCommand extends BaseCommand {
     // define flags that can be inherited by any command that extends FlavoredCommand
     static baseFlags = {
         flavor: Flags.string({
@@ -31,7 +32,7 @@ export class FlavoredCommand extends Command {
         // complain properly if incorrect
         const { flavor } = this.flags;
         if (flavor) {
-            setContext({
+            this.context = setContext({
                 ...context,
                 monorepo: await context.monorepo.withFlavor(flavor),
             });

package/dist/src/cli/abstract/index.d.ts

@@ -1 +1,2 @@
+export * from './BaseCommand.js';
 export * from './FlavouredCommand.js';

package/dist/src/cli/abstract/index.js

@@ -1 +1,2 @@
+export * from './BaseCommand.js';
 export * from './FlavouredCommand.js';

package/dist/src/cli/commands/clean.d.ts

@@ -1,4 +1,4 @@
-import { Command } from '@oclif/core';
+import { BaseCommand } from '../abstract/BaseCommand.js';
 /**
  * For now, only cleans the stores (logs/sentinels)
  * But this should permit to clean everytning (via flags)
@@ -6,7 +6,7 @@ import { Command } from '@oclif/core';
  * Eg: --containers --volumes --images --networks
  * Or: --all
  */
-export default class CleanCommand extends Command {
+export default class CleanCommand extends BaseCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];

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

@@ -1,6 +1,7 @@
 import { getContext } from '../../index.js';
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { Listr } from 'listr2';
+import { BaseCommand } from '../abstract/BaseCommand.js';
 /**
  * For now, only cleans the stores (logs/sentinels)
  * But this should permit to clean everytning (via flags)
@@ -8,7 +9,7 @@ import { Listr } from 'listr2';
  * Eg: --containers --volumes --images --networks
  * Or: --all
  */
-export default class CleanCommand extends Command {
+export default class CleanCommand extends BaseCommand {
     static description = 'Clean the project.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -22,6 +23,10 @@ export default class CleanCommand extends Command {
     async run() {
         const { monorepo } = getContext();
         const { flags } = await this.parse(CleanCommand);
+        await this.config.runCommand('down');
+        await this.config.runCommand('containers:prune');
+        await this.config.runCommand('images:delete', flags.force ? ['--force'] : undefined);
+        await this.config.runCommand('images:prune', flags.force ? ['-a'] : undefined);
         const runner = new Listr([
             {
                 rendererOptions: { persistentOutput: true },
@@ -32,9 +37,5 @@ export default class CleanCommand extends Command {
             },
         ]);
         await runner.run();
-        await this.config.runCommand('down');
-        await this.config.runCommand('containers:prune');
-        await this.config.runCommand('images:delete', flags.force ? ['--force'] : undefined);
-        await this.config.runCommand('images:prune', flags.force ? ['-a'] : undefined);
     }
 }

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

@@ -1,9 +1,10 @@
 import { FlavoredCommand } from '../../index.js';
 export type ComponentInfo = {
-    container?: string;
-    imageName: string;
-    name: string;
-    tag: string;
+    component: string;
+    name?: string;
+    id?: string;
+    created?: string;
+    status?: string;
 };
 export default class ComponentsIndex extends FlavoredCommand<typeof ComponentsIndex> {
     static description: string;

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

@@ -1,6 +1,8 @@
 import { printTable } from '@oclif/table';
 import { FlavoredCommand, getContext, TABLE_DEFAULTS } from '../../index.js';
-import { ListContainersOperation, shortId } from '../../../docker/index.js';
+import { getTimeAgo } from '../../utils.js';
+import { ListContainersOperation } from '../../../docker/operations/index.js';
+import { shortId } from '../../../docker/utils.js';
 export default class ComponentsIndex extends FlavoredCommand {
     static description = 'List components.';
     static enableJsonFlag = true;
@@ -9,30 +11,26 @@ export default class ComponentsIndex extends FlavoredCommand {
     async run() {
         const { flags } = await this.parse(ComponentsIndex);
         const { monorepo } = await getContext();
-        // Get all running containers for this project
-        // and then try to do a mapping. It's probably better than
-        // doing N queries to list with specific filters
         const runningContainers = await monorepo.run(new ListContainersOperation(), {
             filters: {
                 label: [`emb/project=${monorepo.name}`],
             },
         });
-        const components = await Promise.all(monorepo.components.map(async (cmp) => {
-            const buildInfos = await cmp.toDockerBuild();
-            const container = runningContainers.find((cont) => {
-                return cont.Image === `${buildInfos.name}:${buildInfos.tag}`;
-            });
+        const components = monorepo.components.map((cmp) => {
+            const container = runningContainers.find((c) => c.Labels['emb/component'] === cmp.name &&
+                c.Labels['emb/flavor'] === monorepo.currentFlavor);
             return {
-                container: container?.Id ? shortId(container?.Id) : '',
-                imageName: buildInfos.name,
-                name: cmp.name,
-                tag: buildInfos.tag,
+                component: cmp.name,
+                id: shortId(container?.Id),
+                name: container?.Names?.join(', '),
+                created: getTimeAgo(container?.Created),
+                status: container?.Status,
             };
-        }));
+        });
         if (!flags.json) {
             printTable({
                 ...TABLE_DEFAULTS,
-                columns: ['name', 'imageName', 'tag', 'container'],
+                columns: ['component', 'name', 'id', 'created', 'status'],
                 data: components,
                 sort: {
                     name: 'asc',

package/dist/src/cli/commands/config/print.d.ts

@@ -1,5 +1,5 @@
 import { FlavoredCommand } from '../../index.js';
-import { IMonorepoConfig } from '../../../config/index.js';
+import { EMBConfig } from '../../../config/schema.js';
 export type TaskInfo = {
     component?: string;
     description?: string;
@@ -9,5 +9,5 @@ export default class ConfigPrint extends FlavoredCommand<typeof ConfigPrint> {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];
-    run(): Promise<IMonorepoConfig>;
+    run(): Promise<EMBConfig>;
 }

package/dist/src/cli/commands/containers/index.d.ts

@@ -1,6 +1,6 @@
-import { Command } from '@oclif/core';
 import { ContainerInfo } from 'dockerode';
-export default class ContainersIndex extends Command {
+import { BaseCommand } from '../../index.js';
+export default class ContainersIndex extends BaseCommand {
     static aliases: string[];
     static description: string;
     static enableJsonFlag: boolean;

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

@@ -1,10 +1,10 @@
 import { getContext } from '../../../index.js';
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { printTable } from '@oclif/table';
-import { TABLE_DEFAULTS } from '../../index.js';
+import { BaseCommand, TABLE_DEFAULTS } from '../../index.js';
 import { ListContainersOperation, shortId } from '../../../docker/index.js';
 import { timeAgo } from '../../../utils/index.js';
-export default class ContainersIndex extends Command {
+export default class ContainersIndex extends BaseCommand {
     static aliases = ['ps'];
     static description = 'List docker containers.';
     static enableJsonFlag = true;

package/dist/src/cli/commands/containers/prune.d.ts

@@ -1,6 +1,6 @@
-import { Command } from '@oclif/core';
 import { PruneContainersInfo } from 'dockerode';
-export default class ContainersPrune extends Command {
+import { BaseCommand } from '../../abstract/BaseCommand.js';
+export default class ContainersPrune extends BaseCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];

package/dist/src/cli/commands/containers/prune.js

@@ -1,7 +1,7 @@
 import { getContext } from '../../../index.js';
-import { Command } from '@oclif/core';
+import { BaseCommand } from '../../abstract/BaseCommand.js';
 import { PruneContainersOperation } from '../../../docker/index.js';
-export default class ContainersPrune extends Command {
+export default class ContainersPrune extends BaseCommand {
     static description = 'Prune containers.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];

package/dist/src/cli/commands/images/delete.d.ts

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class ImagesDelete extends Command {
+import { BaseCommand } from '../../index.js';
+export default class ImagesDelete extends BaseCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];

package/dist/src/cli/commands/images/delete.js

@@ -1,8 +1,9 @@
 import { getContext } from '../../../index.js';
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { Listr } from 'listr2';
+import { BaseCommand } from '../../index.js';
 import { deleteImage, listImages } from '../../../docker/index.js';
-export default class ImagesDelete extends Command {
+export default class ImagesDelete extends BaseCommand {
     static description = 'Delete project images.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];

package/dist/src/cli/commands/images/index.d.ts

@@ -1,4 +1,4 @@
-import { Command } from '@oclif/core';
+import { BaseCommand } from '../../index.js';
 export type ImageInfo = {
     created: Date;
     imageId: string;
@@ -6,7 +6,7 @@ export type ImageInfo = {
     size: number;
     tag: string;
 };
-export default class ImagesIndex extends Command {
+export default class ImagesIndex extends BaseCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];

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

@@ -1,10 +1,10 @@
 import { getContext } from '../../../index.js';
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { printTable } from '@oclif/table';
-import { TABLE_DEFAULTS } from '../../index.js';
+import { BaseCommand, TABLE_DEFAULTS } from '../../index.js';
 import { listImages, shortId } from '../../../docker/index.js';
 import { timeAgo } from '../../../utils/index.js';
-export default class ImagesIndex extends Command {
+export default class ImagesIndex extends BaseCommand {
     static description = 'List docker images.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];

package/dist/src/cli/commands/images/prune.d.ts

@@ -1,6 +1,6 @@
-import { Command } from '@oclif/core';
 import { PruneImagesInfo } from 'dockerode';
-export default class ImagesPrune extends Command {
+import { BaseCommand } from '../../index.js';
+export default class ImagesPrune extends BaseCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];

package/dist/src/cli/commands/images/prune.js

@@ -1,7 +1,8 @@
 import { getContext } from '../../../index.js';
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
+import { BaseCommand } from '../../index.js';
 import { pruneImages } from '../../../docker/index.js';
-export default class ImagesPrune extends Command {
+export default class ImagesPrune extends BaseCommand {
     static description = 'Prune project images.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];

package/dist/src/cli/commands/{components → resources}/build.d.ts

@@ -1,6 +1,6 @@
 import { FlavoredCommand } from '../../index.js';
-import { BuildComponentMeta } from '../../../monorepo/index.js';
-export default class BuildCommand extends FlavoredCommand<typeof BuildCommand> {
+import { BuildResourceMeta } from '../../../monorepo/operations/resources/BuildResourcesOperation.js';
+export default class ResourcesBuildCommand extends FlavoredCommand<typeof ResourcesBuildCommand> {
     static args: {
         component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
@@ -8,8 +8,9 @@ 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;
-    run(): Promise<Record<string, BuildComponentMeta>>;
+    run(): Promise<Record<string, BuildResourceMeta>>;
 }

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

@@ -0,0 +1,42 @@
+import { Args, Flags } from '@oclif/core';
+import { FlavoredCommand, getContext } from '../../index.js';
+import { BuildResourcesOperation, } from '../../../monorepo/operations/resources/BuildResourcesOperation.js';
+export default class ResourcesBuildCommand extends FlavoredCommand {
+    static args = {
+        component: Args.string({
+            description: 'List of resources to build (defaults to all)',
+            required: false,
+        }),
+    };
+    static description = 'Build the resources of the monorepo';
+    static examples = [
+        `<%= config.bin %> <%= command.id %> build --flavor development`,
+    ];
+    static flags = {
+        'dry-run': Flags.boolean({
+            required: false,
+            description: 'Do not build the resources 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;
+    async run() {
+        const { argv, flags } = await this.parse(ResourcesBuildCommand);
+        const { monorepo } = getContext();
+        const toBuild = argv.length > 0
+            ? argv
+            : monorepo.resources.map((c) => c.id);
+        return monorepo.run(new BuildResourcesOperation(), {
+            dryRun: flags['dry-run'],
+            force: flags.force,
+            silent: flags.json,
+            resources: toBuild,
+        });
+    }
+}

package/dist/src/cli/commands/resources/index.d.ts

@@ -0,0 +1,9 @@
+import { FlavoredCommand } from '../../index.js';
+import { ResourceConfig } from '../../../config/schema.js';
+export default class ResourcesIndex extends FlavoredCommand<typeof ResourcesIndex> {
+    static description: string;
+    static enableJsonFlag: boolean;
+    static examples: string[];
+    static flags: {};
+    run(): Promise<Array<ResourceConfig>>;
+}

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

@@ -0,0 +1,28 @@
+import { printTable } from '@oclif/table';
+import { FlavoredCommand, getContext, TABLE_DEFAULTS } from '../../index.js';
+export default class ResourcesIndex extends FlavoredCommand {
+    static description = 'List resources.';
+    static enableJsonFlag = true;
+    static examples = ['<%= config.bin %> <%= command.id %>'];
+    static flags = {};
+    async run() {
+        const { flags } = await this.parse(ResourcesIndex);
+        const { monorepo } = await getContext();
+        const resources = await Promise.all(monorepo.resources.map(async (config) => {
+            return {
+                ...config,
+            };
+        }));
+        if (!flags.json) {
+            printTable({
+                ...TABLE_DEFAULTS,
+                columns: ['name', 'type', 'id'],
+                data: resources,
+                sort: {
+                    name: 'asc',
+                },
+            });
+        }
+        return resources;
+    }
+}

package/dist/src/cli/commands/tasks/index.d.ts

@@ -1,6 +1,6 @@
-import { Command } from '@oclif/core';
+import { BaseCommand } from '../../index.js';
 import { TaskInfo } from '../../../monorepo/index.js';
-export default class TasksIndex extends Command {
+export default class TasksIndex extends BaseCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];

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

@@ -1,8 +1,7 @@
 import { getContext } from '../../../index.js';
-import { Command } from '@oclif/core';
 import { printTable } from '@oclif/table';
-import { TABLE_DEFAULTS } from '../../index.js';
-export default class TasksIndex extends Command {
+import { BaseCommand, TABLE_DEFAULTS } from '../../index.js';
+export default class TasksIndex extends BaseCommand {
     static description = 'List tasks.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -10,7 +9,7 @@ export default class TasksIndex extends Command {
     async run() {
         const { flags } = await this.parse(TasksIndex);
         const { monorepo: { tasks }, } = await getContext();
-        if (!flags.json)
+        if (!flags.json) {
             printTable({
                 ...TABLE_DEFAULTS,
                 columns: ['name', 'component', 'description', 'id'],
@@ -24,6 +23,7 @@ export default class TasksIndex extends Command {
                     return 0;
                 }),
             });
+        }
         return tasks;
     }
 }

package/dist/src/cli/commands/tasks/run.d.ts

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class RunTask extends Command {
+import { BaseCommand } from '../../index.js';
+export default class RunTask extends BaseCommand {
     static args: {
         task: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };

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

@@ -1,7 +1,8 @@
-import { AmbiguousTaskError, getContext } from '../../../index.js';
-import { Args, Command, Flags } from '@oclif/core';
+import { AmbiguousReferenceError, getContext, UnkownReferenceError } from '../../../index.js';
+import { Args, Flags } from '@oclif/core';
+import { BaseCommand } from '../../index.js';
 import { ExecutorType, RunTasksOperation } from '../../../monorepo/index.js';
-export default class RunTask extends Command {
+export default class RunTask extends BaseCommand {
     static args = {
         task: Args.string({
             description: 'List of tasks to run. You can provide either ids or names (eg: component:task or task)',
@@ -37,13 +38,19 @@ export default class RunTask extends Command {
             });
         }
         catch (error) {
-            if (error instanceof AmbiguousTaskError) {
+            if (error instanceof AmbiguousReferenceError) {
                 throw error.toCliError([
-                    `Specify just one. Eg: \`emb tasks run ${error.options[0]}\``,
+                    `Specify just one. Eg: \`emb tasks run ${error.matches[0]}\``,
                     'Run the same command with --all-matches / -a',
                     'Review the list of tasks by running `emb tasks`',
                 ]);
             }
+            if (error instanceof UnkownReferenceError) {
+                throw error.toCliError([
+                    `Check the list of tasks available by running: \`emb tasks\``,
+                ]);
+            }
+            throw error;
         }
     }
 }