circuitscript 0.0.38 → 0.1.2

package/dist/cjs/layout.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.LayoutEngine = void 0;
+exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.applyComponentParamsToSymbol = exports.LayoutEngine = void 0;
 const graphlib_1 = require("@dagrejs/graphlib");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const globals_js_1 = require("./globals.js");
-const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const geometry_js_1 = require("./geometry.js");
 const logger_js_1 = require("./logger.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const utils_js_1 = require("./utils.js");
 const types_js_1 = require("./objects/types.js");
 const helpers_js_1 = require("./helpers.js");
+const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 class LayoutEngine {
     constructor(options = { showBaseFrame: false }) {
         this.placeSubgraphVersion = 2;
@@ -116,8 +116,8 @@ class LayoutEngine {
             const allLines = wires.map(wire => {
                 return wire.points.map(pt => {
                     return {
-                        x: wire.x + pt.x,
-                        y: wire.y + pt.y,
+                        x: wire.x.add(pt.x),
+                        y: wire.y.add(pt.y),
                     };
                 });
             });
@@ -128,7 +128,7 @@ class LayoutEngine {
                 intersectPoints,
             });
             intersectPoints.forEach(([x, y]) => {
-                junctions.push(new RenderJunction(x, y));
+                junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y)));
             });
         }
         return {
@@ -138,15 +138,15 @@ class LayoutEngine {
     }
     placeFrames(graph, subgraphInfo, frameObjects) {
         const baseFrame = frameObjects[0];
-        baseFrame.padding = 0;
-        baseFrame.borderWidth = 0;
+        baseFrame.padding = (0, ParamDefinition_js_1.numeric)(0);
+        baseFrame.borderWidth = (0, ParamDefinition_js_1.numeric)(0);
         if (this.showBaseFrame) {
-            baseFrame.borderWidth = 5;
+            baseFrame.borderWidth = (0, ParamDefinition_js_1.numeric)(5);
             baseFrame.width = 11692 - 400 * 2;
             baseFrame.height = 8267 - 400 * 2;
         }
-        baseFrame.x = 0;
-        baseFrame.y = 0;
+        baseFrame.x = (0, ParamDefinition_js_1.numeric)(0);
+        baseFrame.y = (0, ParamDefinition_js_1.numeric)(0);
         let textObjects = [];
         let elementFrames = [];
         baseFrame.bounds = {
@@ -192,18 +192,18 @@ class LayoutEngine {
         const innerItems = frame.innerItems;
         innerItems.forEach(innerFrame => {
             if (innerFrame.frame.frameType === globals_js_1.FrameType.Sheet) {
-                innerFrame.x = 0;
-                innerFrame.y = 0;
+                innerFrame.x = (0, ParamDefinition_js_1.numeric)(0);
+                innerFrame.y = (0, ParamDefinition_js_1.numeric)(0);
             }
             else {
-                innerFrame.x += frame.x;
-                innerFrame.y += frame.y;
+                innerFrame.x = innerFrame.x.add(frame.x);
+                innerFrame.y = innerFrame.y.add(frame.y);
             }
             if (innerFrame.type === RenderFrameType.Elements) {
                 this.print(level, "".padStart(level * 4), 'element frame', innerFrame.x, innerFrame.y);
                 innerFrame.innerItems.forEach(item2 => {
-                    item2.x += innerFrame.x - innerFrame.translateX;
-                    item2.y += innerFrame.y - innerFrame.translateY;
+                    item2.x = item2.x.add(innerFrame.x).sub(innerFrame.translateX);
+                    item2.y = item2.y.add(innerFrame.y).sub(innerFrame.translateY);
                 });
             }
             else {
@@ -215,8 +215,8 @@ class LayoutEngine {
     placeAndSizeFrame(frame, level = 0) {
         const innerFrames = frame.innerItems;
         const gridSize = globals_js_1.defaultGridSizeUnits;
-        let accumX = 0;
-        let accumY = 0;
+        let accumX = (0, ParamDefinition_js_1.numeric)(0);
+        let accumY = (0, ParamDefinition_js_1.numeric)(0);
         const boundPoints = [];
         const frameSizes = innerFrames.map(innerFrame => {
             if (innerFrame.type === RenderFrameType.Elements) {
@@ -244,7 +244,7 @@ class LayoutEngine {
                     return accum;
                 }
                 return accum + width +
-                    ((index + 1 < frameSizes.length) ? frame.gap : 0);
+                    ((index + 1 < frameSizes.length) ? frame.gap.toNumber() : 0);
             }, 0);
         }
         else {
@@ -268,47 +268,55 @@ class LayoutEngine {
         innerFrames.forEach(innerFrame => {
             const { width: frameWidth, height: frameHeight } = (0, utils_js_1.getBoundsSize)(innerFrame.bounds);
             if (innerFrame.containsTitle) {
-                innerFrame.x = offsetX + accumX + (0, utils_js_1.toNearestGrid)(widthForTitle / 2 - frameWidth / 2, gridSize);
-                innerFrame.y = offsetY + accumY;
-                accumY += (frameHeight + frame.gap);
+                innerFrame.x = offsetX.add(accumX).add((0, utils_js_1.toNearestGrid)(widthForTitle / 2 - frameWidth / 2, gridSize));
+                innerFrame.y = offsetY.add(accumY);
+                accumY = accumY.add(frameHeight).add(frame.gap);
             }
             else {
                 if (frame.direction === Frame_js_1.FramePlotDirection.Column) {
-                    innerFrame.x = offsetX + accumX + (0, utils_js_1.toNearestGrid)(maxWidth / 2 - frameWidth / 2, gridSize);
-                    innerFrame.y = offsetY + accumY;
-                    accumY += (frameHeight + frame.gap);
+                    innerFrame.x = offsetX.add(accumX).add((0, utils_js_1.toNearestGrid)(maxWidth / 2 - frameWidth / 2, gridSize));
+                    innerFrame.y = offsetY.add(accumY);
+                    accumY = accumY.add(frameHeight).add(frame.gap);
                 }
                 else if (frame.direction === Frame_js_1.FramePlotDirection.Row) {
-                    innerFrame.x = offsetX + centeredOffsetX + accumX;
-                    innerFrame.y = offsetY + accumY;
-                    accumX += (frameWidth + frame.gap);
+                    innerFrame.x = offsetX.add(centeredOffsetX).add(accumX);
+                    innerFrame.y = offsetY.add(accumY);
+                    accumX = accumX.add(frameWidth).add(frame.gap);
                 }
             }
-            boundPoints.push([innerFrame.x, innerFrame.y], [innerFrame.x + frameWidth, innerFrame.y + frameHeight]);
+            boundPoints.push([innerFrame.x, innerFrame.y], [innerFrame.x.add(frameWidth), innerFrame.y.add(frameHeight)]);
+        });
+        const tmpBoundPoints = boundPoints.map(item => {
+            return [
+                item[0].toNumber(),
+                item[1].toNumber(),
+            ];
         });
-        const contentsBounds = (0, utils_js_1.resizeBounds)(getBoundsFromPoints(boundPoints), frame.padding);
+        const contentsBounds = (0, utils_js_1.resizeBounds)(getBoundsFromPoints(tmpBoundPoints), frame.padding.toNumber());
         if (frame.frame.parameters.has(Frame_js_1.FrameParamKeys.SheetType)) {
             const frameComponent = frame.frame.parameters.get(Frame_js_1.FrameParamKeys.SheetType);
-            const rects = ExtractDrawingRects(frameComponent.displayProp);
-            let frameWidth = 0;
-            let frameHeight = 0;
+            const frameDrawing = frameComponent.displayProp;
+            frameDrawing.variables = (0, utils_js_1.combineMaps)(frameComponent.parameters, frame.frame.parameters);
+            const rects = ExtractDrawingRects(frameDrawing);
+            let frameWidth = (0, ParamDefinition_js_1.numeric)(0);
+            let frameHeight = (0, ParamDefinition_js_1.numeric)(0);
             if (rects[1]) {
                 frameWidth = (0, helpers_js_1.milsToMM)(rects[1].width);
                 frameHeight = (0, helpers_js_1.milsToMM)(rects[1].height);
             }
             const contentsWidth = contentsBounds.xmax - contentsBounds.xmin;
             const contentsHeight = contentsBounds.ymax - contentsBounds.ymin;
-            const frameOffsetX = (0, utils_js_1.toNearestGrid)((frameWidth - contentsWidth) / 2, gridSize);
-            const frameOffsetY = (0, utils_js_1.toNearestGrid)((frameHeight - contentsHeight) / 2, gridSize);
+            const frameOffsetX = (0, utils_js_1.toNearestGrid)((frameWidth.toNumber() - contentsWidth) / 2, gridSize);
+            const frameOffsetY = (0, utils_js_1.toNearestGrid)((frameHeight.toNumber() - contentsHeight) / 2, gridSize);
             innerFrames.forEach(innerFrame => {
-                innerFrame.x += frameOffsetX;
-                innerFrame.y += frameOffsetY;
+                innerFrame.x = innerFrame.x.add(frameOffsetX);
+                innerFrame.y = innerFrame.y.add(frameOffsetY);
             });
             frame.bounds = {
                 xmin: 0,
                 ymin: 0,
-                xmax: frameWidth,
-                ymax: frameHeight
+                xmax: frameWidth.toNumber(),
+                ymax: frameHeight.toNumber(),
             };
         }
         else {
@@ -375,13 +383,14 @@ class LayoutEngine {
         }, []);
         if (frame.type === RenderFrameType.Container) {
             const frameObject = frame.frame;
-            if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Title)) {
+            const isSheetFrame = frameObject.frameType === globals_js_1.FrameType.Sheet;
+            if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Title) && !isSheetFrame) {
                 const title = frameObject.parameters.get(Frame_js_1.FrameParamKeys.Title);
                 const tmpFrame = new RenderFrame(new Frame_js_1.Frame(-2), RenderFrameType.Elements);
                 tmpFrame.containsTitle = true;
                 tmpFrame.subgraphId = title.replace(/\s/g, "_");
                 const textObject = new RenderText(title);
-                textObject.fontSize = globals_js_1.defaultFrameTitleTextSize;
+                textObject.fontSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultFrameTitleTextSize);
                 textObject.fontWeight = 'bold';
                 textObject.symbol.refreshDrawing();
                 tmpFrame.innerItems.push(textObject);
@@ -392,8 +401,8 @@ class LayoutEngine {
                     xmax: tmpBox.start[0] + tmpBox.width,
                     ymax: tmpBox.start[1] + tmpBox.height
                 };
-                textObject.x = 0;
-                textObject.y = 0;
+                textObject.x = (0, ParamDefinition_js_1.numeric)(0);
+                textObject.y = (0, ParamDefinition_js_1.numeric)(0);
                 frame.innerItems.splice(0, 0, tmpFrame);
                 this.printLevel(level, frame, 'added text', tmpFrame);
                 textObjects.push(textObject);
@@ -426,46 +435,43 @@ class LayoutEngine {
                 const tmpInstanceName = component.instanceName;
                 if (!graph.hasNode(tmpInstanceName)) {
                     this.print('create instance', tmpInstanceName);
-                    let { displayProp = null, widthProp = null, typeProp = null } = component;
+                    const { displayProp = null, widthProp = null, heightProp = null } = component;
                     let tmpSymbol;
-                    if (displayProp === null &&
-                        component.parameters.get(globals_js_1.ParamKeys.net_name) === globals_js_1.GlobalNames.gnd) {
-                        displayProp = 'gnd';
-                    }
-                    if (displayProp !== null) {
-                        if (displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
-                            tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
-                            tmpSymbol.drawing.logger = this.logger;
-                        }
-                        else if (typeof displayProp === "string") {
-                            tmpSymbol = (0, draw_symbols_js_1.SymbolFactory)(displayProp);
-                        }
+                    if (displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
+                        tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
+                        tmpSymbol.drawing.logger = this.logger;
                     }
                     else {
                         const symbolPinDefinitions = generateLayoutPinDefinition(component);
-                        if (component.typeProp === 'module') {
-                            tmpSymbol = new draw_symbols_js_1.SymbolCustomModule(symbolPinDefinitions);
+                        if (component.typeProp === globals_js_1.ComponentTypes.module) {
+                            tmpSymbol = new draw_symbols_js_1.SymbolCustomModule(symbolPinDefinitions, component.pinsMaxPositions);
                         }
                         else {
-                            tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions);
+                            tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions, component.pinsMaxPositions);
                         }
                     }
-                    applyComponentParamsToSymbol(typeProp, component, tmpSymbol);
+                    applyComponentParamsToSymbol(component, tmpSymbol);
                     let didSetAngle = false;
-                    if (component.parameters.has('angle')) {
+                    if (component.parameters.has(globals_js_1.ParamKeys.angle)) {
                         didSetAngle = true;
-                        tmpSymbol.angle = component.parameters.get('angle');
+                        const value = component.parameters.get(globals_js_1.ParamKeys.angle).toNumber();
+                        tmpSymbol.angle = value;
                     }
-                    if (component.parameters.has('flipX')) {
+                    if (component.parameters.has(globals_js_1.ParamKeys.flipX)) {
                         tmpSymbol.flipX =
-                            component.parameters.get('flipX');
+                            component.parameters.get(globals_js_1.ParamKeys.flipX);
                     }
-                    if (component.parameters.has('flipY')) {
+                    if (component.parameters.has(globals_js_1.ParamKeys.flipY)) {
                         tmpSymbol.flipY =
-                            component.parameters.get('flipY');
+                            component.parameters.get(globals_js_1.ParamKeys.flipY);
                     }
-                    if (tmpSymbol instanceof draw_symbols_js_1.SymbolCustom && widthProp) {
-                        tmpSymbol.bodyWidth = (0, helpers_js_1.milsToMM)(widthProp);
+                    if (tmpSymbol instanceof draw_symbols_js_1.SymbolCustom) {
+                        if (widthProp) {
+                            tmpSymbol.bodyWidth = (0, helpers_js_1.milsToMM)(widthProp);
+                        }
+                        if (heightProp) {
+                            tmpSymbol.bodyHeight = (0, helpers_js_1.milsToMM)(heightProp);
+                        }
                     }
                     if (!didSetAngle && component.parameters.has('_addDirection')) {
                         tmpSymbol.refreshDrawing(false);
@@ -487,7 +493,7 @@ class LayoutEngine {
             }
             else if (action === ExecutionScope_js_1.SequenceAction.Wire) {
                 const [, wireId, wireSegments] = sequence[i];
-                const wire = new RenderWire(0, 0, wireSegments);
+                const wire = new RenderWire((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), wireSegments);
                 wire.id = wireId;
                 let useNetName = null;
                 if (previousNode !== null) {
@@ -651,7 +657,7 @@ class LayoutEngine {
         }
         if (subgraphEdges.length === 0) {
             const [, node1] = graph.node(firstNodeId);
-            this.placeNodeAtPosition(0, 0, node1, 1);
+            this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, 1);
             return;
         }
         let fixedNode;
@@ -664,7 +670,7 @@ class LayoutEngine {
             const [, node2] = graph.node(nodeId2);
             if (nodeId1 === firstNodeId && !firstNodePlaced) {
                 this.print('first node placed at origin');
-                this.placeNodeAtPosition(0, 0, node1, pin1);
+                this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, pin1);
                 firstNodePlaced = true;
                 node1.isFloating = false;
                 originNodes.push(node1);
@@ -687,7 +693,7 @@ class LayoutEngine {
                 originNodes.push(node1);
                 originNodeGroups.set(node1.toString(), [node1]);
                 this.print('creating new origin node at', node1);
-                this.placeNodeAtPosition(0, 0, node1, pin1);
+                this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, pin1);
                 node1.isFloating = false;
                 fixedNode = node1;
                 fixedNodePin = pin1;
@@ -704,7 +710,7 @@ class LayoutEngine {
                 else {
                     const [x1, y1] = getNodePositionAtPin(node1, pin1);
                     const [x2, y2] = getNodePositionAtPin(node2, pin2);
-                    if (x1 !== x2 && y1 !== y2) {
+                    if (!x1.eq(x2) && !y1.eq(y2)) {
                         if (node1 instanceof RenderWire &&
                             node2 instanceof RenderComponent) {
                             const refdes = node2.component.assignedRefDes;
@@ -781,8 +787,8 @@ class LayoutEngine {
         this.print('merging origin node groups, fixed:', keepOriginNode, ', other:', otherOriginNode);
         const [x, y] = getNodePositionAtPin(fixedNode, fixedNodePin);
         const [otherNodeOriginX, otherNodeOriginY] = getNodePositionAtPin(mergedNode, mergedNodePin);
-        const offsetX = x - otherNodeOriginX;
-        const offsetY = y - otherNodeOriginY;
+        const offsetX = x.sub(otherNodeOriginX);
+        const offsetY = y.sub(otherNodeOriginY);
         this.print('offset of other origin:', offsetX, offsetY);
         const otherItemsLinkedToOriginNode = originNodeGroups.get(otherOriginNode);
         this.print('nodes in other origin:', otherItemsLinkedToOriginNode);
@@ -804,7 +810,7 @@ class LayoutEngine {
             const [, node2] = graph.node(nodeId2);
             if (nodeId1 === firstNodeId && !firstNodePlaced) {
                 this.print('first node placed at origin');
-                this.placeNodeAtPosition(0, 0, node1, pin1);
+                this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, pin1);
                 firstNodePlaced = true;
                 node1.isFloating = false;
             }
@@ -850,14 +856,14 @@ class LayoutEngine {
         });
     }
     translateNodeBy(offsetX, offsetY, item) {
-        item.x += offsetX;
-        item.y += offsetY;
+        item.x = item.x.add(offsetX);
+        item.y = item.y.add(offsetY);
     }
     placeNodeAtPosition(fromX, fromY, item, pin, depth = 0) {
         if (item instanceof RenderComponent) {
             const pinPosition = item.symbol.pinPosition(pin);
-            item.x = fromX - pinPosition.x;
-            item.y = fromY - pinPosition.y;
+            item.x = fromX.sub(pinPosition.x);
+            item.y = fromY.sub(pinPosition.y);
         }
         else if (item instanceof RenderWire) {
             if (pin === 0) {
@@ -866,8 +872,8 @@ class LayoutEngine {
             }
             else {
                 const wireEnd = item.getWireEnd();
-                item.x = fromX - wireEnd.x;
-                item.y = fromY - wireEnd.y;
+                item.x = fromX.sub(wireEnd.x);
+                item.y = fromY.sub(wireEnd.y);
             }
         }
         this.print(this.padLevel(depth), 'place', item, 'pin', pin, 'at', item.x, item.y);
@@ -907,12 +913,12 @@ class LayoutEngine {
 }
 exports.LayoutEngine = LayoutEngine;
 function getNodePositionAtPin(item, pin) {
-    let x = 0;
-    let y = 0;
+    let x = (0, ParamDefinition_js_1.numeric)(0);
+    let y = (0, ParamDefinition_js_1.numeric)(0);
     if (item instanceof RenderComponent) {
         const pinPosition = item.symbol.pinPosition(pin);
-        x = item.x + pinPosition.x;
-        y = item.y + pinPosition.y;
+        x = item.x.add(pinPosition.x);
+        y = item.y.add(pinPosition.y);
     }
     else if (item instanceof RenderWire) {
         if (pin === 0) {
@@ -921,8 +927,8 @@ function getNodePositionAtPin(item, pin) {
         }
         else {
             const wireEnd = item.getWireEnd();
-            x = item.x + wireEnd.x;
-            y = item.y + wireEnd.y;
+            x = item.x.add(wireEnd.x);
+            y = item.y.add(wireEnd.y);
         }
     }
     return [
@@ -955,7 +961,7 @@ function generateLayoutPinDefinition(component) {
             const pinPosition = Math.floor(i / 2);
             const pin = pins.get(existingPinIds[i]);
             symbolPinDefinitions.push({
-                side: (i % 2 === 0) ? "left" : "right",
+                side: (i % 2 === 0) ? globals_js_1.SymbolPinSide.Left : globals_js_1.SymbolPinSide.Right,
                 pinId: existingPinIds[i],
                 text: pin.name,
                 position: pinPosition,
@@ -974,24 +980,24 @@ function generateLayoutPinDefinition(component) {
                 useItems = [...items];
             }
             useItems.forEach(pinId => {
-                if (existingPinIds.indexOf(pinId) !== -1) {
-                    const pin = pins.get(pinId);
-                    symbolPinDefinitions.push({
-                        side: key,
-                        pinId: pinId,
-                        text: pin.name,
-                        position: pin.position,
-                        pinType: pin.pinType,
-                    });
-                    addedPins.push(pinId);
+                if (pinId instanceof ParamDefinition_js_1.NumericValue) {
+                    const pinIdValue = pinId.toNumber();
+                    if (existingPinIds.indexOf(pinIdValue) !== -1) {
+                        const pin = pins.get(pinIdValue);
+                        symbolPinDefinitions.push({
+                            side: key,
+                            pinId: pinIdValue,
+                            text: pin.name,
+                            position: pin.position,
+                            pinType: pin.pinType,
+                        });
+                        addedPins.push(pinIdValue);
+                    }
                 }
             });
         }
-        const unplacedPins = [];
-        existingPinIds.forEach(item => {
-            if (addedPins.indexOf(item) === -1) {
-                unplacedPins.push(item);
-            }
+        const unplacedPins = existingPinIds.filter(pinId => {
+            return addedPins.indexOf(pinId) === -1;
         });
         if (unplacedPins.length > 0) {
             throw "'arrange' property is defined, but not all pins are specified: " + unplacedPins.join(",");
@@ -999,29 +1005,14 @@ function generateLayoutPinDefinition(component) {
     }
     return symbolPinDefinitions;
 }
-function applyComponentParamsToSymbol(typeProp, component, symbol) {
-    if (typeProp === 'net') {
-        symbol.setLabelValue("net_name", component.parameters.get(globals_js_1.ParamKeys.net_name));
-    }
-    if (component.assignedRefDes !== null) {
-        symbol.setLabelValue("refdes", component.assignedRefDes);
-    }
-    for (const [key, value] of component.parameters) {
-        if (key !== 'refdes' && key !== 'net_name') {
-            let useValue;
-            if (typeof value == 'object' && (value instanceof ParamDefinition_js_1.NumericValue)) {
-                useValue = value.toDisplayString();
-            }
-            else if (typeof value === 'number') {
-                useValue = value.toString();
-            }
-            else if (typeof value === 'string') {
-                useValue = value;
-            }
-            symbol.setLabelValue(key, useValue);
-        }
+function applyComponentParamsToSymbol(component, symbol) {
+    const newMap = new Map(component.parameters);
+    if (!newMap.has('refdes')) {
+        newMap.set('refdes', component.assignedRefDes ?? "?");
     }
+    symbol.drawing.variables = newMap;
 }
+exports.applyComponentParamsToSymbol = applyComponentParamsToSymbol;
 function calculateSymbolAngle(symbol, pin, direction) {
     let directionVector = 0;
     switch (direction) {
@@ -1048,21 +1039,21 @@ function getBounds(components, wires, junctions, frames) {
         const bbox = item.symbol.drawing.getBoundingBox();
         const [x1, y1] = bbox.start;
         const [x2, y2] = bbox.end;
-        points.push([x1 + item.x, y1 + item.y]);
-        points.push([x2 + item.x, y2 + item.y]);
+        points.push([x1 + item.x.toNumber(), y1 + item.y.toNumber()]);
+        points.push([x2 + item.x.toNumber(), y2 + item.y.toNumber()]);
     });
     wires.forEach(wire => {
         wire.points.forEach(point => {
-            points.push([wire.x + point.x, wire.y + point.y]);
+            points.push([wire.x.add(point.x).toNumber(), wire.y.add(point.y).toNumber()]);
         });
     });
     junctions.forEach(item => {
-        points.push([item.x, item.y]);
+        points.push([item.x.toNumber(), item.y.toNumber()]);
     });
     frames.forEach(item => {
         const { width, height } = (0, utils_js_1.getBoundsSize)(item.bounds);
-        points.push([item.x, item.y]);
-        points.push([item.x + width, item.y + height]);
+        points.push([item.x.toNumber(), item.y.toNumber()]);
+        points.push([item.x.toNumber() + width, item.y.toNumber() + height]);
     });
     return getBoundsFromPoints(points);
 }
@@ -1080,8 +1071,8 @@ function getBoundsFromPoints(points) {
 }
 class RenderObject {
     constructor() {
-        this.x = -1;
-        this.y = -1;
+        this.x = (0, ParamDefinition_js_1.numeric)(-1);
+        this.y = (0, ParamDefinition_js_1.numeric)(-1);
         this.isFloating = true;
         this.floatingRelativeTo = [];
     }
@@ -1124,7 +1115,7 @@ class RenderWire extends RenderObject {
                 tmpX += useValue;
             }
             else if (direction === globals_js_1.WireAutoDirection.Auto || direction === globals_js_1.WireAutoDirection.Auto_) {
-                const { valueXY = [0, 0] } = segment;
+                const { valueXY = [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)] } = segment;
                 const tmpPoints = this.getAutoPoints(valueXY, direction);
                 tmpPoints.forEach(point => {
                     if (point[0] !== 0 || point[1] !== 0) {
@@ -1142,8 +1133,8 @@ class RenderWire extends RenderObject {
         this.points = points;
     }
     getAutoPoints(value, direction) {
-        const valueX = (0, utils_js_1.roundValue)(value[0]);
-        const valueY = (0, utils_js_1.roundValue)(value[1]);
+        const valueX = (0, utils_js_1.roundValue)(value[0]).toNumber();
+        const valueY = (0, utils_js_1.roundValue)(value[1]).toNumber();
         const inQuadrant = geometry_js_1.Geometry.getQuadrant(valueX, valueY);
         const [dx, dy] = [valueX, valueY];
         if (direction === globals_js_1.WireAutoDirection.Auto) {
@@ -1199,16 +1190,16 @@ class RenderWire extends RenderObject {
                 useValue = value;
             }
             if (direction === types_js_1.Direction.Down) {
-                tmpY += useValue;
+                tmpY = tmpY.add(useValue);
             }
             else if (direction === types_js_1.Direction.Up) {
-                tmpY -= useValue;
+                tmpY = tmpY.sub(useValue);
             }
             else if (direction === types_js_1.Direction.Left) {
-                tmpX -= useValue;
+                tmpX = tmpX.sub(useValue);
             }
             else if (direction === types_js_1.Direction.Right) {
-                tmpX += useValue;
+                tmpX = tmpX.add(useValue);
             }
         });
         let useValue = null;
@@ -1216,22 +1207,22 @@ class RenderWire extends RenderObject {
         const lastSegment = this.segments[this.segments.length - 1];
         switch (lastSegment.direction) {
             case types_js_1.Direction.Left:
-                useValue = tmpX - untilX;
+                useValue = tmpX.sub(untilX);
                 break;
             case types_js_1.Direction.Right:
-                useValue = untilX - tmpX;
+                useValue = untilX.sub(tmpX);
                 break;
             case types_js_1.Direction.Up:
-                useValue = untilY - tmpY;
+                useValue = untilY.sub(tmpY);
                 break;
             case types_js_1.Direction.Down:
-                useValue = tmpY - untilY;
+                useValue = tmpY.sub(untilY);
                 break;
             case globals_js_1.WireAutoDirection.Auto:
             case globals_js_1.WireAutoDirection.Auto_:
                 valueXY = [
-                    untilX - tmpX,
-                    untilY - tmpY,
+                    untilX.sub(tmpX),
+                    untilY.sub(tmpY),
                 ];
                 useValue = 0;
                 break;
@@ -1282,7 +1273,7 @@ class RenderText extends RenderObject {
     }
     constructor(text) {
         super();
-        this._fontSize = 12;
+        this._fontSize = (0, ParamDefinition_js_1.numeric)(12);
         this._fontWeight = 'regular';
         this.symbol = new draw_symbols_js_1.SymbolText(text);
     }
@@ -1297,11 +1288,10 @@ class RenderFrame extends RenderObject {
         this.translateY = 0;
         this.padding = (0, helpers_js_1.milsToMM)(100);
         this.gap = (0, helpers_js_1.milsToMM)(100);
+        this.borderWidth = (0, ParamDefinition_js_1.numeric)(5);
         this.direction = Frame_js_1.FramePlotDirection.Column;
-        this.borderWidth = 5;
         this.width = null;
         this.height = null;
-        this.size = null;
         this.subgraphId = "";
         this.containsTitle = false;
         this.frame = frame;
@@ -1315,7 +1305,8 @@ class RenderFrame extends RenderObject {
         else if (this.type === RenderFrameType.Elements) {
             name = 'elements_' + this.subgraphId;
         }
-        return name + ": " + this.x + "," + this.y + " bounds:" + (0, utils_js_1.printBounds)(this.bounds);
+        return name + ": " + this.x + "," + this.y
+            + " bounds:" + (this.bounds && (0, utils_js_1.printBounds)(this.bounds));
     }
 }
 exports.RenderFrame = RenderFrame;
@@ -1340,8 +1331,9 @@ function CalculatePinPositions(component) {
     }
     else {
         const symbolPinDefinitions = generateLayoutPinDefinition(component);
-        tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions);
+        tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions, component.pinsMaxPositions);
     }
+    applyComponentParamsToSymbol(component, tmpSymbol);
     tmpSymbol.refreshDrawing();
     const pins = component.pins;
     pins.forEach((value, key) => {

package/dist/cjs/logger.js

@@ -7,7 +7,14 @@ class Logger {
         this.add((new Date()).toISOString());
         this.add('starting logger...');
     }
-    add(message) {
+    add(...args) {
+        let message = "";
+        if (args.length === 1) {
+            message = args[0].toString();
+        }
+        else {
+            message = args.join(" ");
+        }
         this.logs.push((new Date()).toISOString() + " | " + message);
     }
     dump() {