@jahia/jahia-cli 0.3.1 → 0.5.0

package/dist/lib/workflow/types.js

@@ -1,3 +1,4 @@
+import { resolveEnvVars } from '../config/resolve-env-vars.js';
 /**
  * Builds a step display name from its definition.
  */
@@ -7,19 +8,23 @@ export const getStepDisplayName = (step, index) => step.name ?? step.uses ?? ste
  * Each key-value pair becomes --key value in the argument list.
  * Boolean values are handled specially: 'true' emits --key (no value),
  * 'false' omits the flag entirely (OCLIF boolean flags are toggles).
+ *
+ * Values support ${VAR} and ${VAR:-default} env var substitution,
+ * consistent with other config sections (component overrides, workflowsFile, etc.).
  */
 export const buildFlagsFromWith = (withRecord) => {
     if (withRecord === undefined) {
         return [];
     }
     return Object.entries(withRecord).flatMap(([key, value]) => {
-        if (value === 'true') {
+        const resolved = resolveEnvVars(value);
+        if (resolved === 'true') {
             return [`--${key}`];
         }
-        if (value === 'false') {
+        if (resolved === 'false') {
             return [];
         }
-        return [`--${key}`, value];
+        return [`--${key}`, resolved];
     });
 };
 //# sourceMappingURL=types.js.map

package/dist/lib/workflow/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/workflow/types.ts"],"names":[],"mappings":"AAqBA;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAkB,EAAE,KAAa,EAAU,EAAE,CAC9E,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,IAAI,QAAQ,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,UAAwD,EACrC,EAAE;IACrB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACzD,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACtB,CAAC;QAED,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,KAAK,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/workflow/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAqB/D;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAkB,EAAE,KAAa,EAAU,EAAE,CAC9E,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,IAAI,QAAQ,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;AAEpE;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,UAAwD,EACrC,EAAE;IACrB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACzD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACtB,CAAC;QAED,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,KAAK,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/oclif.manifest.json

@@ -553,6 +553,236 @@
         "stop.js"
       ]
     },
+    "jahia:alive": {
+      "aliases": [],
+      "args": {},
+      "description": "Wait until the Jahia environment is fully alive and responding GREEN. Polls the Server Availability Manager (SAM) healthcheck endpoint and requires N consecutive GREEN responses before declaring the environment ready.",
+      "examples": [
+        "<%= config.bin %> jahia alive",
+        "<%= config.bin %> jahia alive --count 10 --timeout 600",
+        "<%= config.bin %> jahia alive --url http://localhost:8080 --json",
+        "<%= config.bin %> jahia alive --state /ci/workspace/state.json"
+      ],
+      "flags": {
+        "state": {
+          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
+          "env": "JAHIA_CLI_STATE",
+          "name": "state",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "url": {
+          "description": "Jahia base URL (default: from state, or http://localhost:8080)",
+          "name": "url",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "username": {
+          "char": "u",
+          "description": "Jahia username for SAM authentication (default: from state, or root)",
+          "name": "username",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "password": {
+          "char": "P",
+          "description": "Jahia password for SAM authentication (default: from state, or root1234)",
+          "name": "password",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "severity": {
+          "char": "s",
+          "description": "SAM probe severity to evaluate (LOW, MEDIUM, HIGH, CRITICAL)",
+          "name": "severity",
+          "default": "MEDIUM",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "interval": {
+          "char": "i",
+          "description": "Seconds between health checks",
+          "name": "interval",
+          "default": 2,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "timeout": {
+          "char": "t",
+          "description": "Maximum seconds to wait before failing",
+          "name": "timeout",
+          "default": 300,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "count": {
+          "char": "c",
+          "description": "Number of consecutive GREEN responses required",
+          "name": "count",
+          "default": 5,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "json": {
+          "description": "Output result as structured JSON (for AI agents and scripting)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "jahia:alive",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "jahia",
+        "alive.js"
+      ]
+    },
+    "jahia:provision": {
+      "aliases": [],
+      "args": {},
+      "description": "Execute provisioning operations against a running Jahia instance. Three modes are available (exactly one per invocation):\n  --manifest: Submit a YAML provisioning manifest with optional file attachments.\n  --modules:  Upload module files (JARs) from a directory, one at a time.\n  --scripts:  Execute provisioning scripts from a directory, one at a time.\nUse --filter to limit which files are processed (glob pattern, matched against filename).",
+      "examples": [
+        "<%= config.bin %> jahia provision --manifest ./provisioning/setup.yaml",
+        "<%= config.bin %> jahia provision --manifest ./setup.yaml --assets ./artifacts",
+        "<%= config.bin %> jahia provision --manifest ./setup.yaml --assets ./artifacts --filter \"*.jar\"",
+        "<%= config.bin %> jahia provision --modules ./modules/",
+        "<%= config.bin %> jahia provision --modules ./modules/ --filter \"*-SNAPSHOT.jar\"",
+        "<%= config.bin %> jahia provision --scripts ./scripts/",
+        "<%= config.bin %> jahia provision --scripts ./scripts/ --filter \"*.groovy\""
+      ],
+      "flags": {
+        "state": {
+          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
+          "env": "JAHIA_CLI_STATE",
+          "name": "state",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "manifest": {
+          "char": "m",
+          "description": "Path to a local YAML file or a public URL of the provisioning manifest",
+          "exclusive": [
+            "modules",
+            "scripts"
+          ],
+          "name": "manifest",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "modules": {
+          "description": "Path to a directory of module files to install (one at a time via installOrUpgradeBundle)",
+          "exclusive": [
+            "manifest",
+            "scripts",
+            "assets",
+            "file"
+          ],
+          "name": "modules",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "scripts": {
+          "description": "Path to a directory of provisioning scripts to execute (one at a time via executeScript)",
+          "exclusive": [
+            "manifest",
+            "modules",
+            "assets",
+            "file"
+          ],
+          "name": "scripts",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "filter": {
+          "description": "Glob pattern to filter files in --assets, --modules, or --scripts directories (default: all files). Example: \"*-SNAPSHOT.jar\"",
+          "name": "filter",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "url": {
+          "description": "Jahia base URL (default: from state, or http://localhost:8080)",
+          "name": "url",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "username": {
+          "char": "u",
+          "description": "Jahia admin username (default: from state, or root)",
+          "name": "username",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "password": {
+          "char": "P",
+          "description": "Jahia admin password (default: from state, or root1234)",
+          "name": "password",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "file": {
+          "char": "f",
+          "description": "File attachment to include with --manifest (can be specified multiple times)",
+          "name": "file",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "assets": {
+          "char": "a",
+          "description": "Directory whose files are attached to the --manifest provisioning request",
+          "name": "assets",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "json": {
+          "description": "Output result as structured JSON (for AI agents and scripting)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "jahia:provision",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "jahia",
+        "provision.js"
+      ]
+    },
     "tests:artifacts": {
       "aliases": [],
       "args": {},
@@ -609,6 +839,7 @@
       "examples": [
         "<%= config.bin %> tests build -c config.yml",
         "<%= config.bin %> tests build -c config.yml --no-cache",
+        "<%= config.bin %> tests build -c config.yml --context /path/to/test/root",
         "<%= config.bin %> tests build -c config.yml --json"
       ],
       "flags": {
@@ -621,6 +852,14 @@
           "multiple": false,
           "type": "option"
         },
+        "context": {
+          "description": "Docker build context directory (default: current working directory)",
+          "name": "context",
+          "default": ".",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "no-cache": {
           "description": "Build without using cache",
           "name": "no-cache",
@@ -874,237 +1113,7 @@
         "workflow",
         "run.js"
       ]
-    },
-    "jahia:alive": {
-      "aliases": [],
-      "args": {},
-      "description": "Wait until the Jahia environment is fully alive and responding GREEN. Polls the Server Availability Manager (SAM) healthcheck endpoint and requires N consecutive GREEN responses before declaring the environment ready.",
-      "examples": [
-        "<%= config.bin %> jahia alive",
-        "<%= config.bin %> jahia alive --count 10 --timeout 600",
-        "<%= config.bin %> jahia alive --url http://localhost:8080 --json",
-        "<%= config.bin %> jahia alive --state /ci/workspace/state.json"
-      ],
-      "flags": {
-        "state": {
-          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
-          "env": "JAHIA_CLI_STATE",
-          "name": "state",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "url": {
-          "description": "Jahia base URL (default: from state, or http://localhost:8080)",
-          "name": "url",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "username": {
-          "char": "u",
-          "description": "Jahia username for SAM authentication (default: from state, or root)",
-          "name": "username",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "password": {
-          "char": "P",
-          "description": "Jahia password for SAM authentication (default: from state, or root1234)",
-          "name": "password",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "severity": {
-          "char": "s",
-          "description": "SAM probe severity to evaluate (LOW, MEDIUM, HIGH, CRITICAL)",
-          "name": "severity",
-          "default": "MEDIUM",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "interval": {
-          "char": "i",
-          "description": "Seconds between health checks",
-          "name": "interval",
-          "default": 2,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "timeout": {
-          "char": "t",
-          "description": "Maximum seconds to wait before failing",
-          "name": "timeout",
-          "default": 300,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "count": {
-          "char": "c",
-          "description": "Number of consecutive GREEN responses required",
-          "name": "count",
-          "default": 5,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "json": {
-          "description": "Output result as structured JSON (for AI agents and scripting)",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "jahia:alive",
-      "pluginAlias": "@jahia/jahia-cli",
-      "pluginName": "@jahia/jahia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "jahia",
-        "alive.js"
-      ]
-    },
-    "jahia:provision": {
-      "aliases": [],
-      "args": {},
-      "description": "Execute provisioning operations against a running Jahia instance. Three modes are available (exactly one per invocation):\n  --manifest: Submit a YAML provisioning manifest with optional file attachments.\n  --modules:  Upload module files (JARs) from a directory, one at a time.\n  --scripts:  Execute provisioning scripts from a directory, one at a time.\nUse --filter to limit which files are processed (glob pattern, matched against filename).",
-      "examples": [
-        "<%= config.bin %> jahia provision --manifest ./provisioning/setup.yaml",
-        "<%= config.bin %> jahia provision --manifest ./setup.yaml --assets ./artifacts",
-        "<%= config.bin %> jahia provision --manifest ./setup.yaml --assets ./artifacts --filter \"*.jar\"",
-        "<%= config.bin %> jahia provision --modules ./modules/",
-        "<%= config.bin %> jahia provision --modules ./modules/ --filter \"*-SNAPSHOT.jar\"",
-        "<%= config.bin %> jahia provision --scripts ./scripts/",
-        "<%= config.bin %> jahia provision --scripts ./scripts/ --filter \"*.groovy\""
-      ],
-      "flags": {
-        "state": {
-          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
-          "env": "JAHIA_CLI_STATE",
-          "name": "state",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "manifest": {
-          "char": "m",
-          "description": "Path to a local YAML file or a public URL of the provisioning manifest",
-          "exclusive": [
-            "modules",
-            "scripts"
-          ],
-          "name": "manifest",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "modules": {
-          "description": "Path to a directory of module files to install (one at a time via installOrUpgradeBundle)",
-          "exclusive": [
-            "manifest",
-            "scripts",
-            "assets",
-            "file"
-          ],
-          "name": "modules",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "scripts": {
-          "description": "Path to a directory of provisioning scripts to execute (one at a time via executeScript)",
-          "exclusive": [
-            "manifest",
-            "modules",
-            "assets",
-            "file"
-          ],
-          "name": "scripts",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "filter": {
-          "description": "Glob pattern to filter files in --assets, --modules, or --scripts directories (default: all files). Example: \"*-SNAPSHOT.jar\"",
-          "name": "filter",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "url": {
-          "description": "Jahia base URL (default: from state, or http://localhost:8080)",
-          "name": "url",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "username": {
-          "char": "u",
-          "description": "Jahia admin username (default: from state, or root)",
-          "name": "username",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "password": {
-          "char": "P",
-          "description": "Jahia admin password (default: from state, or root1234)",
-          "name": "password",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "file": {
-          "char": "f",
-          "description": "File attachment to include with --manifest (can be specified multiple times)",
-          "name": "file",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "assets": {
-          "char": "a",
-          "description": "Directory whose files are attached to the --manifest provisioning request",
-          "name": "assets",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "json": {
-          "description": "Output result as structured JSON (for AI agents and scripting)",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "jahia:provision",
-      "pluginAlias": "@jahia/jahia-cli",
-      "pluginName": "@jahia/jahia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "jahia",
-        "provision.js"
-      ]
     }
   },
-  "version": "0.3.1"
+  "version": "0.5.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/jahia-cli",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "description": "A CLI to accelerate developing and testing Jahia in the Agentic era",
   "author": "Jahia",
   "license": "Apache-2.0",