@sveltejs/kit 1.0.0-next.40 → 1.0.0-next.402

package/dist/chunks/index3.js

@@ -1,246 +1,218 @@
-function read_only_form_data() {
-	/** @type {Map<string, string[]>} */
-	const map = new Map();
+import { $ } from './index.js';
+import { r as rimraf, m as mkdirp, c as copy } from './filesystem.js';
+import { g as generate_manifest } from '../vite.js';
+import 'fs';
+import 'path';
+import 'url';
+import 'node:child_process';
+import 'node:fs';
+import 'node:path';
+import '@sveltejs/vite-plugin-svelte';
+import 'vite';
+import './sync.js';
+import './utils.js';
+import './write_tsconfig.js';
+import 'querystring';
+import '../node.js';
+import '../node/polyfills.js';
+import 'assert';
+import 'net';
+import 'http';
+import 'stream';
+import 'buffer';
+import 'util';
+import 'stream/web';
+import 'perf_hooks';
+import 'util/types';
+import 'events';
+import 'tls';
+import 'async_hooks';
+import 'console';
+import 'zlib';
+import 'node:http';
+import 'node:https';
+import 'node:zlib';
+import 'node:stream';
+import 'node:buffer';
+import 'node:util';
+import 'node:url';
+import 'node:net';
+import 'crypto';
+import './error.js';
 
-	return {
-		/**
-		 * @param {string} key
-		 * @param {string} value
-		 */
-		append(key, value) {
-			if (map.has(key)) {
-				map.get(key).push(value);
-			} else {
-				map.set(key, [value]);
-			}
-		},
-
-		data: new ReadOnlyFormData(map)
-	};
-}
-
-class ReadOnlyFormData {
-	/** @type {Map<string, string[]>} */
-	#map;
-
-	/** @param {Map<string, string[]>} map */
-	constructor(map) {
-		this.#map = map;
-	}
-
-	/** @param {string} key */
-	get(key) {
-		const value = this.#map.get(key);
-		return value && value[0];
-	}
-
-	/** @param {string} key */
-	getAll(key) {
-		return this.#map.get(key);
-	}
-
-	/** @param {string} key */
-	has(key) {
-		return this.#map.has(key);
-	}
-
-	*[Symbol.iterator]() {
-		for (const [key, value] of this.#map) {
-			for (let i = 0; i < value.length; i += 1) {
-				yield [key, value[i]];
-			}
+/**
+ * Creates the Builder which is passed to adapters for building the application.
+ * @param {{
+ *   config: import('types').ValidatedConfig;
+ *   build_data: import('types').BuildData;
+ *   prerendered: import('types').Prerendered;
+ *   log: import('types').Logger;
+ * }} opts
+ * @returns {import('types').Builder}
+ */
+function create_builder({ config, build_data, prerendered, log }) {
+	/** @type {Set<string>} */
+	const prerendered_paths = new Set(prerendered.paths);
+
+	/** @param {import('types').RouteData} route */
+	// TODO routes should come pre-filtered
+	function not_prerendered(route) {
+		if (route.type === 'page' && route.path) {
+			return !prerendered_paths.has(route.path) && !prerendered_paths.has(route.path + '/');
 		}
-	}
 
-	*entries() {
-		for (const [key, value] of this.#map) {
-			for (let i = 0; i < value.length; i += 1) {
-				yield [key, value[i]];
-			}
-		}
+		return true;
 	}
 
-	*keys() {
-		for (const [key, value] of this.#map) {
-			for (let i = 0; i < value.length; i += 1) {
-				yield key;
-			}
-		}
-	}
+	return {
+		log,
+		rimraf,
+		mkdirp,
+		copy,
+
+		config,
+		prerendered,
+
+		async createEntries(fn) {
+			const { routes } = build_data.manifest_data;
+
+			/** @type {import('types').RouteDefinition[]} */
+			const facades = routes.map((route) => ({
+				id: route.id,
+				type: route.type,
+				segments: route.id.split('/').map((segment) => ({
+					dynamic: segment.includes('['),
+					rest: segment.includes('[...'),
+					content: segment
+				})),
+				pattern: route.pattern,
+				methods: route.type === 'page' ? ['GET'] : build_data.server.methods[route.file]
+			}));
+
+			const seen = new Set();
+
+			for (let i = 0; i < routes.length; i += 1) {
+				const route = routes[i];
+				const { id, filter, complete } = fn(facades[i]);
+
+				if (seen.has(id)) continue;
+				seen.add(id);
+
+				const group = [route];
+
+				// figure out which lower priority routes should be considered fallbacks
+				for (let j = i + 1; j < routes.length; j += 1) {
+					if (filter(facades[j])) {
+						group.push(routes[j]);
+					}
+				}
 
-	*values() {
-		for (const [, value] of this.#map) {
-			for (let i = 0; i < value.length; i += 1) {
-				yield value;
+				const filtered = new Set(group.filter(not_prerendered));
+
+				// heuristic: if /foo/[bar] is included, /foo/[bar].json should
+				// also be included, since the page likely needs the endpoint
+				filtered.forEach((route) => {
+					if (route.type === 'page') {
+						const endpoint = routes.find((candidate) => candidate.id === route.id + '.json');
+
+						if (endpoint) {
+							filtered.add(endpoint);
+						}
+					}
+				});
+
+				if (filtered.size > 0) {
+					await complete({
+						generateManifest: ({ relativePath, format }) =>
+							generate_manifest({
+								build_data,
+								relative_path: relativePath,
+								routes: Array.from(filtered),
+								format
+							})
+					});
+				}
 			}
-		}
-	}
-}
-
-/** @param {import('http').IncomingMessage} req */
-function get_body(req) {
-	const headers = req.headers;
-	const has_body =
-		headers['content-type'] !== undefined &&
-		// https://github.com/jshttp/type-is/blob/c1f4388c71c8a01f79934e68f630ca4a15fffcd6/index.js#L81-L95
-		(headers['transfer-encoding'] !== undefined || !isNaN(Number(headers['content-length'])));
-
-	if (!has_body) return Promise.resolve(undefined);
-
-	const [type, ...directives] = headers['content-type'].split(/;\s*/);
-
-	switch (type) {
-		case 'application/octet-stream':
-			return get_buffer(req);
-
-		case 'text/plain':
-			return get_text(req);
-
-		case 'application/json':
-			return get_json(req);
-
-		case 'application/x-www-form-urlencoded':
-			return get_urlencoded(req);
-
-		case 'multipart/form-data': {
-			const boundary = directives.find((directive) => directive.startsWith('boundary='));
-			if (!boundary) throw new Error('Missing boundary');
-			return get_multipart(req, boundary.slice('boundary='.length));
-		}
-		default:
-			throw new Error(`Invalid Content-Type ${type}`);
-	}
-}
-
-/** @param {import('http').IncomingMessage} req */
-async function get_json(req) {
-	return JSON.parse(await get_text(req));
-}
-
-/** @param {import('http').IncomingMessage} req */
-async function get_urlencoded(req) {
-	const text = await get_text(req);
-
-	const { data, append } = read_only_form_data();
-
-	text
-		.replace(/\+/g, ' ')
-		.split('&')
-		.forEach((str) => {
-			const [key, value] = str.split('=');
-			append(decodeURIComponent(key), decodeURIComponent(value));
-		});
-
-	return data;
-}
-
-/**
- * @param {import('http').IncomingMessage} req
- * @param {string} boundary
- */
-async function get_multipart(req, boundary) {
-	const text = await get_text(req);
-	const parts = text.split(`--${boundary}`);
-
-	const nope = () => {
-		throw new Error('Malformed form data');
-	};
-
-	if (parts[0] !== '' || parts[parts.length - 1].trim() !== '--') {
-		nope();
-	}
+		},
 
-	const { data, append } = read_only_form_data();
+		generateManifest: ({ relativePath, format }) => {
+			return generate_manifest({
+				build_data,
+				relative_path: relativePath,
+				routes: build_data.manifest_data.routes.filter(not_prerendered),
+				format
+			});
+		},
 
-	parts.slice(1, -1).forEach((part) => {
-		const match = /\s*([\s\S]+?)\r\n\r\n([\s\S]*)\s*/.exec(part);
-		const raw_headers = match[1];
-		const body = match[2].trim();
+		getBuildDirectory(name) {
+			return `${config.kit.outDir}/${name}`;
+		},
 
-		let key;
-		raw_headers.split('\r\n').forEach((str) => {
-			const [raw_header, ...raw_directives] = str.split('; ');
-			let [name, value] = raw_header.split(': ');
+		getClientDirectory() {
+			return `${config.kit.outDir}/output/client`;
+		},
 
-			name = name.toLowerCase();
+		getServerDirectory() {
+			return `${config.kit.outDir}/output/server`;
+		},
 
-			/** @type {Record<string, string>} */
-			const directives = {};
-			raw_directives.forEach((raw_directive) => {
-				const [name, value] = raw_directive.split('=');
-				directives[name] = JSON.parse(value); // TODO is this right?
-			});
+		getStaticDirectory() {
+			return config.kit.files.assets;
+		},
 
-			if (name === 'content-disposition') {
-				if (value !== 'form-data') nope();
+		writeClient(dest) {
+			return [...copy(`${config.kit.outDir}/output/client`, dest)];
+		},
 
-				if (directives.filename) {
-					// TODO we probably don't want to do this automatically
-					throw new Error('File upload is not yet implemented');
-				}
+		writePrerendered(dest, { fallback } = {}) {
+			const source = `${config.kit.outDir}/output/prerendered`;
+			const files = [...copy(`${source}/pages`, dest), ...copy(`${source}/dependencies`, dest)];
 
-				if (directives.name) {
-					key = directives.name;
-				}
+			if (fallback) {
+				files.push(fallback);
+				copy(`${source}/fallback.html`, `${dest}/${fallback}`);
 			}
-		});
-
-		if (!key) nope();
 
-		append(key, body);
-	});
-
-	return data;
-}
-
-/**
- * @param {import('http').IncomingMessage} req
- * @returns {Promise<string>}
- */
-function get_text(req) {
-	return new Promise((fulfil, reject) => {
-		let data = '';
+			return files;
+		},
 
-		req.on('error', reject);
+		writeServer(dest) {
+			return copy(`${config.kit.outDir}/output/server`, dest);
+		},
 
-		req.on('data', (chunk) => {
-			data += chunk;
-		});
+		// TODO remove these methods for 1.0
+		// @ts-expect-error
+		writeStatic() {
+			throw new Error(
+				`writeStatic has been removed. Please ensure you are using the latest version of ${
+					config.kit.adapter.name || 'your adapter'
+				}`
+			);
+		},
 
-		req.on('end', () => {
-			fulfil(data);
-		});
-	});
+		async prerender() {
+			throw new Error(
+				'builder.prerender() has been removed. Prerendering now takes place in the build phase — see builder.prerender and builder.writePrerendered'
+			);
+		}
+	};
 }
 
 /**
- * @param {import('http').IncomingMessage} req
- * @returns {Promise<ArrayBuffer>}
+ * @param {import('types').ValidatedConfig} config
+ * @param {import('types').BuildData} build_data
+ * @param {import('types').Prerendered} prerendered
+ * @param {{ log: import('types').Logger }} opts
  */
-function get_buffer(req) {
-	return new Promise((fulfil, reject) => {
-		let data = new Uint8Array(0);
+async function adapt(config, build_data, prerendered, { log }) {
+	const { name, adapt } = config.kit.adapter;
 
-		req.on('error', reject);
-
-		req.on('data', (chunk) => {
-			const new_data = new Uint8Array(data.length + chunk.length);
-
-			for (let i = 0; i < data.length; i += 1) {
-				new_data[i] = data[i];
-			}
-
-			for (let i = 0; i < chunk.length; i += 1) {
-				new_data[i + data.length] = chunk[i];
-			}
+	console.log($.bold().cyan(`\n> Using ${name}`));
 
-			data = new_data;
-		});
+	const builder = create_builder({ config, build_data, prerendered, log });
+	await adapt(builder);
 
-		req.on('end', () => {
-			fulfil(data.buffer);
-		});
-	});
+	log.success('done');
 }
 
-export { get_body as g };
+export { adapt };