hackmud-script-manager 0.20.4-9f460e8 → 0.20.4-a7d8309

package/bin/hsm.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Cache } from "@samual/lib/Cache"
+import { AutoMap } from "@samual/lib/AutoMap"
 import { assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
@@ -13,11 +13,10 @@ import { syncMacros } from "../syncMacros.js"
 import "@samual/lib/readDirectoryWithStats"
 import "path/posix"
 import "@samual/lib/copyFilePersistent"
-const version = "0.20.4-9f460e8",
-	formatOption = name => colourN(`-${1 == name.length ? "" : "-"}${name}`),
+const formatOption = name => colourN(`-${1 == name.length ? "" : "-"}${name}`),
 	options = new Map(),
 	commands = [],
-	userColours = new Cache(user => {
+	userColours = new AutoMap(user => {
 		let hash = 0
 		for (const char of user) hash += (hash >> 1) + hash + "xi1_8ratvsw9hlbgm02y5zpdcn7uekof463qj".indexOf(char) + 1
 		return [colourJ, colourK, colourM, colourW, colourL, colourB][hash % 6](user)
@@ -59,11 +58,11 @@ const pushModule = import("../push.js"),
 process.version.startsWith("v21.") &&
 	console.warn(
 		colourF(
-			"Warning: Support for Node.js 21 will be dropped in the next minor version of HSM\n         You should update your version of Node.js\n         https://nodejs.org/en/download/package-manager"
+			`Warning: Support for Node.js 21 will be dropped in the next minor version of HSM\n         Your current version of Node.js is ${chalk.bold(process.version)}\n         You should update your version of Node.js\n         https://nodejs.org/en/download/package-manager\n`
 		)
 	)
 if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
-	console.log(version)
+	console.log("0.20.4-a7d8309")
 	process.exit()
 }
 if (popOption("help", "h")?.value) {
@@ -201,18 +200,27 @@ switch (commands[0]) {
 								)
 					} else infos.length || logError("Could not find any scripts to push")
 				} else {
-					const typeDeclarationPathOption = popOption(
+					const dtsPathOption = popOption(
+						"dts-path",
 						"type-declaration-path",
 						"type-declaration",
 						"dts",
 						"gen-types"
 					)
+					dtsPathOption &&
+						"emit-dts" != dtsPathOption.name &&
+						"gen-dts" != 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`
+							)
+						)
 					complainAboutUnrecognisedOptions()
 					const { watch } = await watchModule
 					watch(sourcePath, hackmudPath, {
 						scripts,
 						onPush: info => logInfo(info, hackmudPath),
-						typeDeclarationPath: typeDeclarationPathOption?.value.toString(),
+						typeDeclarationPath: dtsPathOption?.value.toString(),
 						minify: noMinifyOption && !noMinifyOption.value,
 						mangleNames: mangleNamesOption?.value,
 						onReady: () => log("Watching"),
@@ -252,7 +260,15 @@ switch (commands[0]) {
 	case "gen-type-declaration":
 	case "gen-dts":
 	case "gen-types":
+	case "emit-dts":
 		{
+			"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`
+					)
+				)
 			const hackmudPath = getHackmudPath(),
 				target = commands[1]
 			if (!target) {
@@ -266,7 +282,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:343:35")
+				assert(error instanceof Error, "src/bin/hsm.ts:361:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 				return writeFile(typeDeclarationPath, typeDeclaration)
@@ -275,7 +291,6 @@ switch (commands[0]) {
 		}
 		break
 	case "help":
-	case "h":
 		logHelp()
 		break
 	default:
@@ -287,21 +302,20 @@ function logHelp() {
 	const pushCommandDescription = "Push scripts from a directory to hackmud user's scripts directories",
 		forceQuineCheatsOptionDescription = `Force quine cheats on. Use ${colourN("--force-quine-cheats")}=${colourV("false")} to force off`,
 		hackmudPathOption = `${colourN("--hackmud-path")}=${colourB("<path>")}\n    Override hackmud path`
-	console.log(colourN("Version") + colourS(": ") + colourV(version))
 	switch (commands[0]) {
 		case "dev":
 		case "watch":
 		case "push":
 			console.log(
 				colourS(
-					`\n${colourJ("push" == commands[0] ? pushCommandDescription : "Watch a directory and push a script when modified")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB('<directory> ["<script user>.<script name>"...]')}\n\n${colourA("Arguments:")}\n${colourB("<directory>")}\n    The source directory containing your scripts\n${colourB("<script user>")}\n    A user to push script(s) to. Can be set to wild card (${colourV("*")}) which will try\n    and discover users to push to\n${colourB("<script name>")}\n    Name of a script to push. Can be set to wild card (${colourV("*")}) to find all scripts\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}\n${hackmudPathOption}\n${"push" == commands[0] ? "" : `${colourN("--type-declaration-path")}=${colourB("<path>")}\n    Path to generate a type declaration file for the scripts\n`}\n${colourA("Examples:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")}\n    Pushes all scripts found in ${colourV("src")} folder to all users\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("bar")}\n    Pushes a script named ${colourL("bar")} found in ${colourV("src")} folder to user ${userColours.get("foo")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("bar")} ${colourC("baz")}${colourV(".")}${colourL("qux")}\n    Multiple can be specified\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("foo")}${colourV(".")}${colourL("*")}\n    Pushes all scripts found in ${colourV("src")} folder to user ${userColours.get("foo")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("*")}${colourV(".")}${colourL("foo")}\n    Pushes all scripts named ${colourL("foo")} found in ${colourV("src")} folder to all user\n${colourC("hsm")} ${colourL(commands[0])} ${colourV("src")} ${colourC("*")}${colourV(".")}${colourL("*")}\n    Pushes all scripts found in ${colourV("src")} folder to all users`
+					`${colourJ("push" == commands[0] ? pushCommandDescription : "Watch a directory and push a script when modified")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB('<directory> ["<script user>.<script name>"...]')}\n\n${colourA("Arguments:")}\n${colourB("<directory>")}\n    The source directory containing your scripts\n${colourB("<script user>")}\n    A user to push script(s) to. Can be set to wild card (${colourV("*")}) which will try\n    and discover users to push to\n${colourB("<script name>")}\n    Name of a script to push. Can be set to wild card (${colourV("*")}) to find all scripts\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}\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`
 				)
 			)
 			break
 		case "pull":
 			console.log(
 				colourS(
-					`\n${colourJ("Pull a script a from a hackmud user's script directory")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<script user>")}${colourV(".")}${colourB("<script name>")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
+					`${colourJ("Pull a script a from a hackmud user's script directory")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<script user>")}${colourV(".")}${colourB("<script name>")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
 				)
 			)
 			break
@@ -309,7 +323,7 @@ function logHelp() {
 		case "golf":
 			console.log(
 				colourS(
-					`\n${colourJ("Minify a script file on the spot")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<target> [output path]")}\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}\n${colourN("--watch")}\n    Watch for changes`
+					`${colourJ("Minify a script file on the spot")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<target> [output path]")}\n\n${colourA("Options:")}\n${colourN("--no-minify")}\n    Skip minification to produce a "readable" script\n${colourN("--mangle-names")}\n    Reduce character count further but lose function names in error call stacks\n${colourN("--force-quine-cheats")}\n    ${forceQuineCheatsOptionDescription}\n${colourN("--watch")}\n    Watch for changes`
 				)
 			)
 			break
@@ -317,6 +331,14 @@ function logHelp() {
 		case "gen-type-declaration":
 		case "gen-dts":
 		case "gen-types":
+		case "emit-dts":
+			"emit-dts" != commands[0] &&
+				"gen-dts" != commands[0] &&
+				console.warn(
+					colourF(
+						`Warning: ${colourC("hsm")} ${colourL(commands[0])} is being deprecated and will be removed\n         in the next minor release of HSM\n         You should switch to using its alias ${colourC("hsm")} ${colourL("emit-dts")}\n`
+					)
+				)
 			console.log(
 				colourS(
 					`${colourJ("Generate a type declaration file for a directory of scripts")}\n\n${colourA("Usage:")}\n${colourC("hsm")} ${colourL(commands[0])} ${colourB("<directory> [output path]")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
@@ -326,14 +348,14 @@ function logHelp() {
 		case "sync-macros":
 			console.log(
 				colourS(
-					`\n${colourJ("Sync macros across all hackmud users")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
+					`${colourJ("Sync macros across all hackmud users")}\n\n${colourA("Options:")}\n${hackmudPathOption}`
 				)
 			)
 			break
 		default:
 			console.log(
 				colourS(
-					`\n${colourJ("Hackmud Script Manager")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("dev")}\n    Watch a directory and push a script when modified\n${colourL("golf")}\n    Minify a script file on the spot\n${colourL("gen-dts")}\n    Generate a type declaration file for a directory of scripts\n${colourL("sync-macros")}\n    Sync macros across all hackmud users\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory`
+					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.20.4-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`
 				)
 			)
 	}
@@ -351,7 +373,7 @@ function logError(message) {
 	process.exitCode = 1
 }
 function getHackmudPath() {
-	const hackmudPathOption = popOption("hackmud-path")
+	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()

package/env.d.ts

@@ -1,9 +1,8 @@
 type Replace<A, B> = Omit<A, keyof B> & B
-type ScriptSuccess<T = object> = { ok: true } & T
+type ScriptSuccess<T = unknown> = { ok: true } & T
 type ScriptFailure = { ok: false, msg?: string }
-type ScriptResponse<T = object> = ScriptSuccess<T> | ScriptFailure
+type ScriptResponse<T = unknown> = ScriptSuccess<T> | ScriptFailure
 type ErrorScripts = Record<string, () => ScriptFailure>
-type Scriptor<TArgs extends any[] = any[]> = { name: string, call: (...args: TArgs) => unknown }
 
 type Subscripts = Record<string, Record<string, (...args: any) => any>> & {
 	accts: ErrorScripts
@@ -28,8 +27,7 @@ interface PlayerLowsec {}
 interface PlayerNullsec {}
 
 type UpgradeRarityString = "`0noob`" | "`1kiddie`" | "`2h4x0r`" | "`3h4rdc0r3`" | "`4|_|b3|2`" | "`531337`"
-type UpgradeRarityNumber = 0 | 1 | 2 | 3 | 4 | 5;
-type UpgradeRarity = UpgradeRarityString | UpgradeRarityNumber;
+type UpgradeRarityNumber = 0 | 1 | 2 | 3 | 4 | 5
 
 type UpgradeBase = {
 	name: string
@@ -45,10 +43,8 @@ type UpgradeBase = {
 
 type Upgrade = UpgradeBase & Record<string, null | boolean | number | string>
 
-type CliUpgrade = Omit<UpgradeBase, `rarity`> & {
-	[x: string]: null | boolean | number | string
-	rarity: UpgradeRarityString
-}
+type CliUpgrade = Omit<UpgradeBase, `rarity`> &
+	{ [k: string]: null | boolean | number | string, rarity: UpgradeRarityString }
 
 type UsersTopItem<R> = { rank: R, name: string, last_activity: string, balance: string }
 type CorpsTopItem<R> = { rank: R, name: string, worth: string }
@@ -126,21 +122,11 @@ type Fullsec = Subscripts & PlayerFullsec & {
 	}
 
 	escrow: {
-		/** **FULLSEC** */ charge: (args: {
-			cost: number | string
-			is_unlim?: boolean
-		}) => null | ScriptFailure
-
+		/** **FULLSEC** */ charge: (args: { cost: number | string, is_unlim?: boolean }) => null | ScriptFailure
 		confirm: never
 	}
 
-	gui: {
-		chats: never
-		quiet: never
-		size: never
-		vfx: never
-		vol: never
-	}
+	gui: { chats: never, quiet: never, size: never, vfx: never, vol: never }
 
 	market: {
 		/** **FULLSEC** */ browse: {
@@ -459,7 +445,10 @@ type Highsec = Fullsec & PlayerHighsec & {
 		/** **HIGHSEC**
 		  * @returns GC balance as number if `is_script` is true (default).
 		  * @returns GC balance as string if `is_script` is false. */
-		balance: ((args?: { is_script?: true }) => number) & ((args: { is_script: false }) => string)
+		balance: {
+			(args?: { is_script?: true }): number
+			(args: { is_script: false }): string
+		}
 
 		/** **HIGHSEC**
 		 * @returns Transaction history according to filter.
@@ -716,95 +705,145 @@ 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;
+// database
+type MongoPrimitive = null | boolean | number | Date | string
+type MongoValue = MongoPrimitive | MongoValue[] | MongoObject
+type MongoObject = { [k: string]: MongoValue, [k: `$${string}`]: never }
+type MongoQueryValue = MongoPrimitive | MongoQueryValue[] | MongoQueryObject
+
+type MongoQueryObject =
+	{ [k: string]: MongoQueryValue, [k: `$${string}`]: MongoValue, $type?: keyof MongoTypeStringsToTypes | (string & {}) }
+
+type MongoTypeStringsToTypes = {
+	double: number
+	string: string
+	object: MongoObject
+	array: MongoValue[]
+	objectId: ObjectId
+	bool: boolean
+	date: Date
+	null: null
+	int: number
+	long: number
+}
+
+type MongoTypeString = keyof MongoTypeStringsToTypes
+type MongoTypeNumber = -1 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 16 | 17 | 18 | 19 | 127
+type MongoId = Exclude<MongoPrimitive, null> | MongoObject
+type MongoQueryId = Exclude<MongoPrimitive, null> | MongoQueryObject
+type MongoDocument = MongoObject & { _id?: MongoId }
+
+type MongoQueryType<TQuery extends MongoQueryObject> = {
+	-readonly [K in keyof TQuery]:
+		TQuery[K] extends MongoPrimitive ?
+			TQuery[K]
+		: TQuery[K] extends { $type: infer TType } ?
+			TType extends keyof MongoTypeStringsToTypes ? MongoTypeStringsToTypes[TType] : unknown
+		: TQuery[K] extends { $in: (infer TIn)[] } ?
+			TIn
+		: keyof TQuery[K] extends `$${string}` ?
+			unknown
+		: TQuery[K] extends { [k: string]: any } ?
+			MongoQueryType<TQuery[K]>
+		: never
+}
 
-type MongoValue = string | number | boolean | Date | MongoValue[] | { [key: string]: MongoValue } | null
+type MongoCommandValue = MongoPrimitive | MongoCommandValue[] | { [k: string]: MongoCommandValue }
+type MongoArraySelectors<T extends MongoValue[] = MongoValue[]> = { $all: T, $elemMatch: T, $size: number }
 
-type MongoCommandValue = string | number | boolean | Date | MongoCommandValue[] | { [key: string]: MongoCommandValue } |
-null | undefined
+type MongoComparisonSelectors<T extends MongoValue = MongoValue> =
+	{ $eq: T, $gt: T, $gte: T, $in: T[], $lt: T, $lte: T, $ne: T, $nin: T[] }
 
-/**
- * Currently unused
- */
-type MongoLogicalSelectors<T extends MongoValue = MongoValue> = {
-	$not: T | MongoComparisonSelectors<T> | MongoLogicalSelectors<T>
-	$nor: T[]
-	$or: T[]
-	$and: T[]
-}
+type MongoElementSelectors = { $exists: boolean, $type: MongoTypeNumber | MongoTypeString }
 
-type MongoArraySelectors<T extends Array<MongoValue> = Array<MongoValue>> = {
-	$all: T
-	$elemMatch: T
-	$size: number
-}
+type MongoQuerySelector<T extends MongoValue> = Partial<
+	T extends []
+		? MongoArraySelectors<T> & MongoElementSelectors & MongoComparisonSelectors<T>
+		: MongoElementSelectors & MongoComparisonSelectors<T>
+>
 
-type MongoComparisonSelectors<T extends MongoValue = MongoValue> = {
-	$eq: T
-	$gt: T
-	$gte: T
-	$in: T[]
-	$lt: T
-	$lte: T
-	$ne: T
-	$nin: T[]
-}
+type MongoQuery<T extends MongoObject> = { [K in keyof T]?: T[K] | MongoQuerySelector<T[K]> } & { _id?: MongoId }
 
-type MongoElementSelectors = {
-	$exists: boolean
-	$type: MongoTypeNumber | MongoTypeString
-}
+type MongoUpdateOperators<T extends MongoObject> = Partial<{
+	/* Universal operators */
+	$set: Partial<Record<string, MongoCommandValue> & T>
+	$setOnInsert: Partial<Record<string, MongoCommandValue> & T>
+	$unset: Partial<Record<string, ""> & T>
 
-type MongoQuerySelector<T extends MongoValue = MongoValue> = Partial<T extends MongoValue[] ?
-	(MongoArraySelectors<T> & MongoElementSelectors & MongoComparisonSelectors<T>) :
-	(MongoElementSelectors & MongoComparisonSelectors<T>)>
+	$rename: Partial<Record<string, string> & { [key in keyof T]: string }>
 
-type Query = { [key: string]: MongoValue | Query } & { _id?: Id, $in?: MongoValue[] }
-type Projection = Record<string, boolean | 0 | 1>
+	/* Date & number operators */
+	$inc: Record<string, number> &
+		{ [K in keyof T as T[K] extends number | Date ? K : never]?: T[K] extends number ? number : Date }
 
-type MongoCommand = MongoCommandValue & Partial<
-	{ $set: Record<string, MongoCommandValue>, $push: Record<string, MongoCommandValue>, $unset: Record<string, ""> }
->
+	$mul: Record<string, number> & { [K in keyof T as T[K] extends number ? K : never]?: number }
+	$min: Record<string, number> & { [K in keyof T as T[K] extends number ? K : never]?: number }
+	$max: Record<string, number> & { [K in keyof T as T[K] extends number ? K : never]?: number }
+
+	/* Array operators */
+	$pop: Record<string, -1 | 1> & { [K in keyof T as T[K] extends [] ? K : never]?: -1 | 1 }
+
+	$push: Record<string, MongoCommandValue> & {
+		[K in keyof T as T[K] extends [] ? K : never]?: (T[K] extends (infer U)[] ? U : never)
+			| MongoUpdateArrayOperatorModifiers<T[K]>
+	}
+
+	$addToSet: Partial<Record<string, MongoCommandValue> & {
+		[K in keyof T as T[K] extends [] ? K : never]: (T[K] extends (infer U)[] ? U : never)
+			| MongoUpdateArrayOperatorUniversalModifiers<T[K]>
+	}>
+
+	$pull: Partial<Record<string, MongoCommandValue> & {
+		[K in keyof T as T[K] extends [] ? K : never]: (T[K] extends (infer U)[] ? U : never)
+			| MongoQuerySelector<T[K]>
+	}>
+
+	$pullAll: Record<string, MongoCommandValue> & { [K in keyof T as T[K] extends [] ? K : never]?: T[K] }
+}>
+
+type MongoUpdateArrayOperatorUniversalModifiers<T> = { $each?: T extends [] ? T : T[] }
+
+type MongoUpdateArrayOperatorModifiers<T> = MongoUpdateArrayOperatorUniversalModifiers<T> &
+	{ $position?: number, $slice?: number, $sort?: 1 | -1 }
+
+type MongoUpdateCommand<Schema extends MongoObject> = MongoUpdateOperators<Schema>
 
-type Id = string | number | boolean | Date | Record<string, MongoValue>
-type MongoDocument = { [key: string]: MongoValue, _id: Id }
 type SortOrder = { [key: string]: 1 | -1 | SortOrder }
 
-type Cursor = {
-	/** Returns the first document that satisfies the query. */ first: () => MongoDocument | null
-	/** Returns an array of documents that satisfy the query. */ array: () => MongoDocument[]
+type Cursor<T> = {
+	/** Returns the first document that satisfies the query. */ first: () => T | null
+	/** Returns an array of documents that satisfy the query. */ array: () => T[]
 	/** Returns the number of documents that match the query. */ count: () => number
 
 	/** Returns the first document that satisfies the query. Also makes cursor unusable. */
-	first_and_close: () => MongoDocument
+	first_and_close: () => T
 
 	/** Returns an array of documents that satisfy the query. Also makes cursor unusable. */
-	array_and_close: () => MongoDocument[]
+	array_and_close: () => T[]
 
 	/** Returns the number of documents that match the query. Also makes cursor unusable. */
 	count_and_close: () => number
 
 	/** Run `callback` on each document that satisfied the query. */
-	each: (callback: (document: MongoDocument) => void) => null
+	each: (callback: (document: T) => void) => null
 
 	/** Returns a new cursor with documents sorted as specified.
 	  * A value of 1 sorts the property ascending, and -1 descending.
 	  * @param order The way the documents are to be sorted. */
-	sort: (order?: SortOrder) => Cursor
+	sort: (order?: SortOrder) => Cursor<T>
 
 	/** Returns a new cursor without the first number of documents.
 	  * @param count Number of documents to skip. */
-	skip: (count: number) => Cursor
+	skip: (count: number) => Cursor<T>
 
 	/** Returns a new cursor limited to a number of documents as specified.
 	  * @param count Number of documents. */
-	limit: (count: number) => Cursor
+	limit: (count: number) => Cursor<T>
 
-	/** @param key The key of the documents. */ distinct: ((key: string) => MongoValue[]) & ((key: "_id") => Id[])
+	/** @param key The key of the documents. */ distinct: { (key: string): MongoValue[], (key: "_id"): MongoId[] }
 	/** Make cursor unusable. */ close: () => null
 	NumberLong: (number: number) => number
+	// TODO what actually is the type here?
 	ObjectId: () => any
 }
 
@@ -815,7 +854,9 @@ type CliContext = {
 	/** The number of rows in the caller’s terminal. */ rows: number
 
 	/** 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
+	  * scriptor. */
+	calling_script: null
+
 	is_scriptor?: undefined
 	is_brain?: undefined
 }
@@ -826,245 +867,212 @@ type SubscriptContext = Replace<CliContext, {
 	calling_script: string
 }>
 
-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
-
-/** Subscript space that can call HIGHSEC and above scripts. Makes your script HIGHSEC (overrides FULLSEC). */
-declare const $hs: Highsec
-
-/** Subscript space that can call MIDSEC and above scripts. Makes your script MIDSEC (overrides higher security levels).
-  */
-declare const $ms: Midsec
-
-/** Subscript space that can call LOWSEC and above scripts. Makes your script LOWSEC (overrides higher security levels).
-  */
-declare const $ls: Lowsec
-
-/** Subscript space that can call any script. Makes your script NULLSEC (overrides higher security levels). */
-declare const $ns: Nullsec
+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 }>
+
+// _id is always returned unless _id: false is passed
+// when anyField: true is given, other fields (except _id) are omitted
+
+type MongoProject<TDocument, TProjection> =
+	true extends (1 extends TProjection[keyof TProjection] ? true : TProjection[keyof TProjection]) ?
+		(TProjection extends { _id: false | 0 } ? {} : { _id: TDocument extends { _id: infer TId } ? TId : MongoId }) &
+			{
+				[K in
+					keyof TDocument as K extends keyof TProjection ? TProjection[K] extends true | 1 ? K : never : never
+				]: TDocument[K]
+			} &
+			{
+				-readonly [K in
+					keyof TProjection as TProjection[K] extends true | 1 ? K extends keyof TDocument ? never : K : never
+				]?: MongoValue
+			}
+	: { [k: string]: MongoValue } & { [K in keyof TDocument as K extends keyof TProjection ? never : K]: TDocument[K] }
 
-/** Subscript space that can call FULLSEC scripts. */ declare const $4s: typeof $fs
+type DeepFreeze<T> = { readonly [P in keyof T]: DeepFreeze<T[P]> }
 
-/** Subscript space that can call HIGHSEC and above scripts. Makes your script HIGHSEC (overrides FULLSEC). */
-declare const $3s: typeof $hs
+declare global {
+	type Scriptor<TArgs extends any[] = any[]> = { name: string, call: (...args: TArgs) => unknown }
+	type Context = CliContext | SubscriptContext | ScriptorContext | BrainContext
+	type ObjectId = { $oid: string }
 
-/** Subscript space that can call MIDSEC and above scripts. Makes your script MIDSEC (overrides higher security levels).
-  */
-declare const $2s: typeof $ms
+	/** Subscript space that can call FULLSEC scripts. */ const $fs: Fullsec
 
-/** Subscript space that can call LOWSEC and above scripts. Makes your script LOWSEC (overrides higher security levels).
-  */
-declare const $1s: typeof $ls
+	/** Subscript space that can call HIGHSEC and above scripts. Makes your script HIGHSEC (overrides FULLSEC). */
+	const $hs: Highsec
 
-/** Subscript space that can call any script. Makes your script NULLSEC (overrides higher security levels). */
-declare const $0s: typeof $ns
+	/** Subscript space that can call MIDSEC and above scripts. Makes your script MIDSEC (overrides higher security levels).
+	  */
+	const $ms: Midsec
 
-/** Subscript space that can call any script. Uses seclevel provided in comment before script (defaults to NULLSEC)
-  * @example
-  * // @ seclevel MIDSEC
-  * // remove the space betwen "@" and "s", there's only a space because otherwise vscode breaks
-  * export function script() {
-  * 	$s.foo.bar() // will be converted to #ms.foo.bar()
-  * } */
-declare const $s: Nullsec
+	/** Subscript space that can call LOWSEC and above scripts. Makes your script LOWSEC (overrides higher security levels).
+	  */
+	const $ls: Lowsec
 
-type ObjectId = { $oid: string }
+	/** Subscript space that can call any script. Makes your script NULLSEC (overrides higher security levels). */
+	const $ns: Nullsec
 
-declare const $db: {
-	/** Insert a document or documents into a collection.
-	  * @param documents A document or array of documents to insert into the collection. */
-	i: (documents: object | object[]) => {
-		ok: 1
-		n: number
-		opTime: { ts: "Undefined Conversion", t: number }
-		electionId: "Undefined Conversion"
-		operationTime: "Undefined Conversion"
-		$clusterTime: {
-			clusterTime: "Undefined Conversion"
-			signature: { hash: "Undefined Conversion", keyId: "Undefined Conversion" }
-		}
-	}
+	/** Subscript space that can call FULLSEC scripts. */ const $4s: typeof $fs
 
-	/** Remove documents from a collection.
-	  * @param query Specifies deletion criteria using query operators. */
-	r: (query: Query) => {
-		ok: 0 | 1
-		n: number
-		opTime: { ts: "Undefined Conversion", t: number }
-		electionId: "Undefined Conversion"
-		operationTime: "Undefined Conversion"
-		$clusterTime: {
-			clusterTime: "Undefined Conversion"
-			signature: { hash: "Undefined Conversion", keyId: "Undefined Conversion" }
-		}
-	}
+	/** Subscript space that can call HIGHSEC and above scripts. Makes your script HIGHSEC (overrides FULLSEC). */
+	const $3s: typeof $hs
 
-	/** Find documents in a collection or view and returns a cursor to the selected documents.
-	  * @param query Specifies deletion criteria using query operators.
-	  * @param projection Specifies the fields to return in the documents that match the query filter. */
-	f: (query?: Query, projection?: Projection) => Cursor
-
-	/** Update an existing documents in a collection.
-	  * @param query Specifies deletion criteria using query operators.
-	  * @param command The modifications to apply.
-	  * {@link https://docs.mongodb.com/manual/reference/method/db.collection.update/#parameters} */
-	u: (query: Query | Query[], command: MongoCommand) => {
-		ok: 0 | 1
-		nModified: number
-		n: number
-		opTime: { ts: "Undefined Conversion", t: number }
-		electionId: "Undefined Conversion"
-		operationTime: "Undefined Conversion"
-		$clusterTime: {
-			clusterTime: "Undefined Conversion"
-			signature: { hash: "Undefined Conversion", keyId: "Undefined Conversion" }
-		}
-	}
-
-	/** Updates one document within the collection based on the filter.
-	  * @param query Specifies deletion criteria using query operators.
-	  * @param command The modifications to apply.
-	  * {@link https://docs.mongodb.com/manual/reference/method/db.collection.update/#parameters} */
-	u1: (query: Query | Query[], command: MongoCommand) => {
-		ok: 0 | 1
-		nModified: number
-		n: number
-		opTime: {
-			ts: "Undefined Conversion"
-			t: number
-		}
-		electionId: "Undefined Conversion"
-		operationTime: "Undefined Conversion"
-		$clusterTime: {
-			clusterTime: "Undefined Conversion"
-			signature: {
-				hash: "Undefined Conversion"
-				keyId: "Undefined Conversion"
-			}
-		}
-	}
+	/** Subscript space that can call MIDSEC and above scripts. Makes your script MIDSEC (overrides higher security levels).
+	  */
+	const $2s: typeof $ms
 
-	/** Update or insert or insert document.
-	  * Same as Update, but if no documents match the query, one document will be inserted based on the properties in
-	  * both the query and the command.
-	  * The `$setOnInsert` operator is useful to set defaults.
-	  * @param query Specifies deletion criteria using query operators.
-	  * @param command The modifications to apply.
-	  * {@link https://docs.mongodb.com/manual/reference/method/db.collection.update/#parameters} */
-	us: (query: Query | Query[], command: MongoCommand) => {
-		ok: 0 | 1
-		nModified: number
-		n: number
-		opTime: { ts: "Undefined Conversion", t: number }
-		electionId: "Undefined Conversion"
-		operationTime: "Undefined Conversion"
-		$clusterTime: {
-			clusterTime: "Undefined Conversion"
-			signature: { hash: "Undefined Conversion", keyId: "Undefined Conversion" }
-		}
+	/** Subscript space that can call LOWSEC and above scripts. Makes your script LOWSEC (overrides higher security levels).
+	  */
+	const $1s: typeof $ls
+
+	/** Subscript space that can call any script. Makes your script NULLSEC (overrides higher security levels). */
+	const $0s: typeof $ns
+
+	/** Subscript space that can call any script. Uses seclevel provided in comment before script (defaults to NULLSEC)
+	  * @example
+	  * // @​seclevel MIDSEC
+	  * // note, do NOT copy paste the above line because there is a zero-width space inserted between "@" and "s"
+	  * export function script() {
+	  * 	$s.foo.bar() // will be converted to #ms.foo.bar()
+	  * } */
+	const $s: Nullsec
+
+	const $db: {
+		/** Insert a document or documents into a collection.
+		  * @param documents A document or array of documents to insert into the collection. */
+		i: <T extends MongoDocument>(documents: (T & { _id?: MongoId }) | (T & { _id?: MongoId })[]) =>
+			{ n: number, opTime: { t: number }, ok: 0 | 1 }[]
+
+		/** Remove documents from a collection.
+		  * @param query Specifies deletion criteria using query operators. */
+		r: <T extends MongoDocument>(query: MongoQuery<T>) => { n: number, opTime: { t: number }, ok: 0 | 1 }[]
+
+		/** Find documents in a collection or view and returns a cursor to the selected documents.
+		  * @param query Specifies deletion criteria using query operators.
+		  * @param projection Specifies the fields to return in the documents that match the query filter. */
+		f: <
+			const TQuery extends MongoQueryObject & { _id?: MongoQueryId },
+			const TProjection extends { [k: string]: boolean | 0 | 1 } = {}
+		>(query: TQuery, projection?: TProjection) => Cursor<MongoProject<MongoQueryType<TQuery>, TProjection>>
+
+		/** Update existing documents in a collection.
+		  * @param query Specifies deletion criteria using query operators.
+		  * @param command The modifications to apply.
+		  * {@link https://docs.mongodb.com/manual/reference/method/db.collection.update/#parameters} */
+		u: <T extends MongoDocument>(query: MongoQuery<T> | MongoQuery<T>[], command: MongoUpdateCommand<T>) =>
+			{ n: number, opTime: { t: number }, ok: 0 | 1, nModified: number }[]
+
+		/** Updates one document within the collection based on the filter.
+		  * @param query Specifies deletion criteria using query operators.
+		  * @param command The modifications to apply.
+		  * {@link https://docs.mongodb.com/manual/reference/method/db.collection.update/#parameters} */
+		u1: <T extends MongoDocument>(query: MongoQuery<T> | MongoQuery<T>[], command: MongoUpdateCommand<T>) =>
+			{ n: number, ok: 0 | 1, opTime: { t: number }, nModified: number }[]
+
+		/** Update or insert document.
+		  * Same as Update, but if no documents match the query, one document will be inserted based on the properties in
+		  * both the query and the command.
+		  * The `$setOnInsert` operator is useful to set defaults.
+		  * @param query Specifies deletion criteria using query operators.
+		  * @param command The modifications to apply.
+		  * {@link https://docs.mongodb.com/manual/reference/method/db.collection.update/#parameters} */
+		us: <T extends MongoDocument>(query: MongoQuery<T> | MongoQuery<T>[], command: MongoUpdateCommand<T>) =>
+			{ n: number, ok: 0 | 1, opTime: { t: number }, nModified: number }[]
+
+		ObjectId: () => ObjectId
 	}
 
-	ObjectId: () => ObjectId
+	/** Debug Log.
+	  *
+	  * If `$D()` is called in a script you own, the `return` value of the top level script is suppressed and instead an
+	  * array of every `$D()`’d entry is printed.
+	  * This lets you use `$D()` like `console.log()`.
+	  *
+	  * `$D()` in scripts not owned by you are not shown but the `return` value always is.
+	  *
+	  * `$D()` returns the first argument so `$D("Hello, World!") evaluates to `"Hello, World!"` as if the `$D` text wasn't
+	  * there.
+	  *
+	  * `$D()`’d items are returned even if the script times out or errors. */
+	function $D<T>(args: T): T
+
+	/** Function Multi-Call Lock.
+	  *
+	  * This is used by escrow to ensure that it is only used once in script execution.
+	  *
+	  * The first time (per-script) `$FMCL` is encountered, it returns `undefined`, every other time it `return`s `true`.
+	  *
+	  * @example
+	  * if ($FMCL)
+	  * 	return { ok: false, msg: "This script can only be used once per script execution." }
+	  *
+	  * // all code here will only run once */
+	const $FMCL: undefined | true
+
+	/** Per-script mutable "global" persistent object that is discarded at the end of top level script execution.
+	  *
+	  * `$G` persists between script calls until the end of the main script run making it useful for caching db entries when
+	  * your script is a subscript.
+	  * @example
+	  * if (!$G.dbCache)
+	  * 	$G.dbCache = $db.f({ whatever: true }).first() */
+	const $G: Record<string | symbol, any>
+
+	/** This contains a JS timestamp (not Date) set immediately before your code begins running.
+	  * @example
+	  * $D(Date.now() - _START) // milliseconds left of run time
+	  */
+	const _START: number
+
+	/** This contains a JS timestamp (not Date) set immediately before your code begins running.
+	  * @example
+	  * $D(Date.now() - _ST) // milliseconds left of run time */
+	const _ST: typeof _START
+
+	/** JavaScript timestamp for the end of the script run (`_START + _TIMEOUT`). */ const _END: number
+
+	/** The number of milliseconds a script can run for. Normally `5000` though it has been known to change. */
+	const _TIMEOUT: number
+
+	/** The number of milliseconds a script can run for. Normally `5000` though it has been known to change. */
+	const _TO: typeof _TIMEOUT
+
+	/** The source code of this script as a string. */ const _SOURCE: string
+	/** A unix timestamp of the date this script was built. */ const _BUILD_DATE: number
+
+	/** The user this script has been uploaded to.
+	  *
+	  * Shorter alternative to `context.this_script.split(".")[0].
+	  *
+	  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
+	const _SCRIPT_USER: string
+
+	/** The name of this script excluding the user and `.`.
+	  *
+	  * e.g. in the script `foo.bar`, `_SCRIPT_NAME` is `bar`.
+	  *
+	  * 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
+
+	/** The full name of this script equivilent to `context.this_script` but should use less characters.
+	  *
+	  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
+	const _FULL_SCRIPT_NAME: string
+
+	/** The seclevel of this script as a number.
+	  *
+	  * In rare cases where it's not known at build time, it's `-1`. */
+	const _SECLEVEL: -1 | 0 | 1 | 2 | 3 | 4
+
+	/** 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) */
+	const DEEP_FREEZE: <T>(value: T) => DeepFreeze<T>
+
+	const _RUN_ID: string
 }
 
-/** Debug Log.
-  *
-  * If `$D()` is called in a script you own, the `return` value of the top level script is suppressed and instead an
-  * array of every `$D()`’d entry is printed.
-  * This lets you use `$D()` like `console.log()`.
-  *
-  * `$D()` in scripts not owned by you are not shown but the `return` value always is.
-  *
-  * `$D()` returns the first argument so `$D("Hello, World!") evaluates to `"Hello, World!"` as if the `$D` text wasn't
-  * there.
-  *
-  * `$D()`’d items are returned even if the script times out or errors. */
-declare function $D<T>(args: T): T
-
-/** Function Multi-Call Lock.
-  *
-  * This is used by escrow to ensure that it is only used once in script execution.
-  *
-  * The first time (per-script) `$FMCL` is encountered, it returns `undefined`, every other time it `return`s `true`.
-  *
-  * @example
-  * if ($FMCL)
-  * 	return { ok: false, msg: "This script can only be used once per script execution." }
-  *
-  * // all code here will only run once */
-declare const $FMCL: undefined | true
-
-/** Per-script mutable "global" persistent object that is discarded at the end of top level script execution.
-  *
-  * `$G` persists between script calls until the end of the main script run making it useful for caching db entries when
-  * your script is a subscript.
-  * @example
-  * if (!$G.dbCache)
-  * 	$G.dbCache = $db.f({ whatever: true }).first() */
-declare const $G: Record<string | symbol, any>
-
-/** This contains a JS timestamp (not Date) set immediately before your code begins running.
-  * @example
-  * $D(Date.now() - _START) // milliseconds left of run time
-  */
-declare const _START: number
-
-/** This contains a JS timestamp (not Date) set immediately before your code begins running.
-  * @example
-  * $D(Date.now() - _ST) // milliseconds left of run time */
-declare const _ST: typeof _START
-
-/** JavaScript timestamp for the end of the script run (`_START + _TIMEOUT`). */ declare const _END: number
-
-/** The number of milliseconds a script can run for. Normally `5000` though it has been known to change. */
-declare const _TIMEOUT: number
-
-/** The number of milliseconds a script can run for. Normally `5000` though it has been known to change. */
-declare const _TO: typeof _TIMEOUT
-
-/** The source code of this script as a string. */ declare const _SOURCE: string
-/** A unix timestamp of the date this script was built. */ declare const _BUILD_DATE: number
-
-/** The user this script has been uploaded to.
-  *
-  * Shorter alternative to `context.this_script.split(".")[0].
-  *
-  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
-declare const _SCRIPT_USER: string
-
-/** The name of this script excluding the user and `.`.
-  *
-  * e.g. in the script `foo.bar`, `_SCRIPT_NAME` is `bar`.
-  *
-  * Shorter alternative to `context.this_script.split(".")[1].
-  *
-  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
-declare const _SCRIPT_NAME: string
-
-/** The full name of this script equivilent to `context.this_script` but should use less characters.
-  *
-  * In rare cases where it's not known at build time, it's `"UNKNOWN"`. */
-declare const _FULL_SCRIPT_NAME: string
-
-/** The seclevel of this script as a number.
-  *
-  * 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
+export {}

package/index.js

@@ -46,7 +46,7 @@ import "import-meta-resolve"
 import "./processScript/transform.js"
 import "@samual/lib/clearObject"
 import "@samual/lib/copyFilePersistent"
-import "@samual/lib/Cache"
+import "@samual/lib/AutoMap"
 import "@samual/lib/writeFilePersistent"
 import "fs/promises"
 import "chokidar"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.20.4-9f460e8",
+  "version": "0.20.4-a7d8309",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",
@@ -31,50 +31,50 @@
     "url": "https://github.com/samualtnorman/hackmud-script-manager.git"
   },
   "dependencies": {
-    "@babel/generator": "^7.24.4",
-    "@babel/parser": "^7.24.4",
-    "@babel/plugin-proposal-decorators": "^7.24.1",
-    "@babel/plugin-proposal-destructuring-private": "^7.24.1",
-    "@babel/plugin-proposal-do-expressions": "^7.24.1",
-    "@babel/plugin-proposal-explicit-resource-management": "^7.24.1",
-    "@babel/plugin-proposal-function-bind": "^7.24.1",
-    "@babel/plugin-proposal-function-sent": "^7.24.1",
-    "@babel/plugin-proposal-partial-application": "^7.24.1",
-    "@babel/plugin-proposal-pipeline-operator": "^7.24.1",
-    "@babel/plugin-proposal-record-and-tuple": "^7.24.1",
-    "@babel/plugin-proposal-throw-expressions": "^7.24.1",
-    "@babel/plugin-transform-class-properties": "^7.24.1",
-    "@babel/plugin-transform-class-static-block": "^7.24.4",
-    "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
-    "@babel/plugin-transform-json-strings": "^7.24.1",
-    "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-    "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-    "@babel/plugin-transform-numeric-separator": "^7.24.1",
-    "@babel/plugin-transform-object-rest-spread": "^7.24.1",
-    "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
-    "@babel/plugin-transform-optional-chaining": "^7.24.1",
-    "@babel/plugin-transform-private-property-in-object": "^7.24.1",
-    "@babel/plugin-transform-typescript": "^7.24.4",
-    "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
-    "@babel/traverse": "^7.24.1",
-    "@babel/types": "^7.24.0",
+    "@babel/generator": "^7.26.2",
+    "@babel/parser": "^7.26.2",
+    "@babel/plugin-proposal-decorators": "^7.25.9",
+    "@babel/plugin-proposal-destructuring-private": "^7.26.0",
+    "@babel/plugin-proposal-do-expressions": "^7.25.9",
+    "@babel/plugin-proposal-explicit-resource-management": "^7.25.9",
+    "@babel/plugin-proposal-function-bind": "^7.25.9",
+    "@babel/plugin-proposal-function-sent": "^7.25.9",
+    "@babel/plugin-proposal-partial-application": "^7.25.9",
+    "@babel/plugin-proposal-pipeline-operator": "^7.25.9",
+    "@babel/plugin-proposal-record-and-tuple": "^7.25.9",
+    "@babel/plugin-proposal-throw-expressions": "^7.25.9",
+    "@babel/plugin-transform-class-properties": "^7.25.9",
+    "@babel/plugin-transform-class-static-block": "^7.26.0",
+    "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+    "@babel/plugin-transform-json-strings": "^7.25.9",
+    "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+    "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+    "@babel/plugin-transform-numeric-separator": "^7.25.9",
+    "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+    "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+    "@babel/plugin-transform-optional-chaining": "^7.25.9",
+    "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+    "@babel/plugin-transform-typescript": "^7.25.9",
+    "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+    "@babel/traverse": "^7.25.9",
+    "@babel/types": "^7.26.0",
     "@bloomberg/record-tuple-polyfill": "^0.0.4",
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@samual/lib": "0.11.0",
-    "acorn": "^8.11.3",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@samual/lib": "^0.13.0",
+    "acorn": "^8.14.0",
     "chalk": "^5.3.0",
-    "chokidar": "^3.6.0",
-    "import-meta-resolve": "^4.0.0",
-    "prettier": "^3.2.5",
+    "chokidar": "^4.0.1",
+    "import-meta-resolve": "^4.1.0",
+    "prettier": "^3.3.3",
     "proxy-polyfill": "^0.3.2",
-    "rollup": "^4.16.4",
-    "terser": "^5.30.4"
+    "rollup": "^4.27.4",
+    "terser": "^5.36.0"
   },
   "peerDependencies": {
-    "typescript": "5.4.5"
+    "typescript": "^5.4.5"
   },
   "type": "module",
   "exports": {

package/processScript/transform.js

@@ -162,21 +162,25 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	if (program.scope.hasGlobal("_SECLEVEL"))
 		for (const referencePath of getReferencePathsToGlobal("_SECLEVEL", program))
 			referencePath.replaceWith(t.numericLiteral(seclevel))
-	let needGetPrototypeOf = !1
+	let needGetPrototypeOf = !1,
+		needHasOwn = !1
 	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:242:64")
 				if ("getPrototypeOf" == referencePath.parent.property.name) {
 					referencePath.parentPath.replaceWith(t.identifier(`_${uniqueId}_GET_PROTOTYPE_OF_`))
 					needGetPrototypeOf = !0
+				} else if ("hasOwn" == referencePath.parent.property.name) {
+					referencePath.parentPath.replaceWith(t.identifier(`_${uniqueId}_HAS_OWN_`))
+					needHasOwn = !0
 				}
 			}
 	const consoleMethodsReferenced = new Set()
 	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:260:64")
 				referencePath.parentPath.replaceWith(
 					t.identifier(`_${uniqueId}_CONSOLE_METHOD_${referencePath.parent.property.name}_`)
 				)
@@ -184,13 +188,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:274: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:280:51 ${specifier.type} is currently unsupported`
 			)
 			if (
 				"default" !=
@@ -292,11 +296,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:390:59")
+				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:394:59")
 				const declarator = globalBlockStatement.declarations[0]
 				assert(
 					"Identifier" == declarator.id.type,
-					`src/processScript/transform.ts:394:51 declarator.id.type was "${declarator.id.type}"`
+					`src/processScript/transform.ts:398:51 declarator.id.type was "${declarator.id.type}"`
 				)
 				program.scope.crawl()
 				if (program.scope.hasGlobal(declarator.id.name)) {
@@ -311,9 +315,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:413:23")
+						assert(binding, "src/processScript/transform.ts:417:23")
 						for (const referencePath of binding.referencePaths) {
-							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:416:56")
+							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:420:56")
 							referencePath.replaceWith(
 								t.memberExpression(
 									t.identifier(`_${uniqueId}_G_`),
@@ -361,16 +365,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:473:37")
+				assert(globalBlockStatement.id, "src/processScript/transform.ts:477: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:485:22")
+					assert(binding, "src/processScript/transform.ts:489:22")
 					for (const referencePath of binding.referencePaths) {
-						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:488:55")
+						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:492:55")
 						referencePath.replaceWith(
 							t.memberExpression(t.identifier(`_${uniqueId}_G_`), t.identifier(referencePath.node.name))
 						)
@@ -448,6 +452,31 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				)
 			])
 		)
+	needHasOwn &&
+		mainFunction.body.body.unshift(
+			t.variableDeclaration("let", [
+				t.variableDeclarator(
+					t.identifier(`_${uniqueId}_HAS_OWN_`),
+					t.callExpression(
+						t.memberExpression(
+							t.memberExpression(
+								t.identifier(
+									globalFunctionsUnder7Characters.find(name => !program.scope.hasOwnBinding(name))
+								),
+								t.identifier("call")
+							),
+							t.identifier("bind")
+						),
+						[
+							t.memberExpression(
+								t.memberExpression(t.identifier("Object"), t.identifier("prototype")),
+								t.identifier("hasOwnProperty")
+							)
+						]
+					)
+				)
+			])
+		)
 	consoleMethodsReferenced.size &&
 		mainFunction.body.body.unshift(
 			t.variableDeclaration(
@@ -537,7 +566,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				}
 		},
 		ClassBody({ node: classBody, scope, parent }) {
-			assert(t.isClass(parent), "src/processScript/transform.ts:658:30")
+			assert(t.isClass(parent), "src/processScript/transform.ts:687:30")
 			let thisIsReferenced = !1
 			for (const classMethod of classBody.body) {
 				if ("ClassMethod" != classMethod.type) continue
@@ -637,23 +666,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:764:60")
+			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:793:60")
 			assert("Identifier" == referencePath.parent.property.type)
 			assert(
 				"MemberExpression" == referencePath.parentPath.parentPath?.node.type,
-				"src/processScript/transform.ts:766:81"
+				"src/processScript/transform.ts:795:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:767:83"
+				"src/processScript/transform.ts:796:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:771:8 invalid user "${referencePath.parent.property.name}" in subscript`
+				`src/processScript/transform.ts:800: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:776:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
+				`src/processScript/transform.ts:805: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

@@ -1,4 +1,4 @@
-import { Cache } from "@samual/lib/Cache"
+import { AutoMap } from "@samual/lib/AutoMap"
 import { ensure, assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
 import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
@@ -84,8 +84,8 @@ async function push(
 		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())
+	const usersToScriptsToPush = new AutoMap(_user => new Map()),
+		scriptNamesToUsers = new AutoMap(_scriptName => new Set())
 	for (const script of scripts) {
 		const [user, scriptName] = script.split(".")
 		assert(user, "src/push.ts:105:16")
@@ -121,7 +121,7 @@ async function push(
 		for (const user of users)
 			if (!usersToScriptsToPush.get(user).has(scriptName))
 				return new NoScriptsError(`Could not find script ${user}.${scriptName} to push`)
-	const pathsToUsers = new Cache(_path => new Set())
+	const pathsToUsers = new AutoMap(_path => new Set())
 	for (const [user, scriptsToPush] of usersToScriptsToPush)
 		for (const path of scriptsToPush.values()) pathsToUsers.get(path).add(user)
 	const allInfo = []

package/watch.js

@@ -1,4 +1,4 @@
-import { Cache } from "@samual/lib/Cache"
+import { AutoMap } from "@samual/lib/AutoMap"
 import { assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
 import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
@@ -60,7 +60,7 @@ async function watch(
 ) {
 	if (!scripts.length) throw Error("scripts option was an empty array")
 	if (!(await stat(sourceDirectory)).isDirectory()) throw Error("Target folder must be a folder")
-	const scriptNamesToUsers = new Cache(_scriptName => new Set()),
+	const scriptNamesToUsers = new AutoMap(_scriptName => new Set()),
 		wildScriptUsers = new Set(),
 		wildUserScripts = new Set()
 	let pushEverything = !1
@@ -92,7 +92,7 @@ async function watch(
 				)
 			)
 				return
-			const scriptNamesToUsersToSkip = new Cache(_scriptName => [])
+			const scriptNamesToUsersToSkip = new AutoMap(_scriptName => [])
 			await Promise.all(
 				(await readDirectoryWithStats(sourceDirectory)).map(async ({ stats, name, path }) => {
 					if (stats.isDirectory())