links-notation 0.21.0 → 0.21.1

package/dist/index.js

@@ -2355,12 +2355,7 @@ class Parser {
       return;
     if (item.children && item.children.length > 0) {
       if (item.id !== undefined && item.id !== null && (!item.values || item.values.length === 0)) {
-        const childValues = item.children.map((child) => {
-          if (child.values && child.values.length === 1) {
-            return this.transformLink(child.values[0]);
-          }
-          return this.transformLink(child);
-        });
+        const childValues = item.children.map((child) => this.transformIndentedValue(child));
         const linkWithChildren = {
           id: item.id,
           values: childValues
@@ -2392,6 +2387,23 @@ class Parser {
       }
     }
   }
+  transformIndentedValue(item) {
+    const children = item.children || [];
+    if (children.length && item.id != null && !item.values?.length) {
+      return new Link(item.id, children.map((child) => this.transformIndentedValue(child)));
+    }
+    const current = this.transformLink(item);
+    if (children.length) {
+      return new Link(current.id, [
+        ...current.values,
+        ...children.map((child) => this.transformIndentedValue(child))
+      ]);
+    }
+    if (item.id == null && item.nested === undefined && current.values.length === 1) {
+      return current.values[0];
+    }
+    return current;
+  }
   combinePathElements(pathElements, current) {
     if (pathElements.length === 0)
       return current;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "links-notation",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Links Notation parser for JavaScript",
   "main": "dist/index.js",
   "types": "index.d.ts",

package/src/Parser.js

@@ -80,13 +80,9 @@ export class Parser {
         item.id !== null &&
         (!item.values || item.values.length === 0)
       ) {
-        const childValues = item.children.map((child) => {
-          // For indented children, extract the actual reference from the child's values
-          if (child.values && child.values.length === 1) {
-            return this.transformLink(child.values[0]);
-          }
-          return this.transformLink(child);
-        });
+        const childValues = item.children.map((child) =>
+          this.transformIndentedValue(child)
+        );
         const linkWithChildren = {
           id: item.id,
           values: childValues,
@@ -128,6 +124,34 @@ export class Parser {
     }
   }
 
+  // A line below an indented ID is a value in its own right. Bare single
+  // references unwrap, but named links and descendants keep their structure.
+  transformIndentedValue(item) {
+    const children = item.children || [];
+    if (children.length && item.id != null && !item.values?.length) {
+      return new Link(
+        item.id,
+        children.map((child) => this.transformIndentedValue(child))
+      );
+    }
+
+    const current = this.transformLink(item);
+    if (children.length) {
+      return new Link(current.id, [
+        ...current.values,
+        ...children.map((child) => this.transformIndentedValue(child)),
+      ]);
+    }
+    if (
+      item.id == null &&
+      item.nested === undefined &&
+      current.values.length === 1
+    ) {
+      return current.values[0];
+    }
+    return current;
+  }
+
   combinePathElements(pathElements, current) {
     if (pathElements.length === 0) return current;
     if (pathElements.length === 1) {

package/tests/IndentedIdNestedValues.test.js

@@ -0,0 +1,38 @@
+import { test, expect } from 'bun:test';
+import { Parser } from '../src/Parser.js';
+import { formatLinks } from '../src/Link.js';
+
+const cases = [
+  [
+    'outer:\n  inner:\n    value1\n    value2\n  value3',
+    '(outer: (inner: value1 value2) value3)',
+  ],
+  [
+    'statement:\n  subject:\n    I\n  verb:\n    love\n  object:\n    you:\n      very\n      much',
+    '(statement: (subject: I) (verb: love) (object: (you: very much)))',
+  ],
+  [
+    'document:\n  (metadata: title author date)\n  content:\n    paragraph1\n    (paragraph2: text (with: nested structure))\n    paragraph3',
+    '(document: (metadata: title author date) (content: paragraph1 (paragraph2: text (with: nested structure)) paragraph3))',
+  ],
+  [
+    'image:\n    file: .gitpod.Dockerfile\n    context: ./docker-content',
+    '(image: (file: .gitpod.Dockerfile) (context: ./docker-content))',
+  ],
+  [
+    'level1:\n  level2:\n    level3a\n    level3b\n  level2b',
+    '(level1: (level2: level3a level3b) level2b)',
+  ],
+  [
+    'root:\n  child1\n  child2\n    grandchild',
+    '(root: child1 (child2 grandchild))',
+  ],
+];
+
+test('indented ID retains nested values', () => {
+  for (const [source, expected] of cases) {
+    const parser = new Parser();
+    expect(formatLinks(parser.parse(source))).toBe(expected);
+    expect(parser.parse(source)).toEqual(parser.parse(expected));
+  }
+});

package/tests/IndentedIdSyntax.test.js

@@ -123,7 +123,6 @@ test('Indented ID with deeper nesting', () => {
   child2
     grandchild`;
 
-  // This should work but the grandchild will be processed as a separate nested structure
   const result = parser.parse(input);
   expect(result.length).toBeGreaterThan(0);
 
@@ -131,6 +130,7 @@ test('Indented ID with deeper nesting', () => {
   const rootLink = result[0];
   expect(rootLink.id).toBe('root');
   expect(rootLink.values.length).toBe(2);
+  expect(formatLinks(result)).toBe('(root: child1 (child2 grandchild))');
 });
 
 test('Empty indented ID should work', () => {