Skip to content

Commit 1bb9140

Browse files
authored
feat: use [email protected] with JSON Schema namespaces (#3787)
1 parent b79b98f commit 1bb9140

File tree

4 files changed

+121
-56
lines changed

4 files changed

+121
-56
lines changed

config/webpack/browser.config.babel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const browserMin = {
6363
devtool: 'source-map',
6464
performance: {
6565
hints: 'error',
66-
maxEntrypointSize: 470000,
66+
maxEntrypointSize: 480000,
6767
maxAssetSize: 50000000,
6868
},
6969
output: {

package-lock.json

+109-44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
5151
"lint": "eslint src/ test/",
5252
"lint:fix": "npm run lint -- --fix",
53-
"link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-2 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-json-pointer",
53+
"link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-2 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-ns-json-schema-draft-6 @swagger-api/apidom-ns-json-schema-draft-7 @swagger-api/apidom-ns-json-schema-2019-09 @swagger-api/apidom-ns-json-schema-2020-12 @swagger-api/apidom-json-pointer",
5454
"test": "run-s test:unit:coverage test:artifact",
5555
"test:unit": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.config.js",
5656
"test:unit:coverage": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.js",
@@ -74,11 +74,11 @@
7474
"dependencies": {
7575
"@babel/runtime-corejs3": "^7.22.15",
7676
"@scarf/scarf": "=1.4.0",
77-
"@swagger-api/apidom-core": ">=1.0.0-beta.6 <1.0.0-rc.0",
78-
"@swagger-api/apidom-error": ">=1.0.0-beta.6 <1.0.0-rc.0",
79-
"@swagger-api/apidom-json-pointer": ">=1.0.0-beta.6 <1.0.0-rc.0",
80-
"@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.6 <1.0.0-rc.0",
81-
"@swagger-api/apidom-reference": ">=1.0.0-beta.6 <1.0.0-rc.0",
77+
"@swagger-api/apidom-core": ">=1.0.0-beta.11 <1.0.0-rc.0",
78+
"@swagger-api/apidom-error": ">=1.0.0-beta.11 <1.0.0-rc.0",
79+
"@swagger-api/apidom-json-pointer": ">=1.0.0-beta.11 <1.0.0-rc.0",
80+
"@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.11 <1.0.0-rc.0",
81+
"@swagger-api/apidom-reference": ">=1.0.0-beta.11 <1.0.0-rc.0",
8282
"@swaggerexpert/cookie": "^1.4.1",
8383
"deepmerge": "~4.3.0",
8484
"fast-json-patch": "^3.0.0-1",

test/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/schema-object/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ describe('dereference', () => {
612612
test('should retain $schema before dereferencing', () => {
613613
const profile = evaluate('/0/components/schemas/User/properties/profile', dereferenced);
614614

615-
expect(profile.meta.get('inherited$schema').toValue()).toStrictEqual(
615+
expect(profile.meta.get('inheritedDialectIdentifier').toValue()).toStrictEqual(
616616
'https://spec.openapis.org/oas/3.1/dialect/base'
617617
);
618618
});
@@ -652,23 +652,23 @@ describe('dereference', () => {
652652
test('should inherit default $schema dialect for User', () => {
653653
const user = evaluate('/0/components/schemas/User', dereferenced);
654654

655-
expect(user.meta.get('inherited$schema').toValue()).toStrictEqual(
655+
expect(user.meta.get('inheritedDialectIdentifier').toValue()).toStrictEqual(
656656
'https://spec.openapis.org/oas/3.1/dialect/base'
657657
);
658658
});
659659

660660
test('should inherit default $schema dialect for User.login', () => {
661661
const user = evaluate('/0/components/schemas/User/properties/login', dereferenced);
662662

663-
expect(user.meta.get('inherited$schema').toValue()).toStrictEqual(
663+
expect(user.meta.get('inheritedDialectIdentifier').toValue()).toStrictEqual(
664664
'https://spec.openapis.org/oas/3.1/dialect/base'
665665
);
666666
});
667667

668668
test('should inherit default $schema dialect for UserProfile', () => {
669669
const user = evaluate('/0/components/schemas/UserProfile', dereferenced);
670670

671-
expect(user.meta.get('inherited$schema').toValue()).toStrictEqual(
671+
expect(user.meta.get('inheritedDialectIdentifier').toValue()).toStrictEqual(
672672
'https://spec.openapis.org/oas/3.1/dialect/base'
673673
);
674674
});
@@ -679,7 +679,7 @@ describe('dereference', () => {
679679
dereferenced
680680
);
681681

682-
expect(user.meta.get('inherited$schema').toValue()).toStrictEqual(
682+
expect(user.meta.get('inheritedDialectIdentifier').toValue()).toStrictEqual(
683683
'https://spec.openapis.org/oas/3.1/dialect/base'
684684
);
685685
});

0 commit comments

Comments
 (0)