hackmud-script-manager 0.19.1-98e81f8 → 0.19.1-bf4dc4a

package/processScript/transform.js

@@ -111,39 +111,34 @@ const { default: traverse } = babelTraverse,
 			}
 		}
 		let detectedSeclevel = 4
-		const processFakeSubscriptObject = fakeSubscriptObjectName => {
-			for (const referencePath of getReferencePathsToGlobal(fakeSubscriptObjectName, program)) {
-				assert("MemberExpression" == referencePath.parent.type)
-				assert("Identifier" == referencePath.parent.property.type)
-				assert("MemberExpression" == referencePath.parentPath.parentPath?.node.type)
-				assert("Identifier" == referencePath.parentPath.parentPath.node.property.type)
-				assert(
-					/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-					`invalid user "${referencePath.parent.property.name}" in subscript`
-				)
-				assert(
-					/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parentPath.parentPath.node.property.name),
-					`invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
-				)
-				"CallExpression" == referencePath.parentPath.parentPath.parentPath?.type ?
-					referencePath.parentPath.parentPath.replaceWith(
-						t.identifier(
-							`$${uniqueID}$SUBSCRIPT$${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}$`
-						)
+		const neededSubscriptLets = new Set(),
+			processFakeSubscriptObject = fakeSubscriptObjectName => {
+				for (const referencePath of getReferencePathsToGlobal(fakeSubscriptObjectName, program)) {
+					assert("MemberExpression" == referencePath.parent.type)
+					assert("Identifier" == referencePath.parent.property.type)
+					assert("MemberExpression" == referencePath.parentPath.parentPath?.node.type)
+					assert("Identifier" == referencePath.parentPath.parentPath.node.property.type)
+					assert(
+						/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
+						`invalid user "${referencePath.parent.property.name}" in subscript`
 					)
-				:	referencePath.parentPath.parentPath.replaceWith(
-						t.arrowFunctionExpression(
-							[t.restElement(t.identifier("args"))],
-							t.callExpression(
-								t.identifier(
-									`$${uniqueID}$SUBSCRIPT$${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}$`
-								),
-								[t.spreadElement(t.identifier("args"))]
+					assert(
+						/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parentPath.parentPath.node.property.name),
+						`invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
+					)
+					if ("CallExpression" == referencePath.parentPath.parentPath.parentPath?.type)
+						referencePath.parentPath.parentPath.replaceWith(
+							t.identifier(
+								`$${uniqueID}$SUBSCRIPT$${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}$`
 							)
 						)
-					)
+					else {
+						const name = `${referencePath.parent.property.name}$${referencePath.parentPath.parentPath.node.property.name}`
+						referencePath.parentPath.parentPath.replaceWith(t.identifier(`_${uniqueID}_SUBSCRIPT_${name}_`))
+						neededSubscriptLets.add(name)
+					}
+				}
 			}
-		}
 		for (const fakeSubscriptObjectName of ["$fs", "$4s", "$s"])
 			program.scope.hasGlobal(fakeSubscriptObjectName) && processFakeSubscriptObject(fakeSubscriptObjectName)
 		for (const fakeSubscriptObjectName of ["$hs", "$3s"])
@@ -167,6 +162,7 @@ const { default: traverse } = babelTraverse,
 				processFakeSubscriptObject(fakeSubscriptObjectName)
 			}
 		seclevel = Math.min(seclevel, detectedSeclevel)
+		const neededDbMethodLets = new Set()
 		if (program.scope.hasGlobal("$db"))
 			for (const referencePath of getReferencePathsToGlobal("$db", program)) {
 				assert("MemberExpression" == referencePath.parentPath.node.type)
@@ -176,44 +172,24 @@ const { default: traverse } = babelTraverse,
 					validDBMethods.includes(databaseOpMethodName),
 					`invalid db method "${databaseOpMethodName}", valid db methods are "${validDBMethods.join('", "')}"`
 				)
-				"CallExpression" == referencePath.parentPath.parentPath?.type ?
+				if ("CallExpression" == referencePath.parentPath.parentPath?.type)
 					referencePath.parentPath.replaceWith(t.identifier(`$${uniqueID}$DB$${databaseOpMethodName}$`))
-				: "ObjectId" == databaseOpMethodName ?
-					referencePath.parentPath.replaceWith(
-						t.arrowFunctionExpression(
-							[],
-							t.callExpression(t.identifier(`$${uniqueID}$DB$${databaseOpMethodName}$`), [])
-						)
-					)
-				: "i" == databaseOpMethodName || "r" == databaseOpMethodName ?
+				else {
 					referencePath.parentPath.replaceWith(
-						t.arrowFunctionExpression(
-							[t.identifier("a")],
-							t.callExpression(t.identifier(`$${uniqueID}$DB$${databaseOpMethodName}$`), [
-								t.identifier("a")
-							])
-						)
-					)
-				:	referencePath.parentPath.replaceWith(
-						t.arrowFunctionExpression(
-							[t.identifier("a"), t.identifier("b")],
-							t.callExpression(t.identifier(`$${uniqueID}$DB$${databaseOpMethodName}$`), [
-								t.identifier("a"),
-								t.identifier("b")
-							])
-						)
+						t.identifier(`_${uniqueID}_CONSOLE_METHOD_${databaseOpMethodName}_`)
 					)
+					neededDbMethodLets.add(databaseOpMethodName)
+				}
 			}
+		let needDebugLet = !1
 		if (program.scope.hasGlobal("$D"))
 			for (const referencePath of getReferencePathsToGlobal("$D", program))
-				"CallExpression" == referencePath.parentPath.type ?
+				if ("CallExpression" == referencePath.parentPath.type)
 					referencePath.replaceWith(t.identifier(`$${uniqueID}$DEBUG$`))
-				:	referencePath.replaceWith(
-						t.arrowFunctionExpression(
-							[t.identifier("a")],
-							t.callExpression(t.identifier(`$${uniqueID}$DEBUG$`), [t.identifier("a")])
-						)
-					)
+				else {
+					referencePath.replaceWith(t.identifier(`_${uniqueID}_DEBUG_`))
+					needDebugLet = !0
+				}
 		if (program.scope.hasGlobal("$FMCL"))
 			for (const referencePath of getReferencePathsToGlobal("$FMCL", program))
 				referencePath.replaceWith(t.identifier(`$${uniqueID}$FMCL$`))
@@ -223,8 +199,7 @@ const { default: traverse } = babelTraverse,
 		if (program.scope.hasGlobal("_SECLEVEL"))
 			for (const referencePath of getReferencePathsToGlobal("_SECLEVEL", program))
 				referencePath.replaceWith(t.numericLiteral(seclevel))
-		let needGetPrototypeOf = !1,
-			needSetPrototypeOf = !1
+		let needGetPrototypeOf = !1
 		if (program.scope.hasGlobal("Object"))
 			for (const referencePath of getReferencePathsToGlobal("Object", program))
 				if ("MemberExpression" == referencePath.parent.type && !referencePath.parent.computed) {
@@ -232,11 +207,18 @@ const { default: traverse } = babelTraverse,
 					if ("getPrototypeOf" == referencePath.parent.property.name) {
 						referencePath.parentPath.replaceWith(t.identifier(`_${uniqueID}_GET_PROTOTYPE_OF_`))
 						needGetPrototypeOf = !0
-					} else if ("setPrototypeOf" == referencePath.parent.property.name) {
-						referencePath.parentPath.replaceWith(t.identifier(`_${uniqueID}_SET_PROTOTYPE_OF_`))
-						needSetPrototypeOf = !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)
+					referencePath.parentPath.replaceWith(
+						t.identifier(`_${uniqueID}_CONSOLE_METHOD_${referencePath.parent.property.name}_`)
+					)
+					consoleMethodsReferenced.add(referencePath.parent.property.name)
+				}
 		const lastStatement = program.node.body.at(-1)
 		let exportDefaultName
 		assert(lastStatement, "program is empty")
@@ -410,7 +392,7 @@ const { default: traverse } = babelTraverse,
 					} else globalBlockVariables.add(declarator.id.name)
 				} else if ("ClassDeclaration" == globalBlockStatement.type) {
 					program.scope.crawl()
-					assert(globalBlockStatement.id, "src/processScript/transform.ts:564:37")
+					assert(globalBlockStatement.id, "src/processScript/transform.ts:544:37")
 					if (program.scope.hasGlobal(globalBlockStatement.id.name)) {
 						globalBlock.body.splice(globalBlockIndex, 1)
 						const [globalBlockPath] = program.unshiftContainer("body", globalBlock),
@@ -471,29 +453,31 @@ const { default: traverse } = babelTraverse,
 					)
 				])
 			)
-		needSetPrototypeOf &&
+		needGetPrototypeOf &&
 			mainFunction.body.body.unshift(
 				t.variableDeclaration("let", [
 					t.variableDeclarator(
-						t.identifier(`_${uniqueID}_SET_PROTOTYPE_OF_`),
+						t.objectPattern([
+							t.objectProperty(t.identifier("get"), t.identifier(`_${uniqueID}_DUNDER_PROTO_GETTER_`))
+						]),
 						t.callExpression(
-							t.memberExpression(
-								t.memberExpression(t.identifier("Object"), t.identifier("call")),
-								t.identifier("bind")
-							),
-							[t.identifier(`_${uniqueID}_DUNDER_PROTO_SETTER_`)]
+							t.memberExpression(t.identifier("Object"), t.identifier("getOwnPropertyDescriptor")),
+							[
+								t.memberExpression(t.identifier("Object"), t.identifier("prototype")),
+								t.stringLiteral("__proto__")
+							]
 						)
-					)
-				])
-			)
-		needGetPrototypeOf &&
-			mainFunction.body.body.unshift(
-				t.variableDeclaration("let", [
+					),
 					t.variableDeclarator(
 						t.identifier(`_${uniqueID}_GET_PROTOTYPE_OF_`),
 						t.callExpression(
 							t.memberExpression(
-								t.memberExpression(t.identifier("Object"), t.identifier("call")),
+								t.memberExpression(
+									t.identifier(
+										globalFunctionsUnder7Characters.find(name => !program.scope.hasOwnBinding(name))
+									),
+									t.identifier("call")
+								),
 								t.identifier("bind")
 							),
 							[t.identifier(`_${uniqueID}_DUNDER_PROTO_GETTER_`)]
@@ -501,41 +485,69 @@ const { default: traverse } = babelTraverse,
 					)
 				])
 			)
-		;(needGetPrototypeOf || needSetPrototypeOf) &&
+		consoleMethodsReferenced.size &&
+			mainFunction.body.body.unshift(
+				t.variableDeclaration(
+					"let",
+					[...consoleMethodsReferenced].map(name =>
+						t.variableDeclarator(
+							t.identifier(`_${uniqueID}_CONSOLE_METHOD_${name}_`),
+							t.arrowFunctionExpression(
+								[t.restElement(t.identifier("args"))],
+								t.unaryExpression(
+									"void",
+									t.callExpression(t.identifier(`$${uniqueID}$DEBUG$`), [t.identifier("args")])
+								)
+							)
+						)
+					)
+				)
+			)
+		neededDbMethodLets.size &&
+			mainFunction.body.body.unshift(
+				t.variableDeclaration(
+					"let",
+					[...neededDbMethodLets].map(name => {
+						const getArgs = () =>
+							"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(
+								getArgs(),
+								t.callExpression(t.identifier(`$${uniqueID}$DB$${name}$`), getArgs())
+							)
+						)
+					})
+				)
+			)
+		needDebugLet &&
 			mainFunction.body.body.unshift(
 				t.variableDeclaration("let", [
 					t.variableDeclarator(
-						t.objectPattern(
-							needGetPrototypeOf ?
-								needSetPrototypeOf ?
-									[
-										t.objectProperty(
-											t.identifier("get"),
-											t.identifier(`_${uniqueID}_DUNDER_PROTO_GETTER_`)
-										),
-										t.objectProperty(
-											t.identifier("set"),
-											t.identifier(`_${uniqueID}_DUNDER_PROTO_SETTER_`)
-										)
-									]
-								:	[
-										t.objectProperty(
-											t.identifier("get"),
-											t.identifier(`_${uniqueID}_DUNDER_PROTO_GETTER_`)
-										)
-									]
-							:	[t.objectProperty(t.identifier("set"), t.identifier(`_${uniqueID}_DUNDER_PROTO_SETTER_`))]
-						),
-						t.callExpression(
-							t.memberExpression(t.identifier("Object"), t.identifier("getOwnPropertyDescriptor")),
-							[
-								t.memberExpression(t.identifier("Object"), t.identifier("prototype")),
-								t.stringLiteral("__proto__")
-							]
-						)
+						t.identifier(`_${uniqueID}_DEBUG_`),
+						t.callExpression(t.identifier(`$${uniqueID}$DEBUG$`), [t.identifier("a")])
 					)
 				])
 			)
+		neededSubscriptLets.size &&
+			mainFunction.body.body.unshift(
+				t.variableDeclaration(
+					"let",
+					[...neededSubscriptLets].map(name =>
+						t.variableDeclarator(
+							t.identifier(`_${uniqueID}_SUBSCRIPT_${name}_`),
+							t.arrowFunctionExpression(
+								[t.restElement(t.identifier("args"))],
+								t.callExpression(t.identifier(`$${uniqueID}$SUBSCRIPT$${name}$`), [
+									t.spreadElement(t.identifier("args"))
+								])
+							)
+						)
+					)
+				)
+			)
 		traverse(file, {
 			BlockStatement({ node: blockStatement }) {
 				for (const [index, functionDeclaration] of blockStatement.body.entries())

package/push.js

@@ -1,8 +1,9 @@
 import { Cache } from "@samual/lib/Cache"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
+import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
-import { readdir, readFile } from "fs/promises"
-import { resolve, extname, basename } from "path"
+import { readFile } from "fs/promises"
+import { basename, resolve, extname } from "path"
 import { supportedExtensions } from "./constants.js"
 import { processScript } from "./processScript/index.js"
 import "@babel/generator"
@@ -64,18 +65,20 @@ const push = async (
 		scriptNamesAlreadyPushedByUser = new Cache(_user => new Set())
 	let sourceDirectoryDirents
 	if (wildUserScripts.size || pushEverything) {
-		const hackmudDirectoryDirents = await readdir(resolve(hackmudDirectory), { withFileTypes: !0 }),
-			allUsers = new Set([
-				...(sourceDirectoryDirents = await readdir(resolve(sourceDirectory), { withFileTypes: !0 }))
-					.filter(dirent => dirent.isDirectory())
-					.map(dirent => dirent.name),
-				...hackmudDirectoryDirents.filter(dirent => dirent.isDirectory()).map(dirent => dirent.name),
-				...hackmudDirectoryDirents
-					.filter(dirent => dirent.isFile() && dirent.name.endsWith(".key"))
-					.map(dirent => dirent.name.slice(0, -4)),
-				...scriptNamesByUser.keys(),
-				...wildScriptUsers
-			])
+		let hackmudDirectoryEntries
+		;[hackmudDirectoryEntries, sourceDirectoryDirents] = await Promise.all([
+			readDirectoryWithStats(hackmudDirectory),
+			readDirectoryWithStats(sourceDirectory)
+		])
+		const allUsers = new Set([
+			...sourceDirectoryDirents.filter(({ stats }) => stats.isDirectory()).map(({ path }) => basename(path)),
+			...hackmudDirectoryEntries.filter(({ stats }) => stats.isDirectory()).map(({ name }) => name),
+			...hackmudDirectoryEntries
+				.filter(({ name, stats }) => stats.isFile() && name.endsWith(".key"))
+				.map(({ name }) => name.slice(0, -4)),
+			...scriptNamesByUser.keys(),
+			...wildScriptUsers
+		])
 		if (pushEverything) for (const user of allUsers) wildScriptUsers.add(user)
 		else
 			for (const user of allUsers) {
@@ -85,28 +88,27 @@ const push = async (
 	}
 	await Promise.all(
 		[...wildScriptUsers].map(async user => {
-			await readdir(resolve(sourceDirectory, user), { withFileTypes: !0 }).then(
-				async dirents => {
+			await readDirectoryWithStats(resolve(sourceDirectory, user)).then(
+				async entries => {
 					await Promise.all(
-						dirents.map(async dirent => {
-							if (dirent.name.endsWith(".d.ts")) return
-							const extension = extname(dirent.name)
-							if (dirent.isFile() && supportedExtensions.includes(extension)) {
-								const scriptName = basename(dirent.name, extension),
-									filePath = resolve(sourceDirectory, user, dirent.name),
+						entries.map(async ({ stats, name, path }) => {
+							if (name.endsWith(".d.ts")) return
+							const extension = extname(name)
+							if (stats.isFile() && supportedExtensions.includes(extension)) {
+								const scriptName = basename(name, extension),
 									{ script: minifiedCode } = await processScript(
-										await readFile(filePath, { encoding: "utf-8" }),
+										await readFile(path, { encoding: "utf-8" }),
 										{
 											minify,
 											scriptUser: user,
 											scriptName,
-											filePath,
+											filePath: path,
 											mangleNames,
 											forceQuineCheats
 										}
 									),
 									info = {
-										file: `${user}/${dirent.name}`,
+										file: `${user}/${name}`,
 										users: [user],
 										minLength: countHackmudCharacters(minifiedCode),
 										error: void 0
@@ -170,12 +172,12 @@ const push = async (
 	)
 	await (wildScriptUsers.size ?
 		Promise.all(
-			(sourceDirectoryDirents || (await readdir(resolve(sourceDirectory), { withFileTypes: !0 }))).map(
-				async dirent => {
-					if (dirent.name.endsWith(".d.ts")) return
-					const extension = extname(dirent.name)
-					if (!dirent.isFile() || !supportedExtensions.includes(extension)) return
-					const scriptName = basename(dirent.name, extension),
+			(sourceDirectoryDirents || (await readDirectoryWithStats(sourceDirectory))).map(
+				async ({ path, stats, name }) => {
+					if (name.endsWith(".d.ts")) return
+					const extension = extname(name)
+					if (!stats.isFile() || !supportedExtensions.includes(extension)) return
+					const scriptName = basename(name, extension),
 						usersToPushTo = [...wildScriptUsers, ...usersByGlobalScriptsToPush.get(scriptName)].filter(
 							user => !scriptNamesAlreadyPushedByUser.get(user).has(scriptName)
 						)
@@ -183,13 +185,17 @@ const push = async (
 					const uniqueID = Math.floor(Math.random() * 2 ** 52)
 							.toString(36)
 							.padStart(11, "0"),
-						filePath = resolve(sourceDirectory, dirent.name),
-						{ script: minifiedCode } = await processScript(
-							await readFile(filePath, { encoding: "utf-8" }),
-							{ minify, scriptUser: !0, scriptName, uniqueID, filePath, mangleNames, forceQuineCheats }
-						),
+						{ script: minifiedCode } = await processScript(await readFile(path, { encoding: "utf-8" }), {
+							minify,
+							scriptUser: !0,
+							scriptName,
+							uniqueID,
+							filePath: path,
+							mangleNames,
+							forceQuineCheats
+						}),
 						info = {
-							file: dirent.name,
+							file: name,
 							users: usersToPushTo,
 							minLength: countHackmudCharacters(minifiedCode),
 							error: void 0

package/syncMacros.js

@@ -1,12 +1,13 @@
-import { readdir, readFile, stat, writeFile } from "fs/promises"
+import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
+import { readFile, stat, writeFile } from "fs/promises"
 import { extname, basename, resolve } from "path"
 const syncMacros = async hackmudPath => {
-	const files = await readdir(hackmudPath, { withFileTypes: !0 }),
+	const files = await readDirectoryWithStats(hackmudPath),
 		macros = new Map(),
 		users = []
 	await Promise.all(
 		files.map(async file => {
-			if (file.isFile())
+			if (file.stats.isFile())
 				switch (extname(file.name)) {
 					case ".macros":
 						{