mahabhuta 0.7.2 → 0.7.6

package/built-in.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const mahabhuta = require('./index');
-const globfs    = require('globfs');
+THIS APPEARS TO NOT BE USED
 
+const mahabhuta = require('./index');
 exports.mahabhuta = new mahabhuta.MahafuncArray("mahabhuta built-in", {});
 
 class SiteVerification extends mahabhuta.CustomElement {

package/examples/express/package.json

@@ -13,7 +13,7 @@
     "ejs": "^2.4.2",
     "express": "~4.13.4",
     "fs-extra-promise": "^0.4.1",
-    "morgan": "~1.7.0",
+    "morgan": "~1.9.1",
     "serve-favicon": "~2.3.0",
     "mahabhuta": ">=0.5"
   }

package/index.js

@@ -27,10 +27,10 @@
 
 const cheerio = require('cheerio');
 const util    = require('util');
-const fs      = require('fs-extra');
 
 var configCheerio;
 var traceFlag = false;
+var tracePerf = false;
 
 exports.config = function(_configCheerio) {
     configCheerio = _configCheerio;
@@ -85,11 +85,24 @@ exports.CustomElement = class CustomElement extends exports.Mahafunc {
         try {
             var elements = custom.findElements($);
             if (elements.length <= 0) return;
+            // Performance testing
+            let _start;
+            if (tracePerf) _start = new Date();
+
+            /* if (this.elementName === "site-verification") {
+                console.log(`CustomElement ${this.elementName} `, $.html());
+            } */
+
             for (var element of elements) {
                 let replaceWith = await custom.process($(element), metadata, setDirty);
                 // console.log(`CustomElement ${this.elementName} process returned ${replaceWith}`);
                 $(element).replaceWith(replaceWith);
             }
+            /* if (this.elementName === "site-verification") {
+                console.log(`CustomElement ${this.elementName} `, $.html());
+            } */
+            // Performance testing
+            if (tracePerf) console.log(`CustomElement ${this.array.name} ${this.elementName} ${(new Date() - _start) / 1000} seconds`);
         } catch (e) {
             console.error(`CustomElement ${custom.elementName} Errored with ${util.inspect(e)}`);
             throw e;
@@ -112,9 +125,15 @@ exports.Munger = class Munger extends exports.Mahafunc {
         try {
             var elements = munger.findElements($);
             if (elements.length <= 0) return;
+            // Performance testing
+            let _start;
+            if (tracePerf) _start = new Date();
+            // console.log(`Munger ${this.array.name} ${this.elementName} found ${elements.length} elements`);
             for (let element of elements) {
                 await munger.process($, $(element), metadata, setDirty);
             }
+            // Performance testing
+            if (tracePerf) console.log(`Munger ${this.array.name} ${this.elementName} ${(new Date() - _start) / 1000} seconds`);
         } catch (e) {
             console.error(`Munger ${munger.selector} Errored with ${util.inspect(e)}`);
             throw e;
@@ -199,24 +218,37 @@ exports.MahafuncArray = class MahafuncArray {
                 if (traceFlag)  console.log(`Mahabhuta FINISHED Munger ${this.name} ${mahafunc.selector}`);
                 // loops.push(`... Munger ${mahafunc.selector} ${(new Date() - startProcessing) / 1000} seconds`);
             } else if (mahafunc instanceof exports.PageProcessor) {
+                // Performance testing
+                let _start;
+                if (tracePerf) _start = new Date();
                 if (traceFlag)  console.log(`Mahabhuta calling ${this.name} PageProcessor `);
                 try {
                     await mahafunc.process($, metadata, dirty);
                 } catch (errPageProcessor) {
                     throw new Error(`Mahabhuta ${this.name} caught error in PageProcessor: ${errPageProcessor.message}`);
                 }
+                // Performance testing
+                if (tracePerf) console.log(`PageProcessor ${this.name} ${(new Date() - _start) / 1000} seconds`)
                 // loops.push(`... PageProcessor ${(new Date() - startProcessing) / 1000} seconds`);
             } else if (mahafunc instanceof exports.MahafuncArray) {
+                // Performance testing
+                let _start;
+                if (tracePerf) _start = new Date();
                 let results = [];
                 try {
                     results = await mahafunc.process($, metadata, dirty);
                 } catch (errMahafuncArray) {
                     throw new Error(`Mahabhuta ${this.name} caught error in MahafuncArray: ${errMahafuncArray.message}`);
                 }
+                // Performance testing
+                if (tracePerf) console.log(`MahafuncArray ${this.name} ${mahafunc.name} ${(new Date() - _start) / 1000} seconds`)
 
                 // results.forEach(result => { loops.push(`    ... "${mahafunc.name} result" ${result} ${(new Date() - startProcessing) / 1000} seconds`); });
                 // loops.push(`... MahafuncArray ${mahafunc.name} ${(new Date() - startProcessing) / 1000} seconds`);
             } else if (typeof mahafunc === 'function') {
+                // Performance testing
+                let _start;
+                if (tracePerf) _start = new Date();
                 if (traceFlag)  console.log(`Mahabhuta calling an ${this.name} "function" `);
                 try {
                     await new Promise((resolve, reject) => {
@@ -228,11 +260,18 @@ exports.MahafuncArray = class MahafuncArray {
                 } catch (errFunction) {
                     throw new Error(`Mahabhuta ${this.name} caught error in function: ${errFunction.message}`);
                 }
+                // Performance testing
+                if (tracePerf) console.log(`function ${this.name} ${(new Date() - _start) / 1000} seconds`)
                 // loops.push(`... MahafuncArray "function" ${(new Date() - startProcessing) / 1000} seconds`);
             } else if (Array.isArray(mahafunc)) {
+                // Performance testing
+                let _start;
+                if (tracePerf) _start = new Date();
                 let mhObj = new exports.MahafuncArray("inline", this._config);
                 mhObj.setMahafuncArray(mahafunc);
                 let results = await mhObj.process($, metadata, dirty);
+                // Performance testing
+                if (tracePerf) console.log(`Array ${this.name} inline ${(new Date() - _start) / 1000} seconds`)
                 // results.forEach(result => { loops.push(`    ... "inline result" ${result} ${(new Date() - startProcessing) / 1000} seconds`); });
                 // loops.push(`... MahafuncArray "inline array" ${(new Date() - startProcessing) / 1000} seconds`);
             } else {
@@ -257,15 +296,19 @@ exports.processAsync =  async function(text, metadata, mahabhutaFuncs) {
 
     if (!mahabhutaFuncs || mahabhutaFuncs.length < 0) mahabhutaFuncs = [];
 
-    var cleanOrDirty = 'first-time';
+    let cleanOrDirty = 'first-time';
+
+    // console.log(`processAsync text at start ${text}`);
 
     // Allow a pre-parsed context to be passed in
-    var $ = typeof text === 'function' ? text : exports.parse(text);
+    const $ = typeof text === 'function' ? text : exports.parse(text);
+
+    // console.log(`processAsync $ at start `, $.html());
 
     const loops = [];
-    const startProcessing = new Date();
     do {
-        var mhObj;
+        let startProcessing = new Date();
+        let mhObj;
         if (Array.isArray(mahabhutaFuncs)) {
             // console.log(`ARRAY substitution`);
             mhObj = new exports.MahafuncArray("master", {});
@@ -279,7 +322,7 @@ exports.processAsync =  async function(text, metadata, mahabhutaFuncs) {
         let results = await mhObj.process($, metadata, () => { cleanOrDirty = 'dirty'; });
 
         // results.forEach(result => { loops.push(mhObj.name +'  '+ result); });
-        // loops.push(`MAHABHUTA processAsync ${metadata.document.path} FINISH ${(new Date() - startProcessing) / 1000} seconds ${cleanOrDirty}`);
+        // console.log(`MAHABHUTA processAsync ${metadata.document.path} FINISH ${(new Date() - startProcessing) / 1000} seconds ${cleanOrDirty}`);
     } while (cleanOrDirty === 'dirty');
 
     // loops.forEach(l => { console.log(l); });

package/maha/metadata.js

@@ -2,7 +2,9 @@
 
 const url = require('url');
 const path = require('path');
+// const util = require('util');
 const mahabhuta = require('../index');
+const cheerio = require('cheerio');
 
 // TODO JavaScript script tags
 // TODO some metadata like rel=canonical
@@ -17,7 +19,9 @@ class SiteVerification extends mahabhuta.CustomElement {
         var ret = '';
         var google = $element.attr('google');
         if (google) {
-            ret += `<meta name="google-site-verification" content="${google}"/>`;
+            let $ = /* mahabhuta.parse */ cheerio.load('<meta name="google-site-verification" content=""/>', null, false);
+            $('meta').attr('content', google);
+            ret += $.html();
         }
         // TBD site verification for other services
         return ret;
@@ -40,9 +44,15 @@ class DNSPrefetch extends mahabhuta.CustomElement {
         var ret = '';
 
         if (control) {
-            ret += `<meta http-equiv="x-dns-prefetch-control" content="${control}"/>`;
+            let $ = /* mahabhuta.parse */ cheerio.load('<meta name="x-dns-prefetch-control" content=""/>', null, false);
+            $('meta').attr('content', control);
+            ret += $.html();
         }
-        dns.forEach(item => { ret += `<link rel="dns-prefetch" href="${item}"/>`; });
+        dns.forEach(item => { 
+            let $ = /* mahabhuta.parse */ cheerio.load('<link rel="dns-prefetch" href=""/>', null, false);
+            $('link').attr('href', item);
+            ret += $.html();
+        });
 
         return ret;
     }
@@ -70,7 +80,10 @@ class XMLSitemap extends mahabhuta.CustomElement {
                 title = "Sitemap";
             }
         }
-        return `<link rel="sitemap" type="application/xml" title="${title}" href="${href}" />`;
+        let $ = /* mahabhuta.parse */ cheerio.load('<link rel="sitemap" type="application/xml" href=""/>', null, false);
+        $('link').attr('href', href);
+        $('link').attr('title', title);
+        return $.html();
     }
 }
 
@@ -80,32 +93,33 @@ class ExternalStylesheet extends mahabhuta.CustomElement {
         var href = $element.attr('href');
         if (!href) throw new Error("No href supplied");
         var media = $element.attr('media');
+        let $ = /* mahabhuta.parse */ cheerio.load('<link rel="stylesheet" type="text/css" href=""/>', null, false);
+        $('link').attr('href', href);
         if (media) {
-            return `<link rel="stylesheet" type="text/css" href="${href}" media="${media}"/>`;
-        } else {
-            return `<link rel="stylesheet" type="text/css" href="${href}"/>`;
+            $('link').attr('media', media);
         }
+        return $.html();
     }
 }
 
-class RSSHeaderMeta extends mahabhuta.Munger {
+class RSSHeaderMeta extends mahabhuta.CustomElement {
     get selector() { return "rss-header-meta"; }
+    get elementName() { return "rss-header-meta"; }
 
-    async process($, $link, metadata, dirty) {
-        if ($('html head').get(0)) {
-            var href = $link.attr('href');
-            if (!href) {
-                throw new Error("No href in rss-header-meta tag");
-            }
-            if (this.array.options.root_url) {
-                let pRootUrl = url.parse(this.array.options.root_url);
-                href = path.normalize(
-                        path.join(pRootUrl.pathname, href)
-                );
-            }
-            $('head').append(`<link rel="alternate" type="application/rss+xml" href="${href}"/>`);
-            $link.remove();
+    process($element, metadata, dirty) {
+        var href = $element.attr('href');
+        if (!href) {
+            throw new Error("No href in rss-header-meta tag");
+        }
+        if (this.array.options.root_url) {
+            let pRootUrl = url.parse(this.array.options.root_url);
+            href = path.normalize(
+                    path.join(pRootUrl.pathname, href)
+            );
         }
+        let $link = /* mahabhuta.parse */ cheerio.load('<link rel="alternate" type="application/rss+xml" href=""/>', null, false);
+        $link('link').attr('href', href);
+        return $link.html();
     }
 }
 

package/maha/partial.js

@@ -1,11 +1,13 @@
 
 const mahabhuta = require('../index');
-const globfs    = require('globfs');
 const ejs       = require('ejs');
+const nunjucks  = require('nunjucks');
+const Liquid    = require('liquid');
+const engine    = new Liquid.Engine();
+const Handlebars = require("handlebars");
 const path      = require('path');
 const util      = require('util');
-const fs        = require('fs-extra');
-// const literal   = require('template-literal');
+const fs        = require('fs/promises');
 
 const pluginName = "mahabhuta partials built-in";
 
@@ -36,6 +38,25 @@ class Partial extends mahabhuta.CustomElement {
             : module.exports.renderPartial(fname, d, this.options);
     }
 }
+
+async function lookForPartial(partialDirs, partialfn) {
+    for (let dir of partialDirs) {
+        let fn2check = path.join(dir, partialfn);
+        let stats;
+        try {
+            stats = await fs.stat(fn2check);
+        } catch (err) { stats = undefined; }
+        if (stats.isFile()) {
+            return {
+                basedir: dir,
+                path: partialfn,
+                fullpath: fn2check
+            };
+        }
+    }
+    return undefined;
+}
+
 module.exports.renderPartial = async function (fname, attrs, options) {
         
     let partialDirs;
@@ -49,11 +70,8 @@ module.exports.renderPartial = async function (fname, attrs, options) {
      }
 
     // console.log(`renderPartial looking for ${util.inspect(partialDirs)} ${fname}`);
-    var partialFound = await globfs.findAsync(partialDirs, fname);
+    const partialFound = await lookForPartial(partialDirs, fname);
     if (!partialFound) throw new Error(`No partial found for ${fname} in ${util.inspect(partialDirs)}`);
-    // Pick the first partial found
-    // console.log(`renderPartial found `, partialFound);
-    partialFound = partialFound[0];
     // console.log(`module.exports.configuration renderPartial ${partialFound}`);
     if (!partialFound) throw new Error(`No partial found for ${fname} in ${util.inspect(partialDirs)}`);
 
@@ -68,6 +86,31 @@ module.exports.renderPartial = async function (fname, attrs, options) {
         } catch (e) {
             throw new Error(`EJS rendering of ${fname} failed because of ${e}`);
         }
+    } else if (/\.liquid$/i.test(partialFound.fullpath)) {
+        try {
+            let partialText = await fs.readFile(partialFound.fullpath, 'utf8'); 
+            let template = await engine.parse(partialText);
+            let result = await template.render(attrs);
+            return result;
+        } catch (e) {
+            throw new Error(`Liquid rendering of ${fname} failed because of ${e}`);
+        }
+    } else if (/\.njk$/i.test(partialFound.fullpath)) {
+        try {
+            let partialText = await fs.readFile(partialFound.fullpath, 'utf8'); 
+            nunjucks.configure({ autoescape: false });
+            return nunjucks.renderString(partialText, attrs);
+        } catch (e) {
+            throw new Error(`Nunjucks rendering of ${fname} failed because of ${e}`);
+        }
+    } else if (/\.handlebars$/i.test(partialFound.fullpath)) {
+        try {
+            let partialText = await fs.readFile(partialFound.fullpath, 'utf8'); 
+            const template = Handlebars.compile(partialText);
+            return template(attrs);
+        } catch (e) {
+            throw new Error(`Handlebars rendering of ${fname} failed because of ${e}`);
+        }
     } /* else if (/\.literal$/i.test(partialFname)) {
         try {
             const t = literal(partialText);
@@ -102,10 +145,8 @@ module.exports.configuration = {
             partialDirs = module.exports.configuration.partialDirs;
          }
 
-        var partialFound = await globfs.findAsync(partialDirs, fname);
+        const partialFound = await lookForPartial(partialDirs, fname);
         if (!partialFound) throw new Error(`No partial found for ${fname} in ${util.inspect(partialDirs)}`);
-        // Pick the first partial found
-        partialFound = partialFound[0];
         // console.log(`module.exports.configuration renderPartial ${partialFound}`);
         if (!partialFound) throw new Error(`No partial found for ${fname} in ${util.inspect(partialDirs)}`);
     
@@ -135,98 +176,6 @@ module.exports.configuration = {
     }
 };
 
-module.exports.doPartialAsync = async function (fname, attrs) {
-
-    throw new Error("Deprecated");
-
-    /* 
-    // find the partial
-    // render the partial using the data provided
-
-    // TBD configuration for partialDirs
-    // console.log(`doPartialAsync ${util.inspect(fname)} ${util.inspect(module.exports.configuration.partialDirs)}`);
-    var partialFound = await globfs.findAsync(module.exports.configuration.partialDirs, fname);
-    // console.log(`doPartialAsync ${partialFound}`);
-    if (!partialFound) throw new Error(`No partial directory found for ${fname}`);
-    // Pick the first partial found
-    partialFound = partialFound[0];
-    if (!partialFound) throw new Error(`No partial directory found for ${fname}`);
-
-    var partialFname = path.join(partialFound.basedir, partialFound.path);
-    // console.log(`doPartialAsync before reading ${partialFname}`);
-    var stats = await fs.stat(partialFname);
-    if (!stats.isFile()) {
-        throw new Error(`doPartialAsync non-file found for ${fname} - ${partialFname}`);
-    }
-    var partialText = await fs.readFile(partialFname, 'utf8');
-    // console.log(`doPartialAsync after reading ${partialFname} text length=${partialText.length}`);
-
-    // TODO based on file extension render through a template engine
-    // TODO Need support for a broader spectrum of template engines
-
-    // dirty();
-    if (/\.ejs$/i.test(partialFname)) {
-        try { return ejs.render(partialText, attrs); } catch (e) {
-            throw new Error(`EJS rendering of ${fname} failed because of ${e}`);
-        }
-    } /* else if (/\.literal$/i.test(partialFname)) {
-        try {
-            const t = literal.compile(partialText);
-            return t(attrs);
-        } catch (e) {
-            throw new Error(`Literal rendering of ${fname} failed because of ${e}`);
-        }
-    } * / else if (/\.html$/i.test(partialFname)) {
-        // NOTE: The partialBody gets lost in this case
-        return partialText;
-    } else {
-        throw new Error("No rendering support for ${fname}");
-    } */
-};
-
-
-module.exports.doPartialSync = function(fname, attrs) {
-    throw new Error("Deprecated");
-
-    /* var partialFound = globfs.findSync(module.exports.configuration.partialDirs, fname);
-    if (!partialFound) throw new Error(`No partial directory found for ${fname}`);
-    // Pick the first partial found
-    partialFound = partialFound[0];
-
-    // console.log(`doPartialSync found ${util.inspect(partialFound)} for ${util.inspect(module.exports.configuration.partialDirs)} ${fname}`);
-
-    var partialFname = path.join(partialFound.basedir, partialFound.path);
-    // console.log(`doPartialSync before reading ${partialFname}`);
-    var stats = fs.statSync(partialFname);
-    if (!stats.isFile()) {
-        throw new Error(`doPartialSync non-file found for ${fname} - ${partialFname}`);
-    }
-    var partialText = fs.readFileSync(partialFname, 'utf8');
-
-    // TODO based on file extension render through a template engine
-    // TODO Need support for a broader spectrum of template engines
-
-    // dirty();
-    if (/\.ejs$/i.test(partialFname)) {
-        try { return ejs.render(partialText, attrs); } catch (e) {
-            throw new Error(`EJS rendering of ${fname} failed because of ${e}`);
-        }
-    } /* else if (/\.literal$/i.test(partialFname)) {
-        try {
-            const t = literal.compile(partialText);
-            return t(attrs);
-        } catch (e) {
-            throw new Error(`Literal rendering of ${fname} failed because of ${e}`);
-        }
-    } * / else if (/\.html$/i.test(partialFname)) {
-        // NOTE: The partialBody gets lost in this case
-        return partialText;
-    } else {
-        throw new Error("No rendering support for ${fname}");
-    } */
-};
-
-
 module.exports.mahabhutaArray = function(options) {
     let ret = new mahabhuta.MahafuncArray(pluginName, options);
     ret.addMahafunc(new Partial());

package/package.json

@@ -21,15 +21,15 @@
     "type": "git",
     "url": "https://github.com/akashacms/mahabhuta.git"
   },
-  "version": "0.7.2",
+  "version": "0.7.6",
   "engines": {
     "node": ">=12.4"
   },
   "dependencies": {
-    "cheerio": ">=0.22.x",
-    "globfs": ">=0.3",
+    "cheerio": "0.22.x",
     "ejs": "*",
-    "fs-extra": ">=4.0.1",
-    "template-literal": ">=1.x"
+    "handlebars": "^4.7.6",
+    "liquid": "^4.1.0",
+    "nunjucks": "^3.2.2"
   }
 }

package/test/partials1/test1.literal

@@ -1,10 +0,0 @@
-<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. ${d.hello} Quamvis enim depravatae non sint, pravae tamen esse possunt. <i>At eum nihili facit;</i> <i>Audeo dicere, inquit.</i> Hanc ergo intuens debet institutum illud quasi signum absolvere. <a href="http://loripsum.net/" target="_blank">Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse;</a> Intellegi quidem, ut propter aliam quampiam rem, verbi gratia propter voluptatem, nos amemus; <a href="http://loripsum.net/" target="_blank">Suo genere perveniant ad extremum;</a> Non enim iam stirpis bonum quaeret, sed animalis. Duo Reges: constructio interrete. </p>
-
-${d.middle}
-
-<p>Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nihil enim iam habes, quod ad corpus referas; Fieri, inquam, Triari, nullo pacto potest, ut non dicas, quid non probes eius, a quo dissentias. Nam his libris eum malo quam reliquo ornatu villae delectari. Verum tamen cum de rebus grandioribus dicas, ipsae res verba rapiunt; Deinde disputat, quod cuiusque generis animantium statui deceat extremum. Qui potest igitur habitare in beata vita summi mali metus? Sed fortuna fortis; Quamvis enim depravatae non sint, pravae tamen esse possunt. Universa enim illorum ratione cum tota vestra confligendum puto. Itaque e contrario moderati aequabilesque habitus, affectiones ususque corporis apti esse ad naturam videntur. </p>
-
-${d.helloFunction()}
-
-<p>Quae cum essent dicta, discessimus. Non enim iam stirpis bonum quaeret, sed animalis. Nunc omni virtuti vitium contrario nomine opponitur. </p>
-

package/test/test-literal.js

@@ -1,23 +0,0 @@
-
-const mahabhuta = require('../index');
-const mahaPartial = require('../maha/partial');
-
-mahaPartial.configuration.partialDirs.push('partials1');
-
-mahabhuta.processAsync(`
-<header>Head of the page</header>
-
-<partial file-name="test1.literal"></partial>
-
-<footer>Bottom of the page</footer>
-`, {
-    hello: "Hello, World!",
-    middle: "A paragraph for the middle of somewhere.",
-    helloFunction: () => {
-        return "Hello, Function!";
-    }
-}, [
-    mahaPartial.mahabhuta
-])
-.then(result => { console.log(`OK: ${result}`); })
-.catch(error => { console.error(`FAIL: ${error.stack}`); })