circuitscript 0.1.0 → 0.1.2

package/dist/cjs/execute.js

@@ -5,11 +5,14 @@ const globals_js_1 = require("./globals.js");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const Net_js_1 = require("./objects/Net.js");
+const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 const types_js_1 = require("./objects/types.js");
 const Wire_js_1 = require("./objects/Wire.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const layout_js_1 = require("./layout.js");
+const helpers_js_1 = require("./helpers.js");
+const draw_symbols_js_1 = require("./draw_symbols.js");
 class ExecutionContext {
     constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
         this.tmpPointId = 0;
@@ -52,27 +55,14 @@ class ExecutionContext {
     }
     setupRoot() {
         const componentRoot = ClassComponent_js_1.ClassComponent.simple(globals_js_1.GlobalNames.__root, 1, '__root');
-        componentRoot.typeProp = globals_js_1.ComponentTypes.point;
-        componentRoot.displayProp = 'point';
+        componentRoot.typeProp = globals_js_1.ComponentTypes.net;
+        componentRoot.displayProp = this.getPointSymbol();
         this.scope.instances.set(globals_js_1.GlobalNames.__root, componentRoot);
-        this.scope.currentComponent = componentRoot;
-        this.scope.currentPin = componentRoot.getDefaultPin();
+        this.scope.setCurrent(componentRoot);
         this.scope.componentRoot = componentRoot;
     }
-    getUniqueInstanceName(className) {
-        let extraPrefix = '';
-        switch (className) {
-            case globals_js_1.GlobalNames.DefaultResistor:
-                extraPrefix = 'R_';
-                break;
-            case globals_js_1.GlobalNames.DefaultCapacitor:
-                extraPrefix = 'C_';
-                break;
-            case globals_js_1.GlobalNames.DefaultInductor:
-                extraPrefix = 'L_';
-                break;
-        }
-        const tmpName = extraPrefix + 'COMP_' + this.scope.unnamedCounter;
+    getUniqueInstanceName() {
+        const tmpName = 'COMP_' + this.scope.unnamedCounter;
         this.scope.unnamedCounter += 1;
         return tmpName;
     }
@@ -85,14 +75,8 @@ class ExecutionContext {
         return [this.scope.currentComponent, this.scope.currentPin];
     }
     linkComponentPinNet(component1, component1Pin, component2, component2Pin) {
-        const net1_exists = this.scope.hasNet(component1, component1Pin);
-        const net2_exists = this.scope.hasNet(component2, component2Pin);
-        const net1 = net1_exists
-            ? this.scope.getNet(component1, component1Pin)
-            : null;
-        const net2 = net2_exists
-            ? this.scope.getNet(component2, component2Pin)
-            : null;
+        const net1 = this.scope.getNet(component1, component1Pin);
+        const net2 = this.scope.getNet(component2, component2Pin);
         this.log('link nets', component1, component1Pin, net1, 'to', component2, component2Pin, net2);
         let returnNet;
         if (net1 === null && net2 === null) {
@@ -114,43 +98,43 @@ class ExecutionContext {
                 returnNet = this.mergeNets(net1, net2);
             }
             else {
-                return net1;
+                returnNet = net1;
             }
         }
+        this.log('final net after link: ', returnNet);
         return returnNet;
     }
     mergeNets(net1, net2) {
         if (net1 === net2) {
             return net1;
         }
-        let tmpNet;
         if (net2.priority > net1.priority) {
-            tmpNet = net1;
+            const tmpNet = net1;
             net1 = net2;
             net2 = tmpNet;
         }
-        const scopeNets = this.scope.getNets();
-        scopeNets.forEach(([component, pin, net]) => {
+        this.scope.getNets().forEach(([component, pin, net]) => {
             if (Net_js_1.Net.isSame(net, net2)) {
                 this.scope.setNet(component, pin, net1);
             }
         });
         return net1;
     }
-    createComponent(instanceName, pins, params, props) {
-        const numPins = pins.length;
-        const component = new ClassComponent_js_1.ClassComponent(instanceName, numPins, globals_js_1.GlobalNames.symbol);
+    createComponent(instanceName, pins, params, props, isModule = false) {
+        const className = isModule ? ClassComponent_js_1.ModuleComponent : ClassComponent_js_1.ClassComponent;
+        const component = new className(instanceName, pins.length);
         pins.forEach((pin) => {
             component.pins.set(pin.id, pin);
         });
         component.arrangeProps = props.arrange ?? null;
         component.displayProp = props.display ?? null;
         component.widthProp = props.width ?? null;
+        component.heightProp = props.height ?? null;
         component.typeProp = props.type ?? null;
         component.copyProp = props.copy ?? false;
         let useAngle = null;
         if (props.angle) {
-            useAngle = props.angle % 360;
+            useAngle = props.angle.toNumber() % 360;
             if (useAngle < 0) {
                 useAngle += 360;
             }
@@ -162,10 +146,12 @@ class ExecutionContext {
             component.parameters.set(param.paramName, param.paramValue);
             paramsMap.set(param.paramName, param.paramValue);
         });
-        if (component.typeProp === globals_js_1.ComponentTypes.net
-            || component.typeProp === globals_js_1.ComponentTypes.label) {
+        if (component.typeProp === globals_js_1.ComponentTypes.net) {
             const netName = paramsMap.get(globals_js_1.ParamKeys.net_name);
-            const priority = paramsMap.get(globals_js_1.ParamKeys.priority);
+            let priority = 0;
+            if (paramsMap.has(globals_js_1.ParamKeys.priority)) {
+                priority = paramsMap.get(globals_js_1.ParamKeys.priority).toNumber();
+            }
             const result = this.resolveNet(netName, this.netNamespace);
             let tmpNet;
             if (result.found) {
@@ -179,8 +165,9 @@ class ExecutionContext {
             this.scope.setNet(component, 1, tmpNet);
             this.log('set net', netName, 'component', component);
         }
-        const portSides = getPortSide(component.pins, component.arrangeProps);
-        portSides.forEach(({ pinId, side, position }) => {
+        const { pins: pinSides, maxPositions } = getPortSide(component.pins, component.arrangeProps);
+        component.pinsMaxPositions = maxPositions;
+        pinSides.forEach(({ pinId, side, position }) => {
             if (component.pins.has(pinId)) {
                 const tmpPin = component.pins.get(pinId);
                 tmpPin.side = side;
@@ -211,10 +198,9 @@ class ExecutionContext {
             this.scope.currentPin + ' ' + netString);
     }
     addComponentExisting(component, pin) {
-        const startPin = pin;
-        const nextPin = component.getNextPinAfter(startPin);
+        const nextPin = component.getNextPinAfter(pin);
         this.applyComponentAngleFromWire(component, pin);
-        this.toComponent(component, startPin, { addSequence: true });
+        this.toComponent(component, pin, { addSequence: true });
         this.log('move to next pin: ' + nextPin);
         this.atComponent(component, nextPin, {
             addSequence: true
@@ -250,13 +236,10 @@ class ExecutionContext {
         }
         const linkedNet = this.linkComponentPinNet(this.scope.currentComponent, this.scope.currentPin, component, pinId);
         this.applyComponentAngleFromWire(component, pinId);
-        this.scope.currentComponent = component;
-        this.scope.currentPin = pinId;
+        this.scope.setCurrent(component, pinId);
         this.scope.clearActive();
         if (addSequence) {
             if (this.scope.sequence.length > 0) {
-                if (component.pinWires.has(pinId) && component.typeProp !== globals_js_1.ComponentTypes.point) {
-                }
                 const [entryType, , segments] = this.scope.sequence[this.scope.sequence.length - 1];
                 if (entryType === ExecutionScope_js_1.SequenceAction.Wire && isWireSegmentsEndAuto(segments)) {
                     segments[segments.length - 1].until = [
@@ -274,7 +257,6 @@ class ExecutionContext {
     atComponent(component, pinId, options) {
         this.log('at component');
         const { addSequence = false } = options ?? {};
-        this.scope.currentComponent = component;
         let usePinId;
         if (pinId === null) {
             usePinId = component.getDefaultPin();
@@ -287,9 +269,7 @@ class ExecutionContext {
                 throw 'Invalid pin number ' + pinId + ' in ' + component;
             }
         }
-        if (usePinId) {
-            this.scope.currentPin = usePinId;
-        }
+        this.scope.setCurrent(component, usePinId);
         this.scope.clearActive();
         if (addSequence) {
             this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.At,
@@ -316,12 +296,9 @@ class ExecutionContext {
         return componentCopy;
     }
     enterBlocks(blockType) {
-        if (blockType === globals_js_1.BlockTypes.Point) {
-            this.addPoint(`_point.${this.name}.${this.tmpPointId}`, false);
-            this.tmpPointId += 1;
-        }
-        else if (blockType === globals_js_1.BlockTypes.Parallel) {
-            this.addPoint(`_parallel.${this.name}.${this.tmpPointId}`, false);
+        if (blockType === globals_js_1.BlockTypes.Point || blockType === globals_js_1.BlockTypes.Parallel) {
+            const key = blockType === globals_js_1.BlockTypes.Point ? 'point' : 'parallel';
+            this.addPoint(`_${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
         }
         this.scope.blockStack.set(this.scope.indentLevel, {
@@ -342,8 +319,7 @@ class ExecutionContext {
         if (blockType === globals_js_1.BlockTypes.Join || blockType === globals_js_1.BlockTypes.Parallel) {
             const { final_point: finalPoint } = stackRef;
             const [component, pin, wireId] = finalPoint;
-            this.scope.currentComponent = component;
-            this.scope.currentPin = pin;
+            this.scope.setCurrent(component, pin);
             this.scope.currentWireId = wireId;
             if (wireId !== -1) {
                 this.scope.sequence.push([
@@ -366,8 +342,7 @@ class ExecutionContext {
             ignore_last_net: false,
         });
         if (blockType === globals_js_1.BlockTypes.Join || blockType === globals_js_1.BlockTypes.Point) {
-            this.scope.currentComponent = null;
-            this.scope.currentPin = null;
+            this.scope.setCurrent(null);
             this.scope.currentWireId = -1;
         }
         else if (blockType === globals_js_1.BlockTypes.Parallel) {
@@ -584,7 +559,6 @@ class ExecutionContext {
         }
         const wireIdOffset = this.scope.wires.length;
         const frameIdOffset = this.scope.frames.length;
-        let incrementGndLinkId = 0;
         childScope.sequence.forEach(sequenceAction => {
             const [action] = sequenceAction;
             if (action === ExecutionScope_js_1.SequenceAction.Wire) {
@@ -597,20 +571,6 @@ class ExecutionContext {
                 this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.WireJump, jumpWireId, 1]);
             }
             else if (action === ExecutionScope_js_1.SequenceAction.At || action === ExecutionScope_js_1.SequenceAction.To) {
-                const tmpComponent = sequenceAction[1];
-                if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net
-                    && tmpComponent.parameters.get(globals_js_1.ParamKeys.net_name) === 'gnd') {
-                    tmpComponent._copyID = gndCopyIdOffset + incrementGndLinkId;
-                    incrementGndLinkId += 1;
-                }
-                else if (tmpComponent === tmpRoot) {
-                    if (currentWireId !== -1) {
-                        sequenceAction = [ExecutionScope_js_1.SequenceAction.WireJump, currentWireId];
-                    }
-                    else {
-                        sequenceAction = [action, currentComponent, currentPin];
-                    }
-                }
                 this.scope.sequence.push(sequenceAction);
             }
             else if (action === ExecutionScope_js_1.SequenceAction.Frame) {
@@ -624,13 +584,11 @@ class ExecutionContext {
             }
         });
         if (childScope.currentComponent === childScope.componentRoot) {
-            this.scope.currentComponent = currentComponent;
-            this.scope.currentPin = currentPin;
+            this.scope.setCurrent(currentComponent, currentPin);
             this.scope.currentWireId = currentWireId;
         }
         else {
-            this.scope.currentComponent = childScope.currentComponent;
-            this.scope.currentPin = childScope.currentPin;
+            this.scope.setCurrent(childScope.currentComponent, childScope.currentPin);
             this.scope.currentWireId = childScope.currentWireId + wireIdOffset;
         }
         this.printPoint('resume at');
@@ -660,7 +618,15 @@ class ExecutionContext {
         this.scope.wires.push(new Wire_js_1.Wire(tmp));
         const output = [];
         segments.forEach(item => {
-            output.push(item.join(","));
+            const tmpArray = item.map(item2 => {
+                if (item2 instanceof helpers_js_1.UnitDimension) {
+                    return item2.value;
+                }
+                else {
+                    return item2;
+                }
+            });
+            output.push(tmpArray.join(","));
         });
         this.log('add wire: ', output.join("|"));
         this.scope.setActive(ExecutionScope_js_1.ActiveObject.Wire, wireId);
@@ -677,12 +643,26 @@ class ExecutionContext {
         }
         const useName = userDefined ? 'point.' + pointId : pointId;
         const componentPoint = ClassComponent_js_1.ClassComponent.simple(useName, 1, "point");
-        componentPoint.displayProp = "point";
-        componentPoint.typeProp = globals_js_1.ComponentTypes.point;
+        componentPoint.displayProp = this.getPointSymbol();
+        componentPoint.typeProp = globals_js_1.ComponentTypes.net;
         this.scope.instances.set(pointId, componentPoint);
         this.toComponent(componentPoint, 1, { addSequence: true });
         return this.getCurrentPoint();
     }
+    getPointSymbol() {
+        return new draw_symbols_js_1.SymbolDrawingCommands(() => {
+            return [
+                [draw_symbols_js_1.PlaceHolderCommands.pin,
+                    [(0, ParamDefinition_js_1.numeric)(1), (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0),
+                        (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)],
+                    new Map([
+                        ["display_pin_id", false]
+                    ]),
+                    null
+                ]
+            ];
+        });
+    }
     setProperty(nameWithProp, value) {
         this.log('set property', nameWithProp, 'value', value);
         let idName;
@@ -715,11 +695,6 @@ class ExecutionContext {
             }
         }
     }
-    setCurrentComponentStyle(styles) {
-        for (const key in styles) {
-            this.scope.currentComponent.styles[key] = styles[key];
-        }
-    }
     applyComponentAngleFromWire(component, pin, opposite = false) {
         if (this.componentAngleFollowsWire
             && component.followWireOrientationProp
@@ -770,23 +745,23 @@ class ExecutionContext {
                     return;
                 }
                 this.log('set component angle from wire, target angle:', targetAngle, ', component angle:', component.angleProp, 'pin angle:', connectedPinPos.angle);
-                let useAngle = (targetAngle - connectedPinPos.angle) % 360;
+                let useAngle = (targetAngle - connectedPinPos.angle.toNumber()) % 360;
                 if (useAngle < 0) {
                     useAngle += 360;
                 }
                 if (useAngle === 90) {
-                    component.setParam('angle', 90);
+                    component.setParam(globals_js_1.ParamKeys.angle, (0, ParamDefinition_js_1.numeric)(90));
                 }
                 else if (useAngle === 180) {
                     if (component.angleProp === 0 || component.angleProp === 180) {
-                        component.setParam('flipX', 1);
+                        component.setParam(globals_js_1.ParamKeys.flipX, 1);
                     }
                     else if (component.angleProp === 90 || component.angleProp === 270) {
-                        component.setParam('flipY', 1);
+                        component.setParam(globals_js_1.ParamKeys.flipY, 1);
                     }
                 }
                 else if (useAngle === 270) {
-                    component.setParam('angle', 270);
+                    component.setParam(globals_js_1.ParamKeys.angle, (0, ParamDefinition_js_1.numeric)(270));
                 }
                 component.wireOrientationAngle = useAngle;
                 component.didSetWireOrientationAngle = true;
@@ -822,6 +797,12 @@ function isWireSegmentsEndAuto(segments) {
 }
 function getPortSide(pins, arrangeProps) {
     const result = [];
+    const maxPositions = {
+        [globals_js_1.SymbolPinSide.Left]: 0,
+        [globals_js_1.SymbolPinSide.Right]: 0,
+        [globals_js_1.SymbolPinSide.Top]: 0,
+        [globals_js_1.SymbolPinSide.Bottom]: 0,
+    };
     if (arrangeProps === null) {
         let counter = 0;
         for (const [pinId] of pins) {
@@ -833,6 +814,14 @@ function getPortSide(pins, arrangeProps) {
             });
             counter++;
         }
+        const leftSideItems = result.filter(item => {
+            return item.side === PinDefinition_js_1.PortSide.WEST;
+        });
+        const rightSideItems = result.filter(item => {
+            return item.side === PinDefinition_js_1.PortSide.EAST;
+        });
+        maxPositions[globals_js_1.SymbolPinSide.Left] = leftSideItems.length;
+        maxPositions[globals_js_1.SymbolPinSide.Right] = rightSideItems.length;
     }
     else {
         let counter = pins.size;
@@ -846,36 +835,45 @@ function getPortSide(pins, arrangeProps) {
                 useItems = [...items];
             }
             let useSide = PinDefinition_js_1.PortSide.WEST;
-            if (key === 'left') {
-                useSide = PinDefinition_js_1.PortSide.WEST;
-            }
-            else if (key === 'right') {
-                useSide = PinDefinition_js_1.PortSide.EAST;
-            }
-            else if (key === 'top') {
-                useSide = PinDefinition_js_1.PortSide.NORTH;
-            }
-            else if (key === 'bottom') {
-                useSide = PinDefinition_js_1.PortSide.SOUTH;
+            switch (key) {
+                case globals_js_1.SymbolPinSide.Left:
+                    useSide = PinDefinition_js_1.PortSide.WEST;
+                    break;
+                case globals_js_1.SymbolPinSide.Right:
+                    useSide = PinDefinition_js_1.PortSide.EAST;
+                    break;
+                case globals_js_1.SymbolPinSide.Top:
+                    useSide = PinDefinition_js_1.PortSide.NORTH;
+                    break;
+                case globals_js_1.SymbolPinSide.Bottom:
+                    useSide = PinDefinition_js_1.PortSide.SOUTH;
+                    break;
             }
             let position = 0;
             useItems.forEach(item => {
                 if (typeof item === 'object' && Array.isArray(item)) {
-                    position += item[0];
+                    position += item[0].toNumber();
                 }
-                if (existingPinIds.indexOf(item) !== -1) {
-                    result.push({
-                        pinId: item,
-                        side: useSide,
-                        position,
-                        order: counter
-                    });
-                    counter--;
-                    position += 1;
+                else {
+                    const itemValue = item.toNumber();
+                    if (existingPinIds.indexOf(itemValue) !== -1) {
+                        result.push({
+                            pinId: itemValue,
+                            side: useSide,
+                            position,
+                            order: counter
+                        });
+                        counter--;
+                        position += 1;
+                    }
                 }
             });
+            maxPositions[key] = position;
         }
     }
-    return result;
+    return {
+        pins: result,
+        maxPositions,
+    };
 }
 exports.getPortSide = getPortSide;

package/dist/cjs/export.js

@@ -50,10 +50,8 @@ function generateKiCADNetList(netlist) {
             }
         }
         else {
-            if (instance.typeProp !== globals_js_1.ComponentTypes.label &&
-                instance.typeProp !== globals_js_1.ComponentTypes.net &&
-                instance.typeProp !== globals_js_1.ComponentTypes.point &&
-                instance.typeProp !== globals_js_1.ComponentTypes.frame &&
+            if (instance.typeProp !== globals_js_1.ComponentTypes.net &&
+                instance.typeProp !== globals_js_1.ComponentTypes.graphic &&
                 instance.typeProp !== null) {
                 console.log('Skipping', instance.instanceName);
             }

package/dist/cjs/geometry.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Textbox = void 0;
+exports.VerticalAlignProp = exports.HorizontalAlignProp = exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Textbox = void 0;
 const core_1 = __importDefault(require("@flatten-js/core"));
 const sizing_js_1 = require("./sizing.js");
 const globals_js_1 = require("./globals.js");
@@ -16,7 +16,9 @@ class Textbox extends core_1.default.Polygon {
     }
     constructor(id, text, anchorPoint, polygon, style, bounds, label) {
         super(polygon.vertices);
-        this.anchorPoint = [0, 0];
+        this.anchorPoint = [
+            (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)
+        ];
         this.boundingBox = { width: -1, height: -1 };
         this.font = 'default';
         this.id = id;
@@ -43,8 +45,8 @@ class Textbox extends core_1.default.Polygon {
         else {
             throw 'Invalid string passed into textbox';
         }
-        const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
-        const { width, height, box } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize * globals_js_1.fontDisplayScale, fontWeight, anchor, vanchor);
+        const { fontSize = (0, ParamDefinition_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;
         let anchorOffsetY = 0;
@@ -103,20 +105,31 @@ class Textbox extends core_1.default.Polygon {
             anchorOffsetY += paddingVert / 2;
         }
         const polygon = new core_1.default.Polygon(polygonCoords);
-        return new Textbox(id, useText, [x + anchorOffsetX, y + anchorOffsetY], polygon, style, box, label);
+        return new Textbox(id, useText, [x.add(anchorOffsetX), y.add(anchorOffsetY)], polygon, style, box, label);
     }
     rotate(angle, origin) {
         const feature = super.rotate(angle, origin);
         const newAnchorPoint = this.transformAnchorPoint(segment => segment.rotate(angle, origin));
-        return new Textbox(this.id, this.text, newAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+        const tmpAnchorPoint = [
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[0]),
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[1])
+        ];
+        return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transform(matrix) {
         const feature = super.transform(matrix);
         const newAnchorPoint = this.transformAnchorPoint(segment => segment.transform(matrix));
-        return new Textbox(this.id, this.text, newAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+        const tmpAnchorPoint = [
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[0]),
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[1])
+        ];
+        return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transformAnchorPoint(callback) {
-        const anchorPointSegment = new core_1.default.Segment(new core_1.default.Point(0, 0), new core_1.default.Point(this.anchorPoint));
+        const anchorPointSegment = new core_1.default.Segment(new core_1.default.Point(0, 0), new core_1.default.Point([
+            this.anchorPoint[0].toNumber(),
+            this.anchorPoint[1].toNumber(),
+        ]));
         const newSegment = callback(anchorPointSegment);
         const lastPoint = newSegment.vertices[newSegment.vertices.length - 1];
         return [
@@ -137,7 +150,7 @@ class GeometryProp {
 exports.GeometryProp = GeometryProp;
 class Geometry {
     static point(x, y) {
-        return new core_1.default.Point(x, y);
+        return new core_1.default.Point(x.toNumber(), y.toNumber());
     }
     static line(x1, y1, x2, y2) {
         return new core_1.default.Line(Geometry.point(x1, y1), Geometry.point(x2, y2));
@@ -152,7 +165,12 @@ class Geometry {
         return new core_1.default.Segment(Geometry.point(start[0], start[1]), Geometry.point(end[0], end[1]));
     }
     static polygon(coords) {
-        return new core_1.default.Polygon(coords);
+        return new core_1.default.Polygon(coords.map(item => {
+            return [
+                item[0].toNumber(),
+                item[1].toNumber(),
+            ];
+        }));
     }
     static multiline(coords) {
         const segments = [];
@@ -162,11 +180,13 @@ class Geometry {
         return new core_1.default.Multiline(segments);
     }
     static arc(center, radius, startAngle, endAngle, sweepDirection) {
-        return new core_1.default.Arc(Geometry.point(center[0], center[1]), radius, startAngle, endAngle, sweepDirection);
+        return new core_1.default.Arc(Geometry.point(center[0], center[1]), radius.toNumber(), startAngle.toNumber(), endAngle.toNumber(), sweepDirection);
     }
     static getCoords(item) {
         const points = item.vertices.map(vertex => {
-            return [vertex.x, vertex.y];
+            return [
+                (0, ParamDefinition_js_1.numeric)(vertex.x), (0, ParamDefinition_js_1.numeric)(vertex.y)
+            ];
         });
         return points;
     }
@@ -213,10 +233,10 @@ class Geometry {
             if (feature instanceof Textbox) {
                 const [x, y] = feature.anchorPoint;
                 box = {
-                    xmin: box.xmin + x,
-                    ymin: box.ymin + y,
-                    xmax: box.xmax + x,
-                    ymax: box.ymax + y
+                    xmin: box.xmin + x.toNumber(),
+                    ymin: box.ymin + y.toNumber(),
+                    xmax: box.xmax + x.toNumber(),
+                    ymax: box.ymax + y.toNumber()
                 };
             }
             if (box.xmin === undefined) {
@@ -273,7 +293,7 @@ class Geometry {
                 for (let i = 0; i < coords.length; i++) {
                     const [x, y] = coords[i];
                     const command = (i === 0) ? 'M' : 'L';
-                    path.push(`${command}`, x, y);
+                    path.push(`${command}`, x.toNumber(), y.toNumber());
                 }
                 if (isClosedPolygon) {
                     path.push('Z');
@@ -306,8 +326,8 @@ class Geometry {
         const existingSegments = [];
         wirePoints.forEach(points => {
             const tmpPoints = points.map(pt => {
-                const roundedX = (0, utils_js_1.roundValue)(pt.x);
-                const roundedY = (0, utils_js_1.roundValue)(pt.y);
+                const roundedX = (0, utils_js_1.roundValue)(pt.x).toNumber();
+                const roundedY = (0, utils_js_1.roundValue)(pt.y).toNumber();
                 return new core_1.default.Point(roundedX, roundedY);
             });
             for (let i = 0; i < tmpPoints.length - 1; i++) {
@@ -520,6 +540,19 @@ var VerticalAlign;
     VerticalAlign["Middle"] = "middle";
     VerticalAlign["Bottom"] = "bottom";
 })(VerticalAlign || (exports.VerticalAlign = VerticalAlign = {}));
+var HorizontalAlignProp;
+(function (HorizontalAlignProp) {
+    HorizontalAlignProp["Start"] = "start";
+    HorizontalAlignProp["Middle"] = "middle";
+    HorizontalAlignProp["End"] = "end";
+})(HorizontalAlignProp || (exports.HorizontalAlignProp = HorizontalAlignProp = {}));
+var VerticalAlignProp;
+(function (VerticalAlignProp) {
+    VerticalAlignProp["Hanging"] = "hanging";
+    VerticalAlignProp["Middle"] = "middle";
+    VerticalAlignProp["Central"] = "central";
+    VerticalAlignProp["TextTop"] = "text-top";
+})(VerticalAlignProp || (exports.VerticalAlignProp = VerticalAlignProp = {}));
 function getArcPointRadians(centerX, centerY, radius, angleRads) {
     const dx = Math.cos(angleRads);
     const dy = Math.sin(angleRads);