@sveltejs/kit 1.0.0-next.399 → 1.0.0-next.400

package/dist/chunks/sync.js

@@ -1003,25 +1003,45 @@ function merge_into(a, b) {
 	}
 }
 
-/** @param {import('types').ValidatedKitConfig} config */
+/**
+ * Transforms kit.alias to a valid vite.resolve.alias array.
+ * Related to tsconfig path alias creation.
+ *
+ * @param {import('types').ValidatedKitConfig} config
+ * */
 function get_aliases(config) {
-	/** @type {Record<string, string>} */
-	const alias = {
-		__GENERATED__: path__default.posix.join(config.outDir, 'generated'),
-
-		$app: `${get_runtime_directory(config)}/app`,
-
+	/** @type {import('vite').Alias[]} */
+	const alias = [
+		{ find: '__GENERATED__', replacement: path__default.posix.join(config.outDir, 'generated') },
+		{ find: '$app', replacement: `${get_runtime_directory(config)}/app` },
 		// For now, we handle `$lib` specially here rather than make it a default value for
 		// `config.kit.alias` since it has special meaning for packaging, etc.
-		$lib: config.files.lib
-	};
+		{ find: '$lib', replacement: config.files.lib }
+	];
 
-	alias['$env'] = `${get_runtime_directory(config)}/env`;
-
-	for (const [key, value] of Object.entries(config.alias)) {
-		alias[key] = path__default.resolve(value);
+	for (let [key, value] of Object.entries(config.alias)) {
+		if (value.endsWith('/*')) {
+			value = value.slice(0, -2);
+		}
+		if (key.endsWith('/*')) {
+			// Doing just `{ find: key.slice(0, -2) ,..}` would mean `import .. from "key"` would also be matched, which we don't want
+			alias.push({
+				find: new RegExp(`^${key.slice(0, -2)}\\/(.+)$`),
+				replacement: `${path__default.resolve(value)}/$1`
+			});
+		} else if (key + '/*' in config.alias) {
+			// key and key/* both exist -> the replacement for key needs to happen _only_ on import .. from "key"
+			alias.push({ find: new RegExp(`^${key}$`), replacement: path__default.resolve(value) });
+		} else {
+			alias.push({ find: key, replacement: path__default.resolve(value) });
+		}
 	}
 
+	alias.push({
+		find: '$env',
+		replacement: `${get_runtime_directory(config)}/env`
+	});
+
 	return alias;
 }
 

package/dist/chunks/write_tsconfig.js

@@ -86,8 +86,34 @@ const reserved = new Set([
 
 const valid_identifier = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
 
-/** @param {string} file */
-const exists = (file) => fs__default.existsSync(file) && file;
+/**
+ * @param {string} cwd
+ * @param {string} file
+ */
+function maybe_file(cwd, file) {
+	const resolved = path__default.resolve(cwd, file);
+	if (fs__default.existsSync(resolved)) {
+		return resolved;
+	}
+}
+
+/**
+ * @param {string} file
+ */
+function project_relative(file) {
+	return posixify(path__default.relative('.', file));
+}
+
+/**
+ * @param {string} file
+ */
+function remove_trailing_slashstar(file) {
+	if (file.endsWith('/*')) {
+		return file.slice(0, -2);
+	} else {
+		return file;
+	}
+}
 
 /**
  * Writes the tsconfig that the user's tsconfig inherits from.
@@ -95,14 +121,10 @@ const exists = (file) => fs__default.existsSync(file) && file;
  */
 function write_tsconfig(config, cwd = process.cwd()) {
 	const out = path__default.join(config.outDir, 'tsconfig.json');
-	const user_file =
-		exists(path__default.resolve(cwd, 'tsconfig.json')) || exists(path__default.resolve(cwd, 'jsconfig.json'));
+	const user_file = maybe_file(cwd, 'tsconfig.json') || maybe_file(cwd, 'jsconfig.json');
 
 	if (user_file) validate(config, cwd, out, user_file);
 
-	/** @param {string} file */
-	const project_relative = (file) => posixify(path__default.relative('.', file));
-
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path__default.relative(config.outDir, file));
 
@@ -114,19 +136,6 @@ function write_tsconfig(config, cwd = process.cwd()) {
 		include.push(config_relative(`${relative}/**/*.svelte`));
 	}
 
-	/** @type {Record<string, string[]>} */
-	const paths = {};
-	const alias = {
-		$lib: project_relative(config.files.lib),
-		...config.alias
-	};
-	for (const [key, value] of Object.entries(alias)) {
-		if (fs__default.existsSync(project_relative(value))) {
-			paths[key] = [project_relative(value)];
-			paths[key + '/*'] = [project_relative(value) + '/*'];
-		}
-	}
-
 	write_if_changed(
 		out,
 		JSON.stringify(
@@ -134,7 +143,7 @@ function write_tsconfig(config, cwd = process.cwd()) {
 				compilerOptions: {
 					// generated options
 					baseUrl: config_relative('.'),
-					paths,
+					paths: get_tsconfig_paths(config),
 					rootDirs: [config_relative('.'), './types'],
 
 					// essential options
@@ -214,4 +223,51 @@ function validate(config, cwd, out, user_file) {
 	}
 }
 
+// <something><optional /*>
+const alias_regex = /^(.+?)(\/\*)?$/;
+// <path><optional /* or .fileending>
+const value_regex = /^(.*?)((\/\*)|(\.\w+))?$/;
+
+/**
+ * Generates tsconfig path aliases from kit's aliases.
+ * Related to vite alias creation.
+ *
+ * @param {import('types').ValidatedKitConfig} config
+ */
+function get_tsconfig_paths(config) {
+	const alias = {
+		...config.alias
+	};
+	if (fs__default.existsSync(project_relative(config.files.lib))) {
+		alias['$lib'] = project_relative(config.files.lib);
+	}
+
+	/** @type {Record<string, string[]>} */
+	const paths = {};
+
+	for (const [key, value] of Object.entries(alias)) {
+		const key_match = alias_regex.exec(key);
+		if (!key_match) throw new Error(`Invalid alias key: ${key}`);
+
+		const value_match = value_regex.exec(value);
+		if (!value_match) throw new Error(`Invalid alias value: ${value}`);
+
+		const rel_path = project_relative(remove_trailing_slashstar(value));
+		const slashstar = key_match[2];
+
+		if (slashstar) {
+			paths[key] = [rel_path + '/*'];
+		} else {
+			paths[key] = [rel_path];
+			const fileending = value_match[4];
+
+			if (!fileending && !(key + '/*' in alias)) {
+				paths[key + '/*'] = [rel_path + '/*'];
+			}
+		}
+	}
+
+	return paths;
+}
+
 export { write as a, write_tsconfig as b, reserved as r, trim as t, valid_identifier as v, write_if_changed as w };

package/dist/cli.js

@@ -19,7 +19,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.399');
+const prog = sade('svelte-kit').version('1.0.0-next.400');
 
 prog
 	.command('package')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.399",
+  "version": "1.0.0-next.400",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",