@ryanatkn/gro 0.147.1 → 0.149.0

package/src/lib/task.ts

@@ -95,40 +95,40 @@ export interface Found_Task {
 }
 
 export interface Found_Tasks {
-	resolved_input_files: Resolved_Input_File[];
-	resolved_input_files_by_root_dir: Map<Path_Id, Resolved_Input_File[]>;
-	resolved_input_paths: Resolved_Input_Path[];
-	input_paths: Input_Path[];
-	task_root_dirs: Path_Id[];
+	resolved_input_files: Array<Resolved_Input_File>;
+	resolved_input_files_by_root_dir: Map<Path_Id, Array<Resolved_Input_File>>;
+	resolved_input_paths: Array<Resolved_Input_Path>;
+	input_paths: Array<Input_Path>;
+	task_root_dirs: Array<Path_Id>;
 }
 
 export type Find_Tasks_Result = Result<{value: Found_Tasks}, Find_Modules_Failure>;
 export type Find_Modules_Failure =
 	| {
 			type: 'unmapped_input_paths';
-			unmapped_input_paths: Input_Path[];
-			resolved_input_paths: Resolved_Input_Path[];
-			input_paths: Input_Path[];
-			task_root_dirs: Path_Id[];
-			reasons: string[];
+			unmapped_input_paths: Array<Input_Path>;
+			resolved_input_paths: Array<Resolved_Input_Path>;
+			input_paths: Array<Input_Path>;
+			task_root_dirs: Array<Path_Id>;
+			reasons: Array<string>;
 	  }
 	| {
 			type: 'input_directories_with_no_files';
-			input_directories_with_no_files: Input_Path[];
-			resolved_input_files: Resolved_Input_File[];
-			resolved_input_files_by_root_dir: Map<Path_Id, Resolved_Input_File[]>;
-			resolved_input_paths: Resolved_Input_Path[];
-			input_paths: Input_Path[];
-			task_root_dirs: Path_Id[];
-			reasons: string[];
+			input_directories_with_no_files: Array<Input_Path>;
+			resolved_input_files: Array<Resolved_Input_File>;
+			resolved_input_files_by_root_dir: Map<Path_Id, Array<Resolved_Input_File>>;
+			resolved_input_paths: Array<Resolved_Input_Path>;
+			input_paths: Array<Input_Path>;
+			task_root_dirs: Array<Path_Id>;
+			reasons: Array<string>;
 	  };
 
 /**
  * Finds modules from input paths. (see `src/lib/input_path.ts` for more)
  */
 export const find_tasks = (
-	input_paths: Input_Path[],
-	task_root_dirs: Path_Id[],
+	input_paths: Array<Input_Path>,
+	task_root_dirs: Array<Path_Id>,
 	config: Gro_Config,
 	timings?: Timings,
 ): Find_Tasks_Result => {
@@ -197,7 +197,7 @@ export const find_tasks = (
 };
 
 export interface Loaded_Tasks {
-	modules: Task_Module_Meta[];
+	modules: Array<Task_Module_Meta>;
 	found_tasks: Found_Tasks;
 }
 

package/src/lib/task_logging.ts

@@ -12,7 +12,7 @@ export const log_tasks = (log: Logger, loaded_tasks: Loaded_Tasks, log_intro = t
 	const {modules, found_tasks} = loaded_tasks;
 	const {resolved_input_files_by_root_dir} = found_tasks;
 
-	const logged: string[] = [];
+	const logged: Array<string> = [];
 	if (log_intro) {
 		logged.unshift(
 			`\n\n${st('gray', 'Run a task:')} gro [name]`,
@@ -44,7 +44,7 @@ export const log_tasks = (log: Logger, loaded_tasks: Loaded_Tasks, log_intro = t
 	log[log_intro ? 'info' : 'plain'](logged.join('') + '\n');
 };
 
-export const log_error_reasons = (log: Logger, reasons: string[]): void => {
+export const log_error_reasons = (log: Logger, reasons: Array<string>): void => {
 	for (const reason of reasons) {
 		log.error(st('red', reason));
 	}
@@ -57,7 +57,7 @@ export const log_task_help = (log: Logger, meta: Task_Module_Meta): void => {
 		name,
 		mod: {task},
 	} = meta;
-	const logged: string[] = [];
+	const logged: Array<string> = [];
 	logged.push(
 		st('cyan', name),
 		'help',
@@ -93,7 +93,7 @@ interface Arg_Schema_Property {
 	schema: Arg_Schema;
 }
 
-const to_arg_properties = (def: ZodTypeDef, meta: Task_Module_Meta): Arg_Schema_Property[] => {
+const to_arg_properties = (def: ZodTypeDef, meta: Task_Module_Meta): Array<Arg_Schema_Property> => {
 	const type_name = to_type_name(def);
 	if (type_name !== ZodFirstPartyTypeKind.ZodObject) {
 		throw Error(
@@ -101,7 +101,7 @@ const to_arg_properties = (def: ZodTypeDef, meta: Task_Module_Meta): Arg_Schema_
 		);
 	}
 	const shape = (def as ZodObjectDef).shape();
-	const properties: Arg_Schema_Property[] = [];
+	const properties: Array<Arg_Schema_Property> = [];
 	for (const name in shape) {
 		if ('no-' + name in shape) continue;
 		const s = shape[name];
@@ -115,7 +115,7 @@ const to_arg_properties = (def: ZodTypeDef, meta: Task_Module_Meta): Arg_Schema_
 	return properties;
 };
 
-const to_max_length = <T>(items: T[], toString: (item: T) => string) =>
+const to_max_length = <T>(items: Array<T>, toString: (item: T) => string) =>
 	items.reduce((max, m) => Math.max(toString(m).length, max), 0);
 
 // The following Zod helpers only need to support single-depth schemas for CLI args,
@@ -131,11 +131,11 @@ const to_args_schema_type = ({_def}: ZodTypeAny): Arg_Schema['type'] => {
 		case ZodFirstPartyTypeKind.ZodNumber:
 			return 'number';
 		case ZodFirstPartyTypeKind.ZodArray:
-			return 'string[]'; // TODO support arrays of arbitrary types, or more hardcoded ones as needed
+			return 'Array<string>'; // TODO support arrays of arbitrary types, or more hardcoded ones as needed
 		case ZodFirstPartyTypeKind.ZodEnum:
 			return _def.values.map((v: string) => `'${v}'`).join(' | ');
 		case ZodFirstPartyTypeKind.ZodUnion:
-			return 'string | string[]'; // TODO support unions of arbitrary types, or more hardcoded ones as needed
+			return 'string | Array<string>'; // TODO support unions of arbitrary types, or more hardcoded ones as needed
 		default: {
 			const subschema = to_subschema(_def);
 			if (subschema) {

package/src/lib/typecheck.task.ts

@@ -3,8 +3,10 @@ import {z} from 'zod';
 
 import {Task_Error, type Task} from './task.js';
 import {serialize_args, to_forwarded_args} from './args.js';
-import {find_cli, spawn_cli} from './cli.js';
+import {find_cli, spawn_cli, spawn_cli_process} from './cli.js';
 import {SVELTE_CHECK_CLI, sveltekit_sync_if_available} from './sveltekit_helpers.js';
+import {configure_colored_output_with_path_replacement} from './child_process_logging.js';
+import {paths} from './paths.js';
 
 export const Args = z
 	.object({
@@ -14,6 +16,10 @@ export const Args = z
 		typescript_cli: z
 			.string({description: 'the TypeScript CLI to use as a fallback to svelte-check'})
 			.default('tsc'),
+		path_replacement: z
+			.string({description: 'replacement string for current working directory in output'})
+			.default('.'),
+		cwd: z.string({description: 'current working directory'}).default(paths.root),
 	})
 	.strict();
 export type Args = z.infer<typeof Args>;
@@ -22,7 +28,7 @@ export const task: Task<Args> = {
 	summary: 'run tsc on the project without emitting any files',
 	Args,
 	run: async ({args, log}): Promise<void> => {
-		const {svelte_check_cli, typescript_cli} = args;
+		const {svelte_check_cli, typescript_cli, path_replacement, cwd} = args;
 
 		await sveltekit_sync_if_available();
 
@@ -30,10 +36,23 @@ export const task: Task<Args> = {
 		const found_svelte_check_cli = find_cli(svelte_check_cli);
 		if (found_svelte_check_cli) {
 			const serialized = serialize_args(to_forwarded_args(svelte_check_cli));
-			const svelte_check_result = await spawn_cli(found_svelte_check_cli, serialized, log);
-			if (!svelte_check_result?.ok) {
-				throw new Task_Error(`Failed to typecheck. ${print_spawn_result(svelte_check_result!)}`);
+			const spawned = spawn_cli_process(found_svelte_check_cli, serialized, undefined, {
+				stdio: ['inherit', 'pipe', 'pipe'],
+				env: {...process.env, FORCE_COLOR: '1'}, // Needed for colors (maybe make an option)
+			});
+
+			const svelte_check_process = spawned?.child;
+			if (svelte_check_process) {
+				// Configure process output with path replacement while preserving colors
+				configure_colored_output_with_path_replacement(svelte_check_process, path_replacement, cwd);
+
+				const svelte_check_result = await spawned.closed;
+
+				if (!svelte_check_result.ok) {
+					throw new Task_Error(`Failed to typecheck. ${print_spawn_result(svelte_check_result)}`);
+				}
 			}
+
 			return;
 		}
 

package/src/lib/upgrade.task.ts

@@ -79,7 +79,7 @@ const CUSTOM_TAG_MATCHER = /^[\^~><=]*.+-(.+)/;
 
 // TODO hacky and limited
 // TODO probably want to pass through exact deps as well, e.g. @foo/bar@1
-const to_upgrade_items = (deps: Package_Json_Dep[]): string[] =>
+const to_upgrade_items = (deps: Array<Package_Json_Dep>): Array<string> =>
 	deps.map((dep) => {
 		if (EXACT_VERSION_MATCHER.test(dep.name)) {
 			return dep.name;