@redocly/respect-core 0.0.0-snapshot.1739981736 → 0.0.0-snapshot.1740152436
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/handlers/generate.d.ts +7 -2
- package/lib/handlers/generate.d.ts.map +1 -1
- package/lib/handlers/generate.js +14 -8
- package/lib/handlers/generate.js.map +1 -1
- package/lib/handlers/run.d.ts +2 -9
- package/lib/handlers/run.d.ts.map +1 -1
- package/lib/handlers/run.js +33 -14
- package/lib/handlers/run.js.map +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/modules/arazzo-description-generator/cleanup-test-description.d.ts.map +1 -0
- package/lib/modules/arazzo-description-generator/cleanup-test-description.js.map +1 -0
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.d.ts +7 -0
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.d.ts.map +1 -0
- package/lib/modules/{test-config-generator/generate-test-config.js → arazzo-description-generator/generate-arazzo-description.js} +5 -8
- package/lib/modules/arazzo-description-generator/generate-arazzo-description.js.map +1 -0
- package/lib/modules/arazzo-description-generator/generate-example-value.d.ts.map +1 -0
- package/lib/modules/arazzo-description-generator/generate-example-value.js.map +1 -0
- package/lib/modules/arazzo-description-generator/generate-test-data-from-json-schema.d.ts.map +1 -0
- package/lib/modules/arazzo-description-generator/generate-test-data-from-json-schema.js.map +1 -0
- package/lib/modules/{test-config-generator → arazzo-description-generator}/index.d.ts +1 -1
- package/lib/modules/arazzo-description-generator/index.d.ts.map +1 -0
- package/lib/modules/{test-config-generator → arazzo-description-generator}/index.js +1 -1
- package/lib/modules/arazzo-description-generator/index.js.map +1 -0
- package/lib/modules/cli-output/calculate-tests-passed.d.ts +2 -2
- package/lib/modules/cli-output/calculate-tests-passed.d.ts.map +1 -1
- package/lib/modules/cli-output/calculate-tests-passed.js +19 -1
- package/lib/modules/cli-output/calculate-tests-passed.js.map +1 -1
- package/lib/modules/cli-output/display-errors.d.ts +2 -2
- package/lib/modules/cli-output/display-errors.d.ts.map +1 -1
- package/lib/modules/cli-output/display-errors.js +13 -2
- package/lib/modules/cli-output/display-errors.js.map +1 -1
- package/lib/modules/cli-output/display-files-summary-table.d.ts +2 -2
- package/lib/modules/cli-output/display-files-summary-table.d.ts.map +1 -1
- package/lib/modules/cli-output/display-files-summary-table.js +1 -1
- package/lib/modules/cli-output/display-files-summary-table.js.map +1 -1
- package/lib/modules/cli-output/display-summary.d.ts +2 -2
- package/lib/modules/cli-output/display-summary.d.ts.map +1 -1
- package/lib/modules/cli-output/display-summary.js.map +1 -1
- package/lib/modules/cli-output/json-logs.d.ts +14 -2
- package/lib/modules/cli-output/json-logs.d.ts.map +1 -1
- package/lib/modules/cli-output/json-logs.js +68 -20
- package/lib/modules/cli-output/json-logs.js.map +1 -1
- package/lib/modules/description-parser/get-request-data-from-openapi.d.ts +1 -0
- package/lib/modules/description-parser/get-request-data-from-openapi.d.ts.map +1 -1
- package/lib/modules/description-parser/get-request-data-from-openapi.js +7 -5
- package/lib/modules/description-parser/get-request-data-from-openapi.js.map +1 -1
- package/lib/modules/flow-runner/call-api-and-analyze-results.d.ts +2 -19
- package/lib/modules/flow-runner/call-api-and-analyze-results.d.ts.map +1 -1
- package/lib/modules/flow-runner/call-api-and-analyze-results.js +30 -37
- package/lib/modules/flow-runner/call-api-and-analyze-results.js.map +1 -1
- package/lib/modules/flow-runner/context/create-test-context.d.ts.map +1 -1
- package/lib/modules/flow-runner/context/create-test-context.js +4 -3
- package/lib/modules/flow-runner/context/create-test-context.js.map +1 -1
- package/lib/modules/flow-runner/get-server-url.d.ts +9 -0
- package/lib/modules/flow-runner/get-server-url.d.ts.map +1 -1
- package/lib/modules/flow-runner/get-server-url.js +22 -9
- package/lib/modules/flow-runner/get-server-url.js.map +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.d.ts +1 -0
- package/lib/modules/flow-runner/get-test-description-from-file.d.ts.map +1 -1
- package/lib/modules/flow-runner/prepare-request.d.ts.map +1 -1
- package/lib/modules/flow-runner/prepare-request.js +3 -1
- package/lib/modules/flow-runner/prepare-request.js.map +1 -1
- package/lib/modules/flow-runner/run-step.d.ts +2 -4
- package/lib/modules/flow-runner/run-step.d.ts.map +1 -1
- package/lib/modules/flow-runner/run-step.js +57 -57
- package/lib/modules/flow-runner/run-step.js.map +1 -1
- package/lib/modules/flow-runner/runner.d.ts +5 -4
- package/lib/modules/flow-runner/runner.d.ts.map +1 -1
- package/lib/modules/flow-runner/runner.js +51 -57
- package/lib/modules/flow-runner/runner.js.map +1 -1
- package/lib/types.d.ts +60 -34
- package/lib/types.d.ts.map +1 -1
- package/lib/utils/api-fetcher.d.ts.map +1 -1
- package/lib/utils/api-fetcher.js +9 -19
- package/lib/utils/api-fetcher.js.map +1 -1
- package/lib/utils/cli-outputs.d.ts +5 -4
- package/lib/utils/cli-outputs.d.ts.map +1 -1
- package/lib/utils/cli-outputs.js +17 -9
- package/lib/utils/cli-outputs.js.map +1 -1
- package/lib/utils/exit-with-error.d.ts +2 -0
- package/lib/utils/exit-with-error.d.ts.map +1 -0
- package/lib/utils/exit-with-error.js +13 -0
- package/lib/utils/exit-with-error.js.map +1 -0
- package/lib/utils/logger/logger.js +1 -1
- package/lib/utils/logger/logger.js.map +1 -1
- package/lib/utils/mtls/resolve-mtls-certificates.d.ts +1 -1
- package/lib/utils/mtls/resolve-mtls-certificates.d.ts.map +1 -1
- package/lib/utils/mtls/resolve-mtls-certificates.js +10 -7
- package/lib/utils/mtls/resolve-mtls-certificates.js.map +1 -1
- package/package.json +2 -2
- package/lib/modules/test-config-generator/cleanup-test-description.d.ts.map +0 -1
- package/lib/modules/test-config-generator/cleanup-test-description.js.map +0 -1
- package/lib/modules/test-config-generator/generate-example-value.d.ts.map +0 -1
- package/lib/modules/test-config-generator/generate-example-value.js.map +0 -1
- package/lib/modules/test-config-generator/generate-test-config.d.ts +0 -7
- package/lib/modules/test-config-generator/generate-test-config.d.ts.map +0 -1
- package/lib/modules/test-config-generator/generate-test-config.js.map +0 -1
- package/lib/modules/test-config-generator/generate-test-data-from-json-schema.d.ts.map +0 -1
- package/lib/modules/test-config-generator/generate-test-data-from-json-schema.js.map +0 -1
- package/lib/modules/test-config-generator/index.d.ts.map +0 -1
- package/lib/modules/test-config-generator/index.js.map +0 -1
- package/lib/utils/get-reunite-url.d.ts +0 -2
- package/lib/utils/get-reunite-url.d.ts.map +0 -1
- package/lib/utils/get-reunite-url.js +0 -18
- package/lib/utils/get-reunite-url.js.map +0 -1
- /package/lib/modules/{test-config-generator → arazzo-description-generator}/cleanup-test-description.d.ts +0 -0
- /package/lib/modules/{test-config-generator → arazzo-description-generator}/cleanup-test-description.js +0 -0
- /package/lib/modules/{test-config-generator → arazzo-description-generator}/generate-example-value.d.ts +0 -0
- /package/lib/modules/{test-config-generator → arazzo-description-generator}/generate-example-value.js +0 -0
- /package/lib/modules/{test-config-generator → arazzo-description-generator}/generate-test-data-from-json-schema.d.ts +0 -0
- /package/lib/modules/{test-config-generator → arazzo-description-generator}/generate-test-data-from-json-schema.js +0 -0
package/lib/types.d.ts
CHANGED
|
@@ -4,14 +4,16 @@ import type { Faker } from './modules/faker';
|
|
|
4
4
|
import type { OperationDetails } from './modules/description-parser';
|
|
5
5
|
import type { RuleSeverity } from '@redocly/openapi-core/lib/config/types';
|
|
6
6
|
import type { ApiFetcher } from './utils/api-fetcher';
|
|
7
|
+
import type { RespectOptions } from './handlers/run';
|
|
8
|
+
import type { Config } from '@redocly/openapi-core';
|
|
9
|
+
import type { CollectFn } from '@redocly/openapi-core/src/utils';
|
|
7
10
|
export type OperationMethod = FromSchema<typeof operationMethod>;
|
|
8
11
|
export type ResponseContext = {
|
|
9
12
|
statusCode: number;
|
|
10
13
|
body: any;
|
|
11
14
|
header: Record<string, string>;
|
|
12
|
-
query?: Record<string, string | number | boolean>;
|
|
13
|
-
path?: Record<string, string | number | boolean>;
|
|
14
15
|
contentType?: string;
|
|
16
|
+
time?: number;
|
|
15
17
|
} & Record<string, any>;
|
|
16
18
|
export type SourceDescription = FromSchema<typeof sourceDescriptionSchema>;
|
|
17
19
|
type ArazzoParameter = FromSchema<typeof parameter>;
|
|
@@ -54,26 +56,25 @@ type AdditionalStepProps = {
|
|
|
54
56
|
verboseLog?: VerboseLog;
|
|
55
57
|
response: ResponseContext;
|
|
56
58
|
checks: Check[];
|
|
59
|
+
retriesLeft?: number;
|
|
57
60
|
};
|
|
58
61
|
export type Step = ArazzoStep & AdditionalStepProps;
|
|
59
62
|
export type Workflow = Omit<ArazzoWorkflow, 'steps'> & {
|
|
60
63
|
steps: Step[];
|
|
61
64
|
time?: number;
|
|
62
65
|
};
|
|
63
|
-
export type RunArgv = {
|
|
66
|
+
export type RunArgv = Omit<RespectOptions, 'files'> & {
|
|
64
67
|
file: string;
|
|
65
68
|
testDescription?: TestDescription;
|
|
66
|
-
workflow?: string[];
|
|
67
|
-
skip?: string[];
|
|
68
|
-
verbose?: boolean;
|
|
69
|
-
harOutput?: string;
|
|
70
|
-
jsonOutput?: string;
|
|
71
69
|
input?: string | string[];
|
|
72
70
|
server?: string | string[];
|
|
73
71
|
severity?: string | string[];
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
72
|
+
};
|
|
73
|
+
export type CommandArgs<T> = {
|
|
74
|
+
argv: T;
|
|
75
|
+
config: Config;
|
|
76
|
+
version: string;
|
|
77
|
+
collectSpecData?: CollectFn;
|
|
77
78
|
};
|
|
78
79
|
export interface RequestContext {
|
|
79
80
|
body: any;
|
|
@@ -93,8 +94,8 @@ export type AppOptions = {
|
|
|
93
94
|
workflow?: string | string[];
|
|
94
95
|
skip?: string | string[];
|
|
95
96
|
verbose?: boolean;
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
harOutput?: string;
|
|
98
|
+
jsonOutput?: string;
|
|
98
99
|
metadata?: Record<string, any>;
|
|
99
100
|
input?: string | string[];
|
|
100
101
|
server?: string | string[];
|
|
@@ -165,11 +166,50 @@ export type RuntimeExpressionContext = {
|
|
|
165
166
|
export type RunWorkflowInput = {
|
|
166
167
|
workflowInput: Workflow | string;
|
|
167
168
|
ctx: TestContext;
|
|
168
|
-
parentStepId?: string;
|
|
169
|
-
parentWorkflowId?: string;
|
|
170
169
|
fromStepId?: string;
|
|
170
|
+
parentStepId?: string;
|
|
171
|
+
skipLineSeparator?: boolean;
|
|
172
|
+
invocationContext?: string;
|
|
171
173
|
};
|
|
174
|
+
export type ArrazoItemExecutionResult = StepExecutionResult | WorkflowExecutionResult;
|
|
175
|
+
export type ExecutionStatus = 'success' | 'error' | 'warn';
|
|
176
|
+
export interface StepExecutionResult {
|
|
177
|
+
type: 'step';
|
|
178
|
+
stepId: string;
|
|
179
|
+
workflowId: string;
|
|
180
|
+
totalTimeMs: number;
|
|
181
|
+
retriesLeft?: number;
|
|
182
|
+
status: ExecutionStatus;
|
|
183
|
+
invocationContext?: string;
|
|
184
|
+
request?: {
|
|
185
|
+
method: string;
|
|
186
|
+
url: string;
|
|
187
|
+
headers: Record<string, string | number | boolean>;
|
|
188
|
+
body: any;
|
|
189
|
+
};
|
|
190
|
+
response?: {
|
|
191
|
+
statusCode: number;
|
|
192
|
+
body: any;
|
|
193
|
+
headers: Record<string, string | number | boolean>;
|
|
194
|
+
time: number;
|
|
195
|
+
};
|
|
196
|
+
checks: (Check & {
|
|
197
|
+
status: ExecutionStatus;
|
|
198
|
+
})[];
|
|
199
|
+
}
|
|
200
|
+
export interface WorkflowExecutionResult {
|
|
201
|
+
type: 'workflow';
|
|
202
|
+
workflowId: string;
|
|
203
|
+
stepId?: string;
|
|
204
|
+
sourceDescriptionName?: string;
|
|
205
|
+
startTime: number;
|
|
206
|
+
endTime: number;
|
|
207
|
+
totalTimeMs: number;
|
|
208
|
+
executedSteps: (Step | WorkflowExecutionResult)[];
|
|
209
|
+
invocationContext?: string;
|
|
210
|
+
}
|
|
172
211
|
export type TestContext = RuntimeExpressionContext & {
|
|
212
|
+
executedSteps: (Step | WorkflowExecutionResult)[];
|
|
173
213
|
arazzo: string;
|
|
174
214
|
info: InfoObject & Record<string, any>;
|
|
175
215
|
sourceDescriptions?: SourceDescription[];
|
|
@@ -188,25 +228,13 @@ export type TestContext = RuntimeExpressionContext & {
|
|
|
188
228
|
apiClient: ApiFetcher;
|
|
189
229
|
};
|
|
190
230
|
export type TestDescription = Partial<Pick<TestContext & WorkflowInnerContext & StepInnerContext, 'workflows' | 'arazzo' | 'info' | 'sourceDescriptions' | '$outputs' | 'components'>>;
|
|
191
|
-
export type CheckStepInfo = {
|
|
192
|
-
stepId: string;
|
|
193
|
-
workflowId?: string;
|
|
194
|
-
operationId?: string;
|
|
195
|
-
operationPath?: string;
|
|
196
|
-
};
|
|
197
231
|
export type Check = {
|
|
198
232
|
severity: RuleSeverity;
|
|
199
|
-
stepInfo?: CheckStepInfo;
|
|
200
233
|
pass: boolean;
|
|
201
234
|
name: string;
|
|
202
235
|
message?: string;
|
|
203
236
|
additionalMessage?: string;
|
|
204
237
|
};
|
|
205
|
-
export type GenerateConfigFileArgv = {
|
|
206
|
-
descriptionPath: string;
|
|
207
|
-
outputFile?: string;
|
|
208
|
-
extended?: boolean;
|
|
209
|
-
};
|
|
210
238
|
export interface ResultsOfTests {
|
|
211
239
|
passed: number;
|
|
212
240
|
failed: number;
|
|
@@ -218,20 +246,18 @@ export type CalculatedResults = {
|
|
|
218
246
|
workflows: ResultsOfTests;
|
|
219
247
|
steps: ResultsOfTests;
|
|
220
248
|
checks: ResultsOfTests;
|
|
249
|
+
totalRequests: number;
|
|
221
250
|
};
|
|
222
251
|
export type StepCallContext = {
|
|
223
252
|
$response?: ResponseContext;
|
|
224
253
|
$request?: RequestContext;
|
|
225
254
|
$inputs?: Record<string, any>;
|
|
226
255
|
};
|
|
227
|
-
type
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
steps: Record<string, StepWithChecks>;
|
|
232
|
-
time?: number;
|
|
256
|
+
export type JsonLogs = {
|
|
257
|
+
files: Record<string, ArrazoItemExecutionResult[]>;
|
|
258
|
+
status: string;
|
|
259
|
+
totalTime: number;
|
|
233
260
|
};
|
|
234
|
-
export type JsonLogs = Record<string, WorkflowWithChecks>;
|
|
235
261
|
export type DescriptionChecks = {
|
|
236
262
|
checks: Check[];
|
|
237
263
|
descriptionOperation: OperationDetails;
|
package/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,uBAAuB,EACvB,UAAU,EACV,WAAW,EACX,WAAW,EACX,cAAc,EACd,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,eAAe,EACf,eAAe,EACf,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
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":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAK/B,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAUlB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D,UAAU,QAAQ;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,0BAiB3E;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,WAEpD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,WAEnD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,qBAAa,UAAW,YAAW,QAAQ;IACzC,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;gBAET,MAAM,EAAE,QAAQ;IAK5B,eAAe,+CAAgD,UAAU,UAQvE;IAEF,cAAc,+BAEZ;IAEF,uBAAuB,0EAQpB,UAAU,UAUX;IAEF,sBAAsB,+BAEpB;IAEF,WAAW,QACJ,WAAW,eACH,WAAW,KACvB,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"api-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAK/B,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAUlB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D,UAAU,QAAQ;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,0BAiB3E;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,WAEpD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,WAEnD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,qBAAa,UAAW,YAAW,QAAQ;IACzC,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;gBAET,MAAM,EAAE,QAAQ;IAK5B,eAAe,+CAAgD,UAAU,UAQvE;IAEF,cAAc,+BAEZ;IAEF,uBAAuB,0EAQpB,UAAU,UAUX;IAEF,sBAAsB,+BAEpB;IAEF,WAAW,QACJ,WAAW,eACH,WAAW,KACvB,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,CA+KjC;CACH"}
|
package/lib/utils/api-fetcher.js
CHANGED
|
@@ -115,11 +115,12 @@ class ApiFetcher {
|
|
|
115
115
|
.map(([key, value]) => `${key}=${value}`)
|
|
116
116
|
.join('; ');
|
|
117
117
|
}
|
|
118
|
-
|
|
118
|
+
const resolvedPath = (0, config_parser_1.resolvePath)(path, pathParams) || '';
|
|
119
119
|
const pathWithSearchParams = `${resolvedPath}${searchParams.toString() ? '?' + searchParams.toString() : ''}`;
|
|
120
|
-
const
|
|
121
|
-
|
|
122
|
-
|
|
120
|
+
const resolvedServerUrl = (0, config_parser_1.resolvePath)(serverUrl.url, pathParams) || '';
|
|
121
|
+
const urlToFetch = `${trimTrailingSlash(resolvedServerUrl)}${pathWithSearchParams}`;
|
|
122
|
+
if (urlToFetch.startsWith('/')) {
|
|
123
|
+
logger.error((0, colorette_1.bgRed)(` Wrong url: ${(0, colorette_1.inverse)(urlToFetch)} `) +
|
|
123
124
|
` Did you forget to provide a correct "serverUrl"?\n`);
|
|
124
125
|
}
|
|
125
126
|
const contentType = headers['content-type'] || '';
|
|
@@ -173,24 +174,14 @@ class ApiFetcher {
|
|
|
173
174
|
// Start of the verbose logs
|
|
174
175
|
this.initVerboseLogs({
|
|
175
176
|
headerParams: maskedHeaderParams,
|
|
176
|
-
host:
|
|
177
|
+
host: resolvedServerUrl,
|
|
177
178
|
method: (method || 'get').toUpperCase(),
|
|
178
179
|
path: maskedPathParams || '',
|
|
179
180
|
body: maskedBody,
|
|
180
181
|
});
|
|
181
182
|
const wrappedFetch = this.harLogs ? (0, har_logs_1.withHar)(this.fetch, { har: this.harLogs }) : undici_1.fetch;
|
|
182
|
-
// Resolve pathToFetch with pathParams for the second time in order
|
|
183
|
-
// to handle described servers->variables in the OpenAPI spec.
|
|
184
|
-
// E.G.:
|
|
185
|
-
// servers:
|
|
186
|
-
// - url: 'https://api-sandbox.redocly.com/organizations/{organizationId}'
|
|
187
|
-
// TODO: remove/update after the support of the described servers->variables in the Arazzo spec.
|
|
188
|
-
resolvedPath = (0, config_parser_1.resolvePath)(pathToFetch, pathParams) || '';
|
|
189
|
-
if (!resolvedPath) {
|
|
190
|
-
throw new Error('Path to fetch is undefined');
|
|
191
|
-
}
|
|
192
183
|
const startTime = performance.now();
|
|
193
|
-
const result = await wrappedFetch(
|
|
184
|
+
const result = await wrappedFetch(urlToFetch, {
|
|
194
185
|
method: (method || 'get').toUpperCase(),
|
|
195
186
|
headers,
|
|
196
187
|
...(!(0, is_empty_1.isEmpty)(requestBody) && {
|
|
@@ -202,7 +193,7 @@ class ApiFetcher {
|
|
|
202
193
|
...(headers['content-type'] === 'application/octet-stream' && {
|
|
203
194
|
duplex: 'half',
|
|
204
195
|
}),
|
|
205
|
-
dispatcher: ctx.mtlsCerts ? (0, create_mtls_client_1.createMtlsClient)(
|
|
196
|
+
dispatcher: ctx.mtlsCerts ? (0, create_mtls_client_1.createMtlsClient)(urlToFetch, ctx.mtlsCerts) : undefined,
|
|
206
197
|
});
|
|
207
198
|
const responseTime = Math.ceil(performance.now() - startTime);
|
|
208
199
|
const res = await result.text();
|
|
@@ -239,8 +230,7 @@ class ApiFetcher {
|
|
|
239
230
|
time: responseTime,
|
|
240
231
|
header: Object.fromEntries(result.headers?.entries() || []),
|
|
241
232
|
contentType: responseContentType,
|
|
242
|
-
|
|
243
|
-
path: pathParams,
|
|
233
|
+
requestUrl: urlToFetch,
|
|
244
234
|
};
|
|
245
235
|
};
|
|
246
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-fetcher.js","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api-fetcher.js","sourceRoot":"","sources":["../../src/utils/api-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { type Totals } from '@redocly/openapi-core';
|
|
2
2
|
import { type Check, type VerboseLog } from '../types';
|
|
3
|
-
export declare const RESET_ESCAPE_CODE
|
|
3
|
+
export declare const RESET_ESCAPE_CODE: string;
|
|
4
4
|
export declare function removeExtraIndentation(message: string | undefined): string;
|
|
5
5
|
export declare function indent(str: string, level: number): string;
|
|
6
6
|
export declare function printWorkflowSeparatorLine(): void;
|
|
7
|
-
export declare function printWorkflowSeparator(fileName: string, workflowName: string | undefined): void;
|
|
8
|
-
export declare function
|
|
9
|
-
export declare function
|
|
7
|
+
export declare function printWorkflowSeparator(fileName: string, workflowName: string | undefined, skipLineSeparator?: boolean): void;
|
|
8
|
+
export declare function printRequiredWorkflowSeparator(parentWorkflowId: string): void;
|
|
9
|
+
export declare function printChildWorkflowSeparator(parentStepId: string): void;
|
|
10
|
+
export declare function printActionsSeparator(stepId: string, actionName: string, kind: 'failure' | 'success'): void;
|
|
10
11
|
export declare function printStepSeparatorLine(): void;
|
|
11
12
|
export declare function printConfigLintTotals(totals: Totals): void;
|
|
12
13
|
export declare function printStepDetails({ testNameToDisplay, checks, verboseLogs, verboseResponseLogs, }: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-outputs.d.ts","sourceRoot":"","sources":["../../src/utils/cli-outputs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAMvD,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"cli-outputs.d.ts","sourceRoot":"","sources":["../../src/utils/cli-outputs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAMvD,eAAO,MAAM,iBAAiB,QAAwC,CAAC;AAEvE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAY1E;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAKhD;AAED,wBAAgB,0BAA0B,SAIzC;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,iBAAiB,CAAC,EAAE,OAAO,QAO5B;AAED,wBAAgB,8BAA8B,CAAC,gBAAgB,EAAE,MAAM,QAKtE;AAED,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,QAM/D;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,GAAG,SAAS,QAS5B;AAED,wBAAgB,sBAAsB,SAErC;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAoB1D;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,iBAAiB,EACjB,MAAM,EACN,WAAW,EACX,mBAAmB,GACpB,EAAE;IACD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,mBAAmB,CAAC,EAAE,UAAU,CAAC;CAClC,QAGA"}
|
package/lib/utils/cli-outputs.js
CHANGED
|
@@ -5,8 +5,9 @@ exports.removeExtraIndentation = removeExtraIndentation;
|
|
|
5
5
|
exports.indent = indent;
|
|
6
6
|
exports.printWorkflowSeparatorLine = printWorkflowSeparatorLine;
|
|
7
7
|
exports.printWorkflowSeparator = printWorkflowSeparator;
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
8
|
+
exports.printRequiredWorkflowSeparator = printRequiredWorkflowSeparator;
|
|
9
|
+
exports.printChildWorkflowSeparator = printChildWorkflowSeparator;
|
|
10
|
+
exports.printActionsSeparator = printActionsSeparator;
|
|
10
11
|
exports.printStepSeparatorLine = printStepSeparatorLine;
|
|
11
12
|
exports.printConfigLintTotals = printConfigLintTotals;
|
|
12
13
|
exports.printStepDetails = printStepDetails;
|
|
@@ -15,7 +16,7 @@ const colorette_1 = require("colorette");
|
|
|
15
16
|
const cli_output_1 = require("../modules/cli-output");
|
|
16
17
|
const logger_1 = require("./logger/logger");
|
|
17
18
|
const logger = logger_1.DefaultLogger.getInstance();
|
|
18
|
-
exports.RESET_ESCAPE_CODE = '\x1B[0m';
|
|
19
|
+
exports.RESET_ESCAPE_CODE = process.env.NO_COLOR ? '' : '\x1B[0m';
|
|
19
20
|
function removeExtraIndentation(message) {
|
|
20
21
|
if (!message) {
|
|
21
22
|
return '';
|
|
@@ -38,18 +39,25 @@ function printWorkflowSeparatorLine() {
|
|
|
38
39
|
logger.printNewLine();
|
|
39
40
|
logger.printNewLine();
|
|
40
41
|
}
|
|
41
|
-
function printWorkflowSeparator(fileName, workflowName) {
|
|
42
|
-
|
|
42
|
+
function printWorkflowSeparator(fileName, workflowName, skipLineSeparator) {
|
|
43
|
+
if (!skipLineSeparator) {
|
|
44
|
+
printWorkflowSeparatorLine();
|
|
45
|
+
}
|
|
43
46
|
logger.log(` ${(0, colorette_1.bold)('Running workflow')} ${(0, colorette_1.blue)(`${fileName} / ${workflowName}`)}`);
|
|
44
47
|
logger.printNewLine();
|
|
45
48
|
}
|
|
46
|
-
function
|
|
49
|
+
function printRequiredWorkflowSeparator(parentWorkflowId) {
|
|
50
|
+
logger.printNewLine();
|
|
51
|
+
logger.log(` ${(0, colorette_1.bold)('Running required')} workflow for ${(0, colorette_1.blue)(parentWorkflowId)}${exports.RESET_ESCAPE_CODE}\n`);
|
|
52
|
+
}
|
|
53
|
+
function printChildWorkflowSeparator(parentStepId) {
|
|
54
|
+
logger.printNewLine();
|
|
55
|
+
logger.log(` ${(0, colorette_1.bold)('Running child')} workflow for the step ${(0, colorette_1.blue)(parentStepId)}${exports.RESET_ESCAPE_CODE}`);
|
|
47
56
|
logger.printNewLine();
|
|
48
|
-
logger.log(` ${(0, colorette_1.bold)('Running required')} workflows for ${(0, colorette_1.blue)(parentWorkflowId)} ${exports.RESET_ESCAPE_CODE}\n`);
|
|
49
57
|
}
|
|
50
|
-
function
|
|
58
|
+
function printActionsSeparator(stepId, actionName, kind) {
|
|
51
59
|
logger.printNewLine();
|
|
52
|
-
logger.log(` ${(0, colorette_1.bold)(
|
|
60
|
+
logger.log(` ${(0, colorette_1.bold)(`Running ${kind} action`)} ${(0, colorette_1.blue)(actionName)} for the step ${(0, colorette_1.blue)(stepId)}${exports.RESET_ESCAPE_CODE}`);
|
|
53
61
|
logger.printNewLine();
|
|
54
62
|
}
|
|
55
63
|
function printStepSeparatorLine() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-outputs.js","sourceRoot":"","sources":["../../src/utils/cli-outputs.ts"],"names":[],"mappings":";;;AAWA,wDAYC;AAED,wBAKC;AAED,gEAIC;AAED,
|
|
1
|
+
{"version":3,"file":"cli-outputs.js","sourceRoot":"","sources":["../../src/utils/cli-outputs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exit-with-error.d.ts","sourceRoot":"","sources":["../../src/utils/exit-with-error.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,aAAa,YAAa,MAAM,UAI5C,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.exitWithError = void 0;
|
|
4
|
+
const colorette_1 = require("colorette");
|
|
5
|
+
const logger_1 = require("../utils/logger/logger");
|
|
6
|
+
const logger = logger_1.DefaultLogger.getInstance();
|
|
7
|
+
const exitWithError = (message) => {
|
|
8
|
+
logger.error((0, colorette_1.bgRed)(message));
|
|
9
|
+
logger.printNewLine();
|
|
10
|
+
throw new Error(message);
|
|
11
|
+
};
|
|
12
|
+
exports.exitWithError = exitWithError;
|
|
13
|
+
//# sourceMappingURL=exit-with-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exit-with-error.js","sourceRoot":"","sources":["../../src/utils/exit-with-error.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAClC,mDAAuD;AAEvD,MAAM,MAAM,GAAG,sBAAa,CAAC,WAAW,EAAE,CAAC;AAEpC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;IAC/C,MAAM,CAAC,KAAK,CAAC,IAAA,iBAAK,EAAC,OAAO,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,YAAY,EAAE,CAAC;IACtB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,aAAa,iBAIxB"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DefaultLogger = void 0;
|
|
4
4
|
const colorette_1 = require("colorette");
|
|
5
|
-
const RESET_ESCAPE_CODE_IN_TERMINAL = '\x1B[0m';
|
|
5
|
+
const RESET_ESCAPE_CODE_IN_TERMINAL = process.env.NO_COLOR ? '' : '\x1B[0m';
|
|
6
6
|
class DefaultLogger {
|
|
7
7
|
static instance;
|
|
8
8
|
constructor() { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger/logger.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AAEjC,MAAM,6BAA6B,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger/logger.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AAEjC,MAAM,6BAA6B,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAS5E,MAAa,aAAa;IAChB,MAAM,CAAC,QAAQ,CAAgB;IAEvC,gBAAuB,CAAC;IAEjB,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,GAAG,CAAC,OAAe;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,YAAY;QACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,6BAA6B,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,cAAc,CAAC,SAAiB;QAC9B,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,SAAS;aAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;aACjD,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAEzB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAI,EAAC,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;CACF;AAhCD,sCAgCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type TestContext } from '../../types';
|
|
2
|
-
export declare function resolveMtlsCertificates(mtlsCertificates
|
|
2
|
+
export declare function resolveMtlsCertificates(mtlsCertificates: Partial<TestContext['mtlsCerts']>, arazzoFilePath: string): {
|
|
3
3
|
clientCert: string | undefined;
|
|
4
4
|
clientKey: string | undefined;
|
|
5
5
|
caCert: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-mtls-certificates.d.ts","sourceRoot":"","sources":["../../../src/utils/mtls/resolve-mtls-certificates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-mtls-certificates.d.ts","sourceRoot":"","sources":["../../../src/utils/mtls/resolve-mtls-certificates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,wBAAgB,uBAAuB,CACrC,gBAAgB,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAM,EACxD,cAAc,EAAE,MAAM;;;;EASvB"}
|
|
@@ -25,24 +25,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.resolveMtlsCertificates = resolveMtlsCertificates;
|
|
27
27
|
const fs = __importStar(require("node:fs"));
|
|
28
|
-
|
|
28
|
+
const path = __importStar(require("node:path"));
|
|
29
|
+
function resolveMtlsCertificates(mtlsCertificates = {}, arazzoFilePath) {
|
|
29
30
|
const { clientCert, clientKey, caCert } = mtlsCertificates;
|
|
30
31
|
return {
|
|
31
|
-
clientCert: resolveCertificate(clientCert),
|
|
32
|
-
clientKey: resolveCertificate(clientKey),
|
|
33
|
-
caCert: resolveCertificate(caCert),
|
|
32
|
+
clientCert: resolveCertificate(clientCert, arazzoFilePath),
|
|
33
|
+
clientKey: resolveCertificate(clientKey, arazzoFilePath),
|
|
34
|
+
caCert: resolveCertificate(caCert, arazzoFilePath),
|
|
34
35
|
};
|
|
35
36
|
}
|
|
36
|
-
function resolveCertificate(cert) {
|
|
37
|
+
function resolveCertificate(cert, arazzoFilePath) {
|
|
37
38
|
if (!cert)
|
|
38
39
|
return undefined;
|
|
39
40
|
try {
|
|
40
41
|
// Check if the string looks like a certificate content
|
|
41
42
|
const isCertContent = cert.includes('-----BEGIN') && cert.includes('-----END');
|
|
42
43
|
if (!isCertContent) {
|
|
44
|
+
const currentArazzoFileFolder = path.dirname(arazzoFilePath);
|
|
45
|
+
const certPath = path.resolve(currentArazzoFileFolder, cert);
|
|
43
46
|
// If not a certificate content, treat as file path
|
|
44
|
-
fs.accessSync(
|
|
45
|
-
return fs.readFileSync(
|
|
47
|
+
fs.accessSync(certPath, fs.constants.R_OK);
|
|
48
|
+
return fs.readFileSync(certPath, 'utf-8');
|
|
46
49
|
}
|
|
47
50
|
// Return the certificate content as-is
|
|
48
51
|
return formatCertificate(cert);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-mtls-certificates.js","sourceRoot":"","sources":["../../../src/utils/mtls/resolve-mtls-certificates.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"resolve-mtls-certificates.js","sourceRoot":"","sources":["../../../src/utils/mtls/resolve-mtls-certificates.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,0DAWC;AAfD,4CAA8B;AAE9B,gDAAkC;AAElC,SAAgB,uBAAuB,CACrC,mBAAsD,EAAE,EACxD,cAAsB;IAEtB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;IAE3D,OAAO;QACL,UAAU,EAAE,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC;QAC1D,SAAS,EAAE,kBAAkB,CAAC,SAAS,EAAE,cAAc,CAAC;QACxD,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,cAAc,CAAC;KACnD,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAwB,EAAE,cAAsB;IAC1E,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAE5B,IAAI,CAAC;QACH,uDAAuD;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAE/E,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,uBAAuB,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;YAE7D,mDAAmD;YACnD,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC3C,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,uCAAuC;QACvC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,kDAAkD;IAClD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,+EAA+E,CAChF,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC;IAEzC,mEAAmE;IACnE,MAAM,aAAa,GACjB,IAAI;SACD,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,wBAAwB;SAC5C,KAAK,CAAC,UAAU,CAAC,CAAC,iCAAiC;QACpD,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,qBAAqB;IAE7C,iDAAiD;IACjD,OAAO,GAAG,MAAM,KAAK,aAAa,KAAK,MAAM,EAAE,CAAC;AAClD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/respect-core",
|
|
3
|
-
"version": "0.0.0-snapshot.
|
|
3
|
+
"version": "0.0.0-snapshot.1740152436",
|
|
4
4
|
"description": "API TEST FRAMEWORK",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"json-server": "json-server --watch api-samples/fake-db.json --port 3000 --host 0.0.0.0"
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"@faker-js/faker": "^7.6.0",
|
|
54
54
|
"@jest/expect-utils": "^29.3.1",
|
|
55
55
|
"@redocly/ajv": "8.11.2",
|
|
56
|
-
"@redocly/openapi-core": "0.0.0-snapshot.
|
|
56
|
+
"@redocly/openapi-core": "0.0.0-snapshot.1740152436",
|
|
57
57
|
"better-ajv-errors": "^1.2.0",
|
|
58
58
|
"colorette": "^2.0.20",
|
|
59
59
|
"concat-stream": "^2.0.0",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup-test-description.d.ts","sourceRoot":"","sources":["../../../src/modules/test-config-generator/cleanup-test-description.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAQ,MAAM,aAAa,CAAC;AAGnE,wBAAgB,sBAAsB,CAAC,eAAe,EAAE,eAAe;;;;;;;;;;;;;EAatE"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup-test-description.js","sourceRoot":"","sources":["../../../src/modules/test-config-generator/cleanup-test-description.ts"],"names":[],"mappings":";;AAGA,wDAaC;AAdD,oDAAoD;AACpD,SAAgB,sBAAsB,CAAC,eAAgC;IACrE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,eAAe,CAAC;IAClE,MAAM,gBAAgB,GAAG,EAAgB,CAAC;IAE1C,SAAS,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC1B,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,MAAM;QACN,kBAAkB;QAClB,SAAS,EAAE,gBAAgB;KAC5B,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,QAAkB;IACzC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IACvC,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC;KAC/B,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU;IAC7B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACrD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;AACnG,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-example-value.d.ts","sourceRoot":"","sources":["../../../src/modules/test-config-generator/generate-example-value.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,OAQxD"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-example-value.js","sourceRoot":"","sources":["../../../src/modules/test-config-generator/generate-example-value.ts"],"names":[],"mappings":";;AAKA,oDAQC;AAbD,+FAAuF;AACvF,8DAA4D;AAI5D,SAAgB,oBAAoB,CAAC,SAAoB;IACvD,IAAI,SAAS,EAAE,OAAO,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC;QAC/B,OAAO,IAAA,wCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;SAAM,IAAI,SAAS,EAAE,MAAM,EAAE,CAAC;QAC7B,OAAO,IAAA,oEAA8B,EAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC"}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import type { GenerateConfigFileArgv } from '../../types';
|
|
2
|
-
export declare const infoSubstitute: {
|
|
3
|
-
title: string;
|
|
4
|
-
version: string;
|
|
5
|
-
};
|
|
6
|
-
export declare function generateTestConfig({ descriptionPath, outputFile, extended, }: GenerateConfigFileArgv): Promise<any>;
|
|
7
|
-
//# sourceMappingURL=generate-test-config.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-test-config.d.ts","sourceRoot":"","sources":["../../../src/modules/test-config-generator/generate-test-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAGV,sBAAsB,EAGvB,MAAM,aAAa,CAAC;AAmFrB,eAAO,MAAM,cAAc;;;CAG1B,CAAC;AAMF,wBAAsB,kBAAkB,CAAC,EACvC,eAAe,EACf,UAAU,EACV,QAAQ,GACT,EAAE,sBAAsB,gBA4BxB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-test-config.js","sourceRoot":"","sources":["../../../src/modules/test-config-generator/generate-test-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-test-data-from-json-schema.d.ts","sourceRoot":"","sources":["../../../src/modules/test-config-generator/generate-test-data-from-json-schema.ts"],"names":[],"mappings":"AAMA,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,GAAG,WAQzD"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-test-data-from-json-schema.js","sourceRoot":"","sources":["../../../src/modules/test-config-generator/generate-test-data-from-json-schema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAMA,wEAQC;AAdD,yDAA2C;AAC3C,yCAAkC;AAClC,sDAA0D;AAE1D,MAAM,MAAM,GAAG,sBAAa,CAAC,WAAW,EAAE,CAAC;AAE3C,SAAgB,8BAA8B,CAAC,MAAW;IACxD,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7F,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,IAAA,iBAAK,EAAC,qDAAqD,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QACtF,OAAO;IACT,CAAC;AACH,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/modules/test-config-generator/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,0BAA0B,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/test-config-generator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,6DAA2C;AAC3C,wEAAsD;AACtD,2DAAyC"}
|