markdown-maker 1.9.1 → 1.10.0

package/build/parse.js

@@ -0,0 +1,281 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splice = void 0;
+var fs = require("fs"); /* for handling reading of files */
+var path = require("path"); /* for handling file paths */
+var Colors = require("colors.ts"); /* for adding colours to strings */
+Colors.enable();
+var marked = require("marked");
+var commands_1 = require("./commands");
+var TargetType;
+(function (TargetType) {
+    TargetType[TargetType["HTML"] = 0] = "HTML";
+    TargetType[TargetType["MARKDOWN"] = 1] = "MARKDOWN";
+})(TargetType || (TargetType = {}));
+/* parse some md
+ * recursively with extra options */
+var Parser = /** @class */ (function () {
+    function Parser(filename, clargs, opts) {
+        /* this.working_directory */
+        this.file = filename;
+        if (!opts)
+            opts = {};
+        /* the parent parser */
+        this.parent = opts.parent;
+        this.line_num = 0;
+        this.wd = path.dirname(filename);
+        this.wd_full = path.resolve(this.wd);
+        /* finished blob */
+        this.blobs = {};
+        /* all options */
+        this.opts = {
+            defs: {},
+            secs: [],
+            args: [],
+            depth: 0,
+            verbose: false,
+            debug: false,
+            max_depth: 5,
+            use_underscore: false,
+            toc_level: 3,
+            allow_undefined: false,
+            html: false,
+            watch: false,
+            targetType: undefined,
+            only_warn: false,
+            parent: undefined,
+            isFileCallback: function (f) {
+                if (!fs.existsSync(f))
+                    return false;
+                return fs.readFileSync(f, "utf-8") + "\n";
+            },
+        };
+        if (!clargs) {
+            clargs = {};
+        }
+        /* append all commandline arguments to this */
+        Object.assign(this.opts, clargs);
+        Object.assign(this.opts, opts);
+        this.raw = this.opts.isFileCallback(filename) || filename;
+    }
+    /**
+     * parse wrapper for handling
+     * preprocessing, parsing and postprocess
+     **/
+    Parser.prototype.parse = function () {
+        (0, commands_1.load_extensions)(this);
+        if (this.opts.verbose || this.opts.debug) {
+            console.log(Colors.colors("magenta", "parsing " + this.file + ": depth=" + this.opts.depth));
+        }
+        if (this.opts.debug) {
+            console.log("Parsing options:");
+            console.log(this.opts);
+        }
+        /* reset sections for beginning parse */
+        if (this.opts.depth === 0)
+            this.opts.secs = [];
+        var __blob;
+        /* apply preproccessing to raw file */
+        __blob = this.preprocess(this.raw);
+        /* main parser instance call */
+        __blob = this.mainparse(__blob);
+        /**
+         * apply postprocessing after */
+        __blob = this.postprocess(__blob);
+        return __blob;
+    };
+    Parser.prototype.mainparse = function (blob) {
+        var _this = this;
+        if (this.opts.verbose || this.opts.debug) {
+            console.debug("beginning mainparse of '".concat(this.file, "'").blue);
+        }
+        /* main parser instance loop */
+        blob.split("\n").forEach(function (line, lnum) {
+            _this.line_num = lnum;
+            /* if line looks like a title */
+            var titleMatch = line.trim().match(/^(#+) (.+)$/);
+            if (titleMatch) {
+                if (_this.opts.verbose || _this.opts.debug)
+                    console.log("found toc element: " + line);
+                /* implement toc level */
+                var level = titleMatch[1].length;
+                var title = titleMatch[2];
+                _this.opts.secs.push({ level: level, title: title });
+                if (_this.opts.debug) {
+                    console.log("updated sections:", { level: level, title: title });
+                }
+            }
+        });
+        return this.parse_commands(blob, commands_1.commands.parse);
+    };
+    Parser.prototype.preprocess = function (blob) {
+        if (this.opts.verbose || this.opts.debug) {
+            console.debug("beginning preprocess of '".concat(this.file, "'").blue);
+        }
+        return this.parse_commands(blob, commands_1.commands.preparse);
+    };
+    Parser.prototype.postprocess = function (blob) {
+        if (this.opts.verbose || this.opts.debug) {
+            console.debug("beginning postprocess of '".concat(this.file, "'").blue);
+        }
+        blob = this.parse_commands(blob, commands_1.commands.postparse);
+        /* remove double empty lines */
+        blob = this.remove_double_blank_lines(blob);
+        blob = blob.trimEnd() + "\n\n";
+        return blob;
+    };
+    Parser.prototype.parse_commands = function (blob, commands) {
+        var _this = this;
+        commands.forEach(function (command) {
+            /* Add global flag to RegExp */
+            var re = new RegExp(command.validator.source, (command.validator.flags || "") + "g");
+            blob = blob.replace(re, function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return command.act(args, _this) || "";
+            });
+        });
+        return blob;
+    };
+    Parser.prototype.parse_all_commands = function (blob, commands) {
+        var _this = this;
+        Object.keys(commands).forEach(function (key) {
+            blob = _this.parse_commands(blob, commands[key]);
+        });
+        return blob;
+    };
+    Parser.prototype.titleId = function (title) {
+        var sep = this.opts.use_underscore ? "_" : "-";
+        title = title
+            .toLowerCase()
+            .replace(/[^\w\s]+/g, "")
+            .replace(/[\s_]+/g, sep);
+        return title;
+    };
+    Parser.prototype.gen_toc = function () {
+        var _this = this;
+        var __blob = [];
+        var tabSize = 2;
+        var beg = "* ";
+        var hor = " ".repeat(tabSize);
+        this.opts.secs.forEach(function (sec) {
+            if (sec.level > _this.opts.toc_level)
+                return;
+            var title = sec.title.replace(/_/g, " ");
+            title = _this.parse_all_commands(title, commands_1.commands);
+            var link = _this.titleId(title);
+            var __line = hor.repeat(Math.max(sec.level - 1, 0)) + beg + "[".concat(title, "](#").concat(link, ")");
+            __blob.push(__line);
+        });
+        return __blob.join("\n");
+    };
+    Parser.prototype.line_num_from_index = function (index) {
+        return this.raw.substring(0, index).split("\n").length + 1;
+    };
+    Parser.prototype.remove_double_blank_lines = function (blob) {
+        /* replace all triple newlines, and EOF by double newline */
+        blob = blob.replace(/(\r\n|\n){3,}/g, "\n\n");
+        return blob;
+    };
+    /* output the parsed document to bundle */
+    Parser.prototype.to = function (bundleName, callback) {
+        var dir = path.dirname(bundleName);
+        if (callback === undefined)
+            callback = function () { };
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        if (!this.opts.html) {
+            this.get(TargetType.MARKDOWN, function (blob) {
+                fs.writeFile(bundleName, blob, function () { return callback(bundleName); });
+            });
+        }
+        else {
+            var htmlFileName_1 = bundleName.replace(".md", ".html");
+            fs.writeFile(htmlFileName_1, this.html(), function () { return callback(htmlFileName_1); });
+        }
+    };
+    Parser.prototype.html = function () {
+        var htmlFormatted = marked(this.get(TargetType.HTML));
+        if (this.opts.watch) {
+            return ("<script>w=new WebSocket(\"ws:localhost:7788\");w.addEventListener(\"message\",(e)=>{if(e.data==\"refresh\")location.reload();});</script>\n" +
+                htmlFormatted);
+        }
+        return htmlFormatted;
+    };
+    Parser.prototype.get = function (targetType, callback) {
+        /* If target type is undefined, markdown is the default */
+        if (targetType === undefined)
+            targetType = TargetType.MARKDOWN;
+        if (this.blobs[targetType]) {
+            if (callback) {
+                callback(this.blobs[targetType]);
+            }
+            return this.blobs[targetType];
+        }
+        else {
+            try {
+                this.opts.targetType = targetType;
+                var blob = this.parse();
+                this.opts.targetType = undefined;
+                if (callback)
+                    callback(blob);
+                return blob;
+            }
+            catch (error) {
+                /* Compile a traceback of error */
+                var traceback = "";
+                var p = this;
+                do {
+                    if (error instanceof commands_1.MDMError)
+                        traceback += "\n...on line ".concat(p.line_num_from_index(error.match.index), " in ").concat(p.file).grey(15);
+                    else
+                        traceback += "\n...on line ".concat(p.line_num, " in ").concat(p.file).grey(15);
+                    if (p.parent)
+                        p = p.parent;
+                } while (p.parent);
+                error.message += traceback;
+                /* only interested in node stacktrace when debugging */
+                if (!this.opts.debug)
+                    error.stack = "";
+                if (this.opts.only_warn)
+                    console.error(error);
+                else
+                    throw error;
+            }
+        }
+    };
+    Parser.TOKEN = "#md";
+    return Parser;
+}());
+function splice(str, startIndex, width, newSubStr) {
+    var start = str.slice(0, startIndex);
+    var end = str.slice(startIndex + width);
+    return start + newSubStr + end;
+}
+exports.splice = splice;
+/* add extention to marked for classed blockquotes*/
+marked.use({
+    renderer: {
+        blockquote: function (quote) {
+            /* find the ending, and if not, return the default */
+            var ending = quote.match(/\{(.+)\}\s*<\/p>/);
+            if (!ending)
+                return "<blockquote>".concat(quote, "</blockquote>");
+            var args = ending[1].split(" ");
+            var classes = args.filter(function (arg) { return arg.startsWith("."); });
+            var id = args.filter(function (arg) { return arg.startsWith("#"); });
+            var classNames = classes.map(function (c) { return c.slice(1); });
+            var classText = classes.length > 0 ? "class=\"".concat(classNames.join(" "), "\"") : "";
+            var idText = id.length > 0 ? "id=\"".concat(id[0].slice(1), "\"") : "";
+            /* remove the ending from the quote */
+            quote = quote.replace(/\{(.+)\}\s*<\/p>/, "</p>");
+            return "<blockquote ".concat(classText, " ").concat(idText, ">\n").concat(quote.trim(), "</blockquote>");
+        },
+    },
+});
+module.exports = Parser;
+exports.default = Parser;
+//# sourceMappingURL=parse.js.map

package/build/parse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}

package/build/templates.d.ts

@@ -0,0 +1,10 @@
+declare const templates: {
+    [key: string]: string;
+};
+/**
+ * Function to add a template to the templates object. Similar to definitions and variables, but reside as an extension.
+ * @param name The name of the template
+ * @param content The replacement string
+ */
+export declare function new_template(name: string, content: string): void;
+export default templates;

package/build/templates.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.new_template = void 0;
+var templates = {};
+/**
+ * Function to add a template to the templates object. Similar to definitions and variables, but reside as an extension.
+ * @param name The name of the template
+ * @param content The replacement string
+ */
+function new_template(name, content) {
+    templates[name] = content;
+}
+exports.new_template = new_template;
+/* initialize default templates */
+var presentation_template = require("../src/templates/presentation.js");
+var mathjax_template = require("../src/templates/mathjax.js");
+new_template("presentation", presentation_template);
+new_template("mathjax", mathjax_template);
+exports.default = templates;
+//# sourceMappingURL=templates.js.map

package/build/templates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":";;;AAAA,IAAM,SAAS,GAA8B,EAAE,CAAC;AAEhD;;;;GAIG;AACH,SAAgB,YAAY,CAAC,IAAY,EAAE,OAAe;IACtD,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;AAC9B,CAAC;AAFD,oCAEC;AAED,kCAAkC;AAClC,IAAM,qBAAqB,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAC;AAC1E,IAAM,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAChE,YAAY,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;AACpD,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAE1C,kBAAe,SAAS,CAAC"}

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "markdown-maker",
-    "version": "1.9.1",
+    "version": "1.10.0",
     "description": "",
     "main": "src/cltool.ts",
     "bin": {
-        "parse": "build/cltool.js"
+        "mdparse": "build/cltool.js"
     },
     "pkg": {
         "assets": [
@@ -23,7 +23,7 @@
         ]
     },
     "scripts": {
-        "test": "mocha",
+        "test": "mocha --require test/hooks.js",
         "test:yarn": "mocha",
         "bundle": "tsc --project tsconfig.json",
         "main": "node build/cltool.js document/main.md -o dist/bundle.md --debug",

package/src/cltool.ts

@@ -11,7 +11,7 @@ const { version } = require("../package.json"); /* package version number */
 const choki = require("chokidar");
 
 export const argParser = new ArgumentParser({
-    description: "Markdown bundler, with extra options",
+    description: "Markdown bundler, with extra options. Extension file is loaded from ./extensions.js, if it exists",
     prog: "mdparse",
 });
 
@@ -92,6 +92,14 @@ function main() {
         clargs = argParser.parse_args();
     }
 
+    /* if src is init, create config file and exit */
+    if (clargs.src == "init") {
+        const template = fs.readFileSync(path.join(__dirname, "..", "src", "templates", "configTemplate.json"));
+        fs.writeFileSync(configFileName, template);
+        fs.writeFileSync("main.md", "# Main\n");
+        return;
+    }
+
     /* helper method for calling parser */
     const compile = (source, output, cb?) => {
         /* load data from file, if it exists,
@@ -140,9 +148,8 @@ function main() {
 
     /* compile once */
     if (!clargs.watch) compile(clargs.src, clargs.output);
-
     /* watch the folder and recompile on change */
-    if (clargs.watch) {
+    else {
         const srcDirName = path.dirname(clargs.src);
         console.log(`Watching ${srcDirName} for changes...`.yellow);
         server = new WebSocketServer({ port: 7788 });
@@ -154,6 +161,7 @@ function main() {
             console.log(e.message);
         }
     }
+
 }
 
 /* main entrypoint */

package/src/commands.ts

@@ -42,7 +42,7 @@ export class Command {
     constructor(
         validator: RegExp,
         acter: (match: RegExpMatchArray, parser: Parser) => string | void,
-        type: CommandType,
+        type: CommandType
     ) {
         this.type = type;
         this.validator = validator;
@@ -71,7 +71,7 @@ export class Command {
 new Command(
     /(\s|^)<(.+)>/,
     (match, parser) => `${match[1]}#mdvar<${match[2]}>`,
-    CommandType.PREPARSE,
+    CommandType.PREPARSE
 );
 
 /* mddef */
@@ -80,7 +80,7 @@ new Command(
     (match, parser) => {
         parser.opts.defs[match[1]] = match[2].replace("_", " ");
     },
-    CommandType.PARSE,
+    CommandType.PARSE
 );
 
 /* mdvar */
@@ -92,7 +92,7 @@ new Command(
             throw new Error(`Undefined variable: ${match[1]}`);
         return (value = value || `<${match[1]}>`);
     },
-    CommandType.PARSE,
+    CommandType.PARSE
 );
 
 /** mdinclude */
@@ -107,17 +107,31 @@ new Command(
         }
 
         /* get the matching group */
-        const [_, name, condition] = match;
+        let [_, name, condition] = match;
 
         /* implement conditional imports */
         if (condition && !parser.opts.args.includes(condition)) return;
 
+        const fsstat = fs.lstatSync(path.join(parser.wd, name));
+        if (fsstat.isDirectory()) {
+            /* check if a file with the same name of the
+             * exists in the folder */
+
+            if (fs.existsSync(path.join(parser.wd, name, `${name}.md`))) {
+                name = path.join(name, `${name}.md`);
+            } else {
+                throw new Error(
+                    `No entry file found in folder "${name}". Looking for "${name}.md"`
+                );
+            }
+        }
+
         const recursiveParser = new Parser(
             path.join(parser.wd, name),
             parser.opts,
             {
                 parent: parser,
-            },
+            }
         );
 
         /* keep the options the same */
@@ -134,7 +148,7 @@ new Command(
         parser.opts.depth--;
         return blob;
     },
-    CommandType.PARSE,
+    CommandType.PARSE
 );
 
 /* mdlabel */
@@ -149,7 +163,7 @@ new Command(
         parser.opts.secs.push({ level, title });
         return `<span id="${link}"></span>`;
     },
-    CommandType.PREPARSE,
+    CommandType.PREPARSE
 );
 
 /* mdref */
@@ -163,7 +177,7 @@ new Command(
 
             if (i === parser.opts.secs.length - 1)
                 throw new Error(
-                    `Reference to [${match[1]}] could not be resolved!`,
+                    `Reference to [${match[1]}] could not be resolved!`
                 );
         }
 
@@ -174,12 +188,12 @@ new Command(
         else if (parser.opts.targetType === TargetType.MARKDOWN)
             return `[${match[1]}](#${link})`;
     },
-    CommandType.PARSE,
+    CommandType.PARSE
 );
 
 /* mdtemplate */
 new Command(
-    /#mdtemplate<([\w\W]+)>/,
+    /#mdtemplate<(\w+?)>/,
     (match, parser) => {
         const template = match[1];
         const replacement = templates[template];
@@ -190,49 +204,39 @@ new Command(
             throw new MDMError(`Template \"${template}\" not found!`, match);
         }
     },
-    CommandType.PARSE,
+    CommandType.PARSE
 );
 
 new Command(
     /#mdmaketoc(?:<>)?/,
     (match, parser) => parser.gen_toc(),
-    CommandType.POSTPARSE,
+    CommandType.POSTPARSE
 );
 
-export function load_extensions(parser: Parser) {
-    /* global extention */
-    const global_extensions_path = path.join(process.cwd(), "extensions.js");
-    if (fs.existsSync(global_extensions_path)) {
-        const extensions = requireRuntime(global_extensions_path);
+const loaded_extentions: fs.PathLike[] = [];
+
+function load_extension(parser: Parser, file: fs.PathLike) {
+    if (loaded_extentions.includes(file)) return;
+    if (fs.existsSync(file)) {
+        const extensions = requireRuntime(file);
+        loaded_extentions.push(file);
         extensions.main(new_template, new_command);
 
         if (parser.opts.verbose)
-            console.log(
-                `Loaded global extensions from ${global_extensions_path}`
-                    .yellow,
-            );
+            console.log(`Loaded extensions from ${file}`.yellow);
     } else if (parser.opts.debug) {
-        console.log(
-            `No global extensions found at ${global_extensions_path}`.red,
-        );
+        console.log(`No extensions found at ${file}`.red);
     }
+}
+
+export function load_extensions(parser: Parser) {
+    /* global extention */
+    const global_extensions_path = path.join(__dirname, "extensions.js");
+    load_extension(parser, global_extensions_path);
 
     /* project extention */
     const project_extensions_path = path.join(parser.wd_full, "extensions.js");
-    if (fs.existsSync(project_extensions_path)) {
-        const extensions = requireRuntime(project_extensions_path);
-        extensions.main(new_template, new_command);
-
-        if (parser.opts.verbose)
-            console.log(
-                `Loaded project extensions from ${project_extensions_path}`
-                    .yellow,
-            );
-    } else if (parser.opts.debug) {
-        console.log(
-            `No project extensions found at ${project_extensions_path}!`.red,
-        );
-    }
+    load_extension(parser, project_extensions_path);
 }
 
 /**
@@ -244,7 +248,7 @@ export function load_extensions(parser: Parser) {
 export function new_command(
     regex: RegExp,
     acter: (match: RegExpMatchArray, parser: Parser) => string,
-    type?: CommandType,
+    type?: CommandType
 ) {
     new Command(regex, acter, type || CommandType.PARSE);
 }