DataManager

Author: devgutt

src/DataManager.js

@@ -0,0 +1,36 @@
+'use strict';
+
+function createDataManager(defaultData) {
+
+    const DATA = {
+        _: defaultData
+    }
+
+    async function getData(url) {
+
+        if (url) {
+            if (DATA[url] == undefined) {
+                DATA[url] = fetch(url)
+                    .then(r => r.json());
+            }
+            return DATA[url];
+
+        } else {
+            return DATA['_'];
+        }
+
+    }
+
+    async function getValue(url, path) {
+
+        const data = await getData(url);
+        const ret = path.split(".").reduce((acc, cur) => acc[(cur+"").trim()], data);
+        return ret;
+    }
+
+    return {
+        getData: getData,
+        getValue: getValue
+    }
+}
+

src/Elements.js

@@ -50,7 +50,17 @@ function append(parent, children) {
     }
 }
 
+function loadScript(url, onload) {
+    const script = document.createElement('script');
+    script.type = 'text/javascript';
+    script.async = true;
+    document.head.appendChild(script);
+    script.onload = onload;
+    script.src = url;
+}
+
 module.exports = {
     create: createElement,
-    append: append
+    append: append,
+    loadScript: loadScript
 }

src/Hyperdata.js

@@ -1,70 +1,34 @@
 'use strict';
 
-function createInstance(defaultData) {
+async function processHyperData(dataManager, str) {
+    const reg = /([\\]?){{\ *(?:\[([^{}]+)\]\ *)?([^{}]+)\ *}}/g;
 
-    const DATA = {
-        _: defaultData
-    }
+    const ret = [];
+    let match;
+    let i = 0;
+    while ((match = reg.exec(str)) !== null) {
 
-    async function getData(key) {
+        const opr = match[1];
 
-        if (key) {
-            if (DATA[key] == undefined) {
-                DATA[key] = fetch(key)
-                    .then(r => r.json());
-            }
-            return DATA[key];
+        ret.push(str.slice(i, match.index));
 
+        if (opr !== '\\') {
+            const url = match[2];
+            const path = match[3];
+            try {
+                ret.push(await dataManager.getValue(url, path));
+            } catch (error) {
+                ret.push("[ERROR]");
+            }
         } else {
-            return DATA['_'];
+            ret.push((match[0] + "").slice(1));
         }
 
+        i = reg.lastIndex;
     }
+    ret.push(str.slice(i));
 
-    async function getValue(url, path) {
-
-        const data = await getData(url);
-        const ret = path.split(".").reduce((acc, cur) => acc[(cur+"").trim()], data);
-        return ret;
-    }
-
-    return {
-        replace: (str, mark) => {
-            return str.replace(/{{[^{}]+}}/g, mark);
-        },
-        process: async str => {
-
-            const reg = /([\\]?){{\ *(?:\[([^{}]+)\]\ *)?([^{}]+)\ *}}/g;
-
-            const ret = [];
-            let match;
-            let i = 0;
-            while ((match = reg.exec(str)) !== null) {
-
-                const opr = match[1];
-
-                ret.push(str.slice(i, match.index));
-
-                if (opr !== '\\') {
-                    const url = match[2];
-                    const path = match[3];
-                    try {
-                        ret.push(await getValue(url, path));
-                    } catch (error) {
-                        ret.push("[ERROR]");
-                    }
-                } else {
-                    ret.push((match[0] + "").slice(1));
-                }
-
-                i = reg.lastIndex;
-            }
-            ret.push(str.slice(i));
-
-            return ret.join("");
-        }
-    }
+    return ret.join("");
 }
 
-module.exports = createInstance;
-
+module.exports = processHyperData;

src/Render.js

@@ -3,13 +3,14 @@
 const el = require('./Elements.js');
 const textFormatting = require('./TextFormatting.js');
 
-const createInstance = require('./Hyperdata.js');
+const createDataManager = require('./DataManager.js');
+const processHyperData = require('./Hyperdata.js');
 
-let hyperdata;
+let dataManager;
 
 function render(data) {
 
-    hyperdata = createInstance(data);
+    dataManager = createDataManager(data);
 
     el.append(document.head, [
         el.create('meta', { charset: "utf-8" }),
@@ -85,8 +86,8 @@ function setValue(el, str) {
     if (!str.includes('{{')) {
         el.innerHTML = textFormatting(str)
     } else {
-        el.innerHTML = textFormatting(hyperdata.replace(str, "..."))
-        hyperdata.process(str)
+        el.innerHTML = textFormatting(str.replace(/{{[^{}]+}}/g, "..."));
+        processHyperData(dataManager, str)
             .then(s => el.innerHTML = textFormatting(s))
             .catch(error => {
                 console.error(error);