@enspirit/emb 0.14.1 → 0.15.0

package/README.md

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

package/dist/src/cli/hooks/postrun.d.ts

@@ -0,0 +1,7 @@
+import { Hook } from '@oclif/core';
+/**
+ * Postrun hook that patches completion scripts after autocomplete generation.
+ * This adds task name completion for the 'tasks run' and 'run' commands.
+ */
+declare const hook: Hook.Postrun;
+export default hook;

package/dist/src/cli/hooks/postrun.js

@@ -0,0 +1,128 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+/**
+ * Task completion function to inject into the bash completion script.
+ * This function is called when completing arguments for `tasks run` or `run`.
+ */
+const TASK_COMPLETION_FUNCTION = `
+# EMB: Task name completion for 'tasks run' and 'run' commands
+_emb_complete_tasks() {
+  local cur="\${1:-}"
+  local tasks
+
+  # Get task IDs from emb tasks --json, extract the id field
+  tasks=$(emb tasks --json 2>/dev/null | grep -o '"id": *"[^"]*"' | sed 's/"id": *"//g' | sed 's/"//g')
+
+  if [[ -z "$tasks" ]]; then
+    return
+  fi
+
+  # Filter by substring match if provided (more flexible than prefix-only)
+  if [[ -n "$cur" ]]; then
+    local matches=""
+    for task in $tasks; do
+      if [[ "$task" == *"$cur"* ]]; then
+        matches="$matches $task"
+      fi
+    done
+    COMPREPLY=($matches)
+  else
+    COMPREPLY=($tasks)
+  fi
+}
+`;
+/**
+ * Enhanced completion logic to inject after normalizedCommand is calculated.
+ * Checks if we're completing task arguments for 'tasks run' or 'run'.
+ */
+const TASK_COMPLETION_LOGIC = `
+    # EMB: Check if we're completing task names for 'tasks run' or 'run'
+    if [[ "$normalizedCommand" == tasks:run:* ]] || [[ "$normalizedCommand" == run:* ]] || [[ "$normalizedCommand" == "tasks:run" ]] || [[ "$normalizedCommand" == "run" ]]; then
+      _emb_complete_tasks "$cur"
+      return
+    fi
+`;
+/**
+ * Zsh task completion function to inject.
+ * Uses zsh's compadd to add task completions.
+ * Note: We use compadd instead of _describe because task IDs contain colons
+ * (e.g., "frontend:test") and _describe uses colons as value:description delimiter.
+ */
+const ZSH_TASK_COMPLETION_FUNCTION = `
+# EMB: Task name completion for 'tasks run' and 'run' commands
+_emb_complete_tasks() {
+  local tasks
+  # Get task IDs from emb tasks --json, extract the id field
+  tasks=(\${(f)"$(emb tasks --json 2>/dev/null | grep -o '"id": *"[^"]*"' | sed 's/"id": *"//g' | sed 's/"//g')"})
+
+  if [[ \${#tasks[@]} -gt 0 ]]; then
+    # Use compadd instead of _describe because task IDs contain colons
+    # which _describe interprets as value:description separators
+    compadd -a tasks
+  fi
+}
+`;
+/**
+ * Patches the bash completion script.
+ */
+function patchBashCompletion() {
+    const possiblePaths = [
+        join(homedir(), 'Library/Caches/emb/autocomplete/functions/bash/emb.bash'),
+        join(homedir(), '.cache/emb/autocomplete/functions/bash/emb.bash'),
+    ];
+    const scriptPath = possiblePaths.find((p) => existsSync(p));
+    if (!scriptPath) {
+        return;
+    }
+    const content = readFileSync(scriptPath, 'utf8');
+    // Check if already patched
+    if (content.includes('_emb_complete_tasks')) {
+        return;
+    }
+    // Insert task completion function after the join_by function
+    let patched = content.replace(/function join_by \{[^}]+\}/, (match) => `${match}\n${TASK_COMPLETION_FUNCTION}`);
+    // Insert task completion logic right before the "if [[ -z "$normalizedCommand" ]]" check
+    patched = patched.replace('if [[ -z "$normalizedCommand" ]]; then', `${TASK_COMPLETION_LOGIC.trim()}\n\n    if [[ -z "$normalizedCommand" ]]; then`);
+    writeFileSync(scriptPath, patched, 'utf8');
+}
+/**
+ * Patches the zsh completion script.
+ */
+function patchZshCompletion() {
+    const possiblePaths = [
+        join(homedir(), 'Library/Caches/emb/autocomplete/functions/zsh/_emb'),
+        join(homedir(), '.cache/emb/autocomplete/functions/zsh/_emb'),
+    ];
+    const scriptPath = possiblePaths.find((p) => existsSync(p));
+    if (!scriptPath) {
+        return;
+    }
+    const content = readFileSync(scriptPath, 'utf8');
+    // Check if already patched
+    if (content.includes('_emb_complete_tasks')) {
+        return;
+    }
+    // Insert task completion function after #compdef line
+    let patched = content.replace('#compdef emb', `#compdef emb\n${ZSH_TASK_COMPLETION_FUNCTION}`);
+    // Replace _files with _emb_complete_tasks in run command sections
+    // Pattern 1: Inside _emb_tasks for "tasks run"
+    patched = patched.replace(/("run"\)\s*\n\s*_arguments -S[\s\S]*?)"?\*: :_files"(\s*;;)/, '$1"*: :_emb_complete_tasks"$2');
+    // Pattern 2: Top-level run) command (the alias)
+    patched = patched.replace(/(^run\)\n_arguments -S[\s\S]*?)"?\*: :_files"(\s*;;)/m, '$1"*: :_emb_complete_tasks"$2');
+    writeFileSync(scriptPath, patched, 'utf8');
+}
+/**
+ * Postrun hook that patches completion scripts after autocomplete generation.
+ * This adds task name completion for the 'tasks run' and 'run' commands.
+ */
+const hook = async function (options) {
+    const commandId = options.Command?.id;
+    // Only patch after autocomplete commands
+    if (commandId !== 'autocomplete' && commandId !== 'autocomplete:create') {
+        return;
+    }
+    patchBashCompletion();
+    patchZshCompletion();
+};
+export default hook;

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

@@ -19,12 +19,22 @@ class DockerImageResourceBuilder extends SentinelFileBasedBuilder {
             : buildContext.monorepo.join(buildContext.component.rootDir);
     }
     async getReference() {
-        const imageName = [
-            this.monorepo.name,
-            this.config?.tag || this.component.name,
-        ].join('/');
-        const tagName = this.config?.tag || this.monorepo.defaults.docker?.tag || 'latest';
-        return this.monorepo.expand(`${imageName}:${tagName}`);
+        const configTag = this.config?.tag;
+        let imageNamePart;
+        let tagPart;
+        if (configTag && configTag.includes(':')) {
+            // config.tag contains both image name and tag (e.g., "myimage:v1.0.0")
+            const colonIndex = configTag.lastIndexOf(':');
+            imageNamePart = configTag.slice(0, colonIndex);
+            tagPart = configTag.slice(colonIndex + 1);
+        }
+        else {
+            // config.tag is just an image name or undefined
+            imageNamePart = configTag || this.component.name;
+            tagPart = this.monorepo.defaults.docker?.tag || 'latest';
+        }
+        const imageName = [this.monorepo.name, imageNamePart].join('/');
+        return this.monorepo.expand(`${imageName}:${tagPart}`);
     }
     get monorepo() {
         return this.buildContext.monorepo;

package/dist/src/monorepo/operations/resources/BuildResourcesOperation.js

@@ -1,7 +1,6 @@
 import { PRESET_TIMER, } from 'listr2';
 import * as z from 'zod';
-import { EMBCollection, findRunOrder, } from '../../index.js';
-import { ResourceFactory } from '../../resources/ResourceFactory.js';
+import { EMBCollection, findRunOrder, ResourceFactory, } from '../../index.js';
 import { AbstractOperation } from '../../../operations/index.js';
 const schema = z.object({
     resources: z

package/dist/src/monorepo/resources/index.d.ts

@@ -1,3 +1,4 @@
 import './FileResourceBuilder.js';
 export * from './abstract/index.js';
+export * from './ResourceFactory.js';
 export * from './types.js';

package/dist/src/monorepo/resources/index.js

@@ -1,3 +1,4 @@
 import './FileResourceBuilder.js';
 export * from './abstract/index.js';
+export * from './ResourceFactory.js';
 export * from './types.js';

package/oclif.manifest.json

@@ -334,6 +334,53 @@
         "up.js"
       ]
     },
+    "config:print": {
+      "aliases": [],
+      "args": {},
+      "description": "Print the current config.",
+      "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"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "config:print",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "config",
+        "print.js"
+      ]
+    },
     "components": {
       "aliases": [],
       "args": {},
@@ -477,53 +524,6 @@
         "shell.js"
       ]
     },
-    "config:print": {
-      "aliases": [],
-      "args": {},
-      "description": "Print the current config.",
-      "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"
-        },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "config:print",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "config",
-        "print.js"
-      ]
-    },
     "containers": {
       "aliases": [],
       "args": {},
@@ -821,6 +821,121 @@
         "push.js"
       ]
     },
+    "resources:build": {
+      "aliases": [],
+      "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 %> build --flavor development"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "name": "verbose",
+          "allowNo": true,
+          "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",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "strict": false,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "resources",
+        "build.js"
+      ]
+    },
+    "resources": {
+      "aliases": [],
+      "args": {},
+      "description": "List resources.",
+      "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"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "resources",
+      "pluginAlias": "@enspirit/emb",
+      "pluginName": "@enspirit/emb",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "cli",
+        "commands",
+        "resources",
+        "index.js"
+      ]
+    },
     "kubernetes:logs": {
       "aliases": [
         "logs"
@@ -1043,121 +1158,6 @@
         "shell.js"
       ]
     },
-    "resources:build": {
-      "aliases": [],
-      "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 %> build --flavor development"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "name": "verbose",
-          "allowNo": true,
-          "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",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": false,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "resources",
-        "build.js"
-      ]
-    },
-    "resources": {
-      "aliases": [],
-      "args": {},
-      "description": "List resources.",
-      "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"
-        },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "resources",
-      "pluginAlias": "@enspirit/emb",
-      "pluginName": "@enspirit/emb",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "cli",
-        "commands",
-        "resources",
-        "index.js"
-      ]
-    },
     "tasks": {
       "aliases": [],
       "args": {},
@@ -1264,5 +1264,5 @@
       ]
     }
   },
-  "version": "0.14.1"
+  "version": "0.15.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "keywords": [
     "monorepo",
     "docker",
@@ -32,69 +32,71 @@
     "posttest": "npm run lint",
     "prepack": "oclif manifest && oclif readme",
     "test": "npm run build:types && npm run test:unit && npm run test:integration",
-    "test:unit": "vitest run tests/unit",
-    "test:unit:watch": "vitest tests/unit",
-    "test:integration": "vitest run tests/integration",
-    "test:integration:watch": "vitest tests/integration",
+    "test:unit": "vitest run --project unit",
+    "test:unit:watch": "vitest --project unit",
+    "test:integration": "npm run test:integration:mocked && npm run test:integration:docker",
+    "test:integration:mocked": "vitest run --project integration-mocked",
+    "test:integration:docker": "vitest run --project integration-docker --project integration-compose",
+    "test:integration:watch": "vitest --project integration-mocked",
     "test:watch": "vitest",
     "version": "oclif readme && git add README.md"
   },
   "dependencies": {
     "@fastify/deepmerge": "^3.1.0",
-    "@kubernetes/client-node": "1.3.0",
-    "@listr2/manager": "^3.0.3",
+    "@kubernetes/client-node": "1.4.0",
+    "@listr2/manager": "^3.0.5",
     "@oclif/core": "^4.8.0",
     "@oclif/plugin-autocomplete": "^3.2.39",
     "@oclif/plugin-help": "^6.2.36",
     "@oclif/plugin-update": "^4.7.16",
     "@oclif/table": "^0.5.1",
     "ajv": "^8.17.1",
-    "ansi-escapes": "^7.0.0",
+    "ansi-escapes": "^7.2.0",
     "colorette": "^2.0.20",
     "docker-compose": "^1.3.0",
-    "dockerode": "^4.0.7",
-    "dotenv": "^17.2.1",
-    "execa": "^9.6.0",
+    "dockerode": "^4.0.9",
+    "dotenv": "^17.2.3",
+    "execa": "^9.6.1",
     "fast-json-patch": "^3.1.1",
     "fdir": "^6.5.0",
     "find-up": "^7.0.0",
-    "glob": "^11.0.3",
+    "glob": "^11.1.0",
     "graphlib": "^2.1.8",
-    "@inquirer/prompts": "^7.8.4",
-    "@listr2/prompt-adapter-inquirer": "^3.0.3",
-    "listr2": "^9.0.3",
-    "luxon": "^3.7.1",
+    "@inquirer/prompts": "^7.10.1",
+    "@listr2/prompt-adapter-inquirer": "^3.0.5",
+    "listr2": "^9.0.5",
+    "luxon": "^3.7.2",
     "protobufjs": "^7.5.4",
-    "p-map": "^7.0.3",
-    "simple-git": "^3.28.0",
-    "yaml": "^2.8.1",
-    "zod": "^4.1.5"
+    "p-map": "^7.0.4",
+    "simple-git": "^3.30.0",
+    "yaml": "^2.8.2",
+    "zod": "^4.3.5"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.34.0",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4",
-    "@tsconfig/node20": "^20.1.6",
-    "@types/dockerode": "^3.3.43",
+    "@tsconfig/node20": "^20.1.8",
+    "@types/dockerode": "^3.3.47",
     "@types/graphlib": "^2.1.12",
     "@types/luxon": "^3.7.1",
-    "@types/node": "^24.3.0",
+    "@types/node": "^24.10.8",
     "@typescript-eslint/eslint-plugin": "^8.41.0",
     "@typescript-eslint/parser": "^8.41.0",
-    "eslint": "^9.34.0",
+    "eslint": "^9.39.2",
     "eslint-config-oclif": "^6",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "json-schema-to-typescript": "^15.0.4",
     "oclif": "^4",
-    "prettier": "^3.6.2",
-    "rimraf": "^6.0.1",
+    "prettier": "^3.7.4",
+    "rimraf": "^6.1.2",
     "shx": "^0.4.0",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.16",
-    "tsx": "^4.20.5",
-    "typescript": "^5.9.2",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
     "vitest": "^3.2.4",
     "vite-tsconfig-paths": "^5.1.4"
   },
@@ -113,7 +115,8 @@
     "commands": "./dist/src/cli/commands",
     "hooks": {
       "init": "./dist/src/cli/hooks/init",
-      "command_not_found": "./dist/src/cli/hooks/not-found"
+      "command_not_found": "./dist/src/cli/hooks/not-found",
+      "postrun": "./dist/src/cli/hooks/postrun"
     },
     "macos": {
       "identifier": "dev.enspirit.emb"
@@ -148,5 +151,5 @@
       }
     }
   },
-  "packageManager": "pnpm@10.15.1"
+  "packageManager": "pnpm@10.28.0"
 }