@redocly/respect-core 2.76.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 (79) 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 +25 -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 +17 -121
  61. package/lib/modules/runtime-expressions/evaluate.js.map +1 -1
  62. package/lib/modules/runtime-expressions/interpret-expression.d.ts +8 -0
  63. package/lib/modules/runtime-expressions/interpret-expression.d.ts.map +1 -0
  64. package/lib/modules/runtime-expressions/interpret-expression.js +215 -0
  65. package/lib/modules/runtime-expressions/interpret-expression.js.map +1 -0
  66. package/lib/types.d.ts +6 -1
  67. package/lib/types.d.ts.map +1 -1
  68. package/lib/utils/api-fetcher.d.ts.map +1 -1
  69. package/lib/utils/api-fetcher.js +16 -7
  70. package/lib/utils/api-fetcher.js.map +1 -1
  71. package/lib/utils/url-encoding.d.ts +10 -0
  72. package/lib/utils/url-encoding.d.ts.map +1 -1
  73. package/lib/utils/url-encoding.js +16 -0
  74. package/lib/utils/url-encoding.js.map +1 -1
  75. package/package.json +2 -2
  76. package/lib/modules/runtime-expressions/replace-json-pointers.d.ts +0 -2
  77. package/lib/modules/runtime-expressions/replace-json-pointers.d.ts.map +0 -1
  78. package/lib/modules/runtime-expressions/replace-json-pointers.js +0 -60
  79. package/lib/modules/runtime-expressions/replace-json-pointers.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"schema-checker.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAAA,OAAY,EAAuB,KAAK,OAAO,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EACL,KAAK,KAAK,EAEV,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAqB3B,wBAAgB,WAAW,CAAC,EAC1B,WAAW,EACX,oBAAoB,EACpB,GAAG,EACH,UAAU,GACX,EAAE;IACD,WAAW,EAAE,eAAe,CAAC;IAC7B,oBAAoB,CAAC,EAAE,GAAG,CAAC;IAC3B,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,KAAK,EAAE,CAkBV;AAyGD,KAAK,eAAe,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAErE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,GAAG,SAAS,EACpC,WAAW,EAAE,MAAM,GAClB,eAAe,CAAC,MAAM,CAAC,GAAG,SAAS,CAUrC;AA2CD,wBAAgB,cAAc,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,UAQzE"}
1
+ {"version":3,"file":"schema-checker.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/schema/schema-checker.ts"],"names":[],"mappings":"AAAA,OAAY,EAAuB,KAAK,OAAO,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGjG,OAAO,EACL,KAAK,KAAK,EAEV,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AA0B3B,wBAAgB,WAAW,CAAC,EAC1B,WAAW,EACX,oBAAoB,EACpB,GAAG,EACH,UAAU,GACX,EAAE;IACD,WAAW,EAAE,eAAe,CAAC;IAC7B,oBAAoB,CAAC,EAAE,GAAG,CAAC;IAC3B,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,KAAK,EAAE,CAkBV;AA2HD,wBAAgB,cAAc,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,UAQzE"}
@@ -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":"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"}
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;AAqND,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"}
@@ -1,7 +1,7 @@
1
1
  import { isPlainObject } from '@redocly/openapi-core';
2
2
  import { getFakeData, parseJson } from '../context-parser/index.js';
3
+ import { interpretExpression } from './interpret-expression.js';
3
4
  import { lintExpression } from './lint.js';
4
- import { replaceJSONPointers } from './replace-json-pointers.js';
5
5
  // Used when evaluating expressions in a string that can contain other text, like request bodies payload, output values, etc.
6
6
  export function evaluateRuntimeExpressionPayload({ payload, context, contentType, logger, }) {
7
7
  if (contentType?.includes('application/octet-stream')) {
@@ -84,134 +84,30 @@ function evaluateExpressionString(expression, context, logger) {
84
84
  }
85
85
  // Validate expression syntax to match ABNF Arazzo grammar
86
86
  lintExpression(expression);
87
- const normalizedExpression = normalizeExpression(expression, context);
88
- // Normalize the context for evaluation by replacing hyphens with underscores in all keys
89
- const normalizedContext = normalizeContext(context);
90
87
  try {
91
- // Create a new Function to evaluate the expression
92
- const evaluate = new Function(...Object.keys(normalizedContext), `return ${normalizedExpression};`);
93
- // Evaluate the modified expression
94
- return evaluate(...Object.values(normalizedContext));
88
+ return interpretExpression(expression, context);
95
89
  }
96
- catch (_error) {
97
- throw new Error(`Error in resolving runtime expression '${expression}'. \n` +
90
+ catch (error) {
91
+ const cause = error instanceof Error ? `: ${error.message}` : '';
92
+ throw new Error(`Error in resolving runtime expression '${expression}'${cause}. \n` +
98
93
  "This could be because the expression references a value from a previous failed step, or is trying to reference a variable that hasn't been set.");
99
94
  }
100
95
  }
101
- // Normalize the expression to replace hyphens with underscores and convert to lowercase
102
- function normalizeSymbolsExpression(expression) {
103
- return expression.replace(/\$([a-zA-Z0-9._-]+)/g, (_match, variable) => {
104
- // Normalize variable by replacing hyphens with underscores and converting to lowercase
105
- const normalizedKey = variable.replace(/-/g, '_'); // Replace hyphens with underscores
106
- return `$${normalizedKey}`; // Return the normalized variable for evaluation
107
- });
108
- }
109
- function normalizeExpression(expression, context) {
110
- const modifiedJsExpression = replaceJSONPointers(expression, context);
111
- // Remove the curly braces surrounding the ENTIRE expression (if any), but not braces within JSON
112
- let cleanedJsExpression = modifiedJsExpression;
113
- if (cleanedJsExpression.startsWith('{') && cleanedJsExpression.endsWith('}')) {
114
- // A runtime expression wrapper has the form {$variable...} with no nested braces until the end
115
- const potentialUnwrapped = cleanedJsExpression.slice(1, -1);
116
- // Unwrap if it doesn't look like JSON (i.e., doesn't start with { or [)
117
- if (!potentialUnwrapped.trim().startsWith('{') && !potentialUnwrapped.trim().startsWith('[')) {
118
- cleanedJsExpression = potentialUnwrapped;
119
- }
120
- }
121
- return splitByStringLiterals(cleanedJsExpression)
122
- .map((part, index) => (index % 2 === 0 ? normalizeCode(part) : part))
123
- .join('');
124
- }
125
- // Splits the expression into [code, literal, code, literal, ..., code]
126
- function splitByStringLiterals(expression) {
127
- const parts = [];
128
- let partStart = 0;
129
- while (partStart < expression.length) {
130
- const quoteIndex = expression.slice(partStart).search(/["']/);
131
- if (quoteIndex === -1) {
132
- break;
133
- }
134
- const literalStart = partStart + quoteIndex;
135
- parts.push(expression.slice(partStart, literalStart));
136
- const literalEnd = findStringLiteralEnd(expression, literalStart);
137
- parts.push(expression.slice(literalStart, literalEnd));
138
- partStart = literalEnd;
139
- }
140
- parts.push(expression.slice(partStart));
141
- return parts;
142
- }
143
- function findStringLiteralEnd(expression, start) {
144
- const quote = expression[start];
145
- for (let index = start + 1; index < expression.length; index++) {
146
- const char = expression[index];
147
- if (char === quote) {
148
- return index + 1;
149
- }
150
- if (char === '\\') {
151
- index++;
152
- }
153
- }
154
- return expression.length;
155
- }
156
- function normalizeCode(code) {
157
- // Replace hyphens with underscores in `$...` references to match the keys normalized by `normalizeContext`
158
- const normalizedSymbolsExpression = normalizeSymbolsExpression(code);
159
- // Convert numeric indices (e.g., `.0`) into square bracket notation (e.g., `[0]`)
160
- const expressionWithBrackets = convertNumericIndices(normalizedSymbolsExpression);
161
- // Check if the expression contains `.header.` and lowercase the parameter after `.header.`.
162
- // As headers are case-insensitive, we need to normalize the header names to lowercase for evaluation.
163
- const headerParameterNameRegex = /\.header\.([a-zA-Z0-9._-]+)/g;
164
- return expressionWithBrackets.replace(headerParameterNameRegex, (_match, p1) => {
165
- return `.header.${p1.toLowerCase()}`;
166
- });
167
- }
168
- // Normalize the entire context to replace hyphens with underscores in all keys
169
- function normalizeContext(context) {
170
- const normalized = {};
171
- for (const [key, value] of Object.entries(context)) {
172
- // Normalize variable names to lowercase and replace hyphens with underscores
173
- const normalizedKey = key.replace(/-/g, '_');
174
- normalized[normalizedKey] = normalizeValue(value);
175
- }
176
- return normalized;
177
- }
178
- // Normalize values recursively, handling objects and primitives
179
- function normalizeValue(value) {
180
- if (Array.isArray(value)) {
181
- // If the value is an array, return it as-is without modifying
182
- return value;
183
- }
184
- else if (isPlainObject(value)) {
185
- return normalizeObject(value);
186
- }
187
- return value;
188
- }
189
- // Normalize an object by replacing hyphens with underscores in keys
190
- function normalizeObject(obj) {
191
- return Object.keys(obj).reduce((acc, key) => {
192
- const normalizedKey = key.replace(/-/g, '_'); // Convert hyphens to underscores
193
- acc[normalizedKey] = normalizeValue(obj[key]);
194
- return acc;
195
- }, {});
196
- }
197
- function convertNumericIndices(expression) {
198
- // Match any dot followed by a number (e.g., .0, .1, etc.) and replace it with [0], [1], etc.
199
- // but not modify floats.
200
- return expression.replace(/\.(\d+)/g, (match, num, offset, str) => {
201
- // Look at the character right before the dot
202
- const charBeforeDot = str[offset - 1];
203
- // If the character before the dot is a digit, it's a float
204
- const isFloat = /\d/.test(charBeforeDot);
205
- return isFloat ? match : `[${num}]`;
206
- });
207
- }
208
96
  // Helper function to evaluate expressions within a string
209
- function evaluateExpressionsInString(expression, context, logger) {
210
- 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;
211
103
  return expression.replace(regex, (match) => {
212
104
  const exprToEvaluate = match.trim();
213
- if (!isValidRuntimeExpression(exprToEvaluate) && !exprToEvaluate.includes('$faker.')) {
214
- 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;
215
111
  }
216
112
  // For dollar expressions, include the leading $ when passing to evaluateRuntimeExpression
217
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":"AAAA,OAAO,EAAE,aAAa,EAAwB,MAAM,uBAAuB,CAAC;AAG5E,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,6HAA6H;AAC7H,MAAM,UAAU,gCAAgC,CAAC,EAC/C,OAAO,EACP,OAAO,EACP,WAAW,EACX,MAAM,GAMP;IACC,IAAI,WAAW,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,WAAW,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACjD,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;YAChC,MAAM,iBAAiB,GAAG,IAAI,QAAQ,EAAE,CAAC;YAEzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC7C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;oBAC1B,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,MAAM,cAAc,GAAG,gCAAgC,CAAC;wBACtD,OAAO,EAAE,KAAK;wBACd,OAAO;wBACP,MAAM;qBACP,CAAC,CAAC;oBACH,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;YAED,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,6BAA6B;QAC7B,OAAO,uBAAuB,CAAC,OAAO,CAAC;YACrC,CAAC,CAAC,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC;YACrD,CAAC,CAAC,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;SAAM,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,gCAAgC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACjF,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAyB,CAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1B,gCAAgC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CACrE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,kEAAkE;QAClE,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,yBAAyB,CACvC,UAAe,EACf,OAAiC,EACjC,MAAuB;IAEvB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;SAAM,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CACtC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACtE,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAyB,CAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAClF,CAAC;SAAM,CAAC;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,UAAkB,EAClB,OAAiC,EACjC,MAAuB;IAEvB,iFAAiF;IACjF,iDAAiD;IACjD,IAAI,0CAA0C,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAChE,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,yCAAyC,CAAC;QAC7D,UAAU,GAAG,UAAU;aACpB,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC;aACD,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3D,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,0DAA0D;IAC1D,cAAc,CAAC,UAAU,CAAC,CAAC;IAE3B,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEtE,yFAAyF;IACzF,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC;QACH,mDAAmD;QACnD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAC3B,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,EACjC,UAAU,oBAAoB,GAAG,CAClC,CAAC;QAEF,mCAAmC;QACnC,OAAO,QAAQ,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,0CAA0C,UAAU,OAAO;YACzD,iJAAiJ,CACpJ,CAAC;IACJ,CAAC;AACH,CAAC;AAED,wFAAwF;AACxF,SAAS,0BAA0B,CAAC,UAAkB;IACpD,OAAO,UAAU,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;QACrE,uFAAuF;QACvF,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,mCAAmC;QAEtF,OAAO,IAAI,aAAa,EAAE,CAAC,CAAC,gDAAgD;IAC9E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAkB,EAAE,OAAiC;IAChF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEtE,iGAAiG;IACjG,IAAI,mBAAmB,GAAG,oBAAoB,CAAC;IAE/C,IAAI,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7E,+FAA+F;QAC/F,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5D,wEAAwE;QACxE,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7F,mBAAmB,GAAG,kBAAkB,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,qBAAqB,CAAC,mBAAmB,CAAC;SAC9C,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACpE,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED,uEAAuE;AACvE,SAAS,qBAAqB,CAAC,UAAkB;IAC/C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,OAAO,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9D,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,MAAM;QACR,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC;QAC5C,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;QAEtD,MAAM,UAAU,GAAG,oBAAoB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAClE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;QACvD,SAAS,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,UAAkB,EAAE,KAAa;IAC7D,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAChC,KAAK,IAAI,KAAK,GAAG,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAE/B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,OAAO,KAAK,GAAG,CAAC,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC,MAAM,CAAC;AAC3B,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,2GAA2G;IAC3G,MAAM,2BAA2B,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAErE,kFAAkF;IAClF,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,2BAA2B,CAAC,CAAC;IAElF,4FAA4F;IAC5F,sGAAsG;IACtG,MAAM,wBAAwB,GAAG,8BAA8B,CAAC;IAChE,OAAO,sBAAsB,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;QAC7E,OAAO,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,SAAS,gBAAgB,CAAC,OAAiC;IACzD,MAAM,UAAU,GAAG,EAAyB,CAAC;IAE7C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,6EAA6E;QAC7E,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAE7C,UAAU,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,gEAAgE;AAChE,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,8DAA8D;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,oEAAoE;AACpE,SAAS,eAAe,CAAC,GAA4B;IACnD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAC5B,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACX,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,iCAAiC;QAC/E,GAAG,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9C,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA6B,CAC9B,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAkB;IAC/C,6FAA6F;IAC7F,yBAAyB;IACzB,OAAO,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAChE,6CAA6C;QAC7C,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtC,2DAA2D;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,0DAA0D;AAC1D,SAAS,2BAA2B,CAClC,UAAkB,EAClB,OAAiC,EACjC,MAAuB;IAEvB,MAAM,KAAK,GAAG,sDAAsD,CAAC;IAErE,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEpC,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACrF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,0FAA0F;QAC1F,MAAM,cAAc,GAAG,yBAAyB,CAAC,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAElF,gFAAgF;QAChF,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,uBAAuB,cAAc,oBAAoB;gBACvD,sHAAsH,CACzH,CAAC;QACJ,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,UAAkB;IACxD,MAAM,iBAAiB,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IAE5C,IAAI,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,CAAC,CACC,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpE,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACvE,EACD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,wBAAwB,CAAC,UAAkB;IAClD,IAAI,CAAC;QACH,cAAc,CAAC,UAAU,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/evaluate.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import type { RuntimeExpressionContext } from '../../types.js';
2
+ /**
3
+ * Evaluates a runtime expression that passed `lintExpression` against the context. Values are
4
+ * read as data and compared with the JavaScript operators of the same name. `||` and `&&` do not
5
+ * resolve the right side when the left side decides the result.
6
+ */
7
+ export declare function interpretExpression(expression: string, context: RuntimeExpressionContext): unknown;
8
+ //# sourceMappingURL=interpret-expression.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interpret-expression.d.ts","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/interpret-expression.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAwB/D;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAyDT"}
@@ -0,0 +1,215 @@
1
+ import { isPlainObject } from '@redocly/openapi-core';
2
+ const REFERENCE_CHAR = /[\w.-]/;
3
+ // The `Unescaped` and `Escaped` characters of `jsonPointer` in abnf-parser.pegjs.
4
+ const POINTER_CHAR = /[!-.0-9A-Z_a-z/~]/;
5
+ const NUMBER = /^\d+(?:\.\d+)?/;
6
+ const KEYWORD = /^(?:true|false|null|undefined)\b/;
7
+ const EMPTY_ARRAY = /^\[\s*\]/;
8
+ const OPERATORS = ['==', '!=', '<=', '>=', '&&', '||', '<', '>', '{', '}'];
9
+ const COMPARISONS = new Set(['==', '!=', '<', '<=', '>', '>=']);
10
+ const KEYWORD_VALUES = {
11
+ true: true,
12
+ false: false,
13
+ null: null,
14
+ undefined: undefined,
15
+ };
16
+ /**
17
+ * Evaluates a runtime expression that passed `lintExpression` against the context. Values are
18
+ * read as data and compared with the JavaScript operators of the same name. `||` and `&&` do not
19
+ * resolve the right side when the left side decides the result.
20
+ */
21
+ export function interpretExpression(expression, context) {
22
+ const tokens = tokenize(expression);
23
+ let position = 0;
24
+ const isOperator = (text) => {
25
+ const token = tokens[position];
26
+ return token?.kind === 'operator' && token.text === text;
27
+ };
28
+ const parseOr = () => {
29
+ let evaluate = parseAnd();
30
+ while (isOperator('||')) {
31
+ position++;
32
+ const [left, right] = [evaluate, parseAnd()];
33
+ evaluate = () => left() || right();
34
+ }
35
+ return evaluate;
36
+ };
37
+ const parseAnd = () => {
38
+ let evaluate = parseComparison();
39
+ while (isOperator('&&')) {
40
+ position++;
41
+ const [left, right] = [evaluate, parseComparison()];
42
+ evaluate = () => left() && right();
43
+ }
44
+ return evaluate;
45
+ };
46
+ const parseComparison = () => {
47
+ let evaluate = parsePrimary();
48
+ let token = tokens[position];
49
+ while (token?.kind === 'operator' && COMPARISONS.has(token.text)) {
50
+ position++;
51
+ const [operator, left, right] = [token.text, evaluate, parsePrimary()];
52
+ evaluate = () => compare(operator, left(), right());
53
+ token = tokens[position];
54
+ }
55
+ return evaluate;
56
+ };
57
+ const parsePrimary = () => {
58
+ const token = tokens[position++];
59
+ if (token?.kind === 'literal')
60
+ return () => token.value;
61
+ if (token?.kind === 'reference')
62
+ return () => resolveReference(token.text, context);
63
+ if (token?.kind === 'operator' && token.text === '{') {
64
+ const evaluate = parseOr();
65
+ if (!isOperator('}'))
66
+ throw new Error(`Expected "}" in "${expression}"`);
67
+ position++;
68
+ return evaluate;
69
+ }
70
+ throw new Error(`Unexpected end or token in "${expression}"`);
71
+ };
72
+ const evaluate = parseOr();
73
+ if (position < tokens.length)
74
+ throw new Error(`Unexpected token in "${expression}"`);
75
+ return evaluate();
76
+ }
77
+ function compare(operator, left, right) {
78
+ const [a, b] = [asOperand(left), asOperand(right)];
79
+ switch (operator) {
80
+ case '==':
81
+ // oxlint-disable-next-line eqeqeq -- Respect compares with loose equality, as before
82
+ return left == right;
83
+ case '!=':
84
+ // oxlint-disable-next-line eqeqeq -- Respect compares with loose equality, as before
85
+ return left != right;
86
+ case '<':
87
+ return a < b;
88
+ case '<=':
89
+ return a <= b;
90
+ case '>':
91
+ return a > b;
92
+ default:
93
+ return a >= b;
94
+ }
95
+ }
96
+ // JavaScript converts any operand of `<`, `<=`, `>` and `>=` itself, as the evaluator did before.
97
+ function asOperand(value) {
98
+ return value;
99
+ }
100
+ /** Respect has always returned a value read by a dot path with the hyphens of its object keys as underscores. */
101
+ function withUnderscoreKeys(value) {
102
+ if (!isPlainObject(value))
103
+ return value;
104
+ return Object.fromEntries(Object.entries(value).map(([key, item]) => [key.replace(/-/g, '_'), withUnderscoreKeys(item)]));
105
+ }
106
+ /**
107
+ * Reads `$source.path.to.value`, optionally followed by a JSON Pointer. A pointer that reaches no
108
+ * value throws. As a Respect extension, a `.` after the pointer starts a property chain, as in
109
+ * `$response.body#/items.length`, so a pointer cannot reach a key that contains `.`.
110
+ */
111
+ function resolveReference(text, context) {
112
+ const hashIndex = text.indexOf('#');
113
+ const path = hashIndex === -1 ? text : text.slice(0, hashIndex);
114
+ const [root, ...segments] = path.slice(1).split('.');
115
+ const value = walk(context, [`$${root}`, ...segments]);
116
+ if (hashIndex === -1)
117
+ return withUnderscoreKeys(value);
118
+ const [pointer, ...chain] = text.slice(hashIndex + 1).split('.');
119
+ return walk(atPointer(value, pointer), chain);
120
+ }
121
+ /** Property access as JavaScript does it, on own properties only. */
122
+ function walk(value, segments) {
123
+ let current = value;
124
+ let previous;
125
+ for (const segment of segments) {
126
+ if (current === null || current === undefined) {
127
+ throw new TypeError(`Cannot read "${segment}" of ${current}`);
128
+ }
129
+ current = ownProperty(current, segment, previous?.toLowerCase() === 'header');
130
+ previous = segment;
131
+ }
132
+ return current;
133
+ }
134
+ /** A hyphen and an underscore match each other in a name, and header names ignore case. */
135
+ function ownProperty(container, name, ignoresCase) {
136
+ const object = Object(container);
137
+ if (Object.hasOwn(object, name))
138
+ return object[name];
139
+ const wanted = normalizeName(name, ignoresCase);
140
+ const key = Object.keys(object).find((candidate) => normalizeName(candidate, ignoresCase) === wanted);
141
+ return key === undefined ? undefined : object[key];
142
+ }
143
+ function normalizeName(name, ignoresCase) {
144
+ const normalized = name.replace(/-/g, '_');
145
+ return ignoresCase ? normalized.toLowerCase() : normalized;
146
+ }
147
+ function atPointer(value, pointer) {
148
+ let current = value;
149
+ for (const segment of pointer.split('/').slice(1)) {
150
+ const key = segment.replace(/~1/g, '/').replace(/~0/g, '~');
151
+ const object = current === null || current === undefined ? undefined : Object(current);
152
+ if (!object || !Object.hasOwn(object, key)) {
153
+ throw new Error(`JSON Pointer "${pointer}" reaches no value`);
154
+ }
155
+ current = object[key];
156
+ }
157
+ return current;
158
+ }
159
+ function tokenize(expression) {
160
+ const tokens = [];
161
+ let index = 0;
162
+ while (index < expression.length) {
163
+ const char = expression[index];
164
+ const rest = expression.slice(index);
165
+ if (/\s/.test(char)) {
166
+ index++;
167
+ }
168
+ else if (char === '$') {
169
+ let end = index + 1;
170
+ while (end < expression.length && REFERENCE_CHAR.test(expression[end]))
171
+ end++;
172
+ if (expression[end] === '#') {
173
+ end++;
174
+ while (end < expression.length && POINTER_CHAR.test(expression[end]))
175
+ end++;
176
+ }
177
+ tokens.push({ kind: 'reference', text: expression.slice(index, end) });
178
+ index = end;
179
+ }
180
+ else if (char === '"' || char === "'") {
181
+ const end = expression.indexOf(char, index + 1);
182
+ if (end === -1)
183
+ throw new Error(`Unclosed string in "${expression}"`);
184
+ tokens.push({ kind: 'literal', value: expression.slice(index + 1, end) });
185
+ index = end + 1;
186
+ }
187
+ else {
188
+ const number = NUMBER.exec(rest)?.[0];
189
+ const keyword = KEYWORD.exec(rest)?.[0];
190
+ const emptyArray = EMPTY_ARRAY.exec(rest)?.[0];
191
+ const operator = OPERATORS.find((candidate) => expression.startsWith(candidate, index));
192
+ if (number) {
193
+ tokens.push({ kind: 'literal', value: Number(number) });
194
+ index += number.length;
195
+ }
196
+ else if (keyword) {
197
+ tokens.push({ kind: 'literal', value: KEYWORD_VALUES[keyword] });
198
+ index += keyword.length;
199
+ }
200
+ else if (emptyArray) {
201
+ tokens.push({ kind: 'literal', value: [] });
202
+ index += emptyArray.length;
203
+ }
204
+ else if (operator) {
205
+ tokens.push({ kind: 'operator', text: operator });
206
+ index += operator.length;
207
+ }
208
+ else {
209
+ throw new Error(`Unexpected "${char}" in "${expression}"`);
210
+ }
211
+ }
212
+ }
213
+ return tokens;
214
+ }
215
+ //# sourceMappingURL=interpret-expression.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interpret-expression.js","sourceRoot":"","sources":["../../../src/modules/runtime-expressions/interpret-expression.ts"],"names":[],"mappings":"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"}
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 = {