hackmud-script-manager 0.20.4-d9a4cf1 → 0.20.4

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.20.4-d9a4cf1",
+const version = "0.20.4",
 	options = new Map(),
 	commands = [],
 	userColours = new Cache(user => {

package/env.d.ts

@@ -1,20 +1,9 @@
-type Replace<T, R> = Omit<T, Extract<keyof R, keyof T>> & R
+type Replace<A, B> = Omit<A, keyof B> & B
 type ScriptSuccess<T = object> = { ok: true } & T
 type ScriptFailure = { ok: false, msg?: string }
 type ScriptResponse<T = object> = ScriptSuccess<T> | ScriptFailure
 type ErrorScripts = Record<string, () => ScriptFailure>
 
-type AllOptional<T> = {
-	[K in keyof T]-?: {} extends Pick<T, K> ? true : false
-}[keyof T]
-
-type Scriptor<Args = unknown, Ret = unknown> = {
-	name: string,
-	call: AllOptional<Args> extends true
-		? (args?: Args) => Ret
-		: (args: Args) => Ret
-}
-
 type Subscripts = Record<string, Record<string, (...args: any) => any>> & {
 	accts: ErrorScripts
 	autos: ErrorScripts
@@ -37,16 +26,12 @@ interface PlayerMidsec {}
 interface PlayerLowsec {}
 interface PlayerNullsec {}
 
-type UpgradeRarityString = "`0noob`" | "`1kiddie`" | "`2h4x0r`" | "`3h4rdc0r3`" | "`4|_|b3|2`" | "`531337`"
-type UpgradeRarityNumber = 0 | 1 | 2 | 3 | 4 | 5;
-type UpgradeRarity = UpgradeRarityString | UpgradeRarityNumber;
-
 type UpgradeCore = {
 	name: string
 	type: "lock" | "script_space" | "chat" | "script" | "tool" | "bot_brain" | "glam"
 	up_class?: -1 | 0 | 1 | 2 | 3
 	tier: 1 | 2 | 3 | 4
-	rarity: UpgradeRarityNumber
+	rarity: 0 | 1 | 2 | 3 | 4 | 5
 	i: number
 	loaded: boolean
 	sn: string
@@ -57,7 +42,7 @@ type Upgrade = UpgradeCore & Record<string, null | boolean | number | string>
 
 type CLIUpgrade = Omit<UpgradeCore, `rarity`> & {
 	[x: string]: null | boolean | number | string
-	rarity: UpgradeRarityString
+	rarity: "`0noob`" | "`1kiddie`" | "`2h4x0r`" | "`3h4rdc0r3`" | "`4|_|b3|2`" | "`531337`"
 }
 
 type UsersTopItem<R> = { rank: R, name: string, last_activity: string, balance: string }
@@ -357,7 +342,7 @@ type Fullsec = Subscripts & PlayerFullsec & {
 			  * const arr = [ 1, 2, 2, 3, 2 ]
 			  *
 			  * $D(uniq(arr)) // [ 1, 2, 3, 2 ] */
-			uniq: (array: T[]) => T[]
+			uniq: <T>(array: T[]) => T[]
 
 			/** Sorts an array of numbers or number-coercible strings in descending order. */
 			u_sort_num_arr_desc: <T>(array: T[]) => T[]
@@ -534,7 +519,7 @@ type Highsec = Fullsec & PlayerHighsec & {
 				args?: { filter?: F, is_script: false, full: true }
 			): (Omit<UpgradeCore, keyof F | `rarity`> & F & {
 				[x: string]: null | boolean | number | string
-				rarity: UpgradeRarityString
+				rarity: "`0noob`" | "`1kiddie`" | "`2h4x0r`" | "`3h4rdc0r3`" | "`4|_|b3|2`" | "`531337`"
 			})[] | ScriptFailure
 		}
 	}

package/package.json

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

package/processScript/minify.js

@@ -136,7 +136,8 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		const promises = []
 		traverse(file, {
 			FunctionDeclaration(path) {
-				path.traverse({
+				const body = path.get("body")
+				body.traverse({
 					Function(path) {
 						"CallExpression" != path.parent.type && "callee" != path.parentKey && path.skip()
 					},
@@ -152,7 +153,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 							path.replaceWith(t.identifier(`_${uniqueId}_JSON_VALUE_${jsonValues.push(o) - 1}_`))
 					}
 				})
-				path.traverse({
+				body.traverse({
 					TemplateLiteral(path) {
 						if ("TaggedTemplateExpression" == path.parent.type) return
 						const templateLiteral = path.node
@@ -172,7 +173,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:259:62")
+							assert("Identifier" == memberExpression.property.type, "src/processScript/minify.ts:261:62")
 							if (!(memberExpression.property.name.length < 3)) {
 								memberExpression.computed = !0
 								memberExpression.property = t.stringLiteral(memberExpression.property.name)
@@ -246,7 +247,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:364:61")
+		assert("FunctionDeclaration" == functionDeclaration.type, "src/processScript/minify.ts:366:61")
 		if (jsonValues.length) {
 			hasComment = !0
 			if (1 == jsonValues.length)
@@ -363,7 +364,7 @@ async function minify(file, { uniqueId = "00000000000", mangleNames = !1, forceQ
 		)
 	}
 	if (1 == forceQuineCheats) return code
-	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:495:43")
+	assert(scriptBeforeJSONValueReplacement, "src/processScript/minify.ts:497:43")
 	return (
 			countHackmudCharacters(scriptBeforeJSONValueReplacement) <=
 				countHackmudCharacters(code) + Number(hasComment)
@@ -379,7 +380,7 @@ function parseObjectExpression(node, o) {
 			"Identifier" == property.key.type ||
 				"NumericLiteral" == property.key.type ||
 				"StringLiteral" == property.key.type,
-			"src/processScript/minify.ts:517:4"
+			"src/processScript/minify.ts:519:4"
 		)
 		if ("ArrayExpression" == property.value.type) {
 			const childArray = []

package/push.js

@@ -61,13 +61,15 @@ async function push(
 			...hackmudFolder
 				.filter(({ stats, name }) => stats.isFile() && name.endsWith(".key"))
 				.map(({ name }) => name.slice(0, -4))
-		]),
-		usersToScriptsToPush = new Cache(_user => new Map()),
+		])
+	if (!allUsers.size)
+		throw Error("Could not find any users. Either provide the names of your users or log into a user in hackmud.")
+	const 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")
+		assert(user, "src/push.ts:72:16")
+		assert(scriptName, "src/push.ts:73:22")
 		"*" == user ? scriptNamesToUsers.set(scriptName, allUsers) : scriptNamesToUsers.get(scriptName).add(user)
 	}
 	const sourceFolderFiles = sourceFolder.filter(({ stats }) => stats.isFile()),