zenn-markdown-html 0.1.142 → 0.1.143

package/lib/utils/url-matcher.d.ts

@@ -8,6 +8,13 @@ export declare function isCodesandboxUrl(url: string): boolean;
 export declare function isCodepenUrl(url: string): boolean;
 export declare function isJsfiddleUrl(url: string): boolean;
 export declare function isYoutubeUrl(url: string): boolean;
+/**
+ * youtube の URL から videoId と開始位置の秒数を取得する
+ */
+export declare function extractYoutubeVideoParameters(youtubeUrl: string): {
+    videoId: string;
+    start?: string;
+} | undefined;
 /**
  * 参考: https://blueprintue.com/
  * 生成されるURLをもとに正規表現を定義した
@@ -17,10 +24,3 @@ export declare function isBlueprintUEUrl(url: string): boolean;
  * 参考: https://www.figma.com/developers/embed
  */
 export declare function isFigmaUrl(url: string): boolean;
-/**
- * youtube の URL から videoId と開始位置の秒数を取得する
- */
-export declare function extractYoutubeVideoParameters(youtubeUrl: string): {
-    videoId: string;
-    start?: string;
-} | undefined;

package/lib/utils/url-matcher.js

@@ -47,9 +47,33 @@ function isCodepenUrl(url) {
 function isJsfiddleUrl(url) {
   return /^(http|https):\/\/jsfiddle\.net\/[a-zA-Z0-9_,/-]+$/.test(url);
 }
-const youtubeRegexp = /^(http(s?):\/\/)?(www\.)?youtu(be)?\.([a-z])+\/(watch(.*?)([?&])v=)?(.*?)(&(.)*)?$/;
 function isYoutubeUrl(url) {
-  return youtubeRegexp.test(url);
+  return [/^https?:\/\/youtu\.be\/[\w-]+(?:\?[\w=&-]+)?$/, /^https?:\/\/(?:www\.)?youtube\.com\/watch\?[\w=&-]+$/].some(pattern => pattern.test(url));
+}
+
+/** YoutubeのVideoIdの文字列の長さ */
+const YOUTUBE_VIDEO_ID_LENGTH = 11;
+
+/**
+ * youtube の URL から videoId と開始位置の秒数を取得する
+ */
+function extractYoutubeVideoParameters(youtubeUrl) {
+  var _params$get;
+  if (!isYoutubeUrl(youtubeUrl)) return void 0;
+  const url = new URL(youtubeUrl);
+  const params = new URLSearchParams(url.search || '');
+
+  // https://youtu.be/Hoge の "HogeHoge" の部分または、
+  // https://www.youtube.com/watch?v=Hoge の "Hoge" の部分を値とする
+  const videoId = params.get('v') || url.pathname.split('/')[1];
+
+  // https://www.youtube.com/watch?v=Hoge&t=100s の "100" の部分を値とする
+  const start = (_params$get = params.get('t')) === null || _params$get === void 0 ? void 0 : _params$get.replace('s', '');
+  if ((videoId === null || videoId === void 0 ? void 0 : videoId.length) !== YOUTUBE_VIDEO_ID_LENGTH) return void 0;
+  return {
+    videoId,
+    start
+  };
 }
 
 /**
@@ -66,21 +90,4 @@ function isBlueprintUEUrl(url) {
  */
 function isFigmaUrl(url) {
   return /^https:\/\/([\w.-]+\.)?figma.com\/(file|proto)\/([0-9a-zA-Z]{22,128})(?:\/[\w-?=&%]+)?$/.test(url);
-}
-
-/**
- * youtube の URL から videoId と開始位置の秒数を取得する
- */
-function extractYoutubeVideoParameters(youtubeUrl) {
-  const match = youtubeUrl.match(youtubeRegexp);
-  if (match && match[9].length == 11) {
-    const urlParams = new URLSearchParams(youtubeUrl);
-    const start = urlParams.get('t');
-    return {
-      videoId: match[9],
-      start: start === null || start === void 0 ? void 0 : start.replace('s', '') // https://www.youtube.com/watch?v=ABCSDGG&t=19101s => 19101
-    };
-  } else {
-    return undefined;
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-markdown-html",
-  "version": "0.1.142",
+  "version": "0.1.143",
   "license": "MIT",
   "description": "Convert markdown to zenn flavor html.",
   "main": "lib/index.js",
@@ -56,7 +56,7 @@
     "prismjs": "^1.29.0",
     "sanitize-html": "^2.9.0"
   },
-  "gitHead": "7c4c62cffc366eb664feb65fd3705f988a38361b",
+  "gitHead": "70c3496e4f43b393f87d136bb594c49f603f4087",
   "publishConfig": {
     "access": "public"
   }