@onozaty/growi-uploader 1.2.0 → 1.4.0

package/README.md

@@ -1,5 +1,7 @@
 # growi-uploader
 
+[![Test](https://github.com/onozaty/growi-uploader/actions/workflows/test.yaml/badge.svg)](https://github.com/onozaty/growi-uploader/actions/workflows/test.yaml)
+[![codecov](https://codecov.io/gh/onozaty/growi-uploader/graph/badge.svg?token=X0YN1OP5PB)](https://codecov.io/gh/onozaty/growi-uploader)
 [![npm version](https://badge.fury.io/js/@onozaty%2Fgrowi-uploader.svg)](https://www.npmjs.com/package/@onozaty/growi-uploader)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
@@ -178,10 +180,24 @@ images/
 All referenced files (`logo.png`, `screenshot.png`, and `banner.png`) will be uploaded as attachments to the `/guide` page, even though they don't follow the `_attachment_` naming convention.
 
 **Path resolution:**
+- Markdown escape sequences are unescaped (`\(` → `(`)
+- URL encoding (percent-encoding) is decoded (`%20` → space, `%E7%94%BB%E5%83%8F` → `画像`)
 - Relative paths (`./`, `../`, or no prefix): Resolved from the Markdown file's directory
 - Absolute paths (starting with `/`): Resolved from the source directory root
   - Example: `/assets/banner.png` → `<source-dir>/assets/banner.png`
 
+**Supported link formats:**
+```markdown
+![Logo](./images/logo.png)                # Standard relative path
+![Logo](images/logo.png)                  # Relative path without ./
+![Image](./images/%E7%94%BB%E5%83%8F.png) # URL-encoded Japanese filename
+[File](./docs/my%20file.pdf)              # URL-encoded space
+[File](<./path/file (1).png>)             # Special chars with angle brackets
+![Image](./path/file\\(1\\).png)          # Special chars with escaping
+<img src="./images/logo.png" alt="Logo">  # HTML img tag (double quotes)
+<img src='./images/logo.png' alt='Logo'>  # HTML img tag (single quotes)
+```
+
 **Excluded from detection:**
 - `.md` files (treated as page links)
 - External URLs (`http://`, `https://`)

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { lookup } from "mime-types";
 import { glob } from "glob";
 
 //#region package.json
-var version = "1.2.0";
+var version = "1.4.0";
 
 //#endregion
 //#region src/config.ts
@@ -215,6 +215,37 @@ const uploadAttachment = async (attachment, pageId, sourceDir) => {
 //#endregion
 //#region src/scanner.ts
 /**
+* Process a link path and convert it to an AttachmentFile if it exists
+*
+* @param linkPath The link path from markdown
+* @param originalLinkPath The original format of the link (for replacement)
+* @param markdownFilePath Path to the markdown file (relative to sourceDir)
+* @param sourceDir Source directory (absolute path)
+* @returns AttachmentFile if the path resolves to an existing file, null otherwise
+*/
+const processLinkPath = (linkPath, originalLinkPath, markdownFilePath, sourceDir) => {
+	if (linkPath.startsWith("http://") || linkPath.startsWith("https://")) return null;
+	if (linkPath.endsWith(".md")) return null;
+	const unescapedPath = linkPath.replace(/\\([\\`*_{}[\]()#+\-.!])/g, "$1");
+	let decodedPath;
+	try {
+		decodedPath = decodeURIComponent(unescapedPath);
+	} catch {
+		decodedPath = unescapedPath;
+	}
+	let absolutePath;
+	if (linkPath.startsWith("/")) absolutePath = resolve(sourceDir, decodedPath.slice(1));
+	else absolutePath = resolve(dirname(join(sourceDir, markdownFilePath)), decodedPath);
+	if (!existsSync(absolutePath)) return null;
+	const normalizedPath = relative(sourceDir, absolutePath).replace(/\\/g, "/");
+	return {
+		localPath: normalizedPath,
+		fileName: basename(normalizedPath),
+		detectionPattern: "link",
+		originalLinkPaths: [originalLinkPath]
+	};
+};
+/**
 * Extract attachment files from markdown links
 *
 * Scans markdown content for image and link references, resolves their paths,
@@ -243,21 +274,15 @@ const extractLinkedAttachments = (content, markdownFilePath, sourceDir) => {
 		const { anglePath, regularPath } = match.groups;
 		const linkPath = anglePath || regularPath;
 		if (!linkPath) continue;
-		const originalLinkPath = anglePath ? `<${anglePath}>` : regularPath;
-		if (linkPath.startsWith("http://") || linkPath.startsWith("https://")) continue;
-		if (linkPath.endsWith(".md")) continue;
-		const unescapedPath = linkPath.replace(/\\([\\`*_{}[\]()#+\-.!])/g, "$1");
-		let absolutePath;
-		if (linkPath.startsWith("/")) absolutePath = resolve(sourceDir, unescapedPath.slice(1));
-		else absolutePath = resolve(dirname(join(sourceDir, markdownFilePath)), unescapedPath);
-		if (!existsSync(absolutePath)) continue;
-		const normalizedPath = relative(sourceDir, absolutePath).replace(/\\/g, "/");
-		attachments.push({
-			localPath: normalizedPath,
-			fileName: basename(normalizedPath),
-			detectionPattern: "link",
-			originalLinkPaths: [originalLinkPath]
-		});
+		const attachment = processLinkPath(linkPath, anglePath ? `<${anglePath}>` : regularPath, markdownFilePath, sourceDir);
+		if (attachment) attachments.push(attachment);
+	}
+	const imgTagRegex = /<img\s+[^>]*src=(?<quote>["'])(?<src>.*?)\k<quote>[^>]*>/gi;
+	while ((match = imgTagRegex.exec(content)) !== null) {
+		const { src } = match.groups;
+		if (!src) continue;
+		const attachment = processLinkPath(src, src, markdownFilePath, sourceDir);
+		if (attachment) attachments.push(attachment);
 	}
 	return attachments;
 };
@@ -343,13 +368,13 @@ const replaceAttachmentLinks = (markdown, attachments, pageName) => {
 			const escapedFileName = escapeRegex(`${pageName}_attachment_${attachment.fileName}`);
 			patterns.push(escapedFileName, `\\./${escapedFileName}`);
 		}
-		if (attachment.detectionPattern === "link" && attachment.originalLinkPaths) for (const linkPath of attachment.originalLinkPaths) {
+		if (attachment.originalLinkPaths) for (const linkPath of attachment.originalLinkPaths) {
 			const escapedPath = escapeRegex(linkPath);
 			patterns.push(escapedPath);
 			if (linkPath.startsWith("./")) {
 				const escapedWithoutDot = escapeRegex(linkPath.substring(2));
 				patterns.push(escapedWithoutDot);
-			} else if (!linkPath.startsWith("../")) patterns.push(`\\./${escapedPath}`);
+			} else if (!linkPath.startsWith("../") && !linkPath.startsWith("<")) patterns.push(`\\./${escapedPath}`);
 		}
 		for (const pattern of patterns) {
 			const imgRegex = new RegExp(`!\\[([^\\]]*)\\]\\(${pattern}\\)`, "g");
@@ -362,6 +387,11 @@ const replaceAttachmentLinks = (markdown, attachments, pageName) => {
 				replaced = true;
 				result = result.replace(linkRegex, `[$1](${growiPath})`);
 			}
+			const imgTagRegex = new RegExp(`(<img\\s+[^>]*src=)(["'])${pattern}\\2([^>]*>)`, "gi");
+			if (imgTagRegex.test(result)) {
+				replaced = true;
+				result = result.replace(imgTagRegex, `$1$2${growiPath}$2$3`);
+			}
 		}
 	}
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onozaty/growi-uploader",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "A content uploader for GROWI",
   "type": "module",
   "bin": {