@enspirit/emb 0.1.0 → 0.1.1

package/README.md

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

package/dist/src/config/schema.d.ts

@@ -83,6 +83,10 @@ export interface DefaultsConfig {
     };
 }
 export interface ComponentConfig {
+    /**
+     * Path to the component's root folder (relative to root of monorepo)
+     */
+    rootDir?: string;
     /**
      * A description of the component.
      */

package/dist/src/config/schema.json

@@ -144,6 +144,10 @@
             "type": "object",
             "required": [],
             "properties": {
+                "rootDir": {
+                    "type": "string",
+                    "description": "Path to the component's root folder (relative to root of monorepo)"
+                },
                 "description": {
                     "type": "string",
                     "minLength": 1,

package/dist/src/config/validation.js

@@ -43,6 +43,9 @@ export const validateEmbfile = async (pathOrObject) => {
     if (!validate) {
         throw new Error('Could not find the JSON schema validator for Embfile');
     }
+    if (!component) {
+        return {};
+    }
     if (!validate(component)) {
         ajv.errors?.forEach((err) => console.error(err));
         throw new Error(`Your .emb.yml is incorrect`);

package/dist/src/docker/resources/DockerImageResource.js

@@ -1,14 +1,20 @@
-import { stat } from 'node:fs/promises';
+import { stat, statfs } from 'node:fs/promises';
+import { join } from 'node:path';
+import pMap from 'p-map';
 import { GitPrerequisitePlugin } from '../../prerequisites/index.js';
 import { ResourceFactory, } from '../../monorepo/resources/ResourceFactory.js';
 import { BuildImageOperation } from '../operations/index.js';
 const DockerImageOpFactory = async ({ config, component, monorepo }) => {
     const fromConfig = (config.params || {});
-    const plugin = new GitPrerequisitePlugin();
-    const sources = await plugin.collect(component);
     const context = fromConfig.context
-        ? component.join(fromConfig.context)
-        : component.rootDir;
+        ? fromConfig.context[0] === '/'
+            ? monorepo.join(fromConfig.context)
+            : component.join(fromConfig.context)
+        : monorepo.join(component.rootDir);
+    // Ensure the folder exists
+    await statfs(context);
+    const plugin = new GitPrerequisitePlugin();
+    const sources = await plugin.collect(context);
     const buildParams = {
         context,
         dockerfile: fromConfig.dockerfile || 'Dockerfile',
@@ -24,13 +30,13 @@ const DockerImageOpFactory = async ({ config, component, monorepo }) => {
         target: fromConfig.target,
     };
     const lastUpdatedInfo = async (sources) => {
-        const stats = await Promise.all(sources.map(async (s) => {
-            const stats = await stat(component.join(s.path));
+        const stats = await pMap(sources, async (s) => {
+            const stats = await stat(join(context, s.path));
             return {
                 time: stats.mtime,
                 path: s.path,
             };
-        }));
+        }, { concurrency: 30 });
         if (stats.length === 0) {
             return 0;
         }

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

@@ -1,19 +1,17 @@
 import { ComponentConfig, ComponentFlavorConfig } from '../config/schema.js';
 import { ComponentFlavors, Monorepo, Resources, Tasks } from './index.js';
-import { FilePrerequisite } from '../prerequisites/index.js';
 export declare class Component implements ComponentConfig {
     readonly name: string;
     readonly config: ComponentConfig;
     protected monorepo: Monorepo;
+    readonly rootDir: string;
     readonly tasks: Tasks;
     readonly resources: Resources;
     readonly flavors: ComponentFlavors;
     constructor(name: string, config: ComponentConfig, monorepo: Monorepo);
-    get rootDir(): string;
     flavor(name: string, mustExist?: boolean): ComponentFlavorConfig;
     cloneWith(config: Partial<ComponentConfig>): ComponentConfig;
     toJSON(): ComponentConfig;
     withFlavor(name: string): Component;
-    getPrerequisites(): Promise<Array<FilePrerequisite>>;
     join(path: string): string;
 }

package/dist/src/monorepo/component.js

@@ -1,11 +1,11 @@
 import jsonpatch from 'fast-json-patch';
 import { join } from 'node:path';
 import { toIdentifedHash, } from './index.js';
-import { GitPrerequisitePlugin } from '../prerequisites/index.js';
 export class Component {
     name;
     config;
     monorepo;
+    rootDir;
     tasks;
     resources;
     flavors;
@@ -13,15 +13,13 @@ export class Component {
         this.name = name;
         this.config = config;
         this.monorepo = monorepo;
+        this.rootDir = config.rootDir || name;
         this.tasks = toIdentifedHash(config.tasks || {}, this.name);
         this.resources = toIdentifedHash(
         // Due to the schema.json -> typescript conversion weirdness
         config.resources || {}, this.name);
         this.flavors = toIdentifedHash(config.flavors || {}, this.name);
     }
-    get rootDir() {
-        return this.monorepo.join(this.name);
-    }
     flavor(name, mustExist = true) {
         const flavor = this.flavors[name];
         if (!flavor && mustExist) {
@@ -50,12 +48,7 @@ export class Component {
         }, original);
         return new Component(this.name, patched, this.monorepo);
     }
-    async getPrerequisites() {
-        // TODO: move this to config with potential overridzs
-        const plugin = new GitPrerequisitePlugin();
-        return plugin.collect(this);
-    }
     join(path) {
-        return join(this.rootDir, path);
+        return this.monorepo.join(join(this.rootDir, path));
     }
 }

package/dist/src/monorepo/monorepo.js

@@ -12,7 +12,6 @@ export class Monorepo {
     initialized = false;
     constructor(config, defaultFlavor = 'default') {
         this.defaultFlavor = defaultFlavor;
-        console.log('WEIRD BECAUSE, adnsod', defaultFlavor);
         this._config = new MonorepoConfig(config);
     }
     get config() {

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

@@ -32,7 +32,10 @@ export class EmbfileLoaderPlugin extends AbstractPlugin {
             const embfile = await join(config.project.rootDir, path);
             const component = await validateEmbfile(embfile);
             const original = config.components[name];
-            const newComponent = deepmerge()(original || {}, component);
+            const newComponent = deepmerge()(original || {}, {
+                ...component,
+                rootDir,
+            });
             return config.with({
                 components: {
                     [name]: newComponent,

package/dist/src/prerequisites/GitPrerequisitePlugin.d.ts

@@ -1,5 +1,4 @@
-import { Component } from '../monorepo/index.js';
 import { FilePrerequisite, PrerequisitePlugin, PrerequisiteType } from './types.js';
 export declare class GitPrerequisitePlugin implements PrerequisitePlugin<PrerequisiteType.file, FilePrerequisite> {
-    collect(component: Component): Promise<Array<FilePrerequisite>>;
+    collect(path: string): Promise<Array<FilePrerequisite>>;
 }

package/dist/src/prerequisites/GitPrerequisitePlugin.js

@@ -1,9 +1,9 @@
 import { simpleGit } from 'simple-git';
 import { PrerequisiteType, } from './types.js';
 export class GitPrerequisitePlugin {
-    async collect(component) {
-        const repo = simpleGit(component.rootDir);
-        return (await repo.raw('ls-files', component.rootDir))
+    async collect(path) {
+        const repo = simpleGit(path);
+        return (await repo.raw('ls-files', path))
             .split('\n')
             .map((s) => s.trim())
             .filter(Boolean)

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

@@ -18,9 +18,9 @@ export interface FilePrerequisite extends Prerequisite<PrerequisiteType.file> {
 }
 export interface PrerequisitePlugin<T extends PrerequisiteType, P extends Prerequisite<T>, Output = unknown, Changes = unknown> {
     /**
-     * Collect/discover prerequisistes for a specific component
+     * Collect/discover prerequisistes for a path (relative to the monorepo root)
      */
-    collect?(component: Component): Promise<Array<P>>;
+    collect?(path: string): Promise<Array<P>>;
     /**
      * Returns the list of changes between the last collection and the new
      * collection.

package/oclif.manifest.json

@@ -168,10 +168,12 @@
         "index.js"
       ]
     },
-    "config:print": {
-      "aliases": [],
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
       "args": {},
-      "description": "Print the current config.",
+      "description": "List docker containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -183,21 +185,22 @@
           "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",
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -205,16 +208,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 %>"
       ],
@@ -225,19 +226,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",
@@ -250,13 +243,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 %>"
       ],
@@ -267,15 +260,22 @@
           "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",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -283,8 +283,8 @@
         "src",
         "cli",
         "commands",
-        "containers",
-        "prune.js"
+        "config",
+        "print.js"
       ]
     },
     "images:delete": {
@@ -413,12 +413,18 @@
         "prune.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": {
@@ -427,15 +433,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": [
@@ -443,20 +472,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 %>"
       ],
@@ -468,33 +491,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": [
@@ -502,22 +513,16 @@
         "src",
         "cli",
         "commands",
-        "tasks",
-        "run.js"
+        "resources",
+        "index.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": {
@@ -526,38 +531,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": [
@@ -565,14 +547,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 %>"
       ],
@@ -584,21 +572,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": [
@@ -606,10 +606,10 @@
         "src",
         "cli",
         "commands",
-        "resources",
-        "index.js"
+        "tasks",
+        "run.js"
       ]
     }
   },
-  "version": "0.1.0"
+  "version": "0.1.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",