@enspirit/emb 0.1.1 → 0.1.2

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @enspirit/emb
 $ emb COMMAND
 running command...
 $ emb (--version)
-@enspirit/emb/0.1.1 darwin-x64 node-v22.12.0
+@enspirit/emb/0.1.2 darwin-x64 node-v22.12.0
 $ emb --help [COMMAND]
 USAGE
   $ emb COMMAND
@@ -225,10 +225,11 @@ List docker images.
 
 ```
 USAGE
-  $ emb images [--json] [-a]
+  $ emb images [--json] [--flavor <value>] [-a]
 
 FLAGS
-  -a, --all  Show all images. Only images from a final layer (no children) are shown by default.
+  -a, --all             Show all images. Only images from a final layer (no children) are shown by default.
+      --flavor=<value>  Specify the flavor to use.
 
 GLOBAL FLAGS
   --json  Format output as json.

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

@@ -9,5 +9,8 @@ export declare abstract class FlavoredCommand<T extends typeof Command> extends
     static enableJsonFlag: boolean;
     protected args: Args<T>;
     protected flags: Flags<T>;
+    protected catch(err: Error & {
+        exitCode?: number;
+    }): Promise<void>;
     init(): Promise<void>;
 }

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

@@ -1,5 +1,6 @@
 import { getContext, setContext } from '../../index.js';
 import { Flags } from '@oclif/core';
+import { JsonPatchError } from 'fast-json-patch';
 import { BaseCommand } from './BaseCommand.js';
 export class FlavoredCommand extends BaseCommand {
     // define flags that can be inherited by any command that extends FlavoredCommand
@@ -14,6 +15,19 @@ export class FlavoredCommand extends BaseCommand {
     static enableJsonFlag = true;
     args;
     flags;
+    async catch(err) {
+        if (err instanceof JsonPatchError) {
+            this.log('INVALID', err.operation);
+            this.error('Invalid patch detected while applying flavor', {
+                code: err.name,
+                message: `Path \`${err.operation?.path}\``,
+            });
+            return;
+        }
+        // add any custom logic to handle errors from the command
+        // or simply return the parent class error handling
+        return super.catch(err);
+    }
     async init() {
         await super.init();
         const { args, flags } = await this.parse({

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

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

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

@@ -20,6 +20,9 @@ export default class UpCommand extends FlavoredCommand {
         if (flags.force) {
             buildFlags.push('--force');
         }
+        if (flags.flavor) {
+            buildFlags.push('--flavor', flags.flavor);
+        }
         await this.config.runCommand('resources:build', buildFlags);
         await monorepo.run(new ComposeUpOperation(), {
             forceRecreate: flags.force,

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

@@ -129,6 +129,5 @@ export interface JsonPatchCopyOperation {
     from: string;
 }
 export interface ProjectFlavorConfig {
-    defaults?: DefaultsConfig;
     patches?: JsonPatchOperation[];
 }

package/dist/src/config/schema.json

@@ -200,9 +200,6 @@
             "additionalProperties": false,
             "required": [],
             "properties": {
-                "defaults": {
-                    "$ref": "#/$defs/DefaultsConfig"
-                },
                 "patches": {
                     "type": "array",
                     "items": {

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

@@ -15,12 +15,14 @@ const DockerImageOpFactory = async ({ config, component, monorepo }) => {
     await statfs(context);
     const plugin = new GitPrerequisitePlugin();
     const sources = await plugin.collect(context);
+    const imageName = [monorepo.name, fromConfig.tag || component.name].join('/');
+    const tagName = fromConfig.tag || monorepo.defaults.docker?.tag || 'latest';
     const buildParams = {
         context,
         dockerfile: fromConfig.dockerfile || 'Dockerfile',
         src: sources.map((s) => s.path),
         buildArgs: fromConfig.buildArgs || {},
-        tag: [monorepo.name, fromConfig.tag || component.name].join('/'),
+        tag: `${imageName}:${tagName}`,
         labels: {
             ...fromConfig.labels,
             'emb/project': monorepo.name,

package/dist/src/monorepo/component.js

@@ -41,7 +41,7 @@ export class Component {
         const patches = this.flavor(name).patches || [];
         const errors = jsonpatch.validate(patches, original);
         if (errors) {
-            throw new Error('Invalid patch(es) detected');
+            throw errors;
         }
         const patched = patches.reduce((doc, patch, index) => {
             return jsonpatch.applyReducer(doc, patch, index);

package/dist/src/monorepo/monorepo.js

@@ -167,13 +167,13 @@ export class Monorepo {
         const original = this._config.toJSON();
         const errors = jsonpatch.validate(patches || [], original);
         if (errors) {
-            throw new Error('Invalid patch(es) detected');
+            throw errors;
         }
         const withComponentPatches = this.components.reduce((config, cmp) => {
             const componentPatches = cmp.flavor(flavorName, false)?.patches || [];
             const errors = jsonpatch.validate(componentPatches || [], config.components[cmp.name]);
             if (errors) {
-                throw new Error('Invalid patch(es) detected');
+                throw errors;
             }
             config.components[cmp.name] = componentPatches.reduce((doc, patch, index) => {
                 return jsonpatch.applyReducer(doc, patch, index);

package/oclif.manifest.json

@@ -344,6 +344,14 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "all": {
           "char": "a",
           "description": "Show all images. Only images from a final layer (no children) are shown by default.",
@@ -359,7 +367,6 @@
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -611,5 +618,5 @@
       ]
     }
   },
-  "version": "0.1.1"
+  "version": "0.1.2"
 }

package/package.json

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