circuitscript 0.4.1 → 0.5.0

package/dist/cjs/render/draw_symbols.js

@@ -7,7 +7,7 @@ const geometry_js_1 = require("./geometry.js");
 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 NumericValue_js_1 = require("../objects/NumericValue.js");
 const PinDefinition_js_1 = require("../objects/PinDefinition.js");
 class SymbolGraphic {
     constructor() {
@@ -16,8 +16,8 @@ class SymbolGraphic {
         this._angle = 0;
         this._flipX = 0;
         this._flipY = 0;
-        this.width = (0, ParamDefinition_js_1.numeric)(-1);
-        this.height = (0, ParamDefinition_js_1.numeric)(-1);
+        this.width = (0, NumericValue_js_1.numeric)(-1);
+        this.height = (0, NumericValue_js_1.numeric)(-1);
         this.labelTexts = new Map();
         this.drawing = new SymbolDrawing();
     }
@@ -45,11 +45,11 @@ class SymbolGraphic {
     }
     calculateSize() {
         const { width, height } = this.drawing.getBoundingBox();
-        this.width = (0, ParamDefinition_js_1.numeric)(width);
-        this.height = (0, ParamDefinition_js_1.numeric)(height);
+        this.width = (0, NumericValue_js_1.numeric)(width);
+        this.height = (0, NumericValue_js_1.numeric)(height);
         return {
-            bodyWidth: (0, ParamDefinition_js_1.numeric)(-1),
-            bodyHeight: (0, ParamDefinition_js_1.numeric)(-1),
+            bodyWidth: (0, NumericValue_js_1.numeric)(-1),
+            bodyHeight: (0, NumericValue_js_1.numeric)(-1),
             width: this.width,
             height: this.height
         };
@@ -88,8 +88,8 @@ class SymbolGraphic {
             throw new utils_js_1.RuntimeExecutionError(`Could not determine pin ${id} position`);
         }
         const [x, y] = pin.start;
-        const useX = (0, utils_js_1.roundValue)(x);
-        const useY = (0, utils_js_1.roundValue)(y);
+        const useX = (0, NumericValue_js_1.roundValue)(x);
+        const useY = (0, NumericValue_js_1.roundValue)(y);
         return {
             x: useX,
             y: useY,
@@ -137,7 +137,7 @@ class SymbolGraphic {
         const labels = this.drawing.getLabels();
         for (const label of labels) {
             const tmpLabel = label;
-            const { fontSize = (0, ParamDefinition_js_1.numeric)(50), anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = (0, ParamDefinition_js_1.numeric)(0), textColor = "#333", } = tmpLabel.style ?? {};
+            const { fontSize = (0, NumericValue_js_1.numeric)(50), anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = (0, NumericValue_js_1.numeric)(0), textColor = "#333", } = tmpLabel.style ?? {};
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
@@ -193,8 +193,8 @@ class SymbolGraphic {
             translateX = position[0];
             translateY = position[1];
             useRotateAngle = this.angle;
-            translateX = (0, utils_js_1.roundValue)(translateX);
-            translateY = (0, utils_js_1.roundValue)(translateY);
+            translateX = (0, NumericValue_js_1.roundValue)(translateX);
+            translateY = (0, NumericValue_js_1.roundValue)(translateY);
             const { portType = null } = tmpLabel.style;
             if (portType !== null) {
                 const { x: boundsX, y: boundsY } = tmpLabel.textMeasurementBounds;
@@ -304,12 +304,12 @@ class SymbolGraphic {
                 .rotate(useLabelAngle, 0, 0);
             const { a, b, c, d, e, f } = textContainer.matrix();
             const newMatrix = {
-                a: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(a)).toNumber(),
-                b: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(b)).toNumber(),
-                c: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(c)).toNumber(),
-                d: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(d)).toNumber(),
-                e: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(e)).toNumber(),
-                f: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(f)).toNumber(),
+                a: (0, NumericValue_js_1.roundValue)((0, NumericValue_js_1.numeric)(a)).toNumber(),
+                b: (0, NumericValue_js_1.roundValue)((0, NumericValue_js_1.numeric)(b)).toNumber(),
+                c: (0, NumericValue_js_1.roundValue)((0, NumericValue_js_1.numeric)(c)).toNumber(),
+                d: (0, NumericValue_js_1.roundValue)((0, NumericValue_js_1.numeric)(d)).toNumber(),
+                e: (0, NumericValue_js_1.roundValue)((0, NumericValue_js_1.numeric)(e)).toNumber(),
+                f: (0, NumericValue_js_1.roundValue)((0, NumericValue_js_1.numeric)(f)).toNumber(),
             };
             textContainer.transform(newMatrix);
             if (globals_js_1.RenderFlags.ShowLabelOrigin) {
@@ -347,14 +347,14 @@ exports.SymbolGraphic = SymbolGraphic;
 class SymbolText extends SymbolGraphic {
     constructor(text) {
         super();
-        this.fontSize = (0, ParamDefinition_js_1.numeric)(40);
+        this.fontSize = (0, NumericValue_js_1.numeric)(40);
         this.fontWeight = 'regular';
         this.text = text;
     }
     generateDrawing() {
         const drawing = this.drawing;
         drawing.clear();
-        drawing.addTextbox((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), this.text, {
+        drawing.addTextbox((0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0), this.text, {
             fontSize: this.fontSize,
             anchor: geometry_js_1.HorizontalAlign.Middle,
             fontWeight: this.fontWeight,
@@ -375,7 +375,7 @@ class SymbolPlaceholder extends SymbolGraphic {
             [PlaceHolderCommands.units, ['mils'], {}],
             [PlaceHolderCommands.lineColor, [globals_js_1.ColorScheme.PinLineColor], {}],
             [PlaceHolderCommands.textColor, [globals_js_1.ColorScheme.PinNameColor], {}],
-            [PlaceHolderCommands.lineWidth, [(0, ParamDefinition_js_1.numeric)(5)], {}],
+            [PlaceHolderCommands.lineWidth, [(0, NumericValue_js_1.numeric)(5)], {}],
             ...drawing.getCommands()
         ];
         drawing.log('id: ', drawing.id, 'angle: ', this._angle, "commands:", commands.length);
@@ -430,8 +430,8 @@ class SymbolPlaceholder extends SymbolGraphic {
                     drawing.addArc(...positionParams);
                     break;
                 case PlaceHolderCommands.circle:
-                    drawing.addArc(...positionParams, (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(180));
-                    drawing.addArc(...positionParams, (0, ParamDefinition_js_1.numeric)(180), (0, ParamDefinition_js_1.numeric)(360));
+                    drawing.addArc(...positionParams, (0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(180));
+                    drawing.addArc(...positionParams, (0, NumericValue_js_1.numeric)(180), (0, NumericValue_js_1.numeric)(360));
                     break;
                 case PlaceHolderCommands.triangle:
                     drawing.addTriangle(...positionParams);
@@ -464,8 +464,8 @@ class SymbolPlaceholder extends SymbolGraphic {
                 case PlaceHolderCommands.text: {
                     const style = this.parseLabelStyle(keywordParams);
                     const content = keywordParams.get('content');
-                    let offsetX = (0, ParamDefinition_js_1.numeric)(0);
-                    let offsetY = (0, ParamDefinition_js_1.numeric)(0);
+                    let offsetX = (0, NumericValue_js_1.numeric)(0);
+                    let offsetY = (0, NumericValue_js_1.numeric)(0);
                     if (keywordParams.has('offset')) {
                         const offset = keywordParams.get('offset');
                         offsetX = offset[0];
@@ -519,13 +519,13 @@ class SymbolPlaceholder extends SymbolGraphic {
         let displayPinName = true;
         if (keywordParams.has(keywordDisplayPinId)) {
             const value = keywordParams.get(keywordDisplayPinId);
-            displayPinId = ((value instanceof ParamDefinition_js_1.NumericValue && value.toNumber() === 0)
+            displayPinId = ((value instanceof NumericValue_js_1.NumericValue && value.toNumber() === 0)
                 || (value === 0)
                 || (value === false)) ? false : true;
         }
         if (keywordParams.has(keywordDisplayPinName)) {
             const value = keywordParams.get(keywordDisplayPinName);
-            displayPinName = ((value instanceof ParamDefinition_js_1.NumericValue && value.toNumber() === 0)
+            displayPinName = ((value instanceof NumericValue_js_1.NumericValue && value.toNumber() === 0)
                 || (value === 0)
                 || (value === false)) ? false : true;
         }
@@ -575,7 +575,7 @@ class SymbolPlaceholder extends SymbolGraphic {
                 (0, helpers_js_1.milsToMM)(endY)
             ];
         }
-        if (positionParams[0] instanceof ParamDefinition_js_1.NumericValue) {
+        if (positionParams[0] instanceof NumericValue_js_1.NumericValue) {
             positionParams[0] = new PinDefinition_js_1.PinId(positionParams[0].toNumber());
         }
         else if (typeof positionParams[0] === 'number' || typeof positionParams[0] === 'string') {
@@ -590,7 +590,7 @@ class SymbolPlaceholder extends SymbolGraphic {
         const offset2 = 15;
         let pinNameOffsetX = (0, helpers_js_1.milsToMM)(0);
         let pinNameOffsetY = (0, helpers_js_1.milsToMM)(0);
-        let pinIdOffsetX = (0, ParamDefinition_js_1.numeric)(0);
+        let pinIdOffsetX = (0, NumericValue_js_1.numeric)(0);
         let pinIdAlignment = geometry_js_1.HorizontalAlign.Left;
         let pinIdVAlignment = geometry_js_1.VerticalAlign.Bottom;
         let pinIdOffsetY = (0, helpers_js_1.milsToMM)(-offset2);
@@ -633,19 +633,19 @@ class SymbolPlaceholder extends SymbolGraphic {
         if (angleValue === 0 || angleValue === 90 || angleValue === 180 || angleValue === 270) {
             const usePinName = pinNameParam ?? "";
             displayPinName && usePinName !== "" && drawing.addLabel(endX.add(pinNameOffsetX), endY.add(pinNameOffsetY), usePinName, {
-                fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultPinNameTextSize),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.defaultPinNameTextSize),
                 anchor: pinNameAlignment,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: pinNameColor,
-                angle: (0, ParamDefinition_js_1.numeric)(usePinIdAngle)
+                angle: (0, NumericValue_js_1.numeric)(usePinIdAngle)
             });
             const pinDisplayText = pinId.toString();
             displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinDisplayText, {
-                fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultPinIdTextSize),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.defaultPinIdTextSize),
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
                 textColor: lineColor,
-                angle: (0, ParamDefinition_js_1.numeric)(usePinIdAngle)
+                angle: (0, NumericValue_js_1.numeric)(usePinIdAngle)
             });
         }
     }
@@ -710,7 +710,7 @@ class SymbolCustom extends SymbolGraphic {
         const { bodyWidth, bodyHeight } = this.calculateSize();
         const defaultLineColor = globals_js_1.ColorScheme.PinLineColor;
         drawing.addSetLineColor(defaultLineColor);
-        drawing.addSetLineWidth((0, ParamDefinition_js_1.numeric)(5));
+        drawing.addSetLineWidth((0, NumericValue_js_1.numeric)(5));
         const xBody = bodyWidth.half().neg();
         const yBody = bodyHeight.half().neg();
         drawing.addRectMM(xBody, yBody, bodyWidth, bodyHeight);
@@ -743,13 +743,13 @@ class SymbolCustom extends SymbolGraphic {
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
             });
             drawing.addLabel(leftPinStart.sub((0, helpers_js_1.milsToMM)(10)), pinY.sub((0, helpers_js_1.milsToMM)(10)), pin.pinId.toString(), {
-                fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Bottom,
                 textColor: defaultLineColor
@@ -760,13 +760,13 @@ class SymbolCustom extends SymbolGraphic {
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
             });
             drawing.addLabel(rightPinStart.add((0, helpers_js_1.milsToMM)(10)), pinY.sub((0, helpers_js_1.milsToMM)(10)), pin.pinId.toString(), {
-                fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Bottom,
                 textColor: defaultLineColor
@@ -777,18 +777,18 @@ class SymbolCustom extends SymbolGraphic {
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
-                angle: (0, ParamDefinition_js_1.numeric)(-90),
+                angle: (0, NumericValue_js_1.numeric)(-90),
             });
             drawing.addLabel(pinX.sub((0, helpers_js_1.milsToMM)(10)), topPinStart.sub((0, helpers_js_1.milsToMM)(10)), pin.pinId.toString(), {
-                fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Bottom,
                 textColor: defaultLineColor,
-                angle: (0, ParamDefinition_js_1.numeric)(-90),
+                angle: (0, NumericValue_js_1.numeric)(-90),
             });
         }
         for (const pin of bottomPins) {
@@ -796,23 +796,23 @@ class SymbolCustom extends SymbolGraphic {
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
-                angle: (0, ParamDefinition_js_1.numeric)(-90),
+                angle: (0, NumericValue_js_1.numeric)(-90),
             });
             drawing.addLabel(pinX.sub((0, helpers_js_1.milsToMM)(10)), bottomPinStart.add((0, helpers_js_1.milsToMM)(10)), pin.pinId.toString(), {
-                fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
+                fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinIdSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Bottom,
                 textColor: defaultLineColor,
-                angle: (0, ParamDefinition_js_1.numeric)(-90)
+                angle: (0, NumericValue_js_1.numeric)(-90)
             });
         }
         const instanceName = drawing.variables.get('refdes');
         instanceName && drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.neg().half().sub((0, helpers_js_1.milsToMM)(20)), instanceName, {
-            fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolRefDesSize),
+            fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolRefDesSize),
             anchor: geometry_js_1.HorizontalAlign.Left,
         });
         const acceptedMPNKeys = ['MPN', 'mpn', 'manufacturer_pn'];
@@ -820,7 +820,7 @@ class SymbolCustom extends SymbolGraphic {
             const labelValue = drawing.variables.get(key);
             if (labelValue !== undefined) {
                 drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.half().add((0, helpers_js_1.milsToMM)(20)), labelValue, {
-                    fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolParamTextSize),
+                    fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolParamTextSize),
                     anchor: geometry_js_1.HorizontalAlign.Left,
                     vanchor: geometry_js_1.VerticalAlign.Top,
                 });
@@ -834,7 +834,7 @@ class SymbolCustom extends SymbolGraphic {
         const maxBottomPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Bottom);
         const maxLeftPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Left);
         const maxRightPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Right);
-        const bodyWidthFromPins = (0, ParamDefinition_js_1.numeric)((1 + Math.max(maxTopPins, maxBottomPins)) * tmpPinSpacing);
+        const bodyWidthFromPins = (0, NumericValue_js_1.numeric)((1 + Math.max(maxTopPins, maxBottomPins)) * tmpPinSpacing);
         const bodyWidth = Math.max(bodyWidthFromPins.toNumber(), this.bodyWidth.toNumber());
         let tmpBodyHeight = 0;
         if (maxLeftPins === 0 && maxRightPins === 0) {
@@ -850,11 +850,11 @@ class SymbolCustom extends SymbolGraphic {
         const useWidth = bodyWidth
             + ((this._cacheLeftPins.length > 0) ? tmpPinLength : 0)
             + ((this._cacheRightPins.length > 0) ? tmpPinLength : 0);
-        this.width = (0, ParamDefinition_js_1.numeric)(useWidth);
-        this.height = (0, ParamDefinition_js_1.numeric)(useHeight);
+        this.width = (0, NumericValue_js_1.numeric)(useWidth);
+        this.height = (0, NumericValue_js_1.numeric)(useHeight);
         return {
-            bodyWidth: (0, ParamDefinition_js_1.numeric)(bodyWidth),
-            bodyHeight: (0, ParamDefinition_js_1.numeric)(bodyHeight),
+            bodyWidth: (0, NumericValue_js_1.numeric)(bodyWidth),
+            bodyHeight: (0, NumericValue_js_1.numeric)(bodyHeight),
             width: this.width,
             height: this.height
         };
@@ -883,7 +883,7 @@ class SymbolCustomModule extends SymbolCustom {
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
@@ -895,7 +895,7 @@ class SymbolCustomModule extends SymbolCustom {
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
@@ -907,11 +907,11 @@ class SymbolCustomModule extends SymbolCustom {
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
-                angle: (0, ParamDefinition_js_1.numeric)(-90),
+                angle: (0, NumericValue_js_1.numeric)(-90),
             });
         });
         bottomPins.forEach(pin => {
@@ -920,11 +920,11 @@ class SymbolCustomModule extends SymbolCustom {
             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),
+                fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
-                angle: (0, ParamDefinition_js_1.numeric)(-90),
+                angle: (0, NumericValue_js_1.numeric)(-90),
             });
         });
     }
@@ -937,7 +937,7 @@ class SymbolDrawing {
         this.angle = 0;
         this.flipX = 0;
         this.flipY = 0;
-        this.mainOrigin = [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)];
+        this.mainOrigin = [(0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0)];
         this.logger = null;
         this.variables = new Map();
     }
@@ -981,7 +981,7 @@ class SymbolDrawing {
         this.pins.push([
             pinId,
             geometry_js_1.Geometry.segment([startXMM, startYMM], [endXMM, endYMM]),
-            (0, ParamDefinition_js_1.numeric)(angle),
+            (0, NumericValue_js_1.numeric)(angle),
             lineColor
         ]);
         return this;
@@ -1023,10 +1023,10 @@ class SymbolDrawing {
         width = (0, helpers_js_1.milsToMM)(width);
         const line = geometry_js_1.Geometry.line(startX, startY, endX, endY);
         const normLine = line.norm;
-        const dx1 = (0, ParamDefinition_js_1.numeric)(normLine.x).mul(width).half();
-        const dy1 = (0, ParamDefinition_js_1.numeric)(normLine.y).mul(width).half();
-        const dx2 = (0, ParamDefinition_js_1.numeric)(normLine.x).mul(width.neg()).half();
-        const dy2 = (0, ParamDefinition_js_1.numeric)(normLine.y).mul(width.neg()).half();
+        const dx1 = (0, NumericValue_js_1.numeric)(normLine.x).mul(width).half();
+        const dy1 = (0, NumericValue_js_1.numeric)(normLine.y).mul(width).half();
+        const dx2 = (0, NumericValue_js_1.numeric)(normLine.x).mul(width.neg()).half();
+        const dy2 = (0, NumericValue_js_1.numeric)(normLine.y).mul(width.neg()).half();
         this.items.push(geometry_js_1.Geometry.polygon([
             [dx1.add(startX), dy1.add(startY)],
             [dx2.add(startX), dy2.add(startY)],
@@ -1057,11 +1057,11 @@ class SymbolDrawing {
         const arrowSize = (0, helpers_js_1.milsToMM)(30);
         if (portType === PinTypes_js_1.PinTypes.Any) {
             path = [
-                [(0, ParamDefinition_js_1.numeric)(0), height2.neg()],
+                [(0, NumericValue_js_1.numeric)(0), height2.neg()],
                 [width, height2.neg()],
                 [width, height2],
-                [(0, ParamDefinition_js_1.numeric)(0), height2],
-                [(0, ParamDefinition_js_1.numeric)(0), height2.neg()]
+                [(0, NumericValue_js_1.numeric)(0), height2],
+                [(0, NumericValue_js_1.numeric)(0), height2.neg()]
             ];
         }
         else if (portType === PinTypes_js_1.PinTypes.Output) {
@@ -1070,28 +1070,28 @@ class SymbolDrawing {
                 [width, height2.neg()],
                 [width, height2],
                 [arrowSize, height2],
-                [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)],
+                [(0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0)],
                 [arrowSize, height2.neg()]
             ];
         }
         else if (portType === PinTypes_js_1.PinTypes.Input) {
             path = [
-                [(0, ParamDefinition_js_1.numeric)(0), height2.neg()],
+                [(0, NumericValue_js_1.numeric)(0), height2.neg()],
                 [width.sub(arrowSize), height2.neg()],
-                [width, (0, ParamDefinition_js_1.numeric)(0)],
+                [width, (0, NumericValue_js_1.numeric)(0)],
                 [width.sub(arrowSize), height2],
-                [(0, ParamDefinition_js_1.numeric)(0), height2],
-                [(0, ParamDefinition_js_1.numeric)(0), height2.neg()],
+                [(0, NumericValue_js_1.numeric)(0), height2],
+                [(0, NumericValue_js_1.numeric)(0), height2.neg()],
             ];
         }
         else if (portType === PinTypes_js_1.PinTypes.IO) {
             path = [
                 [arrowSize, height2.neg()],
                 [width.sub(arrowSize), height2.neg()],
-                [width, (0, ParamDefinition_js_1.numeric)(0)],
+                [width, (0, NumericValue_js_1.numeric)(0)],
                 [width.sub(arrowSize), height2],
                 [arrowSize, height2],
-                [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)],
+                [(0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0)],
                 [arrowSize, height2.neg()],
             ];
         }
@@ -1112,9 +1112,9 @@ class SymbolDrawing {
                 accum = accum.concat(tmp.split(" "));
             }
             else if (typeof tmp === "number") {
-                accum.push((0, ParamDefinition_js_1.numeric)(tmp));
+                accum.push((0, NumericValue_js_1.numeric)(tmp));
             }
-            else if (tmp instanceof ParamDefinition_js_1.NumericValue) {
+            else if (tmp instanceof NumericValue_js_1.NumericValue) {
                 accum.push(tmp);
             }
             return accum;
@@ -1191,7 +1191,7 @@ class SymbolDrawing {
     }
     getPaths() {
         let currentFill = "#fff";
-        let currentLineWidth = (0, ParamDefinition_js_1.numeric)(1);
+        let currentLineWidth = (0, NumericValue_js_1.numeric)(1);
         let currentLineColor = '#333';
         const pathItems = [];
         this.items.forEach(item => {

package/dist/cjs/render/export.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SExpObject = exports._id = exports.IdObject = exports.printTree = exports.generateKiCadNetList = void 0;
 const globals_js_1 = require("../globals.js");
-const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const NumericValue_js_1 = require("../objects/NumericValue.js");
 function generateKiCadNetList(netlist) {
     const componentsList = [];
     const nets = {};
@@ -16,7 +16,7 @@ function generateKiCadNetList(netlist) {
             ];
             if (instance.parameters.has('value')) {
                 let value = instance.parameters.get('value');
-                if (value instanceof ParamDefinition_js_1.NumericValue) {
+                if (value instanceof NumericValue_js_1.NumericValue) {
                     value = value.value;
                 }
                 instanceDetails.push([Id('value'), value]);

package/dist/cjs/render/geometry.js

@@ -7,9 +7,8 @@ exports.VerticalAlignProp = exports.HorizontalAlignProp = exports.VerticalAlign
 const core_1 = __importDefault(require("@flatten-js/core"));
 const sizing_js_1 = require("../sizing.js");
 const globals_js_1 = require("../globals.js");
-const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const NumericValue_js_1 = require("../objects/NumericValue.js");
 const PinTypes_js_1 = require("../objects/PinTypes.js");
-const utils_js_1 = require("../utils.js");
 class Textbox extends core_1.default.Polygon {
     get box() {
         return this.polygon.box;
@@ -17,7 +16,7 @@ class Textbox extends core_1.default.Polygon {
     constructor(id, text, anchorPoint, polygon, style, bounds, label) {
         super(polygon.vertices);
         this.anchorPoint = [
-            (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)
+            (0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0)
         ];
         this.boundingBox = { width: -1, height: -1 };
         this.font = 'default';
@@ -36,7 +35,7 @@ class Textbox extends core_1.default.Polygon {
             useText = text.toString();
         }
         else if (typeof text === 'object'
-            && text instanceof ParamDefinition_js_1.NumericValue) {
+            && text instanceof NumericValue_js_1.NumericValue) {
             useText = text.toDisplayString();
         }
         else if (typeof text === 'string') {
@@ -45,7 +44,7 @@ class Textbox extends core_1.default.Polygon {
         else {
             throw 'Invalid string passed into textbox';
         }
-        const { fontSize = (0, ParamDefinition_js_1.numeric)(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
+        const { fontSize = (0, NumericValue_js_1.numeric)(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
         const { box } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize.mul(globals_js_1.fontDisplayScale).toNumber(), fontWeight, anchor, vanchor);
         let polygonCoords = [];
         let anchorOffsetX = 0;
@@ -111,8 +110,8 @@ class Textbox extends core_1.default.Polygon {
         const feature = super.rotate(angle, origin);
         const newAnchorPoint = this.transformAnchorPoint(segment => segment.rotate(angle, origin));
         const tmpAnchorPoint = [
-            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[0]),
-            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[1])
+            (0, NumericValue_js_1.numeric)(newAnchorPoint[0]),
+            (0, NumericValue_js_1.numeric)(newAnchorPoint[1])
         ];
         return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
@@ -120,8 +119,8 @@ class Textbox extends core_1.default.Polygon {
         const feature = super.transform(matrix);
         const newAnchorPoint = this.transformAnchorPoint(segment => segment.transform(matrix));
         const tmpAnchorPoint = [
-            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[0]),
-            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[1])
+            (0, NumericValue_js_1.numeric)(newAnchorPoint[0]),
+            (0, NumericValue_js_1.numeric)(newAnchorPoint[1])
         ];
         return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
@@ -185,7 +184,7 @@ class Geometry {
     static getCoords(item) {
         const points = item.vertices.map(vertex => {
             return [
-                (0, ParamDefinition_js_1.numeric)(vertex.x), (0, ParamDefinition_js_1.numeric)(vertex.y)
+                (0, NumericValue_js_1.numeric)(vertex.x), (0, NumericValue_js_1.numeric)(vertex.y)
             ];
         });
         return points;
@@ -321,8 +320,8 @@ class Geometry {
         const existingSegments = [];
         wirePoints.forEach(points => {
             const tmpPoints = points.map(pt => {
-                const roundedX = (0, utils_js_1.roundValue)(pt.x).toNumber();
-                const roundedY = (0, utils_js_1.roundValue)(pt.y).toNumber();
+                const roundedX = (0, NumericValue_js_1.roundValue)(pt.x).toNumber();
+                const roundedY = (0, NumericValue_js_1.roundValue)(pt.y).toNumber();
                 return new core_1.default.Point(roundedX, roundedY);
             });
             for (let i = 0; i < tmpPoints.length - 1; i++) {

package/dist/cjs/render/graph.js

@@ -31,7 +31,7 @@ const helpers_js_1 = require("../helpers.js");
 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 NumericValue_js_1 = require("../objects/NumericValue.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");
@@ -126,7 +126,7 @@ class NetGraph {
                             useNet = prevNodeItem.net;
                         }
                     }
-                    const renderWire = new layout_js_1.RenderWire(useNet, (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), wireSegments, wire);
+                    const renderWire = new layout_js_1.RenderWire(useNet, (0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0), wireSegments, wire);
                     renderWire.id = wireId;
                     renderWire.netName = useNet.toString();
                     const wireName = getWireName(renderWire.id);