circuitscript 0.0.29 → 0.0.31

package/dist/types/globals.d.ts

@@ -19,12 +19,40 @@ export declare enum SymbolPinSide {
     Left = "left",
     Right = "right"
 }
+export declare enum LengthUnit {
+    mm = "mm",
+    mils = "mils",
+    px = "px"
+}
+export declare enum WireAutoDirection {
+    Auto = "auto",
+    Auto_ = "auto_"
+}
+export declare const MilsToMM = 0.0254;
+export declare const MMToPx = 3.779276;
+export declare const PxToMM = 0.2645833;
 export declare const portWidth = 20;
 export declare const portHeight = 2;
-export declare const defaultFont = "Open Sans-Regular, Arial";
-export declare const defaultFontBold = "Open Sans-Bold, Arial-Bold, Arial";
+export declare const defaultGridSizeUnits: number;
+export declare const defaultZoomScale = 2.5;
+export declare const fontDisplayScale = 0.032;
+export declare const defaultSymbolLineWidth: number;
+export declare const defaultWireLineWidth: number;
+export declare const defaultPinNameTextSize = 40;
+export declare const defaultPinIdTextSize = 30;
+export declare const CustomSymbolPinTextSize = 40;
+export declare const CustomSymbolPinIdSize = 30;
+export declare const CustomSymbolRefDesSize = 50;
+export declare const CustomSymbolParamTextSize = 40;
+export declare const defaultFrameTitleTextSize = 60;
+export declare const displayUnits = LengthUnit.mils;
+export declare const defaultFont = "Arial";
+export declare const defaultFontBold = "Arial";
 export declare const defaultFontSize = 10;
-export declare const junctionSize = 5;
+export declare const junctionSize: number;
+export declare const PortArrowSize: number;
+export declare const PortPaddingHorizontal: number;
+export declare const PortPaddingVertical: number;
 export declare const ColorScheme: {
     BodyColor: string;
     JunctionColor: string;

package/dist/types/helpers.d.ts

@@ -3,6 +3,7 @@ import { CommonTokenStream, DefaultErrorStrategy, Parser } from "antlr4ng";
 import { CircuitScriptParser } from "./antlr/CircuitScriptParser.js";
 import { CircuitScriptLexer } from "./antlr/CircuitScriptLexer.js";
 import { IParsedToken, SemanticTokensVisitor } from "./SemanticTokenVisitor.js";
+import { LengthUnit } from "./globals.js";
 export declare enum JSModuleType {
     CommonJs = "cjs",
     ESM = "mjs"
@@ -38,3 +39,14 @@ export declare function getCurrentPath(): {
 export declare function getFontsPath(): string;
 export declare function getDefaultLibsPath(): string;
 export declare function getPackageVersion(): string;
+export declare class UnitDimension {
+    type: LengthUnit;
+    value: number;
+    constructor(value: number, type?: LengthUnit);
+    getMM(): number;
+    static mm(value: number): UnitDimension;
+    static mils(value: number): UnitDimension;
+    static px(value: number): UnitDimension;
+}
+export declare function milsToMM(value: number): number;
+export declare function pxToMM(value: number): number;

package/dist/types/layout.d.ts

@@ -2,6 +2,7 @@ import { Graph, Edge } from '@dagrejs/graphlib';
 import { SymbolGraphic, SymbolText } from "./draw_symbols.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { SequenceItem } from "./objects/ExecutionScope.js";
+import { WireAutoDirection } from './globals.js';
 import { WireSegment } from './objects/Wire.js';
 import { Net } from './objects/Net.js';
 import { Logger } from './logger.js';
@@ -79,7 +80,7 @@ export declare class RenderWire extends RenderObject {
     netName: string;
     constructor(x: number, y: number, segments: WireSegment[]);
     refreshPoints(): void;
-    getAutoPoints(value: [x: number, y: number], direction: 'auto' | 'auto_'): [dx: number, dy: number][];
+    getAutoPoints(value: [x: number, y: number], direction: WireAutoDirection): [dx: number, dy: number][];
     getWireEnd(): {
         x: number;
         y: number;

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

@@ -1,7 +1,9 @@
+import { Expressions_blockContext } from 'src/antlr/CircuitScriptParser.js';
 import { SymbolDrawingCommands } from '../draw_symbols.js';
 import { Net } from './Net.js';
 import { PinDefinition, PinId } from './PinDefinition.js';
 import { WireSegment } from './Wire.js';
+import { ExecutionContext } from 'src/execute.js';
 export declare class ClassComponent {
     instanceName: string;
     numPins: number;
@@ -23,10 +25,16 @@ export declare class ClassComponent {
     followWireOrientationProp: boolean;
     wireOrientationAngle: number;
     useWireOrientationAngle: boolean;
+    didSetWireOrientationAngle: boolean;
     styles: {
         [key: string]: number | string;
     };
     assignedRefDes: string | null;
+    moduleContainsExpressions?: Expressions_blockContext;
+    moduleCounter: number;
+    moduleExecutionContext: ExecutionContext;
+    moduleExecutionContextName: string;
+    modulePinIdToPortMap: Map<number, ClassComponent>;
     constructor(instanceName: string, numPins: number, className: string);
     setupPins(): void;
     getDefaultPin(): number;

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

@@ -5,3 +5,4 @@ export declare enum PinTypes {
     IO = "io",
     Power = "power"
 }
+export declare const AllPinTypes: PinTypes[];

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

@@ -1,12 +1,14 @@
+import { UnitDimension } from "src/helpers.js";
 import { ClassComponent } from "./ClassComponent.js";
 import { Direction } from "./types.js";
+import { WireAutoDirection } from "src/globals.js";
 export declare class Wire {
     path: WireSegment[];
     constructor(path: WireSegment[]);
 }
 export type WireSegment = {
-    direction: Direction.Up | Direction.Down | Direction.Left | Direction.Right | 'auto' | 'auto_';
-    value: number;
+    direction: Direction.Up | Direction.Down | Direction.Left | Direction.Right | WireAutoDirection;
+    value: number | UnitDimension;
     valueXY?: [x: number, y: number];
     until?: [instance: ClassComponent, pin: number];
 };

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

@@ -40,6 +40,14 @@ export declare class UndeclaredReference {
     reference: ReferenceType;
     constructor(reference: ReferenceType);
 }
+export declare class DeclaredReference {
+    found: boolean;
+    name?: string;
+    trailers?: string[];
+    type?: string;
+    value?: any;
+    constructor(refType: ReferenceType);
+}
 export type ReferenceType = {
     found: boolean;
     name?: string;

package/dist/types/sizing.d.ts

@@ -4,10 +4,6 @@ import { SVGWindow } from 'svgdom';
 export declare function prepareSVGEnvironment(fontsPath: string | null): Promise<void>;
 export declare function getCreateSVGWindow(): () => SVGWindow;
 export declare function applyFontsToSVG(canvas: SVGTypeMapping): void;
-export declare function measureTextSize(text: string, fontFamily: string, fontSize: number): Promise<{
-    width: number;
-    height: number;
-}>;
 export declare function measureTextSize2(text: string, fontFamily: string, fontSize: number, fontWeight?: string, anchor?: HorizontalAlign, vanchor?: VerticalAlign): {
     width: number;
     height: number;

package/dist/types/utils.d.ts

@@ -1,3 +1,4 @@
+import { ClassComponent } from "./objects/ClassComponent";
 export declare class SimpleStopwatch {
     startTime: Date;
     constructor();
@@ -17,3 +18,5 @@ export declare function getBoundsSize(bounds: BoundBox): {
     width: number;
     height: number;
 };
+export declare function getPortType(component: ClassComponent): string | null;
+export declare function roundValue(value: number): number;

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, Nested_properties_innerContext } 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, Expressions_blockContext, Create_module_exprContext, Property_block_exprContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet } from './objects/types.js';
@@ -16,12 +16,17 @@ export declare class ParserVisitor extends BaseVisitor {
     visitCreate_component_expr: (ctx: Create_component_exprContext) => void;
     visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
     visitGraphic_expr: (ctx: Graphic_exprContext) => void;
+    visitCreate_module_expr: (ctx: Create_module_exprContext) => void;
+    visitProperty_block_expr: (ctx: Property_block_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;
+    private expandModuleContains;
+    private linkModuleSymbolWithContains;
+    private placeModuleContains;
     visitUnaryOperatorExpr: (ctx: UnaryOperatorExprContext) => void;
     visitDataExpr: (ctx: DataExprContext) => void;
     visitBinaryOperatorExpr: (ctx: BinaryOperatorExprContext) => void;
@@ -40,12 +45,14 @@ export declare class ParserVisitor extends BaseVisitor {
     visitPoint_expr: (ctx: Point_exprContext) => ComponentPin;
     visitProperty_set_expr: (ctx: Property_set_exprContext) => void;
     visitDouble_dot_property_set_expr: (ctx: Double_dot_property_set_exprContext) => void;
+    visitExpressions_block: (ctx: Expressions_blockContext) => void;
     visitFrame_expr: (ctx: Frame_exprContext) => void;
     visitNet_namespace_expr: (ctx: Net_namespace_exprContext) => void;
     visitIf_expr: (ctx: If_exprContext) => void;
     visitIf_inner_expr: (ctx: If_inner_exprContext) => void;
     pinTypes: PinTypes[];
     private parseCreateComponentPins;
+    private parseCreateModulePorts;
     private parseCreateComponentParams;
     printNets(): void;
     dumpNets(): ComponentPinNet[];

package/libs/lib.cst

@@ -6,9 +6,9 @@ def net(net_name):
         copy: true
         angle: -90
         display: create graphic:
-            hline: -15, 0, 30
-            vpin: 1, 0, 10, -10, display_pin_id=false
-            label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
+            hline: -50, 0, 100
+            vpin: 1, 0, 50, -50, display_pin_id=false
+            label: "net_name", 0, -15, net_name, fontSize=50, anchor="middle"
         type: "net"
         params:
             net_name: net_name
@@ -20,9 +20,9 @@ def supply(net_name):
         copy: true
         angle: -90
         display: create graphic:
-            hline: -15, 0, 30
-            vpin: 1, 0, 10, -10, display_pin_id=false
-            label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
+            hline: -50, 0, 100
+            vpin: 1, 0, 50, -50, display_pin_id=false
+            label: "net_name", 0, -15, net_name, fontSize=50, anchor="middle"
         type: "net"
         params:
             net_name: net_name
@@ -35,7 +35,7 @@ def label(value, anchor="left"):
         followWireOrientation: false
         display: create graphic:
             textColor: "#222"
-            label: "value", 0, -2, "?", fontSize=10, anchor=anchor
+            label: "value", 0, -10, "?", fontSize=50, anchor=anchor
             pin: 1, 0, 0, 0, 0, display_pin_id=false
         type: "label"
         params:
@@ -43,18 +43,32 @@ def label(value, anchor="left"):
             value: value
             priority: 5
 
+def port(value, portType="input"):
+    return create component:
+        pins: 1
+        copy: true
+        display: create graphic:
+            textColor: "#222"
+            label: "value", 0, 0, "?", fontSize=40, anchor="left", vanchor="middle", portType=portType
+            pin: 1, 0, 0, 0, 0, display_pin_id=false
+        type: "port"
+        params:
+            net_name: value
+            value: value
+            priority: 5
+
 def res(value):
-    width = 40
-    height = 20
+    width = 140
+    height = 60
  
     return create component:
         pins: 2
         display: create graphic:
             rect: 0, 0, width, height
-            hpin: 1, -width/2 - 20, 0, 20
-            hpin: 2, width/2 + 20, 0, -20
-            label: ("value", 0, 1, value, fontSize=10, anchor="middle", vanchor="middle")
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
+            hpin: 1, -width/2 - 30, 0, 30
+            hpin: 2, width/2 + 30, 0, -30
+            label: "refdes", -width/2, -height/2 - 20 , "?", fontSize=50, anchor="left"
+            label: "value", 0, 4, value, fontSize=30, anchor="middle", vanchor="middle"
         type: "res"
         params:
             value: value
@@ -62,19 +76,20 @@ def res(value):
             footprint: "Resistor_SMD:R_0402_1005Metric"
 
 def cap(value):
-    width = 20
+    width = 120
     height = 40
 
     return create component:
         pins: 2
         angle: 90
         display: create graphic:
-            hline: -width/2, -3, width
-            hline: -width/2, 3, width
-            vpin: 1, 0, -height/2, 20-3
-            vpin: 2, 0, height/2, -20+3
-            label: "refdes", width/2+2, 0, "?", fontSize = 10, anchor="left"
-            label: "value", width/2+2, 5, value, fontSize = 10, anchor = "left", vanchor="top"
+            lineWidth: 13
+            hline: -width/2, 20, width
+            hline: -width/2, -20, width
+            vpin: 1, 0, -100, 80
+            vpin: 2, 0, 100, -80
+            label: "refdes", 80, -30, "?", fontSize=50, anchor="left", vanchor="middle"
+            label: "value", 80, 30, value, fontSize=50, anchor = "left", vanchor="middle"
         type: "cap"
         params:
             value: value
@@ -95,14 +110,14 @@ def ind(value):
             arc: 15, 0, 5, 180, 360
             hpin: 1, -width/2 - 20, 0, 20
             hpin: 2, width/2 + 20, 0, -20
-            label: ("value", 0, 10, value, fontSize=10, anchor="middle", vanchor="middle")
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
+            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=50, anchor="left")
+            label: ("value", 0, 10, value, fontSize=50, anchor="middle", vanchor="middle")
         params:
             value: value
 
 def diode():
-    width = 20
-    height = 20
+    width = 100
+    height = 100
 
     # Diode is drawn horizontally
     #  -|>|-
@@ -112,13 +127,13 @@ def diode():
         display: create graphic:
             triangle: -width/2, 0, width/2, 0, height
             vline: width/2, -height/2, height
-            hpin: 1, -width/2-20, 0, 20    # anode
-            hpin: 2, width/2 + 20, 0, -20  # cathode
-            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
+            hpin: 1, -width/2-100, 0, 100    # anode
+            hpin: 2, width/2 + 100, 0, -100  # cathode
+            label: "refdes", 0, -100, "?", fontSize=50, anchor="middle", vanchor="top"
 
 def led(color):
-    width = 20
-    height = 20
+    width = 100
+    height = 100
 
     return create component:
         pins:   
@@ -128,12 +143,14 @@ def led(color):
         display: create graphic:
             triangle: -width/2, 0, width/2, 0, height
             vline: width/2, -height/2, height
-            path: ("M", 0, 8, "L", 5, 18, 
-                   "M", 3, 8, "L", 8, 18)
-            hpin: 1, -width/2-20, 0, 20    # anode
-            hpin: 2, width/2 + 20, 0, -20  # cathode
-            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
-            label: "color", width/2 + 5, 25, color
+            path: ("M", 70, 30, "L", 130, 90,
+                    "M", 130, 60, "L", 130, 90, "L", 100, 90)
+            path: ("M", 120, 30, "L", 180, 90,
+                    "M", 180, 60, "L", 180, 90, "L", 150, 90)
+            hpin: 1, -width/2-100, 0, 100    # anode
+            hpin: 2, width/2 + 100, 0, -100  # cathode
+            label: "refdes", 0, -100, "?", fontSize=50, anchor="middle", vanchor="top"
+            label: "color", 0, 100, color, fontSize=40, anchor="middle", vanchor="bottom"
         params:
             size: "0603"
             footprint: "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder"
@@ -150,15 +167,15 @@ def cgnd():
             hline: -10, 5, 20
             hline: -5, 10, 10
             vpin: 1, 0, -10, 10, display_pin_id=false
-            label: "net_name", 0, 22, net_name, fontSize=10, anchor="middle"
+            label: "net_name", 0, 22, net_name, fontSize=50, anchor="middle"
         type: "net"
         params:
             net_name: net_name
             priority: 100
 
 def dgnd(net_name="GND"):
-    height = 10
-    width = 20
+    height = 50
+    width = 100
 
     return create component:
         pins: 1
@@ -166,14 +183,14 @@ def dgnd(net_name="GND"):
         angle: 90
         display: create graphic:
             triangle: 0, 0, 0, height, width
-            vpin: 1, 0, -10, 10, display_pin_id=false
-            label: "net_name", 0, height + 10, net_name, fontSize=10, anchor="middle"
+            vpin: 1, 0, -50, 50, display_pin_id=false
+            label: "net_name", 0, height + 50, net_name, fontSize=50, anchor="middle", vanchor="middle"
         type: "net"
         params:
             net_name: net_name
             priority: 100
 
-def text(value, offsetX = 0, offsetY = 0, fontSize = 12):
+def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
     return create component:
         pins: 1
         followWireOrientation: false

package/package.json

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