circuitscript 0.0.38 → 0.1.2

package/dist/esm/execute.mjs

@@ -1,12 +1,15 @@
-import { BlockTypes, ComponentTypes, GlobalNames, NoNetText, ParamKeys, ReferenceTypes } from './globals.mjs';
-import { ClassComponent } from './objects/ClassComponent.mjs';
+import { BlockTypes, ComponentTypes, GlobalNames, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide } from './globals.mjs';
+import { ClassComponent, ModuleComponent } from './objects/ClassComponent.mjs';
 import { ActiveObject, ExecutionScope, FrameAction, SequenceAction } from './objects/ExecutionScope.mjs';
 import { Net } from './objects/Net.mjs';
+import { numeric } from './objects/ParamDefinition.mjs';
 import { PortSide } from './objects/PinDefinition.mjs';
 import { DeclaredReference, Direction } from './objects/types.mjs';
 import { Wire } from './objects/Wire.mjs';
 import { Frame } from './objects/Frame.mjs';
 import { CalculatePinPositions } from './layout.mjs';
+import { UnitDimension } from './helpers.mjs';
+import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
 export class ExecutionContext {
     name;
     namespace;
@@ -56,27 +59,14 @@ export class ExecutionContext {
     }
     setupRoot() {
         const componentRoot = ClassComponent.simple(GlobalNames.__root, 1, '__root');
-        componentRoot.typeProp = ComponentTypes.point;
-        componentRoot.displayProp = 'point';
+        componentRoot.typeProp = ComponentTypes.net;
+        componentRoot.displayProp = this.getPointSymbol();
         this.scope.instances.set(GlobalNames.__root, componentRoot);
-        this.scope.currentComponent = componentRoot;
-        this.scope.currentPin = componentRoot.getDefaultPin();
+        this.scope.setCurrent(componentRoot);
         this.scope.componentRoot = componentRoot;
     }
-    getUniqueInstanceName(className) {
-        let extraPrefix = '';
-        switch (className) {
-            case GlobalNames.DefaultResistor:
-                extraPrefix = 'R_';
-                break;
-            case GlobalNames.DefaultCapacitor:
-                extraPrefix = 'C_';
-                break;
-            case GlobalNames.DefaultInductor:
-                extraPrefix = 'L_';
-                break;
-        }
-        const tmpName = extraPrefix + 'COMP_' + this.scope.unnamedCounter;
+    getUniqueInstanceName() {
+        const tmpName = 'COMP_' + this.scope.unnamedCounter;
         this.scope.unnamedCounter += 1;
         return tmpName;
     }
@@ -89,14 +79,8 @@ export class ExecutionContext {
         return [this.scope.currentComponent, this.scope.currentPin];
     }
     linkComponentPinNet(component1, component1Pin, component2, component2Pin) {
-        const net1_exists = this.scope.hasNet(component1, component1Pin);
-        const net2_exists = this.scope.hasNet(component2, component2Pin);
-        const net1 = net1_exists
-            ? this.scope.getNet(component1, component1Pin)
-            : null;
-        const net2 = net2_exists
-            ? this.scope.getNet(component2, component2Pin)
-            : null;
+        const net1 = this.scope.getNet(component1, component1Pin);
+        const net2 = this.scope.getNet(component2, component2Pin);
         this.log('link nets', component1, component1Pin, net1, 'to', component2, component2Pin, net2);
         let returnNet;
         if (net1 === null && net2 === null) {
@@ -118,43 +102,43 @@ export class ExecutionContext {
                 returnNet = this.mergeNets(net1, net2);
             }
             else {
-                return net1;
+                returnNet = net1;
             }
         }
+        this.log('final net after link: ', returnNet);
         return returnNet;
     }
     mergeNets(net1, net2) {
         if (net1 === net2) {
             return net1;
         }
-        let tmpNet;
         if (net2.priority > net1.priority) {
-            tmpNet = net1;
+            const tmpNet = net1;
             net1 = net2;
             net2 = tmpNet;
         }
-        const scopeNets = this.scope.getNets();
-        scopeNets.forEach(([component, pin, net]) => {
+        this.scope.getNets().forEach(([component, pin, net]) => {
             if (Net.isSame(net, net2)) {
                 this.scope.setNet(component, pin, net1);
             }
         });
         return net1;
     }
-    createComponent(instanceName, pins, params, props) {
-        const numPins = pins.length;
-        const component = new ClassComponent(instanceName, numPins, GlobalNames.symbol);
+    createComponent(instanceName, pins, params, props, isModule = false) {
+        const className = isModule ? ModuleComponent : ClassComponent;
+        const component = new className(instanceName, pins.length);
         pins.forEach((pin) => {
             component.pins.set(pin.id, pin);
         });
         component.arrangeProps = props.arrange ?? null;
         component.displayProp = props.display ?? null;
         component.widthProp = props.width ?? null;
+        component.heightProp = props.height ?? null;
         component.typeProp = props.type ?? null;
         component.copyProp = props.copy ?? false;
         let useAngle = null;
         if (props.angle) {
-            useAngle = props.angle % 360;
+            useAngle = props.angle.toNumber() % 360;
             if (useAngle < 0) {
                 useAngle += 360;
             }
@@ -166,10 +150,12 @@ export class ExecutionContext {
             component.parameters.set(param.paramName, param.paramValue);
             paramsMap.set(param.paramName, param.paramValue);
         });
-        if (component.typeProp === ComponentTypes.net
-            || component.typeProp === ComponentTypes.label) {
+        if (component.typeProp === ComponentTypes.net) {
             const netName = paramsMap.get(ParamKeys.net_name);
-            const priority = paramsMap.get(ParamKeys.priority);
+            let priority = 0;
+            if (paramsMap.has(ParamKeys.priority)) {
+                priority = paramsMap.get(ParamKeys.priority).toNumber();
+            }
             const result = this.resolveNet(netName, this.netNamespace);
             let tmpNet;
             if (result.found) {
@@ -183,8 +169,9 @@ export class ExecutionContext {
             this.scope.setNet(component, 1, tmpNet);
             this.log('set net', netName, 'component', component);
         }
-        const portSides = getPortSide(component.pins, component.arrangeProps);
-        portSides.forEach(({ pinId, side, position }) => {
+        const { pins: pinSides, maxPositions } = getPortSide(component.pins, component.arrangeProps);
+        component.pinsMaxPositions = maxPositions;
+        pinSides.forEach(({ pinId, side, position }) => {
             if (component.pins.has(pinId)) {
                 const tmpPin = component.pins.get(pinId);
                 tmpPin.side = side;
@@ -215,10 +202,9 @@ export class ExecutionContext {
             this.scope.currentPin + ' ' + netString);
     }
     addComponentExisting(component, pin) {
-        const startPin = pin;
-        const nextPin = component.getNextPinAfter(startPin);
+        const nextPin = component.getNextPinAfter(pin);
         this.applyComponentAngleFromWire(component, pin);
-        this.toComponent(component, startPin, { addSequence: true });
+        this.toComponent(component, pin, { addSequence: true });
         this.log('move to next pin: ' + nextPin);
         this.atComponent(component, nextPin, {
             addSequence: true
@@ -254,13 +240,10 @@ export class ExecutionContext {
         }
         const linkedNet = this.linkComponentPinNet(this.scope.currentComponent, this.scope.currentPin, component, pinId);
         this.applyComponentAngleFromWire(component, pinId);
-        this.scope.currentComponent = component;
-        this.scope.currentPin = pinId;
+        this.scope.setCurrent(component, pinId);
         this.scope.clearActive();
         if (addSequence) {
             if (this.scope.sequence.length > 0) {
-                if (component.pinWires.has(pinId) && component.typeProp !== ComponentTypes.point) {
-                }
                 const [entryType, , segments] = this.scope.sequence[this.scope.sequence.length - 1];
                 if (entryType === SequenceAction.Wire && isWireSegmentsEndAuto(segments)) {
                     segments[segments.length - 1].until = [
@@ -278,7 +261,6 @@ export class ExecutionContext {
     atComponent(component, pinId, options) {
         this.log('at component');
         const { addSequence = false } = options ?? {};
-        this.scope.currentComponent = component;
         let usePinId;
         if (pinId === null) {
             usePinId = component.getDefaultPin();
@@ -291,9 +273,7 @@ export class ExecutionContext {
                 throw 'Invalid pin number ' + pinId + ' in ' + component;
             }
         }
-        if (usePinId) {
-            this.scope.currentPin = usePinId;
-        }
+        this.scope.setCurrent(component, usePinId);
         this.scope.clearActive();
         if (addSequence) {
             this.scope.sequence.push([SequenceAction.At,
@@ -320,12 +300,9 @@ export class ExecutionContext {
         return componentCopy;
     }
     enterBlocks(blockType) {
-        if (blockType === BlockTypes.Point) {
-            this.addPoint(`_point.${this.name}.${this.tmpPointId}`, false);
-            this.tmpPointId += 1;
-        }
-        else if (blockType === BlockTypes.Parallel) {
-            this.addPoint(`_parallel.${this.name}.${this.tmpPointId}`, false);
+        if (blockType === BlockTypes.Point || blockType === BlockTypes.Parallel) {
+            const key = blockType === BlockTypes.Point ? 'point' : 'parallel';
+            this.addPoint(`_${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
         }
         this.scope.blockStack.set(this.scope.indentLevel, {
@@ -346,8 +323,7 @@ export class ExecutionContext {
         if (blockType === BlockTypes.Join || blockType === BlockTypes.Parallel) {
             const { final_point: finalPoint } = stackRef;
             const [component, pin, wireId] = finalPoint;
-            this.scope.currentComponent = component;
-            this.scope.currentPin = pin;
+            this.scope.setCurrent(component, pin);
             this.scope.currentWireId = wireId;
             if (wireId !== -1) {
                 this.scope.sequence.push([
@@ -370,8 +346,7 @@ export class ExecutionContext {
             ignore_last_net: false,
         });
         if (blockType === BlockTypes.Join || blockType === BlockTypes.Point) {
-            this.scope.currentComponent = null;
-            this.scope.currentPin = null;
+            this.scope.setCurrent(null);
             this.scope.currentWireId = -1;
         }
         else if (blockType === BlockTypes.Parallel) {
@@ -465,7 +440,7 @@ export class ExecutionContext {
     getFunction(functionName) {
         return this.scope.functions.get(functionName);
     }
-    resolveVariable(executionStack, idName) {
+    resolveVariable(executionStack, idName, trailers = []) {
         const reversed = [...executionStack].reverse();
         for (let i = 0; i < reversed.length; i++) {
             const context = reversed[i];
@@ -477,21 +452,34 @@ export class ExecutionContext {
                     name: idName,
                 });
             }
-            else if (context.scope.variables.has(idName)) {
-                return new DeclaredReference({
-                    found: true,
-                    value: context.scope.variables.get(idName),
-                    type: ReferenceTypes.variable,
-                    name: idName,
-                });
-            }
-            else if (context.scope.instances.has(idName)) {
-                return new DeclaredReference({
-                    found: true,
-                    value: context.scope.instances.get(idName),
-                    type: ReferenceTypes.instance,
-                    name: idName,
-                });
+            else {
+                const isVariable = context.scope.variables.has(idName);
+                const isComponentInstance = context.scope.instances.has(idName);
+                if (isVariable || isComponentInstance) {
+                    const scopeList = isVariable ? context.scope.variables
+                        : context.scope.instances;
+                    let parentValue = undefined;
+                    let useValue = scopeList.get(idName);
+                    if (trailers.length > 0) {
+                        parentValue = useValue;
+                        const trailersPath = trailers.join(".");
+                        if (isVariable) {
+                            useValue = parentValue[trailersPath];
+                        }
+                        else if (isComponentInstance) {
+                            useValue = parentValue.parameters.get(trailersPath);
+                        }
+                    }
+                    return new DeclaredReference({
+                        type: isVariable ? ReferenceTypes.variable
+                            : ReferenceTypes.instance,
+                        found: (useValue !== undefined),
+                        parentValue,
+                        value: useValue,
+                        name: idName,
+                        trailers,
+                    });
+                }
             }
         }
         return new DeclaredReference({
@@ -575,7 +563,6 @@ export class ExecutionContext {
         }
         const wireIdOffset = this.scope.wires.length;
         const frameIdOffset = this.scope.frames.length;
-        let incrementGndLinkId = 0;
         childScope.sequence.forEach(sequenceAction => {
             const [action] = sequenceAction;
             if (action === SequenceAction.Wire) {
@@ -588,20 +575,6 @@ export class ExecutionContext {
                 this.scope.sequence.push([SequenceAction.WireJump, jumpWireId, 1]);
             }
             else if (action === SequenceAction.At || action === SequenceAction.To) {
-                const tmpComponent = sequenceAction[1];
-                if (tmpComponent.typeProp === ComponentTypes.net
-                    && tmpComponent.parameters.get(ParamKeys.net_name) === 'gnd') {
-                    tmpComponent._copyID = gndCopyIdOffset + incrementGndLinkId;
-                    incrementGndLinkId += 1;
-                }
-                else if (tmpComponent === tmpRoot) {
-                    if (currentWireId !== -1) {
-                        sequenceAction = [SequenceAction.WireJump, currentWireId];
-                    }
-                    else {
-                        sequenceAction = [action, currentComponent, currentPin];
-                    }
-                }
                 this.scope.sequence.push(sequenceAction);
             }
             else if (action === SequenceAction.Frame) {
@@ -615,13 +588,11 @@ export class ExecutionContext {
             }
         });
         if (childScope.currentComponent === childScope.componentRoot) {
-            this.scope.currentComponent = currentComponent;
-            this.scope.currentPin = currentPin;
+            this.scope.setCurrent(currentComponent, currentPin);
             this.scope.currentWireId = currentWireId;
         }
         else {
-            this.scope.currentComponent = childScope.currentComponent;
-            this.scope.currentPin = childScope.currentPin;
+            this.scope.setCurrent(childScope.currentComponent, childScope.currentPin);
             this.scope.currentWireId = childScope.currentWireId + wireIdOffset;
         }
         this.printPoint('resume at');
@@ -651,7 +622,15 @@ export class ExecutionContext {
         this.scope.wires.push(new Wire(tmp));
         const output = [];
         segments.forEach(item => {
-            output.push(item.join(","));
+            const tmpArray = item.map(item2 => {
+                if (item2 instanceof UnitDimension) {
+                    return item2.value;
+                }
+                else {
+                    return item2;
+                }
+            });
+            output.push(tmpArray.join(","));
         });
         this.log('add wire: ', output.join("|"));
         this.scope.setActive(ActiveObject.Wire, wireId);
@@ -668,12 +647,26 @@ export class ExecutionContext {
         }
         const useName = userDefined ? 'point.' + pointId : pointId;
         const componentPoint = ClassComponent.simple(useName, 1, "point");
-        componentPoint.displayProp = "point";
-        componentPoint.typeProp = ComponentTypes.point;
+        componentPoint.displayProp = this.getPointSymbol();
+        componentPoint.typeProp = ComponentTypes.net;
         this.scope.instances.set(pointId, componentPoint);
         this.toComponent(componentPoint, 1, { addSequence: true });
         return this.getCurrentPoint();
     }
+    getPointSymbol() {
+        return new SymbolDrawingCommands(() => {
+            return [
+                [PlaceHolderCommands.pin,
+                    [numeric(1), numeric(0), numeric(0),
+                        numeric(0), numeric(0)],
+                    new Map([
+                        ["display_pin_id", false]
+                    ]),
+                    null
+                ]
+            ];
+        });
+    }
     setProperty(nameWithProp, value) {
         this.log('set property', nameWithProp, 'value', value);
         let idName;
@@ -706,11 +699,6 @@ export class ExecutionContext {
             }
         }
     }
-    setCurrentComponentStyle(styles) {
-        for (const key in styles) {
-            this.scope.currentComponent.styles[key] = styles[key];
-        }
-    }
     applyComponentAngleFromWire(component, pin, opposite = false) {
         if (this.componentAngleFollowsWire
             && component.followWireOrientationProp
@@ -761,23 +749,23 @@ export class ExecutionContext {
                     return;
                 }
                 this.log('set component angle from wire, target angle:', targetAngle, ', component angle:', component.angleProp, 'pin angle:', connectedPinPos.angle);
-                let useAngle = (targetAngle - connectedPinPos.angle) % 360;
+                let useAngle = (targetAngle - connectedPinPos.angle.toNumber()) % 360;
                 if (useAngle < 0) {
                     useAngle += 360;
                 }
                 if (useAngle === 90) {
-                    component.setParam('angle', 90);
+                    component.setParam(ParamKeys.angle, numeric(90));
                 }
                 else if (useAngle === 180) {
                     if (component.angleProp === 0 || component.angleProp === 180) {
-                        component.setParam('flipX', 1);
+                        component.setParam(ParamKeys.flipX, 1);
                     }
                     else if (component.angleProp === 90 || component.angleProp === 270) {
-                        component.setParam('flipY', 1);
+                        component.setParam(ParamKeys.flipY, 1);
                     }
                 }
                 else if (useAngle === 270) {
-                    component.setParam('angle', 270);
+                    component.setParam(ParamKeys.angle, numeric(270));
                 }
                 component.wireOrientationAngle = useAngle;
                 component.didSetWireOrientationAngle = true;
@@ -812,6 +800,12 @@ function isWireSegmentsEndAuto(segments) {
 }
 export function getPortSide(pins, arrangeProps) {
     const result = [];
+    const maxPositions = {
+        [SymbolPinSide.Left]: 0,
+        [SymbolPinSide.Right]: 0,
+        [SymbolPinSide.Top]: 0,
+        [SymbolPinSide.Bottom]: 0,
+    };
     if (arrangeProps === null) {
         let counter = 0;
         for (const [pinId] of pins) {
@@ -823,6 +817,14 @@ export function getPortSide(pins, arrangeProps) {
             });
             counter++;
         }
+        const leftSideItems = result.filter(item => {
+            return item.side === PortSide.WEST;
+        });
+        const rightSideItems = result.filter(item => {
+            return item.side === PortSide.EAST;
+        });
+        maxPositions[SymbolPinSide.Left] = leftSideItems.length;
+        maxPositions[SymbolPinSide.Right] = rightSideItems.length;
     }
     else {
         let counter = pins.size;
@@ -836,35 +838,44 @@ export function getPortSide(pins, arrangeProps) {
                 useItems = [...items];
             }
             let useSide = PortSide.WEST;
-            if (key === 'left') {
-                useSide = PortSide.WEST;
-            }
-            else if (key === 'right') {
-                useSide = PortSide.EAST;
-            }
-            else if (key === 'top') {
-                useSide = PortSide.NORTH;
-            }
-            else if (key === 'bottom') {
-                useSide = PortSide.SOUTH;
+            switch (key) {
+                case SymbolPinSide.Left:
+                    useSide = PortSide.WEST;
+                    break;
+                case SymbolPinSide.Right:
+                    useSide = PortSide.EAST;
+                    break;
+                case SymbolPinSide.Top:
+                    useSide = PortSide.NORTH;
+                    break;
+                case SymbolPinSide.Bottom:
+                    useSide = PortSide.SOUTH;
+                    break;
             }
             let position = 0;
             useItems.forEach(item => {
                 if (typeof item === 'object' && Array.isArray(item)) {
-                    position += item[0];
+                    position += item[0].toNumber();
                 }
-                if (existingPinIds.indexOf(item) !== -1) {
-                    result.push({
-                        pinId: item,
-                        side: useSide,
-                        position,
-                        order: counter
-                    });
-                    counter--;
-                    position += 1;
+                else {
+                    const itemValue = item.toNumber();
+                    if (existingPinIds.indexOf(itemValue) !== -1) {
+                        result.push({
+                            pinId: itemValue,
+                            side: useSide,
+                            position,
+                            order: counter
+                        });
+                        counter--;
+                        position += 1;
+                    }
                 }
             });
+            maxPositions[key] = position;
         }
     }
-    return result;
+    return {
+        pins: result,
+        maxPositions,
+    };
 }

package/dist/esm/export.mjs

@@ -47,10 +47,8 @@ export function generateKiCADNetList(netlist) {
             }
         }
         else {
-            if (instance.typeProp !== ComponentTypes.label &&
-                instance.typeProp !== ComponentTypes.net &&
-                instance.typeProp !== ComponentTypes.point &&
-                instance.typeProp !== ComponentTypes.frame &&
+            if (instance.typeProp !== ComponentTypes.net &&
+                instance.typeProp !== ComponentTypes.graphic &&
                 instance.typeProp !== null) {
                 console.log('Skipping', instance.instanceName);
             }