@ryanatkn/gro 0.148.0 → 0.149.0

package/dist/typecheck.task.js

@@ -2,8 +2,10 @@ import { print_spawn_result } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
 import { Task_Error } 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({
     svelte_check_cli: z
@@ -12,21 +14,34 @@ 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 const task = {
     summary: 'run tsc on the project without emitting any files',
     Args,
     run: async ({ args, log }) => {
-        const { svelte_check_cli, typescript_cli } = args;
+        const { svelte_check_cli, typescript_cli, path_replacement, cwd } = args;
         await sveltekit_sync_if_available();
         // Prefer svelte-check if available.
         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/dist/upgrade.task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAMhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;EAeP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA+C3B,CAAC"}
+{"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAMhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;EAeP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA+C3B,CAAC"}

package/dist/watch_dir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch_dir.d.ts","sourceRoot":"../src/lib/","sources":["watch_dir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,eAAe,EAAiB,MAAM,UAAU,CAAC;AAKrE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAI3C,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAC9D,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,uBAAuB,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,oDAMnB,iBAAiB,KAAG,aA6CtB,CAAC"}
+{"version":3,"file":"watch_dir.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/watch_dir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,eAAe,EAAiB,MAAM,UAAU,CAAC;AAKrE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAI3C,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAC9D,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,uBAAuB,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,iDAMvB,iBAAiB,KAAG,aA6CtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.148.0",
+  "version": "0.149.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -32,7 +32,7 @@
   },
   "type": "module",
   "engines": {
-    "node": ">=20.17"
+    "node": ">=22.11"
   },
   "bin": {
     "gro": "dist/gro.js"
@@ -49,40 +49,40 @@
     "typescript"
   ],
   "dependencies": {
-    "@ryanatkn/belt": "^0.29.0",
-    "chokidar": "^4.0.1",
-    "dotenv": "^16.4.5",
-    "esm-env": "^1.1.4",
+    "@ryanatkn/belt": "^0.30.0",
+    "chokidar": "^4.0.3",
+    "dotenv": "^16.4.7",
+    "esm-env": "^1.2.2",
     "mri": "^1.2.0",
-    "oxc-parser": "^0.36.0",
-    "prettier": "^3.3.3",
-    "prettier-plugin-svelte": "^3.2.8",
-    "ts-morph": "^24.0.0",
+    "oxc-parser": "^0.62.0",
+    "prettier": "^3.5.3",
+    "prettier-plugin-svelte": "^3.3.3",
+    "ts-morph": "^25.0.1",
     "tslib": "^2.8.1",
-    "zod": "^3.23.8"
+    "zod": "^3.24.2"
   },
   "peerDependencies": {
-    "esbuild": "^0.21.0",
+    "esbuild": "^0.25",
     "svelte": "^5"
   },
   "devDependencies": {
-    "@changesets/changelog-git": "^0.2.0",
-    "@changesets/types": "^6.0.0",
-    "@ryanatkn/eslint-config": "^0.6.0",
-    "@ryanatkn/fuz": "^0.131.1",
-    "@ryanatkn/moss": "^0.20.2",
-    "@sveltejs/adapter-static": "^3.0.6",
-    "@sveltejs/kit": "^2.9.0",
-    "@sveltejs/package": "^2.3.7",
-    "@sveltejs/vite-plugin-svelte": "^4.0.1",
-    "@types/node": "^22.9.1",
-    "esbuild": "^0.21.5",
-    "eslint": "^9.16.0",
-    "eslint-plugin-svelte": "^2.46.1",
-    "svelte": "^5.8.1",
-    "svelte-check": "^4.1.1",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.17.0",
+    "@changesets/changelog-git": "^0.2.1",
+    "@changesets/types": "^6.1.0",
+    "@ryanatkn/eslint-config": "^0.8.0",
+    "@ryanatkn/fuz": "^0.135.0",
+    "@ryanatkn/moss": "^0.24.2",
+    "@sveltejs/adapter-static": "^3.0.8",
+    "@sveltejs/kit": "^2.20.4",
+    "@sveltejs/package": "^2.3.10",
+    "@sveltejs/vite-plugin-svelte": "^5.0.3",
+    "@types/node": "^22.14.0",
+    "esbuild": "^0.25.2",
+    "eslint": "^9.24.0",
+    "eslint-plugin-svelte": "^3.5.1",
+    "svelte": "^5.25.6",
+    "svelte-check": "^4.1.5",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.29.0",
     "uvu": "^0.5.6"
   },
   "prettier": {
@@ -141,6 +141,10 @@
       "types": "./dist/check.task.d.ts",
       "default": "./dist/check.task.js"
     },
+    "./child_process_logging.js": {
+      "types": "./dist/child_process_logging.d.ts",
+      "default": "./dist/child_process_logging.js"
+    },
     "./clean_fs.js": {
       "types": "./dist/clean_fs.d.ts",
       "default": "./dist/clean_fs.js"

package/src/lib/child_process_logging.ts

@@ -0,0 +1,38 @@
+import type {ChildProcess} from 'node:child_process';
+import {strip_end} from '@ryanatkn/belt/string.js';
+
+/**
+ * Maps child process output through a transform function.
+ */
+export const map_child_process_output = (
+	child_process: ChildProcess,
+	transform: (data: string) => string,
+): void => {
+	if (child_process.stdout) {
+		child_process.stdout.on('data', (data) => {
+			process.stdout.write(transform(data.toString()));
+		});
+	}
+
+	if (child_process.stderr) {
+		child_process.stderr.on('data', (data) => {
+			process.stderr.write(transform(data.toString()));
+		});
+	}
+};
+
+/**
+ * Configures process output handling with path replacements while preserving ANSI colors.
+ */
+export const configure_colored_output_with_path_replacement = (
+	child_process: ChildProcess,
+	replacement: string = '.',
+	cwd: string = process.cwd(),
+): void => {
+	// Escape special characters in the cwd for regex safety
+	const cwd_escaped = strip_end(cwd, '/').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+	const cwd_reg_exp = new RegExp(cwd_escaped, 'g');
+
+	// Use the generic mapper with a path replacement transform
+	map_child_process_output(child_process, (data) => data.replace(cwd_reg_exp, replacement));
+};

package/src/lib/constants.ts

@@ -32,6 +32,8 @@ export const TSCONFIG_FILENAME = 'tsconfig.json';
 export const TS_MATCHER = /\.(ts|tsx|mts|cts)$/;
 export const JS_MATCHER = /\.(js|jsx|mjs|cjs)$/;
 export const JSON_MATCHER = /\.json$/;
+/** Extracts the script content from Svelte files. */
+export const SVELTE_SCRIPT_MATCHER = /<script(?:\s+[^>]*)?>([\s\S]*?)<\/script>/gim; // TODO maybe this shouldnt be global? or make a getter?
 export const EVERYTHING_MATCHER = /.*/;
 
 export const JS_CLI_DEFAULT = 'node';

package/src/lib/esbuild_helpers.ts

@@ -38,7 +38,7 @@ export const to_define_import_meta_env = (
 	[import_meta_env + 'SSR']: JSON.stringify(ssr),
 	[import_meta_env + 'MODE']: JSON.stringify(mode),
 	// it appears SvelteKit's `''` translates to Vite's `'/'`, so this intentionally falls back for falsy values, not just undefined
-	[import_meta_env + 'BASE_URL']: JSON.stringify(base_url || '/'), // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
+	[import_meta_env + 'BASE_URL']: JSON.stringify(base_url || '/'),
 });
 
 export const default_ts_transform_options: esbuild.TransformOptions = {

package/src/lib/gro.ts

@@ -21,5 +21,5 @@ const loader_path = join(invoke_path, '../loader.js');
 
 const spawned = await spawn_with_loader(loader_path, invoke_path, process.argv.slice(2));
 if (!spawned.ok) {
-	process.exitCode = spawned.code || 1; // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
+	process.exitCode = spawned.code || 1;
 }

package/src/lib/gro_plugin_moss.ts

@@ -53,7 +53,7 @@ export const gro_plugin_moss = ({
 	};
 	const flush_gen_queue = throttle(
 		async () => {
-			const css = generate_classes_css(css_classes.get_sorted_array(), css_classes_by_name);
+			const css = generate_classes_css(css_classes.get(), css_classes_by_name);
 			const contents = `/* ${banner} */\n\n${css}\n\n/* ${banner} */`;
 			const output = await format_file(contents, {filepath: outfile});
 			// TODO think about using gen to implement this, would have some nice benefits like automatic change detection

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from './src_json.js';
 
 export const package_json = {
 	name: '@ryanatkn/gro',
-	version: '0.148.0',
+	version: '0.149.0',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -30,7 +30,7 @@ export const package_json = {
 		deploy: 'gro deploy',
 	},
 	type: 'module',
-	engines: {node: '>=20.17'},
+	engines: {node: '>=22.11'},
 	bin: {gro: 'dist/gro.js'},
 	keywords: [
 		'web',
@@ -44,37 +44,37 @@ export const package_json = {
 		'typescript',
 	],
 	dependencies: {
-		'@ryanatkn/belt': '^0.29.0',
-		chokidar: '^4.0.1',
-		dotenv: '^16.4.5',
-		'esm-env': '^1.1.4',
+		'@ryanatkn/belt': '^0.30.0',
+		chokidar: '^4.0.3',
+		dotenv: '^16.4.7',
+		'esm-env': '^1.2.2',
 		mri: '^1.2.0',
-		'oxc-parser': '^0.36.0',
-		prettier: '^3.3.3',
-		'prettier-plugin-svelte': '^3.2.8',
-		'ts-morph': '^24.0.0',
+		'oxc-parser': '^0.62.0',
+		prettier: '^3.5.3',
+		'prettier-plugin-svelte': '^3.3.3',
+		'ts-morph': '^25.0.1',
 		tslib: '^2.8.1',
-		zod: '^3.23.8',
+		zod: '^3.24.2',
 	},
-	peerDependencies: {esbuild: '^0.21.0', svelte: '^5'},
+	peerDependencies: {esbuild: '^0.25', svelte: '^5'},
 	devDependencies: {
-		'@changesets/changelog-git': '^0.2.0',
-		'@changesets/types': '^6.0.0',
-		'@ryanatkn/eslint-config': '^0.6.0',
-		'@ryanatkn/fuz': '^0.131.1',
-		'@ryanatkn/moss': '^0.20.2',
-		'@sveltejs/adapter-static': '^3.0.6',
-		'@sveltejs/kit': '^2.9.0',
-		'@sveltejs/package': '^2.3.7',
-		'@sveltejs/vite-plugin-svelte': '^4.0.1',
-		'@types/node': '^22.9.1',
-		esbuild: '^0.21.5',
-		eslint: '^9.16.0',
-		'eslint-plugin-svelte': '^2.46.1',
-		svelte: '^5.8.1',
-		'svelte-check': '^4.1.1',
-		typescript: '^5.7.2',
-		'typescript-eslint': '^8.17.0',
+		'@changesets/changelog-git': '^0.2.1',
+		'@changesets/types': '^6.1.0',
+		'@ryanatkn/eslint-config': '^0.8.0',
+		'@ryanatkn/fuz': '^0.135.0',
+		'@ryanatkn/moss': '^0.24.2',
+		'@sveltejs/adapter-static': '^3.0.8',
+		'@sveltejs/kit': '^2.20.4',
+		'@sveltejs/package': '^2.3.10',
+		'@sveltejs/vite-plugin-svelte': '^5.0.3',
+		'@types/node': '^22.14.0',
+		esbuild: '^0.25.2',
+		eslint: '^9.24.0',
+		'eslint-plugin-svelte': '^3.5.1',
+		svelte: '^5.25.6',
+		'svelte-check': '^4.1.5',
+		typescript: '^5.8.2',
+		'typescript-eslint': '^8.29.0',
 		uvu: '^0.5.6',
 	},
 	prettier: {
@@ -102,6 +102,10 @@ export const package_json = {
 			default: './dist/changeset.task.js',
 		},
 		'./check.task.js': {types: './dist/check.task.d.ts', default: './dist/check.task.js'},
+		'./child_process_logging.js': {
+			types: './dist/child_process_logging.d.ts',
+			default: './dist/child_process_logging.js',
+		},
 		'./clean_fs.js': {types: './dist/clean_fs.d.ts', default: './dist/clean_fs.js'},
 		'./clean.task.js': {types: './dist/clean.task.d.ts', default: './dist/clean.task.js'},
 		'./cli.js': {types: './dist/cli.d.ts', default: './dist/cli.js'},
@@ -265,7 +269,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.148.0',
+	version: '0.149.0',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -334,6 +338,13 @@ export const src_json = {
 				{name: 'task', kind: 'variable'},
 			],
 		},
+		'./child_process_logging.js': {
+			path: 'child_process_logging.ts',
+			declarations: [
+				{name: 'map_child_process_output', kind: 'function'},
+				{name: 'configure_colored_output_with_path_replacement', kind: 'function'},
+			],
+		},
 		'./clean_fs.js': {path: 'clean_fs.ts', declarations: [{name: 'clean_fs', kind: 'function'}]},
 		'./clean.task.js': {
 			path: 'clean.task.ts',
@@ -387,6 +398,7 @@ export const src_json = {
 				{name: 'TS_MATCHER', kind: 'variable'},
 				{name: 'JS_MATCHER', kind: 'variable'},
 				{name: 'JSON_MATCHER', kind: 'variable'},
+				{name: 'SVELTE_SCRIPT_MATCHER', kind: 'variable'},
 				{name: 'EVERYTHING_MATCHER', kind: 'variable'},
 				{name: 'JS_CLI_DEFAULT', kind: 'variable'},
 				{name: 'PM_CLI_DEFAULT', kind: 'variable'},

package/src/lib/parse_imports.ts

@@ -1,13 +1,35 @@
-import {moduleLexerSync} from 'oxc-parser';
+import {parseSync, type ImportDeclaration} from 'oxc-parser';
 import type {Flavored} from '@ryanatkn/belt/types.js';
+import {Unreachable_Error} from '@ryanatkn/belt/error.js';
 
 import type {Path_Id} from './path.js';
 import {SVELTE_MATCHER} from './svelte_helpers.js';
-import {JS_MATCHER, TS_MATCHER} from './constants.js';
+import {JS_MATCHER, TS_MATCHER, SVELTE_SCRIPT_MATCHER} from './constants.js';
 
 export type Import_Specifier = Flavored<string, 'Import_Specifier'>;
 
-const script_matcher = /<script.*?>(.*?)<\/script>/gimsu;
+// TODO this is probably way more complicated that it should be, maybe report the issues upstream unless I made a mistake here
+
+/**
+ * Extracts the string value from a module request, handling different quote styles.
+ * Returns null if the value is not a valid string literal.
+ */
+const extract_string_literal = (content: string, start: number, end: number): string | null => {
+	const value = content.substring(start, end);
+
+	// Check if it's a string literal (starts and ends with quotes)
+	if (
+		(value.startsWith("'") && value.endsWith("'")) ||
+		(value.startsWith('"') && value.endsWith('"')) ||
+		(value.startsWith('`') && value.endsWith('`'))
+	) {
+		// Remove the quotes
+		return value.slice(1, -1);
+	}
+
+	// Not a valid string literal
+	return null;
+};
 
 export const parse_imports = (
 	id: Path_Id,
@@ -15,26 +37,141 @@ export const parse_imports = (
 	ignore_types = true,
 ): Array<Import_Specifier> => {
 	const specifiers: Array<string> = [];
-
 	const is_svelte = SVELTE_MATCHER.test(id);
 
 	const parse_from = (s: string): void => {
-		const parsed = moduleLexerSync(s, {sourceFilename: is_svelte ? id + '.ts' : id});
-		for (const p of parsed.imports) {
+		const parsed = parseSync(is_svelte ? id + '.ts' : id, s, {});
+
+		// Process static imports
+		for (const static_import of parsed.module.staticImports) {
+			// Get the module source node
+			const import_decl = parsed.program.body.find(
+				(node) => node.type === 'ImportDeclaration' && node.start === static_import.start,
+			) as ImportDeclaration | undefined;
+
+			if (!import_decl?.source) continue;
+
+			// Extract the module request string value
+			const value = extract_string_literal(s, import_decl.source.start, import_decl.source.end);
+
+			if (!value) continue;
+
+			// Skip type-only imports if ignore_types is true
 			if (ignore_types) {
-				const import_statement = s.slice(p.ss, p.se);
-				if (import_statement.startsWith('import type')) {
+				// Handle import type {...} (type-only imports)
+				if (import_decl.importKind === 'type') {
+					continue;
+				}
+
+				// Handle inline type imports ({type foo})
+				if (static_import.entries.length > 0) {
+					// If all imports are type imports, skip this import
+					const has_non_type_specifier = static_import.entries.some((entry) => !entry.isType);
+					if (!has_non_type_specifier) {
+						continue;
+					}
+				}
+			}
+
+			specifiers.push(value);
+		}
+
+		// Process dynamic imports
+		for (const dynamic_import of parsed.module.dynamicImports) {
+			// Find the corresponding AST node
+			let found = false;
+			for (const node of parsed.program.body) {
+				if (
+					node.type === 'ExpressionStatement' &&
+					node.expression.type === 'AwaitExpression' &&
+					node.expression.argument.type === 'ImportExpression'
+				) {
+					const import_expr = node.expression.argument;
+					if (import_expr.start === dynamic_import.start) {
+						// Only process string literals (not expressions or variables)
+						if (import_expr.source.type === 'Literal') {
+							const value = String(import_expr.source.value);
+							if (value) {
+								specifiers.push(value);
+							}
+						}
+						found = true;
+						break;
+					}
+				}
+			}
+
+			// If we didn't find a match through AST, fall back to the original approach
+			// but only for simple string literals
+			if (!found) {
+				const value = extract_string_literal(
+					s,
+					dynamic_import.moduleRequest.start,
+					dynamic_import.moduleRequest.end,
+				);
+				if (value) {
+					specifiers.push(value);
+				}
+			}
+		}
+
+		// Process re-exports
+		for (const node of parsed.program.body) {
+			if (node.type === 'ExportNamedDeclaration' && node.source) {
+				// Skip type-only exports if ignore_types is true
+				if (ignore_types && node.exportKind === 'type') {
 					continue;
 				}
+
+				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+				if (node.source.type === 'Literal') {
+					const value = String(node.source.value);
+					if (value) {
+						specifiers.push(value);
+					}
+				} else {
+					throw new Unreachable_Error(node.source.type);
+				}
 			}
-			if (p.n) specifiers.push(p.n);
 		}
 	};
 
 	if (is_svelte) {
-		const matches = contents.matchAll(script_matcher);
-		for (const m of matches) {
-			parse_from(m[1]);
+		// Reset the regex state between calls
+		SVELTE_SCRIPT_MATCHER.lastIndex = 0;
+
+		// Capture script tags at the top level (not nested in HTML)
+		let last_index = 0;
+		const script_blocks: Array<{content: string; start: number; end: number}> = [];
+
+		// First collect all script blocks
+		let match;
+		while ((match = SVELTE_SCRIPT_MATCHER.exec(contents)) !== null) {
+			// Save position of the script tag
+			const start = match.index;
+			const end = SVELTE_SCRIPT_MATCHER.lastIndex;
+
+			// Only process top-level script tags (skip nested ones)
+			// A nested script would be inside another HTML tag between lastIndex and start
+			const text_between = contents.substring(last_index, start);
+			const contains_opening_tag = /<[a-z][^>]*>/i.test(text_between);
+			const contains_closing_tag = /<\/[a-z][^>]*>/i.test(text_between);
+
+			// If we're not nested (no HTML tag nesting), process this script
+			if (!(contains_opening_tag && !contains_closing_tag)) {
+				script_blocks.push({
+					content: match[1],
+					start,
+					end,
+				});
+			}
+
+			last_index = end;
+		}
+
+		// Process all the collected script blocks
+		for (const block of script_blocks) {
+			parse_from(block.content);
 		}
 	} else if (TS_MATCHER.test(id) || JS_MATCHER.test(id)) {
 		parse_from(contents);

package/src/lib/sveltekit_shim_app_stores.ts

@@ -1,6 +1,9 @@
 // shim for $app/stores
 // @see https://github.com/sveltejs/kit/issues/1485
 
+// TODO support `$app/state`
+/* eslint-disable @typescript-eslint/no-deprecated */
+
 import type {
 	getStores as base_getStores,
 	navigating as base_navigating,

package/src/lib/task_logging.ts

@@ -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;
 		}