zenn-markdown-html 0.1.102-alpha.0 → 0.1.103

package/lib/index.js

@@ -19,7 +19,7 @@ var mdFootnote = require('markdown-it-footnote');
 var mdTaskLists = require('markdown-it-task-lists');
 var mdInlineComments = require('markdown-it-inline-comments');
 var mdLinkAttributes = require('markdown-it-link-attributes');
-var md = markdown_it_1.default({
+var md = (0, markdown_it_1.default)({
     breaks: true,
     linkify: true,
 });

package/lib/utils/helper.js

@@ -4,22 +4,22 @@ exports.isValidHttpUrl = exports.generateYoutubeHtmlFromVideoId = exports.genera
 var utils_1 = require("markdown-it/lib/common/utils");
 var url_matcher_1 = require("./url-matcher");
 function generateTweetHtml(url) {
-    return "<div class=\"embed-tweet\"><embed-tweet src=\"" + url + "\"></embed-tweet></div>";
+    return "<div class=\"embed-tweet\"><embed-tweet src=\"".concat(url, "\"></embed-tweet></div>");
 }
 exports.generateTweetHtml = generateTweetHtml;
 function generateCardHtml(url) {
-    return "<div class=\"embed-zenn-link\"><iframe src=\"https://card.zenn.dev/?url=" + encodeURIComponent(url) + "\" frameborder=\"0\" scrolling=\"no\" loading=\"lazy\"></iframe></div>";
+    return "<div class=\"embed-zenn-link\"><iframe src=\"https://card.zenn.dev/?url=".concat(encodeURIComponent(url), "\" frameborder=\"0\" scrolling=\"no\" loading=\"lazy\"></iframe></div>");
 }
 exports.generateCardHtml = generateCardHtml;
 function generateYoutubeHtml(videoId, start) {
-    var escapedVideoId = utils_1.escapeHtml(videoId);
+    var escapedVideoId = (0, utils_1.escapeHtml)(videoId);
     // 48時間以内
     var time = Math.min(Number(start || 0), 48 * 60 * 60);
-    var startQuery = time ? "&start=" + time : '';
-    return "<div class=\"embed-youtube\"><iframe src=\"https://www.youtube.com/embed/" + escapedVideoId + "?loop=1&playlist=" + escapedVideoId + startQuery + "\" allowfullscreen loading=\"lazy\"></iframe></div>";
+    var startQuery = time ? "&start=".concat(time) : '';
+    return "<div class=\"embed-youtube\"><iframe src=\"https://www.youtube.com/embed/".concat(escapedVideoId, "?loop=1&playlist=").concat(escapedVideoId).concat(startQuery, "\" allowfullscreen loading=\"lazy\"></iframe></div>");
 }
 function generateYoutubeHtmlFromUrl(url) {
-    var params = url_matcher_1.extractYoutubeVideoParameters(url);
+    var params = (0, url_matcher_1.extractYoutubeVideoParameters)(url);
     if (!params) {
         return generateCardHtml(url);
     }

package/lib/utils/highlight.js

@@ -9,13 +9,13 @@ var utils_1 = require("markdown-it/lib/common/utils");
 var components_1 = __importDefault(require("prismjs/components/"));
 var prism_diff_highlight_1 = __importDefault(require("@steelydylan/prism-diff-highlight"));
 // diffプラグインを有効化
-prism_diff_highlight_1.default();
+(0, prism_diff_highlight_1.default)();
 function loadPrismGrammer(lang) {
     if (!lang)
         return undefined;
     var langObject = prismjs_1.default.languages[lang];
     if (langObject === undefined) {
-        components_1.default([lang]);
+        (0, components_1.default)([lang]);
         langObject = prismjs_1.default.languages[lang];
     }
     return langObject;
@@ -24,12 +24,12 @@ function highlightContent(_a) {
     var text = _a.text, prismGrammer = _a.prismGrammer, langName = _a.langName, hasDiff = _a.hasDiff;
     if (prismGrammer && langName) {
         if (hasDiff)
-            return prismjs_1.default.highlight(text, prismjs_1.default.languages.diff, "diff-" + langName);
+            return prismjs_1.default.highlight(text, prismjs_1.default.languages.diff, "diff-".concat(langName));
         return prismjs_1.default.highlight(text, prismGrammer, langName);
     }
     if (hasDiff)
         return prismjs_1.default.highlight(text, prismjs_1.default.languages.diff, 'diff');
-    return utils_1.escapeHtml(text);
+    return (0, utils_1.escapeHtml)(text);
 }
 function highlight(text, langName, hasDiff) {
     var prismGrammer = loadPrismGrammer(langName);

package/lib/utils/md-container.js

@@ -17,7 +17,7 @@ exports.containerDetailsOptions = {
         if (tokens[idx].nesting === 1) {
             // opening tag
             return ('<details><summary>' +
-                utils_1.escapeHtml(summary) +
+                (0, utils_1.escapeHtml)(summary) +
                 '</summary><div class="details-content">');
         }
         else {
@@ -39,7 +39,7 @@ exports.containerMessageOptions = {
         var msgClassName = (m === null || m === void 0 ? void 0 : m[1]) || '';
         if (tokens[idx].nesting === 1) {
             // opening tag
-            return '<div class="msg ' + utils_1.escapeHtml(msgClassName) + '">';
+            return '<div class="msg ' + (0, utils_1.escapeHtml)(msgClassName) + '">';
         }
         else {
             // closing tag

package/lib/utils/md-custom-block.js

@@ -10,65 +10,65 @@ var blockOptions = {
         if (!(videoId === null || videoId === void 0 ? void 0 : videoId.match(/^[a-zA-Z0-9_-]+$/))) {
             return 'YouTubeのvideoIDが不正です';
         }
-        return helper_1.generateYoutubeHtmlFromVideoId(videoId);
+        return (0, helper_1.generateYoutubeHtmlFromVideoId)(videoId);
     },
     slideshare: function (key) {
         if (!(key === null || key === void 0 ? void 0 : key.match(/^[a-zA-Z0-9_-]+$/))) {
             return 'Slide Shareのkeyが不正です';
         }
-        return "<div class=\"embed-slideshare\"><iframe src=\"https://www.slideshare.net/slideshow/embed_code/key/" + utils_1.escapeHtml(key) + "\" scrolling=\"no\" allowfullscreen loading=\"lazy\"></iframe></div>";
+        return "<div class=\"embed-slideshare\"><iframe src=\"https://www.slideshare.net/slideshow/embed_code/key/".concat((0, utils_1.escapeHtml)(key), "\" scrolling=\"no\" allowfullscreen loading=\"lazy\"></iframe></div>");
     },
     speakerdeck: function (key) {
         if (!(key === null || key === void 0 ? void 0 : key.match(/^[a-zA-Z0-9_-]+$/))) {
             return 'Speaker Deckのkeyが不正です';
         }
-        return "<div class=\"embed-speakerdeck\"><iframe src=\"https://speakerdeck.com/player/" + utils_1.escapeHtml(key) + "\" scrolling=\"no\" allowfullscreen allow=\"encrypted-media\" loading=\"lazy\"></iframe></div>";
+        return "<div class=\"embed-speakerdeck\"><iframe src=\"https://speakerdeck.com/player/".concat((0, utils_1.escapeHtml)(key), "\" scrolling=\"no\" allowfullscreen allow=\"encrypted-media\" loading=\"lazy\"></iframe></div>");
     },
     jsfiddle: function (str) {
-        if (!url_matcher_1.isJsfiddleUrl(str)) {
+        if (!(0, url_matcher_1.isJsfiddleUrl)(str)) {
             return 'jsfiddleのURLが不正です';
         }
         // URLを~/embedded/とする
         // ※ すでにembeddedもしくはembedが含まれるURLが入力されている場合は、そのままURLを使用する。
         var url = str;
         if (!url.includes('embed')) {
-            url = url.endsWith('/') ? url + "embedded/" : url + "/embedded/";
+            url = url.endsWith('/') ? "".concat(url, "embedded/") : "".concat(url, "/embedded/");
         }
-        return "<div class=\"embed-jsfiddle\"><iframe src=\"" + url + "\" scrolling=\"no\" frameborder=\"no\" allowfullscreen allowtransparency=\"true\" loading=\"lazy\"></iframe></div>";
+        return "<div class=\"embed-jsfiddle\"><iframe src=\"".concat(url, "\" scrolling=\"no\" frameborder=\"no\" allowfullscreen allowtransparency=\"true\" loading=\"lazy\"></iframe></div>");
     },
     codepen: function (str) {
-        if (!url_matcher_1.isCodepenUrl(str)) {
+        if (!(0, url_matcher_1.isCodepenUrl)(str)) {
             return 'CodePenのURLが不正です';
         }
         var url = new URL(str.replace('/pen/', '/embed/'));
         url.searchParams.set('embed-version', '2');
-        return "<div class=\"embed-codepen\"><iframe src=\"" + url + "\" scrolling=\"no\" scrolling=\"no\" frameborder=\"no\" allowtransparency=\"true\" loading=\"lazy\"></iframe></div>";
+        return "<div class=\"embed-codepen\"><iframe src=\"".concat(url, "\" scrolling=\"no\" scrolling=\"no\" frameborder=\"no\" allowtransparency=\"true\" loading=\"lazy\"></iframe></div>");
     },
     codesandbox: function (str) {
-        if (!url_matcher_1.isCodesandboxUrl(str)) {
+        if (!(0, url_matcher_1.isCodesandboxUrl)(str)) {
             return '「https://codesandbox.io/embed/」から始まる正しいURLを入力してください';
         }
-        return "<div class=\"embed-codesandbox\"><iframe src=\"" + str + "\" style=\"width:100%;height:500px;border:none;overflow:hidden;\" allow=\"accelerometer; ambient-light-sensor; camera; encrypted-media; geolocation; gyroscope; hid; microphone; midi; payment; usb; vr; xr-spatial-tracking\" loading=\"lazy\" sandbox=\"allow-modals allow-forms allow-popups allow-scripts allow-same-origin\"></iframe></div>";
+        return "<div class=\"embed-codesandbox\"><iframe src=\"".concat(str, "\" style=\"width:100%;height:500px;border:none;overflow:hidden;\" allow=\"accelerometer; ambient-light-sensor; camera; encrypted-media; geolocation; gyroscope; hid; microphone; midi; payment; usb; vr; xr-spatial-tracking\" loading=\"lazy\" sandbox=\"allow-modals allow-forms allow-popups allow-scripts allow-same-origin\"></iframe></div>");
     },
     stackblitz: function (str) {
-        if (!url_matcher_1.isStackblitzUrl(str)) {
+        if (!(0, url_matcher_1.isStackblitzUrl)(str)) {
             return 'StackBlitzのembed用のURLを指定してください';
         }
-        return "<div class=\"embed-stackblitz\"><iframe src=\"" + str + "\" scrolling=\"no\" frameborder=\"no\" allowtransparency=\"true\" loading=\"lazy\" allowfullscreen></iframe></div>";
+        return "<div class=\"embed-stackblitz\"><iframe src=\"".concat(str, "\" scrolling=\"no\" frameborder=\"no\" allowtransparency=\"true\" loading=\"lazy\" allowfullscreen></iframe></div>");
     },
     tweet: function (str) {
-        if (!url_matcher_1.isTweetUrl(str))
+        if (!(0, url_matcher_1.isTweetUrl)(str))
             return 'ツイートページのURLを指定してください';
-        return helper_1.generateTweetHtml(str);
+        return (0, helper_1.generateTweetHtml)(str);
     },
     card: function (str) {
         // generateCardHtml内でURLはエンコードされるためここでのバリデーションは軽めでOK
-        if (!helper_1.isValidHttpUrl(str))
+        if (!(0, helper_1.isValidHttpUrl)(str))
             return 'URLが不正です';
-        return helper_1.generateCardHtml(str);
+        return (0, helper_1.generateCardHtml)(str);
     },
     gist: function (str) {
-        if (!url_matcher_1.isGistUrl(str))
+        if (!(0, url_matcher_1.isGistUrl)(str))
             return 'GitHub GistのページURLを指定してください';
         /**
          * gistのURL は
@@ -77,7 +77,7 @@ var blockOptions = {
          * のような形式
          */
         var _a = str.split('?file='), pageUrl = _a[0], file = _a[1];
-        return "<div class=\"embed-gist\"><embed-gist page-url=\"" + pageUrl + "\" encoded-filename=\"" + (file ? encodeURIComponent(file) : '') + "\" /></div>";
+        return "<div class=\"embed-gist\"><embed-gist page-url=\"".concat(pageUrl, "\" encoded-filename=\"").concat(file ? encodeURIComponent(file) : '', "\" /></div>");
     },
 };
 // Forked from: https://github.com/posva/markdown-it-custom-block

package/lib/utils/md-katex.js

@@ -19,7 +19,7 @@ var inlineRules = [
     {
         name: 'math_inline_double',
         rex: /\${2}((?:\S)|(?:\S(?!.*\]\(http).*?\S))\${2}/gy,
-        tmpl: "<section class=\"" + katexClassName + "\"><embed-katex display-mode=\"1\"><eqn>$1</eqn></embed-katex></section>",
+        tmpl: "<section class=\"".concat(katexClassName, "\"><embed-katex display-mode=\"1\"><eqn>$1</eqn></embed-katex></section>"),
         tag: '$$',
         pre: preHandler,
         post: postHandler,
@@ -27,7 +27,7 @@ var inlineRules = [
     {
         name: 'math_inline',
         rex: /\$((?:\S)|(?:\S(?!.*\]\(http.*\$.*\)).*?\S))\$/gy,
-        tmpl: "<embed-katex><eq class=\"" + katexClassName + "\">$1</eq></embed-katex>",
+        tmpl: "<embed-katex><eq class=\"".concat(katexClassName, "\">$1</eq></embed-katex>"),
         tag: '$',
         pre: preHandler,
         post: postHandler,
@@ -37,13 +37,13 @@ var blockRules = [
     {
         name: 'math_block_eqno',
         rex: /\${2}([^$]+?)\${2}\s*?\(([^)\s]+?)\)/gmy,
-        tmpl: "<section class=\"" + katexClassName + " eqno\"><eqn><embed-katex display-mode=\"1\">$1</embed-katex></eqn><span>($2)</span></section>",
+        tmpl: "<section class=\"".concat(katexClassName, " eqno\"><eqn><embed-katex display-mode=\"1\">$1</embed-katex></eqn><span>($2)</span></section>"),
         tag: '$$',
     },
     {
         name: 'math_block',
         rex: /\${2}([^$]+?)\${2}/gmy,
-        tmpl: "<section class=\"" + katexClassName + "\"><eqn><embed-katex display-mode=\"1\">$1</embed-katex></eqn></section>",
+        tmpl: "<section class=\"".concat(katexClassName, "\"><eqn><embed-katex display-mode=\"1\">$1</embed-katex></eqn></section>"),
         tag: '$$',
     },
 ];

package/lib/utils/md-linkify-to-card.js

@@ -38,14 +38,14 @@ function convertAutolinkToEmbed(inlineChildTokens) {
         }
         // 埋め込み用のHTMLを生成
         var embedToken = new token_1.default('html_inline', '', 0);
-        if (url_matcher_1.isTweetUrl(url)) {
-            embedToken.content = helper_1.generateTweetHtml(url);
+        if ((0, url_matcher_1.isTweetUrl)(url)) {
+            embedToken.content = (0, helper_1.generateTweetHtml)(url);
         }
-        else if (url_matcher_1.isYoutubeUrl(url)) {
-            embedToken.content = helper_1.generateYoutubeHtmlFromUrl(url);
+        else if ((0, url_matcher_1.isYoutubeUrl)(url)) {
+            embedToken.content = (0, helper_1.generateYoutubeHtmlFromUrl)(url);
         }
         else {
-            embedToken.content = helper_1.generateCardHtml(url);
+            embedToken.content = (0, helper_1.generateCardHtml)(url);
         }
         // a要素自体はカードにより不要になるため非表示に
         linkOpenToken.attrJoin('style', 'display: none');

package/lib/utils/md-renderer-fence.js

@@ -5,10 +5,10 @@ var utils_1 = require("markdown-it/lib/common/utils");
 var highlight_1 = require("./highlight");
 function getHtml(_a) {
     var content = _a.content, className = _a.className, fileName = _a.fileName;
-    var escapedClass = utils_1.escapeHtml(className);
-    return "<div class=\"code-block-container\">" + (fileName
-        ? "<div class=\"code-block-filename-container\"><span class=\"code-block-filename\">" + utils_1.escapeHtml(fileName) + "</span></div>"
-        : '') + "<pre class=\"" + escapedClass + "\"><code class=\"" + escapedClass + "\">" + content + "</code></pre></div>";
+    var escapedClass = (0, utils_1.escapeHtml)(className);
+    return "<div class=\"code-block-container\">".concat(fileName
+        ? "<div class=\"code-block-filename-container\"><span class=\"code-block-filename\">".concat((0, utils_1.escapeHtml)(fileName), "</span></div>")
+        : '', "<pre class=\"").concat(escapedClass, "\"><code class=\"").concat(escapedClass, "\">").concat(content, "</code></pre></div>");
 }
 function getClassName(_a) {
     var _b = _a.langName, langName = _b === void 0 ? '' : _b, hasDiff = _a.hasDiff;
@@ -16,9 +16,9 @@ function getClassName(_a) {
     if (!isSafe)
         return '';
     if (hasDiff) {
-        return "diff-highlight " + (langName.length ? "language-diff-" + langName : '');
+        return "diff-highlight ".concat(langName.length ? "language-diff-".concat(langName) : '');
     }
-    return langName ? "language-" + langName : '';
+    return langName ? "language-".concat(langName) : '';
 }
 var fallbackLanguages = {
     vue: 'html',
@@ -26,7 +26,7 @@ var fallbackLanguages = {
     fish: 'shell',
     sh: 'shell',
     cwl: 'yaml',
-    tf: 'hcl',
+    tf: 'hcl', // ref: https://github.com/PrismJS/prism/issues/1252
 };
 function normalizeLangName(str) {
     var _a;
@@ -69,13 +69,13 @@ function mdRendererFence(md) {
         var _a = tokens[idx], info = _a.info, content = _a.content;
         var _b = parseInfo(info), langName = _b.langName, fileName = _b.fileName, hasDiff = _b.hasDiff;
         if (langName === 'mermaid') {
-            return "<div class=\"embed-mermaid\"><embed-mermaid><pre class=\"zenn-mermaid\">" + utils_1.escapeHtml(content.trim()) + "</pre></embed-mermaid></div>";
+            return "<div class=\"embed-mermaid\"><embed-mermaid><pre class=\"zenn-mermaid\">".concat((0, utils_1.escapeHtml)(content.trim()), "</pre></embed-mermaid></div>");
         }
         var className = getClassName({
             langName: langName,
             hasDiff: hasDiff,
         });
-        var highlightedContent = highlight_1.highlight(content, langName, hasDiff);
+        var highlightedContent = (0, highlight_1.highlight)(content, langName, hasDiff);
         return getHtml({
             content: highlightedContent,
             className: className,

package/lib/utils/url-matcher.js

@@ -34,7 +34,7 @@ function extractYoutubeVideoParameters(youtubeUrl) {
         var start = urlParams.get('t');
         return {
             videoId: match[9],
-            start: start === null || start === void 0 ? void 0 : start.replace('s', ''),
+            start: start === null || start === void 0 ? void 0 : start.replace('s', ''), // https://www.youtube.com/watch?v=ABCSDGG&t=19101s => 19101
         };
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-markdown-html",
-  "version": "0.1.102-alpha.0",
+  "version": "0.1.103",
   "license": "MIT",
   "description": "Convert markdown to zenn flavor html.",
   "main": "lib/index.js",
@@ -21,31 +21,31 @@
   },
   "devDependencies": {
     "@types/jest": "^26.0.19",
-    "@types/markdown-it": "^10.0.1",
+    "@types/markdown-it": "^12.2.3",
     "@types/node": "^14.0.5",
     "@types/prismjs": "^1.16.6",
     "@typescript-eslint/eslint-plugin": "^4.23.0",
     "@typescript-eslint/parser": "^4.23.0",
     "eslint": "^7.26.0",
     "eslint-config-prettier": "^8.3.0",
-    "jest": "^26.6.3",
+    "jest": "^27.4.7",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.4.4",
-    "typescript": "^3.9.3"
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.4"
   },
   "dependencies": {
     "@steelydylan/markdown-it-imsize": "^1.0.2",
     "@steelydylan/prism-diff-highlight": "1.0.4",
-    "markdown-it": "^11.0.0",
-    "markdown-it-anchor": "^8.1.2",
+    "markdown-it": "^12.3.2",
+    "markdown-it-anchor": "^8.4.1",
     "markdown-it-container": "^2.0.0",
-    "markdown-it-footnote": "^3.0.2",
+    "markdown-it-footnote": "^3.0.3",
     "markdown-it-inline-comments": "^1.0.1",
     "markdown-it-link-attributes": "^3.0.0",
     "markdown-it-task-lists": "^2.1.1",
     "prismjs": "^1.26.0"
   },
-  "gitHead": "903fccba99be75bfe75e4f5ed5ac4f404ce3a8d0",
+  "gitHead": "e25396d2fb4cc49c362d8529b9eaa10f193b9c1d",
   "publishConfig": {
     "access": "public"
   }