@photostructure/fs-metadata 1.2.0 → 1.4.0

package/dist/index.d.cts

@@ -79,7 +79,7 @@ interface MountPoint {
      * verifyVolume`.
      *
      * If there are non-critical errors while extracting metadata, those error
-     * messages may be added to this field (say, from blkid or gio).
+     * messages may be added to this field (say, from blkid).
      *
      * @see {@link VolumeHealthStatuses} for values returned by Windows.
      */
@@ -132,6 +132,18 @@ interface MountPoint {
  * @see {@link OptionsDefault} for the default values
  */
 interface Options {
+    /**
+     * Pre-fetched mount points to use instead of querying the system.
+     *
+     * When provided, functions like {@link getMountPointForPath} and
+     * {@link getVolumeMetadataForPath} will use these mount points for device ID
+     * matching instead of calling {@link getVolumeMountPoints} internally. This
+     * avoids redundant system queries when resolving multiple paths.
+     *
+     * Obtain via `getVolumeMountPoints({ includeSystemVolumes: true })` — system
+     * volumes must be included for device ID matching to work correctly.
+     */
+    mountPoints?: MountPoint[];
     /**
      * Timeout in milliseconds for filesystem operations.
      *
@@ -367,7 +379,7 @@ declare function getVolumeMetadata(mountPoint: string, opts?: Partial<Pick<Optio
  * @param pathname Path to any file or directory
  * @param opts Optional filesystem operation settings
  */
-declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths">>): Promise<VolumeMetadata>;
+declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths" | "mountPoints">>): Promise<VolumeMetadata>;
 /**
  * Get the mount point path for an arbitrary file or directory path.
  *
@@ -383,7 +395,7 @@ declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<
  * @param opts Optional settings (timeoutMs, linuxMountTablePaths)
  * @returns The mount point path (e.g., "/", "/System/Volumes/Data", "C:\\")
  */
-declare function getMountPointForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths">>): Promise<string>;
+declare function getMountPointForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths" | "mountPoints">>): Promise<string>;
 /**
  * Retrieves metadata for all mounted volumes with optional filtering and
  * concurrency control.

package/dist/index.d.mts

@@ -79,7 +79,7 @@ interface MountPoint {
      * verifyVolume`.
      *
      * If there are non-critical errors while extracting metadata, those error
-     * messages may be added to this field (say, from blkid or gio).
+     * messages may be added to this field (say, from blkid).
      *
      * @see {@link VolumeHealthStatuses} for values returned by Windows.
      */
@@ -132,6 +132,18 @@ interface MountPoint {
  * @see {@link OptionsDefault} for the default values
  */
 interface Options {
+    /**
+     * Pre-fetched mount points to use instead of querying the system.
+     *
+     * When provided, functions like {@link getMountPointForPath} and
+     * {@link getVolumeMetadataForPath} will use these mount points for device ID
+     * matching instead of calling {@link getVolumeMountPoints} internally. This
+     * avoids redundant system queries when resolving multiple paths.
+     *
+     * Obtain via `getVolumeMountPoints({ includeSystemVolumes: true })` — system
+     * volumes must be included for device ID matching to work correctly.
+     */
+    mountPoints?: MountPoint[];
     /**
      * Timeout in milliseconds for filesystem operations.
      *
@@ -367,7 +379,7 @@ declare function getVolumeMetadata(mountPoint: string, opts?: Partial<Pick<Optio
  * @param pathname Path to any file or directory
  * @param opts Optional filesystem operation settings
  */
-declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths">>): Promise<VolumeMetadata>;
+declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths" | "mountPoints">>): Promise<VolumeMetadata>;
 /**
  * Get the mount point path for an arbitrary file or directory path.
  *
@@ -383,7 +395,7 @@ declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<
  * @param opts Optional settings (timeoutMs, linuxMountTablePaths)
  * @returns The mount point path (e.g., "/", "/System/Volumes/Data", "C:\\")
  */
-declare function getMountPointForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths">>): Promise<string>;
+declare function getMountPointForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths" | "mountPoints">>): Promise<string>;
 /**
  * Retrieves metadata for all mounted volumes with optional filtering and
  * concurrency control.

package/dist/index.d.ts

@@ -79,7 +79,7 @@ interface MountPoint {
      * verifyVolume`.
      *
      * If there are non-critical errors while extracting metadata, those error
-     * messages may be added to this field (say, from blkid or gio).
+     * messages may be added to this field (say, from blkid).
      *
      * @see {@link VolumeHealthStatuses} for values returned by Windows.
      */
@@ -132,6 +132,18 @@ interface MountPoint {
  * @see {@link OptionsDefault} for the default values
  */
 interface Options {
+    /**
+     * Pre-fetched mount points to use instead of querying the system.
+     *
+     * When provided, functions like {@link getMountPointForPath} and
+     * {@link getVolumeMetadataForPath} will use these mount points for device ID
+     * matching instead of calling {@link getVolumeMountPoints} internally. This
+     * avoids redundant system queries when resolving multiple paths.
+     *
+     * Obtain via `getVolumeMountPoints({ includeSystemVolumes: true })` — system
+     * volumes must be included for device ID matching to work correctly.
+     */
+    mountPoints?: MountPoint[];
     /**
      * Timeout in milliseconds for filesystem operations.
      *
@@ -367,7 +379,7 @@ declare function getVolumeMetadata(mountPoint: string, opts?: Partial<Pick<Optio
  * @param pathname Path to any file or directory
  * @param opts Optional filesystem operation settings
  */
-declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths">>): Promise<VolumeMetadata>;
+declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths" | "mountPoints">>): Promise<VolumeMetadata>;
 /**
  * Get the mount point path for an arbitrary file or directory path.
  *
@@ -383,7 +395,7 @@ declare function getVolumeMetadataForPath(pathname: string, opts?: Partial<Pick<
  * @param opts Optional settings (timeoutMs, linuxMountTablePaths)
  * @returns The mount point path (e.g., "/", "/System/Volumes/Data", "C:\\")
  */
-declare function getMountPointForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths">>): Promise<string>;
+declare function getMountPointForPath(pathname: string, opts?: Partial<Pick<Options, "timeoutMs" | "linuxMountTablePaths" | "mountPoints">>): Promise<string>;
 /**
  * Retrieves metadata for all mounted volumes with optional filtering and
  * concurrency control.

package/dist/index.mjs

@@ -649,11 +649,6 @@ async function* readLinks(directory) {
 // src/linux/mount_points.ts
 import { readFile } from "fs/promises";
 
-// src/mount_point.ts
-function isMountPoint(obj) {
-  return isObject(obj) && "mountPoint" in obj && isNotBlank(obj.mountPoint);
-}
-
 // src/options.ts
 import { availableParallelism as availableParallelism2 } from "os";
 import { env as env2 } from "process";
@@ -1135,49 +1130,25 @@ function parseMtab(content) {
 }
 
 // src/linux/mount_points.ts
-async function getLinuxMountPoints(native, opts) {
+async function getLinuxMountPoints(opts) {
   const o = optionsWithDefaults(opts);
-  const raw = [];
-  try {
-    const arr = await (await native()).getGioMountPoints?.();
-    debug("[getLinuxMountPoints] GIO mount points: %o", arr);
-    if (arr != null) raw.push(...arr);
-  } catch (error) {
-    debug("Failed to get GIO mount points: %s", error);
-  }
   let cause;
   for (const input of o.linuxMountTablePaths) {
     try {
       const mtabContent = await readFile(input, "utf8");
-      const arr = parseMtab(mtabContent).map((ea) => mountEntryToMountPoint(ea)).filter((ea) => ea != null);
-      debug("[getLinuxMountPoints] %s mount points: %o", input, arr);
-      if (arr.length > 0) {
-        raw.push(...arr);
-        break;
+      const results = parseMtab(mtabContent).map((ea) => mountEntryToMountPoint(ea)).filter((ea) => ea != null);
+      debug("[getLinuxMountPoints] %s mount points: %o", input, results);
+      if (results.length > 0) {
+        return results;
       }
     } catch (error) {
       cause ??= toError(error);
     }
   }
-  const byMountPoint = /* @__PURE__ */ new Map();
-  for (const ea of raw) {
-    const prior = byMountPoint.get(ea.mountPoint);
-    const merged = { ...compactValues(prior), ...compactValues(ea) };
-    if (isMountPoint(merged)) {
-      byMountPoint.set(merged.mountPoint, merged);
-    }
-  }
-  if (byMountPoint.size === 0) {
-    throw new WrappedError(
-      `Failed to find any mount points (tried: ${JSON.stringify(o.linuxMountTablePaths)})`,
-      { cause }
-    );
-  }
-  const results = [...byMountPoint.values()];
-  debug("[getLinuxMountPoints] %o", {
-    results: results.map((ea) => ea.mountPoint)
-  });
-  return results;
+  throw new WrappedError(
+    `Failed to find any mount points (tried: ${JSON.stringify(o.linuxMountTablePaths)})`,
+    { cause }
+  );
 }
 async function getLinuxMtabMetadata(mountPoint, opts) {
   let caughtError;
@@ -1304,7 +1275,7 @@ async function _getVolumeMountPoints(o, nativeFn2) {
       points.length
     );
     return points;
-  })() : getLinuxMountPoints(nativeFn2, o));
+  })() : getLinuxMountPoints(o));
   debug("[getVolumeMountPoints] raw mount points: %o", raw);
   const compacted = raw.map((ea) => compactValues(ea)).filter((ea) => isNotBlank(ea.mountPoint));
   for (const ea of compacted) {
@@ -1457,7 +1428,7 @@ async function getVolumeMetadataForPathImpl(pathname, opts, nativeFn2) {
 }
 async function findMountPointByDeviceId(resolved, resolvedStat, opts, nativeFn2) {
   const targetDev = resolvedStat.dev;
-  const mountPoints = await getVolumeMountPointsImpl(
+  const mountPoints = opts.mountPoints ?? await getVolumeMountPointsImpl(
     { ...opts, includeSystemVolumes: true },
     nativeFn2
   );