Add resolve helper to state

Author: wooorm

lib/handlers/a.js

@@ -4,8 +4,6 @@
  * @typedef {import('../state.js').State} State
  */
 
-import {resolve} from '../util/resolve.js'
-
 /**
  * @param {State} state
  *   State.
@@ -20,7 +18,7 @@ export function a(state, node) {
   /** @type {Link} */
   const result = {
     type: 'link',
-    url: resolve(state, String(properties.href || '') || null),
+    url: state.resolve(String(properties.href || '') || null),
     title: properties.title ? String(properties.title) : null,
     // @ts-expect-error: assume valid children.
     children: state.all(node)

lib/handlers/iframe.js

@@ -4,8 +4,6 @@
  * @typedef {import('../state.js').State} State
  */
 
-import {resolve} from '../util/resolve.js'
-
 /**
  * @param {State} state
  *   State.
@@ -28,7 +26,7 @@ export function iframe(state, node) {
     const result = {
       type: 'link',
       title: null,
-      url: resolve(state, src),
+      url: state.resolve(src),
       children: [{type: 'text', value: title}]
     }
     state.patch(node, result)

lib/handlers/img.js

@@ -4,8 +4,6 @@
  * @typedef {import('../state.js').State} State
  */
 
-import {resolve} from '../util/resolve.js'
-
 /**
  * @param {State} state
  *   State.
@@ -20,7 +18,7 @@ export function img(state, node) {
   /** @type {Image} */
   const result = {
     type: 'image',
-    url: resolve(state, String(properties.src || '') || null),
+    url: state.resolve(String(properties.src || '') || null),
     title: properties.title ? String(properties.title) : null,
     alt: properties.alt ? String(properties.alt) : ''
   }

lib/handlers/input.js

@@ -8,7 +8,6 @@
  */
 
 import {findSelectedOptions} from '../util/find-selected-options.js'
-import {resolve} from '../util/resolve.js'
 
 const defaultChecked = '[x]'
 const defaultUnchecked = '[ ]'
@@ -53,7 +52,7 @@ export function input(state, node) {
       /** @type {Image} */
       const result = {
         type: 'image',
-        url: resolve(state, String(properties.src || '') || null),
+        url: state.resolve(String(properties.src || '') || null),
         title: String(properties.title || '') || null,
         alt: String(alt)
       }
@@ -102,7 +101,7 @@ export function input(state, node) {
     let index = -1
 
     while (++index < values.length) {
-      const value = resolve(state, values[index][0])
+      const value = state.resolve(values[index][0])
       /** @type {Link} */
       const result = {
         type: 'link',

lib/handlers/media.js

@@ -9,7 +9,6 @@
 
 import {toString} from 'mdast-util-to-string'
 import {visit, EXIT} from 'unist-util-visit'
-import {resolve} from '../util/resolve.js'
 import {wrapNeeded} from '../util/wrap.js'
 
 /**
@@ -62,7 +61,7 @@ export function media(state, node) {
     const image = {
       type: 'image',
       title: null,
-      url: resolve(state, poster),
+      url: state.resolve(poster),
       alt: toString(nodes)
     }
     state.patch(node, image)
@@ -74,7 +73,7 @@ export function media(state, node) {
   const result = {
     type: 'link',
     title: properties.title ? String(properties.title) : null,
-    url: resolve(state, src),
+    url: state.resolve(src),
     // @ts-expect-error Assume phrasing content.
     children: nodes
   }

lib/state.js

@@ -21,6 +21,8 @@
  *   Transform the children of a hast parent to mdast.
  * @property {One} one
  *   Transform a hast node to mdast.
+ * @property {Resolve} resolve
+ *   Resolve a URL relative to a base.
  * @property {Options} options
  *   User configuration.
  * @property {Map<string, Element>} elementById
@@ -60,6 +62,13 @@
  *   Parent of `node`.
  * @returns {MdastNode | Array<MdastNode> | void}
  *   mdast result.
+ *
+ * @callback Resolve
+ *   Resolve a URL relative to a base.
+ * @param {string | null | undefined} url
+ *   Possible URL value.
+ * @returns {string}
+ *   URL, resolved to a `base` element, if any.
  */
 
 import {position} from 'unist-util-position'
@@ -79,6 +88,7 @@ export function createState(options) {
   /** @type {State} */
   const state = {
     patch,
+    resolve,
     all,
     one,
     options,
@@ -197,3 +207,25 @@ function all(parent) {
     ? results
     : results.slice(start, end)
 }
+
+/**
+ * @this {State}
+ *   Info passed around about the current state.
+ * @param {string | null | undefined} url
+ *   Possible URL value.
+ * @returns {string}
+ *   URL, resolved to a `base` element, if any.
+ */
+export function resolve(url) {
+  const base = this.frozenBaseUrl
+
+  if (url === null || url === undefined) {
+    return ''
+  }
+
+  if (base) {
+    return String(new URL(url, base))
+  }
+
+  return url
+}