@enspirit/emb 0.13.0 → 0.13.2

package/README.md

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

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

@@ -2,25 +2,7 @@ import { Exec } from '@kubernetes/client-node';
 import { Args, Flags } from '@oclif/core';
 import { getContext, KubernetesCommand } from '../../index.js';
 import { GetDeploymentPodsOperation } from '../../../kubernetes/operations/GetDeploymentPodsOperation.js';
-function enableRawMode(stdin) {
-    const wasRaw = stdin.isRaw;
-    const { isTTY } = stdin;
-    if (isTTY) {
-        stdin.setRawMode?.(true);
-        stdin.resume();
-        // Do NOT set encoding; keep it binary so control chars pass through.
-    }
-    // Let the remote shell handle Ctrl+C. If you prefer local exit on ^C, uncomment:
-    // stdin.on('data', (buf) => { if (buf.equals(Buffer.from([3]))) process.exit(130); });
-    return () => {
-        if (isTTY) {
-            stdin.setRawMode?.(Boolean(wasRaw));
-            if (!wasRaw) {
-                stdin.pause();
-            }
-        }
-    };
-}
+import { enableRawMode } from '../../../utils/streams.js';
 export default class PodShellCommand extends KubernetesCommand {
     static aliases = ['shell'];
     static description = 'Get a shell on a deployed component.';

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

@@ -25,7 +25,7 @@ export default class RestartComand extends BaseCommand {
         const { monorepo } = getContext();
         const components = argv.length > 0
             ? argv.map((name) => monorepo.component(name))
-            : monorepo.components;
+            : undefined;
         await monorepo.run(new ComposeRestartOperation(), {
             noDeps: flags['no-deps'],
             services: components?.map((c) => c.name),

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

@@ -21,7 +21,7 @@ export default class StartCommand extends BaseCommand {
             components =
                 argv.length > 0
                     ? argv.map((name) => monorepo.component(name))
-                    : monorepo.components;
+                    : undefined;
         }
         await monorepo.run(new ComposeStartOperation(), {
             services: components?.map((c) => c.name),

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

@@ -11,7 +11,8 @@ export type TaskConfig = TaskConfig1 & {
     options?: {
         [k: string]: unknown;
     };
-    pre?: Identifier[];
+    pre?: QualifiedIdentifier[];
+    executors?: ("local" | "container")[];
     /**
      * Variables to pass onto the task
      */
@@ -30,6 +31,7 @@ export type TaskConfig = TaskConfig1 & {
 export type TaskConfig1 = {
     [k: string]: unknown;
 };
+export type QualifiedIdentifier = string;
 export type ResourceConfig = {
     [k: string]: unknown;
 } & {
@@ -37,7 +39,6 @@ export type ResourceConfig = {
     params?: unknown;
     dependencies?: QualifiedIdentifier[];
 };
-export type QualifiedIdentifier = string;
 export type JsonPatchOperation = JsonPatchAddOperation | JsonPatchRemoveOperation | JsonPatchReplaceOperation | JsonPatchMoveOperation | JsonPatchCopyOperation;
 export interface EMBConfig {
     project: {

package/dist/src/config/schema.json

@@ -134,7 +134,16 @@
                 "pre": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/Identifier"
+                        "$ref": "#/definitions/QualifiedIdentifier"
+                    }
+                },
+                "executors": {
+                    "type": "array",
+                    "items": {
+                        "anyOf": [
+                            { "const": "local" },
+                            { "const": "container" }
+                        ]
                     }
                 },
                 "vars": {

package/dist/src/monorepo/operations/tasks/RunTasksOperation.d.ts

@@ -22,4 +22,7 @@ export declare class RunTasksOperation implements IOperation<RunTasksOperationPa
     run(params: RunTasksOperationParams): Promise<Array<TaskInfo>>;
     protected runDocker(task: TaskWithScriptAndComponent, out?: Writable): Promise<void>;
     protected runLocal(task: TaskWithScript, out: Writable): Promise<import("stream").Readable>;
+    private defaultExecutorFor;
+    private ensureExecutorValid;
+    private availableExecutorsFor;
 }

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

@@ -12,7 +12,7 @@ export var ExecutorType;
 })(ExecutorType || (ExecutorType = {}));
 export class RunTasksOperation {
     async run(params) {
-        const { monorepo, compose } = getContext();
+        const { monorepo } = getContext();
         const manager = monorepo.taskManager();
         // First ensure the selection is valid (user can use task IDs or names)
         const collection = new EMBCollection(monorepo.tasks, {
@@ -32,16 +32,8 @@ export class RunTasksOperation {
                         return;
                     }
                     const vars = await monorepo.expand(task.vars || {});
-                    const executor = params.executor ??
-                        (task.component
-                            ? (await 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');
-                    }
+                    const executor = params.executor ?? (await this.defaultExecutorFor(task));
+                    await this.ensureExecutorValid(executor, task);
                     // Handle tasks that require confirmation
                     if (task.confirm) {
                         const expected = await monorepo.expand(task.confirm.expect || 'yes', vars);
@@ -67,7 +59,7 @@ export class RunTasksOperation {
                             return this.runLocal(task, tee);
                         }
                         default: {
-                            throw new Error(`Unssuported executor type: ${executor}`);
+                            throw new Error(`Unsuported executor type: ${executor}`);
                         }
                     }
                 },
@@ -96,4 +88,26 @@ export class RunTasksOperation {
             env: await monorepo.expand(task.vars || {}),
         });
     }
+    async defaultExecutorFor(task) {
+        const available = await this.availableExecutorsFor(task);
+        if (available.length === 0) {
+            throw new Error('No available executor found for task');
+        }
+        return available[0];
+    }
+    async ensureExecutorValid(executor, task) {
+        const available = await this.availableExecutorsFor(task);
+        if (!available.includes(executor)) {
+            throw new Error(`Unsuported executor type: ${executor}`);
+        }
+    }
+    async availableExecutorsFor(task) {
+        const { compose } = getContext();
+        if (task.executors) {
+            return task.executors;
+        }
+        return task.component && (await compose.isService(task.component))
+            ? [ExecutorType.container, ExecutorType.local]
+            : [ExecutorType.local];
+    }
 }

package/dist/src/utils/streams.d.ts

@@ -0,0 +1 @@
+export declare function enableRawMode(stdin: NodeJS.ReadStream): () => void;

package/dist/src/utils/streams.js

@@ -0,0 +1,17 @@
+export function enableRawMode(stdin) {
+    const wasRaw = stdin.isRaw;
+    const { isTTY } = stdin;
+    if (isTTY) {
+        stdin.setRawMode?.(true);
+        stdin.resume();
+        // Do NOT set encoding; keep it binary so control chars pass through.
+    }
+    return () => {
+        if (isTTY) {
+            stdin.setRawMode?.(Boolean(wasRaw));
+            if (!wasRaw) {
+                stdin.pause();
+            }
+        }
+    };
+}

package/oclif.manifest.json

@@ -892,111 +892,6 @@
         "index.js"
       ]
     },
-    "tasks": {
-      "aliases": [],
-      "args": {},
-      "description": "List tasks.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "name": "verbose",
-          "allowNo": true,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "tasks",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "tasks",
-        "index.js"
-      ]
-    },
-    "tasks:run": {
-      "aliases": [
-        "run"
-      ],
-      "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 %>"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "name": "verbose",
-          "allowNo": true,
-          "type": "boolean"
-        },
-        "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": "tasks:run",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": false,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "tasks",
-        "run.js"
-      ]
-    },
     "kubernetes:logs": {
       "aliases": [
         "logs"
@@ -1218,7 +1113,112 @@
         "kubernetes",
         "shell.js"
       ]
+    },
+    "tasks": {
+      "aliases": [],
+      "args": {},
+      "description": "List tasks.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "name": "verbose",
+          "allowNo": true,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "tasks",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "tasks",
+        "index.js"
+      ]
+    },
+    "tasks:run": {
+      "aliases": [
+        "run"
+      ],
+      "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 %>"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "name": "verbose",
+          "allowNo": true,
+          "type": "boolean"
+        },
+        "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": "tasks:run",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "strict": false,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "tasks",
+        "run.js"
+      ]
     }
   },
-  "version": "0.13.0"
+  "version": "0.13.2"
 }

package/package.json

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