honkit 3.7.0 → 3.7.1

package/lib/templating/__tests__/conrefsLoader.js

@@ -12,44 +12,46 @@ describe("ConrefsLoader", () => {
     const fileName = path_1.default.join(dirName, "test.md");
     describe("Git", () => {
         const engine = new templateEngine_1.default({
+            // @ts-expect-error: Expected 0 arguments, but got 1.
             loader: new conrefsLoader_1.default(dirName),
         });
         test("should include content from git", () => {
             jest.setTimeout(20 * 1000);
             // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-            return render_1.default(engine, fileName, '{% include "git+https://gist.github.com/69ea4542e4c8967d2fa7.git/test.md" %}').then((out) => {
+            return (0, render_1.default)(engine, fileName, '{% include "git+https://gist.github.com/69ea4542e4c8967d2fa7.git/test.md" %}').then((out) => {
                 expect(out.getContent()).toBe("Hello from git");
             });
         });
         test("should handle deep inclusion (1)", () => {
             jest.setTimeout(20 * 1000);
             // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-            return render_1.default(engine, fileName, '{% include "git+https://gist.github.com/69ea4542e4c8967d2fa7.git/test2.md" %}').then((out) => {
+            return (0, render_1.default)(engine, fileName, '{% include "git+https://gist.github.com/69ea4542e4c8967d2fa7.git/test2.md" %}').then((out) => {
                 expect(out.getContent()).toBe("First Hello. Hello from git");
             });
         });
         test("should handle deep inclusion (2)", () => {
             jest.setTimeout(20 * 1000);
             // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-            return render_1.default(engine, fileName, '{% include "git+https://gist.github.com/69ea4542e4c8967d2fa7.git/test3.md" %}').then((out) => {
+            return (0, render_1.default)(engine, fileName, '{% include "git+https://gist.github.com/69ea4542e4c8967d2fa7.git/test3.md" %}').then((out) => {
                 expect(out.getContent()).toBe("First Hello. Hello from git");
             });
         });
     });
     describe("Local", () => {
         const engine = new templateEngine_1.default({
+            // @ts-expect-error: Expected 0 arguments, but got 1.
             loader: new conrefsLoader_1.default(dirName),
         });
         describe("Relative", () => {
             test("should resolve basic relative filepath", () => {
                 // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-                return render_1.default(engine, fileName, '{% include "include.md" %}').then((out) => {
+                return (0, render_1.default)(engine, fileName, '{% include "include.md" %}').then((out) => {
                     expect(out.getContent()).toBe("Hello World");
                 });
             });
             test("should resolve basic parent filepath", () => {
                 // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-                return render_1.default(engine, path_1.default.join(dirName, "hello/test.md"), '{% include "../include.md" %}').then((out) => {
+                return (0, render_1.default)(engine, path_1.default.join(dirName, "hello/test.md"), '{% include "../include.md" %}').then((out) => {
                     expect(out.getContent()).toBe("Hello World");
                 });
             });
@@ -57,13 +59,13 @@ describe("ConrefsLoader", () => {
         describe("Absolute", () => {
             test("should resolve absolute filepath", () => {
                 // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-                return render_1.default(engine, fileName, '{% include "/include.md" %}').then((out) => {
+                return (0, render_1.default)(engine, fileName, '{% include "/include.md" %}').then((out) => {
                     expect(out.getContent()).toBe("Hello World");
                 });
             });
             test("should resolve absolute filepath when in a directory", () => {
                 // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-                return render_1.default(engine, path_1.default.join(dirName, "hello/test.md"), '{% include "/include.md" %}').then((out) => {
+                return (0, render_1.default)(engine, path_1.default.join(dirName, "hello/test.md"), '{% include "/include.md" %}').then((out) => {
                     expect(out.getContent()).toBe("Hello World");
                 });
             });
@@ -78,11 +80,12 @@ describe("ConrefsLoader", () => {
             return `test-${source}-endtest`;
         }
         const engine = new templateEngine_1.default({
+            // @ts-expect-error: Expected 0 arguments, but got 1.
             loader: new conrefsLoader_1.default(dirName, transform),
         });
         test("should transform included content", () => {
             // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-            return render_1.default(engine, fileName, '{% include "include.md" %}').then((out) => {
+            return (0, render_1.default)(engine, fileName, '{% include "include.md" %}').then((out) => {
                 expect(out.getContent()).toBe("test-Hello World-endtest");
             });
         });

package/lib/templating/__tests__/postRender.js

@@ -26,11 +26,11 @@ describe("postRender", () => {
     });
     test("should correctly replace block", () => {
         // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-        return render_1.default(engine, "README.md", "Hello {% lower %}Samy{% endlower %}")
+        return (0, render_1.default)(engine, "README.md", "Hello {% lower %}Samy{% endlower %}")
             .then((output) => {
             expect(output.getContent()).toMatch(/Hello \{\{\-([\S]+)\-\}\}/);
             expect(output.getBlocks().size).toBe(1);
-            return postRender_1.default(engine, output);
+            return (0, postRender_1.default)(engine, output);
         })
             .then((result) => {
             expect(result).toBe("Hello samy");
@@ -38,11 +38,11 @@ describe("postRender", () => {
     });
     test("should correctly replace blocks", () => {
         // @ts-expect-error ts-migrate(2554) FIXME: Expected 4 arguments, but got 3.
-        return render_1.default(engine, "README.md", "Hello {% lower %}Samy{% endlower %}{% prefix %}Pesse{% endprefix %}")
+        return (0, render_1.default)(engine, "README.md", "Hello {% lower %}Samy{% endlower %}{% prefix %}Pesse{% endprefix %}")
             .then((output) => {
             expect(output.getContent()).toMatch(/Hello \{\{\-([\S]+)\-\}\}\{\{\-([\S]+)\-\}\}/);
             expect(output.getBlocks().size).toBe(2);
-            return postRender_1.default(engine, output);
+            return (0, postRender_1.default)(engine, output);
         })
             .then((result) => {
             expect(result).toBe("Hello samy_Pesse_");

package/lib/templating/__tests__/replaceShortcuts.js

@@ -17,11 +17,11 @@ describe("replaceShortcuts", () => {
         }),
     ]);
     test("should correctly replace inline matches by block", () => {
-        const content = replaceShortcuts_1.default(blocks, "test.md", "Hello $$a = b$$");
+        const content = (0, replaceShortcuts_1.default)(blocks, "test.md", "Hello $$a = b$$");
         expect(content).toBe("Hello {% math %}a = b{% endmath %}");
     });
     test("should correctly replace block matches", () => {
-        const content = replaceShortcuts_1.default(blocks, "test.md", "Hello\n$$\na = b\n$$\n");
+        const content = (0, replaceShortcuts_1.default)(blocks, "test.md", "Hello\n$$\na = b\n$$\n");
         expect(content).toBe("Hello\n{% math %}\na = b\n{% endmath %}\n");
     });
 });

package/lib/templating/conrefsLoader.js

@@ -19,7 +19,6 @@ const path_2 = __importDefault(require("../utils/path"));
  * @param {Function(filePath, source)} transformFn (optional)
  * @param {Logger} logger (optional)
  */
-// @ts-expect-error: Property 'extend' does not exist on type 'typeof Loader'.
 const ConrefsLoader = nunjucks_1.default.Loader.extend({
     async: true,
     init: function (rootFolder, transformFn, logger) {
@@ -28,6 +27,7 @@ const ConrefsLoader = nunjucks_1.default.Loader.extend({
         this.logger = logger;
         this.git = new git_1.default();
     },
+    // @ts-expect-error: Property 'extend' does not exist on type 'typeof Loader'.
     getSource: function (sourceURL, callback) {
         const that = this;
         this.git

package/lib/templating/render.js

@@ -23,7 +23,7 @@ function renderTemplate(engine, filePath, content, context) {
     // Create nunjucks environment
     const env = engine.toNunjucks(blocks);
     // Replace shortcuts from plugin's blocks
-    content = replaceShortcuts_1.default(engine.getBlocks(), filePath, content);
+    content = (0, replaceShortcuts_1.default)(engine.getBlocks(), filePath, content);
     return timing_1.default.measure("template.render", promise_1.default.nfcall(env.renderString.bind(env), content, context, {
         path: filePath,
     })

package/lib/templating/renderFile.js

@@ -18,7 +18,7 @@ function renderTemplateFile(engine, filePath, context) {
     const loader = engine.getLoader();
     // Resolve the filePath
     const resolvedFilePath = loader.resolve(null, filePath);
-    return promise_1.default()
+    return (0, promise_1.default)()
         .then(() => {
         if (!loader.async) {
             return loader.getSource(resolvedFilePath);
@@ -33,7 +33,7 @@ function renderTemplateFile(engine, filePath, context) {
                 filename: filePath,
             });
         }
-        return render_1.default(engine, result.path, result.src, context);
+        return (0, render_1.default)(engine, result.path, result.src, context);
     });
 }
 exports.default = renderTemplateFile;

package/lib/templating/replaceShortcuts.js

@@ -16,7 +16,7 @@ function applyShortcut(content, shortcut) {
     const end = shortcut.getEnd();
     const tagStart = shortcut.getStartTag();
     const tagEnd = shortcut.getEndTag();
-    const regex = new RegExp(`${escape_string_regexp_1.default(start)}([\\s\\S]*?[^\\$])${escape_string_regexp_1.default(end)}`, "g");
+    const regex = new RegExp(`${(0, escape_string_regexp_1.default)(start)}([\\s\\S]*?[^\\$])${(0, escape_string_regexp_1.default)(end)}`, "g");
     return content.replace(regex, (all, match) => {
         return `{% ${tagStart} %}${match}{% ${tagEnd} %}`;
     });
@@ -30,7 +30,7 @@ function applyShortcut(content, shortcut) {
  * @return {string}
  */
 function replaceShortcuts(blocks, filePath, content) {
-    const shortcuts = listShortcuts_1.default(blocks, filePath);
+    const shortcuts = (0, listShortcuts_1.default)(blocks, filePath);
     return shortcuts.reduce(applyShortcut, content);
 }
 exports.default = replaceShortcuts;

package/lib/templating/themesLoader.js

@@ -8,8 +8,8 @@ const nunjucks_1 = __importDefault(require("nunjucks"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const path_2 = __importDefault(require("../utils/path"));
-// @ts-expect-error: Property 'extend' does not exist on type 'typeof Loader'.
 const ThemesLoader = nunjucks_1.default.Loader.extend({
+    // @ts-expect-error: Property 'extend' does not exist on type 'typeof Loader'.
     init: function (searchPaths) {
         this.searchPaths = immutable_1.default.List(searchPaths).map(path_1.default.normalize);
     },

package/lib/utils/command.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_1 = __importDefault(require("is"));
 const child_process_1 = __importDefault(require("child_process"));
-const spawn_cmd_1 = require("spawn-cmd");
 const promise_1 = __importDefault(require("./promise"));
 /**
  Execute a command
@@ -20,7 +19,7 @@ function exec(command, options) {
         if (!err) {
             return d.resolve();
         }
-        err.message = stdout.toString("utf8") + stderr.toString("utf8");
+        err.message = stdout.toString() + stderr.toString();
         d.reject(err);
     });
     child.stdout.on("data", (data) => {
@@ -31,36 +30,6 @@ function exec(command, options) {
     });
     return d.promise;
 }
-/**
- Spawn an executable
-
- @param {string} command
- @param {Array} args
- @param {Object} options
- @return {Promise}
- */
-function spawnCmd(command, args, options) {
-    const d = promise_1.default.defer();
-    const child = spawn_cmd_1.spawn(command, args, options);
-    child.on("error", (error) => {
-        return d.reject(error);
-    });
-    child.stdout.on("data", (data) => {
-        d.notify(data);
-    });
-    child.stderr.on("data", (data) => {
-        d.notify(data);
-    });
-    child.on("close", (code) => {
-        if (code === 0) {
-            d.resolve();
-        }
-        else {
-            d.reject(new Error(`Error with command "${command}"`));
-        }
-    });
-    return d.promise;
-}
 /**
  Transform an option object to a command line string
 
@@ -99,6 +68,5 @@ function optionsToShellArgs(options) {
 }
 exports.default = {
     exec: exec,
-    spawn: spawnCmd,
     optionsToShellArgs: optionsToShellArgs,
 };

package/lib/utils/error.js

@@ -14,28 +14,28 @@ function enforce(err) {
     return err;
 }
 // Random error wrappers during parsing/generation
-const ParsingError = wrapped_1.default({
+const ParsingError = (0, wrapped_1.default)({
     message: "Parsing Error: {origMessage}",
     type: "parse",
 });
-const OutputError = wrapped_1.default({
+const OutputError = (0, wrapped_1.default)({
     message: "Output Error: {origMessage}",
     type: "generate",
 });
 // A file does not exists
-const FileNotFoundError = typed_1.default({
+const FileNotFoundError = (0, typed_1.default)({
     type: "file.not-found",
     message: 'No "{filename}" file (or is ignored)',
     filename: null,
 });
 // A file cannot be parsed
-const FileNotParsableError = typed_1.default({
+const FileNotParsableError = (0, typed_1.default)({
     type: "file.not-parsable",
     message: '"{filename}" file cannot be parsed',
     filename: null,
 });
 // A file is outside the scope
-const FileOutOfScopeError = typed_1.default({
+const FileOutOfScopeError = (0, typed_1.default)({
     type: "file.out-of-scope",
     message: '"{filename}" not in "{root}"',
     filename: null,
@@ -43,7 +43,7 @@ const FileOutOfScopeError = typed_1.default({
     code: "EACCESS",
 });
 // A file is outside the scope
-const RequireInstallError = typed_1.default({
+const RequireInstallError = (0, typed_1.default)({
     type: "install.required",
     message: '"{cmd}" is not installed.\n{install}',
     cmd: null,
@@ -51,24 +51,24 @@ const RequireInstallError = typed_1.default({
     install: "",
 });
 // Error for nunjucks templates
-const TemplateError = wrapped_1.default({
+const TemplateError = (0, wrapped_1.default)({
     message: 'Error compiling template "{filename}": {origMessage}',
     type: "template",
     filename: null,
 });
 // Error for nunjucks templates
-const PluginError = wrapped_1.default({
+const PluginError = (0, wrapped_1.default)({
     message: 'Error with plugin "{plugin}": {origMessage}',
     type: "plugin",
     plugin: null,
 });
 // Error with the book's configuration
-const ConfigurationError = wrapped_1.default({
+const ConfigurationError = (0, wrapped_1.default)({
     message: "Error with book's configuration: {origMessage}",
     type: "configuration",
 });
 // Error during ebook generation
-const EbookError = wrapped_1.default({
+const EbookError = (0, wrapped_1.default)({
     message: "Error during ebook generation: {origMessage}\n{stdout}",
     type: "ebook",
     stdout: "",

package/lib/utils/fs.js

@@ -17,7 +17,7 @@ function writeStream(filename, st) {
     const d = promise_1.default.defer();
     const wstream = fs_1.default.createWriteStream(filename);
     const cleanup = function () {
-        destroy_1.default(wstream);
+        (0, destroy_1.default)(wstream);
         wstream.removeAllListeners();
     };
     wstream.on("finish", () => {
@@ -58,7 +58,7 @@ function genTmpDir(opts) {
 }
 // Download an image
 function download(uri, dest) {
-    return writeStream(dest, request_1.default(uri));
+    return writeStream(dest, (0, request_1.default)(uri));
 }
 // Find a filename available in a folder
 function uniqueFilename(base, filename) {
@@ -71,12 +71,12 @@ function uniqueFilename(base, filename) {
         _filename = `${filename}_${i}${ext}`;
         i = i + 1;
     }
-    return promise_1.default(path_1.default.relative(base, _filename));
+    return (0, promise_1.default)(path_1.default.relative(base, _filename));
 }
 // Create all required folder to create a file
 function ensureFile(filename) {
     const base = path_1.default.dirname(filename);
-    return promise_1.default(mkdirp_1.default(base));
+    return (0, promise_1.default)((0, mkdirp_1.default)(base));
 }
 // Remove a folder
 function rmDir(base) {
@@ -121,10 +121,10 @@ function pickFile(rootFolder, fileName) {
 function ensureFolder(rootFolder) {
     return rmDir(rootFolder)
         .fail(() => {
-        return promise_1.default();
+        return (0, promise_1.default)();
     })
         .then(() => {
-        return promise_1.default(mkdirp_1.default(rootFolder));
+        return (0, promise_1.default)((0, mkdirp_1.default)(rootFolder));
     });
 }
 exports.default = {

package/lib/utils/git.js

@@ -24,7 +24,7 @@ Git.prototype.repoID = function (host, ref) {
 Git.prototype.allocateDir = function () {
     const that = this;
     if (this.tmpDir)
-        return promise_1.default();
+        return (0, promise_1.default)();
     // @ts-expect-error ts-migrate(2554) FIXME: Expected 1 arguments, but got 0.
     return fs_1.default.tmpDir().then((dir) => {
         that.tmpDir = dir;
@@ -61,13 +61,13 @@ Git.prototype.resolve = function (giturl) {
     // Path to a file in a git repo?
     if (!Git.isUrl(giturl)) {
         if (this.resolveRoot(giturl))
-            return promise_1.default(giturl);
-        return promise_1.default(null);
+            return (0, promise_1.default)(giturl);
+        return (0, promise_1.default)(null);
     }
     if (is_1.default.string(giturl))
         giturl = Git.parseUrl(giturl);
     if (!giturl)
-        return promise_1.default(null);
+        return (0, promise_1.default)(null);
     // Clone or get from cache
     return this.clone(giturl.host, giturl.ref).then((repo) => {
         return path_1.default.resolve(repo, giturl.filepath);

package/lib/utils/promise.js

@@ -24,7 +24,7 @@ function reduce(arr, iter, base) {
         return prev.then((val) => {
             return iter(val, elem, key);
         });
-    }, q_1.default(base));
+    }, (0, q_1.default)(base));
 }
 exports.reduce = reduce;
 /**
@@ -50,7 +50,7 @@ exports.forEach = forEach;
  */
 function serie(arr, iter, base) {
     return reduce(arr, (before, item, key) => {
-        return q_1.default(iter(item, key)).then((r) => {
+        return (0, q_1.default)(iter(item, key)).then((r) => {
             before.push(r);
             return before;
         });
@@ -72,7 +72,7 @@ function some(arr, iter) {
                 return val;
             return iter(elem, i);
         });
-    }, q_1.default());
+    }, (0, q_1.default)());
 }
 exports.some = some;
 /**
@@ -84,7 +84,7 @@ exports.some = some;
  */
 function mapAsList(arr, iter) {
     return reduce(arr, (prev, entry, i) => {
-        return q_1.default(iter(entry, i)).then((out) => {
+        return (0, q_1.default)(iter(entry, i)).then((out) => {
             prev.push(out);
             return prev;
         });
@@ -104,7 +104,7 @@ function map(arr, iter) {
             type = "OrderedMap";
         }
         return mapAsList(arr, (value, key) => {
-            return q_1.default(iter(value, key)).then((result) => {
+            return (0, q_1.default)(iter(value, key)).then((result) => {
                 return [key, result];
             });
         }).then((result) => {
@@ -127,7 +127,7 @@ exports.map = map;
 function wrap(func) {
     return function () {
         const args = Array.prototype.slice.call(arguments, 0);
-        return q_1.default().then(() => {
+        return (0, q_1.default)().then(() => {
             return func.apply(null, args);
         });
     };

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "honkit",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "HonKit is building beautiful books using Markdown.",
   "keywords": [
     "git",
+    "markdown",
     "book",
     "honkit",
     "gitbook"
@@ -46,10 +47,10 @@
     "updateSnapshot": "jest src -u"
   },
   "dependencies": {
-    "@honkit/asciidoc": "^3.7.0",
-    "@honkit/honkit-plugin-highlight": "^3.7.0",
-    "@honkit/honkit-plugin-theme-default": "^3.7.0",
-    "@honkit/markdown-legacy": "^3.7.0",
+    "@honkit/asciidoc": "^3.6.17",
+    "@honkit/honkit-plugin-highlight": "^3.6.19",
+    "@honkit/honkit-plugin-theme-default": "^3.6.20",
+    "@honkit/markdown-legacy": "^3.6.17",
     "bash-color": "^0.0.4",
     "cheerio": "^0.20.0",
     "chokidar": "^3.3.0",
@@ -80,6 +81,7 @@
     "json-schema-defaults": "^0.1.1",
     "jsonschema": "1.1.0",
     "juice": "^6.0.0",
+    "lru_map": "^0.4.1",
     "memoize-one": "^5.1.1",
     "mkdirp": "^1.0.4",
     "moment": "^2.24.0",
@@ -94,19 +96,18 @@
     "resolve": "^1.17.0",
     "semver": "^5.1.0",
     "send": "^0.17.1",
-    "spawn-cmd": "0.0.2",
     "tiny-lr": "^1.1.1",
     "tmp": "0.0.28",
     "try-resolve": "^1.0.1",
     "urijs": "^1.19.6"
   },
   "devDependencies": {
-    "@honkit/internal-test-utils": "^3.7.0",
+    "@honkit/internal-test-utils": "^3.6.17",
     "@types/nunjucks": "^3.1.3",
     "cross-env": "^7.0.3",
     "jest": "^26.6.3",
     "rimraf": "^3.0.2",
     "typescript": "^4.1.3"
   },
-  "gitHead": "6091347c5a858a590bf0e2efb3716e56a22a626f"
+  "gitHead": "35d95d4d0b9f28dce4a4ac8cd3feb39c12ec1d1b"
 }