hackmud-script-manager 0.20.4-550e28d → 0.20.4-698da0d

package/README.md

@@ -20,6 +20,10 @@ You can read about how HSM works [in my blog post](https://samual.uk/blog/js-cod
 > ```
 > You will need to run `Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser` in PowerShell as an administrator. For more information, see [Microsoft's page about Execution Policies](https://learn.microsoft.com/en-gb/powershell/module/microsoft.powershell.core/about/about_execution_policies?view=powershell-7.4).
 
+![image](https://github.com/samualtnorman/hackmud-script-manager/assets/18307063/69a371fe-f8c8-43fe-b3c7-39f3735ce6fb)
+![image](https://github.com/samualtnorman/hackmud-script-manager/assets/18307063/08103f9e-74fa-4a56-a739-94858ba8c139)
+![image](https://github.com/samualtnorman/hackmud-script-manager/assets/18307063/25ccb86d-1fe3-4632-b703-ac47f5b32c9c)
+
 ## Features
 - Minification
     - This includes auto quine cheating.

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

package/env.d.ts

@@ -3,13 +3,7 @@ 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 Scriptor<Args = unknown, Ret = unknown> = {
-	name: string
-	call: AllOptional<Args> extends true ? (args?: Args) => Ret : (args: Args) => Ret
-}
+type Scriptor<TArgs extends any[] = any[]> = { name: string, call: (...args: TArgs) => unknown }
 
 type Subscripts = Record<string, Record<string, (...args: any) => any>> & {
 	accts: ErrorScripts
@@ -34,8 +28,8 @@ 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 UpgradeRarity = UpgradeRarityString | UpgradeRarityNumber
 
 type UpgradeBase = {
 	name: string
@@ -51,10 +45,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 }
@@ -132,21 +124,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: {
@@ -465,7 +447,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.
@@ -635,6 +620,9 @@ type Lowsec = Midsec & PlayerLowsec & {
 			(args: { i: number | number[], to: string, memo?: string }): ScriptResponse
 			(args: { sn: string | string[], to: string, memo?: string }): ScriptResponse
 		}
+		/** **LOWSEC**  */ expose_access_log: (args: { target: string }) => ScriptResponse
+		/** **LOWSEC** */ xfer_gc_from: (args: { target: string, amount: number | string }) => ScriptResponse
+		/** **LOWSEC** */ expose_balance: (args: { target: string }) => ScriptResponse
 	}
 }
 
@@ -719,95 +707,146 @@ 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
-
-/**
- * Currently unused
- */
-type MongoLogicalSelectors<T extends MongoValue = MongoValue> = {
-	$not: T | MongoComparisonSelectors<T> | MongoLogicalSelectors<T>
-	$nor: T[]
-	$or: T[]
-	$and: T[]
+// 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 MongoArraySelectors<T extends Array<MongoValue> = Array<MongoValue>> = {
-	$all: T
-	$elemMatch: T
-	$size: 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 MongoComparisonSelectors<T extends MongoValue = MongoValue> = {
-	$eq: T
-	$gt: T
-	$gte: T
-	$in: T[]
-	$lt: T
-	$lte: T
-	$ne: T
-	$nin: T[]
-}
+type MongoCommandValue = MongoPrimitive | MongoCommandValue[] | { [k: string]: MongoCommandValue }
+type MongoArraySelectors<T extends MongoValue[] = MongoValue[]> = { $all: T, $elemMatch: T, $size: number }
 
-type MongoElementSelectors = {
-	$exists: boolean
-	$type: MongoTypeNumber | MongoTypeString
-}
+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 MongoQuerySelector<T extends MongoValue> = Partial<
+	T extends []
+		? MongoArraySelectors<T> & MongoElementSelectors & MongoComparisonSelectors<T>
+		: MongoElementSelectors & MongoComparisonSelectors<T>
+>
 
-type Query = { [key: string]: MongoValue | Query } & { _id?: Id, $in?: MongoValue[] }
+type MongoQuery<T extends MongoObject> = { [K in keyof T]?: T[K] | MongoQuerySelector<T[K]> } & { _id?: MongoId }
 type Projection = Record<string, boolean | 0 | 1>
 
-type MongoCommand = MongoCommandValue & Partial<
-	{ $set: Record<string, MongoCommandValue>, $push: Record<string, MongoCommandValue>, $unset: Record<string, ""> }
->
+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>
+
+	$rename: Partial<Record<string, string> & { [key in keyof T]: string }>
+
+	/* 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 }
+
+	$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
 }
 
@@ -818,7 +857,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
 }
@@ -829,12 +870,8 @@ 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 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
@@ -871,8 +908,8 @@ declare const $0s: typeof $ns
 
 /** 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
+  * // @​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()
   * } */
@@ -880,99 +917,65 @@ declare const $s: Nullsec
 
 type ObjectId = { $oid: string }
 
+// _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] }
+
 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" }
-		}
-	}
+	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: (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" }
-		}
-	}
+	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: (query?: Query, projection?: Projection) => Cursor
+	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 an existing documents in a collection.
+	/** 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: (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" }
-		}
-	}
+	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: (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"
-			}
-		}
-	}
+	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 or insert document.
+	/** 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: (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" }
-		}
-	}
+	us: <T extends MongoDocument>(query: MongoQuery<T> | MongoQuery<T>[], command: MongoUpdateCommand<T>) =>
+		{ n: number, ok: 0 | 1, opTime: { t: number }, nModified: number }[]
 
 	ObjectId: () => ObjectId
 }

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-550e28d",
+  "version": "0.20.4-698da0d",
   "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": {
@@ -86,6 +86,6 @@
     "hsm": "bin/hsm.js"
   },
   "engines": {
-    "node": "^18 || >=20"
+    "node": "^18 || ^20 || >=22"
   }
 }

package/processScript/index.js

@@ -204,6 +204,7 @@ async function processScript(
 	const bundle = await rollup({
 			input: filePathResolved,
 			plugins: [
+				rollupPluginJSON({ preferConst: !0 }),
 				{
 					name: "hackmud-script-manager",
 					async transform(code, id) {
@@ -227,8 +228,7 @@ async function processScript(
 				},
 				babel({ babelHelpers: "bundled", plugins, configFile: !1, extensions: supportedExtensions }),
 				rollupPluginCommonJS(),
-				rollupPluginNodeResolve({ extensions: supportedExtensions }),
-				rollupPluginJSON()
+				rollupPluginNodeResolve({ extensions: supportedExtensions })
 			],
 			treeshake: { moduleSideEffects: !1 }
 		}),

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
@@ -629,39 +658,31 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	})
 	return { file, seclevel }
 	function createGetFunctionPrototypeNode() {
-		for (const globalFunction of globalFunctionsUnder7Characters)
-			if (!program.scope.hasOwnBinding(globalFunction))
-				return t.memberExpression(
-					t.memberExpression(t.identifier(globalFunction), t.identifier("constructor")),
-					t.identifier("prototype")
-				)
+		const name = globalFunctionsUnder7Characters.find(name => !program.scope.hasOwnBinding(name))
 		return t.memberExpression(
-			t.memberExpression(
-				t.arrowFunctionExpression([t.identifier("_")], t.identifier("_")),
-				t.identifier("constructor")
-			),
-			t.identifier("prototype")
+			name ? t.identifier(name) : t.arrowFunctionExpression([t.identifier("_")], t.identifier("_")),
+			t.identifier("__proto__")
 		)
 	}
 	function processFakeSubscriptObject(fakeSubscriptObjectName, seclevel) {
 		for (const referencePath of getReferencePathsToGlobal(fakeSubscriptObjectName, program)) {
-			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:774: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:776:81"
+				"src/processScript/transform.ts:795:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:777:83"
+				"src/processScript/transform.ts:796:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:781: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:786: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,10 +1,10 @@
-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"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
 import { watch as watch$1 } from "chokidar"
-import { readFile, writeFile } from "fs/promises"
+import { stat, readFile, writeFile } from "fs/promises"
 import { extname, basename, resolve } from "path"
 import { supportedExtensions } from "./constants.js"
 import { generateTypeDeclaration } from "./generateTypeDeclaration.js"
@@ -59,7 +59,8 @@ async function watch(
 	} = {}
 ) {
 	if (!scripts.length) throw Error("scripts option was an empty array")
-	const scriptNamesToUsers = new Cache(_scriptName => new Set()),
+	if (!(await stat(sourceDirectory)).isDirectory()) throw Error("Target folder must be a folder")
+	const scriptNamesToUsers = new AutoMap(_scriptName => new Set()),
 		wildScriptUsers = new Set(),
 		wildUserScripts = new Set()
 	let pushEverything = !1
@@ -91,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())
@@ -136,7 +137,7 @@ async function watch(
 					forceQuineCheats
 				}))
 			} catch (error) {
-				assert(error instanceof Error, "src/watch.ts:141:36")
+				assert(error instanceof Error, "src/watch.ts:146:36")
 				onPush?.({ path, users: [], characterCount: 0, error })
 				return
 			}
@@ -181,7 +182,7 @@ async function watch(
 				forceQuineCheats
 			}))
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:177:35")
+			assert(error instanceof Error, "src/watch.ts:182:35")
 			onPush?.({ path, users: [], characterCount: 0, error })
 			return
 		}
@@ -196,7 +197,7 @@ async function watch(
 		try {
 			await writeFile(typeDeclarationPath, typeDeclaration)
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:210:35")
+			assert(error instanceof Error, "src/watch.ts:215:35")
 			if ("EISDIR" != error.code) throw error
 			typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 			await writeFile(typeDeclarationPath, typeDeclaration)