@irrelon/battlescript 3.1.5 → 3.1.7

package/dist/bin/functionality.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functionality.d.ts","sourceRoot":"","sources":["../../bin/functionality.ts"],"names":[],"mappings":"AAgBA,wBAAsB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,gBAgBjE;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,OAgB/D;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAYlE;AAED,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAYpE;AAED,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAiBnE;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAe1E;AAED,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAUrE;AAcD,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAWvE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIxE"}
+{"version":3,"file":"functionality.d.ts","sourceRoot":"","sources":["../../bin/functionality.ts"],"names":[],"mappings":"AAyBA,wBAAsB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,gBAoBjE;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,OAoB/D;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAYlE;AAED,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAgBpE;AAED,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAsBnE;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAgB1E;AAED,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAUrE;AAcD,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAWvE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIxE"}

package/dist/index.js

@@ -1,9 +1,6 @@
 import require$$0 from 'assert';
 import require$$0$1 from 'util';
 import { join, dirname } from 'path';
-import 'fs/promises';
-import { readFileSync } from 'fs';
-import { writeFileSync } from 'node:fs';
 
 var ATNDeserializer = {};
 
@@ -26300,7 +26297,7 @@ var body$2 = [
 		kind: "FUNCTION_DECLARATION",
 		returnType: {
 			kind: "DATA_TYPE",
-			value: "float",
+			value: "void",
 			meta: {
 				start: {
 					line: 1,
@@ -26309,28 +26306,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,
@@ -26342,8 +26371,8 @@ var body$2 = [
 			},
 			stop: {
 				line: 1,
-				column: 34,
-				offset: 33
+				column: 47,
+				offset: 46
 			}
 		}
 	},
@@ -26351,17 +26380,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
 				}
 			}
 		},
@@ -26370,14 +26450,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
 				}
 			}
 		},
@@ -26387,14 +26467,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: {
@@ -26402,14 +26482,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
 						}
 					}
 				}
@@ -26419,14 +26499,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
 			}
 		}
 	}
@@ -27937,25 +28017,9 @@ function getAllNativeLibraryFunctions(rootNode) {
     ];
 }
 
-var version = "3.1.5";
+var version = "3.1.7";
 var binaryVersion = 7;
 
-function toAstSync(inputPath, outputPath) {
-    console.log(`[BattleScript ${version}] toAstSync: ${inputPath}`);
-    try {
-        const sourceCode = readFileSync(inputPath, "utf-8");
-        const ast = fromSourceCodeToFullAst(sourceCode, { filePath: inputPath, includeMetaData: true });
-        if (outputPath) ;
-        else {
-            return ast;
-        }
-    }
-    catch (error) {
-        console.error(`[BattleScript ${version}] Error:`, error.stack);
-        process.exit(1);
-    }
-}
-
 const RootNodeLayout = [{
         key: "kind",
         shape: [EnumNodeLayoutEntry.LAYOUT_POINTER_KIND],
@@ -27993,7 +28057,12 @@ const rootToAstNode = (instance, ctx) => {
         // Check we can locate the file
         console.log(`[BattleScript ${version}] Processing import compilation unit: `, importNode.source.value);
         const filePath = join(dirname(instance._filePath), importNode.source.value);
-        const importedAst = toAstSync(filePath);
+        const importedSourceCode = instance.resolveSourceCode(filePath);
+        const importedAst = fromSourceCodeToFullAst(importedSourceCode, {
+            filePath,
+            includeMetaData: true,
+            sourceResolver: instance._sourceResolver
+        });
         return importedAst.body;
     }).concat(standardLibraryDeclarations).filter((astNode) => {
         // TODO: We should move this to just before we complete the AST generation
@@ -28270,7 +28339,7 @@ function getMetaData(ctx, extra) {
     };
 }
 class BattleScriptToAST extends AbstractParseTreeVisitorExports.AbstractParseTreeVisitor {
-    constructor(filePath, sourceCode) {
+    constructor(filePath, sourceCode, sourceResolver) {
         super();
         this._options = {
             includeMetaData: true
@@ -28288,6 +28357,16 @@ class BattleScriptToAST extends AbstractParseTreeVisitorExports.AbstractParseTre
                 return;
             this._sourceCode = newSourceCode;
         };
+        this.resolveSourceCode = (filePath) => {
+            if (this._sourceResolver) {
+                const resolved = this._sourceResolver(filePath);
+                if (resolved !== undefined) {
+                    return resolved;
+                }
+                throw new Error(`Source resolver could not resolve source code for file: ${filePath}`);
+            }
+            throw new Error(`Could not resolve source code for file: ${filePath}. No source resolver provided.`);
+        };
         this.extractInlineComment = (ctx) => {
             if (!ctx)
                 return;
@@ -28517,6 +28596,7 @@ class BattleScriptToAST extends AbstractParseTreeVisitorExports.AbstractParseTre
         };
         this._filePath = filePath;
         this._sourceCode = sourceCode;
+        this._sourceResolver = sourceResolver;
     }
     visit(node, options) {
         if (options) {
@@ -28972,28 +29052,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;
@@ -39079,9 +39157,7 @@ function fromSourceCodeToFullAst(inputText, options) {
     const parser = getParser(inputText);
     const tree = parser.root();
     console.log(`[BattleScript ${version}] Transforming source code -> AST...`);
-    const transformer = new BattleScriptToAST(options?.filePath || "-", inputText);
-    transformer.filePath(options?.filePath);
-    transformer.sourceCode(inputText);
+    const transformer = new BattleScriptToAST(options?.filePath || "-", inputText, options?.sourceResolver);
     return transformer.visit(tree, options);
 }
 function fromFullAstToSourceCode(ast, options = { includeMetaData: true }) {
@@ -39093,8 +39169,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 }) {
@@ -39112,8 +39186,7 @@ function fromSourceCodeToByteCode(source, options = { includeMetaData: true }) {
     if (typeof source === "string") {
         const parser = getParser(source);
         const tree = parser.root();
-        const transformer = new BattleScriptToAST(options?.filePath || "-", source);
-        transformer.sourceCode(source);
+        const transformer = new BattleScriptToAST(options?.filePath || "-", source, options?.sourceResolver);
         transformer.visit(tree, options);
     }
     // const transformer = new BattleScriptToByteCode();