From a3a41949a0b4c4d5a6a45e321fae66996fcd62ee Mon Sep 17 00:00:00 2001 From: Jonas Lagoni Date: Mon, 9 Oct 2023 10:37:12 +0200 Subject: [PATCH 1/2] fix: schema parsing for v3 (#864) --- src/custom-operations/anonymous-naming.ts | 9 +- src/custom-operations/index.ts | 19 +-- src/custom-operations/parse-schema.ts | 80 +++++++++++ src/models/v3/schema.ts | 2 +- src/spec-types/v3.ts | 6 +- src/utils.ts | 8 +- ...schema.spec.ts => parse-schema-v2.spec.ts} | 2 +- .../custom-operations/parse-schema-v3.spec.ts | 135 ++++++++++++++++++ 8 files changed, 243 insertions(+), 18 deletions(-) rename test/custom-operations/{parse-schema.spec.ts => parse-schema-v2.spec.ts} (98%) create mode 100644 test/custom-operations/parse-schema-v3.spec.ts diff --git a/src/custom-operations/anonymous-naming.ts b/src/custom-operations/anonymous-naming.ts index d29b9e917..88522f3bd 100644 --- a/src/custom-operations/anonymous-naming.ts +++ b/src/custom-operations/anonymous-naming.ts @@ -1,6 +1,6 @@ import { xParserMessageName, xParserSchemaId } from '../constants'; import { traverseAsyncApiDocument } from '../iterator'; -import { setExtension } from '../utils'; +import { setExtension, setExtensionOnJson } from '../utils'; import type { AsyncAPIDocumentInterface, @@ -59,12 +59,15 @@ function assignUidToComponentSchemas(document: AsyncAPIDocumentInterface) { setExtension(xParserSchemaId, schema.id(), schema); }); } - + function assignUidToAnonymousSchemas(doc: AsyncAPIDocumentInterface) { let anonymousSchemaCounter = 0; function callback(schema: SchemaInterface) { + const json = schema.json() as any; + const isMultiFormatSchema = json.schema !== undefined; + const underlyingSchema = isMultiFormatSchema ? json.schema : json; if (!schema.id()) { - setExtension(xParserSchemaId, ``, schema); + setExtensionOnJson(xParserSchemaId, ``, underlyingSchema); } } traverseAsyncApiDocument(doc, callback); diff --git a/src/custom-operations/index.ts b/src/custom-operations/index.ts index e360848b9..28754663a 100644 --- a/src/custom-operations/index.ts +++ b/src/custom-operations/index.ts @@ -1,8 +1,7 @@ import { applyTraitsV2, applyTraitsV3 } from './apply-traits'; -import { checkCircularRefs } from './check-circular-refs'; -import { parseSchemasV2 } from './parse-schema'; -import { anonymousNaming } from './anonymous-naming'; import { resolveCircularRefs } from './resolve-circular-refs'; +import { parseSchemasV2, parseSchemasV3 } from './parse-schema'; +import { anonymousNaming } from './anonymous-naming'; import type { RulesetFunctionContext } from '@stoplight/spectral-core'; import type { Parser } from '../parser'; @@ -10,6 +9,7 @@ import type { ParseOptions } from '../parse'; import type { AsyncAPIDocumentInterface } from '../models'; import type { DetailedAsyncAPI } from '../types'; import type { v2, v3 } from '../spec-types'; +import { checkCircularRefs } from './check-circular-refs'; export async function customOperations(parser: Parser, document: AsyncAPIDocumentInterface, detailed: DetailedAsyncAPI, inventory: RulesetFunctionContext['documentInventory'], options: ParseOptions): Promise { switch (detailed.semver.major) { @@ -28,7 +28,7 @@ async function operationsV2(parser: Parser, document: AsyncAPIDocumentInterface, await parseSchemasV2(parser, detailed); } - // anonymous naming and resolving circular refrences should be done after custom schemas parsing + // anonymous naming and resolving circular references should be done after custom schemas parsing if (inventory) { resolveCircularRefs(document, inventory); } @@ -41,9 +41,12 @@ async function operationsV3(parser: Parser, document: AsyncAPIDocumentInterface, if (options.applyTraits) { applyTraitsV3(detailed.parsed as v3.AsyncAPIObject); } - // TODO: Support schema parsing in v3 - // if (options.parseSchemas) { - // await parseSchemasV2(parser, detailed); - // } + if (options.parseSchemas) { + await parseSchemasV3(parser, detailed); + } + // anonymous naming and resolving circular references should be done after custom schemas parsing + if (inventory) { + resolveCircularRefs(document, inventory); + } anonymousNaming(document); } diff --git a/src/custom-operations/parse-schema.ts b/src/custom-operations/parse-schema.ts index 6221af6cf..d33c017b4 100644 --- a/src/custom-operations/parse-schema.ts +++ b/src/custom-operations/parse-schema.ts @@ -22,6 +22,24 @@ const customSchemasPathsV2 = [ '$.components.messages.*', ]; +const customSchemasPathsV3 = [ + // channels + '$.channels.*.messages.*.payload', + '$.channels.*.messages.*.headers', + '$.components.channels.*.messages.*.payload', + '$.components.channels.*.messages.*.headers', + // operations + '$.operations.*.messages.*.payload', + '$.operations.*.messages.*.headers', + '$.components.operations.*.messages.*.payload', + '$.components.operations.*.messages.*.headers', + // messages + '$.components.messages.*.payload', + '$.components.messages.*.headers.*', + // schemas + '$.components.schemas.*', +]; + export async function parseSchemasV2(parser: Parser, detailed: DetailedAsyncAPI) { const defaultSchemaFormat = getDefaultSchemaFormat(detailed.semver.version); const parseItems: Array = []; @@ -65,6 +83,68 @@ export async function parseSchemasV2(parser: Parser, detailed: DetailedAsyncAPI) return Promise.all(parseItems.map(item => parseSchemaV2(parser, item))); } +export async function parseSchemasV3(parser: Parser, detailed: DetailedAsyncAPI) { + const defaultSchemaFormat = getDefaultSchemaFormat(detailed.semver.version); + const parseItems: Array = []; + + const visited: Set = new Set(); + customSchemasPathsV3.forEach(path => { + JSONPath({ + path, + json: detailed.parsed, + resultType: 'all', + callback(result) { + const value = result.value; + if (visited.has(value)) { + return; + } + visited.add(value); + + const schema = value.schema; + if (!schema) { + return; + } + + let schemaFormat = value.schemaFormat; + if (!schemaFormat) { + return; + } + schemaFormat = getSchemaFormat(value.schemaFormat, detailed.semver.version); + + parseItems.push({ + input: { + asyncapi: detailed, + data: schema, + meta: { + message: value, + }, + path: [...splitPath(result.path), 'schema'], + schemaFormat, + defaultSchemaFormat, + }, + value, + }); + }, + }); + }); + + return Promise.all(parseItems.map(item => parseSchemaV3(parser, item))); +} + +async function parseSchemaV3(parser: Parser, item: ToParseItem) { + const originalData = item.input.data; + const parsedData = await parseSchema(parser, item.input); + if (item.value?.schema !== undefined) { + item.value.schema = parsedData; + } else { + item.value = parsedData; + } + // save original payload only when data is different (returned by custom parsers) + if (originalData !== parsedData) { + item.value[xParserOriginalPayload] = originalData; + } +} + async function parseSchemaV2(parser: Parser, item: ToParseItem) { const originalData = item.input.data; const parsedData = item.value.payload = await parseSchema(parser, item.input); diff --git a/src/models/v3/schema.ts b/src/models/v3/schema.ts index 763c91a45..40e3d533e 100644 --- a/src/models/v3/schema.ts +++ b/src/models/v3/schema.ts @@ -47,7 +47,7 @@ export class Schema extends BaseModel' }); + expect(((((document?.json() as any).operations?.operation as v3.OperationObject).channel as v3.ChannelObject)?.messages?.message as v3.MessageObject)?.payload?.schema).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + expect((((document?.json() as any).operations?.operation as v3.OperationObject).messages?.[0] as v3.MessageObject)?.payload?.schema).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + expect(((document?.json()?.components?.channels?.channel as v3.ChannelObject).messages?.message as v3.MessageObject)?.payload?.schema).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + expect((document?.json()?.components?.messages?.message as v3.MessageObject)?.payload?.schema).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + expect((((document?.json() as any).components?.messages?.message as v3.MessageObject)?.headers as v3.MultiFormatObject).schema).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + expect((document?.json() as any).components?.schemas?.schema?.schema).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + }); + + it('should parse valid default schema format', async function() { + const documentRaw = { + asyncapi: '3.0.0', + info: { + title: 'Valid AsyncApi document', + version: '1.0' + }, + channels: { + channel: { + address: 'channel', + messages: { + message: { + payload: { + type: 'object' + } + } + } + } + } + }; + const { document, diagnostics } = await parser.parse(documentRaw); + + expect(document).toBeInstanceOf(AsyncAPIDocumentV3); + expect(diagnostics.length === 0).toEqual(true); + + expect(((document?.json()?.channels?.channel as v3.ChannelObject).messages?.message as v3.MessageObject)?.payload).toEqual({ type: 'object', 'x-parser-schema-id': '' }); + }); + + it('should parse invalid schema format', async function() { + const documentRaw = { + asyncapi: '3.0.0', + info: { + title: 'Valid AsyncApi document', + version: '1.0' + }, + channels: { + channel: { + address: 'channel', + messages: { + message: { + payload: { + schemaFormat: 'not existing', + schema: { + type: 'object' + } + } + } + } + } + } + }; + const { document, diagnostics } = await parser.parse(documentRaw); + + expect(document).toBeUndefined(); + expect(diagnostics.length > 0).toEqual(true); + }); +}); From d3afd331fee89b088e35ec3639e23ddcef3570e2 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Mon, 9 Oct 2023 10:48:17 +0200 Subject: [PATCH 2/2] chore(release): v3.0.0-next-major-spec.4 (#869) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a022c41e9..5c26b8a28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@asyncapi/parser", - "version": "3.0.0-next-major-spec.3", + "version": "3.0.0-next-major-spec.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@asyncapi/parser", - "version": "3.0.0-next-major-spec.3", + "version": "3.0.0-next-major-spec.4", "license": "Apache-2.0", "dependencies": { "@asyncapi/specs": "^6.0.0-next-major-spec.6", diff --git a/package.json b/package.json index 21b43846c..293bea0eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@asyncapi/parser", - "version": "3.0.0-next-major-spec.3", + "version": "3.0.0-next-major-spec.4", "description": "JavaScript AsyncAPI parser.", "bugs": { "url": "https://github.com/asyncapi/parser-js/issues"