@redocly/respect-core 0.0.0-snapshot.1752479759 → 0.0.0-snapshot.1752491489
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/handlers/generate.d.ts +5 -8
- package/lib/handlers/generate.d.ts.map +1 -1
- package/lib/handlers/generate.js +19 -2
- package/lib/handlers/generate.js.map +1 -1
- package/lib/handlers/run.d.ts +11 -15
- package/lib/handlers/run.d.ts.map +1 -1
- package/lib/handlers/run.js +66 -22
- package/lib/handlers/run.js.map +1 -1
- package/lib/index.d.ts +3 -6
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -5
- package/lib/index.js.map +1 -1
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.d.ts +2 -2
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.d.ts.map +1 -1
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.js +2 -5
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.js.map +1 -1
- package/lib/modules/arazzo-description-generator/generate-example-value.d.ts +1 -2
- package/lib/modules/arazzo-description-generator/generate-example-value.d.ts.map +1 -1
- package/lib/modules/arazzo-description-generator/generate-example-value.js +2 -2
- package/lib/modules/arazzo-description-generator/generate-example-value.js.map +1 -1
- package/lib/modules/arazzo-description-generator/generate-test-data-from-json-schema.d.ts +1 -2
- package/lib/modules/arazzo-description-generator/generate-test-data-from-json-schema.d.ts.map +1 -1
- package/lib/modules/arazzo-description-generator/generate-test-data-from-json-schema.js +3 -1
- package/lib/modules/arazzo-description-generator/generate-test-data-from-json-schema.js.map +1 -1
- package/lib/modules/cli-output/display-checks.d.ts +1 -8
- package/lib/modules/cli-output/display-checks.d.ts.map +1 -1
- package/lib/modules/cli-output/display-checks.js +8 -7
- package/lib/modules/cli-output/display-checks.js.map +1 -1
- package/lib/modules/cli-output/display-errors.d.ts +1 -2
- package/lib/modules/cli-output/display-errors.d.ts.map +1 -1
- package/lib/modules/cli-output/display-errors.js +10 -8
- package/lib/modules/cli-output/display-errors.js.map +1 -1
- package/lib/modules/cli-output/display-files-summary-table.d.ts +11 -0
- package/lib/modules/cli-output/display-files-summary-table.d.ts.map +1 -0
- package/lib/modules/cli-output/display-files-summary-table.js +68 -0
- package/lib/modules/cli-output/display-files-summary-table.js.map +1 -0
- package/lib/modules/cli-output/display-summary.d.ts +5 -5
- package/lib/modules/cli-output/display-summary.d.ts.map +1 -1
- package/lib/modules/cli-output/display-summary.js +7 -6
- package/lib/modules/cli-output/display-summary.js.map +1 -1
- package/lib/modules/cli-output/index.d.ts +2 -0
- package/lib/modules/cli-output/index.d.ts.map +1 -1
- package/lib/modules/cli-output/index.js +2 -0
- package/lib/modules/cli-output/index.js.map +1 -1
- package/lib/modules/cli-output/json-logs.d.ts +10 -0
- package/lib/modules/cli-output/json-logs.d.ts.map +1 -0
- package/lib/modules/cli-output/json-logs.js +81 -0
- package/lib/modules/cli-output/json-logs.js.map +1 -0
- package/lib/modules/context-parser/get-value-from-context.d.ts +4 -13
- package/lib/modules/context-parser/get-value-from-context.d.ts.map +1 -1
- package/lib/modules/context-parser/get-value-from-context.js +24 -26
- 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 -7
- package/lib/modules/context-parser/handle-request-body-replacements.d.ts.map +1 -1
- package/lib/modules/context-parser/handle-request-body-replacements.js +1 -2
- package/lib/modules/context-parser/handle-request-body-replacements.js.map +1 -1
- package/lib/modules/context-parser/parse-request-body.d.ts +3 -1
- package/lib/modules/context-parser/parse-request-body.d.ts.map +1 -1
- package/lib/modules/context-parser/parse-request-body.js +45 -18
- package/lib/modules/context-parser/parse-request-body.js.map +1 -1
- package/lib/modules/context-parser/resolve-reusable-object-reference.js +1 -1
- package/lib/modules/context-parser/resolve-reusable-object-reference.js.map +1 -1
- package/lib/modules/description-parser/bundle-openapi.d.ts +1 -9
- package/lib/modules/description-parser/bundle-openapi.d.ts.map +1 -1
- package/lib/modules/description-parser/bundle-openapi.js +35 -13
- package/lib/modules/description-parser/bundle-openapi.js.map +1 -1
- package/lib/modules/description-parser/get-request-data-from-openapi.d.ts +1 -2
- package/lib/modules/description-parser/get-request-data-from-openapi.d.ts.map +1 -1
- package/lib/modules/description-parser/get-request-data-from-openapi.js +6 -6
- package/lib/modules/description-parser/get-request-data-from-openapi.js.map +1 -1
- package/lib/modules/flow-runner/call-api-and-analyze-results.d.ts.map +1 -1
- package/lib/modules/flow-runner/call-api-and-analyze-results.js +0 -1
- package/lib/modules/flow-runner/call-api-and-analyze-results.js.map +1 -1
- package/lib/modules/flow-runner/context/create-test-context.d.ts.map +1 -1
- package/lib/modules/flow-runner/context/create-test-context.js +9 -21
- package/lib/modules/flow-runner/context/create-test-context.js.map +1 -1
- package/lib/modules/flow-runner/get-server-url.d.ts.map +1 -1
- package/lib/modules/flow-runner/get-server-url.js +1 -5
- package/lib/modules/flow-runner/get-server-url.js.map +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.d.ts +2 -11
- 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 +14 -12
- package/lib/modules/flow-runner/get-test-description-from-file.js.map +1 -1
- package/lib/modules/flow-runner/get-workflows-to-run.d.ts +1 -7
- package/lib/modules/flow-runner/get-workflows-to-run.d.ts.map +1 -1
- package/lib/modules/flow-runner/get-workflows-to-run.js +10 -8
- package/lib/modules/flow-runner/get-workflows-to-run.js.map +1 -1
- package/lib/modules/flow-runner/index.d.ts +1 -0
- package/lib/modules/flow-runner/index.d.ts.map +1 -1
- package/lib/modules/flow-runner/index.js +1 -0
- package/lib/modules/flow-runner/index.js.map +1 -1
- package/lib/modules/flow-runner/prepare-request.d.ts.map +1 -1
- package/lib/modules/flow-runner/prepare-request.js +2 -9
- package/lib/modules/flow-runner/prepare-request.js.map +1 -1
- package/lib/modules/flow-runner/read-env-variables.d.ts +2 -0
- package/lib/modules/flow-runner/read-env-variables.d.ts.map +1 -0
- package/lib/modules/flow-runner/read-env-variables.js +18 -0
- package/lib/modules/flow-runner/read-env-variables.js.map +1 -0
- package/lib/modules/flow-runner/resolve-x-security-parameters.d.ts.map +1 -1
- package/lib/modules/flow-runner/resolve-x-security-parameters.js +0 -1
- package/lib/modules/flow-runner/resolve-x-security-parameters.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 -26
- package/lib/modules/flow-runner/run-step.js.map +1 -1
- package/lib/modules/flow-runner/runner.d.ts +8 -4
- package/lib/modules/flow-runner/runner.d.ts.map +1 -1
- package/lib/modules/flow-runner/runner.js +48 -46
- package/lib/modules/flow-runner/runner.js.map +1 -1
- package/lib/modules/flow-runner/schema/schema-checker.d.ts.map +1 -1
- package/lib/modules/flow-runner/schema/schema-checker.js +4 -2
- package/lib/modules/flow-runner/schema/schema-checker.js.map +1 -1
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.d.ts.map +1 -1
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.js +3 -3
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.js.map +1 -1
- package/lib/modules/runtime-expressions/evaluate.d.ts +2 -4
- package/lib/modules/runtime-expressions/evaluate.d.ts.map +1 -1
- package/lib/modules/runtime-expressions/evaluate.js +15 -15
- package/lib/modules/runtime-expressions/evaluate.js.map +1 -1
- package/lib/types.d.ts +11 -24
- package/lib/types.d.ts.map +1 -1
- package/lib/utils/api-fetcher.d.ts +3 -0
- package/lib/utils/api-fetcher.d.ts.map +1 -1
- package/lib/utils/api-fetcher.js +37 -23
- package/lib/utils/api-fetcher.js.map +1 -1
- package/lib/utils/cli-outputs.d.ts +10 -21
- package/lib/utils/cli-outputs.d.ts.map +1 -1
- package/lib/utils/cli-outputs.js +20 -18
- package/lib/utils/cli-outputs.js.map +1 -1
- package/lib/utils/env.d.ts +3 -0
- package/lib/utils/env.d.ts.map +1 -0
- package/lib/utils/env.js +9 -0
- package/lib/utils/env.js.map +1 -0
- package/lib/utils/exit-with-error.d.ts +2 -0
- package/lib/utils/exit-with-error.d.ts.map +1 -0
- package/lib/utils/exit-with-error.js +5 -0
- package/lib/utils/exit-with-error.js.map +1 -0
- package/lib/utils/har-logs/create-har-log.d.ts +2 -0
- package/lib/utils/har-logs/create-har-log.d.ts.map +1 -0
- package/lib/utils/har-logs/create-har-log.js +25 -0
- package/lib/utils/har-logs/create-har-log.js.map +1 -0
- package/lib/utils/har-logs/helpers/add-headers.d.ts +2 -0
- package/lib/utils/har-logs/helpers/add-headers.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/add-headers.js +17 -0
- package/lib/utils/har-logs/helpers/add-headers.js.map +1 -0
- package/lib/utils/har-logs/helpers/build-headers.d.ts +10 -0
- package/lib/utils/har-logs/helpers/build-headers.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/build-headers.js +32 -0
- package/lib/utils/har-logs/helpers/build-headers.js.map +1 -0
- package/lib/utils/har-logs/helpers/build-params.d.ts +2 -0
- package/lib/utils/har-logs/helpers/build-params.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/build-params.js +18 -0
- package/lib/utils/har-logs/helpers/build-params.js.map +1 -0
- package/lib/utils/har-logs/helpers/build-request-cookies.d.ts +2 -0
- package/lib/utils/har-logs/helpers/build-request-cookies.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/build-request-cookies.js +18 -0
- package/lib/utils/har-logs/helpers/build-request-cookies.js.map +1 -0
- package/lib/utils/har-logs/helpers/build-response-cookies.d.ts +2 -0
- package/lib/utils/har-logs/helpers/build-response-cookies.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/build-response-cookies.js +40 -0
- package/lib/utils/har-logs/helpers/build-response-cookies.js.map +1 -0
- package/lib/utils/har-logs/helpers/get-agent.d.ts +2 -0
- package/lib/utils/har-logs/helpers/get-agent.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/get-agent.js +89 -0
- package/lib/utils/har-logs/helpers/get-agent.js.map +1 -0
- package/lib/utils/har-logs/helpers/get-duration.d.ts +2 -0
- package/lib/utils/har-logs/helpers/get-duration.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/get-duration.js +6 -0
- package/lib/utils/har-logs/helpers/get-duration.js.map +1 -0
- package/lib/utils/har-logs/helpers/get-input-url.d.ts +2 -0
- package/lib/utils/har-logs/helpers/get-input-url.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/get-input-url.js +5 -0
- package/lib/utils/har-logs/helpers/get-input-url.js.map +1 -0
- package/lib/utils/har-logs/helpers/handle-request.d.ts +9 -0
- package/lib/utils/har-logs/helpers/handle-request.d.ts.map +1 -0
- package/lib/utils/har-logs/helpers/handle-request.js +199 -0
- package/lib/utils/har-logs/helpers/handle-request.js.map +1 -0
- package/lib/utils/har-logs/index.d.ts +3 -0
- package/lib/utils/har-logs/index.d.ts.map +1 -0
- package/lib/utils/har-logs/index.js +3 -0
- package/lib/utils/har-logs/index.js.map +1 -0
- package/lib/utils/har-logs/with-har.d.ts +6 -0
- package/lib/utils/har-logs/with-har.d.ts.map +1 -0
- package/lib/utils/har-logs/with-har.js +189 -0
- package/lib/utils/har-logs/with-har.js.map +1 -0
- package/lib/utils/is-empty.d.ts.map +1 -1
- package/lib/utils/is-empty.js +0 -3
- package/lib/utils/is-empty.js.map +1 -1
- package/lib/utils/is-url.d.ts +2 -0
- package/lib/utils/is-url.d.ts.map +1 -0
- package/lib/utils/is-url.js +13 -0
- package/lib/utils/is-url.js.map +1 -0
- package/lib/utils/logger/logger.d.ts +16 -0
- package/lib/utils/logger/logger.d.ts.map +1 -0
- package/lib/utils/logger/logger.js +28 -0
- package/lib/utils/logger/logger.js.map +1 -0
- package/lib/utils/mtls/create-mtls-client.d.ts +4 -0
- package/lib/utils/mtls/create-mtls-client.d.ts.map +1 -0
- package/lib/utils/mtls/create-mtls-client.js +19 -0
- package/lib/utils/mtls/create-mtls-client.js.map +1 -0
- package/lib/utils/mtls/resolve-mtls-certificates.d.ts +7 -0
- package/lib/utils/mtls/resolve-mtls-certificates.d.ts.map +1 -0
- package/lib/utils/mtls/resolve-mtls-certificates.js +46 -0
- package/lib/utils/mtls/resolve-mtls-certificates.js.map +1 -0
- package/lib/utils/package.d.ts +2 -0
- package/lib/utils/package.d.ts.map +1 -0
- package/lib/utils/package.js +4 -0
- package/lib/utils/package.js.map +1 -0
- package/lib/utils/yaml.d.ts +5 -0
- package/lib/utils/yaml.d.ts.map +1 -0
- package/lib/utils/yaml.js +18 -0
- package/lib/utils/yaml.js.map +1 -0
- package/package.json +16 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
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":"schema-checker.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,KAAK,EAEV,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-checker.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,KAAK,EAEV,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAwB3B,wBAAgB,WAAW,CAAC,EAC1B,WAAW,EACX,oBAAoB,EACpB,GAAG,GACJ,EAAE;IACD,WAAW,EAAE,eAAe,CAAC;IAC7B,oBAAoB,CAAC,EAAE,GAAG,CAAC;IAC3B,GAAG,EAAE,WAAW,CAAC;CAClB,GAAG,KAAK,EAAE,CAkBV"}
|
|
@@ -5,6 +5,8 @@ import { CHECKS } from '../../checks/index.js';
|
|
|
5
5
|
import { printErrors as printAjvErrors } from '../../../utils/ajv-errors.js';
|
|
6
6
|
import { checkCircularRefsInSchema } from '../../../utils/check-circular-refs-in-schema.js';
|
|
7
7
|
import { removeWriteOnlyProperties } from '../../description-parser/index.js';
|
|
8
|
+
import { DefaultLogger } from '../../../utils/logger/logger.js';
|
|
9
|
+
const logger = DefaultLogger.getInstance();
|
|
8
10
|
const ajvStrict = new Ajv({
|
|
9
11
|
schemaId: '$id',
|
|
10
12
|
meta: true,
|
|
@@ -41,8 +43,8 @@ function checkSchemaFromDescription({ checks, descriptionOperation, $response, c
|
|
|
41
43
|
: undefined;
|
|
42
44
|
const isSchemaWithCircularRef = checkCircularRefsInSchema(schemaFromDescription);
|
|
43
45
|
if (isSchemaWithCircularRef) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
+
logger.log(`${yellow('WARNING: schema have circular references')}`);
|
|
47
|
+
logger.printNewLine();
|
|
46
48
|
}
|
|
47
49
|
if (schemaFromDescription && !isSchemaWithCircularRef) {
|
|
48
50
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-checker.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAAA,OAAO,GAA4B,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOnD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-checker.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAAA,OAAO,GAA4B,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOnD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;AAE3C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC;IACxB,QAAQ,EAAE,KAAK;IACf,IAAI,EAAE,IAAI;IACV,SAAS,EAAE,IAAI;IACf,YAAY,EAAE,KAAK;IACnB,UAAU,EAAE,KAAK;IACjB,cAAc,EAAE,KAAK;IACrB,aAAa,EAAE,IAAI;IACnB,eAAe,EAAE,IAAI;IACrB,eAAe,EAAE,KAAK;IACtB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,IAAI;IACb,4BAA4B,EAAE,KAAK;CACpC,CAAC,CAAC;AAEH,MAAM,UAAU,WAAW,CAAC,EAC1B,WAAW,EACX,oBAAoB,EACpB,GAAG,GAKJ;IACC,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;IAElC,MAAM,MAAM,GAAY,EAAE,CAAC;IAE3B,mGAAmG;IACnG,2BAA2B;IAC3B,IAAI,CAAC,SAAS,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,8BAA8B,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAEjF,+BAA+B,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAElF,0BAA0B,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,0BAA0B,CAAC,EAClC,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,GAAG,GACsC;IACzC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IACvC,MAAM,yBAAyB,GAC7B,oBAAoB,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC9D,oBAAoB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAE7C,MAAM,qBAAqB,GAAG,SAAS,EAAE,WAAW;QAClD,CAAC,CAAC,yBAAyB,EAAE,OAAO,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM;QACrE,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,qBAAqB,CAAC,CAAC;IAEjF,IAAI,uBAAuB,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,0CAA0C,CAAC,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,qBAAqB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM,CAAC,YAAY;gBACzB,MAAM,EAAE,SAAS,CAAC,QAAQ,CACxB,yBAAyB,CAAC,qBAAgD,CAAC,EAC3E,UAAU,CACX;gBACD,OAAO,EAAE,SAAS,CAAC,MAAM;oBACvB,CAAC,CAAC,cAAc,CACZ,yBAAyB,CAAC,qBAAgD,CAAC,EAC3E,UAAU,EACV,SAAS,CAAC,MAAM,CACjB;oBACH,CAAC,CAAC,EAAE;gBACN,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;aACvC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM,CAAC,YAAY;gBACzB,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,cAAc,KAAK,CAAC,OAAiB,EAAE;gBAChD,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;aACvC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,GAAG,GACsC;IACzC,MAAM,kBAAkB,GAAG,SAAS,EAAE,UAAU,CAAC;IACjD,MAAM,4BAA4B,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;IACxF,MAAM,0BAA0B,GAC9B,kBAAkB;QAClB,4BAA4B;aACzB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;aAC9B,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE7C,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEhF,MAAM,OAAO,GAAG,0BAA0B;QACxC,CAAC,CAAC,GAAG,CAAC,iEAAiE,CAAC;YACtE,gBAAgB,CAAC,4BAA4B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC,EAAE,CAAC,CAAC,sEAAsE;IAE9E,MAAM,MAAM,GAAG,0BAA0B,IAAI,sBAAsB,CAAC;IAEpE,MAAM,CAAC,IAAI,CAAC;QACV,IAAI,EAAE,MAAM,CAAC,iBAAiB;QAC9B,MAAM;QACN,OAAO;QACP,GAAG,CAAC,MAAM,IAAI;YACZ,SAAS,EAAE,mBAAmB,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;SACzE,CAAC;QACF,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC;KAC5C,CAAC,CAAC;AACL,CAAC;AAED,SAAS,+BAA+B,CAAC,EACvC,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,GAAG,GACsC;IACzC,MAAM,UAAU,GAAG,SAAS,EAAE,UAAU,CAAC;IACzC,MAAM,mBAAmB,GAAG,SAAS,EAAE,WAAW,CAAC;IACnD,MAAM,mCAAmC,GAAG,MAAM,CAAC,IAAI,CACrD,oBAAoB,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,IAAI,EAAE,CAC3D,CAAC;IAEF,IAAI,CAAC,mCAAmC,CAAC,MAAM,EAAE,CAAC;QAChD,OAAO;IACT,CAAC;IAED,IAAI,mBAAmB,IAAI,CAAC,mCAAmC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAC9F,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,MAAM,CAAC,kBAAkB;YAC/B,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,gBAAgB,GAAG,CAAC,mBAAmB,CAAC,QAAQ,IAAI,CAC3D,UAAU,CACX;iCAC0B,IAAI,CAAC,mCAAmC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG;YAClF,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,MAAM,CAAC,kBAAkB;YAC/B,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,iBAAiB,mBAAmB,+BAA+B;YAC5E,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-success-criteria.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/success-criteria/check-success-criteria.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,WAAW,EACX,KAAK,EAEL,IAAI,EACJ,cAAc,EACf,MAAM,mBAAmB,CAAC;AAE3B,wBAAgB,aAAa,CAAC,EAC5B,UAAU,EACV,IAAI,EACJ,QAAQ,EAAE,YAAiB,EAC3B,GAAG,GACJ,EAAE;IACD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;IAC5B,GAAG,EAAE,WAAW,CAAC;CAClB,GAAG,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"check-success-criteria.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/success-criteria/check-success-criteria.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,WAAW,EACX,KAAK,EAEL,IAAI,EACJ,cAAc,EACf,MAAM,mBAAmB,CAAC;AAE3B,wBAAgB,aAAa,CAAC,EAC5B,UAAU,EACV,IAAI,EACJ,QAAQ,EAAE,YAAiB,EAC3B,GAAG,GACJ,EAAE;IACD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;IAC5B,GAAG,EAAE,WAAW,CAAC;CAClB,GAAG,KAAK,EAAE,CAkFV"}
|
|
@@ -39,7 +39,7 @@ export function checkCriteria({ workflowId, step, criteria: criteriaList = [], c
|
|
|
39
39
|
const regex = new RegExp(regexPattern, flags);
|
|
40
40
|
checks.push({
|
|
41
41
|
name: CHECKS.SUCCESS_CRITERIA_CHECK,
|
|
42
|
-
passed: regex.test(evaluateRuntimeExpression(context, criteriaContext
|
|
42
|
+
passed: regex.test(evaluateRuntimeExpression(context, criteriaContext)),
|
|
43
43
|
message: `Checking regex criteria: ${JSON.stringify(criteria)}`,
|
|
44
44
|
severity: ctx.severity['SUCCESS_CRITERIA_CHECK'],
|
|
45
45
|
condition: condition,
|
|
@@ -47,7 +47,7 @@ export function checkCriteria({ workflowId, step, criteria: criteriaList = [], c
|
|
|
47
47
|
}
|
|
48
48
|
else if (isJSONPathSuccessCriteria(criteria)) {
|
|
49
49
|
const { context } = criteria;
|
|
50
|
-
const data = evaluateRuntimeExpression(context, criteriaContext
|
|
50
|
+
const data = evaluateRuntimeExpression(context, criteriaContext);
|
|
51
51
|
checks.push({
|
|
52
52
|
name: CHECKS.SUCCESS_CRITERIA_CHECK,
|
|
53
53
|
passed: evaluateJSONPAthCondition(condition, data),
|
|
@@ -59,7 +59,7 @@ export function checkCriteria({ workflowId, step, criteria: criteriaList = [], c
|
|
|
59
59
|
else {
|
|
60
60
|
checks.push({
|
|
61
61
|
name: CHECKS.SUCCESS_CRITERIA_CHECK,
|
|
62
|
-
passed: evaluateRuntimeExpression(condition, criteriaContext
|
|
62
|
+
passed: evaluateRuntimeExpression(condition, criteriaContext),
|
|
63
63
|
message: `Checking simple criteria: ${JSON.stringify(criteria)}`,
|
|
64
64
|
severity: ctx.severity['SUCCESS_CRITERIA_CHECK'],
|
|
65
65
|
condition: condition,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-success-criteria.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/success-criteria/check-success-criteria.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAUjE,MAAM,UAAU,aAAa,CAAC,EAC5B,UAAU,EACV,IAAI,EACJ,QAAQ,EAAE,YAAY,GAAG,EAAE,EAC3B,GAAG,GAMJ;IACC,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAY,EAAE,CAAC;IAE3B,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,MAAM,CAAC,sBAAsB;YACnC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,iCAAiC,IAAI,CAAC,MAAM,EAAE;YACvD,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,wBAAwB,CAAC;SACjD,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,eAAe,GAAG,0BAA0B,CAAC;QACjD,GAAG;QACH,UAAU;QACV,IAAI;KACL,CAAC,CAAC;IAEH,YAAY,CAAC,OAAO,CAAC,CAAC,QAAwB,EAAE,EAAE;QAChD,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;QAE/B,IAAI,CAAC;YACH,IAAI,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACtC,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAE5D,IAAI,YAAoB,CAAC;gBACzB,IAAI,KAAa,CAAC;gBAElB,IAAI,UAAU,EAAE,CAAC;oBACf,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,mDAAmD;oBACjF,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC;gBAC9D,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,SAAS,CAAC,CAAC,mEAAmE;oBAC7F,KAAK,GAAG,EAAE,CAAC,CAAC,wBAAwB;gBACtC,CAAC;gBAED,MAAM,EAAE,OAAO,EAAE,GAAG,QAAiC,CAAC;gBACtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;gBAE9C,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,MAAM,CAAC,sBAAsB;oBACnC,MAAM,EAAE,KAAK,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"check-success-criteria.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/success-criteria/check-success-criteria.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { type LoggerInterface } from '@redocly/openapi-core';
|
|
2
1
|
import type { RuntimeExpressionContext } from '../../types.js';
|
|
3
|
-
export declare function evaluateRuntimeExpressionPayload({ payload, context, contentType,
|
|
2
|
+
export declare function evaluateRuntimeExpressionPayload({ payload, context, contentType, }: {
|
|
4
3
|
payload: any;
|
|
5
4
|
context: RuntimeExpressionContext;
|
|
6
5
|
contentType?: string;
|
|
7
|
-
logger: LoggerInterface;
|
|
8
6
|
}): any;
|
|
9
|
-
export declare function evaluateRuntimeExpression(expression: any, context: RuntimeExpressionContext
|
|
7
|
+
export declare function evaluateRuntimeExpression(expression: any, context: RuntimeExpressionContext): any;
|
|
10
8
|
export declare function isPureRuntimeExpression(expression: string): boolean;
|
|
11
9
|
//# sourceMappingURL=evaluate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAG/D,wBAAgB,gCAAgC,CAAC,EAC/C,OAAO,EACP,OAAO,EACP,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,wBAAwB,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,GAAG,CAwBN;AAGD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,wBAAwB,GAAG,GAAG,CAajG;AA+ID,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAMnE"}
|
|
@@ -3,26 +3,26 @@ import { lintExpression } from './lint.js';
|
|
|
3
3
|
import { replaceJSONPointers } from './replace-json-pointers.js';
|
|
4
4
|
import { getFakeData, parseJson } from '../context-parser/index.js';
|
|
5
5
|
// Used when evaluating expressions in a string that can contain other text, like request bodies payload, output values, etc.
|
|
6
|
-
export function evaluateRuntimeExpressionPayload({ payload, context, contentType,
|
|
6
|
+
export function evaluateRuntimeExpressionPayload({ payload, context, contentType, }) {
|
|
7
7
|
if (contentType?.includes('application/octet-stream') ||
|
|
8
8
|
contentType?.includes('multipart/form-data')) {
|
|
9
|
-
return parseJson(payload, context
|
|
9
|
+
return parseJson(payload, context); // Return parsed file content as JSON
|
|
10
10
|
}
|
|
11
11
|
if (typeof payload === 'string') {
|
|
12
12
|
// Resolve string expressions
|
|
13
13
|
return isPureRuntimeExpression(payload)
|
|
14
|
-
? evaluateRuntimeExpression(payload, context
|
|
15
|
-
: evaluateExpressionsInString(payload, context
|
|
14
|
+
? evaluateRuntimeExpression(payload, context)
|
|
15
|
+
: evaluateExpressionsInString(payload, context);
|
|
16
16
|
}
|
|
17
17
|
else if (isPlainObject(payload)) {
|
|
18
18
|
return Object.entries(payload).reduce((acc, [key, value]) => {
|
|
19
|
-
acc[key] = evaluateRuntimeExpressionPayload({ payload: value, context
|
|
19
|
+
acc[key] = evaluateRuntimeExpressionPayload({ payload: value, context });
|
|
20
20
|
return acc;
|
|
21
21
|
}, {});
|
|
22
22
|
}
|
|
23
23
|
else if (Array.isArray(payload)) {
|
|
24
24
|
// Handle each element in an array
|
|
25
|
-
return payload.map((item) => evaluateRuntimeExpressionPayload({ payload: item, context
|
|
25
|
+
return payload.map((item) => evaluateRuntimeExpressionPayload({ payload: item, context }));
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
28
|
// Return the payload as-is if it's not a string, object, or array
|
|
@@ -30,34 +30,34 @@ export function evaluateRuntimeExpressionPayload({ payload, context, contentType
|
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
// Evaluate runtime expressions in a given expression object. Used in SuccessCriteria conditions.
|
|
33
|
-
export function evaluateRuntimeExpression(expression, context
|
|
33
|
+
export function evaluateRuntimeExpression(expression, context) {
|
|
34
34
|
if (typeof expression === 'string') {
|
|
35
|
-
return evaluateExpressionString(expression, context
|
|
35
|
+
return evaluateExpressionString(expression, context);
|
|
36
36
|
}
|
|
37
37
|
else if (isPlainObject(expression)) {
|
|
38
38
|
return Object.entries(expression).reduce((acc, [key, value]) => {
|
|
39
|
-
acc[key] = value && evaluateRuntimeExpression(value, context
|
|
39
|
+
acc[key] = value && evaluateRuntimeExpression(value, context);
|
|
40
40
|
return acc;
|
|
41
41
|
}, {});
|
|
42
42
|
}
|
|
43
43
|
else if (Array.isArray(expression)) {
|
|
44
|
-
return expression.map((exp) => evaluateRuntimeExpression(exp, context
|
|
44
|
+
return expression.map((exp) => evaluateRuntimeExpression(exp, context));
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
47
|
return expression;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
function evaluateExpressionString(expression, context
|
|
50
|
+
function evaluateExpressionString(expression, context) {
|
|
51
51
|
// Replace $faker expressions with fake data as it is not the part of the Runtime
|
|
52
52
|
// Expressions and should be evaluated separately
|
|
53
53
|
if (/^\$faker\.[a-zA-Z0-9._-]+(\([^\\)]*\))?$/.test(expression)) {
|
|
54
|
-
return getFakeData(
|
|
54
|
+
return getFakeData(expression.slice(1), context);
|
|
55
55
|
}
|
|
56
56
|
else if (expression.includes('$faker.')) {
|
|
57
57
|
const fakerRegex = /\$faker\.[a-zA-Z0-9._-]+(\([^\\)]*\))?/g;
|
|
58
58
|
expression = expression
|
|
59
59
|
.replace(fakerRegex, (match) => {
|
|
60
|
-
return getFakeData(
|
|
60
|
+
return getFakeData(match.slice(1), context);
|
|
61
61
|
})
|
|
62
62
|
.replace(/{(.*?)}/g, '$1');
|
|
63
63
|
}
|
|
@@ -145,12 +145,12 @@ function convertNumericIndices(expression) {
|
|
|
145
145
|
});
|
|
146
146
|
}
|
|
147
147
|
// Helper function to evaluate expressions within a string
|
|
148
|
-
function evaluateExpressionsInString(expression, context
|
|
148
|
+
function evaluateExpressionsInString(expression, context) {
|
|
149
149
|
const regex = /\{(?:[^{}]|\{[^{}]*\})*\}|\$[^\s{}]+(?:\([^()]*\))*/g;
|
|
150
150
|
return expression.replace(regex, (match) => {
|
|
151
151
|
const exprToEvaluate = match.trim();
|
|
152
152
|
// For dollar expressions, include the leading $ when passing to evaluateRuntimeExpression
|
|
153
|
-
const evaluatedValue = evaluateRuntimeExpression(exprToEvaluate, context
|
|
153
|
+
const evaluatedValue = evaluateRuntimeExpression(exprToEvaluate, context);
|
|
154
154
|
// Return evaluated value or the original match if undefined
|
|
155
155
|
return evaluatedValue !== undefined ? evaluatedValue : match;
|
|
156
156
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import type { Faker } from './modules/faker.js';
|
|
|
4
4
|
import type { OperationDetails } from './modules/description-parser/index.js';
|
|
5
5
|
import type { ApiFetcher } from './utils/api-fetcher.js';
|
|
6
6
|
import type { RespectOptions } from './handlers/run.js';
|
|
7
|
-
import type { Config, CollectFn, RuleSeverity
|
|
7
|
+
import type { Config, CollectFn, RuleSeverity } from '@redocly/openapi-core';
|
|
8
8
|
export type OperationMethod = FromSchema<typeof operationMethod>;
|
|
9
9
|
export type ResponseContext = {
|
|
10
10
|
statusCode: number;
|
|
@@ -62,7 +62,7 @@ export type Workflow = Omit<ArazzoWorkflow, 'steps'> & {
|
|
|
62
62
|
steps: Step[];
|
|
63
63
|
time?: number;
|
|
64
64
|
};
|
|
65
|
-
export type
|
|
65
|
+
export type RunArgv = Omit<RespectOptions, 'files'> & {
|
|
66
66
|
file: string;
|
|
67
67
|
testDescription?: TestDescription;
|
|
68
68
|
input?: string | string[];
|
|
@@ -93,21 +93,16 @@ export type AppOptions = {
|
|
|
93
93
|
workflow?: string | string[];
|
|
94
94
|
skip?: string | string[];
|
|
95
95
|
verbose?: boolean;
|
|
96
|
+
harOutput?: string;
|
|
97
|
+
jsonOutput?: string;
|
|
96
98
|
metadata?: Record<string, any>;
|
|
97
99
|
input?: string | string[];
|
|
98
100
|
server?: string | string[];
|
|
99
101
|
severity?: string | string[];
|
|
102
|
+
mutualTls?: Partial<TestContext['mtlsCerts']>;
|
|
100
103
|
maxSteps: number;
|
|
101
104
|
maxFetchTimeout: number;
|
|
102
105
|
executionTimeout: number;
|
|
103
|
-
config: Config;
|
|
104
|
-
requestFileLoader: {
|
|
105
|
-
getFileBody: (filePath: string) => Promise<Blob>;
|
|
106
|
-
};
|
|
107
|
-
fetch: typeof fetch;
|
|
108
|
-
envVariables: Record<string, string>;
|
|
109
|
-
version?: string;
|
|
110
|
-
logger: LoggerInterface;
|
|
111
106
|
};
|
|
112
107
|
export type RegexpSuccessCriteria = {
|
|
113
108
|
condition: string;
|
|
@@ -204,17 +199,6 @@ export interface StepExecutionResult {
|
|
|
204
199
|
status: ExecutionStatus;
|
|
205
200
|
})[];
|
|
206
201
|
}
|
|
207
|
-
export type RunFileResult = {
|
|
208
|
-
hasProblems: boolean;
|
|
209
|
-
hasWarnings: boolean;
|
|
210
|
-
file: string;
|
|
211
|
-
executedWorkflows: WorkflowExecutionResult[];
|
|
212
|
-
options: RunOptions;
|
|
213
|
-
ctx: TestContext;
|
|
214
|
-
totalTimeMs: number;
|
|
215
|
-
totalRequests: number;
|
|
216
|
-
globalTimeoutError: boolean;
|
|
217
|
-
};
|
|
218
202
|
export interface WorkflowExecutionResult {
|
|
219
203
|
type: 'workflow';
|
|
220
204
|
workflowId: string;
|
|
@@ -242,13 +226,16 @@ export type TestContext = RuntimeExpressionContext & {
|
|
|
242
226
|
workflows: Workflow[];
|
|
243
227
|
options: AppOptions;
|
|
244
228
|
testDescription: TestDescription;
|
|
229
|
+
harLogs: any;
|
|
245
230
|
components?: Record<string, any>;
|
|
246
231
|
secretFields: Set<string>;
|
|
247
232
|
severity: Record<string, RuleSeverity>;
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
233
|
+
mtlsCerts?: {
|
|
234
|
+
clientCert?: string;
|
|
235
|
+
clientKey?: string;
|
|
236
|
+
caCert?: string;
|
|
251
237
|
};
|
|
238
|
+
apiClient: ApiFetcher;
|
|
252
239
|
};
|
|
253
240
|
export type TestDescription = Partial<Pick<TestContext & WorkflowInnerContext & StepInnerContext, 'workflows' | 'arazzo' | 'info' | 'sourceDescriptions' | '$outputs' | 'components'>>;
|
|
254
241
|
export type Check = {
|
package/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,uBAAuB,EACvB,UAAU,EACV,WAAW,EACX,WAAW,EACX,cAAc,EACd,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { fetch } from 'undici';
|
|
1
2
|
import { type VerboseLog, type TestContext, type ResponseContext, type Step } from '../types.js';
|
|
2
3
|
import type { RequestData } from '../modules/flow-runner/index.js';
|
|
3
4
|
interface IFetcher {
|
|
4
5
|
verboseLogs?: VerboseLog;
|
|
5
6
|
verboseResponseLogs?: VerboseLog;
|
|
7
|
+
harLogs?: any;
|
|
6
8
|
fetch?: typeof fetch;
|
|
7
9
|
}
|
|
8
10
|
export declare function normalizeHeaders(headers: Record<string, string> | undefined): Record<string, string>;
|
|
@@ -12,6 +14,7 @@ export declare function trimTrailingSlash(str: string): string;
|
|
|
12
14
|
export declare class ApiFetcher implements IFetcher {
|
|
13
15
|
verboseLogs?: VerboseLog;
|
|
14
16
|
verboseResponseLogs?: VerboseLog;
|
|
17
|
+
harLogs?: any;
|
|
15
18
|
fetch?: typeof fetch;
|
|
16
19
|
constructor(params: IFetcher);
|
|
17
20
|
initVerboseLogs: ({ headerParams, host, path, method, body }: VerboseLog) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAK/B,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,IAAI,EACV,MAAM,aAAa,CAAC;AAgBrB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAInE,UAAU,QAAQ;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,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,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;gBAET,MAAM,EAAE,QAAQ;IAK5B,eAAe,+CAAgD,UAAU,UAQvE;IAEF,cAAc,+BAEZ;IAEF,iBAAiB,WAAY,OAAO,CAAC,UAAU,CAAC,UAQ9C;IAEF,uBAAuB,0EAQpB,UAAU,UAUX;IAEF,sBAAsB,+BAEpB;IAEF,WAAW,4CAKR;QACD,GAAG,EAAE,WAAW,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC;QACX,WAAW,EAAE,WAAW,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAG,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,CA8QlC;CACH"}
|
package/lib/utils/api-fetcher.js
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
|
+
import { fetch } from 'undici';
|
|
1
2
|
import { bgRed, inverse } from 'colorette';
|
|
3
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
4
|
+
// @ts-ignore this works but some types are not working
|
|
5
|
+
import concat from 'concat-stream';
|
|
6
|
+
import { withHar } from '../utils/har-logs/index.js';
|
|
2
7
|
import { isEmpty } from './is-empty.js';
|
|
3
8
|
import { resolvePath } from '../modules/context-parser/index.js';
|
|
4
9
|
import { getVerboseLogs, maskSecrets, findPotentiallySecretObjectFields, } from '../modules/cli-output/index.js';
|
|
5
10
|
import { getResponseSchema } from '../modules/description-parser/index.js';
|
|
6
11
|
import { collectSecretFields } from '../modules/flow-runner/index.js';
|
|
12
|
+
import { createMtlsClient } from './mtls/create-mtls-client.js';
|
|
13
|
+
import { DefaultLogger } from './logger/logger.js';
|
|
7
14
|
import { parseWwwAuthenticateHeader } from './digest-auth/parse-www-authenticate-header.js';
|
|
8
15
|
import { generateDigestAuthHeader } from './digest-auth/generate-digest-auth-header.js';
|
|
16
|
+
const logger = DefaultLogger.getInstance();
|
|
9
17
|
export function normalizeHeaders(headers) {
|
|
10
18
|
if (!headers) {
|
|
11
19
|
return {};
|
|
@@ -69,7 +77,7 @@ export class ApiFetcher {
|
|
|
69
77
|
this.fetchResult = async ({ ctx, step, requestData, workflowId, }) => {
|
|
70
78
|
const { serverUrl, path, method, parameters, requestBody, openapiOperation } = requestData;
|
|
71
79
|
if (!serverUrl?.url) {
|
|
72
|
-
|
|
80
|
+
logger.error(bgRed(` No server url provided `));
|
|
73
81
|
throw new Error('No server url provided');
|
|
74
82
|
}
|
|
75
83
|
const headers = {};
|
|
@@ -105,12 +113,12 @@ export class ApiFetcher {
|
|
|
105
113
|
const resolvedServerUrl = resolvePath(serverUrl.url, pathParams) || '';
|
|
106
114
|
const urlToFetch = `${trimTrailingSlash(resolvedServerUrl)}${pathWithSearchParams}`;
|
|
107
115
|
if (urlToFetch.startsWith('/')) {
|
|
108
|
-
|
|
116
|
+
logger.error(bgRed(` Wrong url: ${inverse(urlToFetch)} `) +
|
|
109
117
|
` Did you forget to provide a correct "serverUrl"?\n`);
|
|
110
118
|
}
|
|
111
119
|
const contentType = headers['content-type'] || '';
|
|
112
120
|
if (requestBody && !contentType) {
|
|
113
|
-
|
|
121
|
+
logger.error(bgRed(` Incorrect request `) +
|
|
114
122
|
` Please provide a correct "content-type" header or specify the "content-type" field in the test case itself. \n`);
|
|
115
123
|
}
|
|
116
124
|
let encodedBody;
|
|
@@ -124,24 +132,28 @@ export class ApiFetcher {
|
|
|
124
132
|
encodedBody = requestBody;
|
|
125
133
|
}
|
|
126
134
|
else if (contentType.includes('multipart/form-data')) {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
*/
|
|
137
|
-
delete headers['content-type'];
|
|
135
|
+
// Get the form data buffer
|
|
136
|
+
encodedBody = await new Promise((resolve, reject) => {
|
|
137
|
+
requestBody.pipe(concat((data) => {
|
|
138
|
+
resolve(data);
|
|
139
|
+
}));
|
|
140
|
+
requestBody.on('error', reject);
|
|
141
|
+
});
|
|
142
|
+
// Ensure the content-type header includes the boundary
|
|
143
|
+
headers['content-type'] = `multipart/form-data; boundary=${requestBody._boundary}`;
|
|
138
144
|
}
|
|
139
145
|
else if (contentType === 'application/octet-stream') {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
146
|
+
// Convert ReadStream to Blob for undici fetch
|
|
147
|
+
encodedBody = await new Promise((resolve, reject) => {
|
|
148
|
+
const chunks = [];
|
|
149
|
+
requestBody.on('data', (chunk) => {
|
|
150
|
+
chunks.push(new Uint8Array(chunk.buffer));
|
|
151
|
+
});
|
|
152
|
+
requestBody.on('end', () => resolve(Buffer.concat(chunks)));
|
|
153
|
+
requestBody.on('error', reject);
|
|
154
|
+
});
|
|
155
|
+
const fileName = requestBody.path.split('/').pop();
|
|
156
|
+
headers['content-disposition'] = `attachment; filename=${fileName}`;
|
|
145
157
|
}
|
|
146
158
|
else {
|
|
147
159
|
encodedBody = requestBody;
|
|
@@ -160,7 +172,7 @@ export class ApiFetcher {
|
|
|
160
172
|
path: maskedPathParams || '',
|
|
161
173
|
body: maskedBody,
|
|
162
174
|
});
|
|
163
|
-
const
|
|
175
|
+
const wrappedFetch = this.harLogs ? withHar(this.fetch, { har: this.harLogs }) : fetch;
|
|
164
176
|
const startTime = performance.now();
|
|
165
177
|
let fetchResult;
|
|
166
178
|
let responseBody;
|
|
@@ -177,6 +189,7 @@ export class ApiFetcher {
|
|
|
177
189
|
...(headers['content-type'] === 'application/octet-stream' && {
|
|
178
190
|
duplex: 'half',
|
|
179
191
|
}),
|
|
192
|
+
dispatcher: ctx.mtlsCerts ? createMtlsClient(urlToFetch, ctx.mtlsCerts) : undefined,
|
|
180
193
|
};
|
|
181
194
|
const workflowLevelXSecurityParameters = ctx.workflows.find((workflow) => workflow.workflowId === workflowId)?.['x-security'] || [];
|
|
182
195
|
const lastDigestSecurityScheme = [
|
|
@@ -194,7 +207,7 @@ export class ApiFetcher {
|
|
|
194
207
|
// FETCH WITH DIGEST AUTH
|
|
195
208
|
// Digest auth perform two requests to establish the connection
|
|
196
209
|
// We need to wait for the second request to complete before returning the response
|
|
197
|
-
const first401Result = await
|
|
210
|
+
const first401Result = await wrappedFetch(urlToFetch, fetchParams);
|
|
198
211
|
const body401 = await first401Result.text();
|
|
199
212
|
const wwwAuthenticateHeader = first401Result.headers.get('www-authenticate');
|
|
200
213
|
if (!wwwAuthenticateHeader) {
|
|
@@ -237,7 +250,7 @@ export class ApiFetcher {
|
|
|
237
250
|
this.updateVerboseLogs({
|
|
238
251
|
headerParams: maskSecrets(updatedHeaders, ctx.secretFields || new Set()),
|
|
239
252
|
});
|
|
240
|
-
fetchResult = await
|
|
253
|
+
fetchResult = await wrappedFetch(urlToFetch, {
|
|
241
254
|
...fetchParams,
|
|
242
255
|
headers: updatedHeaders,
|
|
243
256
|
});
|
|
@@ -246,7 +259,7 @@ export class ApiFetcher {
|
|
|
246
259
|
}
|
|
247
260
|
else {
|
|
248
261
|
// REGULAR FETCH
|
|
249
|
-
fetchResult = await
|
|
262
|
+
fetchResult = await wrappedFetch(urlToFetch, fetchParams);
|
|
250
263
|
responseTime = Math.ceil(performance.now() - startTime);
|
|
251
264
|
responseBody = await fetchResult.text();
|
|
252
265
|
}
|
|
@@ -293,6 +306,7 @@ export class ApiFetcher {
|
|
|
293
306
|
requestUrl: urlToFetch,
|
|
294
307
|
};
|
|
295
308
|
};
|
|
309
|
+
this.harLogs = params.harLogs;
|
|
296
310
|
this.fetch = params.fetch || fetch;
|
|
297
311
|
}
|
|
298
312
|
}
|