@williamthorsen/nmr 0.30.0 → 0.31.0

package/dist/esm/reportCliFailure.d.ts

@@ -0,0 +1,2 @@
+import type { Writable } from 'node:stream';
+export declare function reportCliFailure(error: unknown, stderr: Writable): void;

package/dist/esm/reportCliFailure.js

@@ -0,0 +1,11 @@
+import { reportError } from '@williamthorsen/nmr-core';
+import { describeError } from '@williamthorsen/toolbelt.errors';
+import { UserError } from "./UserError.js";
+export function reportCliFailure(error, stderr) {
+    if (error instanceof UserError) {
+        reportError(error.message, stderr);
+        return;
+    }
+    const detail = error instanceof Error && error.stack !== undefined ? error.stack : describeError(error);
+    stderr.write(`${detail}\n`);
+}

package/dist/esm/resolve-scripts.d.ts

@@ -1,4 +1,4 @@
 import type { ScriptRegistry } from './default-scripts.js';
-export type { ScriptRegistry, ScriptValue } from './default-scripts.js';
+export type { ScriptRegistry, ScriptValue, StepSpec } from './default-scripts.js';
 export declare function getDefaultWorkspaceScripts(): ScriptRegistry;
 export declare function getDefaultRootScripts(): ScriptRegistry;

package/dist/esm/resolver.d.ts

@@ -3,8 +3,16 @@ import type { Step } from './steps.js';
 import type { NmrConfig } from './types.js';
 export declare function applyDevBin(command: string, devBin: Record<string, string> | undefined, monorepoRoot: string): string;
 export declare function applyDevBinToSteps(steps: readonly Step[], devBin: Record<string, string> | undefined, monorepoRoot: string): readonly Step[];
+export type ScriptOrigin = {
+    tier: 'registry';
+    key: string;
+} | {
+    tier: 'package';
+    file: string;
+    key: string;
+};
 export interface ResolvedScript {
-    source: 'default' | 'package';
+    origin: ScriptOrigin;
     steps: readonly Step[];
 }
 export declare function expandScript(script: ScriptValue, workspaceRoot: boolean): readonly Step[];

package/dist/esm/resolver.js

@@ -1,5 +1,6 @@
 import { readFileSync } from 'node:fs';
 import path from 'node:path';
+import { parsePackageJson, readScriptRecord, resolvePackageJsonPath } from "./helpers/package-json.js";
 import { isObject } from "./helpers/type-guards.js";
 import { getDefaultRootScripts, getDefaultWorkspaceScripts } from "./resolve-scripts.js";
 import { composeNmrStep } from "./steps.js";
@@ -41,26 +42,24 @@ export function expandScript(script, workspaceRoot) {
     if (typeof script === 'string') {
         return [{ kind: 'opaque', command: script }];
     }
-    return script.map((element) => composeNmrStep(element, workspaceRoot));
+    return script.map((element) => typeof element === 'string'
+        ? composeNmrStep(element, workspaceRoot)
+        : composeNmrStep(element.run, workspaceRoot, element.declinesArgs));
 }
 export function describeScript(script) {
-    return typeof script === 'string' ? script : `[${script.join(', ')}]`;
+    return typeof script === 'string' ? script : `[${script.map(describeElement).join(', ')}]`;
+}
+function describeElement(element) {
+    if (typeof element === 'string') {
+        return element;
+    }
+    return element.declinesArgs === true ? `${element.run} (no args)` : element.run;
 }
 export function readPackageJsonScripts(packageDir) {
+    const file = resolvePackageJsonPath(packageDir);
+    let raw;
     try {
-        const raw = readFileSync(path.join(packageDir, 'package.json'), 'utf8');
-        const parsed = JSON.parse(raw);
-        if (!isObject(parsed))
-            return undefined;
-        const scripts = parsed['scripts'];
-        if (!isObject(scripts))
-            return undefined;
-        const result = {};
-        for (const [key, val] of Object.entries(scripts)) {
-            if (typeof val === 'string')
-                result[key] = val;
-        }
-        return result;
+        raw = readFileSync(file, 'utf8');
     }
     catch (error) {
         if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
@@ -68,6 +67,13 @@ export function readPackageJsonScripts(packageDir) {
         }
         throw error;
     }
+    const parsed = parsePackageJson(raw, file);
+    if (!isObject(parsed))
+        return undefined;
+    const scripts = parsed['scripts'];
+    if (!isObject(scripts))
+        return undefined;
+    return readScriptRecord(packageDir, scripts);
 }
 export function buildWorkspaceRegistry(config) {
     return {
@@ -91,7 +97,10 @@ export function resolveScript(commandName, registry, packageDir, workspaceRoot)
         if (pkgScripts && Object.hasOwn(pkgScripts, commandName)) {
             const override = pkgScripts[commandName];
             if (override !== undefined && !isSelfReferential(override, commandName)) {
-                return { source: 'package', steps: [{ kind: 'opaque', command: override }] };
+                return {
+                    origin: { tier: 'package', file: resolvePackageJsonPath(packageDir), key: commandName },
+                    steps: [{ kind: 'opaque', command: override }],
+                };
             }
         }
     }
@@ -102,5 +111,5 @@ export function resolveScript(commandName, registry, packageDir, workspaceRoot)
     if (registryEntry === undefined) {
         return undefined;
     }
-    return { source: 'default', steps: expandScript(registryEntry, workspaceRoot) };
+    return { origin: { tier: 'registry', key: commandName }, steps: expandScript(registryEntry, workspaceRoot) };
 }