pkgprn 0.5.4 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkgprn",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "license": "MIT",
   "author": "Konstantin Shutkin",
   "bin": "./index.js",

package/prune.js

@@ -1,4 +1,4 @@
-import { access, mkdir, readdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
+import { access, glob as fsGlob, mkdir, readdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 
 import { extractReferences } from './extract-references.js';
@@ -46,12 +46,20 @@ export async function prunePkg(pkg, options, logger) {
         }
     }
 
+    if (pkg.files && Array.isArray(pkg.files)) {
+        pkg.files = await expandFileGlobs(pkg.files);
+    }
+
     if (options.cleanupFiles) {
         await removeJunkFiles('.');
     } else if (options.flatten) {
         logger('cleanup is disabled, junk files may cause flatten to fail', 2);
     }
 
+    if (pkg.files && Array.isArray(pkg.files) && pkg.files.length > 0 && options.cleanupFiles) {
+        await cleanupDir(pkg, logger);
+    }
+
     if (options.flatten) {
         await flatten(pkg, options.flatten, logger, options.removeSourcemaps);
     }
@@ -209,8 +217,8 @@ export async function prunePkg(pkg, options, logger) {
         }
     }
 
-    if (pkg.files && Array.isArray(pkg.files) && options.cleanupFiles) {
-        await cleanupDir(pkg, logger);
+    if (options.cleanupFiles) {
+        pkg.files = undefined;
     }
 }
 
@@ -590,6 +598,25 @@ function isAlwaysIncludedByBasename(file) {
     return alwaysIncludedBasenames.includes(basenameWithoutExtension);
 }
 
+function isGlobPattern(str) {
+    return /[*?[\]{}]/.test(str);
+}
+
+async function expandFileGlobs(files) {
+
+    const result = [];
+    for (const entry of files) {
+        if (isGlobPattern(entry)) {
+            for await (const match of fsGlob(entry)) {
+                result.push(normalizePath(match));
+            }
+        } else {
+            result.push(entry);
+        }
+    }
+    return [...new Set(result)];
+}
+
 async function cleanupDir(pkg, logger) {
     logger.update('cleaning up files...');
 
@@ -625,8 +652,6 @@ async function cleanupDir(pkg, logger) {
 
         await rm(entry, { recursive: true, force: true });
     }
-
-    pkg.files = undefined;
 }
 
 async function cleanupSubDir(dir, filesEntries, alwaysIncludedFiles) {