circuitscript 0.1.7 → 0.1.9

package/dist/cjs/BaseVisitor.js

@@ -34,6 +34,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         ];
         this.onErrorHandler = null;
         this.importedFiles = [];
+        this.warnings = [];
         this.onImportFile = async (visitor, filePath, fileData, onErrorHandler) => {
             throw "Import file not implemented";
         };
@@ -329,7 +330,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             this.setResult(ctx, returnList);
         };
         this.visitImport_expr = (ctx) => {
-            throw new utils_js_1.RuntimeExecutionError("Cannot parse imports here", ctx.start, ctx.stop);
+            throw new utils_js_1.RuntimeExecutionError("Cannot parse imports here", ctx);
         };
         this.visitFunction_return_expr = (ctx) => {
             const executor = this.getExecutor();
@@ -378,7 +379,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         this.logger = new logger_js_1.Logger();
         this.onErrorHandler = onErrorHandler;
         this.environment = environment;
-        this.startingContext = new execute_js_1.ExecutionContext(globals_js_1.DoubleDelimiter1, `${globals_js_1.DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, null);
+        this.startingContext = new execute_js_1.ExecutionContext(globals_js_1.DoubleDelimiter1, `${globals_js_1.DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, this.warnings, null);
         const scope = this.startingContext.scope;
         scope.sequence.push([
             ExecutionScope_js_1.SequenceAction.At, scope.componentRoot, scope.currentPin
@@ -522,7 +523,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         }
         catch (err) {
             if (ctx != null) {
-                throw new utils_js_1.RuntimeExecutionError("An error occurred while importing file", ctx.start, ctx.stop);
+                throw new utils_js_1.RuntimeExecutionError("An error occurred while importing file", ctx);
             }
             else {
                 this.log('An error occurred while importing file:', err.message);
@@ -538,7 +539,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             }
         }
         if (errorMessage !== null && ctx) {
-            throw new utils_js_1.RuntimeExecutionError(errorMessage, ctx.start, ctx.end);
+            throw new utils_js_1.RuntimeExecutionError(errorMessage, ctx);
         }
         const newImportedFile = {
             id: name.trim(),
@@ -636,7 +637,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         const executionLevel = currentExecutionContext.executionLevel;
         const executionContextNamespace = currentExecutionContext.namespace
             + executionContextName + ".";
-        const newExecutor = new execute_js_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, parentContext);
+        const newExecutor = new execute_js_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, currentExecutionContext.warnings, parentContext);
         executionStack.push(newExecutor);
         this.setupDefinedParameters(funcDefinedParameters, passedInParameters, newExecutor);
         return newExecutor;
@@ -653,7 +654,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         }
         const result = validateFunction(value);
         if (!result) {
-            throw new utils_js_1.RuntimeExecutionError(`Invalid ${expectedType}`, context.start, context.stop);
+            throw new utils_js_1.RuntimeExecutionError(`Invalid ${expectedType}`, context);
         }
         return result;
     }

package/dist/cjs/draw_symbols.js

@@ -83,6 +83,9 @@ class SymbolGraphic {
     }
     pinPosition(id) {
         const pin = this.drawing.getPinPosition(id);
+        if (pin === null) {
+            throw new utils_js_1.RuntimeExecutionError(`Could not determine pin ${id} position`);
+        }
         const [x, y] = pin.start;
         const useX = (0, utils_js_1.roundValue)(x);
         const useY = (0, utils_js_1.roundValue)(y);

package/dist/cjs/execute.js

@@ -15,7 +15,7 @@ const helpers_js_1 = require("./helpers.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const utils_js_1 = require("./utils.js");
 class ExecutionContext {
-    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
+    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, warnings, parent) {
         this.tmpPointId = 0;
         this.resolveNet = null;
         this.stopFurtherExpressions = false;
@@ -23,6 +23,7 @@ class ExecutionContext {
         this.silent = false;
         this.__functionCache = {};
         this.componentAngleFollowsWire = true;
+        this.warnings = [];
         this.name = name;
         this.namespace = namespace;
         this.netNamespace = netNamespace;
@@ -34,6 +35,14 @@ class ExecutionContext {
         this.silent = silent;
         this.log('create new execution context', this.namespace, this.name, this.scope.indentLevel);
         this.parentContext = parent;
+        this.warnings = warnings;
+    }
+    logWarning(message, context, fileName) {
+        this.warnings.push({
+            message,
+            ctx: context,
+            fileName,
+        });
     }
     log(...params) {
         const indentOutput = ''.padStart(this.scope.indentLevel * 4, '    ');
@@ -120,7 +129,6 @@ class ExecutionContext {
         pins.forEach((pin) => {
             component.pins.set(pin.id, pin);
         });
-        component.arrangeProps = props.arrange ?? null;
         component.displayProp = props.display ?? null;
         component.widthProp = props.width ?? null;
         component.heightProp = props.height ?? null;
@@ -133,6 +141,33 @@ class ExecutionContext {
                 useAngle += 360;
             }
         }
+        if (props.display === null && props.arrange === null) {
+            const tmpArrangeLeft = [];
+            const tmpArrangeRight = [];
+            pins.forEach((pin, index) => {
+                const useArray = (index % 2 === 0) ? tmpArrangeLeft : tmpArrangeRight;
+                useArray.push((0, ParamDefinition_js_1.numeric)(pin.id));
+            });
+            const arrangeProp = new Map([
+                [globals_js_1.SymbolPinSide.Left, tmpArrangeLeft],
+                [globals_js_1.SymbolPinSide.Right, tmpArrangeRight]
+            ]);
+            props.arrange = arrangeProp;
+        }
+        if (props.arrange !== null) {
+            component.arrangeProps = this.removeArrangePropDuplicates(props.arrange);
+            const arrangePropPins = this.getArrangePropPins(component.arrangeProps).map(item => {
+                return item.toNumber();
+            });
+            pins.forEach(pin => {
+                if (arrangePropPins.indexOf(pin.id) === -1) {
+                    this.logWarning(`Pin ${pin.id} is not specified in arrange property`);
+                }
+            });
+        }
+        else {
+            component.arrangeProps = null;
+        }
         component.angleProp = useAngle ?? 0;
         component.followWireOrientationProp = props.followWireOrientation;
         const paramsMap = new Map();
@@ -176,6 +211,59 @@ class ExecutionContext {
         this.log('add symbol', instanceName, '[' + pinsOutput.join(', ') + ']');
         return component;
     }
+    removeArrangePropDuplicates(arrangeProp) {
+        const sides = [
+            globals_js_1.SymbolPinSide.Left,
+            globals_js_1.SymbolPinSide.Right,
+            globals_js_1.SymbolPinSide.Top,
+            globals_js_1.SymbolPinSide.Bottom
+        ];
+        const result = new Map();
+        const seenIds = [];
+        sides.forEach(side => {
+            let items = arrangeProp.get(side) ?? [];
+            if (!Array.isArray(items)) {
+                items = [items];
+            }
+            const uniqueItems = [];
+            items.forEach(item => {
+                if (item instanceof ParamDefinition_js_1.NumericValue) {
+                    if (seenIds.indexOf(item.toNumber()) === -1) {
+                        seenIds.push(item.toNumber());
+                        uniqueItems.push(item);
+                    }
+                    else {
+                        this.logWarning(`Pin ${item.toNumber()} specified more than once in arrange property`);
+                    }
+                }
+                else {
+                    uniqueItems.push(item);
+                }
+            });
+            result.set(side, uniqueItems);
+        });
+        return result;
+    }
+    getArrangePropPins(arrangeProps) {
+        const pins = [];
+        const sides = [
+            globals_js_1.SymbolPinSide.Left,
+            globals_js_1.SymbolPinSide.Right,
+            globals_js_1.SymbolPinSide.Top,
+            globals_js_1.SymbolPinSide.Bottom
+        ];
+        sides.forEach(side => {
+            const items = arrangeProps.get(side);
+            if (items) {
+                items.forEach(item => {
+                    if (item instanceof ParamDefinition_js_1.NumericValue) {
+                        pins.push(item);
+                    }
+                });
+            }
+        });
+        return pins;
+    }
     printPoint(extra = '') {
         let netString = globals_js_1.NoNetText;
         if (this.scope.currentComponent === null || this.scope.currentPin === null) {

package/dist/cjs/export.js

@@ -50,11 +50,6 @@ function generateKiCADNetList(netlist) {
             }
         }
         else {
-            if (instance.typeProp !== globals_js_1.ComponentTypes.net &&
-                instance.typeProp !== globals_js_1.ComponentTypes.graphic &&
-                instance.typeProp !== null) {
-                console.log('Skipping', instance.instanceName);
-            }
         }
     });
     const netItems = [];

package/dist/cjs/helpers.js

@@ -164,7 +164,21 @@ async function renderScript(scriptData, outputPath, options) {
             errors.push(error);
         }
         else if (error && error instanceof antlr4ng_1.RecognitionException) {
-            errors.push(new utils_js_1.ParseSyntaxError(message, context.start, context.stop));
+            if (context !== null) {
+                errors.push(new utils_js_1.ParseSyntaxError(message, context.start, context.stop));
+            }
+            else {
+                if (error.recognizer) {
+                    const recognizer = error.recognizer;
+                    errors.push(new utils_js_1.ParseSyntaxError(message, {
+                        line: recognizer.currentTokenStartLine,
+                        column: recognizer.currentTokenColumn
+                    }));
+                }
+                else {
+                    errors.push(new utils_js_1.ParseSyntaxError(message));
+                }
+            }
         }
         else {
             errors.push(new utils_js_1.ParseError(message, context.start, context.stop));
@@ -181,6 +195,7 @@ async function renderScript(scriptData, outputPath, options) {
     visitor.log('reading file');
     visitor.log('done reading file');
     const { tree, parser, parserTimeTaken, lexerTimeTaken } = await (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
+    (0, utils_js_1.printWarnings)(visitor.getWarnings());
     showStats && console.log('Lexing took:', lexerTimeTaken);
     showStats && console.log('Parsing took:', parserTimeTaken);
     if (dumpNets) {
@@ -224,7 +239,10 @@ async function renderScript(scriptData, outputPath, options) {
                 });
                 (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
                 console.log('Generated file', outputPath);
-                return null;
+                return {
+                    svgOutput: null,
+                    errors,
+                };
             }
             const layoutEngine = new layout_js_1.LayoutEngine();
             const layoutTimer = new utils_js_1.SimpleStopwatch();

package/dist/cjs/layout.js

@@ -1,11 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 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 = __importDefault(require("@dagrejs/graphlib"));
-const { Graph, alg } = graphlib_1.default;
+const graphlib_1 = __importStar(require("@dagrejs/graphlib"));
+const { 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");
@@ -35,7 +55,7 @@ class LayoutEngine {
         return "[" + value + "]" + padding;
     }
     runLayout(sequence, nets) {
-        const logNodesAndEdges = false;
+        const logNodesAndEdges = true;
         this.print('===== creating graph and populating with nodes =====');
         const { graph, containerFrames } = this.generateLayoutGraph(sequence, nets);
         this.print('===== done populating graph =====');
@@ -52,7 +72,7 @@ class LayoutEngine {
             this.print('===== graph nodes =====');
             const nodes = graph.nodes();
             nodes.forEach(node => {
-                this.print(node, graph.node(node));
+                this.print(`name:${node}, value:${graph.node(node)}`);
             });
             this.print('===== end nodes =====');
             this.print('');
@@ -610,8 +630,8 @@ class LayoutEngine {
     generateLayoutGraph(sequence, nets) {
         let previousNode = null;
         let previousPin = null;
-        const graph = new Graph({
-            directed: false,
+        const graph = new graphlib_1.Graph({
+            directed: true,
             compound: true,
         });
         this.print('sequence length:', sequence.length);
@@ -629,7 +649,7 @@ class LayoutEngine {
                     const tmpInstanceName = component.instanceName;
                     if (!graph.hasNode(tmpInstanceName)) {
                         this.print('create instance', tmpInstanceName);
-                        const { displayProp = null, widthProp = null, heightProp = null } = component;
+                        const { displayProp = null } = component;
                         let tmpSymbol;
                         if (displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
                             tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
@@ -645,26 +665,6 @@ class LayoutEngine {
                             }
                         }
                         applyComponentParamsToSymbol(component, tmpSymbol);
-                        if (component.parameters.has(globals_js_1.ParamKeys.angle)) {
-                            const value = component.parameters.get(globals_js_1.ParamKeys.angle).toNumber();
-                            tmpSymbol.angle = value;
-                        }
-                        if (component.parameters.has(globals_js_1.ParamKeys.flipX)) {
-                            tmpSymbol.flipX =
-                                component.parameters.get(globals_js_1.ParamKeys.flipX);
-                        }
-                        if (component.parameters.has(globals_js_1.ParamKeys.flipY)) {
-                            tmpSymbol.flipY =
-                                component.parameters.get(globals_js_1.ParamKeys.flipY);
-                        }
-                        if (tmpSymbol instanceof draw_symbols_js_1.SymbolCustom) {
-                            if (widthProp) {
-                                tmpSymbol.bodyWidth = (0, helpers_js_1.milsToMM)(widthProp);
-                            }
-                            if (heightProp) {
-                                tmpSymbol.bodyHeight = (0, helpers_js_1.milsToMM)(heightProp);
-                            }
-                        }
                         tmpSymbol.refreshDrawing();
                         const { width: useWidth, height: useHeight } = tmpSymbol.size();
                         tmpComponent = new RenderComponent(component, useWidth, useHeight);
@@ -770,7 +770,11 @@ class LayoutEngine {
         };
     }
     setGraphEdge(graph, node1, node2, edgeValue) {
+        if (!graph.isDirected && graph.hasEdge(node1, node2)) {
+            this.print(`Warning: edge already exists ${node1} ${node2}`);
+        }
         graph.setEdge(node1, node2, edgeValue);
+        this.print(`created edge: node1:${node1} node2:${node2} edgeValue:${edgeValue}`);
     }
     sizeSubGraphs(graph) {
         const subGraphs = alg.components(graph);
@@ -827,7 +831,6 @@ class LayoutEngine {
         this.placeSubgraphV2(graph, firstNodeId, subgraphEdges);
     }
     placeSubgraphV2(graph, firstNodeId, subgraphEdges) {
-        let firstNodePlaced = false;
         const originNodes = [];
         const originNodeGroups = new Map();
         function findOriginNode(node) {
@@ -853,14 +856,6 @@ class LayoutEngine {
             const [nodeId1, pin1, nodeId2, pin2] = graph.edge(edge);
             const [, node1] = graph.node(nodeId1);
             const [, node2] = graph.node(nodeId2);
-            if (nodeId1 === firstNodeId && !firstNodePlaced) {
-                this.print('first node placed at origin');
-                this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, pin1);
-                firstNodePlaced = true;
-                node1.isFloating = false;
-                originNodes.push(node1);
-                originNodeGroups.set(node1.toString(), [node1]);
-            }
             this.print('edge:', '[', node1, pin1, node1.isFloating, ']', '[', node2, pin2, node2.isFloating, ']');
             if (!node1.isFloating && node2.isFloating) {
                 fixedNode = node1;
@@ -938,6 +933,7 @@ class LayoutEngine {
                     this.print(`set wire auto end at: ${untilX} ${untilY}`);
                 }
             });
+            this.print('----');
         });
     }
     mergeOriginNodes(node1, pin1, node2, pin2, originNode1, originNode2, originNodes, originNodeGroups) {
@@ -1088,61 +1084,69 @@ function generateLayoutPinDefinition(component) {
     const pins = component.pins;
     const symbolPinDefinitions = [];
     const existingPinIds = Array.from(pins.keys());
-    if (component.arrangeProps === null) {
-        for (let i = 0; i < existingPinIds.length; i++) {
-            const pinPosition = Math.floor(i / 2);
-            const pin = pins.get(existingPinIds[i]);
-            symbolPinDefinitions.push({
-                side: (i % 2 === 0) ? globals_js_1.SymbolPinSide.Left : globals_js_1.SymbolPinSide.Right,
-                pinId: existingPinIds[i],
-                text: pin.name,
-                position: pinPosition,
-                pinType: pin.pinType,
-            });
+    const arrangeProps = component.arrangeProps ?? [];
+    const addedPins = [];
+    for (const [key, items] of arrangeProps) {
+        let useItems;
+        if (!Array.isArray(items)) {
+            useItems = [items];
         }
-    }
-    else {
-        const addedPins = [];
-        for (const [key, items] of component.arrangeProps) {
-            let useItems;
-            if (!Array.isArray(items)) {
-                useItems = [items];
-            }
-            else {
-                useItems = [...items];
-            }
-            useItems.forEach(pinId => {
-                if (pinId instanceof ParamDefinition_js_1.NumericValue) {
-                    const pinIdValue = pinId.toNumber();
-                    if (existingPinIds.indexOf(pinIdValue) !== -1) {
-                        const pin = pins.get(pinIdValue);
-                        symbolPinDefinitions.push({
-                            side: key,
-                            pinId: pinIdValue,
-                            text: pin.name,
-                            position: pin.position,
-                            pinType: pin.pinType,
-                        });
-                        addedPins.push(pinIdValue);
-                    }
-                }
-            });
+        else {
+            useItems = [...items];
         }
-        const unplacedPins = existingPinIds.filter(pinId => {
-            return addedPins.indexOf(pinId) === -1;
+        useItems.forEach(pinId => {
+            if (pinId instanceof ParamDefinition_js_1.NumericValue) {
+                const pinIdValue = pinId.toNumber();
+                if (existingPinIds.indexOf(pinIdValue) !== -1) {
+                    const pin = pins.get(pinIdValue);
+                    symbolPinDefinitions.push({
+                        side: key,
+                        pinId: pinIdValue,
+                        text: pin.name,
+                        position: pin.position,
+                        pinType: pin.pinType,
+                    });
+                    addedPins.push(pinIdValue);
+                }
+            }
         });
-        if (unplacedPins.length > 0) {
-            throw "'arrange' property is defined, but not all pins are specified: " + unplacedPins.join(",");
-        }
+    }
+    const unplacedPins = existingPinIds.filter(pinId => {
+        return addedPins.indexOf(pinId) === -1;
+    });
+    if (unplacedPins.length > 0) {
+        component._unplacedPins = unplacedPins;
+        console.warn("Warning: There are unplaced pins: " + unplacedPins);
     }
     return symbolPinDefinitions;
 }
 function applyComponentParamsToSymbol(component, symbol) {
+    const { widthProp = null, heightProp = null } = component;
     const newMap = new Map(component.parameters);
     if (!newMap.has('refdes')) {
         newMap.set('refdes', component.assignedRefDes ?? "?");
     }
     symbol.drawing.variables = newMap;
+    if (component.parameters.has(globals_js_1.ParamKeys.angle)) {
+        const value = component.parameters.get(globals_js_1.ParamKeys.angle).toNumber();
+        symbol.angle = value;
+    }
+    if (component.parameters.has(globals_js_1.ParamKeys.flipX)) {
+        symbol.flipX =
+            component.parameters.get(globals_js_1.ParamKeys.flipX);
+    }
+    if (component.parameters.has(globals_js_1.ParamKeys.flipY)) {
+        symbol.flipY =
+            component.parameters.get(globals_js_1.ParamKeys.flipY);
+    }
+    if (symbol instanceof draw_symbols_js_1.SymbolCustom) {
+        if (widthProp) {
+            symbol.bodyWidth = (0, helpers_js_1.milsToMM)(widthProp);
+        }
+        if (heightProp) {
+            symbol.bodyHeight = (0, helpers_js_1.milsToMM)(heightProp);
+        }
+    }
 }
 exports.applyComponentParamsToSymbol = applyComponentParamsToSymbol;
 function calculateSymbolAngle(symbol, pin, direction) {
@@ -1469,7 +1473,9 @@ function CalculatePinPositions(component) {
     tmpSymbol.refreshDrawing();
     const pins = component.pins;
     pins.forEach((value, key) => {
-        pinPositionMapping.set(key, tmpSymbol.pinPosition(key));
+        if (component._unplacedPins.indexOf(key) === -1) {
+            pinPositionMapping.set(key, tmpSymbol.pinPosition(key));
+        }
     });
     return pinPositionMapping;
 }

package/dist/cjs/objects/ClassComponent.js

@@ -14,6 +14,7 @@ class ClassComponent {
         this.pinsMaxPositions = new Map();
         this._copyID = null;
         this._copyFrom = null;
+        this._unplacedPins = [];
         this.arrangeProps = null;
         this.displayProp = null;
         this.widthProp = null;

package/dist/cjs/objects/ExecutionScope.js

@@ -132,12 +132,13 @@ class ExecutionScope {
     exitContext() {
         return this.contextStack.pop();
     }
-    findPropertyKeyTree() {
+    findPropertyKeyTree(visitor) {
         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()]);
+                const result = visitor.visitResult(ctx);
+                keyNames.push([ctx, result]);
             }
             else if (typeof ctx === 'number') {
                 keyNames.push(['index', ctx]);
@@ -151,9 +152,9 @@ class ExecutionScope {
     popOnPropertyHandler() {
         return this.onPropertyHandler.pop();
     }
-    triggerPropertyHandler(value, valueCtx) {
+    triggerPropertyHandler(visitor, value, valueCtx) {
         const lastHandler = this.onPropertyHandler[this.onPropertyHandler.length - 1];
-        const propertyTree = this.findPropertyKeyTree();
+        const propertyTree = this.findPropertyKeyTree(visitor);
         lastHandler && lastHandler(propertyTree, value, valueCtx);
     }
 }

package/dist/cjs/regenerate-tests.js

@@ -10,7 +10,7 @@ const mainDir = './__tests__/renderData/';
 const env = new environment_js_1.NodeScriptEnvironment();
 environment_js_1.NodeScriptEnvironment.setInstance(env);
 async function regenerateTests(extra = "") {
-    env.prepareSVGEnvironment();
+    await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs_1.default.readdirSync(mainDir);
     files.forEach(file => {
@@ -18,19 +18,20 @@ async function regenerateTests(extra = "") {
             cstFiles.push(file);
         }
     });
-    cstFiles.forEach(file => {
+    for (let i = 0; i < cstFiles.length; i++) {
+        const file = cstFiles[i];
         const inputPath = mainDir + file;
         const scriptData = fs_1.default.readFileSync(inputPath, { encoding: 'utf-8' });
         const outputPath = mainDir + 'svgs/' + file + extra + '.svg';
         env.setModuleDirectory(mainDir);
-        (0, helpers_js_1.renderScript)(scriptData, outputPath, {
+        env.setDefaultLibsPath(mainDir + '../../libs/');
+        await (0, helpers_js_1.renderScript)(scriptData, outputPath, {
             dumpNets: false,
             dumpData: false,
             showStats: false,
             environment: env,
         });
-        console.log('generated ', outputPath);
-    });
+    }
     return cstFiles;
 }
 (async () => {