circuitscript 0.0.38 → 0.1.2

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] = {

package/dist/cjs/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+const big_js_1 = require("big.js");
+const ParamDefinition_1 = require("./objects/ParamDefinition");
 class SimpleStopwatch {
     constructor() {
         this.startTime = new Date();
@@ -73,6 +75,94 @@ function getPortType(component) {
 }
 exports.getPortType = getPortType;
 function roundValue(value) {
-    return +value.toFixed(7);
+    return resolveToNumericValue(new big_js_1.Big(value.toBigNumber().toFixed(7)));
 }
 exports.roundValue = roundValue;
+function throwWithContext(context, message) {
+    const startLine = context.start?.line;
+    const startColumn = context.start?.column;
+    const startString = startLine + ":" + startColumn;
+    const stopLine = context.stop?.line;
+    const stopColumn = context.stop?.column;
+    let stopString = "";
+    if (startLine === stopLine) {
+        stopString = stopColumn?.toString();
+    }
+    else {
+        stopString = stopLine + ":" + stopString;
+    }
+    throw `Parse exception at [${startString} - ${stopString}] : ${message}`;
+}
+exports.throwWithContext = throwWithContext;
+function combineMaps(map1, map2) {
+    const newMap = new Map(map1);
+    map2.forEach((value, key) => {
+        newMap.set(key, value);
+    });
+    return newMap;
+}
+exports.combineMaps = combineMaps;
+function getNumberExponential(value) {
+    value = value.trim();
+    switch (value) {
+        case 'G':
+            return 9;
+        case 'M':
+            return 6;
+        case 'k':
+        case 'K':
+            return 3;
+        case 'm':
+            return -3;
+        case 'u':
+            return -6;
+        case 'n':
+            return -9;
+        case 'p':
+            return -12;
+        case 'f':
+            return -15;
+        default:
+            return 0;
+    }
+}
+exports.getNumberExponential = getNumberExponential;
+function getNumberExponentialText(value) {
+    switch (value) {
+        case -15:
+            return 'f';
+        case -12:
+            return 'p';
+        case -9:
+            return 'n';
+        case -6:
+            return 'u';
+        case -3:
+            return 'm';
+        case 3:
+            return 'k';
+        case 6:
+            return 'M';
+        case 9:
+            return 'G';
+        case 0:
+        default:
+            return '';
+    }
+}
+exports.getNumberExponentialText = getNumberExponentialText;
+function resolveToNumericValue(value) {
+    if (value.toNumber() === 0) {
+        return new ParamDefinition_1.NumericValue(0);
+    }
+    const isNeg = value.lt(0);
+    const positiveValue = isNeg ? value.neg() : value;
+    const prefixPart = Math.floor(Math.log10(positiveValue.toNumber()) / 3);
+    let useValue = value;
+    if (prefixPart !== 0) {
+        const tmpValue1 = positiveValue.div(Math.pow(10, prefixPart * 3));
+        useValue = isNeg ? tmpValue1.neg() : tmpValue1;
+    }
+    return new ParamDefinition_1.NumericValue(useValue, prefixPart * 3);
+}
+exports.resolveToNumericValue = resolveToNumericValue;