circuitscript 0.4.0 → 0.5.0

package/dist/cjs/objects/NumericValue.js

@@ -0,0 +1,196 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.roundValue = exports.resolveToNumericValue = exports.getNumberExponential = exports.getNumberExponentialText = exports.numeric = exports.NumberOperator = exports.NumericValue = void 0;
+const utils_js_1 = require("../utils.js");
+const big_js_1 = require("big.js");
+const WrappedNumber_js_1 = require("./WrappedNumber.js");
+class NumericValue {
+    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 = 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()
+                + 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_js_1.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());
+    }
+}
+exports.NumericValue = NumericValue;
+class NumberOperator {
+    prepare(value) {
+        if (typeof value === 'number') {
+            return new WrappedNumber_js_1.WrappedNumber(value);
+        }
+        else if ((0, utils_js_1.isReference)(value)) {
+            return value.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 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 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 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 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 resolveToNumericValue(big1.mod(big2));
+    }
+}
+exports.NumberOperator = NumberOperator;
+function numeric(value) {
+    return new NumericValue(value);
+}
+exports.numeric = numeric;
+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 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 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);
+}
+exports.resolveToNumericValue = resolveToNumericValue;
+function roundValue(value) {
+    return resolveToNumericValue(new big_js_1.Big(value.toBigNumber().toFixed(7)));
+}
+exports.roundValue = roundValue;

package/dist/cjs/objects/ParamDefinition.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberOperator = exports.WrappedNumber = exports.PercentageValue = exports.numeric = exports.NumericValue = exports.ParamDefinition = void 0;
-const utils_js_1 = require("../utils.js");
-const big_js_1 = require("big.js");
+exports.ParamDefinition = void 0;
 class ParamDefinition {
     constructor(paramName, paramValue) {
         this.paramName = paramName;
@@ -10,149 +8,3 @@ class ParamDefinition {
     }
 }
 exports.ParamDefinition = ParamDefinition;
-class NumericValue {
-    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_js_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_js_1.getNumberExponentialText)(prefix);
-        }
-    }
-    toString() {
-        return 'numeric:' + this.value;
-    }
-    toDisplayString() {
-        if (typeof this.value === 'number') {
-            return this.value.toString();
-        }
-        else {
-            return this.valuePart.toString()
-                + (0, utils_js_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_js_1.resolveToNumericValue)(this.toBigNumber().div(value.toBigNumber()));
-    }
-    half() {
-        return this.div(2);
-    }
-    mul(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return (0, utils_js_1.resolveToNumericValue)(this.toBigNumber().mul(value.toBigNumber()));
-    }
-    add(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return (0, utils_js_1.resolveToNumericValue)(this.toBigNumber().add(value.toBigNumber()));
-    }
-    sub(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return (0, utils_js_1.resolveToNumericValue)(this.toBigNumber().sub(value.toBigNumber()));
-    }
-    mod(value) {
-        if (typeof value === 'number') {
-            value = numeric(value);
-        }
-        return (0, utils_js_1.resolveToNumericValue)(this.toBigNumber().mod(value.toBigNumber()));
-    }
-    neg() {
-        return (0, utils_js_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;
-    }
-    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 if ((0, utils_js_1.isReference)(value)) {
-            return value.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_js_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_js_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_js_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_js_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_js_1.resolveToNumericValue)(big1.mod(big2));
-    }
-}
-exports.NumberOperator = NumberOperator;

package/dist/cjs/objects/PercentageValue.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PercentageValue = void 0;
+class PercentageValue {
+    constructor(value) {
+        this.value = value;
+    }
+    toString() {
+        return this.value.toString();
+    }
+    toNumber() {
+        return 0;
+    }
+}
+exports.PercentageValue = PercentageValue;

package/dist/cjs/objects/PinDefinition.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPinDefinition = exports.isPinId = exports.PortSide = exports.PinIdType = exports.PinDefinition = exports.PinId = void 0;
 const utils_js_1 = require("../utils.js");
-const ParamDefinition_js_1 = require("./ParamDefinition.js");
+const NumericValue_js_1 = require("./NumericValue.js");
 const PinTypes_js_1 = require("./PinTypes.js");
 class PinId {
     constructor(value) {
@@ -44,7 +44,7 @@ class PinId {
         return '';
     }
     static from(value) {
-        if (value instanceof ParamDefinition_js_1.NumericValue) {
+        if (value instanceof NumericValue_js_1.NumericValue) {
             return new PinId(value.toNumber());
         }
         return new PinId(value);

package/dist/cjs/objects/WrappedNumber.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WrappedNumber = void 0;
+class WrappedNumber {
+    constructor(value) {
+        this.value = value;
+    }
+    toString() {
+        return this.value.toString();
+    }
+    toNumber() {
+        return this.value;
+    }
+}
+exports.WrappedNumber = WrappedNumber;

package/dist/cjs/pipeline.js

@@ -60,7 +60,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
     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 = (0, parser_js_1.parseFileWithVisitor)(visitor, fileData, {
             enableLexerDiagnostics: lexerDiagnostics,
             enableLexerVerbose: lexerVerbose,
@@ -68,7 +68,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
         });
         const { throwError, tree, tokens } = result;
         let { hasError, hasParseError } = result;
-        if (errors.length > 0) {
+        if (errors.length > numErrors) {
             hasError = true;
             hasParseError = true;
         }