@onozaty/growi-uploader 1.6.0 → 1.7.0

package/README.ja.md

@@ -1,12 +1,12 @@
 # growi-uploader
 
-日本語 | [English](README.md)
-
 [![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)
 
+[English](README.md) | 日本語
+
 ローカルのMarkdownファイルと添付ファイルを[GROWI](https://growi.org/) Wikiに一括アップロードするCLIツールです。
 
 ## 機能

package/README.md

@@ -1,12 +1,12 @@
 # growi-uploader
 
-English | [日本語](README.ja.md)
-
 [![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)
 
+English | [日本語](README.ja.md)
+
 A CLI tool to batch upload local Markdown files and attachments to [GROWI](https://growi.org/) Wiki.
 
 ## Features

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { lookup } from "mime-types";
 import { glob } from "glob";
 
 //#region package.json
-var version = "1.6.0";
+var version = "1.7.0";
 
 //#endregion
 //#region src/config.ts
@@ -293,9 +293,25 @@ const processLinkPath = (linkPath, originalLinkPath, markdownFilePath, sourceDir
 	else absolutePath = resolve(dirname(join(sourceDir, markdownFilePath)), decodedPath);
 	if (!existsSync(absolutePath)) return null;
 	const normalizedPath = relative(sourceDir, absolutePath).replace(/\\/g, "/");
+	const fileName = basename(normalizedPath);
+	const namingMatch = fileName.match(/^(.+)_attachment_/);
+	if (namingMatch && namingMatch[1]) {
+		const ownerPageName = namingMatch[1];
+		const attachmentDir = dirname(normalizedPath);
+		const currentMarkdownDir = dirname(markdownFilePath);
+		const currentPageName = basename(markdownFilePath, ".md");
+		return {
+			localPath: normalizedPath,
+			fileName,
+			detectionPattern: "link",
+			originalLinkPaths: [originalLinkPath],
+			isExternalReference: attachmentDir !== currentMarkdownDir || ownerPageName !== currentPageName,
+			ownerPageName
+		};
+	}
 	return {
 		localPath: normalizedPath,
-		fileName: basename(normalizedPath),
+		fileName,
 		detectionPattern: "link",
 		originalLinkPaths: [originalLinkPath]
 	};
@@ -315,7 +331,7 @@ const extractLinkedAttachments = (content, markdownFilePath, sourceDir) => {
 	const attachments = [];
 	const linkRegex = new RegExp([
 		"!?",
-		"\\[(?<alt>[^\\]]*)\\]",
+		"\\[(?<alt>(?:[^\\]\\\\]|\\\\.)*)\\]",
 		"\\(",
 		"(?:",
 		"<(?<anglePath>[^>]+)>",
@@ -415,6 +431,56 @@ const escapeRegex = (str) => {
 	return str.replace(/[.*+?^${}()|[\]\\<>]/g, "\\$&");
 };
 /**
+* Build regex patterns from originalLinkPaths
+* Generates escaped patterns including variations (./path <-> path)
+*/
+const buildPatternsFromLinkPaths = (linkPaths) => {
+	const patterns = [];
+	for (const linkPath of linkPaths) {
+		const escapedPath = escapeRegex(linkPath);
+		patterns.push(escapedPath);
+		if (linkPath.startsWith("./")) {
+			const escapedWithoutDot = escapeRegex(linkPath.substring(2));
+			patterns.push(escapedWithoutDot);
+		} else if (!linkPath.startsWith("../") && !linkPath.startsWith("<")) patterns.push(`\\./${escapedPath}`);
+	}
+	return patterns;
+};
+/**
+* Replace links in markdown content matching the given patterns with a target path
+* Handles image links, regular links, and HTML img tags
+*
+* @param markdown Markdown content
+* @param patterns Array of escaped regex patterns to match
+* @param targetPath Path to replace with (e.g., /attachment/xxx)
+* @returns Object with replaced content and whether any replacement occurred
+*/
+const replaceLinksWithPatterns = (markdown, patterns, targetPath) => {
+	let result = markdown;
+	let replaced = false;
+	for (const pattern of patterns) {
+		const imgRegex = new RegExp(`!\\[((?:[^\\]\\\\]|\\\\.)*)\\]\\(${pattern}\\)`, "g");
+		if (imgRegex.test(result)) {
+			replaced = true;
+			result = result.replace(imgRegex, `![$1](${targetPath})`);
+		}
+		const linkRegex = new RegExp(`(?<!!)\\[((?:[^\\]\\\\]|\\\\.)*)\\]\\(${pattern}\\)`, "g");
+		if (linkRegex.test(result)) {
+			replaced = true;
+			result = result.replace(linkRegex, `[$1](${targetPath})`);
+		}
+		const imgTagRegex = new RegExp(`(<img\\s+[^>]*src=)(["'])${pattern}\\2([^>]*>)`, "gi");
+		if (imgTagRegex.test(result)) {
+			replaced = true;
+			result = result.replace(imgTagRegex, `$1$2${targetPath}$2$3`);
+		}
+	}
+	return {
+		content: result,
+		replaced
+	};
+};
+/**
 * Replace attachment links in Markdown content with GROWI format
 *
 * Supports two detection patterns:
@@ -437,30 +503,42 @@ const replaceAttachmentLinks = (markdown, attachments, pageName) => {
 			const escapedFileName = escapeRegex(`${pageName}_attachment_${attachment.fileName}`);
 			patterns.push(escapedFileName, `\\./${escapedFileName}`);
 		}
-		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("../") && !linkPath.startsWith("<")) patterns.push(`\\./${escapedPath}`);
+		if (attachment.originalLinkPaths) patterns.push(...buildPatternsFromLinkPaths(attachment.originalLinkPaths));
+		const { content: replacedContent, replaced: wasReplaced } = replaceLinksWithPatterns(result, patterns, growiPath);
+		if (wasReplaced) {
+			result = replacedContent;
+			replaced = true;
 		}
-		for (const pattern of patterns) {
-			const imgRegex = new RegExp(`!\\[([^\\]]*)\\]\\(${pattern}\\)`, "g");
-			if (imgRegex.test(result)) {
-				replaced = true;
-				result = result.replace(imgRegex, `![$1](${growiPath})`);
-			}
-			const linkRegex = new RegExp(`(?<!!)\\[([^\\]]*)\\]\\(${pattern}\\)`, "g");
-			if (linkRegex.test(result)) {
-				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 {
+		content: result,
+		replaced
+	};
+};
+/**
+* Replace external attachment links in Markdown content with GROWI format
+*
+* External attachments are files that belong to another page (detected via naming convention).
+* This function resolves them using a global attachment map that contains all uploaded attachments.
+*
+* @param markdown Original Markdown content
+* @param attachments List of external attachments (isExternalReference === true)
+* @param attachmentMap Global map of localPath → attachmentId
+* @returns Object with replaced content and whether any replacement occurred
+*/
+const replaceExternalAttachmentLinks = (markdown, attachments, attachmentMap) => {
+	let result = markdown;
+	let replaced = false;
+	for (const attachment of attachments) {
+		if (!attachment.isExternalReference) continue;
+		const attachmentId = attachmentMap.get(attachment.localPath);
+		if (!attachmentId) continue;
+		const growiPath = `/attachment/${attachmentId}`;
+		const patterns = attachment.originalLinkPaths ? buildPatternsFromLinkPaths(attachment.originalLinkPaths) : [];
+		const { content: replacedContent, replaced: wasReplaced } = replaceLinksWithPatterns(result, patterns, growiPath);
+		if (wasReplaced) {
+			result = replacedContent;
+			replaced = true;
 		}
 	}
 	return {
@@ -501,11 +579,16 @@ const replaceMarkdownExtension = (markdown, basePath = "/") => {
 /**
 * Upload Markdown files and their attachments to GROWI
 *
-* This function orchestrates a 4-stage upload process:
-* 1. Create or update page with original Markdown content
-* 2. Upload attachments
-* 3. Replace attachment links in Markdown and update page
-* 4. Replace .md extension in page links and update page
+* This function orchestrates a 2-pass upload process:
+*
+* Pass 1: Page creation and attachment upload
+* - Create or update page with original Markdown content
+* - Upload attachments (skip external references)
+* - Build global attachment map for cross-page reference resolution
+*
+* Pass 2: Link replacement
+* - Replace attachment links (both local and external references)
+* - Replace .md extension in page links
 *
 * @param files List of Markdown files to upload
 * @param sourceDir Source directory containing files
@@ -523,6 +606,8 @@ const uploadFiles = async (files, sourceDir, config) => {
 		attachmentErrors: 0,
 		linkReplacementErrors: 0
 	};
+	const attachmentMap = /* @__PURE__ */ new Map();
+	const pageResults = [];
 	for (const file of files) {
 		const content = readFileSync(join(sourceDir, file.localPath), "utf-8");
 		const result = await createOrUpdatePage(file, content, config.update);
@@ -541,62 +626,78 @@ const uploadFiles = async (files, sourceDir, config) => {
 			if (config.verbose && result.error) console.error(formatDetailedError(result.error));
 		}
 		if (result.pageId && (result.action === "created" || result.action === "updated")) {
-			let currentContent = content;
-			let currentRevisionId = result.revisionId;
-			if (file.attachments.length > 0) {
-				let hasAttachments = false;
-				let latestRevisionId = result.revisionId;
-				for (const attachment of file.attachments) {
-					const attachmentResult = await uploadAttachment(attachment, result.pageId, sourceDir);
-					if (attachmentResult.success) {
-						stats.attachmentsUploaded++;
-						console.log(`[SUCCESS] ${attachment.localPath} → ${file.growiPath} (attachment)`);
-						if (attachmentResult.attachmentId) {
-							attachment.attachmentId = attachmentResult.attachmentId;
-							hasAttachments = true;
-						}
-						if (attachmentResult.revisionId) latestRevisionId = attachmentResult.revisionId;
-					} else {
-						stats.attachmentErrors++;
-						console.error(`[ERROR] ${attachment.localPath} → ${file.growiPath} (${attachmentResult.errorMessage || "failed to upload attachment"})`);
-						if (config.verbose && attachmentResult.error) console.error(formatDetailedError(attachmentResult.error));
-					}
-				}
-				if (hasAttachments && latestRevisionId) {
-					currentRevisionId = latestRevisionId;
-					const pageName = basename(file.localPath, ".md");
-					const { content: replacedContent, replaced } = replaceAttachmentLinks(currentContent, file.attachments, pageName);
-					if (replaced) {
-						const updateResult = await updatePageContent(result.pageId, currentRevisionId, replacedContent);
-						if (updateResult.success && updateResult.revisionId) {
-							console.log(`[SUCCESS] ${file.localPath} → ${file.growiPath} (attachment links replaced)`);
-							currentContent = replacedContent;
-							currentRevisionId = updateResult.revisionId;
-						} else {
-							console.error(`[ERROR] ${file.localPath} → ${file.growiPath} (failed to update attachment links: ${updateResult.errorMessage || "unknown error"})`);
-							if (config.verbose && updateResult.error) console.error(formatDetailedError(updateResult.error));
-							stats.linkReplacementErrors++;
-						}
+			let latestRevisionId = result.revisionId;
+			for (const attachment of file.attachments) {
+				if (attachment.isExternalReference) continue;
+				const attachmentResult = await uploadAttachment(attachment, result.pageId, sourceDir);
+				if (attachmentResult.success) {
+					stats.attachmentsUploaded++;
+					console.log(`[SUCCESS] ${attachment.localPath} → ${file.growiPath} (attachment)`);
+					if (attachmentResult.attachmentId) {
+						attachment.attachmentId = attachmentResult.attachmentId;
+						attachmentMap.set(attachment.localPath, attachmentResult.attachmentId);
 					}
+					if (attachmentResult.revisionId) latestRevisionId = attachmentResult.revisionId;
+				} else {
+					stats.attachmentErrors++;
+					console.error(`[ERROR] ${attachment.localPath} → ${file.growiPath} (${attachmentResult.errorMessage || "failed to upload attachment"})`);
+					if (config.verbose && attachmentResult.error) console.error(formatDetailedError(attachmentResult.error));
 				}
 			}
-			if (currentRevisionId) {
-				const { content: linkedContent, replaced: linkReplaced } = replaceMarkdownExtension(currentContent, config.basePath);
-				if (linkReplaced) {
-					const updateResult = await updatePageContent(result.pageId, currentRevisionId, linkedContent);
-					if (updateResult.success && updateResult.revisionId) {
-						console.log(`[SUCCESS] ${file.localPath} → ${file.growiPath} (page links replaced)`);
-						currentRevisionId = updateResult.revisionId;
-					} else {
-						console.error(`[ERROR] ${file.localPath} → ${file.growiPath} (failed to update page links: ${updateResult.errorMessage || "unknown error"})`);
-						if (config.verbose && updateResult.error) console.error(formatDetailedError(updateResult.error));
-						stats.linkReplacementErrors++;
-					}
-				}
+			if (latestRevisionId) pageResults.push({
+				file,
+				pageId: result.pageId,
+				revisionId: latestRevisionId,
+				content
+			});
+		} else if (file.attachments.length > 0) {
+			for (const attachment of file.attachments) if (!attachment.isExternalReference) {
+				console.log(`[SKIP] ${attachment.localPath} → ${file.growiPath} (attachment skipped)`);
+				stats.attachmentsSkipped++;
+			}
+		}
+	}
+	for (const pageResult of pageResults) {
+		const { file, pageId, content } = pageResult;
+		let currentContent = content;
+		let currentRevisionId = pageResult.revisionId;
+		const pageName = basename(file.localPath, ".md");
+		const localAttachments = file.attachments.filter((att) => !att.isExternalReference && att.attachmentId);
+		const externalAttachments = file.attachments.filter((att) => att.isExternalReference);
+		let hasReplacements = false;
+		if (localAttachments.length > 0) {
+			const { content: replacedContent, replaced } = replaceAttachmentLinks(currentContent, localAttachments, pageName);
+			if (replaced) {
+				currentContent = replacedContent;
+				hasReplacements = true;
+			}
+		}
+		if (externalAttachments.length > 0) {
+			const { content: replacedContent, replaced } = replaceExternalAttachmentLinks(currentContent, externalAttachments, attachmentMap);
+			if (replaced) {
+				currentContent = replacedContent;
+				hasReplacements = true;
+			}
+		}
+		const { content: linkedContent, replaced: linkReplaced } = replaceMarkdownExtension(currentContent, config.basePath);
+		if (linkReplaced) {
+			currentContent = linkedContent;
+			hasReplacements = true;
+		}
+		if (hasReplacements) {
+			const updateResult = await updatePageContent(pageId, currentRevisionId, currentContent);
+			if (updateResult.success && updateResult.revisionId) {
+				const replacementTypes = [];
+				if (localAttachments.some((att) => att.attachmentId)) replacementTypes.push("attachment links");
+				if (externalAttachments.length > 0) replacementTypes.push("external references");
+				if (linkReplaced) replacementTypes.push("page links");
+				console.log(`[SUCCESS] ${file.localPath} → ${file.growiPath} (${replacementTypes.join(", ")} replaced)`);
+				currentRevisionId = updateResult.revisionId;
+			} else {
+				console.error(`[ERROR] ${file.localPath} → ${file.growiPath} (failed to update links: ${updateResult.errorMessage || "unknown error"})`);
+				if (config.verbose && updateResult.error) console.error(formatDetailedError(updateResult.error));
+				stats.linkReplacementErrors++;
 			}
-		} else if (file.attachments.length > 0) for (const attachment of file.attachments) {
-			console.log(`[SKIP] ${attachment.localPath} → ${file.growiPath} (attachment skipped)`);
-			stats.attachmentsSkipped++;
 		}
 	}
 	return stats;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onozaty/growi-uploader",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "A content uploader for GROWI",
   "type": "module",
   "bin": {
@@ -10,8 +10,7 @@
     "dist/**/*"
   ],
   "scripts": {
-    "build": "pnpm gen && tsdown",
-    "prepublishOnly": "pnpm run build",
+    "build": "tsdown",
     "dev": "tsx src/index.ts",
     "gen": "orval",
     "lint": "eslint .",