@irrelon/battlescript 3.1.6 → 3.1.7

package/bin/functionality.ts

@@ -27,7 +27,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 +85,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}`);
@@ -98,7 +106,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 +129,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))
 

package/bin/index.js

@@ -3,7 +3,7 @@ import { writeFile, readFile } from 'fs/promises';
 import { join, dirname, basename, extname } from 'path';
 import require$$0 from 'assert';
 import require$$0$1 from 'util';
-import 'fs';
+import { readFileSync } from 'fs';
 import 'node:fs';
 
 var ATNDeserializer = {};
@@ -26265,7 +26265,7 @@ var body$2 = [
 		kind: "FUNCTION_DECLARATION",
 		returnType: {
 			kind: "DATA_TYPE",
-			value: "float",
+			value: "void",
 			meta: {
 				start: {
 					line: 1,
@@ -26274,28 +26274,60 @@ var body$2 = [
 				},
 				stop: {
 					line: 1,
-					column: 12,
-					offset: 11
+					column: 11,
+					offset: 10
 				}
 			}
 		},
 		id: {
 			kind: "IDENTIFIER",
-			value: "std::gpio.readPin",
+			value: "std::gpio.setPinMode",
 			meta: {
 				start: {
 					line: 1,
-					column: 13,
-					offset: 13
+					column: 12,
+					offset: 12
 				},
 				stop: {
 					line: 1,
-					column: 30,
-					offset: 29
+					column: 32,
+					offset: 31
 				}
 			}
 		},
 		params: [
+			{
+				kind: "IDENTIFIER",
+				value: "newMode",
+				meta: {
+					start: {
+						line: 1,
+						column: 38,
+						offset: 38
+					},
+					stop: {
+						line: 1,
+						column: 45,
+						offset: 44
+					}
+				},
+				type: {
+					kind: "DATA_TYPE",
+					value: "int",
+					meta: {
+						start: {
+							line: 1,
+							column: 34,
+							offset: 34
+						},
+						stop: {
+							line: 1,
+							column: 37,
+							offset: 36
+						}
+					}
+				}
+			}
 		],
 		isNative: true,
 		isPure: false,
@@ -26307,8 +26339,8 @@ var body$2 = [
 			},
 			stop: {
 				line: 1,
-				column: 34,
-				offset: 33
+				column: 47,
+				offset: 46
 			}
 		}
 	},
@@ -26316,17 +26348,68 @@ var body$2 = [
 		kind: "FUNCTION_DECLARATION",
 		returnType: {
 			kind: "DATA_TYPE",
-			value: "void",
+			value: "float",
 			meta: {
 				start: {
 					line: 2,
 					column: 7,
-					offset: 42
+					offset: 55
 				},
 				stop: {
 					line: 2,
+					column: 12,
+					offset: 59
+				}
+			}
+		},
+		id: {
+			kind: "IDENTIFIER",
+			value: "std::gpio.readPin",
+			meta: {
+				start: {
+					line: 2,
+					column: 13,
+					offset: 61
+				},
+				stop: {
+					line: 2,
+					column: 30,
+					offset: 77
+				}
+			}
+		},
+		params: [
+		],
+		isNative: true,
+		isPure: false,
+		meta: {
+			start: {
+				line: 2,
+				column: 0,
+				offset: 48
+			},
+			stop: {
+				line: 2,
+				column: 34,
+				offset: 81
+			}
+		}
+	},
+	{
+		kind: "FUNCTION_DECLARATION",
+		returnType: {
+			kind: "DATA_TYPE",
+			value: "void",
+			meta: {
+				start: {
+					line: 3,
+					column: 7,
+					offset: 90
+				},
+				stop: {
+					line: 3,
 					column: 11,
-					offset: 45
+					offset: 93
 				}
 			}
 		},
@@ -26335,14 +26418,14 @@ var body$2 = [
 			value: "std::gpio.writePin",
 			meta: {
 				start: {
-					line: 2,
+					line: 3,
 					column: 12,
-					offset: 47
+					offset: 95
 				},
 				stop: {
-					line: 2,
+					line: 3,
 					column: 30,
-					offset: 64
+					offset: 112
 				}
 			}
 		},
@@ -26352,14 +26435,14 @@ var body$2 = [
 				value: "newVal",
 				meta: {
 					start: {
-						line: 2,
+						line: 3,
 						column: 36,
-						offset: 71
+						offset: 119
 					},
 					stop: {
-						line: 2,
+						line: 3,
 						column: 42,
-						offset: 76
+						offset: 124
 					}
 				},
 				type: {
@@ -26367,14 +26450,14 @@ var body$2 = [
 					value: "int",
 					meta: {
 						start: {
-							line: 2,
+							line: 3,
 							column: 32,
-							offset: 67
+							offset: 115
 						},
 						stop: {
-							line: 2,
+							line: 3,
 							column: 35,
-							offset: 69
+							offset: 117
 						}
 					}
 				}
@@ -26384,14 +26467,14 @@ var body$2 = [
 		isPure: false,
 		meta: {
 			start: {
-				line: 2,
+				line: 3,
 				column: 0,
-				offset: 35
+				offset: 83
 			},
 			stop: {
-				line: 2,
+				line: 3,
 				column: 44,
-				offset: 78
+				offset: 126
 			}
 		}
 	}
@@ -27902,7 +27985,7 @@ function getAllNativeLibraryFunctions(rootNode) {
     ];
 }
 
-var version = "3.1.6";
+var version = "3.1.7";
 var binaryVersion = 7;
 
 const RootNodeLayout = [{
@@ -28881,28 +28964,26 @@ class BattleScriptToMiniAST {
                     return requiredCount;
                 }, 0);
                 if (functionArgs.length < requiredCount) {
-                    functionParams.reduce((requiredCount, param, index) => {
-                        if (param.kind === "IDENTIFIER") {
-                            if (!functionArgs[index]) {
-                                throw new Error(formatCompilerError(this._filePath, this._sourceCode, "error", node.meta, `Call to function ${prettyPrintFunctionDeclaration(functionNode)} is missing required argument \`${this.nodeResolver.visit(param)}\``));
-                            }
-                            requiredCount++;
+                    functionParams.forEach((param, index) => {
+                        if (functionArgs[index]) {
                             finalArgs.push(functionArgs[index]);
+                            return;
+                        }
+                        if (param.kind === "IDENTIFIER") {
+                            throw new Error(formatCompilerError(this._filePath, this._sourceCode, "error", node.meta, `Call to function ${prettyPrintFunctionDeclaration(functionNode)} is missing required argument \`${this.nodeResolver.visit(param)}\``));
                         }
                         else if (param.kind === "ASSIGNMENT_PATTERN") {
-                            if (!functionArgs[index]) {
-                                // We don't have a value but we do have a default, use it
-                                // We use clone here because we want to create an entirely new node entry in the node array
-                                // just for this one argument so that we don't point at a node index (the default argument
-                                // in the function definition) because that would generate a non-contiguous start index
-                                // and count for the function call arguments. However, when the meta array is compiled,
-                                // the cloned node will still have the same meta data so will highlight the original
-                                // function definition parameter which shows where the value came from.
-                                finalArgs.push(clone(param.right));
-                            }
+                            // We don't have a value but we do have a default, use it
+                            // We use clone here because we want to create an entirely new node entry in the node array
+                            // just for this one argument so that we don't point at a node index (the default argument
+                            // in the function definition) because that would generate a non-contiguous start index
+                            // and count for the function call arguments. However, when the meta array is compiled,
+                            // the cloned node will still have the same meta data so will highlight the original
+                            // function definition parameter which shows where the value came from.
+                            finalArgs.push(clone(param.right));
                         }
-                        return requiredCount;
-                    }, 0);
+                        return;
+                    });
                 }
                 else {
                     return functionArgs;
@@ -38813,8 +38894,6 @@ function fromSourceCodeToFullAst(inputText, options) {
     const tree = parser.root();
     console.log(`[BattleScript ${version}] Transforming source code -> AST...`);
     const transformer = new BattleScriptToAST(options?.filePath || "-", inputText, options?.sourceResolver);
-    transformer.filePath(options?.filePath);
-    transformer.sourceCode(inputText);
     return transformer.visit(tree, options);
 }
 function fromFullAstToSourceCode(ast, options = { includeMetaData: true }) {
@@ -38826,8 +38905,6 @@ function fromSourceCodeToMiniAst(source, options = { includeMetaData: true }) {
     const ast = fromSourceCodeToFullAst(source, options);
     console.log(`[BattleScript ${version}] Transforming AST -> MiniAST...`);
     const transformer = new BattleScriptToMiniAST(options?.filePath || "-", source);
-    transformer.filePath(options?.filePath);
-    transformer.sourceCode(source); // Add for debugging purposes
     return transformer.transform(ast, options);
 }
 function fromMiniAstToBinary(miniAst, options = { includeMetaData: true }) {
@@ -38932,11 +39009,18 @@ function disassembleBytecode([stringTable, bytecode]) {
 const sourceResolverAsync = (filePath) => {
     return readFile(filePath, "utf-8");
 };
+const sourceResolverSync = (filePath) => {
+    return readFileSync(filePath, "utf-8");
+};
 async function toAst(inputPath, outputPath) {
     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));
             console.log(`[BattleScript ${version}] Compiled to ${outputPath}`);
@@ -38968,7 +39052,11 @@ async function toMiniAst(inputPath, outputPath) {
     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}`);
     }
@@ -38983,7 +39071,12 @@ async function toBinary(inputPath, outputPath) {
         console.log(`[BattleScript ${version}] Reading file contents: ${inputPath}`);
         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));
         console.log(`[BattleScript ${version}] Compiled to ${outputPath}`);
@@ -38999,7 +39092,8 @@ async function miniAstToBinary(inputPath, outputPath) {
         const binary = fromMiniAstToBinary(JSON.parse(sourceCode), {
             includeMetaData: true,
             flatten: true,
-            filePath: inputPath
+            filePath: inputPath,
+            sourceResolver: sourceResolverSync
         });
         await writeFile(outputPath, Buffer.concat(binary));
         console.log(`[BattleScript ${version}] Compiled to ${outputPath}`);