@polylith/builder 1.0.0 → 1.0.3

package/Files.js

@@ -2,6 +2,7 @@ import fg from 'fast-glob';
 import path from 'node:path/posix'
 import {ensureDir} from 'fs-extra';
 import { copyFile } from 'node:fs/promises';
+import cc from "@ondohers/console-colors";
 import App from './App.js';
 import {forceToPosix} from './utils.js'
 import './types.js'
@@ -148,6 +149,64 @@ export default class Files {
 		return folders;
 	}
 
+	/**
+	 * Call this method to clear the cached file discovery results. Use this
+	 * before rebuilding the resource map after files are added or removed.
+	 */
+	resetFiles() {
+		this.files = {};
+		this.filesFound = false;
+	}
+
+	/**
+	 * Call this method to refresh the discovered resource files from the current
+	 * copy specs so new or removed files are reflected in the file map.
+	 *
+	 * @returns {Promise<CopyInfoList>} the refreshed copy info list
+	 */
+    async refreshFiles() {
+        this.resetFiles();
+        return await this.findAllFiles();
+    }
+
+    /**
+     * Call this method to register one file in the resource map if it matches
+     * one of the configured copy specs.
+     *
+     * @param {String} filename - the full path of the candidate file.
+     * @returns {Promise<Boolean>} true if the file matched a resource spec.
+     */
+    async addFileIfMatched(filename) {
+        var posixFilename = forceToPosix(filename);
+
+        for (let spec of this.specs) {
+            let searchRoot = path.join(this.src, spec.root, spec.cwd);
+            let posixSearchRoot = forceToPosix(searchRoot);
+            let isInSearchRoot = posixFilename.indexOf(`${posixSearchRoot}/`) === 0;
+
+            if (!isInSearchRoot) continue;
+
+            let matchedFiles = await fg(spec.glob, {
+                cwd: searchRoot,
+                ignore: ['**/node_modules'],
+                absolute: true,
+                onlyFiles: true,
+                unique: true,
+                dot: true,
+            });
+            let normalizedMatches = matchedFiles.map(function(oneFile) {
+                return forceToPosix(oneFile);
+            });
+
+            if (!normalizedMatches.includes(posixFilename)) continue;
+
+            this.addFiles(searchRoot, [posixFilename], spec);
+            return true;
+        }
+
+        return false;
+    }
+
 
 	/**
 	 * Call this method to copy a single file into its destination location
@@ -160,7 +219,8 @@ export default class Files {
 		var destination = forTest ? this.files[file] && this.files[file].testDestFilename : this.files[file] && this.files[file].destFilename;
 
 		if (destination && updated) {
-			console.log(`file ${file} updated, copied to ${destination}`);
+			console.log(`${cc.set('fg_green', 'copy')} of file ${cc.set('fg_white', file)} to ${cc.set('fg_white', destination)}`);
+			await ensureDir(path.dirname(destination));
 			await copyFile(file, destination);
 		}
 	}
@@ -229,6 +289,7 @@ export default class Files {
 			try {
 				await ensureDir(destFilePath);
 				await copyFile(srcFilename, destFilename);
+				console.log(`${cc.set('fg_green', 'copy')} of file ${cc.set('fg_white', srcFilename)} to ${cc.set('fg_white', destFilename)}`);
 			} catch (e) {
 				console.error(`Error copying file ${srcFilename} to ${destFilename}`);
 				throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polylith/builder",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "The polylith builder",
   "main": "index.js",
   "type": "module",
@@ -19,8 +19,8 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.22.15",
     "@ondohers/console-colors": "^0.1.1",
-    "@polylith/config-store": "1.0.0",
-    "@polylith/core": "1.0.0",
+    "@polylith/config-store": "1.0.3",
+    "@polylith/core": "1.0.3",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^24.0.0",
     "@rollup/plugin-json": "^5.0.2",

package/plugin-copy-resources.js

@@ -1,4 +1,23 @@
-var copied= {}
+import { forceToPosix } from './utils.js';
+
+var copied = {}
+
+/**
+ * Call this method to test whether the changed file is inside one of the
+ * resource folders watched by the copy plugin.
+ *
+ * @param {String} file the changed filename from rollup
+ * @param {Array.<String>} folders the resource folders registered for watch
+ * @returns {Boolean} true if the file belongs to a watched resource folder
+ */
+function isWatchedResourceFile(file, folders) {
+    var posixFile = forceToPosix(file);
+
+    return folders.some(function(folder) {
+        var posixFolder = forceToPosix(folder);
+        return posixFile === posixFolder || posixFile.indexOf(`${posixFolder}/`) === 0;
+    });
+}
 
 /**
  *
@@ -7,18 +26,32 @@ var copied= {}
  * @returns {Object} the plugin
  */
 export default function(name, files, forTest) {
+    var folders = [];
+
 	return {
 		name: "copy-resources",
 
 		buildStart() {
-			var folders = files.getAllFolders();
+			folders = files.getAllFolders();
 			folders.forEach(function(name) {
 				this.addWatchFile(name);
 			}, this);
 		},
 
-		watchChange(file, event) {
-			files.copyOneFile(file, true);
+		async watchChange(file, event) {
+            if (!isWatchedResourceFile(file, folders)) return;
+
+            if (event.event === 'create') {
+                let wasAdded = await files.addFileIfMatched(file);
+                if (wasAdded) {
+                    await files.copyOneFile(file, true, forTest);
+                }
+                return;
+            }
+
+            if (event.event === 'delete') return;
+
+			await files.copyOneFile(file, true, forTest);
 		},
 
 		async generateBundle(outputOptions, bundleInfo) {