Improve internal API

src/cli.ts

@@ -2,11 +2,21 @@ import * as fs from 'fs';
 import * as path from 'path';
 import sade from 'sade';
 import colors from 'kleur';
-import prettyMs from 'pretty-ms';
 import * as pkg from '../package.json';
+import { elapsed, repeat, left_pad, format_milliseconds } from './utils';
+import { InvalidEvent, ErrorEvent, FatalEvent, BuildEvent, ReadyEvent } from './interfaces';
 
 const prog = sade('sapper').version(pkg.version);
 
+if (process.argv[2] === 'start') {
+	// remove this in a future version
+	console.error(colors.bold.red(`'sapper start' has been removed`));
+	console.error(`Use 'node [build_dir]' instead`);
+	process.exit(1);
+}
+
+const start = Date.now();
+
 prog.command('dev')
 	.describe('Start a development server')
 	.option('-p, --port', 'Specify a port')
@@ -21,10 +31,93 @@ prog.command('dev')
 		'dev-port': number,
 		live: boolean,
 		hot: boolean,
-		bundler?: string
+		bundler?: 'rollup' | 'webpack'
 	}) => {
-		const { dev } = await import('./cli/dev');
-		dev(opts);
+		const cwd = path.resolve(process.env.SAPPER_BASE || '');
+
+		const { dev } = await import('./api/dev');
+
+		try {
+			const watcher = dev({
+				cwd,
+				port: opts.port,
+				'dev-port': opts['dev-port'],
+				live: opts.live,
+				hot: opts.hot,
+				bundler: opts.bundler
+			});
+
+			let first = true;
+
+			watcher.on('ready', async (event: ReadyEvent) => {
+				if (first) {
+					console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
+					if (opts.open) {
+						const { exec } = await import('child_process');
+						exec(`open http://localhost:${event.port}`);
+					}
+					first = false;
+				}
+
+				// TODO clear screen?
+
+				event.process.stdout.on('data', data => {
+					process.stdout.write(data);
+				});
+
+				event.process.stderr.on('data', data => {
+					process.stderr.write(data);
+				});
+			});
+
+			watcher.on('invalid', (event: InvalidEvent) => {
+				const changed = event.changed.map(filename => path.relative(process.cwd(), filename)).join(', ');
+				console.log(`\n${colors.bold.cyan(changed)} changed. rebuilding...`);
+			});
+
+			watcher.on('error', (event: ErrorEvent) => {
+				console.log(colors.red(`✗ ${event.type}`));
+				console.log(colors.red(event.message));
+			});
+
+			watcher.on('fatal', (event: FatalEvent) => {
+				console.log(colors.bold.red(`> ${event.message}`));
+				if (event.log) console.log(event.log);
+			});
+
+			watcher.on('build', (event: BuildEvent) => {
+				if (event.errors.length) {
+					console.log(colors.bold.red(`✗ ${event.type}`));
+
+					event.errors.filter(e => !e.duplicate).forEach(error => {
+						if (error.file) console.log(colors.bold(error.file));
+						console.log(error.message);
+					});
+
+					const hidden = event.errors.filter(e => e.duplicate).length;
+					if (hidden > 0) {
+						console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
+					}
+				} else if (event.warnings.length) {
+					console.log(colors.bold.yellow(`• ${event.type}`));
+
+					event.warnings.filter(e => !e.duplicate).forEach(warning => {
+						if (warning.file) console.log(colors.bold(warning.file));
+						console.log(warning.message);
+					});
+
+					const hidden = event.warnings.filter(e => e.duplicate).length;
+					if (hidden > 0) {
+						console.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
+					}
+				} else {
+					console.log(`${colors.bold.green(`✔ ${event.type}`)} ${colors.gray(`(${format_milliseconds(event.duration)})`)}`);
+				}
+			});
+		} catch (err) {
+			console.log(colors.bold.red(`> ${err.message}`));
+			process.exit(1);
+		}
 	});
 
 prog.command('build [dest]')
@@ -36,25 +129,20 @@ prog.command('build [dest]')
 	.action(async (dest = '__sapper__/build', opts: {
 		port: string,
 		legacy: boolean,
-		bundler?: string
+		bundler?: 'rollup' | 'webpack'
 	}) => {
 		console.log(`> Building...`);
 
-		process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-		process.env.SAPPER_DEST = dest;
-
-		const start = Date.now();
+		const cwd = path.resolve(process.env.SAPPER_BASE || '');
 
 		try {
-			const { build } = await import('./cli/build');
-			await build(opts);
+			await _build(opts.bundler, opts.legacy, cwd, dest);
 
 			const launcher = path.resolve(dest, 'index.js');
 
 			fs.writeFileSync(launcher, `
 				// generated by sapper build at ${new Date().toISOString()}
 				process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-				process.env.SAPPER_DEST = __dirname;
 				process.env.PORT = process.env.PORT || ${opts.port || 3000};
 
 				console.log('Starting server on port ' + process.env.PORT);
@@ -68,15 +156,6 @@ prog.command('build [dest]')
 		}
 	});
 
-prog.command('start [dir]')
-	.describe('Start your app')
-	.option('-p, --port', 'Specify a port')
-	.option('-o, --open', 'Open a browser window')
-	.action(async (dir = 'build', opts: { port: number, open: boolean }) => {
-		const { start } = await import('./cli/start');
-		start(dir, opts);
-	});
-
 prog.command('export [dest]')
 	.describe('Export your app as static files (if possible)')
 	.option('--build', '(Re)build app before exporting', true)
@@ -88,26 +167,46 @@ prog.command('export [dest]')
 	.action(async (dest = '__sapper__/export', opts: {
 		build: boolean,
 		legacy: boolean,
-		bundler?: string,
+		bundler?: 'rollup' | 'webpack',
 		'build-dir': string,
 		basepath?: string,
 		timeout: number | false
 	}) => {
-		process.env.NODE_ENV = 'production';
-		process.env.SAPPER_DEST = opts['build-dir'];
-
-		const start = Date.now();
+		const cwd = path.resolve(process.env.SAPPER_BASE || '');
 
 		try {
 			if (opts.build) {
 				console.log(`> Building...`);
-				const { build } = await import('./cli/build');
-				await build(opts);
+				await _build(opts.bundler, opts.legacy, cwd, opts['build-dir']);
 				console.error(`\n> Built in ${elapsed(start)}`);
 			}
 
-			const { exporter } = await import('./cli/export');
-			await exporter(dest, opts);
+			const { export: _export } = await import('./api/export');
+			const { default: pb } = await import('pretty-bytes');
+
+			await _export({
+				static: path.resolve(cwd, process.env.SAPPER_STATIC || 'static'),
+				build_dir: opts['build-dir'],
+				export_dir: dest,
+				basepath: opts.basepath,
+				timeout: opts.timeout,
+
+				oninfo: event => {
+					console.log(colors.bold.cyan(`> ${event.message}`));
+				},
+
+				onfile: event => {
+					const size_color = event.size > 150000 ? colors.bold.red : event.size > 50000 ? colors.bold.yellow : colors.bold.gray;
+						const size_label = size_color(left_pad(pb(event.size), 10));
+
+						const file_label = event.status === 200
+							? event.file
+							: colors.bold[event.status >= 400 ? 'red' : 'yellow'](`(${event.status}) ${event.file}`);
+
+						console.log(`${size_label}   ${file_label}`);
+				}
+			});
+
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`npx serve ${dest}`)} to run the app.`);
 		} catch (err) {
 			console.error(colors.bold.red(`> ${err.message}`));
@@ -115,10 +214,41 @@ prog.command('export [dest]')
 		}
 	});
 
-// TODO upgrade
-
 prog.parse(process.argv);
 
-function elapsed(start: number) {
-	return prettyMs(Date.now() - start);
-}
+
+async function _build(
+	bundler: 'rollup' | 'webpack',
+	legacy: boolean,
+	cwd: string,
+	dest: string
+) {
+	const { build } = await import('./api/build');
+
+	await build({
+		bundler,
+		legacy,
+		cwd,
+		src:    path.resolve(cwd, process.env.SAPPER_SRC    || 'src'),
+		routes: path.resolve(cwd, process.env.SAPPER_ROUTES || 'src/routes'),
+		dest:   path.resolve(cwd, dest),
+
+		oncompile: event => {
+			let banner = `built ${event.type}`;
+			let c = colors.cyan;
+
+			const { warnings } = event.result;
+			if (warnings.length > 0) {
+				banner += ` with ${warnings.length} ${warnings.length === 1 ? 'warning' : 'warnings'}`;
+				c = colors.yellow;
+			}
+
+			console.log();
+			console.log(c(`┌─${repeat('─', banner.length)}─┐`));
+			console.log(c(`│ ${colors.bold(banner)       } │`));
+			console.log(c(`└─${repeat('─', banner.length)}─┘`));
+
+			console.log(event.result.print());
+		}
+	});
+}