hackmud-script-manager 0.20.4-a7d8309 → 0.20.4-ae3052c

package/bin/hsm.js

@@ -24,16 +24,16 @@ const formatOption = name => colourN(`-${1 == name.length ? "" : "-"}${name}`),
 	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)
@@ -62,9 +62,10 @@ process.version.startsWith("v21.") &&
 		)
 	)
 if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
-	console.log("0.20.4-a7d8309")
+	console.log("0.20.4-ae3052c")
 	process.exit()
 }
+let warnedDeprecatedEmitDtsAlias = !1
 if (popOption("help", "h")?.value) {
 	logHelp()
 	process.exit()
@@ -77,10 +78,18 @@ switch (commands[0]) {
 	case "golf":
 	case "minify":
 		{
-			const noMinifyOption = popOption("no-minify", "skip-minify"),
-				mangleNamesOption = popOption("mangle-names"),
+			const noMinifyOption = popOption("no-minify", "skip-minify")
+			noMinifyOption &&
+				"no-minify" != noMinifyOption.name &&
+				console.warn(
+					colourF(
+						`Warning: ${formatOption(noMinifyOption.name)} is 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`
+					)
+				)
+			const mangleNamesOption = popOption("mangle-names"),
 				forceQuineCheatsOption = popOption("force-quine-cheats"),
-				noMinifyIncompatibleOption = mangleNamesOption || forceQuineCheatsOption
+				noQuineCheatsOptions = popOption("no-quine-cheats"),
+				noMinifyIncompatibleOption = mangleNamesOption || forceQuineCheatsOption || noQuineCheatsOptions
 			if (noMinifyOption && noMinifyIncompatibleOption) {
 				logError(
 					`Options ${formatOption(noMinifyOption.name)} and ${formatOption(noMinifyIncompatibleOption.name)} are incompatible\n`
@@ -88,9 +97,17 @@ switch (commands[0]) {
 				logHelp()
 				process.exit(1)
 			}
+			if (forceQuineCheatsOption && noQuineCheatsOptions) {
+				logError(
+					`Options ${formatOption(forceQuineCheatsOption.name)} and ${formatOption(noQuineCheatsOptions.name)} are incompatible\n`
+				)
+				logHelp()
+				process.exit(1)
+			}
 			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]
@@ -135,11 +152,10 @@ switch (commands[0]) {
 								scriptName,
 								filePath: target,
 								mangleNames: mangleNamesOption?.value,
-								forceQuineCheats: forceQuineCheatsOption?.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 + "")}`)
+						for (const { message } of warnings) log("Warning: " + chalk.bold(message))
 						await writeFilePersistent(outputPath, script)
 							.catch(error => {
 								if (!commands[2] || "EISDIR" != error.code) throw error
@@ -178,28 +194,8 @@ switch (commands[0]) {
 						process.exit(1)
 					}
 				} else scripts.push("*.*")
-				if ("push" == commands[0]) {
-					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) {
-							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")
-				} else {
+				const watchOption = popOption("watch")
+				if ("push" != commands[0] || watchOption?.value) {
 					const dtsPathOption = popOption(
 						"dts-path",
 						"type-declaration-path",
@@ -208,11 +204,11 @@ switch (commands[0]) {
 						"gen-types"
 					)
 					dtsPathOption &&
-						"emit-dts" != dtsPathOption.name &&
-						"gen-dts" != dtsPathOption.name &&
+						"dts-path" != dtsPathOption.name &&
+						"type-declaration-path" != dtsPathOption.name &&
 						console.warn(
 							colourF(
-								`Warning: ${colourN(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`
+								`Warning: ${formatOption(dtsPathOption.name)} is 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()
@@ -224,9 +220,54 @@ switch (commands[0]) {
 						minify: noMinifyOption && !noMinifyOption.value,
 						mangleNames: mangleNamesOption?.value,
 						onReady: () => log("Watching"),
-						forceQuineCheats: forceQuineCheatsOption?.value
+						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))
 				}
 			}
 		}
@@ -262,13 +303,14 @@ switch (commands[0]) {
 	case "gen-types":
 	case "emit-dts":
 		{
-			"emit-dts" != commands[0] &&
-				"gen-dts" != commands[0] &&
+			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`
+						`Warning: ${colourC("hsm")} ${colourL(commands[0])} is 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) {
@@ -282,7 +324,7 @@ switch (commands[0]) {
 				typeDeclaration = await generateTypeDeclaration(sourcePath, hackmudPath)
 			let typeDeclarationPath = resolve(outputPath)
 			await writeFile(typeDeclarationPath, typeDeclaration).catch(error => {
-				assert(error instanceof Error, "src/bin/hsm.ts:361: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)
@@ -300,7 +342,6 @@ 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`
 	switch (commands[0]) {
 		case "dev":
@@ -308,7 +349,7 @@ function logHelp() {
 		case "push":
 			console.log(
 				colourS(
-					`${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("--dts-path")}=${colourB("<path>")}\n    Path to generate a type declaration (.d.ts) 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
@@ -323,7 +364,7 @@ function logHelp() {
 		case "golf":
 			console.log(
 				colourS(
-					`${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
@@ -332,11 +373,12 @@ function logHelp() {
 		case "gen-dts":
 		case "gen-types":
 		case "emit-dts":
-			"emit-dts" != commands[0] &&
-				"gen-dts" != commands[0] &&
+			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`
+						`Warning: ${colourC("hsm")} ${colourL(commands[0])} is 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(
@@ -355,35 +397,49 @@ function logHelp() {
 		default:
 			console.log(
 				colourS(
-					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.20.4-a7d8309")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("dev")}\n    Watch a directory and push a script when modified\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`
+					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.20.4-ae3052c")}\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`
 				)
 			)
 	}
 }
-function logInfo({ path, users, characterCount, error }, hackmudPath) {
+function logInfo({ path, users, characterCount, error, warnings }, hackmudPath) {
 	path = relative(".", path)
-	error ?
-		logError(`Error "${chalk.bold(error.message)}" in ${chalk.bold(path)}`)
-	:	log(
+	if (error) logError(`Error "${chalk.bold(error.message)}" in ${chalk.bold(path)}`)
+	else {
+		for (const warning of warnings) console.warn(colourF("Warning: " + warning.message))
+		log(
 			`Pushed ${chalk.bold(path)} to ${users.map(user => chalk.bold(userColours.get(user))).join(", ")} | ${chalk.bold(characterCount + "")} chars | ${chalk.bold(resolve(hackmudPath, users[0], "scripts", basename(path, extname(path))) + ".js")}`
 		)
+	}
 }
 function logError(message) {
 	console.error(colourD(message))
 	process.exitCode = 1
 }
 function getHackmudPath() {
-	const hackmudPathOption = popOption("hackmud-path")?.value
-	if (null != hackmudPathOption && "string" != typeof hackmudPathOption) {
-		logError(`Option ${colourN("--hackmud-path")} must be a string, got ${colourV(hackmudPathOption)}\n`)
-		logHelp()
-		process.exit(1)
+	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
 	}
-	return (
-		hackmudPathOption ||
-		process.env.HSM_HACKMUD_PATH ||
-		("win32" == process.platform ? resolve(process.env.APPDATA, "hackmud") : resolve(homedir(), ".config/hackmud"))
-	)
+	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) {
@@ -395,16 +451,15 @@ function assertOptionIsBoolean(option) {
 function popOption(...names) {
 	const presentOptionNames = names.filter(name => options.has(name))
 	if (!presentOptionNames.length) return
-	const presentOptionNamesWithDashDash = presentOptionNames.map(formatOption)
 	if (presentOptionNames.length > 1) {
 		logError(
-			`The options ${presentOptionNamesWithDashDash.join(", ")} are aliases for each other. Please only specify one`
+			`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: presentOptionNamesWithDashDash[0], value }
+	return { name: presentOptionNames[0], value }
 }
 function complainAboutUnrecognisedOptions() {
 	if (options.size) {

package/env.d.ts

@@ -1046,6 +1046,9 @@ declare global {
 	  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
 	const _SCRIPT_USER: string
 
+	/** @deprecated Use `_SCRIPT_SUBNAME` instead. */
+	const _SCRIPT_NAME: string
+
 	/** The name of this script excluding the user and `.`.
 	  *
 	  * e.g. in the script `foo.bar`, `_SCRIPT_NAME` is `bar`.
@@ -1053,7 +1056,7 @@ declare global {
 	  * Shorter alternative to `context.this_script.split(".")[1].
 	  *
 	  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
-	const _SCRIPT_NAME: string
+	const _SCRIPT_SUBNAME: string
 
 	/** The full name of this script equivilent to `context.this_script` but should use less characters.
 	  *

package/index.d.ts

@@ -10,4 +10,7 @@ export type Info = {
     users: string[];
     characterCount: number;
     error: Error | undefined;
+    warnings: {
+        message: string;
+    }[];
 };

package/package.json

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

package/processScript/index.d.ts

@@ -26,6 +26,5 @@ export declare function processScript(code: string, { minify: shouldMinify, uniq
     script: string;
     warnings: {
         message: string;
-        line: number;
     }[];
 }>;

package/processScript/index.js

@@ -234,7 +234,7 @@ async function processScript(
 		}),
 		seclevelNames = ["NULLSEC", "LOWSEC", "MIDSEC", "HIGHSEC", "FULLSEC"]
 	code = (await bundle.generate({})).output[0].code
-	const { file, seclevel } = transform(parse(code, { sourceType: "module" }), sourceCode, {
+	const { file, seclevel, warnings } = transform(parse(code, { sourceType: "module" }), sourceCode, {
 		uniqueId,
 		scriptUser,
 		scriptName
@@ -328,6 +328,6 @@ async function processScript(
 		throw Error(
 			'you found a weird edge case where I wasn\'t able to replace illegal strings like "SC$", please report thx'
 		)
-	return { script: code, warnings: [] }
+	return { script: code, warnings }
 }
 export { minify, postprocess, preprocess, processScript, transform }

package/processScript/transform.d.ts

@@ -16,4 +16,7 @@ export type TransformOptions = LaxPartial<{
 export declare function transform(file: File, sourceCode: string, { uniqueId, scriptUser, scriptName, seclevel }: TransformOptions): {
     file: File;
     seclevel: number;
+    warnings: {
+        message: string;
+    }[];
 };

package/processScript/transform.js

@@ -22,7 +22,8 @@ const { default: traverse } = babelTraverse,
 		"BigInt"
 	]
 function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scriptName, seclevel = 4 }) {
-	const topFunctionName = `_${uniqueId}_SCRIPT_`
+	const warnings = [],
+		topFunctionName = `_${uniqueId}_SCRIPT_`
 	let program
 	traverse(file, {
 		Program(path) {
@@ -44,9 +45,17 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				referencePath.replaceWith(t.identifier(`_${uniqueId}_SCRIPT_USER_`))
 			} else
 				referencePath.replaceWith(t.stringLiteral(1 == scriptUser ? `$${uniqueId}$SCRIPT_USER$` : scriptUser))
-	if (program.scope.hasGlobal("_SCRIPT_NAME"))
+	if (program.scope.hasGlobal("_SCRIPT_NAME")) {
+		warnings.push({
+			message:
+				"Global _SCRIPT_NAME is deprecated and will be removed in the next minor release of HSM, use _SCRIPT_SUBNAME instead"
+		})
 		for (const referencePath of getReferencePathsToGlobal("_SCRIPT_NAME", program))
 			referencePath.replaceWith(t.stringLiteral(1 == scriptName ? `$${uniqueId}$SCRIPT_NAME$` : scriptName))
+	}
+	if (program.scope.hasGlobal("_SCRIPT_SUBNAME"))
+		for (const referencePath of getReferencePathsToGlobal("_SCRIPT_SUBNAME", program))
+			referencePath.replaceWith(t.stringLiteral(1 == scriptName ? `$${uniqueId}$SCRIPT_NAME$` : scriptName))
 	if (program.scope.hasGlobal("_FULL_SCRIPT_NAME"))
 		for (const referencePath of getReferencePathsToGlobal("_FULL_SCRIPT_NAME", program))
 			if (1 == scriptUser || 1 == scriptName)
@@ -68,30 +77,30 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			const referencePath = FunctionReferencePaths[0]
 			assert(
 				"MemberExpression" == referencePath.parent.type,
-				"src/processScript/transform.ts:103:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:111:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			assert(
 				"Identifier" == referencePath.parent.property.type,
-				"src/processScript/transform.ts:108:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:116:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			assert(
 				"prototype" == referencePath.parent.property.name,
-				"src/processScript/transform.ts:113:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:121:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			referencePath.parentPath.replaceWith(createGetFunctionPrototypeNode())
 		} else {
 			for (const referencePath of FunctionReferencePaths) {
 				assert(
 					"MemberExpression" == referencePath.parent.type,
-					"src/processScript/transform.ts:121:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:129:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				assert(
 					"Identifier" == referencePath.parent.property.type,
-					"src/processScript/transform.ts:126:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:134:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				assert(
 					"prototype" == referencePath.parent.property.name,
-					"src/processScript/transform.ts:131:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:139:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				functionDotPrototypeIsReferencedMultipleTimes = !0
 				referencePath.parentPath.replaceWith(t.identifier(`_${uniqueId}_FUNCTION_DOT_PROTOTYPE_`))
@@ -127,12 +136,12 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	const neededDbMethodLets = new Set()
 	if (program.scope.hasGlobal("$db"))
 		for (const referencePath of getReferencePathsToGlobal("$db", program)) {
-			assert("MemberExpression" == referencePath.parentPath.node.type, "src/processScript/transform.ts:185:69")
-			assert("Identifier" == referencePath.parentPath.node.property.type, "src/processScript/transform.ts:186:72")
+			assert("MemberExpression" == referencePath.parentPath.node.type, "src/processScript/transform.ts:193:69")
+			assert("Identifier" == referencePath.parentPath.node.property.type, "src/processScript/transform.ts:194:72")
 			const databaseOpMethodName = referencePath.parentPath.node.property.name
 			assert(
 				validDBMethods.includes(databaseOpMethodName),
-				`src/processScript/transform.ts:192:8 invalid db method "${databaseOpMethodName}", valid db methods are "${validDBMethods.join('", "')}"`
+				`src/processScript/transform.ts:200:8 invalid db method "${databaseOpMethodName}", valid db methods are "${validDBMethods.join('", "')}"`
 			)
 			if ("CallExpression" == referencePath.parentPath.parentPath?.type)
 				referencePath.parentPath.replaceWith(t.identifier(`$${uniqueId}$DB$${databaseOpMethodName}$`))
@@ -167,7 +176,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	if (program.scope.hasGlobal("Object"))
 		for (const referencePath of getReferencePathsToGlobal("Object", program))
 			if ("MemberExpression" == referencePath.parent.type && !referencePath.parent.computed) {
-				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:242:64")
+				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:250:64")
 				if ("getPrototypeOf" == referencePath.parent.property.name) {
 					referencePath.parentPath.replaceWith(t.identifier(`_${uniqueId}_GET_PROTOTYPE_OF_`))
 					needGetPrototypeOf = !0
@@ -180,7 +189,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	if (program.scope.hasGlobal("console"))
 		for (const referencePath of getReferencePathsToGlobal("console", program))
 			if ("MemberExpression" == referencePath.parent.type && !referencePath.parent.computed) {
-				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:260:64")
+				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:268:64")
 				referencePath.parentPath.replaceWith(
 					t.identifier(`_${uniqueId}_CONSOLE_METHOD_${referencePath.parent.property.name}_`)
 				)
@@ -188,13 +197,13 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			}
 	const lastStatement = program.node.body.at(-1)
 	let exportDefaultName
-	assert(lastStatement, "src/processScript/transform.ts:274:27 program is empty")
+	assert(lastStatement, "src/processScript/transform.ts:282:27 program is empty")
 	if ("ExportNamedDeclaration" == lastStatement.type) {
 		program.node.body.pop()
 		for (const specifier of lastStatement.specifiers) {
 			assert(
 				"ExportSpecifier" == specifier.type,
-				`src/processScript/transform.ts:280:51 ${specifier.type} is currently unsupported`
+				`src/processScript/transform.ts:288:51 ${specifier.type} is currently unsupported`
 			)
 			if (
 				"default" !=
@@ -296,11 +305,11 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 		let hoistedGlobalBlockFunctions = 0
 		for (const [globalBlockIndex, globalBlockStatement] of [...globalBlock.body.entries()].reverse())
 			if ("VariableDeclaration" == globalBlockStatement.type) {
-				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:394:59")
+				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:402:59")
 				const declarator = globalBlockStatement.declarations[0]
 				assert(
 					"Identifier" == declarator.id.type,
-					`src/processScript/transform.ts:398:51 declarator.id.type was "${declarator.id.type}"`
+					`src/processScript/transform.ts:406:51 declarator.id.type was "${declarator.id.type}"`
 				)
 				program.scope.crawl()
 				if (program.scope.hasGlobal(declarator.id.name)) {
@@ -315,9 +324,9 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 						Object.keys(program.scope.globals).some(global => globalBlockVariables.has(global))
 					) {
 						const binding = program.scope.getBinding(declarator.id.name)
-						assert(binding, "src/processScript/transform.ts:417:23")
+						assert(binding, "src/processScript/transform.ts:425:23")
 						for (const referencePath of binding.referencePaths) {
-							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:420:56")
+							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:428:56")
 							referencePath.replaceWith(
 								t.memberExpression(
 									t.identifier(`_${uniqueId}_G_`),
@@ -365,16 +374,16 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				} else globalBlockVariables.add(declarator.id.name)
 			} else if ("ClassDeclaration" == globalBlockStatement.type) {
 				program.scope.crawl()
-				assert(globalBlockStatement.id, "src/processScript/transform.ts:477:37")
+				assert(globalBlockStatement.id, "src/processScript/transform.ts:485:37")
 				if (program.scope.hasGlobal(globalBlockStatement.id.name)) {
 					globalBlock.body.splice(globalBlockIndex, 1)
 					const [globalBlockPath] = program.unshiftContainer("body", globalBlock),
 						[globalBlockStatementPath] = program.unshiftContainer("body", globalBlockStatement)
 					program.scope.crawl()
 					const binding = program.scope.getBinding(globalBlockStatement.id.name)
-					assert(binding, "src/processScript/transform.ts:489:22")
+					assert(binding, "src/processScript/transform.ts:497:22")
 					for (const referencePath of binding.referencePaths) {
-						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:492:55")
+						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:500:55")
 						referencePath.replaceWith(
 							t.memberExpression(t.identifier(`_${uniqueId}_G_`), t.identifier(referencePath.node.name))
 						)
@@ -566,7 +575,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				}
 		},
 		ClassBody({ node: classBody, scope, parent }) {
-			assert(t.isClass(parent), "src/processScript/transform.ts:687:30")
+			assert(t.isClass(parent), "src/processScript/transform.ts:695:30")
 			let thisIsReferenced = !1
 			for (const classMethod of classBody.body) {
 				if ("ClassMethod" != classMethod.type) continue
@@ -656,7 +665,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			)
 		}
 	})
-	return { file, seclevel }
+	return { file, seclevel, warnings }
 	function createGetFunctionPrototypeNode() {
 		const name = globalFunctionsUnder7Characters.find(name => !program.scope.hasOwnBinding(name))
 		return t.memberExpression(
@@ -666,23 +675,23 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	}
 	function processFakeSubscriptObject(fakeSubscriptObjectName, seclevel) {
 		for (const referencePath of getReferencePathsToGlobal(fakeSubscriptObjectName, program)) {
-			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:793:60")
+			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:801:60")
 			assert("Identifier" == referencePath.parent.property.type)
 			assert(
 				"MemberExpression" == referencePath.parentPath.parentPath?.node.type,
-				"src/processScript/transform.ts:795:81"
+				"src/processScript/transform.ts:803:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:796:83"
+				"src/processScript/transform.ts:804:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:800:8 invalid user "${referencePath.parent.property.name}" in subscript`
+				`src/processScript/transform.ts:808:8 invalid user "${referencePath.parent.property.name}" in subscript`
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parentPath.parentPath.node.property.name),
-				`src/processScript/transform.ts:805:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
+				`src/processScript/transform.ts:813:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
 			)
 			if ("CallExpression" == referencePath.parentPath.parentPath.parentPath?.type)
 				referencePath.parentPath.parentPath.replaceWith(

package/push.js

@@ -131,7 +131,7 @@ async function push(
 				uniqueId = Math.floor(Math.random() * 2 ** 52)
 					.toString(36)
 					.padStart(11, "0"),
-				{ script: minifiedCode } = await processScript(await readFile(path, { encoding: "utf8" }), {
+				{ script: minifiedCode, warnings } = await processScript(await readFile(path, { encoding: "utf8" }), {
 					minify,
 					scriptUser: !0,
 					scriptName,
@@ -140,7 +140,7 @@ async function push(
 					mangleNames,
 					forceQuineCheats
 				}),
-				info = { path, users, characterCount: countHackmudCharacters(minifiedCode), error: void 0 }
+				info = { path, users, characterCount: countHackmudCharacters(minifiedCode), error: void 0, warnings }
 			await Promise.all(
 				users.map(user =>
 					writeFilePersistent(

package/watch.js

@@ -73,10 +73,11 @@ async function watch(
 		: scriptName && "*" != scriptName ? wildUserScripts.add(scriptName)
 		: (pushEverything = !0)
 	}
-	const watcher = watch$1(["*.ts", "*.js", "*/*.ts", "*/*.js"], {
+	const watcher = watch$1(".", {
 		cwd: sourceDirectory,
 		awaitWriteFinish: { stabilityThreshold: 100 },
-		ignored: "*.d.ts"
+		ignored: (path, stats) =>
+			!!stats?.isFile() && !(path.endsWith(".js") || (path.endsWith(".ts") && !path.endsWith(".d.ts")))
 	}).on("change", async path => {
 		if (path.endsWith(".d.ts")) return
 		const extension = extname(path)
@@ -118,27 +119,22 @@ async function watch(
 			for (const user of scriptNamesToUsers.get(scriptName)) usersToPushToSet.add(user)
 			const usersToPushTo = [...usersToPushToSet].filter(user => !scriptNamesToUsersToSkip.has(user))
 			if (!usersToPushTo.length) {
-				onPush?.({ path, users: [], characterCount: 0, error: Error("no users to push to") })
+				onPush?.({ path, users: [], characterCount: 0, error: Error("no users to push to"), warnings: [] })
 				return
 			}
 			const uniqueId = Math.floor(Math.random() * 2 ** 52)
 					.toString(36)
 					.padStart(11, "0"),
 				filePath = resolve(sourceDirectory, path)
-			let minifiedCode
+			let minifiedCode, warnings
 			try {
-				;({ script: minifiedCode } = await processScript(await readFile(filePath, { encoding: "utf8" }), {
-					minify,
-					scriptUser: !0,
-					scriptName,
-					uniqueId,
-					filePath,
-					mangleNames,
-					forceQuineCheats
-				}))
+				;({ script: minifiedCode, warnings } = await processScript(
+					await readFile(filePath, { encoding: "utf8" }),
+					{ minify, scriptUser: !0, scriptName, uniqueId, filePath, mangleNames, forceQuineCheats }
+				))
 			} catch (error) {
-				assert(error instanceof Error, "src/watch.ts:146:36")
-				onPush?.({ path, users: [], characterCount: 0, error })
+				assert(error instanceof Error, "src/watch.ts:149:36")
+				onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 				return
 			}
 			await Promise.all(
@@ -155,7 +151,8 @@ async function watch(
 				path,
 				users: usersToPushTo,
 				characterCount: countHackmudCharacters(minifiedCode),
-				error: void 0
+				error: void 0,
+				warnings
 			})
 			return
 		}
@@ -171,9 +168,9 @@ async function watch(
 			return
 		const filePath = resolve(sourceDirectory, path),
 			sourceCode = await readFile(filePath, { encoding: "utf8" })
-		let script
+		let script, warnings
 		try {
-			;({ script } = await processScript(sourceCode, {
+			;({ script, warnings } = await processScript(sourceCode, {
 				minify,
 				scriptUser: user,
 				scriptName,
@@ -182,12 +179,12 @@ async function watch(
 				forceQuineCheats
 			}))
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:182:35")
-			onPush?.({ path, users: [], characterCount: 0, error })
+			assert(error instanceof Error, "src/watch.ts:190:35")
+			onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 			return
 		}
 		await writeFilePersistent(resolve(hackmudDirectory, user, "scripts", scriptName + ".js"), script)
-		onPush?.({ path, users: [user], characterCount: countHackmudCharacters(script), error: void 0 })
+		onPush?.({ path, users: [user], characterCount: countHackmudCharacters(script), error: void 0, warnings })
 	})
 	onReady && watcher.on("ready", onReady)
 	if (!typeDeclarationPath_) return
@@ -197,7 +194,7 @@ async function watch(
 		try {
 			await writeFile(typeDeclarationPath, typeDeclaration)
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:215:35")
+			assert(error instanceof Error, "src/watch.ts:223:35")
 			if ("EISDIR" != error.code) throw error
 			typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 			await writeFile(typeDeclarationPath, typeDeclaration)