circuitscript 0.1.15 → 0.1.17

package/dist/cjs/layout.js

@@ -1,46 +1,26 @@
 "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 PinDefinition_js_1 = require("./objects/PinDefinition.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 +34,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) {
@@ -584,7 +542,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;
                 }));
@@ -668,158 +626,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 = [];
@@ -847,10 +653,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);
                 }
             });
@@ -889,7 +695,11 @@ class LayoutEngine {
         }
         if (subgraphEdges.length === 0) {
             const [, node1] = graph.node(firstNodeId);
-            this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, 1);
+            let defaultPin = new PinDefinition_js_1.PinId(1);
+            if (node1 instanceof RenderComponent) {
+                defaultPin = node1.component.getDefaultPin();
+            }
+            this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, defaultPin);
             return;
         }
         let fixedNode;
@@ -1118,52 +928,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);
@@ -1413,7 +1177,7 @@ class RenderWire extends RenderObject {
         this.refreshPoints();
     }
     toString() {
-        return getWireName(this.id);
+        return (0, graph_js_1.getWireName)(this.id);
     }
 }
 exports.RenderWire = RenderWire;
@@ -1512,7 +1276,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);
@@ -1548,8 +1312,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/ClassComponent.js

@@ -5,6 +5,7 @@ const draw_symbols_js_1 = require("../draw_symbols.js");
 const PinDefinition_js_1 = require("./PinDefinition.js");
 const PinTypes_js_1 = require("./PinTypes.js");
 const globals_js_1 = require("../globals.js");
+const utils_js_1 = require("../utils.js");
 class ClassComponent {
     constructor(instanceName, numPins) {
         this.parameters = new Map();
@@ -33,47 +34,53 @@ class ClassComponent {
     setupPins() {
         for (let i = 1; i < this.numPins + 1; i++) {
             const pinIndex = i;
-            this.pins.set(pinIndex, new PinDefinition_js_1.PinDefinition(pinIndex, PinDefinition_js_1.PinIdType.Int, pinIndex.toString(), PinTypes_js_1.PinTypes.Any));
+            this.pins.set(new PinDefinition_js_1.PinId(pinIndex), new PinDefinition_js_1.PinDefinition(pinIndex, PinDefinition_js_1.PinIdType.Int, pinIndex.toString(), PinTypes_js_1.PinTypes.Any));
         }
         this.refreshPinsCache();
     }
     getDefaultPin() {
-        return 1;
+        const pins = Array.from(this.pins.keys());
+        pins.sort();
+        return pins[0];
     }
     hasPin(pinId) {
-        if (typeof pinId === 'number') {
-            return this.pins.has(pinId);
-        }
-        else {
-            for (const [, pinDef] of this.pins) {
-                if (pinDef.name === pinId ||
-                    pinDef.altNames.indexOf(pinId) !== -1) {
-                    return true;
-                }
+        for (const [pin, pinDef] of this.pins) {
+            if (pin.equals(pinId)) {
+                return true;
+            }
+            if (pinId.getType() === PinDefinition_js_1.PinIdType.Str && (pinDef.name === pinId.getValue() ||
+                pinDef.altNames.indexOf(pinId.getValue()) !== -1)) {
+                return true;
             }
         }
         return false;
     }
     getPin(pinId) {
-        if (typeof pinId === 'number') {
-            return pinId;
+        for (const [pin,] of this.pins) {
+            if (pin.equals(pinId)) {
+                return pin;
+            }
         }
-        else {
+        if (pinId.getType() === PinDefinition_js_1.PinIdType.Str) {
+            const pinIdStringValue = pinId.getValue();
             for (const [pin, pinDef] of this.pins) {
-                if (pinDef.name === pinId ||
-                    pinDef.altNames.indexOf(pinId) !== -1) {
+                if (pinDef.name === pinIdStringValue ||
+                    pinDef.altNames.indexOf(pinIdStringValue) !== -1) {
                     return pin;
                 }
             }
-            return -1;
         }
+        throw new utils_js_1.RuntimeExecutionError(`Could not find pin '${pinId}' on component '${this.instanceName}'`);
     }
     getNextPinAfter(pinIndex) {
-        if (pinIndex + 1 <= this.numPins) {
-            return pinIndex + 1;
+        const pins = Array.from(this.pins.keys());
+        pins.sort();
+        const index = pins.findIndex(tmp => tmp.equals(pinIndex));
+        if (index + 1 < pins.length) {
+            return pins[index + 1];
         }
         else {
-            return 1;
+            return this.getDefaultPin();
         }
     }
     setParam(key, value) {

package/dist/cjs/objects/ExecutionScope.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActiveObject = exports.FrameAction = exports.SequenceAction = exports.ExecutionScope = void 0;
 const CircuitScriptParser_js_1 = require("../antlr/CircuitScriptParser.js");
+const PinDefinition_js_1 = require("./PinDefinition.js");
+const utils_js_1 = require("../utils.js");
 class ExecutionScope {
     constructor(scopeId) {
         this.nets = [];
@@ -33,8 +35,11 @@ class ExecutionScope {
         return scope;
     }
     findNet(component, pin) {
+        if (!(pin instanceof PinDefinition_js_1.PinId)) {
+            throw new utils_js_1.RuntimeExecutionError('Invalid value for PinId: ' + pin);
+        }
         return this.nets.find(([tmpComponent, tmpPin]) => {
-            return tmpComponent.isEqual(component) && tmpPin === pin;
+            return tmpComponent.isEqual(component) && tmpPin.equals(pin);
         });
     }
     getNetWithName(name) {
@@ -95,7 +100,7 @@ class ExecutionScope {
             }
         });
         return sortedNet.map(([component, pin, net]) => {
-            return [net.toString(), component.instanceName, pin];
+            return [net.toString(), component.instanceName, pin.value];
         });
     }
     printNets() {

package/dist/cjs/objects/Net.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Net = void 0;
 class Net {
-    constructor(namespace, name, priority = 0, type = null) {
+    constructor(namespace, name, priority = 0, type = 'any') {
         this.params = new Map();
         if (namespace.indexOf(' ') !== -1) {
             throw "Invalid net namespace provided";

package/dist/cjs/objects/PinDefinition.js

@@ -1,13 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PortSide = exports.PinIdType = exports.PinDefinition = void 0;
+exports.getPinDefinition = exports.isPinId = exports.PortSide = exports.PinIdType = exports.PinDefinition = exports.PinId = void 0;
+const utils_js_1 = require("../utils.js");
+const ParamDefinition_js_1 = require("./ParamDefinition.js");
 const PinTypes_js_1 = require("./PinTypes.js");
+class PinId {
+    constructor(value) {
+        if (typeof value !== 'string' && typeof value !== 'number') {
+            throw new utils_js_1.RuntimeExecutionError("Invalid value for PinId: " + value);
+        }
+        this.value = value;
+        this.type = typeof value === 'number' ? PinIdType.Int : PinIdType.Str;
+    }
+    getValue() {
+        return this.value;
+    }
+    getType() {
+        return this.type;
+    }
+    isNumeric() {
+        return this.type === PinIdType.Int;
+    }
+    isString() {
+        return this.type === PinIdType.Str;
+    }
+    toString() {
+        return this.value.toString();
+    }
+    equals(other) {
+        if (other instanceof PinId) {
+            return this.value === other.value;
+        }
+        return this.value === other;
+    }
+    static from(value) {
+        if (value instanceof ParamDefinition_js_1.NumericValue) {
+            return new PinId(value.toNumber());
+        }
+        return new PinId(value);
+    }
+    static isPinIdType(value) {
+        return (typeof value === 'number' || typeof value === 'string');
+    }
+}
+exports.PinId = PinId;
 class PinDefinition {
     constructor(id, idType, name, pinType = PinTypes_js_1.PinTypes.Any, altNames = []) {
         this.side = PortSide.EAST;
         this.position = -1;
-        this.id = id;
-        this.idType = idType;
+        this.id = id instanceof PinId ? id : new PinId(id);
+        this.idType = this.id.getType();
         this.pinType = pinType;
         this.name = name;
         this.altNames = altNames;
@@ -26,3 +68,13 @@ var PortSide;
     PortSide["SOUTH"] = "SOUTH";
     PortSide["NORTH"] = "NORTH";
 })(PortSide || (exports.PortSide = PortSide = {}));
+function isPinId(item) {
+    return item instanceof PinId || (typeof item === 'number' || typeof item === 'string');
+}
+exports.isPinId = isPinId;
+function getPinDefinition(map, id) {
+    const keys = Array.from(map.keys());
+    const tmpKey = keys.find(item => item.equals(id));
+    return map.get(tmpKey);
+}
+exports.getPinDefinition = getPinDefinition;

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.NetTypes = exports.TypeProps = 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;
@@ -86,3 +107,18 @@ var Direction;
     Direction["Down"] = "down";
     Direction["Up"] = "up";
 })(Direction || (exports.Direction = Direction = {}));
+var TypeProps;
+(function (TypeProps) {
+    TypeProps["Net"] = "net";
+    TypeProps["Port"] = "port";
+    TypeProps["Graphic"] = "graphic";
+    TypeProps["Resistor"] = "res";
+    TypeProps["Capacitor"] = "cap";
+    TypeProps["Inductor"] = "ind";
+    TypeProps["Diode"] = "diode";
+})(TypeProps || (exports.TypeProps = TypeProps = {}));
+var NetTypes;
+(function (NetTypes) {
+    NetTypes["Any"] = "any";
+    NetTypes["Source"] = "source";
+})(NetTypes || (exports.NetTypes = NetTypes = {}));