hackmud-script-manager 0.19.1-a81047f → 0.19.1-b3a477d

package/bin/hsm.js

@@ -12,7 +12,7 @@ import { pull } from "../pull.js"
 import { syncMacros } from "../syncMacros.js"
 import "@samual/lib/readDirectoryWithStats"
 import "@samual/lib/copyFilePersistent"
-const version = "0.19.1-a81047f",
+const version = "0.19.1-b3a477d",
 	options = new Map(),
 	commands = [],
 	userColours = new Cache(user => {
@@ -280,7 +280,7 @@ switch (commands[0]) {
 				scriptUser =
 					"scripts" == basename(resolve(target, "..")) && "hackmud" == basename(resolve(target, "../../..")) ?
 						basename(resolve(target, "../.."))
-					:	"UNKNOWN",
+					:	void 0,
 				optionsHasNoMinify = options.has("no-minify")
 			if ((optionsHasNoMinify || options.has("skip-minify")) && options.has("mangle-names")) {
 				logError(
@@ -316,7 +316,7 @@ switch (commands[0]) {
 					: fileBaseName + ".js"
 				)
 			const golfFile = () =>
-				readFile(target, { encoding: "utf-8" }).then(async source => {
+				readFile(target, { encoding: "utf8" }).then(async source => {
 					const timeStart = performance.now(),
 						{ script, warnings } = await processScript(source, {
 							minify: !(options.get("no-minify") || options.get("skip-minify")),
@@ -410,11 +410,12 @@ function logHelp() {
 			)
 	}
 }
-function logInfo({ file, users, minLength, error }, hackmudPath) {
+function logInfo({ path, users, characterCount, error }, hackmudPath) {
+	path = relative(".", path)
 	error ?
-		logError(`error "${chalk.bold(error.message)}" in ${chalk.bold(file)}`)
-	:	console.log(
-			`pushed ${chalk.bold(file)} to ${users.map(user => chalk.bold(userColours.get(user))).join(", ")} | ${chalk.bold(minLength + "")} chars | ${chalk.bold(resolve(hackmudPath, users[0], "scripts", basename(file, extname(file))) + ".js")}`
+		logError(`error "${chalk.bold(error.message)}" in ${chalk.bold(path)}`)
+	:	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")}`
 		)
 }
 function logError(message) {

package/index.d.ts

@@ -6,8 +6,8 @@ export { push } from "./push";
 export { syncMacros } from "./syncMacros";
 export { watch } from "./watch";
 export type Info = {
-    file: string;
+    path: string;
     users: string[];
-    minLength: number;
+    characterCount: number;
     error: Error | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.19.1-a81047f",
+  "version": "0.19.1-b3a477d",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",

package/processScript/index.d.ts

@@ -3,11 +3,10 @@ export { minify } from "./minify";
 export { postprocess } from "./postprocess";
 export { preprocess } from "./preprocess";
 export { transform } from "./transform";
-export type ProcessOptions = {
+export type ProcessOptions = LaxPartial<{
     /** whether to minify the given code */ minify: boolean;
     /** 11 a-z 0-9 characters */ uniqueID: string;
     /** the user going to be hosting this script (or set to `true` if not yet known) */ scriptUser: string | true;
-    /** the name of this script (or set to `true` if not yet known) */ scriptName: string | true;
     filePath: string;
     /** whether to mangle function and class names (defaults to `false`) */ mangleNames: boolean;
     /** when set to `true` forces use of quine cheats
@@ -17,11 +16,13 @@ export type ProcessOptions = {
       * when left unset or set to `undefined`, automatically uses or doesn't use quine cheats based on character count
       */
     forceQuineCheats: boolean;
+}> & {
+    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 }?: LaxPartial<ProcessOptions>): Promise<{
+export declare function processScript(code: string, { minify: shouldMinify, uniqueID, scriptUser, scriptName, filePath, mangleNames, forceQuineCheats }: ProcessOptions): Promise<{
     script: string;
     warnings: {
         message: string;

package/processScript/index.js

@@ -47,14 +47,14 @@ async function processScript(
 		uniqueID = Math.floor(Math.random() * 2 ** 52)
 			.toString(36)
 			.padStart(11, "0"),
-		scriptUser = "UNKNOWN",
-		scriptName = "UNKNOWN",
+		scriptUser,
+		scriptName,
 		filePath,
 		mangleNames = !1,
 		forceQuineCheats
-	} = {}
+	}
 ) {
-	assert(/^\w{11}$/.exec(uniqueID), "src/processScript/index.ts:78:36")
+	assert(/^\w{11}$/.exec(uniqueID), "src/processScript/index.ts:77:36")
 	const sourceCode = code
 	let autocomplete, statedSeclevel
 	const autocompleteMatch = /^function\s*\(.+\/\/(?<autocomplete>.+)/.exec(code)
@@ -115,7 +115,7 @@ async function processScript(
 				}
 			}
 		}
-	assert(/^\w{11}$/.exec(uniqueID), "src/processScript/index.ts:159:36")
+	assert(/^\w{11}$/.exec(uniqueID), "src/processScript/index.ts:158:36")
 	const plugins = [
 		[babelPluginProposalDecorators.default, { decoratorsBeforeExport: !0 }],
 		[babelPluginTransformClassProperties.default],
@@ -249,7 +249,7 @@ async function processScript(
 		traverse(file, {
 			MemberExpression({ node: memberExpression }) {
 				if (!memberExpression.computed) {
-					assert("Identifier" == memberExpression.property.type, "src/processScript/index.ts:322:60")
+					assert("Identifier" == memberExpression.property.type, "src/processScript/index.ts:321:60")
 					if ("prototype" == memberExpression.property.name) {
 						memberExpression.computed = !0
 						memberExpression.property = t.stringLiteral("prototype")
@@ -279,7 +279,7 @@ async function processScript(
 							break
 						case "ObjectPattern":
 							for (const property of lValue.properties) {
-								assert("ObjectProperty" == property.type, "src/processScript/index.ts:352:51")
+								assert("ObjectProperty" == property.type, "src/processScript/index.ts:351:51")
 								renameVariables(property.value)
 							}
 							break

package/processScript/minify.d.ts

@@ -1,6 +1,6 @@
 import type { File } from "@babel/types";
 import type { LaxPartial } from "@samual/lib";
-type MinifyOptions = {
+type MinifyOptions = LaxPartial<{
     /** 11 a-z 0-9 characters */ uniqueID: string;
     /** whether to mangle function and class names (defaults to `false`) */ mangleNames: boolean;
     /** when set to `true` forces use of quine cheats
@@ -11,8 +11,8 @@ type MinifyOptions = {
       */
     forceQuineCheats: boolean;
     /** the comment inserted after the function signature */ autocomplete: string;
-};
+}>;
 /** @param file babel ast node representing a file containing transformed code
   * @param options {@link MinifyOptions details} */
-export declare function minify(file: File, { uniqueID, mangleNames, forceQuineCheats, autocomplete }?: LaxPartial<MinifyOptions>): Promise<string>;
+export declare function minify(file: File, { uniqueID, mangleNames, forceQuineCheats, autocomplete }?: MinifyOptions): Promise<string>;
 export {};

package/processScript/preprocess.d.ts

@@ -1,8 +1,9 @@
-export type PreprocessOptions = {
-    /** 11 a-z 0-9 characters */ uniqueID: string;
-};
+import type { LaxPartial } from "@samual/lib";
+export type PreprocessOptions = LaxPartial<{
+    uniqueID: string;
+}>;
 /** @param code source code for preprocessing
   * @param options {@link PreprocessOptions details} */
-export declare function preprocess(code: string, { uniqueID }?: Partial<PreprocessOptions>): Promise<{
+export declare function preprocess(code: string, { uniqueID }?: PreprocessOptions): Promise<{
     code: string;
 }>;

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:23:36")
+	assert(/^\w{11}$/.test(uniqueID), "src/processScript/preprocess.ts:22: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:67:42")
+			assert(error_ instanceof SyntaxError, "src/processScript/preprocess.ts:66:42")
 			error = error_
 		}
 		if ("BABEL_PARSER_SYNTAX_ERROR" != error.code || "PrivateInExpectedIn" != error.reasonCode) {

package/processScript/transform.d.ts

@@ -1,9 +1,11 @@
 import type { File } from "@babel/types";
-export type TransformOptions = {
+import type { LaxPartial } from "@samual/lib";
+export type TransformOptions = LaxPartial<{
     /** 11 a-z 0-9 characters */ uniqueID: string;
     /** the user going to be hosting this script (or set to `true` if not yet known) */ scriptUser: string | true;
-    /** the name of this script (or set to `true` if not yet known) */ scriptName: string | true;
     seclevel: number;
+}> & {
+    scriptName: string | true;
 };
 /** transform a given babel `File` to be hackmud compatible
   *
@@ -11,7 +13,7 @@ export type TransformOptions = {
   * @param file babel ast node representing a file containing preprocessed code
   * @param sourceCode the original untouched source code
   * @param options {@link TransformOptions details} */
-export declare function transform(file: File, sourceCode: string, { uniqueID, scriptUser, scriptName, seclevel }?: Partial<TransformOptions>): {
+export declare function transform(file: File, sourceCode: string, { uniqueID, scriptUser, scriptName, seclevel }: TransformOptions): {
     file: File;
     seclevel: number;
 };

package/processScript/transform.js

@@ -21,11 +21,7 @@ const { default: traverse } = babelTraverse,
 		"Symbol",
 		"BigInt"
 	]
-function transform(
-	file,
-	sourceCode,
-	{ uniqueID = "00000000000", scriptUser = "UNKNOWN", scriptName = "UNKNOWN", seclevel = 4 } = {}
-) {
+function transform(file, sourceCode, { uniqueID = "00000000000", scriptUser, scriptName, seclevel = 4 }) {
 	const topFunctionName = `_${uniqueID}_SCRIPT_`,
 		exports = new Map(),
 		liveExports = new Map()
@@ -42,21 +38,31 @@ function transform(
 	if (program.scope.hasGlobal("_BUILD_DATE"))
 		for (const referencePath of getReferencePathsToGlobal("_BUILD_DATE", program))
 			referencePath.replaceWith(t.numericLiteral(Date.now()))
+	let uniqueIdScriptUserNeeded = !1
 	if (program.scope.hasGlobal("_SCRIPT_USER"))
 		for (const referencePath of getReferencePathsToGlobal("_SCRIPT_USER", program))
-			referencePath.replaceWith(t.stringLiteral(1 == scriptUser ? `$${uniqueID}$SCRIPT_USER$` : scriptUser))
+			if (null == scriptUser) {
+				uniqueIdScriptUserNeeded = !0
+				referencePath.replaceWith(t.identifier(`_${uniqueID}_SCRIPT_USER_`))
+			} else
+				referencePath.replaceWith(t.stringLiteral(1 == scriptUser ? `$${uniqueID}$SCRIPT_USER$` : scriptUser))
 	if (program.scope.hasGlobal("_SCRIPT_NAME"))
 		for (const referencePath of getReferencePathsToGlobal("_SCRIPT_NAME", program))
 			referencePath.replaceWith(t.stringLiteral(1 == scriptName ? `$${uniqueID}$SCRIPT_NAME$` : scriptName))
 	if (program.scope.hasGlobal("_FULL_SCRIPT_NAME"))
 		for (const referencePath of getReferencePathsToGlobal("_FULL_SCRIPT_NAME", program))
-			referencePath.replaceWith(
-				t.stringLiteral(
-					1 == scriptUser || 1 == scriptName ?
-						`$${uniqueID}$FULL_SCRIPT_NAME$`
-					:	`${scriptUser}.${scriptName}`
+			if (1 == scriptUser || 1 == scriptName)
+				referencePath.replaceWith(t.stringLiteral(`$${uniqueID}$FULL_SCRIPT_NAME$`))
+			else if (null == scriptUser) {
+				uniqueIdScriptUserNeeded = !0
+				referencePath.replaceWith(
+					t.binaryExpression(
+						"+",
+						t.identifier(`_${uniqueID}_SCRIPT_USER_`),
+						t.stringLiteral("." + scriptName)
+					)
 				)
-			)
+			} else referencePath.replaceWith(t.stringLiteral(`${scriptUser}.${scriptName}`))
 	let functionDotPrototypeIsReferencedMultipleTimes = !1
 	if (program.scope.hasGlobal("Function")) {
 		const FunctionReferencePaths = getReferencePathsToGlobal("Function", program)
@@ -64,30 +70,30 @@ function transform(
 			const referencePath = FunctionReferencePaths[0]
 			assert(
 				"MemberExpression" == referencePath.parent.type,
-				"src/processScript/transform.ts:89:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:105:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			assert(
 				"Identifier" == referencePath.parent.property.type,
-				"src/processScript/transform.ts:94:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:110:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 			)
 			assert(
 				"prototype" == referencePath.parent.property.name,
-				"src/processScript/transform.ts:99:8 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+				"src/processScript/transform.ts:115: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:107:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:123:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				assert(
 					"Identifier" == referencePath.parent.property.type,
-					"src/processScript/transform.ts:112:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:128:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				assert(
 					"prototype" == referencePath.parent.property.name,
-					"src/processScript/transform.ts:117:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
+					"src/processScript/transform.ts:133:9 `Function` isn't available in hackmud, only `Function.prototype` is accessible"
 				)
 				functionDotPrototypeIsReferencedMultipleTimes = !0
 				referencePath.parentPath.replaceWith(t.identifier(`_${uniqueID}_FUNCTION_DOT_PROTOTYPE_`))
@@ -123,12 +129,12 @@ function transform(
 	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:171:69")
-			assert("Identifier" == referencePath.parentPath.node.property.type, "src/processScript/transform.ts:172:72")
+			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")
 			const databaseOpMethodName = referencePath.parentPath.node.property.name
 			assert(
 				validDBMethods.includes(databaseOpMethodName),
-				`src/processScript/transform.ts:178:8 invalid db method "${databaseOpMethodName}", valid db methods are "${validDBMethods.join('", "')}"`
+				`src/processScript/transform.ts:194: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}$`))
@@ -161,7 +167,7 @@ function transform(
 	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:225:64")
+				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:241:64")
 				if ("getPrototypeOf" == referencePath.parent.property.name) {
 					referencePath.parentPath.replaceWith(t.identifier(`_${uniqueID}_GET_PROTOTYPE_OF_`))
 					needGetPrototypeOf = !0
@@ -171,7 +177,7 @@ function transform(
 	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:240:64")
+				assert("Identifier" == referencePath.parent.property.type, "src/processScript/transform.ts:256:64")
 				referencePath.parentPath.replaceWith(
 					t.identifier(`_${uniqueID}_CONSOLE_METHOD_${referencePath.parent.property.name}_`)
 				)
@@ -179,13 +185,13 @@ function transform(
 			}
 	const lastStatement = program.node.body.at(-1)
 	let exportDefaultName
-	assert(lastStatement, "src/processScript/transform.ts:254:27 program is empty")
+	assert(lastStatement, "src/processScript/transform.ts:270: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:260:51 ${specifier.type} is currently unsupported`
+				`src/processScript/transform.ts:276:51 ${specifier.type} is currently unsupported`
 			)
 			const exportedName =
 				"Identifier" == specifier.exported.type ? specifier.exported.name : specifier.exported.value
@@ -261,6 +267,28 @@ function transform(
 		[t.identifier("context"), t.identifier("args")],
 		t.blockStatement([])
 	)
+	if (uniqueIdScriptUserNeeded) {
+		const mainFunctionParams = mainFunction.params
+		mainFunction.params = [t.restElement(t.identifier(`_${uniqueID}_PARAMS_`))]
+		mainFunction.body.body.unshift(
+			t.variableDeclaration("let", [
+				t.variableDeclarator(t.arrayPattern(mainFunctionParams), t.identifier(`_${uniqueID}_PARAMS_`)),
+				t.variableDeclarator(
+					t.arrayPattern([t.identifier(`_${uniqueID}_SCRIPT_USER_`)]),
+					t.callExpression(
+						t.memberExpression(
+							t.memberExpression(
+								t.memberExpression(t.identifier(`_${uniqueID}_PARAMS_`), t.numericLiteral(0), !0),
+								t.identifier("this_script")
+							),
+							t.identifier("split")
+						),
+						[t.stringLiteral(".")]
+					)
+				)
+			])
+		)
+	}
 	program.node.body = [mainFunction]
 	if (globalBlock.body.length) {
 		;(exports.size || liveExports.size) &&
@@ -286,11 +314,11 @@ function transform(
 		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:370:59")
+				assert(1 == globalBlockStatement.declarations.length, "src/processScript/transform.ts:410:59")
 				const declarator = globalBlockStatement.declarations[0]
 				assert(
 					"Identifier" == declarator.id.type,
-					`src/processScript/transform.ts:374:51 declarator.id.type was "${declarator.id.type}"`
+					`src/processScript/transform.ts:414:51 declarator.id.type was "${declarator.id.type}"`
 				)
 				program.scope.crawl()
 				if (program.scope.hasGlobal(declarator.id.name)) {
@@ -305,9 +333,9 @@ function transform(
 						Object.keys(program.scope.globals).some(global => globalBlockVariables.has(global))
 					) {
 						const binding = program.scope.getBinding(declarator.id.name)
-						assert(binding, "src/processScript/transform.ts:393:23")
+						assert(binding, "src/processScript/transform.ts:433:23")
 						for (const referencePath of binding.referencePaths) {
-							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:396:56")
+							assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:436:56")
 							referencePath.replaceWith(
 								t.memberExpression(
 									t.identifier(`$${uniqueID}$GLOBAL$`),
@@ -351,16 +379,16 @@ function transform(
 				} else globalBlockVariables.add(declarator.id.name)
 			} else if ("ClassDeclaration" == globalBlockStatement.type) {
 				program.scope.crawl()
-				assert(globalBlockStatement.id, "src/processScript/transform.ts:447:37")
+				assert(globalBlockStatement.id, "src/processScript/transform.ts:487: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:459:22")
+					assert(binding, "src/processScript/transform.ts:499:22")
 					for (const referencePath of binding.referencePaths) {
-						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:462:55")
+						assert("Identifier" == referencePath.node.type, "src/processScript/transform.ts:502:55")
 						referencePath.replaceWith(
 							t.memberExpression(
 								t.identifier(`$${uniqueID}$GLOBAL$`),
@@ -527,7 +555,7 @@ function transform(
 				}
 		},
 		ClassBody({ node: classBody, scope, parent }) {
-			assert(t.isClass(parent), "src/processScript/transform.ts:629:30")
+			assert(t.isClass(parent), "src/processScript/transform.ts:669:30")
 			let thisIsReferenced = !1
 			for (const classMethod of classBody.body) {
 				if ("ClassMethod" != classMethod.type) continue
@@ -633,23 +661,23 @@ function transform(
 	}
 	function processFakeSubscriptObject(fakeSubscriptObjectName) {
 		for (const referencePath of getReferencePathsToGlobal(fakeSubscriptObjectName, program)) {
-			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:743:60")
+			assert("MemberExpression" == referencePath.parent.type, "src/processScript/transform.ts:783:60")
 			assert("Identifier" == referencePath.parent.property.type)
 			assert(
 				"MemberExpression" == referencePath.parentPath.parentPath?.node.type,
-				"src/processScript/transform.ts:745:81"
+				"src/processScript/transform.ts:785:81"
 			)
 			assert(
 				"Identifier" == referencePath.parentPath.parentPath.node.property.type,
-				"src/processScript/transform.ts:746:83"
+				"src/processScript/transform.ts:786:83"
 			)
 			assert(
 				/^[_a-z][\d_a-z]{0,24}$/.test(referencePath.parent.property.name),
-				`src/processScript/transform.ts:750:8 invalid user "${referencePath.parent.property.name}" in subscript`
+				`src/processScript/transform.ts:790: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:755:8 invalid script name "${referencePath.parentPath.parentPath.node.property.name}" in subscript`
+				`src/processScript/transform.ts:795: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.d.ts

@@ -1,6 +1,6 @@
 import type { LaxPartial } from "@samual/lib";
 import type { Info } from ".";
-export type PushOptions = {
+export type PushOptions = LaxPartial<{
     /** whether to do the minify step (defaults to `true`) */ minify: boolean;
     /** whether to mangle function and class names (defaults to `false`) */ mangleNames: boolean;
     /** array of scripts in the format `foo.bar`
@@ -17,12 +17,12 @@ export type PushOptions = {
       * when left unset or set to `undefined`, automatically uses or doesn't use quine cheats based on character count
       */
     forceQuineCheats: boolean;
-};
+}>;
 /** Push scripts from a source directory to the hackmud directory.
   *
   * Pushes files directly in the source folder to all users
-  * @param sourceDirectory directory containing source code
-  * @param hackmudDirectory directory created by hackmud containing user data including scripts
+  * @param sourcePath directory containing source code
+  * @param hackmudPath directory created by hackmud containing user data including scripts
   * @param options {@link PushOptions details}
   * @returns array of info on pushed scripts */
-export declare function push(sourceDirectory: string, hackmudDirectory: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: LaxPartial<PushOptions>): Promise<Info[]>;
+export declare function push(sourcePath: string, hackmudPath: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: PushOptions): Promise<Info[]>;

package/push.js

@@ -1,10 +1,10 @@
 import { Cache } from "@samual/lib/Cache"
+import { ensure, assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
 import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
 import { readFile } from "fs/promises"
-import { basename, resolve, extname } from "path"
-import { supportedExtensions } from "./constants.js"
+import { basename, resolve } from "path"
 import { processScript } from "./processScript/index.js"
 import "@babel/generator"
 import "@babel/parser"
@@ -29,9 +29,9 @@ import "@rollup/plugin-babel"
 import "@rollup/plugin-commonjs"
 import "@rollup/plugin-json"
 import "@rollup/plugin-node-resolve"
-import "@samual/lib/assert"
 import "prettier"
 import "rollup"
+import "./constants.js"
 import "./processScript/minify.js"
 import "@samual/lib/spliceString"
 import "acorn"
@@ -43,227 +43,96 @@ import "import-meta-resolve"
 import "./processScript/transform.js"
 import "@samual/lib/clearObject"
 async function push(
-	sourceDirectory,
-	hackmudDirectory,
+	sourcePath,
+	hackmudPath,
 	{ scripts = ["*.*"], onPush = () => {}, minify = !0, mangleNames = !1, forceQuineCheats } = {}
 ) {
-	const scriptNamesByUser = new Cache(_user => new Set()),
-		wildScriptUsers = new Set(),
-		wildUserScripts = new Set()
-	let pushEverything = !1
-	for (const fullScriptName of scripts) {
-		const [user, scriptName] = fullScriptName.split(".")
-		user && "*" != user ?
-			scriptName && "*" != scriptName ?
-				scriptNamesByUser.get(user).add(scriptName)
-			:	wildScriptUsers.add(user)
-		: scriptName && "*" != scriptName ? wildUserScripts.add(scriptName)
-		: (pushEverything = !0)
+	const [sourceFolder, hackmudFolder] = await Promise.all([
+			readDirectoryWithStats(sourcePath),
+			readDirectoryWithStats(hackmudPath)
+		]),
+		sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
+		allUsers = new Set([
+			...scripts
+				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:52:65"))
+				.filter(name => "*" != name),
+			...sourceFolderFolders.map(({ name }) => name),
+			...hackmudFolder.filter(({ stats }) => stats.isDirectory()).map(({ name }) => name),
+			...hackmudFolder
+				.filter(({ stats, name }) => stats.isFile() && name.endsWith(".key"))
+				.map(({ name }) => name.slice(0, -4))
+		]),
+		usersToScriptsToPush = new Cache(_user => new Map()),
+		scriptNamesToUsers = new Cache(_scriptName => new Set())
+	for (const script of scripts) {
+		const [user, scriptName] = script.split(".")
+		assert(user, "src/push.ts:69:16")
+		assert(scriptName, "src/push.ts:70:22")
+		"*" == user ? scriptNamesToUsers.set(scriptName, allUsers) : scriptNamesToUsers.get(scriptName).add(user)
 	}
-	const usersByGlobalScriptsToPush = new Cache(_user => new Set()),
-		allInfo = [],
-		scriptNamesAlreadyPushedByUser = new Cache(_user => new Set())
-	let sourceDirectoryDirents
-	if (wildUserScripts.size || pushEverything) {
-		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) {
-				const scriptNames = scriptNamesByUser.get(user)
-				for (const scriptName of wildUserScripts) scriptNames.add(scriptName)
-			}
+	const sourceFolderFiles = sourceFolder.filter(({ stats }) => stats.isFile()),
+		wildScriptUsers_ = scriptNamesToUsers.get("*")
+	scriptNamesToUsers.delete("*")
+	for (const { name, path } of [
+		...sourceFolderFiles.filter(({ name }) => name.endsWith(".js")),
+		...sourceFolderFiles.filter(({ name }) => name.endsWith(".ts"))
+	]) {
+		const scriptName = name.slice(0, -3)
+		for (const user of [...wildScriptUsers_, ...scriptNamesToUsers.get(scriptName)])
+			usersToScriptsToPush.get(user).set(scriptName, path)
 	}
 	await Promise.all(
-		[...wildScriptUsers].map(async user => {
-			await readDirectoryWithStats(resolve(sourceDirectory, user)).then(
-				async entries => {
-					await Promise.all(
-						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(path, { encoding: "utf-8" }),
-										{
-											minify,
-											scriptUser: user,
-											scriptName,
-											filePath: path,
-											mangleNames,
-											forceQuineCheats
-										}
-									),
-									info = {
-										file: `${user}/${name}`,
-										users: [user],
-										minLength: countHackmudCharacters(minifiedCode),
-										error: void 0
-									}
-								scriptNamesAlreadyPushedByUser.get(user).add(scriptName)
-								allInfo.push(info)
-								await writeFilePersistent(
-									resolve(hackmudDirectory, user, `scripts/${scriptName}.js`),
-									minifiedCode
-								)
-								onPush(info)
-							}
-						})
-					)
-				},
-				error => {
-					if ("ENOENT" != error.code) throw error
-				}
-			)
+		sourceFolderFolders.map(async ({ name: user, path }) => {
+			const files = (await readDirectoryWithStats(path)).filter(({ stats }) => stats.isFile()),
+				scriptFiles = [
+					...files.filter(({ name }) => name.endsWith(".js")),
+					...files.filter(({ name }) => name.endsWith(".ts"))
+				]
+			for (const { name, path } of scriptFiles) {
+				const scriptName = name.slice(0, -3)
+				;[...wildScriptUsers_, ...scriptNamesToUsers.get(scriptName)].includes(user) &&
+					usersToScriptsToPush.get(user).set(scriptName, path)
+			}
 		})
 	)
+	for (const [scriptName, users] of scriptNamesToUsers)
+		for (const user of users)
+			if (!usersToScriptsToPush.get(user).has(scriptName))
+				throw Error(`Could not find script ${user}.${scriptName} to push`)
+	const pathsToUsers = new Cache(_path => new Set())
+	for (const [user, scriptsToPush] of usersToScriptsToPush)
+		for (const path of scriptsToPush.values()) pathsToUsers.get(path).add(user)
+	const allInfo = []
 	await Promise.all(
-		[...scriptNamesByUser].map(async ([user, scripts]) => {
-			wildScriptUsers.has(user) ||
-				(await Promise.all(
-					[...scripts].map(async scriptName => {
-						let code, fileName, filePath
-						for (const extension of supportedExtensions)
-							try {
-								fileName = `${scriptName}${extension}`
-								code = await readFile((filePath = resolve(sourceDirectory, user, fileName)), {
-									encoding: "utf-8"
-								})
-								break
-							} catch {}
-						if (code) {
-							const { script: minifiedCode } = await processScript(code, {
-									minify,
-									scriptUser: user,
-									scriptName,
-									filePath,
-									mangleNames,
-									forceQuineCheats
-								}),
-								info = {
-									file: `${user}/${fileName}`,
-									users: [user],
-									minLength: countHackmudCharacters(minifiedCode),
-									error: void 0
-								}
-							allInfo.push(info)
-							await writeFilePersistent(
-								resolve(hackmudDirectory, user, "scripts", scriptName + ".js"),
-								minifiedCode
-							)
-							onPush(info)
-						} else usersByGlobalScriptsToPush.get(scriptName).add(user)
-					})
-				))
-		})
-	)
-	await (wildScriptUsers.size ?
-		Promise.all(
-			(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)
-						)
-					if (!usersToPushTo.length) return
-					const uniqueID = Math.floor(Math.random() * 2 ** 52)
-							.toString(36)
-							.padStart(11, "0"),
-						{ script: minifiedCode } = await processScript(await readFile(path, { encoding: "utf-8" }), {
-							minify,
-							scriptUser: !0,
-							scriptName,
-							uniqueID,
-							filePath: path,
-							mangleNames,
-							forceQuineCheats
-						}),
-						info = {
-							file: name,
-							users: usersToPushTo,
-							minLength: countHackmudCharacters(minifiedCode),
-							error: void 0
-						}
-					await Promise.all(
-						usersToPushTo.map(user =>
-							writeFilePersistent(
-								resolve(hackmudDirectory, user, `scripts/${scriptName}.js`),
-								minifiedCode
-									.replace(RegExp(`\\$${uniqueID}\\$SCRIPT_USER\\$`, "g"), user)
-									.replace(
-										RegExp(`\\$${uniqueID}\\$FULL_SCRIPT_NAME\\$`, "g"),
-										`${user}.${scriptName}`
-									)
-							)
-						)
+		[...pathsToUsers].map(async ([path, [...users]]) => {
+			const scriptName = basename(path.slice(0, -3)),
+				uniqueID = Math.floor(Math.random() * 2 ** 52)
+					.toString(36)
+					.padStart(11, "0"),
+				{ script: minifiedCode } = await processScript(await readFile(path, { encoding: "utf8" }), {
+					minify,
+					scriptUser: !0,
+					scriptName,
+					uniqueID,
+					filePath: path,
+					mangleNames,
+					forceQuineCheats
+				}),
+				info = { path, users, characterCount: countHackmudCharacters(minifiedCode), error: void 0 }
+			await Promise.all(
+				users.map(user =>
+					writeFilePersistent(
+						resolve(hackmudPath, user, `scripts/${scriptName}.js`),
+						minifiedCode
+							.replace(RegExp(`\\$${uniqueID}\\$SCRIPT_USER\\$`, "g"), user)
+							.replace(RegExp(`\\$${uniqueID}\\$FULL_SCRIPT_NAME\\$`, "g"), `${user}.${scriptName}`)
 					)
-					allInfo.push(info)
-					onPush(info)
-				}
+				)
 			)
-		)
-	:	Promise.all(
-			[...usersByGlobalScriptsToPush].map(async ([scriptName, users]) => {
-				let code, fileName, filePath
-				for (const extension of supportedExtensions)
-					try {
-						fileName = `${scriptName}${extension}`
-						code = await readFile((filePath = resolve(sourceDirectory, fileName)), { encoding: "utf-8" })
-						break
-					} catch {}
-				if (code) {
-					const uniqueID = Math.floor(Math.random() * 2 ** 52)
-							.toString(36)
-							.padStart(11, "0"),
-						{ script: minifiedCode } = await processScript(code, {
-							minify,
-							scriptUser: !0,
-							scriptName,
-							uniqueID,
-							filePath,
-							mangleNames,
-							forceQuineCheats
-						}),
-						info = {
-							file: fileName,
-							users: [...users],
-							minLength: countHackmudCharacters(minifiedCode),
-							error: void 0
-						}
-					await Promise.all(
-						[...users].map(user =>
-							writeFilePersistent(
-								resolve(hackmudDirectory, user, `scripts/${scriptName}.js`),
-								minifiedCode
-									.replace(RegExp(`\\$${uniqueID}\\$SCRIPT_USER\\$`, "g"), user)
-									.replace(
-										RegExp(`\\$${uniqueID}\\$FULL_SCRIPT_NAME\\$`, "g"),
-										`${user}.${scriptName}`
-									)
-							)
-						)
-					)
-					allInfo.push(info)
-					onPush(info)
-				}
-			})
-		))
+			allInfo.push(info)
+			onPush(info)
+		})
+	)
 	return allInfo
 }
 export { push }

package/syncMacros.js

@@ -12,7 +12,7 @@ async function syncMacros(hackmudPath) {
 					case ".macros":
 						{
 							const [lines, date] = await Promise.all([
-								readFile(resolve(hackmudPath, file.name), { encoding: "utf-8" }).then(file =>
+								readFile(resolve(hackmudPath, file.name), { encoding: "utf8" }).then(file =>
 									file.split("\n")
 								),
 								stat(resolve(hackmudPath, file.name)).then(({ mtime }) => mtime)

package/watch.d.ts

@@ -1,14 +1,14 @@
 import type { LaxPartial } from "@samual/lib";
 import type { PushOptions } from "./push";
-export type WatchOptions = PushOptions & {
+export type WatchOptions = PushOptions & LaxPartial<{
     /** if provided, will write typescript type declarations for all the scripts on every change detected
       *
       * writing the type declarations enables interscript type checking and autocompletetes for the args */
     typeDeclarationPath: string;
     onReady: () => void;
-};
+}>;
 /** Watches target file or folder for updates and builds and pushes updated file.
   * @param sourceDirectory path to folder containing source files
   * @param hackmudDirectory path to hackmud directory
   * @param options {@link WatchOptions details} and {@link PushOptions more details} */
-export declare function watch(sourceDirectory: string, hackmudDirectory: string, { scripts, onPush, minify, mangleNames, typeDeclarationPath: typeDeclarationPath_, onReady, forceQuineCheats }?: LaxPartial<WatchOptions>): Promise<void>;
+export declare function watch(sourceDirectory: string, hackmudDirectory: string, { scripts, onPush, minify, mangleNames, typeDeclarationPath: typeDeclarationPath_, onReady, forceQuineCheats }?: WatchOptions): Promise<void>;

package/watch.js

@@ -116,7 +116,7 @@ async function watch(
 			for (const user of scriptNamesToUsers.get(scriptName)) usersToPushToSet.add(user)
 			const usersToPushTo = [...usersToPushToSet].filter(user => !scriptNamesToUsersToSkip.has(user))
 			if (!usersToPushTo.length) {
-				onPush?.({ file: path, users: [], minLength: 0, error: Error("no users to push to") })
+				onPush?.({ path, users: [], characterCount: 0, error: Error("no users to push to") })
 				return
 			}
 			const uniqueID = Math.floor(Math.random() * 2 ** 52)
@@ -125,7 +125,7 @@ async function watch(
 				filePath = resolve(sourceDirectory, path)
 			let minifiedCode
 			try {
-				;({ script: minifiedCode } = await processScript(await readFile(filePath, { encoding: "utf-8" }), {
+				;({ script: minifiedCode } = await processScript(await readFile(filePath, { encoding: "utf8" }), {
 					minify,
 					scriptUser: !0,
 					scriptName,
@@ -136,7 +136,7 @@ async function watch(
 				}))
 			} catch (error) {
 				assert(error instanceof Error, "src/watch.ts:141:36")
-				onPush?.({ file: path, users: [], minLength: 0, error })
+				onPush?.({ path, users: [], characterCount: 0, error })
 				return
 			}
 			await Promise.all(
@@ -150,9 +150,9 @@ async function watch(
 				)
 			)
 			onPush?.({
-				file: path,
+				path,
 				users: usersToPushTo,
-				minLength: countHackmudCharacters(minifiedCode),
+				characterCount: countHackmudCharacters(minifiedCode),
 				error: void 0
 			})
 			return
@@ -168,7 +168,7 @@ async function watch(
 		)
 			return
 		const filePath = resolve(sourceDirectory, path),
-			sourceCode = await readFile(filePath, { encoding: "utf-8" })
+			sourceCode = await readFile(filePath, { encoding: "utf8" })
 		let script
 		try {
 			;({ script } = await processScript(sourceCode, {
@@ -181,11 +181,11 @@ async function watch(
 			}))
 		} catch (error) {
 			assert(error instanceof Error, "src/watch.ts:177:35")
-			onPush?.({ file: path, users: [], minLength: 0, error })
+			onPush?.({ path, users: [], characterCount: 0, error })
 			return
 		}
 		await writeFilePersistent(resolve(hackmudDirectory, user, "scripts", scriptName + ".js"), script)
-		onPush?.({ file: path, users: [user], minLength: countHackmudCharacters(script), error: void 0 })
+		onPush?.({ path, users: [user], characterCount: countHackmudCharacters(script), error: void 0 })
 	})
 	onReady && watcher.on("ready", onReady)
 	if (!typeDeclarationPath_) return