hackmud-script-manager 0.20.4-4605f71 → 0.20.4-484afbe

package/bin/hsm.js

@@ -1,21 +1,22 @@
 #!/usr/bin/env node
-import { Cache } from "@samual/lib/Cache"
+import { AutoMap } from "@samual/lib/AutoMap"
 import { assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
 import { writeFile, readFile } from "fs/promises"
 import { homedir } from "os"
-import { extname, basename, resolve, dirname, relative } from "path"
+import { resolve, extname, basename, dirname, relative } from "path"
 import { supportedExtensions } from "../constants.js"
 import { generateTypeDeclaration } from "../generateTypeDeclaration.js"
 import { pull } from "../pull.js"
 import { syncMacros } from "../syncMacros.js"
 import "@samual/lib/readDirectoryWithStats"
+import "path/posix"
 import "@samual/lib/copyFilePersistent"
-const version = "0.20.4-4605f71",
+const formatOption = name => colourN(`-${1 == name.length ? "" : "-"}${name}`),
 	options = new Map(),
 	commands = [],
-	userColours = new Cache(user => {
+	userColours = new AutoMap(user => {
 		let hash = 0
 		for (const char of user) hash += (hash >> 1) + hash + "xi1_8ratvsw9hlbgm02y5zpdcn7uekof463qj".indexOf(char) + 1
 		return [colourJ, colourK, colourM, colourW, colourL, colourB][hash % 6](user)
@@ -23,23 +24,19 @@ const version = "0.20.4-4605f71",
 	log = message => console.log(colourS(message))
 for (const argument of process.argv.slice(2))
 	if ("-" == argument[0]) {
-		const [key, valueRaw] = argument.split("=")
-		let value = valueRaw
-		if (value)
-			if ("true" == value) value = !0
-			else if ("false" == value) value = !1
-			else {
-				const number = Number(value)
-				isFinite(number) && (value = number)
-			}
-		else value = !0
+		const argumentEqualsIndex = argument.indexOf("=")
+		let key, value
+		if (-1 == argumentEqualsIndex) {
+			key = argument
+			value = !0
+		} else {
+			key = argument.slice(0, argumentEqualsIndex)
+			value = argument.slice(argumentEqualsIndex + 1)
+			"true" == value ? (value = !0) : "false" == value && (value = !1)
+		}
 		if ("-" == argument[1]) options.set(key.slice(2), value)
 		else for (const option of key.slice(1)) options.set(option, value)
 	} else commands.push(argument)
-if ("v" == commands[0] || "version" == commands[0] || options.get("version") || options.get("v")) {
-	console.log(version)
-	process.exit()
-}
 const pushModule = import("../push.js"),
 	processScriptModule = import("../processScript/index.js"),
 	watchModule = import("../watch.js"),
@@ -49,6 +46,7 @@ const pushModule = import("../push.js"),
 	colourB = chalk.rgb(202, 202, 202),
 	colourC = chalk.rgb(155, 155, 155),
 	colourD = chalk.rgb(255, 0, 0),
+	colourF = chalk.rgb(255, 128, 0),
 	colourJ = chalk.rgb(255, 244, 4),
 	colourK = chalk.rgb(243, 249, 152),
 	colourL = chalk.rgb(30, 255, 0),
@@ -57,162 +55,222 @@ const pushModule = import("../push.js"),
 	colourS = chalk.rgb(122, 178, 244),
 	colourV = chalk.rgb(255, 0, 236),
 	colourW = chalk.rgb(255, 150, 224)
-if (options.get("help") || options.get("h")) {
+process.version.startsWith("v21.") &&
+	console.warn(
+		colourF(
+			`Warning: Support for Node.js 21 will be dropped in the next minor version of HSM\n         Your current version of Node.js is ${chalk.bold(process.version)}\n         You should update your version of Node.js\n         https://nodejs.org/en/download/package-manager\n`
+		)
+	)
+if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
+	console.log("0.20.4-484afbe")
+	process.exit()
+}
+let warnedDeprecatedEmitDtsAlias = !1
+if (popOption("help", "h")?.value) {
 	logHelp()
 	process.exit()
 }
 let autoExit = !0
 switch (commands[0]) {
 	case "push":
+	case "dev":
+	case "watch":
+	case "golf":
+	case "minify":
 		{
-			const hackmudPath = getHackmudPath(),
-				sourcePath = commands[1]
-			if (!sourcePath) {
-				logError("Must provide the directory to push from\n")
-				logHelp()
-				break
-			}
-			const scripts = commands.slice(2)
-			if (scripts.length) {
-				const invalidScript = scripts.find(
-					script => !/^(?:[a-z_][a-z\d_]{0,24}|\*)\.(?:[a-z_][a-z\d_]{0,24}|\*)$/.test(script)
-				)
-				if (invalidScript) {
-					logError(`Invalid script name: ${JSON.stringify(invalidScript)}\n`)
-					logHelp()
-					break
-				}
-			} else scripts.push("*.*")
-			const optionsHasNoMinify = options.has("no-minify")
-			if ((optionsHasNoMinify || options.has("skip-minify")) && options.has("mangle-names")) {
-				logError(
-					`Options ${colourN("--mangle-names")} and ${colourN(optionsHasNoMinify ? "--no-minify" : "--skip-minify")} are incompatible\n`
-				)
-				logHelp()
-				break
-			}
-			const shouldSkipMinify = options.get("no-minify") || options.get("skip-minify")
-			let shouldMinify
-			if (null != shouldSkipMinify) {
-				if ("boolean" != typeof shouldSkipMinify) {
-					logError(
-						`The value for ${colourN(optionsHasNoMinify ? "--no-minify" : "--skip-minify")} must be ${colourV("true")} or ${colourV("false")}\n`
+			const noMinifyOption = popOption("no-minify", "skip-minify")
+			noMinifyOption &&
+				"no-minify" != noMinifyOption.name &&
+				console.warn(
+					colourF(
+						`Warning: ${formatOption(noMinifyOption.name)} is being deprecated and will be removed in the next minor\n         release of HSM\n         You should switch to using its alias ${colourN("--no-minify")}\n`
 					)
-					logHelp()
-					break
-				}
-				shouldMinify = !shouldSkipMinify
-			}
-			const shouldMangleNames = options.get("mangle-names")
-			if (null != shouldMangleNames && "boolean" != typeof shouldMangleNames) {
+				)
+			const mangleNamesOption = popOption("mangle-names"),
+				forceQuineCheatsOption = popOption("force-quine-cheats"),
+				noQuineCheatsOptions = popOption("no-quine-cheats"),
+				noMinifyIncompatibleOption = mangleNamesOption || forceQuineCheatsOption || noQuineCheatsOptions
+			if (noMinifyOption && noMinifyIncompatibleOption) {
 				logError(
-					`The value for ${colourN("--mangle-names")} must be ${colourV("true")} or ${colourV("false")}\n`
+					`Options ${formatOption(noMinifyOption.name)} and ${formatOption(noMinifyIncompatibleOption.name)} are incompatible\n`
 				)
 				logHelp()
-				break
+				process.exit(1)
 			}
-			const shouldforceQuineCheats = options.get("force-quine-cheats")
-			if (null != shouldforceQuineCheats && "boolean" != typeof shouldforceQuineCheats) {
+			if (forceQuineCheatsOption && noQuineCheatsOptions) {
 				logError(
-					`The value for ${colourN("--force-quine-cheats")} must be ${colourV("true")} or ${colourV("false")}\n`
+					`Options ${formatOption(forceQuineCheatsOption.name)} and ${formatOption(noQuineCheatsOptions.name)} are incompatible\n`
 				)
 				logHelp()
-				break
+				process.exit(1)
 			}
-			const { push, MissingSourceFolderError, MissingHackmudFolderError, NoUsersError } = await pushModule,
-				infos = await push(sourcePath, hackmudPath, {
-					scripts,
-					onPush: info => logInfo(info, hackmudPath),
-					minify: shouldMinify,
-					mangleNames: shouldMangleNames,
-					forceQuineCheats: shouldforceQuineCheats
-				})
-			if (infos instanceof Error) {
-				logError(infos.message)
-				if (infos instanceof MissingSourceFolderError || infos instanceof NoUsersError) {
-					console.log()
+			noMinifyOption && assertOptionIsBoolean(noMinifyOption)
+			mangleNamesOption && assertOptionIsBoolean(mangleNamesOption)
+			forceQuineCheatsOption && assertOptionIsBoolean(forceQuineCheatsOption)
+			noQuineCheatsOptions && assertOptionIsBoolean(noQuineCheatsOptions)
+			if ("golf" == commands[0] || "minify" == commands[0]) {
+				const watchOption = popOption("watch"),
+					target = commands[1]
+				if (!target) {
+					logError("Must provide target\n")
 					logHelp()
-				} else
-					infos instanceof MissingHackmudFolderError &&
-						log(
-							`If this is not where your hackmud folder is, you can specify it with the\n${colourN("--hackmud-path")}=${colourB("<path>")} option or ${colourN("HSM_HACKMUD_PATH")} environment variable`
-						)
-			} else infos.length || logError("Could not find any scripts to push")
-		}
-		break
-	case "dev":
-	case "watch":
-		{
-			const hackmudPath = getHackmudPath(),
-				sourcePath = commands[1]
-			if (!sourcePath) {
-				logError("Must provide the directory to watch\n")
-				logHelp()
-				break
-			}
-			const scripts = commands.slice(2)
-			if (scripts.length) {
-				const invalidScript = scripts.find(
-					script => !/^(?:[a-z_][a-z\d_]{0,24}|\*)\.(?:[a-z_][a-z\d_]{0,24}|\*)$/.test(script)
-				)
-				if (invalidScript) {
-					logError(`Invalid script name: ${JSON.stringify(invalidScript)}\n`)
-					logHelp()
-					break
+					process.exit(1)
 				}
-			} else scripts.push("*.*")
-			const optionsHasNoMinify = options.has("no-minify")
-			if ((optionsHasNoMinify || options.has("skip-minify")) && options.has("mangle-names")) {
-				logError(
-					`Options ${colourN("--mangle-names")} and ${colourN(optionsHasNoMinify ? "--no-minify" : "--skip-minify")} are incompatible\n`
-				)
-				logHelp()
-				break
-			}
-			const shouldSkipMinify = options.get("no-minify") || options.get("skip-minify")
-			let shouldMinify
-			if (null != shouldSkipMinify) {
-				if ("boolean" != typeof shouldSkipMinify) {
+				const fileExtension = extname(target)
+				if (!supportedExtensions.includes(fileExtension)) {
 					logError(
-						`The value for ${colourN(optionsHasNoMinify ? "--no-minify" : "--skip-minify")} must be ${colourV("true")} or ${colourV("false")}\n`
+						`Unsupported file extension "${chalk.bold(fileExtension)}"\nSupported extensions are "${supportedExtensions.map(extension => chalk.bold(extension)).join('", "')}"`
 					)
+					process.exit(1)
+				}
+				complainAboutUnrecognisedOptions()
+				const { processScript } = await processScriptModule,
+					fileBaseName = basename(target, fileExtension),
+					fileBaseNameEndsWithDotSrc = fileBaseName.endsWith(".src"),
+					scriptName = fileBaseNameEndsWithDotSrc ? fileBaseName.slice(0, -4) : fileBaseName,
+					scriptUser =
+						(
+							"scripts" == basename(resolve(target, "..")) &&
+							"hackmud" == basename(resolve(target, "../../.."))
+						) ?
+							basename(resolve(target, "../.."))
+						:	void 0
+				let outputPath =
+					commands[2] ||
+					resolve(
+						dirname(target),
+						fileBaseNameEndsWithDotSrc ? scriptName + ".js"
+						: ".js" == fileExtension ? fileBaseName + ".min.js"
+						: fileBaseName + ".js"
+					)
+				const golfFile = () =>
+					readFile(target, { encoding: "utf8" }).then(async source => {
+						const timeStart = performance.now(),
+							{ script, warnings } = await processScript(source, {
+								minify: noMinifyOption && !noMinifyOption.value,
+								scriptUser,
+								scriptName,
+								filePath: target,
+								mangleNames: mangleNamesOption?.value,
+								forceQuineCheats: forceQuineCheatsOption?.value ?? !noQuineCheatsOptions?.value
+							}),
+							timeTook = performance.now() - timeStart
+						for (const { message, line } of warnings)
+							log(`Warning "${chalk.bold(message)}" on line ${chalk.bold(line + "")}`)
+						await writeFilePersistent(outputPath, script)
+							.catch(error => {
+								if (!commands[2] || "EISDIR" != error.code) throw error
+								outputPath = resolve(outputPath, basename(target, fileExtension) + ".js")
+								return writeFilePersistent(outputPath, script)
+							})
+							.then(() =>
+								log(
+									`Wrote ${chalk.bold(countHackmudCharacters(script))} chars to ${chalk.bold(relative(".", outputPath))} | took ${Math.round(100 * timeTook) / 100}ms`
+								)
+							)
+					})
+				if (watchOption) {
+					const { watch: watchFile } = await chokidarModule
+					watchFile(target, { awaitWriteFinish: { stabilityThreshold: 100 } })
+						.on("ready", () => log("Watching " + target))
+						.on("change", golfFile)
+					autoExit = !1
+				} else await golfFile()
+			} else {
+				const hackmudPath = getHackmudPath(),
+					sourcePath = commands[1]
+				if (!sourcePath) {
+					logError(`Must provide the directory to ${"push" == commands[0] ? "push from" : "watch"}\n`)
 					logHelp()
-					break
+					process.exit(1)
+				}
+				const scripts = commands.slice(2)
+				if (scripts.length) {
+					const invalidScript = scripts.find(
+						script => !/^(?:[a-z_][a-z\d_]{0,24}|\*)\.(?:[a-z_][a-z\d_]{0,24}|\*)$/.test(script)
+					)
+					if (invalidScript) {
+						logError(`Invalid script name: ${JSON.stringify(invalidScript)}\n`)
+						logHelp()
+						process.exit(1)
+					}
+				} else scripts.push("*.*")
+				const watchOption = popOption("watch")
+				if ("push" != commands[0] || watchOption?.value) {
+					const dtsPathOption = popOption(
+						"dts-path",
+						"type-declaration-path",
+						"type-declaration",
+						"dts",
+						"gen-types"
+					)
+					dtsPathOption &&
+						"dts-path" != dtsPathOption.name &&
+						"type-declaration-path" != dtsPathOption.name &&
+						console.warn(
+							colourF(
+								`Warning: ${formatOption(dtsPathOption.name)} is being deprecated and will be removed in the\n         next minor release of HSM\n         You should switch to using its alias ${colourN("--dts-path")}\n`
+							)
+						)
+					complainAboutUnrecognisedOptions()
+					const { watch } = await watchModule
+					watch(sourcePath, hackmudPath, {
+						scripts,
+						onPush: info => logInfo(info, hackmudPath),
+						typeDeclarationPath: dtsPathOption?.value.toString(),
+						minify: noMinifyOption && !noMinifyOption.value,
+						mangleNames: mangleNamesOption?.value,
+						onReady: () => log("Watching"),
+						forceQuineCheats: forceQuineCheatsOption?.value ?? !noQuineCheatsOptions?.value
+					})
+					autoExit = !1
+				} else {
+					const dtsPathOption = popOption("dts-path")
+					complainAboutUnrecognisedOptions()
+					let declarationPathPromise
+					if (dtsPathOption) {
+						if ("string" != typeof dtsPathOption.value) {
+							logError(
+								`Option ${formatOption(dtsPathOption.name)} must be a string, got ${colourV(dtsPathOption.value)}\n`
+							)
+							logHelp()
+							process.exit(1)
+						}
+						let typeDeclarationPath = resolve(dtsPathOption.value)
+						const typeDeclaration = await generateTypeDeclaration(sourcePath, hackmudPath)
+						declarationPathPromise = writeFile(typeDeclarationPath, typeDeclaration)
+							.catch(error => {
+								assert(error instanceof Error, "src/bin/hsm.ts:288:38")
+								if ("EISDIR" != error.code) throw error
+								typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
+								return writeFile(typeDeclarationPath, typeDeclaration)
+							})
+							.then(() => typeDeclarationPath)
+					}
+					const { push, MissingSourceFolderError, MissingHackmudFolderError, NoUsersError } =
+							await pushModule,
+						infos = await push(sourcePath, hackmudPath, {
+							scripts,
+							onPush: info => logInfo(info, hackmudPath),
+							minify: noMinifyOption && !noMinifyOption.value,
+							mangleNames: mangleNamesOption?.value,
+							forceQuineCheats: forceQuineCheatsOption?.value ?? !noQuineCheatsOptions?.value
+						})
+					if (infos instanceof Error) {
+						logError(infos.message)
+						if (infos instanceof MissingSourceFolderError || infos instanceof NoUsersError) {
+							console.log()
+							logHelp()
+						} else
+							infos instanceof MissingHackmudFolderError &&
+								log(
+									`If this is not where your hackmud folder is, you can specify it with the\n${colourN("--hackmud-path")}=${colourB("<path>")} option or ${colourN("HSM_HACKMUD_PATH")} environment variable`
+								)
+					} else infos.length || logError("Could not find any scripts to push")
+					declarationPathPromise &&
+						log("Wrote type declaration to " + chalk.bold(await declarationPathPromise))
 				}
-				shouldMinify = !shouldSkipMinify
-			}
-			const shouldMangleNames = options.get("mangle-names")
-			if (null != shouldMangleNames && "boolean" != typeof shouldMangleNames) {
-				logError(
-					`The value for ${colourN("--mangle-names")} must be ${colourV("true")} or ${colourV("false")}\n`
-				)
-				logHelp()
-				break
-			}
-			const shouldforceQuineCheats = options.get("force-quine-cheats")
-			if (null != shouldforceQuineCheats && "boolean" != typeof shouldforceQuineCheats) {
-				logError(
-					`The value for ${colourN("--force-quine-cheats")} must be ${colourV("true")} or ${colourV("false")}\n`
-				)
-				logHelp()
-				break
 			}
-			const { watch } = await watchModule
-			watch(sourcePath, hackmudPath, {
-				scripts,
-				onPush: info => logInfo(info, hackmudPath),
-				typeDeclarationPath: (
-					options.get("type-declaration-path") ||
-					options.get("type-declaration") ||
-					options.get("dts") ||
-					options.get("gen-types")
-				)?.toString(),
-				minify: shouldMinify,
-				mangleNames: shouldMangleNames,
-				onReady: () => log("Watching"),
-				forceQuineCheats: shouldforceQuineCheats
-			})
-			autoExit = !1
 		}
 		break
 	case "pull":
@@ -222,8 +280,9 @@ switch (commands[0]) {
 			if (!script) {
 				logError("Must provide the script to pull\n")
 				logHelp()
-				break
+				process.exit(1)
 			}
+			complainAboutUnrecognisedOptions()
 			const sourcePath = commands[2] || "."
 			await pull(sourcePath, hackmudPath, script).catch(error => {
 				console.error(error)
@@ -233,8 +292,9 @@ switch (commands[0]) {
 		break
 	case "sync-macros":
 		{
-			const hackmudPath = getHackmudPath(),
-				{ macrosSynced, usersSynced } = await syncMacros(hackmudPath)
+			const hackmudPath = getHackmudPath()
+			complainAboutUnrecognisedOptions()
+			const { macrosSynced, usersSynced } = await syncMacros(hackmudPath)
 			log(`Synced ${macrosSynced} macros to ${usersSynced} users`)
 		}
 		break
@@ -242,19 +302,30 @@ switch (commands[0]) {
 	case "gen-type-declaration":
 	case "gen-dts":
 	case "gen-types":
+	case "emit-dts":
 		{
-			const target = commands[1]
+			if ("emit-dts" != commands[0] && "gen-dts" != commands[0]) {
+				warnedDeprecatedEmitDtsAlias = !0
+				console.warn(
+					colourF(
+						`Warning: ${colourC("hsm")} ${colourL(commands[0])} is being deprecated and will be removed\n         in the next minor release of HSM\n         You should switch to using its alias ${colourC("hsm")} ${colourL("emit-dts")}\n`
+					)
+				)
+			}
+			const hackmudPath = getHackmudPath(),
+				target = commands[1]
 			if (!target) {
 				logError("Must provide target directory\n")
 				logHelp()
-				break
+				process.exit(1)
 			}
+			complainAboutUnrecognisedOptions()
 			const sourcePath = resolve(target),
 				outputPath = commands[2] || "./player.d.ts",
-				typeDeclaration = await generateTypeDeclaration(sourcePath, getHackmudPath())
+				typeDeclaration = await generateTypeDeclaration(sourcePath, hackmudPath)
 			let typeDeclarationPath = resolve(outputPath)
 			await writeFile(typeDeclarationPath, typeDeclaration).catch(error => {
-				assert(error instanceof Error, "src/bin/hsm.ts:340:35")
+				assert(error instanceof Error, "src/bin/hsm.ts:422:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 				return writeFile(typeDeclarationPath, typeDeclaration)
@@ -263,102 +334,8 @@ switch (commands[0]) {
 		}
 		break
 	case "help":
-	case "h":
 		logHelp()
 		break
-	case "golf":
-	case "minify":
-		{
-			const target = commands[1]
-			if (!target) {
-				logError("Must provide target\n")
-				logHelp()
-				break
-			}
-			const fileExtension = extname(target)
-			if (!supportedExtensions.includes(fileExtension)) {
-				logError(
-					`Unsupported file extension "${chalk.bold(fileExtension)}"\nSupported extensions are "${supportedExtensions.map(extension => chalk.bold(extension)).join('", "')}"`
-				)
-				break
-			}
-			const { processScript } = await processScriptModule,
-				fileBaseName = basename(target, fileExtension),
-				fileBaseNameEndsWithDotSrc = fileBaseName.endsWith(".src"),
-				scriptName = fileBaseNameEndsWithDotSrc ? fileBaseName.slice(0, -4) : fileBaseName,
-				scriptUser =
-					"scripts" == basename(resolve(target, "..")) && "hackmud" == basename(resolve(target, "../../..")) ?
-						basename(resolve(target, "../.."))
-					:	void 0,
-				optionsHasNoMinify = options.has("no-minify")
-			if ((optionsHasNoMinify || options.has("skip-minify")) && options.has("mangle-names")) {
-				logError(
-					`Options ${colourN("--mangle-names")} and ${colourN(optionsHasNoMinify ? "--no-minify" : "--skip-minify")} are incompatible\n`
-				)
-				logHelp()
-				break
-			}
-			const mangleNames_ = options.get("mangle-names")
-			if (null != mangleNames_ && "boolean" != typeof mangleNames_) {
-				logError(
-					`The value for ${colourN("--mangle-names")} must be ${colourV("true")} or ${colourV("false")}\n`
-				)
-				logHelp()
-				break
-			}
-			const mangleNames = mangleNames_,
-				forceQuineCheats_ = options.get("force-quine-cheats")
-			if (null != forceQuineCheats_ && "boolean" != typeof forceQuineCheats_) {
-				logError(
-					`the value for ${colourN("--force-quine-cheats")} must be ${colourV("true")} or ${colourV("false")}\n`
-				)
-				logHelp()
-				break
-			}
-			const forceQuineCheats = forceQuineCheats_
-			let outputPath =
-				commands[2] ||
-				resolve(
-					dirname(target),
-					fileBaseNameEndsWithDotSrc ? scriptName + ".js"
-					: ".js" == fileExtension ? fileBaseName + ".min.js"
-					: fileBaseName + ".js"
-				)
-			const golfFile = () =>
-				readFile(target, { encoding: "utf8" }).then(async source => {
-					const timeStart = performance.now(),
-						{ script, warnings } = await processScript(source, {
-							minify: !(options.get("no-minify") || options.get("skip-minify")),
-							scriptUser,
-							scriptName,
-							filePath: target,
-							mangleNames,
-							forceQuineCheats
-						}),
-						timeTook = performance.now() - timeStart
-					for (const { message, line } of warnings)
-						log(`Warning "${chalk.bold(message)}" on line ${chalk.bold(line + "")}`)
-					await writeFilePersistent(outputPath, script)
-						.catch(error => {
-							if (!commands[2] || "EISDIR" != error.code) throw error
-							outputPath = resolve(outputPath, basename(target, fileExtension) + ".js")
-							return writeFilePersistent(outputPath, script)
-						})
-						.then(() =>
-							log(
-								`Wrote ${chalk.bold(countHackmudCharacters(script))} chars to ${chalk.bold(relative(".", outputPath))} | took ${Math.round(100 * timeTook) / 100}ms`
-							)
-						)
-				})
-			if (options.get("watch")) {
-				const { watch: watchFile } = await chokidarModule
-				watchFile(target, { awaitWriteFinish: { stabilityThreshold: 100 } })
-					.on("ready", () => log("Watching " + target))
-					.on("change", golfFile)
-				autoExit = !1
-			} else await golfFile()
-		}
-		break
 	default:
 		commands[0] && logError(`Unknown command: ${colourL(commands[0])}\n`)
 		logHelp()
@@ -366,23 +343,21 @@ switch (commands[0]) {
 autoExit && process.exit()
 function logHelp() {
 	const pushCommandDescription = "Push scripts from a directory to hackmud user's scripts directories",
-		forceQuineCheatsOptionDescription = `Force quine cheats on. Use ${colourN("--force-quine-cheats")}=${colourV("false")} to force off`,
 		hackmudPathOption = `${colourN("--hackmud-path")}=${colourB("<path>")}\n    Override hackmud path`
-	console.log(colourN("Version") + colourS(": ") + colourV(version))
 	switch (commands[0]) {
 		case "dev":
 		case "watch":
 		case "push":
 			console.log(
 				colourS(
-					`\n${colourJ("push" == commands[0] ? pushCommandDescription : "Watch a directory and push a script when modified")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB('<directory> ["<script user>.<script name>"...]')}\n\n${colourA("Arguments:")}\n${colourB("<directory>")}\n    The source directory containing your scripts\n${colourB("<script user>")}\n    A user to push script(s) to. Can be set to wild card (${colourV("*")}) which will try\n    and discover users to push to\n${colourB("<script name>")}\n    Name of a script to push. Can be set to wild card (${colourV("*")}) to find all scripts\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}\n${hackmudPathOption}\n${"push" == commands[0] ? "" : `${colourN("--type-declaration-path")}=${colourB("<path>")}\n    Path to generate a type declaration file for the scripts\n`}\n${colourA("Examples:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")}\n    Pushes all scripts found in ${colourV("src")} folder to all users\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("bar")}\n    Pushes a script named ${colourL("bar")} found in ${colourV("src")} folder to user ${userColours.get("foo")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("bar")} ${colourC("baz")}${colourV(".")}${colourL("qux")}\n    Multiple can be specified\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("*")}\n    Pushes all scripts found in ${colourV("src")} folder to user ${userColours.get("foo")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("*")}${colourV(".")}${colourL("foo")}\n    Pushes all scripts named ${colourL("foo")} found in ${colourV("src")} folder to all user\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("*")}${colourV(".")}${colourL("*")}\n    Pushes all scripts found in ${colourV("src")} folder to all users`
+					`${colourJ("push" == commands[0] ? pushCommandDescription : "Watch a directory and push a script when modified")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB('<directory> ["<script user>.<script name>"...]')}\n\n${colourA("Arguments:")}\n${colourB("<directory>")}\n    The source directory containing your scripts\n${colourB("<script user>")}\n    A user to push script(s) to. Can be set to wild card (${colourV("*")}) which will try\n    and discover users to push to\n${colourB("<script name>")}\n    Name of a script to push. Can be set to wild card (${colourV("*")}) to find all scripts\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}, ${colourN("--no-quine-cheats")}\n    Force quine cheats on or off\n${hackmudPathOption}\n${colourN("--dts-path")}=${colourB("<path>")}\n    Path to generate a type declaration (.d.ts) file for the scripts\n${colourN("--watch")}\n    Watch for changes\n\n${colourA("Examples:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")}\n    Pushes all scripts found in ${colourV("src")} folder to all users\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("bar")}\n    Pushes a script named ${colourL("bar")} found in ${colourV("src")} folder to user ${userColours.get("foo")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("bar")} ${colourC("baz")}${colourV(".")}${colourL("qux")}\n    Multiple can be specified\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("*")}\n    Pushes all scripts found in ${colourV("src")} folder to user ${userColours.get("foo")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("*")}${colourV(".")}${colourL("foo")}\n    Pushes all scripts named ${colourL("foo")} found in ${colourV("src")} folder to all user\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("*")}${colourV(".")}${colourL("*")}\n    Pushes all scripts found in ${colourV("src")} folder to all users`
 				)
 			)
 			break
 		case "pull":
 			console.log(
 				colourS(
-					`\n${colourJ("Pull a script a from a hackmud user's script directory")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<script user>")}${colourV(".")}${colourB("<script name>")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
+					`${colourJ("Pull a script a from a hackmud user's script directory")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<script user>")}${colourV(".")}${colourB("<script name>")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
 				)
 			)
 			break
@@ -390,7 +365,7 @@ function logHelp() {
 		case "golf":
 			console.log(
 				colourS(
-					`\n${colourJ("Minify a script file on the spot")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<target> [output path]")}\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}\n${colourN("--watch")}\n    Watch for changes`
+					`${colourJ("Minify a script file on the spot")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<target> [output path]")}\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}, ${colourN("--no-quine-cheats")}\n    Force quine cheats on or off\n${colourN("--watch")}\n    Watch for changes`
 				)
 			)
 			break
@@ -398,6 +373,15 @@ function logHelp() {
 		case "gen-type-declaration":
 		case "gen-dts":
 		case "gen-types":
+		case "emit-dts":
+			warnedDeprecatedEmitDtsAlias ||
+				"emit-dts" == commands[0] ||
+				"gen-dts" == commands[0] ||
+				console.warn(
+					colourF(
+						`Warning: ${colourC("hsm")} ${colourL(commands[0])} is being deprecated and will be removed\n         in the next minor release of HSM\n         You should switch to using its alias ${colourC("hsm")} ${colourL("emit-dts")}\n`
+					)
+				)
 			console.log(
 				colourS(
 					`${colourJ("Generate a type declaration file for a directory of scripts")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<directory> [output path]")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
@@ -407,14 +391,14 @@ function logHelp() {
 		case "sync-macros":
 			console.log(
 				colourS(
-					`\n${colourJ("Sync macros across all hackmud users")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
+					`${colourJ("Sync macros across all hackmud users")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
 				)
 			)
 			break
 		default:
 			console.log(
 				colourS(
-					`\n${colourJ("Hackmud Script Manager")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("dev")}\n    Watch a directory and push a script when modified\n${colourL("golf")}\n    Minify a script file on the spot\n${colourL("gen-dts")}\n    Generate a type declaration file for a directory of scripts\n${colourL("sync-macros")}\n    Sync macros across all hackmud users\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory`
+					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.20.4-484afbe")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("minify")}\n    Minify a script file on the spot\n${colourL("emit-dts")}\n    Generate a type declaration file for a directory of scripts\n${colourL("sync-macros")}\n    Sync macros across all hackmud users\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory\n\n${colourA("Options:")}\n${colourN("--help")}\n    Can be used on any command e.g. ${colourC("hsm")} ${colourL("push")} ${colourN("--help")} to show helpful information`
 				)
 			)
 	}
@@ -432,15 +416,55 @@ function logError(message) {
 	process.exitCode = 1
 }
 function getHackmudPath() {
-	const hackmudPathOption = options.get("hackmud-path")
-	if (null != hackmudPathOption && "string" != typeof hackmudPathOption) {
-		logError(`Option ${colourN("--hackmud-path")} must be a string, got ${colourV(hackmudPathOption)}\n`)
+	const hackmudPathOption = popOption("hackmud-path")
+	if (hackmudPathOption) {
+		if ("string" != typeof hackmudPathOption.value) {
+			logError(`Option ${colourN("--hackmud-path")} must be a string, got ${colourV(hackmudPathOption.value)}\n`)
+			logHelp()
+			process.exit(1)
+		}
+		if (!hackmudPathOption.value) {
+			logError(`Option ${colourN("--hackmud-path")} was specified but empty\n`)
+			logHelp()
+			process.exit(1)
+		}
+		return hackmudPathOption.value
+	}
+	if (null != process.env.HSM_HACKMUD_PATH) {
+		if (!process.env.HSM_HACKMUD_PATH) {
+			logError(`Environment variable ${colourN("HSM_HACKMUD_PATH")} was specified but empty\n`)
+			logHelp()
+			process.exit(1)
+		}
+		return process.env.HSM_HACKMUD_PATH
+	}
+	return "win32" == process.platform ? resolve(process.env.APPDATA, "hackmud") : resolve(homedir(), ".config/hackmud")
+}
+function assertOptionIsBoolean(option) {
+	if ("boolean" != typeof option.value) {
+		logError(`The value for ${formatOption(option.name)} must be ${colourV("true")} or ${colourV("false")}\n`)
 		logHelp()
 		process.exit(1)
 	}
-	return (
-		hackmudPathOption ||
-		process.env.HSM_HACKMUD_PATH ||
-		("win32" == process.platform ? resolve(process.env.APPDATA, "hackmud") : resolve(homedir(), ".config/hackmud"))
-	)
+}
+function popOption(...names) {
+	const presentOptionNames = names.filter(name => options.has(name))
+	if (!presentOptionNames.length) return
+	if (presentOptionNames.length > 1) {
+		logError(
+			`The options ${presentOptionNames.map(formatOption).join(", ")} are aliases for each other. Please only specify one`
+		)
+		process.exit(1)
+	}
+	const value = options.get(presentOptionNames[0])
+	options.delete(presentOptionNames[0])
+	return { name: presentOptionNames[0], value }
+}
+function complainAboutUnrecognisedOptions() {
+	if (options.size) {
+		logError(
+			`Unrecognised option${options.size > 1 ? "s" : ""}: ${[...options.keys()].map(formatOption).join(", ")}`
+		)
+		process.exit(1)
+	}
 }