From 23f22ec75a2bb6a9a28f79a388378100ec409f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Sun, 26 Jan 2025 23:32:45 +0100 Subject: [PATCH] feat(workflows-1): use JSON Schema 2020-12 namespace (#4690) Refs #1822 --- package-lock.json | 2 +- packages/apidom-ns-workflows-1/package.json | 2 +- .../src/elements/JSONSchema.ts | 50 --------------- .../src/elements/Workflow.ts | 3 +- packages/apidom-ns-workflows-1/src/index.ts | 3 +- .../apidom-ns-workflows-1/src/namespace.ts | 4 +- .../apidom-ns-workflows-1/src/predicates.ts | 17 +---- .../src/refractor/registration.ts | 3 +- .../src/refractor/specification.ts | 24 +------ .../visitors/workflows-1/json-schema/index.ts | 46 ------------- .../src/traversal/visitor.ts | 2 +- .../Components/__snapshots__/index.mjs.snap | 2 +- .../JSONSchema/__snapshots__/index.mjs.snap | 64 +++++++++---------- .../JSONSchema/embedded-resources-$id.ts | 12 ++-- .../JSONSchema/embedded-resources-$schema.ts | 12 ++-- .../Workflow/__snapshots__/index.mjs.snap | 2 +- .../test/__snapshots__/adapter.mjs.snap | 6 +- .../test/__snapshots__/adapter.mjs.snap | 6 +- 18 files changed, 67 insertions(+), 193 deletions(-) delete mode 100644 packages/apidom-ns-workflows-1/src/elements/JSONSchema.ts delete mode 100644 packages/apidom-ns-workflows-1/src/refractor/visitors/workflows-1/json-schema/index.ts diff --git a/package-lock.json b/package-lock.json index bfac137042..29d736689b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25634,7 +25634,7 @@ "dependencies": { "@babel/runtime-corejs3": "^7.20.7", "@swagger-api/apidom-core": "^1.0.0-beta.10", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-beta.10", + "@swagger-api/apidom-ns-json-schema-2020-12": "^1.0.0-beta.10", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", diff --git a/packages/apidom-ns-workflows-1/package.json b/packages/apidom-ns-workflows-1/package.json index 179ae1ef31..699d2a8df3 100644 --- a/packages/apidom-ns-workflows-1/package.json +++ b/packages/apidom-ns-workflows-1/package.json @@ -43,7 +43,7 @@ "dependencies": { "@babel/runtime-corejs3": "^7.20.7", "@swagger-api/apidom-core": "^1.0.0-beta.10", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-beta.10", + "@swagger-api/apidom-ns-json-schema-2020-12": "^1.0.0-beta.10", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", diff --git a/packages/apidom-ns-workflows-1/src/elements/JSONSchema.ts b/packages/apidom-ns-workflows-1/src/elements/JSONSchema.ts deleted file mode 100644 index 9b10e1ba53..0000000000 --- a/packages/apidom-ns-workflows-1/src/elements/JSONSchema.ts +++ /dev/null @@ -1,50 +0,0 @@ -import type { Attributes, Meta } from '@swagger-api/apidom-core'; -import { SchemaElement } from '@swagger-api/apidom-ns-openapi-3-1'; - -/** - * @public - */ -class JSONSchema extends SchemaElement { - constructor(content?: Record, meta?: Meta, attributes?: Attributes) { - super(content, meta, attributes); - this.element = 'jSONSchemaDraft202012'; - } - - /** - * We're redefining the getters/setters here so that the following keywords - * are not part of the OAS base vocabulary, but rather an arbitrary custom dialect. - */ - get discriminator(): any { - return this.get('discriminator'); - } - - set discriminator(discriminator: any) { - this.set('discriminator', discriminator); - } - - get xml(): any { - return this.get('xml'); - } - - set xml(xml: any) { - this.set('xml', xml); - } - - get externalDocs(): any { - return this.get('externalDocs'); - } - - set externalDocs(externalDocs: any) { - this.set('externalDocs', externalDocs); - } - - get example(): any { - return this.get('example'); - } - - set example(example: any) { - this.set('example', example); - } -} - -export default JSONSchema; diff --git a/packages/apidom-ns-workflows-1/src/elements/Workflow.ts b/packages/apidom-ns-workflows-1/src/elements/Workflow.ts index d016f51a90..405f576dec 100644 --- a/packages/apidom-ns-workflows-1/src/elements/Workflow.ts +++ b/packages/apidom-ns-workflows-1/src/elements/Workflow.ts @@ -5,8 +5,7 @@ import { Attributes, Meta, } from '@swagger-api/apidom-core'; - -import JSONSchemaElement from './JSONSchema.ts'; +import { JSONSchemaElement } from '@swagger-api/apidom-ns-json-schema-2020-12'; /** * @public diff --git a/packages/apidom-ns-workflows-1/src/index.ts b/packages/apidom-ns-workflows-1/src/index.ts index 7d65607f77..bc89f297d9 100644 --- a/packages/apidom-ns-workflows-1/src/index.ts +++ b/packages/apidom-ns-workflows-1/src/index.ts @@ -71,8 +71,7 @@ export type { export type { default as JSONSchemaVisitor, JSONSchemaVisitorOptions, - SchemaVisitor, -} from './refractor/visitors/workflows-1/json-schema/index.ts'; +} from '@swagger-api/apidom-ns-json-schema-2020-12'; export type { default as ParameterVisitor, ParameterVisitorOptions, diff --git a/packages/apidom-ns-workflows-1/src/namespace.ts b/packages/apidom-ns-workflows-1/src/namespace.ts index 33d6366488..14e5af1993 100644 --- a/packages/apidom-ns-workflows-1/src/namespace.ts +++ b/packages/apidom-ns-workflows-1/src/namespace.ts @@ -1,4 +1,5 @@ import { NamespacePluginOptions } from '@swagger-api/apidom-core'; +import { JSONSchemaElement } from '@swagger-api/apidom-ns-json-schema-2020-12'; import WorkflowsSpecification1Element from './elements/WorkflowsSpecification1.ts'; import WorkflowsSpecElement from './elements/WorkflowsSpec.ts'; @@ -12,7 +13,6 @@ import FailureActionElement from './elements/FailureAction.ts'; import ComponentsElement from './elements/Components.ts'; import CriterionElement from './elements/Criterion.ts'; import ReferenceElement from './elements/Reference.ts'; -import JSONSchemaElement from './elements/JSONSchema.ts'; /** * @public @@ -33,7 +33,7 @@ const workflows1 = { base.register('components', ComponentsElement); base.register('criterion', CriterionElement); base.register('reference', ReferenceElement); - base.register('jSONSchemaDraft202012', JSONSchemaElement); + base.register('jSONSchema202012', JSONSchemaElement); return base; }, diff --git a/packages/apidom-ns-workflows-1/src/predicates.ts b/packages/apidom-ns-workflows-1/src/predicates.ts index 98ff27f2db..89fdd428c0 100644 --- a/packages/apidom-ns-workflows-1/src/predicates.ts +++ b/packages/apidom-ns-workflows-1/src/predicates.ts @@ -1,4 +1,5 @@ import { createPredicate } from '@swagger-api/apidom-core'; +import { isJSONSchemaElement } from '@swagger-api/apidom-ns-json-schema-2020-12'; import WorkflowsSpecification1Element from './elements/WorkflowsSpecification1.ts'; import WorkflowsSpecElement from './elements/WorkflowsSpec.ts'; @@ -12,7 +13,6 @@ import FailureActionElement from './elements/FailureAction.ts'; import ComponentsElement from './elements/Components.ts'; import CriterionElement from './elements/Criterion.ts'; import ReferenceElement from './elements/Reference.ts'; -import JSONSchemaElement from './elements/JSONSchema.ts'; // NCE types import WorkflowsElement from './elements/nces/Workflows.ts'; import SourceDescriptionsElement from './elements/nces/SourceDescriptions.ts'; @@ -27,6 +27,8 @@ import StepOutputsElement from './elements/nces/StepOutputs.ts'; import SuccessActionCriteriaElement from './elements/nces/SuccessActionCriteria.ts'; import FailureActionCriteriaElement from './elements/nces/FailureActionCriteria.ts'; +export { isJSONSchemaElement }; + /** * @public */ @@ -356,16 +358,3 @@ export const isFailureActionCriteriaElement = createPredicate( hasClass('criteria', element)); }, ); - -/** - * @public - */ -export const isJSONSchemaElement = createPredicate( - ({ hasBasicElementProps, isElementType, primitiveEq }) => { - return (element: unknown): element is JSONSchemaElement => - element instanceof JSONSchemaElement || - (hasBasicElementProps(element) && - isElementType('jSONSchemaDraft202012', element) && - primitiveEq('object', element)); - }, -); diff --git a/packages/apidom-ns-workflows-1/src/refractor/registration.ts b/packages/apidom-ns-workflows-1/src/refractor/registration.ts index e122f1b039..80769967a7 100644 --- a/packages/apidom-ns-workflows-1/src/refractor/registration.ts +++ b/packages/apidom-ns-workflows-1/src/refractor/registration.ts @@ -1,3 +1,5 @@ +import { JSONSchemaElement } from '@swagger-api/apidom-ns-json-schema-2020-12'; + import WorkflowsSpecification1Element from '../elements/WorkflowsSpecification1.ts'; import WorkflowsSpecElement from '../elements/WorkflowsSpec.ts'; import InfoElement from '../elements/Info.ts'; @@ -10,7 +12,6 @@ import FailureActionElement from '../elements/FailureAction.ts'; import ComponentsElement from '../elements/Components.ts'; import CriterionElement from '../elements/Criterion.ts'; import ReferenceElement from '../elements/Reference.ts'; -import JSONSchemaElement from '../elements/JSONSchema.ts'; import { createRefractor } from './index.ts'; InfoElement.refract = createRefractor(['visitors', 'document', 'objects', 'Info', '$visitor']); diff --git a/packages/apidom-ns-workflows-1/src/refractor/specification.ts b/packages/apidom-ns-workflows-1/src/refractor/specification.ts index 14cd6df121..5e3e96dc95 100644 --- a/packages/apidom-ns-workflows-1/src/refractor/specification.ts +++ b/packages/apidom-ns-workflows-1/src/refractor/specification.ts @@ -1,5 +1,4 @@ -import { omit } from 'ramda'; -import { specificationObj as OpenApi3_1Specification } from '@swagger-api/apidom-ns-openapi-3-1'; +import { specificationObj as jsonSchemaSpecificationObj } from '@swagger-api/apidom-ns-json-schema-2020-12'; import WorkflowsSpecificationVisitor from './visitors/workflows-1/index.ts'; import WorkflowsSpecVisitor from './visitors/workflows-1/WorkflowsSpecVisitor.ts'; @@ -30,7 +29,6 @@ import ComponentsParametersVisitor from './visitors/workflows-1/components/Param import CriterionVisitor from './visitors/workflows-1/criterion/index.ts'; import ReferenceVisitor from './visitors/workflows-1/reference/index.ts'; import Reference$RefVisitor from './visitors/workflows-1/reference/$RefVisitor.ts'; -import JSONSchemaVisitor from './visitors/workflows-1/json-schema/index.ts'; import SpecificationExtensionVisitor from './visitors/SpecificationExtensionVisitor.ts'; import FallbackVisitor from './visitors/FallbackVisitor.ts'; @@ -43,11 +41,7 @@ import FallbackVisitor from './visitors/FallbackVisitor.ts'; * Note: Specification object allows to use absolute internal JSON pointers. */ -const { fixedFields: schemaFixedFields } = OpenApi3_1Specification.visitors.document.objects.Schema; -const jsonSchemaFixedFields = omit( - ['discriminator', 'xml', 'externalDocs', 'example'], - schemaFixedFields, -); // getting rid of OAS base dialect keywords +const { JSONSchema: JSONSchemaVisitor } = jsonSchemaSpecificationObj.visitors.document.objects; /** * @public @@ -167,19 +161,7 @@ const specification = { value: { $ref: '#/visitors/value' }, }, }, - Schema: { - /** - * Internally the fixed field visitors are using references to `/document/objects/Schema`. - * Schema spec make sure it's pointing to our JSONSchema visitor and basically acts like - * an alias for it. - */ - $visitor: JSONSchemaVisitor, - fixedFields: jsonSchemaFixedFields, - }, - JSONSchema: { - $visitor: JSONSchemaVisitor, - fixedFields: jsonSchemaFixedFields, - }, + JSONSchema: JSONSchemaVisitor, }, extension: { $visitor: SpecificationExtensionVisitor, diff --git a/packages/apidom-ns-workflows-1/src/refractor/visitors/workflows-1/json-schema/index.ts b/packages/apidom-ns-workflows-1/src/refractor/visitors/workflows-1/json-schema/index.ts deleted file mode 100644 index 0253236349..0000000000 --- a/packages/apidom-ns-workflows-1/src/refractor/visitors/workflows-1/json-schema/index.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { always } from 'ramda'; -import { - JsonSchemaDialectElement, - specificationObj as OpenApi3_1Specification, - SchemaVisitorOptions, - SchemaVisitor as SchemaVisitorType, -} from '@swagger-api/apidom-ns-openapi-3-1'; - -import JSONSchemaElement from '../../../../elements/JSONSchema.ts'; -import { SpecPath } from '../../generics/FixedFieldsVisitor.ts'; - -/** - * @public - */ -export const SchemaVisitor: typeof SchemaVisitorType = - OpenApi3_1Specification.visitors.document.objects.Schema.$visitor; - -/** - * @public - */ -export type JSONSchemaVisitorOptions = SchemaVisitorOptions; - -/** - * @public - */ -class JSONSchemaVisitor extends SchemaVisitor { - declare public readonly element: JSONSchemaElement; - - declare protected readonly specPath: SpecPath<['document', 'objects', 'JSONSchema']>; - - declare protected readonly canSupportSpecificationExtensions: false; - - declare protected readonly jsonSchemaDefaultDialect: JsonSchemaDialectElement; - - constructor(options: JSONSchemaVisitorOptions) { - super(options); - this.element = new JSONSchemaElement(); - this.specPath = always(['document', 'objects', 'JSONSchema']); - this.canSupportSpecificationExtensions = false; - this.jsonSchemaDefaultDialect = new JsonSchemaDialectElement( - 'https://json-schema.org/draft/2020-12/schema', - ); - } -} - -export default JSONSchemaVisitor; diff --git a/packages/apidom-ns-workflows-1/src/traversal/visitor.ts b/packages/apidom-ns-workflows-1/src/traversal/visitor.ts index 5e10e08ff9..02ade48cff 100644 --- a/packages/apidom-ns-workflows-1/src/traversal/visitor.ts +++ b/packages/apidom-ns-workflows-1/src/traversal/visitor.ts @@ -27,6 +27,6 @@ export const keyMap = { ComponentsElement: ['content'], CriterionElement: ['content'], ReferenceElement: ['content'], - JSONSchemaDraft202012Element: ['content'], + JSONSchema202012Element: ['content'], ...keyMapBase, }; diff --git a/packages/apidom-ns-workflows-1/test/refractor/elements/Components/__snapshots__/index.mjs.snap b/packages/apidom-ns-workflows-1/test/refractor/elements/Components/__snapshots__/index.mjs.snap index 309ac7c4d6..480123a387 100644 --- a/packages/apidom-ns-workflows-1/test/refractor/elements/Components/__snapshots__/index.mjs.snap +++ b/packages/apidom-ns-workflows-1/test/refractor/elements/Components/__snapshots__/index.mjs.snap @@ -7,7 +7,7 @@ exports[`refractor elements ComponentsElement should refract to semantic ApiDOM (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))) + (JSONSchema202012Element)))) (MemberElement (StringElement) (ObjectElement diff --git a/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/__snapshots__/index.mjs.snap b/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/__snapshots__/index.mjs.snap index 73ef440d5c..7704f76790 100644 --- a/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/__snapshots__/index.mjs.snap +++ b/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/__snapshots__/index.mjs.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`refractor elements JSONSchemaElement given Boolean JSON Schemas should refract to semantic ApiDOM tree 1`] = ` -(JSONSchemaDraft202012Element +(JSONSchema202012Element (MemberElement (StringElement) (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (BooleanElement)))))) @@ -21,49 +21,49 @@ exports[`refractor elements JSONSchemaElement given Boolean JSON Schemas should (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (BooleanElement))))))) `; exports[`refractor elements JSONSchemaElement given embedded JSONSchemaElements should refract to semantic ApiDOM tree 1`] = ` -(JSONSchemaDraft202012Element +(JSONSchema202012Element (MemberElement (StringElement) (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))))) + (JSONSchema202012Element)))))) (MemberElement (StringElement) (ArrayElement - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) - (JSONSchemaDraft202012Element))))) + (JSONSchema202012Element))))) (MemberElement (StringElement) (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))))) + (JSONSchema202012Element)))))) (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) - (JSONSchemaDraft202012Element))))) + (JSONSchema202012Element))))) `; exports[`refractor elements JSONSchemaElement should refract to semantic ApiDOM tree 1`] = ` -(JSONSchemaDraft202012Element +(JSONSchema202012Element (MemberElement (StringElement) (StringElement)) @@ -93,74 +93,74 @@ exports[`refractor elements JSONSchemaElement should refract to semantic ApiDOM (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))) + (JSONSchema202012Element)))) (MemberElement (StringElement) (StringElement)) (MemberElement (StringElement) (ArrayElement - (JSONSchemaDraft202012Element))) + (JSONSchema202012Element))) (MemberElement (StringElement) (ArrayElement - (JSONSchemaDraft202012Element))) + (JSONSchema202012Element))) (MemberElement (StringElement) (ArrayElement - (JSONSchemaDraft202012Element))) + (JSONSchema202012Element))) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))) + (JSONSchema202012Element)))) (MemberElement (StringElement) (ArrayElement - (JSONSchemaDraft202012Element))) + (JSONSchema202012Element))) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))) + (JSONSchema202012Element)))) (MemberElement (StringElement) (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element)))) + (JSONSchema202012Element)))) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) (StringElement)) @@ -262,5 +262,5 @@ exports[`refractor elements JSONSchemaElement should refract to semantic ApiDOM (StringElement)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element))) + (JSONSchema202012Element))) `; diff --git a/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$id.ts b/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$id.ts index d20d51b395..cddde6326f 100644 --- a/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$id.ts +++ b/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$id.ts @@ -10,7 +10,7 @@ describe('refractor', function () { context('given JSONSchema Object without $id keyword', function () { specify('should have empty inherited$id', function () { const jsonSchemaElement = JSONSchemaElement.refract({}); - const actual = toValue(jsonSchemaElement.meta.get('inherited$id')); + const actual = toValue(jsonSchemaElement.meta.get('ancestorsSchemaIdentifiers')); assert.deepEqual(actual, []); }); @@ -28,7 +28,7 @@ describe('refractor', function () { }, }, }); - const actual = toValue(jsonSchemaElement.meta.get('inherited$id')); + const actual = toValue(jsonSchemaElement.meta.get('ancestorsSchemaIdentifiers')); assert.deepEqual(actual, ['./nested/']); }); @@ -61,7 +61,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$anchor) && e.$anchor.equals('1'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement.meta.get('inherited$id')); + const actual = toValue(foundJsonSchemaElement.meta.get('ancestorsSchemaIdentifiers')); assert.deepEqual(actual, []); }); @@ -71,7 +71,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$anchor) && e.$anchor.equals('2'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement.meta.get('inherited$id')); + const actual = toValue(foundJsonSchemaElement.meta.get('ancestorsSchemaIdentifiers')); assert.deepEqual(actual, ['$id1']); }); @@ -81,7 +81,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$anchor) && e.$anchor.equals('3'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement.meta.get('inherited$id')); + const actual = toValue(foundJsonSchemaElement.meta.get('ancestorsSchemaIdentifiers')); assert.deepEqual(actual, ['$id1', '$id2']); }); @@ -93,7 +93,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$anchor) && e.$anchor.equals('4'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement.meta.get('inherited$id')); + const actual = toValue(foundJsonSchemaElement.meta.get('ancestorsSchemaIdentifiers')); assert.deepEqual(actual, []); }, diff --git a/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$schema.ts b/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$schema.ts index ddba48da6d..834e2a539a 100644 --- a/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$schema.ts +++ b/packages/apidom-ns-workflows-1/test/refractor/elements/JSONSchema/embedded-resources-$schema.ts @@ -14,7 +14,7 @@ describe('refractor', function () { type: 'object', not: {}, }) as JSONSchemaElement; - const actual = toValue(jsonSchemaElement.not?.meta.get('inherited$schema')); + const actual = toValue(jsonSchemaElement.not?.meta.get('inheritedDialectIdentifier')); const expected = toValue('https://json-schema.org/draft/2020-12/schema'); assert.strictEqual(actual, expected); @@ -29,7 +29,7 @@ describe('refractor', function () { $id: '1', type: 'object', }) as JSONSchemaElement; - const actual = toValue(jsonSchemaElement.meta.get('inherited$schema')); + const actual = toValue(jsonSchemaElement.meta.get('inheritedDialectIdentifier')); const expected = 'https://json-schema.org/draft/2020-12/schema'; assert.strictEqual(actual, expected); @@ -64,7 +64,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$id) && e.$id.equals('1'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement.meta.get('inherited$schema')); + const actual = toValue(foundJsonSchemaElement.meta.get('inheritedDialectIdentifier')); const expected = 'https://json-schema.org/draft/2020-12/schema'; assert.strictEqual(actual, expected); @@ -79,7 +79,7 @@ describe('refractor', function () { const expected = '$schema1'; assert.strictEqual(actual, expected); - assert.isFalse(foundJsonSchemaElement?.meta.hasKey('inherited$schema')); + assert.isFalse(foundJsonSchemaElement?.meta.hasKey('inheritedDialectIdentifier')); }); specify('should annotate Schema Object($id=3) with appropriate dialect', function () { @@ -87,7 +87,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$id) && e.$id.equals('3'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement?.meta.get('inherited$schema')); + const actual = toValue(foundJsonSchemaElement?.meta.get('inheritedDialectIdentifier')); const expected = '$schema1'; assert.strictEqual(actual, expected); @@ -98,7 +98,7 @@ describe('refractor', function () { (e) => isJSONSchemaElement(e) && isElement(e.$id) && e.$id.equals('4'), jsonSchemaElement, ); - const actual = toValue(foundJsonSchemaElement?.meta.get('inherited$schema')); + const actual = toValue(foundJsonSchemaElement?.meta.get('inheritedDialectIdentifier')); const expected = 'https://json-schema.org/draft/2020-12/schema'; assert.strictEqual(actual, expected); diff --git a/packages/apidom-ns-workflows-1/test/refractor/elements/Workflow/__snapshots__/index.mjs.snap b/packages/apidom-ns-workflows-1/test/refractor/elements/Workflow/__snapshots__/index.mjs.snap index fa2e5c713e..d17367bf39 100644 --- a/packages/apidom-ns-workflows-1/test/refractor/elements/Workflow/__snapshots__/index.mjs.snap +++ b/packages/apidom-ns-workflows-1/test/refractor/elements/Workflow/__snapshots__/index.mjs.snap @@ -13,7 +13,7 @@ exports[`refractor elements WorkflowElement should refract to semantic ApiDOM tr (StringElement)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element)) + (JSONSchema202012Element)) (MemberElement (StringElement) (ArrayElement diff --git a/packages/apidom-parser-adapter-workflows-json-1/test/__snapshots__/adapter.mjs.snap b/packages/apidom-parser-adapter-workflows-json-1/test/__snapshots__/adapter.mjs.snap index b6504d527b..0a268bc6a0 100644 --- a/packages/apidom-parser-adapter-workflows-json-1/test/__snapshots__/adapter.mjs.snap +++ b/packages/apidom-parser-adapter-workflows-json-1/test/__snapshots__/adapter.mjs.snap @@ -49,7 +49,7 @@ exports[`adapter should parse 1`] = ` (StringElement)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (StringElement)) @@ -58,13 +58,13 @@ exports[`adapter should parse 1`] = ` (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (StringElement)))) (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (StringElement)))))))) diff --git a/packages/apidom-parser-adapter-workflows-yaml-1/test/__snapshots__/adapter.mjs.snap b/packages/apidom-parser-adapter-workflows-yaml-1/test/__snapshots__/adapter.mjs.snap index b6504d527b..0a268bc6a0 100644 --- a/packages/apidom-parser-adapter-workflows-yaml-1/test/__snapshots__/adapter.mjs.snap +++ b/packages/apidom-parser-adapter-workflows-yaml-1/test/__snapshots__/adapter.mjs.snap @@ -49,7 +49,7 @@ exports[`adapter should parse 1`] = ` (StringElement)) (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (StringElement)) @@ -58,13 +58,13 @@ exports[`adapter should parse 1`] = ` (ObjectElement (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (StringElement)))) (MemberElement (StringElement) - (JSONSchemaDraft202012Element + (JSONSchema202012Element (MemberElement (StringElement) (StringElement))))))))