@calmdown/rollup-plugin-copy 1.0.0 → 2.0.0

package/index.js

@@ -1,5 +1,5 @@
-import * as fs from "node:fs/promises";
-import * as path from "node:path";
+import * as FS from "node:fs/promises";
+import * as Path from "node:path";
 
 const PLUGIN_NAME = "Copy";
 
@@ -14,18 +14,18 @@ const EK_UNKNOWN = "unknown";
 
 /**
  * @typedef {Object} CopySingleTarget
- * @property {string} srcFile path to the file to be copied
- * @property {string} dstFile path to where the file should be copied to
- * @property {string} [baseDir] base directory for relative paths (defaults to current directory)
+ * @property {string} srcFile path to the file to be copied; relative paths resolve against the current directory
+ * @property {string} dstFile path to where the file should be copied to; relative paths resolve against the current directory
  * @property {"before"|"after"} [trigger="after"] when to run the operation (defaults to "after")
  */
 
 /**
  * @typedef {Object} CopyManyTarget
- * @property {string} dstDir directory to where files should be copied or linked
+ * @property {string} dstDir directory to where files should be copied or linked; relative paths resolve against the current directory
  * @property {string|string[]} include glob pattern(s) of files to include
  * @property {string|string[]} [exclude] glob pattern(s) to exclude (optional)
- * @property {string} [baseDir] base directory for relative paths (defaults to current directory)
+ * @property {string} [baseDir] when set, directory structure under this path will be copied to dstDir, otherwise the structure is flattened; relative paths resolve against the current directory
+ * @property {string} [flatten=false] when to run the operation (defaults to "after")
  * @property {"before"|"after"} [trigger="after"] when to run the operation (defaults to "after")
  */
 
@@ -34,7 +34,7 @@ const EK_UNKNOWN = "unknown";
  * @property {(CopySingleTarget | CopyManyTarget)[]} targets desired copy/link operations
  * @property {boolean} [dryRun=false] whether to perform a dry run, only logging actions without executing them (defaults to false)
  * @property {boolean} [runOnce=true] when in watch mode, controls whether to only delete files on the first build (defaults to true)
- * @property {"ignore"|"copy-file"|"link-absolute"|"link-relative"} [symLinks="ignore"] how to handle symlinks (defaults to "ignore")
+ * @property {"ignore"|"copy-file"|"link-relative"|"link-absolute"} [symLinks="ignore"] how to handle symlinks (defaults to "ignore")
  */
 
 /**
@@ -59,15 +59,14 @@ export default function CopyPlugin(pluginOptions) {
 	};
 
 	const execTarget = async (context, cwd, target) => {
-		const baseDir = target.baseDir ? path.resolve(cwd, target.baseDir) : cwd;
 		const entries = [];
 		if (target.srcFile) {
 			// single file
-			const src = path.resolve(baseDir, target.srcFile);
-			const stats = await fs.stat(src);
+			const src = Path.resolve(cwd, target.srcFile);
+			const stats = await FS.stat(src);
 			entries.push({
 				src,
-				dst: path.resolve(baseDir, target.dstFile),
+				dst: Path.resolve(cwd, target.dstFile),
 				kind: getKind(stats),
 			});
 		}
@@ -80,12 +79,24 @@ export default function CopyPlugin(pluginOptions) {
 				withFileTypes: true,
 			};
 
-			const dstDir = path.resolve(baseDir, target.dstDir);
+			const dstDir = Path.resolve(cwd, target.dstDir);
+			const baseDir = target.baseDir ? Path.resolve(cwd, target.baseDir) : null;
 			for (const includePattern of include) {
-				for await (const entry of fs.glob(includePattern, globOptions)) {
+				for await (const entry of FS.glob(includePattern, globOptions)) {
+					const src = Path.join(entry.parentPath, entry.name);
+					let dst = null;
+
+					if (baseDir) {
+						const rel = Path.relative(baseDir, src);
+						if (!rel.startsWith("..")) {
+							dst = Path.join(dstDir, rel);
+						}
+					}
+
+					dst ??= dst = Path.join(dstDir, entry.name);
 					entries.push({
-						src: path.join(entry.parentPath, entry.name),
-						dst: path.join(dstDir, entry.name),
+						src,
+						dst,
 						kind: getKind(entry),
 					});
 				}
@@ -93,10 +104,10 @@ export default function CopyPlugin(pluginOptions) {
 		}
 
 		for (const entry of entries) {
-			const dstDir = path.dirname(entry.dst);
+			const dstDir = Path.dirname(entry.dst);
 			if (entry.kind === EK_FILE) {
-				await exec(context, null, () => fs.mkdir(dstDir, { recursive: true }));
-				await exec(context, `would copy file ${entry.src} -> ${entry.dst}`, () => fs.copyFile(entry.src, entry.dst));
+				await exec(context, null, () => FS.mkdir(dstDir, { recursive: true }));
+				await exec(context, `would copy file ${entry.src} -> ${entry.dst}`, () => FS.copyFile(entry.src, entry.dst));
 				context.addWatchFile(entry.src);
 			}
 			else if (entry.kind === EK_LINK && symLinks !== SL_IGNORE) {
@@ -105,19 +116,19 @@ export default function CopyPlugin(pluginOptions) {
 					continue;
 				}
 
-				await exec(context, null, () => fs.mkdir(dstDir, { recursive: true }));
+				await exec(context, null, () => FS.mkdir(dstDir, { recursive: true }));
 				switch (symLinks) {
 					case SL_COPY_FILE:
-						await exec(context, `would copy file ${linkedPath} -> ${entry.dst} resolved from symlink ${entry.src}`, () => fs.copyFile(linkedPath, entry.dst));
+						await exec(context, `would copy file ${linkedPath} -> ${entry.dst} resolved from symlink ${entry.src}`, () => FS.copyFile(linkedPath, entry.dst));
 						break;
 
 					case SL_LINK_ABSOLUTE:
-						await exec(context, `would create symlink ${entry.dst} pointing to ${linkedPath} resolved from symlink ${entry.src}`, () => fs.symlink(linkedPath, entry.dst));
+						await exec(context, `would create symlink ${entry.dst} pointing to ${linkedPath} resolved from symlink ${entry.src}`, () => FS.symlink(linkedPath, entry.dst));
 						break;
 
 					case SL_LINK_RELATIVE: {
-						const linkTargetPath = path.relative(entry.dst, linkedPath);
-						await exec(context, `would create symlink ${entry.dst} pointing to ${linkTargetPath} resolved from symlink ${entry.src}`, () => fs.symlink(linkTargetPath, entry.dst));
+						const linkTargetPath = Path.relative(entry.dst, linkedPath);
+						await exec(context, `would create symlink ${entry.dst} pointing to ${linkTargetPath} resolved from symlink ${entry.src}`, () => FS.symlink(linkTargetPath, entry.dst));
 						break;
 					}
 				}
@@ -127,7 +138,6 @@ export default function CopyPlugin(pluginOptions) {
 		}
 	};
 
-	let cwd = undefined;
 	let isFirstBeforeRun = true;
 	let isFirstAfterRun = true;
 	return {
@@ -138,7 +148,8 @@ export default function CopyPlugin(pluginOptions) {
 			}
 
 			isFirstBeforeRun = false;
-			cwd = process.cwd();
+
+			const cwd = process.cwd();
 			for (const target of targets) {
 				if (target.trigger === "before") {
 					await execTarget(this, cwd, target);
@@ -151,6 +162,8 @@ export default function CopyPlugin(pluginOptions) {
 			}
 
 			isFirstAfterRun = false;
+
+			const cwd = process.cwd();
 			for (const target of targets) {
 				const { trigger } = target;
 				if (trigger === "after" || trigger === undefined) {
@@ -183,15 +196,15 @@ async function resolveSymLink(linkPath, maxDepth = 8) {
 	let current = linkPath;
 	let depth = 0;
 	do {
-		const st = await fs.stat(current);
+		const st = await FS.stat(current);
 		if (!st.isSymbolicLink()) {
 			return current;
 		}
 
-		const target = await fs.readlink(current, "utf8");
+		const target = await FS.readlink(current, "utf8");
 		visited.add(current);
 
-		current = path.join(path.dirname(current), target);
+		current = Path.join(Path.dirname(current), target);
 	}
 	while (!visited.has(current) && ++depth < maxDepth);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calmdown/rollup-plugin-copy",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "license": "ISC",
   "type": "module",
   "exports": {