add warnings field to Info

drop `line` field from pre-existing `warnings` fields

Author: samualtnorman

src/bin/hsm.ts

@@ -213,8 +213,8 @@ Warning: ${formatOption(noMinifyOption.name)} is being deprecated and will be re
 
 				const timeTook = performance.now() - timeStart
 
-				for (const { message, line } of warnings)
-					log(`Warning "${chalk.bold(message)}" on line ${chalk.bold(String(line))}`)
+				for (const { message } of warnings)
+					log(`Warning: ${chalk.bold(message)}`)
 
 				await writeFilePersistent(outputPath, script).catch((error: NodeJS.ErrnoException) => {
 					if (!commands[2] || error.code != `EISDIR`)
@@ -601,7 +601,7 @@ ${colourN(`--help`)}
 	}
 }
 
-function logInfo({ path, users, characterCount, error }: Info, hackmudPath: string) {
+function logInfo({ path, users, characterCount, error, warnings }: Info, hackmudPath: string) {
 	path = getRelativePath(`.`, path)
 
 	if (error) {
@@ -610,6 +610,9 @@ function logInfo({ path, users, characterCount, error }: Info, hackmudPath: stri
 		return
 	}
 
+	for (const warning of warnings)
+		console.warn(colourF(`Warning: ${warning.message}`))
+
 	log(`Pushed ${chalk.bold(path)} to ${users.map(user => chalk.bold(userColours.get(user))).join(`, `)} | ${
 		chalk.bold(String(characterCount))
 	} chars | ${chalk.bold(

src/index.ts

@@ -9,4 +9,5 @@ export { watch } from "./watch"
 // TODO `clean()` function that delete all scripts in hackmud directory #70
 // TODO optional argument (defaults to false) for `clean()` that makes it keep scripts with a source file #70
 
-export type Info = { path: string, users: string[], characterCount: number, error: Error | undefined }
+export type Info =
+	{ path: string, users: string[], characterCount: number, error: Error | undefined, warnings: { message: string }[] }

src/processScript/index.ts

@@ -73,7 +73,7 @@ export async function processScript(code: string, {
 	filePath,
 	mangleNames = false,
 	forceQuineCheats
-}: ProcessOptions): Promise<{ script: string, warnings: { message: string, line: number }[] }> {
+}: ProcessOptions): Promise<{ script: string, warnings: { message: string }[] }> {
 	assert(/^\w{11}$/.exec(uniqueId), HERE)
 
 	const sourceCode = code
@@ -298,7 +298,7 @@ export async function processScript(code: string, {
 
 	code = (await bundle.generate({})).output[0].code
 
-	const { file, seclevel } =
+	const { file, seclevel, warnings } =
 		transform(parse(code, { sourceType: `module` }), sourceCode, { uniqueId, scriptUser, scriptName })
 
 	if (statedSeclevel != undefined && seclevel < statedSeclevel) {
@@ -410,5 +410,5 @@ export async function processScript(code: string, {
 		)
 	}
 
-	return { script: code, warnings: [] }
+	return { script: code, warnings }
 }

src/processScript/transform.ts

@@ -782,7 +782,7 @@ export function transform(
 		}
 	})
 
-	return { file, seclevel }
+	return { file, seclevel, warnings }
 
 	function createGetFunctionPrototypeNode() {
 		const name = globalFunctionsUnder7Characters.find(name => !program.scope.hasOwnBinding(name))

src/push.ts

@@ -162,12 +162,12 @@ export async function push(
 
 		const uniqueId = Math.floor(Math.random() * (2 ** 52)).toString(36).padStart(11, `0`)
 
-		const { script: minifiedCode } = await processScript(
+		const { script: minifiedCode, warnings } = await processScript(
 			await readFile(path, { encoding: `utf8` }),
 			{ minify, scriptUser: true, scriptName, uniqueId, filePath: path, mangleNames, forceQuineCheats }
 		)
 
-		const info: Info = { path, users, characterCount: countHackmudCharacters(minifiedCode), error: undefined }
+		const info: Info = { path, users, characterCount: countHackmudCharacters(minifiedCode), error: undefined, warnings }
 
 		await Promise.all(users.map(user => writeFilePersistent(
 			resolvePath(hackmudPath, user, `scripts/${scriptName}.js`),

src/watch.ts

@@ -130,23 +130,24 @@ export async function watch(sourceDirectory: string, hackmudDirectory: string, {
 			const usersToPushTo = [ ...usersToPushToSet ].filter(user => !scriptNamesToUsersToSkip.has(user))
 
 			if (!usersToPushTo.length) {
-				onPush?.({ path, users: [], characterCount: 0, error: new Error(`no users to push to`) })
+				onPush?.({ path, users: [], characterCount: 0, error: new Error(`no users to push to`), warnings: [] })
 
 				return
 			}
 
 			const uniqueId = Math.floor(Math.random() * (2 ** 52)).toString(36).padStart(11, `0`)
 			const filePath = resolvePath(sourceDirectory, path)
 			let minifiedCode: string
+			let warnings
 
 			try {
-				({ script: minifiedCode } = await processScript(
+				({ script: minifiedCode, warnings } = await processScript(
 					await readFile(filePath, { encoding: `utf8` }),
 					{ minify, scriptUser: true, scriptName, uniqueId, filePath, mangleNames, forceQuineCheats }
 				))
 			} catch (error) {
 				assert(error instanceof Error, HERE)
-				onPush?.({ path, users: [], characterCount: 0, error })
+				onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 
 				return
 			}
@@ -157,9 +158,13 @@ export async function watch(sourceDirectory: string, hackmudDirectory: string, {
 					.replace(new RegExp(`\\$${uniqueId}\\$FULL_SCRIPT_NAME\\$`, `g`), `${user}.${scriptName}`)
 			)))
 
-			onPush?.(
-				{ path, users: usersToPushTo, characterCount: countHackmudCharacters(minifiedCode), error: undefined }
-			)
+			onPush?.({
+				path,
+				users: usersToPushTo,
+				characterCount: countHackmudCharacters(minifiedCode),
+				error: undefined,
+				warnings
+			})
 
 			return
 		}
@@ -174,21 +179,22 @@ export async function watch(sourceDirectory: string, hackmudDirectory: string, {
 		const filePath = resolvePath(sourceDirectory, path)
 		const sourceCode = await readFile(filePath, { encoding: `utf8` })
 		let script
+		let warnings
 
 		try {
-			({ script } = await processScript(
+			({ script, warnings } = await processScript(
 				sourceCode,
 				{ minify, scriptUser: user, scriptName, filePath, mangleNames, forceQuineCheats }
 			))
 		} catch (error) {
 			assert(error instanceof Error, HERE)
-			onPush?.({ path, users: [], characterCount: 0, error })
+			onPush?.({ path, users: [], characterCount: 0, error, warnings: [] })
 
 			return
 		}
 
 		await writeFilePersistent(resolvePath(hackmudDirectory, user, `scripts`, `${scriptName}.js`), script)
-		onPush?.({ path, users: [ user ], characterCount: countHackmudCharacters(script), error: undefined })
+		onPush?.({ path, users: [ user ], characterCount: countHackmudCharacters(script), error: undefined, warnings })
 	})
 
 	if (onReady)