@jahia/jahia-cli 0.3.1 → 0.5.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/environment/create.d.ts.map +1 -1
- package/dist/commands/environment/create.js +1 -0
- package/dist/commands/environment/create.js.map +1 -1
- package/dist/commands/environment/list.d.ts.map +1 -1
- package/dist/commands/environment/list.js +1 -0
- package/dist/commands/environment/list.js.map +1 -1
- package/dist/commands/jahia/alive.d.ts.map +1 -1
- package/dist/commands/jahia/alive.js +28 -10
- package/dist/commands/jahia/alive.js.map +1 -1
- package/dist/commands/tests/build.d.ts +1 -0
- package/dist/commands/tests/build.d.ts.map +1 -1
- package/dist/commands/tests/build.js +8 -0
- package/dist/commands/tests/build.js.map +1 -1
- package/dist/commands/tests/run.d.ts +17 -2
- package/dist/commands/tests/run.d.ts.map +1 -1
- package/dist/commands/tests/run.js +70 -6
- package/dist/commands/tests/run.js.map +1 -1
- package/dist/commands/workflow/run.d.ts.map +1 -1
- package/dist/commands/workflow/run.js +26 -18
- package/dist/commands/workflow/run.js.map +1 -1
- 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/types.d.ts +16 -0
- package/dist/lib/components/types.d.ts.map +1 -1
- package/dist/lib/config/parser.d.ts.map +1 -1
- package/dist/lib/config/parser.js +11 -0
- package/dist/lib/config/parser.js.map +1 -1
- package/dist/lib/config/types.d.ts +1 -0
- package/dist/lib/config/types.d.ts.map +1 -1
- package/dist/lib/output/formatter.d.ts +2 -0
- package/dist/lib/output/formatter.d.ts.map +1 -1
- package/dist/lib/output/formatter.js +58 -21
- package/dist/lib/output/formatter.js.map +1 -1
- package/dist/lib/providers/docker/container.d.ts +16 -0
- package/dist/lib/providers/docker/container.d.ts.map +1 -1
- package/dist/lib/providers/docker/container.js +22 -0
- package/dist/lib/providers/docker/container.js.map +1 -1
- package/dist/lib/providers/docker/index.d.ts.map +1 -1
- package/dist/lib/providers/docker/index.js +12 -2
- package/dist/lib/providers/docker/index.js.map +1 -1
- package/dist/lib/providers/types.d.ts +6 -1
- package/dist/lib/providers/types.d.ts.map +1 -1
- package/dist/lib/state/types.d.ts +18 -0
- package/dist/lib/state/types.d.ts.map +1 -1
- package/dist/lib/tests/build-image.d.ts +1 -0
- package/dist/lib/tests/build-image.d.ts.map +1 -1
- package/dist/lib/tests/build-image.js +2 -5
- package/dist/lib/tests/build-image.js.map +1 -1
- package/dist/lib/workflow/format-workflow-sources.d.ts +1 -1
- package/dist/lib/workflow/format-workflow-sources.d.ts.map +1 -1
- package/dist/lib/workflow/format-workflow-sources.js +19 -19
- package/dist/lib/workflow/format-workflow-sources.js.map +1 -1
- package/dist/lib/workflow/merge-workflow-sources.d.ts +4 -1
- package/dist/lib/workflow/merge-workflow-sources.d.ts.map +1 -1
- package/dist/lib/workflow/merge-workflow-sources.js +4 -4
- package/dist/lib/workflow/merge-workflow-sources.js.map +1 -1
- package/dist/lib/workflow/resolve-workflows-file-path.d.ts +14 -5
- package/dist/lib/workflow/resolve-workflows-file-path.d.ts.map +1 -1
- package/dist/lib/workflow/resolve-workflows-file-path.js +13 -7
- package/dist/lib/workflow/resolve-workflows-file-path.js.map +1 -1
- package/dist/lib/workflow/types.d.ts +3 -0
- package/dist/lib/workflow/types.d.ts.map +1 -1
- package/dist/lib/workflow/types.js +8 -3
- package/dist/lib/workflow/types.js.map +1 -1
- package/oclif.manifest.json +287 -278
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/providers/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/providers/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,20 @@
|
|
|
1
1
|
import type { EnvironmentConfig } from '../config/types.js';
|
|
2
|
+
import type { PortMapping } from '../components/types.js';
|
|
3
|
+
/**
|
|
4
|
+
* Endpoint visibility for a component — how to reach it from inside
|
|
5
|
+
* the Docker network ("Docker network") and from the host machine ("Host").
|
|
6
|
+
*
|
|
7
|
+
* `aliases` lists all Docker network aliases the container is reachable by.
|
|
8
|
+
* `ports` lists the container/host port mappings.
|
|
9
|
+
*
|
|
10
|
+
* Derive addresses as:
|
|
11
|
+
* Docker network: <aliases[0]>:<port.container>
|
|
12
|
+
* Host: localhost:<port.host>
|
|
13
|
+
*/
|
|
14
|
+
export interface ComponentEndpoints {
|
|
15
|
+
readonly aliases: readonly string[];
|
|
16
|
+
readonly ports: readonly PortMapping[];
|
|
17
|
+
}
|
|
2
18
|
/**
|
|
3
19
|
* A persisted component entry — tracks container identity for lifecycle ops.
|
|
4
20
|
*/
|
|
@@ -7,6 +23,8 @@ export interface PersistedComponent {
|
|
|
7
23
|
readonly image: string;
|
|
8
24
|
readonly tag: string;
|
|
9
25
|
readonly containerId: string;
|
|
26
|
+
/** Endpoint info populated at creation time. Optional for backward compat with old state files. */
|
|
27
|
+
readonly endpoints?: ComponentEndpoints | undefined;
|
|
10
28
|
}
|
|
11
29
|
/**
|
|
12
30
|
* Full persisted environment state — stored in the state file.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/state/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/state/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,mGAAmG;IACnG,QAAQ,CAAC,SAAS,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,WAAW,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;CACzD"}
|
|
@@ -26,6 +26,7 @@ export declare const buildBuildxArgs: (params: {
|
|
|
26
26
|
readonly dockerfile: string;
|
|
27
27
|
readonly tag: string;
|
|
28
28
|
readonly baseVersion: string;
|
|
29
|
+
readonly context?: string | undefined;
|
|
29
30
|
readonly platform?: string | undefined;
|
|
30
31
|
readonly noCache?: boolean | undefined;
|
|
31
32
|
readonly extraBuildArgs?: Readonly<Record<string, string>> | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-image.d.ts","sourceRoot":"","sources":["../../../src/lib/tests/build-image.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,kBAAkB,4BAA4B,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,MAAM,EACjB,SAAS,MAAM,KACd,MAAmC,CAAC;AAEvC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,MAAM,EAAE,KACtB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAW/B,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;CACxE,KAAG,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"build-image.d.ts","sourceRoot":"","sources":["../../../src/lib/tests/build-image.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,kBAAkB,4BAA4B,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,MAAM,EACjB,SAAS,MAAM,KACd,MAAmC,CAAC;AAEvC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,MAAM,EAAE,KACtB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAW/B,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;CACxE,KAAG,SAAS,MAAM,EA6BlB,CAAC"}
|
|
@@ -49,11 +49,8 @@ export const buildBuildxArgs = (params) => {
|
|
|
49
49
|
}
|
|
50
50
|
// --load makes the image available in the local Docker daemon
|
|
51
51
|
args.push('--load');
|
|
52
|
-
// Build context
|
|
53
|
-
|
|
54
|
-
? params.dockerfile.slice(0, params.dockerfile.lastIndexOf('/'))
|
|
55
|
-
: '.';
|
|
56
|
-
args.push(contextDir);
|
|
52
|
+
// Build context defaults to CWD (.), can be overridden via config or flag
|
|
53
|
+
args.push(params.context ?? '.');
|
|
57
54
|
return args;
|
|
58
55
|
};
|
|
59
56
|
//# sourceMappingURL=build-image.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-image.js","sourceRoot":"","sources":["../../../src/lib/tests/build-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,yBAAyB,CAAC;AAE5D;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAEhD;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAiB,EACjB,OAAe,EACP,EAAE,CAAC,GAAG,SAAS,IAAI,OAAO,EAAE,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAuB,EACW,EAAE,CACpC,MAAM,CAAC,WAAW,CAChB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,gCAAgC,GAAG,+BAA+B,CACnE,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC,CACH,CAAC;AAEJ;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"build-image.js","sourceRoot":"","sources":["../../../src/lib/tests/build-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,yBAAyB,CAAC;AAE5D;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAEhD;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAiB,EACjB,OAAe,EACP,EAAE,CAAC,GAAG,SAAS,IAAI,OAAO,EAAE,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAuB,EACW,EAAE,CACpC,MAAM,CAAC,WAAW,CAChB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,gCAAgC,GAAG,+BAA+B,CACnE,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC,CACH,CAAC;AAEJ;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAQ/B,EAAqB,EAAE;IACtB,MAAM,IAAI,GAAa;QACrB,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,MAAM,CAAC,UAAU;QACvB,IAAI,EAAE,MAAM,CAAC,GAAG;QAChB,aAAa,EAAE,gBAAgB,MAAM,CAAC,WAAW,EAAE;KACpD,CAAC;IAEF,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAED,8DAA8D;IAC9D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEpB,0EAA0E;IAC1E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;IAEjC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -4,7 +4,7 @@ import type { MergedWorkflowsResult } from './merge-workflow-sources.js';
|
|
|
4
4
|
/**
|
|
5
5
|
* Builds the human-readable "Workflow sources:" section.
|
|
6
6
|
*/
|
|
7
|
-
export declare const formatWorkflowSources: (configPath: string,
|
|
7
|
+
export declare const formatWorkflowSources: (configPath: string, configWorkflowCount: number, workflowFileResult: GlobalWorkflowsLoadResult | undefined) => string;
|
|
8
8
|
/**
|
|
9
9
|
* Builds the human-readable "Available workflows:" section.
|
|
10
10
|
* Marks the selected workflow with → and the default with (default).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAkB,MAAM,6BAA6B,CAAC;AAEzF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,YAAY,MAAM,EAClB,
|
|
1
|
+
{"version":3,"file":"format-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAkB,MAAM,6BAA6B,CAAC;AAEzF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,YAAY,MAAM,EAClB,qBAAqB,MAAM,EAC3B,oBAAoB,yBAAyB,GAAG,SAAS,KACxD,MAsBF,CAAC;AAcF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,cAAc,qBAAqB,EACnC,cAAc,MAAM,KACnB,MAeF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,YAAY,MAAM,EAClB,gBAAgB,YAAY,GAAG,SAAS,EACxC,cAAc,yBAAyB,GAAG,SAAS,EACnD,cAAc,qBAAqB,EACnC,cAAc,MAAM,KACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CA0BvB,CAAC"}
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Builds the human-readable "Workflow sources:" section.
|
|
3
3
|
*/
|
|
4
|
-
export const formatWorkflowSources = (configPath,
|
|
4
|
+
export const formatWorkflowSources = (configPath, configWorkflowCount, workflowFileResult) => {
|
|
5
5
|
const lines = ['▶ Workflow sources:'];
|
|
6
|
-
const
|
|
7
|
-
? `✓
|
|
8
|
-
: `
|
|
9
|
-
lines.push(` ${
|
|
10
|
-
if (
|
|
11
|
-
if (!
|
|
12
|
-
lines.push(` ⚠
|
|
6
|
+
const configLabel = configWorkflowCount > 0
|
|
7
|
+
? `✓ Config: ${configPath} (${String(configWorkflowCount)} workflows)`
|
|
8
|
+
: ` Config: ${configPath} (no workflows)`;
|
|
9
|
+
lines.push(` ${configLabel}`);
|
|
10
|
+
if (workflowFileResult !== undefined) {
|
|
11
|
+
if (!workflowFileResult.found) {
|
|
12
|
+
lines.push(` ⚠ Workflow file: ${workflowFileResult.path} (file not found, skipping)`);
|
|
13
13
|
}
|
|
14
|
-
else if (
|
|
15
|
-
lines.push(` ⚠
|
|
14
|
+
else if (workflowFileResult.error !== undefined) {
|
|
15
|
+
lines.push(` ⚠ Workflow file: ${workflowFileResult.path} (${workflowFileResult.error})`);
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
|
-
const count =
|
|
19
|
-
? Object.keys(
|
|
18
|
+
const count = workflowFileResult.workflows !== undefined
|
|
19
|
+
? Object.keys(workflowFileResult.workflows).length
|
|
20
20
|
: 0;
|
|
21
|
-
lines.push(` ✓
|
|
21
|
+
lines.push(` ✓ Workflow file: ${workflowFileResult.path} (${String(count)} workflows loaded)`);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
return lines.join('\n');
|
|
@@ -28,9 +28,9 @@ export const formatWorkflowSources = (configPath, localWorkflowCount, globalResu
|
|
|
28
28
|
*/
|
|
29
29
|
const sourceLabel = (source) => {
|
|
30
30
|
const labels = {
|
|
31
|
-
'
|
|
32
|
-
'
|
|
33
|
-
'
|
|
31
|
+
'workflow-file': 'workflow file',
|
|
32
|
+
'config': 'config',
|
|
33
|
+
'config-override': 'config, overrides workflow file',
|
|
34
34
|
};
|
|
35
35
|
return labels[source];
|
|
36
36
|
};
|
|
@@ -41,7 +41,7 @@ const sourceLabel = (source) => {
|
|
|
41
41
|
export const formatAvailableWorkflows = (mergedResult, selectedName) => {
|
|
42
42
|
const lines = ['▶ Available workflows:'];
|
|
43
43
|
Object.entries(mergedResult.workflows).forEach(([name, wf]) => {
|
|
44
|
-
const source = mergedResult.sources[name] ?? '
|
|
44
|
+
const source = mergedResult.sources[name] ?? 'config';
|
|
45
45
|
const isSelected = name === selectedName;
|
|
46
46
|
const isDefault = wf.default === true;
|
|
47
47
|
const prefix = isSelected ? '→' : ' ';
|
|
@@ -57,13 +57,13 @@ export const formatAvailableWorkflows = (mergedResult, selectedName) => {
|
|
|
57
57
|
*/
|
|
58
58
|
export const buildWorkflowSourcesJson = (configPath, localWorkflows, globalResult, mergedResult, selectedName) => ({
|
|
59
59
|
sources: {
|
|
60
|
-
|
|
60
|
+
config: {
|
|
61
61
|
path: configPath,
|
|
62
62
|
workflowCount: localWorkflows !== undefined ? Object.keys(localWorkflows).length : 0,
|
|
63
63
|
},
|
|
64
64
|
...(globalResult !== undefined
|
|
65
65
|
? {
|
|
66
|
-
|
|
66
|
+
workflowFile: {
|
|
67
67
|
path: globalResult.path,
|
|
68
68
|
found: globalResult.found,
|
|
69
69
|
...(globalResult.error !== undefined ? { error: globalResult.error } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,UAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"format-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { WorkflowsMap } from '../config/types.js';
|
|
2
2
|
/**
|
|
3
3
|
* Source attribution for each workflow in the merged map.
|
|
4
|
+
* - 'workflow-file': from the dedicated workflows file
|
|
5
|
+
* - 'config': from the main config file
|
|
6
|
+
* - 'config-override': defined in config, overriding a same-name workflow from the workflow file
|
|
4
7
|
*/
|
|
5
|
-
export type WorkflowSource = '
|
|
8
|
+
export type WorkflowSource = 'workflow-file' | 'config' | 'config-override';
|
|
6
9
|
/**
|
|
7
10
|
* Result of merging global and local workflow sources.
|
|
8
11
|
* Includes the merged workflows map and per-name source attribution.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvE
|
|
1
|
+
{"version":3,"file":"merge-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,QAAQ,GAAG,iBAAiB,CAAC;AAE5E;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;CAC5D;AAkBD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,YAAY,GAAG,SAAS,EAChC,OAAO,YAAY,GAAG,SAAS,KAC9B,qBAAqB,GAAG,SAoC1B,CAAC"}
|
|
@@ -27,14 +27,14 @@ export const mergeWorkflowSources = (global, local) => {
|
|
|
27
27
|
if (global === undefined) {
|
|
28
28
|
const sources = {};
|
|
29
29
|
Object.keys(local ?? {}).forEach((name) => {
|
|
30
|
-
sources[name] = '
|
|
30
|
+
sources[name] = 'config';
|
|
31
31
|
});
|
|
32
32
|
return { workflows: local ?? {}, sources };
|
|
33
33
|
}
|
|
34
34
|
if (local === undefined) {
|
|
35
35
|
const sources = {};
|
|
36
36
|
Object.keys(global).forEach((name) => {
|
|
37
|
-
sources[name] = '
|
|
37
|
+
sources[name] = 'workflow-file';
|
|
38
38
|
});
|
|
39
39
|
return { workflows: global, sources };
|
|
40
40
|
}
|
|
@@ -44,10 +44,10 @@ export const mergeWorkflowSources = (global, local) => {
|
|
|
44
44
|
const sources = {};
|
|
45
45
|
Object.keys(merged).forEach((name) => {
|
|
46
46
|
if (name in local) {
|
|
47
|
-
sources[name] = name in global ? '
|
|
47
|
+
sources[name] = name in global ? 'config-override' : 'config';
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
|
-
sources[name] = '
|
|
50
|
+
sources[name] = 'workflow-file';
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
return { workflows: merged, sources };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,MAAM,aAAa,GAAG,CACpB,SAAuB,EACT,EAAE,CAChB,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,EAAE,CAAC,OAAO,KAAK,IAAI;QACjB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE;QACrB,CAAC,CAAC,EAAE;CACP,CAAC,CACH,CAAC;AAEJ;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAAgC,EAChC,KAA+B,EACI,EAAE;IACrC,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;IAC/E,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAEzE,MAAM,MAAM,GAAmC,EAAE,GAAG,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC;IAChF,MAAM,OAAO,GAAmC,EAAE,CAAC;IAEnD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC;QAClC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AACxC,CAAC,CAAC"}
|
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Default filename for the global workflows file, looked up in CWD.
|
|
3
|
+
*/
|
|
4
|
+
export declare const DEFAULT_WORKFLOWS_FILENAME = "jahia-cli.workflows.global.yml";
|
|
5
|
+
/**
|
|
6
|
+
* Resolves the path to the workflows file.
|
|
3
7
|
*
|
|
4
8
|
* Precedence:
|
|
5
9
|
* 1. CLI flag value (resolved relative to CWD)
|
|
6
10
|
* 2. Config key value (resolved relative to config file directory)
|
|
7
|
-
* 3.
|
|
11
|
+
* 3. Default: jahia-cli.workflows.global.yml in CWD
|
|
8
12
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
13
|
+
* Returns { path, isExplicit } where isExplicit is true when the user
|
|
14
|
+
* explicitly specified a file (via flag or config key) rather than relying on
|
|
15
|
+
* the default. This distinction drives error handling: an explicit file that
|
|
16
|
+
* is missing triggers a warning, while a missing default is silently skipped.
|
|
11
17
|
*/
|
|
12
|
-
export declare const resolveWorkflowsFilePath: (configDir: string, configKey: string | undefined, flagValue: string | undefined) =>
|
|
18
|
+
export declare const resolveWorkflowsFilePath: (configDir: string, configKey: string | undefined, flagValue: string | undefined) => {
|
|
19
|
+
readonly path: string;
|
|
20
|
+
readonly isExplicit: boolean;
|
|
21
|
+
};
|
|
13
22
|
//# sourceMappingURL=resolve-workflows-file-path.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-workflows-file-path.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAEA
|
|
1
|
+
{"version":3,"file":"resolve-workflows-file-path.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAE3E;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GACnC,WAAW,MAAM,EACjB,WAAW,MAAM,GAAG,SAAS,EAC7B,WAAW,MAAM,GAAG,SAAS,KAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;CAUvD,CAAC"}
|
|
@@ -1,22 +1,28 @@
|
|
|
1
1
|
import { resolve } from 'node:path';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
3
|
+
* Default filename for the global workflows file, looked up in CWD.
|
|
4
|
+
*/
|
|
5
|
+
export const DEFAULT_WORKFLOWS_FILENAME = 'jahia-cli.workflows.global.yml';
|
|
6
|
+
/**
|
|
7
|
+
* Resolves the path to the workflows file.
|
|
4
8
|
*
|
|
5
9
|
* Precedence:
|
|
6
10
|
* 1. CLI flag value (resolved relative to CWD)
|
|
7
11
|
* 2. Config key value (resolved relative to config file directory)
|
|
8
|
-
* 3.
|
|
12
|
+
* 3. Default: jahia-cli.workflows.global.yml in CWD
|
|
9
13
|
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
14
|
+
* Returns { path, isExplicit } where isExplicit is true when the user
|
|
15
|
+
* explicitly specified a file (via flag or config key) rather than relying on
|
|
16
|
+
* the default. This distinction drives error handling: an explicit file that
|
|
17
|
+
* is missing triggers a warning, while a missing default is silently skipped.
|
|
12
18
|
*/
|
|
13
19
|
export const resolveWorkflowsFilePath = (configDir, configKey, flagValue) => {
|
|
14
20
|
if (flagValue !== undefined) {
|
|
15
|
-
return resolve(flagValue);
|
|
21
|
+
return { path: resolve(flagValue), isExplicit: true };
|
|
16
22
|
}
|
|
17
23
|
if (configKey !== undefined) {
|
|
18
|
-
return resolve(configDir, configKey);
|
|
24
|
+
return { path: resolve(configDir, configKey), isExplicit: true };
|
|
19
25
|
}
|
|
20
|
-
return
|
|
26
|
+
return { path: resolve(DEFAULT_WORKFLOWS_FILENAME), isExplicit: false };
|
|
21
27
|
};
|
|
22
28
|
//# sourceMappingURL=resolve-workflows-file-path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-workflows-file-path.js","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC
|
|
1
|
+
{"version":3,"file":"resolve-workflows-file-path.js","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAC;AAE3E;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,SAAiB,EACjB,SAA6B,EAC7B,SAA6B,EAC4B,EAAE;IAC3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,0BAA0B,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC1E,CAAC,CAAC"}
|
|
@@ -25,6 +25,9 @@ export declare const getStepDisplayName: (step: WorkflowStep, index: number) =>
|
|
|
25
25
|
* Each key-value pair becomes --key value in the argument list.
|
|
26
26
|
* Boolean values are handled specially: 'true' emits --key (no value),
|
|
27
27
|
* 'false' omits the flag entirely (OCLIF boolean flags are toggles).
|
|
28
|
+
*
|
|
29
|
+
* Values support ${VAR} and ${VAR:-default} env var substitution,
|
|
30
|
+
* consistent with other config sections (component overrides, workflowsFile, etc.).
|
|
28
31
|
*/
|
|
29
32
|
export declare const buildFlagsFromWith: (withRecord: Readonly<Record<string, string>> | undefined) => readonly string[];
|
|
30
33
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,YAAY,EAAE,OAAO,MAAM,KAAG,MACJ,CAAC;AAEpE;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,YAAY,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,KACvD,SAAS,MAAM,EAkBjB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveEnvVars } from '../config/resolve-env-vars.js';
|
|
1
2
|
/**
|
|
2
3
|
* Builds a step display name from its definition.
|
|
3
4
|
*/
|
|
@@ -7,19 +8,23 @@ export const getStepDisplayName = (step, index) => step.name ?? step.uses ?? ste
|
|
|
7
8
|
* Each key-value pair becomes --key value in the argument list.
|
|
8
9
|
* Boolean values are handled specially: 'true' emits --key (no value),
|
|
9
10
|
* 'false' omits the flag entirely (OCLIF boolean flags are toggles).
|
|
11
|
+
*
|
|
12
|
+
* Values support ${VAR} and ${VAR:-default} env var substitution,
|
|
13
|
+
* consistent with other config sections (component overrides, workflowsFile, etc.).
|
|
10
14
|
*/
|
|
11
15
|
export const buildFlagsFromWith = (withRecord) => {
|
|
12
16
|
if (withRecord === undefined) {
|
|
13
17
|
return [];
|
|
14
18
|
}
|
|
15
19
|
return Object.entries(withRecord).flatMap(([key, value]) => {
|
|
16
|
-
|
|
20
|
+
const resolved = resolveEnvVars(value);
|
|
21
|
+
if (resolved === 'true') {
|
|
17
22
|
return [`--${key}`];
|
|
18
23
|
}
|
|
19
|
-
if (
|
|
24
|
+
if (resolved === 'false') {
|
|
20
25
|
return [];
|
|
21
26
|
}
|
|
22
|
-
return [`--${key}`,
|
|
27
|
+
return [`--${key}`, resolved];
|
|
23
28
|
});
|
|
24
29
|
};
|
|
25
30
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/workflow/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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"}
|