circuitscript 0.4.1 → 0.5.0

package/dist/esm/objects/NumericValue.js

@@ -0,0 +1,189 @@
+import { isReference } from "../utils.js";
+import { Big } from 'big.js';
+import { WrappedNumber } from "./WrappedNumber.js";
+export class NumericValue {
+    value;
+    valuePart;
+    prefixPart;
+    constructor(value, prefix = 0) {
+        this.value = value;
+        if (typeof value === 'string') {
+            const matches = value.match(/^([\d]+(?:.[\d]+)?)([\w]*)$/);
+            if (matches) {
+                this.valuePart = new Big(matches[1]);
+                this.prefixPart = getNumberExponential(matches[2]);
+            }
+            else {
+                throw new Error("Invalid numeric value: " + value);
+            }
+        }
+        else {
+            this.valuePart = new Big(value);
+            this.prefixPart = prefix;
+            this.value = this.valuePart.toString()
+                + getNumberExponentialText(prefix);
+        }
+    }
+    toString() {
+        return 'numeric:' + this.value;
+    }
+    toDisplayString() {
+        if (typeof this.value === 'number') {
+            return this.value.toString();
+        }
+        else {
+            return this.valuePart.toString()
+                + getNumberExponentialText(this.prefixPart);
+        }
+    }
+    toNumber() {
+        return this.toBigNumber().toNumber();
+    }
+    toBigNumber() {
+        return this.valuePart.mul(new Big(Math.pow(10, this.prefixPart)));
+    }
+    div(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return resolveToNumericValue(this.toBigNumber().div(value.toBigNumber()));
+    }
+    half() {
+        return this.div(2);
+    }
+    mul(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return resolveToNumericValue(this.toBigNumber().mul(value.toBigNumber()));
+    }
+    add(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return resolveToNumericValue(this.toBigNumber().add(value.toBigNumber()));
+    }
+    sub(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return resolveToNumericValue(this.toBigNumber().sub(value.toBigNumber()));
+    }
+    mod(value) {
+        if (typeof value === 'number') {
+            value = numeric(value);
+        }
+        return resolveToNumericValue(this.toBigNumber().mod(value.toBigNumber()));
+    }
+    neg() {
+        return resolveToNumericValue(this.toBigNumber().neg());
+    }
+    eq(value) {
+        return this.toBigNumber().eq(value.toBigNumber());
+    }
+}
+export class NumberOperator {
+    prepare(value) {
+        if (typeof value === 'number') {
+            return new WrappedNumber(value);
+        }
+        else if (isReference(value)) {
+            return value.value;
+        }
+        else {
+            return value;
+        }
+    }
+    multiply(value1, value2) {
+        const big1 = new Big(value1.toNumber());
+        const big2 = new Big(value2.toNumber());
+        return resolveToNumericValue(big1.mul(big2));
+    }
+    divide(value1, value2) {
+        const big1 = new Big(value1.toNumber());
+        const big2 = new Big(value2.toNumber());
+        return resolveToNumericValue(big1.div(big2));
+    }
+    addition(value1, value2) {
+        const big1 = new Big(value1.toNumber());
+        const big2 = new Big(value2.toNumber());
+        return resolveToNumericValue(big1.add(big2));
+    }
+    subtraction(value1, value2) {
+        const big1 = new Big(value1.toNumber());
+        const big2 = new Big(value2.toNumber());
+        return resolveToNumericValue(big1.sub(big2));
+    }
+    modulus(value1, value2) {
+        const big1 = new Big(value1.toNumber());
+        const big2 = new Big(value2.toNumber());
+        return resolveToNumericValue(big1.mod(big2));
+    }
+}
+export function numeric(value) {
+    return new NumericValue(value);
+}
+export 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 '';
+    }
+}
+export 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;
+    }
+}
+export function resolveToNumericValue(value) {
+    if (value.toNumber() === 0) {
+        return new 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 NumericValue(useValue, prefixPart * 3);
+}
+export function roundValue(value) {
+    return resolveToNumericValue(new Big(value.toBigNumber().toFixed(7)));
+}

package/dist/esm/objects/ParamDefinition.js

@@ -1,5 +1,3 @@
-import { getNumberExponential, getNumberExponentialText, isReference, resolveToNumericValue } from "../utils.js";
-import { Big } from 'big.js';
 export class ParamDefinition {
     paramName;
     paramValue;
@@ -8,149 +6,3 @@ export class ParamDefinition {
         this.paramValue = paramValue;
     }
 }
-export class NumericValue {
-    value;
-    valuePart;
-    prefixPart;
-    constructor(value, prefix = 0) {
-        this.value = value;
-        if (typeof value === 'string') {
-            const matches = value.match(/^([\d]+(?:.[\d]+)?)([\w]*)$/);
-            if (matches) {
-                this.valuePart = new Big(matches[1]);
-                this.prefixPart = getNumberExponential(matches[2]);
-            }
-            else {
-                throw new Error("Invalid numeric value: " + value);
-            }
-        }
-        else {
-            this.valuePart = new Big(value);
-            this.prefixPart = prefix;
-            this.value = this.valuePart.toString()
-                + getNumberExponentialText(prefix);
-        }
-    }
-    toString() {
-        return 'numeric:' + this.value;
-    }
-    toDisplayString() {
-        if (typeof this.value === 'number') {
-            return this.value.toString();
-        }
-        else {
-            return this.valuePart.toString()
-                + getNumberExponentialText(this.prefixPart);
-        }
-    }
-    toNumber() {
-        return this.toBigNumber().toNumber();
-    }
-    toBigNumber() {
-        return this.valuePart.mul(new Big(Math.pow(10, this.prefixPart)));
-    }
-    div(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return resolveToNumericValue(this.toBigNumber().div(value.toBigNumber()));
-    }
-    half() {
-        return this.div(2);
-    }
-    mul(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return resolveToNumericValue(this.toBigNumber().mul(value.toBigNumber()));
-    }
-    add(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return resolveToNumericValue(this.toBigNumber().add(value.toBigNumber()));
-    }
-    sub(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return resolveToNumericValue(this.toBigNumber().sub(value.toBigNumber()));
-    }
-    mod(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return resolveToNumericValue(this.toBigNumber().mod(value.toBigNumber()));
-    }
-    neg() {
-        return resolveToNumericValue(this.toBigNumber().neg());
-    }
-    eq(value) {
-        return this.toBigNumber().eq(value.toBigNumber());
-    }
-}
-export function numeric(value) {
-    return new NumericValue(value);
-}
-export class PercentageValue {
-    value;
-    constructor(value) {
-        this.value = value;
-    }
-    toString() {
-        return this.value.toString();
-    }
-    toNumber() {
-        return 0;
-    }
-}
-export class WrappedNumber {
-    value;
-    constructor(value) {
-        this.value = value;
-    }
-    toString() {
-        return this.value.toString();
-    }
-    toNumber() {
-        return this.value;
-    }
-}
-export class NumberOperator {
-    prepare(value) {
-        if (typeof value === 'number') {
-            return new WrappedNumber(value);
-        }
-        else if (isReference(value)) {
-            return value.value;
-        }
-        else {
-            return value;
-        }
-    }
-    multiply(value1, value2) {
-        const big1 = new Big(value1.toNumber());
-        const big2 = new Big(value2.toNumber());
-        return resolveToNumericValue(big1.mul(big2));
-    }
-    divide(value1, value2) {
-        const big1 = new Big(value1.toNumber());
-        const big2 = new Big(value2.toNumber());
-        return resolveToNumericValue(big1.div(big2));
-    }
-    addition(value1, value2) {
-        const big1 = new Big(value1.toNumber());
-        const big2 = new Big(value2.toNumber());
-        return resolveToNumericValue(big1.add(big2));
-    }
-    subtraction(value1, value2) {
-        const big1 = new Big(value1.toNumber());
-        const big2 = new Big(value2.toNumber());
-        return resolveToNumericValue(big1.sub(big2));
-    }
-    modulus(value1, value2) {
-        const big1 = new Big(value1.toNumber());
-        const big2 = new Big(value2.toNumber());
-        return resolveToNumericValue(big1.mod(big2));
-    }
-}

package/dist/esm/objects/PercentageValue.js

@@ -0,0 +1,12 @@
+export class PercentageValue {
+    value;
+    constructor(value) {
+        this.value = value;
+    }
+    toString() {
+        return this.value.toString();
+    }
+    toNumber() {
+        return 0;
+    }
+}

package/dist/esm/objects/PinDefinition.js

@@ -1,5 +1,5 @@
 import { RuntimeExecutionError } from '../utils.js';
-import { NumericValue } from './ParamDefinition.js';
+import { NumericValue } from './NumericValue.js';
 import { PinTypes } from './PinTypes.js';
 export class PinId {
     value;

package/dist/esm/objects/WrappedNumber.js

@@ -0,0 +1,12 @@
+export class WrappedNumber {
+    value;
+    constructor(value) {
+        this.value = value;
+    }
+    toString() {
+        return this.value.toString();
+    }
+    toNumber() {
+        return this.value;
+    }
+}

package/dist/esm/pipeline.js

@@ -53,7 +53,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
     visitor.log(`current file: ${inputPath}`);
     visitor.onImportFile = (visitor, filePath, fileData, errorHandler, fileLineOffset = 0) => {
         visitor.enterFile(filePath);
-        errors.splice(0, errors.length);
+        const numErrors = errors.length;
         const result = parseFileWithVisitor(visitor, fileData, {
             enableLexerDiagnostics: lexerDiagnostics,
             enableLexerVerbose: lexerVerbose,
@@ -61,7 +61,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
         });
         const { throwError, tree, tokens } = result;
         let { hasError, hasParseError } = result;
-        if (errors.length > 0) {
+        if (errors.length > numErrors) {
             hasError = true;
             hasParseError = true;
         }

package/dist/esm/render/draw_symbols.js

@@ -2,9 +2,9 @@ import { milsToMM } from "../helpers.js";
 import { ColorScheme, CustomSymbolParamTextSize, CustomSymbolPinIdSize, CustomSymbolPinTextSize, CustomSymbolRefDesSize, PinTypesList, PortArrowSize, PortPaddingHorizontal, PortPaddingVertical, ReferenceTypes, RenderFlags, SymbolPinSide, defaultFont, defaultPinIdTextSize, defaultPinNameTextSize, defaultSymbolLineWidth, fontDisplayScale } from "../globals.js";
 import { Geometry, GeometryProp, HorizontalAlign, HorizontalAlignProp, Textbox, VerticalAlign, VerticalAlignProp } from "./geometry.js";
 import { PinTypes } from "../objects/PinTypes.js";
-import { roundValue, RuntimeExecutionError, throwWithContext } from "../utils.js";
+import { RuntimeExecutionError, throwWithContext } from "../utils.js";
 import { DeclaredReference, UndeclaredReference } from "../objects/types.js";
-import { numeric, NumericValue } from "../objects/ParamDefinition.js";
+import { NumericValue, numeric, roundValue } from "../objects/NumericValue.js";
 import { PinId } from "../objects/PinDefinition.js";
 export class SymbolGraphic {
     drawPortsName = true;

package/dist/esm/render/export.js

@@ -1,5 +1,5 @@
 import { NoNetText } from "../globals.js";
-import { NumericValue } from "../objects/ParamDefinition.js";
+import { NumericValue } from "../objects/NumericValue.js";
 export function generateKiCadNetList(netlist) {
     const componentsList = [];
     const nets = {};

package/dist/esm/render/geometry.js

@@ -1,9 +1,8 @@
 import Flatten from '@flatten-js/core';
 import { measureTextSize2 } from '../sizing.js';
 import { defaultFont, fontDisplayScale, PortArrowSize, PortPaddingHorizontal, PortPaddingVertical } from '../globals.js';
-import { numeric, NumericValue } from '../objects/ParamDefinition.js';
+import { NumericValue, numeric, roundValue } from '../objects/NumericValue.js';
 import { AllPinTypes, PinTypes } from '../objects/PinTypes.js';
-import { roundValue } from '../utils.js';
 export class Textbox extends Flatten.Polygon {
     id;
     text;

package/dist/esm/render/graph.js

@@ -5,7 +5,7 @@ import { milsToMM } from "../helpers.js";
 import { RenderFrame, RenderComponent, applyComponentParamsToSymbol, RenderWire } from "./layout.js";
 import { SequenceAction, FrameAction } from "../objects/ExecutionScope.js";
 import { Frame, FixedFrameIds, FrameParamKeys } from "../objects/Frame.js";
-import { numeric } from "../objects/ParamDefinition.js";
+import { numeric } from "../objects/NumericValue.js";
 import { NetTypes } from "../objects/types.js";
 import Matrix, { solve } from "ml-matrix";
 import { getPinDefinition, PinId } from "../objects/PinDefinition.js";

package/dist/esm/render/layout.js

@@ -4,11 +4,11 @@ import { SymbolCustom, SymbolDrawing, SymbolPlaceholder, SymbolText, PlaceHolder
 import { DefaultComponentUnit, defaultFrameTitleTextSize, defaultGridSizeUnits, FrameType, NetGraphicsParams, ParamKeys, WireAutoDirection } from '../globals.js';
 import { Geometry, HorizontalAlign, VerticalAlign } from './geometry.js';
 import { FixedFrameIds, Frame, FrameParamKeys, FramePlotDirection } from '../objects/Frame.js';
-import { areasOverlap, combineMaps, getBoundsSize, printBounds, resizeBounds, resizeToNearestGrid, roundValue, toNearestGrid } from '../utils.js';
+import { areasOverlap, combineMaps, getBoundsSize, printBounds, resizeBounds, resizeToNearestGrid, toNearestGrid } from '../utils.js';
 import { Direction } from '../objects/types.js';
 import { PinId } from '../objects/PinDefinition.js';
 import { milsToMM, UnitDimension } from '../helpers.js';
-import { numeric } from '../objects/ParamDefinition.js';
+import { numeric, roundValue } from '../objects/NumericValue.js';
 import { generateLayoutPinDefinition, getWireName, RenderItemType } from './graph.js';
 export class LayoutEngine {
     logger;

package/dist/esm/render/render.js

@@ -2,7 +2,7 @@ import { SVG, registerWindow } from '@svgdotjs/svg.js';
 import { ExtractDrawingRects, RenderFrameType, getBounds } from "./layout.js";
 import { applyFontsToSVG } from '../sizing.js';
 import { ColorScheme, ComponentTypes, FrameType, MMToPt, MMToPx, MilsToMM, ParamKeys, RenderFlags, defaultGridSizeUnits, defaultPageSpacingMM, defaultWireLineWidth, fontDisplayScale, junctionSize } from '../globals.js';
-import { numeric, NumericValue } from '../objects/ParamDefinition.js';
+import { NumericValue, numeric } from '../objects/NumericValue.js';
 import { combineMaps, getBoundsSize } from '../utils.js';
 import { milsToMM } from '../helpers.js';
 import { getPaperSize } from "./PaperSizes.js";