circuitscript 0.0.25 → 0.0.27

package/dist/esm/antlr/CircuitScriptVisitor.mjs

@@ -31,6 +31,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitFunctionCallExpr;
     visitAdditionExpr;
     visitMultiplyExpr;
+    visitLogicalOperatorExpr;
     visitDataExpr;
     visitUnaryOperatorExpr;
     visitValueAtomExpr;
@@ -49,7 +50,8 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitFunction_return_expr;
     visitCreate_component_expr;
     visitCreate_graphic_expr;
-    visitSub_expr;
+    visitNested_properties_inner;
+    visitGraphic_expr;
     visitProperty_expr;
     visitProperty_key_expr;
     visitNested_properties;
@@ -61,4 +63,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitPoint_expr;
     visitImport_expr;
     visitFrame_expr;
+    visitIf_expr;
+    visitIf_inner_expr;
+    visitElse_expr;
 }

package/dist/esm/draw_symbols.mjs

@@ -1,5 +1,6 @@
-import { SymbolPinSide, defaultFont } from "./globals.mjs";
-import { Geometry, GeometryProp, HorizontalAlign, Label, VerticalAlign } from "./geometry.mjs";
+import { ReferenceTypes, SymbolPinSide, defaultFont } from "./globals.mjs";
+import { Geometry, GeometryProp, HorizontalAlign, Label, Textbox, VerticalAlign } from "./geometry.mjs";
+import { PinTypes } from "./objects/PinTypes.mjs";
 const defaultSymbolLineWidth = 2;
 export class SymbolGraphic {
     drawPortsName = true;
@@ -251,7 +252,7 @@ export class SymbolText extends SymbolGraphic {
     }
     generateDrawing() {
         const drawing = new SymbolDrawing();
-        drawing.addLabel(0, 0, this.text, {
+        drawing.addTextbox(0, 0, this.text, {
             fontSize: this.fontSize,
             anchor: HorizontalAlign.Middle,
             fontWeight: this.fontWeight,
@@ -316,13 +317,7 @@ export class SymbolPlaceholder extends SymbolGraphic {
                         break;
                     }
                 case PlaceHolderCommands.label: {
-                    const keywords = ['fontSize', 'anchor', 'vanchor', 'angle'];
-                    const style = {};
-                    keywords.forEach(item => {
-                        if (keywordParams.has(item)) {
-                            style[item] = keywordParams.get(item);
-                        }
-                    });
+                    const style = this.parseLabelStyle(keywordParams);
                     positionParams = [...positionParams];
                     positionParams.push(style);
                     const labelId = positionParams[0];
@@ -335,10 +330,33 @@ export class SymbolPlaceholder extends SymbolGraphic {
                     drawing.addLabelId(...tmpPositionParams);
                     break;
                 }
+                case PlaceHolderCommands.text: {
+                    const style = this.parseLabelStyle(keywordParams);
+                    const content = keywordParams.get('content');
+                    let offsetX = 0;
+                    let offsetY = 0;
+                    if (keywordParams.has('offset')) {
+                        const offset = keywordParams.get('offset');
+                        offsetX = offset[0];
+                        offsetY = offset[1];
+                    }
+                    drawing.addTextbox(offsetX, offsetY, content, style);
+                    break;
+                }
             }
         });
         drawing.log("=== end generate drawing ===");
     }
+    parseLabelStyle(keywordParams) {
+        const keywords = ['fontSize', 'anchor', 'vanchor', 'angle'];
+        const style = {};
+        keywords.forEach(item => {
+            if (keywordParams.has(item)) {
+                style[item] = keywordParams.get(item);
+            }
+        });
+        return style;
+    }
     drawPinParams(drawing, commandName, keywordParams, positionParams) {
         drawing.log('add pin', ...positionParams);
         const keywordDisplayPinId = 'display_pin_id';
@@ -348,6 +366,11 @@ export class SymbolPlaceholder extends SymbolGraphic {
             displayPinId = false;
         }
         let pinNameParam = null;
+        let pinType = PinTypes.Any;
+        if (positionParams[1].type && positionParams[1].type === ReferenceTypes.pinType) {
+            pinType = positionParams[1].value;
+            positionParams = [positionParams[0], ...positionParams.slice(2)];
+        }
         if (typeof positionParams[1] === 'string') {
             pinNameParam = positionParams[1];
             positionParams = [positionParams[0], ...positionParams.slice(2)];
@@ -443,6 +466,7 @@ export var PlaceHolderCommands;
     PlaceHolderCommands["lineWidth"] = "lineWidth";
     PlaceHolderCommands["fill"] = "fill";
     PlaceHolderCommands["lineColor"] = "lineColor";
+    PlaceHolderCommands["text"] = "text";
 })(PlaceHolderCommands || (PlaceHolderCommands = {}));
 export class SymbolCustom extends SymbolGraphic {
     pinDefinition = [];
@@ -630,6 +654,10 @@ export class SymbolDrawing {
         this.items.push(Geometry.label(id, x, y, textValue, style));
         return this;
     }
+    addTextbox(x, y, textValue, style) {
+        this.items.push(Geometry.textbox(null, x, y, textValue, style));
+        return this;
+    }
     addPath(...pathParts) {
         const parts = pathParts.reduce((accum, tmp) => {
             if (typeof tmp === "string") {
@@ -704,7 +732,7 @@ export class SymbolDrawing {
         let currentLineColor = '#333';
         const pathItems = [];
         this.items.forEach(item => {
-            if (!(item instanceof Label)) {
+            if (!(item instanceof Textbox)) {
                 if (item instanceof GeometryProp) {
                     if (item.name === 'lineWidth') {
                         currentLineWidth = item.value;
@@ -719,7 +747,7 @@ export class SymbolDrawing {
                 else {
                     let tmpResult = Geometry.groupFlip([item], this.flipX, this.flipY);
                     tmpResult = Geometry.groupRotate(tmpResult, this.angle, this.mainOrigin);
-                    const { path, isClosedPolygon } = this.featuresToPath(tmpResult);
+                    const { path, isClosedPolygon } = this.featuresToPath(tmpResult, this.flipX, this.flipY);
                     pathItems.push({
                         path: path,
                         lineWidth: currentLineWidth,
@@ -735,14 +763,14 @@ export class SymbolDrawing {
         let features = this.pins.map(item => item[1]);
         features = Geometry.groupFlip(features, this.flipX, this.flipY);
         features = Geometry.groupRotate(features, this.angle, this.mainOrigin);
-        const { path } = this.featuresToPath(features);
+        const { path } = this.featuresToPath(features, this.flipX, this.flipY);
         return path;
     }
     getLabels() {
-        return this.items.filter(item => item instanceof Label);
+        return this.items.filter(item => item instanceof Textbox);
     }
-    featuresToPath(items) {
-        return Geometry.featuresToPath(items);
+    featuresToPath(items, flipX, flipY) {
+        return Geometry.featuresToPath(items, flipX, flipY);
     }
     getBoundingBox(excludeLabels = false) {
         const pinFeatures = this.pins.map(pin => {

package/dist/esm/execute.mjs

@@ -3,8 +3,10 @@ import { ClassComponent } from './objects/ClassComponent.mjs';
 import { ActiveObject, ExecutionScope, FrameAction, SequenceAction } from './objects/ExecutionScope.mjs';
 import { Net } from './objects/Net.mjs';
 import { PortSide } from './objects/PinDefinition.mjs';
+import { Direction } from './objects/types.mjs';
 import { Wire } from './objects/Wire.mjs';
 import { Frame } from './objects/Frame.mjs';
+import { CalculatePinPositions } from './layout.mjs';
 export class ExecutionContext {
     name;
     namespace;
@@ -19,6 +21,7 @@ export class ExecutionContext {
     logger;
     __functionCache = {};
     parentContext;
+    componentAngleFollowsWire = true;
     constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
         this.name = name;
         this.namespace = namespace;
@@ -144,12 +147,27 @@ export class ExecutionContext {
         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.typeProp = props.type ?? null;
+        component.copyProp = props.copy ?? false;
+        let useAngle = null;
+        if (props.angle) {
+            useAngle = props.angle % 360;
+            if (useAngle < 0) {
+                useAngle += 360;
+            }
+        }
+        component.angleProp = useAngle ?? 0;
+        component.followWireOrientationProp = props.followWireOrientation;
         const paramsMap = new Map();
         params.forEach((param) => {
             component.parameters.set(param.paramName, param.paramValue);
             paramsMap.set(param.paramName, param.paramValue);
         });
-        if (paramsMap.has(ParamKeys.__is_net)) {
+        if (component.typeProp === ComponentTypes.net
+            || component.typeProp === ComponentTypes.label) {
             const netName = paramsMap.get(ParamKeys.net_name);
             const priority = paramsMap.get(ParamKeys.priority);
             const result = this.resolveNet(netName, this.netNamespace);
@@ -165,12 +183,7 @@ export class ExecutionContext {
             this.scope.setNet(component, 1, tmpNet);
             this.log('set net', netName, 'component', component);
         }
-        const { arrange = null } = props;
-        component.arrangeProps = arrange;
-        component.displayProp = props.display ?? null;
-        component.widthProp = props.width ?? null;
-        component.typeProp = props.type ?? null;
-        const portSides = getPortSide(component.pins, arrange);
+        const portSides = getPortSide(component.pins, component.arrangeProps);
         portSides.forEach(({ pinId, side, position }) => {
             if (component.pins.has(pinId)) {
                 const tmpPin = component.pins.get(pinId);
@@ -187,6 +200,10 @@ export class ExecutionContext {
     }
     printPoint(extra = '') {
         let netName = NoNetText;
+        if (this.scope.currentComponent === null || this.scope.currentPin === null) {
+            this.log((extra !== '' ? (extra + ' ') : '') + 'point is null');
+            return;
+        }
         if (this.scope.hasNet(this.scope.currentComponent, this.scope.currentPin)) {
             netName = this.scope
                 .getNet(this.scope.currentComponent, this.scope.currentPin)
@@ -200,6 +217,7 @@ export class ExecutionContext {
     addComponentExisting(component, pin) {
         const startPin = pin;
         const nextPin = component.getNextPinAfter(startPin);
+        this.applyComponentAngleFromWire(component, pin);
         this.toComponent(component, startPin, { addSequence: true });
         this.log('move to next pin: ' + nextPin);
         this.atComponent(component, nextPin, {
@@ -235,6 +253,7 @@ export class ExecutionContext {
                 .toString());
         }
         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.clearActive();
@@ -283,22 +302,22 @@ export class ExecutionContext {
         this.printPoint();
         return this.getCurrentPoint();
     }
-    cloneComponent(component) {
-        let clonedComponent = null;
+    copyComponent(component) {
+        let componentCopy = null;
         if (!this.scope.copyIDs.has(component.instanceName)) {
             this.scope.copyIDs.set(component.instanceName, 0);
         }
         const idNum = this.scope.copyIDs.get(component.instanceName);
-        clonedComponent = component.clone();
-        clonedComponent._copyID = idNum;
-        clonedComponent._copyFrom = component;
+        componentCopy = component.clone();
+        componentCopy._copyID = idNum;
+        componentCopy._copyFrom = component;
         this.scope.copyIDs.set(component.instanceName, idNum + 1);
         const cloneInstanceName = component.instanceName + ':' + idNum;
-        this.scope.instances.set(cloneInstanceName, clonedComponent);
-        clonedComponent.instanceName = cloneInstanceName;
-        this.linkComponentPinNet(component, 1, clonedComponent, 1);
+        this.scope.instances.set(cloneInstanceName, componentCopy);
+        componentCopy.instanceName = cloneInstanceName;
+        this.linkComponentPinNet(component, 1, componentCopy, 1);
         this.log('created clone of net component:', cloneInstanceName);
-        return clonedComponent;
+        return componentCopy;
     }
     enterBlocks(blockType) {
         if (blockType === BlockTypes.Point) {
@@ -565,7 +584,8 @@ export class ExecutionContext {
             }
             else if (action === SequenceAction.At || action === SequenceAction.To) {
                 const tmpComponent = sequenceAction[1];
-                if (isNetComponent(tmpComponent) && tmpComponent.parameters.get(ParamKeys.net_name) === 'gnd') {
+                if (tmpComponent.typeProp === ComponentTypes.net
+                    && tmpComponent.parameters.get(ParamKeys.net_name) === 'gnd') {
                     tmpComponent._copyID = gndCopyIdOffset + incrementGndLinkId;
                     incrementGndLinkId += 1;
                 }
@@ -682,6 +702,59 @@ export class ExecutionContext {
             this.scope.currentComponent.styles[key] = styles[key];
         }
     }
+    applyComponentAngleFromWire(component, pin) {
+        if (this.componentAngleFollowsWire
+            && component.followWireOrientationProp
+            && component.useWireOrientationAngle
+            && this.scope.currentWireId !== -1) {
+            const currentWire = this.scope.wires[this.scope.currentWireId];
+            const lastSegment = currentWire.path[currentWire.path.length - 1];
+            const pinPositions = CalculatePinPositions(component);
+            if (pinPositions.has(pin)) {
+                const connectedPinPos = pinPositions.get(pin);
+                let targetAngle = null;
+                switch (lastSegment.direction) {
+                    case Direction.Down:
+                        targetAngle = 90;
+                        break;
+                    case Direction.Up:
+                        targetAngle = 270;
+                        break;
+                    case Direction.Right:
+                        targetAngle = 0;
+                        break;
+                    case Direction.Left:
+                        targetAngle = 180;
+                        break;
+                    default:
+                        targetAngle = null;
+                }
+                if (targetAngle === null) {
+                    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;
+                if (useAngle < 0) {
+                    useAngle += 360;
+                }
+                if (useAngle === 90) {
+                    component.setParam('angle', 90);
+                }
+                else if (useAngle === 180) {
+                    if (component.angleProp === 0 || component.angleProp === 180) {
+                        component.setParam('flipX', 1);
+                    }
+                    else if (component.angleProp === 90 || component.angleProp === 270) {
+                        component.setParam('flipY', 1);
+                    }
+                }
+                else if (useAngle === 270) {
+                    component.setParam('angle', 270);
+                }
+                component.wireOrientationAngle = useAngle;
+            }
+        }
+    }
     enterFrame() {
         const frameId = this.scope.frames.length + 1;
         const frameObject = new Frame(frameId);
@@ -706,15 +779,6 @@ function isWireSegmentsEndAuto(segments) {
     }
     return false;
 }
-export function isNetComponent(component) {
-    return component.parameters.has(ParamKeys.__is_net);
-}
-export function isLabelComponent(component) {
-    return component.parameters.has(ParamKeys.__is_label);
-}
-export function isNetOnlyComponent(component) {
-    return isNetComponent(component) && !isLabelComponent(component);
-}
 export function getPortSide(pins, arrangeProps) {
     const result = [];
     if (arrangeProps === null) {

package/dist/esm/export.mjs

@@ -3,6 +3,7 @@ import { NumericValue } from "./objects/ParamDefinition.mjs";
 export function generateKiCADNetList(netlist) {
     const componentsList = [];
     const nets = {};
+    const missingFootprints = [];
     netlist.forEach(entry => {
         const { instance, pins } = entry;
         if (instance.assignedRefDes !== null) {
@@ -22,7 +23,10 @@ export function generateKiCADNetList(netlist) {
                     instance.parameters.get('footprint')]);
             }
             else {
-                console.log(instance.assignedRefDes, instance.instanceName, 'does not have footprint');
+                missingFootprints.push({
+                    refdes: instance.assignedRefDes,
+                    instanceName: instance.instanceName
+                });
             }
             componentsList.push(instanceDetails);
             for (const key in pins) {
@@ -63,20 +67,24 @@ export function generateKiCADNetList(netlist) {
         ]);
         counter++;
     }
+    const dateString = new Date().toISOString().slice(0, 10);
     const tree = [
         Id("export"),
         [Id("version"), "E"],
         [Id("design"),
-            [Id("source"), "/somefile"],
-            [Id("date"), "2023-11-19"],
+            [Id("source"), "/unknown-file"],
+            [Id("date"), dateString],
             [Id("tool"), "circuitscript-to-kicad"]
         ],
         [Id('components'), ...componentsList],
         [Id('nets'), ...netItems]
     ];
-    return printTree(tree);
+    return {
+        tree,
+        missingFootprints
+    };
 }
-function printTree(tree, level = 0) {
+export function printTree(tree, level = 0) {
     const output = [];
     if (!Array.isArray(tree)) {
         return "\"" + tree + "\"";
@@ -98,9 +106,84 @@ function printTree(tree, level = 0) {
 function Id(name) {
     return new IdObject(name);
 }
-class IdObject {
+export class IdObject {
     keyName;
     constructor(keyName) {
         this.keyName = keyName;
     }
 }
+export function _id(key) {
+    return new IdObject(key);
+}
+export class SExpObject {
+    object;
+    constructor(object) {
+        this.object = object;
+    }
+    getKey(object = null) {
+        object = object ?? this.object;
+        return object[0];
+    }
+    getValue(object = null) {
+        object = object ?? this.object;
+        return object.slice(1);
+    }
+    getJSON(object = null) {
+        object = object ?? this.object;
+        if (!Array.isArray(object)) {
+            return object;
+        }
+        const properties = {};
+        const keyName = object[0].keyName;
+        if (object.length === 2) {
+            properties[keyName] = this.getJSON(object[1]);
+        }
+        else {
+            const innerProps = {};
+            this.getValue(object).forEach(item => {
+                const tmpValue = this.getJSON(item);
+                if (typeof tmpValue === "object") {
+                    for (const key in tmpValue) {
+                        if (innerProps[key]) {
+                            if (!Array.isArray(innerProps[key])) {
+                                innerProps[key] = [innerProps[key]];
+                            }
+                            innerProps[key].push(tmpValue[key]);
+                        }
+                        else {
+                            innerProps[key] = tmpValue[key];
+                        }
+                    }
+                }
+                else {
+                    innerProps[item[0].keyName] = tmpValue;
+                }
+            });
+            properties[keyName] = innerProps;
+        }
+        return properties;
+    }
+    getWithId(id, object = null) {
+        object = object ?? this.object;
+        let result = null;
+        const key = object[0];
+        if (key.keyName === id) {
+            return object;
+        }
+        else {
+            this.getValue(object).some(item => {
+                if (Array.isArray(item)) {
+                    result = this.getWithId(id, item);
+                    if (result !== null) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+        }
+        return result;
+    }
+    print() {
+        console.log(printTree(this.object));
+    }
+}

package/dist/esm/geometry.mjs

@@ -2,7 +2,7 @@ import Flatten from '@flatten-js/core';
 import { measureTextSize2 } from './sizing.mjs';
 import { defaultFont } from './globals.mjs';
 import { NumericValue } from './objects/ParamDefinition.mjs';
-export class Label extends Flatten.Polygon {
+export class Textbox extends Flatten.Polygon {
     id;
     text;
     anchorPoint = [0, 0];
@@ -11,10 +11,11 @@ export class Label extends Flatten.Polygon {
     font = 'default';
     style;
     textMeasurementBounds;
+    label;
     get box() {
         return this.polygon.box;
     }
-    constructor(id, text, anchorPoint, polygon, style, bounds) {
+    constructor(id, text, anchorPoint, polygon, style, bounds, label) {
         super(polygon.vertices);
         this.id = id;
         this.text = text;
@@ -23,8 +24,9 @@ export class Label extends Flatten.Polygon {
         this.boundingBox = polygon.box;
         this.polygon = polygon;
         this.textMeasurementBounds = bounds;
+        this.label = label;
     }
-    static fromPoint(id, x, y, text, style) {
+    static fromPoint(id, x, y, text, style, label) {
         let useText;
         if (typeof text === 'number') {
             useText = text.toString();
@@ -37,7 +39,7 @@ export class Label extends Flatten.Polygon {
             useText = text;
         }
         else {
-            throw 'Invalid string passed into label';
+            throw 'Invalid string passed into textbox';
         }
         const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', } = style ?? {};
         const { width, height, box } = measureTextSize2(useText, defaultFont, fontSize, fontWeight, anchor, vanchor);
@@ -49,20 +51,22 @@ export class Label extends Flatten.Polygon {
             [box.x, box.y],
         ];
         const polygon = new Flatten.Polygon(polygonCoords);
-        return new Label(id, useText, [x, y], polygon, style, box);
+        return new Textbox(id, useText, [x, y], polygon, style, box, label);
     }
     rotate(angle, origin) {
         const feature = super.rotate(angle, origin);
-        return new Label(this.id, this.text, this.anchorPoint, feature, this.style, this.textMeasurementBounds);
+        return new Textbox(this.id, this.text, this.anchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transform(matrix) {
         const feature = super.transform(matrix);
-        return new Label(this.id, this.text, this.anchorPoint, feature, this.style, this.textMeasurementBounds);
+        return new Textbox(this.id, this.text, this.anchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     getLabelPosition() {
         return this.anchorPoint;
     }
 }
+export class Label extends Textbox {
+}
 export class GeometryProp {
     name;
     value;
@@ -79,7 +83,10 @@ export class Geometry {
         return new Flatten.Line(Geometry.point(x1, y1), Geometry.point(x2, y2));
     }
     static label(id, x, y, text, style) {
-        return Label.fromPoint(id, x, y, text, style);
+        return Textbox.fromPoint(id, x, y, text, style, true);
+    }
+    static textbox(id, x, y, text, style) {
+        return Textbox.fromPoint(id, x, y, text, style, false);
     }
     static segment(start, end) {
         return new Flatten.Segment(Geometry.point(start[0], start[1]), Geometry.point(end[0], end[1]));
@@ -130,12 +137,28 @@ export class Geometry {
         let maxX = Number.NEGATIVE_INFINITY;
         let maxY = Number.NEGATIVE_INFINITY;
         features.forEach(feature => {
-            const box = feature.box;
-            if (feature instanceof Label
+            const tmpBox = feature.box;
+            let box = {
+                xmin: tmpBox.xmin,
+                ymin: tmpBox.ymin,
+                xmax: tmpBox.xmax,
+                ymax: tmpBox.ymax
+            };
+            if (feature instanceof Textbox
+                && feature.label
                 && typeof feature.text === 'string'
                 && feature.text.trim().length === 0) {
                 return;
             }
+            if (feature instanceof Textbox && !feature.label) {
+                const [x, y] = feature.anchorPoint;
+                box = {
+                    xmin: box.xmin + x,
+                    ymin: box.ymin + y,
+                    xmax: box.xmax + x,
+                    ymax: box.ymax + y
+                };
+            }
             if (box.xmin === undefined) {
                 throw "Invalid box!";
             }
@@ -151,24 +174,12 @@ export class Geometry {
             height: maxY - minY,
         };
     }
-    static getType(feature) {
-        if (feature instanceof Label) {
-            return 'label';
-        }
-        else if (feature instanceof Flatten.Polygon) {
-            return 'polygon';
-        }
-        else if (feature instanceof Flatten.Segment) {
-            return 'segment';
-        }
-        console.log('unknown type', feature);
-    }
     static FullCircleRadians = 2 * Math.PI;
-    static featuresToPath(items) {
+    static featuresToPath(items, flipX, flipY) {
         const paths = [];
         let isClosedPolygon = false;
         items.forEach(item => {
-            if (item instanceof Label) {
+            if (item instanceof Textbox) {
                 return;
             }
             const path = [];
@@ -185,7 +196,15 @@ export class Geometry {
                 }
                 const startPoint = getArcPointRadians(x, y, radius, item.startAngle);
                 const endPoint = getArcPointRadians(x, y, radius, useEndAngle);
-                paths.push('M', startPoint[0], startPoint[1], 'A', radius, radius, 0, 1, 1, endPoint[0], endPoint[1], extraEnd);
+                let largeArcSweepFlag = 0;
+                if (useEndAngle - item.startAngle > Math.PI) {
+                    largeArcSweepFlag = 1;
+                }
+                let sweepFlag = 1;
+                if (flipX === 1 && flipY === 0) {
+                    sweepFlag = 0;
+                }
+                paths.push('M', startPoint[0], startPoint[1], 'A', radius, radius, 0, largeArcSweepFlag, sweepFlag, endPoint[0], endPoint[1], extraEnd);
             }
             else {
                 const coords = Geometry.getCoords(item);

package/dist/esm/globals.mjs

@@ -10,8 +10,6 @@ export var GlobalNames;
 export const NoNetText = 'NO_NET';
 export var ParamKeys;
 (function (ParamKeys) {
-    ParamKeys["__is_net"] = "__is_net";
-    ParamKeys["__is_label"] = "__is_label";
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
 })(ParamKeys || (ParamKeys = {}));
@@ -47,6 +45,7 @@ export var ReferenceTypes;
     ReferenceTypes["value"] = "value";
     ReferenceTypes["variable"] = "variable";
     ReferenceTypes["instance"] = "instance";
+    ReferenceTypes["pinType"] = "pinType";
 })(ReferenceTypes || (ReferenceTypes = {}));
 export var BlockTypes;
 (function (BlockTypes) {