rehype-video 2.1.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/index.js CHANGED
@@ -1,19 +1,33 @@
1
1
  import { visit } from 'unist-util-visit';
2
2
  import { detailsNode } from './detailsNode.js';
3
3
  import { trackNode } from './trackNode.js';
4
- const delimiter = /((?:https?:\/\/)(?:(?:[a-z0-9]?(?:[a-z0-9\-]{1,61}[a-z0-9])?\.[^\.|\s])+[a-z\.]*[a-z]+|(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})(?::\d{1,5})*[a-z0-9.,_\/~#&=;%+?\-\\(\\)]*)/g;
4
+ function isValidURL(string) {
5
+ try {
6
+ new URL(string);
7
+ return true;
8
+ }
9
+ catch (err) {
10
+ return false;
11
+ }
12
+ }
5
13
  const properties = { muted: 'muted', controls: 'controls', style: 'max-height:640px;' };
6
- const queryStringToObject = (url) => [...new URLSearchParams(url.split('?!#')[1])].reduce((a, [k, v]) => ((a[k] = v), a), {});
14
+ const queryStringToObject = (url) => [...new URLSearchParams(url.split('?')[1])].reduce((a, [k, v]) => ((a[k] = v), a), {});
7
15
  function reElement(node, details, track, href) {
8
- let url = /https?/.test(href) ? new URL(href).pathname : href;
9
- const filename = url.split('/').pop()?.replace(/(\?|!|\#|$).+/, '');
10
- node.properties = { ...properties, src: href };
16
+ const url = isValidURL(href.trim()) ? new URL(href) : null;
17
+ const pathname = url?.pathname || href;
18
+ const filename = pathname.split('/').pop()?.replace(/(\?|!|\#|$).+/, '');
19
+ const params = queryStringToObject(href.replace(/\?\!/, "?").replace(/\?\!\#/, "?"));
20
+ const { title = filename } = params;
21
+ const result = trackNode(params);
22
+ const searchParams = new URLSearchParams({ ...result.query });
23
+ if (url) {
24
+ url.search = searchParams.toString() ?? "";
25
+ }
11
26
  node.tagName = 'video';
12
27
  node.children = [];
13
- const { title = filename, ...other } = queryStringToObject(href);
28
+ node.properties = { ...properties, src: url?.toString() || href };
14
29
  if (track) {
15
- const trNode = trackNode(other);
16
- trNode.forEach((tr) => node.children.push({ ...tr }));
30
+ result.element.forEach((tr) => node.children.push({ ...tr }));
17
31
  }
18
32
  if (details) {
19
33
  const reNode = detailsNode(title);
@@ -30,7 +44,7 @@ const RehypeVideo = (options) => {
30
44
  const isChecked = (str) => test.test(str.replace(/(\?|!|\#|$).+/g, '').toLocaleLowerCase());
31
45
  const child = node.children[0];
32
46
  if (node.tagName === 'p' && node.children.length === 1) {
33
- if (child.type === 'text' && delimiter.test(child.value) && isChecked(child.value)) {
47
+ if (child.type === 'text' && isValidURL(child.value) && isChecked(child.value)) {
34
48
  reElement(node, details, track, child.value);
35
49
  }
36
50
  if (child.type === 'element' && child.tagName === 'a' && child.properties && typeof child.properties.href === 'string' && isChecked(child.properties.href)) {
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,5 @@
1
1
  import type { Element } from 'hast';
2
- export declare function trackNode(query?: Record<string, string>): Element[];
2
+ export declare const trackNode: (query?: Record<string, string>) => {
3
+ query: Record<string, string>;
4
+ element: Element[];
5
+ };
package/lib/trackNode.js CHANGED
@@ -1,19 +1,24 @@
1
- export function trackNode(query = {}) {
2
- let result = {};
3
- let resultElement = [];
1
+ export const trackNode = (query = {}) => {
2
+ const resultTrack = {};
3
+ const resultElement = [];
4
+ const resultQuery = {};
5
+ const result = { query: resultQuery, element: resultElement };
4
6
  Object.keys(query).forEach((key) => {
5
- let keyMatch = key.match(/track\[['"](\w+:?\w+)['"]\]/i);
7
+ let keyMatch = key.trim().match(/track\[['"](\w+:?\w+)['"]\]/i);
6
8
  let queryKey = keyMatch ? keyMatch[1] : null;
7
9
  if (queryKey) {
8
10
  let [lang, keyString] = queryKey.split(':');
9
- if (!result[lang])
10
- result[lang] = {};
11
+ if (!resultTrack[lang])
12
+ resultTrack[lang] = {};
11
13
  const value = query[key];
12
- result[lang][keyString ?? "src"] = value;
14
+ resultTrack[lang][keyString ?? "src"] = value;
15
+ }
16
+ else {
17
+ resultQuery[key] = query[key];
13
18
  }
14
19
  });
15
- Object.keys(result).forEach((lang) => {
16
- const track = result[lang];
20
+ Object.keys(resultTrack).forEach((lang) => {
21
+ const track = resultTrack[lang];
17
22
  resultElement.push({
18
23
  type: 'element',
19
24
  tagName: 'track',
@@ -24,6 +29,8 @@ export function trackNode(query = {}) {
24
29
  children: []
25
30
  });
26
31
  });
27
- return resultElement;
28
- }
32
+ result.query = resultQuery;
33
+ result.element = resultElement;
34
+ return { ...result };
35
+ };
29
36
  //# sourceMappingURL=trackNode.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"trackNode.js","sourceRoot":"","sources":["../src/trackNode.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAC,QAAgC,EAAE;IAC1D,IAAI,MAAM,GAA2C,EAAE,CAAA;IACvD,IAAI,aAAa,GAAc,EAAE,CAAA;IACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACjC,IAAI,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QACxD,IAAI,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC5C,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;YACpC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;YACxB,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,GAAG,KAAK,CAAA;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;QAC1B,aAAa,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE;gBACV,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,WAAW;gBAC/B,GAAG,KAAK;aACT;YACD,QAAQ,EAAE,EAAE;SACb,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,OAAO,aAAa,CAAA;AACtB,CAAC"}
1
+ {"version":3,"file":"trackNode.js","sourceRoot":"","sources":["../src/trackNode.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAgC,EAAE,EAAyD,EAAE;IACrH,MAAM,WAAW,GAA2C,EAAE,CAAA;IAC9D,MAAM,aAAa,GAAc,EAAE,CAAA;IACnC,MAAM,WAAW,GAA2B,EAAE,CAAA;IAC9C,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,CAAA;IAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACjC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC/D,IAAI,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC5C,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC3C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBAAE,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;YAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;YACxB,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,GAAG,KAAK,CAAA;QAC/C,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAC/B,aAAa,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE;gBACV,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,WAAW;gBAC/B,GAAG,KAAK;aACT;YACD,QAAQ,EAAE,EAAE;SACb,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,KAAK,GAAG,WAAW,CAAA;IAC1B,MAAM,CAAC,OAAO,GAAG,aAAa,CAAA;IAC9B,OAAO,EAAE,GAAG,MAAM,EAAE,CAAA;AACtB,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rehype-video",
3
- "version": "2.1.0",
3
+ "version": "2.2.0",
4
4
  "description": "Markdown supports video play with `.mp4` and `.mov` URLs.",
5
5
  "homepage": "https://jaywcjlove.github.io/rehype-video",
6
6
  "funding": "https://jaywcjlove.github.io/#/sponsor",
package/src/index.ts CHANGED
@@ -22,27 +22,39 @@ export type RehypeVideoOptions = {
22
22
  track?: boolean;
23
23
  }
24
24
 
25
- const delimiter = /((?:https?:\/\/)(?:(?:[a-z0-9]?(?:[a-z0-9\-]{1,61}[a-z0-9])?\.[^\.|\s])+[a-z\.]*[a-z]+|(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})(?::\d{1,5})*[a-z0-9.,_\/~#&=;%+?\-\\(\\)]*)/g;
25
+ function isValidURL(string: string) {
26
+ try {
27
+ new URL(string);
28
+ return true;
29
+ } catch (err) {
30
+ return false;
31
+ }
32
+ }
33
+
26
34
  const properties = { muted: 'muted', controls: 'controls', style: 'max-height:640px;' };
27
35
  const queryStringToObject = (url: string) =>
28
- [...new URLSearchParams(url.split('?!#')[1])].reduce(
36
+ [...new URLSearchParams(url.split('?')[1])].reduce(
29
37
  (a: Record<string, string>, [k, v]) => ((a[k] = v), a),
30
38
  {}
31
39
  );
32
40
 
33
41
  function reElement(node: Element, details: boolean, track: boolean, href: string) {
34
- let url = /https?/.test(href) ? new URL(href).pathname : href;
35
- const filename = url.split('/').pop()?.replace(/(\?|!|\#|$).+/, '');
36
- node.properties = { ...properties, src: href };
42
+ const url = isValidURL(href.trim()) ? new URL(href) : null;
43
+ const pathname = url?.pathname || href;
44
+ const filename = pathname.split('/').pop()?.replace(/(\?|!|\#|$).+/, '');
45
+ const params = queryStringToObject(href.replace(/\?\!/, "?").replace(/\?\!\#/, "?"));
46
+ const { title = filename } = params;
47
+ const result = trackNode(params);
48
+ const searchParams = new URLSearchParams({ ...result.query });
49
+ if (url) {
50
+ url.search = searchParams.toString() ?? "";
51
+ }
37
52
  node.tagName = 'video';
38
53
  node.children = [];
39
- const { title = filename, ...other }= queryStringToObject(href);
40
-
54
+ node.properties = { ...properties, src: url?.toString() || href };
41
55
  if (track) {
42
- const trNode = trackNode(other);
43
- trNode.forEach((tr) => node.children.push({ ...tr }));
56
+ result.element.forEach((tr) => node.children.push({ ...tr }));
44
57
  }
45
-
46
58
  if (details) {
47
59
  const reNode = detailsNode(title);
48
60
  reNode.children.push({ ...node });
@@ -60,7 +72,7 @@ const RehypeVideo: Plugin<[RehypeVideoOptions?], Root> = (options) => {
60
72
  const child = node.children[0];
61
73
 
62
74
  if (node.tagName === 'p' && node.children.length === 1) {
63
- if (child.type === 'text' && delimiter.test(child.value) && isChecked(child.value)) {
75
+ if (child.type === 'text' && isValidURL(child.value) && isChecked(child.value)) {
64
76
  reElement(node, details, track, child.value);
65
77
  }
66
78
  if (child.type === 'element' && child.tagName === 'a' && child.properties && typeof child.properties.href === 'string' && isChecked(child.properties.href)) {
package/src/trackNode.ts CHANGED
@@ -1,21 +1,25 @@
1
1
  import type { Element } from 'hast';
2
2
 
3
- export function trackNode(query: Record<string, string> = {}): Element[] {
4
- let result: Record<string, Record<string, string>> = {}
5
- let resultElement: Element[] = []
3
+ export const trackNode = (query: Record<string, string> = {}): { query: Record<string, string>, element: Element[] } => {
4
+ const resultTrack: Record<string, Record<string, string>> = {}
5
+ const resultElement: Element[] = []
6
+ const resultQuery: Record<string, string> = {}
7
+ const result = { query: resultQuery, element: resultElement }
6
8
  Object.keys(query).forEach((key) => {
7
- let keyMatch = key.match(/track\[['"](\w+:?\w+)['"]\]/i)
9
+ let keyMatch = key.trim().match(/track\[['"](\w+:?\w+)['"]\]/i)
8
10
  let queryKey = keyMatch ? keyMatch[1] : null
9
11
  if (queryKey) {
10
12
  let [lang, keyString] = queryKey.split(':')
11
- if (!result[lang]) result[lang] = {}
13
+ if (!resultTrack[lang]) resultTrack[lang] = {}
12
14
  const value = query[key]
13
- result[lang][keyString ?? "src"] = value
15
+ resultTrack[lang][keyString ?? "src"] = value
16
+ } else {
17
+ resultQuery[key] = query[key]
14
18
  }
15
19
  });
16
20
 
17
- Object.keys(result).forEach((lang) => {
18
- const track = result[lang]
21
+ Object.keys(resultTrack).forEach((lang) => {
22
+ const track = resultTrack[lang]
19
23
  resultElement.push({
20
24
  type: 'element',
21
25
  tagName: 'track',
@@ -26,5 +30,7 @@ export function trackNode(query: Record<string, string> = {}): Element[] {
26
30
  children: []
27
31
  })
28
32
  })
29
- return resultElement
33
+ result.query = resultQuery
34
+ result.element = resultElement
35
+ return { ...result }
30
36
  }