hackmud-script-manager 0.21.1-8e6657c → 0.21.1-93e7bef

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-8e6657c")
+	console.log("0.21.1-93e7bef")
 	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"),
@@ -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-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`
+					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.1-93e7bef")}\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

@@ -703,14 +703,14 @@ type MongoObject = { [k: string]: MongoValue, [k: `$${string}`]: never }
 type MongoQueryValue = MongoPrimitive | MongoQueryValue[] | MongoQueryObject
 
 type MongoQueryObject =
-	{ [k: string]: MongoQueryValue, [k: `$${string}`]: MongoValue, $type?: keyof MongoTypeStringsToTypes | (string & {}) }
+	{ [k: string]: MongoQueryValue, [k: `$${string}`]: MongoValue } & { $type?: keyof MongoTypeStringsToTypes | (string & {}) }
 
 type MongoTypeStringsToTypes = {
 	double: number
 	string: string
 	object: MongoObject
 	array: MongoValue[]
-	objectId: ObjectId
+	objectId: MongoObjectId
 	bool: boolean
 	date: Date
 	null: null
@@ -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> | MongoObjectId | MongoObject
+type MongoQueryId = Exclude<MongoPrimitive, null | false> | MongoObjectId | MongoQueryObject
 type MongoDocument = MongoObject & { _id?: MongoId }
 
 type MongoQueryType<TQuery extends MongoQueryObject> = {
@@ -865,8 +865,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 +877,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]> }
 
@@ -885,9 +886,9 @@ declare global {
 	type ScriptSuccess<T = unknown> = { ok: true } & T
 	type ScriptFailure = { ok: false, msg?: string }
 	type ScriptResponse<T = unknown> = ScriptSuccess<T> | ScriptFailure
-	type Scriptor<TArgs extends any[] = any[]> = { name: string, call: (...args: TArgs) => unknown }
+	type Scriptor<TArgs = any> = { name: string, call: (args: TArgs) => unknown }
 	type Context = CliContext | SubscriptContext | ScriptorContext | BrainContext
-	type ObjectId = { $oid: string }
+	type MongoObjectId = { $oid: string }
 
 	interface PlayerFullsec {}
 	interface PlayerHighsec {}
@@ -978,7 +979,7 @@ declare global {
 		us: <T extends MongoDocument>(query: MongoQuery<T> | MongoQuery<T>[], command: MongoUpdateCommand<T>) =>
 			{ n: number, ok: 0 | 1, opTime: { t: number }, nModified: number }[]
 
-		ObjectId: () => ObjectId
+		ObjectId: () => MongoObjectId
 	}
 
 	/** Debug Log.

package/package.json

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

package/processScript/preprocess.js

@@ -2,155 +2,95 @@ import babelGenerator from "@babel/generator"
 import { parse } from "@babel/parser"
 import babelTraverse from "@babel/traverse"
 import t from "@babel/types"
-import { assert, ensure } from "@samual/lib/assert"
+import { assert } 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"],
-	PREPROCESSOR_NAMES = [...SUBSCRIPT_PREFIXES, "D", "G", "FMCL", "db"]
+	SUBSCRIPT_PREFIXES = ["s", "fs", "4s", "hs", "3s", "ms", "2s", "ls", "1s", "ns", "0s"]
 async function preprocess(code, { uniqueId = "00000000000" } = {}) {
-	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))
+	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)
 		}
 	}
-	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"
-				}
-			}
+	traverse(file, {
+		Program(path) {
+			program = path
+			path.skip()
 		}
-	)
+	})
 	const needRecord = program.scope.hasGlobal("Record"),
 		needTuple = program.scope.hasGlobal("Tuple")
 	;(needRecord || needTuple) &&
-		program.node.body.unshift(
+		file.program.body.unshift(
 			t.importDeclaration(
 				needRecord
 					? needTuple
@@ -164,7 +104,7 @@ async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 			)
 		)
 	program.scope.hasGlobal("Proxy") &&
-		program.node.body.unshift(
+		file.program.body.unshift(
 			t.importDeclaration(
 				[t.importDefaultSpecifier(t.identifier("Proxy"))],
 				t.stringLiteral(resolve("proxy-polyfill/src/proxy.js", import.meta.url).slice(7))
@@ -174,6 +114,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(program.node).code }
+	return { code: generate(file).code }
 }
 export { preprocess }