zenn-markdown-html 0.1.160 → 0.1.161

package/lib/embed.js

@@ -33,7 +33,7 @@ const embedGenerators = {
     }
     const [key, slideParamStr] = str.split('?');
     const slideQuery = slideParamStr ? `?${slideParamStr}` : '';
-    return `<span class="embed-block embed-speakerdeck"><iframe src="https://speakerdeck.com/player/${(0, _utils.escapeHtml)(key)}${slideQuery}" scrolling="no" allowfullscreen allow="encrypted-media" loading="lazy"></iframe></span>`;
+    return `<span class="embed-block embed-speakerdeck"><iframe src="https://speakerdeck.com/player/${(0, _utils.escapeHtml)(key)}${(0, _utils.escapeHtml)(slideQuery)}" scrolling="no" allowfullscreen allow="encrypted-media" loading="lazy"></iframe></span>`;
   },
   docswell(str) {
     const errorMessage = 'DocswellのスライドURLが不正です';

package/lib/utils/url-matcher.js

@@ -49,8 +49,15 @@ function isCodepenUrl(url) {
 function isJsfiddleUrl(url) {
   return /^(http|https):\/\/jsfiddle\.net\/[a-zA-Z0-9_,/-]+$/.test(url);
 }
-const docswellNormalUrlRegex = /^https:\/\/www\.docswell\.com\/s\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+$/;
-const docswellEmbedUrlRegex = /^https:\/\/www\.docswell\.com\/slide\/[a-zA-Z0-9_-]+\/embed$/;
+
+// 例: https://www.docswell.com/s/ku-suke/LK7J5V-hello-docswell
+// 例: https://www.docswell.com/s/ku-suke/LK7J5V-hello-docswell#p13
+// 例: https://www.docswell.com/s/ku-suke/LK7J5V-hello-docswell/13
+const docswellNormalUrlRegex = /^https:\/\/www\.docswell\.com\/s\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+(\/\d+)?(#p\d+)?$/;
+
+// 例: https://www.docswell.com/slide/LK7J5V/embed
+// 例: https://www.docswell.com/slide/LK7J5V/embed#p12
+const docswellEmbedUrlRegex = /^https:\/\/www\.docswell\.com\/slide\/[a-zA-Z0-9_-]+\/embed(#p\d+)?$/;
 function isDocswellUrl(url) {
   return [docswellNormalUrlRegex, docswellEmbedUrlRegex].some(pattern => pattern.test(url));
 }
@@ -83,17 +90,38 @@ function extractYoutubeVideoParameters(youtubeUrl) {
   };
 }
 function extractDocswellEmbedUrl(url) {
-  var _URL$pathname$split$a;
   // Embed用URLの場合、そのまま返す
   if (docswellEmbedUrlRegex.test(url)) {
     return url;
   }
   // Embed用URLでない場合 https://www.docswell.com/s/:username/{slideId}-hello-docswell のslideIdを抽出する
-  const slideId = (_URL$pathname$split$a = new URL(url).pathname.split('/').at(3)) === null || _URL$pathname$split$a === void 0 ? void 0 : _URL$pathname$split$a.split('-').at(0);
+  const urlObj = new URL(url); // URLオブジェクトを作成
+  const pathSegments = urlObj.pathname.split('/');
+  // pathSegmentsの例: ["", "s", "ku-suke", "LK7J5V-hello-docswell", "10"]
+  // slideIdは pathSegments[3] の先頭部分
+  const slideIdPart = pathSegments.at(3);
+  const slideId = slideIdPart === null || slideIdPart === void 0 ? void 0 : slideIdPart.split('-').at(0);
   if (!slideId) {
     return null;
   }
-  return new URL(`/slide/${slideId}/embed`, 'https://www.docswell.com').toString();
+  let pageSuffix = '';
+  // #pXX 形式のページ番号を優先 (例: #p18)
+  if (urlObj.hash && /^#p\d+$/.test(urlObj.hash)) {
+    pageSuffix = urlObj.hash;
+  } else {
+    // /XX 形式のページ番号 (例: /28)
+    // 通常URLの形式: /s/{username}/{slideId-slug}/{optional_page_num}
+    // ページ番号がある場合、pathSegmentsの長さは5になる (e.g., ["", "s", "username", "slide-slug", "page"])
+    if (pathSegments.length === 5) {
+      const pageCandidate = pathSegments.at(4);
+      if (pageCandidate && /^\d+$/.test(pageCandidate)) {
+        pageSuffix = `#p${pageCandidate}`;
+      }
+    }
+  }
+  return new URL(`/slide/${slideId}/embed${pageSuffix}`,
+  // pageSuffixを結合
+  'https://www.docswell.com').toString();
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-markdown-html",
-  "version": "0.1.160",
+  "version": "0.1.161",
   "license": "MIT",
   "description": "Convert markdown to zenn flavor html.",
   "main": "lib/index.js",
@@ -60,7 +60,7 @@
     "prismjs": "^1.29.0",
     "sanitize-html": "^2.9.0"
   },
-  "gitHead": "5339a7646b0ef2cbe3821043e5f6d5ee3f032992",
+  "gitHead": "743a5f1677cb17c25504be97f1e8fd5824d3e1a6",
   "publishConfig": {
     "access": "public"
   }