mahabhuta 0.7.3 → 0.7.4

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/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 = true;
 
 exports.config = function(_configCheerio) {
     configCheerio = _configCheerio;
@@ -85,11 +85,16 @@ 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();
             for (var element of elements) {
                 let replaceWith = await custom.process($(element), metadata, setDirty);
                 // console.log(`CustomElement ${this.elementName} process returned ${replaceWith}`);
                 $(element).replaceWith(replaceWith);
             }
+            // 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 +117,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 +210,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 +252,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 {
@@ -263,8 +294,8 @@ exports.processAsync =  async function(text, metadata, mahabhutaFuncs) {
     var $ = typeof text === 'function' ? text : exports.parse(text);
 
     const loops = [];
-    const startProcessing = new Date();
     do {
+        let startProcessing = new Date();
         var mhObj;
         if (Array.isArray(mahabhutaFuncs)) {
             // console.log(`ARRAY substitution`);
@@ -279,7 +310,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,6 +2,7 @@
 
 const url = require('url');
 const path = require('path');
+// const util = require('util');
 const mahabhuta = require('../index');
 
 // TODO JavaScript script tags
@@ -102,10 +103,11 @@ class ExternalStylesheet extends mahabhuta.CustomElement {
 
 class RSSHeaderMeta extends mahabhuta.Munger {
     get selector() { return "rss-header-meta"; }
+    get elementName() { return "rss-header-meta"; }
 
-    async process($, $link, metadata, dirty) {
+    async process($, $element, metadata, dirty) {
         if ($('html head').get(0)) {
-            var href = $link.attr('href');
+            var href = $element.attr('href');
             if (!href) {
                 throw new Error("No href in rss-header-meta tag");
             }
@@ -118,7 +120,7 @@ class RSSHeaderMeta extends mahabhuta.Munger {
             let $link = mahabhuta.parse('<link rel="alternate" type="application/rss+xml" href=""/>');
             $link('link').attr('href', href);
             $('head').append($link.html());
-            $link.remove();
+            $element.remove();
         }
     }
 }

package/maha/partial.js

@@ -1,10 +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 fs        = require('fs/promises');
 
 const pluginName = "mahabhuta partials built-in";
 
@@ -35,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;
@@ -48,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)}`);
 
@@ -67,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);
@@ -101,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)}`);
     
@@ -134,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,14 +21,15 @@
     "type": "git",
     "url": "https://github.com/akashacms/mahabhuta.git"
   },
-  "version": "0.7.3",
+  "version": "0.7.4",
   "engines": {
     "node": ">=12.4"
   },
   "dependencies": {
-    "cheerio": ">=0.22.x",
-    "globfs": ">=0.3",
+    "cheerio": ">=1.0.0-rc.10",
     "ejs": "*",
-    "fs-extra": ">=4.0.1"
+    "handlebars": "^4.7.6",
+    "liquid": "^4.1.0",
+    "nunjucks": "^3.2.2"
   }
 }