yini-parser 1.0.0-alpha.5 → 1.0.0-alpha.7

package/dist/core/YINIVisitor.js

@@ -38,13 +38,47 @@ class YINIVisitor extends YiniParserVisitor_1.default {
         this.meta_numOfMembers = 0; // For stats.
         this.meta_numOfChains = 0; // For stats.
         this.meta_maxLevelSection = 0; // For stats.
-        this.pushOnTree = (sReslult) => {
+        // private existingSectionTitles: Map<string, boolean> = new Map()
+        this.existingSectionTitlesAtLevels = [];
+        this.hasDefinedSectionTitle = (sectionName, level) => {
+            const mapAtCurrentLevel = this.existingSectionTitlesAtLevels[level - 1];
+            return mapAtCurrentLevel === null || mapAtCurrentLevel === void 0 ? void 0 : mapAtCurrentLevel.has(sectionName);
+        };
+        this.setDefineSectionTitle = (sectionName, level) => {
+            let mapAtCurrentLevel = this.existingSectionTitlesAtLevels[level - 1];
+            if (!mapAtCurrentLevel) {
+                mapAtCurrentLevel = new Map();
+                this.existingSectionTitlesAtLevels[level - 1] = mapAtCurrentLevel;
+            }
+            mapAtCurrentLevel.set(sectionName, true);
+        };
+        this.pushOnTree = (ctx, sReslult) => {
             if ((0, env_1.isDebug)()) {
                 console.log();
                 (0, system_1.debugPrint)('--- In pushOnTree(..) --------');
                 (0, system_1.debugPrint)('sReslult:');
                 (0, system_1.printObject)(sReslult);
             }
+            const key = sReslult.level + '-' + sReslult.name;
+            (0, system_1.debugPrint)('KKKKKK, key = ' + key);
+            // if (this.existingSectionTitles.has(key)) {
+            if (this.hasDefinedSectionTitle(key, sReslult.level)) {
+                this.errorHandler.pushOrBail(ctx, 'Syntax-Error', 'Section name already exists', 'Cannot redefine section name: "' +
+                    sReslult.name +
+                    '" at level ' +
+                    sReslult.level +
+                    '.');
+            }
+            else {
+                if (sReslult.members === undefined) {
+                    (0, system_1.debugPrint)('This sReslult does not hold any valid members (=undefined)');
+                }
+                else {
+                    // this.existingSectionTitles.set(key, true)
+                    this.setDefineSectionTitle(key, sReslult.level);
+                    // printObject(this.existingSectionTitles)
+                }
+            }
             // if (
             //     sReslult.level === 0 &&
             //     (!sReslult.name || sReslult.name === 'undefined')
@@ -115,7 +149,7 @@ class YINIVisitor extends YiniParserVisitor_1.default {
                 // ctx?.section_list()?.forEach((section: any) => {
                 (0, system_1.debugPrint)('\nStart of each element in forEeach(..) of section_list():');
                 const topSectionResult = this.visitSection(section);
-                this.pushOnTree(topSectionResult);
+                this.pushOnTree(ctx, topSectionResult);
                 const topSectionName = topSectionResult === null || topSectionResult === void 0 ? void 0 : topSectionResult.name;
                 const topSectionMembers = topSectionResult === null || topSectionResult === void 0 ? void 0 : topSectionResult.members;
                 const topSectionLevel = topSectionResult === null || topSectionResult === void 0 ? void 0 : topSectionResult.level; // This must have a value of 1.
@@ -386,7 +420,7 @@ class YINIVisitor extends YiniParserVisitor_1.default {
                     this.lastActiveSectionAtLevels[this.level - 1] = {
                         [sectionName]: Object.assign({}, members),
                     };
-                    this.pushOnTree({
+                    this.pushOnTree(ctx, {
                         level: sectionLevel,
                         name: sectionName,
                         members,
@@ -499,7 +533,8 @@ class YINIVisitor extends YiniParserVisitor_1.default {
                     }
                     else {
                         this.meta_numOfMembers++;
-                        if ((value === null || value === void 0 ? void 0 : value.type) === 'Null') {
+                        // if ((value?.type as TDataType) === 'Null') {
+                        if (type === 'Null') {
                             members[key] = null;
                         }
                         else {
@@ -507,6 +542,22 @@ class YINIVisitor extends YiniParserVisitor_1.default {
                             // NOTE: (!) Only if nested section.
                             (0, system_1.debugPrint)('About to mount a single member or section onto members...');
                             (0, env_1.isDebug)() && console.log({ [key]: value });
+                            // if ((type as TDataType) === 'Object') {
+                            //     const isExistingSectionName =
+                            //         this.hasDefinedSectionTitle(key, this.level)
+                            //     debugPrint('      type = "' + type + '"')
+                            //     debugPrint('this.level = "' + this.level + '"')
+                            //     debugPrint(
+                            //         'DDDDDDDD: sectionName / objectKey: ' + key,
+                            //     )
+                            //     debugPrint(
+                            //         'Is already defined at this level? ' +
+                            //             isExistingSectionName,
+                            //     )
+                            //     if (!isExistingSectionName) {
+                            //         this.setDefineSectionTitle(key, this.level)
+                            //     }
+                            // }
                             Object.assign(members, { [key]: value });
                             (0, system_1.debugPrint)('+ Added member or section onto members: "' +
                                 key +

package/dist/core/objectBuilder.js

@@ -77,6 +77,9 @@ class Builder {
     }
     mountChainOntoLevel(chainC, workingSubTree) {
         (0, system_1.debugPrint)('-> Builder: mountChainOntoLevel(..)');
+        if ((0, env_1.isDebug)()) {
+            (0, system_1.printObject)(chainC);
+        }
         if (chainC.originLevel > 1) {
             // NOP
         }
@@ -101,7 +104,7 @@ class Builder {
             (0, system_1.printObject)(workingSubTree.chain);
         }
         (0, system_1.debugPrint)('Mount currentChain onto workingFullSubTree.');
-        workingSubTree.chain = mountObjectAtLevel(workingSubTree.chain, chain, targetLevel);
+        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);
@@ -140,7 +143,7 @@ class Builder {
  * 1-based) in objectSrc.
  * @return Returns a new object without mutating input objects.
  */
-const mountObjectAtLevel = (objectSrc, objectDest, level) => {
+const mountObjectAtLevel = (objectSrc, objectDest, level, errorHandler) => {
     // Deep copy to avoid mutating the input.
     const result = JSON.parse(JSON.stringify(objectSrc));
     let current = result;
@@ -160,6 +163,22 @@ const mountObjectAtLevel = (objectSrc, objectDest, level) => {
         current = current[nextKey];
         currentLevel++;
     }
+    (0, system_1.debugPrint)('--------');
+    (0, system_1.debugPrint)('   current = ' + (0, system_1.toPrettyJSON)(current));
+    const [firstKey] = Object.keys(objectDest);
+    (0, system_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));
+        // 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 +
+            '" at level ' +
+            currentLevel +
+            '.');
+        return current;
+    }
     // Mount objectDest onto the object at the required level.
     Object.assign(current, objectDest);
     return result;

package/dist/grammar/YiniLexer.d.ts

@@ -6,47 +6,46 @@ export default class YiniLexer extends Lexer {
     static readonly SS = 4;
     static readonly EUR = 5;
     static readonly CARET = 6;
-    static readonly TILDE = 7;
-    static readonly GT = 8;
-    static readonly LT = 9;
-    static readonly EQ = 10;
-    static readonly HASH = 11;
-    static readonly COMMA = 12;
-    static readonly COLON = 13;
-    static readonly OB = 14;
-    static readonly CB = 15;
-    static readonly OC = 16;
-    static readonly CC = 17;
-    static readonly PLUS = 18;
-    static readonly DOLLAR = 19;
-    static readonly PC = 20;
-    static readonly AT = 21;
-    static readonly SEMICOLON = 22;
-    static readonly BOOLEAN_FALSE = 23;
-    static readonly BOOLEAN_TRUE = 24;
-    static readonly NULL = 25;
-    static readonly EMPTY_OBJECT = 26;
-    static readonly EMPTY_LIST = 27;
-    static readonly SHEBANG = 28;
-    static readonly NUMBER = 29;
-    static readonly KEY = 30;
-    static readonly IDENT = 31;
-    static readonly IDENT_BACKTICKED = 32;
-    static readonly STRING = 33;
-    static readonly TRIPLE_QUOTED_STRING = 34;
-    static readonly SINGLE_OR_DOUBLE = 35;
-    static readonly R_AND_C_STRING = 36;
-    static readonly HYPER_STRING = 37;
-    static readonly ESC_SEQ = 38;
-    static readonly ESC_SEQ_BASE = 39;
-    static readonly NL = 40;
-    static readonly SINGLE_NL = 41;
-    static readonly WS = 42;
-    static readonly BLOCK_COMMENT = 43;
-    static readonly COMMENT = 44;
-    static readonly LINE_COMMENT = 45;
-    static readonly INLINE_COMMENT = 46;
-    static readonly IDENT_INVALID = 47;
+    static readonly GT = 7;
+    static readonly LT = 8;
+    static readonly EQ = 9;
+    static readonly HASH = 10;
+    static readonly COMMA = 11;
+    static readonly COLON = 12;
+    static readonly OB = 13;
+    static readonly CB = 14;
+    static readonly OC = 15;
+    static readonly CC = 16;
+    static readonly PLUS = 17;
+    static readonly DOLLAR = 18;
+    static readonly PC = 19;
+    static readonly AT = 20;
+    static readonly SEMICOLON = 21;
+    static readonly BOOLEAN_FALSE = 22;
+    static readonly BOOLEAN_TRUE = 23;
+    static readonly NULL = 24;
+    static readonly EMPTY_OBJECT = 25;
+    static readonly EMPTY_LIST = 26;
+    static readonly SHEBANG = 27;
+    static readonly NUMBER = 28;
+    static readonly KEY = 29;
+    static readonly IDENT = 30;
+    static readonly IDENT_BACKTICKED = 31;
+    static readonly STRING = 32;
+    static readonly TRIPLE_QUOTED_STRING = 33;
+    static readonly SINGLE_OR_DOUBLE = 34;
+    static readonly R_AND_C_STRING = 35;
+    static readonly HYPER_STRING = 36;
+    static readonly ESC_SEQ = 37;
+    static readonly ESC_SEQ_BASE = 38;
+    static readonly NL = 39;
+    static readonly SINGLE_NL = 40;
+    static readonly WS = 41;
+    static readonly BLOCK_COMMENT = 42;
+    static readonly COMMENT = 43;
+    static readonly LINE_COMMENT = 44;
+    static readonly INLINE_COMMENT = 45;
+    static readonly IDENT_INVALID = 46;
     static readonly EOF: number;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];