@speclynx/apidom-parser-adapter-yaml-1-2 6.1.0 → 6.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-parser-adapter-yaml-1-2",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Parser adapter for parsing YAML documents into base namespace.",
   "keywords": [
     "apidom",
@@ -58,10 +58,10 @@
   "author": "Vladimir Gorej",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^8.0.5",
-    "@speclynx/apidom-core": "6.1.0",
-    "@speclynx/apidom-datamodel": "6.1.0",
-    "@speclynx/apidom-error": "6.1.0",
+    "@babel/runtime-corejs3": "^8.0.8",
+    "@speclynx/apidom-core": "6.1.2",
+    "@speclynx/apidom-datamodel": "6.1.2",
+    "@speclynx/apidom-error": "6.1.2",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.1.0",
     "web-tree-sitter": "=0.27.1",
@@ -80,5 +80,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "575dbf59cb58a6c57248bf2c027a5cbc99442a63"
+  "gitHead": "e3ba735e1c56369bb263dd8246c711d405ed9606"
 }

package/src/tree-sitter/syntactic-analysis/YamlAstTransformer.cjs

@@ -430,9 +430,19 @@ const transformKeyValuePair = (node, ctx) => {
   }
 
   // Transform key and value (these are dynamically defined properties)
-  const keyResult = transform(key, ctx);
+  let keyResult = transform(key, ctx);
   const valueResult = transform(value, ctx);
 
+  // an empty key is a null in YAML, but a JavaScript property name can't be null, so it's the empty
+  // string it's named by, marked as an empty key
+  if ((0, _apidomDatamodel.isNullElement)(keyResult) && (0, _apidomDatamodel.includesClasses)(keyResult, ['yaml-e-node'])) {
+    const emptyKey = new _apidomDatamodel.StringElement('', keyResult.meta, keyResult.attributes);
+    emptyKey.classes.push('yaml-e-key');
+    _apidomDatamodel.SourceMapElement.transfer(keyResult, emptyKey);
+    _apidomDatamodel.StyleElement.transfer(keyResult, emptyKey);
+    keyResult = emptyKey;
+  }
+
   // @ts-ignore
   element.content.key = keyResult;
   // @ts-ignore
@@ -459,12 +469,11 @@ const transformSequence = (node, ctx) => {
 
 // Scalar: Converts to Element via namespace
 const transformScalar = (node, ctx) => {
-  const element = ctx.namespace.toElement(node.content);
-
-  // Translate style information about empty nodes; an empty node (YAML 1.2 §7.2) is a null unless
-  // a tag other than the null tag makes it something else (e.g. !!str makes it an empty string)
+  // an empty node (YAML 1.2 §7.2) is a null unless a tag other than the null tag makes it
+  // something else (e.g. !!str makes it an empty string); its classes tell it from an explicit null
   const tag = node.tag?.explicitName;
   const isEmptyNode = node.content === '' && node.style === _YamlStyle.YamlStyle.Plain && [undefined, '?', '!!null', '!<tag:yaml.org,2002:null>'].includes(tag);
+  const element = isEmptyNode ? new _apidomDatamodel.NullElement() : ctx.namespace.toElement(node.content);
   if (isEmptyNode) {
     element.classes.push('yaml-e-node');
     element.classes.push('yaml-e-scalar');

package/src/tree-sitter/syntactic-analysis/YamlAstTransformer.mjs

@@ -1,4 +1,4 @@
-import { ParseResultElement, AnnotationElement, CommentElement, MemberElement, ObjectElement, ArrayElement, isPrimitiveElement, Namespace, SourceMapElement } from '@speclynx/apidom-datamodel';
+import { ParseResultElement, AnnotationElement, CommentElement, MemberElement, ObjectElement, ArrayElement, StringElement, NullElement, isPrimitiveElement, isNullElement, includesClasses, Namespace, SourceMapElement, StyleElement } from '@speclynx/apidom-datamodel';
 import { isComment, isDocument } from "./ast/nodes/predicates.mjs";
 import { YamlStyle, YamlStyleGroup } from "./ast/nodes/YamlStyle.mjs"; // Transform context passed through transformation
 // Node with type property and flat position properties
@@ -421,9 +421,19 @@ const transformKeyValuePair = (node, ctx) => {
   }
 
   // Transform key and value (these are dynamically defined properties)
-  const keyResult = transform(key, ctx);
+  let keyResult = transform(key, ctx);
   const valueResult = transform(value, ctx);
 
+  // an empty key is a null in YAML, but a JavaScript property name can't be null, so it's the empty
+  // string it's named by, marked as an empty key
+  if (isNullElement(keyResult) && includesClasses(keyResult, ['yaml-e-node'])) {
+    const emptyKey = new StringElement('', keyResult.meta, keyResult.attributes);
+    emptyKey.classes.push('yaml-e-key');
+    SourceMapElement.transfer(keyResult, emptyKey);
+    StyleElement.transfer(keyResult, emptyKey);
+    keyResult = emptyKey;
+  }
+
   // @ts-ignore
   element.content.key = keyResult;
   // @ts-ignore
@@ -450,12 +460,11 @@ const transformSequence = (node, ctx) => {
 
 // Scalar: Converts to Element via namespace
 const transformScalar = (node, ctx) => {
-  const element = ctx.namespace.toElement(node.content);
-
-  // Translate style information about empty nodes; an empty node (YAML 1.2 §7.2) is a null unless
-  // a tag other than the null tag makes it something else (e.g. !!str makes it an empty string)
+  // an empty node (YAML 1.2 §7.2) is a null unless a tag other than the null tag makes it
+  // something else (e.g. !!str makes it an empty string); its classes tell it from an explicit null
   const tag = node.tag?.explicitName;
   const isEmptyNode = node.content === '' && node.style === YamlStyle.Plain && [undefined, '?', '!!null', '!<tag:yaml.org,2002:null>'].includes(tag);
+  const element = isEmptyNode ? new NullElement() : ctx.namespace.toElement(node.content);
   if (isEmptyNode) {
     element.classes.push('yaml-e-node');
     element.classes.push('yaml-e-scalar');