links-notation 0.9.0 → 0.11.2

package/examples/debug_indentation.js

@@ -0,0 +1,16 @@
+import { parse } from '../src/parser-generated.js';
+
+const withLeading = `  A: a
+  B: b`;
+
+console.log('Parsing with leading spaces:');
+console.log(withLeading);
+console.log('---');
+
+try {
+  const result = parse(withLeading);
+  console.log('Result:', JSON.stringify(result, null, 2));
+} catch (e) {
+  console.log('Error:', e.message);
+  console.log(e);
+}

package/examples/test_leading_spaces.js

@@ -0,0 +1,33 @@
+import { Parser } from '../src/Parser.js';
+
+const parser = new Parser();
+
+// Example with 2 leading spaces
+const withLeading = `  A: a
+  B: b`;
+
+// Example without leading spaces
+const withoutLeading = `A: a
+B: b`;
+
+console.log('=== With Leading Spaces ===');
+try {
+  const result = parser.parse(withLeading);
+  console.log(`Parsed ${result.length} links:`);
+  result.forEach((link, i) => {
+    console.log(`  Link ${i}: ${link.toString()}`);
+  });
+} catch (e) {
+  console.log('Error:', e.message);
+}
+
+console.log('\n=== Without Leading Spaces ===');
+try {
+  const result = parser.parse(withoutLeading);
+  console.log(`Parsed ${result.length} links:`);
+  result.forEach((link, i) => {
+    console.log(`  Link ${i}: ${link.toString()}`);
+  });
+} catch (e) {
+  console.log('Error:', e.message);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "links-notation",
-  "version": "0.9.0",
-  "description": "Lino protocol parser for JavaScript",
+  "version": "0.11.2",
+  "description": "Links Notation parser for JavaScript",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {

package/src/grammar.pegjs

@@ -1,31 +1,49 @@
 {
   let indentationStack = [0];
-  
+  let baseIndentation = null;
+
+  function setBaseIndentation(spaces) {
+    if (baseIndentation === null) {
+      baseIndentation = spaces.length;
+    }
+  }
+
+  function normalizeIndentation(spaces) {
+    if (baseIndentation === null) {
+      return spaces.length;
+    }
+    return Math.max(0, spaces.length - baseIndentation);
+  }
+
   function pushIndentation(spaces) {
-    indentationStack.push(spaces.length);
+    const normalized = normalizeIndentation(spaces);
+    indentationStack.push(normalized);
   }
-  
+
   function popIndentation() {
     if (indentationStack.length > 1) {
       indentationStack.pop();
     }
   }
-  
+
   function checkIndentation(spaces) {
-    return spaces.length >= indentationStack[indentationStack.length - 1];
+    const normalized = normalizeIndentation(spaces);
+    return normalized >= indentationStack[indentationStack.length - 1];
   }
-  
+
   function getCurrentIndentation() {
     return indentationStack[indentationStack.length - 1];
   }
 }
 
-document = _ links:links eof { return links; }
-  / _ eof { return []; }
+document = &{ indentationStack = [0]; baseIndentation = null; return true; } skipEmptyLines links:links _ eof { return links; }
+  / &{ indentationStack = [0]; baseIndentation = null; return true; } _ eof { return []; }
+
+skipEmptyLines = ([ \t]* [\r\n])*
 
 links = fl:firstLine list:line* { popIndentation(); return [fl].concat(list || []); }
 
-firstLine = l:element { return l; }
+firstLine = SET_BASE_INDENTATION l:element { return l; }
 
 line = CHECK_INDENTATION l:element { return l; }
 
@@ -69,7 +87,9 @@ doubleQuotedReference = '"' r:[^"]+ '"' { return r.join(''); }
 
 singleQuotedReference = "'" r:[^']+ "'" { return r.join(''); }
 
-PUSH_INDENTATION = spaces:" "* &{ return spaces.length > getCurrentIndentation(); } { pushIndentation(spaces); }
+SET_BASE_INDENTATION = spaces:" "* { setBaseIndentation(spaces); }
+
+PUSH_INDENTATION = spaces:" "* &{ return normalizeIndentation(spaces) > getCurrentIndentation(); } { pushIndentation(spaces); }
 
 CHECK_INDENTATION = spaces:" "* &{ return checkIndentation(spaces); }