hackmud-script-manager 0.20.5-97101bc → 0.21.1-583d190

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.d.ts

@@ -10,4 +10,7 @@ export type Info = {
     users: string[];
     characterCount: number;
     error: Error | undefined;
+    warnings: {
+        message: string;
+    }[];
 };

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"
@@ -26,6 +27,7 @@ import "@babel/plugin-transform-private-property-in-object"
 import "@babel/plugin-transform-unicode-sets-regex"
 import "@babel/traverse"
 import "@babel/types"
+import "@rollup/plugin-alias"
 import "@rollup/plugin-babel"
 import "@rollup/plugin-commonjs"
 import "@rollup/plugin-json"
@@ -45,7 +47,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.5-97101bc",
+  "version": "0.21.1-583d190",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",
@@ -31,50 +31,51 @@
     "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-alias": "^5.1.1",
     "@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.d.ts

@@ -16,16 +16,16 @@ export type ProcessOptions = LaxPartial<{
       * when left unset or set to `undefined`, automatically uses or doesn't use quine cheats based on character count
       */
     forceQuineCheats: boolean;
+    rootFolderPath: string;
 }> & {
     scriptName: string | true;
 };
 /** Minifies a given script
   * @param code JavaScript or TypeScript code
   * @param options {@link ProcessOptions details} */
-export declare function processScript(code: string, { minify: shouldMinify, uniqueId, scriptUser, scriptName, filePath, mangleNames, forceQuineCheats }: ProcessOptions): Promise<{
+export declare function processScript(code: string, { minify: shouldMinify, uniqueId, scriptUser, scriptName, filePath, mangleNames, forceQuineCheats, rootFolderPath }: ProcessOptions): Promise<{
     script: string;
     warnings: {
         message: string;
-        line: number;
     }[];
 }>;

package/processScript/index.js

@@ -17,12 +17,13 @@ import babelPluginTransformPrivatePropertyInObject from "@babel/plugin-transform
 import babelPluginTransformUnicodeSetsRegex from "@babel/plugin-transform-unicode-sets-regex"
 import babelTraverse from "@babel/traverse"
 import t from "@babel/types"
+import rollupPluginAlias from "@rollup/plugin-alias"
 import { babel } from "@rollup/plugin-babel"
 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 { resolve } from "path"
+import { relative } from "path"
 import prettier from "prettier"
 import { rollup } from "rollup"
 import { supportedExtensions } from "../constants.js"
@@ -51,10 +52,11 @@ async function processScript(
 		scriptName,
 		filePath,
 		mangleNames = !1,
-		forceQuineCheats
+		forceQuineCheats,
+		rootFolderPath
 	}
 ) {
-	assert(/^\w{11}$/.exec(uniqueId), "src/processScript/index.ts:77:36")
+	assert(/^\w{11}$/.exec(uniqueId), "src/processScript/index.ts:81:36")
 	const sourceCode = code
 	let autocomplete, statedSeclevel
 	const autocompleteMatch = /^function\s*\(.+\/\/(?<autocomplete>.+)/.exec(code)
@@ -115,7 +117,7 @@ async function processScript(
 				}
 			}
 		}
-	assert(/^\w{11}$/.exec(uniqueId), "src/processScript/index.ts:158:36")
+	assert(/^\w{11}$/.exec(uniqueId), "src/processScript/index.ts:162:36")
 	const plugins = [
 		[babelPluginProposalDecorators.default, { decoratorsBeforeExport: !0 }],
 		[babelPluginTransformClassProperties.default],
@@ -135,7 +137,7 @@ async function processScript(
 	]
 	let filePathResolved
 	if (filePath) {
-		filePathResolved = resolve(filePath)
+		filePathResolved = relative(".", filePath)
 		if (filePath.endsWith(".ts"))
 			plugins.push([
 				(await import("@babel/plugin-transform-typescript")).default,
@@ -204,6 +206,7 @@ async function processScript(
 	const bundle = await rollup({
 			input: filePathResolved,
 			plugins: [
+				rollupPluginJSON({ preferConst: !0 }),
 				{
 					name: "hackmud-script-manager",
 					async transform(code, id) {
@@ -228,13 +231,13 @@ async function processScript(
 				babel({ babelHelpers: "bundled", plugins, configFile: !1, extensions: supportedExtensions }),
 				rollupPluginCommonJS(),
 				rollupPluginNodeResolve({ extensions: supportedExtensions }),
-				rollupPluginJSON()
+				!!rootFolderPath && rollupPluginAlias({ entries: [{ find: /^\//, replacement: rootFolderPath + "/" }] })
 			],
 			treeshake: { moduleSideEffects: !1 }
 		}),
 		seclevelNames = ["NULLSEC", "LOWSEC", "MIDSEC", "HIGHSEC", "FULLSEC"]
 	code = (await bundle.generate({})).output[0].code
-	const { file, seclevel } = transform(parse(code, { sourceType: "module" }), sourceCode, {
+	const { file, seclevel, warnings } = transform(parse(code, { sourceType: "module" }), sourceCode, {
 		uniqueId,
 		scriptUser,
 		scriptName
@@ -249,7 +252,7 @@ async function processScript(
 		traverse(file, {
 			MemberExpression({ node: memberExpression }) {
 				if (!memberExpression.computed) {
-					assert("Identifier" == memberExpression.property.type, "src/processScript/index.ts:321:60")
+					assert("Identifier" == memberExpression.property.type, "src/processScript/index.ts:326:60")
 					if ("prototype" == memberExpression.property.name) {
 						memberExpression.computed = !0
 						memberExpression.property = t.stringLiteral("prototype")
@@ -279,7 +282,7 @@ async function processScript(
 							break
 						case "ObjectPattern":
 							for (const property of lValue.properties) {
-								assert("ObjectProperty" == property.type, "src/processScript/index.ts:351:51")
+								assert("ObjectProperty" == property.type, "src/processScript/index.ts:356:51")
 								renameVariables(property.value)
 							}
 							break
@@ -323,11 +326,11 @@ async function processScript(
 			trailingComma: "none"
 		})
 	}
-	code = postprocess(code, seclevel, uniqueId)
+	code = postprocess(code, uniqueId)
 	if (includesIllegalString(code))
 		throw Error(
 			'you found a weird edge case where I wasn\'t able to replace illegal strings like "SC$", please report thx'
 		)
-	return { script: code, warnings: [] }
+	return { script: code, warnings }
 }
 export { minify, postprocess, preprocess, processScript, transform }

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)
@@ -259,7 +250,10 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 								t.memberExpression(
 									t.taggedTemplateExpression(
 										t.memberExpression(
-											t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$scripts$quine$`), []),
+											t.callExpression(
+												t.identifier(`$${uniqueId}$4$SUBSCRIPT$scripts$quine$`),
+												[]
+											),
 											t.identifier("split")
 										),
 										t.templateLiteral([t.templateElement({ raw: "\t", cooked: "\t" }, !0)], [])
@@ -283,7 +277,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 							t.memberExpression(
 								t.taggedTemplateExpression(
 									t.memberExpression(
-										t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$scripts$quine$`), []),
+										t.callExpression(t.identifier(`$${uniqueId}$4$SUBSCRIPT$scripts$quine$`), []),
 										t.identifier("split")
 									),
 									t.templateLiteral([t.templateElement({ raw: "\t", cooked: "\t" }, !0)], [])
@@ -308,7 +302,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 							t.memberExpression(
 								t.taggedTemplateExpression(
 									t.memberExpression(
-										t.callExpression(t.identifier(`$${uniqueId}$SUBSCRIPT$scripts$quine$`), []),
+										t.callExpression(t.identifier(`$${uniqueId}$4$SUBSCRIPT$scripts$quine$`), []),
 										t.identifier("split")
 									),
 									t.templateLiteral([t.templateElement({ raw: "\t", cooked: "\t" }, !0)], [])
@@ -364,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)
@@ -380,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/postprocess.d.ts

@@ -1 +1 @@
-export declare const postprocess: (code: string, seclevel: number, uniqueId: string) => string;
+export declare const postprocess: (code: string, uniqueId: string) => string;

package/processScript/postprocess.js

@@ -1,12 +1,12 @@
-const postprocess = (code, seclevel, uniqueId) =>
+const postprocess = (code, uniqueId) =>
 	code
-		.replace(/^function\s*\w+\(/, "function(")
+		.replace(/^function\s*[\w$]+\(/, "function(")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$SC_DOLLAR\\$`, "g"), "S\\C$")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$DB_DOLLAR\\$`, "g"), "D\\B$")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$D\\$`, "g"), "_\\_D_S")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$FMCL\\$`, "g"), "_\\_FMCL_")
 		.replace(RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$G\\$`, "g"), "_\\_G_")
-		.replace(RegExp(`\\$${uniqueId}\\$SUBSCRIPT\\$(\\w+)\\$(\\w+)\\$`, "g"), `#${"nlmhf"[seclevel]}s.$1.$2`)
+		.replace(RegExp(`\\$${uniqueId}\\$(\\d)\\$SUBSCRIPT\\$(\\w+)\\$(\\w+)\\$`, "g"), "#$1s.$2.$3")
 		.replace(RegExp(`\\$${uniqueId}\\$DEBUG\\$`, "g"), "#D")
 		.replace(RegExp(`\\$${uniqueId}\\$FMCL\\$`, "g"), "#FMCL")
 		.replace(RegExp(`\\$${uniqueId}\\$GLOBAL\\$`, "g"), "#G")

package/processScript/preprocess.js

@@ -8,7 +8,7 @@ import { resolve } from "import-meta-resolve"
 const { default: traverse } = babelTraverse,
 	{ default: generate } = babelGenerator
 async function preprocess(code, { uniqueId = "00000000000" } = {}) {
-	assert(/^\w{11}$/.test(uniqueId), "src/processScript/preprocess.ts:22:36")
+	assert(/^\w{11}$/.test(uniqueId), "src/processScript/preprocess.ts:23:36")
 	const sourceCode = code
 	let lengthBefore, file, program
 	do {
@@ -47,7 +47,7 @@ async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 			})
 			break
 		} catch (error_) {
-			assert(error_ instanceof SyntaxError, "src/processScript/preprocess.ts:66:42")
+			assert(error_ instanceof SyntaxError, "src/processScript/preprocess.ts:67:42")
 			error = error_
 		}
 		if ("BABEL_PARSER_SYNTAX_ERROR" != error.code || "PrivateInExpectedIn" != error.reasonCode) {
@@ -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.d.ts

@@ -16,4 +16,7 @@ export type TransformOptions = LaxPartial<{
 export declare function transform(file: File, sourceCode: string, { uniqueId, scriptUser, scriptName, seclevel }: TransformOptions): {
     file: File;
     seclevel: number;
+    warnings: {
+        message: string;
+    }[];
 };