hackmud-script-manager 0.21.1-f88f20e → 0.21.2-6d8b74e

package/README.md

@@ -1,6 +1,8 @@
 # Hackmud Script Manager
 Command made for [Hackmud Scripting Environment](https://github.com/samualtnorman/hackmud-environment), which is a scripting environment for hackmud with minification, autocompletes / intellisense, and TypeScript support.
 
+Join [our Discord server](https://discord.gg/RSa4Sc6pNA)!
+
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R0XN5CX)
 
 You can read about how HSM works [in my blog post](https://samual.uk/blog/js-code-transformation-niche-environment/).
@@ -12,7 +14,7 @@ You can read about how HSM works [in my blog post](https://samual.uk/blog/js-cod
 ## Usage
 1. Run `#dir` in game, then `cd` to that folder
 2. Name your source script file to `<name>.src.js`
-3. Run `hsm golf <name>.src.js` and it will create a minified script file called `<name>.js`
+3. Run `hsm minify <name>.src.js` and it will create a minified script file called `<name>.js`
 
 > **NOTE:** If you get an error message that looks like this:
 > ```
@@ -60,8 +62,6 @@ You can read about how HSM works [in my blog post](https://samual.uk/blog/js-cod
     - Subscript and `#db` methods names are verified.
     - All references to preprocessor syntax functions not being called are turned into arrow function wrappers e.g. `let debug = #D;` -> `let debug = v => #D(v);`.
     - `_SECLEVEL` is replaced with a number (`0` to `4`) representing the seclevel of the script.
-    - When `export`s are present in the script, it becomes a script that returns an object of the `export`ed values.
-        - `_EXPORTS` becomes an array of the names of the exported values.
 - And Neat Weird Fixes
     - Like `.__proto__` and `.prototype` being converted to `["__proto__"]` and `["prototype"]`.
     - Illegal and unsafe strings.

package/bin/hsm.js

@@ -55,14 +55,16 @@ const pushModule = import("../push.js"),
 	colourS = chalk.rgb(122, 178, 244),
 	colourV = chalk.rgb(255, 0, 236),
 	colourW = chalk.rgb(255, 150, 224)
-process.version.startsWith("v21.") &&
+if (process.version.startsWith("v21.")) {
+	process.exitCode = 1
 	console.warn(
 		colourF(
 			`${chalk.bold("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("0.21.1-f88f20e")
+	console.log("0.21.2-6d8b74e")
 	process.exit()
 }
 let warnedDeprecatedEmitDtsAlias = !1
@@ -79,13 +81,14 @@ switch (commands[0]) {
 	case "minify":
 		{
 			const noMinifyOption = popOption("no-minify", "skip-minify")
-			noMinifyOption &&
-				"no-minify" != noMinifyOption.name &&
+			if (noMinifyOption && "no-minify" != noMinifyOption.name) {
+				process.exitCode = 1
 				console.warn(
 					colourF(
 						`${chalk.bold("Warning:")} ${formatOption(noMinifyOption.name)} is deprecated and will be removed in the next minor\n         release of HSM\n         You should switch to using its alias ${colourN("--no-minify")}\n`
 					)
 				)
+			}
 			const mangleNamesOption = popOption("mangle-names"),
 				forceQuineCheatsOption = popOption("force-quine-cheats"),
 				noQuineCheatsOptions = popOption("no-quine-cheats"),
@@ -131,19 +134,19 @@ switch (commands[0]) {
 					fileBaseNameEndsWithDotSrc = fileBaseName.endsWith(".src"),
 					scriptName = fileBaseNameEndsWithDotSrc ? fileBaseName.slice(0, -4) : fileBaseName,
 					scriptUser =
-						(
-							"scripts" == basename(resolve(target, "..")) &&
-							"hackmud" == basename(resolve(target, "../../.."))
-						) ?
-							basename(resolve(target, "../.."))
-						:	void 0
+						"scripts" == basename(resolve(target, "..")) &&
+						"hackmud" == basename(resolve(target, "../../.."))
+							? basename(resolve(target, "../.."))
+							: void 0
 				let outputPath =
 					commands[2] ||
 					resolve(
 						dirname(target),
-						fileBaseNameEndsWithDotSrc ? scriptName + ".js"
-						: ".js" == fileExtension ? fileBaseName + ".min.js"
-						: fileBaseName + ".js"
+						fileBaseNameEndsWithDotSrc
+							? scriptName + ".js"
+							: ".js" == fileExtension
+								? fileBaseName + ".min.js"
+								: fileBaseName + ".js"
 					)
 				const golfFile = () =>
 					readFile(target, { encoding: "utf8" }).then(async source => {
@@ -158,6 +161,7 @@ switch (commands[0]) {
 								rootFolderPath
 							}),
 							timeTook = performance.now() - timeStart
+						warnings.length && (process.exitCode = 1)
 						for (const { message } of warnings)
 							console.warn(colourF(`${chalk.bold("Warning:")} ${message}`))
 						await writeFilePersistent(outputPath, script)
@@ -207,14 +211,18 @@ switch (commands[0]) {
 						"dts",
 						"gen-types"
 					)
-					dtsPathOption &&
+					if (
+						dtsPathOption &&
 						"dts-path" != dtsPathOption.name &&
-						"type-declaration-path" != dtsPathOption.name &&
+						"type-declaration-path" != dtsPathOption.name
+					) {
+						process.exitCode = 1
 						console.warn(
 							colourF(
 								`${chalk.bold("Warning:")} ${formatOption(dtsPathOption.name)} is deprecated and will be removed in the\n         next minor release of HSM\n         You should switch to using its alias ${colourN("--dts-path")}\n`
 							)
 						)
+					}
 					complainAboutUnrecognisedOptions()
 					const { watch } = await watchModule
 					watch(sourcePath, hackmudPath, {
@@ -244,7 +252,7 @@ switch (commands[0]) {
 						const typeDeclaration = await generateTypeDeclaration(sourcePath, hackmudPath)
 						declarationPathPromise = writeFile(typeDeclarationPath, typeDeclaration)
 							.catch(error => {
-								assert(error instanceof Error, "src/bin/hsm.ts:292:38")
+								assert(error instanceof Error, "src/bin/hsm.ts:299:38")
 								if ("EISDIR" != error.code) throw error
 								typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 								return writeFile(typeDeclarationPath, typeDeclaration)
@@ -311,6 +319,7 @@ switch (commands[0]) {
 		{
 			if ("emit-dts" != commands[0] && "gen-dts" != commands[0]) {
 				warnedDeprecatedEmitDtsAlias = !0
+				process.exitCode = 1
 				console.warn(
 					colourF(
 						`${chalk.bold("Warning:")} ${colourC("hsm")} ${colourL(commands[0])} is deprecated and will be removed\n         in the next minor release of HSM\n         You should switch to using its alias ${colourC("hsm")} ${colourL("emit-dts")}\n`
@@ -330,7 +339,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:428:35")
+				assert(error instanceof Error, "src/bin/hsm.ts:438:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 				return writeFile(typeDeclarationPath, typeDeclaration)
@@ -379,14 +388,14 @@ function logHelp() {
 		case "gen-dts":
 		case "gen-types":
 		case "emit-dts":
-			warnedDeprecatedEmitDtsAlias ||
-				"emit-dts" == commands[0] ||
-				"gen-dts" == commands[0] ||
+			if (!warnedDeprecatedEmitDtsAlias && "emit-dts" != commands[0] && "gen-dts" != commands[0]) {
+				process.exitCode = 1
 				console.warn(
 					colourF(
 						`${chalk.bold("Warning:")} ${colourC("hsm")} ${colourL(commands[0])} is deprecated and will be removed\n         in the next minor release of HSM\n         You should switch to using its alias ${colourC("hsm")} ${colourL("emit-dts")}\n`
 					)
 				)
+			}
 			console.log(
 				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}`
@@ -403,7 +412,7 @@ function logHelp() {
 		default:
 			console.log(
 				colourS(
-					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.1-f88f20e")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("minify")}\n    Minify a script file on the spot\n${colourL("emit-dts")}\n    Generate a type declaration file for a directory of scripts\n${colourL("sync-macros")}\n    Sync macros across all hackmud users\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory\n\n${colourA("Options:")}\n${colourN("--help")}\n    Can be used on any command e.g. ${colourC("hsm")} ${colourL("push")} ${colourN("--help")} to show helpful information`
+					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.2-6d8b74e")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("minify")}\n    Minify a script file on the spot\n${colourL("emit-dts")}\n    Generate a type declaration file for a directory of scripts\n${colourL("sync-macros")}\n    Sync macros across all hackmud users\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory\n\n${colourA("Options:")}\n${colourN("--help")}\n    Can be used on any command e.g. ${colourC("hsm")} ${colourL("push")} ${colourN("--help")} to show helpful information`
 				)
 			)
 	}
@@ -412,6 +421,7 @@ function logInfo({ path, users, characterCount, error, warnings }, hackmudPath)
 	path = relative(".", path)
 	if (error) logError(`Error "${chalk.bold(error.message)}" in ${chalk.bold(path)}`)
 	else {
+		warnings.length && (process.exitCode = 1)
 		for (const warning of warnings) console.warn(colourF(`${chalk.bold("Warning:")} ${warning.message}`))
 		log(
 			`Pushed ${chalk.bold(path)} to ${users.map(user => chalk.bold(userColours.get(user))).join(", ")} | ${chalk.bold(characterCount + "")} chars | ${chalk.bold(resolve(hackmudPath, users[0], "scripts", basename(path, extname(path))) + ".js")}`

package/env.d.ts

@@ -1,4 +1,4 @@
-type Replace<A, B> = Omit<A, keyof B> & BigInt
+type Replace<A, B> = Omit<A, keyof B> & B
 type ErrorScripts = Record<string, () => ScriptFailure>
 
 type Subscripts = Record<string, Record<string, (...args: any) => any>> & {
@@ -189,7 +189,7 @@ type Fullsec = Subscripts & PlayerFullsec & {
 
 			/** @returns A random element from `array`, selected with a random number generated using `rng`
 			  * (defaults to `Math.random`). */
-			sample: (array: any[], rng?: ()=>number) => any
+			sample: <T>(array: T[], rng?: ()=>number) => T
 
 			/** @returns Whether two MongoDB `ObjectId`s are equivalent. */ are_ids_eq: (id1: any, id2: any) => boolean
 			/** Convert a MongoDB `ObjectId` to a string. */ id_to_str: (id: string | {$oid: string}) => any
@@ -270,7 +270,7 @@ type Fullsec = Subscripts & PlayerFullsec & {
 			map: <T, U>(array: T[], callback: (index: number, value: T) => U) => U[]
 
 			/** @returns A new object derived from `obj` with only the keys specified in `keys`. */
-			pick: (obj: object, keys: string[]) => any
+			pick: <TObj extends object, TKeys extends keyof TObj>(obj: TObj, keys: TKeys[]) => { [K in TKeys]: TObj[K] }
 
 			/** @returns An array with the elements from `array` in a random order. */ shuffle: <T>(array: T[]) => T[]
 
@@ -298,7 +298,7 @@ type Fullsec = Subscripts & PlayerFullsec & {
 			security_level_names: [ "NULLSEC", "LOWSEC", "MIDSEC", "HIGHSEC", "FULLSEC" ]
 
 			/** @returns The string name of a numeric security level. */
-			get_security_level_name: (security_level: number) => any
+			get_security_level_name: (security_level: number) => string
 
 			/** @param result The return value of a call to `$db.i()` or `$db.r()`.
 			  * @param nModified The expected value of `result.nModified`.
@@ -699,11 +699,11 @@ type Nullsec = Lowsec & PlayerNullsec & {
 // database
 type MongoPrimitive = null | boolean | number | Date | string
 type MongoValue = MongoPrimitive | MongoValue[] | MongoObject
-type MongoObject = { [k: string]: MongoValue, [k: `$${string}`]: never }
+type MongoObject = { [k: string]: MongoValue }
 type MongoQueryValue = MongoPrimitive | MongoQueryValue[] | MongoQueryObject
 
 type MongoQueryObject =
-	{ [k: string]: MongoQueryValue, [k: `$${string}`]: MongoValue, $type?: keyof MongoTypeStringsToTypes | (string & {}) }
+	{ [k: string]: MongoQueryValue, [k: `$${string}`]: MongoValue } & { $type?: keyof MongoTypeStringsToTypes | (string & {}) }
 
 type MongoTypeStringsToTypes = {
 	double: number
@@ -720,8 +720,8 @@ type MongoTypeStringsToTypes = {
 
 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 MongoId = Exclude<MongoPrimitive, null | false> | ObjectId | MongoObject
+type MongoQueryId = Exclude<MongoPrimitive, null | false> | ObjectId | MongoQueryObject
 type MongoDocument = MongoObject & { _id?: MongoId }
 
 type MongoQueryType<TQuery extends MongoQueryObject> = {
@@ -755,11 +755,16 @@ type MongoQuerySelector<T extends MongoValue> = Partial<
 
 type MongoQuery<T extends MongoObject> = { [K in keyof T]?: T[K] | MongoQuerySelector<T[K]> } & { _id?: MongoId }
 
-type MongoUpdateOperators<T extends MongoObject> = Partial<{
+type MongoUpdateArrayOperatorUniversalModifiers<T> = { $each?: T extends [] ? T : T[] }
+
+type MongoUpdateArrayOperatorModifiers<T> = MongoUpdateArrayOperatorUniversalModifiers<T> &
+	{ $position?: number, $slice?: number, $sort?: 1 | -1 }
+
+type MongoUpdateCommand<T extends MongoObject> = Partial<{
 	/* Universal operators */
-	$set: Partial<Record<string, MongoCommandValue> & T>
-	$setOnInsert: Partial<Record<string, MongoCommandValue> & T>
-	$unset: Partial<Record<string, ""> & T>
+	$set: Partial<Record<(string & {}) | keyof T, MongoCommandValue>>
+	$setOnInsert: Partial<Record<(string & {}) | keyof T, MongoCommandValue>>
+	$unset: Partial<Record<(string & {}) | keyof T, "">>
 
 	$rename: Partial<Record<string, string> & { [key in keyof T]: string }>
 
@@ -792,13 +797,6 @@ type MongoUpdateOperators<T extends MongoObject> = Partial<{
 	$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 SortOrder = { [key: string]: 1 | -1 | SortOrder }
 
 type Cursor<T> = {
@@ -865,8 +863,8 @@ type BrainContext = Replace<CliContext, { /** Whether the script is being run vi
 // 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 }) &
+	(TProjection extends { _id: false | 0 } ? {} : { _id: TDocument extends { _id: infer TId } ? TId : MongoId }) & (
+		true extends (1 extends TProjection[keyof TProjection] ? true : TProjection[keyof TProjection]) ?
 			{
 				[K in
 					keyof TDocument as K extends keyof TProjection ? TProjection[K] extends true | 1 ? K : never : never
@@ -877,7 +875,8 @@ type MongoProject<TDocument, TProjection> =
 					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] }
+		: { [k: string]: MongoValue } & { [K in keyof TDocument as K extends keyof TProjection ? never : K]: TDocument[K] }
+	)
 
 type DeepFreeze<T> = { readonly [P in keyof T]: DeepFreeze<T[P]> }
 

package/generateTypeDeclaration.js

@@ -11,24 +11,26 @@ async function generateTypeDeclaration(sourceDirectory, hackmudPath) {
 		allScripts = {},
 		allAnyScripts = {}
 	await Promise.all(
-		(await readDirectoryWithStats(sourceDirectory)).map(async ({ stats, name }) => {
-			if (stats.isFile())
-				name.endsWith(".ts") ?
-					name.endsWith(".d.ts") || wildScripts.push(basename(name, ".ts"))
-				:	name.endsWith(".js") && wildAnyScripts.push(basename(name, ".js"))
-			else if (stats.isDirectory()) {
-				const scripts = [],
-					anyScripts = []
-				allScripts[name] = scripts
-				allAnyScripts[name] = anyScripts
-				users.add(name)
-				for (const child of await readDirectoryWithStats(resolve(sourceDirectory, name)))
-					child.stats.isFile() &&
-						(child.name.endsWith(".ts") ?
-							name.endsWith(".d.ts") || scripts.push(basename(child.name, ".ts"))
-						:	child.name.endsWith(".js") && anyScripts.push(basename(child.name, ".js")))
-			}
-		})
+		(await readDirectoryWithStats(sourceDirectory))
+			.filter(({ stats, name }) => !stats.isDirectory() || /^[a-z_][a-z\d_]{0,24}$/.test(name))
+			.map(async ({ stats, name }) => {
+				if (stats.isFile())
+					name.endsWith(".ts")
+						? name.endsWith(".d.ts") || wildScripts.push(basename(name, ".ts"))
+						: name.endsWith(".js") && wildAnyScripts.push(basename(name, ".js"))
+				else if (stats.isDirectory()) {
+					const scripts = [],
+						anyScripts = []
+					allScripts[name] = scripts
+					allAnyScripts[name] = anyScripts
+					users.add(name)
+					for (const child of await readDirectoryWithStats(resolve(sourceDirectory, name)))
+						child.stats.isFile() &&
+							(child.name.endsWith(".ts")
+								? name.endsWith(".d.ts") || scripts.push(basename(child.name, ".ts"))
+								: child.name.endsWith(".js") && anyScripts.push(basename(child.name, ".js")))
+				}
+			})
 	)
 	sourceDirectory = PathPosix.resolve(sourceDirectory)
 	let o = ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.21.1-f88f20e",
+  "version": "0.21.2-6d8b74e",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",
@@ -23,7 +23,9 @@
   "author": "Samual Norman <me@samual.uk> (https://samual.uk/)",
   "contributors": [
     "Daniel Swann (https://github.com/danswann)",
-    "Longboyy"
+    "Longboyy",
+    "Helloman892",
+    "Sarah Klocke (https://sarahisweird.dev/)"
   ],
   "main": "index.js",
   "repository": {

package/processScript/index.js

@@ -23,7 +23,7 @@ import rollupPluginCommonJS from "@rollup/plugin-commonjs"
 import rollupPluginJSON from "@rollup/plugin-json"
 import rollupPluginNodeResolve from "@rollup/plugin-node-resolve"
 import { assert } from "@samual/lib/assert"
-import { relative } from "path"
+import { relative, isAbsolute, sep } from "path"
 import prettier from "prettier"
 import { rollup } from "rollup"
 import { supportedExtensions } from "../constants.js"
@@ -210,7 +210,8 @@ async function processScript(
 				{
 					name: "hackmud-script-manager",
 					async transform(code, id) {
-						if (!id.includes("/node_modules/")) return (await preprocess(code, { uniqueId })).code
+						if (isAbsolute(id) && !id.includes(`${sep}node_modules${sep}`))
+							return (await preprocess(code, { uniqueId })).code
 						let program
 						traverse(parse(code, { sourceType: "module" }), {
 							Program(path) {
@@ -221,10 +222,10 @@ async function processScript(
 						for (const referencePath of getReferencePathsToGlobal("JSON", program))
 							"MemberExpression" == referencePath.parentPath.node.type &&
 								"Identifier" == referencePath.parentPath.node.property.type &&
-								("parse" == referencePath.parentPath.node.property.name ?
-									(referencePath.parentPath.node.property.name = "oparse")
-								:	"stringify" == referencePath.parentPath.node.property.name &&
-									(referencePath.parentPath.node.property.name = "ostringify"))
+								("parse" == referencePath.parentPath.node.property.name
+									? (referencePath.parentPath.node.property.name = "oparse")
+									: "stringify" == referencePath.parentPath.node.property.name &&
+										(referencePath.parentPath.node.property.name = "ostringify"))
 						return generate(program.node).code
 					}
 				},

package/processScript/minify.js

@@ -359,12 +359,9 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 	}
 	if (1 == forceQuineCheats) return code
 	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:485:43")
-	return (
-			countHackmudCharacters(scriptBeforeJSONValueReplacement) <=
-				countHackmudCharacters(code) + Number(hasComment)
-		) ?
-			scriptBeforeJSONValueReplacement
-		:	code
+	return countHackmudCharacters(scriptBeforeJSONValueReplacement) <= countHackmudCharacters(code) + Number(hasComment)
+		? scriptBeforeJSONValueReplacement
+		: code
 }
 function parseObjectExpression(node, o) {
 	if (!node.properties.length) return !1

package/processScript/preprocess.js

@@ -80,14 +80,14 @@ async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 	;(needRecord || needTuple) &&
 		file.program.body.unshift(
 			t.importDeclaration(
-				needRecord ?
-					needTuple ?
-						[
-							t.importSpecifier(t.identifier("Record"), t.identifier("Record")),
-							t.importSpecifier(t.identifier("Tuple"), t.identifier("Tuple"))
-						]
-					:	[t.importSpecifier(t.identifier("Record"), t.identifier("Record"))]
-				:	[t.importSpecifier(t.identifier("Tuple"), t.identifier("Tuple"))],
+				needRecord
+					? needTuple
+						? [
+								t.importSpecifier(t.identifier("Record"), t.identifier("Record")),
+								t.importSpecifier(t.identifier("Tuple"), t.identifier("Tuple"))
+							]
+						: [t.importSpecifier(t.identifier("Record"), t.identifier("Record"))]
+					: [t.importSpecifier(t.identifier("Tuple"), t.identifier("Tuple"))],
 				t.stringLiteral("@bloomberg/record-tuple-polyfill")
 			)
 		)

package/processScript/transform.js

@@ -253,29 +253,29 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 					mainFunction = t.functionDeclaration(
 						t.identifier(topFunctionName),
 						declarator.init.params,
-						"BlockStatement" == declarator.init.body.type ?
-							declarator.init.body
-						:	t.blockStatement([t.returnStatement(declarator.init.body)])
+						"BlockStatement" == declarator.init.body.type
+							? declarator.init.body
+							: t.blockStatement([t.returnStatement(declarator.init.body)])
 					)
 		else
-			"FunctionDeclaration" == statement.type ?
-				statement.id.name == exportDefaultName ?
-					(mainFunction = statement)
-				:	globalBlock.body.push(
-						t.variableDeclaration("let", [
-							t.variableDeclarator(
-								statement.id,
-								t.functionExpression(
-									void 0,
-									statement.params,
-									statement.body,
-									statement.generator,
-									statement.async
+			"FunctionDeclaration" == statement.type
+				? statement.id.name == exportDefaultName
+					? (mainFunction = statement)
+					: globalBlock.body.push(
+							t.variableDeclaration("let", [
+								t.variableDeclarator(
+									statement.id,
+									t.functionExpression(
+										void 0,
+										statement.params,
+										statement.body,
+										statement.generator,
+										statement.async
+									)
 								)
-							)
-						])
-					)
-			:	globalBlock.body.push(statement)
+							])
+						)
+				: globalBlock.body.push(statement)
 	mainFunction ||= t.functionDeclaration(
 		t.identifier(topFunctionName),
 		[t.identifier("context"), t.identifier("args")],
@@ -515,9 +515,11 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				"let",
 				[...neededDbMethodLets].map(name => {
 					const getArgs = () =>
-						"ObjectId" == name ? []
-						: "i" == name || "r" == name ? [t.identifier("a")]
-						: [t.identifier("a"), t.identifier("b")]
+						"ObjectId" == name
+							? []
+							: "i" == name || "r" == name
+								? [t.identifier("a")]
+								: [t.identifier("a"), t.identifier("b")]
 					return t.variableDeclarator(
 						t.identifier(`_${uniqueId}_CONSOLE_METHOD_${name}_`),
 						t.arrowFunctionExpression(
@@ -593,7 +595,9 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 							thisIsReferenced = !0
 							path.replaceWith(t.identifier(`_${uniqueId}_THIS_`))
 						},
-						Function: path => path.skip()
+						Function(path) {
+							"ArrowFunctionExpression" != path.node.type && path.skip()
+						}
 					},
 					scope
 				)
@@ -663,9 +667,9 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			const bigIntAsNumber = Number(path.node.value)
 			path.replaceWith(
 				t.callExpression(t.identifier("BigInt"), [
-					BigInt(bigIntAsNumber) == BigInt(path.node.value) ?
-						t.numericLiteral(bigIntAsNumber)
-					:	t.stringLiteral(path.node.value)
+					BigInt(bigIntAsNumber) == BigInt(path.node.value)
+						? t.numericLiteral(bigIntAsNumber)
+						: t.stringLiteral(path.node.value)
 				])
 			)
 		}
@@ -680,23 +684,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:807:60")
+			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:811:60")
 			assert("Identifier" == referencePath.parent.property.type)
 			assert(
 				"MemberExpression" == referencePath.parentPath.parentPath?.node.type,
-				"src/processScript/transform.ts:809:81"
+				"src/processScript/transform.ts:813:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:810:83"
+				"src/processScript/transform.ts:814:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:814:8 invalid user "${referencePath.parent.property.name}" in subscript`
+				`src/processScript/transform.ts:818: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:819:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
+				`src/processScript/transform.ts:823: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

@@ -70,7 +70,9 @@ async function push(
 	])
 	if (sourceFolder instanceof Error) return sourceFolder
 	if (hackmudFolder instanceof Error) return hackmudFolder
-	const sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
+	const sourceFolderFolders = sourceFolder.filter(
+			({ name, stats }) => stats.isDirectory() && /^[a-z_][a-z\d_]{0,24}$/.test(name)
+		),
 		allUsers = new Set([
 			...scripts
 				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:85:65"))

package/watch.js

@@ -68,12 +68,13 @@ async function watch(
 	let pushEverything = !1
 	for (const fullScriptName of scripts) {
 		const [user, scriptName] = fullScriptName.split(".")
-		user && "*" != user ?
-			scriptName && "*" != scriptName ?
-				scriptNamesToUsers.get(scriptName).add(user)
-			:	wildScriptUsers.add(user)
-		: scriptName && "*" != scriptName ? wildUserScripts.add(scriptName)
-		: (pushEverything = !0)
+		user && "*" != user
+			? scriptName && "*" != scriptName
+				? scriptNamesToUsers.get(scriptName).add(user)
+				: wildScriptUsers.add(user)
+			: scriptName && "*" != scriptName
+				? wildUserScripts.add(scriptName)
+				: (pushEverything = !0)
 	}
 	const watcher = watch$1(".", {
 		cwd: sourceDirectory,
@@ -112,9 +113,9 @@ async function watch(
 				for (const { stats, name } of await readDirectoryWithStats(sourceDirectory))
 					stats.isDirectory() && usersToPushToSet.add(name)
 				for (const { stats, name } of await readDirectoryWithStats(hackmudDirectory))
-					stats.isDirectory() ?
-						usersToPushToSet.add(name)
-					:	stats.isFile() && name.endsWith(".key") && usersToPushToSet.add(name.slice(0, -4))
+					stats.isDirectory()
+						? usersToPushToSet.add(name)
+						: stats.isFile() && name.endsWith(".key") && usersToPushToSet.add(name.slice(0, -4))
 				for (const users of scriptNamesToUsers.values()) for (const user of users) usersToPushToSet.add(user)
 			}
 			for (const user of wildScriptUsers) usersToPushToSet.add(user)
@@ -132,10 +133,19 @@ async function watch(
 			try {
 				;({ script: minifiedCode, warnings } = await processScript(
 					await readFile(filePath, { encoding: "utf8" }),
-					{ minify, scriptUser: !0, scriptName, uniqueId, filePath, mangleNames, forceQuineCheats }
+					{
+						minify,
+						scriptUser: !0,
+						scriptName,
+						uniqueId,
+						filePath,
+						mangleNames,
+						forceQuineCheats,
+						rootFolderPath
+					}
 				))
 			} catch (error) {
-				assert(error instanceof Error, "src/watch.ts:151:36")
+				assert(error instanceof Error, "src/watch.ts:160:36")
 				onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 				return
 			}
@@ -183,7 +193,7 @@ async function watch(
 				rootFolderPath
 			}))
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:198:35")
+			assert(error instanceof Error, "src/watch.ts:207:35")
 			onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 			return
 		}
@@ -198,7 +208,7 @@ async function watch(
 		try {
 			await writeFile(typeDeclarationPath, typeDeclaration)
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:231:35")
+			assert(error instanceof Error, "src/watch.ts:240:35")
 			if ("EISDIR" != error.code) throw error
 			typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 			await writeFile(typeDeclarationPath, typeDeclaration)