@galaxy-tool-util/schema 1.10.1 → 1.12.0
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/index.d.ts +26 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -1
- package/dist/index.js.map +1 -1
- package/dist/schema/bundle-types.d.ts +6 -2
- package/dist/schema/bundle-types.d.ts.map +1 -1
- package/dist/schema/bundle-types.js.map +1 -1
- package/dist/schema/parameter-defaults.d.ts.map +1 -1
- package/dist/schema/parameter-defaults.js +7 -3
- package/dist/schema/parameter-defaults.js.map +1 -1
- package/dist/schema/parameters/base.d.ts.map +1 -1
- package/dist/schema/parameters/base.js +3 -1
- package/dist/schema/parameters/base.js.map +1 -1
- package/dist/schema/parameters/gx-drill-down.js +2 -1
- package/dist/schema/parameters/gx-drill-down.js.map +1 -1
- package/dist/schema/parameters/gx-text.js +2 -2
- package/dist/schema/parameters/gx-text.js.map +1 -1
- package/dist/schema/parsed-tool.d.ts +180 -10
- package/dist/schema/parsed-tool.d.ts.map +1 -1
- package/dist/schema/parsed-tool.js +56 -2
- package/dist/schema/parsed-tool.js.map +1 -1
- package/dist/schema/state-representations.js +1 -1
- package/dist/schema/state-representations.js.map +1 -1
- package/dist/tool-state-validator.d.ts +2 -2
- package/dist/tool-state-validator.d.ts.map +1 -1
- package/dist/tool-state-validator.js +4 -4
- package/dist/tool-state-validator.js.map +1 -1
- package/dist/trs/index.d.ts +110 -0
- package/dist/trs/index.d.ts.map +1 -0
- package/dist/trs/index.js +64 -0
- package/dist/trs/index.js.map +1 -0
- package/dist/user-tool-parse/index.d.ts +4 -1
- package/dist/user-tool-parse/index.d.ts.map +1 -1
- package/dist/user-tool-parse/index.js +4 -1
- package/dist/user-tool-parse/index.js.map +1 -1
- package/dist/user-tool-parse/input-source.d.ts +105 -0
- package/dist/user-tool-parse/input-source.d.ts.map +1 -0
- package/dist/user-tool-parse/input-source.js +271 -0
- package/dist/user-tool-parse/input-source.js.map +1 -0
- package/dist/user-tool-parse/inputs.d.ts +15 -8
- package/dist/user-tool-parse/inputs.d.ts.map +1 -1
- package/dist/user-tool-parse/inputs.js +188 -295
- package/dist/user-tool-parse/inputs.js.map +1 -1
- package/dist/user-tool-parse/outputs.d.ts +2 -1
- package/dist/user-tool-parse/outputs.d.ts.map +1 -1
- package/dist/user-tool-parse/outputs.js +4 -3
- package/dist/user-tool-parse/outputs.js.map +1 -1
- package/dist/user-tool-parse/parse.d.ts +17 -2
- package/dist/user-tool-parse/parse.d.ts.map +1 -1
- package/dist/user-tool-parse/parse.js +23 -6
- package/dist/user-tool-parse/parse.js.map +1 -1
- package/dist/workflow/normalized/stateful-runner.d.ts +3 -1
- package/dist/workflow/normalized/stateful-runner.d.ts.map +1 -1
- package/dist/workflow/normalized/stateful-runner.js +1 -1
- package/dist/workflow/normalized/stateful-runner.js.map +1 -1
- package/dist/workflow/normalized/toFormat2Stateful.js +8 -10
- package/dist/workflow/normalized/toFormat2Stateful.js.map +1 -1
- package/dist/workflow/normalized/toNativeStateful.d.ts.map +1 -1
- package/dist/workflow/normalized/toNativeStateful.js +3 -10
- package/dist/workflow/normalized/toNativeStateful.js.map +1 -1
- package/dist/workflow/report-models.d.ts +1 -1
- package/dist/workflow/report-models.d.ts.map +1 -1
- package/dist/workflow/report-models.js +1 -0
- package/dist/workflow/report-models.js.map +1 -1
- package/dist/workflow/stateful-convert.d.ts.map +1 -1
- package/dist/workflow/stateful-convert.js +6 -0
- package/dist/workflow/stateful-convert.js.map +1 -1
- package/dist/workflow/stateful-validate.d.ts +12 -5
- package/dist/workflow/stateful-validate.d.ts.map +1 -1
- package/dist/workflow/stateful-validate.js +62 -24
- package/dist/workflow/stateful-validate.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateful-convert.js","sourceRoot":"","sources":["../../src/workflow/stateful-convert.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stateful-convert.js","sourceRoot":"","sources":["../../src/workflow/stateful-convert.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,14 +36,21 @@ export declare class ConversionValidationFailure extends Error {
|
|
|
36
36
|
*/
|
|
37
37
|
export declare function validateNativeStepState(inputs: ToolParameterModel[], toolState: Record<string, unknown>, inputConnections?: Record<string, unknown>): void;
|
|
38
38
|
/**
|
|
39
|
-
* Validate format2 tool_state
|
|
40
|
-
*
|
|
41
|
-
*
|
|
39
|
+
* Validate format2 tool_state after stateful conversion.
|
|
40
|
+
*
|
|
41
|
+
* Validation follows the upstream Python two-model pipeline:
|
|
42
|
+
*
|
|
43
|
+
* 1. Strip any serialized ConnectedValue markers and validate the stored state
|
|
44
|
+
* against `workflow_step`. Every field is optional in this unlinked editor
|
|
45
|
+
* representation, but values that are present must still have the right type.
|
|
46
|
+
* 2. Inject the step's actual `in` connections and validate the effective state
|
|
47
|
+
* against `workflow_step_linked`. This restores requiredness while allowing a
|
|
48
|
+
* connection marker to satisfy a required leaf.
|
|
42
49
|
*
|
|
43
50
|
* Returns silently on success or if the schema cannot be built. Throws
|
|
44
51
|
* `ConversionValidationFailure` with phase="post" on validation failure.
|
|
45
52
|
*/
|
|
46
|
-
export declare function validateFormat2StepState(inputs: ToolParameterModel[], format2State: Record<string, unknown>): void;
|
|
53
|
+
export declare function validateFormat2StepState(inputs: ToolParameterModel[], format2State: Record<string, unknown>, inputConnections?: Record<string, unknown>): void;
|
|
47
54
|
/**
|
|
48
55
|
* A single diagnostic produced by tool-state validation.
|
|
49
56
|
*
|
|
@@ -70,5 +77,5 @@ export declare function stringContainerDiagnostic(error: StringContainerError):
|
|
|
70
77
|
* corresponding parameter definition. Returns an empty array if the schema
|
|
71
78
|
* cannot be built or validation passes.
|
|
72
79
|
*/
|
|
73
|
-
export declare function validateFormat2StepStateStrict(inputs: ToolParameterModel[], format2State: Record<string, unknown>): ToolStateDiagnostic[];
|
|
80
|
+
export declare function validateFormat2StepStateStrict(inputs: ToolParameterModel[], format2State: Record<string, unknown>, inputConnections?: Record<string, unknown>): ToolStateDiagnostic[];
|
|
74
81
|
//# sourceMappingURL=stateful-validate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateful-validate.d.ts","sourceRoot":"","sources":["../../src/workflow/stateful-validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,OAAO,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAA4B,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;AAE7C;;;;GAIG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;aAGlC,KAAK,EAAE,eAAe;aACtB,MAAM,EAAE,MAAM,EAAE;IAHlC,QAAQ,CAAC,IAAI,EAAG,6BAA6B,CAAU;gBAErC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EAAE;CAKnC;
|
|
1
|
+
{"version":3,"file":"stateful-validate.d.ts","sourceRoot":"","sources":["../../src/workflow/stateful-validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,OAAO,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAA4B,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;AAE7C;;;;GAIG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;aAGlC,KAAK,EAAE,eAAe;aACtB,MAAM,EAAE,MAAM,EAAE;IAHlC,QAAQ,CAAC,IAAI,EAAG,6BAA6B,CAAU;gBAErC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EAAE;CAKnC;AA6BD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAC7C,IAAI,CAaN;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAC7C,IAAI,CAsBN;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,mBAAmB,CAO1F;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,kBAAkB,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAC7C,mBAAmB,EAAE,CAsDvB"}
|
|
@@ -39,6 +39,13 @@ function formatIssues(error) {
|
|
|
39
39
|
const issues = ParseResult.ArrayFormatter.formatErrorSync(error);
|
|
40
40
|
return issues.map((i) => (i.path.length ? `${i.path.join(".")}: ${i.message}` : i.message));
|
|
41
41
|
}
|
|
42
|
+
/** Decode `state` against `model`, throwing a phase-tagged failure on mismatch. */
|
|
43
|
+
function decodeOrThrow(model, state, phase) {
|
|
44
|
+
const result = S.decodeUnknownEither(model, { onExcessProperty: "ignore" })(state);
|
|
45
|
+
if (result._tag === "Left") {
|
|
46
|
+
throw new ConversionValidationFailure(phase, formatIssues(result.left));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
42
49
|
function buildBundle(inputs) {
|
|
43
50
|
return { parameters: inputs };
|
|
44
51
|
}
|
|
@@ -67,32 +74,41 @@ export function validateNativeStepState(inputs, toolState, inputConnections = {}
|
|
|
67
74
|
if (Object.keys(inputConnections).length > 0) {
|
|
68
75
|
injectConnectionsIntoState(inputs, state, inputConnections);
|
|
69
76
|
}
|
|
70
|
-
|
|
71
|
-
const result = decode(state);
|
|
72
|
-
if (result._tag === "Left") {
|
|
73
|
-
throw new ConversionValidationFailure("pre", formatIssues(result.left));
|
|
74
|
-
}
|
|
77
|
+
decodeOrThrow(model, state, "pre");
|
|
75
78
|
}
|
|
76
79
|
/**
|
|
77
|
-
* Validate format2 tool_state
|
|
78
|
-
*
|
|
79
|
-
*
|
|
80
|
+
* Validate format2 tool_state after stateful conversion.
|
|
81
|
+
*
|
|
82
|
+
* Validation follows the upstream Python two-model pipeline:
|
|
83
|
+
*
|
|
84
|
+
* 1. Strip any serialized ConnectedValue markers and validate the stored state
|
|
85
|
+
* against `workflow_step`. Every field is optional in this unlinked editor
|
|
86
|
+
* representation, but values that are present must still have the right type.
|
|
87
|
+
* 2. Inject the step's actual `in` connections and validate the effective state
|
|
88
|
+
* against `workflow_step_linked`. This restores requiredness while allowing a
|
|
89
|
+
* connection marker to satisfy a required leaf.
|
|
80
90
|
*
|
|
81
91
|
* Returns silently on success or if the schema cannot be built. Throws
|
|
82
92
|
* `ConversionValidationFailure` with phase="post" on validation failure.
|
|
83
93
|
*/
|
|
84
|
-
export function validateFormat2StepState(inputs, format2State) {
|
|
94
|
+
export function validateFormat2StepState(inputs, format2State, inputConnections = {}) {
|
|
85
95
|
const bundle = buildBundle(inputs);
|
|
86
|
-
const
|
|
87
|
-
|
|
96
|
+
const unlinkedModel = createFieldModel(bundle, "workflow_step");
|
|
97
|
+
const linkedModel = createFieldModel(bundle, "workflow_step_linked");
|
|
98
|
+
if (!unlinkedModel || !linkedModel)
|
|
88
99
|
return;
|
|
89
100
|
const state = deepClone(format2State);
|
|
90
101
|
stripConnectedValues(inputs, state);
|
|
91
|
-
|
|
92
|
-
const
|
|
93
|
-
|
|
94
|
-
|
|
102
|
+
decodeOrThrow(unlinkedModel, state, "post");
|
|
103
|
+
const linkedState = deepClone(state);
|
|
104
|
+
const remaining = injectConnectionsIntoState(inputs, linkedState, inputConnections, {
|
|
105
|
+
linked: true,
|
|
106
|
+
});
|
|
107
|
+
const unmatched = Object.keys(remaining);
|
|
108
|
+
if (unmatched.length > 0) {
|
|
109
|
+
throw new ConversionValidationFailure("post", unmatched.map((path) => `${path}: input connection does not match a tool parameter`));
|
|
95
110
|
}
|
|
111
|
+
decodeOrThrow(linkedModel, linkedState, "post");
|
|
96
112
|
}
|
|
97
113
|
/**
|
|
98
114
|
* Map a {@link StringContainerError} thrown by the walker into a located
|
|
@@ -115,10 +131,11 @@ export function stringContainerDiagnostic(error) {
|
|
|
115
131
|
* corresponding parameter definition. Returns an empty array if the schema
|
|
116
132
|
* cannot be built or validation passes.
|
|
117
133
|
*/
|
|
118
|
-
export function validateFormat2StepStateStrict(inputs, format2State) {
|
|
134
|
+
export function validateFormat2StepStateStrict(inputs, format2State, inputConnections = {}) {
|
|
119
135
|
const bundle = buildBundle(inputs);
|
|
120
|
-
const
|
|
121
|
-
|
|
136
|
+
const unlinkedModel = createFieldModel(bundle, "workflow_step");
|
|
137
|
+
const linkedModel = createFieldModel(bundle, "workflow_step_linked");
|
|
138
|
+
if (!unlinkedModel || !linkedModel)
|
|
122
139
|
return [];
|
|
123
140
|
const state = deepClone(format2State);
|
|
124
141
|
// The walker rejects a scalar where a container is expected by throwing; the
|
|
@@ -133,16 +150,37 @@ export function validateFormat2StepStateStrict(inputs, format2State) {
|
|
|
133
150
|
}
|
|
134
151
|
throw error;
|
|
135
152
|
}
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
return
|
|
153
|
+
const decodeStrict = (model, value) => {
|
|
154
|
+
const result = S.decodeUnknownEither(model, { onExcessProperty: "error" })(value);
|
|
155
|
+
if (result._tag === "Right")
|
|
156
|
+
return [];
|
|
157
|
+
return ParseResult.ArrayFormatter.formatErrorSync(result.left).map((i) => ({
|
|
141
158
|
path: i.path.map(String).join("."),
|
|
142
159
|
message: i.message,
|
|
143
160
|
severity: "error",
|
|
144
161
|
}));
|
|
162
|
+
};
|
|
163
|
+
const unlinkedDiagnostics = decodeStrict(unlinkedModel, state);
|
|
164
|
+
if (unlinkedDiagnostics.length > 0)
|
|
165
|
+
return unlinkedDiagnostics;
|
|
166
|
+
const linkedState = deepClone(state);
|
|
167
|
+
let remaining;
|
|
168
|
+
try {
|
|
169
|
+
remaining = injectConnectionsIntoState(inputs, linkedState, inputConnections, { linked: true });
|
|
170
|
+
}
|
|
171
|
+
catch (error) {
|
|
172
|
+
if (error instanceof StringContainerError) {
|
|
173
|
+
return [stringContainerDiagnostic(error)];
|
|
174
|
+
}
|
|
175
|
+
throw error;
|
|
145
176
|
}
|
|
146
|
-
|
|
177
|
+
const unmatchedDiagnostics = Object.keys(remaining).map((path) => ({
|
|
178
|
+
path: path.split("|").join("."),
|
|
179
|
+
message: "Input connection does not match a tool parameter.",
|
|
180
|
+
severity: "error",
|
|
181
|
+
}));
|
|
182
|
+
if (unmatchedDiagnostics.length > 0)
|
|
183
|
+
return unmatchedDiagnostics;
|
|
184
|
+
return decodeStrict(linkedModel, linkedState);
|
|
147
185
|
}
|
|
148
186
|
//# sourceMappingURL=stateful-validate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateful-validate.js","sourceRoot":"","sources":["../../src/workflow/stateful-validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,CAAC,MAAM,eAAe,CAAC;AACnC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,6EAA6E;AAC7E,2EAA2E;AAC3E,6EAA6E;AAC7E,OAAO,+BAA+B,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAInD;;;;GAIG;AACH,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IAGlC;IACA;IAHT,IAAI,GAAG,6BAAsC,CAAC;IACvD,YACkB,KAAsB,EACtB,MAAgB;QAEhC,KAAK,CAAC,gBAAgB,KAAK,2BAA2B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAH3D,UAAK,GAAL,KAAK,CAAiB;QACtB,WAAM,GAAN,MAAM,CAAU;QAGhC,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;AAED,SAAS,YAAY,CAAC,KAA6B;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,WAAW,CAAC,MAA4B;IAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC;AAED;oEACoE;AACpE,SAAS,SAAS,CAAI,KAAQ;IAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAM,CAAC;AAChD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CACrC,MAA4B,EAC5B,SAAkC,EAClC,mBAA4C,EAAE;IAE9C,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,2EAA2E;IAE/F,4EAA4E;IAC5E,iEAAiE;IACjE,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7C,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"stateful-validate.js","sourceRoot":"","sources":["../../src/workflow/stateful-validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,CAAC,MAAM,eAAe,CAAC;AACnC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,6EAA6E;AAC7E,2EAA2E;AAC3E,6EAA6E;AAC7E,OAAO,+BAA+B,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAInD;;;;GAIG;AACH,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IAGlC;IACA;IAHT,IAAI,GAAG,6BAAsC,CAAC;IACvD,YACkB,KAAsB,EACtB,MAAgB;QAEhC,KAAK,CAAC,gBAAgB,KAAK,2BAA2B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAH3D,UAAK,GAAL,KAAK,CAAiB;QACtB,WAAM,GAAN,MAAM,CAAU;QAGhC,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;AAED,SAAS,YAAY,CAAC,KAA6B;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,mFAAmF;AACnF,SAAS,aAAa,CACpB,KAAwB,EACxB,KAA8B,EAC9B,KAAsB;IAEtB,MAAM,MAAM,GAAG,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IACnF,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,2BAA2B,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,MAA4B;IAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC;AAED;oEACoE;AACpE,SAAS,SAAS,CAAI,KAAQ;IAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAM,CAAC;AAChD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CACrC,MAA4B,EAC5B,SAAkC,EAClC,mBAA4C,EAAE;IAE9C,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,2EAA2E;IAE/F,4EAA4E;IAC5E,iEAAiE;IACjE,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7C,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,KAA0B,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,wBAAwB,CACtC,MAA4B,EAC5B,YAAqC,EACrC,mBAA4C,EAAE;IAE9C,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACrE,IAAI,CAAC,aAAa,IAAI,CAAC,WAAW;QAAE,OAAO;IAE3C,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACtC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpC,aAAa,CAAC,aAAkC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAEjE,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE;QAClF,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,2BAA2B,CACnC,MAAM,EACN,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,oDAAoD,CAAC,CACrF,CAAC;IACJ,CAAC;IACD,aAAa,CAAC,WAAgC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC;AAeD;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAA2B;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,sBAAsB,IAAI,yDAAyD;QAC5F,QAAQ,EAAE,OAAO;KAClB,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,8BAA8B,CAC5C,MAA4B,EAC5B,YAAqC,EACrC,mBAA4C,EAAE;IAE9C,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACrE,IAAI,CAAC,aAAa,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAE9C,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACtC,6EAA6E;IAC7E,4EAA4E;IAC5E,iDAAiD;IACjD,IAAI,CAAC;QACH,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;YAC1C,OAAO,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,KAAwB,EAAE,KAA8B,EAAE,EAAE;QAChF,MAAM,MAAM,GAAG,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAClF,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,EAAE,CAAC;QACvC,OAAO,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAChE,CAAC,CAAC,EAAuB,EAAE,CAAC,CAAC;YAC3B,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAClC,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,QAAQ,EAAE,OAAO;SAClB,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,YAAY,CAAC,aAAkC,EAAE,KAAK,CAAC,CAAC;IACpF,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,mBAAmB,CAAC;IAE/D,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,SAAkC,CAAC;IACvC,IAAI,CAAC;QACH,SAAS,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAClG,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;YAC1C,OAAO,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CACrD,CAAC,IAAI,EAAuB,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC/B,OAAO,EAAE,mDAAmD;QAC5D,QAAQ,EAAE,OAAO;KAClB,CAAC,CACH,CAAC;IACF,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,oBAAoB,CAAC;IAEjE,OAAO,YAAY,CAAC,WAAgC,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC"}
|