hackmud-script-manager 0.19.1-c2f3057 → 0.19.1-d57be2a

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-c2f3057",
+const version = "0.19.1-d57be2a",
 	options = new Map(),
 	commands = [],
 	userColours = new Cache(user => {
@@ -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-c2f3057",
+  "version": "0.19.1-d57be2a",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",

package/push.d.ts

@@ -21,8 +21,8 @@ export type PushOptions = LaxPartial<{
 /** 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 }?: 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.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