circuitscript 0.0.26 → 0.0.28

package/dist/types/BaseVisitor.d.ts

@@ -4,7 +4,7 @@ import { ExecutionContext } from "./execute";
 import { Logger } from "./logger";
 import { ClassComponent } from "./objects/ClassComponent";
 import { Net } from "./objects/Net";
-import { CallableParameter, CFunctionOptions, ComplexType, FunctionDefinedParameter, ReferenceType } from "./objects/types";
+import { CallableParameter, CFunctionOptions, ComplexType, Direction, FunctionDefinedParameter, ReferenceType } from "./objects/types";
 import { ParserRuleContext } from 'antlr4ng';
 export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | ReferenceType | any> {
     indentLevel: number;
@@ -16,7 +16,7 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | Refe
     defaultLibsPath: string;
     printStream: string[];
     printToConsole: boolean;
-    acceptedDirections: string[];
+    acceptedDirections: Direction[];
     acceptedFlip: string[];
     protected resultData: Map<ParserRuleContext, any>;
     protected paramData: Map<ParserRuleContext, any>;

package/dist/types/antlr/CircuitScriptParser.d.ts

@@ -99,19 +99,20 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly RULE_function_return_expr = 39;
     static readonly RULE_create_component_expr = 40;
     static readonly RULE_create_graphic_expr = 41;
-    static readonly RULE_graphic_expr = 42;
-    static readonly RULE_property_expr = 43;
-    static readonly RULE_property_key_expr = 44;
-    static readonly RULE_property_value_expr = 45;
-    static readonly RULE_blank_expr = 46;
-    static readonly RULE_wire_atom_expr = 47;
-    static readonly RULE_wire_expr = 48;
-    static readonly RULE_point_expr = 49;
-    static readonly RULE_import_expr = 50;
-    static readonly RULE_frame_expr = 51;
-    static readonly RULE_if_expr = 52;
-    static readonly RULE_if_inner_expr = 53;
-    static readonly RULE_else_expr = 54;
+    static readonly RULE_nested_properties_inner = 42;
+    static readonly RULE_graphic_expr = 43;
+    static readonly RULE_property_expr = 44;
+    static readonly RULE_property_key_expr = 45;
+    static readonly RULE_property_value_expr = 46;
+    static readonly RULE_blank_expr = 47;
+    static readonly RULE_wire_atom_expr = 48;
+    static readonly RULE_wire_expr = 49;
+    static readonly RULE_point_expr = 50;
+    static readonly RULE_import_expr = 51;
+    static readonly RULE_frame_expr = 52;
+    static readonly RULE_if_expr = 53;
+    static readonly RULE_if_inner_expr = 54;
+    static readonly RULE_else_expr = 55;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -165,6 +166,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     function_return_expr(): Function_return_exprContext;
     create_component_expr(): Create_component_exprContext;
     create_graphic_expr(): Create_graphic_exprContext;
+    nested_properties_inner(): Nested_properties_innerContext;
     graphic_expr(): Graphic_exprContext;
     property_expr(): Property_exprContext;
     property_key_expr(): Property_key_exprContext;
@@ -639,6 +641,17 @@ export declare class Create_graphic_exprContext extends antlr.ParserRuleContext
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
+export declare class Nested_properties_innerContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    NEWLINE(): antlr.TerminalNode[];
+    NEWLINE(i: number): antlr.TerminalNode | null;
+    INDENT(): antlr.TerminalNode | null;
+    DEDENT(): antlr.TerminalNode | null;
+    property_expr(): Property_exprContext[];
+    property_expr(i: number): Property_exprContext | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
 export declare class Graphic_exprContext extends antlr.ParserRuleContext {
     _command?: Token | null;
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
@@ -647,6 +660,7 @@ export declare class Graphic_exprContext extends antlr.ParserRuleContext {
     parameters(): ParametersContext | null;
     OPEN_PAREN(): antlr.TerminalNode | null;
     CLOSE_PAREN(): antlr.TerminalNode | null;
+    nested_properties_inner(): Nested_properties_innerContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
@@ -678,12 +692,7 @@ export declare class Single_line_propertyContext extends Property_value_exprCont
 }
 export declare class Nested_propertiesContext extends Property_value_exprContext {
     constructor(ctx: Property_value_exprContext);
-    NEWLINE(): antlr.TerminalNode[];
-    NEWLINE(i: number): antlr.TerminalNode | null;
-    INDENT(): antlr.TerminalNode;
-    DEDENT(): antlr.TerminalNode;
-    property_expr(): Property_exprContext[];
-    property_expr(i: number): Property_exprContext | null;
+    nested_properties_inner(): Nested_properties_innerContext;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
 export declare class Blank_exprContext extends antlr.ParserRuleContext {

package/dist/types/antlr/CircuitScriptVisitor.d.ts

@@ -49,6 +49,7 @@ import { Net_namespace_exprContext } from "./CircuitScriptParser.js";
 import { Function_return_exprContext } from "./CircuitScriptParser.js";
 import { Create_component_exprContext } from "./CircuitScriptParser.js";
 import { Create_graphic_exprContext } from "./CircuitScriptParser.js";
+import { Nested_properties_innerContext } from "./CircuitScriptParser.js";
 import { Graphic_exprContext } from "./CircuitScriptParser.js";
 import { Property_exprContext } from "./CircuitScriptParser.js";
 import { Property_key_exprContext } from "./CircuitScriptParser.js";
@@ -115,6 +116,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitFunction_return_expr?: (ctx: Function_return_exprContext) => Result;
     visitCreate_component_expr?: (ctx: Create_component_exprContext) => Result;
     visitCreate_graphic_expr?: (ctx: Create_graphic_exprContext) => Result;
+    visitNested_properties_inner?: (ctx: Nested_properties_innerContext) => Result;
     visitGraphic_expr?: (ctx: Graphic_exprContext) => Result;
     visitProperty_expr?: (ctx: Property_exprContext) => Result;
     visitProperty_key_expr?: (ctx: Property_key_exprContext) => Result;

package/dist/types/draw_symbols.d.ts

@@ -1,5 +1,5 @@
 import { G } from "@svgdotjs/svg.js";
-import { Feature, GeometryProp, HorizontalAlign, Label, LabelStyle, VerticalAlign } from "./geometry.js";
+import { Feature, GeometryProp, HorizontalAlign, LabelStyle, Textbox, VerticalAlign } from "./geometry.js";
 import { Logger } from "./logger.js";
 export declare abstract class SymbolGraphic {
     drawPortsName: boolean;
@@ -56,6 +56,9 @@ export declare class SymbolText extends SymbolGraphic {
 }
 export declare class SymbolPlaceholder extends SymbolGraphic {
     generateDrawing(): void;
+    parseLabelStyle(keywordParams: Map<string, any>): {
+        [key: string]: any;
+    };
     drawPinParams(drawing: SymbolDrawingCommands, commandName: string, keywordParams: Map<string, any>, positionParams: any[]): void;
     constructor(drawing: SymbolDrawing);
 }
@@ -74,7 +77,8 @@ export declare enum PlaceHolderCommands {
     path = "path",
     lineWidth = "lineWidth",
     fill = "fill",
-    lineColor = "lineColor"
+    lineColor = "lineColor",
+    text = "text"
 }
 export declare class SymbolCustom extends SymbolGraphic {
     pinDefinition: SymbolPinDefintion[];
@@ -110,6 +114,7 @@ export declare class SymbolDrawing {
     addRect2(x: number, y: number, x2: number, y2: number): SymbolDrawing;
     addLabel(x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
     addLabelId(id: string, x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
+    addTextbox(x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
     addPath(...pathParts: any): SymbolDrawing;
     addSetLineWidth(value: number): SymbolDrawing;
     addSetLineColor(value: string): SymbolDrawing;
@@ -122,7 +127,7 @@ export declare class SymbolDrawing {
         lineWidth: number;
     }[];
     getPinsPath(): string;
-    getLabels(): Label[];
+    getLabels(): Textbox[];
     private featuresToPath;
     getBoundingBox(excludeLabels?: boolean): {
         width: number;

package/dist/types/execute.d.ts

@@ -23,6 +23,7 @@ export declare class ExecutionContext {
     logger: Logger;
     __functionCache: {};
     parentContext: ExecutionContext;
+    componentAngleFollowsWire: boolean;
     constructor(name: string, namespace: string, netNamespace: string, executionLevel: number | undefined, indentLevel: number | undefined, silent: boolean | undefined, logger: Logger, parent: ExecutionContext);
     log(...params: any[]): void;
     private setupRoot;
@@ -37,6 +38,8 @@ export declare class ExecutionContext {
         type?: string;
         width?: number;
         copy: boolean;
+        angle?: number;
+        followWireOrientation: boolean;
     }): ClassComponent;
     printPoint(extra?: string): void;
     addComponentExisting(component: ClassComponent, pin: number): ComponentPin;
@@ -67,6 +70,7 @@ export declare class ExecutionContext {
     setCurrentComponentStyle(styles: {
         [key: string]: number | string;
     }): void;
+    applyComponentAngleFromWire(component: ClassComponent, pin: number): void;
     enterFrame(): number;
     exitFrame(frameId: number): void;
 }

package/dist/types/geometry.d.ts

@@ -5,7 +5,7 @@ export type Polygon = Flatten.Polygon;
 export type Multiline = Flatten.Multiline;
 export type Line = Flatten.Line;
 export type Arc = Flatten.Arc;
-export type Feature = Segment | Polygon | Label | Arc | Multiline;
+export type Feature = Segment | Polygon | Label | Textbox | Arc | Multiline;
 export type LabelStyle = {
     font?: string;
     fontSize?: number;
@@ -14,7 +14,7 @@ export type LabelStyle = {
     anchor?: HorizontalAlign.Left | HorizontalAlign.Middle | HorizontalAlign.Right;
     vanchor?: VerticalAlign.Top | VerticalAlign.Middle | VerticalAlign.Bottom;
 };
-export declare class Label extends Flatten.Polygon {
+export declare class Textbox extends Flatten.Polygon {
     id: string;
     text: string;
     anchorPoint: [number, number];
@@ -26,13 +26,16 @@ export declare class Label extends Flatten.Polygon {
     font: string;
     style: LabelStyle;
     textMeasurementBounds: Box;
+    label: boolean;
     get box(): Flatten.Box;
-    constructor(id: string, text: string, anchorPoint: [number, number], polygon: Flatten.Polygon, style: LabelStyle, bounds: Box);
-    static fromPoint(id: string, x: number, y: number, text: string, style: LabelStyle): Label;
-    rotate(angle: number, origin: Flatten.Point): Label;
-    transform(matrix: Flatten.Matrix): Label;
+    constructor(id: string, text: string, anchorPoint: [number, number], polygon: Flatten.Polygon, style: LabelStyle, bounds: Box, label: boolean);
+    static fromPoint(id: string, x: number, y: number, text: string, style: LabelStyle, label: boolean): Textbox;
+    rotate(angle: number, origin: Flatten.Point): Textbox;
+    transform(matrix: Flatten.Matrix): Textbox;
     getLabelPosition(): [number, number];
 }
+export declare class Label extends Textbox {
+}
 export declare class GeometryProp {
     name: string;
     value: string | number;
@@ -41,7 +44,8 @@ export declare class GeometryProp {
 export declare class Geometry {
     static point(x: number, y: number): Flatten.Point;
     static line(x1: number, y1: number, x2: number, y2: number): Flatten.Line;
-    static label(id: string, x: number, y: number, text: string, style: LabelStyle): Label;
+    static label(id: string, x: number, y: number, text: string, style: LabelStyle): Textbox;
+    static textbox(id: string | null, x: number, y: number, text: string, style: LabelStyle): Textbox;
     static segment(start: [number, number], end: [number, number]): Segment;
     static polygon(coords: [number, number][]): Polygon;
     static multiline(coords: [number, number][]): Multiline;
@@ -57,9 +61,8 @@ export declare class Geometry {
         width: number;
         height: number;
     };
-    static getType(feature: Feature): string;
     static FullCircleRadians: number;
-    static featuresToPath(items: Feature[]): {
+    static featuresToPath(items: Feature[], flipX: number, flipY: number): {
         path: string;
         isClosedPolygon: boolean;
     };

package/dist/types/layout.d.ts

@@ -139,6 +139,11 @@ export declare class RenderJunction {
     y: number;
     constructor(x: number, y: number);
 }
+export declare function CalculatePinPositions(component: ClassComponent): Map<number, {
+    x: number;
+    y: number;
+    angle: number;
+}>;
 type SubGraphInfo = {
     firstNodeId: string;
     components: string[];

package/dist/types/objects/ClassComponent.d.ts

@@ -19,6 +19,10 @@ export declare class ClassComponent {
     widthProp: number | null;
     typeProp: string | null;
     copyProp: boolean;
+    angleProp: number;
+    followWireOrientationProp: boolean;
+    wireOrientationAngle: number;
+    useWireOrientationAngle: boolean;
     styles: {
         [key: string]: number | string;
     };

package/dist/types/objects/Wire.d.ts

@@ -1,10 +1,11 @@
 import { ClassComponent } from "./ClassComponent.js";
+import { Direction } from "./types.js";
 export declare class Wire {
     path: WireSegment[];
     constructor(path: WireSegment[]);
 }
 export type WireSegment = {
-    direction: 'up' | 'down' | 'left' | 'right' | 'auto' | 'auto_';
+    direction: Direction.Up | Direction.Down | Direction.Left | Direction.Right | 'auto' | 'auto_';
     value: number;
     valueXY?: [x: number, y: number];
     until?: [instance: ClassComponent, pin: number];

package/dist/types/objects/types.d.ts

@@ -52,3 +52,9 @@ export declare enum ParseSymbolType {
     Function = "function",
     Undefined = "undefined"
 }
+export declare enum Direction {
+    Left = "left",
+    Right = "right",
+    Down = "down",
+    Up = "up"
+}

package/dist/types/visitor.d.ts

@@ -1,4 +1,4 @@
-import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_block_pin_expression_complexContext, At_block_pin_expression_simpleContext, At_component_exprContext, BinaryOperatorExprContext, Path_blocksContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, DataExprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, Keyword_assignment_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_expr2Context, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Property_set_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, Wire_expr_direction_onlyContext, Wire_expr_direction_valueContext, Graphic_exprContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext } from './antlr/CircuitScriptParser.js';
+import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_block_pin_expression_complexContext, At_block_pin_expression_simpleContext, At_component_exprContext, BinaryOperatorExprContext, Path_blocksContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, DataExprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, Keyword_assignment_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_expr2Context, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Property_set_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, Wire_expr_direction_onlyContext, Wire_expr_direction_valueContext, Graphic_exprContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, Nested_properties_innerContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet } from './objects/types.js';
@@ -8,7 +8,7 @@ import { ParserRuleContext } from 'antlr4ng';
 export declare class ParserVisitor extends BaseVisitor {
     visitKeyword_assignment_expr: (ctx: Keyword_assignment_exprContext) => void;
     visitPin_select_expr: (ctx: Pin_select_exprContext) => void;
-    visitAdd_component_expr: (ctx: Add_component_exprContext) => ComponentPin;
+    visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
     visitAt_component_expr: (ctx: At_component_exprContext) => ComponentPin;
     visitTo_component_expr: (ctx: To_component_exprContext) => ComponentPin;
     visitComponent_select_expr: (ctx: Component_select_exprContext) => void;
@@ -18,6 +18,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitGraphic_expr: (ctx: Graphic_exprContext) => void;
     visitProperty_expr: (ctx: Property_exprContext) => void;
     visitSingle_line_property: (ctx: Single_line_propertyContext) => void;
+    visitNested_properties_inner: (ctx: Nested_properties_innerContext) => void;
     visitNested_properties: (ctx: Nested_propertiesContext) => void;
     visitProperty_key_expr: (ctx: Property_key_exprContext) => void;
     visitData_expr_with_assignment: (ctx: Data_expr_with_assignmentContext) => void;

package/libs/lib.cst

@@ -4,6 +4,7 @@ def net(net_name):
     return create component:
         pins: 1
         copy: true
+        angle: -90
         display: create graphic:
             hline: -15, 0, 30
             vpin: 1, 0, 10, -10, display_pin_id=0
@@ -17,6 +18,7 @@ def supply(net_name):
     return create component:
         pins: 1
         copy: true
+        angle: -90
         display: create graphic:
             hline: -15, 0, 30
             vpin: 1, 0, 10, -10, display_pin_id=0
@@ -26,12 +28,13 @@ def supply(net_name):
             net_name: net_name
             priority: 20
 
-def label(value):
+def label(value, anchor="left"):
     return create component:
         pins: 1
         copy: true
+        followWireOrientation: false
         display: create graphic:
-            label: "value", 0, -2, "?", fontSize=10, anchor="left"
+            label: "value", 0, -2, "?", fontSize=10, anchor=anchor
             pin: 1, 0, 0, 0, 0, display_pin_id=0
         type: "label"
         params:
@@ -63,6 +66,7 @@ def cap(value):
 
     return create component:
         pins: 2
+        angle: 90
         display: create graphic:
             hline: -width/2, -3, width
             hline: -width/2, 3, width
@@ -139,6 +143,7 @@ def cgnd():
     return create component:
         pins: 1
         copy: true
+        angle: 90
         display: create graphic:
             hline: -15, 0, 30
             hline: -10, 5, 20
@@ -157,6 +162,7 @@ def dgnd(net_name="GND"):
     return create component:
         pins: 1
         copy: true
+        angle: 90
         display: create graphic:
             triangle: 0, 0, 0, height, width
             vpin: 1, 0, -10, 10, display_pin_id=0
@@ -173,7 +179,6 @@ def marker_point():
             hline: -5, 0, 10
             vline: 0, -5, 10
             pin: 1, 0, 0, 0, 0, display_pin_id=0
-        type: "net"
 
 def arrow_point():
     return create component:
@@ -181,4 +186,14 @@ def arrow_point():
         display: create graphic:
             path: ("M", 15, -5, "L", 20, 0, "L", 15, 5)
             hpin: 1, 0, 0, 20
-        type: "net"
+
+def text(value, offsetX = 0, offsetY = 0, fontSize = 12):
+    return create component:
+        pins: 1
+        followWireOrientation: false
+        display: create graphic:
+            pin: 1, 0, 0, 0, 0, display_pin_id=0
+            text:
+                content: value
+                offset: offsetX, offsetY
+                fontSize: fontSize

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.0.26",
+    "version": "0.0.28",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {