@softarc/native-federation 4.3.2 → 4.4.0

package/dist/lib/config/with-native-federation.js

@@ -2,21 +2,25 @@ import { getRawMappedPaths } from "./mapped-paths.js";
 import { fromPackageJson } from "./share-utils.js";
 import { findRootTsConfigJson } from "./project-paths.js";
 import { isInSkipList, prepareSkipList } from "./default-skip-list.js";
+import { normalizeMappingConfig, withoutSkippedMappings } from "./mapping-utils.js";
 import { logger } from "../utils/logger.js";
 function withNativeFederation(config) {
   const skip = prepareSkipList(config.skip ?? []);
   const chunks = config.chunks ?? true;
+  const mappingVersion = config.features?.mappingVersion ?? true;
+  const { paths, configs } = getRawMappedPaths(findRootTsConfigJson(), config.sharedMappings);
   const normalized = {
     $type: "classic",
     name: config.name ?? "",
     exposes: normalizeExposes(config.exposes),
     shared: normalizeShared(config, skip, chunks),
-    sharedMappings: removeSkippedMappings(config, skip),
+    sharedMappings: withoutSkippedMappings(paths, skip),
+    sharedMappingsConfig: normalizeMappingConfigs(configs, mappingVersion),
     chunks,
     skip,
     externals: config.externals ?? [],
     features: {
-      mappingVersion: config.features?.mappingVersion ?? true,
+      mappingVersion,
       ignoreUnusedDeps: config.features?.ignoreUnusedDeps ?? true,
       denseChunking: config.features?.denseChunking ?? false,
       denseExternals: config.features?.denseExternals ?? false,
@@ -74,10 +78,18 @@ function normalizeShared(config, skip, chunks) {
   result = Object.keys(result).filter((key) => !isInSkipList(key, skip)).reduce((acc, cur) => ({ ...acc, [cur]: result[cur] }), {});
   return result;
 }
-function removeSkippedMappings(config, skipList) {
-  const rootTsConfigPath = findRootTsConfigJson();
-  const paths = getRawMappedPaths(rootTsConfigPath, config.sharedMappings);
-  return Object.entries(paths).filter(([, _import]) => !isInSkipList(_import, skipList)).reduce((acc, [_path, _import]) => ({ ...acc, [_path]: _import }), {});
+const IGNORED_MAPPING_PROPS = ["build", "platform", "chunks", "packageInfo"];
+function normalizeMappingConfigs(configs, mappingVersion) {
+  return Object.entries(configs).reduce((acc, [pattern, cfg]) => {
+    const ignored = IGNORED_MAPPING_PROPS.filter((prop) => cfg[prop] !== void 0);
+    if (ignored.length > 0) {
+      logger.warn(
+        `Mapping '${pattern}' sets ${ignored.join(", ")}, which mapped paths do not honour (they all share one bundle). Ignored.`
+      );
+    }
+    acc[pattern] = normalizeMappingConfig(cfg, mappingVersion);
+    return acc;
+  }, {});
 }
 export {
   withNativeFederation

package/dist/lib/core/build/bundle-exposed-and-mappings.js

@@ -7,6 +7,7 @@ import { nodeIo } from "../../utils/io/node-io-adapter.js";
 import { AbortedError } from "../../utils/errors.js";
 import { rewriteChunkImports } from "./rewrite-chunk-imports.js";
 import { getBuildAdapter } from "./build-adapter.js";
+import { resolveMappingConfig } from "../../config/mapping-utils.js";
 async function bundleExposedAndMappings(config, fedOptions, externals, modifiedFiles, signal) {
   return bundleExposedAndMappingsCore(
     { adapter: getBuildAdapter() },
@@ -78,7 +79,13 @@ async function bundleExposedAndMappingsCore(deps, config, fedOptions, externals,
   for (const item of shared) {
     const distEntryFile = popFromResultMap(resultMap, item.outName);
     sharedResult.push(
-      toSharedMappingInfo(item.fileName, item.key, path.basename(distEntryFile), config, fedOptions)
+      toSharedMappingInfo(
+        item.fileName,
+        item.key,
+        path.basename(distEntryFile),
+        config,
+        fedOptions
+      )
     );
     entryFiles.push(distEntryFile);
   }
@@ -112,9 +119,7 @@ function describeExposed(config, options) {
   const result = [];
   for (const key in config.exposes) {
     const expose = config.exposes[key];
-    const localPath = normalize(
-      path.normalize(path.join(options.workspaceRoot, expose.file))
-    );
+    const localPath = normalize(path.normalize(path.join(options.workspaceRoot, expose.file)));
     result.push({
       key,
       outFileName: "",
@@ -135,13 +140,21 @@ function describeSharedMappings(config, fedOptions) {
 }
 function toSharedMappingInfo(mappedPath, mappedImport, outFileName, config, fedOptions) {
   const mappingVersion = config.features.mappingVersion ? getMappingVersion(mappedPath, fedOptions.workspaceRoot) : "";
+  const mappingConfig = resolveMappingConfig(
+    mappedImport,
+    config.sharedMappingsConfig,
+    config.features.mappingVersion
+  );
+  const version = mappingConfig.version ?? mappingVersion;
   return {
     packageName: mappedImport,
     outFileName,
-    requiredVersion: mappingVersion.length > 0 ? "~" + mappingVersion : "",
-    singleton: true,
-    strictVersion: config.features.mappingVersion,
-    version: mappingVersion,
+    requiredVersion: mappingConfig.requiredVersion ?? (version.length > 0 ? "~" + version : ""),
+    singleton: mappingConfig.singleton,
+    strictVersion: mappingConfig.strictVersion,
+    version,
+    ...mappingConfig.shareScope && { shareScope: mappingConfig.shareScope },
+    ...mappingConfig.pool && { pool: mappingConfig.pool },
     dev: !fedOptions.dev ? void 0 : {
       entryPoint: normalize(path.normalize(mappedPath))
     }

package/dist/lib/core/build/bundle-shared.js

@@ -1,7 +1,8 @@
 import * as path from "path";
 import {
   sharedPackageJsonRepository,
-  getPackageInfo
+  getPackageInfo,
+  installedVersions
 } from "../../utils/package/package-info.js";
 import { logger } from "../../utils/logger.js";
 import { nodeIo } from "../../utils/io/node-io-adapter.js";
@@ -41,13 +42,18 @@ async function bundleSharedCore(deps, sharedBundles, config, fedOptions, externa
     deps.io,
     deps.repo
   );
+  const resolvedVersions = installedVersions(Object.keys(sharedBundles), folder, deps.repo);
+  for (const [key, cfg] of Object.entries(sharedBundles)) {
+    if (cfg.packageInfo) resolvedVersions[key] = cfg.packageInfo.version ?? "";
+  }
   const checksum = getChecksumCore(
     deps.io,
     sharedBundles,
     fedOptions.dev ? "1" : "0",
     builderVersion,
-    config.features.synthesizeCjsExports,
-    contentSignals
+    config.features,
+    contentSignals,
+    resolvedVersions
   );
   const bundleCache = cacheEntryCore(
     deps.io,

package/dist/lib/core/build/resolve-shared-dirs.d.ts

@@ -8,6 +8,22 @@ export declare function resolveSharedPackageDirs(config: NormalizedFederationCon
 /** Realpath'd dirs of symlinked shared packages — the bounded watch set.
  *  Deduped, since secondaries share a package dir. */
 export declare function linkedSharedDirs(config: NormalizedFederationConfig, fedOptions: NormalizedFederationOptions, io?: FileReaderPort, repo?: PackageJsonRepository): string[];
+/**
+ * Source directories of the workspace libs in `config.sharedMappings` — the watch set
+ * for mappings, derived from config alone rather than from a bundler cache.
+ *
+ * Coarser than the inputs a build actually compiled, and deliberately so: it covers
+ * files added to a lib after the last build, which a compiled-inputs watch set cannot
+ * know about yet. It does not follow imports out of the lib, so an adapter that can
+ * enumerate its build inputs should watch both. See angular-adapter#94.
+ *
+ * How coarse is the caller's to bound: an entry point that is not a lib barrel widens the
+ * watch to whatever directory it sits in (`'@app/env': ['src/environments/environment.ts']`
+ * to that folder, `'@shared': ['src/index.ts']` to all of `src`), and with `sharedMappings`
+ * unset every tsconfig path becomes a mapping. Watch these natively rather than polled —
+ * they are source trees, not the dist output `linkedSharedDirs` exists for.
+ */
+export declare function sharedMappingDirs(config: NormalizedFederationConfig): string[];
 /** Per-key content signal (max mtime of the resolved dir) for symlinked deps only.
  *  Registry deps get no signal, keeping their checksum version-only. (Every key is
  *  still resolved: detecting the symlink requires the realpath + lstat.) */

package/dist/lib/core/build/resolve-shared-dirs.js

@@ -1,7 +1,7 @@
 import * as path from "path";
 import { nodeIo } from "../../utils/io/node-io-adapter.js";
 import { sharedPackageJsonRepository } from "../../utils/package/package-info.js";
-import { toPosix } from "../../utils/path-patterns.js";
+import { isUnderDir, toPosix } from "../../utils/path-patterns.js";
 const folderOf = (fedOptions) => fedOptions.packageJson ? path.dirname(fedOptions.packageJson) : fedOptions.workspaceRoot;
 function resolveEntries(keys, folder, io, repo) {
   const out = [];
@@ -25,6 +25,10 @@ function linkedSharedDirs(config, fedOptions, io = nodeIo, repo = sharedPackageJ
   const entries = resolveEntries(Object.keys(config.shared), folderOf(fedOptions), io, repo);
   return [...new Set(entries.filter((e) => e.isSymlink).map((e) => e.realDir))];
 }
+function sharedMappingDirs(config) {
+  const dirs = Object.keys(config.sharedMappings).map((entryPoint) => toPosix(path.dirname(entryPoint))).filter((dir) => !dir.includes("node_modules"));
+  return [...new Set(dirs)];
+}
 function maxMtime(io, dir) {
   let max = 0;
   const walk = (d) => {
@@ -53,8 +57,7 @@ function affectedSharedKeys(modifiedFiles, dirs, io = nodeIo) {
   if (modifiedFiles.length === 0 || dirs.size === 0) return affected;
   const realFiles = modifiedFiles.map((f) => toPosix(io.realpath(f)));
   for (const [key, dir] of dirs) {
-    const prefix = dir.endsWith("/") ? dir : dir + "/";
-    if (realFiles.some((f) => f === dir || f.startsWith(prefix))) affected.add(key);
+    if (realFiles.some((f) => isUnderDir(f, dir))) affected.add(key);
   }
   return affected;
 }
@@ -62,5 +65,6 @@ export {
   affectedSharedKeys,
   linkedContentSignals,
   linkedSharedDirs,
-  resolveSharedPackageDirs
+  resolveSharedPackageDirs,
+  sharedMappingDirs
 };

package/dist/lib/core/cache/cache-persistence.d.ts

@@ -1,10 +1,12 @@
 import type { NormalizedExternalConfig } from '../../domain/config/external-config.contract.js';
+import type { NormalizedFederationConfig } from '../../domain/config/federation-config.contract.js';
 import type { ChunkInfo, IntegrityMap, SharedInfo } from '../../domain/core/federation-info.contract.js';
 import type { FileReaderPort, FileWriterPort, HashPort } from '../../domain/utils/io-port.contract.js';
 export declare const getDefaultCachePath: (workspaceRoot: string) => string;
 export declare const getFilename: (title: string, dev?: boolean) => string;
-export declare const getChecksum: (shared: Record<string, NormalizedExternalConfig>, dev: "1" | "0", builderVersion?: string, synthesizeCjsExports?: boolean, contentSignals?: Record<string, string>) => string;
-export declare const getChecksumCore: (hash: HashPort, shared: Record<string, NormalizedExternalConfig>, dev: "1" | "0", builderVersion?: string, synthesizeCjsExports?: boolean, contentSignals?: Record<string, string>) => string;
+export declare const getChecksum: (shared: Record<string, NormalizedExternalConfig>, dev: "1" | "0", builderVersion?: string, features?: FeatureFlags, contentSignals?: Record<string, string>, resolvedVersions?: Record<string, string>) => string;
+export type FeatureFlags = Partial<NormalizedFederationConfig['features']>;
+export declare const getChecksumCore: (hash: HashPort, shared: Record<string, NormalizedExternalConfig>, dev: "1" | "0", builderVersion?: string, features?: FeatureFlags, contentSignals?: Record<string, string>, resolvedVersions?: Record<string, string>) => string;
 export type CacheMetadata = {
     checksum: string;
     externals: SharedInfo[];

package/dist/lib/core/cache/cache-persistence.js

@@ -6,15 +6,31 @@ const getFilename = (title, dev) => {
   const devSuffix = dev ? "-dev" : "";
   return `${title}${devSuffix}.meta.json`;
 };
-const getChecksum = (shared, dev, builderVersion = "", synthesizeCjsExports = true, contentSignals = {}) => getChecksumCore(nodeIo, shared, dev, builderVersion, synthesizeCjsExports, contentSignals);
-const getChecksumCore = (hash, shared, dev, builderVersion = "", synthesizeCjsExports = true, contentSignals = {}) => {
+const getChecksum = (shared, dev, builderVersion = "", features = {}, contentSignals = {}, resolvedVersions = {}) => getChecksumCore(nodeIo, shared, dev, builderVersion, features, contentSignals, resolvedVersions);
+const featureState = (features) => Object.entries(features).sort(([a], [b]) => a < b ? -1 : 1).map(([flag, on]) => `${flag}=${on ? "1" : "0"}`).join(",");
+const SHARED_INFO_FIELDS = [
+  "requiredVersion",
+  "singleton",
+  "strictVersion",
+  "shareScope",
+  "pool"
+];
+const sharedInfoState = (config) => {
+  const values = SHARED_INFO_FIELDS.map((field) => config[field] ?? null);
+  return values.every((value) => value === null) ? "" : `!${JSON.stringify(values)}`;
+};
+const getChecksumCore = (hash, shared, dev, builderVersion = "", features = {}, contentSignals = {}, resolvedVersions = {}) => {
   const denseExternals = Object.keys(shared).sort().reduce((clean, external) => {
-    const version = shared[external].version ? `@${shared[external].version}` : "";
+    const installed = resolvedVersions[external];
+    const declared = shared[external].version;
+    const version = installed ? `~${installed}` : declared ? `@${declared}` : "";
     const signal = contentSignals[external] ? `#${contentSignals[external]}` : "";
-    return clean + ":" + external + version + signal;
+    return clean + ":" + external + version + sharedInfoState(shared[external]) + signal;
   }, "deps");
-  const cjs = synthesizeCjsExports ? "1" : "0";
-  return hash.hash("sha256", denseExternals + `:dev=${dev}:builder=${builderVersion}:cjs=${cjs}`).hex();
+  return hash.hash(
+    "sha256",
+    denseExternals + `:dev=${dev}:builder=${builderVersion}:features=${featureState(features)}`
+  ).hex();
 };
 const cacheEntryCore = (io, pathToCache, fileName) => {
   const metadataFile = path.join(pathToCache, fileName);
@@ -36,8 +52,11 @@ const cacheEntryCore = (io, pathToCache, fileName) => {
       io.mkdirp(fullOutputPath);
       cachedResult.files.forEach((file) => {
         const cachedFile = path.join(pathToCache, file);
-        const distFileName = path.join(fullOutputPath, file);
-        if (io.exists(cachedFile)) io.copyFile(cachedFile, distFileName);
+        if (!io.exists(cachedFile))
+          throw new Error(
+            `Cached artifact '${file}' recorded in '${metadataFile}' is missing. Delete '${pathToCache}' and rebuild.`
+          );
+        io.copyFile(cachedFile, path.join(fullOutputPath, file));
       });
     },
     clear: () => {

package/dist/lib/core/normalize-options.d.ts

@@ -1,11 +1,11 @@
 import type { NormalizedFederationConfig } from '../domain/config/federation-config.contract.js';
 import type { FederationOptions, NormalizedFederationOptions } from '../domain/core/federation-options.contract.js';
-import type { FileReaderPort } from '../domain/utils/io-port.contract.js';
+import type { FileReaderPort, GlobPort } from '../domain/utils/io-port.contract.js';
 import { type FederationCache } from '../../domain.js';
 import { getUsedDependenciesFactory } from '../config/get-used-dependencies.js';
 type ConfigLoader = (fullConfigPath: string) => Promise<NormalizedFederationConfig>;
 interface NormalizeFederationDeps {
-    io: FileReaderPort;
+    io: FileReaderPort & GlobPort;
     loadConfig: ConfigLoader;
     usedDependenciesFactory?: typeof getUsedDependenciesFactory;
 }

package/dist/lib/core/normalize-options.js

@@ -2,6 +2,8 @@ import * as path from "path";
 import { pathToFileURL } from "url";
 import { nodeIo } from "../utils/io/node-io-adapter.js";
 import { removeUnusedDeps } from "../config/remove-unused-deps.js";
+import { expandOrDropWildcards } from "../config/expand-mappings.js";
+import { assertBarrelMappings } from "../config/validate-mappings.js";
 import { createFederationCache } from "./cache/federation-cache.js";
 import { getDefaultCachePath } from "./cache/cache-persistence.js";
 import { getUsedDependenciesFactory } from "../config/get-used-dependencies.js";
@@ -31,25 +33,29 @@ async function normalizeFederationOptionsCore(deps, options, cache) {
     cacheExternalArtifacts: options.cacheExternalArtifacts ?? true,
     federationCache
   };
-  if (config.features.ignoreUnusedDeps) {
+  const nothingShared = Object.keys(config.shared).length === 0 && Object.keys(config.sharedMappings).length === 0;
+  if (nothingShared) {
+    logger.debug("Nothing is shared, skipping the used dependency scan.");
+  } else if (config.features.ignoreUnusedDeps) {
     const getUsedDeps = (deps.usedDependenciesFactory ?? getUsedDependenciesFactory)(
       options.workspaceRoot,
       options.entryPoints
     );
-    config = removeUnusedDeps(getUsedDeps(config), config);
+    config = removeUnusedDeps(getUsedDeps(config), config, {
+      io: deps.io,
+      workspaceRoot: options.workspaceRoot
+    });
     logger.info("Removed unused dependencies.");
     logger.debug(
       'This can be disabled per dependency/external using the "includeSecondaries: {keepAll: true}" property. Or in general by disabling the "ignoreUnusedDeps" feature. '
     );
   } else {
-    const withWildcard = Object.keys(config.sharedMappings).some((m) => m.includes("*"));
-    if (withWildcard) {
-      logger.warn(
-        "Sharing mapped paths with wildcards (*) is only supported with ignoreUnusedDeps feature."
-      );
-      config.sharedMappings = Object.entries(config.sharedMappings).filter(([_path]) => !_path.includes("*")).reduce((acc, [_path, _import]) => ({ ...acc, [_path]: _import }), {});
-    }
+    config.sharedMappings = expandOrDropWildcards(config, {
+      io: deps.io,
+      workspaceRoot: options.workspaceRoot
+    });
   }
+  assertBarrelMappings(config.sharedMappings);
   return { config, options: normalizedOptions };
 }
 function resolveProjectName(name) {

package/dist/lib/domain/config/federation-config.contract.d.ts

@@ -1,16 +1,40 @@
 import type { PreparedSkipList, SkipList } from './skip-list.contract.js';
 import type { PathToImport } from '../utils/mapped-path.contract.js';
-import type { NormalizedSharedExternalsConfig, SharedExternalsConfig } from './external-config.contract.js';
+import type { ExternalConfig, NormalizedSharedExternalsConfig, SharedExternalsConfig } from './external-config.contract.js';
 export type ExposeEntry = {
     file: string;
     element?: string;
 };
+export type SharedMappingEntry = string | [string[], ExternalConfig];
+/** Selection pattern -> config, kept in declaration order: first match wins. */
+export type SharedMappingConfigs = Record<string, ExternalConfig>;
+/**
+ * Only the subset of `ExternalConfig` a mapping can act on — mappings all share the
+ * single `mapping-or-exposed` bundle, so `build`/`platform`/`chunks`/`packageInfo`
+ * have nothing to select. `requiredVersion` and `version` stay optional because their
+ * defaults are read from the mapped lib's package.json at build time.
+ *
+ * `includeSecondaries` collapses to a boolean exactly as it does for a shared external:
+ * it means "exempt from `ignoreUnusedDeps` pruning". `resolveGlob` is lifted out of it
+ * because a mapping has no secondary entry points for it to apply to.
+ */
+export interface NormalizedMappingConfig {
+    singleton: boolean;
+    strictVersion: boolean;
+    requiredVersion?: string;
+    version?: string;
+    shareScope?: string;
+    pool?: string;
+    includeSecondaries?: boolean;
+    resolveGlob?: boolean;
+}
+export type NormalizedSharedMappingConfigs = Record<string, NormalizedMappingConfig>;
 export interface FederationConfig {
     name?: string;
     exposes?: Record<string, string | ExposeEntry>;
     shared?: SharedExternalsConfig;
     platform?: 'browser' | 'node';
-    sharedMappings?: Array<string>;
+    sharedMappings?: Array<SharedMappingEntry>;
     chunks?: boolean;
     skip?: SkipList;
     externals?: string[];
@@ -30,6 +54,7 @@ export interface NormalizedFederationConfig {
     exposes: Record<string, ExposeEntry>;
     shared: NormalizedSharedExternalsConfig;
     sharedMappings: PathToImport;
+    sharedMappingsConfig: NormalizedSharedMappingConfigs;
     skip: PreparedSkipList;
     chunks: boolean;
     externals: string[];

package/dist/lib/domain/utils/file-watcher.contract.d.ts

@@ -2,6 +2,18 @@ export interface NfFileWatcherOptions {
     onChange?: (path: string) => void;
     pollIntervalMs?: number;
     debounceMs?: number;
+    /** Drop events whose mtime is unchanged since the last one seen for that path.
+     *  macOS FSEvents re-delivers 'changed' for recently edited files roughly every
+     *  30s; with a watch list of a few thousand sources that replay alone keeps a
+     *  rebuild loop awake forever. Default: true. */
+    dedupeReplays?: boolean;
+    /** Grace period after a path's recorded mtime during which an event whose mtime
+     *  and byte length both match still passes, covering a second save inside one
+     *  mtime tick. The 2000 default is twice the coarsest mtime granularity in play
+     *  (1s on gRPC-FUSE/NFS/WSL2 drvfs/HFS+); raise it for a filesystem coarser than
+     *  that, or for a network mount whose server clock runs behind the client.
+     *  See AGENTS.md "Replay dedupe". Default: 2000. */
+    replayGraceMs?: number;
 }
 interface AddPathsOptions {
     poll?: boolean;

package/dist/lib/domain/utils/io-port.contract.d.ts

@@ -5,6 +5,8 @@ export interface Digest {
 }
 export interface StatInfo {
     mtimeMs: number;
+    /** Byte length; 0 for directories. */
+    size: number;
     isSymbolicLink: boolean;
 }
 export interface FileReaderPort {
@@ -29,6 +31,7 @@ export interface FileWriterPort {
 export interface GlobPort {
     globFiles(pattern: string, opts: {
         cwd: string;
+        ignore?: string[];
     }): string[];
 }
 export interface HashPort {
@@ -45,9 +48,9 @@ interface WatchOptions {
 }
 export interface WatchPort {
     /**
-     * For a recursive directory watch `onEvent` receives the changed entry's
-     * filename relative to `path`; for a file it receives the path itself (or
-     * null when the platform omits it).
+     * `onEvent` receives the changed entry's filename relative to `path` (null when
+     * the platform omits it). Watching a file reports that file's own basename, so a
+     * caller that registered a file can ignore the argument.
      */
     watch(path: string, opts: WatchOptions, onEvent: (filename: string | null) => void): WatchHandle;
 }

package/dist/lib/utils/file-watcher.d.ts

@@ -1,7 +1,18 @@
 import type { WatchPort, FileReaderPort } from '../domain/utils/io-port.contract.js';
 import type { NfFileWatcher, NfFileWatcherOptions } from '../domain/utils/file-watcher.contract.js';
 export declare function createNfWatcher(options?: NfFileWatcherOptions): NfFileWatcher;
-export declare function createNfWatcherCore(io: WatchPort & FileReaderPort, options?: NfFileWatcherOptions): NfFileWatcher;
-export declare function syncNfFileWatcher(watcher: NfFileWatcher, bundlerCache: {
-    keys(): IterableIterator<string>;
-}, linkedDirs?: readonly string[]): void;
+export declare function createNfWatcherCore(io: WatchPort & FileReaderPort, options?: NfFileWatcherOptions, now?: () => number): NfFileWatcher;
+/** A bundler cache keyed by input path, or the input paths themselves. */
+export type WatchSources = Iterable<string> | {
+    keys(): Iterable<string>;
+};
+/**
+ * Subscribe the watcher to the inputs the last build compiled.
+ *
+ * Passing a bundler cache only works when it is keyed by input path. A cache that
+ * records its inputs elsewhere yields an empty watch set and, silently, a dev server
+ * that serves stale bundles until restart — Angular's `SourceFileCache` extends `Map`
+ * but keeps its inputs in `typeScriptFileCache`/`referencedFiles`, which is
+ * angular-adapter#94. Adapters over such a cache must expand it and pass the paths.
+ */
+export declare function syncNfFileWatcher(watcher: NfFileWatcher, sources: WatchSources, linkedDirs?: readonly string[]): void;

package/dist/lib/utils/file-watcher.js

@@ -1,29 +1,82 @@
-import { join } from "path";
+import { dirname, join } from "path";
 import { nodeIo } from "./io/node-io-adapter.js";
 import { logger } from "./logger.js";
-import { toPosix } from "./path-patterns.js";
+import { isUnderDir, toPosix } from "./path-patterns.js";
 function createNfWatcher(options = {}) {
   return createNfWatcherCore(nodeIo, options);
 }
-function createNfWatcherCore(io, options = {}) {
+function createNfWatcherCore(io, options = {}, now = Date.now) {
   const { onChange } = options;
   const pollIntervalMs = options.pollIntervalMs ?? 300;
   const debounceMs = options.debounceMs ?? 0;
+  const dedupeReplays = options.dedupeReplays ?? true;
+  const replayGraceMs = options.replayGraceMs ?? 2e3;
   const watchers = /* @__PURE__ */ new Map();
   const dirtyPaths = /* @__PURE__ */ new Set();
-  const deliver = (path) => {
+  const lastSeen = /* @__PURE__ */ new Map();
+  const trackedFiles = /* @__PURE__ */ new Set();
+  const fileDirWatchers = /* @__PURE__ */ new Map();
+  const dirKey = (p) => {
+    const posix = toPosix(p);
+    return posix.length > 1 ? posix.replace(/\/+$/, "") : posix;
+  };
+  const covers = (path, poll) => {
+    for (const [dir, watch] of watchers) {
+      if ((watch.poll || !poll) && isUnderDir(path, dir)) return true;
+    }
+    return false;
+  };
+  const supersede = (dir, poll) => {
+    for (const map of [watchers, fileDirWatchers]) {
+      for (const [key, watch] of map) {
+        if (watch.poll && !poll) continue;
+        if (map === watchers && key === dir) continue;
+        if (!isUnderDir(key, dir)) continue;
+        watch.handle.close();
+        map.delete(key);
+      }
+    }
+  };
+  const identityOf = (path) => {
+    let stat = io.stat(path);
+    if (stat?.isSymbolicLink) stat = io.stat(io.realpath(path));
+    return stat ? { mtimeMs: stat.mtimeMs, size: stat.size } : null;
+  };
+  const isReplay = (path, at) => {
+    const current = identityOf(path);
+    if (!current) {
+      lastSeen.delete(path);
+      return false;
+    }
+    const previous = lastSeen.get(path);
+    lastSeen.set(path, current);
+    if (!previous || previous.mtimeMs !== current.mtimeMs || previous.size !== current.size) {
+      return false;
+    }
+    return at - current.mtimeMs >= replayGraceMs;
+  };
+  let watchFailures = 0;
+  const watchFailed = (path) => {
+    if (++watchFailures > 1) return logger.debug(`Could not watch path '${path}'.`);
+    logger.warn(
+      `Could not watch '${path}'. Changes there will not trigger a rebuild; run with verbose logging to see any further watch failures.`
+    );
+  };
+  const deliver = (path, at) => {
+    if (dedupeReplays && isReplay(path, at)) return;
+    dirtyPaths.add(path);
     if (onChange) onChange(path);
-    else dirtyPaths.add(path);
   };
-  const pending = /* @__PURE__ */ new Set();
+  const pending = /* @__PURE__ */ new Map();
   let flushTimer;
   const flush = () => {
-    for (const p of pending) deliver(p);
+    for (const [p, at] of pending) deliver(p, at);
     pending.clear();
   };
   const notify = (path) => {
-    if (debounceMs <= 0) return deliver(path);
-    pending.add(path);
+    const at = now();
+    if (debounceMs <= 0) return deliver(path, at);
+    if (!pending.has(path)) pending.set(path, at);
     if (flushTimer) clearTimeout(flushTimer);
     flushTimer = setTimeout(flush, debounceMs);
     flushTimer.unref?.();
@@ -31,16 +84,47 @@ function createNfWatcherCore(io, options = {}) {
   return {
     addPaths(paths, opts) {
       const list = typeof paths === "string" ? [paths] : [...paths];
-      const poll = opts?.poll ? { intervalMs: pollIntervalMs } : void 0;
+      const shouldPoll = !!opts?.poll;
+      const poll = shouldPoll ? { intervalMs: pollIntervalMs } : void 0;
       for (const p of list) {
-        if (watchers.has(p)) continue;
+        if (io.isDirectory(p)) {
+          const dir2 = dirKey(p);
+          if (watchers.has(dir2) || covers(dir2, shouldPoll)) continue;
+          try {
+            watchers.set(dir2, {
+              handle: io.watch(p, { recursive: true, poll }, (filename) => {
+                if (filename) notify(toPosix(join(p, filename)));
+              }),
+              poll: shouldPoll
+            });
+          } catch {
+            watchFailed(p);
+            continue;
+          }
+          supersede(dir2, shouldPoll);
+          continue;
+        }
+        const key = toPosix(p);
+        if (trackedFiles.has(key)) continue;
+        trackedFiles.add(key);
+        if (dedupeReplays && !lastSeen.has(key)) {
+          const identity = identityOf(key);
+          if (identity) lastSeen.set(key, identity);
+        }
+        if (covers(key, shouldPoll)) continue;
+        const dir = dirKey(dirname(p));
+        if (fileDirWatchers.has(dir)) continue;
         try {
-          const handle = io.isDirectory(p) ? io.watch(p, { recursive: true, poll }, (filename) => {
-            if (filename) notify(toPosix(join(p, filename)));
-          }) : io.watch(p, { recursive: false, poll }, () => notify(toPosix(p)));
-          watchers.set(p, handle);
+          fileDirWatchers.set(dir, {
+            handle: io.watch(dir, { recursive: false, poll }, (filename) => {
+              if (!filename) return;
+              const changed = toPosix(join(dir, filename));
+              if (trackedFiles.has(changed)) notify(changed);
+            }),
+            poll: shouldPoll
+          });
         } catch {
-          logger.debug(`Could not watch path '${p}'.`);
+          watchFailed(dir);
         }
       }
     },
@@ -49,15 +133,24 @@ function createNfWatcherCore(io, options = {}) {
     mutate: (fn) => fn(dirtyPaths),
     async close() {
       if (flushTimer) clearTimeout(flushTimer);
-      for (const handle of watchers.values()) {
+      for (const { handle } of [...watchers.values(), ...fileDirWatchers.values()]) {
         handle.close();
       }
       watchers.clear();
+      fileDirWatchers.clear();
+      trackedFiles.clear();
+      lastSeen.clear();
+      watchFailures = 0;
     }
   };
 }
-function syncNfFileWatcher(watcher, bundlerCache, linkedDirs = []) {
-  const files = [...bundlerCache.keys()].filter((k) => !k.includes("node_modules"));
+function toPaths(sources) {
+  if (Array.isArray(sources)) return sources;
+  const cache = sources;
+  return typeof cache.keys === "function" ? cache.keys() : sources;
+}
+function syncNfFileWatcher(watcher, sources, linkedDirs = []) {
+  const files = [...toPaths(sources)].filter((k) => !k.includes("node_modules"));
   if (files.length) watcher.addPaths(files);
   if (linkedDirs.length) watcher.addPaths(linkedDirs, { poll: true });
 }