move validation into separate function

Author: Rich-Harris

Diff for: packages/kit/src/core/tsconfig.js

@@ -12,53 +12,7 @@ export function generate_tsconfig(config) {
 	const out = path.resolve(SVELTE_KIT, 'tsconfig.json');
 	const user_file = exists('tsconfig.json') || exists('jsconfig.json');
 
-	if (user_file) {
-		// we have to eval the file, since it's not parseable as JSON (contains comments)
-		const user_tsconfig_json = fs.readFileSync(user_file, 'utf-8');
-		const user_tsconfig = (0, eval)(`(${user_tsconfig_json})`);
-
-		// we need to check that the user's tsconfig extends the framework config
-		const extend = user_tsconfig.extends;
-		const extends_framework_config = extend && path.resolve('.', extend) === out;
-
-		if (extends_framework_config) {
-			const { paths: user_paths } = user_tsconfig.compilerOptions || {};
-
-			if (user_paths) {
-				const lib = user_paths['$lib'] || [];
-				const lib_ = user_paths['$lib/*'] || [];
-
-				const missing_lib_paths =
-					!lib.some(
-						(/** @type {string} */ relative) => path.resolve('.', relative) === config.kit.files.lib
-					) ||
-					!lib_.some(
-						(/** @type {string} */ relative) =>
-							path.resolve('.', relative) === config.kit.files.lib + '/*'
-					);
-
-				if (missing_lib_paths) {
-					console.warn(
-						colors
-							.bold()
-							.yellow(`Your compilerOptions.paths in ${user_file} should include the following:`)
-					);
-					const relative = path.relative('.', config.kit.files.lib);
-					console.warn(`{\n  "$lib":["${relative}"],\n  "$lib/*":["${relative}/*"]\n}`);
-				}
-			}
-		} else {
-			let relative = path.relative('.', out);
-			if (relative.startsWith(SVELTE_KIT)) relative = './' + relative;
-
-			console.warn(
-				colors
-					.bold()
-					.yellow(`Your ${user_file} should extend the configuration generated by SvelteKit:`)
-			);
-			console.warn(`{\n  "extends": "${relative}"\n}`);
-		}
-	}
+	if (user_file) validate(config, out, user_file);
 
 	mkdirp(SVELTE_KIT);
 
@@ -107,3 +61,56 @@ export function generate_tsconfig(config) {
 		)
 	);
 }
+
+/**
+ * @param {import('types').ValidatedConfig} config
+ * @param {string} out
+ * @param {string} user_file
+ */
+function validate(config, out, user_file) {
+	// we have to eval the file, since it's not parseable as JSON (contains comments)
+	const user_tsconfig_json = fs.readFileSync(user_file, 'utf-8');
+	const user_tsconfig = (0, eval)(`(${user_tsconfig_json})`);
+
+	// we need to check that the user's tsconfig extends the framework config
+	const extend = user_tsconfig.extends;
+	const extends_framework_config = extend && path.resolve('.', extend) === out;
+
+	if (extends_framework_config) {
+		const { paths: user_paths } = user_tsconfig.compilerOptions || {};
+
+		if (user_paths) {
+			const lib = user_paths['$lib'] || [];
+			const lib_ = user_paths['$lib/*'] || [];
+
+			const missing_lib_paths =
+				!lib.some(
+					(/** @type {string} */ relative) => path.resolve('.', relative) === config.kit.files.lib
+				) ||
+				!lib_.some(
+					(/** @type {string} */ relative) =>
+						path.resolve('.', relative) === config.kit.files.lib + '/*'
+				);
+
+			if (missing_lib_paths) {
+				console.warn(
+					colors
+						.bold()
+						.yellow(`Your compilerOptions.paths in ${user_file} should include the following:`)
+				);
+				const relative = path.relative('.', config.kit.files.lib);
+				console.warn(`{\n  "$lib":["${relative}"],\n  "$lib/*":["${relative}/*"]\n}`);
+			}
+		}
+	} else {
+		let relative = path.relative('.', out);
+		if (relative.startsWith(SVELTE_KIT)) relative = './' + relative;
+
+		console.warn(
+			colors
+				.bold()
+				.yellow(`Your ${user_file} should extend the configuration generated by SvelteKit:`)
+		);
+		console.warn(`{\n  "extends": "${relative}"\n}`);
+	}
+}