@ryanatkn/gro 0.189.2 → 0.189.3

package/dist/format.task.d.ts

@@ -2,6 +2,7 @@ import { z } from 'zod';
 import { type Task } from './task.ts';
 /** @nodocs */
 export declare const Args: z.ZodObject<{
+    _: z.ZodOptional<z.ZodArray<z.ZodString>>;
     check: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strict>;
 export type Args = z.infer<typeof Args>;

package/dist/format.task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/format.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAY,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAI/C,cAAc;AACd,eAAO,MAAM,IAAI;;kBAKf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAqB3B,CAAC"}
+{"version":3,"file":"format.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/format.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAMtB,OAAO,EAAY,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/C,cAAc;AACd,eAAO,MAAM,IAAI;;;kBAMf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAuB3B,CAAC"}

package/dist/format.task.js

@@ -1,10 +1,13 @@
 import { print_spawn_result } from '@fuzdev/fuz_util/process.js';
 import { z } from 'zod';
-import { TaskError } from "./task.js";
+import { to_implicit_forwarded_args } from "./args.js";
+import { PRETTIER_CLI_DEFAULT } from "./constants.js";
 import { format_directory } from "./format_directory.js";
 import { paths } from "./paths.js";
+import { TaskError } from "./task.js";
 /** @nodocs */
 export const Args = z.strictObject({
+    _: z.array(z.string()).meta({ description: 'files or directories to format' }).optional(),
     check: z
         .boolean()
         .meta({ description: 'exit with a nonzero code if any files are unformatted' })
@@ -15,9 +18,8 @@ export const task = {
     summary: 'format source files',
     Args,
     run: async ({ args, log, config }) => {
-        const { check } = args;
-        // TODO forward prettier args
-        const format_result = await format_directory(log, paths.source, check, undefined, undefined, undefined, config.pm_cli);
+        const { _: patterns, check } = args;
+        const format_result = await format_directory(log, paths.source, check, undefined, undefined, undefined, config.pm_cli, to_implicit_forwarded_args(PRETTIER_CLI_DEFAULT), patterns);
         if (!format_result.ok) {
             throw new TaskError(`Failed ${check ? 'formatting check' : 'to format'}. ${print_spawn_result(format_result)}`);
         }

package/dist/format_directory.d.ts

@@ -1,11 +1,13 @@
+import { type Args } from '@fuzdev/fuz_util/args.js';
 import type { Logger } from '@fuzdev/fuz_util/log.js';
 import type { SpawnResult } from '@fuzdev/fuz_util/process.js';
 import { type Cli } from './cli.ts';
 /**
- * Formats a directory on the filesystem.
- * If the source directory is given, it also formats all of the root directory files.
+ * Formats files on the filesystem.
+ * When `patterns` is provided, formats those specific files/patterns.
+ * Otherwise formats `dir` with default extensions, plus root files if `dir` is `paths.source`.
  * This is separated from `./format_file` to avoid importing all of the `prettier` code
  * inside modules that import this one. (which has a nontrivial cost)
  */
-export declare const format_directory: (log: Logger, dir: string, check?: boolean, extensions?: string, root_paths?: string, prettier_cli?: string | Cli, pm_cli?: string) => Promise<SpawnResult>;
+export declare const format_directory: (log: Logger, dir: string, check?: boolean, extensions?: string, root_paths?: string, prettier_cli?: string | Cli, pm_cli?: string, additional_args?: Args, patterns?: Array<string>) => Promise<SpawnResult>;
 //# sourceMappingURL=format_directory.d.ts.map

package/dist/format_directory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format_directory.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/format_directory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAG7D,OAAO,EAAyB,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAuB1D;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC5B,KAAK,MAAM,EACX,KAAK,MAAM,EACX,eAAa,EACb,mBAA+B,EAC/B,mBAA+B,EAC/B,eAAc,MAAM,GAAG,GAA0B,EACjD,SAAQ,MAAuB,KAC7B,OAAO,CAAC,WAAW,CAcrB,CAAC"}
+{"version":3,"file":"format_directory.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/format_directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,IAAI,EAAC,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAyB,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAuB1D;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC5B,KAAK,MAAM,EACX,KAAK,MAAM,EACX,eAAa,EACb,mBAA+B,EAC/B,mBAA+B,EAC/B,eAAc,MAAM,GAAG,GAA0B,EACjD,SAAQ,MAAuB,EAC/B,kBAAkB,IAAI,EACtB,WAAW,KAAK,CAAC,MAAM,CAAC,KACtB,OAAO,CAAC,WAAW,CAoBrB,CAAC"}

package/dist/format_directory.js

@@ -1,5 +1,4 @@
 import { args_serialize } from '@fuzdev/fuz_util/args.js';
-import { to_forwarded_args } from "./args.js";
 import { spawn_cli, to_cli_name } from "./cli.js";
 import { GITHUB_DIRNAME, README_FILENAME, SVELTE_CONFIG_FILENAME, VITE_CONFIG_FILENAME, TSCONFIG_FILENAME, GRO_CONFIG_FILENAME, PM_CLI_DEFAULT, PRETTIER_CLI_DEFAULT, } from "./constants.js";
 import { paths } from "./paths.js";
@@ -13,18 +12,26 @@ const ROOT_PATHS_DEFAULT = `${[
     GITHUB_DIRNAME,
 ].join(',')}/**/*`;
 /**
- * Formats a directory on the filesystem.
- * If the source directory is given, it also formats all of the root directory files.
+ * Formats files on the filesystem.
+ * When `patterns` is provided, formats those specific files/patterns.
+ * Otherwise formats `dir` with default extensions, plus root files if `dir` is `paths.source`.
  * This is separated from `./format_file` to avoid importing all of the `prettier` code
  * inside modules that import this one. (which has a nontrivial cost)
  */
-export const format_directory = async (log, dir, check = false, extensions = EXTENSIONS_DEFAULT, root_paths = ROOT_PATHS_DEFAULT, prettier_cli = PRETTIER_CLI_DEFAULT, pm_cli = PM_CLI_DEFAULT) => {
-    const forwarded_args = to_forwarded_args(to_cli_name(prettier_cli));
-    forwarded_args[check ? 'check' : 'write'] = true;
+export const format_directory = async (log, dir, check = false, extensions = EXTENSIONS_DEFAULT, root_paths = ROOT_PATHS_DEFAULT, prettier_cli = PRETTIER_CLI_DEFAULT, pm_cli = PM_CLI_DEFAULT, additional_args, patterns) => {
+    const forwarded_args = { ...additional_args };
+    if (forwarded_args.check === undefined && forwarded_args.write === undefined) {
+        forwarded_args[check ? 'check' : 'write'] = true;
+    }
     const serialized_args = args_serialize(forwarded_args);
-    serialized_args.push(`${dir}**/*.{${extensions}}`);
-    if (dir === paths.source) {
-        serialized_args.push(`${paths.root}{${root_paths}}`);
+    if (patterns?.length) {
+        serialized_args.push(...patterns);
+    }
+    else {
+        serialized_args.push(`${dir}**/*.{${extensions}}`);
+        if (dir === paths.source) {
+            serialized_args.push(`${paths.root}{${root_paths}}`);
+        }
     }
     const spawned = await spawn_cli(prettier_cli, serialized_args, log);
     if (!spawned)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.189.2",
+  "version": "0.189.3",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",

package/src/lib/format.task.ts

@@ -1,12 +1,15 @@
 import {print_spawn_result} from '@fuzdev/fuz_util/process.js';
 import {z} from 'zod';
 
-import {TaskError, type Task} from './task.ts';
+import {to_implicit_forwarded_args} from './args.ts';
+import {PRETTIER_CLI_DEFAULT} from './constants.ts';
 import {format_directory} from './format_directory.ts';
 import {paths} from './paths.ts';
+import {TaskError, type Task} from './task.ts';
 
 /** @nodocs */
 export const Args = z.strictObject({
+	_: z.array(z.string()).meta({description: 'files or directories to format'}).optional(),
 	check: z
 		.boolean()
 		.meta({description: 'exit with a nonzero code if any files are unformatted'})
@@ -19,8 +22,8 @@ export const task: Task<Args> = {
 	summary: 'format source files',
 	Args,
 	run: async ({args, log, config}) => {
-		const {check} = args;
-		// TODO forward prettier args
+		const {_: patterns, check} = args;
+
 		const format_result = await format_directory(
 			log,
 			paths.source,
@@ -29,6 +32,8 @@ export const task: Task<Args> = {
 			undefined,
 			undefined,
 			config.pm_cli,
+			to_implicit_forwarded_args(PRETTIER_CLI_DEFAULT),
+			patterns,
 		);
 		if (!format_result.ok) {
 			throw new TaskError(

package/src/lib/format_directory.ts

@@ -1,8 +1,7 @@
-import {args_serialize} from '@fuzdev/fuz_util/args.js';
+import {args_serialize, type Args} from '@fuzdev/fuz_util/args.js';
 import type {Logger} from '@fuzdev/fuz_util/log.js';
 import type {SpawnResult} from '@fuzdev/fuz_util/process.js';
 
-import {to_forwarded_args} from './args.ts';
 import {spawn_cli, to_cli_name, type Cli} from './cli.ts';
 import {
 	GITHUB_DIRNAME,
@@ -27,8 +26,9 @@ const ROOT_PATHS_DEFAULT = `${[
 ].join(',')}/**/*`;
 
 /**
- * Formats a directory on the filesystem.
- * If the source directory is given, it also formats all of the root directory files.
+ * Formats files on the filesystem.
+ * When `patterns` is provided, formats those specific files/patterns.
+ * Otherwise formats `dir` with default extensions, plus root files if `dir` is `paths.source`.
  * This is separated from `./format_file` to avoid importing all of the `prettier` code
  * inside modules that import this one. (which has a nontrivial cost)
  */
@@ -40,13 +40,21 @@ export const format_directory = async (
 	root_paths = ROOT_PATHS_DEFAULT,
 	prettier_cli: string | Cli = PRETTIER_CLI_DEFAULT,
 	pm_cli: string = PM_CLI_DEFAULT,
+	additional_args?: Args,
+	patterns?: Array<string>,
 ): Promise<SpawnResult> => {
-	const forwarded_args = to_forwarded_args(to_cli_name(prettier_cli));
-	forwarded_args[check ? 'check' : 'write'] = true;
+	const forwarded_args = {...additional_args};
+	if (forwarded_args.check === undefined && forwarded_args.write === undefined) {
+		forwarded_args[check ? 'check' : 'write'] = true;
+	}
 	const serialized_args = args_serialize(forwarded_args);
-	serialized_args.push(`${dir}**/*.{${extensions}}`);
-	if (dir === paths.source) {
-		serialized_args.push(`${paths.root}{${root_paths}}`);
+	if (patterns?.length) {
+		serialized_args.push(...patterns);
+	} else {
+		serialized_args.push(`${dir}**/*.{${extensions}}`);
+		if (dir === paths.source) {
+			serialized_args.push(`${paths.root}{${root_paths}}`);
+		}
 	}
 	const spawned = await spawn_cli(prettier_cli, serialized_args, log);
 	if (!spawned)