Enhancement: replaced exsiting toml parser. (#44)

Co-authored-by: Rushikesh Patange <rushikesh.patange@espressif.com>

index.html

@@ -436,7 +436,6 @@ <h4 class=" mb-4" style="color: #e63f36;"><b>Publish your own firmware apps</b><
         <script src="node_modules/xterm-addon-fit/lib/xterm-addon-fit.js"></script>
         <script src="node_modules/crypto-js/crypto-js.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.0.3/pako.js"></script>
-        <script type="text/javascript" src="node_modules/toml-js/src/toml.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/2.1.0/showdown.min.js"></script>
 

js/index.js

@@ -34,6 +34,8 @@ let resizeTimeout = false;
 
 import * as utilities from "./utils.js";
 import * as esptooljs from "../node_modules/esptool-js/bundle.js";
+import * as toml from '../node_modules/smol-toml/dist/index.js';
+
 const ESPLoader = esptooljs.ESPLoader;
 const Transport = esptooljs.Transport;
 
@@ -132,8 +134,8 @@ function buildQuickTryUI_v1_0() {
     if(supported_apps) {
         addDeviceTypeOption(supported_apps);
         populateSupportedChipsets(config[supported_apps[0]]);
-        if (config[supported_apps[0]]["readme.text"]) {
-            markdown_payload_url = config[supported_apps[0]]["readme.text"];
+        if (config[supported_apps[0]].readme?.text) {
+            markdown_payload_url = config[supported_apps[0]].readme.text;
         }
     }
     setAppURLs(config[supported_apps[0]]);
@@ -186,7 +188,7 @@ function populateSupportedChipsets(deviceConfig) {
         inputElement.setAttribute("class", "form-check-input");
         inputElement.name = "chipType";
         inputElement.id = "radio-" + chipset;
-        inputElement.value = deviceConfig["image." + chipset.toLowerCase()];
+        inputElement.value = deviceConfig["image"][chipset.toLowerCase()];
         if (chipset.toLowerCase() === chip.toLowerCase())
             inputElement.checked = true;
 
@@ -220,8 +222,8 @@ $('#frameworkSel').on('change', function() {
 $('#device').on('change', function() {
     populateSupportedChipsets(config[deviceTypeSelect.value]);
     setAppURLs(config[deviceTypeSelect.value]);
-    if (config[deviceTypeSelect.value]["readme.text"]) {
-        markdown_payload_url = config[deviceTypeSelect.value]["readme.text"];
+    if (config[deviceTypeSelect.value].readme?.text) {
+        markdown_payload_url = config[deviceTypeSelect.value].readme.text;
     } else {
         markdown_payload_url = "";
     }

minimal-launchpad/index.html

@@ -96,7 +96,6 @@ <h4 class="topic" data-target-tab-panel-id="about">
     <script src="../node_modules/xterm-addon-fit/lib/xterm-addon-fit.js"></script>
     <script src="../node_modules/crypto-js/crypto-js.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.0.3/pako.js"></script>
-    <script type="text/javascript" src="../node_modules/toml-js/src/toml.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/2.1.0/showdown.min.js"></script>
 

minimal-launchpad/minimal_ui_index.js

@@ -10,6 +10,8 @@ const message = document.getElementById("message");
 
 import * as utilities from "../js/utils.js"
 import * as esptooljs from "../node_modules/esptool-js/bundle.js";
+import * as toml from '../node_modules/smol-toml/dist/index.js';
+
 const ESPLoader = esptooljs.ESPLoader;
 const Transport = esptooljs.Transport;
 
@@ -39,19 +41,17 @@ var config = [];
 
 // Code for minimalLaunchpad
 function setImagePartsAndOffsetArray() {
-    let application = "supported_apps";
+    let app = config[config["supported_apps"][0]];
     let chipInConfToml = undefined;
-    let imageString = undefined;
-    let addressString = undefined;
+    let appImageObj = undefined;
     if (chip !== "default" && config["multipart"]) {
         chipInConfToml = config["chip"];
+        appImageObj = app["image"][chipInConfToml.toLowerCase()];
     }
     if (chip !== "default" && chipInConfToml !== undefined) {
-        imageString = "image." + chipInConfToml.toLowerCase() + ".parts";
-        addressString = "image." + chipInConfToml.toLowerCase() + ".addresses";
+        imagePartsArray = appImageObj["parts"];
+        imagePartsOffsetArray = appImageObj["addresses"];
     }
-    imagePartsArray = config[config[application][0]][imageString];
-    imagePartsOffsetArray = config[config[application][0]][addressString];
 }
 
 async function downloadAndFlash() {
@@ -79,7 +79,7 @@ function MDtoHtml() {
     var converter = new showdown.Converter({ tables: true });
     converter.setFlavor('github');
     try {
-        fetch(config[config[application][0]]["readme.text"]).then(response => {
+        fetch(config[config[application][0]].readme.text).then(response => {
             return response.text();
         }).then(result => {
             let htmlText = converter.makeHtml(result);

package.json

@@ -3,7 +3,7 @@
 	"dependencies": {
 		"crypto-js": "^4.1.1",
 		"esptool-js": "^0.3.0",
-		"toml-js": "^0.0.8",
+		"smol-toml": "^1.1.2",
 		"xterm": "^4.17.0",
 		"xterm-addon-fit": "^0.5.0"
 	}