@libsrcdev/gatsby-remark-images-anywhere 0.1.0 → 0.1.3

package/dist/index.d.ts

@@ -1,20 +1,18 @@
 import { Node, NodePluginArgs } from "gatsby";
 import { FileSystemNode } from "gatsby-source-filesystem";
+import { Literal } from "mdast";
 
 //#region src/custom-http-headers/http-request-header-options.d.ts
 type HttpRequestHeaderOptions = {
   dangerouslyBuildRequestHttpHeaders?: (url: string) => Record<string, string> | undefined;
-  httpHeaderProviders: ((url: string) => Record<string, string> | undefined)[];
+  httpHeaderProviders?: HttpRequestHeaderProvider[];
 };
+type HttpRequestHeaderProvider = (url: string) => Record<string, string> | undefined;
 //#endregion
 //#region src/type.d.ts
 type SharpMethod = 'fluid' | 'fixed' | 'resize';
-interface RemarkNode {
-  type: string;
-  [key: string]: any;
-}
 interface Args extends NodePluginArgs {
-  markdownAST: RemarkNode;
+  markdownAST: Literal;
   markdownNode: Node;
   files: FileSystemNode[];
 }
@@ -58,7 +56,7 @@ interface Options extends Partial<MarkupOptions>, HttpRequestHeaderOptions {
 }
 //#endregion
 //#region src/index.d.ts
-declare const addImage: ({
+declare function remarkImagesAnywhere({
   markdownAST: mdast,
   markdownNode,
   actions,
@@ -70,5 +68,5 @@ declare const addImage: ({
   reporter,
   cache,
   pathPrefix
-}: Args, pluginOptions: Options) => Promise<(null | undefined)[]>;
-export = addImage;
+}: Args, pluginOptions: Options): Promise<(null | undefined)[]>;
+export = remarkImagesAnywhere;

package/dist/index.js

@@ -29,11 +29,11 @@ var __toESM = (mod, isNodeMode, target$1) => (target$1 = mod != null ? __create(
 let path = require("path");
 path = __toESM(path);
 let unist_util_select = require("unist-util-select");
-unist_util_select = __toESM(unist_util_select);
 let slash = require("slash");
 slash = __toESM(slash);
 let parse5 = require("parse5");
-parse5 = __toESM(parse5);
+let is_relative_url = require("is-relative-url");
+is_relative_url = __toESM(is_relative_url);
 
 //#region node_modules/universalify/index.js
 var require_universalify = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -70756,23 +70756,27 @@ const processImage = async ({ file: file$1, reporter, cache: cache$3, pathPrefix
 //#region src/util-html-to-md.ts
 const toMdNode = (node) => {
 	const value = node.value;
-	const imgNode = parse5.default.parseFragment(value).childNodes.find((node$1) => node$1.tagName === "img");
+	const imgNode = (0, parse5.parseFragment)(value).childNodes.find((node$1) => {
+		if ("tagName" in node$1) return node$1.tagName === "img";
+		return false;
+	});
 	if (!imgNode) return null;
-	const attrs = imgNode.attrs.reduce((acc, cur) => {
+	const attrs = "attrs" in imgNode ? imgNode.attrs.reduce((acc, cur) => {
 		const { name: name$1, value: value$1 } = cur;
 		acc[name$1] = value$1;
 		return acc;
-	}, {});
-	if (!attrs.src) return null;
+	}, {}) : {};
+	if ("src" in attrs) return null;
 	const original = { ...node };
-	node.type = "image";
-	node.value = "";
-	node.url = attrs.src;
-	node.title = attrs.title;
-	node.alt = attrs.alt;
-	node.data = {};
-	node.data.original = original;
-	return node;
+	const remarkImageNode = node;
+	remarkImageNode.type = "image";
+	remarkImageNode.value = "";
+	remarkImageNode.url = attrs.src;
+	remarkImageNode.title = attrs.title;
+	remarkImageNode.alt = attrs.alt;
+	remarkImageNode.data = {};
+	remarkImageNode.data.original = original;
+	return remarkImageNode;
 };
 
 //#endregion
@@ -70915,21 +70919,49 @@ const isWhitelisted = makeWhitelistTest(rpWhitelist);
 
 //#endregion
 //#region src/custom-http-headers/http-header-trusted-provider.ts
-function createRequestHttpHeaderBuilder({ dangerouslyBuildRequestHttpHeaders, httpHeaderProviders }) {
-	if (dangerouslyBuildRequestHttpHeaders) return dangerouslyBuildRequestHttpHeaders;
-	if (httpHeaderProviders) return (url$3) => {
-		for (const httpHeaderProvider of httpHeaderProviders) {
-			const httpHeaders = httpHeaderProvider(url$3);
-			if (httpHeaders) return httpHeaders;
-		}
-	};
-	return (url$3) => void 0;
+const buildRequestHttpHeadersWith = (httpHeaderProviders) => (url$3) => {
+	for (const httpHeaderProvider of httpHeaderProviders ?? []) {
+		const httpHeaders = httpHeaderProvider(url$3);
+		if (httpHeaders) return httpHeaders;
+	}
+};
+
+//#endregion
+//#region src/utils.ts
+/**
+* Resolves a potentially incomplete URL to a full URL with protocol
+* @param url - The URL to resolve (can be protocol-relative or full)
+* @returns The full URL with protocol, or null if invalid or relative
+*/
+function resolveFullUrl(url$3) {
+	const trimmed = url$3.trim();
+	if (!trimmed) return;
+	if ((0, is_relative_url.default)(trimmed)) return;
+	let resolvedUrl = trimmed;
+	if (trimmed.startsWith("//")) resolvedUrl = `https:${trimmed}`;
+	try {
+		new URL(resolvedUrl);
+		return resolvedUrl;
+	} catch {
+		return;
+	}
+}
+/**
+* Resolves a relative URL by validating and returning it if it's relative
+* @param url - The URL to check and resolve
+* @returns The relative URL if valid, or undefined if not relative or invalid
+*/
+function resolveRelativeUrl(url$3) {
+	const trimmed = url$3.trim();
+	if (!trimmed) return;
+	if (!(0, is_relative_url.default)(trimmed)) return;
+	return trimmed;
 }
 
 //#endregion
 //#region src/index.ts
-const addImage = async ({ markdownAST: mdast, markdownNode, actions: actions$1, store, files, getNode, getCache, createNodeId, reporter, cache: cache$3, pathPrefix }, pluginOptions$1) => {
-	const { plugins, staticDir = "static", createMarkup = defaultMarkup, sharpMethod = "fluid", loading = "lazy", linkImagesToOriginal = false, showCaptions = false, wrapperStyle = "", backgroundColor = "#fff", tracedSVG = false, blurUp = true, dangerouslyBuildRequestHttpHeaders, httpHeaderProviders, ...imageOptions } = pluginOptions$1;
+async function remarkImagesAnywhere({ markdownAST: mdast, markdownNode, actions: actions$1, store, files, getNode, getCache, createNodeId, reporter, cache: cache$3, pathPrefix }, pluginOptions$1) {
+	const { plugins, staticDir = "static", createMarkup = defaultMarkup, sharpMethod = "fluid", loading = "lazy", linkImagesToOriginal = false, showCaptions = false, wrapperStyle = "", backgroundColor = "#fff", tracedSVG = false, blurUp = true, dangerouslyBuildRequestHttpHeaders, httpHeaderProviders = [], ...imageOptions } = pluginOptions$1;
 	if ([
 		"fluid",
 		"fixed",
@@ -70938,35 +70970,36 @@ const addImage = async ({ markdownAST: mdast, markdownNode, actions: actions$1,
 	const { touchNode, createNode } = actions$1;
 	const dirPath = markdownNode.parent && getNode(markdownNode.parent)?.dir;
 	const { directory } = store.getState().program;
-	const imgNodes = unist_util_select.default.selectAll("image[url]", mdast);
-	const htmlImgNodes = unist_util_select.default.selectAll("html, jsx", mdast).map((node) => toMdNode(node)).filter((node) => !!node);
+	const imgNodes = (0, unist_util_select.selectAll)("image[url]", mdast).filter((node) => "src" in node);
+	const htmlImgNodes = (0, unist_util_select.selectAll)("html, jsx", mdast).filter((node) => "value" in node).map((node, _$2, __) => toMdNode(node)).filter((node, _$2, __) => !!node);
 	imgNodes.push(...htmlImgNodes);
 	const processPromises = imgNodes.map(async (node) => {
+		if (!node.url) return;
 		let url$3 = node.url;
-		if (!url$3) return;
 		let gImgFileNode;
 		if (isWhitelisted(url$3)) url$3 = `https:${url$3}`;
-		if (url$3.startsWith("http")) gImgFileNode = await downloadImage({
-			id: markdownNode.id,
-			url: url$3,
-			getCache,
-			getNode,
-			touchNode,
-			cache: cache$3,
-			createNode,
-			createNodeId,
-			reporter,
-			dangerouslyBuildImageRequestHttpHeaders: createRequestHttpHeaderBuilder({
-				dangerouslyBuildRequestHttpHeaders,
-				httpHeaderProviders
-			})
-		});
-		else {
+		const remoteFullImageUrl = resolveFullUrl(url$3);
+		const relativeImageUrl = resolveRelativeUrl(url$3);
+		if (remoteFullImageUrl) {
+			const buildRequestHttpHeaders = dangerouslyBuildRequestHttpHeaders ?? buildRequestHttpHeadersWith(httpHeaderProviders);
+			gImgFileNode = await downloadImage({
+				id: markdownNode.id,
+				url: new URL(url$3).protocol,
+				getCache,
+				getNode,
+				touchNode,
+				cache: cache$3,
+				createNode,
+				createNodeId,
+				reporter,
+				dangerouslyBuildImageRequestHttpHeaders: buildRequestHttpHeaders
+			});
+		} else if (relativeImageUrl) {
 			let filePath;
 			if (dirPath && url$3[0] === ".") filePath = (0, slash.default)(path.default.join(dirPath, url$3));
 			else filePath = path.default.join(directory, staticDir, url$3);
 			gImgFileNode = files.find((fileNode) => fileNode.absolutePath && fileNode.absolutePath === filePath);
-		}
+		} else reporter.warn(`Skipping invalid image URL ${url$3}`);
 		if (!gImgFileNode) return;
 		if (!SUPPORT_EXTS.includes(gImgFileNode.extension)) return;
 		const imageResult = await processImage({
@@ -70998,7 +71031,7 @@ const addImage = async ({ markdownAST: mdast, markdownNode, actions: actions$1,
 		return null;
 	});
 	return Promise.all(processPromises);
-};
-module.exports = addImage;
+}
 
-//#endregion
+//#endregion
+module.exports = remarkImagesAnywhere;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@libsrcdev/gatsby-remark-images-anywhere",
-	"version": "0.1.0",
+	"version": "0.1.3",
 	"description": "Handle images with relative, absolute, remote path for gatsby-transformer-remark.",
 	"keywords": [
 		"gatsby",
@@ -35,25 +35,26 @@
 		"prepare": "npm run build"
 	},
 	"dependencies": {
+		"is-relative-url": "^4.1.0",
 		"parse5": "^8.0.0",
 		"slash": "^3.0.0",
 		"unist-util-select": "^5.1.0"
 	},
 	"devDependencies": {
 		"@swc/core": "^1.15.3",
+		"@types/fs-extra": "^8.0.0",
 		"@types/mdast": "^4.0.4",
 		"eslint": "^9.39.1",
 		"gatsby": "^5.15.0",
+		"gatsby-plugin-sharp": "^5.10.0",
+		"gatsby-source-filesystem": "^5.10.0",
 		"husky": "^9.1.7",
 		"mdast": "^2.3.2",
 		"nodemon": "^3.1.11",
+		"tap": "^14.9.2",
 		"tsdown": "^0.16.6",
 		"tslib": "^2.8.1",
-		"typescript": "^5.9.3",
-		"@types/fs-extra": "^8.0.0",
-		"gatsby-plugin-sharp": "^5.10.0",
-		"gatsby-source-filesystem": "^5.10.0",
-		"tap": "^14.9.2"
+		"typescript": "^5.9.3"
 	},
 	"typings": "dist/index.d.ts",
 	"prettier": {
@@ -62,4 +63,4 @@
 		"singleQuote": true,
 		"trailingComma": "es5"
 	}
-}
+}