circuitscript 0.1.14 → 0.1.16

package/dist/cjs/layout.js

@@ -1,46 +1,25 @@
 "use strict";
-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;
+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 = __importStar(require("@dagrejs/graphlib"));
+const graphlib_1 = __importDefault(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");
 const geometry_js_1 = require("./geometry.js");
-const logger_js_1 = require("./logger.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const utils_js_1 = require("./utils.js");
 const types_js_1 = require("./objects/types.js");
 const helpers_js_1 = require("./helpers.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const graph_js_1 = require("./graph.js");
 class LayoutEngine {
-    constructor(options = { showBaseFrame: false }) {
+    constructor(logger, options = { showBaseFrame: false }) {
         this.layoutWarnings = [];
         this.showBaseFrame = false;
-        this.logger = new logger_js_1.Logger();
+        this.logger = logger;
         const { showBaseFrame = false } = options ?? {};
         this.showBaseFrame = showBaseFrame;
     }
@@ -54,30 +33,8 @@ class LayoutEngine {
         const padding = ''.padStart(value * 4, ' ');
         return "[" + value + "]" + padding;
     }
-    runLayout(sequence, nets) {
-        const logNodesAndEdges = true;
+    runLayout(graph, containerFrames, nets) {
         const renderNets = this.collectRenderNets(nets);
-        this.print('===== creating graph and populating with nodes =====');
-        const { graph, containerFrames } = this.generateLayoutGraph(sequence, nets);
-        this.print('===== done populating graph =====');
-        this.print('');
-        if (logNodesAndEdges) {
-            this.print('===== graph edges =====');
-            const allEdges = graph.edges();
-            allEdges.forEach(edge => {
-                const [nodeId1, pin1, nodeId2, pin2] = graph.edge(edge);
-                this.print(nodeId1, 'pin', pin1, '-----', nodeId2, 'pin', pin2);
-            });
-            this.print('===== end edges =====');
-            this.print();
-            this.print('===== graph nodes =====');
-            const nodes = graph.nodes();
-            nodes.forEach(node => {
-                this.print(`name:${node}, value:${graph.node(node)}`);
-            });
-            this.print('===== end nodes =====');
-            this.print('');
-        }
         const subgraphInfo = this.sizeSubGraphs(graph);
         const dumpSubgraphInfo = true;
         if (dumpSubgraphInfo) {
@@ -137,8 +94,19 @@ class LayoutEngine {
                 const value = net.params.get(globals_js_1.NetGraphicsParams.LineWidth);
                 renderNet.lineWidth = (0, helpers_js_1.milsToMM)(value).toNumber();
             }
-            if (net.params.has(globals_js_1.NetGraphicsParams.Highight)) {
-                renderNet.highlight = net.params.get(globals_js_1.NetGraphicsParams.Highight);
+            if (net.params.has(globals_js_1.NetGraphicsParams.Highlight)) {
+                renderNet.highlight =
+                    net.params.get(globals_js_1.NetGraphicsParams.Highlight);
+            }
+            if (net.params.has(globals_js_1.NetGraphicsParams.HighlightWidth)) {
+                renderNet.highlightWidth =
+                    (0, helpers_js_1.milsToMM)(net.params.get(globals_js_1.NetGraphicsParams.HighlightWidth))
+                        .toNumber();
+            }
+            if (net.params.has(globals_js_1.NetGraphicsParams.HighlightOpacity)) {
+                renderNet.highlightOpacity =
+                    net.params.get(globals_js_1.NetGraphicsParams.HighlightOpacity)
+                        .toNumber();
             }
             renderNets.set(net.toString(), renderNet);
         });
@@ -192,12 +160,13 @@ class LayoutEngine {
                 });
             }
             else {
-                const { intersectPoints, segments } = geometry_js_1.Geometry.mergeWires(allLines);
+                const { intersectPoints, segments, lines } = geometry_js_1.Geometry.mergeWires(allLines);
                 mergedWires.push({
                     netName: netName,
                     segments,
                     intersectPoints,
                     net: renderNet,
+                    lines,
                 });
                 intersectPoints.forEach(([x, y]) => {
                     junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y), renderNet));
@@ -572,7 +541,7 @@ class LayoutEngine {
                         return item.component.instanceName;
                     }
                     else if (item instanceof RenderWire) {
-                        return getWireName(item.id);
+                        return (0, graph_js_1.getWireName)(item.id);
                     }
                     return null;
                 }));
@@ -656,158 +625,6 @@ class LayoutEngine {
             }
         }
     }
-    generateLayoutGraph(sequence, nets) {
-        let previousNode = null;
-        let previousPin = null;
-        const graph = new graphlib_1.Graph({
-            directed: true,
-            compound: true,
-        });
-        this.print('sequence length:', sequence.length);
-        const baseFrame = new RenderFrame(new Frame_js_1.Frame(Frame_js_1.FixedFrameIds.BaseFrame));
-        const frameStack = [baseFrame];
-        const containerFrames = [baseFrame];
-        sequence.forEach((sequenceStep, index) => {
-            const action = sequenceStep[0];
-            let tmpComponent;
-            switch (action) {
-                case ExecutionScope_js_1.SequenceAction.To:
-                case ExecutionScope_js_1.SequenceAction.At: {
-                    this.print(...sequenceStep);
-                    const [, component, pin] = sequenceStep;
-                    const tmpInstanceName = component.instanceName;
-                    if (!graph.hasNode(tmpInstanceName)) {
-                        this.print('create instance', tmpInstanceName);
-                        const { displayProp = null } = component;
-                        let tmpSymbol;
-                        if (displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
-                            tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
-                            tmpSymbol.drawing.logger = this.logger;
-                        }
-                        else {
-                            const symbolPinDefinitions = generateLayoutPinDefinition(component);
-                            if (component.typeProp === globals_js_1.ComponentTypes.module) {
-                                tmpSymbol = new draw_symbols_js_1.SymbolCustomModule(symbolPinDefinitions, component.pinsMaxPositions);
-                            }
-                            else {
-                                tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions, component.pinsMaxPositions);
-                            }
-                        }
-                        applyComponentParamsToSymbol(component, tmpSymbol);
-                        tmpSymbol.refreshDrawing();
-                        const { width: useWidth, height: useHeight } = tmpSymbol.size();
-                        tmpComponent = new RenderComponent(component, useWidth, useHeight);
-                        tmpComponent.symbol = tmpSymbol;
-                        graph.setNode(tmpInstanceName, [RenderItemType.Component, tmpComponent, index]);
-                        const currentFrame = frameStack[frameStack.length - 1];
-                        currentFrame && currentFrame.innerItems.push(tmpComponent);
-                    }
-                    if (action === ExecutionScope_js_1.SequenceAction.To && previousNode && previousPin) {
-                        this.setGraphEdge(graph, previousNode, tmpInstanceName, makeEdgeValue(previousNode, previousPin, tmpInstanceName, pin, index));
-                    }
-                    previousNode = tmpInstanceName;
-                    previousPin = pin;
-                    break;
-                }
-                case ExecutionScope_js_1.SequenceAction.Wire: {
-                    const [, wireId, wireSegments] = sequenceStep;
-                    let useNet;
-                    if (previousNode !== null) {
-                        const [prevNodeType, prevNodeItem] = graph.node(previousNode);
-                        if (prevNodeType === RenderItemType.Component) {
-                            const matchingItem = nets.find(([comp, pin]) => {
-                                return comp.instanceName === previousNode
-                                    && pin === previousPin;
-                            });
-                            if (matchingItem !== undefined) {
-                                useNet = matchingItem[2];
-                            }
-                        }
-                        else if (prevNodeType === RenderItemType.Wire) {
-                            useNet = prevNodeItem.net;
-                        }
-                    }
-                    const wire = new RenderWire(useNet, (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), wireSegments);
-                    wire.id = wireId;
-                    wire.netName = useNet.toString();
-                    const wireName = getWireName(wire.id);
-                    graph.setNode(wireName, [RenderItemType.Wire, wire, index]);
-                    this.setGraphEdge(graph, previousNode, wireName, makeEdgeValue(previousNode, previousPin, wireName, 0, index));
-                    previousNode = wireName;
-                    previousPin = 1;
-                    const wireSegmentsInfo = wireSegments.map(item => {
-                        const tmp = {
-                            direction: item.direction,
-                            value: item.value,
-                        };
-                        if (item.valueXY) {
-                            tmp.valueXY = item.valueXY;
-                        }
-                        if (item.until) {
-                            tmp.until = [item.until[0].toString(), item.until[1]];
-                        }
-                        return tmp;
-                    });
-                    this.print(ExecutionScope_js_1.SequenceAction.Wire, wireId, JSON.stringify(wireSegmentsInfo));
-                    break;
-                }
-                case ExecutionScope_js_1.SequenceAction.WireJump: {
-                    this.print(...sequenceStep);
-                    const wireId = sequenceStep[1];
-                    const wireName = getWireName(wireId);
-                    let wirePin = 1;
-                    if (sequenceStep.length === 3) {
-                        wirePin = sequenceStep[2];
-                    }
-                    previousNode = wireName;
-                    previousPin = wirePin;
-                    break;
-                }
-                case ExecutionScope_js_1.SequenceAction.Frame: {
-                    const [, frameObject, frameAction] = sequenceStep;
-                    if (frameAction === ExecutionScope_js_1.FrameAction.Enter) {
-                        const prevFrame = frameStack[frameStack.length - 1];
-                        const newFrame = new RenderFrame(frameObject);
-                        if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Direction)) {
-                            newFrame.direction =
-                                frameObject.parameters.get(Frame_js_1.FrameParamKeys.Direction);
-                        }
-                        if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Padding)) {
-                            newFrame.padding = (0, helpers_js_1.milsToMM)(frameObject.parameters.get(Frame_js_1.FrameParamKeys.Padding));
-                        }
-                        if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Border)) {
-                            newFrame.borderWidth =
-                                frameObject.parameters.get(Frame_js_1.FrameParamKeys.Border);
-                        }
-                        if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Width)) {
-                            newFrame.width = (0, helpers_js_1.milsToMM)(frameObject.parameters.get(Frame_js_1.FrameParamKeys.Width));
-                        }
-                        if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Height)) {
-                            newFrame.height = (0, helpers_js_1.milsToMM)(frameObject.parameters.get(Frame_js_1.FrameParamKeys.Height));
-                        }
-                        containerFrames.push(newFrame);
-                        frameStack.push(newFrame);
-                        prevFrame && prevFrame.innerItems.push(newFrame);
-                    }
-                    else if (frameAction === ExecutionScope_js_1.FrameAction.Exit) {
-                        frameStack.pop();
-                    }
-                    break;
-                }
-            }
-        });
-        return {
-            graph,
-            containerFrames,
-        };
-    }
-    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);
         const subGraphsStarts = [];
@@ -835,10 +652,10 @@ class LayoutEngine {
             const wires = [];
             innerGraph.forEach(nodeId => {
                 const [nodeType, item,] = graph.node(nodeId);
-                if (nodeType === RenderItemType.Component) {
+                if (nodeType === graph_js_1.RenderItemType.Component) {
                     renderItems.push(item);
                 }
-                else if (nodeType === RenderItemType.Wire) {
+                else if (nodeType === graph_js_1.RenderItemType.Wire) {
                     wires.push(item);
                 }
             });
@@ -1106,52 +923,6 @@ function getNeighbours(graph, nodeIds) {
         return accum;
     }, []);
 }
-function makeEdgeValue(instanceName1, instancePin1, instanceName2, instancePin2, priority) {
-    return [instanceName1, instancePin1, instanceName2, instancePin2, priority];
-}
-function getWireName(wireId) {
-    return 'wire:' + wireId;
-}
-function generateLayoutPinDefinition(component) {
-    const pins = component.pins;
-    const symbolPinDefinitions = [];
-    const existingPinIds = Array.from(pins.keys());
-    const arrangeProps = component.arrangeProps ?? [];
-    const addedPins = [];
-    for (const [key, items] of 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);
-                }
-            }
-        });
-    }
-    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);
@@ -1401,7 +1172,7 @@ class RenderWire extends RenderObject {
         this.refreshPoints();
     }
     toString() {
-        return getWireName(this.id);
+        return (0, graph_js_1.getWireName)(this.id);
     }
 }
 exports.RenderWire = RenderWire;
@@ -1500,7 +1271,7 @@ function CalculatePinPositions(component) {
         tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(component.displayProp);
     }
     else {
-        const symbolPinDefinitions = generateLayoutPinDefinition(component);
+        const symbolPinDefinitions = (0, graph_js_1.generateLayoutPinDefinition)(component);
         tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions, component.pinsMaxPositions);
     }
     applyComponentParamsToSymbol(component, tmpSymbol);
@@ -1536,8 +1307,3 @@ exports.ExtractDrawingRects = ExtractDrawingRects;
 function isPointOverlap(x, y, other) {
     return (x >= other.x && y >= other.y && x <= (other.x + other.width) && y <= (other.y + other.height));
 }
-var RenderItemType;
-(function (RenderItemType) {
-    RenderItemType["Wire"] = "wire";
-    RenderItemType["Component"] = "component";
-})(RenderItemType || (RenderItemType = {}));

package/dist/cjs/objects/types.js

@@ -1,25 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Direction = exports.ParseSymbolType = exports.DeclaredReference = exports.UndeclaredReference = exports.AnyReference = void 0;
+exports.Direction = exports.ParseSymbolType = exports.DeclaredReference = exports.UndeclaredReference = exports.AnyReference = exports.CFunctionEntry = void 0;
+const globals_js_1 = require("../globals.js");
 const utils_js_1 = require("../utils.js");
+class CFunctionEntry {
+    constructor(name, execute, source, uniqueId) {
+        this.name = name;
+        this.execute = execute;
+        this.uniqueId = uniqueId;
+        this.source = source;
+    }
+    toString() {
+        return `[Function: ${this.name}]`;
+    }
+}
+exports.CFunctionEntry = CFunctionEntry;
+;
 class AnyReference {
     constructor(refType) {
         this.found = false;
         this.trailers = [];
-        if (refType.value instanceof AnyReference) {
+        this.referenceName = 'AnyReference';
+        if (refType.value instanceof AnyReference
+            && refType.value.type !== globals_js_1.ReferenceTypes.function) {
             throw new utils_js_1.RuntimeExecutionError("Nested reference types!");
         }
         this.found = refType.found;
         this.name = refType.name;
         this.trailers = refType.trailers;
-        this.type = refType.type;
+        this.type = refType.type ?? globals_js_1.ReferenceTypes.unknown;
         this.value = refType.value;
         this.parentValue = refType.parentValue;
     }
+    toString() {
+        return `[${this.referenceName} name: ${this.name} trailers:${this.trailers} found: ${this.found}]`;
+    }
 }
 exports.AnyReference = AnyReference;
-class UndeclaredReference {
+class UndeclaredReference extends AnyReference {
     constructor(reference) {
+        super(reference);
         this.reference = reference;
     }
     throwMessage() {
@@ -39,8 +59,9 @@ class UndeclaredReference {
 }
 exports.UndeclaredReference = UndeclaredReference;
 class DeclaredReference extends AnyReference {
-    toString() {
-        return `[DeclaredReference name: ${this.name} trailers:${this.trailers} found: ${this.found}]`;
+    constructor() {
+        super(...arguments);
+        this.referenceName = 'DeclaredReference';
     }
     toDisplayString() {
         let returnValue = undefined;

package/dist/cjs/render.js

@@ -181,12 +181,14 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     const mergedWireHighlightGroup = canvas.group();
     const mergedWireGroup = canvas.group();
     mergedWires.forEach(tmpItem => {
-        const { segments, intersectPoints, net = null } = tmpItem;
+        const { intersectPoints, net = null, lines = null } = tmpItem;
         let useJunctionColor = globals_js_1.ColorScheme.JunctionColor;
         let useColor = globals_js_1.ColorScheme.WireColor;
         let useLineWidth = globals_js_1.defaultWireLineWidth;
         let displayHighlight = false;
         let displayHighlightColor = null;
+        let displayHighlightOpacity = 0.3;
+        let displayHighlightWidth = 5 * globals_js_1.MilsToMM;
         if (net !== null) {
             useColor = net.color ?? globals_js_1.ColorScheme.WireColor;
             useJunctionColor = net.color ?? globals_js_1.ColorScheme.JunctionColor;
@@ -194,25 +196,29 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             if (net.highlight !== null) {
                 displayHighlight = true;
                 displayHighlightColor = net.highlight ?? null;
+                if (net.highlightOpacity !== undefined) {
+                    displayHighlightOpacity = net.highlightOpacity;
+                }
+                if (net.highlightWidth !== undefined) {
+                    displayHighlightWidth = net.highlightWidth;
+                }
             }
         }
         const pathItems = [];
-        const highlightExtraSize = 5 * globals_js_1.MilsToMM;
-        segments.forEach(segment => {
-            const pt1 = segment[0];
-            const pt2 = segment[1];
-            pathItems.push(...[
-                'M', pt1[0], pt1[1],
-                'L', pt2[0], pt2[1]
-            ]);
+        const useLines = lines ?? [];
+        useLines.forEach(line => {
+            line.forEach((point, index) => {
+                const commandType = (index === 0) ? 'M' : 'L';
+                pathItems.push(...[commandType, point[0], point[1]]);
+            });
         });
         if (displayHighlight) {
             mergedWireHighlightGroup.path(pathItems)
                 .stroke({
-                width: useLineWidth + highlightExtraSize,
+                width: useLineWidth + displayHighlightWidth,
                 color: displayHighlightColor,
-                opacity: 0.3,
-                linecap: 'square'
+                opacity: displayHighlightOpacity,
+                linecap: 'butt'
             })
                 .fill('none');
         }
@@ -220,11 +226,11 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             .stroke({
             width: useLineWidth,
             color: useColor,
-            linecap: 'square'
+            linecap: 'butt'
         })
             .fill('none');
         const halfJunctionSize = globals_js_1.junctionSize.half();
-        const highlightJunctionSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.junctionSize.toNumber() + highlightExtraSize);
+        const highlightJunctionSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.junctionSize.toNumber() + displayHighlightWidth);
         const tmpHighlightExtraSize = highlightJunctionSize.half();
         intersectPoints.forEach(point => {
             const [x, y,] = point;

package/dist/cjs/visitor.js

@@ -381,7 +381,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (ctxNestedProperties) {
                 const nestedKeyValues = this.visitResult(ctxNestedProperties);
                 nestedKeyValues.forEach((value, key) => {
-                    parameters.push(['keyword', key, value]);
+                    parameters.push(['keyword', key, (0, utils_js_1.unwrapValue)(value)]);
                 });
             }
             else {
@@ -539,36 +539,36 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, result);
         };
         this.visitData_expr_with_assignment = (ctx) => {
-            let component = null;
-            let componentCtx = null;
+            let dataResult = null;
+            let componentCtx;
             const ctxDataExpr = ctx.data_expr();
             const ctxAssignmentExpr = ctx.assignment_expr();
             if (ctxDataExpr) {
-                component = this.visitResult(ctxDataExpr);
-                component = (0, utils_js_1.unwrapValue)(component);
+                dataResult = this.visitResult(ctxDataExpr);
                 componentCtx = ctxDataExpr;
-                if (component === null || component === undefined) {
-                    this.throwWithContext(ctxDataExpr, "Could not find component: " + ctxDataExpr.getText());
-                }
             }
             else if (ctxAssignmentExpr) {
-                component = this.visitResult(ctxAssignmentExpr);
+                dataResult = this.visitResult(ctxAssignmentExpr);
                 componentCtx = ctxAssignmentExpr;
             }
-            if (component instanceof ClassComponent_js_1.ClassComponent
-                && component.copyProp) {
-                component = this.getExecutor().copyComponent(component);
-            }
-            if (component instanceof types_js_1.UndeclaredReference) {
-                const { reference: { trailers = [], parentValue = null } } = component;
+            if (dataResult instanceof types_js_1.AnyReference) {
+                const { trailers = [], parentValue = null } = dataResult;
                 if (parentValue instanceof ClassComponent_js_1.ClassComponent
                     && trailers.length > 0
                     && trailers[0] === globals_js_1.ModuleContainsKeyword) {
-                    component = parentValue;
-                    this.placeModuleContains(component);
+                    dataResult = parentValue;
+                    this.placeModuleContains(dataResult);
                 }
             }
-            if (component && component instanceof ClassComponent_js_1.ClassComponent) {
+            dataResult = (0, utils_js_1.unwrapValue)(dataResult);
+            if (dataResult === null || dataResult === undefined) {
+                this.throwWithContext(componentCtx, "Could not find component: " + componentCtx.getText());
+            }
+            if (dataResult instanceof ClassComponent_js_1.ClassComponent
+                && dataResult.copyProp) {
+                dataResult = this.getExecutor().copyComponent(dataResult);
+            }
+            if (dataResult && dataResult instanceof ClassComponent_js_1.ClassComponent) {
                 const modifiers = ctx.component_modifier_expr();
                 modifiers.forEach(modifier => {
                     const modifierText = modifier.ID(0).getText();
@@ -585,23 +585,23 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     if (modifierText === globals_js_1.ParamKeys.flip) {
                         const flipValue = result;
                         if (flipValue.indexOf('x') !== -1) {
-                            component.setParam(globals_js_1.ParamKeys.flipX, 1);
+                            dataResult.setParam(globals_js_1.ParamKeys.flipX, 1);
                             shouldIgnoreWireOrientation = true;
                         }
                         if (flipValue.indexOf('y') !== -1) {
-                            component.setParam(globals_js_1.ParamKeys.flipY, 1);
+                            dataResult.setParam(globals_js_1.ParamKeys.flipY, 1);
                             shouldIgnoreWireOrientation = true;
                         }
                     }
                     else if (modifierText === globals_js_1.ParamKeys.angle) {
-                        component.setParam(globals_js_1.ParamKeys.angle, result);
+                        dataResult.setParam(globals_js_1.ParamKeys.angle, result);
                         shouldIgnoreWireOrientation = true;
                     }
                     else if (modifierText === 'anchor') {
-                        component.setParam('anchor', result);
+                        dataResult.setParam('anchor', result);
                     }
                     if (shouldIgnoreWireOrientation) {
-                        component.useWireOrientationAngle = false;
+                        dataResult.useWireOrientationAngle = false;
                     }
                 });
             }
@@ -611,15 +611,15 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 pinValue = this.visitResult(ctxPinSelectExpr);
             }
             else {
-                if (component instanceof ClassComponent_js_1.ClassComponent) {
-                    pinValue = component.getDefaultPin();
+                if (dataResult instanceof ClassComponent_js_1.ClassComponent) {
+                    pinValue = dataResult.getDefaultPin();
                 }
                 else {
-                    const undeclaredRef = component;
+                    const undeclaredRef = dataResult;
                     this.throwWithContext(componentCtx, 'Invalid component: ' + undeclaredRef.reference.name);
                 }
             }
-            this.setResult(ctx, [component, pinValue]);
+            this.setResult(ctx, [dataResult, pinValue]);
         };
         this.visitUnaryOperatorExpr = (ctx) => {
             let value = this.visitResult(ctx.data_expr());
@@ -749,8 +749,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, result);
         };
         this.visitAdditionExpr = (ctx) => {
-            const value1 = this.resolveDataExpr(ctx.data_expr(0));
-            const value2 = this.resolveDataExpr(ctx.data_expr(1));
+            const value1 = (0, utils_js_1.unwrapValue)(this.resolveDataExpr(ctx.data_expr(0)));
+            const value2 = (0, utils_js_1.unwrapValue)(this.resolveDataExpr(ctx.data_expr(1)));
             if (ctx.Addition() && (typeof value1 === 'string' || typeof value2 === 'string')) {
                 let tmpValue1 = value1;
                 if (value1 instanceof ParamDefinition_js_1.NumericValue) {
@@ -779,6 +779,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitFunction_def_expr = (ctx) => {
             const functionName = ctx.ID().getText();
+            const uniqueFunctionID = '__._' + ctx.start.line + '_'
+                + ctx.start.column + '_' + functionName + '_' + ctx.getText();
             let funcDefinedParameters = [];
             const ctxFunctionArgsExpr = ctx.function_args_expr();
             if (ctxFunctionArgsExpr) {
@@ -800,7 +802,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 nextLastExecution.mergeScope(lastExecution.scope, executionContextName);
                 return [lastExecution, returnValue];
             };
-            this.getExecutor().createFunction(functionName, __runFunc);
+            this.getExecutor().createFunction(functionName, __runFunc, ctx, uniqueFunctionID);
         };
         this.visitPin_select_expr2 = (ctx) => {
             const ctxStringValue = ctx.STRING_VALUE();