marked-base-url 1.0.1 → 1.0.3

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.cjs CHANGED
@@ -3,13 +3,43 @@
3
3
  function baseUrl(base) {
4
4
  // extension code here
5
5
 
6
+ base = base.trim().replace(/\/+$/, '/'); // if multiple '/' at the end, just keep one
7
+ const reIsAbsolute = /^[\w+]+:\/\//;
8
+ const isBaseAbsolute = reIsAbsolute.test(base);
9
+ const dummyUrl = 'http://__dummy__';
10
+ const dummyBaseUrl = new URL(base, dummyUrl);
11
+ const dummyUrlLength = dummyUrl.length + (base.startsWith('/') ? 0 : 1);
12
+
6
13
  return {
7
14
  walkTokens(token) {
8
15
  if (!['link', 'image'].includes(token.type)) {
9
16
  return;
10
17
  }
11
18
 
12
- token.href = new URL(token.href, base).href;
19
+ if (reIsAbsolute.test(token.href)) {
20
+ // the URL is absolute, do not touch it
21
+ return;
22
+ }
23
+
24
+ if (isBaseAbsolute) {
25
+ try {
26
+ token.href = new URL(token.href, base).href;
27
+ } catch (e) {
28
+ // ignore
29
+ }
30
+ } else {
31
+ // base is not absolute
32
+ if (token.href.startsWith('/')) {
33
+ // the URL is from root
34
+ return;
35
+ }
36
+ try {
37
+ const temp = new URL(token.href, dummyBaseUrl).href;
38
+ token.href = temp.slice(dummyUrlLength);
39
+ } catch (e) {
40
+ // ignore
41
+ }
42
+ }
13
43
  }
14
44
  };
15
45
  }
package/lib/index.umd.js CHANGED
@@ -7,13 +7,43 @@
7
7
  function baseUrl(base) {
8
8
  // extension code here
9
9
 
10
+ base = base.trim().replace(/\/+$/, '/'); // if multiple '/' at the end, just keep one
11
+ const reIsAbsolute = /^[\w+]+:\/\//;
12
+ const isBaseAbsolute = reIsAbsolute.test(base);
13
+ const dummyUrl = 'http://__dummy__';
14
+ const dummyBaseUrl = new URL(base, dummyUrl);
15
+ const dummyUrlLength = dummyUrl.length + (base.startsWith('/') ? 0 : 1);
16
+
10
17
  return {
11
18
  walkTokens(token) {
12
19
  if (!['link', 'image'].includes(token.type)) {
13
20
  return;
14
21
  }
15
22
 
16
- token.href = new URL(token.href, base).href;
23
+ if (reIsAbsolute.test(token.href)) {
24
+ // the URL is absolute, do not touch it
25
+ return;
26
+ }
27
+
28
+ if (isBaseAbsolute) {
29
+ try {
30
+ token.href = new URL(token.href, base).href;
31
+ } catch (e) {
32
+ // ignore
33
+ }
34
+ } else {
35
+ // base is not absolute
36
+ if (token.href.startsWith('/')) {
37
+ // the URL is from root
38
+ return;
39
+ }
40
+ try {
41
+ const temp = new URL(token.href, dummyBaseUrl).href;
42
+ token.href = temp.slice(dummyUrlLength);
43
+ } catch (e) {
44
+ // ignore
45
+ }
46
+ }
17
47
  }
18
48
  };
19
49
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "marked-base-url",
3
- "version": "1.0.1",
3
+ "version": "1.0.3",
4
4
  "description": "marked base url",
5
5
  "main": "./lib/index.cjs",
6
6
  "module": "./src/index.js",
@@ -42,23 +42,23 @@
42
42
  "marked": "^4 || ^5"
43
43
  },
44
44
  "devDependencies": {
45
- "@babel/core": "^7.21.5",
46
- "@babel/preset-env": "^7.21.5",
45
+ "@babel/core": "^7.22.9",
46
+ "@babel/preset-env": "^7.22.9",
47
47
  "@semantic-release/changelog": "^6.0.3",
48
- "@semantic-release/commit-analyzer": "^9.0.2",
48
+ "@semantic-release/commit-analyzer": "^10.0.1",
49
49
  "@semantic-release/git": "^10.0.1",
50
- "@semantic-release/github": "^8.0.7",
51
- "@semantic-release/npm": "^10.0.3",
52
- "@semantic-release/release-notes-generator": "^11.0.1",
53
- "babel-jest": "^29.5.0",
54
- "eslint": "^8.39.0",
55
- "eslint-config-standard": "^17.0.0",
50
+ "@semantic-release/github": "^9.0.4",
51
+ "@semantic-release/npm": "^10.0.4",
52
+ "@semantic-release/release-notes-generator": "^11.0.4",
53
+ "babel-jest": "^29.6.1",
54
+ "eslint": "^8.45.0",
55
+ "eslint-config-standard": "^17.1.0",
56
56
  "eslint-plugin-import": "^2.27.5",
57
- "eslint-plugin-n": "^15.7.0",
57
+ "eslint-plugin-n": "^16.0.1",
58
58
  "eslint-plugin-promise": "^6.1.1",
59
- "jest-cli": "^29.5.0",
60
- "marked": "^4.3.0",
61
- "rollup": "^3.21.2",
62
- "semantic-release": "^21.0.2"
59
+ "jest-cli": "^29.6.1",
60
+ "marked": "^5.1.0",
61
+ "rollup": "^3.26.3",
62
+ "semantic-release": "^21.0.7"
63
63
  }
64
64
  }
package/src/index.js CHANGED
@@ -1,13 +1,43 @@
1
1
  export function baseUrl(base) {
2
2
  // extension code here
3
3
 
4
+ base = base.trim().replace(/\/+$/, '/'); // if multiple '/' at the end, just keep one
5
+ const reIsAbsolute = /^[\w+]+:\/\//;
6
+ const isBaseAbsolute = reIsAbsolute.test(base);
7
+ const dummyUrl = 'http://__dummy__';
8
+ const dummyBaseUrl = new URL(base, dummyUrl);
9
+ const dummyUrlLength = dummyUrl.length + (base.startsWith('/') ? 0 : 1);
10
+
4
11
  return {
5
12
  walkTokens(token) {
6
13
  if (!['link', 'image'].includes(token.type)) {
7
14
  return;
8
15
  }
9
16
 
10
- token.href = new URL(token.href, base).href;
17
+ if (reIsAbsolute.test(token.href)) {
18
+ // the URL is absolute, do not touch it
19
+ return;
20
+ }
21
+
22
+ if (isBaseAbsolute) {
23
+ try {
24
+ token.href = new URL(token.href, base).href;
25
+ } catch (e) {
26
+ // ignore
27
+ }
28
+ } else {
29
+ // base is not absolute
30
+ if (token.href.startsWith('/')) {
31
+ // the URL is from root
32
+ return;
33
+ }
34
+ try {
35
+ const temp = new URL(token.href, dummyBaseUrl).href;
36
+ token.href = temp.slice(dummyUrlLength);
37
+ } catch (e) {
38
+ // ignore
39
+ }
40
+ }
11
41
  }
12
42
  };
13
43
  }