@enspirit/emb 0.0.8 → 0.1.0

package/oclif.manifest.json

@@ -70,7 +70,6 @@
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -118,7 +117,6 @@
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -129,18 +127,12 @@
         "up.js"
       ]
     },
-    "components:build": {
+    "components": {
       "aliases": [],
-      "args": {
-        "component": {
-          "description": "List of components to build (defaults to all)",
-          "name": "component",
-          "required": false
-        }
-      },
-      "description": "Build the components of the monorepo",
+      "args": {},
+      "description": "List components.",
       "examples": [
-        "<%= config.bin %> <%= command.id %> build --flavor development"
+        "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
         "json": {
@@ -157,22 +149,14 @@
           "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,
       "hiddenAliases": [],
-      "id": "components:build",
+      "id": "components",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -181,13 +165,13 @@
         "cli",
         "commands",
         "components",
-        "build.js"
+        "index.js"
       ]
     },
-    "components": {
+    "config:print": {
       "aliases": [],
       "args": {},
-      "description": "List components.",
+      "description": "Print the current config.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -210,7 +194,50 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "components",
+      "id": "config:print",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "config",
+        "print.js"
+      ]
+    },
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
+      "args": {},
+      "description": "List docker containers.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "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",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -222,14 +249,48 @@
         "src",
         "cli",
         "commands",
-        "components",
+        "containers",
         "index.js"
       ]
     },
-    "config:print": {
+    "containers:prune": {
       "aliases": [],
       "args": {},
-      "description": "Print the current config.",
+      "description": "Prune containers.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "containers:prune",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "containers",
+        "prune.js"
+      ]
+    },
+    "images:delete": {
+      "aliases": [],
+      "args": {},
+      "description": "Delete project images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -241,18 +302,18 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
+        "force": {
+          "char": "f",
+          "description": "Remove the image even if it is being used by stopped containers or has other tags",
+          "name": "force",
           "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "config:print",
+      "id": "images:delete",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -264,16 +325,14 @@
         "src",
         "cli",
         "commands",
-        "config",
-        "print.js"
+        "images",
+        "delete.js"
       ]
     },
-    "containers": {
-      "aliases": [
-        "ps"
-      ],
+    "images": {
+      "aliases": [],
       "args": {},
-      "description": "List docker containers.",
+      "description": "List docker images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -287,7 +346,7 @@
         },
         "all": {
           "char": "a",
-          "description": "Retun all containers. By default, only running containers are shown",
+          "description": "Show all images. Only images from a final layer (no children) are shown by default.",
           "name": "all",
           "required": false,
           "allowNo": false,
@@ -296,7 +355,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers",
+      "id": "images",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -308,14 +367,14 @@
         "src",
         "cli",
         "commands",
-        "containers",
+        "images",
         "index.js"
       ]
     },
-    "containers:prune": {
+    "images:prune": {
       "aliases": [],
       "args": {},
-      "description": "Prune containers.",
+      "description": "Prune project images.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -326,11 +385,19 @@
           "name": "json",
           "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",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers:prune",
+      "id": "images:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -342,7 +409,7 @@
         "src",
         "cli",
         "commands",
-        "containers",
+        "images",
         "prune.js"
       ]
     },
@@ -439,12 +506,18 @@
         "run.js"
       ]
     },
-    "images:delete": {
+    "resources:build": {
       "aliases": [],
-      "args": {},
-      "description": "Delete project images.",
+      "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": {
@@ -454,52 +527,25 @@
           "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",
+        "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"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "images:delete",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "images",
-        "delete.js"
-      ]
-    },
-    "images": {
-      "aliases": [],
-      "args": {},
-      "description": "List docker images.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "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",
+        "force": {
+          "char": "f",
+          "description": "Bypass the cache and force the build",
+          "name": "force",
           "required": false,
           "allowNo": false,
           "type": "boolean"
@@ -507,11 +553,11 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images",
+      "id": "resources:build",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -519,14 +565,14 @@
         "src",
         "cli",
         "commands",
-        "images",
-        "index.js"
+        "resources",
+        "build.js"
       ]
     },
-    "images:prune": {
+    "resources": {
       "aliases": [],
       "args": {},
-      "description": "Prune project images.",
+      "description": "List resources.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -538,22 +584,21 @@
           "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",
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
           "required": false,
-          "allowNo": false,
-          "type": "boolean"
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "images:prune",
+      "id": "resources",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -561,10 +606,10 @@
         "src",
         "cli",
         "commands",
-        "images",
-        "prune.js"
+        "resources",
+        "index.js"
       ]
     }
   },
-  "version": "0.0.8"
+  "version": "0.1.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",
@@ -13,6 +13,7 @@
     "build": "rimraf dist && npm run build:types && npm run build:ts && npm run copy:proto",
     "copy:proto": "cp -r src/docker/protobuf/*.proto dist/src/docker/protobuf/",
     "build:ts": "tsc -b && tsc-alias",
+    "build:ts:watch": "tsc --watch",
     "build:types": "json2ts src/config/schema.json > src/config/schema.ts",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
@@ -22,9 +23,11 @@
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "npm run lint",
     "prepack": "oclif manifest && oclif readme",
-    "test": "npm run build:types && npm run test:unit",
+    "test": "npm run build:types && npm run test:unit && npm run test:integration",
     "test:unit": "vitest run tests/unit",
+    "test:unit:watch": "vitest tests/unit",
     "test:integration": "vitest run tests/integration",
+    "test:integration:watch": "vitest tests/integration",
     "test:watch": "vitest",
     "version": "oclif readme && git add README.md"
   },
@@ -43,6 +46,7 @@
     "dockerode": "^4.0.7",
     "dotenv": "^17.2.1",
     "execa": "^9.6.0",
+    "fast-json-patch": "^3.1.1",
     "find-up": "^7.0.0",
     "glob": "^11.0.3",
     "graphlib": "^2.1.8",
@@ -111,6 +115,7 @@
     "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" }

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

@@ -1,34 +0,0 @@
-import { Args, Flags } from '@oclif/core';
-import { FlavoredCommand, getContext } from '../../index.js';
-import { BuildComponentsOperation } from '../../../monorepo/index.js';
-export default class BuildCommand extends FlavoredCommand {
-    static args = {
-        component: Args.string({
-            description: 'List of components to build (defaults to all)',
-            required: false,
-        }),
-    };
-    static description = 'Build the components 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 components but only produce build meta information',
-        }),
-    };
-    static enableJsonFlag = true;
-    static strict = false;
-    async run() {
-        const { argv, flags } = await this.parse(BuildCommand);
-        const { monorepo } = getContext();
-        return monorepo.run(new BuildComponentsOperation(), {
-            dryRun: flags['dry-run'],
-            silent: flags.json,
-            components: argv.length > 0
-                ? argv
-                : monorepo.components.map((c) => c.name),
-        });
-    }
-}

package/dist/src/docker/images/buildImage.d.ts

@@ -1,19 +0,0 @@
-import { Writable } from 'node:stream';
-import { DockerComponentBuild } from '../index.js';
-import { Component } from '../../monorepo/index.js';
-export type MobyTrace = {
-    aux: unknown;
-    error?: string;
-    id: string;
-};
-export type Progress = {
-    error?: string;
-    name?: string;
-};
-export type DockerBuildExtraOptions = {
-    output?: Writable;
-};
-export type BuildDockerImageOutput = DockerComponentBuild & {
-    traces: Array<MobyTrace>;
-};
-export declare const buildDockerImage: (component: Component, opts?: DockerBuildExtraOptions, progress?: (progress: Progress) => void) => Promise<BuildDockerImageOutput | undefined>;

package/dist/src/docker/images/buildImage.js

@@ -1,64 +0,0 @@
-import { getContext } from '../../index.js';
-import { decodeBuildkitStatusResponse, getSentinelFile, } from '../index.js';
-import { FilePrerequisitePlugin } from '../../prerequisites/index.js';
-export const buildDockerImage = async (component, opts = {}, progress) => {
-    const cmp = await component.toDockerBuild();
-    const files = (cmp.prerequisites || []).map((f) => f.path);
-    const { docker, monorepo } = getContext();
-    /** SENTINEL LOGIC */
-    // TODO: make configurable
-    const prereqPlugin = new FilePrerequisitePlugin();
-    const preBuildMeta = await prereqPlugin.meta(component, cmp.prerequisites, 'pre');
-    const sentinelFile = getSentinelFile(component);
-    let lastValue;
-    try {
-        lastValue = (await monorepo.store.readFile(sentinelFile)).toString();
-    }
-    catch {
-        lastValue = undefined;
-    }
-    if (lastValue) {
-        const diff = await prereqPlugin.diff(component, cmp.prerequisites, lastValue, preBuildMeta);
-        if (!diff) {
-            return;
-        }
-    }
-    const stream = await docker.buildImage({
-        context: cmp.context,
-        src: [...files],
-    }, {
-        buildargs: cmp.buildArgs,
-        dockerfile: cmp.dockerfile,
-        labels: cmp.labels,
-        t: cmp.name + ':' + (cmp.tag || 'latest'),
-        target: cmp.target,
-        version: '2',
-    });
-    if (opts.output) {
-        stream.pipe(opts.output);
-    }
-    stream.on('close', async () => {
-        const sentinelValue = await prereqPlugin.meta(component, cmp.prerequisites, 'post');
-        await monorepo.store.writeFile(sentinelFile, sentinelValue);
-    });
-    return new Promise((resolve, reject) => {
-        docker.modem.followProgress(stream, (err, traces) => {
-            return err ? reject(err) : resolve({ ...cmp, traces });
-        }, async (trace) => {
-            if (trace.error) {
-                reject(new Error(trace.error));
-            }
-            else {
-                try {
-                    const { vertexes } = await decodeBuildkitStatusResponse(trace.aux);
-                    vertexes.forEach((v) => {
-                        progress?.(v);
-                    });
-                }
-                catch (error) {
-                    console.error(error);
-                }
-            }
-        });
-    });
-};

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

@@ -1,14 +0,0 @@
-import { FilePrerequisite } from '../prerequisites/index.js';
-export type EnvVariable = {
-    name: string;
-};
-export interface DockerComponentBuild {
-    buildArgs?: Record<string, string>;
-    context: string;
-    dockerfile: string;
-    labels?: Record<string, string>;
-    name: string;
-    prerequisites: Array<FilePrerequisite>;
-    tag: string;
-    target?: string;
-}

package/dist/src/monorepo/operations/components/BuildComponentsOperation.d.ts

@@ -1,21 +0,0 @@
-import * as z from 'zod';
-import { DockerComponentBuild } from '../../../docker/index.js';
-import { AbstractOperation } from '../../../operations/index.js';
-export type BuildComponentMeta = {
-    dryRun?: boolean;
-    cacheHit?: boolean;
-    build: DockerComponentBuild;
-    preBuildMeta?: string;
-    sentinelFile: string;
-};
-declare const schema: z.ZodObject<{
-    components: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    dryRun: z.ZodOptional<z.ZodBoolean>;
-    silent: z.ZodOptional<z.ZodBoolean>;
-}, z.core.$strip>;
-export declare class BuildComponentsOperation extends AbstractOperation<typeof schema, Record<string, BuildComponentMeta>> {
-    constructor();
-    protected _run(input: z.input<typeof schema>): Promise<Record<string, BuildComponentMeta>>;
-    private buildComponent;
-}
-export {};