circuitscript 0.0.26 → 0.0.28

package/dist/cjs/draw_symbols.js

@@ -256,7 +256,7 @@ 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: geometry_js_1.HorizontalAlign.Middle,
             fontWeight: this.fontWeight,
@@ -322,13 +322,7 @@ 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];
@@ -341,10 +335,33 @@ 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';
@@ -455,6 +472,7 @@ var PlaceHolderCommands;
     PlaceHolderCommands["lineWidth"] = "lineWidth";
     PlaceHolderCommands["fill"] = "fill";
     PlaceHolderCommands["lineColor"] = "lineColor";
+    PlaceHolderCommands["text"] = "text";
 })(PlaceHolderCommands || (exports.PlaceHolderCommands = PlaceHolderCommands = {}));
 class SymbolCustom extends SymbolGraphic {
     constructor(pinDefinition) {
@@ -643,6 +661,10 @@ class SymbolDrawing {
         this.items.push(geometry_js_1.Geometry.label(id, x, y, textValue, style));
         return this;
     }
+    addTextbox(x, y, textValue, style) {
+        this.items.push(geometry_js_1.Geometry.textbox(null, x, y, textValue, style));
+        return this;
+    }
     addPath(...pathParts) {
         const parts = pathParts.reduce((accum, tmp) => {
             if (typeof tmp === "string") {
@@ -717,7 +739,7 @@ class SymbolDrawing {
         let currentLineColor = '#333';
         const pathItems = [];
         this.items.forEach(item => {
-            if (!(item instanceof geometry_js_1.Label)) {
+            if (!(item instanceof geometry_js_1.Textbox)) {
                 if (item instanceof geometry_js_1.GeometryProp) {
                     if (item.name === 'lineWidth') {
                         currentLineWidth = item.value;
@@ -732,7 +754,7 @@ class SymbolDrawing {
                 else {
                     let tmpResult = geometry_js_1.Geometry.groupFlip([item], this.flipX, this.flipY);
                     tmpResult = geometry_js_1.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,
@@ -748,21 +770,21 @@ class SymbolDrawing {
         let features = this.pins.map(item => item[1]);
         features = geometry_js_1.Geometry.groupFlip(features, this.flipX, this.flipY);
         features = geometry_js_1.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 geometry_js_1.Label);
+        return this.items.filter(item => item instanceof geometry_js_1.Textbox);
     }
-    featuresToPath(items) {
-        return geometry_js_1.Geometry.featuresToPath(items);
+    featuresToPath(items, flipX, flipY) {
+        return geometry_js_1.Geometry.featuresToPath(items, flipX, flipY);
     }
     getBoundingBox(excludeLabels = false) {
         const pinFeatures = this.pins.map(pin => {
             return pin[1];
         });
         const drawingFeatures = this.items.reduce((accum, item) => {
-            if (!excludeLabels || (excludeLabels && !(item instanceof geometry_js_1.Label))) {
+            if (!excludeLabels || (excludeLabels && !(item instanceof geometry_js_1.Textbox && item.label))) {
                 if (!(item instanceof geometry_js_1.GeometryProp)) {
                     accum.push(item);
                 }

package/dist/cjs/execute.js

@@ -6,8 +6,10 @@ const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const Net_js_1 = require("./objects/Net.js");
 const PinDefinition_js_1 = require("./objects/PinDefinition.js");
+const types_js_1 = require("./objects/types.js");
 const Wire_js_1 = require("./objects/Wire.js");
 const Frame_js_1 = require("./objects/Frame.js");
+const layout_js_1 = require("./layout.js");
 class ExecutionContext {
     constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
         this.tmpPointId = 0;
@@ -16,6 +18,7 @@ class ExecutionContext {
         this.returnValue = null;
         this.silent = false;
         this.__functionCache = {};
+        this.componentAngleFollowsWire = true;
         this.name = name;
         this.namespace = namespace;
         this.netNamespace = netNamespace;
@@ -145,6 +148,15 @@ class ExecutionContext {
         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);
@@ -201,6 +213,7 @@ 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, {
@@ -236,6 +249,7 @@ 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();
@@ -684,6 +698,59 @@ 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 = (0, layout_js_1.CalculatePinPositions)(component);
+            if (pinPositions.has(pin)) {
+                const connectedPinPos = pinPositions.get(pin);
+                let targetAngle = null;
+                switch (lastSegment.direction) {
+                    case types_js_1.Direction.Down:
+                        targetAngle = 90;
+                        break;
+                    case types_js_1.Direction.Up:
+                        targetAngle = 270;
+                        break;
+                    case types_js_1.Direction.Right:
+                        targetAngle = 0;
+                        break;
+                    case types_js_1.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_js_1.Frame(frameId);

package/dist/cjs/geometry.js

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Label = void 0;
+exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Label = exports.Textbox = void 0;
 const core_1 = __importDefault(require("@flatten-js/core"));
 const sizing_js_1 = require("./sizing.js");
 const globals_js_1 = require("./globals.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
-class Label extends core_1.default.Polygon {
+class Textbox extends core_1.default.Polygon {
     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.anchorPoint = [0, 0];
         this.boundingBox = { width: -1, height: -1 };
@@ -24,8 +24,9 @@ class Label extends core_1.default.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();
@@ -38,7 +39,7 @@ class Label extends core_1.default.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 } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize, fontWeight, anchor, vanchor);
@@ -50,20 +51,23 @@ class Label extends core_1.default.Polygon {
             [box.x, box.y],
         ];
         const polygon = new core_1.default.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;
     }
 }
+exports.Textbox = Textbox;
+class Label extends Textbox {
+}
 exports.Label = Label;
 class GeometryProp {
     constructor(name, value) {
@@ -80,7 +84,10 @@ class Geometry {
         return new core_1.default.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 core_1.default.Segment(Geometry.point(start[0], start[1]), Geometry.point(end[0], end[1]));
@@ -131,12 +138,28 @@ 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!";
             }
@@ -152,23 +175,11 @@ class Geometry {
             height: maxY - minY,
         };
     }
-    static getType(feature) {
-        if (feature instanceof Label) {
-            return 'label';
-        }
-        else if (feature instanceof core_1.default.Polygon) {
-            return 'polygon';
-        }
-        else if (feature instanceof core_1.default.Segment) {
-            return 'segment';
-        }
-        console.log('unknown type', feature);
-    }
-    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 @@ 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/cjs/helpers.js

@@ -226,6 +226,7 @@ function renderScript(scriptData, outputPath, options) {
         showStats && console.log('Render took:', generateSvgTimer.lap());
         if (outputPath) {
             (0, fs_1.writeFileSync)(outputPath, svgOutput);
+            console.log('Generated file', outputPath);
         }
     }
     catch (err) {

package/dist/cjs/layout.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.LayoutEngine = void 0;
+exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.LayoutEngine = void 0;
 const graphlib_1 = require("@dagrejs/graphlib");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -10,6 +10,7 @@ const geometry_js_1 = require("./geometry.js");
 const logger_js_1 = require("./logger.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const utils_js_1 = require("./utils.js");
+const types_js_1 = require("./objects/types.js");
 class LayoutEngine {
     constructor() {
         this.placeSubgraphVersion = 2;
@@ -938,16 +939,16 @@ function applyComponentParamsToSymbol(typeProp, component, symbol) {
 function calculateSymbolAngle(symbol, pin, direction) {
     let directionVector = 0;
     switch (direction) {
-        case 'right':
+        case types_js_1.Direction.Right:
             directionVector = 0;
             break;
-        case 'down':
+        case types_js_1.Direction.Down:
             directionVector = 90;
             break;
-        case 'left':
+        case types_js_1.Direction.Left:
             directionVector = 180;
             break;
-        case 'up':
+        case types_js_1.Direction.Up:
             directionVector = 270;
             break;
     }
@@ -1017,16 +1018,16 @@ class RenderWire extends RenderObject {
         this.segments.forEach(segment => {
             const { direction, value } = segment;
             let didAddPoint = false;
-            if (direction === 'down') {
+            if (direction === types_js_1.Direction.Down) {
                 tmpY += value;
             }
-            else if (direction === 'up') {
+            else if (direction === types_js_1.Direction.Up) {
                 tmpY -= value;
             }
-            else if (direction === 'left') {
+            else if (direction === types_js_1.Direction.Left) {
                 tmpX -= value;
             }
-            else if (direction === 'right') {
+            else if (direction === types_js_1.Direction.Right) {
                 tmpX += value;
             }
             else if (direction === 'auto' || direction === "auto_") {
@@ -1095,16 +1096,16 @@ class RenderWire extends RenderObject {
         let tmpY = this.y;
         excludeLastSegment.forEach(segment => {
             const { direction, value } = segment;
-            if (direction === 'down') {
+            if (direction === types_js_1.Direction.Down) {
                 tmpY += value;
             }
-            else if (direction === 'up') {
+            else if (direction === types_js_1.Direction.Up) {
                 tmpY -= value;
             }
-            else if (direction === 'left') {
+            else if (direction === types_js_1.Direction.Left) {
                 tmpX -= value;
             }
-            else if (direction === 'right') {
+            else if (direction === types_js_1.Direction.Right) {
                 tmpX += value;
             }
         });
@@ -1112,16 +1113,16 @@ class RenderWire extends RenderObject {
         let valueXY = null;
         const lastSegment = this.segments[this.segments.length - 1];
         switch (lastSegment.direction) {
-            case 'left':
+            case types_js_1.Direction.Left:
                 useValue = tmpX - untilX;
                 break;
-            case 'right':
+            case types_js_1.Direction.Right:
                 useValue = untilX - tmpX;
                 break;
-            case 'up':
+            case types_js_1.Direction.Up:
                 useValue = untilY - tmpY;
                 break;
-            case 'down':
+            case types_js_1.Direction.Down:
                 useValue = tmpY - untilY;
                 break;
             case 'auto':
@@ -1225,6 +1226,25 @@ class RenderJunction {
     }
 }
 exports.RenderJunction = RenderJunction;
+function CalculatePinPositions(component) {
+    const pinPositionMapping = new Map();
+    let tmpSymbol;
+    if (component.displayProp !== null
+        && component.displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
+        tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(component.displayProp);
+    }
+    else {
+        const symbolPinDefinitions = generateLayoutPinDefinition(component);
+        tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions);
+    }
+    tmpSymbol.refreshDrawing();
+    const pins = component.pins;
+    pins.forEach((value, key) => {
+        pinPositionMapping.set(key, tmpSymbol.pinPosition(key));
+    });
+    return pinPositionMapping;
+}
+exports.CalculatePinPositions = CalculatePinPositions;
 function isPointOverlap(x, y, other) {
     return (x >= other.x && y >= other.y && x <= (other.x + other.width) && y <= (other.y + other.height));
 }

package/dist/cjs/objects/ClassComponent.js

@@ -17,6 +17,10 @@ class ClassComponent {
         this.widthProp = null;
         this.typeProp = null;
         this.copyProp = false;
+        this.angleProp = 0;
+        this.followWireOrientationProp = true;
+        this.wireOrientationAngle = 0;
+        this.useWireOrientationAngle = true;
         this.styles = {};
         this.assignedRefDes = null;
         this.instanceName = instanceName;
@@ -118,6 +122,9 @@ class ClassComponent {
         component.arrangeProps = this.arrangeProps;
         component.widthProp = this.widthProp;
         component.typeProp = this.typeProp;
+        component.angleProp = this.angleProp;
+        component.followWireOrientationProp = this.followWireOrientationProp;
+        component.useWireOrientationAngle = this.useWireOrientationAngle;
         if (this.displayProp) {
             if (typeof this.displayProp === "string") {
                 component.displayProp = this.displayProp;

package/dist/cjs/objects/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParseSymbolType = exports.UndeclaredReference = void 0;
+exports.Direction = exports.ParseSymbolType = exports.UndeclaredReference = void 0;
 class UndeclaredReference {
     constructor(reference) {
         this.reference = reference;
@@ -13,3 +13,10 @@ var ParseSymbolType;
     ParseSymbolType["Function"] = "function";
     ParseSymbolType["Undefined"] = "undefined";
 })(ParseSymbolType || (exports.ParseSymbolType = ParseSymbolType = {}));
+var Direction;
+(function (Direction) {
+    Direction["Left"] = "left";
+    Direction["Right"] = "right";
+    Direction["Down"] = "down";
+    Direction["Up"] = "up";
+})(Direction || (exports.Direction = Direction = {}));

package/dist/cjs/visitor.js

@@ -35,7 +35,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const ctxDataWithAssignmentExpr = ctx.data_expr_with_assignment();
             this.visit(ctxDataWithAssignmentExpr);
             const [component, pinValue] = this.getResult(ctxDataWithAssignmentExpr);
-            return this.getExecutor().addComponentExisting(component, pinValue);
+            this.getExecutor().addComponentExisting(component, pinValue);
         };
         this.visitAt_component_expr = (ctx) => {
             if (ctx.Point()) {
@@ -142,12 +142,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 properties.get('copy') : false;
             const width = properties.has('width') ?
                 properties.get('width') : null;
+            const angle = properties.has('angle') ?
+                properties.get('angle') : null;
+            const followWireOrientation = properties.has('followWireOrientation') ?
+                properties.get('followWireOrientation') : true;
             const props = {
-                arrange,
-                display,
-                type,
-                width,
-                copy
+                arrange, display, type, width, copy,
+                angle, followWireOrientation
             };
             this.setResult(ctx, this.getExecutor().createComponent(instanceName, pins, params, props));
         };
@@ -181,9 +182,20 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             else {
                 throw "Invalid command!";
             }
-            const ctxParameters = ctx.parameters();
-            this.visit(ctxParameters);
-            const parameters = this.getResult(ctxParameters);
+            let parameters = [];
+            const ctxNestedProperties = ctx.nested_properties_inner();
+            if (ctxNestedProperties) {
+                this.visit(ctxNestedProperties);
+                const nestedKeyValues = this.getResult(ctxNestedProperties);
+                nestedKeyValues.forEach((value, key) => {
+                    parameters.push(['keyword', key, value]);
+                });
+            }
+            else {
+                const ctxParameters = ctx.parameters();
+                this.visit(ctxParameters);
+                parameters = this.getResult(ctxParameters);
+            }
             this.setResult(ctx, [commandName, parameters]);
         };
         this.visitProperty_expr = (ctx) => {
@@ -212,7 +224,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             this.setResult(ctx, value);
         };
-        this.visitNested_properties = (ctx) => {
+        this.visitNested_properties_inner = (ctx) => {
             const result = new Map();
             ctx.property_expr().forEach((item) => {
                 this.visit(item);
@@ -223,6 +235,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             });
             this.setResult(ctx, result);
         };
+        this.visitNested_properties = (ctx) => {
+            const ctxNested = ctx.nested_properties_inner();
+            this.visit(ctxNested);
+            this.setResult(ctx, this.getResult(ctxNested));
+        };
         this.visitProperty_key_expr = (ctx) => {
             const ctxID = ctx.ID();
             const ctxIntegerValue = ctx.INTEGER_VALUE();
@@ -272,18 +289,40 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     else if (ctxID2) {
                         result = ctxID2.getText();
                     }
+                    let shouldIgnoreWireOrientation = false;
                     if (modifierText === 'flip') {
                         const flipValue = result;
                         if (flipValue.indexOf('x') !== -1) {
                             component.setParam('flipX', 1);
+                            shouldIgnoreWireOrientation = true;
                         }
                         if (flipValue.indexOf('y') !== -1) {
                             component.setParam('flipY', 1);
+                            shouldIgnoreWireOrientation = true;
                         }
                     }
                     else if (modifierText === 'angle') {
                         const angleValue = Number(result);
                         component.setParam('angle', angleValue);
+                        shouldIgnoreWireOrientation = true;
+                    }
+                    else if (modifierText === 'anchor') {
+                        if (component.displayProp
+                            && component.displayProp instanceof draw_symbols_js_1.SymbolDrawingCommands) {
+                            const commands = (component.displayProp)
+                                .getCommands();
+                            commands.forEach(command => {
+                                const positionParams = command[1];
+                                const keywordParams = command[2];
+                                if (command[0] === draw_symbols_js_1.PlaceHolderCommands.label
+                                    && positionParams[0] === 'value') {
+                                    keywordParams.set('anchor', result);
+                                }
+                            });
+                        }
+                    }
+                    if (shouldIgnoreWireOrientation) {
+                        component.useWireOrientationAngle = false;
                     }
                 });
             }