circuitscript 0.5.7 → 0.6.0

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

@@ -73,61 +73,63 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly ID = 69;
     static readonly RULE_script = 0;
     static readonly RULE_expression = 1;
-    static readonly RULE_flow_expressions = 2;
-    static readonly RULE_graph_expressions = 3;
-    static readonly RULE_expressions_block = 4;
-    static readonly RULE_path_block = 5;
-    static readonly RULE_pin_select_expr = 6;
-    static readonly RULE_component_modifier_expr = 7;
-    static readonly RULE_data_expr_with_assignment = 8;
-    static readonly RULE_assignment_expr = 9;
-    static readonly RULE_add_component_expr = 10;
-    static readonly RULE_component_select_expr = 11;
-    static readonly RULE_at_component_expr = 12;
-    static readonly RULE_to_component_expr = 13;
-    static readonly RULE_at_block_header = 14;
-    static readonly RULE_at_block = 15;
-    static readonly RULE_at_block_expressions = 16;
-    static readonly RULE_at_block_pin_expr = 17;
-    static readonly RULE_keyword_assignment_expr = 18;
-    static readonly RULE_parameters = 19;
-    static readonly RULE_double_dot_property_set_expr = 20;
-    static readonly RULE_data_expr = 21;
-    static readonly RULE_value_expr = 22;
-    static readonly RULE_function_def_expr = 23;
-    static readonly RULE_function_expr = 24;
-    static readonly RULE_function_args_expr = 25;
-    static readonly RULE_function_return_expr = 26;
-    static readonly RULE_net_namespace_expr = 27;
-    static readonly RULE_callable_expr = 28;
-    static readonly RULE_trailer = 29;
-    static readonly RULE_property_block_expr = 30;
-    static readonly RULE_properties_block = 31;
-    static readonly RULE_graphic_expressions_block = 32;
-    static readonly RULE_create_expr = 33;
-    static readonly RULE_create_component_expr = 34;
-    static readonly RULE_create_graphic_expr = 35;
-    static readonly RULE_create_module_expr = 36;
-    static readonly RULE_graphic_expr = 37;
-    static readonly RULE_property_expr = 38;
-    static readonly RULE_property_key_expr = 39;
-    static readonly RULE_property_value_expr = 40;
-    static readonly RULE_wire_expr = 41;
-    static readonly RULE_point_expr = 42;
-    static readonly RULE_import_expr = 43;
-    static readonly RULE_frame_expr = 44;
-    static readonly RULE_if_expr = 45;
-    static readonly RULE_if_inner_expr = 46;
-    static readonly RULE_else_expr = 47;
-    static readonly RULE_while_expr = 48;
-    static readonly RULE_for_expr = 49;
-    static readonly RULE_part_set_expr = 50;
-    static readonly RULE_part_set_key = 51;
-    static readonly RULE_part_match_block = 52;
-    static readonly RULE_part_sub_expr = 53;
-    static readonly RULE_part_condition_expr = 54;
-    static readonly RULE_part_value_expr = 55;
-    static readonly RULE_annotation_comment_expr = 56;
+    static readonly RULE_non_newline_expression = 2;
+    static readonly RULE_flow_expressions = 3;
+    static readonly RULE_graph_expressions = 4;
+    static readonly RULE_expressions_block = 5;
+    static readonly RULE_path_block = 6;
+    static readonly RULE_pin_select_expr = 7;
+    static readonly RULE_component_modifier_expr = 8;
+    static readonly RULE_data_expr_with_assignment = 9;
+    static readonly RULE_assignment_expr = 10;
+    static readonly RULE_add_component_expr = 11;
+    static readonly RULE_component_select_expr = 12;
+    static readonly RULE_at_component_expr = 13;
+    static readonly RULE_to_component_expr = 14;
+    static readonly RULE_at_block_header = 15;
+    static readonly RULE_at_block = 16;
+    static readonly RULE_at_block_expressions = 17;
+    static readonly RULE_at_block_expressions_inner = 18;
+    static readonly RULE_at_block_pin_expr = 19;
+    static readonly RULE_keyword_assignment_expr = 20;
+    static readonly RULE_parameters = 21;
+    static readonly RULE_double_dot_property_set_expr = 22;
+    static readonly RULE_data_expr = 23;
+    static readonly RULE_value_expr = 24;
+    static readonly RULE_function_def_expr = 25;
+    static readonly RULE_function_expr = 26;
+    static readonly RULE_function_args_expr = 27;
+    static readonly RULE_function_return_expr = 28;
+    static readonly RULE_net_namespace_expr = 29;
+    static readonly RULE_callable_expr = 30;
+    static readonly RULE_trailer = 31;
+    static readonly RULE_property_block_expr = 32;
+    static readonly RULE_properties_block = 33;
+    static readonly RULE_graphic_expressions_block = 34;
+    static readonly RULE_create_expr = 35;
+    static readonly RULE_create_component_expr = 36;
+    static readonly RULE_create_graphic_expr = 37;
+    static readonly RULE_create_module_expr = 38;
+    static readonly RULE_graphic_expr = 39;
+    static readonly RULE_property_expr = 40;
+    static readonly RULE_property_key_expr = 41;
+    static readonly RULE_property_value_expr = 42;
+    static readonly RULE_wire_expr = 43;
+    static readonly RULE_point_expr = 44;
+    static readonly RULE_import_expr = 45;
+    static readonly RULE_frame_expr = 46;
+    static readonly RULE_if_expr = 47;
+    static readonly RULE_if_inner_expr = 48;
+    static readonly RULE_else_expr = 49;
+    static readonly RULE_while_expr = 50;
+    static readonly RULE_for_expr = 51;
+    static readonly RULE_part_set_expr = 52;
+    static readonly RULE_part_set_key = 53;
+    static readonly RULE_part_match_block = 54;
+    static readonly RULE_part_sub_expr = 55;
+    static readonly RULE_part_condition_expr = 56;
+    static readonly RULE_part_value_expr = 57;
+    static readonly RULE_annotation_comment_expr = 58;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -140,6 +142,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     constructor(input: antlr.TokenStream);
     script(): ScriptContext;
     expression(): ExpressionContext;
+    non_newline_expression(): Non_newline_expressionContext;
     flow_expressions(): Flow_expressionsContext;
     graph_expressions(): Graph_expressionsContext;
     expressions_block(): Expressions_blockContext;
@@ -155,6 +158,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     at_block_header(): At_block_headerContext;
     at_block(): At_blockContext;
     at_block_expressions(): At_block_expressionsContext;
+    at_block_expressions_inner(): At_block_expressions_innerContext;
     at_block_pin_expr(): At_block_pin_exprContext;
     keyword_assignment_expr(): Keyword_assignment_exprContext;
     parameters(): ParametersContext;
@@ -218,6 +222,13 @@ export declare class ScriptContext extends antlr.ParserRuleContext {
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }
 export declare class ExpressionContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    non_newline_expression(): Non_newline_expressionContext | null;
+    NEWLINE(): antlr.TerminalNode | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
+}
+export declare class Non_newline_expressionContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     flow_expressions(): Flow_expressionsContext | null;
     graph_expressions(): Graph_expressionsContext | null;
@@ -228,7 +239,6 @@ export declare class ExpressionContext extends antlr.ParserRuleContext {
     double_dot_property_set_expr(): Double_dot_property_set_exprContext | null;
     assignment_expr(): Assignment_exprContext | null;
     callable_expr(): Callable_exprContext | null;
-    NEWLINE(): antlr.TerminalNode | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }
@@ -267,11 +277,14 @@ export declare class Expressions_blockContext extends antlr.ParserRuleContext {
 export declare class Path_blockContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     Colon(): antlr.TerminalNode;
-    expressions_block(): Expressions_blockContext;
     Branch(): antlr.TerminalNode | null;
     Join(): antlr.TerminalNode | null;
     Parallel(): antlr.TerminalNode | null;
     Point(): antlr.TerminalNode | null;
+    expressions_block(): Expressions_blockContext | null;
+    at_block_expressions(): At_block_expressionsContext | null;
+    non_newline_expression(): Non_newline_expressionContext[];
+    non_newline_expression(i: number): Non_newline_expressionContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }
@@ -357,18 +370,24 @@ export declare class At_block_headerContext extends antlr.ParserRuleContext {
 export declare class At_blockContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     at_block_header(): At_block_headerContext;
+    at_block_expressions(): At_block_expressionsContext;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
+}
+export declare class At_block_expressionsContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     NEWLINE(): antlr.TerminalNode;
     INDENT(): antlr.TerminalNode;
     DEDENT(): antlr.TerminalNode;
-    at_block_expressions(): At_block_expressionsContext[];
-    at_block_expressions(i: number): At_block_expressionsContext | null;
+    at_block_expressions_inner(): At_block_expressions_innerContext[];
+    at_block_expressions_inner(i: number): At_block_expressions_innerContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }
-export declare class At_block_expressionsContext extends antlr.ParserRuleContext {
+export declare class At_block_expressions_innerContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
-    expression(): ExpressionContext | null;
     at_block_pin_expr(): At_block_pin_exprContext | null;
+    expression(): ExpressionContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }
@@ -376,9 +395,10 @@ export declare class At_block_pin_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     property_key_expr(): Property_key_exprContext;
     Colon(): antlr.TerminalNode;
-    expression(): ExpressionContext | null;
     expressions_block(): Expressions_blockContext | null;
     NOT_CONNECTED(): antlr.TerminalNode | null;
+    non_newline_expression(): Non_newline_expressionContext[];
+    non_newline_expression(i: number): Non_newline_expressionContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }
@@ -765,9 +785,9 @@ export declare class Import_simpleContext extends Import_exprContext {
 export declare class Frame_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     Colon(): antlr.TerminalNode;
-    expressions_block(): Expressions_blockContext;
     Frame(): antlr.TerminalNode | null;
     Sheet(): antlr.TerminalNode | null;
+    expressions_block(): Expressions_blockContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptParserVisitor<Result>): Result | null;
 }

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

@@ -1,6 +1,7 @@
 import { AbstractParseTreeVisitor } from "antlr4ng";
 import { ScriptContext } from "./CircuitScriptParser.js";
 import { ExpressionContext } from "./CircuitScriptParser.js";
+import { Non_newline_expressionContext } from "./CircuitScriptParser.js";
 import { Flow_expressionsContext } from "./CircuitScriptParser.js";
 import { Graph_expressionsContext } from "./CircuitScriptParser.js";
 import { Expressions_blockContext } from "./CircuitScriptParser.js";
@@ -16,6 +17,7 @@ import { To_component_exprContext } from "./CircuitScriptParser.js";
 import { At_block_headerContext } from "./CircuitScriptParser.js";
 import { At_blockContext } from "./CircuitScriptParser.js";
 import { At_block_expressionsContext } from "./CircuitScriptParser.js";
+import { At_block_expressions_innerContext } from "./CircuitScriptParser.js";
 import { At_block_pin_exprContext } from "./CircuitScriptParser.js";
 import { Keyword_assignment_exprContext } from "./CircuitScriptParser.js";
 import { ParametersContext } from "./CircuitScriptParser.js";
@@ -71,6 +73,7 @@ import { Annotation_comment_exprContext } from "./CircuitScriptParser.js";
 export declare class CircuitScriptParserVisitor<Result> extends AbstractParseTreeVisitor<Result> {
     visitScript?: (ctx: ScriptContext) => Result;
     visitExpression?: (ctx: ExpressionContext) => Result;
+    visitNon_newline_expression?: (ctx: Non_newline_expressionContext) => Result;
     visitFlow_expressions?: (ctx: Flow_expressionsContext) => Result;
     visitGraph_expressions?: (ctx: Graph_expressionsContext) => Result;
     visitExpressions_block?: (ctx: Expressions_blockContext) => Result;
@@ -86,6 +89,7 @@ export declare class CircuitScriptParserVisitor<Result> extends AbstractParseTre
     visitAt_block_header?: (ctx: At_block_headerContext) => Result;
     visitAt_block?: (ctx: At_blockContext) => Result;
     visitAt_block_expressions?: (ctx: At_block_expressionsContext) => Result;
+    visitAt_block_expressions_inner?: (ctx: At_block_expressions_innerContext) => Result;
     visitAt_block_pin_expr?: (ctx: At_block_pin_exprContext) => Result;
     visitKeyword_assignment_expr?: (ctx: Keyword_assignment_exprContext) => Result;
     visitParameters?: (ctx: ParametersContext) => Result;

package/dist/types/execute.d.ts

@@ -75,6 +75,7 @@ export declare class ExecutionContext {
     closeOpenPathBlocks(): void;
     enterBlock(blockIndex: number): void;
     exitBlock(blockIndex: number): void;
+    addPointForBlockType(blockType: BlockTypes): void;
     atPointBlock(): void;
     toPointBlock(): void;
     getPointBlockLocation(): [component: ClassComponent, pin: number, wireId: number];

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

@@ -2,5 +2,6 @@ export declare enum BlockTypes {
     Branch = 1,
     Join = 2,
     Parallel = 3,
-    Point = 4
+    Point = 4,
+    AtBlock = 5
 }

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

@@ -30,6 +30,10 @@ export declare enum FrameParamKeys {
     TitleAlign = "title_align",
     HorizontalAlign = "align",
     VerticalAlign = "valign",
+    FontSize = "font_size",
+    Bold = "bold",
+    Italic = "italic",
+    Color = "color",
     SheetNumber = "sheet_number",
     SheetTotal = "sheet_total"
 }

package/dist/types/render/draw_symbols.d.ts

@@ -57,6 +57,8 @@ export declare class SymbolText extends SymbolGraphic {
     text: string;
     fontSize: NumericValue;
     fontWeight: string;
+    fontStyle: string;
+    color: string | undefined;
     constructor(text: string);
     generateDrawing(): void;
 }
@@ -64,9 +66,7 @@ export declare class SymbolPlaceholder extends SymbolGraphic {
     styles: Styles;
     generateDrawing(): void;
     private resolveReference;
-    parseLabelStyle(keywordParams: Map<string, any>): {
-        [key: string]: any;
-    };
+    parseLabelStyle(keywordParams: Map<string, any>): LabelStyle;
     drawPinParams(drawing: SymbolDrawingCommands, commandName: string, keywordParams: Map<string, any>, positionParams: any[], lineColor: string, pinNameColor: string): void;
     constructor(drawing: SymbolDrawing);
     setStyles(styles: Styles): void;

package/dist/types/render/geometry.d.ts

@@ -13,6 +13,7 @@ export type LabelStyle = {
     font?: string;
     fontSize?: NumericValue;
     fontWeight?: string;
+    fontStyle?: string;
     angle?: NumericValue;
     anchor?: HorizontalAlign.Left | HorizontalAlign.Center | HorizontalAlign.Right;
     vanchor?: VerticalAlign.Top | VerticalAlign.Center | VerticalAlign.Bottom;

package/dist/types/render/layout.d.ts

@@ -102,10 +102,16 @@ export declare class RenderText extends RenderObject {
     symbol: SymbolText;
     _fontSize: NumericValue;
     _fontWeight: string;
+    _fontStyle: string;
+    _color: string | undefined;
     get fontSize(): NumericValue;
     set fontSize(value: NumericValue);
     get fontWeight(): string;
     set fontWeight(value: string);
+    get fontStyle(): string;
+    set fontStyle(value: string);
+    get color(): string | undefined;
+    set color(value: string | undefined);
     constructor(text: string);
 }
 export declare class RenderFrame extends RenderObject {

package/dist/types/sizing.d.ts

@@ -1,7 +1,7 @@
 import { Box, SVGTypeMapping } from '@svgdotjs/svg.js';
 import { HorizontalAlign, VerticalAlign } from './render/geometry.js';
 export declare function applyFontsToSVG(canvas: SVGTypeMapping): void;
-export declare function measureTextSize2(text: string, fontFamily: string, fontSize: number, fontWeight?: string, anchor?: HorizontalAlign, vanchor?: VerticalAlign): {
+export declare function measureTextSize2(text: string, fontFamily: string, fontSize: number, fontWeight?: string, fontStyle?: string, anchor?: HorizontalAlign, vanchor?: VerticalAlign): {
     width: number;
     height: number;
     box: Box;

package/dist/types/visitor.d.ts

@@ -1,4 +1,4 @@
-import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_component_exprContext, BinaryOperatorExprContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, Expressions_blockContext, Create_module_exprContext, Property_block_exprContext, While_exprContext, For_exprContext, GraphicCommandExprContext, Graphic_expressions_blockContext, GraphicForExprContext, Graph_expressionsContext, Path_blockContext, Annotation_comment_exprContext, At_block_headerContext, Part_set_exprContext, Part_set_keyContext, Part_match_blockContext, Part_sub_exprContext, Part_value_exprContext, Part_condition_exprContext, CreateExprContext, Create_exprContext, Properties_blockContext } from './antlr/CircuitScriptParser.js';
+import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_component_exprContext, BinaryOperatorExprContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, Expressions_blockContext, Create_module_exprContext, Property_block_exprContext, While_exprContext, For_exprContext, GraphicCommandExprContext, Graphic_expressions_blockContext, GraphicForExprContext, Graph_expressionsContext, Path_blockContext, Annotation_comment_exprContext, At_block_headerContext, Part_set_exprContext, Part_set_keyContext, Part_match_blockContext, Part_sub_exprContext, Part_value_exprContext, Part_condition_exprContext, CreateExprContext, Create_exprContext, Properties_blockContext, At_block_expressionsContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet, ComponentPinNetPair } from './objects/types.js';
@@ -48,6 +48,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitAdditionExpr: (ctx: AdditionExprContext) => void;
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
     visitAt_block_pin_expr: (ctx: At_block_pin_exprContext) => void;
+    visitAt_block_expressions: (ctx: At_block_expressionsContext) => void;
     visitAt_block_header: (ctx: At_block_headerContext) => void;
     visitAt_block: (ctx: At_blockContext) => void;
     visitWire_expr: (ctx: Wire_exprContext) => void;

package/libs/std.cst

@@ -181,7 +181,7 @@ def dgnd(net_name="GND"):
             net_name: net_name
             priority: 100
 
-def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
+def text(value, offsetX = 0, offsetY = 0, fontSize = 50, bold = false, italic = false):
     return create component:
         pins: 1
         followWireOrientation: false
@@ -192,6 +192,8 @@ def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
                 content: value
                 offset: offsetX, offsetY
                 fontSize: fontSize
+                bold: bold
+                italic: italic
 
 # Drawing markers
 

package/package.json

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