circuitscript 0.1.0 → 0.1.2

package/dist/cjs/objects/ClassComponent.js

@@ -1,20 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClassComponent = void 0;
+exports.ModuleComponent = exports.ClassComponent = void 0;
 const draw_symbols_js_1 = require("../draw_symbols.js");
 const PinDefinition_js_1 = require("./PinDefinition.js");
 const PinTypes_js_1 = require("./PinTypes.js");
+const globals_js_1 = require("../globals.js");
 class ClassComponent {
-    constructor(instanceName, numPins, className) {
+    constructor(instanceName, numPins) {
         this.parameters = new Map();
         this.pins = new Map();
         this.pinNets = new Map();
         this.pinWires = new Map();
+        this.pinsMaxPositions = {};
         this._copyID = null;
         this._copyFrom = null;
         this.arrangeProps = null;
         this.displayProp = null;
         this.widthProp = null;
+        this.heightProp = null;
         this.typeProp = null;
         this.copyProp = false;
         this.angleProp = 0;
@@ -22,12 +25,9 @@ class ClassComponent {
         this.wireOrientationAngle = 0;
         this.useWireOrientationAngle = true;
         this.didSetWireOrientationAngle = false;
-        this.styles = {};
         this.assignedRefDes = null;
-        this.moduleCounter = 0;
         this.instanceName = instanceName;
         this.numPins = numPins;
-        this.className = className;
     }
     setupPins() {
         for (let i = 1; i < this.numPins + 1; i++) {
@@ -104,25 +104,26 @@ class ClassComponent {
     toString() {
         return this.instanceName;
     }
-    static simple(instanceName, numPins, className) {
-        const component = new ClassComponent(instanceName, numPins, className);
+    static simple(instanceName, numPins) {
+        const component = new ClassComponent(instanceName, numPins);
         component.setupPins();
         return component;
     }
     isEqual(other) {
         return this.instanceName === other.instanceName
             && this.numPins === other.numPins
-            && this.className === other.className
             && this._copyID === other._copyID
             && this.arrangeProps === other.arrangeProps
-            && this.displayProp === other.displayProp
+            && ((this.displayProp === null && other.displayProp === null)
+                ||
+                    (this.displayProp !== null && other.displayProp !== null && this.displayProp.eq(other.displayProp)))
             && this.widthProp === other.widthProp
             && this.typeProp === other.typeProp
             && this._cachedPins === other._cachedPins
             && this._cachedParams === other._cachedParams;
     }
     clone() {
-        const component = new ClassComponent(this.instanceName, this.numPins, this.className);
+        const component = new ClassComponent(this.instanceName, this.numPins);
         component._copyID = this._copyID;
         component.arrangeProps = this.arrangeProps;
         component.widthProp = this.widthProp;
@@ -130,17 +131,12 @@ class ClassComponent {
         component.angleProp = this.angleProp;
         component.followWireOrientationProp = this.followWireOrientationProp;
         component.useWireOrientationAngle = this.useWireOrientationAngle;
-        if (this.displayProp) {
-            if (typeof this.displayProp === "string") {
-                component.displayProp = this.displayProp;
-            }
-            else if (this.displayProp instanceof draw_symbols_js_1.SymbolDrawingCommands) {
-                component.displayProp =
-                    this.displayProp.clone();
-            }
+        if (this.displayProp instanceof draw_symbols_js_1.SymbolDrawingCommands) {
+            component.displayProp =
+                this.displayProp.clone();
         }
         for (const [key, value] of this.parameters) {
-            if (key === 'flipX' || key === 'flipY' || key === 'angle') {
+            if (key === globals_js_1.ParamKeys.flipX || key === globals_js_1.ParamKeys.flipY || key === globals_js_1.ParamKeys.angle) {
                 continue;
             }
             component.parameters.set(key, value);
@@ -148,11 +144,15 @@ class ClassComponent {
         for (const [key, value] of this.pins) {
             component.pins.set(key, value);
         }
-        for (const key in this.styles) {
-            component.styles[key] = this.styles[key];
-        }
         component.refreshCache();
         return component;
     }
 }
 exports.ClassComponent = ClassComponent;
+class ModuleComponent extends ClassComponent {
+    constructor() {
+        super(...arguments);
+        this.moduleCounter = 0;
+    }
+}
+exports.ModuleComponent = ModuleComponent;

package/dist/cjs/objects/ExecutionScope.js

@@ -47,10 +47,7 @@ class ExecutionScope {
     }
     getNet(component, pin) {
         const result = this.findNet(component, pin);
-        if (result) {
-            return result[2];
-        }
-        return null;
+        return result ? result[2] : null;
     }
     setNet(component, pin, net) {
         const pair = this.findNet(component, pin);
@@ -113,6 +110,15 @@ class ExecutionScope {
         this.currentWireId = -1;
         this.currentFrameId = -1;
     }
+    setCurrent(component, pin = null) {
+        this.currentComponent = component;
+        if (component !== null) {
+            this.currentPin = (pin === null) ? component.getDefaultPin() : pin;
+        }
+        else {
+            this.currentPin = null;
+        }
+    }
 }
 exports.ExecutionScope = ExecutionScope;
 ExecutionScope.scopeId = 0;

package/dist/cjs/objects/Frame.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FramePlotDirection = exports.FrameParamKeys = exports.Frame = void 0;
+const globals_js_1 = require("../globals.js");
 class Frame {
-    constructor(frameId, frameType) {
+    constructor(frameId, frameType = globals_js_1.FrameType.Frame) {
         this.parameters = new Map();
         this.frameId = frameId;
         this.frameType = frameType;

package/dist/cjs/objects/ParamDefinition.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PercentageValue = exports.NumericValue = exports.ParamDefinition = void 0;
+exports.NumberOperator = exports.WrappedNumber = exports.PercentageValue = exports.numeric = exports.NumericValue = exports.ParamDefinition = void 0;
+const utils_1 = require("../utils");
+const big_js_1 = require("big.js");
 class ParamDefinition {
     constructor(paramName, paramValue) {
         this.paramName = paramName;
@@ -9,8 +11,24 @@ class ParamDefinition {
 }
 exports.ParamDefinition = ParamDefinition;
 class NumericValue {
-    constructor(value) {
+    constructor(value, prefix = 0) {
         this.value = value;
+        if (typeof value === 'string') {
+            const matches = value.match(/^([\d]+(?:.[\d]+)?)([\w]*)$/);
+            if (matches) {
+                this.valuePart = new big_js_1.Big(matches[1]);
+                this.prefixPart = (0, utils_1.getNumberExponential)(matches[2]);
+            }
+            else {
+                throw new Error("Invalid numeric value: " + value);
+            }
+        }
+        else {
+            this.valuePart = new big_js_1.Big(value);
+            this.prefixPart = prefix;
+            this.value = this.valuePart.toString()
+                + (0, utils_1.getNumberExponentialText)(prefix);
+        }
     }
     toString() {
         return 'numeric:' + this.value;
@@ -19,12 +37,59 @@ class NumericValue {
         if (typeof this.value === 'number') {
             return this.value.toString();
         }
-        else if (typeof this.value === 'string') {
-            return this.value;
+        else {
+            return this.valuePart.toString()
+                + (0, utils_1.getNumberExponentialText)(this.prefixPart);
+        }
+    }
+    toNumber() {
+        return this.toBigNumber().toNumber();
+    }
+    toBigNumber() {
+        return this.valuePart.mul(new big_js_1.Big(Math.pow(10, this.prefixPart)));
+    }
+    div(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return (0, utils_1.resolveToNumericValue)(this.toBigNumber().div(value.toBigNumber()));
+    }
+    mul(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return (0, utils_1.resolveToNumericValue)(this.toBigNumber().mul(value.toBigNumber()));
+    }
+    add(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
         }
+        return (0, utils_1.resolveToNumericValue)(this.toBigNumber().add(value.toBigNumber()));
+    }
+    sub(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return (0, utils_1.resolveToNumericValue)(this.toBigNumber().sub(value.toBigNumber()));
+    }
+    mod(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return (0, utils_1.resolveToNumericValue)(this.toBigNumber().mod(value.toBigNumber()));
+    }
+    neg() {
+        return (0, utils_1.resolveToNumericValue)(this.toBigNumber().neg());
+    }
+    eq(value) {
+        return this.toBigNumber().eq(value.toBigNumber());
     }
 }
 exports.NumericValue = NumericValue;
+function numeric(value) {
+    return new NumericValue(value);
+}
+exports.numeric = numeric;
 class PercentageValue {
     constructor(value) {
         this.value = value;
@@ -32,5 +97,56 @@ class PercentageValue {
     toString() {
         return this.value.toString();
     }
+    toNumber() {
+        return 0;
+    }
 }
 exports.PercentageValue = PercentageValue;
+class WrappedNumber {
+    constructor(value) {
+        this.value = value;
+    }
+    toString() {
+        return this.value.toString();
+    }
+    toNumber() {
+        return this.value;
+    }
+}
+exports.WrappedNumber = WrappedNumber;
+class NumberOperator {
+    prepare(value) {
+        if (typeof value === 'number') {
+            return new WrappedNumber(value);
+        }
+        else {
+            return value;
+        }
+    }
+    multiply(value1, value2) {
+        const big1 = new big_js_1.Big(value1.toNumber());
+        const big2 = new big_js_1.Big(value2.toNumber());
+        return (0, utils_1.resolveToNumericValue)(big1.mul(big2));
+    }
+    divide(value1, value2) {
+        const big1 = new big_js_1.Big(value1.toNumber());
+        const big2 = new big_js_1.Big(value2.toNumber());
+        return (0, utils_1.resolveToNumericValue)(big1.div(big2));
+    }
+    addition(value1, value2) {
+        const big1 = new big_js_1.Big(value1.toNumber());
+        const big2 = new big_js_1.Big(value2.toNumber());
+        return (0, utils_1.resolveToNumericValue)(big1.add(big2));
+    }
+    subtraction(value1, value2) {
+        const big1 = new big_js_1.Big(value1.toNumber());
+        const big2 = new big_js_1.Big(value2.toNumber());
+        return (0, utils_1.resolveToNumericValue)(big1.sub(big2));
+    }
+    modulus(value1, value2) {
+        const big1 = new big_js_1.Big(value1.toNumber());
+        const big2 = new big_js_1.Big(value2.toNumber());
+        return (0, utils_1.resolveToNumericValue)(big1.mod(big2));
+    }
+}
+exports.NumberOperator = NumberOperator;

package/dist/cjs/objects/PinDefinition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PinReference = exports.PortSide = exports.PinIdType = exports.PinDefinition = void 0;
+exports.PortSide = exports.PinIdType = exports.PinDefinition = void 0;
 const PinTypes_js_1 = require("./PinTypes.js");
 class PinDefinition {
     constructor(id, idType, name, pinType = PinTypes_js_1.PinTypes.Any, altNames = []) {
@@ -26,6 +26,3 @@ var PortSide;
     PortSide["SOUTH"] = "SOUTH";
     PortSide["NORTH"] = "NORTH";
 })(PortSide || (exports.PortSide = PortSide = {}));
-class PinReference {
-}
-exports.PinReference = PinReference;

package/dist/cjs/render.js

@@ -22,11 +22,12 @@ function createSvgCanvas() {
     (0, sizing_js_1.applyFontsToSVG)(canvas);
     return canvas;
 }
-function renderSheetsToSVG(sheetFrames) {
+function renderSheetsToSVG(sheetFrames, logger) {
     const canvas = createSvgCanvas();
     sheetFrames.forEach((sheet, index) => {
         const sheetGroup = canvas.group();
-        sheetGroup.id('sheet-' + index);
+        sheetGroup.id('sheet-' + index).addClass('sheet');
+        logger.add('rendering sheet: sheet-' + index);
         const { components, wires, junctions, mergedWires, frames, textObjects } = sheet;
         const allFrames = [sheet.frame, ...frames];
         let gridBounds = null;
@@ -35,6 +36,7 @@ function renderSheetsToSVG(sheetFrames) {
         let yOffset = 0;
         let sheetYOffset = 0;
         if (sheet.frame.frame) {
+            logger.add('drawing frame');
             const frameComponent = sheet.frame.frame.parameters
                 .get(Frame_js_1.FrameParamKeys.SheetType);
             if (frameComponent) {
@@ -47,15 +49,18 @@ function renderSheetsToSVG(sheetFrames) {
                 let widthMM = 0;
                 let heightMM = 0;
                 if (frameRects[0]) {
-                    originalWidthMM = (0, helpers_js_1.milsToMM)(frameRects[0].width);
-                    originalHeightMM = (0, helpers_js_1.milsToMM)(frameRects[0].height);
+                    originalWidthMM = (0, helpers_js_1.milsToMM)(frameRects[0].width).toNumber();
+                    originalHeightMM = (0, helpers_js_1.milsToMM)(frameRects[0].height).toNumber();
+                    logger.add('first frame size: ' + originalWidthMM + ' ' + originalHeightMM);
                 }
                 if (frameRects[1]) {
-                    widthMM = (0, helpers_js_1.milsToMM)(frameRects[1].width);
-                    heightMM = (0, helpers_js_1.milsToMM)(frameRects[1].height);
+                    widthMM = (0, helpers_js_1.milsToMM)(frameRects[1].width).toNumber();
+                    heightMM = (0, helpers_js_1.milsToMM)(frameRects[1].height).toNumber();
+                    logger.add('second frame size: ' + widthMM + ' ' + heightMM);
                 }
                 xOffset = (originalWidthMM - widthMM) / 2;
                 yOffset = (originalHeightMM - heightMM) / 2;
+                logger.add('offset', xOffset, yOffset);
                 sheetYOffset = index * (originalHeightMM + globals_js_1.defaultPageSpacingMM);
                 gridBounds = {
                     xmin: 0,
@@ -66,8 +71,10 @@ function renderSheetsToSVG(sheetFrames) {
                 extendGrid = false;
             }
         }
-        const sheetElements = sheetGroup.group();
-        generateSVGChild(sheetElements, components, wires, junctions, mergedWires, allFrames, textObjects, gridBounds, extendGrid);
+        logger.add('sheet contents offset: ' + xOffset + ' ' + yOffset);
+        logger.add('generating svg children in sheet');
+        const sheetElements = sheetGroup.group().addClass('sheet-elements');
+        generateSVGChild(sheetElements, components, wires, junctions, mergedWires, allFrames, textObjects, gridBounds, extendGrid, logger);
         sheetElements.translate(xOffset, yOffset);
         sheetGroup.translate(0, sheetYOffset);
     });
@@ -114,16 +121,18 @@ function generatePdfOutput(doc, canvas, sheetSize, sheetSizeDefined, zoomScale =
     });
 }
 exports.generatePdfOutput = generatePdfOutput;
-function generateSVGChild(canvas, components, wires, junctions, mergedWires, frameObjects, textObjects, gridBounds, extendGrid) {
+function generateSVGChild(canvas, components, wires, junctions, mergedWires, frameObjects, textObjects, gridBounds, extendGrid, logger) {
     const displayWireId = false;
     if (gridBounds === null) {
+        logger.add('get grid bounds');
         gridBounds = (0, layout_js_1.getBounds)(components, wires, junctions, frameObjects);
     }
-    drawGrid(canvas.group().translate(0, 0), gridBounds, extendGrid);
+    logger.add('grid bounds', gridBounds.xmin, gridBounds.ymin, gridBounds.xmax, gridBounds.ymax);
+    drawGrid(canvas.group().translate(0, 0), gridBounds, extendGrid, logger);
     components.forEach(item => {
         const { x, y, width, height } = item;
         const symbolGroup = canvas.group();
-        symbolGroup.translate(x, y);
+        symbolGroup.translate(x.toNumber(), y.toNumber());
         const { symbol = null } = item;
         if (symbol !== null && symbol) {
             const extra = {};
@@ -160,7 +169,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
                 family: 'Arial',
                 size: 50 * globals_js_1.fontDisplayScale,
             })
-                .translate(wire.x + 5, wire.y + 5);
+                .translate(wire.x.add(5).toNumber(), wire.y.add(5).toNumber());
         });
     }
     const mergedWireGroup = canvas.group();
@@ -194,7 +203,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             drawSheetFrameBorder(frameGroup, item);
         }
         else {
-            if (borderWidth > 0) {
+            if (borderWidth.toNumber() > 0) {
                 if (item.type === layout_js_1.RenderFrameType.Container) {
                     strokeColor = '#111';
                 }
@@ -206,24 +215,27 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
                 }
                 const tmpRect = frameGroup.rect(width, height)
                     .fill('none')
-                    .stroke({ width: (0, helpers_js_1.milsToMM)(borderWidth), color: strokeColor });
-                tmpRect.translate(item.x, item.y);
+                    .stroke({
+                    width: (0, helpers_js_1.milsToMM)(borderWidth).toNumber(),
+                    color: strokeColor
+                });
+                tmpRect.translate(item.x.toNumber(), item.y.toNumber());
             }
         }
     });
     textObjects.forEach(item => {
         const { x, y, symbol } = item;
         const innerGroup = canvas.group();
-        innerGroup.translate(x, y);
+        innerGroup.translate(x.toNumber(), y.toNumber());
         symbol.draw(innerGroup);
     });
-    const originSize = (0, helpers_js_1.milsToMM)(10);
+    const originSize = (0, helpers_js_1.milsToMM)(10).toNumber();
     globals_js_1.RenderFlags.ShowOrigin && canvas.group().translate(0, 0)
         .circle(originSize)
         .translate(-originSize / 2, -originSize / 2)
         .stroke('none').fill('red');
 }
-function drawGrid(group, canvasSize, extendGrid) {
+function drawGrid(group, canvasSize, extendGrid, logger) {
     const gridSize = globals_js_1.defaultGridSizeUnits;
     const { xmin, ymin, xmax, ymax } = canvasSize;
     const extraValue = extendGrid ? 1 : 0;
@@ -237,8 +249,12 @@ function drawGrid(group, canvasSize, extendGrid) {
         : (ymax - ymin);
     const numCols = Math.floor((gridEndX - gridStartX) / gridSize)
         + (extendGrid ? 1 : 0);
+    const originSize = (0, helpers_js_1.milsToMM)(10).toNumber();
+    globals_js_1.RenderFlags.ShowGridOrigin && group.circle(originSize)
+        .translate(-originSize / 2, -originSize / 2)
+        .stroke('none').fill('blue');
     const lines = [];
-    const smallOffset = (0, helpers_js_1.milsToMM)(3);
+    const smallOffset = (0, helpers_js_1.milsToMM)(3).toNumber();
     const startY = gridStartY - smallOffset / 2;
     const endY = gridEndY + smallOffset;
     for (let i = 0; i < numCols; i++) {
@@ -246,12 +262,13 @@ function drawGrid(group, canvasSize, extendGrid) {
         lines.push(`M ${startX} ${startY} L ${startX} ${endY}`);
     }
     const strokeSize = (0, helpers_js_1.milsToMM)(3);
-    group.path(lines.join(" "))
+    group.addClass('grid')
+        .path(lines.join(" "))
         .attr({
-        'stroke-dasharray': `${strokeSize},${gridSize - strokeSize}`,
+        'stroke-dasharray': `${strokeSize.toNumber()},${gridSize - strokeSize.toNumber()}`,
     })
         .stroke({
-        width: strokeSize,
+        width: strokeSize.toNumber(),
         color: '#000'
     });
 }
@@ -268,94 +285,7 @@ function drawSheetFrameBorder(frameGroup, frame) {
             symbol.draw(sheetFrameGroup);
             const offsetX = (0, helpers_js_1.milsToMM)(frameComponent.getParam('offset_x'));
             const offsetY = (0, helpers_js_1.milsToMM)(frameComponent.getParam('offset_y'));
-            sheetFrameGroup.translate(-offsetX, -offsetY);
-        }
-    }
-}
-function drawSheetFrameBorderDirect(frameGroup, frame, borderWidth, strokeColor, width, height) {
-    const commonStroke = {
-        width: (0, helpers_js_1.milsToMM)(borderWidth),
-        color: strokeColor
-    };
-    const commonFont = {
-        family: globals_js_1.defaultFont,
-        size: 50 * globals_js_1.fontDisplayScale,
-        'dominant-baseline': 'middle',
-        'text-anchor': 'middle',
-    };
-    let rows = 1;
-    let columns = 1;
-    let showGridReference = true;
-    if (helpers_js_1.PaperGridReferences[frame.size]) {
-        [rows, columns] = helpers_js_1.PaperGridReferences[frame.size];
-    }
-    else {
-        showGridReference = false;
-    }
-    if (!showGridReference) {
-        return;
-    }
-    const outerMargin = 2;
-    const outerWidth = width + outerMargin * 2;
-    const outerHeight = height + outerMargin * 2;
-    const outerRect = frameGroup.rect(outerWidth, outerHeight)
-        .fill('none')
-        .stroke(commonStroke);
-    outerRect.translate(frame.x - outerMargin, frame.y - outerMargin);
-    const gridWidth = outerWidth / columns;
-    const gridHeight = outerHeight / rows;
-    const pathPoints = [];
-    for (let i = 1; i < rows + 1; i++) {
-        const lineStartX = frame.x - outerMargin;
-        const lineStartX2 = frame.x - outerMargin + outerWidth - outerMargin;
-        const lineY = frame.y - outerMargin + (gridHeight * i);
-        if (i < rows) {
-            pathPoints.push(...[
-                "M", lineStartX, lineY, "L", lineStartX + outerMargin, lineY,
-                "M", lineStartX2, lineY, "L", lineStartX2 + outerMargin, lineY
-            ]);
+            sheetFrameGroup.translate(-offsetX.toNumber(), -offsetY.toNumber());
         }
-        const displayValue = String.fromCharCode(i + 64);
-        frameGroup.text(displayValue)
-            .font(commonFont)
-            .translate(lineStartX + outerMargin / 2, lineY - gridHeight / 2);
-        frameGroup.text(displayValue)
-            .font(commonFont)
-            .translate(lineStartX2 + outerMargin / 2, lineY - gridHeight / 2);
-    }
-    for (let i = 1; i < columns + 1; i++) {
-        const lineStartY = frame.y - outerMargin;
-        const lineStartY2 = frame.y - outerMargin + outerHeight - outerMargin;
-        const lineX = frame.x - outerMargin + (gridWidth * i);
-        if (i < columns) {
-            pathPoints.push(...[
-                "M", lineX, lineStartY, "L", lineX, lineStartY + outerMargin,
-                "M", lineX, lineStartY2, "L", lineX, lineStartY2 + outerMargin
-            ]);
-        }
-        frameGroup.text(i.toString())
-            .font(commonFont)
-            .translate(lineX - gridWidth / 2, lineStartY + outerMargin / 2 + (0, helpers_js_1.milsToMM)(10));
-        frameGroup.text(i.toString())
-            .font(commonFont)
-            .translate(lineX - gridWidth / 2, lineStartY2 + outerMargin / 2 + (0, helpers_js_1.milsToMM)(10));
-    }
-    frameGroup.path(pathPoints).stroke(commonStroke);
-    const titleWidth = (0, helpers_js_1.milsToMM)(3000);
-    const titleHeight = (0, helpers_js_1.milsToMM)(1000);
-    const rowHeight = (0, helpers_js_1.milsToMM)(200);
-    const points = [
-        "M", width - titleWidth, height,
-        "L", width - titleWidth, height - titleHeight,
-        "L", width, height - titleHeight,
-        "M", width - titleWidth, height - rowHeight,
-        "L", width, height - rowHeight,
-        "M", width - titleWidth, height - rowHeight * 2,
-        "L", width, height - rowHeight * 2,
-        "M", width - titleWidth, height - rowHeight * 3,
-        "L", width, height - rowHeight * 3
-    ];
-    frameGroup.path(points).stroke(commonStroke).fill('none');
-    if (frame.containsTitle) {
     }
 }

package/dist/cjs/sizing.js

@@ -67,27 +67,53 @@ function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', an
     }
     const key = `${text}-${fontFamily}-${fontSize}-${fontWeight}-${anchor}-${vanchor}`;
     if (measureTextSizeCache[key] === undefined) {
-        let dominantBaseline = 'hanging';
+        let dominantBaseline = geometry_js_1.VerticalAlignProp.Hanging;
         switch (vanchor) {
             case geometry_js_1.VerticalAlign.Top:
-                dominantBaseline = 'hanging';
+                dominantBaseline = geometry_js_1.VerticalAlignProp.Hanging;
                 break;
             case geometry_js_1.VerticalAlign.Middle:
-                dominantBaseline = 'middle';
+                dominantBaseline = geometry_js_1.VerticalAlignProp.Central;
                 break;
             case geometry_js_1.VerticalAlign.Bottom:
-                dominantBaseline = 'text-top';
+                dominantBaseline = geometry_js_1.VerticalAlignProp.TextTop;
+                break;
+        }
+        let useAnchor = geometry_js_1.HorizontalAlignProp.Start;
+        switch (anchor) {
+            case geometry_js_1.HorizontalAlign.Left:
+                useAnchor = geometry_js_1.HorizontalAlignProp.Start;
+                break;
+            case geometry_js_1.HorizontalAlign.Middle:
+                useAnchor = geometry_js_1.HorizontalAlignProp.Middle;
+                break;
+            case geometry_js_1.HorizontalAlign.Right:
+                useAnchor = geometry_js_1.HorizontalAlignProp.End;
                 break;
         }
         fontFamily = globals_js_1.defaultFont;
         const tmpTextElement = MainCanvas.text(text).font({
             family: fontFamily,
             size: fontSize,
-            anchor: anchor,
+            anchor: useAnchor,
             'dominant-baseline': dominantBaseline,
             weight: fontWeight,
-        }).fill('#333');
-        const textbox = tmpTextElement.bbox();
+        })
+            .attr("xml:space", "preserve")
+            .fill('#333');
+        let textbox = tmpTextElement.bbox();
+        const tmpTextBox = { ...textbox };
+        if (dominantBaseline === geometry_js_1.VerticalAlignProp.Hanging) {
+            tmpTextBox.y = textbox.cy - textbox.height;
+            tmpTextBox.y2 = tmpTextBox.y + textbox.height;
+            textbox = tmpTextBox;
+        }
+        else if (dominantBaseline === geometry_js_1.VerticalAlignProp.Central) {
+            tmpTextBox.y -= textbox.cy;
+            tmpTextBox.y2 -= textbox.cy;
+            tmpTextBox.cy = 0;
+            textbox = tmpTextBox;
+        }
         const { width, height } = textbox;
         tmpTextElement.remove();
         measureTextSizeCache[key] = {