updated commands in accordance with new hackmud_env-tools version

Author: samualtnorman

.gitignore

@@ -105,4 +105,6 @@ dist
 
 *.js
 *.d.ts
-!test/src/*
+!test/src/**
+test/src/user_1/**
+!test/hackmud/user_1/scripts/script_2.js

lib/hsm.ts

@@ -1,8 +1,12 @@
 import { readFile, mkdir as mkDir, writeFile, rmdir as rmDir } from "fs/promises"
 import { resolve as resolvePath } from "path"
 import { homedir as homeDir } from "os"
-import { build, clear, push, sync, watch } from "hackmud_env-tools"
-import c, { redBright, yellowBright, greenBright, blueBright, cyanBright, magentaBright, bold, dim } from "ansi-colors"
+import { build, clear, pull, push, pushBuilt, watch } from "hackmud_env-tools"
+import { redBright, yellowBright, greenBright, blueBright, cyanBright, magentaBright, bold, dim } from "ansi-colors"
+
+interface LooseObject<T = any> {
+	[key: string]: T | undefined
+}
 
 // let o = ""
 
@@ -33,10 +37,12 @@ const commands: string[] = []
 // 	}
 // }
 
-let config: Partial<{
+let config: LooseObject &  Partial<{
 	hackmudPath: string
 	defaultUser: string
-	[key: string]: any
+	users: LooseObject<{
+		colour: string
+	}>
 }> | undefined
 
 for (let arg of process.argv.slice(2)) {
@@ -99,15 +105,15 @@ for (let arg of process.argv.slice(2)) {
 				break
 			}
 
-			case "push": {
+			case "push-built": {
 				const config = await getConfig()
 
 				if (config.hackmudPath) {
 					const target = commands[1] || "dist"
 					const user = commands[2] || config.defaultUser
 
 					if (user) {
-						const { pushedCount } = await push(target, config.hackmudPath, user)
+						const { pushedCount } = await pushBuilt(target, config.hackmudPath, user)
 
 						console.log(`pushed ${pushedCount} file(s) to ${user}`)
 					} else
@@ -118,52 +124,97 @@ for (let arg of process.argv.slice(2)) {
 				break
 			}
 
-			case "sync": {
+			case "push": {
 				const config = await getConfig()
 
 				if (config.hackmudPath) {
 					const srcPath = commands[1] || "."
 					const hackmudPath = config.hackmudPath
 					const users = options.get("users")?.toString().split(",") || []
 					const scripts = options.get("scripts")?.toString().split(",") || []
-
 					const colours = [ redBright, greenBright, yellowBright, blueBright, magentaBright, cyanBright ]
-					const userColours = new Map<string, string>()
+					const configUsers = config.users = config.users || {}
+
+					await push(
+						srcPath,
+						hackmudPath,
+						users,
+						scripts,
+						({ minLength, srcLength, users, script }) =>
+							users.length && console.log(
+								`wrote ${
+									bold(minLength.toString())
+								} chars from ${
+									dim(script)
+								} to ${
+									users.map(user =>
+										(configUsers[user] = configUsers[user] || { colour: colours[Math.floor(Math.random() * colours.length)](user) }).colour
+									).join(", ")
+								} and saved ${
+										bold((srcLength - minLength).toString())
+								} chars`
+							)
+					)
+				} else
+					console.log("you need to set hackmudPath in config before you can use this command")
 
-					sync(srcPath, hackmudPath, users, scripts, (file, { minLength, srcLength, users }) => {
-						if (users.length)
-							console.log(`synced ${dim(file)} to ${users.map(user => {
-								let colour = userColours.get(user)
+				break
+			}
 
-								if (!colour)
-									userColours.set(user, colour = colours[Math.floor(Math.random() * colours.length)](user))
+			case "watch": {
+				const config = await getConfig()
 
-								return colour
-							}).join(", ")} [saved ${bold((srcLength - minLength).toString())} chars]`)
-					})
+				if (config.hackmudPath) {
+					const srcPath = commands[1] || "."
+					const hackmudPath = config.hackmudPath
+					const users = options.get("users")?.toString().split(",") || []
+					const scripts = options.get("scripts")?.toString().split(",") || []
+					const colours = [ redBright, greenBright, yellowBright, blueBright, magentaBright, cyanBright ]
+					const configUsers = config.users = config.users || {}
+
+					watch(
+						srcPath,
+						hackmudPath,
+						users,
+						scripts,
+						({ minLength, srcLength, users, script }) => {
+							users.length && console.log(
+								`wrote ${
+									bold(minLength.toString())
+								} chars from ${
+									dim(script)
+								} to ${
+									users.map(user =>
+										(configUsers[user] = configUsers[user] || { colour: colours[Math.floor(Math.random() * colours.length)](user) }).colour
+									).join(", ")
+								} and saved ${
+										bold((srcLength - minLength).toString())
+								} chars`
+							)
+
+							updateConfig()
+						}
+					)
 				} else
 					console.log("you need to set hackmudPath in config before you can use this command")
 
 				break
 			}
 
-			case "watch": {
+			case "pull": {
 				const config = await getConfig()
 
 				if (config.hackmudPath) {
-					const srcPath = commands[1] || "src"
-					const user = commands[2] || config.defaultUser
-
-					if (user) {
-						const {} = await watch(srcPath, config.hackmudPath, user, ({ minLength, oldLength, name }) => {
-							console.log(`built and pushed ${name} to ${user} [saved ${oldLength - minLength} chars]`)
-						})
+					const script = commands[1]
 
-						// console.log(`pushed ${pushedCount} file(s) to ${user}`)
+					if (script) {
+						const srcPath = commands[2] || "."
+						const hackmudPath = config.hackmudPath
+						pull(srcPath, hackmudPath, script)
 					} else
-						console.log("set defaultUser in config first")
+						help()
 				} else
-					console.log("set hackmudPath in config first")
+					console.log("you need to set hackmudPath in config before you can use this command")
 
 				break
 			}
@@ -233,24 +284,7 @@ for (let arg of process.argv.slice(2)) {
 				help()
 		}
 
-	if (config) {
-		const json = JSON.stringify(config)
-
-		writeFile(configFile, json).catch(async error => {
-			switch (error.code) {
-				case "EISDIR":
-					await rmDir(configFile)
-					break
-				case "ENOENT":
-					await mkDir(configDir)
-					break
-				default:
-					throw error
-			}
-
-			writeFile(configFile, json)
-		})
-	}
+	updateConfig()
 })()
 
 function help() {
@@ -297,3 +331,24 @@ function exploreObject(object: any, keys: string[], createPath = false) {
 
 	return object
 }
+
+function updateConfig() {
+	if (config) {
+		const json = JSON.stringify(config)
+
+		writeFile(configFile, json).catch(async error => {
+			switch (error.code) {
+				case "EISDIR":
+					await rmDir(configFile)
+					break
+				case "ENOENT":
+					await mkDir(configDir)
+					break
+				default:
+					throw error
+			}
+
+			writeFile(configFile, json)
+		})
+	}
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "hackmud-script-manager",
-	"version": "0.0.2",
+	"version": "0.1.0",
 	"description": "",
 	"files": [
 		"bin/hsm",
@@ -22,7 +22,7 @@
 	"homepage": "https://github.com/samualtnorman/hackmud-script-manager#readme",
 	"dependencies": {
 		"ansi-colors": "^4.1.1",
-		"hackmud_env-tools": "^1.1.0"
+		"hackmud_env-tools": "^1.2.0"
 	},
 	"devDependencies": {
 		"@types/node": "^14.6.0",

package.json

@@ -0,0 +1,3 @@
+function (context, args) {
+	return args.foo
+}