fix(parser-adapter-yaml-1-2): fix canonical formatting of quoted scal…

…ars (#3792) Refs #3788
swagger-api · Feb 6, 2024 · 3d9ff9f · 3d9ff9f
1 parent 8c3c20d
commit 3d9ff9f
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 20 deletions.
diff --git a/packages/apidom-ast/src/yaml/schemas/canonical-format.ts b/packages/apidom-ast/src/yaml/schemas/canonical-format.ts
@@ -128,11 +128,11 @@ export const formatFlowPlain = pipe(
 export const formatFlowSingleQuoted = pipe(
   normalizeLineBreaks,
   trim,
-  removeQuotes("'"),
   collapseLineBreakToSpace,
   split('\n'),
   map(trimStart),
   join('\n'),
+  removeQuotes("'"),
 );
 
 /**
@@ -142,13 +142,13 @@ export const formatFlowSingleQuoted = pipe(
 export const formatFlowDoubleQuoted = pipe(
   normalizeLineBreaks,
   trim,
-  removeQuotes('"'),
   preventLineBreakCollapseToSpace,
   collapseLineBreakToSpace,
   unraw,
   split('\n'),
   map(trimStart),
   join('\n'),
+  removeQuotes('"'),
 );
 
 /**

diff --git a/...ns-openapi-3-1/test/refractor/plugins/normalize-operation-ids/__snapshots__/index.ts.snap b/...ns-openapi-3-1/test/refractor/plugins/normalize-operation-ids/__snapshots__/index.ts.snap
@@ -531,7 +531,7 @@ exports[`refractor plugins normalize-operation-ids given Operation Object with o
                             },
                             "originalOperationId": {
                               "element": "string",
-                              "content": ""
+                              "content": "   "
                             }
                           },
                           "content": [
@@ -568,7 +568,7 @@ exports[`refractor plugins normalize-operation-ids given Operation Object with o
                                 },
                                 "value": {
                                   "element": "string",
-                                  "content": ""
+                                  "content": "   "
                                 }
                               }
                             }

diff --git a/packages/apidom-parser-adapter-yaml-1-2/test/adapter-browser.ts b/packages/apidom-parser-adapter-yaml-1-2/test/adapter-browser.ts
@@ -1,7 +1,13 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { assert, expect } from 'chai';
-import { toValue, isObjectElement, isParseResultElement, sexprs } from '@swagger-api/apidom-core';
+import {
+  toValue,
+  isObjectElement,
+  isParseResultElement,
+  sexprs,
+  isStringElement,
+} from '@swagger-api/apidom-core';
 
 import * as adapter from '../src/adapter-browser';
 
@@ -126,4 +132,25 @@ describe('adapter-browser', function () {
       assert.strictEqual(toValue(parseResult.errors.get(0)), '(Error YAML syntax error)');
     });
   });
+
+  context('given an alias', function () {
+    specify('should analyze alias as string', async function () {
+      const result = await adapter.parse('*alias');
+      assert.isTrue(isStringElement(result.result));
+    });
+  });
+
+  context('given single-quote scalar containing only space characters', function () {
+    specify('should parse all space characters', async function () {
+      const result = await adapter.parse("' '");
+      assert.strictEqual(result.toValue()[0], ' ');
+    });
+  });
+
+  context('given double-quote scalar containing only space characters', function () {
+    specify('should parse all space characters', async function () {
+      const result = await adapter.parse('" "');
+      assert.strictEqual(result.toValue()[0], ' ');
+    });
+  });
 });
diff --git a/packages/apidom-parser-adapter-yaml-1-2/test/adapter-node/index.ts b/packages/apidom-parser-adapter-yaml-1-2/test/adapter-node/index.ts
@@ -2,7 +2,13 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { assert, expect } from 'chai';
 import { YamlTagError } from '@swagger-api/apidom-ast';
-import { toValue, isObjectElement, isParseResultElement, sexprs } from '@swagger-api/apidom-core';
+import {
+  toValue,
+  isObjectElement,
+  isParseResultElement,
+  sexprs,
+  isStringElement,
+} from '@swagger-api/apidom-core';
 
 import * as adapter from '../../src/adapter-node';
 
@@ -155,4 +161,25 @@ describe('adapter-node', function () {
       }
     });
   });
+
+  context('given an alias', function () {
+    specify('should analyze alias as string', async function () {
+      const result = await adapter.parse('*alias');
+      assert.isTrue(isStringElement(result.result));
+    });
+  });
+
+  context('given single-quote scalar containing only space characters', function () {
+    specify('should parse all space characters', async function () {
+      const result = await adapter.parse("' '");
+      assert.strictEqual(result.toValue()[0], ' ');
+    });
+  });
+
+  context('given double-quote scalar containing only space characters', function () {
+    specify('should parse all space characters', async function () {
+      const result = await adapter.parse('" "');
+      assert.strictEqual(result.toValue()[0], ' ');
+    });
+  });
 });
diff --git a/...es/apidom-parser-adapter-yaml-1-2/test/syntactic-analysis/indirect/visitors/CstVisitor.ts b/...es/apidom-parser-adapter-yaml-1-2/test/syntactic-analysis/indirect/visitors/CstVisitor.ts