Support GroupMenu (#113)

package.json

@@ -20,16 +20,16 @@
     "test": "npm run build && node test/test.js"
   },
   "devDependencies": {
-    "@hyper-tuner/eslint-config": "^0.1.2",
+    "@hyper-tuner/eslint-config": "^0.1.6",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^18.7.18",
+    "@types/node": "^18.7.22",
     "@types/parsimmon": "^1.10.6",
     "eslint-plugin-modules-newline": "^0.0.6",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "typescript": "^4.8.3"
   },
   "dependencies": {
-    "@hyper-tuner/types": "^0.3.0",
+    "@hyper-tuner/types": "^0.4.0",
     "js-yaml": "^4.1.0",
     "parsimmon": "^1.18.1"
   }

src/ini.ts

@@ -1,7 +1,8 @@
-import * as P from 'parsimmon';
+import P from 'parsimmon';
 import {
   Config as ConfigType,
   Constant,
+  GroupMenu,
 } from '@hyper-tuner/types';
 import { ParserInterface } from './parserInterface';
 
@@ -44,6 +45,8 @@ export class INI implements ParserInterface {
 
   currentMenu?: string;
 
+  currentGroupMenu?: string;
+
   currentCurve?: string;
 
   currentTable?: string;
@@ -801,10 +804,76 @@ export class INI implements ParserInterface {
         title: INI.sanitize(title),
         subMenus: {},
       };
+
       return;
     }
 
     if (this.currentMenu) {
+      // parse groupMenu
+      // groupMenu = "Engine Protection"
+      const groupMenuResult = P
+        .seqObj<any>(
+          P.string('groupMenu'),
+          this.space, this.equal, this.space,
+          ['title', this.notQuote.wrap(...this.quotes)],
+          P.all,
+        )
+        .parse(line);
+
+      if (groupMenuResult.status) {
+        const title = INI
+          .sanitize(groupMenuResult.value.title);
+        const name = title
+          .toLowerCase()
+          .replace(/([^\w]\w)/g, (g) => g[1].toUpperCase()); // camelCase
+
+        this.currentGroupMenu = name;
+        this.result.menus[this.currentMenu].subMenus[name] = {
+          type: 'groupMenu',
+          title: INI.sanitize(title),
+          groupChildMenus: {},
+        };
+
+        return;
+      }
+
+      // parse groupChildMenu
+      if (this.currentGroupMenu && line.startsWith('groupChildMenu')) {
+        // groupChildMenu = std_separator
+        const base: any = [
+          P.string('groupChildMenu'),
+          this.space, this.equal, this.space,
+          ['name', this.name],
+        ];
+
+        // groupChildMenu = engineProtection, "Common Engine Protection"
+        const withTitle: any = [
+          ...base,
+          ...this.delimiter,
+          ['title', this.notQuote.wrap(...this.quotes)],
+        ];
+
+        // groupChildMenu = revLimiterDialog, "Rev Limiters", { engineProtectType }
+        const full: any = [
+          ...withTitle,
+          ...this.delimiter,
+          ['condition', this.expression],
+          P.all,
+        ];
+
+        const groupChildMenuResult = P.seqObj<any>(...full, P.all)
+          .or(P.seqObj<any>(...withTitle, P.all))
+          .or(P.seqObj<any>(...base, P.all))
+          .tryParse(line);
+
+        (this.result.menus[this.currentMenu].subMenus[this.currentGroupMenu] as GroupMenu).groupChildMenus[groupChildMenuResult.name] = {
+          title: INI.sanitize(groupChildMenuResult.title),
+          condition: groupChildMenuResult.condition ? INI.sanitize(groupChildMenuResult.condition) : '',
+        };
+
+        return;
+      }
+
       // subMenu = std_separator
       const base: any = [
         P.string('subMenu'),
@@ -849,6 +918,7 @@ export class INI implements ParserInterface {
         .tryParse(line);
 
       this.result.menus[this.currentMenu].subMenus[subMenuResult.name] = {
+        type: 'subMenu',
         title: INI.sanitize(subMenuResult.title),
         page: Number(subMenuResult.page || 0),
         condition: subMenuResult.condition ? INI.sanitize(subMenuResult.condition) : '',