hackmud-script-manager 0.19.1-3ef8894 → 0.19.1-531ddb2

package/bin/hsm.js

@@ -1,7 +1,11 @@
 #!/usr/bin/env node
 import { Cache } from "@samual/lib/Cache"
 import { assert } from "@samual/lib/assert"
+import { catchError } from "@samual/lib/catchError"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
+import { getDeepObjectProperty } from "@samual/lib/getDeepObjectProperty"
+import { isRecord } from "@samual/lib/isRecord"
+import { setDeepObjectProperty } from "@samual/lib/setDeepObjectProperty"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
 import { readFile, writeFile, mkdir, rmdir } from "fs/promises"
 import { homedir } from "os"
@@ -10,6 +14,7 @@ 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 "@samual/lib/copyFilePersistent"
 const configDirectoryPath = resolve(homedir(), ".config"),
 	configFilePath = resolve(configDirectoryPath, "hsm.json"),
@@ -20,119 +25,7 @@ const configDirectoryPath = resolve(homedir(), ".config"),
 		for (const char of user) hash += (hash >> 1) + hash + "xi1_8ratvsw9hlbgm02y5zpdcn7uekof463qj".indexOf(char) + 1
 		return [colourJ, colourK, colourM, colourW, colourL, colourB][hash % 6](user)
 	}),
-	logNeedHackmudPathMessage = () =>
-		console.error(
-			colourS(
-				`${colourD("You need to set hackmudPath in config before you can use this command")}\n\n${colourA("To fix this:")}\nOpen hackmud and run "${colourC("#dir")}"\nThis will open a file browser and print your hackmud user's script directory\nGo up 2 directories and then copy the path\nThen in a terminal run "${colourC("hsm")} ${colourL("config set")} ${colourV("hackmudPath")} ${colourB("<the path you copied>")}"`
-			)
-		),
-	logHelp = () => {
-		const pushCommandDescription = "Push scripts from a directory to hackmud user's scripts directories",
-			mangleNamesOptionDescription =
-				"Reduce character count further but lose function names in error call stacks",
-			forceQuineCheatsOptionDescription = `Force quine cheats on. Use ${colourN("--force-quine-cheats")}=${colourV("false")} to force off.`
-		console.log(colourN("Version") + colourS(": ") + colourV("0.19.1-3ef8894"))
-		switch (commands[0]) {
-			case "config":
-				switch (commands[1]) {
-					case "get":
-						console.log(
-							`\n${colourJ("Retrieve a value from the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(`${commands[0]} ${commands[1]}`)} ${colourB("<key>")}`
-						)
-						break
-					case "set":
-						console.log(
-							`\n${colourJ("Assign a value to the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(`${commands[0]} ${commands[1]}`)} ${colourB("<key> <value>")}`
-						)
-						break
-					case "delete":
-						console.log(
-							`\n${colourJ("Remove a key and value from the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(`${commands[0]} ${commands[1]}`)} ${colourB("<key>")}`
-						)
-						break
-					default:
-						console.log(
-							colourS(
-								`${colourN("Config path")}: ${colourV(configFilePath)}\n\n${colourJ("Modify the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0] + " get")} ${colourB("<key>")}\n    Retrieve a value from the config file\n${colourC("hsm")} ${colourL(commands[0] + " set")} ${colourB("<key> <value>")}\n    Assign a value to the config file\n${colourC("hsm")} ${colourL(commands[0] + " delete")} ${colourB("<key>")}\n    Remove a key and value from the config file`
-							)
-						)
-				}
-				break
-			case "push":
-				console.log(
-					colourS(
-						`\n${colourJ(pushCommandDescription)}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<directory> [<script user>.<script name>...]")}\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    ${mangleNamesOptionDescription}\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}`
-					)
-				)
-				break
-			case "dev":
-			case "watch":
-				console.log(
-					colourS(
-						`\n${colourJ("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("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    ${mangleNamesOptionDescription}\n${colourN("--type-declaration-path")}=${colourB("<path>")}\n    Path to generate a type declaration file for the scripts\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}`
-					)
-				)
-				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>")}`
-					)
-				)
-				break
-			case "minify":
-			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    ${mangleNamesOptionDescription}\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}\n${colourN("--watch")}\n    Watch for changes`
-					)
-				)
-				break
-			case "generate-type-declaration":
-			case "gen-type-declaration":
-			case "gen-dts":
-			case "gen-types":
-				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]")}`
-					)
-				)
-				break
-			case "sync-macros":
-				console.log("\n" + colourJ("Sync macros across all hackmud users"))
-				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("config")}\n    Modify and view the config file\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory`
-					)
-				)
-		}
-	},
-	exploreObject = (object, keys, createPath = !1) => {
-		for (const key of keys)
-			object =
-				createPath ?
-					"object" == typeof object[key] ?
-						object[key]
-					:	(object[key] = {})
-				:	object?.[key]
-		return object
-	},
-	logInfo = ({ file, users, minLength, error }, hackmudPath) => {
-		error ?
-			logError(`error "${chalk.bold(error.message)}" in ${chalk.bold(file)}`)
-		:	console.log(
-				`pushed ${chalk.bold(file)} to ${users.map(user => chalk.bold(userColours.get(user))).join(", ")} | ${chalk.bold(minLength + "")} chars | ${chalk.bold(resolve(hackmudPath, users[0], "scripts", basename(file, extname(file))) + ".js")}`
-			)
-	},
-	log = message => {
-		console.log(colourS(message))
-	},
-	logError = message => {
-		console.error(colourD(message))
-		process.exitCode = 1
-	}
+	log = message => console.log(colourS(message))
 for (const argument of process.argv.slice(2))
 	if ("-" == argument[0]) {
 		const [key, valueRaw] = argument.split("=")
@@ -149,20 +42,14 @@ for (const argument of process.argv.slice(2))
 		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("0.19.1-3ef8894")
+	console.log("0.19.1-531ddb2")
 	process.exit()
 }
 let configDidNotExist = !1
 const configPromise = readFile(configFilePath, { encoding: "utf-8" }).then(
 		configFile => {
-			let temporaryConfig
-			try {
-				temporaryConfig = JSON.parse(configFile)
-			} catch {
-				log("Config file was corrupted, resetting")
-				return {}
-			}
-			if (!temporaryConfig || "object" != typeof temporaryConfig) {
+			const [temporaryConfig, error] = catchError(() => JSON.parse(configFile))
+			if (error || !isRecord(temporaryConfig)) {
 				log("Config file was corrupted, resetting")
 				return {}
 			}
@@ -199,15 +86,13 @@ if (options.get("help") || options.get("h")) {
 	process.exit()
 }
 let autoExit = !0
+const getDefaultHackmudPath = () =>
+	"win32" == process.platform ? resolve(process.env.APPDATA, "hackmud") : resolve(homedir(), ".config/hackmud")
 switch (commands[0]) {
 	case "push":
 		{
-			const { hackmudPath } = await configPromise
-			if (!hackmudPath) {
-				logNeedHackmudPathMessage()
-				break
-			}
-			const sourcePath = commands[1]
+			const { hackmudPath = getDefaultHackmudPath() } = await configPromise,
+				sourcePath = commands[1]
 			if (!sourcePath) {
 				logError("Must provide the directory to push from\n")
 				logHelp()
@@ -275,12 +160,8 @@ switch (commands[0]) {
 	case "dev":
 	case "watch":
 		{
-			const { hackmudPath } = await configPromise
-			if (!hackmudPath) {
-				logNeedHackmudPathMessage()
-				break
-			}
-			const sourcePath = commands[1]
+			const { hackmudPath = getDefaultHackmudPath() } = await configPromise,
+				sourcePath = commands[1]
 			if (!sourcePath) {
 				logError("Must provide the directory to watch\n")
 				logHelp()
@@ -353,34 +234,24 @@ switch (commands[0]) {
 		break
 	case "pull":
 		{
-			const { hackmudPath } = await configPromise
-			if (!hackmudPath) {
-				logNeedHackmudPathMessage()
-				break
-			}
-			const script = commands[1]
+			const { hackmudPath = getDefaultHackmudPath() } = await configPromise,
+				script = commands[1]
 			if (!script) {
 				logError("Must provide the script to pull\n")
 				logHelp()
 				break
 			}
 			const sourcePath = commands[2] || "."
-			try {
-				await pull(sourcePath, hackmudPath, script)
-			} catch (error) {
+			await pull(sourcePath, hackmudPath, script).catch(error => {
 				console.error(error)
 				logError(`Something went wrong, did you forget to ${colourC("#down")} the script?`)
-			}
+			})
 		}
 		break
 	case "sync-macros":
 		{
-			const { hackmudPath } = await configPromise
-			if (!hackmudPath) {
-				logNeedHackmudPathMessage()
-				break
-			}
-			const { macrosSynced, usersSynced } = await syncMacros(hackmudPath)
+			const { hackmudPath = getDefaultHackmudPath() } = await configPromise,
+				{ macrosSynced, usersSynced } = await syncMacros(hackmudPath)
 			log(`Synced ${macrosSynced} macros to ${usersSynced} users`)
 		}
 		break
@@ -397,16 +268,17 @@ switch (commands[0]) {
 			}
 			const sourcePath = resolve(target),
 				outputPath = commands[2] || "./player.d.ts",
-				typeDeclaration = await generateTypeDeclaration(sourcePath, (await configPromise).hackmudPath)
+				typeDeclaration = await generateTypeDeclaration(
+					sourcePath,
+					(await configPromise).hackmudPath || getDefaultHackmudPath()
+				)
 			let typeDeclarationPath = resolve(outputPath)
-			try {
-				await writeFile(typeDeclarationPath, typeDeclaration)
-			} catch (error) {
-				assert(error instanceof Error)
+			await writeFile(typeDeclarationPath, typeDeclaration).catch(error => {
+				assert(error instanceof Error, "src/bin/hsm.ts:365:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
-				await writeFile(typeDeclarationPath, typeDeclaration)
-			}
+				return writeFile(typeDeclarationPath, typeDeclaration)
+			})
 			log("Wrote type declaration to " + chalk.bold(typeDeclarationPath))
 		}
 		break
@@ -414,8 +286,14 @@ switch (commands[0]) {
 		switch (commands[1]) {
 			case "get":
 				{
-					const key = commands[2]
-					key ? log(exploreObject(await configPromise, key.split("."))) : console.log(await configPromise)
+					const key = commands[2],
+						config = await configPromise
+					if (key) {
+						const [value, error] = catchError(() => getDeepObjectProperty(config, key.split(".")))
+						error ? logError("Could not get key " + colourV(key))
+						: "string" == typeof value ? log(value)
+						: console.log(value)
+					} else console.log(config)
 				}
 				break
 			case "delete":
@@ -426,14 +304,16 @@ switch (commands[0]) {
 						logHelp()
 						break
 					}
-					const keyParts = key.split("."),
-						pathName = keyParts
-							.map(name => (/^[a-z_$][\w$]*$/i.test(name) ? name : JSON.stringify(name)))
-							.join("."),
-						lastKey = keyParts.pop(),
-						config = await configPromise
-					delete exploreObject(config, keyParts)?.[lastKey]
-					log(`Removed ${colourV(pathName)} from config file`)
+					const keys = key.split("."),
+						lastKey = keys.pop(),
+						config = await configPromise,
+						object = getDeepObjectProperty(config, keys)
+					if (isRecord(object)) {
+						delete object[lastKey]
+						await updateConfig(config)
+						log(`Removed ${colourV(key)} from config file:`)
+						console.log(config)
+					} else log("Could not delete " + colourV(key))
 				}
 				break
 			case "set":
@@ -445,49 +325,20 @@ switch (commands[0]) {
 						logHelp()
 						break
 					}
-					const keys = key.split("."),
-						pathName = keys
-							.map(name => (/^[a-z_$][\w$]*$/i.test(name) ? name : JSON.stringify(name)))
-							.join(".")
 					if (!value) {
-						logError(`Must provide a value for the key ${pathName}\n`)
+						logError(`Must provide a value for the key ${colourV(key)}\n`)
 						logHelp()
 						break
 					}
-					const lastKey = keys.pop(),
-						config = await configPromise
-					if (keys.length || "hackmudPath" != lastKey) {
-						let object = config
-						for (const key of keys)
-							if ("object" == typeof object[key]) object = object[key]
-							else {
-								object[key] = {}
-								object = object[key]
-							}
-						object[lastKey] = value
-					} else config.hackmudPath = resolve(value.startsWith("~/") ? homedir() + value.slice(1) : value)
+					const config = await configPromise
+					setDeepObjectProperty(config, key.split("."), value)
+					log(`Set ${colourV(key)} to ${colourV(value)}:`)
 					console.log(config)
-					await (async config => {
-						const json = JSON.stringify(config, void 0, "\t")
-						configDidNotExist && log("Creating config file at " + configFilePath)
-						await writeFile(configFilePath, json).catch(async error => {
-							switch (error.code) {
-								case "EISDIR":
-									await rmdir(configFilePath)
-									break
-								case "ENOENT":
-									await mkdir(configDirectoryPath)
-									break
-								default:
-									throw error
-							}
-							await writeFile(configFilePath, json)
-						})
-					})(config)
+					await updateConfig(config)
 				}
 				break
 			default:
-				commands[1] && logError(`Unknown command: ${JSON.stringify(commands[1])}\n`)
+				commands[1] && logError(`Unknown command: ${colourL(commands[1])}\n`)
 				logHelp()
 		}
 		break
@@ -554,36 +405,31 @@ switch (commands[0]) {
 					: fileBaseName + ".js"
 				)
 			const golfFile = () =>
-				readFile(target, { encoding: "utf-8" }).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(async error => {
-								if (!commands[2] || "EISDIR" != error.code) throw error
-								outputPath = resolve(outputPath, basename(target, fileExtension) + ".js")
-								await writeFilePersistent(outputPath, script)
-							})
-							.then(
-								() =>
-									log(
-										`Wrote ${chalk.bold(countHackmudCharacters(script))} chars to ${chalk.bold(relative(".", outputPath))} | took ${Math.round(100 * timeTook) / 100}ms`
-									),
-								error => logError(error.message)
+				readFile(target, { encoding: "utf-8" }).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`
 							)
-					},
-					error => logError(error.message)
-				)
+						)
+				})
 			if (options.get("watch")) {
 				const { watch: watchFile } = await chokidarModule
 				watchFile(target, { awaitWriteFinish: { stabilityThreshold: 100 } })
@@ -594,7 +440,110 @@ switch (commands[0]) {
 		}
 		break
 	default:
-		commands[0] && logError(`Unknown command: ${JSON.stringify(commands[0])}\n`)
+		commands[0] && logError(`Unknown command: ${colourL(commands[0])}\n`)
 		logHelp()
 }
 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`
+	console.log(colourN("Version") + colourS(": ") + colourV("0.19.1-531ddb2"))
+	switch (commands[0]) {
+		case "config":
+			switch (commands[1]) {
+				case "get":
+					console.log(
+						`\n${colourJ("Retrieve a value from the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(`${commands[0]} ${commands[1]}`)} ${colourB("<key>")}`
+					)
+					break
+				case "set":
+					console.log(
+						`\n${colourJ("Assign a value to the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(`${commands[0]} ${commands[1]}`)} ${colourB("<key> <value>")}`
+					)
+					break
+				case "delete":
+					console.log(
+						`\n${colourJ("Remove a key and value from the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(`${commands[0]} ${commands[1]}`)} ${colourB("<key>")}`
+					)
+					break
+				default:
+					console.log(
+						colourS(
+							`${colourN("Config path")}: ${colourV(configFilePath)}\n\n${colourJ("Modify the config file")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0] + " get")} ${colourB("<key>")}\n    Retrieve a value from the config file\n${colourC("hsm")} ${colourL(commands[0] + " set")} ${colourB("<key> <value>")}\n    Assign a value to the config file\n${colourC("hsm")} ${colourL(commands[0] + " delete")} ${colourB("<key>")}\n    Remove a key and value from the config file`
+						)
+					)
+			}
+			break
+		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${"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\tPushes 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\tPushes 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\tPushes 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\tPushes 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>")}`
+				)
+			)
+			break
+		case "minify":
+		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`
+				)
+			)
+			break
+		case "generate-type-declaration":
+		case "gen-type-declaration":
+		case "gen-dts":
+		case "gen-types":
+			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]")}`
+				)
+			)
+			break
+		case "sync-macros":
+			console.log("\n" + colourJ("Sync macros across all hackmud users"))
+			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("config")}\n    Modify and view the config file\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory`
+				)
+			)
+	}
+}
+async function updateConfig(config) {
+	const json = JSON.stringify(config, void 0, "\t")
+	configDidNotExist && log("Creating config file at " + configFilePath)
+	await writeFile(configFilePath, json).catch(async error => {
+		switch (error.code) {
+			case "EISDIR":
+				await rmdir(configFilePath)
+				break
+			case "ENOENT":
+				await mkdir(configDirectoryPath)
+				break
+			default:
+				throw error
+		}
+		await writeFile(configFilePath, json)
+	})
+}
+function logInfo({ file, users, minLength, error }, hackmudPath) {
+	error ?
+		logError(`error "${chalk.bold(error.message)}" in ${chalk.bold(file)}`)
+	:	console.log(
+			`pushed ${chalk.bold(file)} to ${users.map(user => chalk.bold(userColours.get(user))).join(", ")} | ${chalk.bold(minLength + "")} chars | ${chalk.bold(resolve(hackmudPath, users[0], "scripts", basename(file, extname(file))) + ".js")}`
+		)
+}
+function logError(message) {
+	console.error(colourD(message))
+	process.exitCode = 1
+}

package/generateTypeDeclaration.js

@@ -1,31 +1,31 @@
-import { readdir } from "fs/promises"
+import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
 import { basename, resolve } from "path"
-const generateTypeDeclaration = async (sourceDirectory, hackmudPath) => {
+async function generateTypeDeclaration(sourceDirectory, hackmudPath) {
 	const users = new Set()
 	if (hackmudPath)
-		for (const dirent of await readdir(hackmudPath, { withFileTypes: !0 }))
-			dirent.isFile() && dirent.name.endsWith(".key") && users.add(basename(dirent.name, ".key"))
+		for (const { stats, name } of await readDirectoryWithStats(hackmudPath))
+			stats.isFile() && name.endsWith(".key") && users.add(basename(name, ".key"))
 	const wildScripts = [],
 		wildAnyScripts = [],
 		allScripts = {},
 		allAnyScripts = {}
 	await Promise.all(
-		(await readdir(sourceDirectory, { withFileTypes: !0 })).map(async dirent => {
-			if (dirent.isFile())
-				dirent.name.endsWith(".ts") ?
-					dirent.name.endsWith(".d.ts") || wildScripts.push(basename(dirent.name, ".ts"))
-				:	dirent.name.endsWith(".js") && wildAnyScripts.push(basename(dirent.name, ".js"))
-			else if (dirent.isDirectory()) {
+		(await readDirectoryWithStats(sourceDirectory)).map(async ({ stats, name }) => {
+			if (stats.isFile())
+				name.endsWith(".ts") ?
+					name.endsWith(".d.ts") || wildScripts.push(basename(name, ".ts"))
+				:	name.endsWith(".js") && wildAnyScripts.push(basename(name, ".js"))
+			else if (stats.isDirectory()) {
 				const scripts = [],
 					anyScripts = []
-				allScripts[dirent.name] = scripts
-				allAnyScripts[dirent.name] = anyScripts
-				users.add(dirent.name)
-				for (const file of await readdir(resolve(sourceDirectory, dirent.name), { withFileTypes: !0 }))
-					file.isFile() &&
-						(file.name.endsWith(".ts") ?
-							dirent.name.endsWith(".d.ts") || scripts.push(basename(file.name, ".ts"))
-						:	file.name.endsWith(".js") && anyScripts.push(basename(file.name, ".js")))
+				allScripts[name] = scripts
+				allAnyScripts[name] = anyScripts
+				users.add(name)
+				for (const child of await readDirectoryWithStats(resolve(sourceDirectory, name)))
+					child.stats.isFile() &&
+						(child.name.endsWith(".ts") ?
+							name.endsWith(".d.ts") || scripts.push(basename(child.name, ".ts"))
+						:	child.name.endsWith(".js") && anyScripts.push(basename(child.name, ".js")))
 			}
 		})
 	)

package/index.js

@@ -5,7 +5,7 @@ export { pull } from "./pull.js"
 export { push } from "./push.js"
 export { syncMacros } from "./syncMacros.js"
 export { watch } from "./watch.js"
-import "fs/promises"
+import "@samual/lib/readDirectoryWithStats"
 import "path"
 import "@babel/generator"
 import "@babel/parser"
@@ -47,4 +47,5 @@ import "@samual/lib/clearObject"
 import "@samual/lib/copyFilePersistent"
 import "@samual/lib/Cache"
 import "@samual/lib/writeFilePersistent"
+import "fs/promises"
 import "chokidar"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.19.1-3ef8894",
+  "version": "0.19.1-531ddb2",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",
@@ -59,7 +59,7 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@samual/lib": "^0.10.1",
+    "@samual/lib": "0.10.2-e64c5bc",
     "acorn": "^8.11.3",
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
@@ -69,17 +69,15 @@
     "rollup": "^4.14.2",
     "terser": "^5.30.3"
   },
-  "engines": {
-    "node": "^18 || >=20",
-    "pnpm": "^9.0.1"
-  },
   "type": "module",
   "exports": {
     "./*": "./*.js",
     "./*.js": "./*.js"
   },
   "bin": {
-    "hsm.d": "bin/hsm.d.ts",
     "hsm": "bin/hsm.js"
+  },
+  "engines": {
+    "node": "^18 || >=20"
   }
 }