hackmud-script-manager 0.20.4-550e28d → 0.20.4-66e0e13

package/watch.js

@@ -1,10 +1,10 @@
-import { Cache } from "@samual/lib/Cache"
+import { AutoMap } from "@samual/lib/AutoMap"
 import { assert } from "@samual/lib/assert"
 import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
 import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
 import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
 import { watch as watch$1 } from "chokidar"
-import { readFile, writeFile } from "fs/promises"
+import { stat, readFile, writeFile } from "fs/promises"
 import { extname, basename, resolve } from "path"
 import { supportedExtensions } from "./constants.js"
 import { generateTypeDeclaration } from "./generateTypeDeclaration.js"
@@ -29,6 +29,7 @@ import "@babel/plugin-transform-private-property-in-object"
 import "@babel/plugin-transform-unicode-sets-regex"
 import "@babel/traverse"
 import "@babel/types"
+import "@rollup/plugin-alias"
 import "@rollup/plugin-babel"
 import "@rollup/plugin-commonjs"
 import "@rollup/plugin-json"
@@ -59,7 +60,8 @@ async function watch(
 	} = {}
 ) {
 	if (!scripts.length) throw Error("scripts option was an empty array")
-	const scriptNamesToUsers = new Cache(_scriptName => new Set()),
+	if (!(await stat(sourceDirectory)).isDirectory()) throw Error("Target folder must be a folder")
+	const scriptNamesToUsers = new AutoMap(_scriptName => new Set()),
 		wildScriptUsers = new Set(),
 		wildUserScripts = new Set()
 	let pushEverything = !1
@@ -72,10 +74,11 @@ async function watch(
 		: scriptName && "*" != scriptName ? wildUserScripts.add(scriptName)
 		: (pushEverything = !0)
 	}
-	const watcher = watch$1(["*.ts", "*.js", "*/*.ts", "*/*.js"], {
+	const watcher = watch$1(".", {
 		cwd: sourceDirectory,
 		awaitWriteFinish: { stabilityThreshold: 100 },
-		ignored: "*.d.ts"
+		ignored: (path, stats) =>
+			!!stats?.isFile() && !(path.endsWith(".js") || (path.endsWith(".ts") && !path.endsWith(".d.ts")))
 	}).on("change", async path => {
 		if (path.endsWith(".d.ts")) return
 		const extension = extname(path)
@@ -91,7 +94,7 @@ async function watch(
 				)
 			)
 				return
-			const scriptNamesToUsersToSkip = new Cache(_scriptName => [])
+			const scriptNamesToUsersToSkip = new AutoMap(_scriptName => [])
 			await Promise.all(
 				(await readDirectoryWithStats(sourceDirectory)).map(async ({ stats, name, path }) => {
 					if (stats.isDirectory())
@@ -117,27 +120,22 @@ 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?.({ path, users: [], characterCount: 0, error: Error("no users to push to") })
+				onPush?.({ path, users: [], characterCount: 0, error: Error("no users to push to"), warnings: [] })
 				return
 			}
 			const uniqueId = Math.floor(Math.random() * 2 ** 52)
 					.toString(36)
 					.padStart(11, "0"),
 				filePath = resolve(sourceDirectory, path)
-			let minifiedCode
+			let minifiedCode, warnings
 			try {
-				;({ script: minifiedCode } = await processScript(await readFile(filePath, { encoding: "utf8" }), {
-					minify,
-					scriptUser: !0,
-					scriptName,
-					uniqueId,
-					filePath,
-					mangleNames,
-					forceQuineCheats
-				}))
+				;({ script: minifiedCode, warnings } = await processScript(
+					await readFile(filePath, { encoding: "utf8" }),
+					{ minify, scriptUser: !0, scriptName, uniqueId, filePath, mangleNames, forceQuineCheats }
+				))
 			} catch (error) {
-				assert(error instanceof Error, "src/watch.ts:141:36")
-				onPush?.({ path, users: [], characterCount: 0, error })
+				assert(error instanceof Error, "src/watch.ts:149:36")
+				onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 				return
 			}
 			await Promise.all(
@@ -154,7 +152,8 @@ async function watch(
 				path,
 				users: usersToPushTo,
 				characterCount: countHackmudCharacters(minifiedCode),
-				error: void 0
+				error: void 0,
+				warnings
 			})
 			return
 		}
@@ -168,25 +167,27 @@ async function watch(
 			)
 		)
 			return
-		const filePath = resolve(sourceDirectory, path),
+		const sourceDirectoryResolved = resolve(sourceDirectory),
+			filePath = resolve(sourceDirectoryResolved, path),
 			sourceCode = await readFile(filePath, { encoding: "utf8" })
-		let script
+		let script, warnings
 		try {
-			;({ script } = await processScript(sourceCode, {
+			;({ script, warnings } = await processScript(sourceCode, {
 				minify,
 				scriptUser: user,
 				scriptName,
 				filePath,
 				mangleNames,
-				forceQuineCheats
+				forceQuineCheats,
+				rootFolderPath: sourceDirectoryResolved
 			}))
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:177:35")
-			onPush?.({ path, users: [], characterCount: 0, error })
+			assert(error instanceof Error, "src/watch.ts:196:35")
+			onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 			return
 		}
 		await writeFilePersistent(resolve(hackmudDirectory, user, "scripts", scriptName + ".js"), script)
-		onPush?.({ path, users: [user], characterCount: countHackmudCharacters(script), error: void 0 })
+		onPush?.({ path, users: [user], characterCount: countHackmudCharacters(script), error: void 0, warnings })
 	})
 	onReady && watcher.on("ready", onReady)
 	if (!typeDeclarationPath_) return
@@ -196,7 +197,7 @@ async function watch(
 		try {
 			await writeFile(typeDeclarationPath, typeDeclaration)
 		} catch (error) {
-			assert(error instanceof Error, "src/watch.ts:210:35")
+			assert(error instanceof Error, "src/watch.ts:229:35")
 			if ("EISDIR" != error.code) throw error
 			typeDeclarationPath = resolve(typeDeclarationPath, "player.d.ts")
 			await writeFile(typeDeclarationPath, typeDeclaration)