@redocly/respect-core 2.77.0 → 2.78.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.
Files changed (71) hide show
  1. package/lib/arazzo-schema.d.ts +53 -21
  2. package/lib/arazzo-schema.d.ts.map +1 -1
  3. package/lib/arazzo-schema.js +16 -2
  4. package/lib/arazzo-schema.js.map +1 -1
  5. package/lib/modules/arazzo-description-generator/cleanup-test-description.d.ts +4 -0
  6. package/lib/modules/arazzo-description-generator/cleanup-test-description.d.ts.map +1 -1
  7. package/lib/modules/context-parser/parse-parameters.d.ts +1 -1
  8. package/lib/modules/context-parser/parse-parameters.d.ts.map +1 -1
  9. package/lib/modules/context-parser/parse-parameters.js +1 -1
  10. package/lib/modules/context-parser/parse-parameters.js.map +1 -1
  11. package/lib/modules/description-parser/get-operation-by-id.d.ts.map +1 -1
  12. package/lib/modules/description-parser/get-operation-by-id.js +6 -6
  13. package/lib/modules/description-parser/get-operation-by-id.js.map +1 -1
  14. package/lib/modules/description-parser/get-request-body-schema.d.ts +1 -1
  15. package/lib/modules/description-parser/get-request-body-schema.d.ts.map +1 -1
  16. package/lib/modules/description-parser/get-request-body-schema.js +2 -4
  17. package/lib/modules/description-parser/get-request-body-schema.js.map +1 -1
  18. package/lib/modules/description-parser/get-request-data-from-openapi.d.ts.map +1 -1
  19. package/lib/modules/description-parser/get-request-data-from-openapi.js +22 -1
  20. package/lib/modules/description-parser/get-request-data-from-openapi.js.map +1 -1
  21. package/lib/modules/description-parser/get-response-schema.d.ts +3 -1
  22. package/lib/modules/description-parser/get-response-schema.d.ts.map +1 -1
  23. package/lib/modules/description-parser/get-response-schema.js +8 -2
  24. package/lib/modules/description-parser/get-response-schema.js.map +1 -1
  25. package/lib/modules/description-parser/index.d.ts +1 -0
  26. package/lib/modules/description-parser/index.d.ts.map +1 -1
  27. package/lib/modules/description-parser/index.js +1 -0
  28. package/lib/modules/description-parser/index.js.map +1 -1
  29. package/lib/modules/description-parser/resolve-content-by-type.d.ts +4 -0
  30. package/lib/modules/description-parser/resolve-content-by-type.d.ts.map +1 -0
  31. package/lib/modules/description-parser/resolve-content-by-type.js +29 -0
  32. package/lib/modules/description-parser/resolve-content-by-type.js.map +1 -0
  33. package/lib/modules/flow-runner/context/create-test-context.d.ts +2 -1
  34. package/lib/modules/flow-runner/context/create-test-context.d.ts.map +1 -1
  35. package/lib/modules/flow-runner/context/create-test-context.js +2 -1
  36. package/lib/modules/flow-runner/context/create-test-context.js.map +1 -1
  37. package/lib/modules/flow-runner/context/set-public-workflows.d.ts +6 -3
  38. package/lib/modules/flow-runner/context/set-public-workflows.d.ts.map +1 -1
  39. package/lib/modules/flow-runner/context/set-public-workflows.js +21 -10
  40. package/lib/modules/flow-runner/context/set-public-workflows.js.map +1 -1
  41. package/lib/modules/flow-runner/get-test-description-from-file.d.ts.map +1 -1
  42. package/lib/modules/flow-runner/get-test-description-from-file.js +10 -8
  43. package/lib/modules/flow-runner/get-test-description-from-file.js.map +1 -1
  44. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.d.ts +1 -1
  45. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.d.ts.map +1 -1
  46. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.js +7 -2
  47. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.js.map +1 -1
  48. package/lib/modules/flow-runner/prepare-request.d.ts +1 -0
  49. package/lib/modules/flow-runner/prepare-request.d.ts.map +1 -1
  50. package/lib/modules/flow-runner/prepare-request.js +81 -4
  51. package/lib/modules/flow-runner/prepare-request.js.map +1 -1
  52. package/lib/modules/flow-runner/runner.d.ts.map +1 -1
  53. package/lib/modules/flow-runner/runner.js +7 -0
  54. package/lib/modules/flow-runner/runner.js.map +1 -1
  55. package/lib/modules/flow-runner/schema/schema-checker.d.ts +0 -4
  56. package/lib/modules/flow-runner/schema/schema-checker.d.ts.map +1 -1
  57. package/lib/modules/flow-runner/schema/schema-checker.js +15 -42
  58. package/lib/modules/flow-runner/schema/schema-checker.js.map +1 -1
  59. package/lib/modules/runtime-expressions/evaluate.d.ts.map +1 -1
  60. package/lib/modules/runtime-expressions/evaluate.js +12 -4
  61. package/lib/modules/runtime-expressions/evaluate.js.map +1 -1
  62. package/lib/types.d.ts +6 -1
  63. package/lib/types.d.ts.map +1 -1
  64. package/lib/utils/api-fetcher.d.ts.map +1 -1
  65. package/lib/utils/api-fetcher.js +16 -7
  66. package/lib/utils/api-fetcher.js.map +1 -1
  67. package/lib/utils/url-encoding.d.ts +10 -0
  68. package/lib/utils/url-encoding.d.ts.map +1 -1
  69. package/lib/utils/url-encoding.js +16 -0
  70. package/lib/utils/url-encoding.js.map +1 -1
  71. package/package.json +2 -2
@@ -3,6 +3,7 @@ import { blue, dim, red, yellow, green } from 'colorette';
3
3
  import { printErrors as printAjvErrors } from '../../../utils/ajv-errors.js';
4
4
  import { checkCircularRefsInSchema } from '../../../utils/check-circular-refs-in-schema.js';
5
5
  import { CHECKS } from '../../checks/index.js';
6
+ import { contentTypeMatchesPattern, getResponseKeyByStatusCode, getResponseSchema, } from '../../description-parser/index.js';
6
7
  const ajvStrict = new Ajv({
7
8
  schemaId: '$id',
8
9
  meta: true,
@@ -33,10 +34,12 @@ export function checkSchema({ stepCallCtx, descriptionOperation, ctx, ajvContext
33
34
  }
34
35
  function checkSchemaFromDescription({ checks, descriptionOperation, $response, ctx, ajvContext, }) {
35
36
  const { body: resultBody } = $response;
36
- const descriptionResponseByCode = descriptionOperation?.responses[String($response?.statusCode)] ||
37
- descriptionOperation?.responses['default'];
38
37
  const schemaFromDescription = $response?.contentType
39
- ? resolveContentByType(descriptionResponseByCode?.content, $response.contentType)?.schema
38
+ ? getResponseSchema({
39
+ statusCode: $response.statusCode,
40
+ contentType: $response.contentType,
41
+ descriptionResponses: descriptionOperation?.responses,
42
+ })
40
43
  : undefined;
41
44
  const isSchemaWithCircularRef = checkCircularRefsInSchema(schemaFromDescription);
42
45
  if (isSchemaWithCircularRef) {
@@ -67,17 +70,14 @@ function checkSchemaFromDescription({ checks, descriptionOperation, $response, c
67
70
  }
68
71
  function checkStatusCodeFromDescription({ checks, descriptionOperation, $response, ctx, }) {
69
72
  const responseStatusCode = $response?.statusCode;
70
- const responseCodesFromDescription = Object.keys(descriptionOperation?.responses || {});
71
- const matchesCodeFromDescription = responseStatusCode &&
72
- responseCodesFromDescription
73
- .map((item) => item.toString())
74
- .includes(responseStatusCode.toString());
75
- const matchesDefaultResponse = responseCodesFromDescription.includes('default');
76
- const message = matchesCodeFromDescription
73
+ const descriptionResponses = descriptionOperation?.responses || {};
74
+ const responseCodesFromDescription = Object.keys(descriptionResponses);
75
+ const matchedResponseKey = getResponseKeyByStatusCode(descriptionResponses, responseStatusCode);
76
+ const message = matchedResponseKey === String(responseStatusCode)
77
77
  ? dim(`List of valid response codes are inferred from description \n\n`) +
78
78
  statusCodeDiff(`${responseStatusCode}`, responseCodesFromDescription.map(String))
79
- : ''; // NOTE: we don't show any diff if response code hits default response
80
- const passed = matchesCodeFromDescription || matchesDefaultResponse;
79
+ : ''; // NOTE: we don't show any diff if response code hits a range or the default response
80
+ const passed = matchedResponseKey !== undefined;
81
81
  checks.push({
82
82
  name: CHECKS.STATUS_CODE_CHECK,
83
83
  passed,
@@ -88,39 +88,12 @@ function checkStatusCodeFromDescription({ checks, descriptionOperation, $respons
88
88
  severity: ctx.severity['STATUS_CODE_CHECK'],
89
89
  });
90
90
  }
91
- function contentTypeMatchesPattern(contentType, pattern) {
92
- const normalizedPattern = pattern.toLowerCase();
93
- const normalizedContentType = contentType.toLowerCase();
94
- if (normalizedPattern === '*/*')
95
- return true;
96
- if (normalizedPattern === normalizedContentType)
97
- return true;
98
- const [patternType, patternSubtype] = normalizedPattern.split('/');
99
- const [actualType, actualSubtype] = normalizedContentType.split('/');
100
- if (patternType === '*') {
101
- return patternSubtype === '*' || patternSubtype === actualSubtype;
102
- }
103
- if (patternSubtype === '*') {
104
- return patternType === actualType;
105
- }
106
- return false;
107
- }
108
- export function resolveContentByType(content, contentType) {
109
- if (!content)
110
- return undefined;
111
- if (content[contentType])
112
- return content[contentType];
113
- for (const pattern of Object.keys(content)) {
114
- if (contentTypeMatchesPattern(contentType, pattern)) {
115
- return content[pattern];
116
- }
117
- }
118
- return undefined;
119
- }
120
91
  function checkContentTypeFromDescription({ checks, descriptionOperation, $response, ctx, }) {
121
92
  const statusCode = $response?.statusCode;
122
93
  const responseContentType = $response?.contentType;
123
- const possibleContentTypesFromDescription = Object.keys(descriptionOperation?.responses[statusCode]?.content || {});
94
+ const descriptionResponses = descriptionOperation?.responses || {};
95
+ const responseKey = getResponseKeyByStatusCode(descriptionResponses, statusCode);
96
+ const possibleContentTypesFromDescription = Object.keys((responseKey && descriptionResponses[responseKey]?.content) || {});
124
97
  if (!possibleContentTypesFromDescription.length) {
125
98
  return;
126
99
  }
@@ -1 +1 @@
1
- {"version":3,"file":"schema-checker.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAAA,OAAO,GAAwD,MAAM,2BAA2B,CAAC;AAEjG,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAQ1D,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,SAAS,GAAG,IAAK,GAAW,CAAC;IACjC,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,IAAI;IACrB,WAAW,EAAE,IAAI;IACjB,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,EACH,UAAU,GAMX;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,UAAU,EAAE,CAAC,CAAC;IAEzF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,0BAA0B,CAAC,EAClC,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,GAAG,EACH,UAAU,GACwD;IAClE,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,oBAAoB,CAAC,yBAAyB,EAAE,OAAO,EAAE,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM;QACzF,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,qBAAqB,CAAC,CAAC;IAEjF,IAAI,uBAAuB,EAAE,CAAC;QAC5B,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,0CAA0C,CAAC,EAAE,CAAC,CAAC;QACnF,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,qBAAqB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAgD,CAAC,CAAC;YACrF,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM,CAAC,YAAY;gBACzB,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC;gBAC7C,OAAO,EAAE,QAAQ,CAAC,MAAM;oBACtB,CAAC,CAAC,cAAc,CACZ,qBAAgD,EAChD,UAAU,EACV,QAAQ,CAAC,MAAM,CAChB;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,cAAc,CAAC,GAAG,kBAAkB,EAAE,EAAE,4BAA4B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnF,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,yBAAyB,CAAC,WAAmB,EAAE,OAAe;IACrE,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAChD,MAAM,qBAAqB,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAExD,IAAI,iBAAiB,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAC7C,IAAI,iBAAiB,KAAK,qBAAqB;QAAE,OAAO,IAAI,CAAC;IAE7D,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErE,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;QACxB,OAAO,cAAc,KAAK,GAAG,IAAI,cAAc,KAAK,aAAa,CAAC;IACpE,CAAC;IAED,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;QAC3B,OAAO,WAAW,KAAK,UAAU,CAAC;IACpC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAID,MAAM,UAAU,oBAAoB,CAClC,OAAoC,EACpC,WAAmB;IAEnB,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,IAAI,OAAO,CAAC,WAAW,CAAC;QAAE,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC;IAEtD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,IAAI,yBAAyB,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;YACpD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,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,IACE,mBAAmB;QACnB,CAAC,mCAAmC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CACpD,yBAAyB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CACxD,EACD,CAAC;QACD,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;AAED,MAAM,UAAU,cAAc,CAAc,MAAe,EAAE,QAAa;IACxE,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAW,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAEpC,OAAO,wCAAwC,YAAY,kBACzD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAC/C,EAAE,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"schema-checker.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.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;AAoED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAiBnE"}
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;AA+ED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAiBnE"}
@@ -94,12 +94,20 @@ function evaluateExpressionString(expression, context, logger) {
94
94
  }
95
95
  }
96
96
  // Helper function to evaluate expressions within a string
97
- function evaluateExpressionsInString(expression, context, logger) {
98
- const regex = /\{(?:[^{}]|\{[^{}]*\})*\}|\$[^\s{}]+(?:\([^()]*\))*/g;
97
+ function evaluateExpressionsInString(expression, context, logger, insideBraces = false) {
98
+ // Inside braces that are not an expression, such as a JSON object, only an {expression}
99
+ // and a $faker call are evaluated.
100
+ const regex = insideBraces
101
+ ? /\{(?:[^{}]|\{[^{}]*\})*\}|\$faker\.[a-zA-Z0-9._-]+(?:\([^()]*\))?/g
102
+ : /\{(?:[^{}]|\{[^{}]*\})*\}|\$[^\s{}]+(?:\([^()]*\))*/g;
99
103
  return expression.replace(regex, (match) => {
100
104
  const exprToEvaluate = match.trim();
101
- if (!isValidRuntimeExpression(exprToEvaluate) && !exprToEvaluate.includes('$faker.')) {
102
- return match;
105
+ // `{"id": "$faker.string.uuid()"}` only holds a $faker call, `{$faker.string.uuid()}` is one
106
+ const isFakerExpression = /^\{?\s*\$/.test(exprToEvaluate) && exprToEvaluate.includes('$faker.');
107
+ if (!isValidRuntimeExpression(exprToEvaluate) && !isFakerExpression) {
108
+ return match.startsWith('{')
109
+ ? `{${evaluateExpressionsInString(match.slice(1, -1), context, logger, true)}}`
110
+ : match;
103
111
  }
104
112
  // For dollar expressions, include the leading $ when passing to evaluateRuntimeExpression
105
113
  const evaluatedValue = evaluateRuntimeExpression(exprToEvaluate, context, logger);
@@ -1 +1 @@
1
- {"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"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"}
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
@@ -35,12 +35,17 @@ export type AdditionalParameterProperties = {
35
35
  schema?: Record<string, any>;
36
36
  example?: unknown;
37
37
  examples?: Record<string, Oas3Example>;
38
+ content?: Record<string, {
39
+ schema?: unknown;
40
+ example?: unknown;
41
+ examples?: Record<string, Oas3Example>;
42
+ }>;
38
43
  allowReserved?: boolean;
39
44
  };
40
45
  type ExtendedParameter<T> = T & AdditionalParameterProperties;
41
46
  export type Parameter = ExtendedParameter<ArazzoParameter>;
42
47
  export type ResolvedParameter = Parameter & {
43
- in?: 'header' | 'query' | 'path' | 'cookie';
48
+ in?: 'header' | 'query' | 'querystring' | 'path' | 'cookie';
44
49
  name: string;
45
50
  };
46
51
  export type VerboseLog = {
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.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,CA2WlC;CACH"}
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,CA6XlC;CACH"}
@@ -10,7 +10,7 @@ import { isBinaryContentType } from './binary-content-type-checker.js';
10
10
  import { generateDigestAuthHeader } from './digest-auth/generate-digest-auth-header.js';
11
11
  import { parseWwwAuthenticateHeader } from './digest-auth/parse-www-authenticate-header.js';
12
12
  import { isEmpty } from './is-empty.js';
13
- import { buildQueryString } from './url-encoding.js';
13
+ import { buildQueryString, encodeQuerystring } from './url-encoding.js';
14
14
  export function normalizeHeaders(headers) {
15
15
  if (!headers) {
16
16
  return {};
@@ -81,7 +81,7 @@ export class ApiFetcher {
81
81
  this.verboseResponseLogs = undefined;
82
82
  };
83
83
  fetchResult = async ({ ctx, step, requestData, workflowId, }) => {
84
- const { serverUrl, path, method, parameters, requestBody, openapiOperation } = requestData;
84
+ const { serverUrl, path, method, parameters, requestBody, openapiOperation, querystringMediaType, } = requestData;
85
85
  if (!serverUrl?.url) {
86
86
  ctx.options.logger.error(bgRed(` No server url provided `));
87
87
  throw new Error('No server url provided');
@@ -110,7 +110,11 @@ export class ApiFetcher {
110
110
  break;
111
111
  }
112
112
  }
113
- const queryString = buildQueryString(searchParams);
113
+ // prepareRequest lets through one querystring parameter at most, with a string value and no query parameters
114
+ const querystring = parameters.find((parameter) => parameter.in === 'querystring')?.value;
115
+ const queryString = typeof querystring === 'string'
116
+ ? encodeQuerystring(querystring, querystringMediaType)
117
+ : buildQueryString(searchParams);
114
118
  if ((isPlainObject(requestBody) || Array.isArray(requestBody)) && !headers['content-type']) {
115
119
  headers['content-type'] = 'application/json';
116
120
  }
@@ -212,10 +216,15 @@ export class ApiFetcher {
212
216
  noSecretsMasking: ctx.noSecretsMasking,
213
217
  secretsSet: ctx.secretsSet,
214
218
  });
219
+ const maskedServerUrl = conditionallyMaskSecrets({
220
+ value: resolvedServerUrl,
221
+ noSecretsMasking: ctx.noSecretsMasking,
222
+ secretsSet: ctx.secretsSet,
223
+ });
215
224
  // Start of the verbose logs
216
225
  this.initVerboseLogs({
217
226
  headerParams: maskedHeaderParams,
218
- host: resolvedServerUrl,
227
+ host: maskedServerUrl,
219
228
  method: method.toUpperCase(),
220
229
  path: maskedPathParams || '',
221
230
  body: maskedBody,
@@ -263,7 +272,7 @@ export class ApiFetcher {
263
272
  this.initVerboseResponseLogs({
264
273
  body: body401,
265
274
  method,
266
- host: serverUrl.url,
275
+ host: maskedServerUrl,
267
276
  path: pathWithSearchParams || '',
268
277
  statusCode: first401Result.status,
269
278
  responseTime: 0,
@@ -275,7 +284,7 @@ export class ApiFetcher {
275
284
  this.initVerboseResponseLogs({
276
285
  body: body401,
277
286
  method,
278
- host: serverUrl.url,
287
+ host: maskedServerUrl,
279
288
  path: pathWithSearchParams || '',
280
289
  statusCode: first401Result.status,
281
290
  responseTime: 0,
@@ -387,7 +396,7 @@ export class ApiFetcher {
387
396
  ? JSON.stringify(maskedResponseBody)
388
397
  : maskedResponseBody,
389
398
  method,
390
- host: serverUrl.url,
399
+ host: maskedServerUrl,
391
400
  path: pathWithSearchParams || '',
392
401
  statusCode: fetchResult.status,
393
402
  responseTime,
@@ -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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"}
@@ -8,4 +8,14 @@ export declare function buildQueryString(params: Array<{
8
8
  value: string;
9
9
  allowReserved?: boolean;
10
10
  }>): string;
11
+ /** Matches the media type without its parameters, such as `; charset=utf-8`. */
12
+ export declare function isFormUrlencoded(mediaType: string): boolean;
13
+ /**
14
+ * Prepares the value of a `querystring` parameter for the URL.
15
+ * @param mediaType – the media type the API description gives to the query string.
16
+ * A value without a described media type, or in `application/x-www-form-urlencoded`, is a ready query string:
17
+ * only `#` is encoded, because it would start the URL fragment and cut the query short.
18
+ * Any other media type is percent-encoded as a whole.
19
+ */
20
+ export declare function encodeQuerystring(value: string, mediaType?: string): string;
11
21
  //# sourceMappingURL=url-encoding.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"url-encoding.d.ts","sourceRoot":"","sources":["../../src/utils/url-encoding.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,MAAM,CAgB3E;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACtE,MAAM,CAMR"}
1
+ {"version":3,"file":"url-encoding.d.ts","sourceRoot":"","sources":["../../src/utils/url-encoding.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,MAAM,CAgB3E;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACtE,MAAM,CAMR;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAI3E"}
@@ -28,4 +28,20 @@ export function buildQueryString(params) {
28
28
  .map((p) => `${encodeURIComponent(p.name)}=${encodeURIValue(p.value, p.allowReserved === true)}`)
29
29
  .join('&');
30
30
  }
31
+ /** Matches the media type without its parameters, such as `; charset=utf-8`. */
32
+ export function isFormUrlencoded(mediaType) {
33
+ return mediaType.split(';')[0].trim().toLowerCase() === 'application/x-www-form-urlencoded';
34
+ }
35
+ /**
36
+ * Prepares the value of a `querystring` parameter for the URL.
37
+ * @param mediaType – the media type the API description gives to the query string.
38
+ * A value without a described media type, or in `application/x-www-form-urlencoded`, is a ready query string:
39
+ * only `#` is encoded, because it would start the URL fragment and cut the query short.
40
+ * Any other media type is percent-encoded as a whole.
41
+ */
42
+ export function encodeQuerystring(value, mediaType) {
43
+ return !mediaType || isFormUrlencoded(mediaType)
44
+ ? value.replaceAll('#', '%23')
45
+ : encodeURIValue(value);
46
+ }
31
47
  //# sourceMappingURL=url-encoding.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"url-encoding.js","sourceRoot":"","sources":["../../src/utils/url-encoding.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAC5C,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEpE,SAAS,gBAAgB,CAAC,IAAY;IACpC,IAAI,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,KAAa,EAAE,aAAa,GAAG,KAAK;IACjE,IAAI,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,OAAO,CAClD,UAAU,EACV,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CACxD,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,YAAY,CAAC;IAExC,MAAM,oBAAoB,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9D,IAAI;QACJ,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;KAChC,CAAC,CAAC,CAAC;IAEJ,KAAK,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACrD,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAuE;IAEvE,OAAO,MAAM;SACV,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,aAAa,KAAK,IAAI,CAAC,EAAE,CAC5F;SACA,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"url-encoding.js","sourceRoot":"","sources":["../../src/utils/url-encoding.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAC5C,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEpE,SAAS,gBAAgB,CAAC,IAAY;IACpC,IAAI,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,KAAa,EAAE,aAAa,GAAG,KAAK;IACjE,IAAI,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,OAAO,CAClD,UAAU,EACV,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CACxD,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,YAAY,CAAC;IAExC,MAAM,oBAAoB,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9D,IAAI;QACJ,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;KAChC,CAAC,CAAC,CAAC;IAEJ,KAAK,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACrD,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAuE;IAEvE,OAAO,MAAM;SACV,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,aAAa,KAAK,IAAI,CAAC,EAAE,CAC5F;SACA,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,mCAAmC,CAAC;AAC9F,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa,EAAE,SAAkB;IACjE,OAAO,CAAC,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC;QAC9C,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;QAC9B,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redocly/respect-core",
3
- "version": "2.77.0",
3
+ "version": "2.78.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.77.0",
51
+ "@redocly/openapi-core": "2.78.0",
52
52
  "ajv": "npm:@redocly/ajv@^8.18.3",
53
53
  "better-ajv-errors": "^2.0.3",
54
54
  "colorette": "^2.0.20",