yini-parser 1.0.0-alpha.7 → 1.0.0-beta.1

package/dist/core/objectBuilder.js

@@ -2,34 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructFinalObject = void 0;
 const env_1 = require("../config/env");
-const system_1 = require("../utils/system");
+const print_1 = require("../utils/print");
 /**
  * Construct the final result of a JavaScript Object.
  */
 const constructFinalObject = (syntaxTreeC, errorHandler) => {
-    (0, system_1.debugPrint)('-> constructFinalObject(..)');
+    (0, print_1.debugPrint)('-> constructFinalObject(..)');
     const bulder = new Builder(syntaxTreeC, errorHandler);
     if ((0, env_1.isDebug)()) {
         console.log('Argument, syntaxTreeC:');
-        (0, system_1.printObject)(syntaxTreeC);
+        (0, print_1.printObject)(syntaxTreeC);
     }
     const jsObject = bulder.doCheckAndBuild();
-    (0, system_1.debugPrint)('<- About to leave constructFinalObject(..)');
+    (0, print_1.debugPrint)('<- About to leave constructFinalObject(..)');
     if ((0, env_1.isDebug)()) {
         console.log('Returning, jsObject:');
-        (0, system_1.printObject)(syntaxTreeC);
+        (0, print_1.printObject)(syntaxTreeC);
     }
     return jsObject;
 };
 exports.constructFinalObject = constructFinalObject;
 class Builder {
     constructor(syntaxTreeC, errorHandler) {
-        (0, system_1.debugPrint)('-> Builder: constructor(..)');
+        (0, print_1.debugPrint)('-> Builder: constructor(..)');
         this.syntaxTreeC = syntaxTreeC;
         this.errorHandler = errorHandler;
     }
     doCheckAndBuild() {
-        (0, system_1.debugPrint)('-> Builder: doCheckAndBuild(..)');
+        (0, print_1.debugPrint)('-> Builder: doCheckAndBuild(..)');
         if (!this.syntaxTreeC) {
             // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
             this.errorHandler.pushOrBail(null, 'Fatal-Error', 'SyntaxTreeC is undefined', 'This is most likely caused by an internal error somewhere. The process cannot recover fully from this, sorry.');
@@ -39,46 +39,46 @@ class Builder {
         return jsObject;
     }
     buildFullSubTrees(syntaxTreeC) {
-        (0, system_1.debugPrint)('-> Builder: buildFullSubTrees(..)');
+        (0, print_1.debugPrint)('-> Builder: buildFullSubTrees(..)');
         (0, env_1.isDebug)() && console.log();
         const fullSubTreeList = []; // List of FULL sub-trees.
         // Current Working Full Sub-Tree (starting at level 1).
         let workingFullSubTree = syntaxTreeC._syntaxTree[0]; // (!) Any tree MUST START at level 1.
-        (0, system_1.debugPrint)(`Setted new workingFullSubTree, from syntaxTreeC._syntaxTree[0]`);
+        (0, print_1.debugPrint)(`Setted new workingFullSubTree, from syntaxTreeC._syntaxTree[0]`);
         const len = syntaxTreeC._syntaxTree.length;
         for (let i = 1; i < len; i++) {
             const currentChainC = syntaxTreeC._syntaxTree[i];
             const level = currentChainC.originLevel;
             const nestingIndex = level - 1; // For debugging purposes.
             const chain = currentChainC.chain; // For debugging purposes.
-            (0, system_1.debugPrint)(`Got new chain from syntaxTreeC._syntaxTree[${i}] to be mounted onto parent...`);
-            (0, system_1.debugPrint)('* level: ' + level + ' (i=' + i + '), chain: ' + chain);
+            (0, print_1.debugPrint)(`Got new chain from syntaxTreeC._syntaxTree[${i}] to be mounted onto parent...`);
+            (0, print_1.debugPrint)('* level: ' + level + ' (i=' + i + '), chain: ' + chain);
             if (level === 1) {
-                (0, system_1.debugPrint)('HIT - Detected that currentChain starts with level 1');
+                (0, print_1.debugPrint)('HIT - Detected that currentChain starts with level 1');
                 fullSubTreeList.push(workingFullSubTree);
-                (0, system_1.debugPrint)('The workingFullSubTree is finished, pushed it to the list.');
+                (0, print_1.debugPrint)('The workingFullSubTree is finished, pushed it to the list.');
                 workingFullSubTree = syntaxTreeC._syntaxTree[i]; // (!) The tree MUST START at level 1.
-                (0, system_1.debugPrint)(`Setted new workingFullSubTree, from syntaxTreeC._syntaxTree[${i}]`);
+                (0, print_1.debugPrint)(`Setted new workingFullSubTree, from syntaxTreeC._syntaxTree[${i}]`);
             }
             else {
-                (0, system_1.debugPrint)('About to mount currentChain onto workingFullSubTree at correct level...');
+                (0, print_1.debugPrint)('About to mount currentChain onto workingFullSubTree at correct level...');
                 workingFullSubTree = this.mountChainOntoLevel(currentChainC, workingFullSubTree);
             }
-            (0, system_1.debugPrint)();
+            (0, print_1.debugPrint)();
         }
         fullSubTreeList.push(workingFullSubTree);
         if ((0, env_1.isDebug)()) {
             console.log();
             console.log('--- fullSubTreeList: (list of FULL sub-trees.) -------');
-            (0, system_1.printObject)(fullSubTreeList);
+            (0, print_1.printObject)(fullSubTreeList);
             console.log();
         }
         return fullSubTreeList;
     }
     mountChainOntoLevel(chainC, workingSubTree) {
-        (0, system_1.debugPrint)('-> Builder: mountChainOntoLevel(..)');
+        (0, print_1.debugPrint)('-> Builder: mountChainOntoLevel(..)');
         if ((0, env_1.isDebug)()) {
-            (0, system_1.printObject)(chainC);
+            (0, print_1.printObject)(chainC);
         }
         if (chainC.originLevel > 1) {
             // NOP
@@ -86,36 +86,36 @@ class Builder {
         else {
             // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
             this.errorHandler.pushOrBail(null, 'Fatal-Error', 'Internal-Error: Detected incorrect chain in mountChainOntoLevel(..), start section has level: ' +
-                chainC.originLevel, 'The (chain) must start with a section level higher than 1', '' + (0, system_1.printObject)(chainC));
+                chainC.originLevel, 'The (chain) must start with a section level higher than 1', '' + (0, print_1.printObject)(chainC));
         }
         if (workingSubTree.originLevel != 1) {
             // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
             this.errorHandler.pushOrBail(null, 'Fatal-Error', 'Internal-Error: Detected incorrect full sub-tree in mountChainOntoLevel(..), start section has level: ' +
-                chainC.originLevel, 'A full sub-tree (chain) must start with a section at level 1', '' + (0, system_1.printObject)(chainC));
+                chainC.originLevel, 'A full sub-tree (chain) must start with a section at level 1', '' + (0, print_1.printObject)(chainC));
         }
         const chain = chainC.chain;
         const targetLevel = chainC.originLevel;
         if ((0, env_1.isDebug)()) {
-            (0, system_1.debugPrint)('Target level = ' + targetLevel);
-            (0, system_1.debugPrint)(`The chain to mount: (onto level: ${targetLevel})`);
-            (0, system_1.printObject)(chain);
-            (0, system_1.debugPrint)('--- workingFullSubTree: -------');
-            (0, system_1.debugPrint)('Before mounting onto workingSubTree.chain:');
-            (0, system_1.printObject)(workingSubTree.chain);
+            (0, print_1.debugPrint)('Target level = ' + targetLevel);
+            (0, print_1.debugPrint)(`The chain to mount: (onto level: ${targetLevel})`);
+            (0, print_1.printObject)(chain);
+            (0, print_1.debugPrint)('--- workingFullSubTree: -------');
+            (0, print_1.debugPrint)('Before mounting onto workingSubTree.chain:');
+            (0, print_1.printObject)(workingSubTree.chain);
         }
-        (0, system_1.debugPrint)('Mount currentChain onto workingFullSubTree.');
+        (0, print_1.debugPrint)('Mount currentChain onto workingFullSubTree.');
         workingSubTree.chain = mountObjectAtLevel(workingSubTree.chain, chain, targetLevel, this.errorHandler);
         if ((0, env_1.isDebug)()) {
-            (0, system_1.debugPrint)('After mounting onto workingSubTree.chain:');
-            (0, system_1.printObject)(workingSubTree.chain);
-            (0, system_1.debugPrint)('----------');
+            (0, print_1.debugPrint)('After mounting onto workingSubTree.chain:');
+            (0, print_1.printObject)(workingSubTree.chain);
+            (0, print_1.debugPrint)('----------');
         }
-        (0, system_1.debugPrint)('<- Builder: mountChainOntoLevel(..)');
+        (0, print_1.debugPrint)('<- Builder: mountChainOntoLevel(..)');
         return workingSubTree;
     }
     // Contruct the final JS object from the list of full sub-trees.
     buildObjectFromList(fullSubTreeList) {
-        (0, system_1.debugPrint)('-> Builder: buildObjectFromList(..)');
+        (0, print_1.debugPrint)('-> Builder: buildObjectFromList(..)');
         const jsObject = {};
         for (const chainC of fullSubTreeList) {
             if (chainC.originLevel === 1) {
@@ -132,7 +132,7 @@ class Builder {
             else {
                 // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
                 this.errorHandler.pushOrBail(null, 'Fatal-Error', 'Internal-Error: Detected incorrect full sub-tree in buildObjectFromList(..), start section has level: ' +
-                    chainC.originLevel, 'A full sub-tree (chain) must start with a section at level 1', '' + (0, system_1.printObject)(chainC));
+                    chainC.originLevel, 'A full sub-tree (chain) must start with a section at level 1', '' + (0, print_1.printObject)(chainC));
             }
         }
         return jsObject;
@@ -163,14 +163,14 @@ const mountObjectAtLevel = (objectSrc, objectDest, level, errorHandler) => {
         current = current[nextKey];
         currentLevel++;
     }
-    (0, system_1.debugPrint)('--------');
-    (0, system_1.debugPrint)('   current = ' + (0, system_1.toPrettyJSON)(current));
+    (0, print_1.debugPrint)('--------');
+    (0, print_1.debugPrint)('   current = ' + (0, print_1.toPrettyJSON)(current));
     const [firstKey] = Object.keys(objectDest);
-    (0, system_1.debugPrint)('objectDest = ' + firstKey);
+    (0, print_1.debugPrint)('objectDest = ' + firstKey);
     if (Object.prototype.hasOwnProperty.call(current, firstKey)) {
         //@todo Add metadata with line number, onto chainC, so can use line number in error reporting
-        (0, system_1.debugPrint)(`(!) sectionName already exist, name: "${firstKey}", in: `);
-        (0, system_1.debugPrint)((0, system_1.toPrettyJSON)(current));
+        (0, print_1.debugPrint)(`(!) sectionName already exist, name: "${firstKey}", in: `);
+        (0, print_1.debugPrint)((0, print_1.toPrettyJSON)(current));
         // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
         errorHandler.pushOrBail(null, 'Syntax-Error', 'Section name already exists', 'Cannot redefine section name: "' +
             firstKey +

package/dist/grammar/YiniLexer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// Generated from grammar/v1.0.0-beta.7x/YiniLexer.g4 by ANTLR 4.13.2
+// Generated from grammar/v1.0.0-rc.1/YiniLexer.g4 by ANTLR 4.13.2
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 const antlr4_1 = require("antlr4");
 class YiniLexer extends antlr4_1.Lexer {
@@ -81,7 +81,10 @@ YiniLexer.literalNames = [null, null,
     "']'", "'{'",
     "'}'", "'+'",
     "'$'", "'%'",
-    "'@'", "';'"];
+    "'@'", "';'",
+    null, null,
+    null, "'{}'",
+    "'[]'"];
 YiniLexer.symbolicNames = [null, "YINI_MARKER",
     "SECTION_HEAD",
     "TERMINAL_TOKEN",

package/dist/grammar/YiniParser.d.ts

@@ -67,6 +67,8 @@ export default class YiniParser extends Parser {
     static readonly RULE_string_literal = 16;
     static readonly RULE_string_concat = 17;
     static readonly RULE_boolean_literal = 18;
+    static readonly RULE_empty_object = 19;
+    static readonly RULE_empty_list = 20;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -96,6 +98,8 @@ export default class YiniParser extends Parser {
     string_literal(): String_literalContext;
     string_concat(): String_concatContext;
     boolean_literal(): Boolean_literalContext;
+    empty_object(): Empty_objectContext;
+    empty_list(): Empty_listContext;
     static readonly _serializedATN: number[];
     private static __ATN;
     static get _ATN(): ATN;
@@ -183,7 +187,7 @@ export declare class Object_literalContext extends ParserRuleContext {
     CC(): TerminalNode;
     NL_list(): TerminalNode[];
     NL(i: number): TerminalNode;
-    EMPTY_OBJECT(): TerminalNode;
+    empty_object(): Empty_objectContext;
     get ruleIndex(): number;
     accept<Result>(visitor: YiniParserVisitor<Result>): Result;
 }
@@ -195,14 +199,14 @@ export declare class ObjectMemberListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     NL_list(): TerminalNode[];
     NL(i: number): TerminalNode;
-    EMPTY_OBJECT(): TerminalNode;
+    empty_object(): Empty_objectContext;
     get ruleIndex(): number;
     accept<Result>(visitor: YiniParserVisitor<Result>): Result;
 }
 export declare class ObjectMemberContext extends ParserRuleContext {
     constructor(parser?: YiniParser, parent?: ParserRuleContext, invokingState?: number);
     KEY(): TerminalNode;
-    EQ(): TerminalNode;
+    COLON(): TerminalNode;
     value(): ValueContext;
     WS(): TerminalNode;
     NL_list(): TerminalNode[];
@@ -224,7 +228,7 @@ export declare class List_in_bracketsContext extends ParserRuleContext {
     CB(): TerminalNode;
     NL_list(): TerminalNode[];
     NL(i: number): TerminalNode;
-    EMPTY_LIST(): TerminalNode;
+    empty_list(): Empty_listContext;
     get ruleIndex(): number;
     accept<Result>(visitor: YiniParserVisitor<Result>): Result;
 }
@@ -281,3 +285,23 @@ export declare class Boolean_literalContext extends ParserRuleContext {
     get ruleIndex(): number;
     accept<Result>(visitor: YiniParserVisitor<Result>): Result;
 }
+export declare class Empty_objectContext extends ParserRuleContext {
+    constructor(parser?: YiniParser, parent?: ParserRuleContext, invokingState?: number);
+    EMPTY_OBJECT(): TerminalNode;
+    OC(): TerminalNode;
+    CC(): TerminalNode;
+    NL_list(): TerminalNode[];
+    NL(i: number): TerminalNode;
+    get ruleIndex(): number;
+    accept<Result>(visitor: YiniParserVisitor<Result>): Result;
+}
+export declare class Empty_listContext extends ParserRuleContext {
+    constructor(parser?: YiniParser, parent?: ParserRuleContext, invokingState?: number);
+    EMPTY_LIST(): TerminalNode;
+    OB(): TerminalNode;
+    CB(): TerminalNode;
+    NL_list(): TerminalNode[];
+    NL(i: number): TerminalNode;
+    get ruleIndex(): number;
+    accept<Result>(visitor: YiniParserVisitor<Result>): Result;
+}