@augment-vir/node 31.73.1 → 31.73.2

package/dist/augments/fs/grep.js

@@ -1,10 +1,26 @@
 import { assert, check } from '@augment-vir/assert';
 import { arrayToObject, getOrSet, log, safeMatch, } from '@augment-vir/common';
 import { join } from 'node:path';
+import { isOperatingSystem, OperatingSystem } from '../os/operating-system.js';
 import { runShellCommand } from '../terminal/shell.js';
 function escape(input) {
     return input.replaceAll('"', String.raw `\"`).replaceAll('\n', '');
 }
+function recursiveFlag({ recursive, followSymLinks, }) {
+    if (!recursive) {
+        return '';
+    }
+    else if (!followSymLinks) {
+        return '--recursive';
+    }
+    /**
+     * BSD `grep` (macOS) requires `-S` to follow symlinks while recursing, but GNU `grep` (Linux)
+     * has no `-S` flag and instead follows all symlinks with `-R`. Only one of these branches can
+     * run on a given operating system.
+     */
+    /* node:coverage ignore next */
+    return isOperatingSystem(OperatingSystem.Mac) ? '-RS' : '-R';
+}
 /**
  * Run `grep`, matching patterns to specific lines in files or directories.
  *
@@ -75,7 +91,7 @@ export async function grep(grepSearchPattern, grepSearchLocation, options = {})
         ...(options.excludePatterns?.length
             ? options.excludePatterns.map((excludePattern) => `--exclude="${escape(excludePattern)}"`)
             : []),
-        options.recursive ? (options.followSymLinks ? '-RS' : '--recursive') : '',
+        recursiveFlag(options),
         ...(options.excludeDirs?.length
             ? options.excludeDirs.map((excludeDir) => `--exclude-dir="${escape(excludeDir)}"`)
             : []),
@@ -100,13 +116,17 @@ export async function grep(grepSearchPattern, grepSearchLocation, options = {})
         return {};
     }
     else if (options.output?.countOnly) {
-        return arrayToObject(trimmedOutput.split(/[\0\n]/), (entry) => {
+        return arrayToObject(trimmedOutput.split('\n'), (entry) => {
             /** Ignore empty strings. */
             /* node:coverage ignore next 3 */
             if (!entry) {
                 return undefined;
             }
-            const [, fileName, countString,] = safeMatch(entry, /(^.+):(\d+)$/);
+            /**
+             * GNU `grep` (Linux) separates the file name from its count with a null byte when
+             * `--null` is set, while BSD `grep` (macOS) uses a colon. Accept either.
+             */
+            const [, fileName, countString,] = safeMatch(entry, /^(.+)[\0:](\d+)$/);
             assert.isDefined(fileName, `Failed parse grep file name from: '${entry}'`);
             const count = Number(countString);
             assert.isNumber(count, `Failed to parse grep number from: '${entry}'`);

package/dist/augments/path/resolve-import.js

@@ -74,5 +74,6 @@ function mapImportPath(importPath, tsconfig, tsconfigPath) {
     if (!mappedPaths[0]) {
         return importPath;
     }
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     return resolve(tsconfig.options.baseUrl || dirname(tsconfigPath), mappedPaths[0]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/node",
-    "version": "31.73.1",
+    "version": "31.73.2",
     "description": "A collection of augments, helpers types, functions, and classes only for Node.js (backend) JavaScript environments.",
     "keywords": [
         "augment",
@@ -38,25 +38,25 @@
         "test:update": "npm test"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.73.1",
-        "@augment-vir/common": "^31.73.1",
-        "@date-vir/duration": "^8.3.2",
+        "@augment-vir/assert": "^31.73.2",
+        "@augment-vir/common": "^31.73.2",
+        "@date-vir/duration": "^8.5.0",
         "ansi-styles": "^6.2.3",
         "sanitize-filename": "^1.6.4",
         "terminate": "^2.8.0",
-        "tsx": "^4.22.3",
-        "type-fest": "^5.6.0",
-        "typed-event-target": "^4.3.0"
+        "tsx": "^4.22.4",
+        "type-fest": "^5.7.0",
+        "typed-event-target": "^4.3.1"
     },
     "devDependencies": {
-        "@augment-vir/test": "^31.73.1",
-        "@types/node": "^25.9.1",
+        "@augment-vir/test": "^31.73.2",
+        "@types/node": "^25.9.3",
         "@web/dev-server-esbuild": "^1.0.5",
         "@web/test-runner": "^0.20.2",
         "@web/test-runner-playwright": "^0.11.1",
         "c8": "^11.0.0",
         "istanbul-smart-text-reporter": "^1.1.5",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.3"
     },
     "peerDependencies": {
         "typescript": "*"

package/src/augments/fs/grep.ts

@@ -9,6 +9,7 @@ import {
 } from '@augment-vir/common';
 import {join} from 'node:path';
 import {type IsEqual, type RequireExactlyOne} from 'type-fest';
+import {isOperatingSystem, OperatingSystem} from '../os/operating-system.js';
 import {runShellCommand} from '../terminal/shell.js';
 
 /**
@@ -178,6 +179,25 @@ function escape(input: string) {
     return input.replaceAll('"', String.raw`\"`).replaceAll('\n', '');
 }
 
+function recursiveFlag({
+    recursive,
+    followSymLinks,
+}: Readonly<Pick<GrepOptions, 'recursive' | 'followSymLinks'>>): string {
+    if (!recursive) {
+        return '';
+    } else if (!followSymLinks) {
+        return '--recursive';
+    }
+
+    /**
+     * BSD `grep` (macOS) requires `-S` to follow symlinks while recursing, but GNU `grep` (Linux)
+     * has no `-S` flag and instead follows all symlinks with `-R`. Only one of these branches can
+     * run on a given operating system.
+     */
+    /* node:coverage ignore next */
+    return isOperatingSystem(OperatingSystem.Mac) ? '-RS' : '-R';
+}
+
 /**
  * Output of {@link grep}. Each key is an absolute file path. Values are array of matches lines for
  * that file.
@@ -279,7 +299,7 @@ export async function grep<const CountOnly extends boolean = false>(
                   (excludePattern) => `--exclude="${escape(excludePattern)}"`,
               )
             : []),
-        options.recursive ? (options.followSymLinks ? '-RS' : '--recursive') : '',
+        recursiveFlag(options),
         ...(options.excludeDirs?.length
             ? options.excludeDirs.map((excludeDir) => `--exclude-dir="${escape(excludeDir)}"`)
             : []),
@@ -308,7 +328,7 @@ export async function grep<const CountOnly extends boolean = false>(
         return {};
     } else if (options.output?.countOnly) {
         return arrayToObject(
-            trimmedOutput.split(/[\0\n]/),
+            trimmedOutput.split('\n'),
             (entry) => {
                 /** Ignore empty strings. */
                 /* node:coverage ignore next 3 */
@@ -316,11 +336,15 @@ export async function grep<const CountOnly extends boolean = false>(
                     return undefined;
                 }
 
+                /**
+                 * GNU `grep` (Linux) separates the file name from its count with a null byte when
+                 * `--null` is set, while BSD `grep` (macOS) uses a colon. Accept either.
+                 */
                 const [
                     ,
                     fileName,
                     countString,
-                ] = safeMatch(entry, /(^.+):(\d+)$/);
+                ] = safeMatch(entry, /^(.+)[\0:](\d+)$/);
 
                 assert.isDefined(fileName, `Failed parse grep file name from: '${entry}'`);
 

package/src/augments/path/resolve-import.ts

@@ -115,5 +115,6 @@ function mapImportPath(
         return importPath;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     return resolve(tsconfig.options.baseUrl || dirname(tsconfigPath), mappedPaths[0]);
 }