@jahia/jahia-cli 0.5.4 → 0.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/tests/run.d.ts +9 -0
- package/dist/commands/tests/run.d.ts.map +1 -1
- package/dist/commands/tests/run.js +42 -3
- package/dist/commands/tests/run.js.map +1 -1
- package/dist/lib/artifacts/collect-all.d.ts.map +1 -1
- package/dist/lib/artifacts/collect-all.js +13 -1
- package/dist/lib/artifacts/collect-all.js.map +1 -1
- package/dist/lib/components/cypress.d.ts.map +1 -1
- package/dist/lib/components/cypress.js +1 -0
- package/dist/lib/components/cypress.js.map +1 -1
- package/oclif.manifest.json +118 -118
- package/package.json +1 -1
|
@@ -23,6 +23,15 @@ export declare const buildStateMountArgs: (hostStatePath: string) => Promise<{
|
|
|
23
23
|
readonly bindMount: BindMount;
|
|
24
24
|
readonly envVar: readonly [string, string];
|
|
25
25
|
} | undefined>;
|
|
26
|
+
/**
|
|
27
|
+
* Persists the test container into the environment state file.
|
|
28
|
+
* Upserts by component name — replaces any existing entry with the same name.
|
|
29
|
+
* Uses `docker inspect` to resolve the real container ID.
|
|
30
|
+
*/
|
|
31
|
+
export declare const persistTestContainer: (statePath: string, name: string, image: string, tag: string, networkAliases: readonly string[], ports: readonly {
|
|
32
|
+
readonly container: number;
|
|
33
|
+
readonly host: number;
|
|
34
|
+
}[]) => Promise<void>;
|
|
26
35
|
export declare const formatRunComplete: (name: string, exitCode: number) => string;
|
|
27
36
|
/**
|
|
28
37
|
* Builds a ResolvedComponent for the cypress test runner using the component registry.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AASzE;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,aAAa;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KACjE,MAUW,CAAC;AAEf;;;GAGG;AACH,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAc5D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,eAAe,MAAM,KACpB,OAAO,CAAC;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,SAAS,CAWnG,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,WAAW,MAAM,EACjB,MAAM,MAAM,EACZ,OAAO,MAAM,EACb,KAAK,MAAM,EACX,gBAAgB,SAAS,MAAM,EAAE,EACjC,OAAO,SAAS;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KACtE,OAAO,CAAC,IAAI,CAiCd,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,MAIF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,eAAe,SAAS,MAAM,EAAE,EAChC,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,EACtC,UAAU,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KACzC,iBAgCF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,OAAO;IAC3C,OAAgB,WAAW,SAG2E;IAEtG,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;;MAgBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2IlC"}
|
|
@@ -4,8 +4,10 @@ import { Command, Flags } from '@oclif/core';
|
|
|
4
4
|
import { execa } from 'execa';
|
|
5
5
|
import { applyEnvInjections, getComponent, resolveComponent } from '../../lib/components/index.js';
|
|
6
6
|
import { loadConfigFile } from '../../lib/config/parser.js';
|
|
7
|
-
import { buildRunArgs, containerName, removeContainer, stopContainer } from '../../lib/providers/docker/container.js';
|
|
7
|
+
import { buildRunArgs, containerName, inspectContainer, removeContainer, stopContainer } from '../../lib/providers/docker/container.js';
|
|
8
8
|
import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
|
|
9
|
+
import { loadState } from '../../lib/state/load-state.js';
|
|
10
|
+
import { saveState } from '../../lib/state/save-state.js';
|
|
9
11
|
import { stateFilePath } from '../../lib/state/state-file-path.js';
|
|
10
12
|
import { stateFlag } from '../../lib/state/state-flag.js';
|
|
11
13
|
import { DEFAULT_IMAGE_NAME, parseKeyValueArgs } from '../../lib/tests/build-image.js';
|
|
@@ -55,6 +57,41 @@ export const buildStateMountArgs = async (hostStatePath) => {
|
|
|
55
57
|
envVar: ['JAHIA_CLI_STATE', CONTAINER_STATE_PATH],
|
|
56
58
|
};
|
|
57
59
|
};
|
|
60
|
+
/**
|
|
61
|
+
* Persists the test container into the environment state file.
|
|
62
|
+
* Upserts by component name — replaces any existing entry with the same name.
|
|
63
|
+
* Uses `docker inspect` to resolve the real container ID.
|
|
64
|
+
*/
|
|
65
|
+
export const persistTestContainer = async (statePath, name, image, tag, networkAliases, ports) => {
|
|
66
|
+
const state = await loadState(statePath);
|
|
67
|
+
if (state?.environment === undefined) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const inspection = await inspectContainer(name);
|
|
71
|
+
const containerId = inspection?.id ?? name;
|
|
72
|
+
const entry = {
|
|
73
|
+
name: 'cypress',
|
|
74
|
+
image,
|
|
75
|
+
tag,
|
|
76
|
+
containerId,
|
|
77
|
+
endpoints: {
|
|
78
|
+
aliases: [...networkAliases],
|
|
79
|
+
ports: ports.map((p) => ({ container: p.container, host: p.host })),
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
// Upsert: replace existing cypress entry or append
|
|
83
|
+
const existingIndex = state.environment.components.findIndex((c) => c.name === 'cypress');
|
|
84
|
+
const updatedComponents = existingIndex >= 0
|
|
85
|
+
? state.environment.components.map((c, i) => (i === existingIndex ? entry : c))
|
|
86
|
+
: [...state.environment.components, entry];
|
|
87
|
+
await saveState({
|
|
88
|
+
...state,
|
|
89
|
+
environment: {
|
|
90
|
+
...state.environment,
|
|
91
|
+
components: updatedComponents,
|
|
92
|
+
},
|
|
93
|
+
}, statePath);
|
|
94
|
+
};
|
|
58
95
|
export const formatRunComplete = (name, exitCode) => {
|
|
59
96
|
const icon = exitCode === 0 ? '✓' : '✗';
|
|
60
97
|
const status = exitCode === 0 ? 'passed' : `failed (exit code ${String(exitCode)})`;
|
|
@@ -174,9 +211,9 @@ export default class TestsRun extends Command {
|
|
|
174
211
|
// Register SIGINT handler to stop the container on Ctrl+C
|
|
175
212
|
const onSigint = () => {
|
|
176
213
|
process.stderr.write(`\n⚠ Interrupted — stopping container "${name}"...\n`);
|
|
177
|
-
void stopContainer(name).finally(() => {
|
|
214
|
+
void persistTestContainer(statePath, name, component.effectiveImage, component.effectiveTag, component.effectiveNetworkAliases, component.effectivePorts).catch(() => { }).then(() => stopContainer(name).finally(() => {
|
|
178
215
|
process.exit(130);
|
|
179
|
-
});
|
|
216
|
+
}));
|
|
180
217
|
};
|
|
181
218
|
process.on('SIGINT', onSigint);
|
|
182
219
|
const result = await execa('docker', [...args], {
|
|
@@ -184,6 +221,8 @@ export default class TestsRun extends Command {
|
|
|
184
221
|
reject: false,
|
|
185
222
|
});
|
|
186
223
|
process.removeListener('SIGINT', onSigint);
|
|
224
|
+
// Persist the test container into environment state for artifact collection
|
|
225
|
+
await persistTestContainer(statePath, name, component.effectiveImage, component.effectiveTag, component.effectiveNetworkAliases, component.effectivePorts);
|
|
187
226
|
const exitCode = result.exitCode ?? 1;
|
|
188
227
|
if (flags.json) {
|
|
189
228
|
this.log(JSON.stringify({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAmB,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEnG,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-all.d.ts","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collect-all.d.ts","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAI9D,OAAO,KAAK,EAAsB,gBAAgB,EAA6B,MAAM,YAAY,CAAC;AAElG;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,oBAAoB,KAAG,MAAM,GAAG,SAUpE,CAAC;AAkCF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,QAAQ;IAChD,QAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CAC/D,KAAG,OAAO,CAAC,gBAAgB,CAuF3B,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
|
+
import { getComponent, resolveComponent } from '../components/index.js';
|
|
3
4
|
import { resolveConfigComponents } from '../config/parser.js';
|
|
4
5
|
import { copyContainerArtifacts } from './copy-container-artifacts.js';
|
|
5
6
|
import { fetchContainerLogs } from './fetch-container-logs.js';
|
|
@@ -54,7 +55,18 @@ export const collectAllArtifacts = async (params) => {
|
|
|
54
55
|
const resolvedComponents = resolveConfigComponents(env.config);
|
|
55
56
|
// Map persisted components by name for container ID lookup
|
|
56
57
|
const containerIdByName = new Map(env.components.map((c) => [c.name, c.containerId]));
|
|
57
|
-
|
|
58
|
+
// Build the list of targets: config-resolved components + any persisted components
|
|
59
|
+
// not in config (e.g. cypress test container added by tests:run)
|
|
60
|
+
const resolvedNames = new Set(resolvedComponents.map((r) => r.definition.name));
|
|
61
|
+
const extraComponents = env.components
|
|
62
|
+
.filter((c) => !resolvedNames.has(c.name))
|
|
63
|
+
.map((c) => {
|
|
64
|
+
const def = getComponent(c.name);
|
|
65
|
+
return def !== undefined ? resolveComponent(def) : undefined;
|
|
66
|
+
})
|
|
67
|
+
.filter((c) => c !== undefined);
|
|
68
|
+
const allTargets = [...resolvedComponents, ...extraComponents];
|
|
69
|
+
const componentResults = await allTargets.reduce(async (chainPromise, resolved) => {
|
|
58
70
|
const chain = await chainPromise;
|
|
59
71
|
const componentName = resolved.definition.name;
|
|
60
72
|
const containerId = containerIdByName.get(componentName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-all.js","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"collect-all.js","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.d.ts","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cypress.d.ts","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,EAAE,mBAqBrB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,gCAAgC;IAC7C,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE;QACH,SAAS,EAAE,mBAAmB;QAC9B,mBAAmB,EAAE,kCAAkC;QACvD,cAAc,EAAE,qBAAqB;QACrC,cAAc,EAAE,qBAAqB;QACrC,QAAQ,EAAE,eAAe;KAC1B;IACD,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,CAAC,OAAO,CAAC;IACpB,cAAc,EAAE,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,gCAAgC;IAC7C,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE;QACH,SAAS,EAAE,mBAAmB;QAC9B,mBAAmB,EAAE,kCAAkC;QACvD,cAAc,EAAE,qBAAqB;QACrC,cAAc,EAAE,qBAAqB;QACrC,QAAQ,EAAE,eAAe;KAC1B;IACD,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,CAAC,OAAO,CAAC;IACpB,cAAc,EAAE,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;IAC3B,SAAS,EAAE,CAAC,uBAAuB,CAAC;CACrC,CAAC"}
|
package/oclif.manifest.json
CHANGED
|
@@ -767,6 +767,123 @@
|
|
|
767
767
|
"run.js"
|
|
768
768
|
]
|
|
769
769
|
},
|
|
770
|
+
"workflow:init": {
|
|
771
|
+
"aliases": [],
|
|
772
|
+
"args": {},
|
|
773
|
+
"description": "Add sample workflows section to a configuration file. Generates a named \"main\" workflow with representative steps (init, create, alive, test, cleanup) to help get started. Preserves existing environment and tests sections.",
|
|
774
|
+
"examples": [
|
|
775
|
+
"<%= config.bin %> workflow init",
|
|
776
|
+
"<%= config.bin %> workflow init --config ./my-config.yml",
|
|
777
|
+
"<%= config.bin %> workflow init --force",
|
|
778
|
+
"<%= config.bin %> workflow init --json"
|
|
779
|
+
],
|
|
780
|
+
"flags": {
|
|
781
|
+
"config": {
|
|
782
|
+
"char": "c",
|
|
783
|
+
"description": "Path to the YAML configuration file",
|
|
784
|
+
"name": "config",
|
|
785
|
+
"default": "jahia-cli.config.yml",
|
|
786
|
+
"hasDynamicHelp": false,
|
|
787
|
+
"multiple": false,
|
|
788
|
+
"type": "option"
|
|
789
|
+
},
|
|
790
|
+
"force": {
|
|
791
|
+
"char": "f",
|
|
792
|
+
"description": "Overwrite existing workflows section if already present",
|
|
793
|
+
"name": "force",
|
|
794
|
+
"allowNo": false,
|
|
795
|
+
"type": "boolean"
|
|
796
|
+
},
|
|
797
|
+
"json": {
|
|
798
|
+
"description": "Output result as structured JSON (for AI agents and scripting)",
|
|
799
|
+
"name": "json",
|
|
800
|
+
"allowNo": false,
|
|
801
|
+
"type": "boolean"
|
|
802
|
+
}
|
|
803
|
+
},
|
|
804
|
+
"hasDynamicHelp": false,
|
|
805
|
+
"hiddenAliases": [],
|
|
806
|
+
"id": "workflow:init",
|
|
807
|
+
"pluginAlias": "@jahia/jahia-cli",
|
|
808
|
+
"pluginName": "@jahia/jahia-cli",
|
|
809
|
+
"pluginType": "core",
|
|
810
|
+
"strict": true,
|
|
811
|
+
"enableJsonFlag": false,
|
|
812
|
+
"isESM": true,
|
|
813
|
+
"relativePath": [
|
|
814
|
+
"dist",
|
|
815
|
+
"commands",
|
|
816
|
+
"workflow",
|
|
817
|
+
"init.js"
|
|
818
|
+
]
|
|
819
|
+
},
|
|
820
|
+
"workflow:run": {
|
|
821
|
+
"aliases": [],
|
|
822
|
+
"args": {},
|
|
823
|
+
"description": "Execute a named workflow defined in a configuration file. Supports loading shared workflows from a dedicated workflows file (via --workflows-file flag or workflowsFile config key, defaults to jahia-cli.workflows.global.yml in CWD). Config workflows override workflow file ones with the same name. Runs steps sequentially — shell commands via execa, jahia-cli commands via subprocess. Stops on first failure. Use --name to select a workflow, or omit to run the default.",
|
|
824
|
+
"examples": [
|
|
825
|
+
"<%= config.bin %> workflow run --config jahia-cli.config.yml",
|
|
826
|
+
"<%= config.bin %> workflow run --config jahia-cli.config.yml --name setup",
|
|
827
|
+
"<%= config.bin %> workflow run --config jahia-cli.config.yml --workflows-file shared.yml",
|
|
828
|
+
"<%= config.bin %> workflow run --config ./my-config.yml --json"
|
|
829
|
+
],
|
|
830
|
+
"flags": {
|
|
831
|
+
"config": {
|
|
832
|
+
"char": "c",
|
|
833
|
+
"description": "Path to the YAML configuration file",
|
|
834
|
+
"name": "config",
|
|
835
|
+
"required": true,
|
|
836
|
+
"hasDynamicHelp": false,
|
|
837
|
+
"multiple": false,
|
|
838
|
+
"type": "option"
|
|
839
|
+
},
|
|
840
|
+
"name": {
|
|
841
|
+
"char": "n",
|
|
842
|
+
"description": "Name of the workflow to run (runs default workflow if omitted)",
|
|
843
|
+
"name": "name",
|
|
844
|
+
"hasDynamicHelp": false,
|
|
845
|
+
"multiple": false,
|
|
846
|
+
"type": "option"
|
|
847
|
+
},
|
|
848
|
+
"workflows-file": {
|
|
849
|
+
"char": "w",
|
|
850
|
+
"description": "Path to a dedicated workflows YAML file. Merged with config workflows (config takes precedence). Resolved relative to CWD. Overrides the workflowsFile config key. Defaults to jahia-cli.workflows.global.yml in CWD.",
|
|
851
|
+
"name": "workflows-file",
|
|
852
|
+
"hasDynamicHelp": false,
|
|
853
|
+
"multiple": false,
|
|
854
|
+
"type": "option"
|
|
855
|
+
},
|
|
856
|
+
"json": {
|
|
857
|
+
"description": "Output result as structured JSON (for AI agents and scripting)",
|
|
858
|
+
"name": "json",
|
|
859
|
+
"allowNo": false,
|
|
860
|
+
"type": "boolean"
|
|
861
|
+
},
|
|
862
|
+
"state": {
|
|
863
|
+
"char": "s",
|
|
864
|
+
"description": "Path to the state file (auto-passed to jahia-cli subcommands)",
|
|
865
|
+
"name": "state",
|
|
866
|
+
"hasDynamicHelp": false,
|
|
867
|
+
"multiple": false,
|
|
868
|
+
"type": "option"
|
|
869
|
+
}
|
|
870
|
+
},
|
|
871
|
+
"hasDynamicHelp": false,
|
|
872
|
+
"hiddenAliases": [],
|
|
873
|
+
"id": "workflow:run",
|
|
874
|
+
"pluginAlias": "@jahia/jahia-cli",
|
|
875
|
+
"pluginName": "@jahia/jahia-cli",
|
|
876
|
+
"pluginType": "core",
|
|
877
|
+
"strict": true,
|
|
878
|
+
"enableJsonFlag": false,
|
|
879
|
+
"isESM": true,
|
|
880
|
+
"relativePath": [
|
|
881
|
+
"dist",
|
|
882
|
+
"commands",
|
|
883
|
+
"workflow",
|
|
884
|
+
"run.js"
|
|
885
|
+
]
|
|
886
|
+
},
|
|
770
887
|
"jahia:alive": {
|
|
771
888
|
"aliases": [],
|
|
772
889
|
"args": {},
|
|
@@ -996,124 +1113,7 @@
|
|
|
996
1113
|
"jahia",
|
|
997
1114
|
"provision.js"
|
|
998
1115
|
]
|
|
999
|
-
},
|
|
1000
|
-
"workflow:init": {
|
|
1001
|
-
"aliases": [],
|
|
1002
|
-
"args": {},
|
|
1003
|
-
"description": "Add sample workflows section to a configuration file. Generates a named \"main\" workflow with representative steps (init, create, alive, test, cleanup) to help get started. Preserves existing environment and tests sections.",
|
|
1004
|
-
"examples": [
|
|
1005
|
-
"<%= config.bin %> workflow init",
|
|
1006
|
-
"<%= config.bin %> workflow init --config ./my-config.yml",
|
|
1007
|
-
"<%= config.bin %> workflow init --force",
|
|
1008
|
-
"<%= config.bin %> workflow init --json"
|
|
1009
|
-
],
|
|
1010
|
-
"flags": {
|
|
1011
|
-
"config": {
|
|
1012
|
-
"char": "c",
|
|
1013
|
-
"description": "Path to the YAML configuration file",
|
|
1014
|
-
"name": "config",
|
|
1015
|
-
"default": "jahia-cli.config.yml",
|
|
1016
|
-
"hasDynamicHelp": false,
|
|
1017
|
-
"multiple": false,
|
|
1018
|
-
"type": "option"
|
|
1019
|
-
},
|
|
1020
|
-
"force": {
|
|
1021
|
-
"char": "f",
|
|
1022
|
-
"description": "Overwrite existing workflows section if already present",
|
|
1023
|
-
"name": "force",
|
|
1024
|
-
"allowNo": false,
|
|
1025
|
-
"type": "boolean"
|
|
1026
|
-
},
|
|
1027
|
-
"json": {
|
|
1028
|
-
"description": "Output result as structured JSON (for AI agents and scripting)",
|
|
1029
|
-
"name": "json",
|
|
1030
|
-
"allowNo": false,
|
|
1031
|
-
"type": "boolean"
|
|
1032
|
-
}
|
|
1033
|
-
},
|
|
1034
|
-
"hasDynamicHelp": false,
|
|
1035
|
-
"hiddenAliases": [],
|
|
1036
|
-
"id": "workflow:init",
|
|
1037
|
-
"pluginAlias": "@jahia/jahia-cli",
|
|
1038
|
-
"pluginName": "@jahia/jahia-cli",
|
|
1039
|
-
"pluginType": "core",
|
|
1040
|
-
"strict": true,
|
|
1041
|
-
"enableJsonFlag": false,
|
|
1042
|
-
"isESM": true,
|
|
1043
|
-
"relativePath": [
|
|
1044
|
-
"dist",
|
|
1045
|
-
"commands",
|
|
1046
|
-
"workflow",
|
|
1047
|
-
"init.js"
|
|
1048
|
-
]
|
|
1049
|
-
},
|
|
1050
|
-
"workflow:run": {
|
|
1051
|
-
"aliases": [],
|
|
1052
|
-
"args": {},
|
|
1053
|
-
"description": "Execute a named workflow defined in a configuration file. Supports loading shared workflows from a dedicated workflows file (via --workflows-file flag or workflowsFile config key, defaults to jahia-cli.workflows.global.yml in CWD). Config workflows override workflow file ones with the same name. Runs steps sequentially — shell commands via execa, jahia-cli commands via subprocess. Stops on first failure. Use --name to select a workflow, or omit to run the default.",
|
|
1054
|
-
"examples": [
|
|
1055
|
-
"<%= config.bin %> workflow run --config jahia-cli.config.yml",
|
|
1056
|
-
"<%= config.bin %> workflow run --config jahia-cli.config.yml --name setup",
|
|
1057
|
-
"<%= config.bin %> workflow run --config jahia-cli.config.yml --workflows-file shared.yml",
|
|
1058
|
-
"<%= config.bin %> workflow run --config ./my-config.yml --json"
|
|
1059
|
-
],
|
|
1060
|
-
"flags": {
|
|
1061
|
-
"config": {
|
|
1062
|
-
"char": "c",
|
|
1063
|
-
"description": "Path to the YAML configuration file",
|
|
1064
|
-
"name": "config",
|
|
1065
|
-
"required": true,
|
|
1066
|
-
"hasDynamicHelp": false,
|
|
1067
|
-
"multiple": false,
|
|
1068
|
-
"type": "option"
|
|
1069
|
-
},
|
|
1070
|
-
"name": {
|
|
1071
|
-
"char": "n",
|
|
1072
|
-
"description": "Name of the workflow to run (runs default workflow if omitted)",
|
|
1073
|
-
"name": "name",
|
|
1074
|
-
"hasDynamicHelp": false,
|
|
1075
|
-
"multiple": false,
|
|
1076
|
-
"type": "option"
|
|
1077
|
-
},
|
|
1078
|
-
"workflows-file": {
|
|
1079
|
-
"char": "w",
|
|
1080
|
-
"description": "Path to a dedicated workflows YAML file. Merged with config workflows (config takes precedence). Resolved relative to CWD. Overrides the workflowsFile config key. Defaults to jahia-cli.workflows.global.yml in CWD.",
|
|
1081
|
-
"name": "workflows-file",
|
|
1082
|
-
"hasDynamicHelp": false,
|
|
1083
|
-
"multiple": false,
|
|
1084
|
-
"type": "option"
|
|
1085
|
-
},
|
|
1086
|
-
"json": {
|
|
1087
|
-
"description": "Output result as structured JSON (for AI agents and scripting)",
|
|
1088
|
-
"name": "json",
|
|
1089
|
-
"allowNo": false,
|
|
1090
|
-
"type": "boolean"
|
|
1091
|
-
},
|
|
1092
|
-
"state": {
|
|
1093
|
-
"char": "s",
|
|
1094
|
-
"description": "Path to the state file (auto-passed to jahia-cli subcommands)",
|
|
1095
|
-
"name": "state",
|
|
1096
|
-
"hasDynamicHelp": false,
|
|
1097
|
-
"multiple": false,
|
|
1098
|
-
"type": "option"
|
|
1099
|
-
}
|
|
1100
|
-
},
|
|
1101
|
-
"hasDynamicHelp": false,
|
|
1102
|
-
"hiddenAliases": [],
|
|
1103
|
-
"id": "workflow:run",
|
|
1104
|
-
"pluginAlias": "@jahia/jahia-cli",
|
|
1105
|
-
"pluginName": "@jahia/jahia-cli",
|
|
1106
|
-
"pluginType": "core",
|
|
1107
|
-
"strict": true,
|
|
1108
|
-
"enableJsonFlag": false,
|
|
1109
|
-
"isESM": true,
|
|
1110
|
-
"relativePath": [
|
|
1111
|
-
"dist",
|
|
1112
|
-
"commands",
|
|
1113
|
-
"workflow",
|
|
1114
|
-
"run.js"
|
|
1115
|
-
]
|
|
1116
1116
|
}
|
|
1117
1117
|
},
|
|
1118
|
-
"version": "0.5.
|
|
1118
|
+
"version": "0.5.5"
|
|
1119
1119
|
}
|