honkit 6.0.1 → 6.0.3

package/lib/output/modifiers/annotateText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotateText.d.ts","sourceRoot":"","sources":["../../../src/output/modifiers/annotateText.ts"],"names":[],"mappings":"AAwDA;;;;;;GAMG;AACH,iBAAS,YAAY,CAAC,OAAO,KAAA,EAAE,gBAAgB,KAAA,EAAE,CAAC,KAAA,QAqBjD;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"annotateText.d.ts","sourceRoot":"","sources":["../../../src/output/modifiers/annotateText.ts"],"names":[],"mappings":"AAyDA;;;;;;GAMG;AACH,iBAAS,YAAY,CAAC,OAAO,KAAA,EAAE,gBAAgB,KAAA,EAAE,CAAC,KAAA,QA4BjD;AAED,eAAe,YAAY,CAAC"}

package/lib/output/modifiers/annotateText.js

@@ -20,14 +20,15 @@ function replaceText($, el, search, replace, text_only) {
             // Loop over all childNodes.
             while (node) {
                 // Only process text nodes.
-                if (node.nodeType === 3) {
+                if (node.nodeType === 3 && node.nodeValue) {
                     // The original node value.
                     val = node.nodeValue;
                     new_val = val.replace(search, replace);
                     // Only replace text if the new value is actually different!
                     if (new_val !== val) {
                         if (!text_only && /</.test(new_val)) {
-                            // The new value contains HTML, set it in a slower but far more                              // robust way.
+                            // The new value contains HTML, set it in a slower but far more
+                            // robust way.
                             // Don't remove the node yet, or the loop will lose its place.
                             const currentTextNode = $(node);
                             const newHTML = val.replace(val, new_val);
@@ -64,16 +65,21 @@ function annotateText(entries, glossaryFilePath, $) {
     entries.forEach((entry) => {
         const entryId = entry.getID();
         const name = entry.getName();
+        const nameLowerCase = `${name}`.toLowerCase();
+        const quotedName = pregQuote(nameLowerCase);
+        const nameCleaned = nameLowerCase.replace(/[^\w\s]/, "");
+        const searchRegex = nameLowerCase === nameCleaned
+            ? new RegExp(`\\b(${quotedName})\\b`, "gi")
+            : new RegExp(`(?:\\s*)(${quotedName})(?:\\s*)`, "gi");
         const description = entry.getDescription();
-        const searchRegex = new RegExp(`\\b(${pregQuote(name.toLowerCase())})\\b`, "gi");
         $("*").each(function () {
             const $this = $(this);
             if ($this.is(ANNOTATION_IGNORE) || $this.parents(ANNOTATION_IGNORE).length > 0)
                 return;
             // @ts-expect-error ts-migrate(2554) FIXME: Expected 5 arguments, but got 4.
-            replaceText($, this, searchRegex, (match) => {
+            replaceText($, this, searchRegex, (match, matchedTerm) => {
                 return (`<a href="/${glossaryFilePath}#${entryId}" ` +
-                    `class="glossary-term" title="${(0, escape_html_1.default)(description)}">${match}</a>`);
+                    `class="glossary-term" title="${(0, escape_html_1.default)(description)}">${matchedTerm}</a>`);
             });
         });
     });

package/lib/plugins/PluginResolver.d.ts

@@ -21,6 +21,6 @@ export declare class PluginResolver {
      * @param {string} packageName
      * @returns {string} return path to module
      */
-    resolvePluginPackageName(packageName: any): any;
+    resolvePluginPackageName(packageName: any): string;
 }
 //# sourceMappingURL=PluginResolver.d.ts.map

package/lib/plugins/PluginResolver.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginResolver = void 0;
 const path_1 = __importDefault(require("path"));
 const util = __importStar(require("./package-name-util"));
-const try_resolve_1 = __importDefault(require("try-resolve"));
+const path_2 = __importDefault(require("../utils/path"));
 const SPECIAL_PACKAGE_NAME = [
     "fontsettings", // → @honkit/honkit-plugin-fontsettings
     "highlight", // → @honkit/honkit-plugin-highlight
@@ -71,11 +71,11 @@ class PluginResolver {
         // e.g.) load theme-default as @honkit/honkit-plugins-theme-default
         const honkitScopePackageName = `@honkit/${honkitFullPackageName}`;
         // In sometimes, HonKit package has not main field - so search package.json
-        const pkgPath = (0, try_resolve_1.default)(path_1.default.join(baseDir, honkitFullPackageName, "/package.json")) ||
-            (0, try_resolve_1.default)(path_1.default.join(baseDir, gitbookFullPackageName, "/package.json")) ||
-            (0, try_resolve_1.default)(path_1.default.join(baseDir, packageName, "/package.json")) ||
+        const pkgPath = path_2.default.tryResolve(path_1.default.join(baseDir, honkitFullPackageName, "/package.json")) ||
+            path_2.default.tryResolve(path_1.default.join(baseDir, gitbookFullPackageName, "/package.json")) ||
+            path_2.default.tryResolve(path_1.default.join(baseDir, packageName, "/package.json")) ||
             (SPECIAL_PACKAGE_NAME.includes(packageName) &&
-                (0, try_resolve_1.default)(path_1.default.join(baseDir, honkitScopePackageName, "/package.json")));
+                path_2.default.tryResolve(path_1.default.join(baseDir, honkitScopePackageName, "/package.json")));
         if (!pkgPath) {
             throw new ReferenceError(`Failed to load HonKit's plugin module: "${packageName}" is not found.
 

package/lib/utils/path.d.ts

@@ -3,12 +3,19 @@ declare function isInRoot(root: any, filename: any): boolean;
 declare function resolveInRoot(root: any): string;
 declare function setExtension(filename: any, ext: any): string;
 declare function isPureRelative(filename: any): boolean;
+/**
+ * Try to resolve package name
+ * if `packageName` is found, return resolved absolute path.
+ * if `packageName` is not found, return `undefined`
+ **/
+declare function tryResolve(packageName: string): string | undefined;
 declare const _default: {
     isInRoot: typeof isInRoot;
     resolveInRoot: typeof resolveInRoot;
     normalize: typeof normalizePath;
     setExtension: typeof setExtension;
     isPureRelative: typeof isPureRelative;
+    tryResolve: typeof tryResolve;
 };
 export default _default;
 //# sourceMappingURL=path.d.ts.map

package/lib/utils/path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/utils/path.ts"],"names":[],"mappings":"AAIA,iBAAS,aAAa,CAAC,QAAQ,KAAA,UAE9B;AAGD,iBAAS,QAAQ,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA,WAY/B;AAID,iBAAS,aAAa,CAAC,IAAI,KAAA,UAkB1B;AAGD,iBAAS,YAAY,CAAC,QAAQ,KAAA,EAAE,GAAG,KAAA,UAElC;AAQD,iBAAS,cAAc,CAAC,QAAQ,KAAA,WAE/B;;;;;;;;AAED,wBAME"}
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/utils/path.ts"],"names":[],"mappings":"AAIA,iBAAS,aAAa,CAAC,QAAQ,KAAA,UAE9B;AAGD,iBAAS,QAAQ,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA,WAY/B;AAID,iBAAS,aAAa,CAAC,IAAI,KAAA,UAkB1B;AAGD,iBAAS,YAAY,CAAC,QAAQ,KAAA,EAAE,GAAG,KAAA,UAElC;AAQD,iBAAS,cAAc,CAAC,QAAQ,KAAA,WAE/B;AAED;;;;IAII;AACJ,iBAAS,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAM3D;;;;;;;;;AAED,wBAOE"}

package/lib/utils/path.js

@@ -40,7 +40,7 @@ function resolveInRoot(root) {
     }
     return result;
 }
-// Chnage extension of a file
+// Change extension of a file
 function setExtension(filename, ext) {
     return path_1.default.join(path_1.default.dirname(filename), path_1.default.basename(filename, path_1.default.extname(filename)) + ext);
 }
@@ -53,10 +53,24 @@ function setExtension(filename, ext) {
 function isPureRelative(filename) {
     return filename.indexOf("./") === 0 || filename.indexOf("../") === 0;
 }
+/**
+ * Try to resolve package name
+ * if `packageName` is found, return resolved absolute path.
+ * if `packageName` is not found, return `undefined`
+ **/
+function tryResolve(packageName) {
+    try {
+        return require.resolve(packageName);
+    }
+    catch {
+        return undefined;
+    }
+}
 exports.default = {
     isInRoot: isInRoot,
     resolveInRoot: resolveInRoot,
     normalize: normalizePath,
     setExtension: setExtension,
-    isPureRelative: isPureRelative
+    isPureRelative: isPureRelative,
+    tryResolve: tryResolve
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honkit",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "description": "HonKit is building beautiful books using Markdown.",
   "keywords": [
     "git",
@@ -37,12 +37,12 @@
     "updateSnapshot": "jest src -u"
   },
   "dependencies": {
-    "@honkit/asciidoc": "6.0.1",
-    "@honkit/honkit-plugin-fontsettings": "6.0.1",
-    "@honkit/honkit-plugin-highlight": "6.0.1",
-    "@honkit/honkit-plugin-theme-default": "6.0.1",
-    "@honkit/html": "6.0.1",
-    "@honkit/markdown-legacy": "6.0.1",
+    "@honkit/asciidoc": "6.0.3",
+    "@honkit/honkit-plugin-fontsettings": "6.0.3",
+    "@honkit/honkit-plugin-highlight": "6.0.3",
+    "@honkit/honkit-plugin-theme-default": "6.0.3",
+    "@honkit/html": "6.0.3",
+    "@honkit/markdown-legacy": "6.0.3",
     "bash-color": "^0.0.4",
     "cheerio": "^1.0.0",
     "chokidar": "^3.6.0",
@@ -86,11 +86,10 @@
     "send": "^0.17.2",
     "tiny-lr": "^1.1.1",
     "tmp": "0.0.28",
-    "try-resolve": "^1.0.1",
     "urijs": "^1.19.11"
   },
   "devDependencies": {
-    "@honkit/internal-test-utils": "6.0.1",
+    "@honkit/internal-test-utils": "6.0.3",
     "@relmify/jest-serializer-strip-ansi": "^1.0.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^22.7.4",
@@ -101,5 +100,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^5.6.2"
   },
-  "gitHead": "8a67601b23ce480bce2bd1a8fb787f1f6f56656f"
+  "gitHead": "608191107875c3d613840d702b76a9888992d7bc"
 }