hackmud-script-manager 0.20.4-e675c94 → 0.20.4-ec30de9

package/README.md

@@ -1,5 +1,5 @@
 # Hackmud Script Manager
-Command made for [hackmud-environment](https://github.com/samualtnorman/hackmud-environment), which is a scripting environment for hackmud with minification, autocompletes / intellisense, and TypeScript support.
+Command made for [Hackmud Scripting Environment](https://github.com/samualtnorman/hackmud-environment), which is a scripting environment for hackmud with minification, autocompletes / intellisense, and TypeScript support.
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R0XN5CX)
 

package/bin/hsm.js

@@ -5,14 +5,14 @@ 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 "@samual/lib/copyFilePersistent"
-const version = "0.20.4-e675c94",
+const version = "0.20.4-ec30de9",
 	options = new Map(),
 	commands = [],
 	userColours = new Cache(user => {
@@ -36,10 +36,6 @@ for (const argument of process.argv.slice(2))
 		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"),
@@ -57,153 +53,163 @@ 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")) {
+if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
+	console.log(version)
+	process.exit()
+}
+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")) {
+			const noMinifyOption = popOption("no-minify", "skip-minify"),
+				mangleNamesOption = popOption("mangle-names"),
+				forceQuineCheatsOption = popOption("force-quine-cheats"),
+				noMinifyIncompatibleOption = mangleNamesOption || forceQuineCheatsOption
+			if (noMinifyOption && noMinifyIncompatibleOption) {
 				logError(
-					`Options ${colourN("--mangle-names")} and ${colourN(optionsHasNoMinify ? "--no-minify" : "--skip-minify")} are incompatible\n`
+					`Options ${colourN(noMinifyOption.name)} and ${colourN(noMinifyIncompatibleOption.name)} are incompatible\n`
 				)
 				logHelp()
-				break
+				process.exit(1)
 			}
-			const shouldSkipMinify = options.get("no-minify") || options.get("skip-minify")
-			let shouldMinify
-			if (null != shouldSkipMinify) {
-				if ("boolean" != typeof shouldSkipMinify) {
+			noMinifyOption && assertOptionIsBoolean(noMinifyOption)
+			mangleNamesOption && assertOptionIsBoolean(mangleNamesOption)
+			forceQuineCheatsOption && assertOptionIsBoolean(forceQuineCheatsOption)
+			if ("golf" == commands[0] || "minify" == commands[0]) {
+				const watchOption = popOption("watch"),
+					target = commands[1]
+				if (!target) {
+					logError("Must provide target\n")
+					logHelp()
+					process.exit(1)
+				}
+				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('", "')}"`
 					)
-					logHelp()
-					break
+					process.exit(1)
 				}
-				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 { push } = await pushModule
-			;(
-				await push(sourcePath, hackmudPath, {
-					scripts,
-					onPush: info => logInfo(info, hackmudPath),
-					minify: shouldMinify,
-					mangleNames: shouldMangleNames,
-					forceQuineCheats: shouldforceQuineCheats
-				})
-			).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`)
+				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
+							}),
+							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)
 				}
-			} 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 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)
 					)
-					logHelp()
-					break
+					if (invalidScript) {
+						logError(`Invalid script name: ${JSON.stringify(invalidScript)}\n`)
+						logHelp()
+						process.exit(1)
+					}
+				} 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
+						})
+					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 typeDeclarationPathOption = popOption(
+							"type-declaration-path",
+							"type-declaration",
+							"dts",
+							"gen-types"
+						),
+						{ watch } = await watchModule
+					watch(sourcePath, hackmudPath, {
+						scripts,
+						onPush: info => logInfo(info, hackmudPath),
+						typeDeclarationPath: typeDeclarationPathOption?.value.toString(),
+						minify: noMinifyOption && !noMinifyOption.value,
+						mangleNames: mangleNamesOption?.value,
+						onReady: () => log("Watching"),
+						forceQuineCheats: forceQuineCheatsOption?.value
+					})
+					autoExit = !1
 				}
-				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":
@@ -213,7 +219,7 @@ switch (commands[0]) {
 			if (!script) {
 				logError("Must provide the script to pull\n")
 				logHelp()
-				break
+				process.exit(1)
 			}
 			const sourcePath = commands[2] || "."
 			await pull(sourcePath, hackmudPath, script).catch(error => {
@@ -234,18 +240,19 @@ switch (commands[0]) {
 	case "gen-dts":
 	case "gen-types":
 		{
-			const target = commands[1]
+			const hackmudPath = getHackmudPath(),
+				target = commands[1]
 			if (!target) {
 				logError("Must provide target directory\n")
 				logHelp()
-				break
+				process.exit(1)
 			}
 			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:327:35")
+				assert(error instanceof Error, "src/bin/hsm.ts:321:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 				return writeFile(typeDeclarationPath, typeDeclaration)
@@ -257,99 +264,6 @@ switch (commands[0]) {
 	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()
@@ -423,7 +337,7 @@ function logError(message) {
 	process.exitCode = 1
 }
 function getHackmudPath() {
-	const hackmudPathOption = options.get("hackmud-path")
+	const hackmudPathOption = popOption("hackmud-path")
 	if (null != hackmudPathOption && "string" != typeof hackmudPathOption) {
 		logError(`Option ${colourN("--hackmud-path")} must be a string, got ${colourV(hackmudPathOption)}\n`)
 		logHelp()
@@ -435,3 +349,26 @@ function getHackmudPath() {
 		("win32" == process.platform ? resolve(process.env.APPDATA, "hackmud") : resolve(homedir(), ".config/hackmud"))
 	)
 }
+function assertOptionIsBoolean(option) {
+	if ("boolean" != typeof option.value) {
+		logError(`The value for ${colourN(option.name)} must be ${colourV("true")} or ${colourV("false")}\n`)
+		logHelp()
+		process.exit(1)
+	}
+}
+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}`)
+	)
+	if (presentOptionNames.length > 1) {
+		logError(
+			`The options ${presentOptionNamesWithDashDash.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 }
+}

package/env.d.ts

@@ -1,18 +1,14 @@
-type Replace<T, R> = Omit<T, Extract<keyof R, keyof T>> & R
+type Replace<A, B> = Omit<A, keyof B> & B
 type ScriptSuccess<T = object> = { ok: true } & T
 type ScriptFailure = { ok: false, msg?: string }
 type ScriptResponse<T = object> = ScriptSuccess<T> | ScriptFailure
 type ErrorScripts = Record<string, () => ScriptFailure>
 
-type AllOptional<T> = {
-	[K in keyof T]-?: {} extends Pick<T, K> ? true : false
-}[keyof T]
+type AllOptional<T> = { [K in keyof T]-?: {} extends Pick<T, K> ? true : false }[keyof T]
 
 type Scriptor<Args = unknown, Ret = unknown> = {
-	name: string,
-	call: AllOptional<Args> extends true
-		? (args?: Args) => Ret
-		: (args: Args) => Ret
+	name: string
+	call: AllOptional<Args> extends true ? (args?: Args) => Ret : (args: Args) => Ret
 }
 
 type Subscripts = Record<string, Record<string, (...args: any) => any>> & {
@@ -41,7 +37,7 @@ type UpgradeRarityString = "`0noob`" | "`1kiddie`" | "`2h4x0r`" | "`3h4rdc0r3`"
 type UpgradeRarityNumber = 0 | 1 | 2 | 3 | 4 | 5;
 type UpgradeRarity = UpgradeRarityString | UpgradeRarityNumber;
 
-type UpgradeCore = {
+type UpgradeBase = {
 	name: string
 	type: "lock" | "script_space" | "chat" | "script" | "tool" | "bot_brain" | "glam"
 	up_class?: -1 | 0 | 1 | 2 | 3
@@ -53,9 +49,9 @@ type UpgradeCore = {
 	description: string
 }
 
-type Upgrade = UpgradeCore & Record<string, null | boolean | number | string>
+type Upgrade = UpgradeBase & Record<string, null | boolean | number | string>
 
-type CLIUpgrade = Omit<UpgradeCore, `rarity`> & {
+type CliUpgrade = Omit<UpgradeBase, `rarity`> & {
 	[x: string]: null | boolean | number | string
 	rarity: UpgradeRarityString
 }
@@ -155,7 +151,16 @@ type Fullsec = Subscripts & PlayerFullsec & {
 	market: {
 		/** **FULLSEC** */ browse: {
 			(args:
-				Partial<{ seller: string, listed_before: number, listed_after: number, cost: number | string } & Omit<CLIUpgrade, "rarity">>
+				Partial<{
+					seller: string | MongoQuerySelector<string>,
+					listed_before: number | MongoQuerySelector<number>,
+					listed_after: number,
+					cost: number | MongoQuerySelector<number> | string,
+					rarity: UpgradeRarityNumber | MongoQuerySelector<UpgradeRarityNumber>,
+					name: string | MongoQuerySelector<string>
+				} & Omit<{
+					[k in keyof CliUpgrade]: CliUpgrade[k] | MongoQuerySelector<CliUpgrade[k]>
+				}, "rarity">>
 			): { i: string, name: string, rarity: Upgrade["rarity"], cost: number }[] | ScriptFailure
 
 			<I extends string>(args: { i: I }): {
@@ -357,7 +362,7 @@ type Fullsec = Subscripts & PlayerFullsec & {
 			  * const arr = [ 1, 2, 2, 3, 2 ]
 			  *
 			  * $D(uniq(arr)) // [ 1, 2, 3, 2 ] */
-			uniq: (array: T[]) => T[]
+			uniq: <T>(array: T[]) => T[]
 
 			/** Sorts an array of numbers or number-coercible strings in descending order. */
 			u_sort_num_arr_desc: <T>(array: T[]) => T[]
@@ -424,17 +429,17 @@ type Fullsec = Subscripts & PlayerFullsec & {
 		upgrades_of_owner: {
 			<F extends Partial<Upgrade & { loaded: boolean }> = object>(args?: { filter?: F, full?: false }): (
 				Omit<
-					Pick<UpgradeCore, "tier" | "rarity" | "name" | "type" | "i" | "loaded">,
+					Pick<UpgradeBase, "tier" | "rarity" | "name" | "type" | "i" | "loaded">,
 					keyof F
 				> & Pick<F, "tier" | "rarity" | "name" | "type" | "i" | "loaded">
 			)[] | ScriptFailure
 
 			<F extends Partial<Upgrade & { loaded: boolean }> = object>(args: { filter?: F, full: true }): (
-				Omit<UpgradeCore, keyof F> & F & Record<string, null | boolean | number | string>
+				Omit<UpgradeBase, keyof F> & F & Record<string, null | boolean | number | string>
 			)[] | ScriptFailure
 
 			<I extends number>(args: { i: I }): (
-				Omit<UpgradeCore, "i"> & { [x: string]: null | boolean | number | string, i: I }
+				Omit<UpgradeBase, "i"> & { [x: string]: null | boolean | number | string, i: I }
 			) | ScriptFailure
 		}
 
@@ -511,7 +516,7 @@ type Highsec = Fullsec & PlayerHighsec & {
 		/** **HIGHSEC** */
 		upgrades: {
 			<I extends number>(args: { i: I }): (
-				Omit<UpgradeCore, "i"> & { [x: string]: null | boolean | number | string, i: I }
+				Omit<UpgradeBase, "i"> & { [x: string]: null | boolean | number | string, i: I }
 			) | ScriptFailure
 
 			<F extends Partial<Upgrade & { loaded: boolean }> = object>(args?: {
@@ -519,20 +524,20 @@ type Highsec = Fullsec & PlayerHighsec & {
 				is_script?: true
 				full?: false
 			}): (
-				Omit<Pick<UpgradeCore, "tier" | "rarity" | "name" | "type" | "i" | "loaded">, keyof F> & F &
+				Omit<Pick<UpgradeBase, "tier" | "rarity" | "name" | "type" | "i" | "loaded">, keyof F> & F &
 					Record<string, null | boolean | number | string>
 			)[] | ScriptFailure
 
 			<F extends Partial<Upgrade & { loaded: boolean }> = object>(args?:
 				{ filter?: F, is_script?: true, full: true }
-			): (Omit<UpgradeCore, keyof F> & F & Record<string, null | boolean | number | string>)[] | ScriptFailure
+			): (Omit<UpgradeBase, keyof F> & F & Record<string, null | boolean | number | string>)[] | ScriptFailure
 
 			(args?: { filter?: Partial<Upgrade & { loaded: boolean }>, is_script: false, full?: false }):
 				{ msg: string, upgrades: string[] } | ScriptFailure
 
 			<F extends Partial<Upgrade & { loaded: boolean }> = object>(
 				args?: { filter?: F, is_script: false, full: true }
-			): (Omit<UpgradeCore, keyof F | `rarity`> & F & {
+			): (Omit<UpgradeBase, keyof F | `rarity`> & F & {
 				[x: string]: null | boolean | number | string
 				rarity: UpgradeRarityString
 			})[] | ScriptFailure
@@ -714,10 +719,50 @@ type Nullsec = Lowsec & PlayerNullsec & {
 	}
 }
 
+type MongoTypeString = "minKey" | "double" | "string" | "object" | "array" | "binData" | "undefined" | "objectId" |
+	"bool" | "date" | "null" | "regex" | "dbPointer" | "javascript" | "symbol" | "int" | "timestamp" | "long" | "decimal" | "maxKey";
+type MongoTypeNumber = -1 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 16 | 17 | 18 | 19 | 127;
+
 type MongoValue = string | number | boolean | Date | MongoValue[] | { [key: string]: MongoValue } | null
 
 type MongoCommandValue = string | number | boolean | Date | MongoCommandValue[] | { [key: string]: MongoCommandValue } |
-	null | undefined
+null | undefined
+
+/**
+ * Currently unused
+ */
+type MongoLogicalSelectors<T extends MongoValue = MongoValue> = {
+	$not: T | MongoComparisonSelectors<T> | MongoLogicalSelectors<T>
+	$nor: T[]
+	$or: T[]
+	$and: T[]
+}
+
+type MongoArraySelectors<T extends Array<MongoValue> = Array<MongoValue>> = {
+	$all: T
+	$elemMatch: T
+	$size: number
+}
+
+type MongoComparisonSelectors<T extends MongoValue = MongoValue> = {
+	$eq: T
+	$gt: T
+	$gte: T
+	$in: T[]
+	$lt: T
+	$lte: T
+	$ne: T
+	$nin: T[]
+}
+
+type MongoElementSelectors = {
+	$exists: boolean
+	$type: MongoTypeNumber | MongoTypeString
+}
+
+type MongoQuerySelector<T extends MongoValue = MongoValue> = Partial<T extends MongoValue[] ?
+	(MongoArraySelectors<T> & MongoElementSelectors & MongoComparisonSelectors<T>) :
+	(MongoElementSelectors & MongoComparisonSelectors<T>)>
 
 type Query = { [key: string]: MongoValue | Query } & { _id?: Id, $in?: MongoValue[] }
 type Projection = Record<string, boolean | 0 | 1>
@@ -766,7 +811,7 @@ type Cursor = {
 	ObjectId: () => any
 }
 
-type CLIContext = {
+type CliContext = {
 	/** The name of the user who is calling the script. */ caller: string
 	/** The name of this script. */ this_script: string
 	/** The number of columns in the caller’s terminal. */ cols: number
@@ -774,17 +819,23 @@ type CLIContext = {
 
 	/** The name of the script that directly called this script, or null if called on the command line or as a
 	  * scriptor. */ calling_script: null
+	is_scriptor?: undefined
+	is_brain?: undefined
 }
 
-type SubscriptContext = Replace<CLIContext, {
+type SubscriptContext = Replace<CliContext, {
 	/** The name of the script that directly called this script, or null if called on the command line or as a scriptor.
 	  */
 	calling_script: string
 }>
 
-type ScriptorContext = CLIContext & { /** Whether the script is being run as a scriptor. */ is_scriptor: true }
-type BrainContext = CLIContext & { /** Whether the script is being run via a bot brain. */ is_brain: true }
-type Context = CLIContext | SubscriptContext | ScriptorContext | BrainContext
+type ScriptorContext =
+	Replace<CliContext, { /** Whether the script is being run as a scriptor. */ is_scriptor: true }>
+
+type BrainContext =
+	Replace<CliContext, { /** Whether the script is being run via a bot brain. */ is_brain: true }>
+
+type Context = CliContext | SubscriptContext | ScriptorContext | BrainContext
 
 /** Subscript space that can call FULLSEC scripts. */ declare const $fs: Fullsec
 
@@ -827,6 +878,8 @@ declare const $0s: typeof $ns
   * } */
 declare const $s: Nullsec
 
+type ObjectId = { $oid: string }
+
 declare const $db: {
 	/** Insert a document or documents into a collection.
 	  * @param documents A document or array of documents to insert into the collection. */
@@ -920,6 +973,8 @@ declare const $db: {
 			signature: { hash: "Undefined Conversion", keyId: "Undefined Conversion" }
 		}
 	}
+
+	ObjectId: () => ObjectId
 }
 
 /** Debug Log.
@@ -956,7 +1011,7 @@ declare const $FMCL: undefined | true
   * @example
   * if (!$G.dbCache)
   * 	$G.dbCache = $db.f({ whatever: true }).first() */
-declare const $G: any
+declare const $G: Record<string | symbol, any>
 
 /** This contains a JS timestamp (not Date) set immediately before your code begins running.
   * @example
@@ -1005,3 +1060,14 @@ declare const _FULL_SCRIPT_NAME: string
   *
   * In rare cases where it's not known at build time, it's `-1`. */
 declare const _SECLEVEL: -1 | 0 | 1 | 2 | 3 | 4
+
+type DeepFreeze<T> = { readonly [P in keyof T]: DeepFreeze<T[P]> }
+
+/** Recursively
+  * [`Object.freeze()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/freeze)
+  * an object and its properties' objects and its properties' objects and so on.
+  *
+  * [Official Hackmud Wiki](https://wiki.hackmud.com/scripting/extensions/deep_freeze) */
+declare const DEEP_FREEZE: <T>(value: T) => DeepFreeze<T>
+
+declare const _RUN_ID: string

package/package.json

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

package/processScript/index.js

@@ -323,7 +323,7 @@ async function processScript(
 			trailingComma: "none"
 		})
 	}
-	code = postprocess(code, seclevel, uniqueId)
+	code = postprocess(code, uniqueId)
 	if (includesIllegalString(code))
 		throw Error(
 			'you found a weird edge case where I wasn\'t able to replace illegal strings like "SC$", please report thx'

package/processScript/minify.js

@@ -43,15 +43,6 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 			)
 		}
 	}
-	const hashGReferencePaths = getReferencePathsToGlobal(`$${uniqueId}$GLOBAL$`, program)
-	if (hashGReferencePaths.length > 3) {
-		for (const path of hashGReferencePaths) path.replaceWith(t.identifier(`_${uniqueId}_G_`))
-		mainFunctionPath.node.body.body.unshift(
-			t.variableDeclaration("let", [
-				t.variableDeclarator(t.identifier(`_${uniqueId}_G_`), t.identifier(`$${uniqueId}$GLOBAL$`))
-			])
-		)
-	}
 	const jsonValues = []
 	let scriptBeforeJSONValueReplacement,
 		comment,
@@ -61,7 +52,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		traverse(fileBeforeJSONValueReplacement, {
 			MemberExpression({ node: memberExpression }) {
 				if (!memberExpression.computed) {
-					assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:127:60")
+					assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:115:60")
 					if ("prototype" == memberExpression.property.name) {
 						memberExpression.computed = !0
 						memberExpression.property = t.identifier(`_${uniqueId}_PROTOTYPE_PROPERTY_`)
@@ -136,7 +127,8 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		const promises = []
 		traverse(file, {
 			FunctionDeclaration(path) {
-				path.traverse({
+				const body = path.get("body")
+				body.traverse({
 					Function(path) {
 						"CallExpression" != path.parent.type && "callee" != path.parentKey && path.skip()
 					},
@@ -152,7 +144,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 							path.replaceWith(t.identifier(`_${uniqueId}_JSON_VALUE_${jsonValues.push(o) - 1}_`))
 					}
 				})
-				path.traverse({
+				body.traverse({
 					TemplateLiteral(path) {
 						if ("TaggedTemplateExpression" == path.parent.type) return
 						const templateLiteral = path.node
@@ -172,7 +164,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 					},
 					MemberExpression({ node: memberExpression }) {
 						if (!memberExpression.computed) {
-							assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:259:62")
+							assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:249:62")
 							if (!(memberExpression.property.name.length < 3)) {
 								memberExpression.computed = !0
 								memberExpression.property = t.stringLiteral(memberExpression.property.name)
@@ -246,7 +238,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		})
 		await Promise.all(promises)
 		const functionDeclaration = file.program.body[0]
-		assert("FunctionDeclaration" == functionDeclaration.type, "src/processScript/minify.ts:364:61")
+		assert("FunctionDeclaration" == functionDeclaration.type, "src/processScript/minify.ts:354:61")
 		if (jsonValues.length) {
 			hasComment = !0
 			if (1 == jsonValues.length)
@@ -258,7 +250,10 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 								t.memberExpression(
 									t.taggedTemplateExpression(
 										t.memberExpression(
-											t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$scripts$quine$`), []),
+											t.callExpression(
+												t.identifier(`$${uniqueId}$4$SUBSCRIPT$scripts$quine$`),
+												[]
+											),
 											t.identifier("split")
 										),
 										t.templateLiteral([t.templateElement({ raw: "\t", cooked: "\t" }, !0)], [])
@@ -282,7 +277,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 							t.memberExpression(
 								t.taggedTemplateExpression(
 									t.memberExpression(
-										t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$scripts$quine$`), []),
+										t.callExpression(t.identifier(`$${uniqueId}$4$SUBSCRIPT$scripts$quine$`), []),
 										t.identifier("split")
 									),
 									t.templateLiteral([t.templateElement({ raw: "\t", cooked: "\t" }, !0)], [])
@@ -307,7 +302,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 							t.memberExpression(
 								t.taggedTemplateExpression(
 									t.memberExpression(
-										t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$scripts$quine$`), []),
+										t.callExpression(t.identifier(`$${uniqueId}$4$SUBSCRIPT$scripts$quine$`), []),
 										t.identifier("split")
 									),
 									t.templateLiteral([t.templateElement({ raw: "\t", cooked: "\t" }, !0)], [])
@@ -363,7 +358,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		)
 	}
 	if (1 == forceQuineCheats) return code
-	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:495:43")
+	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:485:43")
 	return (
 			countHackmudCharacters(scriptBeforeJSONValueReplacement) <=
 				countHackmudCharacters(code) + Number(hasComment)
@@ -379,7 +374,7 @@ function parseObjectExpression(node, o) {
 			"Identifier" == property.key.type ||
 				"NumericLiteral" == property.key.type ||
 				"StringLiteral" == property.key.type,
-			"src/processScript/minify.ts:517:4"
+			"src/processScript/minify.ts:507:4"
 		)
 		if ("ArrayExpression" == property.value.type) {
 			const childArray = []

package/processScript/postprocess.d.ts

@@ -1 +1 @@
-export declare const postprocess: (code: string, seclevel: number, uniqueId: string) => string;
+export declare const postprocess: (code: string, uniqueId: string) => string;

package/processScript/postprocess.js

@@ -1,12 +1,12 @@
-const postprocess = (code, seclevel, uniqueId) =>
+const postprocess = (code, uniqueId) =>
 	code
-		.replace(/^function\s*\w+\(/, "function(")
+		.replace(/^function\s*[\w$]+\(/, "function(")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$SC_DOLLAR\\$`, "g"), "S\\C$")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$DB_DOLLAR\\$`, "g"), "D\\B$")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$D\\$`, "g"), "_\\_D_S")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$FMCL\\$`, "g"), "_\\_FMCL_")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$G\\$`, "g"), "_\\_G_")
-		.replace(RegExp(`\\$${uniqueId}\\$SUBSCRIPT\\$(\\w+)\\$(\\w+)\\$`, "g"), `#${"nlmhf"[seclevel]}s.$1.$2`)
+		.replace(RegExp(`\\$${uniqueId}\\$(\\d)\\$SUBSCRIPT\\$(\\w+)\\$(\\w+)\\$`, "g"), "#$1s.$2.$3")
 		.replace(RegExp(`\\$${uniqueId}\\$DEBUG\\$`, "g"), "#D")
 		.replace(RegExp(`\\$${uniqueId}\\$FMCL\\$`, "g"), "#FMCL")
 		.replace(RegExp(`\\$${uniqueId}\\$GLOBAL\\$`, "g"), "#G")

package/processScript/transform.js

@@ -101,29 +101,29 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			functionDotPrototypeIsReferencedMultipleTimes = !0
 		}
 	}
-	const neededSubscriptLets = new Set()
+	const neededSubscriptLets = new Map()
 	let detectedSeclevel = 4
 	for (const fakeSubscriptObjectName of ["$fs", "$4s", "$s"])
-		program.scope.hasGlobal(fakeSubscriptObjectName) && processFakeSubscriptObject(fakeSubscriptObjectName)
+		program.scope.hasGlobal(fakeSubscriptObjectName) && processFakeSubscriptObject(fakeSubscriptObjectName, 4)
 	for (const fakeSubscriptObjectName of ["$hs", "$3s"])
 		if (program.scope.hasGlobal(fakeSubscriptObjectName)) {
 			detectedSeclevel = 3
-			processFakeSubscriptObject(fakeSubscriptObjectName)
+			processFakeSubscriptObject(fakeSubscriptObjectName, 3)
 		}
 	for (const fakeSubscriptObjectName of ["$ms", "$2s"])
 		if (program.scope.hasGlobal(fakeSubscriptObjectName)) {
 			detectedSeclevel = 2
-			processFakeSubscriptObject(fakeSubscriptObjectName)
+			processFakeSubscriptObject(fakeSubscriptObjectName, 2)
 		}
 	for (const fakeSubscriptObjectName of ["$ls", "$1s"])
 		if (program.scope.hasGlobal(fakeSubscriptObjectName)) {
 			detectedSeclevel = 1
-			processFakeSubscriptObject(fakeSubscriptObjectName)
+			processFakeSubscriptObject(fakeSubscriptObjectName, 1)
 		}
 	for (const fakeSubscriptObjectName of ["$ns", "$0s"])
 		if (program.scope.hasGlobal(fakeSubscriptObjectName)) {
 			detectedSeclevel = 0
-			processFakeSubscriptObject(fakeSubscriptObjectName)
+			processFakeSubscriptObject(fakeSubscriptObjectName, 0)
 		}
 	seclevel = Math.min(seclevel, detectedSeclevel)
 	const neededDbMethodLets = new Set()
@@ -157,9 +157,10 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	if (program.scope.hasGlobal("$FMCL"))
 		for (const referencePath of getReferencePathsToGlobal("$FMCL", program))
 			referencePath.replaceWith(t.identifier(`$${uniqueId}$FMCL$`))
-	if (program.scope.hasGlobal("$G"))
+	let needG = program.scope.hasGlobal("$G")
+	if (needG)
 		for (const referencePath of getReferencePathsToGlobal("$G", program))
-			referencePath.replaceWith(t.identifier(`$${uniqueId}$GLOBAL$`))
+			referencePath.replaceWith(t.identifier(`_${uniqueId}_G_`))
 	if (program.scope.hasGlobal("_SECLEVEL"))
 		for (const referencePath of getReferencePathsToGlobal("_SECLEVEL", program))
 			referencePath.replaceWith(t.numericLiteral(seclevel))
@@ -167,7 +168,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:241:64")
+				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:243:64")
 				if ("getPrototypeOf" == referencePath.parent.property.name) {
 					referencePath.parentPath.replaceWith(t.identifier(`_${uniqueId}_GET_PROTOTYPE_OF_`))
 					needGetPrototypeOf = !0
@@ -177,7 +178,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:256:64")
+				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:258:64")
 				referencePath.parentPath.replaceWith(
 					t.identifier(`_${uniqueId}_CONSOLE_METHOD_${referencePath.parent.property.name}_`)
 				)
@@ -185,13 +186,13 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			}
 	const lastStatement = program.node.body.at(-1)
 	let exportDefaultName
-	assert(lastStatement, "src/processScript/transform.ts:270:27 program is empty")
+	assert(lastStatement, "src/processScript/transform.ts:272: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:276:51 ${specifier.type} is currently unsupported`
+				`src/processScript/transform.ts:278:51 ${specifier.type} is currently unsupported`
 			)
 			const exportedName =
 				"Identifier" == specifier.exported.type ? specifier.exported.name : specifier.exported.value
@@ -314,11 +315,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:410:59")
+				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:412:59")
 				const declarator = globalBlockStatement.declarations[0]
 				assert(
 					"Identifier" == declarator.id.type,
-					`src/processScript/transform.ts:414:51 declarator.id.type was "${declarator.id.type}"`
+					`src/processScript/transform.ts:416:51 declarator.id.type was "${declarator.id.type}"`
 				)
 				program.scope.crawl()
 				if (program.scope.hasGlobal(declarator.id.name)) {
@@ -333,15 +334,16 @@ 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:433:23")
+						assert(binding, "src/processScript/transform.ts:435:23")
 						for (const referencePath of binding.referencePaths) {
-							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:436:56")
+							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:438:56")
 							referencePath.replaceWith(
 								t.memberExpression(
-									t.identifier(`$${uniqueId}$GLOBAL$`),
+									t.identifier(`_${uniqueId}_G_`),
 									t.identifier(referencePath.node.name)
 								)
 							)
+							needG = !0
 						}
 						for (const referencePath of binding.constantViolations)
 							if ("AssignmentExpression" == referencePath.node.type)
@@ -350,12 +352,13 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 										clearObject(node)
 										Object.assign(
 											node,
-											t.memberExpression(t.identifier(`$${uniqueId}$GLOBAL$`), t.identifier(name))
+											t.memberExpression(t.identifier(`_${uniqueId}_G_`), t.identifier(name))
 										)
+										needG = !0
 									}
 						globalBlockPath.remove()
 						globalBlockStatementPath.remove()
-						declarator.init &&
+						if (declarator.init) {
 							globalBlock.body.splice(
 								globalBlockIndex,
 								0,
@@ -363,13 +366,15 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 									t.assignmentExpression(
 										"=",
 										t.memberExpression(
-											t.identifier(`$${uniqueId}$GLOBAL$`),
+											t.identifier(`_${uniqueId}_G_`),
 											t.identifier(declarator.id.name)
 										),
 										declarator.init
 									)
 								)
 							)
+							needG = !0
+						}
 					} else {
 						globalBlockPath.remove()
 						globalBlockStatementPath.remove()
@@ -379,22 +384,20 @@ 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:487:37")
+				assert(globalBlockStatement.id, "src/processScript/transform.ts:495: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:499:22")
+					assert(binding, "src/processScript/transform.ts:507:22")
 					for (const referencePath of binding.referencePaths) {
-						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:502:55")
+						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:510:55")
 						referencePath.replaceWith(
-							t.memberExpression(
-								t.identifier(`$${uniqueId}$GLOBAL$`),
-								t.identifier(referencePath.node.name)
-							)
+							t.memberExpression(t.identifier(`_${uniqueId}_G_`), t.identifier(referencePath.node.name))
 						)
+						needG = !0
 					}
 					globalBlockPath.remove()
 					globalBlockStatementPath.remove()
@@ -405,7 +408,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 							t.assignmentExpression(
 								"=",
 								t.memberExpression(
-									t.identifier(`$${uniqueId}$GLOBAL$`),
+									t.identifier(`_${uniqueId}_G_`),
 									t.identifier(globalBlockStatement.id.name)
 								),
 								t.classExpression(
@@ -417,6 +420,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 							)
 						)
 					)
+					needG = !0
 				}
 			}
 		if (program.scope.hasGlobal("_EXPORTS"))
@@ -522,12 +526,12 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 		mainFunction.body.body.unshift(
 			t.variableDeclaration(
 				"let",
-				[...neededSubscriptLets].map(name =>
+				[...neededSubscriptLets].map(([name, seclevel]) =>
 					t.variableDeclarator(
 						t.identifier(`_${uniqueId}_SUBSCRIPT_${name}_`),
 						t.arrowFunctionExpression(
 							[t.restElement(t.identifier("args"))],
-							t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$${name}$`), [
+							t.callExpression(t.identifier(`$${uniqueId}$${seclevel}$SUBSCRIPT$${name}$`), [
 								t.spreadElement(t.identifier("args"))
 							])
 						)
@@ -535,6 +539,12 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				)
 			)
 		)
+	needG &&
+		mainFunction.body.body.unshift(
+			t.variableDeclaration("let", [
+				t.variableDeclarator(t.identifier(`_${uniqueId}_G_`), t.identifier(`$${uniqueId}$GLOBAL$`))
+			])
+		)
 	traverse(file, {
 		BlockStatement({ node: blockStatement }) {
 			for (const [index, functionDeclaration] of blockStatement.body.entries())
@@ -555,7 +565,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				}
 		},
 		ClassBody({ node: classBody, scope, parent }) {
-			assert(t.isClass(parent), "src/processScript/transform.ts:669:30")
+			assert(t.isClass(parent), "src/processScript/transform.ts:688:30")
 			let thisIsReferenced = !1
 			for (const classMethod of classBody.body) {
 				if ("ClassMethod" != classMethod.type) continue
@@ -631,7 +641,9 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 		VariableDeclaration({ node: variableDeclaration }) {
 			"const" == variableDeclaration.kind && (variableDeclaration.kind = "let")
 		},
-		ThisExpression: path => path.replaceWith(t.identifier("undefined")),
+		ThisExpression: path => {
+			path.replaceWith(t.identifier("undefined"))
+		},
 		BigIntLiteral(path) {
 			const bigIntAsNumber = Number(path.node.value)
 			path.replaceWith(
@@ -659,36 +671,37 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			t.identifier("prototype")
 		)
 	}
-	function processFakeSubscriptObject(fakeSubscriptObjectName) {
+	function processFakeSubscriptObject(fakeSubscriptObjectName, seclevel) {
 		for (const referencePath of getReferencePathsToGlobal(fakeSubscriptObjectName, program)) {
-			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:783:60")
+			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:804:60")
 			assert("Identifier" == referencePath.parent.property.type)
 			assert(
 				"MemberExpression" == referencePath.parentPath.parentPath?.node.type,
-				"src/processScript/transform.ts:785:81"
+				"src/processScript/transform.ts:806:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:786:83"
+				"src/processScript/transform.ts:807:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:790:8 invalid user "${referencePath.parent.property.name}" in subscript`
+				`src/processScript/transform.ts:811: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:795:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
+				`src/processScript/transform.ts:816:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
 			)
 			if ("CallExpression" == referencePath.parentPath.parentPath.parentPath?.type)
 				referencePath.parentPath.parentPath.replaceWith(
 					t.identifier(
-						`$${uniqueId}$SUBSCRIPT$${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}$`
+						`$${uniqueId}$${seclevel}$SUBSCRIPT$${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}$`
 					)
 				)
 			else {
 				const name = `${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}`
 				referencePath.parentPath.parentPath.replaceWith(t.identifier(`_${uniqueId}_SUBSCRIPT_${name}_`))
-				neededSubscriptLets.add(name)
+				const maxSecLevel = Math.max(neededSubscriptLets.get(name) || 0, seclevel)
+				neededSubscriptLets.set(name, maxSecLevel)
 			}
 		}
 	}

package/push.d.ts

@@ -18,6 +18,14 @@ export type PushOptions = LaxPartial<{
       */
     forceQuineCheats: boolean;
 }>;
+export declare class MissingSourceFolderError extends Error {
+}
+export declare class MissingHackmudFolderError extends Error {
+}
+export declare class NoUsersError extends Error {
+}
+export declare class NoScriptsError extends Error {
+}
 /** Push scripts from a source directory to the hackmud directory.
   *
   * Pushes files directly in the source folder to all users
@@ -25,4 +33,4 @@ export type PushOptions = LaxPartial<{
   * @param hackmudPath directory created by hackmud containing user data including scripts
   * @param options {@link PushOptions details}
   * @returns array of info on pushed scripts */
-export declare function push(sourcePath: string, hackmudPath: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: PushOptions): Promise<Info[]>;
+export declare function push(sourcePath: string, hackmudPath: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: PushOptions): Promise<MissingSourceFolderError | MissingHackmudFolderError | NoUsersError | NoScriptsError | Info[]>;

package/push.js

@@ -42,32 +42,54 @@ import "./processScript/preprocess.js"
 import "import-meta-resolve"
 import "./processScript/transform.js"
 import "@samual/lib/clearObject"
+class MissingSourceFolderError extends Error {}
+Object.defineProperty(MissingSourceFolderError.prototype, "name", { value: "MissingSourceFolderError" })
+class MissingHackmudFolderError extends Error {}
+Object.defineProperty(MissingHackmudFolderError.prototype, "name", { value: "MissingHackmudFolderError" })
+class NoUsersError extends Error {}
+Object.defineProperty(NoUsersError.prototype, "name", { value: "NoUsersError" })
+class NoScriptsError extends Error {}
+Object.defineProperty(NoScriptsError.prototype, "name", { value: "NoScriptsError" })
 async function push(
 	sourcePath,
 	hackmudPath,
 	{ scripts = ["*.*"], onPush = () => {}, minify = !0, mangleNames = !1, forceQuineCheats } = {}
 ) {
 	const [sourceFolder, hackmudFolder] = await Promise.all([
-			readDirectoryWithStats(sourcePath),
-			readDirectoryWithStats(hackmudPath)
-		]),
-		sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
+		readDirectoryWithStats(sourcePath).catch(error => {
+			if (error && "ENOENT" == error.code)
+				return new MissingSourceFolderError("There is no folder at " + sourcePath)
+			throw error
+		}),
+		readDirectoryWithStats(hackmudPath).catch(error => {
+			if (error && "ENOENT" == error.code)
+				return new MissingHackmudFolderError("There is no folder at " + hackmudPath)
+			throw error
+		})
+	])
+	if (sourceFolder instanceof Error) return sourceFolder
+	if (hackmudFolder instanceof Error) return hackmudFolder
+	const sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
 		allUsers = new Set([
 			...scripts
-				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:52:65"))
+				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:82:65"))
 				.filter(name => "*" != name),
 			...sourceFolderFolders.map(({ name }) => name),
 			...hackmudFolder.filter(({ stats }) => stats.isDirectory()).map(({ name }) => name),
 			...hackmudFolder
 				.filter(({ stats, name }) => stats.isFile() && name.endsWith(".key"))
 				.map(({ name }) => name.slice(0, -4))
-		]),
-		usersToScriptsToPush = new Cache(_user => new Map()),
+		])
+	if (!allUsers.size)
+		return new NoUsersError(
+			"Could not find any users. Either provide the names of your users or log into a user in hackmud"
+		)
+	const usersToScriptsToPush = new Cache(_user => new Map()),
 		scriptNamesToUsers = new Cache(_scriptName => new Set())
 	for (const script of scripts) {
 		const [user, scriptName] = script.split(".")
-		assert(user, "src/push.ts:69:16")
-		assert(scriptName, "src/push.ts:70:22")
+		assert(user, "src/push.ts:105:16")
+		assert(scriptName, "src/push.ts:106:22")
 		"*" == user ? scriptNamesToUsers.set(scriptName, allUsers) : scriptNamesToUsers.get(scriptName).add(user)
 	}
 	const sourceFolderFiles = sourceFolder.filter(({ stats }) => stats.isFile()),
@@ -98,7 +120,7 @@ async function push(
 	for (const [scriptName, users] of scriptNamesToUsers)
 		for (const user of users)
 			if (!usersToScriptsToPush.get(user).has(scriptName))
-				throw Error(`Could not find script ${user}.${scriptName} to push`)
+				return new NoScriptsError(`Could not find script ${user}.${scriptName} to push`)
 	const pathsToUsers = new Cache(_path => new Set())
 	for (const [user, scriptsToPush] of usersToScriptsToPush)
 		for (const path of scriptsToPush.values()) pathsToUsers.get(path).add(user)
@@ -135,4 +157,4 @@ async function push(
 	)
 	return allInfo
 }
-export { push }
+export { MissingHackmudFolderError, MissingSourceFolderError, NoScriptsError, NoUsersError, push }