hackmud-script-manager 0.21.1-628a731 → 0.21.1-698970b

package/bin/hsm.js

@@ -14,6 +14,8 @@ import "@samual/lib/readDirectoryWithStats"
 import "@samual/lib/copyFilePersistent"
 const options = new Map(),
 	commands = []
+let didParseOption = !1,
+	didParseOptionAfterCommand = !1
 for (const argument of process.argv.slice(2))
 	if ("-" == argument[0]) {
 		const argumentEqualsIndex = argument.indexOf("=")
@@ -28,7 +30,11 @@ for (const argument of process.argv.slice(2))
 		}
 		if ("-" == argument[1]) options.set(key.slice(2), value)
 		else for (const option of key.slice(1)) options.set(option, value)
-	} else commands.push(argument)
+		didParseOption = !0
+	} else {
+		didParseOption && (didParseOptionAfterCommand = !0)
+		commands.push(argument)
+	}
 const pushModule = import("../push.js"),
 	processScriptModule = import("../processScript/index.js"),
 	watchModule = import("../watch.js"),
@@ -54,6 +60,15 @@ const pushModule = import("../push.js"),
 		return [colourJ, colourK, colourM, colourW, colourL, colourB][hash % 6](user)
 	}),
 	log = message => console.log(colourS(message))
+if (didParseOptionAfterCommand) {
+	process.exitCode = 1
+	console.warn(
+		colourF(
+			chalk.bold("Warning:") +
+				" Options should come after commands when calling the script.\n         This warning will become an error in the next minor version of HSM."
+		)
+	)
+}
 if (process.version.startsWith("v21.")) {
 	process.exitCode = 1
 	console.warn(
@@ -63,7 +78,7 @@ if (process.version.startsWith("v21.")) {
 	)
 }
 if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
-	console.log("0.21.1-628a731")
+	console.log("0.21.1-698970b")
 	process.exit()
 }
 let warnedDeprecatedEmitDtsAlias = !1
@@ -248,7 +263,7 @@ switch (commands[0]) {
 					const typeDeclaration = await generateTypeDeclaration(sourcePath, hackmudPath)
 					declarationPathPromise = writeFile(typeDeclarationPath, typeDeclaration)
 						.catch(error => {
-							assert(error instanceof Error, "src/bin/hsm.ts:300:38")
+							assert(error instanceof Error, "src/bin/hsm.ts:318:38")
 							if ("EISDIR" != error.code) throw error
 							typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 							return writeFile(typeDeclarationPath, typeDeclaration)
@@ -330,7 +345,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:444:35")
+			assert(error instanceof Error, "src/bin/hsm.ts:462:35")
 			if ("EISDIR" != error.code) throw error
 			typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 			return writeFile(typeDeclarationPath, typeDeclaration)
@@ -403,7 +418,7 @@ function logHelp() {
 		default:
 			console.log(
 				colourS(
-					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.1-628a731")}\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-698970b")}\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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hackmud-script-manager",
   "type": "module",
-  "version": "0.21.1-628a731",
+  "version": "0.21.1-698970b",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "author": "Samual Norman <me@samual.uk> (https://samual.uk/)",
   "contributors": [
@@ -12,10 +12,7 @@
   ],
   "license": "MIT",
   "homepage": "https://github.com/samualtnorman/hackmud-script-manager#readme",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/samualtnorman/hackmud-script-manager.git"
-  },
+  "repository": "github:samualtnorman/hackmud-script-manager",
   "bugs": "https://github.com/samualtnorman/hackmud-script-manager/issues",
   "keywords": [
     "api",

package/processScript/index.js

@@ -1,22 +1,22 @@
 import { relative, isAbsolute, sep } from "path"
-import aebzhxabshj61x7158qbcn2x from "@babel/generator"
+import o8o18ueduqgposmxo6khc98u from "@babel/generator"
 import { parse } from "@babel/parser"
-import s2ijmvl7wzm8x394g1t9hy8q from "@babel/plugin-proposal-decorators"
-import ol4uaa84wjloic2wsoi6umo8 from "@babel/plugin-proposal-destructuring-private"
-import cbsvdf0g10wznhaefq3xse17 from "@babel/plugin-proposal-explicit-resource-management"
-import j07gcj286yuti7d039w8qp0u from "@babel/plugin-transform-class-properties"
-import upwk5e6zb7t9muf3l9ti8udk from "@babel/plugin-transform-class-static-block"
-import fpgic0shirjc7nvp6qxdbs8u from "@babel/plugin-transform-exponentiation-operator"
-import f5ic1rjer9khd55x2hcf00m1 from "@babel/plugin-transform-json-strings"
-import k1omyve9bniu90tg7tbjt9vk from "@babel/plugin-transform-logical-assignment-operators"
-import yhl3lcharmsmfpq182cxrptq from "@babel/plugin-transform-nullish-coalescing-operator"
-import mlyvai1hug0j9bjtom8lyrkp from "@babel/plugin-transform-numeric-separator"
-import y62i7opsnlr2x3j4qu1ufsvv from "@babel/plugin-transform-object-rest-spread"
-import n5vivjwibw69juzwbc941n4e from "@babel/plugin-transform-optional-catch-binding"
-import tw1r15cx7xxc8faz7rt7jva9 from "@babel/plugin-transform-optional-chaining"
-import ik82kk7qeg2vi4ycdwkqr0ws from "@babel/plugin-transform-private-property-in-object"
-import ea48loi9ddodrbpp8w2ei0uh from "@babel/plugin-transform-unicode-sets-regex"
-import lc792rc2i7ecp4gwhh6mo7ge from "@babel/traverse"
+import yerg92h3xef0pxntmentis4x from "@babel/plugin-proposal-decorators"
+import bte791wmvheh6c8duknw52o8 from "@babel/plugin-proposal-destructuring-private"
+import hh8bh9as603wznftfw598ev4 from "@babel/plugin-proposal-explicit-resource-management"
+import mw6tmscbfy336xel0wwko3m5 from "@babel/plugin-transform-class-properties"
+import hqa52cv6hq1ln2kxplifj0vt from "@babel/plugin-transform-class-static-block"
+import kue2jd7y9faemw8fy3f873jc from "@babel/plugin-transform-exponentiation-operator"
+import rla2xnm97c6qkc9c3lugzrsn from "@babel/plugin-transform-json-strings"
+import yrmvvy1iqsvv49eiqoaiagw1 from "@babel/plugin-transform-logical-assignment-operators"
+import u3y6roa2q93oh9vgn7fh5bp8 from "@babel/plugin-transform-nullish-coalescing-operator"
+import q5clnfu3mx2a2utmxqlodg7x from "@babel/plugin-transform-numeric-separator"
+import w96tm2oib174p8k4grehe3y1 from "@babel/plugin-transform-object-rest-spread"
+import zk6pwiooyiv76c30twyn2zhq from "@babel/plugin-transform-optional-catch-binding"
+import l8e6321b0ayw5a4k0tzzxigq from "@babel/plugin-transform-optional-chaining"
+import nmo6kym6bvsq78mjyglii3dt from "@babel/plugin-transform-private-property-in-object"
+import b87sx47xj4o4ode3kr2ona7l from "@babel/plugin-transform-unicode-sets-regex"
+import gpiwud5ibbmji5fxkev1yx1i from "@babel/traverse"
 import t from "@babel/types"
 import rollupPluginAlias from "@rollup/plugin-alias"
 import { babel } from "@rollup/plugin-babel"
@@ -38,23 +38,23 @@ import "acorn"
 import "terser"
 import "import-meta-resolve"
 import "@samual/lib/clearObject"
-const generate = aebzhxabshj61x7158qbcn2x.default,
-	babelPluginProposalDecorators = s2ijmvl7wzm8x394g1t9hy8q.default,
-	babelPluginProposalDestructuringPrivate = ol4uaa84wjloic2wsoi6umo8.default,
-	babelPluginProposalExplicitResourceManagement = cbsvdf0g10wznhaefq3xse17.default,
-	babelPluginTransformClassProperties = j07gcj286yuti7d039w8qp0u.default,
-	babelPluginTransformClassStaticBlock = upwk5e6zb7t9muf3l9ti8udk.default,
-	babelPluginTransformExponentiationOperator = fpgic0shirjc7nvp6qxdbs8u.default,
-	babelPluginTransformJsonStrings = f5ic1rjer9khd55x2hcf00m1.default,
-	babelPluginTransformLogicalAssignmentOperators = k1omyve9bniu90tg7tbjt9vk.default,
-	babelPluginTransformNullishCoalescingOperator = yhl3lcharmsmfpq182cxrptq.default,
-	babelPluginTransformNumericSeparator = mlyvai1hug0j9bjtom8lyrkp.default,
-	babelPluginTransformObjectRestSpread = y62i7opsnlr2x3j4qu1ufsvv.default,
-	babelPluginTransformOptionalCatchBinding = n5vivjwibw69juzwbc941n4e.default,
-	babelPluginTransformOptionalChaining = tw1r15cx7xxc8faz7rt7jva9.default,
-	babelPluginTransformPrivatePropertyInObject = ik82kk7qeg2vi4ycdwkqr0ws.default,
-	babelPluginTransformUnicodeSetsRegex = ea48loi9ddodrbpp8w2ei0uh.default,
-	traverse = lc792rc2i7ecp4gwhh6mo7ge.default,
+const generate = o8o18ueduqgposmxo6khc98u.default,
+	babelPluginProposalDecorators = yerg92h3xef0pxntmentis4x.default,
+	babelPluginProposalDestructuringPrivate = bte791wmvheh6c8duknw52o8.default,
+	babelPluginProposalExplicitResourceManagement = hh8bh9as603wznftfw598ev4.default,
+	babelPluginTransformClassProperties = mw6tmscbfy336xel0wwko3m5.default,
+	babelPluginTransformClassStaticBlock = hqa52cv6hq1ln2kxplifj0vt.default,
+	babelPluginTransformExponentiationOperator = kue2jd7y9faemw8fy3f873jc.default,
+	babelPluginTransformJsonStrings = rla2xnm97c6qkc9c3lugzrsn.default,
+	babelPluginTransformLogicalAssignmentOperators = yrmvvy1iqsvv49eiqoaiagw1.default,
+	babelPluginTransformNullishCoalescingOperator = u3y6roa2q93oh9vgn7fh5bp8.default,
+	babelPluginTransformNumericSeparator = q5clnfu3mx2a2utmxqlodg7x.default,
+	babelPluginTransformObjectRestSpread = w96tm2oib174p8k4grehe3y1.default,
+	babelPluginTransformOptionalCatchBinding = zk6pwiooyiv76c30twyn2zhq.default,
+	babelPluginTransformOptionalChaining = l8e6321b0ayw5a4k0tzzxigq.default,
+	babelPluginTransformPrivatePropertyInObject = nmo6kym6bvsq78mjyglii3dt.default,
+	babelPluginTransformUnicodeSetsRegex = b87sx47xj4o4ode3kr2ona7l.default,
+	traverse = gpiwud5ibbmji5fxkev1yx1i.default,
 	{ format } = prettier
 async function processScript(
 	code,
@@ -154,7 +154,7 @@ async function processScript(
 	if (filePath) {
 		filePathResolved = relative(".", filePath)
 		if (filePath.endsWith(".ts"))
-			plugins.push([
+			plugins.unshift([
 				await import("@babel/plugin-transform-typescript").then(module => module.default),
 				{ allowDeclareFields: !0, optimizeConstEnums: !0 }
 			])
@@ -224,7 +224,14 @@ async function processScript(
 				rollupPluginJSON({ preferConst: !0 }),
 				{
 					name: "hackmud-script-manager",
+					resolveId(source) {
+						if (source == filePathResolved) return filePathResolved
+					},
+					async load(id) {
+						if (id == filePathResolved) return (await preprocess(code, { uniqueId })).code
+					},
 					async transform(code, id) {
+						if (id == filePathResolved) return
 						if (isAbsolute(id) && !id.includes(`${sep}node_modules${sep}`))
 							return (await preprocess(code, { uniqueId })).code
 						let program
@@ -268,7 +275,7 @@ async function processScript(
 		traverse(file, {
 			MemberExpression({ node: memberExpression }) {
 				if (!memberExpression.computed) {
-					assert("Identifier" == memberExpression.property.type, "src/processScript/index.ts:325:60")
+					assert("Identifier" == memberExpression.property.type, "src/processScript/index.ts:336:60")
 					if ("prototype" == memberExpression.property.name) {
 						memberExpression.computed = !0
 						memberExpression.property = t.stringLiteral("prototype")
@@ -298,7 +305,7 @@ async function processScript(
 							break
 						case "ObjectPattern":
 							for (const property of lValue.properties) {
-								assert("ObjectProperty" == property.type, "src/processScript/index.ts:356:51")
+								assert("ObjectProperty" == property.type, "src/processScript/index.ts:367:51")
 								renameVariables(property.value)
 							}
 							break

package/processScript/minify.js

@@ -1,5 +1,5 @@
-import aebzhxabshj61x7158qbcn2x from "@babel/generator"
-import lc792rc2i7ecp4gwhh6mo7ge from "@babel/traverse"
+import o8o18ueduqgposmxo6khc98u from "@babel/generator"
+import gpiwud5ibbmji5fxkev1yx1i from "@babel/traverse"
 import t from "@babel/types"
 import { assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
@@ -7,8 +7,8 @@ import { spliceString } from "@samual/lib/spliceString"
 import { tokenizer, tokTypes } from "acorn"
 import * as terser from "terser"
 import { getReferencePathsToGlobal, includesIllegalString, replaceUnsafeStrings } from "./shared.js"
-const generate = aebzhxabshj61x7158qbcn2x.default,
-	traverse = lc792rc2i7ecp4gwhh6mo7ge.default,
+const generate = o8o18ueduqgposmxo6khc98u.default,
+	traverse = gpiwud5ibbmji5fxkev1yx1i.default,
 	minifyNumber = async number =>
 		/\$\((?<number>.+)\)/.exec((await terser.minify(`$(${number})`, { ecma: 2015 })).code).groups.number
 async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQuineCheats, autocomplete } = {}) {

package/processScript/preprocess.js

@@ -1,12 +1,12 @@
-import aebzhxabshj61x7158qbcn2x from "@babel/generator"
+import o8o18ueduqgposmxo6khc98u from "@babel/generator"
 import { parse } from "@babel/parser"
-import lc792rc2i7ecp4gwhh6mo7ge from "@babel/traverse"
+import gpiwud5ibbmji5fxkev1yx1i from "@babel/traverse"
 import t from "@babel/types"
 import { assert } from "@samual/lib/assert"
 import { spliceString } from "@samual/lib/spliceString"
 import { resolve } from "import-meta-resolve"
-const generate = aebzhxabshj61x7158qbcn2x.default,
-	traverse = lc792rc2i7ecp4gwhh6mo7ge.default
+const generate = o8o18ueduqgposmxo6khc98u.default,
+	traverse = gpiwud5ibbmji5fxkev1yx1i.default
 async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 	assert(/^\w{11}$/.test(uniqueId), "src/processScript/preprocess.ts:20:36")
 	const sourceCode = code

package/processScript/transform.js

@@ -1,10 +1,10 @@
-import lc792rc2i7ecp4gwhh6mo7ge from "@babel/traverse"
+import gpiwud5ibbmji5fxkev1yx1i from "@babel/traverse"
 import t from "@babel/types"
 import { assert } from "@samual/lib/assert"
 import { clearObject } from "@samual/lib/clearObject"
 import { validDBMethods } from "../constants.js"
 import { getReferencePathsToGlobal } from "./shared.js"
-const traverse = lc792rc2i7ecp4gwhh6mo7ge.default,
+const traverse = gpiwud5ibbmji5fxkev1yx1i.default,
 	globalFunctionsUnder7Characters = [
 		"Map",
 		"Set",
@@ -652,6 +652,18 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			for (const classMethod of classBody.body) {
 				if ("ClassMethod" != classMethod.type) continue
 				let methodReferencesThis = !1
+				for (const param of classMethod.params)
+					traverse(
+						param,
+						{
+							ThisExpression(path) {
+								path.replaceWith(
+									t.callExpression(t.memberExpression(t.super(), t.identifier("valueOf")), [])
+								)
+							}
+						},
+						scope
+					)
 				traverse(
 					classMethod.body,
 					{
@@ -723,17 +735,7 @@ function transform(file, sourceCode, { uniqueId = "00000000000", scriptUser, scr
 			!parent.superClass && thisIsReferenced && (parent.superClass = t.identifier("Object"))
 		},
 		VariableDeclaration({ node: variableDeclaration }) {
-			if ("const" == variableDeclaration.kind) {
-				variableDeclaration.kind = "let"
-				variableDeclaration.extra = { ...variableDeclaration.extra, usedToBeConst: !0 }
-			}
-		},
-		AssignmentExpression({ node: assignment, scope }) {
-			const lhs = assignment.left
-			if ("Identifier" != lhs.type) return
-			const binding = scope.getBinding(lhs.name)
-			if (binding?.path?.parentPath?.node?.extra?.usedToBeConst)
-				throw Error(`Reassignment to const variable ${lhs.name} is not allowed!`)
+			"const" == variableDeclaration.kind && (variableDeclaration.kind = "let")
 		},
 		ThisExpression: path => {
 			path.replaceWith(t.identifier("undefined"))