hackmud-script-manager 0.21.1-0e9f98d → 0.21.1-23d95dd

package/bin/hsm.js

@@ -64,7 +64,7 @@ if (process.version.startsWith("v21.")) {
 	)
 }
 if ("v" == commands[0] || "version" == commands[0] || popOption("version", "v")?.value) {
-	console.log("0.21.1-0e9f98d")
+	console.log("0.21.1-23d95dd")
 	process.exit()
 }
 let warnedDeprecatedEmitDtsAlias = !1
@@ -412,7 +412,7 @@ function logHelp() {
 		default:
 			console.log(
 				colourS(
-					`${colourJ("Hackmud Script Manager")}\n${colourN("Version") + colourS(": ") + colourV("0.21.1-0e9f98d")}\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-23d95dd")}\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/env.d.ts

@@ -703,7 +703,7 @@ 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
@@ -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> | ObjectId | MongoObject
+type MongoQueryId = Exclude<MongoPrimitive, null | false> | ObjectId | 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,7 +886,7 @@ 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 = any> = { name: string, call: (args: TArgs) => unknown }
+	type Scriptor<TArgs extends any[] = any[]> = { name: string, call: (...args: TArgs) => unknown }
 	type Context = CliContext | SubscriptContext | ScriptorContext | BrainContext
 	type ObjectId = { $oid: string }
 

package/package.json

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

package/processScript/preprocess.js

@@ -4,23 +4,11 @@ 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,
-	SUBSCRIPT_PREFIXES = ["s", "fs", "4s", "hs", "3s", "ms", "2s", "ls", "1s", "ns", "0s"]
+	{ default: generate } = babelGenerator
 async function preprocess(code, { uniqueId = "00000000000" } = {}) {
-	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")
-	}
+	assert(/^\w{11}$/.test(uniqueId), "src/processScript/preprocess.ts:23:36")
 	const sourceCode = code
 	let lengthBefore, file, program
 	do {
@@ -59,7 +47,7 @@ async function preprocess(code, { uniqueId = "00000000000" } = {}) {
 			})
 			break
 		} catch (error_) {
-			assert(error_ instanceof SyntaxError, "src/processScript/preprocess.ts:89:42")
+			assert(error_ instanceof SyntaxError, "src/processScript/preprocess.ts:67:42")
 			error = error_
 		}
 		if ("BABEL_PARSER_SYNTAX_ERROR" != error.code || "PrivateInExpectedIn" != error.reasonCode) {

package/push.js

@@ -70,7 +70,9 @@ async function push(
 	])
 	if (sourceFolder instanceof Error) return sourceFolder
 	if (hackmudFolder instanceof Error) return hackmudFolder
-	const sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
+	const sourceFolderFolders = sourceFolder.filter(
+			({ name, stats }) => stats.isDirectory() && /^[a-z_][a-z\d_]{0,24}$/.test(name)
+		),
 		allUsers = new Set([
 			...scripts
 				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:85:65"))

package/watch.js

@@ -133,10 +133,19 @@ async function watch(
 			try {
 				;({ script: minifiedCode, warnings } = await processScript(
 					await readFile(filePath, { encoding: "utf8" }),
-					{ minify, scriptUser: !0, scriptName, uniqueId, filePath, mangleNames, forceQuineCheats }
+					{
+						minify,
+						scriptUser: !0,
+						scriptName,
+						uniqueId,
+						filePath,
+						mangleNames,
+						forceQuineCheats,
+						rootFolderPath
+					}
 				))
 			} catch (error) {
-				assert(error instanceof Error, "src/watch.ts:151:36")
+				assert(error instanceof Error, "src/watch.ts:160:36")
 				onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 				return
 			}
@@ -184,7 +193,7 @@ async function watch(
 				rootFolderPath
 			}))
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:198:35")
+			assert(error instanceof Error, "src/watch.ts:207:35")
 			onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 			return
 		}
@@ -199,7 +208,7 @@ async function watch(
 		try {
 			await writeFile(typeDeclarationPath, typeDeclaration)
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:231:35")
+			assert(error instanceof Error, "src/watch.ts:240:35")
 			if ("EISDIR" != error.code) throw error
 			typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 			await writeFile(typeDeclarationPath, typeDeclaration)