circuitscript 0.1.16 → 0.1.17

package/dist/cjs/BaseVisitor.js

@@ -14,6 +14,7 @@ const utils_js_1 = require("./utils.js");
 const builtinMethods_js_1 = require("./builtinMethods.js");
 const utils_js_2 = require("./utils.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
+const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
     constructor(silent = false, onErrorHandler = null, environment) {
         super();
@@ -92,7 +93,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
                     this.log2(`assigned component param ${leftSideReference.parentValue} trailers: ${trailers} value: ${rhsValue}`);
                     sequenceParts.push(...['instance', [leftSideReference.parentValue, trailers], rhsValue]);
                     if (leftSideReference.parentValue.typeProp === globals_js_1.ComponentTypes.net) {
-                        const net = this.getScope().getNet(leftSideReference.parentValue, 1);
+                        const net = this.getScope().getNet(leftSideReference.parentValue, new PinDefinition_js_1.PinId(1));
                         if (net) {
                             const trailerValue = trailers.join(".");
                             net.params.set(trailerValue, rhsValue);

package/dist/cjs/draw_symbols.js

@@ -8,6 +8,7 @@ const PinTypes_js_1 = require("./objects/PinTypes.js");
 const utils_js_1 = require("./utils.js");
 const types_js_1 = require("./objects/types.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 class SymbolGraphic {
     constructor() {
         this.drawPortsName = true;
@@ -563,6 +564,12 @@ class SymbolPlaceholder extends SymbolGraphic {
                 (0, helpers_js_1.milsToMM)(endY)
             ];
         }
+        if (positionParams[0] instanceof ParamDefinition_js_1.NumericValue) {
+            positionParams[0] = new PinDefinition_js_1.PinId(positionParams[0].toNumber());
+        }
+        else if (typeof positionParams[0] === 'number' || typeof positionParams[0] === 'string') {
+            positionParams[0] = new PinDefinition_js_1.PinId(positionParams[0]);
+        }
         drawing.addPinMM(...positionParams, lineColor);
         const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
         const [pinId, , angle] = lastAddedPin;
@@ -607,7 +614,8 @@ class SymbolPlaceholder extends SymbolGraphic {
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: pinNameColor,
             });
-            displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinId.toDisplayString(), {
+            const pinDisplayText = pinId.toString();
+            displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinDisplayText, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultPinIdTextSize),
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
@@ -707,7 +715,7 @@ class SymbolCustom extends SymbolGraphic {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addLabel(leftPinStart.add((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
@@ -724,7 +732,7 @@ class SymbolCustom extends SymbolGraphic {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addLabel(rightPinStart.sub((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
@@ -741,7 +749,7 @@ class SymbolCustom extends SymbolGraphic {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
             drawing.addLabel(pinX, topPinStart.add((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
@@ -760,7 +768,7 @@ class SymbolCustom extends SymbolGraphic {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
             drawing.addLabel(pinX, bottomPinStart.sub((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
@@ -846,7 +854,7 @@ class SymbolCustomModule extends SymbolCustom {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addModulePort(leftPinStart, pinY, this.portWidth, this.portHeight, pin.pinType);
             drawing.addLabel(leftPinStart.add(this.portWidth).add((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -858,7 +866,7 @@ class SymbolCustomModule extends SymbolCustom {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addModulePort(rightPinStart, pinY, this.portWidth, this.portHeight, pin.pinType, -1);
             drawing.addLabel(rightPinStart.sub(this.portWidth).sub((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -870,7 +878,7 @@ class SymbolCustomModule extends SymbolCustom {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
             drawing.addModulePort(pinX, topPinStart, this.portWidth, this.portHeight, pin.pinType, 1, 90);
             drawing.addLabel(pinX, topPinStart.add(this.portWidth).add((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -883,7 +891,7 @@ class SymbolCustomModule extends SymbolCustom {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, bottomPinStart, pinX, bottomPinStart.sub(this.pinLength), defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, bottomPinStart, pinX, bottomPinStart.sub(this.pinLength), defaultLineColor);
             drawing.addModulePort(pinX, bottomPinStart, this.portWidth, this.portHeight, pin.pinType, 1, -90);
             drawing.addLabel(pinX, bottomPinStart.sub(this.portWidth).sub((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -922,13 +930,6 @@ class SymbolDrawing {
         this.items.push(geometry_js_1.Geometry.segment([startX, startY], [endX, endY]));
         return this;
     }
-    addPin(pinId, startX, startY, endX, endY, lineColor) {
-        startX = (0, helpers_js_1.milsToMM)(startX);
-        startY = (0, helpers_js_1.milsToMM)(startY);
-        endX = (0, helpers_js_1.milsToMM)(endX);
-        endY = (0, helpers_js_1.milsToMM)(endY);
-        return this.addPinMM(pinId, startX, startY, endX, endY, lineColor);
-    }
     addPinMM(pinId, startXMM, startYMM, endXMM, endYMM, lineColor) {
         let angle = 0;
         const tmpStartXMM = startXMM.toNumber();
@@ -1231,7 +1232,7 @@ class SymbolDrawing {
     }
     getPinPosition(pinId) {
         const pin = this.pins.find(item => {
-            return item[0].toNumber() === pinId;
+            return item[0].equals(pinId);
         });
         if (pin) {
             const [, feature, angle] = pin;

package/dist/cjs/execute.js

@@ -146,7 +146,7 @@ class ExecutionContext {
             const tmpArrangeRight = [];
             pins.forEach((pin, index) => {
                 const useArray = (index % 2 === 0) ? tmpArrangeLeft : tmpArrangeRight;
-                useArray.push((0, ParamDefinition_js_1.numeric)(pin.id));
+                useArray.push(pin.id);
             });
             const arrangeProp = new Map([
                 [globals_js_1.SymbolPinSide.Left, tmpArrangeLeft],
@@ -156,11 +156,9 @@ class ExecutionContext {
         }
         if (props.arrange !== null) {
             component.arrangeProps = this.removeArrangePropDuplicates(props.arrange);
-            const arrangePropPins = this.getArrangePropPins(component.arrangeProps).map(item => {
-                return item.toNumber();
-            });
+            const arrangePropPins = this.getArrangePropPins(component.arrangeProps);
             pins.forEach(pin => {
-                if (arrangePropPins.indexOf(pin.id) === -1) {
+                if (arrangePropPins.find(id => id.equals(pin.id)) === undefined) {
                     this.logWarning(`Pin ${pin.id} is not specified in arrange property`);
                 }
             });
@@ -177,6 +175,7 @@ class ExecutionContext {
         });
         if (component.typeProp === globals_js_1.ComponentTypes.net) {
             const netName = paramsMap.get(globals_js_1.ParamKeys.net_name);
+            const netType = paramsMap.get(globals_js_1.ParamKeys.net_type);
             let priority = 0;
             if (paramsMap.has(globals_js_1.ParamKeys.priority)) {
                 priority = paramsMap.get(globals_js_1.ParamKeys.priority).toNumber();
@@ -188,21 +187,26 @@ class ExecutionContext {
                 this.log('net found', tmpNet.namespace, tmpNet.name);
             }
             else {
-                tmpNet = new Net_js_1.Net(this.netNamespace, netName, priority);
+                tmpNet = new Net_js_1.Net(this.netNamespace, netName, priority, netType);
                 this.log('net not found, added net instance', tmpNet.namespace, tmpNet.name);
             }
-            const defaultPin = 1;
+            const defaultPin = new PinDefinition_js_1.PinId(1);
             this.scope.setNet(component, defaultPin, tmpNet);
             this.log('set net', netName, 'component', component, defaultPin);
         }
         const { pins: pinSides, maxPositions } = getPortSide(component.pins, component.arrangeProps);
         component.pinsMaxPositions = maxPositions;
+        const pinIdKeys = Array.from(component.pins.keys());
         pinSides.forEach(({ pinId, side, position }) => {
-            if (component.pins.has(pinId)) {
-                const tmpPin = component.pins.get(pinId);
+            const matchedPinId = pinIdKeys.find(id => id.equals(pinId));
+            if (matchedPinId) {
+                const tmpPin = component.pins.get(matchedPinId);
                 tmpPin.side = side;
                 tmpPin.position = position;
             }
+            else {
+                throw 'Not found!';
+            }
         });
         this.scope.instances.set(instanceName, component);
         const pinsOutput = pins.map((pin) => {
@@ -225,15 +229,32 @@ class ExecutionContext {
             if (!Array.isArray(items)) {
                 items = [items];
             }
+            items = items.map(item => {
+                if (item instanceof ParamDefinition_js_1.NumericValue) {
+                    item = item.toNumber();
+                }
+                if (item instanceof PinDefinition_js_1.PinId) {
+                    return item;
+                }
+                else if (PinDefinition_js_1.PinId.isPinIdType(item)) {
+                    return new PinDefinition_js_1.PinId(item);
+                }
+                return item;
+            });
+            arrangeProp.set(side, items);
+            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());
+                if (item instanceof PinDefinition_js_1.PinId) {
+                    const found = seenIds.find(id => id.equals(item));
+                    if (!found) {
+                        seenIds.push(item);
                         uniqueItems.push(item);
                     }
                     else {
-                        this.logWarning(`Pin ${item.toNumber()} specified more than once in arrange property`);
+                        this.logWarning(`Pin ${item.toString()} specified more than once in arrange property`);
                     }
                 }
                 else {
@@ -256,7 +277,7 @@ class ExecutionContext {
             const items = arrangeProps.get(side);
             if (items) {
                 items.forEach(item => {
-                    if (item instanceof ParamDefinition_js_1.NumericValue) {
+                    if (item instanceof PinDefinition_js_1.PinId) {
                         pins.push(item);
                     }
                 });
@@ -378,7 +399,7 @@ class ExecutionContext {
         const cloneInstanceName = component.instanceName + ':' + idNum;
         this.scope.instances.set(cloneInstanceName, componentCopy);
         componentCopy.instanceName = cloneInstanceName;
-        const defaultPin = 1;
+        const defaultPin = new PinDefinition_js_1.PinId(1);
         if (this.scope.getNet(component, defaultPin) === null) {
             const foundNet = this.resolveComponentPinNet(component, defaultPin);
             if (foundNet !== null) {
@@ -597,7 +618,7 @@ class ExecutionContext {
             else if (type === globals_js_1.ReferenceTypes.instance) {
                 const tmpComponent = parentValue;
                 if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net) {
-                    const usedNet = this.scope.getNet(tmpComponent, 1);
+                    const usedNet = this.scope.getNet(tmpComponent, new PinDefinition_js_1.PinId(1));
                     if (usedNet) {
                         const trailerValue = trailers.join(".");
                         useValue = usedNet.params.get(trailerValue) ?? null;
@@ -691,7 +712,7 @@ class ExecutionContext {
         const linkRootComponent = true;
         const tmpRoot = childScope.componentRoot;
         if (linkRootComponent) {
-            const netConnectedToRoot = childScope.getNet(tmpRoot, 1);
+            const netConnectedToRoot = childScope.getNet(tmpRoot, new PinDefinition_js_1.PinId(1));
             if (netConnectedToRoot !== null) {
                 let currentNet = this.scope.getNet(currentComponent, currentPin);
                 if (currentNet === null) {
@@ -1039,10 +1060,9 @@ function getPortSide(pins, arrangeProps) {
                     position += item[0].toNumber();
                 }
                 else {
-                    const itemValue = item.toNumber();
-                    if (existingPinIds.indexOf(itemValue) !== -1) {
+                    if (existingPinIds.find(id => id.equals(item))) {
                         result.push({
-                            pinId: itemValue,
+                            pinId: item,
                             side: useSide,
                             position,
                             order: counter

package/dist/cjs/globals.js

@@ -15,6 +15,7 @@ var ParamKeys;
 (function (ParamKeys) {
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
+    ParamKeys["net_type"] = "net_type";
     ParamKeys["flip"] = "flip";
     ParamKeys["flipX"] = "flipX";
     ParamKeys["flipY"] = "flipY";

package/dist/cjs/graph.js

@@ -1,4 +1,27 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderItemType = exports.generateLayoutPinDefinition = exports.getWireName = exports.NetGraph = void 0;
 const graphlib_1 = require("@dagrejs/graphlib");
@@ -9,6 +32,9 @@ const layout_js_1 = require("./layout.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const types_js_1 = require("./objects/types.js");
+const ml_matrix_1 = __importStar(require("ml-matrix"));
+const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 class NetGraph {
     constructor(logger) {
         this.logger = logger;
@@ -75,7 +101,7 @@ class NetGraph {
                         if (prevNodeType === RenderItemType.Component) {
                             const matchingItem = nets.find(([comp, pin]) => {
                                 return comp.instanceName === previousNode
-                                    && pin === previousPin;
+                                    && pin.equals(previousPin);
                             });
                             if (matchingItem !== undefined) {
                                 useNet = matchingItem[2];
@@ -190,21 +216,71 @@ class NetGraph {
         this.logger.add(params.join(' '));
     }
     generateNetGraph(nets) {
-        const graph = new graphlib_1.Graph({
-            directed: false
+        const uniqueNets = new Set(nets.map(([, , net]) => net));
+        const components = new Set(nets.map(([component, ,]) => component));
+        const tmpNets = Array.from(uniqueNets);
+        const gndNet = tmpNets.find(item => {
+            return item.toString() === '/GND';
         });
-        nets.forEach(item => {
-            const [component, pin, net] = item;
-            const netNodeName = this.getNetNodeName(net);
-            if (!graph.hasNode(netNodeName)) {
-                graph.setNode(netNodeName, net);
-            }
-            const componentNodeName = this.getComponentName(component);
-            if (!graph.hasNode(componentNodeName)) {
-                graph.setNode(componentNodeName, component);
+        const otherNets = tmpNets.filter(item => {
+            return item !== gndNet;
+        });
+        const netsIndexed = [];
+        if (gndNet) {
+            netsIndexed.push(gndNet);
+        }
+        netsIndexed.push(...otherNets);
+        const netsLength = netsIndexed.length;
+        const conductanceMatrix = ml_matrix_1.default.zeros(netsLength, netsLength);
+        components.forEach(item => {
+            if (item.typeProp === types_js_1.TypeProps.Resistor) {
+                const net1 = item.pinNets.get(1);
+                const net2 = item.pinNets.get(2);
+                const net1Index = netsIndexed.indexOf(net1);
+                const net2Index = netsIndexed.indexOf(net2);
+                const resistance = item.parameters.get('value');
+                const resistanceValue = resistance.toNumber();
+                const conductanceValue = 1 / resistanceValue;
+                const currentValue1 = conductanceMatrix.get(net1Index, net1Index);
+                const currentValue2 = conductanceMatrix.get(net2Index, net2Index);
+                const currentValue3 = conductanceMatrix.get(net1Index, net2Index);
+                const currentValue4 = conductanceMatrix.get(net2Index, net1Index);
+                conductanceMatrix.set(net1Index, net1Index, currentValue1 + conductanceValue);
+                conductanceMatrix.set(net2Index, net2Index, currentValue2 + conductanceValue);
+                conductanceMatrix.set(net1Index, net2Index, currentValue3 - conductanceValue);
+                conductanceMatrix.set(net2Index, net1Index, currentValue4 - conductanceValue);
             }
-            graph.setEdge(netNodeName, componentNodeName, [component, pin, net]);
         });
+        if (gndNet) {
+            conductanceMatrix.removeColumn(0);
+            conductanceMatrix.removeRow(0);
+        }
+        const netsWithoutGnd = netsIndexed.filter(net => {
+            return (net !== gndNet);
+        });
+        const netResistances = new Map();
+        try {
+            netsWithoutGnd.forEach((net, index) => {
+                if (net.type === types_js_1.NetTypes.Source) {
+                    const currentVector = ml_matrix_1.default.zeros(netsWithoutGnd.length, 1);
+                    currentVector.set(index, 0, 1);
+                    const solution = (0, ml_matrix_1.solve)(conductanceMatrix, currentVector);
+                    for (let i = 0; i < solution.rows; i++) {
+                        const resValue = solution.get(i, 0);
+                        if (resValue > 0) {
+                            const targetNet = netsIndexed[i];
+                            netResistances.set(targetNet, resValue);
+                        }
+                    }
+                }
+            });
+        }
+        catch (err) {
+        }
+        return {
+            nets,
+            netResistances,
+        };
     }
     findNodePaths(graph, startNode, endNode, seenNodes = []) {
         const edges = graph.nodeEdges(startNode);
@@ -265,24 +341,22 @@ function generateLayoutPinDefinition(component) {
             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 existingPin = existingPinIds.find(pin => pin.equals(pinId));
+            if (existingPin) {
+                const pin = (0, PinDefinition_js_1.getPinDefinition)(pins, existingPin);
+                symbolPinDefinitions.push({
+                    side: key,
+                    pinId: pinId,
+                    text: pin.name,
+                    position: pin.position,
+                    pinType: pin.pinType,
+                });
+                addedPins.push(pinId);
             }
         });
     }
     const unplacedPins = existingPinIds.filter(pinId => {
-        return addedPins.indexOf(pinId) === -1;
+        return addedPins.find(id => id.equals(pinId)) === undefined;
     });
     if (unplacedPins.length > 0) {
         component._unplacedPins = unplacedPins;

package/dist/cjs/layout.js

@@ -12,6 +12,7 @@ const geometry_js_1 = require("./geometry.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");
@@ -694,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;

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";