circuitscript 0.1.0 → 0.1.3

package/dist/esm/logger.mjs

@@ -4,7 +4,14 @@ export 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/esm/objects/ClassComponent.mjs

@@ -1,6 +1,7 @@
 import { SymbolDrawingCommands } from '../draw_symbols.mjs';
 import { PinDefinition, PinIdType } from './PinDefinition.mjs';
 import { PinTypes } from './PinTypes.mjs';
+import { ParamKeys } from '../globals.mjs';
 export class ClassComponent {
     instanceName;
     numPins;
@@ -8,14 +9,15 @@ export class ClassComponent {
     pins = new Map();
     pinNets = new Map();
     pinWires = new Map();
+    pinsMaxPositions = {};
     _cachedPins;
     _cachedParams;
-    className;
     _copyID = null;
     _copyFrom = null;
     arrangeProps = null;
     displayProp = null;
     widthProp = null;
+    heightProp = null;
     typeProp = null;
     copyProp = false;
     angleProp = 0;
@@ -23,17 +25,10 @@ export class ClassComponent {
     wireOrientationAngle = 0;
     useWireOrientationAngle = true;
     didSetWireOrientationAngle = false;
-    styles = {};
     assignedRefDes = null;
-    moduleContainsExpressions;
-    moduleCounter = 0;
-    moduleExecutionContext;
-    moduleExecutionContextName;
-    modulePinIdToPortMap;
-    constructor(instanceName, numPins, className) {
+    constructor(instanceName, numPins) {
         this.instanceName = instanceName;
         this.numPins = numPins;
-        this.className = className;
     }
     setupPins() {
         for (let i = 1; i < this.numPins + 1; i++) {
@@ -110,25 +105,26 @@ export 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;
@@ -136,17 +132,12 @@ export 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 SymbolDrawingCommands) {
-                component.displayProp =
-                    this.displayProp.clone();
-            }
+        if (this.displayProp instanceof SymbolDrawingCommands) {
+            component.displayProp =
+                this.displayProp.clone();
         }
         for (const [key, value] of this.parameters) {
-            if (key === 'flipX' || key === 'flipY' || key === 'angle') {
+            if (key === ParamKeys.flipX || key === ParamKeys.flipY || key === ParamKeys.angle) {
                 continue;
             }
             component.parameters.set(key, value);
@@ -154,10 +145,14 @@ export 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;
     }
 }
+export class ModuleComponent extends ClassComponent {
+    moduleContainsExpressions;
+    moduleCounter = 0;
+    moduleExecutionContext;
+    moduleExecutionContextName;
+    modulePinIdToPortMap;
+}

package/dist/esm/objects/ExecutionScope.mjs

@@ -46,10 +46,7 @@ export 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);
@@ -112,6 +109,15 @@ export 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;
+        }
+    }
 }
 export var SequenceAction;
 (function (SequenceAction) {

package/dist/esm/objects/Frame.mjs

@@ -1,12 +1,18 @@
+import { FrameType } from "../globals.mjs";
 export class Frame {
     parameters = new Map();
     frameId;
     frameType;
-    constructor(frameId, frameType) {
+    constructor(frameId, frameType = FrameType.Frame) {
         this.frameId = frameId;
         this.frameType = frameType;
     }
 }
+export var FixedFrameIds;
+(function (FixedFrameIds) {
+    FixedFrameIds[FixedFrameIds["BaseFrame"] = -1] = "BaseFrame";
+    FixedFrameIds[FixedFrameIds["FrameIdNotUsed"] = -2] = "FrameIdNotUsed";
+})(FixedFrameIds || (FixedFrameIds = {}));
 export var FrameParamKeys;
 (function (FrameParamKeys) {
     FrameParamKeys["Title"] = "title";
@@ -17,6 +23,9 @@ export 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 || (FrameParamKeys = {}));

package/dist/esm/objects/ParamDefinition.mjs

@@ -1,3 +1,5 @@
+import { getNumberExponential, getNumberExponentialText, resolveToNumericValue } from "../utils";
+import { Big } from 'big.js';
 export class ParamDefinition {
     paramName;
     paramValue;
@@ -8,8 +10,26 @@ export class ParamDefinition {
 }
 export class NumericValue {
     value;
-    constructor(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;
@@ -18,10 +38,59 @@ export 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()
+                + 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;
@@ -31,4 +100,54 @@ export class PercentageValue {
     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 {
+            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/PinDefinition.mjs

@@ -27,5 +27,3 @@ export var PortSide;
     PortSide["SOUTH"] = "SOUTH";
     PortSide["NORTH"] = "NORTH";
 })(PortSide || (PortSide = {}));
-export class PinReference {
-}