@irrelon/battlescript 3.1.6 → 3.2.1

package/bin/functionality.ts

@@ -1,16 +1,15 @@
 import {readFile, writeFile} from "fs/promises";
 import {basename, dirname, extname, join} from "path";
 import {
-	disassembleBytecode,
 	fromFullAstToSourceCode,
 	fromMiniAstToBinary,
+	fromMiniAstToSourceCode,
 	fromSourceCodeToBinary,
 	fromSourceCodeToFullAst,
 	fromSourceCodeToMiniAst,
 	miniAstFromBinaryBuffer
 } from "@/services";
 import type {SourceResolverAsync, SourceResolverSync} from "@/types";
-import type {ByteCodeJson} from "@/types/byteCode/ByteCodeJson";
 import {version} from "../package.json";
 import {readFileSync} from "fs";
 import {writeFileSync} from "node:fs";
@@ -27,7 +26,11 @@ export async function toAst(inputPath: string, outputPath?: string) {
 	console.log(`[BattleScript ${version}] toAst: ${inputPath}`);
 	try {
 		const sourceCode = await sourceResolverAsync(inputPath);
-		const ast = fromSourceCodeToFullAst(sourceCode, {filePath: inputPath, includeMetaData: true});
+		const ast = fromSourceCodeToFullAst(sourceCode, {
+			filePath: inputPath,
+			includeMetaData: true,
+			sourceResolver: sourceResolverSync
+		});
 
 		if (outputPath) {
 			await writeFile(outputPath, JSON.stringify(ast, null, 2));
@@ -81,7 +84,11 @@ export async function toMiniAst(inputPath: string, outputPath: string) {
 	console.log(`[BattleScript ${version}] toMiniAst: ${inputPath}`);
 	try {
 		const sourceCode = await sourceResolverAsync(inputPath);
-		const ast = fromSourceCodeToMiniAst(sourceCode, {filePath: inputPath, includeMetaData: true});
+		const ast = fromSourceCodeToMiniAst(sourceCode, {
+			filePath: inputPath,
+			includeMetaData: true,
+			sourceResolver: sourceResolverSync
+		});
 
 		await writeFile(outputPath, JSON.stringify(ast));
 		console.log(`[BattleScript ${version}] Compiled to ${outputPath}`);
@@ -91,6 +98,20 @@ export async function toMiniAst(inputPath: string, outputPath: string) {
 	}
 }
 
+export async function fromMiniAst(inputPath: string, outputPath: string) {
+	console.log(`[BattleScript ${version}] fromMiniAst: ${inputPath}`);
+	try {
+		const miniAstString = await sourceResolverAsync(inputPath);
+		const miniAst = JSON.parse(miniAstString);
+		const sourceCode = fromMiniAstToSourceCode(miniAst);
+		await writeFile(outputPath, sourceCode);
+		console.log(`[BattleScript ${version}] Decompiled to ${outputPath}`);
+	} catch (error) {
+		console.error(`[BattleScript ${version}] Error:`, (error as Error).stack);
+		process.exit(1);
+	}
+}
+
 export async function toBinary(inputPath: string, outputPath: string) {
 	console.log(`[BattleScript ${version}] toBinary: ${inputPath}`);
 	try {
@@ -98,7 +119,12 @@ export async function toBinary(inputPath: string, outputPath: string) {
 		const sourceCode = await sourceResolverAsync(inputPath);
 
 		console.log(`[BattleScript ${version}] fromSourceCodeToBinary: ${inputPath}`);
-		const binary = fromSourceCodeToBinary(sourceCode, {includeMetaData: true, flatten: true, filePath: inputPath});
+		const binary = fromSourceCodeToBinary(sourceCode, {
+			includeMetaData: true,
+			flatten: true,
+			filePath: inputPath,
+			sourceResolver: sourceResolverSync
+		});
 
 		console.log(`[BattleScript ${version}] Writing file contents: ${outputPath}`);
 		await writeFile(outputPath, Buffer.concat(binary))
@@ -116,7 +142,8 @@ export async function miniAstToBinary(inputPath: string, outputPath: string) {
 		const binary = fromMiniAstToBinary(JSON.parse(sourceCode), {
 			includeMetaData: true,
 			flatten: true,
-			filePath: inputPath
+			filePath: inputPath,
+			sourceResolver: sourceResolverSync
 		});
 		await writeFile(outputPath, Buffer.concat(binary))
 
@@ -139,31 +166,6 @@ export async function fromBinary(inputPath: string, outputPath: string) {
 	}
 }
 
-// async function toByteCode(inputPath: string, outputPath: string) {
-// 	try {
-// 		const sourceCode = await sourceResolverAsync(inputPath);
-// 		const bcodeJson = fromSourceCodeToByteCode(sourceCode, {includeMetaData: true, flatten: true});
-// 		await writeFile(outputPath, JSON.stringify(bcodeJson).replace(/\[\[/g, "[\n[").replace(/]]/g, "]\n]").replace(/],/g, "],\n"));
-// 		console.log(`Compiled to ${outputPath}`);
-// 	} catch (error) {
-// 		console.error("Error:", (error as Error).stack);
-// 		process.exit(1);
-// 	}
-// }
-
-export async function fromByteCode(inputPath: string, outputPath: string) {
-	try {
-		const byteCodeJsonString = await sourceResolverAsync(inputPath);
-		const byteCodeJson: ByteCodeJson = JSON.parse(byteCodeJsonString);
-		const code = disassembleBytecode(byteCodeJson);
-		await writeFile(outputPath, code.join("\n"));
-		console.log(`[BattleScript ${version}] Disassembled to ${outputPath}`);
-	} catch (error) {
-		console.error(`[BattleScript ${version}] Error:`, (error as Error).stack);
-		process.exit(1);
-	}
-}
-
 export function changeExtension(filePath: string, newExt: string): string {
 	const dir = dirname(filePath);
 	const base = basename(filePath, extname(filePath));