@redocly/openapi-core 1.0.0-rc.3 → 1.0.1
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/CHANGELOG.md +7 -0
- package/__tests__/utils.ts +88 -0
- package/lib/config/all.js +0 -1
- package/lib/config/minimal.js +0 -1
- package/lib/config/recommended.js +0 -1
- package/package.json +1 -1
- package/src/__tests__/__snapshots__/bundle.test.ts.snap +437 -0
- package/src/__tests__/bundle.test.ts +236 -0
- package/src/__tests__/codeframes.test.ts +530 -0
- package/src/__tests__/fixtures/.redocly.lint-ignore.yaml +5 -0
- package/src/__tests__/fixtures/extension.js +24 -0
- package/src/__tests__/fixtures/refs/definitions.yaml +3 -0
- package/src/__tests__/fixtures/refs/examples.yaml +8 -0
- package/src/__tests__/fixtures/refs/external-request-body.yaml +13 -0
- package/src/__tests__/fixtures/refs/externalref.yaml +35 -0
- package/src/__tests__/fixtures/refs/hosted.yaml +35 -0
- package/src/__tests__/fixtures/refs/openapi-with-external-refs-conflicting-names.yaml +21 -0
- package/src/__tests__/fixtures/refs/openapi-with-external-refs.yaml +33 -0
- package/src/__tests__/fixtures/refs/openapi-with-url-refs.yaml +18 -0
- package/src/__tests__/fixtures/refs/param-b.yaml +1 -0
- package/src/__tests__/fixtures/refs/param-c.yaml +1 -0
- package/src/__tests__/fixtures/refs/rename.yaml +1 -0
- package/src/__tests__/fixtures/refs/requestBody.yaml +9 -0
- package/src/__tests__/fixtures/refs/schema-a.yaml +1 -0
- package/src/__tests__/fixtures/refs/simple.yaml +1 -0
- package/src/__tests__/fixtures/refs/vendor.schema.yaml +20 -0
- package/src/__tests__/fixtures/resolve/External.yaml +10 -0
- package/src/__tests__/fixtures/resolve/External2.yaml +4 -0
- package/src/__tests__/fixtures/resolve/description.md +3 -0
- package/src/__tests__/fixtures/resolve/externalInfo.yaml +4 -0
- package/src/__tests__/fixtures/resolve/externalLicense.yaml +1 -0
- package/src/__tests__/fixtures/resolve/openapi-with-back.yaml +13 -0
- package/src/__tests__/fixtures/resolve/openapi-with-md-description.yaml +5 -0
- package/src/__tests__/fixtures/resolve/openapi.yaml +28 -0
- package/src/__tests__/fixtures/resolve/schemas/type-a.yaml +10 -0
- package/src/__tests__/fixtures/resolve/schemas/type-b.yaml +6 -0
- package/src/__tests__/fixtures/resolve/transitive/a.yaml +1 -0
- package/src/__tests__/fixtures/resolve/transitive/components.yaml +5 -0
- package/src/__tests__/fixtures/resolve/transitive/schemas.yaml +3 -0
- package/src/__tests__/format.test.ts +76 -0
- package/src/__tests__/js-yaml.test.ts +73 -0
- package/src/__tests__/lint.test.ts +392 -0
- package/src/__tests__/logger-browser.test.ts +53 -0
- package/src/__tests__/logger.test.ts +47 -0
- package/src/__tests__/login.test.ts +17 -0
- package/src/__tests__/normalizeVisitors.test.ts +151 -0
- package/src/__tests__/output-browser.test.ts +18 -0
- package/src/__tests__/output.test.ts +15 -0
- package/src/__tests__/ref-utils.test.ts +120 -0
- package/src/__tests__/resolve-http.test.ts +77 -0
- package/src/__tests__/resolve.test.ts +431 -0
- package/src/__tests__/utils-browser.test.ts +11 -0
- package/src/__tests__/utils.test.ts +144 -0
- package/src/__tests__/walk.test.ts +1545 -0
- package/src/benchmark/benches/lint-with-many-rules.bench.ts +35 -0
- package/src/benchmark/benches/lint-with-nested-rule.bench.ts +39 -0
- package/src/benchmark/benches/lint-with-no-rules.bench.ts +20 -0
- package/src/benchmark/benches/lint-with-top-level-rule-report.bench.ts +35 -0
- package/src/benchmark/benches/lint-with-top-level-rule.bench.ts +32 -0
- package/src/benchmark/benches/rebilly.yaml +32275 -0
- package/src/benchmark/benches/recommended-oas3.bench.ts +22 -0
- package/src/benchmark/benches/resolve-with-no-external.bench.ts +23 -0
- package/src/benchmark/benchmark.js +311 -0
- package/src/benchmark/colors.js +29 -0
- package/src/benchmark/fork.js +83 -0
- package/src/benchmark/utils.ts +36 -0
- package/src/bundle.ts +417 -0
- package/src/config/__tests__/__snapshots__/config-resolvers.test.ts.snap +164 -0
- package/src/config/__tests__/__snapshots__/config.test.ts.snap +144 -0
- package/src/config/__tests__/config-resolvers.test.ts +491 -0
- package/src/config/__tests__/config.test.ts +312 -0
- package/src/config/__tests__/fixtures/ingore-file.ts +8 -0
- package/src/config/__tests__/fixtures/load-redocly.yaml +2 -0
- package/src/config/__tests__/fixtures/plugin-config.yaml +2 -0
- package/src/config/__tests__/fixtures/plugin.js +56 -0
- package/src/config/__tests__/fixtures/resolve-config/api/nested-config.yaml +11 -0
- package/src/config/__tests__/fixtures/resolve-config/api/plugin.js +69 -0
- package/src/config/__tests__/fixtures/resolve-config/local-config-with-circular.yaml +7 -0
- package/src/config/__tests__/fixtures/resolve-config/local-config-with-custom-function.yaml +17 -0
- package/src/config/__tests__/fixtures/resolve-config/local-config-with-file.yaml +18 -0
- package/src/config/__tests__/fixtures/resolve-config/local-config-with-wrong-custom-function.yaml +15 -0
- package/src/config/__tests__/fixtures/resolve-config/local-config.yaml +9 -0
- package/src/config/__tests__/fixtures/resolve-config/plugin.js +80 -0
- package/src/config/__tests__/fixtures/resolve-remote-configs/nested-remote-config.yaml +3 -0
- package/src/config/__tests__/fixtures/resolve-remote-configs/remote-config.yaml +4 -0
- package/src/config/__tests__/load.test.ts +167 -0
- package/src/config/__tests__/resolve-plugins.test.ts +27 -0
- package/src/config/__tests__/utils.test.ts +204 -0
- package/src/config/all.ts +74 -0
- package/src/config/builtIn.ts +37 -0
- package/src/config/config-resolvers.ts +474 -0
- package/src/config/config.ts +332 -0
- package/src/config/index.ts +7 -0
- package/src/config/load.ts +144 -0
- package/src/config/minimal.ts +61 -0
- package/src/config/recommended.ts +61 -0
- package/src/config/rules.ts +54 -0
- package/src/config/types.ts +231 -0
- package/src/config/utils.ts +349 -0
- package/src/decorators/__tests__/filter-in.test.ts +310 -0
- package/src/decorators/__tests__/filter-out.test.ts +335 -0
- package/src/decorators/__tests__/media-type-examples-override.test.ts +665 -0
- package/src/decorators/__tests__/remove-x-internal.test.ts +316 -0
- package/src/decorators/__tests__/resources/request.yaml +3 -0
- package/src/decorators/__tests__/resources/response.yaml +3 -0
- package/src/decorators/common/filters/filter-helper.ts +72 -0
- package/src/decorators/common/filters/filter-in.ts +18 -0
- package/src/decorators/common/filters/filter-out.ts +18 -0
- package/src/decorators/common/info-description-override.ts +24 -0
- package/src/decorators/common/info-override.ts +15 -0
- package/src/decorators/common/media-type-examples-override.ts +79 -0
- package/src/decorators/common/operation-description-override.ts +30 -0
- package/src/decorators/common/registry-dependencies.ts +25 -0
- package/src/decorators/common/remove-x-internal.ts +59 -0
- package/src/decorators/common/tag-description-override.ts +25 -0
- package/src/decorators/oas2/index.ts +20 -0
- package/src/decorators/oas3/index.ts +22 -0
- package/src/env.ts +5 -0
- package/src/format/codeframes.ts +216 -0
- package/src/format/format.ts +375 -0
- package/src/index.ts +71 -0
- package/src/js-yaml/index.ts +14 -0
- package/src/lint.ts +148 -0
- package/src/logger.ts +34 -0
- package/src/oas-types.ts +57 -0
- package/src/output.ts +7 -0
- package/src/redocly/__tests__/redocly-client.test.ts +146 -0
- package/src/redocly/index.ts +187 -0
- package/src/redocly/redocly-client-types.ts +10 -0
- package/src/redocly/registry-api-types.ts +32 -0
- package/src/redocly/registry-api.ts +150 -0
- package/src/ref-utils.ts +85 -0
- package/src/resolve.ts +417 -0
- package/src/rules/__tests__/fixtures/code-sample.php +9 -0
- package/src/rules/__tests__/fixtures/invalid-yaml.yaml +1 -0
- package/src/rules/__tests__/fixtures/ref.yaml +1 -0
- package/src/rules/__tests__/no-unresolved-refs.test.ts +257 -0
- package/src/rules/__tests__/utils.test.ts +160 -0
- package/src/rules/ajv.ts +102 -0
- package/src/rules/common/__tests__/info-license.test.ts +62 -0
- package/src/rules/common/__tests__/license-url.test.ts +63 -0
- package/src/rules/common/__tests__/no-ambiguous-paths.test.ts +96 -0
- package/src/rules/common/__tests__/no-enum-type-mismatch.test.ts +210 -0
- package/src/rules/common/__tests__/no-identical-paths.test.ts +58 -0
- package/src/rules/common/__tests__/no-path-trailing-slash.test.ts +85 -0
- package/src/rules/common/__tests__/operation-2xx-response.test.ts +192 -0
- package/src/rules/common/__tests__/operation-4xx-response.test.ts +231 -0
- package/src/rules/common/__tests__/operation-operationId-unique.test.ts +76 -0
- package/src/rules/common/__tests__/operation-operationId-url-safe.test.ts +45 -0
- package/src/rules/common/__tests__/operation-parameters-unique.test.ts +167 -0
- package/src/rules/common/__tests__/operation-singular-tag.test.ts +72 -0
- package/src/rules/common/__tests__/path-http-verbs-order.test.ts +95 -0
- package/src/rules/common/__tests__/path-not-include-query.test.ts +64 -0
- package/src/rules/common/__tests__/path-params-defined.test.ts +202 -0
- package/src/rules/common/__tests__/paths-kebab-case.test.ts +108 -0
- package/src/rules/common/__tests__/scalar-property-missing-example.test.ts +264 -0
- package/src/rules/common/__tests__/security-defined.test.ts +175 -0
- package/src/rules/common/__tests__/spec-strict-refs.test.ts +69 -0
- package/src/rules/common/__tests__/spec.test.ts +610 -0
- package/src/rules/common/__tests__/tag-description.test.ts +65 -0
- package/src/rules/common/__tests__/tags-alphabetical.test.ts +64 -0
- package/src/rules/common/assertions/__tests__/asserts.test.ts +869 -0
- package/src/rules/common/assertions/__tests__/index.test.ts +100 -0
- package/src/rules/common/assertions/__tests__/utils.test.ts +236 -0
- package/src/rules/common/assertions/asserts.ts +357 -0
- package/src/rules/common/assertions/index.ts +53 -0
- package/src/rules/common/assertions/utils.ts +331 -0
- package/src/rules/common/info-contact.ts +15 -0
- package/src/rules/common/info-license-url.ts +10 -0
- package/src/rules/common/info-license.ts +15 -0
- package/src/rules/common/no-ambiguous-paths.ts +50 -0
- package/src/rules/common/no-enum-type-mismatch.ts +52 -0
- package/src/rules/common/no-http-verbs-in-paths.ts +36 -0
- package/src/rules/common/no-identical-paths.ts +24 -0
- package/src/rules/common/no-invalid-parameter-examples.ts +36 -0
- package/src/rules/common/no-invalid-schema-examples.ts +27 -0
- package/src/rules/common/no-path-trailing-slash.ts +15 -0
- package/src/rules/common/operation-2xx-response.ts +24 -0
- package/src/rules/common/operation-4xx-response.ts +24 -0
- package/src/rules/common/operation-description.ts +13 -0
- package/src/rules/common/operation-operationId-unique.ts +21 -0
- package/src/rules/common/operation-operationId-url-safe.ts +19 -0
- package/src/rules/common/operation-operationId.ts +17 -0
- package/src/rules/common/operation-parameters-unique.ts +48 -0
- package/src/rules/common/operation-singular-tag.ts +17 -0
- package/src/rules/common/operation-summary.ts +13 -0
- package/src/rules/common/operation-tag-defined.ts +26 -0
- package/src/rules/common/parameter-description.ts +22 -0
- package/src/rules/common/path-declaration-must-exist.ts +15 -0
- package/src/rules/common/path-excludes-patterns.ts +23 -0
- package/src/rules/common/path-http-verbs-order.ts +30 -0
- package/src/rules/common/path-not-include-query.ts +17 -0
- package/src/rules/common/path-params-defined.ts +65 -0
- package/src/rules/common/path-segment-plural.ts +31 -0
- package/src/rules/common/paths-kebab-case.ts +19 -0
- package/src/rules/common/required-string-property-missing-min-length.ts +44 -0
- package/src/rules/common/response-contains-header.ts +35 -0
- package/src/rules/common/scalar-property-missing-example.ts +58 -0
- package/src/rules/common/security-defined.ts +65 -0
- package/src/rules/common/spec-strict-refs.ts +30 -0
- package/src/rules/common/spec.ts +175 -0
- package/src/rules/common/tag-description.ts +10 -0
- package/src/rules/common/tags-alphabetical.ts +20 -0
- package/src/rules/no-unresolved-refs.ts +51 -0
- package/src/rules/oas2/__tests__/boolean-parameter-prefixes.test.ts +110 -0
- package/src/rules/oas2/__tests__/response-contains-header.test.ts +174 -0
- package/src/rules/oas2/__tests__/response-contains-property.test.ts +155 -0
- package/src/rules/oas2/__tests__/spec/fixtures/description.md +1 -0
- package/src/rules/oas2/__tests__/spec/info.test.ts +355 -0
- package/src/rules/oas2/__tests__/spec/operation.test.ts +123 -0
- package/src/rules/oas2/__tests__/spec/paths.test.ts +245 -0
- package/src/rules/oas2/__tests__/spec/referenceableScalars.test.ts +35 -0
- package/src/rules/oas2/__tests__/spec/utils.ts +32 -0
- package/src/rules/oas2/boolean-parameter-prefixes.ts +26 -0
- package/src/rules/oas2/index.ts +91 -0
- package/src/rules/oas2/remove-unused-components.ts +81 -0
- package/src/rules/oas2/request-mime-type.ts +16 -0
- package/src/rules/oas2/response-contains-property.ts +36 -0
- package/src/rules/oas2/response-mime-type.ts +16 -0
- package/src/rules/oas3/__tests__/boolean-parameter-prefixes.test.ts +111 -0
- package/src/rules/oas3/__tests__/component-name-unique.test.ts +823 -0
- package/src/rules/oas3/__tests__/fixtures/common.yaml +11 -0
- package/src/rules/oas3/__tests__/no-empty-enum-servers.com.test.ts +205 -0
- package/src/rules/oas3/__tests__/no-example-value-and-externalValue.test.ts +65 -0
- package/src/rules/oas3/__tests__/no-invalid-media-type-examples.test.ts +473 -0
- package/src/rules/oas3/__tests__/no-server-example.com.test.ts +60 -0
- package/src/rules/oas3/__tests__/no-server-trailing-slash.test.ts +79 -0
- package/src/rules/oas3/__tests__/no-unused-components.test.ts +131 -0
- package/src/rules/oas3/__tests__/operation-4xx-problem-details-rfc7807.test.ts +145 -0
- package/src/rules/oas3/__tests__/response-contains-header.test.ts +389 -0
- package/src/rules/oas3/__tests__/response-contains-property.test.ts +403 -0
- package/src/rules/oas3/__tests__/spec/callbacks.test.ts +41 -0
- package/src/rules/oas3/__tests__/spec/fixtures/description.md +1 -0
- package/src/rules/oas3/__tests__/spec/info.test.ts +391 -0
- package/src/rules/oas3/__tests__/spec/operation.test.ts +253 -0
- package/src/rules/oas3/__tests__/spec/paths.test.ts +284 -0
- package/src/rules/oas3/__tests__/spec/referenceableScalars.test.ts +77 -0
- package/src/rules/oas3/__tests__/spec/servers.test.ts +505 -0
- package/src/rules/oas3/__tests__/spec/spec.test.ts +298 -0
- package/src/rules/oas3/__tests__/spec/utils.ts +32 -0
- package/src/rules/oas3/__tests__/spec-components-invalid-map-name.test.ts +276 -0
- package/src/rules/oas3/__tests__/utils/lint-document-for-test.ts +23 -0
- package/src/rules/oas3/boolean-parameter-prefixes.ts +28 -0
- package/src/rules/oas3/component-name-unique.ts +158 -0
- package/src/rules/oas3/index.ts +113 -0
- package/src/rules/oas3/no-empty-servers.ts +22 -0
- package/src/rules/oas3/no-example-value-and-externalValue.ts +14 -0
- package/src/rules/oas3/no-invalid-media-type-examples.ts +49 -0
- package/src/rules/oas3/no-server-example.com.ts +14 -0
- package/src/rules/oas3/no-server-trailing-slash.ts +15 -0
- package/src/rules/oas3/no-server-variables-empty-enum.ts +66 -0
- package/src/rules/oas3/no-undefined-server-variable.ts +30 -0
- package/src/rules/oas3/no-unused-components.ts +75 -0
- package/src/rules/oas3/operation-4xx-problem-details-rfc7807.ts +35 -0
- package/src/rules/oas3/remove-unused-components.ts +95 -0
- package/src/rules/oas3/request-mime-type.ts +30 -0
- package/src/rules/oas3/response-contains-property.ts +38 -0
- package/src/rules/oas3/response-mime-type.ts +30 -0
- package/src/rules/oas3/spec-components-invalid-map-name.ts +69 -0
- package/src/rules/other/stats.ts +73 -0
- package/src/rules/utils.ts +193 -0
- package/src/types/config-external-schemas.ts +917 -0
- package/src/types/index.ts +149 -0
- package/src/types/oas2.ts +478 -0
- package/src/types/oas3.ts +597 -0
- package/src/types/oas3_1.ts +258 -0
- package/src/types/redocly-yaml.ts +1040 -0
- package/src/typings/common.ts +17 -0
- package/src/typings/openapi.ts +298 -0
- package/src/typings/swagger.ts +236 -0
- package/src/utils.ts +276 -0
- package/src/visitors.ts +491 -0
- package/src/walk.ts +439 -0
- package/tsconfig.json +8 -0
- package/tsconfig.tsbuildinfo +1 -0
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import outdent from 'outdent';
|
|
2
|
+
import { parseYamlToDocument } from '../../__tests__/utils';
|
|
3
|
+
import { parseRef, refBaseName } from '../ref-utils';
|
|
4
|
+
import { lintDocument } from '../lint';
|
|
5
|
+
import { StyleguideConfig } from '../config';
|
|
6
|
+
import { BaseResolver } from '../resolve';
|
|
7
|
+
|
|
8
|
+
describe('ref-utils', () => {
|
|
9
|
+
it(`should unescape refs with '/'`, () => {
|
|
10
|
+
const reference = 'somefile.yaml#/components/schemas/scope~1domain-schema';
|
|
11
|
+
expect(parseRef(reference)).toMatchInlineSnapshot(`
|
|
12
|
+
Object {
|
|
13
|
+
"pointer": Array [
|
|
14
|
+
"components",
|
|
15
|
+
"schemas",
|
|
16
|
+
"scope/domain-schema",
|
|
17
|
+
],
|
|
18
|
+
"uri": "somefile.yaml",
|
|
19
|
+
}
|
|
20
|
+
`);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it(`should unescape refs with '~'`, () => {
|
|
24
|
+
const reference = 'somefile.yaml#/components/schemas/complex~0name';
|
|
25
|
+
expect(parseRef(reference)).toMatchInlineSnapshot(`
|
|
26
|
+
Object {
|
|
27
|
+
"pointer": Array [
|
|
28
|
+
"components",
|
|
29
|
+
"schemas",
|
|
30
|
+
"complex~name",
|
|
31
|
+
],
|
|
32
|
+
"uri": "somefile.yaml",
|
|
33
|
+
}
|
|
34
|
+
`);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it(`should unescape complex urlencoded paths`, () => {
|
|
38
|
+
const referene = 'somefile.yaml#/components/schemas/scope%2Fcomplex~name';
|
|
39
|
+
expect(parseRef(referene)).toMatchInlineSnapshot(`
|
|
40
|
+
Object {
|
|
41
|
+
"pointer": Array [
|
|
42
|
+
"components",
|
|
43
|
+
"schemas",
|
|
44
|
+
"scope/complex~name",
|
|
45
|
+
],
|
|
46
|
+
"uri": "somefile.yaml",
|
|
47
|
+
}
|
|
48
|
+
`);
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it(`should validate definition with urlencoded paths`, async () => {
|
|
52
|
+
const document = parseYamlToDocument(
|
|
53
|
+
outdent`
|
|
54
|
+
openapi: "3.0.0"
|
|
55
|
+
info:
|
|
56
|
+
version: 1.0.0
|
|
57
|
+
title: Swagger Petstore
|
|
58
|
+
description: Test definition
|
|
59
|
+
license:
|
|
60
|
+
name: MIT
|
|
61
|
+
url: https://opensource.org/licenses/MIT
|
|
62
|
+
servers:
|
|
63
|
+
- url: http://petstore.swagger.io/v1
|
|
64
|
+
paths:
|
|
65
|
+
/pet:
|
|
66
|
+
get:
|
|
67
|
+
summary: List all pets
|
|
68
|
+
operationId: listPets
|
|
69
|
+
responses:
|
|
70
|
+
'200':
|
|
71
|
+
description: A paged array of pets
|
|
72
|
+
content:
|
|
73
|
+
application/json:
|
|
74
|
+
schema:
|
|
75
|
+
$ref: "#/components/schemas/scope%3A%7Banimals~1Pet%7D"
|
|
76
|
+
components:
|
|
77
|
+
schemas:
|
|
78
|
+
scope:{animals/Pet}:
|
|
79
|
+
type: object
|
|
80
|
+
properties:
|
|
81
|
+
id:
|
|
82
|
+
type: integer
|
|
83
|
+
format: int64
|
|
84
|
+
name:
|
|
85
|
+
type: string
|
|
86
|
+
`,
|
|
87
|
+
''
|
|
88
|
+
);
|
|
89
|
+
|
|
90
|
+
const result = await lintDocument({
|
|
91
|
+
document,
|
|
92
|
+
externalRefResolver: new BaseResolver(),
|
|
93
|
+
config: new StyleguideConfig({}),
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
expect(result).toMatchInlineSnapshot(`Array []`);
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
describe('refBaseName', () => {
|
|
100
|
+
it('returns base name for file reference', () => {
|
|
101
|
+
expect(refBaseName('../testcase/Pet.yaml')).toStrictEqual('Pet');
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
it('returns base name for local file reference', () => {
|
|
105
|
+
expect(refBaseName('Cat.json')).toStrictEqual('Cat');
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
it('returns base name for url reference', () => {
|
|
109
|
+
expect(refBaseName('http://example.com/tests/crocodile.json')).toStrictEqual('crocodile');
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it('returns base name for file with multiple dots in name', () => {
|
|
113
|
+
expect(refBaseName('feline.tiger.v1.yaml')).toStrictEqual('feline.tiger.v1');
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
it('returns base name for file without any dots in name', () => {
|
|
117
|
+
expect(refBaseName('abcdefg')).toStrictEqual('abcdefg');
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
});
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { outdent } from 'outdent';
|
|
2
|
+
|
|
3
|
+
import { resolveDocument, BaseResolver } from '../resolve';
|
|
4
|
+
import { parseYamlToDocument } from '../../__tests__/utils';
|
|
5
|
+
import { Oas3Types } from '../types/oas3';
|
|
6
|
+
import { normalizeTypes } from '../types';
|
|
7
|
+
|
|
8
|
+
describe('Resolve http-headers', () => {
|
|
9
|
+
it('should use matching http-headers', async () => {
|
|
10
|
+
const rootDocument = parseYamlToDocument(
|
|
11
|
+
outdent`
|
|
12
|
+
openapi: 3.0.0
|
|
13
|
+
components:
|
|
14
|
+
schemas:
|
|
15
|
+
A:
|
|
16
|
+
$ref: 'https://example.com/test.yaml'
|
|
17
|
+
B:
|
|
18
|
+
$ref: 'https://sample.com/test.yaml'
|
|
19
|
+
C:
|
|
20
|
+
$ref: 'https://sample.com/test/a/test.yaml'
|
|
21
|
+
`,
|
|
22
|
+
'foobar.yaml'
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
const fetchMock = jest.fn(() => Promise.resolve({ ok: true, text: Promise.resolve('') }));
|
|
26
|
+
|
|
27
|
+
await resolveDocument({
|
|
28
|
+
rootDocument,
|
|
29
|
+
externalRefResolver: new BaseResolver({
|
|
30
|
+
http: {
|
|
31
|
+
customFetch: fetchMock,
|
|
32
|
+
headers: [
|
|
33
|
+
{
|
|
34
|
+
name: 'X_TEST',
|
|
35
|
+
matches: 'example.com/*',
|
|
36
|
+
value: '123',
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
name: 'X_TEST',
|
|
40
|
+
matches: 'https://sample.com/test/**',
|
|
41
|
+
value: '321',
|
|
42
|
+
},
|
|
43
|
+
],
|
|
44
|
+
},
|
|
45
|
+
}),
|
|
46
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
expect(fetchMock).toBeCalledTimes(3);
|
|
50
|
+
expect(fetchMock.mock.calls).toMatchInlineSnapshot(`
|
|
51
|
+
Array [
|
|
52
|
+
Array [
|
|
53
|
+
"https://example.com/test.yaml",
|
|
54
|
+
Object {
|
|
55
|
+
"headers": Object {
|
|
56
|
+
"X_TEST": "123",
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
],
|
|
60
|
+
Array [
|
|
61
|
+
"https://sample.com/test.yaml",
|
|
62
|
+
Object {
|
|
63
|
+
"headers": Object {},
|
|
64
|
+
},
|
|
65
|
+
],
|
|
66
|
+
Array [
|
|
67
|
+
"https://sample.com/test/a/test.yaml",
|
|
68
|
+
Object {
|
|
69
|
+
"headers": Object {
|
|
70
|
+
"X_TEST": "321",
|
|
71
|
+
},
|
|
72
|
+
},
|
|
73
|
+
],
|
|
74
|
+
]
|
|
75
|
+
`);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
@@ -0,0 +1,431 @@
|
|
|
1
|
+
import { outdent } from 'outdent';
|
|
2
|
+
import * as path from 'path';
|
|
3
|
+
|
|
4
|
+
import { resolveDocument, BaseResolver, Document } from '../resolve';
|
|
5
|
+
import { parseYamlToDocument } from '../../__tests__/utils';
|
|
6
|
+
import { Oas3Types } from '../types/oas3';
|
|
7
|
+
import { normalizeTypes } from '../types';
|
|
8
|
+
import * as fs from 'fs';
|
|
9
|
+
|
|
10
|
+
describe('collect refs', () => {
|
|
11
|
+
it('should resolve local refs', async () => {
|
|
12
|
+
const rootDocument = parseYamlToDocument(
|
|
13
|
+
outdent`
|
|
14
|
+
openapi: 3.0.0
|
|
15
|
+
info:
|
|
16
|
+
$ref: "#/defs/info"
|
|
17
|
+
defs:
|
|
18
|
+
info:
|
|
19
|
+
contact: {}
|
|
20
|
+
license: {}
|
|
21
|
+
`,
|
|
22
|
+
'foobar.yaml'
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
const resolvedRefs = await resolveDocument({
|
|
26
|
+
rootDocument,
|
|
27
|
+
externalRefResolver: new BaseResolver(),
|
|
28
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
expect(resolvedRefs).toBeDefined();
|
|
32
|
+
expect(resolvedRefs.size).toEqual(1);
|
|
33
|
+
expect(Array.from(resolvedRefs.keys())).toMatchInlineSnapshot(
|
|
34
|
+
[`foobar.yaml::#/defs/info`],
|
|
35
|
+
`
|
|
36
|
+
Array [
|
|
37
|
+
"foobar.yaml::#/defs/info",
|
|
38
|
+
]
|
|
39
|
+
`
|
|
40
|
+
);
|
|
41
|
+
expect(Array.from(resolvedRefs.values()).map((info) => info.node)).toEqual([
|
|
42
|
+
{ contact: {}, license: {} },
|
|
43
|
+
]);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
// Or using async/await.
|
|
47
|
+
it('should throw on self-circular refs', async () => {
|
|
48
|
+
expect.assertions(1);
|
|
49
|
+
|
|
50
|
+
const rootDocument = parseYamlToDocument(
|
|
51
|
+
outdent`
|
|
52
|
+
openapi: 3.0.0
|
|
53
|
+
info:
|
|
54
|
+
$ref: "#/info"
|
|
55
|
+
defs:
|
|
56
|
+
info:
|
|
57
|
+
contact: {}
|
|
58
|
+
license: {}
|
|
59
|
+
`,
|
|
60
|
+
''
|
|
61
|
+
);
|
|
62
|
+
|
|
63
|
+
try {
|
|
64
|
+
await resolveDocument({
|
|
65
|
+
rootDocument,
|
|
66
|
+
externalRefResolver: new BaseResolver(),
|
|
67
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
68
|
+
});
|
|
69
|
+
} catch (e) {
|
|
70
|
+
expect(e.message).toEqual('Self-referencing circular pointer');
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
it('should resolve local transitive refs', async () => {
|
|
75
|
+
const rootDocument = parseYamlToDocument(
|
|
76
|
+
outdent`
|
|
77
|
+
openapi: 3.0.0
|
|
78
|
+
info:
|
|
79
|
+
$ref: "#/tmp/info"
|
|
80
|
+
tmp:
|
|
81
|
+
$ref: '#/defs'
|
|
82
|
+
prop:
|
|
83
|
+
$ref: '#/propTrans'
|
|
84
|
+
propTrans:
|
|
85
|
+
$ref: '#/propDest'
|
|
86
|
+
propDest:
|
|
87
|
+
type: string
|
|
88
|
+
defs:
|
|
89
|
+
info:
|
|
90
|
+
contact: {}
|
|
91
|
+
license: {}
|
|
92
|
+
`,
|
|
93
|
+
'foobar.yaml'
|
|
94
|
+
);
|
|
95
|
+
|
|
96
|
+
const resolvedRefs = await resolveDocument({
|
|
97
|
+
rootDocument,
|
|
98
|
+
externalRefResolver: new BaseResolver(),
|
|
99
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
expect(resolvedRefs).toBeDefined();
|
|
103
|
+
expect(resolvedRefs.size).toEqual(4);
|
|
104
|
+
expect(Array.from(resolvedRefs.keys())).toEqual([
|
|
105
|
+
'foobar.yaml::#/defs',
|
|
106
|
+
'foobar.yaml::#/propDest',
|
|
107
|
+
'foobar.yaml::#/tmp/info',
|
|
108
|
+
'foobar.yaml::#/propTrans',
|
|
109
|
+
]);
|
|
110
|
+
expect(Array.from(resolvedRefs.values()).map((info) => info.node)).toEqual([
|
|
111
|
+
{ info: { contact: {}, license: {} } },
|
|
112
|
+
{ type: 'string' },
|
|
113
|
+
{ contact: {}, license: {} },
|
|
114
|
+
{ type: 'string' },
|
|
115
|
+
]);
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
it('should throw on ref loop', async () => {
|
|
119
|
+
const rootDocument = parseYamlToDocument(
|
|
120
|
+
outdent`
|
|
121
|
+
openapi: 3.0.0
|
|
122
|
+
info:
|
|
123
|
+
$ref: "#/loop"
|
|
124
|
+
loop:
|
|
125
|
+
$ref: '#/loop2'
|
|
126
|
+
loop2:
|
|
127
|
+
$ref: '#/info'
|
|
128
|
+
`,
|
|
129
|
+
'foobar.yaml'
|
|
130
|
+
);
|
|
131
|
+
|
|
132
|
+
try {
|
|
133
|
+
await resolveDocument({
|
|
134
|
+
rootDocument,
|
|
135
|
+
externalRefResolver: new BaseResolver(),
|
|
136
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
137
|
+
});
|
|
138
|
+
} catch (e) {
|
|
139
|
+
expect(e.message).toEqual('Self-referencing circular pointer');
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
it('should resolve external ref', async () => {
|
|
144
|
+
const cwd = path.join(__dirname, 'fixtures/resolve');
|
|
145
|
+
const rootDocument = parseYamlToDocument(
|
|
146
|
+
outdent`
|
|
147
|
+
openapi: 3.0.0
|
|
148
|
+
info:
|
|
149
|
+
$ref: "./externalInfo.yaml#/info"
|
|
150
|
+
`,
|
|
151
|
+
path.join(cwd, 'foobar.yaml')
|
|
152
|
+
);
|
|
153
|
+
|
|
154
|
+
const resolvedRefs = await resolveDocument({
|
|
155
|
+
rootDocument,
|
|
156
|
+
externalRefResolver: new BaseResolver(),
|
|
157
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
expect(resolvedRefs).toBeDefined();
|
|
161
|
+
// expect(resolvedRefs.size).toEqual(2);
|
|
162
|
+
expect(Array.from(resolvedRefs.keys()).map((ref) => ref.substring(cwd.length + 1))).toEqual([
|
|
163
|
+
'foobar.yaml::./externalInfo.yaml#/info',
|
|
164
|
+
'externalInfo.yaml::./externalLicense.yaml',
|
|
165
|
+
]);
|
|
166
|
+
|
|
167
|
+
expect(Array.from(resolvedRefs.values()).map((info) => info.node)).toEqual([
|
|
168
|
+
{
|
|
169
|
+
contact: {},
|
|
170
|
+
license: {
|
|
171
|
+
$ref: './externalLicense.yaml',
|
|
172
|
+
},
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
name: 'MIT',
|
|
176
|
+
},
|
|
177
|
+
]);
|
|
178
|
+
});
|
|
179
|
+
|
|
180
|
+
it('should resolve back references', async () => {
|
|
181
|
+
const cwd = path.join(__dirname, 'fixtures/resolve');
|
|
182
|
+
const externalRefResolver = new BaseResolver();
|
|
183
|
+
const rootDocument = await externalRefResolver.resolveDocument(
|
|
184
|
+
null,
|
|
185
|
+
`${cwd}/openapi-with-back.yaml`
|
|
186
|
+
);
|
|
187
|
+
|
|
188
|
+
const resolvedRefs = await resolveDocument({
|
|
189
|
+
rootDocument: rootDocument as Document,
|
|
190
|
+
externalRefResolver: externalRefResolver,
|
|
191
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
expect(resolvedRefs).toBeDefined();
|
|
195
|
+
|
|
196
|
+
expect(
|
|
197
|
+
Array.from(resolvedRefs.keys())
|
|
198
|
+
.map((ref) => ref.substring(cwd.length + 1))
|
|
199
|
+
.sort()
|
|
200
|
+
).toMatchInlineSnapshot(`
|
|
201
|
+
Array [
|
|
202
|
+
"openapi-with-back.yaml::./schemas/type-a.yaml#/",
|
|
203
|
+
"openapi-with-back.yaml::./schemas/type-b.yaml#/",
|
|
204
|
+
"schemas/type-a.yaml::../openapi-with-back.yaml#/components/schemas/TypeB",
|
|
205
|
+
]
|
|
206
|
+
`);
|
|
207
|
+
|
|
208
|
+
expect(
|
|
209
|
+
Array.from(resolvedRefs.values())
|
|
210
|
+
.map((val) => val.node)
|
|
211
|
+
.sort((firstEl, secondEl) => {
|
|
212
|
+
const getKey = (el: any): string => el?.allOf?.type || el?.type || '';
|
|
213
|
+
|
|
214
|
+
return getKey(firstEl).localeCompare(getKey(secondEl));
|
|
215
|
+
})
|
|
216
|
+
).toMatchInlineSnapshot(`
|
|
217
|
+
Array [
|
|
218
|
+
Object {
|
|
219
|
+
"allOf": Array [
|
|
220
|
+
Object {
|
|
221
|
+
"properties": Object {
|
|
222
|
+
"integration_type": Object {
|
|
223
|
+
"$ref": "../openapi-with-back.yaml#/components/schemas/TypeB",
|
|
224
|
+
},
|
|
225
|
+
"name": Object {
|
|
226
|
+
"type": "string",
|
|
227
|
+
},
|
|
228
|
+
},
|
|
229
|
+
"required": Array [
|
|
230
|
+
"name",
|
|
231
|
+
"integration_type",
|
|
232
|
+
],
|
|
233
|
+
"type": "object",
|
|
234
|
+
},
|
|
235
|
+
],
|
|
236
|
+
},
|
|
237
|
+
Object {
|
|
238
|
+
"enum": Array [
|
|
239
|
+
"webhook",
|
|
240
|
+
"api_key",
|
|
241
|
+
"sftp",
|
|
242
|
+
"netsuite",
|
|
243
|
+
],
|
|
244
|
+
"type": "string",
|
|
245
|
+
},
|
|
246
|
+
Object {
|
|
247
|
+
"enum": Array [
|
|
248
|
+
"webhook",
|
|
249
|
+
"api_key",
|
|
250
|
+
"sftp",
|
|
251
|
+
"netsuite",
|
|
252
|
+
],
|
|
253
|
+
"type": "string",
|
|
254
|
+
},
|
|
255
|
+
]
|
|
256
|
+
`);
|
|
257
|
+
});
|
|
258
|
+
|
|
259
|
+
it('should resolve external refs with circular', async () => {
|
|
260
|
+
const cwd = path.join(__dirname, 'fixtures/resolve');
|
|
261
|
+
const externalRefResolver = new BaseResolver();
|
|
262
|
+
const rootDocument = await externalRefResolver.resolveDocument(null, `${cwd}/openapi.yaml`);
|
|
263
|
+
|
|
264
|
+
const resolvedRefs = await resolveDocument({
|
|
265
|
+
rootDocument: rootDocument as Document,
|
|
266
|
+
externalRefResolver: externalRefResolver,
|
|
267
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
268
|
+
});
|
|
269
|
+
|
|
270
|
+
expect(resolvedRefs).toBeDefined();
|
|
271
|
+
expect(Array.from(resolvedRefs.keys()).map((ref) => ref.substring(cwd.length + 1)))
|
|
272
|
+
.toMatchInlineSnapshot(`
|
|
273
|
+
Array [
|
|
274
|
+
"openapi.yaml::#/components/schemas/Local",
|
|
275
|
+
"openapi.yaml::#/components/schemas/Local/properties/string",
|
|
276
|
+
"openapi.yaml::./External.yaml#/properties/string",
|
|
277
|
+
"openapi.yaml::./External.yaml",
|
|
278
|
+
"External.yaml::./External2.yaml",
|
|
279
|
+
"External2.yaml::./External.yaml#/properties",
|
|
280
|
+
]
|
|
281
|
+
`);
|
|
282
|
+
|
|
283
|
+
expect(Array.from(resolvedRefs.values()).map((val) => val.node)).toMatchInlineSnapshot(`
|
|
284
|
+
Array [
|
|
285
|
+
Object {
|
|
286
|
+
"properties": Object {
|
|
287
|
+
"localCircular": Object {
|
|
288
|
+
"$ref": "#/components/schemas/Local",
|
|
289
|
+
},
|
|
290
|
+
"number": Object {
|
|
291
|
+
"type": "number",
|
|
292
|
+
},
|
|
293
|
+
"string": Object {
|
|
294
|
+
"type": "string",
|
|
295
|
+
},
|
|
296
|
+
},
|
|
297
|
+
},
|
|
298
|
+
Object {
|
|
299
|
+
"type": "string",
|
|
300
|
+
},
|
|
301
|
+
Object {
|
|
302
|
+
"type": "string",
|
|
303
|
+
},
|
|
304
|
+
Object {
|
|
305
|
+
"properties": Object {
|
|
306
|
+
"external": Object {
|
|
307
|
+
"$ref": "./External2.yaml",
|
|
308
|
+
},
|
|
309
|
+
"number": Object {
|
|
310
|
+
"type": "number",
|
|
311
|
+
},
|
|
312
|
+
"string": Object {
|
|
313
|
+
"type": "string",
|
|
314
|
+
},
|
|
315
|
+
"unknown": Object {
|
|
316
|
+
"type": "string",
|
|
317
|
+
},
|
|
318
|
+
},
|
|
319
|
+
"type": "object",
|
|
320
|
+
},
|
|
321
|
+
Object {
|
|
322
|
+
"properties": Object {
|
|
323
|
+
"circularParent": Object {
|
|
324
|
+
"$ref": "./External.yaml#/properties",
|
|
325
|
+
},
|
|
326
|
+
},
|
|
327
|
+
"type": "object",
|
|
328
|
+
},
|
|
329
|
+
Object {
|
|
330
|
+
"external": Object {
|
|
331
|
+
"$ref": "./External2.yaml",
|
|
332
|
+
},
|
|
333
|
+
"number": Object {
|
|
334
|
+
"type": "number",
|
|
335
|
+
},
|
|
336
|
+
"string": Object {
|
|
337
|
+
"type": "string",
|
|
338
|
+
},
|
|
339
|
+
"unknown": Object {
|
|
340
|
+
"type": "string",
|
|
341
|
+
},
|
|
342
|
+
},
|
|
343
|
+
]
|
|
344
|
+
`);
|
|
345
|
+
});
|
|
346
|
+
|
|
347
|
+
it('should resolve referenceable scalars', async () => {
|
|
348
|
+
const cwd = path.join(__dirname, 'fixtures/resolve');
|
|
349
|
+
const externalRefResolver = new BaseResolver();
|
|
350
|
+
const rootDocument = await externalRefResolver.resolveDocument(
|
|
351
|
+
null,
|
|
352
|
+
`${cwd}/openapi-with-md-description.yaml`
|
|
353
|
+
);
|
|
354
|
+
|
|
355
|
+
expect(rootDocument).toBeDefined();
|
|
356
|
+
|
|
357
|
+
// @ts-ignore
|
|
358
|
+
Oas3Types.Info.properties.description['referenceable'] = true;
|
|
359
|
+
const resolvedRefs = await resolveDocument({
|
|
360
|
+
rootDocument: rootDocument as Document,
|
|
361
|
+
externalRefResolver: externalRefResolver,
|
|
362
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
363
|
+
});
|
|
364
|
+
|
|
365
|
+
expect(resolvedRefs).toBeDefined();
|
|
366
|
+
// expect(resolvedRefs.size).toEqual(2);
|
|
367
|
+
expect(Array.from(resolvedRefs.keys()).map((ref) => ref.substring(cwd.length + 1)))
|
|
368
|
+
.toMatchInlineSnapshot(`
|
|
369
|
+
Array [
|
|
370
|
+
"openapi-with-md-description.yaml::./description.md",
|
|
371
|
+
]
|
|
372
|
+
`);
|
|
373
|
+
expect(Array.from(resolvedRefs.values()).map((val) => val.node)).toMatchInlineSnapshot(`
|
|
374
|
+
Array [
|
|
375
|
+
"# Hello World
|
|
376
|
+
|
|
377
|
+
Lorem ipsum
|
|
378
|
+
",
|
|
379
|
+
]
|
|
380
|
+
`);
|
|
381
|
+
});
|
|
382
|
+
|
|
383
|
+
it('should resolve external transitive ref', async () => {
|
|
384
|
+
const cwd = path.join(__dirname, 'fixtures/resolve');
|
|
385
|
+
const rootDocument = parseYamlToDocument(
|
|
386
|
+
outdent`
|
|
387
|
+
openapi: 3.0.0
|
|
388
|
+
components:
|
|
389
|
+
$ref: "./transitive/components.yaml#/components/schemas/a"
|
|
390
|
+
`,
|
|
391
|
+
path.join(cwd, 'foobar.yaml')
|
|
392
|
+
);
|
|
393
|
+
|
|
394
|
+
const resolvedRefs = await resolveDocument({
|
|
395
|
+
rootDocument,
|
|
396
|
+
externalRefResolver: new BaseResolver(),
|
|
397
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
398
|
+
});
|
|
399
|
+
|
|
400
|
+
expect(resolvedRefs).toBeDefined();
|
|
401
|
+
expect(resolvedRefs.size).toEqual(3);
|
|
402
|
+
expect(Array.from(resolvedRefs.keys()).map((ref) => ref.substring(cwd.length + 1))).toEqual([
|
|
403
|
+
'transitive/components.yaml::./schemas.yaml#/schemas',
|
|
404
|
+
'transitive/schemas.yaml::a.yaml',
|
|
405
|
+
'foobar.yaml::./transitive/components.yaml#/components/schemas/a',
|
|
406
|
+
]);
|
|
407
|
+
|
|
408
|
+
expect(Array.from(resolvedRefs.values()).pop()!.node).toEqual({ type: 'string' });
|
|
409
|
+
});
|
|
410
|
+
|
|
411
|
+
it('should throw error if ref is folder', async () => {
|
|
412
|
+
const cwd = path.join(__dirname, 'fixtures/resolve');
|
|
413
|
+
const rootDocument = parseYamlToDocument(
|
|
414
|
+
outdent`
|
|
415
|
+
openapi: 3.0.0
|
|
416
|
+
components:
|
|
417
|
+
$ref: "./transitive/components.yaml#/components/schemas/a"
|
|
418
|
+
`,
|
|
419
|
+
path.join(cwd, 'foobar')
|
|
420
|
+
);
|
|
421
|
+
jest.spyOn(fs, 'lstatSync').mockImplementation((_) => ({ isDirectory: () => true } as any));
|
|
422
|
+
|
|
423
|
+
const resolvedRefs = await resolveDocument({
|
|
424
|
+
rootDocument,
|
|
425
|
+
externalRefResolver: new BaseResolver(),
|
|
426
|
+
rootType: normalizeTypes(Oas3Types).Root,
|
|
427
|
+
});
|
|
428
|
+
|
|
429
|
+
expect(Array.from(resolvedRefs.values()).pop()!.error).toBeInstanceOf(Error);
|
|
430
|
+
});
|
|
431
|
+
});
|