circuitscript 0.1.5 → 0.1.7

package/dist/cjs/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPaperSize = exports.isSupportedPaperSize = exports.PaperGridReferences = exports.pxToMM = exports.milsToMM = exports.UnitDimension = exports.getPackageVersion = exports.getDefaultLibsPath = exports.getFontsPath = exports.getCurrentPath = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.getScriptText = exports.prepareFile = exports.JSModuleType = void 0;
+exports.getPaperSize = exports.isSupportedPaperSize = exports.PaperGridReferences = exports.pxToMM = exports.milsToMM = exports.UnitDimension = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.prepareFile = exports.JSModuleType = void 0;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const pdfkit_1 = __importDefault(require("pdfkit"));
@@ -13,8 +13,8 @@ const parser_js_1 = require("./parser.js");
 const render_js_1 = require("./render.js");
 const utils_js_1 = require("./utils.js");
 const visitor_js_1 = require("./visitor.js");
-const this_file_1 = require("this-file");
-const SymbolValidatorVisitor_js_1 = require("./SymbolValidatorVisitor.js");
+const SymbolValidatorVisitor_js_1 = require("./validate/SymbolValidatorVisitor.js");
+const SymbolValidatorResolveVisitor_js_1 = require("./validate/SymbolValidatorResolveVisitor.js");
 const antlr4ng_1 = require("antlr4ng");
 const lexer_js_1 = require("./lexer.js");
 const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
@@ -44,22 +44,12 @@ function prepareFile(textData) {
     };
 }
 exports.prepareFile = prepareFile;
-function getScriptText(filePath) {
-    try {
-        return (0, fs_1.readFileSync)(filePath, { encoding: 'utf-8' });
-    }
-    catch (err) {
-        return null;
-    }
-}
-exports.getScriptText = getScriptText;
-function getSemanticTokens(scriptData, options) {
+async function getSemanticTokens(scriptData, options) {
     const { parser, lexer, tokens } = prepareFile(scriptData);
     const tree = parser.script();
-    const { currentDirectory = null, defaultLibsPath, } = options;
-    const visitor = new SemanticTokenVisitor_js_1.SemanticTokensVisitor(true, null, currentDirectory, defaultLibsPath, lexer, scriptData);
+    const visitor = new SemanticTokenVisitor_js_1.SemanticTokensVisitor(true, null, options.environment, lexer, scriptData);
     parser.removeErrorListeners();
-    visitor.onImportFile = (visitor, textData) => {
+    visitor.onImportFile = async (visitor, filePath, textData) => {
         let hasError = false;
         let hasParseError = false;
         if (textData !== null) {
@@ -72,6 +62,7 @@ function getSemanticTokens(scriptData, options) {
                 console.log('Error while parsing: ', err);
                 hasParseError = true;
                 hasError = true;
+                throw new utils_js_1.ParseError(`Error parsing semantic tokens in imported file: ${err}`);
             }
         }
         else {
@@ -82,7 +73,7 @@ function getSemanticTokens(scriptData, options) {
             hasError, hasParseError
         };
     };
-    visitor.visit(tree);
+    await visitor.visitAsync(tree);
     const semanticTokens = visitor.getTokens();
     const parsedTokens = (0, SemanticTokenVisitor_js_1.prepareTokens)(tokens.getTokens(), lexer, scriptData);
     const finalParsedTokens = [];
@@ -120,27 +111,30 @@ class ParseErrorStrategy extends antlr4ng_1.DefaultErrorStrategy {
     }
 }
 exports.ParseErrorStrategy = ParseErrorStrategy;
-function validateScript(scriptData, options) {
+async function validateScript(filePath, scriptData, options) {
     const { parser } = prepareFile(scriptData);
     parser.removeErrorListeners();
     parser.errorHandler = new ParseErrorStrategy();
     parser.addErrorListener(new TokenErrorListener());
     const tree = parser.script();
-    const { currentDirectory = null, defaultLibsPath, } = options;
-    const visitor = new SymbolValidatorVisitor_js_1.SymbolValidatorVisitor(true, null, currentDirectory, defaultLibsPath);
-    visitor.onImportFile = (visitor, textData) => {
+    const visitor = new SymbolValidatorVisitor_js_1.SymbolValidatorVisitor(true, null, options.environment);
+    visitor.enterFile(filePath);
+    visitor.onImportFile = async (visitor, filePath, textData) => {
+        visitor.enterFile(filePath);
         let hasError = false;
         let hasParseError = false;
         if (textData !== null) {
             const { parser } = prepareFile(textData);
             const tree = parser.script();
             try {
-                visitor.visit(tree);
+                await visitor.visitAsync(tree);
+                visitor.exitFile();
             }
             catch (err) {
                 console.log('got an error while parsing tree: ', err);
                 hasParseError = true;
                 hasError = true;
+                throw new utils_js_1.ParseError(`Error parsing validation in imported file: ${err}`);
             }
         }
         else {
@@ -151,120 +145,160 @@ function validateScript(scriptData, options) {
             hasError, hasParseError
         };
     };
-    visitor.visit(tree);
+    await visitor.visitAsync(tree);
     const symbolTable = visitor.getSymbols();
     symbolTable.clearUndefined();
-    const visitorResolver = new SymbolValidatorVisitor_js_1.SymbolValidatorResolveVisitor(true, null, currentDirectory, defaultLibsPath);
+    const visitorResolver = new SymbolValidatorResolveVisitor_js_1.SymbolValidatorResolveVisitor(true, null, options.environment);
+    visitorResolver.enterFile(filePath);
     visitorResolver.setSymbols(visitor.getSymbols());
     visitorResolver.onImportFile = visitor.onImportFile;
-    visitorResolver.visit(tree);
+    await visitorResolver.visitAsync(tree);
     return visitorResolver;
 }
 exports.validateScript = validateScript;
-function renderScript(scriptData, outputPath, options) {
-    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, showStats = false } = options;
-    const onErrorHandler = (line, column, message, error) => {
-        if (error instanceof visitor_js_1.VisitorExecutionException) {
-            console.log('Error', line, column, message, error.errorMessage);
+async function renderScript(scriptData, outputPath, options) {
+    const { dumpNets = false, dumpData = false, showStats = false, environment } = options;
+    const errors = [];
+    const onErrorHandler = (message, context, error) => {
+        if (error && error instanceof utils_js_1.RuntimeExecutionError) {
+            errors.push(error);
+        }
+        else if (error && error instanceof antlr4ng_1.RecognitionException) {
+            errors.push(new utils_js_1.ParseSyntaxError(message, context.start, context.stop));
+        }
+        else {
+            errors.push(new utils_js_1.ParseError(message, context.start, context.stop));
         }
     };
-    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, currentDirectory, defaultLibsPath);
-    visitor.onImportFile = (visitor, fileData) => {
-        const { hasError, hasParseError } = (0, parser_js_1.parseFileWithVisitor)(visitor, fileData);
+    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, options.environment);
+    visitor.onImportFile = async (visitor, filePath, fileData) => {
+        const { hasError, hasParseError } = await (0, parser_js_1.parseFileWithVisitor)(visitor, fileData);
+        if (hasError || hasParseError) {
+            throw new utils_js_1.ParseError(`Error parsing imported file: ${filePath}`, undefined, undefined, filePath);
+        }
         return { hasError, hasParseError };
     };
     visitor.log('reading file');
     visitor.log('done reading file');
-    const { tree, parser, hasParseError, hasError, parserTimeTaken, lexerTimeTaken } = (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
+    const { tree, parser, parserTimeTaken, lexerTimeTaken } = await (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
     showStats && console.log('Lexing took:', lexerTimeTaken);
     showStats && console.log('Parsing took:', parserTimeTaken);
     if (dumpNets) {
         const nets = visitor.dumpNets();
         nets.forEach(item => console.log(item.join(" | ")));
     }
-    const dumpDirectory = currentDirectory + '/dump/';
+    const dumpDirectory = environment.getRelativeToModule('/dump/');
     if (dumpData) {
+        console.log('Dump data to:', dumpDirectory);
         if (!(0, fs_1.existsSync)(dumpDirectory)) {
             (0, fs_1.mkdirSync)(dumpDirectory);
         }
     }
     dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
     dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
-    if (hasError || hasParseError) {
-        console.log('Error while parsing');
-        return null;
-    }
-    const { frameComponent } = visitor.applySheetFrameComponent();
-    try {
-        visitor.annotateComponents();
-    }
-    catch (err) {
-        console.log('Error during annotation: ', err);
-    }
-    const { sequence, nets } = visitor.getGraph();
-    const tmpSequence = (0, utils_js_1.generateDebugSequenceAction)(sequence).map(item => (0, utils_js_1.sequenceActionString)(item));
-    dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = "";
-    try {
-        let fileExtension = null;
-        let outputDefaultZoom = globals_js_1.defaultZoomScale;
-        if (outputPath) {
-            fileExtension = path_1.default.extname(outputPath).substring(1);
-            if (fileExtension === "pdf") {
-                outputDefaultZoom = 1;
-            }
+    if (errors.length === 0) {
+        const { frameComponent } = visitor.applySheetFrameComponent();
+        try {
+            visitor.annotateComponents();
         }
-        if (fileExtension === 'net') {
-            const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
-            missingFootprints.forEach(entry => {
-                console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
-            });
-            (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
-            console.log('Generated file', outputPath);
-            return null;
+        catch (err) {
+            throw new utils_js_1.RenderError(`Error during component annotation: ${err}`, 'annotation');
         }
-        const layoutEngine = new layout_js_1.LayoutEngine();
-        const layoutTimer = new utils_js_1.SimpleStopwatch();
-        const sheetFrames = layoutEngine.runLayout(sequence, nets);
-        layoutEngine.printWarnings();
-        showStats && console.log('Layout took:', layoutTimer.lap());
-        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
-        const generateSvgTimer = new utils_js_1.SimpleStopwatch();
-        const renderLogger = new logger_js_1.Logger();
-        const svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger);
-        showStats && console.log('Render took:', generateSvgTimer.lap());
-        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-render.txt', renderLogger.dump());
-        svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
-        if (outputPath) {
-            if (fileExtension === 'svg') {
-                (0, fs_1.writeFileSync)(outputPath, svgOutput);
-            }
-            else if (fileExtension === 'pdf') {
-                let sheetSize = "A4";
-                let sheetSizeDefined = false;
-                if (frameComponent) {
-                    sheetSize = frameComponent.getParam(Frame_js_1.FrameParamKeys.PaperSize);
-                    sheetSizeDefined = true;
+        const { sequence, nets } = visitor.getGraph();
+        const tmpSequence = (0, utils_js_1.generateDebugSequenceAction)(sequence).map(item => (0, utils_js_1.sequenceActionString)(item));
+        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
+        try {
+            let fileExtension = null;
+            let outputDefaultZoom = globals_js_1.defaultZoomScale;
+            if (outputPath) {
+                fileExtension = path_1.default.extname(outputPath).substring(1);
+                if (fileExtension === "pdf") {
+                    outputDefaultZoom = 1;
                 }
-                const doc = new pdfkit_1.default({
-                    layout: 'landscape',
-                    size: sheetSize
+            }
+            if (fileExtension === 'net') {
+                const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
+                missingFootprints.forEach(entry => {
+                    console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
                 });
-                const outputStream = (0, fs_1.createWriteStream)(outputPath);
-                (0, render_js_1.generatePdfOutput)(doc, svgCanvas, sheetSize, sheetSizeDefined, outputDefaultZoom);
-                doc.pipe(outputStream);
-                doc.end();
+                (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
+                console.log('Generated file', outputPath);
+                return null;
+            }
+            const layoutEngine = new layout_js_1.LayoutEngine();
+            const layoutTimer = new utils_js_1.SimpleStopwatch();
+            let sheetFrames;
+            try {
+                sheetFrames = layoutEngine.runLayout(sequence, nets);
+            }
+            catch (err) {
+                throw new utils_js_1.RenderError(`Error during layout generation: ${err}`, 'layout');
+            }
+            layoutEngine.printWarnings();
+            showStats && console.log('Layout took:', layoutTimer.lap());
+            dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
+            const generateSvgTimer = new utils_js_1.SimpleStopwatch();
+            const renderLogger = new logger_js_1.Logger();
+            let svgCanvas;
+            try {
+                svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger);
+            }
+            catch (err) {
+                throw new utils_js_1.RenderError(`Error during SVG generation: ${err}`, 'svg_generation');
+            }
+            showStats && console.log('Render took:', generateSvgTimer.lap());
+            dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-render.txt', renderLogger.dump());
+            try {
+                svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
             }
-            else {
-                throw "Invalid output format";
+            catch (err) {
+                throw new utils_js_1.RenderError(`Error generating SVG output: ${err}`, 'svg_output');
+            }
+            if (outputPath) {
+                if (fileExtension === 'svg') {
+                    try {
+                        (0, fs_1.writeFileSync)(outputPath, svgOutput);
+                    }
+                    catch (err) {
+                        throw new utils_js_1.RenderError(`Error writing SVG file: ${err}`, 'file_output');
+                    }
+                }
+                else if (fileExtension === 'pdf') {
+                    let sheetSize = "A4";
+                    let sheetSizeDefined = false;
+                    if (frameComponent) {
+                        sheetSize = frameComponent.getParam(Frame_js_1.FrameParamKeys.PaperSize);
+                        sheetSizeDefined = true;
+                    }
+                    try {
+                        const doc = new pdfkit_1.default({
+                            layout: 'landscape',
+                            size: sheetSize
+                        });
+                        const outputStream = (0, fs_1.createWriteStream)(outputPath);
+                        (0, render_js_1.generatePdfOutput)(doc, svgCanvas, sheetSize, sheetSizeDefined, outputDefaultZoom);
+                        doc.pipe(outputStream);
+                        doc.end();
+                    }
+                    catch (err) {
+                        throw new utils_js_1.RenderError(`Error generating PDF file: ${err}`, 'pdf_output');
+                    }
+                }
+                else {
+                    throw new utils_js_1.RenderError(`Invalid output format: ${fileExtension}`, 'file_output');
+                }
+                console.log('Generated file', outputPath);
             }
-            console.log('Generated file', outputPath);
+        }
+        catch (err) {
+            throw new utils_js_1.RenderError(`Error during rendering: ${err}`, 'output_generation');
         }
     }
-    catch (err) {
-        console.log('Error during render: ', err);
-    }
-    return svgOutput;
+    return {
+        svgOutput,
+        errors
+    };
 }
 exports.renderScript = renderScript;
 function detectJSModuleType() {
@@ -277,32 +311,6 @@ function detectJSModuleType() {
     }
 }
 exports.detectJSModuleType = detectJSModuleType;
-const context = (0, this_file_1.createContext)();
-function getCurrentPath() {
-    const filename = context.filename;
-    return { filePath: filename };
-}
-exports.getCurrentPath = getCurrentPath;
-function getToolsPath() {
-    const { filePath } = getCurrentPath();
-    return path_1.default.normalize(path_1.default.dirname(filePath) + '/../../');
-}
-function getFontsPath() {
-    const toolsPath = getToolsPath();
-    return path_1.default.normalize(toolsPath + "fonts");
-}
-exports.getFontsPath = getFontsPath;
-function getDefaultLibsPath() {
-    const toolsPath = getToolsPath();
-    return path_1.default.normalize(toolsPath + "libs");
-}
-exports.getDefaultLibsPath = getDefaultLibsPath;
-function getPackageVersion() {
-    const packageJson = JSON.parse((0, fs_1.readFileSync)(getToolsPath() + 'package.json').toString());
-    const { version } = packageJson;
-    return version;
-}
-exports.getPackageVersion = getPackageVersion;
 class UnitDimension {
     constructor(value, type = globals_js_1.LengthUnit.mils) {
         this.value = value;

package/dist/cjs/index.js

@@ -29,3 +29,8 @@ __exportStar(require("./utils.js"), exports);
 __exportStar(require("./visitor.js"), exports);
 __exportStar(require("./sizing.js"), exports);
 __exportStar(require("./objects/types.js"), exports);
+__exportStar(require("./builtinMethods.js"), exports);
+__exportStar(require("./validate/SymbolTable.js"), exports);
+__exportStar(require("./validate/SymbolValidatorResolveVisitor.js"), exports);
+__exportStar(require("./validate/SymbolValidatorVisitor.js"), exports);
+__exportStar(require("./environment.js"), exports);

package/dist/cjs/layout.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.applyComponentParamsToSymbol = exports.LayoutEngine = void 0;
-const graphlib_1 = require("@dagrejs/graphlib");
+const graphlib_1 = __importDefault(require("@dagrejs/graphlib"));
+const { Graph, alg } = graphlib_1.default;
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const globals_js_1 = require("./globals.js");
@@ -111,6 +115,7 @@ class LayoutEngine {
     findJunctions(wireGroups) {
         const junctions = [];
         const mergedWires = [];
+        const debugSegments = false;
         for (const [key, wires] of wireGroups) {
             const allLines = wires.map(wire => {
                 return wire.points.map(pt => {
@@ -120,15 +125,35 @@ class LayoutEngine {
                     };
                 });
             });
-            const { intersectPoints, segments } = geometry_js_1.Geometry.mergeWires(allLines);
-            mergedWires.push({
-                netName: key,
-                segments,
-                intersectPoints,
-            });
-            intersectPoints.forEach(([x, y]) => {
-                junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y)));
-            });
+            if (debugSegments) {
+                const tmpSegments = [];
+                allLines.forEach(wire => {
+                    for (let i = 1; i < wire.length; i++) {
+                        const pt1 = wire[i - 1];
+                        const pt2 = wire[i];
+                        tmpSegments.push([
+                            [pt1.x.toNumber(), pt1.y.toNumber()],
+                            [pt2.x.toNumber(), pt2.y.toNumber()],
+                        ]);
+                    }
+                });
+                mergedWires.push({
+                    netName: key,
+                    segments: tmpSegments,
+                    intersectPoints: [],
+                });
+            }
+            else {
+                const { intersectPoints, segments } = geometry_js_1.Geometry.mergeWires(allLines);
+                mergedWires.push({
+                    netName: key,
+                    segments,
+                    intersectPoints,
+                });
+                intersectPoints.forEach(([x, y]) => {
+                    junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y)));
+                });
+            }
         }
         return {
             junctions,
@@ -585,7 +610,7 @@ class LayoutEngine {
     generateLayoutGraph(sequence, nets) {
         let previousNode = null;
         let previousPin = null;
-        const graph = new graphlib_1.Graph({
+        const graph = new Graph({
             directed: false,
             compound: true,
         });
@@ -748,7 +773,7 @@ class LayoutEngine {
         graph.setEdge(node1, node2, edgeValue);
     }
     sizeSubGraphs(graph) {
-        const subGraphs = graphlib_1.alg.components(graph);
+        const subGraphs = alg.components(graph);
         const subGraphsStarts = [];
         this.print('===== placing subgraphs =====');
         this.print('number of subgraphs: ', subGraphs.length);

package/dist/cjs/main.js

@@ -6,14 +6,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const figlet_1 = __importDefault(require("figlet"));
-const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
-const sizing_js_1 = require("./sizing.js");
 const helpers_js_1 = require("./helpers.js");
+const environment_js_1 = require("./environment.js");
 async function main() {
-    const fontsPath = (0, helpers_js_1.getFontsPath)();
-    const defaultLibsPath = (0, helpers_js_1.getDefaultLibsPath)();
-    const version = (0, helpers_js_1.getPackageVersion)();
+    const env = new environment_js_1.NodeScriptEnvironment();
+    environment_js_1.NodeScriptEnvironment.setInstance(env);
+    const version = env.getPackageVersion();
     commander_1.program
         .description('generate graphical output from circuitscript files')
         .version(version)
@@ -38,11 +37,13 @@ async function main() {
     const watchFileChanges = options.watch;
     const dumpNets = options.dumpNets;
     const dumpData = options.dumpData;
-    let currentDirectory = options.currentDirectory ?? null;
+    if (options.currentDirectory) {
+        throw "Parameter not supported yet";
+    }
     if (watchFileChanges) {
         console.log('watching for file changes...');
     }
-    await (0, sizing_js_1.prepareSVGEnvironment)(fontsPath);
+    await env.prepareSVGEnvironment();
     let inputFilePath = "";
     if (args.length > 2) {
         console.log("Error: Extra arguments passed");
@@ -51,11 +52,8 @@ async function main() {
     let scriptData;
     if (args.length > 0 && args[0]) {
         inputFilePath = args[0];
-        if ((0, fs_1.existsSync)(inputFilePath)) {
-            scriptData = (0, fs_1.readFileSync)(inputFilePath, { encoding: 'utf-8' });
-            if (currentDirectory === null) {
-                currentDirectory = path_1.default.dirname(inputFilePath);
-            }
+        if ((await env.exists(inputFilePath))) {
+            scriptData = await env.readFile(inputFilePath, { encoding: 'utf-8' });
         }
         else {
             console.error("Error: File could not be found");
@@ -70,29 +68,43 @@ async function main() {
         return;
     }
     const scriptOptions = {
-        currentDirectory,
-        defaultLibsPath,
         dumpNets,
         dumpData,
         showStats: options.stats,
+        environment: env,
     };
     let outputPath = null;
     if (args.length > 0 && args[1]) {
         outputPath = args[1];
     }
-    const output = (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
+    const output = await parseFile(scriptData, outputPath, scriptOptions);
     if (outputPath === null && output && (options.skipOutput === undefined)) {
         console.log(output);
     }
     if (watchFileChanges) {
-        (0, fs_1.watch)(inputFilePath, event => {
+        (0, fs_1.watch)(inputFilePath, async (event) => {
             if (event === 'change') {
-                const scriptData = (0, fs_1.readFileSync)(inputFilePath, { encoding: 'utf-8' });
-                (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
-                console.log('done');
+                const scriptData = await env.readFile(inputFilePath, { encoding: 'utf-8' });
+                parseFile(scriptData, outputPath, scriptOptions);
             }
         });
     }
 }
 exports.default = main;
+async function parseFile(scriptData, outputPath, scriptOptions) {
+    try {
+        const { svgOutput: output, errors } = await (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
+        errors.forEach((err, index) => {
+            console.log(`[${index}] ${err}`);
+        });
+        if (errors.length > 0) {
+            console.log('Render failed due to syntax or parsing errors');
+        }
+        return output;
+    }
+    catch (error) {
+        console.error(`Unexpected Error: ${error}`);
+    }
+    return null;
+}
 main();

package/dist/cjs/objects/ExecutionScope.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActiveObject = exports.FrameAction = exports.SequenceAction = exports.ExecutionScope = void 0;
+const CircuitScriptParser_js_1 = require("../antlr/CircuitScriptParser.js");
 class ExecutionScope {
     constructor(scopeId) {
         this.nets = [];
@@ -9,6 +10,8 @@ class ExecutionScope {
         this.variables = new Map();
         this.symbols = new Map();
         this.blockStack = new Map();
+        this.contextStack = [];
+        this.onPropertyHandler = [];
         this.breakStack = [];
         this.wires = [];
         this.frames = [];
@@ -123,6 +126,36 @@ class ExecutionScope {
             this.currentPin = null;
         }
     }
+    enterContext(context) {
+        this.contextStack.push(context);
+    }
+    exitContext() {
+        return this.contextStack.pop();
+    }
+    findPropertyKeyTree() {
+        const keyNames = [];
+        for (let i = this.contextStack.length - 1; i >= 0; i--) {
+            const ctx = this.contextStack[i];
+            if (ctx instanceof CircuitScriptParser_js_1.Property_key_exprContext) {
+                keyNames.push([ctx, ctx.getText()]);
+            }
+            else if (typeof ctx === 'number') {
+                keyNames.push(['index', ctx]);
+            }
+        }
+        return keyNames.reverse();
+    }
+    setOnPropertyHandler(handler) {
+        this.onPropertyHandler.push(handler);
+    }
+    popOnPropertyHandler() {
+        return this.onPropertyHandler.pop();
+    }
+    triggerPropertyHandler(value, valueCtx) {
+        const lastHandler = this.onPropertyHandler[this.onPropertyHandler.length - 1];
+        const propertyTree = this.findPropertyKeyTree();
+        lastHandler && lastHandler(propertyTree, value, valueCtx);
+    }
 }
 exports.ExecutionScope = ExecutionScope;
 ExecutionScope.scopeId = 0;