filedist 0.31.0 → 0.34.0

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

@@ -0,0 +1,65 @@
+import { ProgressEvent } from '../types';
+import { InstallResult } from './action-install';
+export type RemoveOptions = {
+    /**
+     * Working directory; used to discover config file and resolve output paths.
+     */
+    cwd: string;
+    /**
+     * When true, removes all set entries. Mutually exclusive with packageSpec.
+     */
+    all?: boolean;
+    /**
+     * Package spec to remove. Version/ref is ignored during matching, so both
+     * "xdrs-core" and "xdrs-core@1.0.0" match an entry whose package field
+     * starts with "xdrs-core". Required when all is not true.
+     */
+    packageSpec?: string;
+    /**
+     * Optional: restrict removal to entries whose output.path equals this value.
+     * When omitted, all entries for the package are removed.
+     */
+    outputPath?: string;
+    /**
+     * Optional: restrict removal to entries that contain ALL of these preset tags.
+     */
+    presets?: string[];
+    /**
+     * Explicit path to the config file. When omitted, the config is auto-discovered
+     * via cosmiconfig (same as the `install` command).
+     */
+    configFilePath: string;
+    lockfilePath: string;
+    dryRun?: boolean;
+    verbose?: boolean;
+    onProgress?: (event: ProgressEvent) => void;
+};
+export type RemoveSummary = {
+    /** Number of config entries that were removed (or would be removed in dry-run). */
+    removedEntries: number;
+    /** Result from the subsequent install run that cleared the output directories. */
+    install: InstallResult;
+    /** True when the lock file was deleted (only possible on --all with full cleanup). */
+    lockfileDeleted?: boolean;
+    /** True when the config file was deleted (only possible on --all with full cleanup). */
+    configFileDeleted?: boolean;
+};
+/**
+ * Remove matching config entries and run a full install with the remaining entries
+ * so that the lockfile is updated and removed files are deleted from output directories.
+ *
+ * Steps:
+ *  1. Discover the config file path (unless `configFilePath` is supplied). Throws when
+ *     no config file is found — the config file is required for this command.
+ *  2. Partition the config sets: when `all=true`, all entries are removed; otherwise
+ *     entries matching `packageSpec` (plus optional `outputPath` / `presets` filters)
+ *     are removed. Throws when no matching entries are found.
+ *  3. Rewrite the config file on disk with only the `toKeep` entries.
+ *  4. Call `actionInstall` with the remaining entries (`frozenLockfile: false`)
+ *     so the lockfile is updated and files for removed entries are deleted from disk.
+ *
+ * This has the same effect as manually deleting the matching sets from the config
+ * file and running `filedist install`.
+ */
+export declare function actionRemove(options: RemoveOptions): Promise<RemoveSummary>;
+//# sourceMappingURL=action-remove.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"action-remove.d.ts","sourceRoot":"","sources":["../../src/package/action-remove.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,aAAa,EAAE,MAAM,UAAU,CAAC;AAE/D,OAAO,EAAiB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGhE,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,mFAAmF;IACnF,cAAc,EAAE,MAAM,CAAC;IACvB,kFAAkF;IAClF,OAAO,EAAE,aAAa,CAAC;IACvB,sFAAsF;IACtF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wFAAwF;IACxF,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AA6CF;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAAsB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CA8HjF"}

package/dist/package/action-remove.js

@@ -0,0 +1,171 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.actionRemove = actionRemove;
+/* eslint-disable no-console */
+const node_fs_1 = __importDefault(require("node:fs"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const action_install_1 = require("./action-install");
+const config_1 = require("./config");
+/**
+ * Split config sets into the entries to remove and the entries to keep.
+ */
+function partitionSets(sets, targetName, outputPath, presets) {
+    const toRemove = [];
+    const toKeep = [];
+    for (const e of sets) {
+        if (!e.package) {
+            toKeep.push(e);
+            continue;
+        }
+        const match = (0, config_1.packageNameWithoutRef)(e.package) === targetName;
+        // eslint-disable-next-line no-undefined
+        const outputMatch = outputPath === undefined || e.output?.path === outputPath;
+        // eslint-disable-next-line no-undefined
+        const presetsMatch = presets === undefined || presets.every((p) => e.presets?.includes(p));
+        if (match && outputMatch && presetsMatch) {
+            toRemove.push(e);
+        }
+        else {
+            toKeep.push(e);
+        }
+    }
+    return { toRemove, toKeep };
+}
+/**
+ * Read and parse sets from a YAML config file. Returns [] when file is missing or empty.
+ */
+function readConfigSets(filePath) {
+    try {
+        const raw = node_fs_1.default.readFileSync(filePath, 'utf8');
+        const parsed = js_yaml_1.default.load(raw);
+        return parsed?.sets ?? [];
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Remove matching config entries and run a full install with the remaining entries
+ * so that the lockfile is updated and removed files are deleted from output directories.
+ *
+ * Steps:
+ *  1. Discover the config file path (unless `configFilePath` is supplied). Throws when
+ *     no config file is found — the config file is required for this command.
+ *  2. Partition the config sets: when `all=true`, all entries are removed; otherwise
+ *     entries matching `packageSpec` (plus optional `outputPath` / `presets` filters)
+ *     are removed. Throws when no matching entries are found.
+ *  3. Rewrite the config file on disk with only the `toKeep` entries.
+ *  4. Call `actionInstall` with the remaining entries (`frozenLockfile: false`)
+ *     so the lockfile is updated and files for removed entries are deleted from disk.
+ *
+ * This has the same effect as manually deleting the matching sets from the config
+ * file and running `filedist install`.
+ */
+// eslint-disable-next-line complexity
+async function actionRemove(options) {
+    const { cwd, packageSpec, all = false, outputPath, presets, dryRun = false, verbose = false, onProgress, } = options;
+    // ── Resolve config file path ──────────────────────────────────────────────
+    const { configFilePath } = options;
+    const currentSets = readConfigSets(configFilePath);
+    // ── Determine which entries to remove and which to keep ───────────────────
+    let toRemove;
+    let toKeep;
+    if (all) {
+        toRemove = currentSets.slice();
+        toKeep = [];
+        if (verbose) {
+            console.log(`[verbose] actionRemove: removing all ${toRemove.length} config entries` +
+                (configFilePath ? ` from ${configFilePath}` : ''));
+        }
+    }
+    else {
+        if (!packageSpec) {
+            throw new Error('actionRemove: packageSpec is required when all is not true');
+        }
+        const targetName = (0, config_1.packageNameWithoutRef)(packageSpec);
+        if (verbose) {
+            console.log(`[verbose] actionRemove: removing entries for "${targetName}"` +
+                (outputPath ? ` (output: ${outputPath})` : '') +
+                (presets ? ` (presets: ${presets.join(',')})` : '') +
+                (configFilePath ? ` from ${configFilePath}` : ' (no config file found)'));
+        }
+        ({ toRemove, toKeep } = partitionSets(currentSets, targetName, outputPath, presets));
+        if (toRemove.length === 0) {
+            throw new Error(`No entries found for "${packageSpec}"` +
+                (outputPath ? ` with output "${outputPath}"` : '') +
+                (presets ? ` and presets "${presets.join(',')}"` : '') +
+                '. Nothing removed.');
+        }
+    }
+    const removedEntries = toRemove.length;
+    if (verbose && removedEntries > 0) {
+        console.log(`[verbose] actionRemove: ${dryRun ? 'would remove' : 'removing'} ${removedEntries} config entries`);
+    }
+    // ── Rewrite config file with remaining entries ────────────────────────────
+    if (!dryRun && removedEntries > 0) {
+        let existingConfig = {};
+        try {
+            const raw = node_fs_1.default.readFileSync(configFilePath, 'utf8');
+            existingConfig = js_yaml_1.default.load(raw) ?? {};
+        }
+        catch {
+            // no-op: file may not exist when using lockfile-only mode
+        }
+        existingConfig.sets = toKeep;
+        const isJson = configFilePath.endsWith('.json');
+        const content = isJson
+            ? // eslint-disable-next-line unicorn/no-null
+                JSON.stringify(existingConfig, null, 2) + '\n'
+            : js_yaml_1.default.dump(existingConfig, { indent: 2 });
+        node_fs_1.default.writeFileSync(configFilePath, content, 'utf8');
+    }
+    // ── Run install with remaining entries to update lockfile ─────────────────
+    if (verbose) {
+        console.log(`[verbose] actionRemove: running install with ${toKeep.length} remaining entries`);
+    }
+    const { lockfilePath } = options;
+    const install = await (0, action_install_1.actionInstall)({
+        entries: toKeep,
+        cwd,
+        lockfilePath,
+        dryRun,
+        verbose,
+        frozenLockfile: false,
+        onProgress,
+    });
+    // When --all is used and all files were successfully removed, delete the lock
+    // file and config file since they would be empty/useless.
+    let lockfileDeleted = false;
+    let configFileDeleted = false;
+    if (all && !dryRun && install.added === 0 && install.modified === 0) {
+        try {
+            if (node_fs_1.default.existsSync(lockfilePath)) {
+                node_fs_1.default.unlinkSync(lockfilePath);
+                lockfileDeleted = true;
+                if (verbose) {
+                    console.log(`[verbose] actionRemove: deleted lock file ${lockfilePath}`);
+                }
+            }
+        }
+        catch {
+            // Ignore lock file deletion errors
+        }
+        try {
+            if (node_fs_1.default.existsSync(configFilePath)) {
+                node_fs_1.default.unlinkSync(configFilePath);
+                configFileDeleted = true;
+                if (verbose) {
+                    console.log(`[verbose] actionRemove: deleted config file ${configFilePath}`);
+                }
+            }
+        }
+        catch {
+            // Ignore config file deletion errors
+        }
+    }
+    return { removedEntries, install, lockfileDeleted, configFileDeleted };
+}
+//# sourceMappingURL=action-remove.js.map

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

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

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

@@ -0,0 +1,28 @@
+import { BasicPackageOptions, FiledistExtractEntry, ProgressEvent } from '../types';
+import { InstallResult } from './action-install';
+export type UpdateOptions = Omit<BasicPackageOptions, 'entries'> & {
+    entries?: FiledistExtractEntry[];
+    onProgress?: (event: ProgressEvent) => void;
+    /**
+     * Absolute path to the lock file. Derived from the config file path via getLockfilePath().
+     */
+    lockfilePath: string;
+    /**
+     * When true (default), forces every entry selector to upgrade=true so the
+     * package manager fetches the latest matching version from the registry.
+     * Set to false to re-resolve from whatever is currently installed locally
+     * (useful for testing without registry access).
+     */
+    upgrade?: boolean;
+};
+/**
+ * Update managed files to their latest available package versions.
+ *
+ * Reads the set definitions from .filedist.lock (falls back to the entries option
+ * when no lockfile is present). Forces upgrade=true on every entry selector so
+ * npm/git sources are re-fetched for the newest matching version. Then runs a
+ * full install (frozenLockfile=false), which resolves and writes an updated
+ * lockfile with new package refs, updated sets, and an updated managed files list.
+ */
+export declare function actionUpdate(options: UpdateOptions): Promise<InstallResult>;
+//# sourceMappingURL=action-update.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"action-update.d.ts","sourceRoot":"","sources":["../../src/package/action-update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpF,OAAO,EAAiB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGhE,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IACjE,OAAO,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACjC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5C;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAwCjF"}

package/dist/package/action-update.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.actionUpdate = actionUpdate;
+const action_install_1 = require("./action-install");
+const lockfile_1 = require("./lockfile");
+/**
+ * Update managed files to their latest available package versions.
+ *
+ * Reads the set definitions from .filedist.lock (falls back to the entries option
+ * when no lockfile is present). Forces upgrade=true on every entry selector so
+ * npm/git sources are re-fetched for the newest matching version. Then runs a
+ * full install (frozenLockfile=false), which resolves and writes an updated
+ * lockfile with new package refs, updated sets, and an updated managed files list.
+ */
+async function actionUpdate(options) {
+    const { cwd, verbose = false, onProgress, dryRun, upgrade = true } = options;
+    const { lockfilePath } = options;
+    const lockfileData = (0, lockfile_1.readLockfile)(lockfilePath);
+    // Prefer caller-supplied entries (user config) — same precedence as actionInstall.
+    // Fall back to set definitions recorded in .filedist.lock when no entries are provided.
+    let entries = (options.entries && options.entries.length > 0 ? options.entries : lockfileData?.sets) ?? [];
+    if (entries.length === 0) {
+        throw new Error(`No sets found. Run 'filedist install' first, or provide --packages to specify packages.`);
+    }
+    // Force upgrade on all selectors so the resolver fetches the newest matching version.
+    if (upgrade) {
+        entries = entries.map((entry) => ({
+            ...entry,
+            selector: { ...entry.selector, upgrade: true },
+        }));
+    }
+    if (verbose) {
+        console.log(`[verbose] actionUpdate: bumping ${entries.length} set(s) to latest package versions`);
+    }
+    return (0, action_install_1.actionInstall)({
+        entries,
+        cwd,
+        verbose,
+        dryRun,
+        onProgress,
+        lockfilePath,
+        frozenLockfile: false,
+    });
+}
+//# sourceMappingURL=action-update.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"action-update.js","sourceRoot":"","sources":["../../src/package/action-update.ts"],"names":[],"mappings":";;AA+BA,oCAwCC;AApED,qDAAgE;AAChE,yCAA0C;AAkB1C;;;;;;;;GAQG;AACI,KAAK,UAAU,YAAY,CAAC,OAAsB;IACvD,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAC7E,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEjC,MAAM,YAAY,GAAG,IAAA,uBAAY,EAAC,YAAY,CAAC,CAAC;IAEhD,mFAAmF;IACnF,wFAAwF;IACxF,IAAI,OAAO,GACT,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAE/F,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;IACJ,CAAC;IAED,sFAAsF;IACtF,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAChC,GAAG,KAAK;YACR,QAAQ,EAAE,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;SAC/C,CAAC,CAAC,CAAC;IACN,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CACT,mCAAmC,OAAO,CAAC,MAAM,oCAAoC,CACtF,CAAC;IACJ,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO;QACP,GAAG;QACH,OAAO;QACP,MAAM;QACN,UAAU;QACV,YAAY;QACZ,cAAc,EAAE,KAAK;KACtB,CAAC,CAAC;AACL,CAAC"}

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

@@ -8,5 +8,5 @@ import { ResolvedFile, DiffResult } from '../types';
  *
  * @returns DiffResult classifying each file as ok, missing, extra, or conflict.
  */
-export declare function calculateDiff(resolvedFiles: ResolvedFile[], verbose?: boolean, cwd?: string, relevantPackagesByOutputDir?: Map<string, Set<string>>, compareWithSource?: boolean): Promise<DiffResult>;
+export declare function calculateDiff(resolvedFiles: ResolvedFile[], verbose?: boolean, cwd?: string, relevantPackagesByOutputDir?: Map<string, Set<string>>, compareWithSource?: boolean, lockfilePath?: string): Promise<DiffResult>;
 //# sourceMappingURL=calculate-diff.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"calculate-diff.d.ts","sourceRoot":"","sources":["../../src/package/calculate-diff.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAQzE;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,YAAY,EAAE,EAC7B,OAAO,CAAC,EAAE,OAAO,EACjB,GAAG,CAAC,EAAE,MAAM,EACZ,2BAA2B,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtD,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC,CA0CrB"}
+{"version":3,"file":"calculate-diff.d.ts","sourceRoot":"","sources":["../../src/package/calculate-diff.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAQzE;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,YAAY,EAAE,EAC7B,OAAO,CAAC,EAAE,OAAO,EACjB,GAAG,CAAC,EAAE,MAAM,EACZ,2BAA2B,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtD,iBAAiB,CAAC,EAAE,OAAO,EAC3B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC,CA4CrB"}

package/dist/package/calculate-diff.js

@@ -10,7 +10,7 @@ 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 lockfile_1 = require("./lockfile");
 const content_replacements_1 = require("./content-replacements");
 const symlinks_1 = require("./symlinks");
 /**
@@ -22,7 +22,7 @@ const symlinks_1 = require("./symlinks");
  *
  * @returns DiffResult classifying each file as ok, missing, extra, or conflict.
  */
-async function calculateDiff(resolvedFiles, verbose, cwd, relevantPackagesByOutputDir, compareWithSource) {
+async function calculateDiff(resolvedFiles, verbose, cwd, relevantPackagesByOutputDir, compareWithSource, lockfilePath) {
     const result = { ok: [], missing: [], extra: [], conflict: [] };
     if (resolvedFiles.length === 0 &&
         (!relevantPackagesByOutputDir || relevantPackagesByOutputDir.size === 0)) {
@@ -40,7 +40,7 @@ async function calculateDiff(resolvedFiles, verbose, cwd, relevantPackagesByOutp
         ...(relevantPackagesByOutputDir?.keys() ?? []),
     ]);
     for (const outputDir of outputDirs) {
-        await appendOutputDirDiff(outputDir, byOutputDir.get(outputDir) ?? [], result, relevantPackagesByOutputDir?.get(outputDir), compareWithSource);
+        await appendOutputDirDiff(outputDir, byOutputDir.get(outputDir) ?? [], result, relevantPackagesByOutputDir?.get(outputDir), compareWithSource, cwd, lockfilePath);
         if (verbose) {
             console.log(`[verbose] calculateDiff: ${(0, utils_1.formatDisplayPath)(outputDir, cwd)}: ` +
                 `ok=${result.ok.length} missing=${result.missing.length} ` +
@@ -49,8 +49,11 @@ async function calculateDiff(resolvedFiles, verbose, cwd, relevantPackagesByOutp
     }
     return result;
 }
-async function appendOutputDirDiff(outputDir, desiredFiles, result, relevantPackages, compareWithSource) {
-    const existingMarker = await (0, markers_1.readOutputDirMarker)(outputDir);
+async function appendOutputDirDiff(outputDir, desiredFiles, result, relevantPackages, compareWithSource, cwd, lockfilePath) {
+    let existingMarker = [];
+    if (lockfilePath && cwd) {
+        existingMarker = (0, lockfile_1.readManagedFilesForDir)(lockfilePath, cwd, outputDir);
+    }
     const managedByPath = new Map(existingMarker.map((m) => [m.path, m]));
     const desiredSymlinks = (0, symlinks_1.collectManagedSymlinkTargets)(outputDir, desiredFiles);
     const desiredPaths = new Set([
@@ -98,7 +101,7 @@ function classifyDesiredSymlink(desiredSymlink, outputDir, managedByPath, result
             conflictReasons.push('content');
         }
     }
-    if (!existingEntry || (existingEntry.kind ?? 'file') !== 'symlink') {
+    if (!existingEntry || existingEntry.kind !== 'symlink') {
         conflictReasons.push('managed');
     }
     if (conflictReasons.length === 0) {
@@ -153,19 +156,14 @@ async function classifyDesiredFile(desired, outputDir, managedByPath, gitignoreP
     else {
         // Check mode: compare disk against stored checksum (no source package needed).
         // Mutable files are allowed to change locally — skip content verification.
-        // Files with no stored checksum cannot be verified — reported as no-checksum conflict.
         if (existingEntry?.mutable) {
             // File is intentionally mutable (e.g. extracted with mutable option); skip content check
         }
-        else if (existingEntry?.checksum) {
+        else {
             const destHash = (0, utils_1.shortenChecksum)(await (0, utils_1.hashFile)(destPath));
-            if (existingEntry.checksum !== destHash)
+            if (existingEntry?.checksum !== destHash)
                 conflictReasons.push('content');
         }
-        else {
-            // No stored checksum: marker is from an old extraction; re-extract to repair
-            conflictReasons.push('no-checksum');
-        }
     }
     // Managed-state check
     const isManaged = managedByPath.has(desired.relPath);

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

@@ -1 +1 @@
-{"version":3,"file":"calculate-diff.js","sourceRoot":"","sources":["../../src/package/calculate-diff.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calculate-diff.js","sourceRoot":"","sources":["../../src/package/calculate-diff.ts"],"names":[],"mappings":";;;;;AAsBA,sCAmDC;AAzED,+BAA+B;AAC/B,8DAAiC;AACjC,sDAAyB;AACzB,0DAA6B;AAG7B,oDAAmE;AACnE,oCAAsF;AAEtF,yCAAoD;AACpD,iEAA0E;AAC1E,yCAA0D;AAE1D;;;;;;;;GAQG;AACI,KAAK,UAAU,aAAa,CACjC,aAA6B,EAC7B,OAAiB,EACjB,GAAY,EACZ,2BAAsD,EACtD,iBAA2B,EAC3B,YAAqB;IAErB,MAAM,MAAM,GAAe,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAE5E,IACE,aAAa,CAAC,MAAM,KAAK,CAAC;QAC1B,CAAC,CAAC,2BAA2B,IAAI,2BAA2B,CAAC,IAAI,KAAK,CAAC,CAAC,EACxE,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,2CAA2C;IAC3C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0B,CAAC;IACtD,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC/C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,CAAS;QACjC,GAAG,WAAW,CAAC,IAAI,EAAE;QACrB,GAAG,CAAC,2BAA2B,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;KAC/C,CAAC,CAAC;IAEH,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,mBAAmB,CACvB,SAAS,EACT,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,EAChC,MAAM,EACN,2BAA2B,EAAE,GAAG,CAAC,SAAS,CAAC,EAC3C,iBAAiB,EACjB,GAAG,EACH,YAAY,CACb,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CACT,4BAA4B,IAAA,yBAAiB,EAAC,SAAS,EAAE,GAAG,CAAC,IAAI;gBAC/D,MAAM,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG;gBAC1D,YAAY,MAAM,CAAC,QAAQ,CAAC,MAAM,UAAU,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CACpE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,SAAiB,EACjB,YAA4B,EAC5B,MAAkB,EAClB,gBAA8B,EAC9B,iBAA2B,EAC3B,GAAY,EACZ,YAAqB;IAErB,IAAI,cAAc,GAA0B,EAAE,CAAC;IAC/C,IAAI,YAAY,IAAI,GAAG,EAAE,CAAC;QACxB,cAAc,GAAG,IAAA,iCAAsB,EAAC,YAAY,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CACvC,CAAC;IACF,MAAM,eAAe,GAAG,IAAA,uCAA4B,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAC9E,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS;QACnC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3C,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;KAC9C,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAA,uCAA2B,EAAC,SAAS,CAAC,CAAC;IAC9D,MAAM,sBAAsB,GAC1B,gBAAgB,IAAI,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAEtE,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;QACnC,MAAM,mBAAmB,CACvB,OAAO,EACP,SAAS,EACT,aAAa,EACb,cAAc,EACd,MAAM,EACN,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC7C,sBAAsB,CAAC,cAAc,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE,CAAC;QACzC,IACE,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC;YACnD,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EACnC,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;gBAChB,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,WAAW,CAAC,IAAI;gBACzB,SAAS;gBACT,QAAQ,EAAE,WAAW;aACtB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,cAAuE,EACvE,SAAiB,EACjB,aAA+C,EAC/C,MAAkB;IAElB,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,IAA0B,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,GAAG,iBAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACpF,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAA+C,EAAE,CAAC;IACvE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QAC3B,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,mBAAI,CAAC,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,iBAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrF,IAAI,YAAY,KAAK,cAAc,CAAC,UAAU,EAAE,CAAC;YAC/C,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACvD,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;YACb,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,cAAc,CAAC,IAAI;YAC5B,SAAS;YACT,QAAQ,EAAE,aAAa;SACxB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,cAAc,CAAC,IAAI;YAC5B,SAAS;YACT,QAAQ,EAAE,aAAa;YACvB,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,mBAAmB,CAChC,OAAqB,EACrB,SAAiB,EACjB,aAA+C,EAC/C,cAA2B,EAC3B,MAAkB,EAClB,iBAA2B;IAE3B,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,iBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE3C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QACzF,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAA+C,EAAE,CAAC;IACvE,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzD,IAAI,iBAAiB,EAAE,CAAC;QACtB,4EAA4E;QAC5E,yEAAyE;QACzE,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAC9C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,mBAAmB,CAC5B,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,UAAU,KAAK,QAAQ;gBAAE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,+EAA+E;QAC/E,2EAA2E;QAC3E,IAAI,aAAa,EAAE,OAAO,EAAE,CAAC;YAC3B,yFAAyF;QAC3F,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,IAAA,uBAAe,EAAC,MAAM,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC;YAC3D,IAAI,aAAa,EAAE,QAAQ,KAAK,QAAQ;gBAAE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,sBAAsB;IACtB,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;QAAE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEnE,wBAAwB;IACxB,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,IAAI,OAAO,CAAC,SAAS,KAAK,YAAY;QAAE,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAE1E,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;YACb,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS;YACT,OAAO;YACP,QAAQ,EAAE,aAAa;SACxB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS;YACT,OAAO;YACP,QAAQ,EAAE,aAAa;YACvB,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,uBAAuB,CACpC,OAAe,EACf,mBAAkE;IAElE,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,IAAI,IAAA,oBAAY,EAAC,OAAO,CAAC;QAAE,OAAO,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAC;IACxF,MAAM,OAAO,GAAG,iBAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,IAAA,uDAAgC,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACnF,OAAO,qBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC"}

package/dist/package/config.d.ts

@@ -1,39 +1,52 @@
 import { FiledistConfig, FiledistExtractEntry } from '../types';
+/** Default bootstrap config filename. */
+export declare const DEFAULT_CONFIG_FILENAME = ".filedist.yml";
+/** Represents the structure of a .filedist.yml or .filedist-package.yml file. */
+export type FiledistConfigFile = {
+    version: number;
+    sets: FiledistExtractEntry[];
+};
+/** Package config filename used by data packages to define their own sets. */
+export declare const PACKAGE_CONFIG_FILENAME = ".filedist-package.yml";
 /**
- * Search for a filedist configuration using cosmiconfig, starting from the given cwd.
- * Looks for (in priority order):
- *   - .filedistrc (JSON or YAML)
- *   - .filedistrc.json / .filedistrc.yaml / .filedistrc.js
- *   - filedist.config.js
- *   - "filedist" key in package.json
- *
- * Returns the FiledistConfig when found, or null when no configuration is present.
+ * Load the default filedist bootstrap config (.filedist.yml) from the given directory.
+ * Returns the FiledistConfig when found, or null when absent or empty.
  */
-export declare function searchAndLoadFiledistConfig(cwd: string): Promise<FiledistConfig | null>;
+export declare function loadDefaultConfig(cwd: string): FiledistConfig | null;
 /**
- * Load a filedist configuration from an explicit file path using cosmiconfig.
- * Supports JSON, YAML, and JS config files.
- *
- * Returns the FiledistConfig when found, or null when the file is empty or invalid.
+ * Load a filedist bootstrap config from an explicit YAML file path.
+ * Returns the FiledistConfig when found, or null when the file is empty or absent.
  */
-export declare function loadFiledistConfigFile(filePath: string): Promise<FiledistConfig | null>;
+export declare function loadFiledistConfigFile(filePath: string): FiledistConfig | null;
 /**
- * Load filedist config only from the given directory, without searching parent folders.
+ * Load a filedist package config (.filedist-package.yml) from the given directory.
+ * Data packages place this file in their root to define their sets, selectors, and presets.
+ * Returns the FiledistConfig when found, or null when absent or empty.
  */
-export declare function loadFiledistConfigFromDirectory(directory: string): Promise<FiledistConfig | null>;
+export declare function loadPackageConfig(directory: string): FiledistConfig | null;
+export declare function upsertFiledistConfigEntries(directory: string, configFilePath: string, addEntries: FiledistExtractEntry[]): Promise<void>;
 /**
- * Load a filedist configuration from `.filedistrc.local.yml` in the given directory.
- * Returns the config when found, or null when the file does not exist or is empty.
- * The local config file is intentionally not searched in parent directories.
+ * Strip the version/ref from a package spec string, leaving only the package name.
+ *
+ * Examples:
+ *   "my-pkg@^1.2.3"                      → "my-pkg"
+ *   "@scope/pkg@1.0.0"                   → "@scope/pkg"
+ *   "git:github.com/org/repo.git@main"   → "git:github.com/org/repo.git"
+ *   "my-pkg"                             → "my-pkg"
  */
-export declare function loadFiledistLocalConfig(directory: string): Promise<FiledistConfig | null>;
+export declare function packageNameWithoutRef(spec: string): string;
 /**
- * Upsert entries into a filedist YAML config file.
- * - Uses the path provided (from --config) or defaults to `.filedistrc.yml` in `directory`.
- * - Reads the existing file (or starts with an empty sets array).
- * - For each provided entry, replaces an existing entry with the same `package`
- *   value, or appends it when no match is found.
- * - Writes the merged result back as YAML.
+ * Remove entries from the filedist YAML config file that match the given package name.
+ *
+ * - `packageSpec` is matched against each entry's `package` field after stripping
+ *   the version/ref from both sides, so "xdrs-core@1.0.0" and "xdrs-core" both
+ *   match entries whose package field starts with "xdrs-core".
+ * - When `outputPath` is supplied, only entries whose `output.path` equals
+ *   `outputPath` are removed (allows targeting a specific entry when the same
+ *   package is installed to multiple output directories).
+ * - Returns the number of entries removed.  Zero means the config was unchanged.
+ * - When `configFilePath` is not supplied, defaults to `.filedist.yml` in `directory`.
+ * - Throws if the config file exists but cannot be parsed.
  */
-export declare function upsertFiledistConfigEntries(directory: string, addEntries: FiledistExtractEntry[], configFilePath?: string): Promise<void>;
+export declare function removeFiledistConfigEntries(directory: string, packageSpec: string, outputPath?: string, configFilePath?: string): number;
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/package/config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAoDhE;;;;;;;;;GASG;AACH,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAQ7F;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAQ7F;AAED;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAuBhC;AAKD;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAkB/F;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,oBAAoB,EAAE,EAClC,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CA2Cf"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/package/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAShE,yCAAyC;AACzC,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAEvD,iFAAiF;AACjF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,oBAAoB,EAAE,CAAC;CAC9B,CAAC;AAEF,8EAA8E;AAC9E,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAsD/D;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAEpE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAE9E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAE1E;AAuDD,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,oBAAoB,EAAE,GACjC,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkB1D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,CAkCR"}