Fix bug in kv parser

Author: StefanH-AT

packages/kv/src/parser-types.ts

@@ -389,9 +389,4 @@ export class Document {
         return this.errors.length > 0;
     }
 
-    public toStringPreservePositions(): string {
-        
-        return "";
-    }
-
 }

packages/kv/src/parser.test.ts

@@ -156,6 +156,35 @@ describe("Parse Successes", () => {
 
     });
 
+    test("Parse compile time report", () => {
+        const kvFile = 
+    `"report" 
+    {
+        "total_seconds"		"12"
+    }
+    `;
+        const kvTree = parser.parseText(kvFile);
+        expect(kvTree.getErrors().length).toBe(0);
+        expect(kvTree.getRootItems().length).toBe(1);
+
+        const root = kvTree.getRootItems()[0];
+        expect(root.isRoot()).toBeTruthy();
+        expect(root.isLeaf()).toBeFalsy();
+        expect(root.getKey().getContent()).toBe("\"report\"");
+
+        const children = root.getChildren()!;
+        expect(children).not.toBeNull();
+        expect(children.length).toBe(1);
+        const item1 = children[0];
+        expect(item1.isLeaf()).toBeTruthy();
+        expect(item1.isRoot()).toBeFalsy();
+        expect(item1.getKey().getContent()).toBe("\"total_seconds\"");
+        expect(item1.getValues()).not.toBeNull();
+        expect(item1.getValues()!.length).toBe(1);
+        expect(item1.getValues()![0].getContent()).toBe("\"12\"");
+    });
+    
+
     test("With Conditional", () => {
 
         const kvFile = 

packages/kv/src/parser.ts

@@ -123,28 +123,29 @@ function getKvSetPosition(s: ParserState): Position | null {
 }
 
 function completeOutstandingKvSet(s: ParserState, token: Token): void {
-    if(s.keyToken != null && s.keyToken.line !== token.line) {
-        if(s.valueTokens.length == 0) {
-            
-            const error = new ParseError(ParseErrorType.MissingValue, s.keyToken.getPosition());
-            s.errors.push(error);
-        }
+    if(s.keyToken == null || s.keyToken.line === token.line || token.type === TokenType.ObjectStart) return;
 
-        if(s.currentParent == null) {
-            const pos = getKvSetPosition(s);
-            if(pos != null) {
-                s.errors.push(new ParseError(ParseErrorType.MissingRootObject, pos));
-            }
-        } else {
-            const key = s.keyToken.toLiteral();
-            const values = s.valueTokens.map(t => new Literal(new Position(t.line, t.range), t.value));
-            const condition: Conditional | undefined = s.conditionToken?.toConditional();
-            const item = Item.createLeaf(s.currentParent, key, values, condition);
-            s.currentParent.addChild(item);
-        }
+    if(s.valueTokens.length == 0) {
+        
+        const error = new ParseError(ParseErrorType.MissingValue, s.keyToken.getPosition());
+        s.errors.push(error);
+    }
 
-        s.keyToken = null;
-        s.valueTokens = [];
-        s.conditionToken = null;
+    if(s.currentParent == null) {
+        const pos = getKvSetPosition(s);
+        if(pos != null) {
+            s.errors.push(new ParseError(ParseErrorType.MissingRootObject, pos));
+        }
+    } else {
+        const key = s.keyToken.toLiteral();
+        const values = s.valueTokens.map(t => new Literal(new Position(t.line, t.range), t.value));
+        const condition: Conditional | undefined = s.conditionToken?.toConditional();
+        const item = Item.createLeaf(s.currentParent, key, values, condition);
+        s.currentParent.addChild(item);
     }
+
+    s.keyToken = null;
+    s.valueTokens = [];
+    s.conditionToken = null;
+
 }

packages/kv/src/tokenizer.test.ts

@@ -246,4 +246,14 @@ test("Error when / is not followed by any character", () => {
     }).not.toThrowError();
 
 
-});
+});
+
+test("Tokenize compile time report", () => {
+    const kvFile = 
+`"report" 
+{
+	"total_seconds"		"12"
+}
+`;
+    const tokens = tokenize(kvFile);
+});