hackmud-script-manager 0.21.1-24be49c → 0.21.1-8e6657c

package/bin/hsm.js

@@ -62,7 +62,7 @@ process.version.startsWith("v21.") &&
 		)
 	)
 if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
-	console.log("0.21.1-24be49c")
+	console.log("0.21.1-8e6657c")
 	process.exit()
 }
 let warnedDeprecatedEmitDtsAlias = !1
@@ -131,19 +131,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 => {
@@ -403,7 +403,7 @@ function logHelp() {
 		default:
 			console.log(
 				colourS(
-					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.1-24be49c")}\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.1-8e6657c")}\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`
 				)
 			)
 	}

package/generateTypeDeclaration.js

@@ -13,9 +13,9 @@ async function generateTypeDeclaration(sourceDirectory, hackmudPath) {
 	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"))
+				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 = []
@@ -24,9 +24,9 @@ async function generateTypeDeclaration(sourceDirectory, hackmudPath) {
 				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")))
+						(child.name.endsWith(".ts")
+							? name.endsWith(".d.ts") || scripts.push(basename(child.name, ".ts"))
+							: child.name.endsWith(".js") && anyScripts.push(basename(child.name, ".js")))
 			}
 		})
 	)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.21.1-24be49c",
+  "version": "0.21.1-8e6657c",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",

package/processScript/index.js

@@ -221,10 +221,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

@@ -2,109 +2,169 @@ import babelGenerator from "@babel/generator"
 import { parse } from "@babel/parser"
 import babelTraverse from "@babel/traverse"
 import t from "@babel/types"
-import { assert } from "@samual/lib/assert"
+import { assert, ensure } from "@samual/lib/assert"
 import { spliceString } from "@samual/lib/spliceString"
 import { tokenizer, tokTypes } from "acorn"
 import { resolve } from "import-meta-resolve"
+import { validDBMethods } from "../constants.js"
 const { default: traverse } = babelTraverse,
 	{ default: generate } = babelGenerator,
-	SUBSCRIPT_PREFIXES = ["s", "fs", "4s", "hs", "3s", "ms", "2s", "ls", "1s", "ns", "0s"]
+	SUBSCRIPT_PREFIXES = ["s", "fs", "4s", "hs", "3s", "ms", "2s", "ls", "1s", "ns", "0s"],
+	PREPROCESSOR_NAMES = [...SUBSCRIPT_PREFIXES, "D", "G", "FMCL", "db"]
 async function preprocess(code, { uniqueId = "00000000000" } = {}) {
-	assert(/^\w{11}$/.test(uniqueId), "src/processScript/preprocess.ts:26:36")
-	const tokensIterable = tokenizer(code, { ecmaVersion: "latest" })
-	for (const token of tokensIterable) {
-		assert("value" in token, "src/processScript/preprocess.ts:31:28")
-		if (token.type != tokTypes.privateId) continue
-		assert("string" == typeof token.value, "src/processScript/preprocess.ts:36:42")
-		if (!SUBSCRIPT_PREFIXES.includes(token.value)) continue
-		const nextToken = tokensIterable.getToken()
-		if (nextToken.type != tokTypes._in && nextToken.type != tokTypes.dot)
-			throw SyntaxError("Subscripts must be in the form of #fs.foo.bar")
-	}
-	const sourceCode = code
-	let lengthBefore, file, program
-	do {
-		lengthBefore = code.length
-		code = code
-			.replace(/^\s+/, "")
-			.replace(/^\/\/.*/, "")
-			.replace(/^\/\*[\s\S]*?\*\//, "")
-	} while (code.length != lengthBefore)
-	code = code.replace(/^function\s*\(/, "export default function (")
-	for (;;) {
-		let error
-		try {
-			file = parse(code, {
-				plugins: [
-					"typescript",
-					["decorators", { decoratorsBeforeExport: !0 }],
-					"doExpressions",
-					"functionBind",
-					"functionSent",
-					"partialApplication",
-					["pipelineOperator", { proposal: "hack", topicToken: "%" }],
-					"throwExpressions",
-					["recordAndTuple", { syntaxType: "hash" }],
-					"classProperties",
-					"classPrivateProperties",
-					"classPrivateMethods",
-					"logicalAssignment",
-					"numericSeparator",
-					"nullishCoalescingOperator",
-					"optionalChaining",
-					"optionalCatchBinding",
-					"objectRestSpread"
-				],
-				sourceType: "module"
-			})
-			break
-		} catch (error_) {
-			assert(error_ instanceof SyntaxError, "src/processScript/preprocess.ts:89:42")
-			error = error_
-		}
-		if ("BABEL_PARSER_SYNTAX_ERROR" != error.code || "PrivateInExpectedIn" != error.reasonCode) {
-			console.log(/.+/.exec(code.slice(error.pos))?.[0])
-			throw error
-		}
-		const codeSlice = code.slice(error.pos)
-		let match
-		if ((match = /^#[0-4fhmln]s\.scripts\.quine\(\)/.exec(codeSlice)))
-			code = spliceString(code, JSON.stringify(sourceCode), error.pos, match[0].length)
-		else if ((match = /^#[0-4fhmln]?s\./.exec(codeSlice))) code = spliceString(code, "$", error.pos, 1)
-		else if ((match = /^#D[^\w$]/.exec(codeSlice))) code = spliceString(code, "$", error.pos, 1)
-		else if ((match = /^#FMCL/.exec(codeSlice)))
-			code = spliceString(code, `$${uniqueId}$FMCL$`, error.pos, match[0].length)
-		else if ((match = /^#G/.exec(codeSlice)))
-			code = spliceString(code, `$${uniqueId}$GLOBAL$`, error.pos, match[0].length)
-		else {
-			if (!(match = /^#db\./.exec(codeSlice))) throw error
-			code = spliceString(code, "$", error.pos, 1)
+	assert(/^\w{11}$/.test(uniqueId), "src/processScript/preprocess.ts:28:36")
+	const sourceCode = code,
+		tokens = [...tokenizer(code, { ecmaVersion: "latest" })],
+		needExportDefault =
+			ensure(tokens[0], "src/processScript/preprocess.ts:34:21").type == tokTypes._function &&
+			ensure(tokens[1], "src/processScript/preprocess.ts:34:77").type == tokTypes.parenL,
+		maybePrivatePrefix = `$${uniqueId}$MAYBE_PRIVATE$`
+	for (const token of [...tokens].reverse()) {
+		assert("value" in token, "src/processScript/preprocess.ts:39:28")
+		if (token.type == tokTypes.privateId) {
+			assert("string" == typeof token.value, "src/processScript/preprocess.ts:42:43")
+			PREPROCESSOR_NAMES.includes(token.value) &&
+				(code = spliceString(code, maybePrivatePrefix + token.value, token.start, token.end - token.start))
 		}
 	}
-	traverse(file, {
-		Program(path) {
-			program = path
-			path.skip()
+	needExportDefault && (code = "export default " + code)
+	let program
+	traverse(
+		parse(code, {
+			plugins: [
+				"typescript",
+				["decorators", { decoratorsBeforeExport: !0 }],
+				"doExpressions",
+				"functionBind",
+				"functionSent",
+				"partialApplication",
+				["pipelineOperator", { proposal: "hack", topicToken: "%" }],
+				"throwExpressions",
+				["recordAndTuple", { syntaxType: "hash" }],
+				"classProperties",
+				"classPrivateProperties",
+				"classPrivateMethods",
+				"logicalAssignment",
+				"numericSeparator",
+				"nullishCoalescingOperator",
+				"optionalChaining",
+				"optionalCatchBinding",
+				"objectRestSpread"
+			],
+			sourceType: "module"
+		}),
+		{
+			Program(path) {
+				program = path
+			},
+			Identifier(path) {
+				if (!path.node.name.startsWith(maybePrivatePrefix)) return
+				const name = path.node.name.slice(maybePrivatePrefix.length)
+				if ("ClassProperty" == path.parent.type && path.parent.key == path.node)
+					path.parentPath.replaceWith(
+						t.classPrivateProperty(
+							t.privateName(t.identifier(name)),
+							path.parent.value,
+							path.parent.decorators,
+							path.parent.static
+						)
+					)
+				else if ("MemberExpression" == path.parent.type)
+					if (path.parent.property == path.node) {
+						assert(!path.parent.computed, "src/processScript/preprocess.ts:95:36")
+						path.replaceWith(t.privateName(t.identifier(name)))
+					} else {
+						assert(path.parent.object == path.node, "src/processScript/preprocess.ts:98:46")
+						if ("db" == name) {
+							if (path.parent.computed)
+								throw Error(
+									"Index notation cannot be used on #db, must be in the form of #db.<DB method name>"
+								)
+							if ("Identifier" != path.parent.property.type)
+								throw Error(
+									`Expected DB method name to be an Identifier, got ${path.parent.property.type} instead`
+								)
+							if (!validDBMethods.includes(path.parent.property.name))
+								throw Error("Invalid DB method #db." + path.parent.property.name)
+							path.node.name = "$db"
+						} else {
+							assert(SUBSCRIPT_PREFIXES.includes(name), "src/processScript/preprocess.ts:112:49")
+							if (path.parent.computed)
+								throw Error(
+									`Index notation cannot be used for subscripts, must be in the form of #${name}.foo.bar`
+								)
+							if ("Identifier" != path.parent.property.type)
+								throw Error(
+									`Expected subscript user name to be Identifier but got ${path.parent.property.type} instead`
+								)
+							if ("MemberExpression" != path.parentPath.parent.type)
+								throw Error(`Subscripts must be in the form of #${name}.foo.bar`)
+							if (path.parentPath.parent.computed)
+								throw Error(
+									`Index notation cannot be used for subscripts, must be in the form of #${name}.foo.bar`
+								)
+							if ("Identifier" != path.parentPath.parent.property.type)
+								throw Error(
+									`Expected subscript subname to be Identifier but got ${path.parent.property.type} instead`
+								)
+							"CallExpression" == path.parentPath.parentPath?.parent.type &&
+							"scripts" == path.parent.property.name &&
+							"quine" == path.parentPath.parent.property.name
+								? ensure(
+										path.parentPath.parentPath.parentPath,
+										"src/processScript/preprocess.ts:134:54"
+									).replaceWith(t.stringLiteral(sourceCode))
+								: (path.node.name = "$" + name)
+						}
+					}
+				else if (
+					"BinaryExpression" == path.parent.type &&
+					path.parent.left == path.node &&
+					"in" == path.parent.operator
+				)
+					path.replaceWith(t.privateName(t.identifier(name)))
+				else if ("ClassMethod" == path.parent.type && path.parent.key == path.node) {
+					assert("constructor" != path.parent.kind, "src/processScript/preprocess.ts:142:47")
+					path.parentPath.replaceWith(
+						t.classPrivateMethod(
+							path.parent.kind,
+							t.privateName(t.identifier(name)),
+							path.parent.params,
+							path.parent.body,
+							path.parent.static
+						)
+					)
+				} else if ("FMCL" == name) path.node.name = `$${uniqueId}$FMCL$`
+				else if ("G" == name) path.node.name = `$${uniqueId}$GLOBAL$`
+				else {
+					if ("D" != name) {
+						if ("db" == name) throw Error("Invalid #db syntax, must be in the form of #db.<DB method name>")
+						assert(SUBSCRIPT_PREFIXES.includes(name), "src/processScript/preprocess.ts:161:51 " + name)
+						throw Error(`Invalid subscript syntax, must be in the form of #${name}.foo.bar`)
+					}
+					path.node.name = "$D"
+				}
+			}
 		}
-	})
+	)
 	const needRecord = program.scope.hasGlobal("Record"),
 		needTuple = program.scope.hasGlobal("Tuple")
 	;(needRecord || needTuple) &&
-		file.program.body.unshift(
+		program.node.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")
 			)
 		)
 	program.scope.hasGlobal("Proxy") &&
-		file.program.body.unshift(
+		program.node.body.unshift(
 			t.importDeclaration(
 				[t.importDefaultSpecifier(t.identifier("Proxy"))],
 				t.stringLiteral(resolve("proxy-polyfill/src/proxy.js", import.meta.url).slice(7))
@@ -114,6 +174,6 @@ async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 		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 }
+	return { code: generate(program.node).code }
 }
 export { preprocess }

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(
@@ -663,9 +665,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)
 				])
 			)
 		}

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)