hackmud-script-manager 0.20.4-550e28d → 0.20.4-6a2a079

package/bin/hsm.js

@@ -13,7 +13,8 @@ import { syncMacros } from "../syncMacros.js"
 import "@samual/lib/readDirectoryWithStats"
 import "path/posix"
 import "@samual/lib/copyFilePersistent"
-const version = "0.20.4-550e28d",
+const version = "0.20.4-6a2a079",
+	formatOption = name => colourN(`-${1 == name.length ? "" : "-"}${name}`),
 	options = new Map(),
 	commands = [],
 	userColours = new Cache(user => {
@@ -83,7 +84,7 @@ switch (commands[0]) {
 				noMinifyIncompatibleOption = mangleNamesOption || forceQuineCheatsOption
 			if (noMinifyOption && noMinifyIncompatibleOption) {
 				logError(
-					`Options ${colourN(noMinifyOption.name)} and ${colourN(noMinifyIncompatibleOption.name)} are incompatible\n`
+					`Options ${formatOption(noMinifyOption.name)} and ${formatOption(noMinifyIncompatibleOption.name)} are incompatible\n`
 				)
 				logHelp()
 				process.exit(1)
@@ -106,6 +107,7 @@ switch (commands[0]) {
 					)
 					process.exit(1)
 				}
+				complainAboutUnrecognisedOptions()
 				const { processScript } = await processScriptModule,
 					fileBaseName = basename(target, fileExtension),
 					fileBaseNameEndsWithDotSrc = fileBaseName.endsWith(".src"),
@@ -178,15 +180,15 @@ switch (commands[0]) {
 					}
 				} else scripts.push("*.*")
 				if ("push" == commands[0]) {
-					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
-						})
+					const { push, MissingSourceFolderError, MissingHackmudFolderError, NoUsersError } = await pushModule
+					complainAboutUnrecognisedOptions()
+					const infos = await push(sourcePath, hackmudPath, {
+						scripts,
+						onPush: info => logInfo(info, hackmudPath),
+						minify: noMinifyOption && !noMinifyOption.value,
+						mangleNames: mangleNamesOption?.value,
+						forceQuineCheats: forceQuineCheatsOption?.value
+					})
 					if (infos instanceof Error) {
 						logError(infos.message)
 						if (infos instanceof MissingSourceFolderError || infos instanceof NoUsersError) {
@@ -200,12 +202,13 @@ switch (commands[0]) {
 					} else infos.length || logError("Could not find any scripts to push")
 				} else {
 					const typeDeclarationPathOption = popOption(
-							"type-declaration-path",
-							"type-declaration",
-							"dts",
-							"gen-types"
-						),
-						{ watch } = await watchModule
+						"type-declaration-path",
+						"type-declaration",
+						"dts",
+						"gen-types"
+					)
+					complainAboutUnrecognisedOptions()
+					const { watch } = await watchModule
 					watch(sourcePath, hackmudPath, {
 						scripts,
 						onPush: info => logInfo(info, hackmudPath),
@@ -229,6 +232,7 @@ switch (commands[0]) {
 				logHelp()
 				process.exit(1)
 			}
+			complainAboutUnrecognisedOptions()
 			const sourcePath = commands[2] || "."
 			await pull(sourcePath, hackmudPath, script).catch(error => {
 				console.error(error)
@@ -238,8 +242,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
@@ -255,12 +260,13 @@ switch (commands[0]) {
 				logHelp()
 				process.exit(1)
 			}
+			complainAboutUnrecognisedOptions()
 			const sourcePath = resolve(target),
 				outputPath = commands[2] || "./player.d.ts",
 				typeDeclaration = await generateTypeDeclaration(sourcePath, hackmudPath)
 			let typeDeclarationPath = resolve(outputPath)
 			await writeFile(typeDeclarationPath, typeDeclaration).catch(error => {
-				assert(error instanceof Error, "src/bin/hsm.ts:330:35")
+				assert(error instanceof Error, "src/bin/hsm.ts:343:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 				return writeFile(typeDeclarationPath, typeDeclaration)
@@ -359,7 +365,7 @@ function getHackmudPath() {
 }
 function assertOptionIsBoolean(option) {
 	if ("boolean" != typeof option.value) {
-		logError(`The value for ${colourN(option.name)} must be ${colourV("true")} or ${colourV("false")}\n`)
+		logError(`The value for ${formatOption(option.name)} must be ${colourV("true")} or ${colourV("false")}\n`)
 		logHelp()
 		process.exit(1)
 	}
@@ -367,9 +373,7 @@ function assertOptionIsBoolean(option) {
 function popOption(...names) {
 	const presentOptionNames = names.filter(name => options.has(name))
 	if (!presentOptionNames.length) return
-	const presentOptionNamesWithDashDash = presentOptionNames.map(name =>
-		colourN(`-${1 == name.length ? "" : "-"}${name}`)
-	)
+	const presentOptionNamesWithDashDash = presentOptionNames.map(formatOption)
 	if (presentOptionNames.length > 1) {
 		logError(
 			`The options ${presentOptionNamesWithDashDash.join(", ")} are aliases for each other. Please only specify one`
@@ -380,3 +384,11 @@ function popOption(...names) {
 	options.delete(presentOptionNames[0])
 	return { name: presentOptionNamesWithDashDash[0], value }
 }
+function complainAboutUnrecognisedOptions() {
+	if (options.size) {
+		logError(
+			`Unrecognised option${options.size > 1 ? "s" : ""}: ${[...options.keys()].map(formatOption).join(", ")}`
+		)
+		process.exit(1)
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.20.4-550e28d",
+  "version": "0.20.4-6a2a079",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",