circuitscript 0.1.16 → 0.1.18

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) {
@@ -82,8 +87,8 @@ class ExecutionScope {
         const sortedNet = [...this.nets].sort((a, b) => {
             const netA = a[2];
             const netB = b[2];
-            const netAId = netA.namespace + netA.name;
-            const netBId = netB.namespace + b[2].name;
+            const netAId = netA.toString();
+            const netBId = netB.toString();
             if (netAId > netBId) {
                 return 1;
             }
@@ -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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Net = void 0;
+const types_js_1 = require("./types.js");
 class Net {
-    constructor(namespace, name, priority = 0, type = null) {
+    constructor(namespace, name, priority = 0, type = types_js_1.NetTypes.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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Direction = exports.ParseSymbolType = exports.DeclaredReference = exports.UndeclaredReference = exports.AnyReference = exports.CFunctionEntry = 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 {
@@ -107,3 +107,19 @@ 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["Module"] = "module";
+    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 = {}));

package/dist/cjs/visitor.js

@@ -22,19 +22,23 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, [id, value]);
         };
         this.visitPin_select_expr = (ctx) => {
-            let value = null;
+            let pinId = null;
             const ctxData = ctx.data_expr();
             const result = this.visitResult(ctxData);
+            let pinValue;
             if (result instanceof ParamDefinition_js_1.NumericValue) {
-                value = result.toNumber();
+                pinValue = result.toNumber();
             }
             else if (typeof result === 'string') {
-                value = result;
+                pinValue = result;
             }
             else {
-                throw new utils_js_2.RuntimeExecutionError("Invalid value for pin", ctx);
+                throw new utils_js_2.RuntimeExecutionError("Invalid select pin: " + result, ctx);
             }
-            this.setResult(ctx, value);
+            if (pinValue !== undefined) {
+                pinId = new PinDefinition_js_1.PinId(pinValue);
+            }
+            this.setResult(ctx, pinId);
         };
         this.visitAdd_component_expr = (ctx) => {
             const [component, pinValue] = this.visitResult(ctx.data_expr_with_assignment());
@@ -221,11 +225,18 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                                     }
                                 }
                                 else {
-                                    if (!(value instanceof ParamDefinition_js_1.NumericValue)) {
+                                    if (!(value instanceof ParamDefinition_js_1.NumericValue) && !(typeof value === 'string')) {
                                         throw new utils_js_2.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
                                     }
                                     else {
-                                        checkPinExistsAndNotDuplicated(value.toNumber(), ctx);
+                                        let useValue;
+                                        if (value instanceof ParamDefinition_js_1.NumericValue) {
+                                            useValue = value.toNumber();
+                                        }
+                                        else if (typeof value === 'string') {
+                                            useValue = value;
+                                        }
+                                        value && checkPinExistsAndNotDuplicated(useValue, ctx);
                                     }
                                 }
                             }
@@ -265,7 +276,6 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             scope.exitContext();
             scope.popOnPropertyHandler();
             const properties = this.getPropertyExprList(ctx.property_expr());
-            const pins = this.parseCreateComponentPins(properties.get('pins'));
             let instanceName = this.getExecutor().getUniqueInstanceName();
             const propParams = properties.get('params');
             const params = this.parseCreateComponentParams(propParams);
@@ -278,11 +288,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 }
                 instanceName += `${globals_js_1.Delimiter1}${appendValue}`;
             }
-            const arrange = properties.has('arrange') ?
+            const arrangeProp = properties.has('arrange') ?
                 properties.get('arrange') : null;
-            const display = properties.has('display') ?
+            const displayProp = properties.has('display') ?
                 properties.get('display') : null;
-            const type = properties.has('type') ?
+            const typeProp = properties.has('type') ?
                 properties.get('type') : null;
             const copy = properties.has('copy') ?
                 properties.get('copy') : false;
@@ -294,8 +304,29 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 properties.get(globals_js_1.ParamKeys.angle) : null;
             const followWireOrientation = properties.has('followWireOrientation') ?
                 properties.get('followWireOrientation') : true;
+            let pins = [];
+            if (displayProp !== null && arrangeProp === null
+                && typeProp !== types_js_1.TypeProps.Graphic) {
+                const drawCommands = displayProp.getCommands();
+                drawCommands.forEach(command => {
+                    const [commandValue,] = command;
+                    if (commandValue === draw_symbols_js_1.PlaceHolderCommands.vpin
+                        || commandValue === draw_symbols_js_1.PlaceHolderCommands.hpin
+                        || commandValue === draw_symbols_js_1.PlaceHolderCommands.pin) {
+                        const id = PinDefinition_js_1.PinId.from(command[1][0]);
+                        const pinType = id.getType();
+                        const pinName = id.toString();
+                        pins.push(new PinDefinition_js_1.PinDefinition(id, pinType, pinName, PinTypes_js_1.PinTypes.Any));
+                    }
+                });
+            }
+            else {
+                pins = this.parseCreateComponentPins(properties.get('pins'));
+            }
             const props = {
-                arrange, display, type, width, height, copy,
+                arrange: arrangeProp,
+                display: displayProp,
+                type: typeProp, width, height, copy,
                 angle, followWireOrientation
             };
             try {
@@ -807,14 +838,21 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitPin_select_expr2 = (ctx) => {
             const ctxStringValue = ctx.STRING_VALUE();
             const ctxIntegerValue = ctx.INTEGER_VALUE();
-            let result = null;
+            let pinIdValue;
+            let pinId = null;
             if (ctxStringValue) {
-                result = this.prepareStringValue(ctxStringValue.getText());
+                pinIdValue = this.prepareStringValue(ctxStringValue.getText());
             }
             else if (ctxIntegerValue) {
-                result = Number(ctxIntegerValue.getText());
+                pinIdValue = Number(ctxIntegerValue.getText());
             }
-            this.setResult(ctx, result);
+            if (pinIdValue !== undefined) {
+                pinId = new PinDefinition_js_1.PinId(pinIdValue);
+            }
+            else {
+                throw new utils_js_2.RuntimeExecutionError("Invalid select pin", ctx);
+            }
+            this.setResult(ctx, pinId);
         };
         this.visitAt_block_pin_expr = (ctx) => {
             const executor = this.getExecutor();
@@ -1206,7 +1244,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         return item;
                     }
                     else {
-                        return (0, ParamDefinition_js_1.numeric)(nameToPinId.get(item));
+                        return new PinDefinition_js_1.PinId(nameToPinId.get(item));
                     }
                 });
                 if (items.length > 0) {
@@ -1297,7 +1335,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     getGraph() {
         const executor = this.getExecutor();
         const fullSequence = executor.scope.sequence;
-        const tmpNet = executor.scope.getNet(executor.scope.componentRoot, 1);
+        const tmpNet = executor.scope.getNet(executor.scope.componentRoot, new PinDefinition_js_1.PinId(1));
         const sequence = (tmpNet === null)
             ? fullSequence.slice(1) : fullSequence;
         const nets = executor.scope.getNets();
@@ -1342,8 +1380,28 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.log('Failed to annotate:', instance.instanceName);
             }
         });
-        this.log('===== annotate done =====');
-        this.log('');
+        this.log('===== annotate components done =====');
+        this.log('===== rename nets =====');
+        this.renameNetsWithRefdes();
+        this.log('===== rename nets done =====');
+    }
+    renameNetsWithRefdes() {
+        const nets = this.getScope().getNets();
+        const seenNets = [];
+        const uniqueNets = new Set(nets.map(([, , net]) => net));
+        const fullNetNames = Array.from(uniqueNets).map(item => item.toString());
+        nets.forEach(([component, pin, net]) => {
+            if (net.priority === 0 && seenNets.indexOf(net) === -1
+                && component.typeProp !== types_js_1.TypeProps.Module
+                && component.typeProp !== types_js_1.TypeProps.Net) {
+                net.name = net.baseName =
+                    `NET-(${component.assignedRefDes}-${pin.toString()})`;
+                if (fullNetNames.indexOf(net.toString()) !== -1) {
+                    throw new utils_js_2.RuntimeExecutionError('Net renaming failed due to clash: ' + net);
+                }
+                seenNets.push(net);
+            }
+        });
     }
     applySheetFrameComponent() {
         const baseScope = this.getScope();

package/dist/esm/BaseVisitor.js

@@ -11,6 +11,7 @@ import { isReference, unwrapValue as unwrapValue } from "./utils.js";
 import { linkBuiltInMethods } from './builtinMethods.js';
 import { resolveToNumericValue, RuntimeExecutionError, throwWithContext } from './utils.js';
 import { SequenceAction } from './objects/ExecutionScope.js';
+import { PinId } from './objects/PinDefinition.js';
 export class BaseVisitor extends CircuitScriptVisitor {
     indentLevel = 0;
     startingContext;
@@ -171,7 +172,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 this.log2(`assigned component param ${leftSideReference.parentValue} trailers: ${trailers} value: ${rhsValue}`);
                 sequenceParts.push(...['instance', [leftSideReference.parentValue, trailers], rhsValue]);
                 if (leftSideReference.parentValue.typeProp === ComponentTypes.net) {
-                    const net = this.getScope().getNet(leftSideReference.parentValue, 1);
+                    const net = this.getScope().getNet(leftSideReference.parentValue, new PinId(1));
                     if (net) {
                         const trailerValue = trailers.join(".");
                         net.params.set(trailerValue, rhsValue);

package/dist/esm/draw_symbols.js

@@ -5,6 +5,7 @@ import { PinTypes } from "./objects/PinTypes.js";
 import { roundValue, RuntimeExecutionError, throwWithContext } from "./utils.js";
 import { DeclaredReference, UndeclaredReference } from "./objects/types.js";
 import { numeric, NumericValue } from "./objects/ParamDefinition.js";
+import { PinId } from "./objects/PinDefinition.js";
 export class SymbolGraphic {
     drawPortsName = true;
     displayBounds = false;
@@ -560,6 +561,12 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 milsToMM(endY)
             ];
         }
+        if (positionParams[0] instanceof NumericValue) {
+            positionParams[0] = new PinId(positionParams[0].toNumber());
+        }
+        else if (typeof positionParams[0] === 'number' || typeof positionParams[0] === 'string') {
+            positionParams[0] = new PinId(positionParams[0]);
+        }
         drawing.addPinMM(...positionParams, lineColor);
         const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
         const [pinId, , angle] = lastAddedPin;
@@ -604,7 +611,8 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 vanchor: 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: numeric(defaultPinIdTextSize),
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
@@ -704,7 +712,7 @@ export class SymbolCustom extends SymbolGraphic {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Left,
@@ -721,7 +729,7 @@ export class SymbolCustom extends SymbolGraphic {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Right,
@@ -738,7 +746,7 @@ export class SymbolCustom extends SymbolGraphic {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Right,
@@ -757,7 +765,7 @@ export class SymbolCustom extends SymbolGraphic {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Left,
@@ -839,7 +847,7 @@ export class SymbolCustomModule extends SymbolCustom {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(40),
@@ -851,7 +859,7 @@ export class SymbolCustomModule extends SymbolCustom {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(40),
@@ -863,7 +871,7 @@ export class SymbolCustomModule extends SymbolCustom {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pin.text, {
                 fontSize: numeric(40),
@@ -876,7 +884,7 @@ export class SymbolCustomModule extends SymbolCustom {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(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(milsToMM(20)), pin.text, {
                 fontSize: numeric(40),
@@ -912,13 +920,6 @@ export class SymbolDrawing {
         this.items.push(Geometry.segment([startX, startY], [endX, endY]));
         return this;
     }
-    addPin(pinId, startX, startY, endX, endY, lineColor) {
-        startX = milsToMM(startX);
-        startY = milsToMM(startY);
-        endX = milsToMM(endX);
-        endY = 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();
@@ -1221,7 +1222,7 @@ export 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;