hackmud-script-manager 0.20.4-a5e6bcd → 0.20.4-a7d8309

package/generateTypeDeclaration.js

@@ -1,5 +1,6 @@
 import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
 import { basename, resolve } from "path"
+import * as PathPosix from "path/posix"
 async function generateTypeDeclaration(sourceDirectory, hackmudPath) {
 	const users = new Set()
 	if (hackmudPath)
@@ -29,7 +30,7 @@ async function generateTypeDeclaration(sourceDirectory, hackmudPath) {
 			}
 		})
 	)
-	sourceDirectory = resolve(sourceDirectory)
+	sourceDirectory = PathPosix.resolve(sourceDirectory)
 	let o = ""
 	for (const script of wildScripts) o += `type $${script}$ = typeof import("${sourceDirectory}/${script}").default\n`
 	o += "\n"

package/index.js

@@ -7,6 +7,7 @@ export { syncMacros } from "./syncMacros.js"
 export { watch } from "./watch.js"
 import "@samual/lib/readDirectoryWithStats"
 import "path"
+import "path/posix"
 import "@babel/generator"
 import "@babel/parser"
 import "@babel/plugin-proposal-decorators"
@@ -45,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-a5e6bcd",
+  "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/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/minify.js

@@ -43,15 +43,6 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 			)
 		}
 	}
-	const hashGReferencePaths = getReferencePathsToGlobal(`$${uniqueId}$GLOBAL$`, program)
-	if (hashGReferencePaths.length > 3) {
-		for (const path of hashGReferencePaths) path.replaceWith(t.identifier(`_${uniqueId}_G_`))
-		mainFunctionPath.node.body.body.unshift(
-			t.variableDeclaration("let", [
-				t.variableDeclarator(t.identifier(`_${uniqueId}_G_`), t.identifier(`$${uniqueId}$GLOBAL$`))
-			])
-		)
-	}
 	const jsonValues = []
 	let scriptBeforeJSONValueReplacement,
 		comment,
@@ -61,7 +52,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		traverse(fileBeforeJSONValueReplacement, {
 			MemberExpression({ node: memberExpression }) {
 				if (!memberExpression.computed) {
-					assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:127:60")
+					assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:115:60")
 					if ("prototype" == memberExpression.property.name) {
 						memberExpression.computed = !0
 						memberExpression.property = t.identifier(`_${uniqueId}_PROTOTYPE_PROPERTY_`)
@@ -173,7 +164,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 					},
 					MemberExpression({ node: memberExpression }) {
 						if (!memberExpression.computed) {
-							assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:261:62")
+							assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:249:62")
 							if (!(memberExpression.property.name.length < 3)) {
 								memberExpression.computed = !0
 								memberExpression.property = t.stringLiteral(memberExpression.property.name)
@@ -247,7 +238,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		})
 		await Promise.all(promises)
 		const functionDeclaration = file.program.body[0]
-		assert("FunctionDeclaration" == functionDeclaration.type, "src/processScript/minify.ts:366:61")
+		assert("FunctionDeclaration" == functionDeclaration.type, "src/processScript/minify.ts:354:61")
 		if (jsonValues.length) {
 			hasComment = !0
 			if (1 == jsonValues.length)
@@ -367,7 +358,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		)
 	}
 	if (1 == forceQuineCheats) return code
-	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:497:43")
+	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:485:43")
 	return (
 			countHackmudCharacters(scriptBeforeJSONValueReplacement) <=
 				countHackmudCharacters(code) + Number(hasComment)
@@ -383,7 +374,7 @@ function parseObjectExpression(node, o) {
 			"Identifier" == property.key.type ||
 				"NumericLiteral" == property.key.type ||
 				"StringLiteral" == property.key.type,
-			"src/processScript/minify.ts:519:4"
+			"src/processScript/minify.ts:507:4"
 		)
 		if ("ArrayExpression" == property.value.type) {
 			const childArray = []

package/processScript/preprocess.js

@@ -98,8 +98,10 @@ async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 				t.stringLiteral(resolve("proxy-polyfill/src/proxy.js", import.meta.url).slice(7))
 			)
 		)
-	return 1 == program.node.body.length && "FunctionDeclaration" == program.node.body[0].type ?
-			{ code: "export default " + generate(file).code }
-		:	{ code: generate(file).code }
+	if (1 == program.node.body.length && "FunctionDeclaration" == program.node.body[0].type)
+		throw Error(
+			"Scripts that only contain a single function declaration are no longer supported.\nPrefix the function declaration with `export default`."
+		)
+	return { code: generate(file).code }
 }
 export { preprocess }

package/processScript/transform.js

@@ -22,9 +22,7 @@ const { default: traverse } = babelTraverse,
 		"BigInt"
 	]
 function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scriptName, seclevel = 4 }) {
-	const topFunctionName = `_${uniqueId}_SCRIPT_`,
-		exports = new Map(),
-		liveExports = new Map()
+	const topFunctionName = `_${uniqueId}_SCRIPT_`
 	let program
 	traverse(file, {
 		Program(path) {
@@ -70,30 +68,30 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			const referencePath = FunctionReferencePaths[0]
 			assert(
 				"MemberExpression" == referencePath.parent.type,
-				"src/processScript/transform.ts:105:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:103:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			assert(
 				"Identifier" == referencePath.parent.property.type,
-				"src/processScript/transform.ts:110:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:108:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			assert(
 				"prototype" == referencePath.parent.property.name,
-				"src/processScript/transform.ts:115:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:113:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			referencePath.parentPath.replaceWith(createGetFunctionPrototypeNode())
 		} else {
 			for (const referencePath of FunctionReferencePaths) {
 				assert(
 					"MemberExpression" == referencePath.parent.type,
-					"src/processScript/transform.ts:123:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:121:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				assert(
 					"Identifier" == referencePath.parent.property.type,
-					"src/processScript/transform.ts:128:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:126:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				assert(
 					"prototype" == referencePath.parent.property.name,
-					"src/processScript/transform.ts:133:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:131:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				functionDotPrototypeIsReferencedMultipleTimes = !0
 				referencePath.parentPath.replaceWith(t.identifier(`_${uniqueId}_FUNCTION_DOT_PROTOTYPE_`))
@@ -129,12 +127,12 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	const neededDbMethodLets = new Set()
 	if (program.scope.hasGlobal("$db"))
 		for (const referencePath of getReferencePathsToGlobal("$db", program)) {
-			assert("MemberExpression" == referencePath.parentPath.node.type, "src/processScript/transform.ts:187:69")
-			assert("Identifier" == referencePath.parentPath.node.property.type, "src/processScript/transform.ts:188:72")
+			assert("MemberExpression" == referencePath.parentPath.node.type, "src/processScript/transform.ts:185:69")
+			assert("Identifier" == referencePath.parentPath.node.property.type, "src/processScript/transform.ts:186:72")
 			const databaseOpMethodName = referencePath.parentPath.node.property.name
 			assert(
 				validDBMethods.includes(databaseOpMethodName),
-				`src/processScript/transform.ts:194:8 invalid db method "${databaseOpMethodName}", valid db methods are "${validDBMethods.join('", "')}"`
+				`src/processScript/transform.ts:192:8 invalid db method "${databaseOpMethodName}", valid db methods are "${validDBMethods.join('", "')}"`
 			)
 			if ("CallExpression" == referencePath.parentPath.parentPath?.type)
 				referencePath.parentPath.replaceWith(t.identifier(`$${uniqueId}$DB$${databaseOpMethodName}$`))
@@ -157,27 +155,32 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	if (program.scope.hasGlobal("$FMCL"))
 		for (const referencePath of getReferencePathsToGlobal("$FMCL", program))
 			referencePath.replaceWith(t.identifier(`$${uniqueId}$FMCL$`))
-	if (program.scope.hasGlobal("$G"))
+	let needG = program.scope.hasGlobal("$G")
+	if (needG)
 		for (const referencePath of getReferencePathsToGlobal("$G", program))
-			referencePath.replaceWith(t.identifier(`$${uniqueId}$GLOBAL$`))
+			referencePath.replaceWith(t.identifier(`_${uniqueId}_G_`))
 	if (program.scope.hasGlobal("_SECLEVEL"))
 		for (const referencePath of getReferencePathsToGlobal("_SECLEVEL", program))
 			referencePath.replaceWith(t.numericLiteral(seclevel))
-	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}_`)
 				)
@@ -185,19 +188,20 @@ 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`
 			)
-			const exportedName =
-				"Identifier" == specifier.exported.type ? specifier.exported.name : specifier.exported.value
-			"default" == exportedName ?
-				(exportDefaultName = specifier.local.name)
-			:	exports.set(specifier.local.name, exportedName)
+			if (
+				"default" !=
+				("Identifier" == specifier.exported.type ? specifier.exported.name : specifier.exported.value)
+			)
+				throw Error("Only default exports are supported")
+			exportDefaultName = specifier.local.name
 		}
 	}
 	const globalBlock = t.blockStatement([])
@@ -223,10 +227,6 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 									t.returnStatement(t.callExpression(t.identifier(exportDefaultName), []))
 								])
 							))
-						if ("const" != statement.kind && exports.has(identifierName)) {
-							liveExports.set(identifierName, exports.get(identifierName))
-							exports.delete(identifierName)
-						}
 						globalBlock.body.push(
 							t.variableDeclaration("let", [t.variableDeclarator(t.identifier(identifierName))])
 						)
@@ -291,34 +291,16 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 	}
 	program.node.body = [mainFunction]
 	if (globalBlock.body.length) {
-		;(exports.size || liveExports.size) &&
-			mainFunction.body.body.push(
-				t.returnStatement(
-					t.objectExpression([
-						...[...exports].map(([local, exported]) =>
-							t.objectProperty(t.identifier(exported), t.identifier(local))
-						),
-						...[...liveExports].map(([local, exported]) =>
-							t.objectMethod(
-								"get",
-								t.identifier(exported),
-								[],
-								t.blockStatement([t.returnStatement(t.identifier(local))])
-							)
-						)
-					])
-				)
-			)
 		program.scope.crawl()
 		const globalBlockVariables = new Set()
 		let hoistedGlobalBlockFunctions = 0
 		for (const [globalBlockIndex, globalBlockStatement] of [...globalBlock.body.entries()].reverse())
 			if ("VariableDeclaration" == globalBlockStatement.type) {
-				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:410:59")
+				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:394:59")
 				const declarator = globalBlockStatement.declarations[0]
 				assert(
 					"Identifier" == declarator.id.type,
-					`src/processScript/transform.ts:414:51 declarator.id.type was "${declarator.id.type}"`
+					`src/processScript/transform.ts:398:51 declarator.id.type was "${declarator.id.type}"`
 				)
 				program.scope.crawl()
 				if (program.scope.hasGlobal(declarator.id.name)) {
@@ -333,15 +315,16 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 						Object.keys(program.scope.globals).some(global => globalBlockVariables.has(global))
 					) {
 						const binding = program.scope.getBinding(declarator.id.name)
-						assert(binding, "src/processScript/transform.ts:433:23")
+						assert(binding, "src/processScript/transform.ts:417:23")
 						for (const referencePath of binding.referencePaths) {
-							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:436:56")
+							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:420:56")
 							referencePath.replaceWith(
 								t.memberExpression(
-									t.identifier(`$${uniqueId}$GLOBAL$`),
+									t.identifier(`_${uniqueId}_G_`),
 									t.identifier(referencePath.node.name)
 								)
 							)
+							needG = !0
 						}
 						for (const referencePath of binding.constantViolations)
 							if ("AssignmentExpression" == referencePath.node.type)
@@ -350,12 +333,13 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 										clearObject(node)
 										Object.assign(
 											node,
-											t.memberExpression(t.identifier(`$${uniqueId}$GLOBAL$`), t.identifier(name))
+											t.memberExpression(t.identifier(`_${uniqueId}_G_`), t.identifier(name))
 										)
+										needG = !0
 									}
 						globalBlockPath.remove()
 						globalBlockStatementPath.remove()
-						declarator.init &&
+						if (declarator.init) {
 							globalBlock.body.splice(
 								globalBlockIndex,
 								0,
@@ -363,13 +347,15 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 									t.assignmentExpression(
 										"=",
 										t.memberExpression(
-											t.identifier(`$${uniqueId}$GLOBAL$`),
+											t.identifier(`_${uniqueId}_G_`),
 											t.identifier(declarator.id.name)
 										),
 										declarator.init
 									)
 								)
 							)
+							needG = !0
+						}
 					} else {
 						globalBlockPath.remove()
 						globalBlockStatementPath.remove()
@@ -379,22 +365,20 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				} else globalBlockVariables.add(declarator.id.name)
 			} else if ("ClassDeclaration" == globalBlockStatement.type) {
 				program.scope.crawl()
-				assert(globalBlockStatement.id, "src/processScript/transform.ts:487:37")
+				assert(globalBlockStatement.id, "src/processScript/transform.ts: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:499:22")
+					assert(binding, "src/processScript/transform.ts:489:22")
 					for (const referencePath of binding.referencePaths) {
-						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:502:55")
+						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:492:55")
 						referencePath.replaceWith(
-							t.memberExpression(
-								t.identifier(`$${uniqueId}$GLOBAL$`),
-								t.identifier(referencePath.node.name)
-							)
+							t.memberExpression(t.identifier(`_${uniqueId}_G_`), t.identifier(referencePath.node.name))
 						)
+						needG = !0
 					}
 					globalBlockPath.remove()
 					globalBlockStatementPath.remove()
@@ -405,7 +389,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 							t.assignmentExpression(
 								"=",
 								t.memberExpression(
-									t.identifier(`$${uniqueId}$GLOBAL$`),
+									t.identifier(`_${uniqueId}_G_`),
 									t.identifier(globalBlockStatement.id.name)
 								),
 								t.classExpression(
@@ -417,13 +401,9 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 							)
 						)
 					)
+					needG = !0
 				}
 			}
-		if (program.scope.hasGlobal("_EXPORTS"))
-			for (const referencePath of getReferencePathsToGlobal("_EXPORTS", program))
-				referencePath.replaceWith(
-					t.arrayExpression([...exports.keys(), ...liveExports.keys()].map(name => t.stringLiteral(name)))
-				)
 		globalBlock.body.length &&
 			mainFunction.body.body.splice(
 				hoistedGlobalBlockFunctions,
@@ -472,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(
@@ -535,6 +540,12 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				)
 			)
 		)
+	needG &&
+		mainFunction.body.body.unshift(
+			t.variableDeclaration("let", [
+				t.variableDeclarator(t.identifier(`_${uniqueId}_G_`), t.identifier(`$${uniqueId}$GLOBAL$`))
+			])
+		)
 	traverse(file, {
 		BlockStatement({ node: blockStatement }) {
 			for (const [index, functionDeclaration] of blockStatement.body.entries())
@@ -555,7 +566,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 				}
 		},
 		ClassBody({ node: classBody, scope, parent }) {
-			assert(t.isClass(parent), "src/processScript/transform.ts:669:30")
+			assert(t.isClass(parent), "src/processScript/transform.ts:687:30")
 			let thisIsReferenced = !1
 			for (const classMethod of classBody.body) {
 				if ("ClassMethod" != classMethod.type) continue
@@ -647,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:785: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:787:81"
+				"src/processScript/transform.ts:795:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:788:83"
+				"src/processScript/transform.ts:796:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:792: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:797: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 = []