circuitscript 0.1.0 → 0.1.3

package/dist/cjs/logger.js

@@ -7,7 +7,14 @@ class Logger {
         this.add((new Date()).toISOString());
         this.add('starting logger...');
     }
-    add(message) {
+    add(...args) {
+        let message = "";
+        if (args.length === 1) {
+            message = args[0].toString();
+        }
+        else {
+            message = args.join(" ");
+        }
         this.logs.push((new Date()).toISOString() + " | " + message);
     }
     dump() {

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,14 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FramePlotDirection = exports.FrameParamKeys = exports.Frame = void 0;
+exports.FramePlotDirection = exports.FrameParamKeys = exports.FixedFrameIds = 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;
     }
 }
 exports.Frame = Frame;
+var FixedFrameIds;
+(function (FixedFrameIds) {
+    FixedFrameIds[FixedFrameIds["BaseFrame"] = -1] = "BaseFrame";
+    FixedFrameIds[FixedFrameIds["FrameIdNotUsed"] = -2] = "FrameIdNotUsed";
+})(FixedFrameIds || (exports.FixedFrameIds = FixedFrameIds = {}));
 var FrameParamKeys;
 (function (FrameParamKeys) {
     FrameParamKeys["Title"] = "title";
@@ -19,6 +25,9 @@ var FrameParamKeys;
     FrameParamKeys["Height"] = "height";
     FrameParamKeys["PaperSize"] = "paper_size";
     FrameParamKeys["SheetType"] = "sheet_type";
+    FrameParamKeys["TitleAlign"] = "title_align";
+    FrameParamKeys["HorizontalAlign"] = "align";
+    FrameParamKeys["VerticalAlign"] = "valign";
     FrameParamKeys["SheetNumber"] = "sheet_number";
     FrameParamKeys["SheetTotal"] = "sheet_total";
 })(FrameParamKeys || (exports.FrameParamKeys = FrameParamKeys = {}));

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,62 @@ 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()));
+    }
+    half() {
+        return this.div(2);
+    }
+    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 +100,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;