@redocly/respect-core 2.75.0 → 2.77.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/lib/modules/flow-runner/runner.d.ts.map +1 -1
- package/lib/modules/flow-runner/runner.js +18 -0
- package/lib/modules/flow-runner/runner.js.map +1 -1
- package/lib/modules/runtime-expressions/evaluate.d.ts.map +1 -1
- package/lib/modules/runtime-expressions/evaluate.js +5 -117
- package/lib/modules/runtime-expressions/evaluate.js.map +1 -1
- package/lib/modules/runtime-expressions/interpret-expression.d.ts +8 -0
- package/lib/modules/runtime-expressions/interpret-expression.d.ts.map +1 -0
- package/lib/modules/runtime-expressions/interpret-expression.js +215 -0
- package/lib/modules/runtime-expressions/interpret-expression.js.map +1 -0
- package/lib/utils/api-fetcher.d.ts.map +1 -1
- package/lib/utils/api-fetcher.js +1 -3
- package/lib/utils/api-fetcher.js.map +1 -1
- package/lib/utils/digest-auth/generate-digest-auth-header.d.ts +0 -1
- package/lib/utils/digest-auth/generate-digest-auth-header.d.ts.map +1 -1
- package/lib/utils/digest-auth/generate-digest-auth-header.js +7 -5
- package/lib/utils/digest-auth/generate-digest-auth-header.js.map +1 -1
- package/lib/utils/digest-auth/parse-www-authenticate-header.d.ts +0 -2
- package/lib/utils/digest-auth/parse-www-authenticate-header.d.ts.map +1 -1
- package/lib/utils/digest-auth/parse-www-authenticate-header.js +19 -13
- package/lib/utils/digest-auth/parse-www-authenticate-header.js.map +1 -1
- package/package.json +2 -2
- package/lib/modules/runtime-expressions/replace-json-pointers.d.ts +0 -2
- package/lib/modules/runtime-expressions/replace-json-pointers.d.ts.map +0 -1
- package/lib/modules/runtime-expressions/replace-json-pointers.js +0 -60
- package/lib/modules/runtime-expressions/replace-json-pointers.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIrE,OAAO,KAAK,EAGV,WAAW,EACX,UAAU,EACV,QAAQ,EAGR,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAEnB,MAAM,gBAAgB,CAAC;AAkBxB,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,eAAe,EACf,kBAAkB,GACnB,EAAE;IACD,OAAO,EAAE,UAAU,CAAC;IACpB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;;;GAoBA;AAyFD,wBAAsB,WAAW,CAAC,EAChC,aAAa,EACb,GAAG,EACH,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,eAAe,GAChB,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIrE,OAAO,KAAK,EAGV,WAAW,EACX,UAAU,EACV,QAAQ,EAGR,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAEnB,MAAM,gBAAgB,CAAC;AAkBxB,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,eAAe,EACf,kBAAkB,GACnB,EAAE;IACD,OAAO,EAAE,UAAU,CAAC;IACpB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;;;GAoBA;AAyFD,wBAAsB,WAAW,CAAC,EAChC,aAAa,EACb,GAAG,EACH,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,eAAe,GAChB,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CA2JrD;AA+DD,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,gBAAgB,EAAE,QAAQ,EAC1B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,MAAM,wBA+Bf"}
|
|
@@ -203,6 +203,7 @@ export async function runWorkflow({ workflowInput, ctx, inputs, fromStepId, skip
|
|
|
203
203
|
},
|
|
204
204
|
workflowId,
|
|
205
205
|
});
|
|
206
|
+
const hasFailedSteps = hasFailedLastAttempt(runCtx.executedSteps);
|
|
206
207
|
const outputs = {};
|
|
207
208
|
for (const outputKey of Object.keys(workflow.outputs)) {
|
|
208
209
|
try {
|
|
@@ -213,6 +214,9 @@ export async function runWorkflow({ workflowInput, ctx, inputs, fromStepId, skip
|
|
|
213
214
|
});
|
|
214
215
|
}
|
|
215
216
|
catch (error) {
|
|
217
|
+
// A failed step leaves the values its outputs read unset, and the step reports the failure.
|
|
218
|
+
if (hasFailedSteps)
|
|
219
|
+
continue;
|
|
216
220
|
throw new Error(`Failed to resolve output "${outputKey}" in workflow "${workflowId}": ${error.message}`);
|
|
217
221
|
}
|
|
218
222
|
}
|
|
@@ -320,4 +324,18 @@ function calculateWorkflowTotalTimeMs(executedSteps) {
|
|
|
320
324
|
}
|
|
321
325
|
return totalTime;
|
|
322
326
|
}
|
|
327
|
+
// a retry runs the step again in the same run, so the last entry of a step id is its result
|
|
328
|
+
function hasFailedLastAttempt(executedSteps) {
|
|
329
|
+
return executedSteps.some((entry, index) => {
|
|
330
|
+
const isRetriedLater = entry.stepId !== undefined &&
|
|
331
|
+
executedSteps.findLastIndex((other) => other.stepId === entry.stepId) !== index;
|
|
332
|
+
if (isRetriedLater) {
|
|
333
|
+
return false;
|
|
334
|
+
}
|
|
335
|
+
if (isWorkflowExecutionResult(entry)) {
|
|
336
|
+
return hasFailedLastAttempt(entry.executedSteps);
|
|
337
|
+
}
|
|
338
|
+
return entry.checks.some((check) => !check.passed && check.severity === 'error');
|
|
339
|
+
});
|
|
340
|
+
}
|
|
323
341
|
//# sourceMappingURL=runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAM/D,wBAAgB,gCAAgC,CAAC,EAC/C,OAAO,EACP,OAAO,EACP,WAAW,EACX,MAAM,GACP,EAAE;IACD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,wBAAwB,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;CACzB,GAAG,GAAG,CAiDN;AAGD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,GAAG,EACf,OAAO,EAAE,wBAAwB,EACjC,MAAM,EAAE,eAAe,GACtB,GAAG,CAgBL;
|
|
1
|
+
{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAM/D,wBAAgB,gCAAgC,CAAC,EAC/C,OAAO,EACP,OAAO,EACP,WAAW,EACX,MAAM,GACP,EAAE;IACD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,wBAAwB,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;CACzB,GAAG,GAAG,CAiDN;AAGD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,GAAG,EACf,OAAO,EAAE,wBAAwB,EACjC,MAAM,EAAE,eAAe,GACtB,GAAG,CAgBL;AAoED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAiBnE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isPlainObject } from '@redocly/openapi-core';
|
|
2
2
|
import { getFakeData, parseJson } from '../context-parser/index.js';
|
|
3
|
+
import { interpretExpression } from './interpret-expression.js';
|
|
3
4
|
import { lintExpression } from './lint.js';
|
|
4
|
-
import { replaceJSONPointers } from './replace-json-pointers.js';
|
|
5
5
|
// Used when evaluating expressions in a string that can contain other text, like request bodies payload, output values, etc.
|
|
6
6
|
export function evaluateRuntimeExpressionPayload({ payload, context, contentType, logger, }) {
|
|
7
7
|
if (contentType?.includes('application/octet-stream')) {
|
|
@@ -84,127 +84,15 @@ function evaluateExpressionString(expression, context, logger) {
|
|
|
84
84
|
}
|
|
85
85
|
// Validate expression syntax to match ABNF Arazzo grammar
|
|
86
86
|
lintExpression(expression);
|
|
87
|
-
const normalizedExpression = normalizeExpression(expression, context);
|
|
88
|
-
// Normalize the context for evaluation by replacing hyphens with underscores in all keys
|
|
89
|
-
const normalizedContext = normalizeContext(context);
|
|
90
87
|
try {
|
|
91
|
-
|
|
92
|
-
const evaluate = new Function(...Object.keys(normalizedContext), `return ${normalizedExpression};`);
|
|
93
|
-
// Evaluate the modified expression
|
|
94
|
-
return evaluate(...Object.values(normalizedContext));
|
|
88
|
+
return interpretExpression(expression, context);
|
|
95
89
|
}
|
|
96
|
-
catch (
|
|
97
|
-
|
|
90
|
+
catch (error) {
|
|
91
|
+
const cause = error instanceof Error ? `: ${error.message}` : '';
|
|
92
|
+
throw new Error(`Error in resolving runtime expression '${expression}'${cause}. \n` +
|
|
98
93
|
"This could be because the expression references a value from a previous failed step, or is trying to reference a variable that hasn't been set.");
|
|
99
94
|
}
|
|
100
95
|
}
|
|
101
|
-
// Normalize the expression to replace hyphens with underscores and convert to lowercase
|
|
102
|
-
function normalizeSymbolsExpression(expression) {
|
|
103
|
-
return expression.replace(/\$([a-zA-Z0-9._-]+)/g, (_match, variable) => {
|
|
104
|
-
// Normalize variable by replacing hyphens with underscores and converting to lowercase
|
|
105
|
-
const normalizedKey = variable.replace(/-/g, '_'); // Replace hyphens with underscores
|
|
106
|
-
return `$${normalizedKey}`; // Return the normalized variable for evaluation
|
|
107
|
-
});
|
|
108
|
-
}
|
|
109
|
-
function normalizeExpression(expression, context) {
|
|
110
|
-
const modifiedJsExpression = replaceJSONPointers(expression, context);
|
|
111
|
-
// Remove the curly braces surrounding the ENTIRE expression (if any), but not braces within JSON
|
|
112
|
-
let cleanedJsExpression = modifiedJsExpression;
|
|
113
|
-
if (cleanedJsExpression.startsWith('{') && cleanedJsExpression.endsWith('}')) {
|
|
114
|
-
// A runtime expression wrapper has the form {$variable...} with no nested braces until the end
|
|
115
|
-
const potentialUnwrapped = cleanedJsExpression.slice(1, -1);
|
|
116
|
-
// Unwrap if it doesn't look like JSON (i.e., doesn't start with { or [)
|
|
117
|
-
if (!potentialUnwrapped.trim().startsWith('{') && !potentialUnwrapped.trim().startsWith('[')) {
|
|
118
|
-
cleanedJsExpression = potentialUnwrapped;
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
return splitByStringLiterals(cleanedJsExpression)
|
|
122
|
-
.map((part, index) => (index % 2 === 0 ? normalizeCode(part) : part))
|
|
123
|
-
.join('');
|
|
124
|
-
}
|
|
125
|
-
// Splits the expression into [code, literal, code, literal, ..., code]
|
|
126
|
-
function splitByStringLiterals(expression) {
|
|
127
|
-
const parts = [];
|
|
128
|
-
let partStart = 0;
|
|
129
|
-
while (partStart < expression.length) {
|
|
130
|
-
const quoteIndex = expression.slice(partStart).search(/["']/);
|
|
131
|
-
if (quoteIndex === -1) {
|
|
132
|
-
break;
|
|
133
|
-
}
|
|
134
|
-
const literalStart = partStart + quoteIndex;
|
|
135
|
-
parts.push(expression.slice(partStart, literalStart));
|
|
136
|
-
const literalEnd = findStringLiteralEnd(expression, literalStart);
|
|
137
|
-
parts.push(expression.slice(literalStart, literalEnd));
|
|
138
|
-
partStart = literalEnd;
|
|
139
|
-
}
|
|
140
|
-
parts.push(expression.slice(partStart));
|
|
141
|
-
return parts;
|
|
142
|
-
}
|
|
143
|
-
function findStringLiteralEnd(expression, start) {
|
|
144
|
-
const quote = expression[start];
|
|
145
|
-
for (let index = start + 1; index < expression.length; index++) {
|
|
146
|
-
const char = expression[index];
|
|
147
|
-
if (char === quote) {
|
|
148
|
-
return index + 1;
|
|
149
|
-
}
|
|
150
|
-
if (char === '\\') {
|
|
151
|
-
index++;
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
return expression.length;
|
|
155
|
-
}
|
|
156
|
-
function normalizeCode(code) {
|
|
157
|
-
// Replace hyphens with underscores in `$...` references to match the keys normalized by `normalizeContext`
|
|
158
|
-
const normalizedSymbolsExpression = normalizeSymbolsExpression(code);
|
|
159
|
-
// Convert numeric indices (e.g., `.0`) into square bracket notation (e.g., `[0]`)
|
|
160
|
-
const expressionWithBrackets = convertNumericIndices(normalizedSymbolsExpression);
|
|
161
|
-
// Check if the expression contains `.header.` and lowercase the parameter after `.header.`.
|
|
162
|
-
// As headers are case-insensitive, we need to normalize the header names to lowercase for evaluation.
|
|
163
|
-
const headerParameterNameRegex = /\.header\.([a-zA-Z0-9._-]+)/g;
|
|
164
|
-
return expressionWithBrackets.replace(headerParameterNameRegex, (_match, p1) => {
|
|
165
|
-
return `.header.${p1.toLowerCase()}`;
|
|
166
|
-
});
|
|
167
|
-
}
|
|
168
|
-
// Normalize the entire context to replace hyphens with underscores in all keys
|
|
169
|
-
function normalizeContext(context) {
|
|
170
|
-
const normalized = {};
|
|
171
|
-
for (const [key, value] of Object.entries(context)) {
|
|
172
|
-
// Normalize variable names to lowercase and replace hyphens with underscores
|
|
173
|
-
const normalizedKey = key.replace(/-/g, '_');
|
|
174
|
-
normalized[normalizedKey] = normalizeValue(value);
|
|
175
|
-
}
|
|
176
|
-
return normalized;
|
|
177
|
-
}
|
|
178
|
-
// Normalize values recursively, handling objects and primitives
|
|
179
|
-
function normalizeValue(value) {
|
|
180
|
-
if (Array.isArray(value)) {
|
|
181
|
-
// If the value is an array, return it as-is without modifying
|
|
182
|
-
return value;
|
|
183
|
-
}
|
|
184
|
-
else if (isPlainObject(value)) {
|
|
185
|
-
return normalizeObject(value);
|
|
186
|
-
}
|
|
187
|
-
return value;
|
|
188
|
-
}
|
|
189
|
-
// Normalize an object by replacing hyphens with underscores in keys
|
|
190
|
-
function normalizeObject(obj) {
|
|
191
|
-
return Object.keys(obj).reduce((acc, key) => {
|
|
192
|
-
const normalizedKey = key.replace(/-/g, '_'); // Convert hyphens to underscores
|
|
193
|
-
acc[normalizedKey] = normalizeValue(obj[key]);
|
|
194
|
-
return acc;
|
|
195
|
-
}, {});
|
|
196
|
-
}
|
|
197
|
-
function convertNumericIndices(expression) {
|
|
198
|
-
// Match any dot followed by a number (e.g., .0, .1, etc.) and replace it with [0], [1], etc.
|
|
199
|
-
// but not modify floats.
|
|
200
|
-
return expression.replace(/\.(\d+)/g, (match, num, offset, str) => {
|
|
201
|
-
// Look at the character right before the dot
|
|
202
|
-
const charBeforeDot = str[offset - 1];
|
|
203
|
-
// If the character before the dot is a digit, it's a float
|
|
204
|
-
const isFloat = /\d/.test(charBeforeDot);
|
|
205
|
-
return isFloat ? match : `[${num}]`;
|
|
206
|
-
});
|
|
207
|
-
}
|
|
208
96
|
// Helper function to evaluate expressions within a string
|
|
209
97
|
function evaluateExpressionsInString(expression, context, logger) {
|
|
210
98
|
const regex = /\{(?:[^{}]|\{[^{}]*\})*\}|\$[^\s{}]+(?:\([^()]*\))*/g;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwB,MAAM,uBAAuB,CAAC;AAG5E,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwB,MAAM,uBAAuB,CAAC;AAG5E,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,6HAA6H;AAC7H,MAAM,UAAU,gCAAgC,CAAC,EAC/C,OAAO,EACP,OAAO,EACP,WAAW,EACX,MAAM,GAMP;IACC,IAAI,WAAW,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,WAAW,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACjD,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;YAChC,MAAM,iBAAiB,GAAG,IAAI,QAAQ,EAAE,CAAC;YAEzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC7C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;oBAC1B,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,MAAM,cAAc,GAAG,gCAAgC,CAAC;wBACtD,OAAO,EAAE,KAAK;wBACd,OAAO;wBACP,MAAM;qBACP,CAAC,CAAC;oBACH,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;YAED,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,6BAA6B;QAC7B,OAAO,uBAAuB,CAAC,OAAO,CAAC;YACrC,CAAC,CAAC,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC;YACrD,CAAC,CAAC,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;SAAM,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,gCAAgC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACjF,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAyB,CAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1B,gCAAgC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CACrE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,kEAAkE;QAClE,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,yBAAyB,CACvC,UAAe,EACf,OAAiC,EACjC,MAAuB;IAEvB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;SAAM,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CACtC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACtE,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAyB,CAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAClF,CAAC;SAAM,CAAC;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,UAAkB,EAClB,OAAiC,EACjC,MAAuB;IAEvB,iFAAiF;IACjF,iDAAiD;IACjD,IAAI,0CAA0C,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAChE,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,yCAAyC,CAAC;QAC7D,UAAU,GAAG,UAAU;aACpB,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC;aACD,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3D,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,0DAA0D;IAC1D,cAAc,CAAC,UAAU,CAAC,CAAC;IAE3B,IAAI,CAAC;QACH,OAAO,mBAAmB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CACb,0CAA0C,UAAU,IAAI,KAAK,MAAM;YACjE,iJAAiJ,CACpJ,CAAC;IACJ,CAAC;AACH,CAAC;AAED,0DAA0D;AAC1D,SAAS,2BAA2B,CAClC,UAAkB,EAClB,OAAiC,EACjC,MAAuB;IAEvB,MAAM,KAAK,GAAG,sDAAsD,CAAC;IAErE,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEpC,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACrF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,0FAA0F;QAC1F,MAAM,cAAc,GAAG,yBAAyB,CAAC,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAElF,gFAAgF;QAChF,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,uBAAuB,cAAc,oBAAoB;gBACvD,sHAAsH,CACzH,CAAC;QACJ,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,UAAkB;IACxD,MAAM,iBAAiB,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IAE5C,IAAI,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,CAAC,CACC,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpE,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACvE,EACD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,wBAAwB,CAAC,UAAkB;IAClD,IAAI,CAAC;QACH,cAAc,CAAC,UAAU,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { RuntimeExpressionContext } from '../../types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Evaluates a runtime expression that passed `lintExpression` against the context. Values are
|
|
4
|
+
* read as data and compared with the JavaScript operators of the same name. `||` and `&&` do not
|
|
5
|
+
* resolve the right side when the left side decides the result.
|
|
6
|
+
*/
|
|
7
|
+
export declare function interpretExpression(expression: string, context: RuntimeExpressionContext): unknown;
|
|
8
|
+
//# sourceMappingURL=interpret-expression.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interpret-expression.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/interpret-expression.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAwB/D;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAyDT"}
|
|
@@ -0,0 +1,215 @@
|
|
|
1
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
2
|
+
const REFERENCE_CHAR = /[\w.-]/;
|
|
3
|
+
// The `Unescaped` and `Escaped` characters of `jsonPointer` in abnf-parser.pegjs.
|
|
4
|
+
const POINTER_CHAR = /[!-.0-9A-Z_a-z/~]/;
|
|
5
|
+
const NUMBER = /^\d+(?:\.\d+)?/;
|
|
6
|
+
const KEYWORD = /^(?:true|false|null|undefined)\b/;
|
|
7
|
+
const EMPTY_ARRAY = /^\[\s*\]/;
|
|
8
|
+
const OPERATORS = ['==', '!=', '<=', '>=', '&&', '||', '<', '>', '{', '}'];
|
|
9
|
+
const COMPARISONS = new Set(['==', '!=', '<', '<=', '>', '>=']);
|
|
10
|
+
const KEYWORD_VALUES = {
|
|
11
|
+
true: true,
|
|
12
|
+
false: false,
|
|
13
|
+
null: null,
|
|
14
|
+
undefined: undefined,
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Evaluates a runtime expression that passed `lintExpression` against the context. Values are
|
|
18
|
+
* read as data and compared with the JavaScript operators of the same name. `||` and `&&` do not
|
|
19
|
+
* resolve the right side when the left side decides the result.
|
|
20
|
+
*/
|
|
21
|
+
export function interpretExpression(expression, context) {
|
|
22
|
+
const tokens = tokenize(expression);
|
|
23
|
+
let position = 0;
|
|
24
|
+
const isOperator = (text) => {
|
|
25
|
+
const token = tokens[position];
|
|
26
|
+
return token?.kind === 'operator' && token.text === text;
|
|
27
|
+
};
|
|
28
|
+
const parseOr = () => {
|
|
29
|
+
let evaluate = parseAnd();
|
|
30
|
+
while (isOperator('||')) {
|
|
31
|
+
position++;
|
|
32
|
+
const [left, right] = [evaluate, parseAnd()];
|
|
33
|
+
evaluate = () => left() || right();
|
|
34
|
+
}
|
|
35
|
+
return evaluate;
|
|
36
|
+
};
|
|
37
|
+
const parseAnd = () => {
|
|
38
|
+
let evaluate = parseComparison();
|
|
39
|
+
while (isOperator('&&')) {
|
|
40
|
+
position++;
|
|
41
|
+
const [left, right] = [evaluate, parseComparison()];
|
|
42
|
+
evaluate = () => left() && right();
|
|
43
|
+
}
|
|
44
|
+
return evaluate;
|
|
45
|
+
};
|
|
46
|
+
const parseComparison = () => {
|
|
47
|
+
let evaluate = parsePrimary();
|
|
48
|
+
let token = tokens[position];
|
|
49
|
+
while (token?.kind === 'operator' && COMPARISONS.has(token.text)) {
|
|
50
|
+
position++;
|
|
51
|
+
const [operator, left, right] = [token.text, evaluate, parsePrimary()];
|
|
52
|
+
evaluate = () => compare(operator, left(), right());
|
|
53
|
+
token = tokens[position];
|
|
54
|
+
}
|
|
55
|
+
return evaluate;
|
|
56
|
+
};
|
|
57
|
+
const parsePrimary = () => {
|
|
58
|
+
const token = tokens[position++];
|
|
59
|
+
if (token?.kind === 'literal')
|
|
60
|
+
return () => token.value;
|
|
61
|
+
if (token?.kind === 'reference')
|
|
62
|
+
return () => resolveReference(token.text, context);
|
|
63
|
+
if (token?.kind === 'operator' && token.text === '{') {
|
|
64
|
+
const evaluate = parseOr();
|
|
65
|
+
if (!isOperator('}'))
|
|
66
|
+
throw new Error(`Expected "}" in "${expression}"`);
|
|
67
|
+
position++;
|
|
68
|
+
return evaluate;
|
|
69
|
+
}
|
|
70
|
+
throw new Error(`Unexpected end or token in "${expression}"`);
|
|
71
|
+
};
|
|
72
|
+
const evaluate = parseOr();
|
|
73
|
+
if (position < tokens.length)
|
|
74
|
+
throw new Error(`Unexpected token in "${expression}"`);
|
|
75
|
+
return evaluate();
|
|
76
|
+
}
|
|
77
|
+
function compare(operator, left, right) {
|
|
78
|
+
const [a, b] = [asOperand(left), asOperand(right)];
|
|
79
|
+
switch (operator) {
|
|
80
|
+
case '==':
|
|
81
|
+
// oxlint-disable-next-line eqeqeq -- Respect compares with loose equality, as before
|
|
82
|
+
return left == right;
|
|
83
|
+
case '!=':
|
|
84
|
+
// oxlint-disable-next-line eqeqeq -- Respect compares with loose equality, as before
|
|
85
|
+
return left != right;
|
|
86
|
+
case '<':
|
|
87
|
+
return a < b;
|
|
88
|
+
case '<=':
|
|
89
|
+
return a <= b;
|
|
90
|
+
case '>':
|
|
91
|
+
return a > b;
|
|
92
|
+
default:
|
|
93
|
+
return a >= b;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
// JavaScript converts any operand of `<`, `<=`, `>` and `>=` itself, as the evaluator did before.
|
|
97
|
+
function asOperand(value) {
|
|
98
|
+
return value;
|
|
99
|
+
}
|
|
100
|
+
/** Respect has always returned a value read by a dot path with the hyphens of its object keys as underscores. */
|
|
101
|
+
function withUnderscoreKeys(value) {
|
|
102
|
+
if (!isPlainObject(value))
|
|
103
|
+
return value;
|
|
104
|
+
return Object.fromEntries(Object.entries(value).map(([key, item]) => [key.replace(/-/g, '_'), withUnderscoreKeys(item)]));
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* Reads `$source.path.to.value`, optionally followed by a JSON Pointer. A pointer that reaches no
|
|
108
|
+
* value throws. As a Respect extension, a `.` after the pointer starts a property chain, as in
|
|
109
|
+
* `$response.body#/items.length`, so a pointer cannot reach a key that contains `.`.
|
|
110
|
+
*/
|
|
111
|
+
function resolveReference(text, context) {
|
|
112
|
+
const hashIndex = text.indexOf('#');
|
|
113
|
+
const path = hashIndex === -1 ? text : text.slice(0, hashIndex);
|
|
114
|
+
const [root, ...segments] = path.slice(1).split('.');
|
|
115
|
+
const value = walk(context, [`$${root}`, ...segments]);
|
|
116
|
+
if (hashIndex === -1)
|
|
117
|
+
return withUnderscoreKeys(value);
|
|
118
|
+
const [pointer, ...chain] = text.slice(hashIndex + 1).split('.');
|
|
119
|
+
return walk(atPointer(value, pointer), chain);
|
|
120
|
+
}
|
|
121
|
+
/** Property access as JavaScript does it, on own properties only. */
|
|
122
|
+
function walk(value, segments) {
|
|
123
|
+
let current = value;
|
|
124
|
+
let previous;
|
|
125
|
+
for (const segment of segments) {
|
|
126
|
+
if (current === null || current === undefined) {
|
|
127
|
+
throw new TypeError(`Cannot read "${segment}" of ${current}`);
|
|
128
|
+
}
|
|
129
|
+
current = ownProperty(current, segment, previous?.toLowerCase() === 'header');
|
|
130
|
+
previous = segment;
|
|
131
|
+
}
|
|
132
|
+
return current;
|
|
133
|
+
}
|
|
134
|
+
/** A hyphen and an underscore match each other in a name, and header names ignore case. */
|
|
135
|
+
function ownProperty(container, name, ignoresCase) {
|
|
136
|
+
const object = Object(container);
|
|
137
|
+
if (Object.hasOwn(object, name))
|
|
138
|
+
return object[name];
|
|
139
|
+
const wanted = normalizeName(name, ignoresCase);
|
|
140
|
+
const key = Object.keys(object).find((candidate) => normalizeName(candidate, ignoresCase) === wanted);
|
|
141
|
+
return key === undefined ? undefined : object[key];
|
|
142
|
+
}
|
|
143
|
+
function normalizeName(name, ignoresCase) {
|
|
144
|
+
const normalized = name.replace(/-/g, '_');
|
|
145
|
+
return ignoresCase ? normalized.toLowerCase() : normalized;
|
|
146
|
+
}
|
|
147
|
+
function atPointer(value, pointer) {
|
|
148
|
+
let current = value;
|
|
149
|
+
for (const segment of pointer.split('/').slice(1)) {
|
|
150
|
+
const key = segment.replace(/~1/g, '/').replace(/~0/g, '~');
|
|
151
|
+
const object = current === null || current === undefined ? undefined : Object(current);
|
|
152
|
+
if (!object || !Object.hasOwn(object, key)) {
|
|
153
|
+
throw new Error(`JSON Pointer "${pointer}" reaches no value`);
|
|
154
|
+
}
|
|
155
|
+
current = object[key];
|
|
156
|
+
}
|
|
157
|
+
return current;
|
|
158
|
+
}
|
|
159
|
+
function tokenize(expression) {
|
|
160
|
+
const tokens = [];
|
|
161
|
+
let index = 0;
|
|
162
|
+
while (index < expression.length) {
|
|
163
|
+
const char = expression[index];
|
|
164
|
+
const rest = expression.slice(index);
|
|
165
|
+
if (/\s/.test(char)) {
|
|
166
|
+
index++;
|
|
167
|
+
}
|
|
168
|
+
else if (char === '$') {
|
|
169
|
+
let end = index + 1;
|
|
170
|
+
while (end < expression.length && REFERENCE_CHAR.test(expression[end]))
|
|
171
|
+
end++;
|
|
172
|
+
if (expression[end] === '#') {
|
|
173
|
+
end++;
|
|
174
|
+
while (end < expression.length && POINTER_CHAR.test(expression[end]))
|
|
175
|
+
end++;
|
|
176
|
+
}
|
|
177
|
+
tokens.push({ kind: 'reference', text: expression.slice(index, end) });
|
|
178
|
+
index = end;
|
|
179
|
+
}
|
|
180
|
+
else if (char === '"' || char === "'") {
|
|
181
|
+
const end = expression.indexOf(char, index + 1);
|
|
182
|
+
if (end === -1)
|
|
183
|
+
throw new Error(`Unclosed string in "${expression}"`);
|
|
184
|
+
tokens.push({ kind: 'literal', value: expression.slice(index + 1, end) });
|
|
185
|
+
index = end + 1;
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
const number = NUMBER.exec(rest)?.[0];
|
|
189
|
+
const keyword = KEYWORD.exec(rest)?.[0];
|
|
190
|
+
const emptyArray = EMPTY_ARRAY.exec(rest)?.[0];
|
|
191
|
+
const operator = OPERATORS.find((candidate) => expression.startsWith(candidate, index));
|
|
192
|
+
if (number) {
|
|
193
|
+
tokens.push({ kind: 'literal', value: Number(number) });
|
|
194
|
+
index += number.length;
|
|
195
|
+
}
|
|
196
|
+
else if (keyword) {
|
|
197
|
+
tokens.push({ kind: 'literal', value: KEYWORD_VALUES[keyword] });
|
|
198
|
+
index += keyword.length;
|
|
199
|
+
}
|
|
200
|
+
else if (emptyArray) {
|
|
201
|
+
tokens.push({ kind: 'literal', value: [] });
|
|
202
|
+
index += emptyArray.length;
|
|
203
|
+
}
|
|
204
|
+
else if (operator) {
|
|
205
|
+
tokens.push({ kind: 'operator', text: operator });
|
|
206
|
+
index += operator.length;
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
throw new Error(`Unexpected "${char}" in "${expression}"`);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return tokens;
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=interpret-expression.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interpret-expression.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/interpret-expression.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"AAMA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAOxF,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,IAAI,EACV,MAAM,aAAa,CAAC;AAOrB,UAAU,QAAQ;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,0BAiB3E;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,WAEpD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,WAEnD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,qBAAa,UAAW,YAAW,QAAQ;IACzC,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;gBAET,MAAM,EAAE,QAAQ;IAI5B,eAAe,GAAI,4CAA4C,UAAU,UAQvE;IAEF,cAAc,+BAEZ;IAEF,iBAAiB,GAAI,QAAQ,OAAO,CAAC,UAAU,CAAC,UAQ9C;IAEF,uBAAuB,GAAI,qFASxB,UAAU,UAWX;IAEF,sBAAsB,+BAEpB;IAEF,wBAAwB,aAEtB;IAEF,WAAW,GAAU,yCAKlB;QACD,GAAG,EAAE,WAAW,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC;QACX,WAAW,EAAE,WAAW,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;KAEpB,KAAG,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"api-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"AAMA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAOxF,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,IAAI,EACV,MAAM,aAAa,CAAC;AAOrB,UAAU,QAAQ;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,0BAiB3E;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,WAEpD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,WAEnD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,qBAAa,UAAW,YAAW,QAAQ;IACzC,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;gBAET,MAAM,EAAE,QAAQ;IAI5B,eAAe,GAAI,4CAA4C,UAAU,UAQvE;IAEF,cAAc,+BAEZ;IAEF,iBAAiB,GAAI,QAAQ,OAAO,CAAC,UAAU,CAAC,UAQ9C;IAEF,uBAAuB,GAAI,qFASxB,UAAU,UAWX;IAEF,sBAAsB,+BAEpB;IAEF,wBAAwB,aAEtB;IAEF,WAAW,GAAU,yCAKlB;QACD,GAAG,EAAE,WAAW,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC;QACX,WAAW,EAAE,WAAW,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;KAEpB,KAAG,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,CA2WlC;CACH"}
|
package/lib/utils/api-fetcher.js
CHANGED
|
@@ -283,7 +283,7 @@ export class ApiFetcher {
|
|
|
283
283
|
});
|
|
284
284
|
throw new UnexpectedError('Digest auth failed, no www-authenticate header received in the first response');
|
|
285
285
|
}
|
|
286
|
-
const { realm, nonce, opaque, qop, algorithm
|
|
286
|
+
const { realm, nonce, opaque, qop, algorithm } = parseWwwAuthenticateHeader(wwwAuthenticateHeader);
|
|
287
287
|
const { username, password } = lastDigestSecurityScheme.values;
|
|
288
288
|
const uri = new URL(urlToFetch).pathname + new URL(urlToFetch).search;
|
|
289
289
|
const digestAuthHeader = generateDigestAuthHeader({
|
|
@@ -294,8 +294,6 @@ export class ApiFetcher {
|
|
|
294
294
|
opaque,
|
|
295
295
|
qop,
|
|
296
296
|
algorithm,
|
|
297
|
-
cnonce,
|
|
298
|
-
nc,
|
|
299
297
|
uri,
|
|
300
298
|
method: method.toUpperCase(),
|
|
301
299
|
bodyContent: JSON.stringify(encodedBody) || '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-fetcher.js","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api-fetcher.js","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-digest-auth-header.d.ts","sourceRoot":"","sources":["../../../src/utils/digest-auth/generate-digest-auth-header.ts"],"names":[],"mappings":"AAOA,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,
|
|
1
|
+
{"version":3,"file":"generate-digest-auth-header.d.ts","sourceRoot":"","sources":["../../../src/utils/digest-auth/generate-digest-auth-header.ts"],"names":[],"mappings":"AAOA,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,KAAK,EACL,MAAoC,EACpC,SAA6B,EAC7B,GAAG,EACH,EAAe,EACf,MAAM,EACN,GAAG,EACH,MAAM,EACN,WAAgB,GACjB,EAAE,cAAc,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,UAgDxE;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,wBAAwB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,UA2BF"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import { md5 } from '@noble/hashes/legacy.js';
|
|
2
2
|
import { sha256 } from '@noble/hashes/sha2.js';
|
|
3
|
-
import { bytesToHex } from '@noble/hashes/utils';
|
|
3
|
+
import { bytesToHex, randomBytes } from '@noble/hashes/utils';
|
|
4
4
|
const DEFAULT_ALGORITHM = 'MD5';
|
|
5
5
|
const DEFAULT_NC = '00000001';
|
|
6
|
-
export function generateDigestAuthHeader({ username, password, nonce, realm, cnonce, algorithm = DEFAULT_ALGORITHM, qop, nc = DEFAULT_NC, opaque, uri, method, bodyContent = '', }) {
|
|
6
|
+
export function generateDigestAuthHeader({ username, password, nonce, realm, cnonce = bytesToHex(randomBytes(16)), algorithm = DEFAULT_ALGORITHM, qop, nc = DEFAULT_NC, opaque, uri, method, bodyContent = '', }) {
|
|
7
|
+
// The server can offer several qop values, the client answers with one of them
|
|
8
|
+
const qopOptions = qop?.split(',').map((option) => option.trim()) ?? [];
|
|
9
|
+
const selectedQop = qopOptions.includes('auth') ? 'auth' : qopOptions[0];
|
|
7
10
|
const requiredParams = {
|
|
8
11
|
username,
|
|
9
12
|
password,
|
|
10
13
|
realm,
|
|
11
14
|
nonce,
|
|
12
|
-
qop,
|
|
13
|
-
opaque,
|
|
15
|
+
qop: selectedQop,
|
|
14
16
|
uri,
|
|
15
17
|
method,
|
|
16
18
|
};
|
|
@@ -32,7 +34,7 @@ export function generateDigestAuthHeader({ username, password, nonce, realm, cno
|
|
|
32
34
|
`realm="${realm}"`,
|
|
33
35
|
`nonce="${nonce}"`,
|
|
34
36
|
`uri="${uri}"`,
|
|
35
|
-
`qop=${
|
|
37
|
+
`qop=${selectedQop}`,
|
|
36
38
|
`nc=${nc}`,
|
|
37
39
|
`cnonce="${cnonce}"`,
|
|
38
40
|
`response="${response}"`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-digest-auth-header.js","sourceRoot":"","sources":["../../../src/utils/digest-auth/generate-digest-auth-header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-digest-auth-header.js","sourceRoot":"","sources":["../../../src/utils/digest-auth/generate-digest-auth-header.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-www-authenticate-header.d.ts","sourceRoot":"","sources":["../../../src/utils/digest-auth/parse-www-authenticate-header.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-www-authenticate-header.d.ts","sourceRoot":"","sources":["../../../src/utils/digest-auth/parse-www-authenticate-header.ts"],"names":[],"mappings":"AAIA,wBAAgB,0BAA0B,CAAC,qBAAqB,EAAE,MAAM,GAAG;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAmBA"}
|
|
@@ -1,17 +1,23 @@
|
|
|
1
|
+
// challenge = auth-scheme [ 1*SP ( token68 / #auth-param ) ], auth-param = token "=" ( token / quoted-string )
|
|
2
|
+
// https://datatracker.ietf.org/doc/html/rfc7235#section-2.1
|
|
3
|
+
const SCHEME_OR_AUTH_PARAM = /([\w-]+)(?:\s*=\s*(?:"((?:[^"\\]|\\.)*)"|([^\s,]*)))?/g;
|
|
1
4
|
export function parseWwwAuthenticateHeader(wwwAuthenticateHeader) {
|
|
2
|
-
const
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
5
|
+
const params = {};
|
|
6
|
+
let isDigestChallenge = false;
|
|
7
|
+
for (const [, name, quotedValue, tokenValue] of wwwAuthenticateHeader.matchAll(SCHEME_OR_AUTH_PARAM)) {
|
|
8
|
+
const value = quotedValue?.replace(/\\(.)/g, '$1') ?? tokenValue;
|
|
9
|
+
if (value === undefined) {
|
|
10
|
+
// A name without a value starts the next challenge, read only the first Digest one
|
|
11
|
+
if (isDigestChallenge)
|
|
12
|
+
break;
|
|
13
|
+
isDigestChallenge = name.toLowerCase() === 'digest';
|
|
14
|
+
}
|
|
15
|
+
else if (isDigestChallenge) {
|
|
16
|
+
params[name.toLowerCase()] = value;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
6
19
|
// Digest The WWW-Authenticate Response Header Field: https://datatracker.ietf.org/doc/html/rfc7616#section-3.3
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
key,
|
|
10
|
-
headerParts
|
|
11
|
-
.find((part) => part.startsWith(`${key}=`))
|
|
12
|
-
?.split('=')[1]
|
|
13
|
-
?.replace(/"/g, ''),
|
|
14
|
-
]));
|
|
15
|
-
return result;
|
|
20
|
+
const { realm, nonce, opaque, qop, algorithm } = params;
|
|
21
|
+
return { realm, nonce, opaque, qop, algorithm };
|
|
16
22
|
}
|
|
17
23
|
//# sourceMappingURL=parse-www-authenticate-header.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-www-authenticate-header.js","sourceRoot":"","sources":["../../../src/utils/digest-auth/parse-www-authenticate-header.ts"],"names":[],"mappings":"AAAA,MAAM,
|
|
1
|
+
{"version":3,"file":"parse-www-authenticate-header.js","sourceRoot":"","sources":["../../../src/utils/digest-auth/parse-www-authenticate-header.ts"],"names":[],"mappings":"AAAA,+GAA+G;AAC/G,4DAA4D;AAC5D,MAAM,oBAAoB,GAAG,wDAAwD,CAAC;AAEtF,MAAM,UAAU,0BAA0B,CAAC,qBAA6B;IAOtE,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,KAAK,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAC5E,oBAAoB,CACrB,EAAE,CAAC;QACF,MAAM,KAAK,GAAG,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,UAAU,CAAC;QACjE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,mFAAmF;YACnF,IAAI,iBAAiB;gBAAE,MAAM;YAC7B,iBAAiB,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;QACtD,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC;QACrC,CAAC;IACH,CAAC;IAED,+GAA+G;IAC/G,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACxD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;AAClD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/respect-core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.77.0",
|
|
4
4
|
"description": "API testing framework core",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@faker-js/faker": "^10.6.0",
|
|
49
49
|
"@noble/hashes": "^1.8.0",
|
|
50
50
|
"@redocly/ajv": "^8.18.3",
|
|
51
|
-
"@redocly/openapi-core": "2.
|
|
51
|
+
"@redocly/openapi-core": "2.77.0",
|
|
52
52
|
"ajv": "npm:@redocly/ajv@^8.18.3",
|
|
53
53
|
"better-ajv-errors": "^2.0.3",
|
|
54
54
|
"colorette": "^2.0.20",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"replace-json-pointers.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/replace-json-pointers.ts"],"names":[],"mappings":"AAGA,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CA4C5E"}
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import { isPlainObject } from '@redocly/openapi-core';
|
|
2
|
-
import JsonPointerLib from 'json-pointer';
|
|
3
|
-
export function replaceJSONPointers(expression, context) {
|
|
4
|
-
const jsonPointerReplacementRules = [
|
|
5
|
-
{
|
|
6
|
-
pattern: /\$response\.body#\/([\w/-]+)/g,
|
|
7
|
-
ctxFunction: (match, pointer) => {
|
|
8
|
-
return resolvePointer(context.$response?.body, pointer, match);
|
|
9
|
-
},
|
|
10
|
-
},
|
|
11
|
-
{
|
|
12
|
-
pattern: /\$request\.body#\/([\w/-]+)/g,
|
|
13
|
-
ctxFunction: (match, pointer) => {
|
|
14
|
-
return resolvePointer(context.$request?.body, pointer, match);
|
|
15
|
-
},
|
|
16
|
-
},
|
|
17
|
-
{
|
|
18
|
-
pattern: /\$outputs\.([\w-]+)#\/([\w/-]+)/g,
|
|
19
|
-
ctxFunction: (match, property, pointer) => {
|
|
20
|
-
return resolvePointer(context.$outputs?.[property], pointer, match);
|
|
21
|
-
},
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
pattern: /\$workflows\.([\w-]+)\.outputs\.([\w-]+)#\/([\w/-]+)/g,
|
|
25
|
-
ctxFunction: (match, workflowId, property, pointer) => {
|
|
26
|
-
return resolvePointer(context.$workflows?.[workflowId]?.outputs?.[property], pointer, match);
|
|
27
|
-
},
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
pattern: /\$steps\.([\w-]+)\.outputs\.([\w-]+)#\/([\w/-]+)/g,
|
|
31
|
-
ctxFunction: (match, stepId, property, pointer) => {
|
|
32
|
-
return resolvePointer(context.$steps?.[stepId]?.outputs?.[property], pointer, match);
|
|
33
|
-
},
|
|
34
|
-
},
|
|
35
|
-
];
|
|
36
|
-
let result = expression;
|
|
37
|
-
for (const { pattern, ctxFunction } of jsonPointerReplacementRules) {
|
|
38
|
-
result = result.replaceAll(pattern, ctxFunction);
|
|
39
|
-
}
|
|
40
|
-
return result;
|
|
41
|
-
}
|
|
42
|
-
function resolvePointer(sourceContext, pointer, fallbackMatch) {
|
|
43
|
-
if (sourceContext) {
|
|
44
|
-
try {
|
|
45
|
-
const value = JsonPointerLib.get(sourceContext, `/${pointer}`);
|
|
46
|
-
if (typeof value === 'string') {
|
|
47
|
-
return JSON.stringify(value); // Safely quote the strings
|
|
48
|
-
}
|
|
49
|
-
if (Array.isArray(value) || isPlainObject(value)) {
|
|
50
|
-
return JSON.stringify(value);
|
|
51
|
-
}
|
|
52
|
-
return value !== undefined ? value : fallbackMatch;
|
|
53
|
-
}
|
|
54
|
-
catch (_error) {
|
|
55
|
-
return fallbackMatch;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
return fallbackMatch;
|
|
59
|
-
}
|
|
60
|
-
//# sourceMappingURL=replace-json-pointers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"replace-json-pointers.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/replace-json-pointers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,cAAc,MAAM,cAAc,CAAC;AAE1C,MAAM,UAAU,mBAAmB,CAAC,UAAkB,EAAE,OAAY;IAClE,MAAM,2BAA2B,GAAG;QAClC;YACE,OAAO,EAAE,+BAA+B;YACxC,WAAW,EAAE,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;gBAC9C,OAAO,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACjE,CAAC;SACF;QACD;YACE,OAAO,EAAE,8BAA8B;YACvC,WAAW,EAAE,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;gBAC9C,OAAO,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAChE,CAAC;SACF;QACD;YACE,OAAO,EAAE,kCAAkC;YAC3C,WAAW,EAAE,CAAC,KAAa,EAAE,QAAgB,EAAE,OAAe,EAAE,EAAE;gBAChE,OAAO,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACtE,CAAC;SACF;QACD;YACE,OAAO,EAAE,uDAAuD;YAChE,WAAW,EAAE,CAAC,KAAa,EAAE,UAAkB,EAAE,QAAgB,EAAE,OAAe,EAAE,EAAE;gBACpF,OAAO,cAAc,CACnB,OAAO,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,EACrD,OAAO,EACP,KAAK,CACN,CAAC;YACJ,CAAC;SACF;QACD;YACE,OAAO,EAAE,mDAAmD;YAC5D,WAAW,EAAE,CAAC,KAAa,EAAE,MAAc,EAAE,QAAgB,EAAE,OAAe,EAAE,EAAE;gBAChF,OAAO,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACvF,CAAC;SACF;KACF,CAAC;IAEF,IAAI,MAAM,GAAG,UAAU,CAAC;IACxB,KAAK,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,2BAA2B,EAAE,CAAC;QACnE,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,aAAkB,EAAE,OAAe,EAAE,aAAqB;IAChF,IAAI,aAAa,EAAE,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC;YAC/D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,2BAA2B;YAC3D,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;QACrD,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}
|