@enspirit/emb 0.8.0 → 0.8.2

package/README.md

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

package/dist/src/cli/hooks/not-found.d.ts

@@ -0,0 +1,3 @@
+import { Hook } from '@oclif/core';
+declare const hook: Hook.CommandNotFound;
+export default hook;

package/dist/src/cli/hooks/not-found.js

@@ -0,0 +1,4 @@
+const hook = async function (opts) {
+    return opts.config.runCommand('tasks:run', process.argv.splice(2));
+};
+export default hook;

package/dist/src/docker/compose/client.d.ts

@@ -16,9 +16,10 @@ export type GetContainerOptions = {
 export declare const DefaultGetContainerOptions: GetContainerOptions;
 export declare class DockerComposeClient {
     protected monorepo: Monorepo;
-    protected containers?: ComposeServices;
+    protected services?: ComposeServices;
     constructor(monorepo: Monorepo);
     init(): Promise<void>;
+    isService(component: string): boolean | undefined;
     getContainer(serviceName: string, options?: Partial<GetContainerOptions>): Promise<string>;
     private loadContainers;
 }

package/dist/src/docker/compose/client.js

@@ -5,17 +5,20 @@ export const DefaultGetContainerOptions = {
 };
 export class DockerComposeClient {
     monorepo;
-    containers;
+    services;
     constructor(monorepo) {
         this.monorepo = monorepo;
     }
     async init() {
         await this.loadContainers();
     }
+    isService(component) {
+        return this.services?.has(component);
+    }
     async getContainer(serviceName, options = DefaultGetContainerOptions) {
         const getOptions = { ...DefaultGetContainerOptions, ...options };
         await this.loadContainers();
-        const service = this.containers?.get(serviceName);
+        const service = this.services?.get(serviceName);
         if (!service) {
             throw new Error(`No compose service found with name ${serviceName}`);
         }
@@ -31,25 +34,29 @@ export class DockerComposeClient {
         return containers[0].ID;
     }
     async loadContainers(force = false) {
-        if (this.containers && !force) {
+        if (this.services && !force) {
             return;
         }
+        const { stdout: servicesOutput } = await execa({
+            cwd: this.monorepo.rootDir,
+        }) `docker compose config --services`;
+        const services = servicesOutput
+            .split('\n')
+            .map((l) => l.trim())
+            .reduce((services, name) => {
+            services.set(name, { name, containers: [] });
+            return services;
+        }, new Map());
         const { stdout } = await execa({
             cwd: this.monorepo.rootDir,
         }) `docker compose ps -a --format json`;
-        this.containers = stdout
+        this.services = stdout
             .split('\n')
             .map((l) => JSON.parse(l))
             .reduce((services, entry) => {
-            if (!services.has(entry.Service)) {
-                services.set(entry.Service, {
-                    name: entry.Service,
-                    containers: [],
-                });
-            }
             const svc = services.get(entry.Service);
             svc?.containers.push(entry);
             return services;
-        }, new Map());
+        }, services);
     }
 }

package/dist/src/monorepo/operations/tasks/RunTasksOperation.js

@@ -13,7 +13,7 @@ export var ExecutorType;
 })(ExecutorType || (ExecutorType = {}));
 export class RunTasksOperation {
     async run(params) {
-        const { monorepo } = getContext();
+        const { monorepo, compose } = getContext();
         // First ensure the selection is valid (user can use task IDs or names)
         const collection = new EMBCollection(monorepo.tasks, {
             idField: 'id',
@@ -33,9 +33,14 @@ export class RunTasksOperation {
                     }
                     const vars = await monorepo.expand(task.vars || {});
                     const executor = params.executor ??
-                        (task.component ? ExecutorType.container : ExecutorType.local);
-                    if (executor === ExecutorType.container && !task.component) {
-                        throw new Error('Cannot use the container executor with global tasks');
+                        (task.component
+                            ? compose.isService(task.component)
+                                ? ExecutorType.container
+                                : ExecutorType.local
+                            : ExecutorType.local);
+                    if (executor === ExecutorType.container &&
+                        (!task.component || !compose.isService(task.component))) {
+                        throw new Error('Cannot use the container executor with this task');
                     }
                     // Handle tasks that require confirmation
                     if (task.confirm) {

package/oclif.manifest.json

@@ -853,5 +853,5 @@
       ]
     }
   },
-  "version": "0.8.0"
+  "version": "0.8.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "keywords": [
     "monorepo",
     "docker",
@@ -45,7 +45,6 @@
     "@oclif/core": "^4.5.2",
     "@oclif/plugin-autocomplete": "^3.2.34",
     "@oclif/plugin-help": "^6.2.32",
-    "@oclif/plugin-not-found": "^3.2.63",
     "@oclif/plugin-update": "^4.7.3",
     "@oclif/table": "^0.4.12",
     "ajv": "^8.17.1",
@@ -111,7 +110,8 @@
     "dirname": "emb",
     "commands": "./dist/src/cli/commands",
     "hooks": {
-      "init": "./dist/src/cli/hooks/init"
+      "init": "./dist/src/cli/hooks/init",
+      "command_not_found": "./dist/src/cli/hooks/not-found"
     },
     "macos": {
       "identifier": "dev.enspirit.emb"
@@ -119,7 +119,6 @@
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-autocomplete",
-      "@oclif/plugin-not-found",
       "@oclif/plugin-update"
     ],
     "topicSeparator": " ",