@augment-vir/node 31.73.4 → 32.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,11 +1,14 @@
1
1
  import { readdir, stat } from 'node:fs/promises';
2
2
  import { join, relative } from 'node:path';
3
- async function internalReadDirPathsRecursive(dirPath, basePath) {
3
+ async function internalReadDirPathsRecursive({ dirPath, basePath, }) {
4
4
  const dirContents = await readdir(dirPath);
5
5
  const recursiveContents = (await Promise.all(dirContents.map(async (fileName) => {
6
6
  const filePath = join(dirPath, fileName);
7
7
  if ((await stat(filePath)).isDirectory()) {
8
- return internalReadDirPathsRecursive(filePath, basePath);
8
+ return internalReadDirPathsRecursive({
9
+ dirPath: filePath,
10
+ basePath,
11
+ });
9
12
  }
10
13
  else {
11
14
  return relative(basePath, filePath);
@@ -22,7 +25,10 @@ async function internalReadDirPathsRecursive(dirPath, basePath) {
22
25
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
23
26
  */
24
27
  export async function readDirRecursive(dirPath) {
25
- return await internalReadDirPathsRecursive(dirPath, dirPath);
28
+ return await internalReadDirPathsRecursive({
29
+ dirPath,
30
+ basePath: dirPath,
31
+ });
26
32
  }
27
33
  /**
28
34
  * Reads all files within a single directory and filters them by the given extension or extensions.
@@ -6,11 +6,15 @@ import { type PartialWithUndefined } from '@augment-vir/common';
6
6
  * @category Package : @augment-vir/node
7
7
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
8
8
  */
9
- export declare function doesPathContain(potentialParentPath: string, potentialChildPath: string, options?: PartialWithUndefined<{
10
- /**
11
- * Set this to `true` to return `true` if the paths are exactly equal.
12
- *
13
- * @default false
14
- */
15
- allowSelf: boolean;
9
+ export declare function doesPathContain({ potentialParentPath, potentialChildPath, options, }: Readonly<{
10
+ potentialParentPath: string;
11
+ potentialChildPath: string;
12
+ options?: PartialWithUndefined<{
13
+ /**
14
+ * Set this to `true` to return `true` if the paths are exactly equal.
15
+ *
16
+ * @default false
17
+ */
18
+ allowSelf: boolean;
19
+ }>;
16
20
  }>): boolean;
@@ -7,7 +7,7 @@ import { isOperatingSystem, OperatingSystem } from '../os/operating-system.js';
7
7
  * @category Package : @augment-vir/node
8
8
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
9
9
  */
10
- export function doesPathContain(potentialParentPath, potentialChildPath, options = {}) {
10
+ export function doesPathContain({ potentialParentPath, potentialChildPath, options = {}, }) {
11
11
  if (!potentialParentPath || !potentialChildPath) {
12
12
  return false;
13
13
  }
@@ -8,4 +8,7 @@
8
8
  * @returns `undefined` if no matches are found.
9
9
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
10
10
  */
11
- export declare function resolveImportPath(importerFilePath: string, importPath: string): string | undefined;
11
+ export declare function resolveImportPath({ importerFilePath, importPath, }: Readonly<{
12
+ importerFilePath: string;
13
+ importPath: string;
14
+ }>): string | undefined;
@@ -15,10 +15,14 @@ import { replaceWithWindowsPathIfNeeded } from './os-path.js';
15
15
  * @returns `undefined` if no matches are found.
16
16
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
17
17
  */
18
- export function resolveImportPath(importerFilePath, importPath) {
18
+ export function resolveImportPath({ importerFilePath, importPath, }) {
19
19
  const foundTsconfig = readTsconfig(importerFilePath);
20
20
  const mappedImportPath = foundTsconfig
21
- ? mapImportPath(importPath, foundTsconfig.tsconfig, foundTsconfig.path)
21
+ ? mapImportPath({
22
+ importPath,
23
+ tsconfig: foundTsconfig.tsconfig,
24
+ tsconfigPath: foundTsconfig.path,
25
+ })
22
26
  : importPath;
23
27
  if (mappedImportPath.startsWith(sep) || mappedImportPath.startsWith('/')) {
24
28
  /** Absolute import */
@@ -56,7 +60,7 @@ function mapFilePath(path) {
56
60
  }
57
61
  return path;
58
62
  }
59
- function mapImportPath(importPath, tsconfig, tsconfigPath) {
63
+ function mapImportPath({ importPath, tsconfig, tsconfigPath, }) {
60
64
  const paths = tsconfig.options.paths;
61
65
  if (!paths) {
62
66
  return importPath;
@@ -16,11 +16,8 @@ export declare const ExtensionToRunner: Record<string, string | {
16
16
  * @category Package : @augment-vir/node
17
17
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
18
18
  */
19
- export declare function runCliScript(scriptPath: string,
20
- /** This should just be `__filename` (for CJS) or `import.meta.filename` (for ESM). */
21
- cliScriptFilePath: string,
22
- /**
23
- * This should be the bin name of the package that is calling this function. Set to `undefined`
24
- * if there isn't one.
25
- */
26
- binName: string | undefined): Promise<void>;
19
+ export declare function runCliScript({ scriptPath, cliScriptFilePath, binName, }: Readonly<{
20
+ scriptPath: string;
21
+ cliScriptFilePath: string;
22
+ binName: string | undefined;
23
+ }>): Promise<void>;
@@ -27,14 +27,7 @@ export const ExtensionToRunner = {
27
27
  * @category Package : @augment-vir/node
28
28
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
29
29
  */
30
- export async function runCliScript(scriptPath,
31
- /** This should just be `__filename` (for CJS) or `import.meta.filename` (for ESM). */
32
- cliScriptFilePath,
33
- /**
34
- * This should be the bin name of the package that is calling this function. Set to `undefined`
35
- * if there isn't one.
36
- */
37
- binName) {
30
+ export async function runCliScript({ scriptPath, cliScriptFilePath, binName, }) {
38
31
  const args = extractRelevantArgs({
39
32
  rawArgs: process.argv,
40
33
  binName,
@@ -126,6 +126,20 @@ export declare class ShellTarget extends ListenTarget<ShellStdoutEvent | ShellSt
126
126
  readonly childProcess: ChildProcess;
127
127
  constructor(childProcess: ChildProcess);
128
128
  }
129
+ /**
130
+ * Options for {@link streamShellCommand}.
131
+ *
132
+ * @category Node : Terminal : Util
133
+ * @category Package : @augment-vir/node
134
+ * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
135
+ */
136
+ export type StreamShellCommandOptions = PartialWithUndefined<{
137
+ cwd: string;
138
+ env: NodeJS.ProcessEnv;
139
+ shell: string;
140
+ /** Automatically hook up stdout and stderr printing to the caller's console methods. */
141
+ hookUpToConsole: boolean;
142
+ }>;
129
143
  /**
130
144
  * Runs a shell command and returns a {@link ShellTarget} instance for directly hooking into shell
131
145
  * events. This allows instant reactions to shell events but in a less convenient API compared to
@@ -137,7 +151,7 @@ export declare class ShellTarget extends ListenTarget<ShellStdoutEvent | ShellSt
137
151
  * @see
138
152
  * - {@link runShellCommand}: a higher level and more succinct way of running a shell command.
139
153
  */
140
- export declare function streamShellCommand(command: string, cwd?: string, shell?: string, env?: NodeJS.ProcessEnv, hookUpToConsole?: boolean): ShellTarget;
154
+ export declare function streamShellCommand(command: string, { cwd, env, shell, hookUpToConsole, }?: StreamShellCommandOptions): ShellTarget;
141
155
  /**
142
156
  * Options for {@link runShellCommand}.
143
157
  *
@@ -145,19 +159,14 @@ export declare function streamShellCommand(command: string, cwd?: string, shell?
145
159
  * @category Package : @augment-vir/node
146
160
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
147
161
  */
148
- export type RunShellCommandOptions = {
149
- cwd?: string | undefined;
150
- env?: NodeJS.ProcessEnv | undefined;
151
- shell?: string | undefined;
152
- /** Automatically hook up stdout and stderr printing to the caller's console methods. */
153
- hookUpToConsole?: boolean | undefined;
162
+ export type RunShellCommandOptions = StreamShellCommandOptions & PartialWithUndefined<{
154
163
  /** @default false */
155
- rejectOnError?: boolean | undefined;
164
+ rejectOnError: boolean;
156
165
  /** Callback to call whenever the shell logs to stdout. */
157
- stdoutCallback?: (stdout: string, childProcess: ChildProcess) => MaybePromise<void> | undefined;
166
+ stdoutCallback: (stdout: string, childProcess: ChildProcess) => MaybePromise<void> | undefined;
158
167
  /** Callback to call whenever the shell logs to stderr. */
159
- stderrCallback?: (stderr: string, childProcess: ChildProcess) => MaybePromise<void> | undefined;
160
- };
168
+ stderrCallback: (stderr: string, childProcess: ChildProcess) => MaybePromise<void> | undefined;
169
+ }>;
161
170
  /**
162
171
  * Runs a shell command and returns its output.
163
172
  *
@@ -64,7 +64,7 @@ export class ShellTarget extends ListenTarget {
64
64
  * @see
65
65
  * - {@link runShellCommand}: a higher level and more succinct way of running a shell command.
66
66
  */
67
- export function streamShellCommand(command, cwd, shell = 'bash', env = process.env, hookUpToConsole = false) {
67
+ export function streamShellCommand(command, { cwd, env = process.env, shell = 'bash', hookUpToConsole = false, } = {}) {
68
68
  const stdio = hookUpToConsole ? [process.stdin] : undefined;
69
69
  const childProcess = spawn(command, {
70
70
  shell,
@@ -109,7 +109,9 @@ export function streamShellCommand(command, cwd, shell = 'bash', env = process.e
109
109
  const exitCode = inputExitCode ?? undefined;
110
110
  const exitSignal = inputExitSignal ?? undefined;
111
111
  if ((exitCode !== undefined && exitCode !== 0) || exitSignal !== undefined) {
112
- const execException = new Error(`Command failed: ${command}`);
112
+ const execException = Object.assign(new Error(`Command failed: ${command}`), {
113
+ cmd: command,
114
+ });
113
115
  if (exitCode != undefined) {
114
116
  execException.code = exitCode;
115
117
  }
@@ -117,7 +119,6 @@ export function streamShellCommand(command, cwd, shell = 'bash', env = process.e
117
119
  if (exitSignal != undefined) {
118
120
  execException.signal = exitSignal;
119
121
  }
120
- execException.cmd = command;
121
122
  execException.killed = childProcess.killed;
122
123
  execException.cwd = cwd;
123
124
  shellTarget.dispatch(new ShellErrorEvent({
@@ -147,7 +148,12 @@ export async function runShellCommand(command, options = {}) {
147
148
  let stdout = '';
148
149
  let stderr = '';
149
150
  const errors = [];
150
- const shellTarget = streamShellCommand(command, options.cwd, options.shell, options.env, options.hookUpToConsole);
151
+ const shellTarget = streamShellCommand(command, {
152
+ cwd: options.cwd,
153
+ shell: options.shell,
154
+ env: options.env,
155
+ hookUpToConsole: options.hookUpToConsole,
156
+ });
151
157
  shellTarget.listen(ShellStdoutEvent, ({ detail: chunk }) => {
152
158
  if (options.stdoutCallback) {
153
159
  void options.stdoutCallback(chunk.toString(), shellTarget.childProcess);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@augment-vir/node",
3
- "version": "31.73.4",
3
+ "version": "32.0.0",
4
4
  "description": "A collection of augments, helpers types, functions, and classes only for Node.js (backend) JavaScript environments.",
5
5
  "keywords": [
6
6
  "augment",
@@ -38,9 +38,9 @@
38
38
  "test:update": "npm test"
39
39
  },
40
40
  "dependencies": {
41
- "@augment-vir/assert": "^31.73.4",
42
- "@augment-vir/common": "^31.73.4",
43
- "@date-vir/duration": "^8.5.0",
41
+ "@augment-vir/assert": "^32.0.0",
42
+ "@augment-vir/common": "^32.0.0",
43
+ "@date-vir/duration": "^8.6.1",
44
44
  "ansi-styles": "^6.2.3",
45
45
  "sanitize-filename": "^1.6.4",
46
46
  "terminate": "^2.8.0",
@@ -49,8 +49,8 @@
49
49
  "typed-event-target": "^4.3.1"
50
50
  },
51
51
  "devDependencies": {
52
- "@augment-vir/test": "^31.73.4",
53
- "@types/node": "^25.9.3",
52
+ "@augment-vir/test": "^32.0.0",
53
+ "@types/node": "^26.0.1",
54
54
  "@web/dev-server-esbuild": "^1.0.5",
55
55
  "@web/test-runner": "^0.20.2",
56
56
  "@web/test-runner-playwright": "^0.11.1",