mancha 0.3.1 → 0.3.3

package/README.md

@@ -41,7 +41,7 @@ Source:
 <div>
   <include src="./hello-world.html"></include>
 </div>
-<script src="//fresho-dev.github.io/mancha/dist/mancha.js" init></script>
+<script src="//unpkg.com/mancha" init></script>
 ```
 
 Result:

package/dist/browser.d.ts

@@ -0,0 +1,2 @@
+import * as Mancha from "./web.js";
+export default Mancha;

package/dist/browser.js

@@ -0,0 +1,13 @@
+"use strict";
+var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Mancha = require("./web.js");
+self["Mancha"] = Mancha;
+if (((_b = (_a = self.document) === null || _a === void 0 ? void 0 : _a.currentScript) === null || _b === void 0 ? void 0 : _b.getAttribute("init")) !== undefined) {
+    const vars = JSON.parse(self.document.currentScript.dataset["vars"] || "{}");
+    const fsroot = self.location.href.split("/").slice(0, -1).join("/") + "/";
+    Mancha.renderContent(self.document.body.innerHTML, vars, fsroot).then((content) => {
+        self.document.body.innerHTML = content;
+    });
+}
+exports.default = Mancha;

package/dist/{gulp/index.js → gulp.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const stream = require("stream");
 const through = require("through2");
-const Mancha = require("../index.js");
+const Mancha = require("./index.js");
 /**
  * Main entrypoint to be used in Gulp. Usage:
  *

package/dist/index.d.ts

@@ -1,24 +1,8 @@
 /// <reference types="node" />
-import { Document, DocumentFragment } from "parse5/dist/tree-adapters/default";
-/**
- * Helper function used to escape HTML attribute values.
- * See: https://stackoverflow.com/a/9756789
- */
-export declare function encodeHtmlAttrib(value: string): string;
-/** Inverse the operation of [encodeHtmlAttrib] */
-export declare function decodeHtmlAttrib(value: string): string;
-export declare function preprocess(content: string, vars: {
-    [key: string]: string;
-}): string;
-export declare function renderContent(content: string, vars?: {
-    [key: string]: string;
-}, fsroot?: string, maxdepth?: number): Promise<string>;
-export declare function renderDocument(document: Document | DocumentFragment, vars?: {
-    [key: string]: string;
-}, fsroot?: string, maxdepth?: number): Promise<string>;
 export declare function renderLocalPath(fpath: string, vars?: {
     [key: string]: string;
 }, encoding?: BufferEncoding): Promise<string>;
-export declare function renderRemotePath(fpath: string, vars?: {
+export declare function renderContent(content: string, vars?: {
     [key: string]: string;
-}): Promise<string>;
+}, fsroot?: string, maxdepth?: number): Promise<string>;
+export { preprocess, renderRemotePath, encodeHtmlAttrib, decodeHtmlAttrib } from "./web";

package/dist/index.js

@@ -9,145 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRemotePath = exports.renderLocalPath = exports.renderDocument = exports.renderContent = exports.preprocess = exports.decodeHtmlAttrib = exports.encodeHtmlAttrib = void 0;
+exports.decodeHtmlAttrib = exports.encodeHtmlAttrib = exports.renderRemotePath = exports.preprocess = exports.renderContent = exports.renderLocalPath = void 0;
 const fs = require("fs/promises");
-const parse5 = require("parse5");
 const path = require("path");
-const axios_1 = require("axios");
-function replaceNodeWith(original, replacement) {
-    const elem = original;
-    const parent = elem.parentNode;
-    const index = parent.childNodes.indexOf(elem);
-    replacement.forEach((elem) => (elem.parentNode = parent));
-    parent.childNodes = []
-        .concat(parent.childNodes.slice(0, index))
-        .concat(replacement)
-        .concat(parent.childNodes.slice(index + 1));
-}
-function isDocument(content) {
-    return /^[\n\r\s]*<(!doctype|html|head|body)\b/i.test(content);
-}
-function isBrowser() {
-    return typeof window !== "undefined";
-}
-function parseDocument(content) {
-    return isDocument(content)
-        ? parse5.parse(content)
-        : parse5.parseFragment(content);
-}
-function traverse(tree) {
-    const explored = [];
-    const frontier = Array.isArray(tree) ? tree : [tree];
-    while (frontier.length) {
-        const node = frontier.pop();
-        explored.push(node);
-        if (node.childNodes) {
-            node.childNodes.forEach((node) => frontier.push(node));
-        }
-    }
-    return explored;
-}
-/**
- * Helper function used to escape HTML attribute values.
- * See: https://stackoverflow.com/a/9756789
- */
-function encodeHtmlAttrib(value) {
-    return value
-        .replace(/&/g, "&amp;")
-        .replace(/'/g, "&apos;")
-        .replace(/"/g, "&quot;")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/\r\n/g, "&#13;")
-        .replace(/[\r\n]/g, "&#13;");
-}
-exports.encodeHtmlAttrib = encodeHtmlAttrib;
-/** Inverse the operation of [encodeHtmlAttrib] */
-function decodeHtmlAttrib(value) {
-    return value
-        .replace(/&amp;/g, "&")
-        .replace(/&apos;/g, "'")
-        .replace(/&quot;/g, '"')
-        .replace(/&lt;/g, "<")
-        .replace(/&gt;/g, ">")
-        .replace(/&#13;/g, "\n");
-}
-exports.decodeHtmlAttrib = decodeHtmlAttrib;
-function preprocess(content, vars) {
-    // Replace all {{variables}}.
-    Object.keys(vars).forEach((key) => {
-        content = content.replace(new RegExp(`{{${key}}}`, "g"), vars[key]);
-    });
-    return content;
-}
-exports.preprocess = preprocess;
-function renderContent(content, vars = {}, fsroot = ".", maxdepth = 10) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const preprocessed = preprocess(content, vars);
-        const document = parseDocument(preprocessed);
-        return renderDocument(document, vars, fsroot, maxdepth);
-    });
-}
-exports.renderContent = renderContent;
-function renderDocument(document, vars = {}, fsroot = ".", maxdepth = 10) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const renderings = traverse(document.childNodes.map((node) => node))
-            .filter((node) => node.nodeName === "include")
-            .map((node) => __awaiter(this, void 0, void 0, function* () {
-            const attribs = node.attrs.reduce((dict, attr) => {
-                dict[attr.name] = attr.value;
-                return dict;
-            }, {});
-            // If the node has a vars attribute, it overrides our current vars.
-            // NOTE: this will propagate to all subsequent render calls, including nested calls.
-            if (attribs.hasOwnProperty("data-vars")) {
-                vars = Object.assign({}, vars, JSON.parse(decodeHtmlAttrib(attribs["data-vars"])));
-            }
-            // Early exit: <include> tags must have a src attribute.
-            if (!attribs["src"]) {
-                throw new Error(`"src" attribute missing from ${JSON.stringify(node)}`);
-            }
-            // The included file will replace this tag.
-            const handler = (content) => {
-                const docfragment = parse5.parseFragment(content);
-                replaceNodeWith(node, docfragment.childNodes);
-            };
-            // Case 1: Absolute remote path.
-            if (attribs["src"].indexOf("://") !== -1) {
-                yield renderRemotePath(attribs["src"], vars).then(handler);
-                // Case 2: Relative remote path.
-            }
-            else if (fsroot.indexOf("://") !== -1) {
-                const relpath = `${fsroot}/${attribs["src"]}`;
-                yield renderRemotePath(relpath, vars).then(handler);
-                // Case 3: Local absolute path.
-            }
-            else if (attribs["src"].charAt(0) === "/") {
-                yield renderLocalPath(attribs["src"], vars).then(handler);
-                // Case 4: Local relative path.
-            }
-            else {
-                const relpath = path.join(fsroot, attribs["src"]);
-                yield renderLocalPath(relpath, vars).then(handler);
-            }
-        }));
-        // Wait for all the rendering operations to complete.
-        yield Promise.all(renderings);
-        // The document has now been modified and can be re-serialized.
-        const result = parse5.serialize(document);
-        // Re-render until no changes are made.
-        if (renderings.length === 0) {
-            return result;
-        }
-        else if (maxdepth === 0) {
-            throw new Error("Maximum recursion depth reached.");
-        }
-        else {
-            return renderContent(result, vars, fsroot, maxdepth--);
-        }
-    });
-}
-exports.renderDocument = renderDocument;
+const web_1 = require("./web");
 function renderLocalPath(fpath, vars = {}, encoding = "utf8") {
     return __awaiter(this, void 0, void 0, function* () {
         const content = yield fs.readFile(fpath, { encoding: encoding });
@@ -155,13 +20,15 @@ function renderLocalPath(fpath, vars = {}, encoding = "utf8") {
     });
 }
 exports.renderLocalPath = renderLocalPath;
-function renderRemotePath(fpath, vars = {}) {
+function renderContent(content, vars = {}, fsroot = ".", maxdepth = 10) {
     return __awaiter(this, void 0, void 0, function* () {
-        const content = (yield axios_1.default
-            .get(fpath, { responseType: "text" })
-            .catch((err) => Promise.reject(new Error(err.message)))
-            .then((res) => res.data));
-        return renderContent(content, vars, path.dirname(fpath));
+        return (0, web_1.renderContent)(content, vars, fsroot, maxdepth, renderLocalPath);
     });
 }
-exports.renderRemotePath = renderRemotePath;
+exports.renderContent = renderContent;
+// Re-exports from web.
+var web_2 = require("./web");
+Object.defineProperty(exports, "preprocess", { enumerable: true, get: function () { return web_2.preprocess; } });
+Object.defineProperty(exports, "renderRemotePath", { enumerable: true, get: function () { return web_2.renderRemotePath; } });
+Object.defineProperty(exports, "encodeHtmlAttrib", { enumerable: true, get: function () { return web_2.encodeHtmlAttrib; } });
+Object.defineProperty(exports, "decodeHtmlAttrib", { enumerable: true, get: function () { return web_2.decodeHtmlAttrib; } });

package/dist/index.test.js

@@ -17,7 +17,7 @@ const gulp = require("gulp");
 // @ts-ignore
 const StaticServer = require("static-server");
 const Mancha = require("./index.js");
-const index_js_1 = require("./gulp/index.js");
+const gulp_js_1 = require("./gulp.js");
 /**
  * Helper function used to test a transformation of string elements.
  * @param fname file name to test
@@ -85,7 +85,7 @@ function testRemotePathRender(fname, compare = "Hello World", vars = {}) {
 function testBufferedTransform(fname, compare = "Hello World", vars = {}) {
     return new Promise((resolve, reject) => {
         const file = new File({ path: fname, contents: fs.readFileSync(fname) });
-        (0, index_js_1.default)(vars, path.join(__dirname, "fixtures"))._transform(file, "utf8", (err, file) => {
+        (0, gulp_js_1.default)(vars, path.join(__dirname, "fixtures"))._transform(file, "utf8", (err, file) => {
             if (err) {
                 reject(err);
             }
@@ -111,7 +111,7 @@ function testStreamedTransform(fname, compare = "Hello World", vars = {}) {
             path: fname,
             contents: fs.createReadStream(fname),
         });
-        (0, index_js_1.default)(vars, path.join(__dirname, "fixtures"))._transform(file, "utf8", (err, file) => {
+        (0, gulp_js_1.default)(vars, path.join(__dirname, "fixtures"))._transform(file, "utf8", (err, file) => {
             var _a, _b;
             if (err) {
                 reject(err);
@@ -157,7 +157,7 @@ function testGulpedTransform(fname, compare = "Hello World", vars = {}) {
         let content = null;
         gulp
             .src(fname)
-            .pipe((0, index_js_1.default)(vars, path.join(__dirname, "fixtures")))
+            .pipe((0, gulp_js_1.default)(vars, path.join(__dirname, "fixtures")))
             .on("data", (chunk) => {
             content = chunk.isBuffer() ? chunk.contents.toString("utf8") : null;
         })