@apollion-dsi/scripts 0.9.0 → 0.9.2

package/src/command/lint.ts

@@ -1,30 +1,26 @@
 import spawn from 'cross-spawn';
 
+import { buildWrapperArgs } from '../utils/buildWrapperArgs';
 import { resolveBin } from '../utils/resolveBin';
 
 /**
- * `scripts lint` — ESLint over `src` with `--quiet`. ESLint 9 flat
- * config uses `eslint.config.js#files` for filtering (no `--ext`).
+ * `scripts lint` — ESLint over `src`. ESLint 9 flat config uses
+ * `eslint.config.js#files` for filtering (no `--ext`).
  *
- * If the consumer passes any path-like arg, they own the invocation
- * entirely. Flag-only invocations (e.g. `scripts lint --fix`) keep the
- * default `src` target so the common case Just Works.
+ * Flag args pass through; the default `src` target is always appended
+ * so the common case (`scripts lint --fix`, `scripts lint
+ * --max-warnings 0`, `scripts lint -- --fix`) Just Works. Consumers
+ * that need a different target should call `eslint` directly from
+ * `node_modules/.bin`.
  */
 const eslintBin = resolveBin('eslint');
 
 const userArgs = process.argv.slice(2);
 
-const userProvidedPath = userArgs.some((a) => !a.startsWith('-'));
-
-let args: string[];
-
-if (userArgs.length === 0) {
-  args = ['src', '--quiet'];
-} else if (userProvidedPath) {
-  args = userArgs;
-} else {
-  args = [...userArgs, 'src'];
-}
+const args = buildWrapperArgs(userArgs, {
+  defaults: ['src', '--quiet'],
+  target: 'src',
+});
 
 const result = spawn.sync(process.execPath, [eslintBin, ...args], { stdio: 'inherit' });
 

package/src/command/prettier.ts

@@ -1,13 +1,15 @@
 import spawn from 'cross-spawn';
 
+import { buildWrapperArgs } from '../utils/buildWrapperArgs';
 import { resolveBin } from '../utils/resolveBin';
 
 /**
  * `scripts prettier` — `--check` over `src/**\/*.{ts,tsx,json,css,md}`.
  *
- * Flag-only user args (e.g. `scripts prettier --write`) keep the default
- * glob so `--write` is enough. A path-like arg switches to fully
- * user-controlled invocation.
+ * Flag args pass through; the default glob is always appended so
+ * `scripts prettier --write` Just Works. Consumers that need a
+ * different target should call `prettier` directly from
+ * `node_modules/.bin`.
  */
 const prettierBin = resolveBin('prettier');
 
@@ -15,17 +17,10 @@ const DEFAULT_GLOB = 'src/**/*.{ts,tsx,json,css,md}';
 
 const userArgs = process.argv.slice(2);
 
-const userProvidedPath = userArgs.some((a) => !a.startsWith('-'));
-
-let args: string[];
-
-if (userArgs.length === 0) {
-  args = ['--check', DEFAULT_GLOB];
-} else if (userProvidedPath) {
-  args = userArgs;
-} else {
-  args = [...userArgs, DEFAULT_GLOB];
-}
+const args = buildWrapperArgs(userArgs, {
+  defaults: ['--check', DEFAULT_GLOB],
+  target: DEFAULT_GLOB,
+});
 
 const result = spawn.sync(process.execPath, [prettierBin, ...args], { stdio: 'inherit' });
 

package/src/utils/buildWrapperArgs.ts

@@ -0,0 +1,37 @@
+/**
+ * Build the argv passed to an underlying CLI (eslint, prettier) for a
+ * `scripts <cmd>` wrapper, from the user-provided argv.
+ *
+ * - Empty input → `defaults` verbatim (the canonical no-args
+ *   invocation, e.g. `['src', '--quiet']` for lint).
+ * - Non-empty input → user args (with the POSIX `--` end-of-options
+ *   marker removed) followed by `target`.
+ *
+ * The previous heuristic tried to detect "user-provided path" by
+ * scanning for any argv entry not starting with `-`, then handed full
+ * control to the user. That broke two real consumer invocations:
+ *
+ * 1. `scripts lint --max-warnings 0` — the `0` value of the flag was
+ *    misread as a path, so `src` was dropped and ESLint ran with no
+ *    files.
+ * 2. `scripts lint -- --fix` — every arg started with `-`, so `src`
+ *    was appended, but the surviving `--` separator forced ESLint to
+ *    treat `--fix` and `src` as positional files.
+ *
+ * The wrapper is intentionally narrow: pass flags, get the default
+ * target. Consumers that need a non-default target should invoke the
+ * underlying CLI directly (`node_modules/.bin/eslint <path>`).
+ *
+ * @param userArgs - argv after `scripts <cmd>` (i.e. `process.argv.slice(2)`).
+ * @param options.defaults - argv to use when `userArgs` is empty.
+ * @param options.target - path/glob appended after user flags otherwise.
+ */
+export function buildWrapperArgs(userArgs: string[], options: { defaults: string[]; target: string }): string[] {
+  if (userArgs.length === 0) {
+    return [...options.defaults];
+  }
+
+  const passthrough = userArgs.filter((a) => a !== '--');
+
+  return [...passthrough, options.target];
+}