Merge branch 'master' into node_fetch

README.md

@@ -3,6 +3,7 @@
 This is a Monorepo managed using [Turborepo](https://turbo.build/) and contains the following package:
 
 1. [Parser-js](packages/parser): Use this package to validate and parse AsyncAPI documents —either YAML or JSON— in your Node.js or browser application.
+2. [Multi-Parser](packages/multi-parser): This tool allows the parsing of AsyncAPI documents producing a desired interface based on a given Parser-API version. Useful if your tool needs to support several AsyncAPI Spec versions.
 
 Validation is powered by [Spectral](https://github.com/stoplightio/spectral).  
 Updated bundle for the browser is always attached to the GitHub Release.

packages/parser/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @asyncapi/parser
 
+## 3.2.2
+
+### Patch Changes
+
+- b700a65: fix: remove forceful normalization of YAML to JSON
+
 ## 3.2.1
 
 ### Patch Changes

packages/parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/parser",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "JavaScript AsyncAPI parser.",
   "private": false,
   "bugs": {

packages/parser/src/parse.ts

@@ -38,24 +38,21 @@ const defaultOptions: ParseOptions = {
   validateOptions: {},
   __unstable: {},
 };
-import yaml from 'js-yaml';
+
 export async function parse(parser: Parser, spectral: Spectral, asyncapi: Input, options: ParseOptions = {}): Promise<ParseOutput> {
   let spectralDocument: Document | undefined;
 
   try {
     options = mergePatch<ParseOptions>(defaultOptions, options);
-    // Normalize input to always be JSON 
-    let loadedObj;
-    if (typeof asyncapi === 'string') {
-      try {
-        loadedObj = yaml.load(asyncapi);
-      } catch (e) {
-        loadedObj = JSON.parse(asyncapi);
-      }
-    } else {
-      loadedObj = asyncapi;
-    }
-    const { validated, diagnostics, extras } = await validate(parser, spectral, loadedObj, { ...options.validateOptions, source: options.source, __unstable: options.__unstable });
+
+    // `./src/validate.ts` enforces 'string' type on both YAML and JSON later in
+    // code, and parses them both using the same `@stoplight/yaml`, so forceful
+    // normalization of YAML to JSON here has no practical application. It only
+    // causes `range` to be reported incorrectly in `diagnostics` by misleading
+    // `Parser` into thinking it's dealing with JSON instead of YAML, creating
+    // the bug described in https://github.com/asyncapi/parser-js/issues/936
+
+    const { validated, diagnostics, extras } = await validate(parser, spectral, asyncapi, { ...options.validateOptions, source: options.source, __unstable: options.__unstable });
     if (validated === undefined) {
       return {
         document: undefined,
@@ -72,7 +69,7 @@ export async function parse(parser: Parser, spectral: Spectral, asyncapi: Input,
 
     // Apply unique ids which are used as part of iterating between channels <-> operations <-> messages
     applyUniqueIds(validatedDoc);
-    const detailed = createDetailedAsyncAPI(validatedDoc, loadedObj as DetailedAsyncAPI['input'], options.source);
+    const detailed = createDetailedAsyncAPI(validatedDoc, asyncapi as DetailedAsyncAPI['input'], options.source);
     const document = createAsyncAPIDocument(detailed);
     setExtension(xParserSpecParsed, true, document);
     setExtension(xParserApiVersion, ParserAPIVersion, document);