@photostructure/fs-metadata 0.2.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@photostructure/fs-metadata",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Cross-platform native filesystem metadata retrieval for Node.js",
   "homepage": "https://photostructure.github.io/fs-metadata/",
   "types": "./dist/types/index.d.ts",
@@ -21,6 +21,7 @@
     "configure": "node scripts/configure.mjs",
     "prebuildify": "prebuildify --napi --tag-libc --strip",
     "prebuild": "run-s configure prebuildify",
+    "clang-tidy": "node-gyp configure -- -f compile_commands_json && clang-tidy -p build/Release src/**/*.cpp",
     "compile": "run-p compile:*",
     "compile:esm": "tsc -p tsconfig.esm.json --noEmit",
     "compile:cjs": "tsc -p tsconfig.cjs.json --noEmit",
@@ -43,6 +44,7 @@
     "test:memory": "cross-env TEST_MEMORY=1 node --expose-gc --experimental-vm-modules --no-warnings node_modules/jest/bin/jest.js --config jest.config.mjs --no-coverage src/memory.test.ts",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
+    "snyk": "snyk code test",
     "fmt": "run-p fmt:*",
     "// fmt:cpp": "on ubuntu: `sudo apt install clang-format`",
     "fmt:cpp": "clang-format --style=LLVM -i src/*.cpp src/*/*.cpp src/*/*.h || true",
@@ -50,7 +52,7 @@
     "fmt:json": "prettier --write \"**/*.json\"",
     "fmt:pkg": "npm pkg fix",
     "fmt:ts": "prettier --write \"**/*.(c|m)?ts\"",
-    "precommit": "run-s fmt clean prebuild tests",
+    "precommit": "run-s fmt clean prebuild tests snyk",
     "prepare-release": "npm run bundle",
     "release": "release-it"
   },
@@ -93,21 +95,23 @@
     "cross-env": "^7.0.3",
     "del-cli": "^6.0.0",
     "eslint": "^9.17.0",
+    "eslint-plugin-regexp": "^2.7.0",
     "globals": "^15.14.0",
+    "jest": "^29.7.0",
     "jest-environment-node": "^29.7.0",
     "jest-extended": "^4.0.2",
-    "jest": "^29.7.0",
     "node-gyp": "^11.0.0",
     "npm-run-all": "4.1.5",
     "prebuildify": "^6.0.1",
-    "prettier-plugin-organize-imports": "4.1.0",
     "prettier": "^3.4.2",
+    "prettier-plugin-organize-imports": "4.1.0",
     "release-it": "^17.11.0",
+    "snyk": "^1.1294.3",
     "terser": "^5.37.0",
     "ts-jest": "^29.2.5",
     "tsup": "^8.3.5",
     "typedoc": "^0.27.6",
-    "typescript-eslint": "^8.19.0",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.19.0"
   }
 }

package/src/glob.ts

@@ -123,5 +123,7 @@ function _compileGlob(patterns: string[] | readonly string[]): RegExp {
     : new RegExp(`^(?:${final.join("|")})$`, "i");
 }
 
+// eslint-disable-next-line regexp/no-empty-group
 export const AlwaysMatchRE = /(?:)/;
+// eslint-disable-next-line regexp/no-empty-lookarounds-assertion
 export const NeverMatchRE = /(?!)/;

package/src/linux/mtab.ts

@@ -92,7 +92,7 @@ export function parseMtab(content: string): MountEntry[] {
 
     const fields = line
       .trim()
-      .match(/(?:[^\s\\]+|\\.)+/g)
+      .match(/(?:[^\s\\]|\\.)+/g)
       ?.map(decodeEscapeSequences);
 
     if (!fields || fields.length < 3) {

package/src/options.ts

@@ -41,7 +41,7 @@ export interface Options {
    *
    * @see {@link SystemFsTypesDefault} for the default value
    */
-  systemFsTypes: Set<string>;
+  systemFsTypes: string[];
 
   /**
    * On Linux, use the first mount point table in this array that is readable.
@@ -105,7 +105,7 @@ export const SystemPathPatternsDefault = [
 /**
  * Filesystem types that indicate system volumes
  */
-export const SystemFsTypesDefault = new Set([
+export const SystemFsTypesDefault = [
   "autofs",
   "binfmt_misc",
   "cgroup",
@@ -128,16 +128,16 @@ export const SystemFsTypesDefault = new Set([
   "squashfs",
   "sysfs",
   "tmpfs",
-]);
+] as const;
 
 export const LinuxMountTablePathsDefault = [
   "/proc/self/mounts",
   "/proc/mounts",
   "/etc/mtab",
-];
+] as const;
 
 /**
- * Should {@link getAllVolumeMetadata()} include system volumes by
+ * Should {@link getAllVolumeMetadata} include system volumes by
  * default?
  */
 export const IncludeSystemVolumesDefault = isWindows;
@@ -151,8 +151,8 @@ export const OptionsDefault: Options = {
   timeoutMs: TimeoutMsDefault,
   maxConcurrency: availableParallelism(),
   systemPathPatterns: [...SystemPathPatternsDefault],
-  systemFsTypes: new Set(SystemFsTypesDefault),
-  linuxMountTablePaths: LinuxMountTablePathsDefault,
+  systemFsTypes: [...SystemFsTypesDefault],
+  linuxMountTablePaths: [...LinuxMountTablePathsDefault],
   includeSystemVolumes: IncludeSystemVolumesDefault,
 } as const;
 

package/src/string.ts

@@ -53,7 +53,7 @@ export function decodeEscapeSequences(input: string): string {
   });
 }
 
-const AlphaNumericRE = /[a-z0-9.-_]/i;
+const AlphaNumericRE = /[/\w.-]/;
 
 export function encodeEscapeSequences(input: string): string {
   return input

package/src/system_volume.ts

@@ -31,7 +31,6 @@ export function isSystemVolume(
   fstype: string | undefined,
   config: Partial<SystemVolumeConfig> = {},
 ): boolean {
-  debug("[isSystemVolume] checking %s (fstype: %s)", mountPoint, fstype);
   if (isWindows) {
     const systemDrive = normalizePath(process.env["SystemDrive"]);
     if (systemDrive != null && mountPoint === systemDrive) {
@@ -39,13 +38,22 @@ export function isSystemVolume(
       return true;
     }
   }
-  const result =
-    (isNotBlank(fstype) &&
-      (config.systemFsTypes ?? SystemFsTypesDefault).has(fstype)) ||
-    compileGlob(config.systemPathPatterns ?? SystemPathPatternsDefault).test(
-      mountPoint,
+  const isSystemFsType =
+    isNotBlank(fstype) &&
+    ((config.systemFsTypes ?? SystemFsTypesDefault) as string[]).includes(
+      fstype,
     );
-  debug("[isSystemVolume] %s -> %s", mountPoint, result);
+  const hasSystemPath = compileGlob(
+    config.systemPathPatterns ?? SystemPathPatternsDefault,
+  ).test(mountPoint);
+  const result = isSystemFsType || hasSystemPath;
+  debug("[isSystemVolume]", {
+    mountPoint,
+    fstype,
+    result,
+    isSystemFsType,
+    hasSystemPath,
+  });
   return result;
 }