hackmud-script-manager 0.21.0 → 0.21.1-24be49c

package/README.md

@@ -12,7 +12,7 @@ You can read about how HSM works [in my blog post](https://samual.uk/blog/js-cod
 ## Usage
 1. Run `#dir` in game, then `cd` to that folder
 2. Name your source script file to `<name>.src.js`
-3. Run `hsm golf <name>.src.js` and it will create a minified script file called `<name>.js`
+3. Run `hsm minify <name>.src.js` and it will create a minified script file called `<name>.js`
 
 > **NOTE:** If you get an error message that looks like this:
 > ```

package/bin/hsm.js

@@ -62,7 +62,7 @@ process.version.startsWith("v21.") &&
 		)
 	)
 if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
-	console.log("0.21.0")
+	console.log("0.21.1-24be49c")
 	process.exit()
 }
 let warnedDeprecatedEmitDtsAlias = !1
@@ -403,7 +403,7 @@ function logHelp() {
 		default:
 			console.log(
 				colourS(
-					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.0")}\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-24be49c")}\n\n${colourA("Commands:")}\n${colourL("push")}\n    ${pushCommandDescription}\n${colourL("minify")}\n    Minify a script file on the spot\n${colourL("emit-dts")}\n    Generate a type declaration file for a directory of scripts\n${colourL("sync-macros")}\n    Sync macros across all hackmud users\n${colourL("pull")}\n    Pull a script a from a hackmud user's script directory\n\n${colourA("Options:")}\n${colourN("--help")}\n    Can be used on any command e.g. ${colourC("hsm")} ${colourL("push")} ${colourN("--help")} to show helpful information`
 				)
 			)
 	}

package/package.json

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

package/processScript/preprocess.js

@@ -4,11 +4,23 @@ import babelTraverse from "@babel/traverse"
 import t from "@babel/types"
 import { assert } from "@samual/lib/assert"
 import { spliceString } from "@samual/lib/spliceString"
+import { tokenizer, tokTypes } from "acorn"
 import { resolve } from "import-meta-resolve"
 const { default: traverse } = babelTraverse,
-	{ default: generate } = babelGenerator
+	{ default: generate } = babelGenerator,
+	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:23:36")
+	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 {
@@ -47,7 +59,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:89:42")
 			error = error_
 		}
 		if ("BABEL_PARSER_SYNTAX_ERROR" != error.code || "PrivateInExpectedIn" != error.reasonCode) {