@jahia/jahia-cli 0.2.0 → 0.3.1
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/init.js +4 -4
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/jahia/provision.d.ts +37 -2
- package/dist/commands/jahia/provision.d.ts.map +1 -1
- package/dist/commands/jahia/provision.js +241 -53
- package/dist/commands/jahia/provision.js.map +1 -1
- package/dist/commands/tests/artifacts.d.ts +25 -0
- package/dist/commands/tests/artifacts.d.ts.map +1 -0
- package/dist/commands/tests/artifacts.js +112 -0
- package/dist/commands/tests/artifacts.js.map +1 -0
- package/dist/commands/tests/build.d.ts +30 -0
- package/dist/commands/tests/build.d.ts.map +1 -0
- package/dist/commands/tests/build.js +90 -0
- package/dist/commands/tests/build.js.map +1 -0
- package/dist/commands/tests/run.d.ts +28 -0
- package/dist/commands/tests/run.d.ts.map +1 -0
- package/dist/commands/tests/run.js +166 -0
- package/dist/commands/tests/run.js.map +1 -0
- package/dist/commands/workflow/init.d.ts.map +1 -1
- package/dist/commands/workflow/init.js +15 -14
- package/dist/commands/workflow/init.js.map +1 -1
- package/dist/commands/workflow/run.d.ts +3 -1
- package/dist/commands/workflow/run.d.ts.map +1 -1
- package/dist/commands/workflow/run.js +62 -14
- package/dist/commands/workflow/run.js.map +1 -1
- package/dist/lib/artifacts/collect-all.d.ts +17 -0
- package/dist/lib/artifacts/collect-all.d.ts.map +1 -0
- package/dist/lib/artifacts/collect-all.js +107 -0
- package/dist/lib/artifacts/collect-all.js.map +1 -0
- package/dist/lib/artifacts/copy-container-artifacts.d.ts +13 -0
- package/dist/lib/artifacts/copy-container-artifacts.d.ts.map +1 -0
- package/dist/lib/artifacts/copy-container-artifacts.js +48 -0
- package/dist/lib/artifacts/copy-container-artifacts.js.map +1 -0
- package/dist/lib/artifacts/fetch-container-logs.d.ts +17 -0
- package/dist/lib/artifacts/fetch-container-logs.d.ts.map +1 -0
- package/dist/lib/artifacts/fetch-container-logs.js +36 -0
- package/dist/lib/artifacts/fetch-container-logs.js.map +1 -0
- package/dist/lib/artifacts/index.d.ts +6 -0
- package/dist/lib/artifacts/index.d.ts.map +1 -0
- package/dist/lib/artifacts/index.js +5 -0
- package/dist/lib/artifacts/index.js.map +1 -0
- package/dist/lib/artifacts/query-vlogs.d.ts +14 -0
- package/dist/lib/artifacts/query-vlogs.d.ts.map +1 -0
- package/dist/lib/artifacts/query-vlogs.js +33 -0
- package/dist/lib/artifacts/query-vlogs.js.map +1 -0
- package/dist/lib/artifacts/types.d.ts +28 -0
- package/dist/lib/artifacts/types.d.ts.map +1 -0
- package/dist/lib/artifacts/types.js +2 -0
- package/dist/lib/artifacts/types.js.map +1 -0
- package/dist/lib/components/cypress.d.ts +16 -0
- package/dist/lib/components/cypress.d.ts.map +1 -0
- package/dist/lib/components/cypress.js +35 -0
- package/dist/lib/components/cypress.js.map +1 -0
- package/dist/lib/components/index.d.ts.map +1 -1
- package/dist/lib/components/index.js +3 -0
- package/dist/lib/components/index.js.map +1 -1
- package/dist/lib/components/jahia.d.ts.map +1 -1
- package/dist/lib/components/jahia.js +1 -0
- package/dist/lib/components/jahia.js.map +1 -1
- package/dist/lib/components/smtp-server.d.ts.map +1 -1
- package/dist/lib/components/smtp-server.js +1 -0
- package/dist/lib/components/smtp-server.js.map +1 -1
- package/dist/lib/components/types.d.ts +12 -0
- package/dist/lib/components/types.d.ts.map +1 -1
- package/dist/lib/config/config-to-yaml-with-comments.d.ts.map +1 -1
- package/dist/lib/config/config-to-yaml-with-comments.js +28 -3
- package/dist/lib/config/config-to-yaml-with-comments.js.map +1 -1
- package/dist/lib/config/config-to-yaml.d.ts.map +1 -1
- package/dist/lib/config/config-to-yaml.js +13 -1
- package/dist/lib/config/config-to-yaml.js.map +1 -1
- package/dist/lib/config/parser.d.ts +17 -4
- package/dist/lib/config/parser.d.ts.map +1 -1
- package/dist/lib/config/parser.js +101 -12
- package/dist/lib/config/parser.js.map +1 -1
- package/dist/lib/config/types.d.ts +57 -3
- package/dist/lib/config/types.d.ts.map +1 -1
- package/dist/lib/providers/docker/container.d.ts +2 -0
- package/dist/lib/providers/docker/container.d.ts.map +1 -1
- package/dist/lib/providers/docker/container.js +5 -1
- package/dist/lib/providers/docker/container.js.map +1 -1
- package/dist/lib/provisioning/filter-files.d.ts +7 -0
- package/dist/lib/provisioning/filter-files.d.ts.map +1 -0
- package/dist/lib/provisioning/filter-files.js +14 -0
- package/dist/lib/provisioning/filter-files.js.map +1 -0
- package/dist/lib/provisioning/submit-file-action.d.ts +29 -0
- package/dist/lib/provisioning/submit-file-action.d.ts.map +1 -0
- package/dist/lib/provisioning/submit-file-action.js +75 -0
- package/dist/lib/provisioning/submit-file-action.js.map +1 -0
- package/dist/lib/provisioning/types.d.ts +11 -0
- package/dist/lib/provisioning/types.d.ts.map +1 -1
- package/dist/lib/tests/build-image.d.ts +33 -0
- package/dist/lib/tests/build-image.d.ts.map +1 -0
- package/dist/lib/tests/build-image.js +59 -0
- package/dist/lib/tests/build-image.js.map +1 -0
- package/dist/lib/workflow/build-sample-workflow.d.ts +5 -4
- package/dist/lib/workflow/build-sample-workflow.d.ts.map +1 -1
- package/dist/lib/workflow/build-sample-workflow.js +35 -31
- package/dist/lib/workflow/build-sample-workflow.js.map +1 -1
- package/dist/lib/workflow/executor.d.ts +3 -1
- package/dist/lib/workflow/executor.d.ts.map +1 -1
- package/dist/lib/workflow/executor.js +29 -0
- package/dist/lib/workflow/executor.js.map +1 -1
- package/dist/lib/workflow/format-workflow-sources.d.ts +17 -0
- package/dist/lib/workflow/format-workflow-sources.d.ts.map +1 -0
- package/dist/lib/workflow/format-workflow-sources.js +85 -0
- package/dist/lib/workflow/format-workflow-sources.js.map +1 -0
- package/dist/lib/workflow/load-global-workflows.d.ts +24 -0
- package/dist/lib/workflow/load-global-workflows.d.ts.map +1 -0
- package/dist/lib/workflow/load-global-workflows.js +49 -0
- package/dist/lib/workflow/load-global-workflows.js.map +1 -0
- package/dist/lib/workflow/merge-workflow-into-config.d.ts +4 -4
- package/dist/lib/workflow/merge-workflow-into-config.d.ts.map +1 -1
- package/dist/lib/workflow/merge-workflow-into-config.js +4 -4
- package/dist/lib/workflow/merge-workflow-into-config.js.map +1 -1
- package/dist/lib/workflow/merge-workflow-sources.d.ts +27 -0
- package/dist/lib/workflow/merge-workflow-sources.d.ts.map +1 -0
- package/dist/lib/workflow/merge-workflow-sources.js +55 -0
- package/dist/lib/workflow/merge-workflow-sources.js.map +1 -0
- package/dist/lib/workflow/resolve-workflow.d.ts +20 -0
- package/dist/lib/workflow/resolve-workflow.d.ts.map +1 -0
- package/dist/lib/workflow/resolve-workflow.js +38 -0
- package/dist/lib/workflow/resolve-workflow.js.map +1 -0
- package/dist/lib/workflow/resolve-workflows-file-path.d.ts +13 -0
- package/dist/lib/workflow/resolve-workflows-file-path.d.ts.map +1 -0
- package/dist/lib/workflow/resolve-workflows-file-path.js +22 -0
- package/dist/lib/workflow/resolve-workflows-file-path.js.map +1 -0
- package/oclif.manifest.json +318 -108
- package/package.json +4 -2
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { resolveEnvVarsInRecord } from '../config/resolve-env-vars.js';
|
|
2
|
+
import { cypress } from './cypress.js';
|
|
2
3
|
import { jahia } from './jahia.js';
|
|
3
4
|
import { smtpServer } from './smtp-server.js';
|
|
4
5
|
import { victorialogs } from './victorialogs.js';
|
|
@@ -7,6 +8,7 @@ import { victorialogs } from './victorialogs.js';
|
|
|
7
8
|
* To add a new component: create a file, define the ComponentDefinition, import and add here.
|
|
8
9
|
*/
|
|
9
10
|
export const COMPONENT_REGISTRY = {
|
|
11
|
+
cypress,
|
|
10
12
|
jahia,
|
|
11
13
|
'smtp-server': smtpServer,
|
|
12
14
|
victorialogs,
|
|
@@ -78,6 +80,7 @@ export const resolveComponent = (definition, overrides = {}) => {
|
|
|
78
80
|
effectiveTag: overrides.tag ?? parsed?.tag ?? definition.defaultTag,
|
|
79
81
|
effectiveEnv: resolveEnvVarsInRecord(mergedEnv),
|
|
80
82
|
effectivePorts: overrides.ports ?? definition.ports,
|
|
83
|
+
effectiveArtifacts: [...(definition.artifacts ?? []), ...(overrides.artifacts ?? [])],
|
|
81
84
|
};
|
|
82
85
|
};
|
|
83
86
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/components/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/components/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jahia.d.ts","sourceRoot":"","sources":["../../../src/lib/components/jahia.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,eAAO,MAAM,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"jahia.d.ts","sourceRoot":"","sources":["../../../src/lib/components/jahia.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,eAAO,MAAM,KAAK,EAAE,mBAoCnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jahia.js","sourceRoot":"","sources":["../../../src/lib/components/jahia.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAwB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,0DAA0D;IACvE,KAAK,EAAE,gBAAgB;IACvB,UAAU,EAAE,SAAS;IACrB,KAAK,EAAE;QACL,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QAC/B,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;KAChC;IACD,GAAG,EAAE;QACH,mBAAmB,EAAE,kCAAkC;QACvD,kBAAkB,EAAE,2BAA2B;QAC/C,iBAAiB,EAAE,MAAM;QACzB,aAAa,EAAE,oBAAoB;QACnC,IAAI,EAAE,WAAW;KAClB;IACD,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,uBAAuB,EAAE;KAC/D;IACD,WAAW,EAAE;QACX,OAAO,EAAE;YACP,WAAW;YACX,6DAA6D;SAC9D;QACD,eAAe,EAAE,EAAE;QACnB,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,EAAE;QACX,kBAAkB,EAAE,GAAG;KACxB;IACD,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,CAAC,OAAO,CAAC;IACzB,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"jahia.js","sourceRoot":"","sources":["../../../src/lib/components/jahia.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAwB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,0DAA0D;IACvE,KAAK,EAAE,gBAAgB;IACvB,UAAU,EAAE,SAAS;IACrB,KAAK,EAAE;QACL,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QAC/B,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;KAChC;IACD,GAAG,EAAE;QACH,mBAAmB,EAAE,kCAAkC;QACvD,kBAAkB,EAAE,2BAA2B;QAC/C,iBAAiB,EAAE,MAAM;QACzB,aAAa,EAAE,oBAAoB;QACnC,IAAI,EAAE,WAAW;KAClB;IACD,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,uBAAuB,EAAE;KAC/D;IACD,WAAW,EAAE;QACX,OAAO,EAAE;YACP,WAAW;YACX,6DAA6D;SAC9D;QACD,eAAe,EAAE,EAAE;QACnB,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,EAAE;QACX,kBAAkB,EAAE,GAAG;KACxB;IACD,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,CAAC,OAAO,CAAC;IACzB,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC;IAC3C,SAAS,EAAE,CAAC,gBAAgB,CAAC;CAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smtp-server.d.ts","sourceRoot":"","sources":["../../../src/lib/components/smtp-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,eAAO,MAAM,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"smtp-server.d.ts","sourceRoot":"","sources":["../../../src/lib/components/smtp-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,eAAO,MAAM,UAAU,EAAE,mBA4BxB,CAAC"}
|
|
@@ -23,6 +23,7 @@ export const smtpServer = {
|
|
|
23
23
|
multiInstance: false,
|
|
24
24
|
providerSupport: ['docker'],
|
|
25
25
|
envInjections: {
|
|
26
|
+
cypress: { MAILPIT_URL: '${MAILPIT_URL:-http://smtp-server:8025}' },
|
|
26
27
|
jahia: { SMTP_SERVER_URL: '${SMTP_SERVER_URL:-smtp://smtp-server:1025}' },
|
|
27
28
|
},
|
|
28
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smtp-server.js","sourceRoot":"","sources":["../../../src/lib/components/smtp-server.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAwB;IAC7C,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,uCAAuC;IACpD,KAAK,EAAE,iBAAiB;IACxB,UAAU,EAAE,OAAO;IACnB,KAAK,EAAE;QACL,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QAC/B,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;KAChC;IACD,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,EAAE;IACX,WAAW,EAAE;QACX,OAAO,EAAE,CAAC,WAAW,EAAE,uDAAuD,CAAC;QAC/E,eAAe,EAAE,EAAE;QACnB,cAAc,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;QACV,kBAAkB,EAAE,CAAC;KACtB;IACD,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,CAAC,aAAa,CAAC;IAC/B,QAAQ,EAAE,SAAS;IACnB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;IAC3B,aAAa,EAAE;QACb,KAAK,EAAE,EAAE,eAAe,EAAE,6CAA6C,EAAE;KAC1E;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"smtp-server.js","sourceRoot":"","sources":["../../../src/lib/components/smtp-server.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAwB;IAC7C,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,uCAAuC;IACpD,KAAK,EAAE,iBAAiB;IACxB,UAAU,EAAE,OAAO;IACnB,KAAK,EAAE;QACL,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QAC/B,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;KAChC;IACD,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,EAAE;IACX,WAAW,EAAE;QACX,OAAO,EAAE,CAAC,WAAW,EAAE,uDAAuD,CAAC;QAC/E,eAAe,EAAE,EAAE;QACnB,cAAc,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;QACV,kBAAkB,EAAE,CAAC;KACtB;IACD,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,CAAC,aAAa,CAAC;IAC/B,QAAQ,EAAE,SAAS;IACnB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;IAC3B,aAAa,EAAE;QACb,OAAO,EAAE,EAAE,WAAW,EAAE,yCAAyC,EAAE;QACnE,KAAK,EAAE,EAAE,eAAe,EAAE,6CAA6C,EAAE;KAC1E;CACF,CAAC"}
|
|
@@ -52,6 +52,12 @@ export interface ComponentDefinition {
|
|
|
52
52
|
* Keys are target component names, values are env var maps to merge into those components.
|
|
53
53
|
*/
|
|
54
54
|
readonly envInjections?: Readonly<Record<string, Readonly<Record<string, string>>>> | undefined;
|
|
55
|
+
/**
|
|
56
|
+
* Container paths to collect as test artifacts (logs, diagnostic files, directories).
|
|
57
|
+
* These are copied from the container via `docker cp` during artifact collection.
|
|
58
|
+
* Example: ['/var/log/jahia']
|
|
59
|
+
*/
|
|
60
|
+
readonly artifacts?: readonly string[] | undefined;
|
|
55
61
|
}
|
|
56
62
|
/**
|
|
57
63
|
* User-provided overrides for a component.
|
|
@@ -74,6 +80,11 @@ export interface ComponentOverrides {
|
|
|
74
80
|
readonly tag?: string | undefined;
|
|
75
81
|
readonly env?: Readonly<Record<string, string>> | undefined;
|
|
76
82
|
readonly ports?: readonly PortMapping[] | undefined;
|
|
83
|
+
/**
|
|
84
|
+
* Additional container paths to collect as test artifacts.
|
|
85
|
+
* These are merged with the component definition's artifacts during resolution.
|
|
86
|
+
*/
|
|
87
|
+
readonly artifacts?: readonly string[] | undefined;
|
|
77
88
|
}
|
|
78
89
|
/**
|
|
79
90
|
* A component with its overrides applied, ready for deployment.
|
|
@@ -85,5 +96,6 @@ export interface ResolvedComponent {
|
|
|
85
96
|
readonly effectiveTag: string;
|
|
86
97
|
readonly effectiveEnv: Readonly<Record<string, string>>;
|
|
87
98
|
readonly effectivePorts: readonly PortMapping[];
|
|
99
|
+
readonly effectiveArtifacts: readonly string[];
|
|
88
100
|
}
|
|
89
101
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/components/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;CAC/C;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GACzB,MAAM,GACN,gBAAgB,GAChB,UAAU,GACV,QAAQ,GACR,aAAa,GACb,SAAS,GACT,QAAQ,CAAC;AAEb;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC,QAAQ,CAAC,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC;IACjE,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/components/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-to-yaml-with-comments.d.ts","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml-with-comments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"config-to-yaml-with-comments.d.ts","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml-with-comments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AA4EjD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,aAAa,MAAM,KAAG,MA4B3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GAAI,QAAQ,cAAc,KAAG,MACrB,CAAC"}
|
|
@@ -35,14 +35,38 @@ const TESTS_COMMENT = `# ── Tests ──────────────
|
|
|
35
35
|
# - scaffolding.repository: Git URL of the test scaffolding source
|
|
36
36
|
# - scaffolding.path: subdirectory within the repo containing scaffolding files
|
|
37
37
|
# - scaffolding.version: Git ref to checkout ("latest" resolves to newest tag)`;
|
|
38
|
-
const
|
|
39
|
-
#
|
|
38
|
+
const WORKFLOWS_FILE_COMMENT = `# ── Workflows File ───────────────────────────────────────────────────────
|
|
39
|
+
# Path to a separate YAML file containing shared (global) workflow definitions.
|
|
40
|
+
# Resolved relative to this config file's directory.
|
|
41
|
+
# Workflows in this file are merged with local workflows below.
|
|
42
|
+
# Local workflows take precedence on name collisions.
|
|
43
|
+
# Supports \${VAR:-default} env var substitution.
|
|
44
|
+
#
|
|
45
|
+
# Example:
|
|
46
|
+
# workflowsFile: jahia-cli.workflows.global.yml
|
|
47
|
+
#
|
|
48
|
+
# Can also be specified via CLI: --workflows-file <path>
|
|
49
|
+
# (CLI flag is resolved relative to CWD and takes precedence over this key)`;
|
|
50
|
+
const WORKFLOW_COMMENT = `# ── Workflows ────────────────────────────────────────────────────────────
|
|
51
|
+
# Named workflows executed by "jahia-cli workflow run --name <name>".
|
|
52
|
+
# Each workflow has a unique name (the map key), an optional "default: true"
|
|
53
|
+
# flag, and a "steps" array.
|
|
54
|
+
#
|
|
55
|
+
# One workflow may be marked as "default: true" — it runs when --name is omitted.
|
|
56
|
+
#
|
|
40
57
|
# Each step is either a shell command (run:) or a jahia-cli command (uses:).
|
|
41
58
|
# - name: human-readable label (optional)
|
|
42
59
|
# - run: shell command executed via execa
|
|
43
60
|
# - uses: jahia-cli command name (e.g. "environment:create")
|
|
44
61
|
# - with: flags passed to the command (e.g. { timeout: "300" })
|
|
45
62
|
# - working_dir: override the working directory for this step
|
|
63
|
+
#
|
|
64
|
+
# Workflows can call other workflows via:
|
|
65
|
+
# uses: workflow:run
|
|
66
|
+
# with:
|
|
67
|
+
# name: <other-workflow-name>
|
|
68
|
+
#
|
|
69
|
+
# Circular calls are detected and rejected.
|
|
46
70
|
# Steps run in order; the workflow stops on the first failure.`;
|
|
47
71
|
/**
|
|
48
72
|
* Takes the plain YAML output from configToYaml and inserts section-level
|
|
@@ -50,9 +74,10 @@ const WORKFLOW_COMMENT = `# ── Workflow ────────────
|
|
|
50
74
|
*/
|
|
51
75
|
export const insertSectionComments = (yamlContent) => {
|
|
52
76
|
const commentMap = {
|
|
77
|
+
'workflowsFile:': WORKFLOWS_FILE_COMMENT,
|
|
53
78
|
'environment:': ENVIRONMENT_COMMENT,
|
|
54
79
|
'tests:': TESTS_COMMENT,
|
|
55
|
-
'
|
|
80
|
+
'workflows:': WORKFLOW_COMMENT,
|
|
56
81
|
};
|
|
57
82
|
const lines = yamlContent.split('\n');
|
|
58
83
|
const result = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-to-yaml-with-comments.js","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml-with-comments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;uGA0B2E,CAAC;AAExG,MAAM,aAAa,GAAG;;;;+EAIyD,CAAC;AAEhF,MAAM,gBAAgB,GAAG
|
|
1
|
+
{"version":3,"file":"config-to-yaml-with-comments.js","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml-with-comments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;uGA0B2E,CAAC;AAExG,MAAM,aAAa,GAAG;;;;+EAIyD,CAAC;AAEhF,MAAM,sBAAsB,GAAG;;;;;;;;;;;4EAW6C,CAAC;AAE7E,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;+DAoBsC,CAAC;AAEhE;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,WAAmB,EAAU,EAAE;IACnE,MAAM,UAAU,GAAqC;QACnD,gBAAgB,EAAE,sBAAsB;QACxC,cAAc,EAAE,mBAAmB;QACnC,QAAQ,EAAE,aAAa;QACvB,YAAY,EAAE,gBAAgB;KAC/B,CAAC;IAEF,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAC7C,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAC9B,CAAC;QAEF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,MAAsB,EAAU,EAAE,CACzE,qBAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-to-yaml.d.ts","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"config-to-yaml.d.ts","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAmBjD;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,cAAc,KAAG,MA0BnD,CAAC"}
|
|
@@ -1,9 +1,21 @@
|
|
|
1
1
|
import yaml from 'js-yaml';
|
|
2
|
+
/**
|
|
3
|
+
* Serializes a workflows map for YAML output.
|
|
4
|
+
* Each named workflow is serialized with its steps (and optional default flag).
|
|
5
|
+
*/
|
|
6
|
+
const serializeWorkflows = (workflows) => Object.fromEntries(Object.entries(workflows).map(([name, wf]) => [
|
|
7
|
+
name,
|
|
8
|
+
{
|
|
9
|
+
...(wf.default === true ? { default: true } : {}),
|
|
10
|
+
steps: wf.steps,
|
|
11
|
+
},
|
|
12
|
+
]));
|
|
2
13
|
/**
|
|
3
14
|
* Serializes JahiaCliConfig to YAML.
|
|
4
15
|
* Components without overrides are emitted as plain strings for readability.
|
|
5
16
|
*/
|
|
6
17
|
export const configToYaml = (config) => yaml.dump({
|
|
18
|
+
...(config.workflowsFile === undefined ? {} : { workflowsFile: config.workflowsFile }),
|
|
7
19
|
...(config.environment === undefined
|
|
8
20
|
? {}
|
|
9
21
|
: {
|
|
@@ -18,7 +30,7 @@ export const configToYaml = (config) => yaml.dump({
|
|
|
18
30
|
},
|
|
19
31
|
}),
|
|
20
32
|
...(config.tests === undefined ? {} : { tests: config.tests }),
|
|
21
|
-
...(config.
|
|
33
|
+
...(config.workflows === undefined ? {} : { workflows: serializeWorkflows(config.workflows) }),
|
|
22
34
|
}, {
|
|
23
35
|
lineWidth: -1,
|
|
24
36
|
noRefs: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-to-yaml.js","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,SAAS,CAAC;AAI3B;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAsB,EAAU,EAAE,CAC7D,IAAI,CAAC,IAAI,CACP;IACE,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS;QAClC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,WAAW,EAAE;gBACX,GAAG,MAAM,CAAC,WAAW;gBACrB,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC1D,SAAS,CAAC,SAAS,KAAK,SAAS;oBAC/B,CAAC,CAAC,SAAS,CAAC,IAAI;oBAChB,CAAC,CAAC;wBACE,IAAI,EAAE,SAAS,CAAC,IAAI;wBACpB,SAAS,EAAE,SAAS,CAAC,SAAS;qBAC/B,CACN;aACF;SACF,CAAC;IACN,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAC9D,GAAG,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"config-to-yaml.js","sourceRoot":"","sources":["../../../src/lib/config/config-to-yaml.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,SAAS,CAAC;AAI3B;;;GAGG;AACH,MAAM,kBAAkB,GAAG,CACzB,SAAmH,EAC1F,EAAE,CAC3B,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,IAAI;IACJ;QACE,GAAG,CAAC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,KAAK,EAAE,EAAE,CAAC,KAAK;KAChB;CACF,CAAC,CACH,CAAC;AAEJ;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAsB,EAAU,EAAE,CAC7D,IAAI,CAAC,IAAI,CACP;IACE,GAAG,CAAC,MAAM,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;IACtF,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS;QAClC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,WAAW,EAAE;gBACX,GAAG,MAAM,CAAC,WAAW;gBACrB,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC1D,SAAS,CAAC,SAAS,KAAK,SAAS;oBAC/B,CAAC,CAAC,SAAS,CAAC,IAAI;oBAChB,CAAC,CAAC;wBACE,IAAI,EAAE,SAAS,CAAC,IAAI;wBACpB,SAAS,EAAE,SAAS,CAAC,SAAS;qBAC/B,CACN;aACF;SACF,CAAC;IACN,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAC9D,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;CAC/F,EACD;IACE,SAAS,EAAE,CAAC,CAAC;IACb,MAAM,EAAE,IAAI;CACb,CACF,CAAC"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import type { ResolvedComponent } from '../components/types.js';
|
|
2
|
-
import type { EnvironmentConfig, JahiaCliConfig, RawConfig, RawEnvironmentConfig, ScaffoldingConfig, TestsConfig, WorkflowConfig, WorkflowStep } from './types.js';
|
|
2
|
+
import type { EnvironmentConfig, JahiaCliConfig, RawConfig, RawEnvironmentConfig, ScaffoldingConfig, TestContainerConfig, TestsConfig, WorkflowConfig, WorkflowStep, WorkflowsMap } from './types.js';
|
|
3
3
|
/**
|
|
4
4
|
* Parses and validates the optional scaffolding section within tests.
|
|
5
5
|
*/
|
|
6
6
|
export declare const parseScaffoldingConfig: (rawScaffolding: unknown) => ScaffoldingConfig;
|
|
7
|
+
/**
|
|
8
|
+
* Parses and validates the optional tests.container section.
|
|
9
|
+
* All fields are optional — only provided values are included.
|
|
10
|
+
* String values support ${VAR:-default} env var resolution.
|
|
11
|
+
*/
|
|
12
|
+
export declare const parseTestContainerConfig: (rawContainer: unknown) => TestContainerConfig | undefined;
|
|
7
13
|
/**
|
|
8
14
|
* Parses and validates the optional tests section.
|
|
9
15
|
*/
|
|
@@ -25,13 +31,20 @@ export declare const validateEnvironmentConfig: (raw: RawEnvironmentConfig) => E
|
|
|
25
31
|
*/
|
|
26
32
|
export declare const validateWorkflowStep: (raw: unknown, index: number) => WorkflowStep;
|
|
27
33
|
/**
|
|
28
|
-
* Parses and validates the
|
|
34
|
+
* Parses and validates a single named workflow entry (the value under a workflow name key).
|
|
35
|
+
*/
|
|
36
|
+
export declare const parseSingleWorkflow: (rawWorkflow: unknown, name: string) => WorkflowConfig;
|
|
37
|
+
/**
|
|
38
|
+
* Parses and validates the optional workflows section.
|
|
39
|
+
* Expects a map of named workflows. At most one may have `default: true`.
|
|
29
40
|
*/
|
|
30
|
-
export declare const
|
|
41
|
+
export declare const parseWorkflowsConfig: (rawWorkflows: unknown) => WorkflowsMap | undefined;
|
|
31
42
|
/**
|
|
32
43
|
* Validates and parses a raw YAML object into a typed JahiaCliConfig.
|
|
33
|
-
* All sections (environment, tests,
|
|
44
|
+
* All sections (environment, tests, workflows) are optional — commands validate
|
|
34
45
|
* the presence of the sections they need.
|
|
46
|
+
*
|
|
47
|
+
* Detects the legacy `workflow:` key and provides a migration error.
|
|
35
48
|
*/
|
|
36
49
|
export declare const validateConfig: (raw: RawConfig) => JahiaCliConfig;
|
|
37
50
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/lib/config/parser.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAUhE,OAAO,KAAK,EAEV,iBAAiB,EACjB,cAAc,EACd,SAAS,EACT,oBAAoB,EACpB,iBAAiB,EACjB,WAAW,EACX,cAAc,EACd,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,gBAAgB,OAAO,KAAG,iBAsBhE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,UAAU,OAAO,KAAG,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/lib/config/parser.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAUhE,OAAO,KAAK,EAEV,iBAAiB,EACjB,cAAc,EACd,SAAS,EACT,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,cAAc,EACd,YAAY,EACZ,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,gBAAgB,OAAO,KAAG,iBAsBhE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAI,cAAc,OAAO,KAAG,mBAAmB,GAAG,SA0CtF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,UAAU,OAAO,KAAG,WAAW,GAAG,SA4BlE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GACpC,cAAc,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAC9C,MAAM,CAAC,MAAM,EAAE,OAAO,CAqBxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,GAAI,KAAK,oBAAoB,KAAG,iBAkCrE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,OAAO,EAAE,OAAO,MAAM,KAAG,YAmClE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAI,aAAa,OAAO,EAAE,MAAM,MAAM,KAAG,cAyBxE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,cAAc,OAAO,KAAG,YAAY,GAAG,SAiC3E,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,KAAK,SAAS,KAAG,cAyC/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,cAAc,CAI7E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAI,QAAQ,iBAAiB,KAAG,SAAS,iBAAiB,EAS1F,CAAC"}
|
|
@@ -26,6 +26,45 @@ export const parseScaffoldingConfig = (rawScaffolding) => {
|
|
|
26
26
|
version: typeof record['version'] === 'string' ? record['version'] : DEFAULT_SCAFFOLDING_VERSION,
|
|
27
27
|
};
|
|
28
28
|
};
|
|
29
|
+
/**
|
|
30
|
+
* Parses and validates the optional tests.container section.
|
|
31
|
+
* All fields are optional — only provided values are included.
|
|
32
|
+
* String values support ${VAR:-default} env var resolution.
|
|
33
|
+
*/
|
|
34
|
+
export const parseTestContainerConfig = (rawContainer) => {
|
|
35
|
+
if (rawContainer === undefined) {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
if (typeof rawContainer !== 'object' || rawContainer === null || Array.isArray(rawContainer)) {
|
|
39
|
+
throw new Error('Configuration "tests.container" must be an object when provided.');
|
|
40
|
+
}
|
|
41
|
+
const record = rawContainer;
|
|
42
|
+
if (record['dockerfile'] !== undefined && typeof record['dockerfile'] !== 'string') {
|
|
43
|
+
throw new Error('Configuration "tests.container.dockerfile" must be a string when provided.');
|
|
44
|
+
}
|
|
45
|
+
if (record['image'] !== undefined && typeof record['image'] !== 'string') {
|
|
46
|
+
throw new Error('Configuration "tests.container.image" must be a string when provided.');
|
|
47
|
+
}
|
|
48
|
+
if (record['tag'] !== undefined && typeof record['tag'] !== 'string') {
|
|
49
|
+
throw new Error('Configuration "tests.container.tag" must be a string when provided.');
|
|
50
|
+
}
|
|
51
|
+
if (record['platform'] !== undefined && typeof record['platform'] !== 'string') {
|
|
52
|
+
throw new Error('Configuration "tests.container.platform" must be a string when provided.');
|
|
53
|
+
}
|
|
54
|
+
if (record['buildArgs'] !== undefined) {
|
|
55
|
+
if (typeof record['buildArgs'] !== 'object' || record['buildArgs'] === null || Array.isArray(record['buildArgs'])) {
|
|
56
|
+
throw new Error('Configuration "tests.container.buildArgs" must be an object when provided.');
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
const config = {
|
|
60
|
+
...(record['dockerfile'] !== undefined ? { dockerfile: record['dockerfile'] } : {}),
|
|
61
|
+
...(record['image'] !== undefined ? { image: resolveEnvVars(record['image']) } : {}),
|
|
62
|
+
...(record['tag'] !== undefined ? { tag: resolveEnvVars(record['tag']) } : {}),
|
|
63
|
+
...(record['platform'] !== undefined ? { platform: record['platform'] } : {}),
|
|
64
|
+
...(record['buildArgs'] !== undefined ? { buildArgs: resolveEnvVarsInRecord(record['buildArgs']) } : {}),
|
|
65
|
+
};
|
|
66
|
+
return Object.keys(config).length > 0 ? config : undefined;
|
|
67
|
+
};
|
|
29
68
|
/**
|
|
30
69
|
* Parses and validates the optional tests section.
|
|
31
70
|
*/
|
|
@@ -44,9 +83,11 @@ export const parseTestsConfig = (rawTests) => {
|
|
|
44
83
|
const scaffolding = testsRecord['scaffolding'] !== undefined
|
|
45
84
|
? parseScaffoldingConfig(testsRecord['scaffolding'])
|
|
46
85
|
: undefined;
|
|
86
|
+
const container = parseTestContainerConfig(testsRecord['container']);
|
|
47
87
|
return {
|
|
48
88
|
...(jahiaCypress === undefined ? {} : { 'jahia-cypress': jahiaCypress }),
|
|
49
89
|
...(scaffolding === undefined ? {} : { scaffolding }),
|
|
90
|
+
...(container === undefined ? {} : { container }),
|
|
50
91
|
};
|
|
51
92
|
};
|
|
52
93
|
/**
|
|
@@ -133,31 +174,75 @@ export const validateWorkflowStep = (raw, index) => {
|
|
|
133
174
|
};
|
|
134
175
|
};
|
|
135
176
|
/**
|
|
136
|
-
* Parses and validates the
|
|
177
|
+
* Parses and validates a single named workflow entry (the value under a workflow name key).
|
|
137
178
|
*/
|
|
138
|
-
export const
|
|
139
|
-
if (rawWorkflow === undefined) {
|
|
140
|
-
return undefined;
|
|
141
|
-
}
|
|
179
|
+
export const parseSingleWorkflow = (rawWorkflow, name) => {
|
|
142
180
|
if (typeof rawWorkflow !== 'object' || rawWorkflow === null || Array.isArray(rawWorkflow)) {
|
|
143
|
-
throw new Error(
|
|
181
|
+
throw new Error(`Workflow "${name}" must be an object.`);
|
|
144
182
|
}
|
|
145
183
|
const record = rawWorkflow;
|
|
146
184
|
if (!Array.isArray(record['steps'])) {
|
|
147
|
-
throw new Error(
|
|
185
|
+
throw new Error(`Workflow "${name}" must include a "steps" array.`);
|
|
148
186
|
}
|
|
149
187
|
if (record['steps'].length === 0) {
|
|
150
|
-
throw new Error(
|
|
188
|
+
throw new Error(`Workflow "${name}.steps" must contain at least one step.`);
|
|
151
189
|
}
|
|
152
190
|
const steps = record['steps'].map((entry, index) => validateWorkflowStep(entry, index));
|
|
153
|
-
|
|
191
|
+
const isDefault = record['default'] === true ? true : undefined;
|
|
192
|
+
return {
|
|
193
|
+
...(isDefault === undefined ? {} : { default: isDefault }),
|
|
194
|
+
steps,
|
|
195
|
+
};
|
|
196
|
+
};
|
|
197
|
+
/**
|
|
198
|
+
* Parses and validates the optional workflows section.
|
|
199
|
+
* Expects a map of named workflows. At most one may have `default: true`.
|
|
200
|
+
*/
|
|
201
|
+
export const parseWorkflowsConfig = (rawWorkflows) => {
|
|
202
|
+
if (rawWorkflows === undefined) {
|
|
203
|
+
return undefined;
|
|
204
|
+
}
|
|
205
|
+
if (typeof rawWorkflows !== 'object' || rawWorkflows === null || Array.isArray(rawWorkflows)) {
|
|
206
|
+
throw new Error('Configuration "workflows" field must be a map of named workflows.');
|
|
207
|
+
}
|
|
208
|
+
const entries = Object.entries(rawWorkflows);
|
|
209
|
+
if (entries.length === 0) {
|
|
210
|
+
throw new Error('Configuration "workflows" must contain at least one named workflow.');
|
|
211
|
+
}
|
|
212
|
+
const workflows = {};
|
|
213
|
+
const defaultNames = [];
|
|
214
|
+
entries.forEach(([name, value]) => {
|
|
215
|
+
const workflow = parseSingleWorkflow(value, name);
|
|
216
|
+
workflows[name] = workflow;
|
|
217
|
+
if (workflow.default === true) {
|
|
218
|
+
defaultNames.push(name);
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
if (defaultNames.length > 1) {
|
|
222
|
+
throw new Error(`Only one workflow may have "default: true". Found ${String(defaultNames.length)}: ${defaultNames.join(', ')}`);
|
|
223
|
+
}
|
|
224
|
+
return workflows;
|
|
154
225
|
};
|
|
155
226
|
/**
|
|
156
227
|
* Validates and parses a raw YAML object into a typed JahiaCliConfig.
|
|
157
|
-
* All sections (environment, tests,
|
|
228
|
+
* All sections (environment, tests, workflows) are optional — commands validate
|
|
158
229
|
* the presence of the sections they need.
|
|
230
|
+
*
|
|
231
|
+
* Detects the legacy `workflow:` key and provides a migration error.
|
|
159
232
|
*/
|
|
160
233
|
export const validateConfig = (raw) => {
|
|
234
|
+
if (raw.workflow !== undefined) {
|
|
235
|
+
throw new Error('Configuration uses the deprecated "workflow:" key.\n' +
|
|
236
|
+
'Rename it to "workflows:" and wrap your workflow in a named entry.\n\n' +
|
|
237
|
+
' Before:\n' +
|
|
238
|
+
' workflow:\n' +
|
|
239
|
+
' steps: [...]\n\n' +
|
|
240
|
+
' After:\n' +
|
|
241
|
+
' workflows:\n' +
|
|
242
|
+
' main:\n' +
|
|
243
|
+
' default: true\n' +
|
|
244
|
+
' steps: [...]');
|
|
245
|
+
}
|
|
161
246
|
const rawEnv = raw.environment !== undefined && typeof raw.environment === 'object' && raw.environment !== null
|
|
162
247
|
? raw.environment
|
|
163
248
|
: undefined;
|
|
@@ -167,11 +252,15 @@ export const validateConfig = (raw) => {
|
|
|
167
252
|
? validateEnvironmentConfig(rawEnv)
|
|
168
253
|
: undefined;
|
|
169
254
|
const tests = parseTestsConfig(raw.tests);
|
|
170
|
-
const
|
|
255
|
+
const workflows = parseWorkflowsConfig(raw.workflows);
|
|
256
|
+
const workflowsFile = typeof raw.workflowsFile === 'string'
|
|
257
|
+
? resolveEnvVars(raw.workflowsFile)
|
|
258
|
+
: undefined;
|
|
171
259
|
return {
|
|
172
260
|
...(environment === undefined ? {} : { environment }),
|
|
173
261
|
...(tests === undefined ? {} : { tests }),
|
|
174
|
-
...(
|
|
262
|
+
...(workflows === undefined ? {} : { workflows }),
|
|
263
|
+
...(workflowsFile === undefined ? {} : { workflowsFile }),
|
|
175
264
|
};
|
|
176
265
|
};
|
|
177
266
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/lib/config/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/lib/config/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,45 @@ export interface ScaffoldingConfig {
|
|
|
20
20
|
export interface TestsConfig {
|
|
21
21
|
readonly 'jahia-cypress'?: string | undefined;
|
|
22
22
|
readonly scaffolding?: ScaffoldingConfig | undefined;
|
|
23
|
+
/**
|
|
24
|
+
* Test container build and run configuration.
|
|
25
|
+
*
|
|
26
|
+
* All fields are optional — sensible defaults are used when omitted.
|
|
27
|
+
* This keeps config files minimal while allowing full control when needed.
|
|
28
|
+
*
|
|
29
|
+
* Available options:
|
|
30
|
+
* dockerfile — Path to the Dockerfile (default: "docker/Dockerfile.local")
|
|
31
|
+
* image — Image name for the built test image (default: "jahia-tests")
|
|
32
|
+
* Supports ${VAR:-default} env var substitution.
|
|
33
|
+
* tag — Image tag (default: scaffolding version from tests.scaffolding.version)
|
|
34
|
+
* Supports ${VAR:-default} env var substitution.
|
|
35
|
+
* platform — Target platform for buildx (e.g. "linux/amd64").
|
|
36
|
+
* Defaults to current platform when omitted.
|
|
37
|
+
* buildArgs — Extra Docker build args as key-value pairs.
|
|
38
|
+
* Values support ${VAR:-default} env var substitution.
|
|
39
|
+
*
|
|
40
|
+
* Example in YAML:
|
|
41
|
+
* tests:
|
|
42
|
+
* container:
|
|
43
|
+
* image: "${TEST_IMAGE:-jahia-tests}"
|
|
44
|
+
* tag: "${TEST_TAG:-latest}"
|
|
45
|
+
* platform: linux/amd64
|
|
46
|
+
* buildArgs:
|
|
47
|
+
* CYPRESS_VERSION: "13.0.0"
|
|
48
|
+
*/
|
|
49
|
+
readonly container?: TestContainerConfig | undefined;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Configuration for the test container image build and execution.
|
|
53
|
+
* All fields are optional — defaults from the cypress component and
|
|
54
|
+
* build-image module are used when omitted.
|
|
55
|
+
*/
|
|
56
|
+
export interface TestContainerConfig {
|
|
57
|
+
readonly dockerfile?: string | undefined;
|
|
58
|
+
readonly image?: string | undefined;
|
|
59
|
+
readonly tag?: string | undefined;
|
|
60
|
+
readonly platform?: string | undefined;
|
|
61
|
+
readonly buildArgs?: Readonly<Record<string, string>> | undefined;
|
|
23
62
|
}
|
|
24
63
|
/**
|
|
25
64
|
* The environment section of the configuration file.
|
|
@@ -41,19 +80,32 @@ export interface WorkflowStep {
|
|
|
41
80
|
readonly working_dir?: string | undefined;
|
|
42
81
|
}
|
|
43
82
|
/**
|
|
44
|
-
*
|
|
83
|
+
* A single named workflow in the configuration file.
|
|
84
|
+
* May be marked as the default workflow to run when --name is omitted.
|
|
45
85
|
*/
|
|
46
86
|
export interface WorkflowConfig {
|
|
87
|
+
readonly default?: boolean | undefined;
|
|
47
88
|
readonly steps: readonly WorkflowStep[];
|
|
48
89
|
}
|
|
90
|
+
/**
|
|
91
|
+
* A map of named workflows keyed by workflow name.
|
|
92
|
+
*/
|
|
93
|
+
export type WorkflowsMap = Readonly<Record<string, WorkflowConfig>>;
|
|
49
94
|
/**
|
|
50
95
|
* The top-level Jahia CLI configuration file structure.
|
|
51
|
-
* Contains `environment`, `tests`, and `
|
|
96
|
+
* Contains `environment`, `tests`, and `workflows` as distinct top-level sections.
|
|
97
|
+
*
|
|
98
|
+
* The optional `workflowsFile` key points to a separate YAML file containing
|
|
99
|
+
* shared (global) workflow definitions. Workflows defined in the local config
|
|
100
|
+
* take precedence over identically-named global workflows.
|
|
101
|
+
* Path is resolved relative to the config file directory.
|
|
102
|
+
* Supports ${VAR:-default} env var substitution.
|
|
52
103
|
*/
|
|
53
104
|
export interface JahiaCliConfig {
|
|
54
105
|
readonly environment?: EnvironmentConfig | undefined;
|
|
55
106
|
readonly tests?: TestsConfig | undefined;
|
|
56
|
-
readonly
|
|
107
|
+
readonly workflows?: WorkflowsMap | undefined;
|
|
108
|
+
readonly workflowsFile?: string | undefined;
|
|
57
109
|
}
|
|
58
110
|
/**
|
|
59
111
|
* Raw YAML structure before validation (loose types for parsing).
|
|
@@ -61,7 +113,9 @@ export interface JahiaCliConfig {
|
|
|
61
113
|
export interface RawConfig {
|
|
62
114
|
readonly environment?: unknown;
|
|
63
115
|
readonly tests?: unknown;
|
|
116
|
+
readonly workflows?: unknown;
|
|
64
117
|
readonly workflow?: unknown;
|
|
118
|
+
readonly workflowsFile?: unknown;
|
|
65
119
|
}
|
|
66
120
|
/**
|
|
67
121
|
* Raw environment section before validation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACtD;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;CACjD;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IAC7D,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AAED
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/config/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,8 @@ export declare const buildRunArgs: (params: {
|
|
|
27
27
|
readonly healthcheck?: HealthcheckConfig | undefined;
|
|
28
28
|
readonly logConfig?: LogDriverConfig | undefined;
|
|
29
29
|
readonly containerArgs?: readonly string[] | undefined;
|
|
30
|
+
/** When false, the container runs in the foreground (no -d). Defaults to true. */
|
|
31
|
+
readonly detached?: boolean | undefined;
|
|
30
32
|
}) => readonly string[];
|
|
31
33
|
/**
|
|
32
34
|
* Starts a container using `docker run`.
|