@redocly/respect-core 2.15.1 → 2.16.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/context-parser/get-value-from-context.d.ts +4 -4
- package/lib/modules/context-parser/get-value-from-context.d.ts.map +1 -1
- package/lib/modules/context-parser/get-value-from-context.js +10 -5
- package/lib/modules/context-parser/get-value-from-context.js.map +1 -1
- package/lib/modules/context-parser/handle-request-body-replacements.d.ts +1 -1
- package/lib/modules/context-parser/handle-request-body-replacements.d.ts.map +1 -1
- package/lib/modules/context-parser/parse-parameters.d.ts +3 -3
- package/lib/modules/context-parser/parse-parameters.d.ts.map +1 -1
- package/lib/modules/context-parser/parse-parameters.js +4 -35
- package/lib/modules/context-parser/parse-parameters.js.map +1 -1
- package/lib/modules/context-parser/parse-request-body.d.ts +1 -1
- package/lib/modules/context-parser/parse-request-body.d.ts.map +1 -1
- package/lib/modules/context-parser/parse-request-body.js +3 -2
- package/lib/modules/context-parser/parse-request-body.js.map +1 -1
- package/lib/modules/context-parser/resolve-reusable-object-reference.d.ts.map +1 -1
- package/lib/modules/context-parser/resolve-reusable-object-reference.js +2 -1
- package/lib/modules/context-parser/resolve-reusable-object-reference.js.map +1 -1
- package/lib/modules/description-parser/get-request-data-from-openapi.d.ts +1 -1
- package/lib/modules/description-parser/get-request-data-from-openapi.d.ts.map +1 -1
- package/lib/modules/description-parser/remove-write-only-properties.d.ts +1 -1
- package/lib/modules/description-parser/remove-write-only-properties.d.ts.map +1 -1
- package/lib/modules/description-parser/remove-write-only-properties.js +2 -1
- package/lib/modules/description-parser/remove-write-only-properties.js.map +1 -1
- package/lib/modules/flow-runner/get-server-url.js.map +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.d.ts.map +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.js +1 -0
- package/lib/modules/flow-runner/get-test-description-from-file.js.map +1 -1
- package/lib/modules/flow-runner/inputs/format-cli-inputs.d.ts.map +1 -1
- package/lib/modules/flow-runner/inputs/format-cli-inputs.js +2 -1
- package/lib/modules/flow-runner/inputs/format-cli-inputs.js.map +1 -1
- package/lib/modules/flow-runner/prepare-request.d.ts +4 -4
- package/lib/modules/flow-runner/prepare-request.d.ts.map +1 -1
- package/lib/modules/flow-runner/prepare-request.js +6 -5
- package/lib/modules/flow-runner/prepare-request.js.map +1 -1
- package/lib/modules/flow-runner/run-step.d.ts.map +1 -1
- package/lib/modules/flow-runner/run-step.js +12 -6
- package/lib/modules/flow-runner/run-step.js.map +1 -1
- package/lib/modules/flow-runner/runner.js +2 -2
- package/lib/modules/flow-runner/runner.js.map +1 -1
- package/lib/modules/flow-runner/success-criteria/validate-success-criteria.d.ts +1 -1
- package/lib/modules/flow-runner/success-criteria/validate-success-criteria.d.ts.map +1 -1
- package/lib/modules/flow-runner/success-criteria/validate-success-criteria.js +2 -1
- package/lib/modules/flow-runner/success-criteria/validate-success-criteria.js.map +1 -1
- package/lib/modules/logger-output/mask-secrets.d.ts.map +1 -1
- package/lib/modules/logger-output/mask-secrets.js +21 -21
- package/lib/modules/logger-output/mask-secrets.js.map +1 -1
- package/lib/modules/runtime-expressions/evaluate.js +1 -1
- package/lib/modules/runtime-expressions/evaluate.js.map +1 -1
- package/lib/modules/runtime-expressions/replace-json-pointers.d.ts.map +1 -1
- package/lib/modules/runtime-expressions/replace-json-pointers.js +2 -1
- package/lib/modules/runtime-expressions/replace-json-pointers.js.map +1 -1
- package/lib/types.d.ts +1 -1
- package/lib/types.d.ts.map +1 -1
- package/lib/utils/api-fetcher.d.ts +1 -1
- package/lib/utils/api-fetcher.d.ts.map +1 -1
- package/lib/utils/api-fetcher.js +2 -1
- package/lib/utils/api-fetcher.js.map +1 -1
- package/lib/utils/is-empty.d.ts +1 -1
- package/lib/utils/is-empty.d.ts.map +1 -1
- package/lib/utils/is-empty.js +2 -1
- package/lib/utils/is-empty.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type
|
|
1
|
+
import { type LoggerInterface } from '@redocly/openapi-core';
|
|
2
|
+
import { type RuntimeExpressionContext, type TestContext } from '../../types.js';
|
|
3
3
|
export interface ParsedParameters {
|
|
4
4
|
queryParams: Record<string, string>;
|
|
5
5
|
pathParams: Record<string, string | number>;
|
|
6
6
|
headerParams: Record<string, string>;
|
|
7
7
|
}
|
|
8
8
|
export declare function getValueFromContext({ value, ctx, logger, }: {
|
|
9
|
-
value:
|
|
9
|
+
value: unknown;
|
|
10
10
|
ctx: TestContext | RuntimeExpressionContext;
|
|
11
11
|
logger: LoggerInterface;
|
|
12
|
-
}):
|
|
12
|
+
}): unknown;
|
|
13
13
|
export declare function replaceFakerVariablesInString(input: string, ctx: TestContext | RuntimeExpressionContext, logger: LoggerInterface): any;
|
|
14
14
|
export declare function getFakeData({ pointer, ctx, logger, }: {
|
|
15
15
|
pointer: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-value-from-context.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/get-value-from-context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-value-from-context.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/get-value-from-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAEhG,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAMD,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,GAAG,EACH,MAAM,GACP,EAAE;IACD,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,WAAW,GAAG,wBAAwB,CAAC;IAC5C,MAAM,EAAE,eAAe,CAAC;CACzB,GAAG,OAAO,CA4BV;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,WAAW,GAAG,wBAAwB,EAC3C,MAAM,EAAE,eAAe,OAaxB;AA6HD,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,GAAG,EACH,MAAM,GACP,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,WAAW,GAAG,wBAAwB,CAAC;IAC5C,MAAM,EAAE,eAAe,CAAC;CACzB,GAAG,GAAG,CAoBN;AA6BD,wBAAgB,SAAS,CACvB,eAAe,EAAE,GAAG,EACpB,GAAG,EAAE,WAAW,GAAG,wBAAwB,EAC3C,MAAM,EAAE,eAAe,GACtB,GAAG,CAEL;AAED,wBAAgB,WAAW,CACzB,IAAI,CAAC,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GACrD,MAAM,GAAG,SAAS,CAWpB"}
|
|
@@ -1,20 +1,25 @@
|
|
|
1
1
|
import { red } from 'colorette';
|
|
2
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
2
3
|
const hasCurlyBraces = (input) => {
|
|
3
4
|
return /\{.*?\}/.test(input);
|
|
4
5
|
};
|
|
5
6
|
export function getValueFromContext({ value, ctx, logger, }) {
|
|
6
7
|
if (!value)
|
|
7
8
|
return value;
|
|
8
|
-
if (
|
|
9
|
+
if (isPlainObject(value)) {
|
|
10
|
+
const resolvedValue = {};
|
|
9
11
|
for (const key in value) {
|
|
10
|
-
|
|
12
|
+
resolvedValue[key] = getValueFromContext({ value: value[key], ctx, logger });
|
|
11
13
|
}
|
|
12
|
-
return
|
|
14
|
+
return resolvedValue;
|
|
15
|
+
}
|
|
16
|
+
else if (Array.isArray(value)) {
|
|
17
|
+
return value.map((item) => getValueFromContext({ value: item, ctx, logger }));
|
|
13
18
|
}
|
|
14
|
-
if (typeof value
|
|
19
|
+
if (typeof value !== 'string') {
|
|
15
20
|
return value;
|
|
16
21
|
}
|
|
17
|
-
if (value.
|
|
22
|
+
if (value.startsWith('$faker.')) {
|
|
18
23
|
return getFakeData({ pointer: value.slice(1), ctx, logger });
|
|
19
24
|
}
|
|
20
25
|
if (hasCurlyBraces(value)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-value-from-context.js","sourceRoot":"","sources":["../../../src/modules/context-parser/get-value-from-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"get-value-from-context.js","sourceRoot":"","sources":["../../../src/modules/context-parser/get-value-from-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type RuntimeExpressionContext, type Replacement } from '../../types.js';
|
|
2
2
|
import { type LoggerInterface } from '@redocly/openapi-core';
|
|
3
3
|
export declare function handlePayloadReplacements({ payload, replacements, expressionContext, logger, }: {
|
|
4
|
-
payload:
|
|
4
|
+
payload: Record<string, unknown> | Array<unknown>;
|
|
5
5
|
replacements: Replacement[];
|
|
6
6
|
expressionContext: RuntimeExpressionContext;
|
|
7
7
|
logger: LoggerInterface;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-request-body-replacements.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/handle-request-body-replacements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAgB,yBAAyB,CAAC,EACxC,OAAO,EACP,YAAY,EACZ,iBAAiB,EACjB,MAAM,GACP,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"handle-request-body-replacements.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/handle-request-body-replacements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAgB,yBAAyB,CAAC,EACxC,OAAO,EACP,YAAY,EACZ,iBAAiB,EACjB,MAAM,GACP,EAAE;IACD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IAClD,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,MAAM,EAAE,eAAe,CAAC;CACzB,QAyBA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type AdditionalParameterProperties } from '../../types.js';
|
|
2
2
|
export type ParameterWithIn = {
|
|
3
3
|
in: 'header' | 'query' | 'path' | 'cookie';
|
|
4
4
|
name: string;
|
|
5
5
|
value: string | number | boolean;
|
|
6
6
|
} & AdditionalParameterProperties;
|
|
7
7
|
export type ParameterWithoutIn = Omit<ParameterWithIn, 'in'>;
|
|
8
|
-
export declare function isParameterWithoutIn(parameter:
|
|
9
|
-
export declare function isParameterWithIn(parameter:
|
|
8
|
+
export declare function isParameterWithoutIn(parameter: unknown): parameter is ParameterWithoutIn;
|
|
9
|
+
export declare function isParameterWithIn(parameter: unknown): parameter is ParameterWithIn;
|
|
10
10
|
//# sourceMappingURL=parse-parameters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-parameters.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-parameters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-parameters.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-parameters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAEpE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CAClC,GAAG,6BAA6B,CAAC;AAElC,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AAI7D,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,IAAI,kBAAkB,CAIxF;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,IAAI,eAAe,CAOlF"}
|
|
@@ -1,44 +1,13 @@
|
|
|
1
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
1
2
|
// The isParameterWithoutIn and isParameterWithIn type guards are used to differentiate between
|
|
2
3
|
// the two sides of onOffs in the parameter schema that is imported from the @redocly/openapi-core.
|
|
3
|
-
// export const parameter = {
|
|
4
|
-
// type: 'object',
|
|
5
|
-
// oneOf: [
|
|
6
|
-
// {
|
|
7
|
-
// type: 'object',
|
|
8
|
-
// properties: {
|
|
9
|
-
// in: { type: 'string', enum: ['header', 'query', 'path', 'cookie'] },
|
|
10
|
-
// name: { type: 'string' },
|
|
11
|
-
// value: {
|
|
12
|
-
// oneOf: [{ type: 'string' }, { type: 'number' }, { type: 'boolean' }],
|
|
13
|
-
// },
|
|
14
|
-
// },
|
|
15
|
-
// required: ['name', 'value'],
|
|
16
|
-
// additionalProperties: false,
|
|
17
|
-
// },
|
|
18
|
-
// {
|
|
19
|
-
// type: 'object',
|
|
20
|
-
// properties: {
|
|
21
|
-
// reference: { type: 'string' },
|
|
22
|
-
// value: {
|
|
23
|
-
// oneOf: [{ type: 'string' }, { type: 'number' }, { type: 'boolean' }],
|
|
24
|
-
// },
|
|
25
|
-
// },
|
|
26
|
-
// required: ['reference'],
|
|
27
|
-
// additionalProperties: false,
|
|
28
|
-
// },
|
|
29
|
-
// ],
|
|
30
|
-
// } as const;
|
|
31
4
|
export function isParameterWithoutIn(parameter) {
|
|
32
|
-
return (
|
|
33
|
-
parameter !== null &&
|
|
34
|
-
'name' in parameter &&
|
|
35
|
-
'value' in parameter &&
|
|
36
|
-
!('in' in parameter));
|
|
5
|
+
return (isPlainObject(parameter) && 'name' in parameter && 'value' in parameter && !('in' in parameter));
|
|
37
6
|
}
|
|
38
7
|
export function isParameterWithIn(parameter) {
|
|
39
|
-
return (
|
|
40
|
-
parameter !== null &&
|
|
8
|
+
return (isPlainObject(parameter) &&
|
|
41
9
|
'in' in parameter &&
|
|
10
|
+
typeof parameter.in === 'string' &&
|
|
42
11
|
['header', 'query', 'path', 'cookie'].includes(parameter.in));
|
|
43
12
|
}
|
|
44
13
|
//# sourceMappingURL=parse-parameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-parameters.js","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-parameters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-parameters.js","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAWtD,+FAA+F;AAC/F,mGAAmG;AACnG,MAAM,UAAU,oBAAoB,CAAC,SAAkB;IACrD,OAAO,CACL,aAAa,CAAC,SAAS,CAAC,IAAI,MAAM,IAAI,SAAS,IAAI,OAAO,IAAI,SAAS,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,CAChG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAAkB;IAClD,OAAO,CACL,aAAa,CAAC,SAAS,CAAC;QACxB,IAAI,IAAI,SAAS;QACjB,OAAO,SAAS,CAAC,EAAE,KAAK,QAAQ;QAChC,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAC7D,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type TestContext, type RequestBody } from '../../types.js';
|
|
2
2
|
export declare function stripFileDecorator(payload: string): string;
|
|
3
3
|
export declare function parseRequestBody(stepRequestBody: RequestBody | undefined, ctx: TestContext): Promise<Omit<RequestBody, 'payload'> & {
|
|
4
|
-
payload: string | number | boolean | Record<string,
|
|
4
|
+
payload: string | number | boolean | Record<string, unknown> | Array<unknown> | BodyInit | FormData | URLSearchParams | undefined;
|
|
5
5
|
}>;
|
|
6
6
|
//# sourceMappingURL=parse-request-body.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-request-body.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-request-body.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-request-body.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-request-body.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAKpE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,UAIjD;AAmED,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,WAAW,GAAG,SAAS,EACxC,GAAG,EAAE,WAAW,GACf,OAAO,CACR,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG;IAC7B,OAAO,EACH,MAAM,GACN,MAAM,GACN,OAAO,GACP,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,KAAK,CAAC,OAAO,CAAC,GACd,QAAQ,GACR,QAAQ,GACR,eAAe,GACf,SAAS,CAAC;CACf,CACF,CAwCA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as path from 'node:path';
|
|
2
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
2
3
|
const KNOWN_BINARY_CONTENT_TYPES_REGEX = /^image\/(png|jpeg|gif|bmp|webp|svg\+xml)|application\/pdf$/;
|
|
3
4
|
export function stripFileDecorator(payload) {
|
|
4
5
|
return payload.startsWith('$file(') && payload.endsWith(')')
|
|
@@ -26,7 +27,7 @@ const appendObjectToFormData = (promises, formData, payload, workflowFilePath, c
|
|
|
26
27
|
}
|
|
27
28
|
});
|
|
28
29
|
}
|
|
29
|
-
else if (
|
|
30
|
+
else if (isPlainObject(item)) {
|
|
30
31
|
appendObjectToFormData(promises, formData, item, workflowFilePath, ctx, formKey);
|
|
31
32
|
}
|
|
32
33
|
else if (typeof item === 'string' || typeof item === 'number' || typeof item === 'boolean') {
|
|
@@ -35,7 +36,7 @@ const appendObjectToFormData = (promises, formData, payload, workflowFilePath, c
|
|
|
35
36
|
});
|
|
36
37
|
};
|
|
37
38
|
const getRequestBodyMultipartFormData = async (payload, formData, workflowFilePath, ctx) => {
|
|
38
|
-
if (
|
|
39
|
+
if (isPlainObject(payload)) {
|
|
39
40
|
const promises = [];
|
|
40
41
|
appendObjectToFormData(promises, formData, payload, workflowFilePath, ctx);
|
|
41
42
|
await Promise.all(promises);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-request-body.js","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-request-body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-request-body.js","sourceRoot":"","sources":["../../../src/modules/context-parser/parse-request-body.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-reusable-object-reference.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/resolve-reusable-object-reference.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-reusable-object-reference.d.ts","sourceRoot":"","sources":["../../../src/modules/context-parser/resolve-reusable-object-reference.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,eAAe,EACf,eAAe,EACf,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,KAAK,aAAa,CAAC,CAAC,SAAS,cAAc,IACzC,CAAC,CAAC,WAAW,CAAC,SAAS,6BAA6B,MAAM,EAAE,GACxD,eAAe,GACf,CAAC,CAAC,WAAW,CAAC,SAAS,6BAA6B,MAAM,EAAE,GAC5D,eAAe,GACf,CAAC,CAAC,WAAW,CAAC,SAAS,yBAAyB,MAAM,EAAE,GACxD,SAAS,GACT,KAAK,CAAC;AAIZ,wBAAgB,8BAA8B,CAAC,CAAC,SAAS,cAAc,EACrE,cAAc,EAAE,CAAC,EACjB,GAAG,EAAE,WAAW,GACf,aAAa,CAAC,CAAC,CAAC,CAmBlB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
1
2
|
import { getValueFromContext } from './get-value-from-context.js';
|
|
2
3
|
const VALID_COMPONENTS = ['parameters', 'failureActions', 'successActions'];
|
|
3
4
|
export function resolveReusableObjectReference(reusableObject, ctx) {
|
|
@@ -6,7 +7,7 @@ export function resolveReusableObjectReference(reusableObject, ctx) {
|
|
|
6
7
|
throw new Error('Invalid reference: available components are $components.parameters, $components.failureActions, or $components.successActions');
|
|
7
8
|
}
|
|
8
9
|
const component = getValueFromContext({ value: reference, ctx, logger: ctx.options.logger });
|
|
9
|
-
if ('value' in component && valueOverride) {
|
|
10
|
+
if (isPlainObject(component) && 'value' in component && valueOverride) {
|
|
10
11
|
return {
|
|
11
12
|
...component,
|
|
12
13
|
value: valueOverride,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-reusable-object-reference.js","sourceRoot":"","sources":["../../../src/modules/context-parser/resolve-reusable-object-reference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAmBlE,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;AAE5E,MAAM,UAAU,8BAA8B,CAC5C,cAAiB,EACjB,GAAgB;IAEhB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;IAE3D,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,OAAO,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-reusable-object-reference.js","sourceRoot":"","sources":["../../../src/modules/context-parser/resolve-reusable-object-reference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAmBlE,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;AAE5E,MAAM,UAAU,8BAA8B,CAC5C,cAAiB,EACjB,GAAgB;IAEhB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;IAE3D,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,aAAa,CAAC,SAAS,CAAC,IAAI,OAAO,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;QACtE,OAAO;YACL,GAAG,SAAS;YACZ,KAAK,EAAE,aAAa;SACD,CAAC;IACxB,CAAC;IAED,OAAO,SAA6B,CAAC;AACvC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { type LoggerInterface } from '@redocly/openapi-core';
|
|
|
2
2
|
import type { ParameterWithIn } from '../context-parser/index.js';
|
|
3
3
|
import type { OperationDetails } from './get-operation-from-description.js';
|
|
4
4
|
export interface OpenApiRequestData {
|
|
5
|
-
requestBody?:
|
|
5
|
+
requestBody?: unknown;
|
|
6
6
|
contentType?: string;
|
|
7
7
|
parameters: ParameterWithIn[];
|
|
8
8
|
contentTypeParameters: ParameterWithIn[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-request-data-from-openapi.d.ts","sourceRoot":"","sources":["../../../src/modules/description-parser/get-request-data-from-openapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"get-request-data-from-openapi.d.ts","sourceRoot":"","sources":["../../../src/modules/description-parser/get-request-data-from-openapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,qBAAqB,EAAE,eAAe,EAAE,CAAC;CAC1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjD,MAAM,EAAE,eAAe,GACtB,kBAAkB,CAwBpB"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type JSONSchemaType } from '@redocly/ajv/dist/2020.js';
|
|
2
2
|
export declare function removeWriteOnlyProperties<T>(schema: JSONSchemaType<T>): JSONSchemaType<T>;
|
|
3
3
|
//# sourceMappingURL=remove-write-only-properties.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-write-only-properties.d.ts","sourceRoot":"","sources":["../../../src/modules/description-parser/remove-write-only-properties.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"remove-write-only-properties.d.ts","sourceRoot":"","sources":["../../../src/modules/description-parser/remove-write-only-properties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CA2CzF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
1
2
|
export function removeWriteOnlyProperties(schema) {
|
|
2
3
|
const schemaCopy = JSON.parse(JSON.stringify(schema));
|
|
3
4
|
function filterWriteOnlyProps(schema) {
|
|
@@ -15,7 +16,7 @@ export function removeWriteOnlyProperties(schema) {
|
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
|
-
if (schema.additionalProperties
|
|
19
|
+
if (isPlainObject(schema.additionalProperties)) {
|
|
19
20
|
filterWriteOnlyProps(schema.additionalProperties);
|
|
20
21
|
}
|
|
21
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-write-only-properties.js","sourceRoot":"","sources":["../../../src/modules/description-parser/remove-write-only-properties.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remove-write-only-properties.js","sourceRoot":"","sources":["../../../src/modules/description-parser/remove-write-only-properties.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,UAAU,yBAAyB,CAAI,MAAyB;IACpE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtD,SAAS,oBAAoB,CAAC,MAAyB;QACrD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBACtB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;oBACpC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;wBACrC,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC9B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;4BACpB,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;wBAC3E,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,oBAAoB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAsB,CAAC,CAAC;oBACpE,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,aAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAC/C,oBAAoB,CAAC,MAAM,CAAC,oBAAyC,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACnD,oBAAoB,CAAC,MAAM,CAAC,KAA0B,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAA4B,EAAE,EAAE,CAC/D,oBAAoB,CAAC,SAA8B,CAAC,CACrD,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAA4B,EAAE,EAAE,CAC/D,oBAAoB,CAAC,SAA8B,CAAC,CACrD,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAA4B,EAAE,EAAE,CAC/D,oBAAoB,CAAC,SAA8B,CAAC,CACrD,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,oBAAoB,CAAC,UAAU,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-server-url.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-server-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAyBtF,MAAM,UAAU,YAAY,CAAC,EAC3B,GAAG,EACH,eAAe,EACf,gBAAgB,EAChB,UAAU,GACQ;IAClB,IAAI,CAAC,eAAe,IAAI,UAAU,EAAE,GAAG,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,gCAAgC,CAAC;YACnD,OAAO,EAAE,UAAU,EAAE,GAAG;YACxB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;SAC3B,CAAC,CAAC;QAEH,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;IAC9B,CAAC;IAED,4DAA4D;IAC5D,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,CAAC;QAC3C,MAAM,eAAe,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;YACrC,OAAO,EAAE,GAAG,EAAE,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;QACnD,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;IAE5F,IACE,iBAAiB;QACjB,iBAAiB,CAAC,IAAI,KAAK,SAAS;QACpC,iBAAiB,CAAC,aAAa,CAAC,EAChC,CAAC;QACD,IAAI,iBAAiB,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACxD,OAAO;gBACL,GAAG,EAAE,iBAAiB,CAAC,aAAa,CAAC;aACtC,CAAC;QACJ,CAAC;QAED,MAAM,wBAAwB,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;YACvF,CAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,YAAY,GAAG,mBAAmB,CAAC;YACvC,KAAK,EAAE,uBAAuB,eAAe,YAAY,wBAAwB,EAAE;YACnF,GAAG;YACH,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;SAC3B,
|
|
1
|
+
{"version":3,"file":"get-server-url.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-server-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-test-description-from-file.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-test-description-from-file.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,eAAe,EAErB,MAAM,uBAAuB,CAAC;AAK/B,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"get-test-description-from-file.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-test-description-from-file.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,eAAe,EAErB,MAAM,uBAAuB,CAAC;AAK/B,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,eA2E9D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-test-description-from-file.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-test-description-from-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,SAAS,EACT,cAAc,EACd,IAAI,EACJ,MAAM,EACN,YAAY,GAKb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAYjD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA4B;IAC7D,MAAM,EACJ,QAAQ,EACR,IAAI,EACJ,mBAAmB,EACnB,eAAe,EACf,OAAO,EACP,QAAQ,GAAG,KAAK,GACjB,GAAG,OAAO,CAAC;IACZ,IAAI,YAAY,GAAwB,EAAE,CAAC;IAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEzC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;QAChC,OAAO,EAAE,CAAC,oBAAoB,CAAC;QAC/B,YAAY,EAAE;YACZ,mBAAmB,EAAE,OAAO;YAC5B,4BAA4B,EAAE,MAAM;YACpC,2CAA2C,EAAE,OAAO;YACpD,mCAAmC,EAAE,OAAO;YAC5C,kCAAkC,EAAE,OAAO;YAC3C,2CAA2C,EAAE,OAAO;SACrD;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,YAAY,GAAG,MAAM,IAAI,CAAC;YACxB,GAAG,EAAE,QAAQ;YACb,MAAM;YACN,mBAAmB;SACpB,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;YAE3C,cAAc,CAAC,YAAY,EAAE;gBAC3B,MAAM,EAAE,UAAU;gBAClB,OAAO;
|
|
1
|
+
{"version":3,"file":"get-test-description-from-file.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-test-description-from-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,SAAS,EACT,cAAc,EACd,IAAI,EACJ,MAAM,EACN,YAAY,GAKb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAYjD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA4B;IAC7D,MAAM,EACJ,QAAQ,EACR,IAAI,EACJ,mBAAmB,EACnB,eAAe,EACf,OAAO,EACP,QAAQ,GAAG,KAAK,GACjB,GAAG,OAAO,CAAC;IACZ,IAAI,YAAY,GAAwB,EAAE,CAAC;IAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEzC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;QAChC,OAAO,EAAE,CAAC,oBAAoB,CAAC;QAC/B,YAAY,EAAE;YACZ,mBAAmB,EAAE,OAAO;YAC5B,4BAA4B,EAAE,MAAM;YACpC,2CAA2C,EAAE,OAAO;YACpD,mCAAmC,EAAE,OAAO;YAC5C,kCAAkC,EAAE,OAAO;YAC3C,2CAA2C,EAAE,OAAO;SACrD;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,YAAY,GAAG,MAAM,IAAI,CAAC;YACxB,GAAG,EAAE,QAAQ;YACb,MAAM;YACN,mBAAmB;SACpB,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;YAE3C,cAAc,CAAC,YAAY,EAAE;gBAC3B,MAAM,EAAE,UAAU;gBAClB,OAAO;gBACP,OAAO,EAAE,QAAQ;aAClB,CAAC,CAAC;YAEH,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC;QACnC,IAAI;QACJ,GAAG,EAAE,QAAQ;QACb,MAAM;QACN,WAAW,EAAE,IAAI;QACjB,mBAAmB;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CACb,6BAA6B,QAAQ,kGAAkG,CACxI,CAAC;IACJ,CAAC;IAED,eAAe,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEvD,MAAM,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IACzF,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,oCAAoC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,OAAO,eAAe,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-cli-inputs.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/inputs/format-cli-inputs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"format-cli-inputs.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/inputs/format-cli-inputs.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAa5F"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isPlainObject } from '@redocly/openapi-core';
|
|
1
2
|
export function formatCliInputs(input) {
|
|
2
3
|
if (!input) {
|
|
3
4
|
return {};
|
|
@@ -13,7 +14,7 @@ export function formatCliInputs(input) {
|
|
|
13
14
|
function parseParam(param) {
|
|
14
15
|
try {
|
|
15
16
|
const parsedObject = JSON.parse(param);
|
|
16
|
-
if (
|
|
17
|
+
if (isPlainObject(parsedObject)) {
|
|
17
18
|
return parsedObject;
|
|
18
19
|
}
|
|
19
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-cli-inputs.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/inputs/format-cli-inputs.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,eAAe,CAAC,KAAoC;IAClE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;QAClC,CAAC,EAAE,EAA4B,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,
|
|
1
|
+
{"version":3,"file":"format-cli-inputs.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/inputs/format-cli-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,KAAoC;IAClE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;QAClC,CAAC,EAAE,EAA4B,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,YAAsC,CAAC;QAChD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,aAAa;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,yCAAyC;QACzC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC3C,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACrC,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC;oBACjB,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBACjC,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAA4B,CAAC,CAAC;QACnC,CAAC;QAED,+BAA+B;QAC/B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import type
|
|
3
|
-
import type
|
|
4
|
-
import type
|
|
1
|
+
import { type Oas3SecurityScheme } from '@redocly/openapi-core';
|
|
2
|
+
import { type ParameterWithIn } from '../context-parser/index.js';
|
|
3
|
+
import { type TestContext, type Step, type OperationMethod } from '../../types.js';
|
|
4
|
+
import { type OperationDetails } from '../description-parser/index.js';
|
|
5
5
|
export type RequestData = {
|
|
6
6
|
serverUrl?: {
|
|
7
7
|
url: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-request.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prepare-request.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,IAAI,EAGT,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KAEb,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,CAAC,EAAE,gBAAgB,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;KAAE,CAAC;CAChG,CAAC;AAEF,wBAAsB,cAAc,CAClC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,WAAW,CAAC,CAgLtB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isPlainObject, } from '@redocly/openapi-core';
|
|
1
2
|
import { getOperationFromDescriptionBySource, getRequestBodySchema, getRequestDataFromOpenApi, } from '../description-parser/index.js';
|
|
2
3
|
import { parseRequestBody, resolveReusableComponentItem, isParameterWithIn, handlePayloadReplacements, } from '../context-parser/index.js';
|
|
3
4
|
import { getServerUrl } from './get-server-url.js';
|
|
@@ -47,7 +48,7 @@ export async function prepareRequest(ctx, step, workflowName) {
|
|
|
47
48
|
const contentType = stepRequestBodyContentType || requestDataFromOpenAPI?.contentType;
|
|
48
49
|
const parameters = joinParameters(
|
|
49
50
|
// order is important here, the last one wins
|
|
50
|
-
|
|
51
|
+
isPlainObject(requestBody) || Array.isArray(requestBody)
|
|
51
52
|
? [{ in: 'header', name: 'content-type', value: 'application/json' }]
|
|
52
53
|
: [], serverUrl?.parameters || [], requestDataFromOpenAPI?.contentTypeParameters || [],
|
|
53
54
|
// if step.parameters is defined, we do not auto-populate parameters from the openapi operation
|
|
@@ -77,8 +78,8 @@ export async function prepareRequest(ctx, step, workflowName) {
|
|
|
77
78
|
const ctxWithInputs = {
|
|
78
79
|
...ctx,
|
|
79
80
|
$inputs: {
|
|
80
|
-
...
|
|
81
|
-
...
|
|
81
|
+
...ctx.$inputs,
|
|
82
|
+
...ctx.$workflows[workflowName]?.inputs,
|
|
82
83
|
},
|
|
83
84
|
};
|
|
84
85
|
const expressionContext = createRuntimeExpressionCtx({
|
|
@@ -114,7 +115,7 @@ export async function prepareRequest(ctx, step, workflowName) {
|
|
|
114
115
|
contentType,
|
|
115
116
|
logger: ctx.options.logger,
|
|
116
117
|
});
|
|
117
|
-
if (replacements &&
|
|
118
|
+
if (replacements && (isPlainObject(evaluatedBody) || Array.isArray(evaluatedBody))) {
|
|
118
119
|
handlePayloadReplacements({
|
|
119
120
|
payload: evaluatedBody,
|
|
120
121
|
replacements,
|
|
@@ -124,7 +125,7 @@ export async function prepareRequest(ctx, step, workflowName) {
|
|
|
124
125
|
}
|
|
125
126
|
if (contentType && openapiOperation?.requestBody) {
|
|
126
127
|
const requestBodySchema = getRequestBodySchema(contentType, openapiOperation);
|
|
127
|
-
if (
|
|
128
|
+
if (isPlainObject(requestBody) || Array.isArray(requestBody)) {
|
|
128
129
|
collectSecretValues(ctx, requestBodySchema, requestBody);
|
|
129
130
|
}
|
|
130
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-request.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EACnC,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"prepare-request.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-step.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/run-step.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAEV,IAAI,EACJ,WAAW,EAMX,kBAAkB,
|
|
1
|
+
{"version":3,"file":"run-step.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/run-step.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAEV,IAAI,EACJ,WAAW,EAMX,kBAAkB,EAEnB,MAAM,gBAAgB,CAAC;AAGxB,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,GAAG,EACH,UAAU,EACV,WAAW,EACX,kBAAkB,GACnB,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAAC,CAkXzC"}
|
|
@@ -31,7 +31,7 @@ export async function runStep({ step, ctx, workflowId, retriesLeft, executedStep
|
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
const workflowCtx = await resolveWorkflowContext(targetWorkflowRef, targetWorkflow, ctx, ctx.options.config);
|
|
34
|
-
if (resolvedParameters && resolvedParameters.length) {
|
|
34
|
+
if (resolvedParameters && resolvedParameters.length > 0) {
|
|
35
35
|
// When the step in context specifies a workflowId, then all parameters without `in` maps to workflow inputs.
|
|
36
36
|
const workflowInputParameters = resolvedParameters
|
|
37
37
|
.filter(isParameterWithoutIn)
|
|
@@ -39,8 +39,8 @@ export async function runStep({ step, ctx, workflowId, retriesLeft, executedStep
|
|
|
39
39
|
const ctxWithInputs = {
|
|
40
40
|
...ctx,
|
|
41
41
|
$inputs: {
|
|
42
|
-
...
|
|
43
|
-
...(workflowId ? ctx.$workflows[workflowId]?.inputs
|
|
42
|
+
...ctx.$inputs,
|
|
43
|
+
...(workflowId ? ctx.$workflows[workflowId]?.inputs : {}),
|
|
44
44
|
},
|
|
45
45
|
};
|
|
46
46
|
// Ensure parameter is of type ParameterWithoutIn
|
|
@@ -210,9 +210,13 @@ export async function runStep({ step, ctx, workflowId, retriesLeft, executedStep
|
|
|
210
210
|
}).every((check) => check.passed);
|
|
211
211
|
if (matchesCriteria) {
|
|
212
212
|
const targetWorkflow = action.workflowId
|
|
213
|
-
? getValueFromContext({
|
|
213
|
+
? getValueFromContext({
|
|
214
|
+
value: action.workflowId,
|
|
215
|
+
ctx,
|
|
216
|
+
logger: ctx.options.logger,
|
|
217
|
+
})
|
|
214
218
|
: undefined;
|
|
215
|
-
const targetCtx = action.workflowId
|
|
219
|
+
const targetCtx = action.workflowId && targetWorkflow
|
|
216
220
|
? await resolveWorkflowContext(action.workflowId, targetWorkflow, ctx, ctx.options.config)
|
|
217
221
|
: { ...ctx, executedSteps: [] };
|
|
218
222
|
const targetStep = action.stepId ? action.stepId : undefined;
|
|
@@ -223,7 +227,9 @@ export async function runStep({ step, ctx, workflowId, retriesLeft, executedStep
|
|
|
223
227
|
if (retriesLeft === 0) {
|
|
224
228
|
return { retriesLeft: 0, shouldEnd: false };
|
|
225
229
|
}
|
|
226
|
-
|
|
230
|
+
if (retryAfter) {
|
|
231
|
+
await delay(retryAfter);
|
|
232
|
+
}
|
|
227
233
|
if (targetWorkflow || targetStep) {
|
|
228
234
|
printActionsSeparator({
|
|
229
235
|
stepId,
|