hackmud-script-manager 0.20.4-9596502 → 0.20.4-9d6d467

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-9596502",
+const version = "0.20.4-9d6d467",
 	options = new Map(),
 	commands = [],
 	userColours = new Cache(user => {
@@ -119,7 +119,7 @@ switch (commands[0]) {
 				logHelp()
 				break
 			}
-			const { push } = await pushModule,
+			const { push, MissingSourceFolderError, MissingHackmudFolderError, NoUsersError } = await pushModule,
 				infos = await push(sourcePath, hackmudPath, {
 					scripts,
 					onPush: info => logInfo(info, hackmudPath),
@@ -127,9 +127,17 @@ switch (commands[0]) {
 					mangleNames: shouldMangleNames,
 					forceQuineCheats: shouldforceQuineCheats
 				})
-			infos instanceof Error ?
+			if (infos instanceof Error) {
 				logError(infos.message)
-			:	infos.length || logError("Could not find any scripts to push")
+				if (infos instanceof MissingSourceFolderError || infos instanceof NoUsersError) {
+					console.log()
+					logHelp()
+				} else
+					infos instanceof MissingHackmudFolderError &&
+						log(
+							`If this is not where your hackmud folder is, you can specify it with the\n${colourN("--hackmud-path")}=${colourB("<path>")} option or ${colourN("HSM_HACKMUD_PATH")} environment variable`
+						)
+			} else infos.length || logError("Could not find any scripts to push")
 		}
 		break
 	case "dev":
@@ -246,7 +254,7 @@ switch (commands[0]) {
 				typeDeclaration = await generateTypeDeclaration(sourcePath, getHackmudPath())
 			let typeDeclarationPath = resolve(outputPath)
 			await writeFile(typeDeclarationPath, typeDeclaration).catch(error => {
-				assert(error instanceof Error, "src/bin/hsm.ts:329:35")
+				assert(error instanceof Error, "src/bin/hsm.ts:340:35")
 				if ("EISDIR" != error.code) throw error
 				typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 				return writeFile(typeDeclarationPath, typeDeclaration)

package/package.json

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

package/push.d.ts

@@ -22,6 +22,10 @@ export declare class MissingSourceFolderError extends Error {
 }
 export declare class MissingHackmudFolderError extends Error {
 }
+export declare class NoUsersError extends Error {
+}
+export declare class NoScriptsError extends Error {
+}
 /** Push scripts from a source directory to the hackmud directory.
   *
   * Pushes files directly in the source folder to all users
@@ -29,4 +33,4 @@ export declare class MissingHackmudFolderError extends Error {
   * @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(sourcePath: string, hackmudPath: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: PushOptions): Promise<MissingSourceFolderError | MissingHackmudFolderError | Info[]>;
+export declare function push(sourcePath: string, hackmudPath: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: PushOptions): Promise<MissingSourceFolderError | MissingHackmudFolderError | NoUsersError | NoScriptsError | Info[]>;

package/push.js

@@ -46,6 +46,10 @@ class MissingSourceFolderError extends Error {}
 Object.defineProperty(MissingSourceFolderError.prototype, "name", { value: "MissingSourceFolderError" })
 class MissingHackmudFolderError extends Error {}
 Object.defineProperty(MissingHackmudFolderError.prototype, "name", { value: "MissingHackmudFolderError" })
+class NoUsersError extends Error {}
+Object.defineProperty(NoUsersError.prototype, "name", { value: "NoUsersError" })
+class NoScriptsError extends Error {}
+Object.defineProperty(NoScriptsError.prototype, "name", { value: "NoScriptsError" })
 async function push(
 	sourcePath,
 	hackmudPath,
@@ -68,7 +72,7 @@ async function push(
 	const sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
 		allUsers = new Set([
 			...scripts
-				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:76:65"))
+				.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:82:65"))
 				.filter(name => "*" != name),
 			...sourceFolderFolders.map(({ name }) => name),
 			...hackmudFolder.filter(({ stats }) => stats.isDirectory()).map(({ name }) => name),
@@ -77,13 +81,15 @@ async function push(
 				.map(({ name }) => name.slice(0, -4))
 		])
 	if (!allUsers.size)
-		throw Error("Could not find any users. Either provide the names of your users or log into a user in hackmud.")
+		return new NoUsersError(
+			"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:96:16")
-		assert(scriptName, "src/push.ts:97:22")
+		assert(user, "src/push.ts:105:16")
+		assert(scriptName, "src/push.ts:106:22")
 		"*" == user ? scriptNamesToUsers.set(scriptName, allUsers) : scriptNamesToUsers.get(scriptName).add(user)
 	}
 	const sourceFolderFiles = sourceFolder.filter(({ stats }) => stats.isFile()),
@@ -114,7 +120,7 @@ async function push(
 	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`)
+				return new NoScriptsError(`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)
@@ -151,4 +157,4 @@ async function push(
 	)
 	return allInfo
 }
-export { MissingHackmudFolderError, MissingSourceFolderError, push }
+export { MissingHackmudFolderError, MissingSourceFolderError, NoScriptsError, NoUsersError, push }