@sveltejs/kit 1.0.0-next.291 → 1.0.0-next.292

package/dist/chunks/{tsconfig.js → sync.js}

@@ -1,348 +1,13 @@
-import fs__default from 'fs';
 import path__default from 'path';
+import fs__default from 'fs';
+import { g as get_runtime_path, $ } from '../cli.js';
+import { p as posixify, c as copy, m as mkdirp } from './filesystem.js';
+import { fileURLToPath } from 'url';
 import { s } from './misc.js';
-import { m as mkdirp, g as get_runtime_path, p as posixify, $ } from '../cli.js';
-
-/**
- * Takes zero or more objects and returns a new object that has all the values
- * deeply merged together. None of the original objects will be mutated at any
- * level, and the returned object will have no references to the original
- * objects at any depth. If there's a conflict the last one wins, except for
- * arrays which will be combined.
- * @param {...Object} objects
- * @returns {[Record<string, any>, string[]]} a 2-tuple with the merged object,
- *     and a list of merge conflicts if there were any, in dotted notation
- */
-function deep_merge(...objects) {
-	const result = {};
-	/** @type {string[]} */
-	const conflicts = [];
-	objects.forEach((o) => merge_into(result, o, conflicts));
-	return [result, conflicts];
-}
-
-/**
- * normalize kit.vite.resolve.alias as an array
- * @param {import('vite').AliasOptions} o
- * @returns {import('vite').Alias[]}
- */
-function normalize_alias(o) {
-	if (Array.isArray(o)) return o;
-	return Object.entries(o).map(([find, replacement]) => ({ find, replacement }));
-}
-
-/**
- * Merges b into a, recursively, mutating a.
- * @param {Record<string, any>} a
- * @param {Record<string, any>} b
- * @param {string[]} conflicts array to accumulate conflicts in
- * @param {string[]} path array of property names representing the current
- *     location in the tree
- */
-function merge_into(a, b, conflicts = [], path = []) {
-	/**
-	 * Checks for "plain old Javascript object", typically made as an object
-	 * literal. Excludes Arrays and built-in types like Buffer.
-	 * @param {any} x
-	 */
-	const is_plain_object = (x) => typeof x === 'object' && x.constructor === Object;
-
-	for (const prop in b) {
-		// normalize alias objects to array
-		if (prop === 'alias' && path[path.length - 1] === 'resolve') {
-			if (a[prop]) a[prop] = normalize_alias(a[prop]);
-			if (b[prop]) b[prop] = normalize_alias(b[prop]);
-		}
-
-		if (is_plain_object(b[prop])) {
-			if (!is_plain_object(a[prop])) {
-				if (a[prop] !== undefined) {
-					conflicts.push([...path, prop].join('.'));
-				}
-				a[prop] = {};
-			}
-			merge_into(a[prop], b[prop], conflicts, [...path, prop]);
-		} else if (Array.isArray(b[prop])) {
-			if (!Array.isArray(a[prop])) {
-				if (a[prop] !== undefined) {
-					conflicts.push([...path, prop].join('.'));
-				}
-				a[prop] = [];
-			}
-			a[prop].push(...b[prop]);
-		} else {
-			// Since we're inside a for/in loop which loops over enumerable
-			// properties only, we want parity here and to check if 'a' has
-			// enumerable-only property 'prop'. Using 'hasOwnProperty' to
-			// exclude inherited properties is close enough. It is possible
-			// that someone uses Object.defineProperty to create a direct,
-			// non-enumerable property but let's not worry about that.
-			if (Object.prototype.hasOwnProperty.call(a, prop)) {
-				conflicts.push([...path, prop].join('.'));
-			}
-			a[prop] = b[prop];
-		}
-	}
-}
-
-/** @type {Map<string, string>} */
-const previous_contents = new Map();
-
-/**
- * @param {string} file
- * @param {string} code
- */
-function write_if_changed(file, code) {
-	if (code !== previous_contents.get(file)) {
-		previous_contents.set(file, code);
-		mkdirp(path__default.dirname(file));
-		fs__default.writeFileSync(file, code);
-	}
-}
-
-/** @typedef {import('types').ManifestData} ManifestData */
-
-/**
- * @param {{
- *   config: import('types').ValidatedConfig;
- *   manifest_data: ManifestData;
- *   cwd: string;
- * }} options
- */
-function create_app({ config, manifest_data, cwd = process.cwd() }) {
-	const output = path__default.join(config.kit.outDir, 'generated');
-	const base = path__default.relative(cwd, output);
-
-	write_if_changed(`${output}/manifest.js`, generate_client_manifest(manifest_data, base));
-	write_if_changed(`${output}/root.svelte`, generate_app(manifest_data));
-
-	create_types(config, manifest_data);
-}
-
-/**
- * @param {string} str
- */
-function trim(str) {
-	return str.replace(/^\t\t/gm, '').trim();
-}
-
-/**
- * @param {ManifestData} manifest_data
- * @param {string} base
- */
-function generate_client_manifest(manifest_data, base) {
-	/** @type {Record<string, number>} */
-	const component_indexes = {};
-
-	/** @param {string} c */
-	const get_path = (c) => path__default.relative(base, c);
-
-	const components = `[
-		${manifest_data.components
-			.map((component, i) => {
-				component_indexes[component] = i;
-
-				return `() => import(${s(get_path(component))})`;
-			})
-			.join(',\n\t\t\t\t')}
-	]`.replace(/^\t/gm, '');
-
-	/** @param {string[]} parts */
-	const get_indices = (parts) =>
-		`[${parts.map((part) => (part ? `c[${component_indexes[part]}]` : '')).join(', ')}]`;
-
-	const routes = `[
-		${manifest_data.routes
-			.map((route) => {
-				if (route.type === 'page') {
-					const params =
-						route.params.length > 0 &&
-						'(m) => ({ ' +
-							route.params
-								.map((param, i) => {
-									return param.startsWith('...')
-										? `${param.slice(3)}: d(m[${i + 1}] || '')`
-										: `${param}: d(m[${i + 1}])`;
-								})
-								.join(', ') +
-							'})';
-
-					const tuple = [route.pattern, get_indices(route.a), get_indices(route.b)];
-
-					// optional items
-					if (params || route.shadow) tuple.push(params || 'null');
-					if (route.shadow) tuple.push('1');
-
-					return `// ${route.a[route.a.length - 1]}\n\t\t[${tuple.join(', ')}]`;
-				}
-			})
-			.filter(Boolean)
-			.join(',\n\n\t\t')}
-	]`.replace(/^\t/gm, '');
-
-	return trim(`
-		const c = ${components};
-
-		const d = decodeURIComponent;
-
-		export const routes = ${routes};
-
-		// we import the root layout/error components eagerly, so that
-		// connectivity errors after initialisation don't nuke the app
-		export const fallback = [c[0](), c[1]()];
-	`);
-}
-
-/**
- * @param {ManifestData} manifest_data
- */
-function generate_app(manifest_data) {
-	// TODO remove default layout altogether
-
-	const max_depth = Math.max(
-		...manifest_data.routes.map((route) =>
-			route.type === 'page' ? route.a.filter(Boolean).length : 0
-		),
-		1
-	);
-
-	const levels = [];
-	for (let i = 0; i <= max_depth; i += 1) {
-		levels.push(i);
-	}
-
-	let l = max_depth;
-
-	let pyramid = `<svelte:component this={components[${l}]} {...(props_${l} || {})}/>`;
-
-	while (l--) {
-		pyramid = `
-			{#if components[${l + 1}]}
-				<svelte:component this={components[${l}]} {...(props_${l} || {})}>
-					${pyramid.replace(/\n/g, '\n\t\t\t\t\t')}
-				</svelte:component>
-			{:else}
-				<svelte:component this={components[${l}]} {...(props_${l} || {})} />
-			{/if}
-		`
-			.replace(/^\t\t\t/gm, '')
-			.trim();
-	}
-
-	return trim(`
-		<!-- This file is generated by @sveltejs/kit — do not edit it! -->
-		<script>
-			import { setContext, afterUpdate, onMount } from 'svelte';
-
-			// stores
-			export let stores;
-			export let page;
-
-			export let components;
-			${levels.map((l) => `export let props_${l} = null;`).join('\n\t\t\t')}
-
-			setContext('__svelte__', stores);
-
-			$: stores.page.set(page);
-			afterUpdate(stores.page.notify);
-
-			let mounted = false;
-			let navigated = false;
-			let title = null;
-
-			onMount(() => {
-				const unsubscribe = stores.page.subscribe(() => {
-					if (mounted) {
-						navigated = true;
-						title = document.title || 'untitled page';
-					}
-				});
-
-				mounted = true;
-				return unsubscribe;
-			});
-		</script>
-
-		${pyramid.replace(/\n/g, '\n\t\t')}
-
-		{#if mounted}
-			<div id="svelte-announcer" aria-live="assertive" aria-atomic="true" style="position: absolute; left: 0; top: 0; clip: rect(0 0 0 0); clip-path: inset(50%); overflow: hidden; white-space: nowrap; width: 1px; height: 1px">
-				{#if navigated}
-					{title}
-				{/if}
-			</div>
-		{/if}
-	`);
-}
-
-/**
- * @param {import('types').ValidatedConfig} config
- * @param {ManifestData} manifest_data
- */
-function create_types(config, manifest_data) {
-	/** @type {Map<string, { params: string[], type: 'page' | 'endpoint' | 'both' }>} */
-	const shadow_types = new Map();
-
-	/** @param {string} key */
-	function extract_params(key) {
-		/** @type {string[]} */
-		const params = [];
-
-		const pattern = /\[([^\]]+)\]/g;
-		let match;
-
-		while ((match = pattern.exec(key))) {
-			params.push(match[1]);
-		}
-
-		return params;
-	}
-
-	manifest_data.routes.forEach((route) => {
-		if (route.type === 'endpoint') {
-			const key = route.file.slice(0, -path__default.extname(route.file).length);
-			shadow_types.set(key, { params: extract_params(key), type: 'endpoint' });
-		} else if (route.shadow) {
-			const key = route.shadow.slice(0, -path__default.extname(route.shadow).length);
-			shadow_types.set(key, { params: extract_params(key), type: 'both' });
-		}
-	});
-
-	manifest_data.components.forEach((component) => {
-		if (component.startsWith('.')) return; // exclude fallback components
-
-		const ext = /** @type {string} */ (config.extensions.find((ext) => component.endsWith(ext)));
-		const key = component.slice(0, -ext.length);
-
-		if (!shadow_types.has(key)) {
-			shadow_types.set(key, { params: extract_params(key), type: 'page' });
-		}
-	});
-
-	shadow_types.forEach(({ params, type }, key) => {
-		const arg = `{ ${params.map((param) => `${param}: string`).join('; ')} }`;
-
-		const imports = [
-			type !== 'page' && 'RequestHandler as GenericRequestHandler',
-			type !== 'endpoint' && 'Load as GenericLoad'
-		]
-			.filter(Boolean)
-			.join(', ');
-
-		const file = `${config.kit.outDir}/types/${key || 'index'}.d.ts`;
-		const content = [
-			'// this file is auto-generated',
-			`import type { ${imports} } from '@sveltejs/kit';`,
-			type !== 'page' && `export type RequestHandler = GenericRequestHandler<${arg}>;`,
-			type !== 'endpoint' &&
-				`export type Load<Props = Record<string, any>> = GenericLoad<${arg}, Props>;`
-		]
-			.filter(Boolean)
-			.join('\n');
-
-		write_if_changed(file, content);
-	});
-}
+import 'sade';
+import 'child_process';
+import 'net';
+import 'os';
 
 /**
  * @param typeMap [Object] Map of MIME type -> Array[extensions]
@@ -517,7 +182,12 @@ function create_manifest_data({
 			const file = posixify(path__default.relative(cwd, resolved));
 			const is_dir = fs__default.statSync(resolved).isDirectory();
 
-			const ext = config.extensions.find((ext) => basename.endsWith(ext)) || path__default.extname(basename);
+			const ext = is_dir
+				? ''
+				: config.extensions.find((ext) => basename.endsWith(ext)) ||
+				  config.kit.endpointExtensions.find((ext) => basename.endsWith(ext));
+
+			if (ext === undefined) return;
 
 			const name = ext ? basename.slice(0, -ext.length) : basename;
 
@@ -704,20 +374,19 @@ function create_manifest_data({
 
 	walk(config.kit.files.routes, [], [], [], [layout], [error]);
 
-	// merge matching page/endpoint pairs into shadowed pages
+	const lookup = new Map();
+	for (const route of routes) {
+		if (route.type === 'page') {
+			lookup.set(route.key, route);
+		}
+	}
+
 	let i = routes.length;
 	while (i--) {
 		const route = routes[i];
-		const prev = routes[i - 1];
-
-		if (prev && prev.key === route.key) {
-			if (prev.type !== 'endpoint' || route.type !== 'page') {
-				const relative = path__default.relative(cwd, path__default.resolve(config.kit.files.routes, prev.key));
-				throw new Error(`Duplicate route files: ${relative}`);
-			}
-
-			route.shadow = prev.file;
-			routes.splice(--i, 1);
+		if (route.type === 'endpoint' && lookup.has(route.key)) {
+			lookup.get(route.key).shadow = route.file;
+			routes.splice(i, 1);
 		}
 	}
 
@@ -905,18 +574,215 @@ function list_files({ config, dir, path, files = [] }) {
 	return files;
 }
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path__default.dirname(__filename);
+
+/** @param {string} dest */
+function copy_assets(dest) {
+	let prefix = '..';
+	do {
+		// we jump through these hoops so that this function
+		// works whether or not it's been bundled
+		const resolved = path__default.resolve(__dirname, `${prefix}/assets`);
+
+		if (fs__default.existsSync(resolved)) {
+			copy(resolved, dest);
+			return;
+		}
+
+		prefix = `../${prefix}`;
+	} while (true); // eslint-disable-line
+}
+
+/** @type {Map<string, string>} */
+const previous_contents = new Map();
+
+/**
+ * @param {string} file
+ * @param {string} code
+ */
+function write_if_changed(file, code) {
+	if (code !== previous_contents.get(file)) {
+		previous_contents.set(file, code);
+		mkdirp(path__default.dirname(file));
+		fs__default.writeFileSync(file, code);
+	}
+}
+
+/** @param {string} str */
+function trim(str) {
+	const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];
+	const pattern = new RegExp(`^${indentation}`, 'gm');
+	return str.replace(pattern, '').trim();
+}
+
+/**
+ * @param {import('types').ManifestData} manifest_data
+ * @param {string} base
+ * @param {string} output
+ */
+function write_manifest(manifest_data, base, output) {
+	/** @type {Record<string, number>} */
+	const component_indexes = {};
+
+	/** @param {string} c */
+	const get_path = (c) => path__default.relative(base, c);
+
+	const components = `[
+		${manifest_data.components
+			.map((component, i) => {
+				component_indexes[component] = i;
+
+				return `() => import(${s(get_path(component))})`;
+			})
+			.join(',\n\t\t\t\t\t')}
+	]`.replace(/^\t/gm, '');
+
+	/** @param {string[]} parts */
+	const get_indices = (parts) =>
+		`[${parts.map((part) => (part ? `c[${component_indexes[part]}]` : '')).join(', ')}]`;
+
+	const routes = `[
+		${manifest_data.routes
+			.map((route) => {
+				if (route.type === 'page') {
+					const params =
+						route.params.length > 0 &&
+						'(m) => ({ ' +
+							route.params
+								.map((param, i) => {
+									return param.startsWith('...')
+										? `${param.slice(3)}: d(m[${i + 1}] || '')`
+										: `${param}: d(m[${i + 1}])`;
+								})
+								.join(', ') +
+							'})';
+
+					const tuple = [route.pattern, get_indices(route.a), get_indices(route.b)];
+
+					// optional items
+					if (params || route.shadow) tuple.push(params || 'null');
+					if (route.shadow) tuple.push(`'${route.key}'`);
+
+					return `// ${route.a[route.a.length - 1]}\n\t\t[${tuple.join(', ')}]`;
+				}
+			})
+			.filter(Boolean)
+			.join(',\n\n\t\t')}
+	]`.replace(/^\t/gm, '');
+
+	write_if_changed(
+		`${output}/manifest.js`,
+		trim(`
+			const c = ${components};
+
+			const d = decodeURIComponent;
+
+			export const routes = ${routes};
+
+			// we import the root layout/error components eagerly, so that
+			// connectivity errors after initialisation don't nuke the app
+			export const fallback = [c[0](), c[1]()];
+		`)
+	);
+}
+
+/**
+ * @param {import('types').ManifestData} manifest_data
+ * @param {string} output
+ */
+function write_root(manifest_data, output) {
+	// TODO remove default layout altogether
+
+	const max_depth = Math.max(
+		...manifest_data.routes.map((route) =>
+			route.type === 'page' ? route.a.filter(Boolean).length : 0
+		),
+		1
+	);
+
+	const levels = [];
+	for (let i = 0; i <= max_depth; i += 1) {
+		levels.push(i);
+	}
+
+	let l = max_depth;
+
+	let pyramid = `<svelte:component this={components[${l}]} {...(props_${l} || {})}/>`;
+
+	while (l--) {
+		pyramid = `
+			{#if components[${l + 1}]}
+				<svelte:component this={components[${l}]} {...(props_${l} || {})}>
+					${pyramid.replace(/\n/g, '\n\t\t\t\t\t')}
+				</svelte:component>
+			{:else}
+				<svelte:component this={components[${l}]} {...(props_${l} || {})} />
+			{/if}
+		`
+			.replace(/^\t\t\t/gm, '')
+			.trim();
+	}
+
+	write_if_changed(
+		`${output}/root.svelte`,
+		trim(`
+			<!-- This file is generated by @sveltejs/kit — do not edit it! -->
+			<script>
+				import { setContext, afterUpdate, onMount } from 'svelte';
+
+				// stores
+				export let stores;
+				export let page;
+
+				export let components;
+				${levels.map((l) => `export let props_${l} = null;`).join('\n\t\t\t\t')}
+
+				setContext('__svelte__', stores);
+
+				$: stores.page.set(page);
+				afterUpdate(stores.page.notify);
+
+				let mounted = false;
+				let navigated = false;
+				let title = null;
+
+				onMount(() => {
+					const unsubscribe = stores.page.subscribe(() => {
+						if (mounted) {
+							navigated = true;
+							title = document.title || 'untitled page';
+						}
+					});
+
+					mounted = true;
+					return unsubscribe;
+				});
+			</script>
+
+			${pyramid.replace(/\n/g, '\n\t\t\t')}
+
+			{#if mounted}
+				<div id="svelte-announcer" aria-live="assertive" aria-atomic="true" style="position: absolute; left: 0; top: 0; clip: rect(0 0 0 0); clip-path: inset(50%); overflow: hidden; white-space: nowrap; width: 1px; height: 1px">
+					{#if navigated}
+						{title}
+					{/if}
+				</div>
+			{/if}
+		`)
+	);
+}
+
 /** @param {string} file */
 const exists = (file) => fs__default.existsSync(file) && file;
 
 /** @param {import('types').ValidatedConfig} config */
-function generate_tsconfig(config) {
+function write_tsconfig(config) {
 	const out = path__default.join(config.kit.outDir, 'tsconfig.json');
 	const user_file = exists('tsconfig.json') || exists('jsconfig.json');
 
 	if (user_file) validate(config, out, user_file);
 
-	mkdirp(config.kit.outDir);
-
 	/** @param {string} file */
 	const project_relative = (file) => posixify(path__default.relative('.', file));
 
@@ -936,7 +802,7 @@ function generate_tsconfig(config) {
 		include.push(config_relative(`${dir}/**/*.svelte`));
 	});
 
-	fs__default.writeFileSync(
+	write_if_changed(
 		out,
 		JSON.stringify(
 			{
@@ -1029,4 +895,105 @@ function validate(config, out, user_file) {
 	}
 }
 
-export { create_app as a, create_manifest_data as c, deep_merge as d, generate_tsconfig as g };
+/**
+ * @param {import('types').ValidatedConfig} config
+ * @param {import('types').ManifestData} manifest_data
+ */
+function write_types(config, manifest_data) {
+	/** @type {Map<string, { params: string[], type: 'page' | 'endpoint' | 'both' }>} */
+	const shadow_types = new Map();
+
+	/** @param {string} key */
+	function extract_params(key) {
+		/** @type {string[]} */
+		const params = [];
+
+		const pattern = /\[([^\]]+)\]/g;
+		let match;
+
+		while ((match = pattern.exec(key))) {
+			params.push(match[1]);
+		}
+
+		return params;
+	}
+
+	manifest_data.routes.forEach((route) => {
+		const file = route.type === 'endpoint' ? route.file : route.shadow;
+
+		if (file) {
+			const ext = /** @type {string} */ (
+				config.kit.endpointExtensions.find((ext) => file.endsWith(ext))
+			);
+			const key = file.slice(0, -ext.length);
+			shadow_types.set(key, {
+				params: extract_params(key),
+				type: route.type === 'endpoint' ? 'endpoint' : 'both'
+			});
+		}
+	});
+
+	manifest_data.components.forEach((component) => {
+		if (component.startsWith('.')) return; // exclude fallback components
+
+		const ext = /** @type {string} */ (config.extensions.find((ext) => component.endsWith(ext)));
+		const key = component.slice(0, -ext.length);
+
+		if (!shadow_types.has(key)) {
+			shadow_types.set(key, { params: extract_params(key), type: 'page' });
+		}
+	});
+
+	shadow_types.forEach(({ params, type }, key) => {
+		const arg =
+			params.length > 0 ? `{ ${params.map((param) => `${param}: string`).join('; ')} }` : '{}';
+
+		const imports = [
+			type !== 'page' && 'RequestHandler as GenericRequestHandler',
+			type !== 'endpoint' && 'Load as GenericLoad'
+		]
+			.filter(Boolean)
+			.join(', ');
+
+		const file = `${config.kit.outDir}/types/${key || 'index'}.d.ts`;
+		const content = [
+			'// this file is auto-generated',
+			`import type { ${imports} } from '@sveltejs/kit';`,
+			type !== 'page' && `export type RequestHandler = GenericRequestHandler<${arg}>;`,
+			type !== 'endpoint' &&
+				`export type Load<Props = Record<string, any>> = GenericLoad<${arg}, Props>;`
+		]
+			.filter(Boolean)
+			.join('\n');
+
+		write_if_changed(file, content);
+	});
+}
+
+/** @param {import('types').ValidatedConfig} config */
+function init(config) {
+	copy_assets(path__default.join(config.kit.outDir, 'runtime'));
+	write_tsconfig(config);
+}
+
+/** @param {import('types').ValidatedConfig} config */
+function update(config) {
+	const manifest_data = create_manifest_data({ config });
+
+	const output = path__default.join(config.kit.outDir, 'generated');
+	const base = path__default.relative('.', output);
+
+	write_manifest(manifest_data, base, output);
+	write_root(manifest_data, output);
+	write_types(config, manifest_data);
+
+	return { manifest_data };
+}
+
+/** @param {import('types').ValidatedConfig} config */
+function all(config) {
+	init(config);
+	return update(config);
+}
+
+export { all, init, update };