@enspirit/emb 0.4.2 → 0.5.0

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @enspirit/emb
 $ emb COMMAND
 running command...
 $ emb (--version)
-@enspirit/emb/0.4.2 darwin-x64 node-v22.18.0
+@enspirit/emb/0.5.0 darwin-x64 node-v22.18.0
 $ emb --help [COMMAND]
 USAGE
   $ emb COMMAND
@@ -43,7 +43,7 @@ USAGE
 * [`emb shell COMPONENT`](#emb-shell-component)
 * [`emb tasks`](#emb-tasks)
 * [`emb tasks run TASK`](#emb-tasks-run-task)
-* [`emb up`](#emb-up)
+* [`emb up [COMPONENT]`](#emb-up-component)
 * [`emb update [CHANNEL]`](#emb-update-channel)
 
 ## `emb autocomplete [SHELL]`
@@ -125,14 +125,13 @@ Get components logs.
 
 ```
 USAGE
-  $ emb components logs COMPONENT [--flavor <value>] [-f]
+  $ emb components logs COMPONENT [-f]
 
 ARGUMENTS
   COMPONENT  The component you want to see the logs of
 
 FLAGS
-  -f, --follow          Follow log output
-      --flavor=<value>  Specify the flavor to use.
+  -f, --follow  Follow log output
 
 DESCRIPTION
   Get components logs.
@@ -150,14 +149,13 @@ Get a shell on a running component.
 
 ```
 USAGE
-  $ emb components shell COMPONENT [--flavor <value>] [-s <value>]
+  $ emb components shell COMPONENT [-s <value>]
 
 ARGUMENTS
   COMPONENT  The component you want to get a shell on
 
 FLAGS
-  -s, --shell=<value>   [default: bash] The shell to run
-      --flavor=<value>  Specify the flavor to use.
+  -s, --shell=<value>  [default: bash] The shell to run
 
 DESCRIPTION
   Get a shell on a running component.
@@ -343,14 +341,13 @@ Get components logs.
 
 ```
 USAGE
-  $ emb logs COMPONENT [--flavor <value>] [-f]
+  $ emb logs COMPONENT [-f]
 
 ARGUMENTS
   COMPONENT  The component you want to see the logs of
 
 FLAGS
-  -f, --follow          Follow log output
-      --flavor=<value>  Specify the flavor to use.
+  -f, --follow  Follow log output
 
 DESCRIPTION
   Get components logs.
@@ -439,14 +436,13 @@ Get a shell on a running component.
 
 ```
 USAGE
-  $ emb shell COMPONENT [--flavor <value>] [-s <value>]
+  $ emb shell COMPONENT [-s <value>]
 
 ARGUMENTS
   COMPONENT  The component you want to get a shell on
 
 FLAGS
-  -s, --shell=<value>   [default: bash] The shell to run
-      --flavor=<value>  Specify the flavor to use.
+  -s, --shell=<value>  [default: bash] The shell to run
 
 DESCRIPTION
   Get a shell on a running component.
@@ -502,13 +498,16 @@ EXAMPLES
   $ emb tasks run
 ```
 
-## `emb up`
+## `emb up [COMPONENT]`
 
 Start the whole project.
 
 ```
 USAGE
-  $ emb up [--json] [--flavor <value>] [-f]
+  $ emb up [COMPONENT...] [--json] [--flavor <value>] [-f]
+
+ARGUMENTS
+  COMPONENT...  The component(s) to build and start
 
 FLAGS
   -f, --force           Bypass caches, force the recreation of containers, etc

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

@@ -1,5 +1,5 @@
-import { FlavoredCommand } from '../../index.js';
-export default class ComponentsLogs extends FlavoredCommand<typeof ComponentsLogs> {
+import { BaseCommand } from '../../index.js';
+export default class ComponentsLogs extends BaseCommand {
     static aliases: string[];
     static description: string;
     static enableJsonFlag: boolean;

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

@@ -1,7 +1,7 @@
 import { Args, Flags } from '@oclif/core';
-import { FlavoredCommand, getContext } from '../../index.js';
+import { BaseCommand, getContext } from '../../index.js';
 import { ListContainersOperation } from '../../../docker/index.js';
-export default class ComponentsLogs extends FlavoredCommand {
+export default class ComponentsLogs extends BaseCommand {
     static aliases = ['logs'];
     static description = 'Get components logs.';
     static enableJsonFlag = false;

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

@@ -1,5 +1,5 @@
-import { FlavoredCommand } from '../../index.js';
-export default class ComponentsLogs extends FlavoredCommand<typeof ComponentsLogs> {
+import { BaseCommand } from '../../index.js';
+export default class ComponentsLogs extends BaseCommand {
     static aliases: string[];
     static description: string;
     static enableJsonFlag: boolean;

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

@@ -1,8 +1,8 @@
 import { Args, Flags } from '@oclif/core';
-import { FlavoredCommand, getContext } from '../../index.js';
+import { BaseCommand, getContext } from '../../index.js';
 import { ComposeExecShellOperation } from '../../../docker/index.js';
 import { ShellExitError } from '../../../errors.js';
-export default class ComponentsLogs extends FlavoredCommand {
+export default class ComponentsLogs extends BaseCommand {
     static aliases = ['shell'];
     static description = 'Get a shell on a running component.';
     static enableJsonFlag = false;

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

@@ -6,5 +6,9 @@ export default class UpCommand extends FlavoredCommand<typeof UpCommand> {
     static flags: {
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    static args: {
+        component: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static strict: boolean;
     run(): Promise<void>;
 }

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

@@ -1,6 +1,7 @@
-import { Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import { FlavoredCommand, getContext } from '../index.js';
 import { ComposeUpOperation } from '../../docker/index.js';
+import { BuildResourcesOperation } from '../../monorepo/operations/resources/BuildResourcesOperation.js';
 export default class UpCommand extends FlavoredCommand {
     static description = 'Start the whole project.';
     static enableJsonFlag = true;
@@ -13,16 +14,44 @@ export default class UpCommand extends FlavoredCommand {
             name: 'force',
         }),
     };
+    static args = {
+        component: Args.string({
+            name: 'component',
+            description: 'The component(s) to build and start',
+        }),
+    };
+    static strict = false;
     async run() {
-        const { flags } = await this.parse(UpCommand);
+        const { flags, argv } = await this.parse(UpCommand);
         const { monorepo } = getContext();
         const buildFlags = [];
         if (flags.force) {
             buildFlags.push('--force');
         }
-        await this.config.runCommand('resources:build', buildFlags);
+        let components;
+        let resources;
+        if (argv.length > 0) {
+            components =
+                argv.length > 0
+                    ? argv.map((name) => monorepo.component(name))
+                    : monorepo.components;
+            resources = components.reduce((resources, component) => {
+                return [
+                    ...resources,
+                    ...Object.values(component.resources).map((r) => r.id),
+                ];
+            }, []);
+        }
+        else {
+            resources = monorepo.resources.map((r) => r.id);
+        }
+        await monorepo.run(new BuildResourcesOperation(), {
+            force: flags.force,
+            resources,
+        });
         await monorepo.run(new ComposeUpOperation(), {
             forceRecreate: flags.force,
+            components: components?.map((c) => c.name),
         });
     }
 }

package/dist/src/config/schema.json

@@ -10,7 +10,7 @@
             "required": ["name"],
             "properties": {
                 "name": {
-                    "$ref": "#/$defs/Identifier",
+                    "$ref": "#/definitions/Identifier",
                     "description": "The name of the project."
                 },
                 "rootDir": {
@@ -28,7 +28,7 @@
                 "required": ["name"],
                 "properties": {
                     "name": {
-                        "$ref": "#/$defs/Identifier"
+                        "$ref": "#/definitions/Identifier"
                     },
                     "config": {}
                 },
@@ -48,29 +48,29 @@
             "additionalProperties": true
         },
         "defaults": {
-            "$ref": "#/$defs/DefaultsConfig"
+            "$ref": "#/definitions/DefaultsConfig"
         },
         "components": {
             "type": "object",
             "additionalProperties": {
-                "$ref": "#/$defs/ComponentConfig"
+                "$ref": "#/definitions/ComponentConfig"
             }
         },
         "flavors": {
             "type": "object",
             "additionalProperties": {
-                "$ref": "#/$defs/ProjectFlavorConfig"
+                "$ref": "#/definitions/ProjectFlavorConfig"
             }
         },
         "tasks": {
             "type": "object",
             "additionalProperties": {
-                "$ref": "#/$defs/TaskConfig"
+                "$ref": "#/definitions/TaskConfig"
             }
         }
     },
     "required": ["project"],
-    "$defs": {
+    "definitions": {
         "Identifier": {
             "type": "string",
             "pattern": "^[a-zA-Z]+[\\w._-]+$"
@@ -92,7 +92,7 @@
                             "type": "string"
                         },
                         "target": {
-                            "$ref": "#/$defs/Identifier"
+                            "$ref": "#/definitions/Identifier"
                         },
                         "buildArgs": {
                             "type": "object",
@@ -125,7 +125,7 @@
                     "type": "string"
                 },
                 "executor": {
-                    "$ref": "#/$defs/Identifier"
+                    "$ref": "#/definitions/Identifier"
                 },
                 "options": {
                     "type": "object",
@@ -134,7 +134,7 @@
                 "pre": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/$defs/Identifier"
+                        "$ref": "#/definitions/Identifier"
                     }
                 }
             },
@@ -156,19 +156,19 @@
                 "tasks": {
                     "type": "object",
                     "additionalProperties": {
-                        "$ref": "#/$defs/TaskConfig"
+                        "$ref": "#/definitions/TaskConfig"
                     }
                 },
                 "resources": {
                     "type": "object",
                     "additionalProperties": {
-                        "$ref": "#/$defs/ResourceConfig"
+                        "$ref": "#/definitions/ResourceConfig"
                     }
                 },
                 "flavors": {
                     "type": "object",
                     "additionalProperties": {
-                        "$ref": "#/$defs/ComponentFlavorConfig"
+                        "$ref": "#/definitions/ComponentFlavorConfig"
                     }
                 }
             },
@@ -203,7 +203,7 @@
                 "patches": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/$defs/JsonPatchOperation"
+                        "$ref": "#/definitions/JsonPatchOperation"
                     }
                 }
             }
@@ -216,9 +216,7 @@
                 "params": {},
                 "dependencies": {
                     "type": "array",
-                    "items": {
-                        "$ref": "#/$defs/QualifiedIdentifier"
-                    },
+                    "items": { "$ref": "#/definitions/QualifiedIdentifier" },
                     "uniqueItems": true
                 }
             },
@@ -226,14 +224,37 @@
             "allOf": [
                 {
                     "if": {
-                        "properties": { "type": { "const": "docker/DockerImageConfig" } },
+                        "properties": {
+                            "type": { "const": "docker/image" }
+                        },
                         "required": ["type"]
                     },
                     "then": {
-                        "properties": { "params": { "$ref": "#/$defs/DockerImageConfig" } }
+                        "properties": {
+                            "params": { "$ref": "#/definitions/DockerImageConfig" }
+                        },
+                        "required": ["params"]
+                    }
+                },
+                {
+                    "if": {
+                        "properties": {
+                            "type": { "const": "file" }
+                        },
+                        "required": ["type"]
                     },
-                    "else": {
-                        "properties": { "params": { "type": "object" } }
+                    "then": {
+                        "properties": {
+                            "params": {
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "path": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             ]
@@ -246,7 +267,7 @@
                 "patches": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/$defs/JsonPatchOperation"
+                        "$ref": "#/definitions/JsonPatchOperation"
                     }
                 }
             }
@@ -302,11 +323,11 @@
         },
         "JsonPatchOperation": {
             "oneOf": [
-                { "$ref": "#/$defs/JsonPatchAddOperation" },
-                { "$ref": "#/$defs/JsonPatchRemoveOperation" },
-                { "$ref": "#/$defs/JsonPatchReplaceOperation" },
-                { "$ref": "#/$defs/JsonPatchMoveOperation" },
-                { "$ref": "#/$defs/JsonPatchCopyOperation" }
+                { "$ref": "#/definitions/JsonPatchAddOperation" },
+                { "$ref": "#/definitions/JsonPatchRemoveOperation" },
+                { "$ref": "#/definitions/JsonPatchReplaceOperation" },
+                { "$ref": "#/definitions/JsonPatchMoveOperation" },
+                { "$ref": "#/definitions/JsonPatchCopyOperation" }
             ]
         }
     }

package/dist/src/config/validation.js

@@ -38,7 +38,7 @@ export const validateEmbfile = async (pathOrObject) => {
     else {
         component = pathOrObject;
     }
-    const validate = ajv.getSchema('/schemas/config#/$defs/ComponentConfig');
+    const validate = ajv.getSchema('/schemas/config#/definitions/ComponentConfig');
     if (!validate) {
         throw new Error('Could not find the JSON schema validator for Embfile');
     }

package/dist/src/docker/compose/operations/ComposeUpOperation.d.ts

@@ -4,6 +4,7 @@ import { AbstractOperation } from '../../../operations/index.js';
  * https://docs.docker.com/reference/cli/docker/compose/up/
  */
 declare const schema: z.ZodOptional<z.ZodObject<{
+    components: z.ZodOptional<z.ZodArray<z.ZodString>>;
     forceRecreate: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>>;
 export declare class ComposeUpOperation extends AbstractOperation<typeof schema, void> {

package/dist/src/docker/compose/operations/ComposeUpOperation.js

@@ -7,6 +7,10 @@ import { AbstractOperation } from '../../../operations/index.js';
  */
 const schema = z
     .object({
+    components: z
+        .array(z.string())
+        .optional()
+        .describe('The list of service to up'),
     forceRecreate: z
         .boolean()
         .optional()
@@ -21,6 +25,9 @@ export class ComposeUpOperation extends AbstractOperation {
         const { monorepo } = getContext();
         const manager = taskManagerFactory();
         const command = ['docker', 'compose', 'up', '-d'];
+        if (input?.components) {
+            command.push(...input.components);
+        }
         if (input?.forceRecreate) {
             command.push('--force-recreate');
         }

package/dist/src/docker/operations/images/BuildImageOperation.js

@@ -43,19 +43,11 @@ export class BuildImageOperation extends AbstractOperation {
         return this._buildWithDockerCLI(input);
     }
     async _buildWithDockerCLI(input) {
-        const labels = Object.entries(input.labels || {})
-            .reduce((arr, [key, value]) => {
-            arr.push(`${key.trim()}=${value.trim()}`);
-            return arr;
-        }, [])
-            .join(',');
         const args = [
             'build',
             input.context,
             '-f',
             join(input.context, input.dockerfile || 'Dockerfile'),
-            '--label',
-            labels,
         ];
         if (input.tag) {
             args.push('--tag', input.tag);
@@ -66,6 +58,9 @@ export class BuildImageOperation extends AbstractOperation {
         Object.entries(input.buildArgs || []).forEach(([key, value]) => {
             args.push('--build-arg', `${key.trim()}=${value.trim()}`);
         });
+        Object.entries(input.labels || {}).forEach(([key, value]) => {
+            args.push('--label', `${key.trim()}=${value.trim()}`);
+        });
         const logFile = await this.context.monorepo.store.createWriteStream(`logs/docker/build/${input.tag}.log`);
         const tee = new PassThrough();
         tee.pipe(logFile);

package/dist/src/monorepo/monorepo.js

@@ -46,13 +46,7 @@ export class Monorepo {
         return new Component(name, this._config.component(name), this);
     }
     get tasks() {
-        const globalTasks = Object.entries(this._config.tasks || {}).map(([name, task]) => {
-            return {
-                ...task,
-                name,
-                id: `global:${name}`,
-            };
-        });
+        const globalTasks = Object.values(this._config.tasks);
         return this.components.reduce((tasks, cmp) => {
             const cmpTasks = Object.entries(cmp.tasks || {}).map(([name, task]) => {
                 return {

package/oclif.manifest.json

@@ -82,7 +82,12 @@
     },
     "up": {
       "aliases": [],
-      "args": {},
+      "args": {
+        "component": {
+          "description": "The component(s) to build and start",
+          "name": "component"
+        }
+      },
       "description": "Start the whole project.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
@@ -117,6 +122,7 @@
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": false,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -184,14 +190,6 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "follow": {
           "char": "f",
           "description": "Follow log output",
@@ -206,6 +204,7 @@
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": true,
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
@@ -233,14 +232,6 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "shell": {
           "char": "s",
           "description": "The shell to run",
@@ -257,6 +248,7 @@
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": true,
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
@@ -268,12 +260,10 @@
         "shell.js"
       ]
     },
-    "containers": {
-      "aliases": [
-        "ps"
-      ],
+    "config:print": {
+      "aliases": [],
       "args": {},
-      "description": "List docker containers.",
+      "description": "Print the current config.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -285,22 +275,21 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "all": {
-          "char": "a",
-          "description": "Retun all containers. By default, only running containers are shown",
-          "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": "containers",
+      "id": "config:print",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -308,14 +297,16 @@
         "src",
         "cli",
         "commands",
-        "containers",
-        "index.js"
+        "config",
+        "print.js"
       ]
     },
-    "containers:prune": {
-      "aliases": [],
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
       "args": {},
-      "description": "Prune containers.",
+      "description": "List docker containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -326,11 +317,19 @@
           "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:prune",
+      "id": "containers",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -343,13 +342,13 @@
         "cli",
         "commands",
         "containers",
-        "prune.js"
+        "index.js"
       ]
     },
-    "config:print": {
+    "containers:prune": {
       "aliases": [],
       "args": {},
-      "description": "Print the current config.",
+      "description": "Prune containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -360,22 +359,15 @@
           "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": "config:print",
+      "id": "containers:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -383,8 +375,8 @@
         "src",
         "cli",
         "commands",
-        "config",
-        "print.js"
+        "containers",
+        "prune.js"
       ]
     },
     "images:delete": {
@@ -718,5 +710,5 @@
       ]
     }
   },
-  "version": "0.4.2"
+  "version": "0.5.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "keywords": [
     "monorepo",
     "docker",