@redocly/respect-core 2.77.0 → 2.79.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 (95) 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/index.d.ts +1 -1
  6. package/lib/index.d.ts.map +1 -1
  7. package/lib/index.js +1 -1
  8. package/lib/index.js.map +1 -1
  9. package/lib/modules/arazzo-description-generator/cleanup-test-description.d.ts +4 -0
  10. package/lib/modules/arazzo-description-generator/cleanup-test-description.d.ts.map +1 -1
  11. package/lib/modules/context-parser/parse-parameters.d.ts +1 -1
  12. package/lib/modules/context-parser/parse-parameters.d.ts.map +1 -1
  13. package/lib/modules/context-parser/parse-parameters.js +1 -1
  14. package/lib/modules/context-parser/parse-parameters.js.map +1 -1
  15. package/lib/modules/description-parser/get-operation-by-id.d.ts.map +1 -1
  16. package/lib/modules/description-parser/get-operation-by-id.js +6 -6
  17. package/lib/modules/description-parser/get-operation-by-id.js.map +1 -1
  18. package/lib/modules/description-parser/get-request-body-schema.d.ts +1 -1
  19. package/lib/modules/description-parser/get-request-body-schema.d.ts.map +1 -1
  20. package/lib/modules/description-parser/get-request-body-schema.js +2 -4
  21. package/lib/modules/description-parser/get-request-body-schema.js.map +1 -1
  22. package/lib/modules/description-parser/get-request-data-from-openapi.d.ts.map +1 -1
  23. package/lib/modules/description-parser/get-request-data-from-openapi.js +22 -1
  24. package/lib/modules/description-parser/get-request-data-from-openapi.js.map +1 -1
  25. package/lib/modules/description-parser/get-response-schema.d.ts +3 -1
  26. package/lib/modules/description-parser/get-response-schema.d.ts.map +1 -1
  27. package/lib/modules/description-parser/get-response-schema.js +8 -2
  28. package/lib/modules/description-parser/get-response-schema.js.map +1 -1
  29. package/lib/modules/description-parser/index.d.ts +1 -0
  30. package/lib/modules/description-parser/index.d.ts.map +1 -1
  31. package/lib/modules/description-parser/index.js +1 -0
  32. package/lib/modules/description-parser/index.js.map +1 -1
  33. package/lib/modules/description-parser/resolve-content-by-type.d.ts +4 -0
  34. package/lib/modules/description-parser/resolve-content-by-type.d.ts.map +1 -0
  35. package/lib/modules/description-parser/resolve-content-by-type.js +29 -0
  36. package/lib/modules/description-parser/resolve-content-by-type.js.map +1 -0
  37. package/lib/modules/flow-runner/context/create-test-context.d.ts +2 -1
  38. package/lib/modules/flow-runner/context/create-test-context.d.ts.map +1 -1
  39. package/lib/modules/flow-runner/context/create-test-context.js +2 -1
  40. package/lib/modules/flow-runner/context/create-test-context.js.map +1 -1
  41. package/lib/modules/flow-runner/context/set-public-workflows.d.ts +6 -3
  42. package/lib/modules/flow-runner/context/set-public-workflows.d.ts.map +1 -1
  43. package/lib/modules/flow-runner/context/set-public-workflows.js +21 -10
  44. package/lib/modules/flow-runner/context/set-public-workflows.js.map +1 -1
  45. package/lib/modules/flow-runner/get-test-description-from-file.d.ts.map +1 -1
  46. package/lib/modules/flow-runner/get-test-description-from-file.js +10 -8
  47. package/lib/modules/flow-runner/get-test-description-from-file.js.map +1 -1
  48. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.d.ts +1 -1
  49. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.d.ts.map +1 -1
  50. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.js +7 -2
  51. package/lib/modules/flow-runner/inputs/map-input-values-to-schema.js.map +1 -1
  52. package/lib/modules/flow-runner/prepare-request.d.ts +1 -0
  53. package/lib/modules/flow-runner/prepare-request.d.ts.map +1 -1
  54. package/lib/modules/flow-runner/prepare-request.js +81 -4
  55. package/lib/modules/flow-runner/prepare-request.js.map +1 -1
  56. package/lib/modules/flow-runner/run-step.d.ts.map +1 -1
  57. package/lib/modules/flow-runner/run-step.js +97 -43
  58. package/lib/modules/flow-runner/run-step.js.map +1 -1
  59. package/lib/modules/flow-runner/runner.d.ts.map +1 -1
  60. package/lib/modules/flow-runner/runner.js +17 -3
  61. package/lib/modules/flow-runner/runner.js.map +1 -1
  62. package/lib/modules/flow-runner/schema/schema-checker.d.ts +0 -4
  63. package/lib/modules/flow-runner/schema/schema-checker.d.ts.map +1 -1
  64. package/lib/modules/flow-runner/schema/schema-checker.js +15 -42
  65. package/lib/modules/flow-runner/schema/schema-checker.js.map +1 -1
  66. package/lib/modules/logger-output/calculate-tests-passed.d.ts.map +1 -1
  67. package/lib/modules/logger-output/calculate-tests-passed.js +4 -1
  68. package/lib/modules/logger-output/calculate-tests-passed.js.map +1 -1
  69. package/lib/modules/logger-output/display-summary.d.ts.map +1 -1
  70. package/lib/modules/logger-output/display-summary.js +1 -11
  71. package/lib/modules/logger-output/display-summary.js.map +1 -1
  72. package/lib/modules/logger-output/json-logs.d.ts +3 -0
  73. package/lib/modules/logger-output/json-logs.d.ts.map +1 -0
  74. package/lib/modules/logger-output/json-logs.js +100 -0
  75. package/lib/modules/logger-output/json-logs.js.map +1 -0
  76. package/lib/modules/runtime-expressions/evaluate.d.ts.map +1 -1
  77. package/lib/modules/runtime-expressions/evaluate.js +12 -4
  78. package/lib/modules/runtime-expressions/evaluate.js.map +1 -1
  79. package/lib/run.d.ts.map +1 -1
  80. package/lib/run.js +2 -7
  81. package/lib/run.js.map +1 -1
  82. package/lib/types.d.ts +8 -3
  83. package/lib/types.d.ts.map +1 -1
  84. package/lib/utils/api-fetcher.d.ts.map +1 -1
  85. package/lib/utils/api-fetcher.js +16 -7
  86. package/lib/utils/api-fetcher.js.map +1 -1
  87. package/lib/utils/url-encoding.d.ts +10 -0
  88. package/lib/utils/url-encoding.d.ts.map +1 -1
  89. package/lib/utils/url-encoding.js +16 -0
  90. package/lib/utils/url-encoding.js.map +1 -1
  91. package/package.json +2 -2
  92. package/lib/modules/timeout-timer/timer.d.ts +0 -10
  93. package/lib/modules/timeout-timer/timer.d.ts.map +0 -1
  94. package/lib/modules/timeout-timer/timer.js +0 -22
  95. package/lib/modules/timeout-timer/timer.js.map +0 -1
@@ -2,22 +2,12 @@ import { yellow, inverse, bold, green, red, blue, gray } from 'colorette';
2
2
  import * as path from 'node:path';
3
3
  import { outdent } from 'outdent';
4
4
  import { getExecutionTime } from '../../utils/time.js';
5
- import { resolveRunningWorkflows } from '../flow-runner/index.js';
6
5
  import { calculateTotals } from './calculate-tests-passed.js';
7
6
  import { indent } from './helpers.js';
8
7
  export function displaySummary({ startedAt, workflows, options, }) {
9
8
  const { logger } = options;
10
9
  const fileName = path.basename(options?.file || '');
11
- const workflowArgv = resolveRunningWorkflows(options?.workflow) || [];
12
- const skippedWorkflowArgv = resolveRunningWorkflows(options?.skip) || [];
13
- let executedWorkflows = workflowArgv && workflowArgv.length
14
- ? workflows.filter(({ workflowId }) => workflowArgv.includes(workflowId))
15
- : workflows;
16
- executedWorkflows =
17
- skippedWorkflowArgv && skippedWorkflowArgv.length
18
- ? executedWorkflows.filter(({ workflowId }) => !skippedWorkflowArgv.includes(workflowId))
19
- : executedWorkflows;
20
- const totals = calculateTotals(executedWorkflows);
10
+ const totals = calculateTotals(workflows);
21
11
  const executionTime = getExecutionTime(startedAt);
22
12
  logger.printNewLine();
23
13
  logger.output(outdent `
@@ -1 +1 @@
1
- {"version":3,"file":"display-summary.js","sourceRoot":"","sources":["../../../src/modules/logger-output/display-summary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,UAAU,cAAc,CAAC,EAC7B,SAAS,EACT,SAAS,EACT,OAAO,GAKR;IACC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtE,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAEzE,IAAI,iBAAiB,GACnB,YAAY,IAAI,YAAY,CAAC,MAAM;QACjC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACzE,CAAC,CAAC,SAAS,CAAC;IAEhB,iBAAiB;QACf,mBAAmB,IAAI,mBAAmB,CAAC,MAAM;YAC/C,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACzF,CAAC,CAAC,iBAAiB,CAAC;IAExB,MAAM,MAAM,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,CAAC,YAAY,EAAE,CAAC;IACtB,MAAM,CAAC,MAAM,CACX,OAAO,CAAA;UACD,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;UAClD,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;UACb,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;UAChE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;UAC/C,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;UACjD,MAAM,CAAC,OAAO,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC;GACnD,CACA,CAAC;IACF,MAAM,CAAC,YAAY,EAAE,CAAC;IACtB,MAAM,CAAC,YAAY,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAc,EAAE,MAAsB;IACnE,OAAO,CACL,IAAI,CAAC,MAAM,CAAC;QACZ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,IAAI,MAAM,CAAC,KAAK,QAAQ,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,MAAc,EAAE,MAAsB;IAC1D,OAAO,CACL,IAAI,CAAC,MAAM,CAAC;QACZ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,IAAI,MAAM,CAAC,KAAK,QAAQ,CACzB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"display-summary.js","sourceRoot":"","sources":["../../../src/modules/logger-output/display-summary.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import type { JsonLogs, RunFileResult } from '../../types.js';
2
+ export declare function composeJsonLogs(filesResult: Omit<RunFileResult, 'options'>[], totalTime: number): JsonLogs;
3
+ //# sourceMappingURL=json-logs.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json-logs.d.ts","sourceRoot":"","sources":["../../../src/modules/logger-output/json-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EAER,aAAa,EAMd,MAAM,gBAAgB,CAAC;AAIxB,wBAAgB,eAAe,CAC7B,WAAW,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,EAC7C,SAAS,EAAE,MAAM,GAChB,QAAQ,CASV"}
@@ -0,0 +1,100 @@
1
+ import { calculateTotals } from './calculate-tests-passed.js';
2
+ import { conditionallyMaskSecrets } from './mask-secrets.js';
3
+ export function composeJsonLogs(filesResult, totalTime) {
4
+ const hasProblems = filesResult.some((result) => result.hasProblems);
5
+ const hasWarnings = filesResult.some((result) => result.hasWarnings);
6
+ return {
7
+ files: composeJsonLogsFiles(filesResult),
8
+ status: hasProblems ? 'error' : hasWarnings ? 'warn' : 'success',
9
+ totalTime,
10
+ };
11
+ }
12
+ function composeJsonLogsFiles(filesResult) {
13
+ const files = {};
14
+ for (const fileResult of filesResult) {
15
+ const { executedWorkflows, globalTimeoutError: fileGlobalTimeoutError, ctx, secretValues, } = fileResult;
16
+ files[fileResult.file] = conditionallyMaskSecrets({
17
+ value: {
18
+ totalRequests: fileResult.totalRequests,
19
+ executedWorkflows: executedWorkflows.map((workflow) => mapJsonWorkflow(workflow)),
20
+ totalTimeMs: fileResult.totalTimeMs,
21
+ globalTimeoutError: fileGlobalTimeoutError,
22
+ secretValues,
23
+ },
24
+ noSecretsMasking: ctx.noSecretsMasking,
25
+ secretsSet: ctx.secretsSet || new Set(),
26
+ });
27
+ }
28
+ return files;
29
+ }
30
+ function mapJsonWorkflow(workflow) {
31
+ const { ctx, ...rest } = workflow;
32
+ const steps = workflow.executedSteps.map((step) => mapJsonStep(step, workflow.workflowId, ctx));
33
+ const totals = calculateTotals([workflow]);
34
+ const result = {
35
+ ...rest,
36
+ executedSteps: steps,
37
+ status: totals.steps.failed > 0 ? 'error' : totals.steps.warnings > 0 ? 'warn' : 'success',
38
+ totalRequests: totals.totalRequests,
39
+ totalTimeMs: workflow.totalTimeMs,
40
+ };
41
+ return result;
42
+ }
43
+ function mapJsonStep(step, workflowId, ctx) {
44
+ if ('executedSteps' in step) {
45
+ return mapJsonWorkflow(step);
46
+ }
47
+ // synthetic steps (e.g. a failed dependsOn resolution) have no declared
48
+ // counterpart in the workflow, so there is no public step to read from
49
+ const publicStep = ctx.$workflows[workflowId].steps[step.stepId];
50
+ return {
51
+ type: 'step',
52
+ stepId: step.stepId,
53
+ workflowId,
54
+ // a step that calls a workflow sends no request
55
+ ...(!step.workflowId && {
56
+ request: {
57
+ method: publicStep?.request?.method || '',
58
+ url: step.response?.requestUrl || '',
59
+ headers: publicStep?.request?.header || {},
60
+ body: publicStep?.request?.body,
61
+ },
62
+ response: {
63
+ statusCode: step.response?.statusCode || 0,
64
+ body: publicStep?.response?.body,
65
+ headers: step.response?.header || {},
66
+ time: step.response?.time || 0,
67
+ size: step.response?.responseSize,
68
+ },
69
+ }),
70
+ checks: step.checks.map((check) => ({
71
+ ...check,
72
+ status: calculateCheckStatus(check),
73
+ })),
74
+ totalTimeMs: publicStep?.response?.time || 0,
75
+ retriesLeft: step.retriesLeft,
76
+ status: calculateStepStatus(step.checks),
77
+ };
78
+ }
79
+ function calculateCheckStatus(check) {
80
+ if (check.passed) {
81
+ return 'success';
82
+ }
83
+ if (check.severity === 'error') {
84
+ return 'error';
85
+ }
86
+ return 'warn';
87
+ }
88
+ function calculateStepStatus(checks) {
89
+ let hasWarning = false;
90
+ for (const check of checks) {
91
+ if (!check.passed && check.severity === 'error') {
92
+ return 'error';
93
+ }
94
+ if (!check.passed && check.severity === 'warn') {
95
+ hasWarning = true;
96
+ }
97
+ }
98
+ return hasWarning ? 'warn' : 'success';
99
+ }
100
+ //# sourceMappingURL=json-logs.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json-logs.js","sourceRoot":"","sources":["../../../src/modules/logger-output/json-logs.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/run.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAA2B,KAAK,aAAa,EAAmB,MAAM,YAAY,CAAC;AAE1F,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,iBAAiB,EAAE;QAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;IACxE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,wBAAsB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAmC3E"}
1
+ {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAA2B,KAAK,aAAa,EAAmB,MAAM,YAAY,CAAC;AAE1F,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,iBAAiB,EAAE;QAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;IACxE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,wBAAsB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CA+B3E"}
package/lib/run.js CHANGED
@@ -1,14 +1,9 @@
1
1
  import { runTestFile } from './modules/flow-runner/index.js';
2
2
  import { displayErrors, displaySummary, calculateTotals } from './modules/logger-output/index.js';
3
- import { Timer } from './modules/timeout-timer/timer.js';
4
3
  export async function run(options) {
5
4
  const executedStepsCount = { value: 0 };
6
5
  const { files, executionTimeout, collectSpecData } = options;
7
- // Don't create a timer if executionTimeout is not set
8
- if (executionTimeout) {
9
- Timer.reset();
10
- Timer.getInstance(executionTimeout);
11
- }
6
+ const executionDeadline = executionTimeout ? Date.now() + executionTimeout : undefined;
12
7
  const testsRunProblemsStatus = [];
13
8
  const runAllFilesResult = [];
14
9
  for (const path of files) {
@@ -21,7 +16,7 @@ export async function run(options) {
21
16
  // documents while preserving the resolver's transport config (proxy, mTLS, etc).
22
17
  options.externalRefResolver?.cache.clear();
23
18
  const result = await runFile({
24
- options: { ...options, file: path },
19
+ options: { ...options, file: path, executionDeadline },
25
20
  startedAt: performance.now(),
26
21
  collectSpecData,
27
22
  executedStepsCount,
package/lib/run.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.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 = {
@@ -67,6 +72,7 @@ export type Workflow = Omit<ArazzoWorkflow, 'steps'> & {
67
72
  };
68
73
  export type RunOptions = Omit<RespectOptions, 'files'> & {
69
74
  file: string;
75
+ executionDeadline?: number;
70
76
  testDescription?: TestDescription;
71
77
  input?: string | string[];
72
78
  server?: string | string[];
@@ -103,7 +109,7 @@ export type AppOptions = {
103
109
  severity?: string | string[];
104
110
  maxSteps: number;
105
111
  maxFetchTimeout: number;
106
- executionTimeout?: number;
112
+ executionDeadline?: number;
107
113
  config: Config;
108
114
  requestFileLoader: {
109
115
  getFileBody: (filePath: string) => Promise<Blob>;
@@ -297,7 +303,6 @@ export type JsonLogs = {
297
303
  }>;
298
304
  status: string;
299
305
  totalTime: number;
300
- globalTimeoutError: boolean;
301
306
  };
302
307
  export type DescriptionChecks = {
303
308
  checks: Check[];
@@ -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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAoB,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EACL,cAAc,EACd,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,mCAAmC,CAAC;AAQ3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAQxE,MAAM,UAAU,gBAAgB,CAAC,OAA2C;IAC1E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,eAAe,GAA2B,EAAE,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAEvC,iEAAiE;QACjE,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,eAAe,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,OAAO,qCAAqC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAAmB;IAClD,OAAO,iCAAiC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACpD,CAAC;AAED,MAAM,OAAO,UAAU;IACrB,WAAW,CAAc;IACzB,mBAAmB,CAAc;IACjC,KAAK,CAAgB;IAErB,YAAY,MAAgB;QAC1B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC;IACrC,CAAC;IAED,eAAe,GAAG,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAc,EAAE,EAAE;QAC3E,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;YAChC,YAAY;YACZ,IAAI;YACJ,IAAI;YACJ,MAAM;YACN,IAAI,EAAE,IAAI,YAAY,QAAQ,IAAI,IAAI,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SACrF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,cAAc,GAAG,GAAG,EAAE;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC,CAAC;IAEF,iBAAiB,GAAG,CAAC,MAA2B,EAAE,EAAE;QAClD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;YAChC,GAAG,IAAI,CAAC,WAAW;YACnB,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,uBAAuB,GAAG,CAAC,EACzB,YAAY,EACZ,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,UAAU,EACV,YAAY,EACZ,YAAY,GACD,EAAE,EAAE;QACf,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAC;YACxC,YAAY;YACZ,IAAI;YACJ,IAAI;YACJ,MAAM;YACN,IAAI;YACJ,UAAU;YACV,YAAY;YACZ,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,sBAAsB,GAAG,GAAG,EAAE;QAC5B,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC,CAAC;IAEF,wBAAwB,GAAG,GAAG,EAAE;QAC9B,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC,CAAC;IAEF,WAAW,GAAG,KAAK,EAAE,EACnB,GAAG,EACH,IAAI,EACJ,WAAW,EACX,UAAU,GAOX,EAAoC,EAAE;QACrC,MAAM,EACJ,SAAS,EACT,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,oBAAoB,GACrB,GAAG,WAAW,CAAC;QAChB,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,MAAM,UAAU,GAA8C,EAAE,CAAC;QACjE,MAAM,OAAO,GAA2B,EAAE,CAAC;QAE3C,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC/B,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;gBACjB,KAAK,QAAQ;oBACX,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACxD,MAAM;gBACR,KAAK,OAAO;oBACV,YAAY,CAAC,IAAI,CAAC;wBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;wBAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;qBACnC,CAAC,CAAC;oBACH,MAAM;gBACR,KAAK,MAAM;oBACT,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC7C,MAAM;gBACR,KAAK,QAAQ;oBACX,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC1C,MAAM;YACV,CAAC;QACH,CAAC;QAED,6GAA6G;QAC7G,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,aAAa,CAAC,EAAE,KAAK,CAAC;QAC1F,MAAM,WAAW,GACf,OAAO,WAAW,KAAK,QAAQ;YAC7B,CAAC,CAAC,iBAAiB,CAAC,WAAW,EAAE,oBAAoB,CAAC;YACtD,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAErC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3F,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;QAC/C,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;YAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;iBACxC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;iBACxC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;QACzD,MAAM,oBAAoB,GAAG,GAAG,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACtF,MAAM,iBAAiB,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;QACvE,MAAM,UAAU,GAAG,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,oBAAoB,EAAE,CAAC;QAEpF,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACtB,KAAK,CAAC,eAAe,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC1C,qDAAqD,CACxD,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAClD,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACtB,KAAK,CAAC,qBAAqB,CAAC;gBAC1B,iHAAiH,CACpH,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,CAAC;QAChB,IAAI,WAAW,KAAK,mCAAmC,EAAE,CAAC;YACxD,WAAW,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5D,CAAC;aAAM,IAAI,iBAAiB,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;YAChD,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;YACzC,WAAW,GAAG,WAAW,CAAC;QAC5B,CAAC;aAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACvD,WAAW,GAAG,WAAW,CAAC;YAC1B,qEAAqE;YACrE;;;;;;;eAOG;YACH,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,WAAW,KAAK,0BAA0B,EAAE,CAAC;YACtD,WAAW,GAAG,WAAW,CAAC;YAC1B,IAAI,WAAW,YAAY,IAAI,EAAE,CAAC;gBAChC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;gBAClC,OAAO,CAAC,qBAAqB,CAAC,GAAG,wBAAwB,QAAQ,EAAE,CAAC;YACtE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,WAAW,CAAC;QAC5B,CAAC;QAED,qDAAqD;QACrD,MAAM,kBAAkB,GAAG,wBAAwB,CAAC;YAClD,KAAK,EAAE,OAAO;YACd,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC,CAAC;QACH,IAAI,UAAU,CAAC;QAEf,IAAI,WAAW,YAAY,QAAQ,EAAE,CAAC;YACpC,kEAAkE;YAClE,MAAM,cAAc,GAAG,IAAI,QAAQ,EAAE,CAAC;YACtC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACjD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;oBAC1B,cAAc,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACpC,CAAC;qBAAM,CAAC;oBACN,MAAM,WAAW,GAAG,wBAAwB,CAAC;wBAC3C,KAAK,EAAE,KAAK;wBACZ,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;wBACtC,UAAU,EAAE,GAAG,CAAC,UAAU;qBAC3B,CAAC,CAAC;oBACH,cAAc,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YACD,UAAU,GAAG,cAAc,CAAC;QAC9B,CAAC;aAAM,IAAI,iBAAiB,CAAC,WAAW,CAAC,IAAI,WAAW,EAAE,CAAC;YACzD,UAAU,GAAG,wBAAwB,CAAC;gBACpC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;gBAC9B,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;gBACtC,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC3C,UAAU,GAAG,wBAAwB,CAAC;gBACpC,KAAK,EAAE,WAAW;gBAClB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;gBACtC,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,WAAW,CAAC;QAC3B,CAAC;QACD,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;YAChD,KAAK,EAAE,oBAAoB;YAC3B,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,wBAAwB,CAAC;YAC/C,KAAK,EAAE,iBAAiB;YACxB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,CAAC,eAAe,CAAC;YACnB,YAAY,EAAE,kBAAkB;YAChC,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,MAAM,CAAC,WAAW,EAAqB;YAC/C,IAAI,EAAE,gBAAgB,IAAI,EAAE;YAC5B,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;QACtC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAEpC,IAAI,WAAW,CAAC;QAChB,IAAI,YAAY,CAAC;QACjB,IAAI,YAAY,CAAC;QAEjB,MAAM,WAAW,GAAG;YAClB,MAAM,EAAE,MAAM,CAAC,WAAW,EAAqB;YAC/C,OAAO;YACP,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI;gBAC3B,IAAI,EAAE,WAAW;aAClB,CAAC;YACF,QAAQ,EAAE,QAAiB;YAC3B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;YACxD,8DAA8D;YAC9D,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,0BAA0B,IAAI;gBAC5D,MAAM,EAAE,MAAM;aACf,CAAC;SACH,CAAC;QAEF,MAAM,gCAAgC,GACpC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAE7F,MAAM,wBAAwB,GAAG;YAC/B,GAAG,gCAAgC;YACnC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;SAC9B;aACE,OAAO,EAAE;aACT,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,MAAM,MAAM,GAAG,qBAAqB,CAAC;gBACnC,GAAG;gBACH,QAAQ;gBACR,SAAS,EAAE,gBAAgB;aAC5B,CAAC,CAAC;YAEH,OAAO,MAAM,EAAE,IAAI,KAAK,MAAM,IAAI,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,QAAQ,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEL,IAAI,wBAAwB,EAAE,CAAC;YAC7B,yBAAyB;YACzB,+DAA+D;YAC/D,mFAAmF;YACnF,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAClE,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;YAC5C,MAAM,qBAAqB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAE7E,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAClC,IAAI,CAAC,uBAAuB,CAAC;oBAC3B,IAAI,EAAE,OAAO;oBACb,MAAM;oBACN,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,oBAAoB,IAAI,EAAE;oBAChC,UAAU,EAAE,cAAc,CAAC,MAAM;oBACjC,YAAY,EAAE,CAAC;oBACf,YAAY,EAAE,SAAS;iBACxB,CAAC,CAAC;gBACH,MAAM,IAAI,eAAe,CACvB,8DAA8D,cAAc,CAAC,MAAM,wBAAwB,CAC5G,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC3B,IAAI,CAAC,uBAAuB,CAAC;oBAC3B,IAAI,EAAE,OAAO;oBACb,MAAM;oBACN,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,oBAAoB,IAAI,EAAE;oBAChC,UAAU,EAAE,cAAc,CAAC,MAAM;oBACjC,YAAY,EAAE,CAAC;oBACf,YAAY,EAAE,SAAS;iBACxB,CAAC,CAAC;gBACH,MAAM,IAAI,eAAe,CACvB,+EAA+E,CAChF,CAAC;YACJ,CAAC;YAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAC5C,0BAA0B,CAAC,qBAAqB,CAAC,CAAC;YACpD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,wBAAwB,CAAC,MAAM,CAAC;YAC/D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;YAEtE,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;gBAChD,QAAQ,EAAE,QAAkB;gBAC5B,QAAQ,EAAE,QAAkB;gBAC5B,KAAK;gBACL,KAAK;gBACL,MAAM;gBACN,GAAG;gBACH,SAAS;gBACT,GAAG;gBACH,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE;gBAC5B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE;aAC/C,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG;gBACrB,GAAG,OAAO;gBACV,aAAa,EAAE,gBAAgB;aAChC,CAAC;YAEF,yCAAyC;YACzC,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;YAC3E,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,CAAC,MAAM,GAAG,cAAc,CAAC;YACtC,CAAC;YAED,IAAI,CAAC,iBAAiB,CAAC;gBACrB,YAAY,EAAE,wBAAwB,CAAC;oBACrC,KAAK,EAAE,cAAc;oBACrB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;oBACtC,UAAU,EAAE,GAAG,CAAC,UAAU;iBAC3B,CAAC;aACH,CAAC,CAAC;YAEH,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE;gBAC1C,GAAG,WAAW;gBACd,OAAO,EAAE,cAAc;aACxB,CAAC,CAAC;YAEH,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,gBAAgB;YAChB,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACzD,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,CAAC,mBAAmB,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI;YACnF,kBAAkB;SACnB,CAAC;QAEF,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC7C,YAAY,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QAC1C,CAAC;QACD,MAAM,eAAe,GAAG,YAAY;YAClC,CAAC,CAAC,YAAY,YAAY,WAAW;gBACnC,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,iBAAiB,CAAC,mBAAmB,CAAC;oBACtC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;oBAC1B,CAAC,CAAC,YAAY;YAClB,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,cAAc,GAAG,iBAAiB,CAAC;YACvC,UAAU,EAAE,WAAW,CAAC,MAAM;YAC9B,WAAW,EAAE,mBAAmB;YAChC,oBAAoB,EAAE,gBAAgB,EAAE,SAAS;SAClD,CAAC,CAAC;QAEH,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;QAE1D,MAAM,wBAAwB,GAAG,iCAAiC,CAAC,eAAe,CAAC,CAAC;QACpF,KAAK,MAAM,UAAU,IAAI,wBAAwB,EAAE,CAAC;YAClD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;YAC/D,CAAC,CAAC,wBAAwB,CAAC;gBACvB,KAAK,EAAE,eAAe;gBACtB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;gBACtC,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC;YACJ,CAAC,CAAC,eAAe,CAAC;QAEpB,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACjF,MAAM,2BAA2B,GAAG,iCAAiC,CAAC,eAAe,CAAC,CAAC;QAEvF,KAAK,MAAM,UAAU,IAAI,2BAA2B,EAAE,CAAC;YACrD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,YAAgC,CAAC;QACrC,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAEhE,IAAI,aAAa,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5C,YAAY,GAAG,CAAC,aAAa,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,YAAY,YAAY,WAAW,EAAE,CAAC;gBACxC,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC;YACzC,CAAC;iBAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;gBAC5C,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,SAAS,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,uBAAuB,CAAC;YAC3B,IAAI,EAAE,iBAAiB,CAAC,mBAAmB,CAAC;gBAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC;gBACpC,CAAC,CAAC,kBAAkB;YACtB,MAAM;YACN,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,oBAAoB,IAAI,EAAE;YAChC,UAAU,EAAE,WAAW,CAAC,MAAM;YAC9B,YAAY;YACZ,YAAY,EAAE,wBAAwB,CAAC;gBACrC,KAAK,EAAE,eAAe;gBACtB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;gBACtC,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC;YACF,YAAY;SACb,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,UAAU,EAAE,WAAW,CAAC,MAAM;YAC9B,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAChE,WAAW,EAAE,mBAAmB;YAChC,UAAU,EAAE,UAAU;YACtB,YAAY;SACb,CAAC;IACJ,CAAC,CAAC;CACH"}
@@ -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.79.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.79.0",
52
52
  "ajv": "npm:@redocly/ajv@^8.18.3",
53
53
  "better-ajv-errors": "^2.0.3",
54
54
  "colorette": "^2.0.20",
@@ -1,10 +0,0 @@
1
- export declare class Timer {
2
- private static instance;
3
- private startTime;
4
- private timeout;
5
- private constructor();
6
- static getInstance(timeout: number): Timer;
7
- static reset(): void;
8
- isTimedOut(): boolean;
9
- }
10
- //# sourceMappingURL=timer.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../../src/modules/timeout-timer/timer.ts"],"names":[],"mappings":"AAAA,qBAAa,KAAK;IAChB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAQ;IAC/B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;WAKO,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK;WAOnC,KAAK,IAAI,IAAI;IAIpB,UAAU,IAAI,OAAO;CAG7B"}
@@ -1,22 +0,0 @@
1
- export class Timer {
2
- static instance;
3
- startTime;
4
- timeout;
5
- constructor(timeout) {
6
- this.startTime = Date.now();
7
- this.timeout = timeout;
8
- }
9
- static getInstance(timeout) {
10
- if (!Timer.instance) {
11
- Timer.instance = new Timer(timeout);
12
- }
13
- return Timer.instance;
14
- }
15
- static reset() {
16
- Timer.instance = undefined;
17
- }
18
- isTimedOut() {
19
- return Date.now() - this.startTime > this.timeout;
20
- }
21
- }
22
- //# sourceMappingURL=timer.js.map