npmdata 0.18.11 → 0.18.13

package/dist/package/action-purge.d.ts

@@ -1,9 +1,6 @@
-import { NpmdataConfig, ProgressEvent, BasicPackageOptions } from '../types';
+import { ProgressEvent, BasicPackageOptions } from '../types';
 export type PurgeOptions = BasicPackageOptions & {
     onProgress?: (event: ProgressEvent) => void;
-    visitedEntries?: Set<string>;
-    config?: NpmdataConfig;
-    presets?: string[];
 };
 export type PurgeSummary = {
     deleted: number;
@@ -11,14 +8,12 @@ export type PurgeSummary = {
     dirsRemoved: number;
 };
 /**
- * Purge managed files from all matching filesets.
- * Supports --dry-run.
+ * Purge all managed files for the given entries.
  *
- * Operates in two phases:
- *   1. Collect: recursively traverse all sets and accumulate the managed file
- *      entries to delete per output directory (no disk writes).
- *   2. Execute: delete the collected files per output directory, then update
- *      the marker (removing only purged paths) and gitignore accordingly.
+ * Uses resolveFiles() to build the desired file list (installing packages as needed),
+ * then calculateDiff() to find the managed files on disk. Deletes ok, conflict,
+ * and extra files (i.e. everything currently managed by npmdata for these packages).
+ * Updates .npmdata markers and .gitignore entries for affected output directories.
  */
 export declare function actionPurge(options: PurgeOptions): Promise<PurgeSummary>;
 //# sourceMappingURL=action-purge.d.ts.map

package/dist/package/action-purge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-purge.d.ts","sourceRoot":"","sources":["../../src/package/action-purge.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,aAAa,EACb,aAAa,EACb,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAKlB,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG;IAC/C,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5C,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0HF;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqD9E"}
+{"version":3,"file":"action-purge.d.ts","sourceRoot":"","sources":["../../src/package/action-purge.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AASzE,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG;IAC/C,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAkD9E"}

package/dist/package/action-purge.js

@@ -1,166 +1,130 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actionPurge = actionPurge;
 /* eslint-disable no-console */
-const node_fs_1 = __importStar(require("node:fs"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const utils_1 = require("../utils");
 const markers_1 = require("../fileset/markers");
-const purge_1 = require("../fileset/purge");
-/** Unique key for a set entry: same package with different selectors is a distinct entry. */
-const entryKey = (entry) => `${(0, utils_1.parsePackageSpec)(entry.package).name}|${JSON.stringify(entry.selector ?? {})}`;
+const gitignore_1 = require("../fileset/gitignore");
+const symlinks_1 = require("./symlinks");
+const resolve_files_1 = require("./resolve-files");
+const calculate_diff_1 = require("./calculate-diff");
 /**
- * Phase 1: recursively collect all managed file entries that need to be purged,
- * grouped by output directory. No disk writes are performed.
+ * Purge all managed files for the given entries.
+ *
+ * Uses resolveFiles() to build the desired file list (installing packages as needed),
+ * then calculateDiff() to find the managed files on disk. Deletes ok, conflict,
+ * and extra files (i.e. everything currently managed by npmdata for these packages).
+ * Updates .npmdata markers and .gitignore entries for affected output directories.
  */
-// eslint-disable-next-line complexity
-async function collectPurgePlan(entries, cwd, verbose, visitedEntries, plan, onProgress) {
-    // Skip already-visited entries to break recursion cycles; mark the rest as visited.
-    const entriesToProcess = entries.filter((entry) => !visitedEntries.has(entryKey(entry)));
-    for (const entry of entriesToProcess) {
-        visitedEntries.add(entryKey(entry));
-    }
+async function actionPurge(options) {
+    const { entries, cwd, dryRun = false, verbose = false, onProgress } = options;
+    const summary = { deleted: 0, symlinksRemoved: 0, dirsRemoved: 0 };
     if (verbose) {
-        console.log(`[verbose] purge: collecting ${entriesToProcess.length} entr${entriesToProcess.length === 1 ? 'y' : 'ies'} (cwd: ${cwd})`);
+        console.log(`[verbose] actionPurge: resolving files (cwd: ${(0, utils_1.formatDisplayPath)(cwd, cwd)})`);
     }
-    for (const entry of entriesToProcess) {
-        const pkg = (0, utils_1.parsePackageSpec)(entry.package);
-        const outputDir = node_path_1.default.resolve(cwd, entry.output?.path ?? '.');
+    try {
+        const resolvedFiles = await (0, resolve_files_1.resolveFiles)(entries, {
+            cwd,
+            verbose,
+            onProgress: (e) => {
+                if (e.type === 'package-start' || e.type === 'package-end')
+                    onProgress?.(e);
+            },
+        });
         if (verbose) {
-            console.log(`[verbose] purge: collecting entry package=${entry.package} outputDir=${entry.output?.path ?? '.'}`);
+            console.log(`[verbose] actionPurge: resolved ${resolvedFiles.length} desired file(s)`);
         }
-        onProgress?.({
-            type: 'package-start',
-            packageName: pkg.name,
-            packageVersion: pkg.version ?? 'latest',
-        });
-        // Read the marker and collect only entries belonging to this package
-        const managedFiles = await (0, markers_1.readOutputDirMarker)(outputDir);
-        const entryFiles = managedFiles.filter((m) => m.packageName === pkg.name);
-        // Accumulate into the plan (multiple entries may share the same outputDir)
-        const existing = plan.get(outputDir) ?? [];
-        plan.set(outputDir, [...existing, ...entryFiles]);
-        onProgress?.({
-            type: 'package-end',
-            packageName: pkg.name,
-            packageVersion: pkg.version ?? 'latest',
-        });
-        // Hierarchical collection: if the installed package declares npmdata.sets, recurse
-        const pkgPath = (0, utils_1.getInstalledIfSatisfies)(pkg.name, pkg.version, cwd);
-        if (!pkgPath)
-            continue;
-        const pkgJsonFile = node_path_1.default.join(pkgPath, 'package.json');
-        if (!(0, node_fs_1.existsSync)(pkgJsonFile))
-            continue;
-        const depPkgJson = JSON.parse(node_fs_1.default.readFileSync(pkgJsonFile).toString());
-        const pkgNpmdataSets = depPkgJson.npmdata?.sets;
-        if (pkgNpmdataSets && pkgNpmdataSets.length > 0) {
-            const presetFilteredSets = (0, utils_1.filterEntriesByPresets)(pkgNpmdataSets, entry.selector?.presets ?? []);
-            // Preemptively mark preset-excluded entries as visited so they cannot sneak
-            // back in through a self-referencing set's secondary recursion.
-            for (const e of pkgNpmdataSets) {
-                if (!presetFilteredSets.includes(e)) {
-                    visitedEntries.add(entryKey(e));
+        const managedResolvedFiles = resolvedFiles.filter((f) => f.managed);
+        const diff = await (0, calculate_diff_1.calculateDiff)(managedResolvedFiles, verbose, cwd);
+        // Purge: ok (present+matching), conflict (present+mismatched), extra (stale managed)
+        const filesToDelete = [...diff.ok, ...diff.conflict, ...diff.extra];
+        if (verbose) {
+            console.log(`[verbose] actionPurge: ${filesToDelete.length} file(s) to delete` +
+                ` (ok=${diff.ok.length} conflict=${diff.conflict.length} extra=${diff.extra.length})`);
+        }
+        // Group by outputDir
+        const byOutputDir = new Map();
+        for (const entry of filesToDelete) {
+            const arr = byOutputDir.get(entry.outputDir) ?? [];
+            arr.push(entry);
+            byOutputDir.set(entry.outputDir, arr);
+        }
+        for (const [outputDir, dirEntries] of byOutputDir) {
+            await purgeOutputDir(outputDir, dirEntries, dryRun, summary, cwd, onProgress, verbose);
+        }
+        return summary;
+    }
+    finally {
+        (0, utils_1.cleanupTempPackageJson)(cwd, verbose);
+    }
+}
+async function purgeOutputDir(outputDir, entries, dryRun, summary, cwd, onProgress, verbose) {
+    const relPaths = entries.map((e) => e.relPath);
+    const gitignorePaths = (0, gitignore_1.readManagedGitignoreEntries)(outputDir);
+    for (const entry of entries) {
+        const fullPath = node_path_1.default.join(outputDir, entry.relPath);
+        if (node_fs_1.default.existsSync(fullPath)) {
+            if (!dryRun) {
+                try {
+                    node_fs_1.default.chmodSync(fullPath, 0o644);
+                    node_fs_1.default.unlinkSync(fullPath);
                 }
-            }
-            // Self-referencing sets only recurse when presets are active; external sets always recurse.
-            const filteredSets = presetFilteredSets.filter((e) => (0, utils_1.parsePackageSpec)(e.package).name !== pkg.name ||
-                (entry.selector?.presets?.length ?? 0) > 0);
-            if (filteredSets.length > 0) {
-                const outputConfig = entry.output ?? {};
-                const inheritedEntries = filteredSets.map((depEntry) => {
-                    const { path: depPath, ...restOutput } = depEntry.output ?? {};
-                    return {
-                        ...depEntry,
-                        output: {
-                            ...restOutput,
-                            path: node_path_1.default.join(outputConfig.path ?? '.', depPath ?? '.'),
-                        },
-                    };
-                });
-                if (verbose) {
-                    console.log(`[verbose] purge: recursing into ${filteredSets.length} set(s) from ${pkg.name}`);
+                catch {
+                    // ignore deletion errors
                 }
-                await collectPurgePlan(inheritedEntries, cwd, verbose, visitedEntries, plan, onProgress);
             }
+            summary.deleted++;
+            const pkgName = entry.desired?.packageName ?? entry.existing?.packageName ?? '';
+            onProgress?.({
+                type: 'file-deleted',
+                packageName: pkgName,
+                file: entry.relPath,
+                managed: true,
+                gitignore: gitignorePaths.has(entry.relPath),
+            });
         }
     }
-}
-/**
- * Purge managed files from all matching filesets.
- * Supports --dry-run.
- *
- * Operates in two phases:
- *   1. Collect: recursively traverse all sets and accumulate the managed file
- *      entries to delete per output directory (no disk writes).
- *   2. Execute: delete the collected files per output directory, then update
- *      the marker (removing only purged paths) and gitignore accordingly.
- */
-async function actionPurge(options) {
-    const { entries, cwd, dryRun = false, verbose = false, onProgress, visitedEntries = new Set(), } = options;
-    // Phase 1: collect all entries to purge across all recursive sets
-    if (verbose) {
-        console.log(`[verbose] purge: phase 1 - collecting entries to purge (cwd: ${cwd})`);
+    if (!dryRun && relPaths.length > 0) {
+        summary.symlinksRemoved += await (0, symlinks_1.removeAllSymlinks)(outputDir);
+        summary.dirsRemoved += removeEmptyDirs(outputDir);
+        await updateMarkerAfterPurge(outputDir, new Set(relPaths));
+        await (0, gitignore_1.removeFromGitignore)(outputDir, relPaths);
     }
-    const plan = new Map();
-    await collectPurgePlan(entries, cwd, verbose, visitedEntries, plan, onProgress);
-    const summary = { deleted: 0, symlinksRemoved: 0, dirsRemoved: 0 };
-    // Phase 2: execute deletions per output directory
     if (verbose) {
-        const total = [...plan.values()].reduce((sum, e) => sum + e.length, 0);
-        console.log(`[verbose] purge: phase 2 - deleting ${total} entr${total === 1 ? 'y' : 'ies'} across ${plan.size} output dir(s)`);
+        console.log(`[verbose] actionPurge: ${(0, utils_1.formatDisplayPath)(outputDir, cwd)} — deleted ${relPaths.length} file(s)`);
     }
-    for (const [outputDir, entriesToPurge] of plan) {
-        if (verbose) {
-            console.log(`[verbose] purge: executing purge for ${node_path_1.default.relative(cwd, outputDir)} (${entriesToPurge.length} entries)`);
+}
+async function updateMarkerAfterPurge(outputDir, purgedPaths) {
+    const current = await (0, markers_1.readOutputDirMarker)(outputDir);
+    const updated = current.filter((m) => !purgedPaths.has(m.path));
+    await (0, markers_1.writeMarker)((0, markers_1.markerPath)(outputDir), updated);
+}
+function removeEmptyDirs(dir) {
+    let count = 0;
+    if (!node_fs_1.default.existsSync(dir))
+        return count;
+    const recurse = (d) => {
+        for (const e of node_fs_1.default.readdirSync(d)) {
+            const full = node_path_1.default.join(d, e);
+            if (node_fs_1.default.statSync(full).isDirectory())
+                recurse(full);
         }
-        const result = await (0, purge_1.purgeFileset)(outputDir, entriesToPurge, dryRun);
-        for (const m of entriesToPurge) {
-            onProgress?.({ type: 'file-deleted', packageName: m.packageName, file: m.path });
+        try {
+            if (d !== dir && node_fs_1.default.readdirSync(d).length === 0) {
+                node_fs_1.default.rmdirSync(d);
+                count++;
+            }
         }
-        summary.deleted += result.deleted;
-        summary.symlinksRemoved += result.symlinksRemoved;
-        summary.dirsRemoved += result.dirsRemoved;
-        if (verbose) {
-            console.log(`[verbose] purge: deleted ${result.deleted} files, ${result.symlinksRemoved} symlinks, ${result.dirsRemoved} dirs`);
+        catch {
+            // ignore
         }
-    }
-    return summary;
+    };
+    recurse(dir);
+    return count;
 }
 //# sourceMappingURL=action-purge.js.map

package/dist/package/action-purge.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-purge.js","sourceRoot":"","sources":["../../src/package/action-purge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"action-purge.js","sourceRoot":"","sources":["../../src/package/action-purge.ts"],"names":[],"mappings":"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"}

package/dist/package/calculate-diff.d.ts

@@ -0,0 +1,12 @@
+import { ResolvedFile, DiffResult } from '../types';
+/**
+ * Calculate the diff between the desired file list (from resolveFiles) and the
+ * actual state of each output directory.
+ *
+ * Only managed files (tracked in .npmdata markers) are included in the 'extra'
+ * analysis, scoped to the packages represented in `resolvedFiles`.
+ *
+ * @returns DiffResult classifying each file as ok, missing, extra, or conflict.
+ */
+export declare function calculateDiff(resolvedFiles: ResolvedFile[], verbose?: boolean, cwd?: string): Promise<DiffResult>;
+//# sourceMappingURL=calculate-diff.d.ts.map

package/dist/package/calculate-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculate-diff.d.ts","sourceRoot":"","sources":["../../src/package/calculate-diff.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAOzE;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,YAAY,EAAE,EAC7B,OAAO,CAAC,EAAE,OAAO,EACjB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,UAAU,CAAC,CAgDrB"}

package/dist/package/calculate-diff.js

@@ -0,0 +1,119 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateDiff = calculateDiff;
+/* eslint-disable no-console */
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const gitignore_1 = require("../fileset/gitignore");
+const utils_1 = require("../utils");
+const markers_1 = require("../fileset/markers");
+const content_replacements_1 = require("./content-replacements");
+/**
+ * Calculate the diff between the desired file list (from resolveFiles) and the
+ * actual state of each output directory.
+ *
+ * Only managed files (tracked in .npmdata markers) are included in the 'extra'
+ * analysis, scoped to the packages represented in `resolvedFiles`.
+ *
+ * @returns DiffResult classifying each file as ok, missing, extra, or conflict.
+ */
+async function calculateDiff(resolvedFiles, verbose, cwd) {
+    const result = { ok: [], missing: [], extra: [], conflict: [] };
+    if (resolvedFiles.length === 0)
+        return result;
+    // Group resolved files by output directory
+    const byOutputDir = new Map();
+    for (const f of resolvedFiles) {
+        const arr = byOutputDir.get(f.outputDir) ?? [];
+        arr.push(f);
+        byOutputDir.set(f.outputDir, arr);
+    }
+    // Only consider marker entries from packages that appear in the resolved list
+    const relevantPackages = new Set(resolvedFiles.map((f) => f.packageName));
+    for (const [outputDir, desiredFiles] of byOutputDir) {
+        const existingMarker = await (0, markers_1.readOutputDirMarker)(outputDir);
+        const managedByPath = new Map(existingMarker.map((m) => [m.path, m]));
+        const desiredByPath = new Map(desiredFiles.map((f) => [f.relPath, f]));
+        const gitignorePaths = (0, gitignore_1.readManagedGitignoreEntries)(outputDir);
+        // ── Classify desired files ──────────────────────────────────────────────
+        for (const desired of desiredFiles) {
+            await classifyDesiredFile(desired, outputDir, managedByPath, gitignorePaths, result);
+        }
+        // ── Extra managed files ─────────────────────────────────────────────────
+        // Files that are managed (in the marker) under a relevant package but are
+        // no longer in the desired file list.
+        for (const m of existingMarker) {
+            if (relevantPackages.has(m.packageName) && !desiredByPath.has(m.path)) {
+                result.extra.push({ status: 'extra', relPath: m.path, outputDir, existing: m });
+            }
+        }
+        if (verbose) {
+            console.log(`[verbose] calculateDiff: ${(0, utils_1.formatDisplayPath)(outputDir, cwd)}: ` +
+                `ok=${result.ok.length} missing=${result.missing.length} ` +
+                `conflict=${result.conflict.length} extra=${result.extra.length}`);
+        }
+    }
+    return result;
+}
+/**
+ * Classify a single desired file against the current output directory state.
+ * Appends to the appropriate result bucket (ok, missing, or conflict).
+ */
+async function classifyDesiredFile(desired, outputDir, managedByPath, gitignorePaths, result) {
+    const destPath = node_path_1.default.join(outputDir, desired.relPath);
+    const destExists = node_fs_1.default.existsSync(destPath);
+    if (!destExists) {
+        result.missing.push({ status: 'missing', relPath: desired.relPath, outputDir, desired });
+        return;
+    }
+    const conflictReasons = [];
+    // Content check
+    let srcHash;
+    try {
+        if (desired.contentReplacements.length > 0) {
+            const srcContent = node_fs_1.default.readFileSync(desired.sourcePath, 'utf8');
+            const transformed = (0, content_replacements_1.applyContentReplacementsToBuffer)(srcContent, desired.contentReplacements);
+            srcHash = (0, utils_1.hashBuffer)(transformed);
+        }
+        else {
+            srcHash = await (0, utils_1.hashFile)(desired.sourcePath);
+        }
+    }
+    catch {
+        srcHash = await (0, utils_1.hashFile)(desired.sourcePath);
+    }
+    const destHash = await (0, utils_1.hashFile)(destPath);
+    if (srcHash !== destHash)
+        conflictReasons.push('content');
+    // Managed-state check
+    const isManaged = managedByPath.has(desired.relPath);
+    if (desired.managed !== isManaged)
+        conflictReasons.push('managed');
+    // Gitignore-state check
+    const isGitignored = gitignorePaths.has(desired.relPath);
+    if (desired.gitignore !== isGitignored)
+        conflictReasons.push('gitignore');
+    if (conflictReasons.length === 0) {
+        result.ok.push({
+            status: 'ok',
+            relPath: desired.relPath,
+            outputDir,
+            desired,
+            existing: managedByPath.get(desired.relPath),
+        });
+    }
+    else {
+        result.conflict.push({
+            status: 'conflict',
+            relPath: desired.relPath,
+            outputDir,
+            desired,
+            existing: managedByPath.get(desired.relPath),
+            conflictReasons,
+        });
+    }
+}
+//# sourceMappingURL=calculate-diff.js.map

package/dist/package/calculate-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculate-diff.js","sourceRoot":"","sources":["../../src/package/calculate-diff.ts"],"names":[],"mappings":"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"}

package/dist/package/config-merge.d.ts

@@ -2,6 +2,7 @@ import { SelectorConfig, OutputConfig } from '../types';
 /**
  * Merge two SelectorConfig objects across recursion levels.
  * - files: ANDed (intersection); when either is absent, use the other's list
+ * - exclude: concatenated (both exclusion lists apply)
  * - contentRegexes: ANDed (both must match)
  * - presets: NOT inherited (caller's presets not forwarded to dependency)
  * - upgrade: each level evaluated independently (not merged)
@@ -10,7 +11,7 @@ export declare function mergeSelectorConfig(parent: SelectorConfig, child: Selec
 /**
  * Merge two OutputConfig objects for recursive extraction.
  * - force, keepExisting, gitignore, managed, dryRun: caller value overrides child
- * - path: concatenated (parent/child)
+ * - path: concatenated (parent/child), undefined treated as '.'
  * - symlinks: appended (parent + child)
  * - contentReplacements: appended (parent + child)
  */

package/dist/package/config-merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-merge.d.ts","sourceRoot":"","sources":["../../src/package/config-merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,GAAG,cAAc,CAiBjG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,GAAG,YAAY,CAczF"}
+{"version":3,"file":"config-merge.d.ts","sourceRoot":"","sources":["../../src/package/config-merge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,GAAG,cAAc,CAwBjG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,GAAG,YAAY,CAmBzF"}

package/dist/package/config-merge.js

@@ -1,23 +1,34 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeSelectorConfig = mergeSelectorConfig;
 exports.mergeOutputConfig = mergeOutputConfig;
+const node_path_1 = __importDefault(require("node:path"));
 /**
  * Merge two SelectorConfig objects across recursion levels.
  * - files: ANDed (intersection); when either is absent, use the other's list
+ * - exclude: concatenated (both exclusion lists apply)
  * - contentRegexes: ANDed (both must match)
  * - presets: NOT inherited (caller's presets not forwarded to dependency)
  * - upgrade: each level evaluated independently (not merged)
  */
 function mergeSelectorConfig(parent, child) {
-    const files = parent.files && child.files
-        ? parent.files.filter((f) => (child.files ?? []).includes(f))
+    const parentGroups = parent.filePatternGroups ?? (parent.files ? [parent.files] : []);
+    const childGroups = child.filePatternGroups ?? (child.files ? [child.files] : []);
+    const filePatternGroups = [...parentGroups, ...childGroups];
+    const files = filePatternGroups.length > 0
+        ? [...new Set(filePatternGroups.flat())]
         : (parent.files ?? child.files);
     const contentRegexes = parent.contentRegexes && child.contentRegexes
         ? [...parent.contentRegexes, ...child.contentRegexes]
         : (parent.contentRegexes ?? child.contentRegexes);
+    const exclude = [...(parent.exclude ?? []), ...(child.exclude ?? [])];
     return {
         files,
+        ...(filePatternGroups.length > 0 ? { filePatternGroups } : {}),
+        exclude,
         contentRegexes,
         presets: child.presets, // not inherited from parent
         upgrade: child.upgrade, // each level independent
@@ -26,13 +37,18 @@ function mergeSelectorConfig(parent, child) {
 /**
  * Merge two OutputConfig objects for recursive extraction.
  * - force, keepExisting, gitignore, managed, dryRun: caller value overrides child
- * - path: concatenated (parent/child)
+ * - path: concatenated (parent/child), undefined treated as '.'
  * - symlinks: appended (parent + child)
  * - contentReplacements: appended (parent + child)
  */
 function mergeOutputConfig(caller, child) {
+    const callerPath = caller.path ?? '.';
+    const childPath = child.path ?? '.';
+    // When childPath is absolute it overrides the inherited path entirely.
+    // path.join('.', '/absolute') would strip the leading slash, so we check explicitly.
+    const mergedPath = node_path_1.default.isAbsolute(childPath) ? childPath : node_path_1.default.join(callerPath, childPath);
     return {
-        path: `${caller.path}/${child.path}`.replaceAll(/\/+/g, '/'),
+        path: mergedPath,
         force: caller.force ?? child.force,
         keepExisting: caller.keepExisting ?? child.keepExisting,
         gitignore: caller.gitignore ?? child.gitignore,

package/dist/package/config-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-merge.js","sourceRoot":"","sources":["../../src/package/config-merge.ts"],"names":[],"mappings":";;AASA,kDAiBC;AASD,8CAcC;AA/CD;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAAC,MAAsB,EAAE,KAAqB;IAC/E,MAAM,KAAK,GACT,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;QACzB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IAEpC,MAAM,cAAc,GAClB,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;QAC3C,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,cAAc,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC;QACrD,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAEtD,OAAO;QACL,KAAK;QACL,cAAc;QACd,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,4BAA4B;QACpD,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,yBAAyB;KAClD,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,MAAoB,EAAE,KAAmB;IACzE,OAAO;QACL,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC;QAC5D,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;QAClC,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY;QACvD,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS;QAC9C,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO;QACxC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACrC,QAAQ,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjE,mBAAmB,EAAE;YACnB,GAAG,CAAC,MAAM,CAAC,mBAAmB,IAAI,EAAE,CAAC;YACrC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC;SACrC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"config-merge.js","sourceRoot":"","sources":["../../src/package/config-merge.ts"],"names":[],"mappings":"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"}

package/dist/package/resolve-files.d.ts

@@ -0,0 +1,21 @@
+import { NpmdataExtractEntry, ResolvedFile, ProgressEvent } from '../types';
+export type ResolveOptions = {
+    cwd: string;
+    verbose?: boolean;
+    onProgress?: (event: ProgressEvent) => void;
+};
+/**
+ * Recursively resolve all entries into a flat list of desired files.
+ *
+ * Two entry types are handled:
+ *  - Self-package entry (no `package` field): enumerates files directly from the
+ *    package context provided by the parent recursion level.
+ *  - External-package entry (`package` field set): installs the package, reads its
+ *    npmdata.sets, and recurses; when the package has no sets, files are enumerated
+ *    directly (leaf behaviour).
+ *
+ * Duplicate (outputDir, relPath) pairs are deduplicated; conflicting managed/gitignore
+ * settings for the same destination path throw an error.
+ */
+export declare function resolveFiles(entries: NpmdataExtractEntry[], options: ResolveOptions): Promise<ResolvedFile[]>;
+//# sourceMappingURL=resolve-files.d.ts.map

package/dist/package/resolve-files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-files.d.ts","sourceRoot":"","sources":["../../src/package/resolve-files.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,mBAAmB,EAGnB,YAAY,EACZ,aAAa,EACd,MAAM,UAAU,CAAC;AAWlB,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC7C,CAAC;AAaF;;;;;;;;;;;;GAYG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,EAAE,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBzB"}