circuitscript 0.5.3 → 0.5.5

package/dist/types/globals.d.ts

@@ -46,8 +46,11 @@ export declare const portHeight = 2;
 export declare const defaultGridSizeUnits: number;
 export declare const defaultZoomScale = 2.5;
 export declare const fontDisplayScale = 0.032;
+export declare const Defaults: {
+    WireLineWidth: import("./objects/NumericValue.js").NumericValue;
+    LineWidth: import("./objects/NumericValue.js").NumericValue;
+};
 export declare const defaultSymbolLineWidth: number;
-export declare const defaultWireLineWidth: number;
 export declare const defaultPinNameTextSize = 40;
 export declare const defaultPinIdTextSize = 30;
 export declare const defaultPageMarginMM = 10;
@@ -90,10 +93,10 @@ export declare enum ReferenceTypes {
 }
 export declare enum NetGraphicsParams {
     Color = "color",
-    LineWidth = "lineWidth",
+    LineWidth = "line_width",
     Highlight = "highlight",
-    HighlightWidth = "highlightWidth",
-    HighlightOpacity = "highlightOpacity"
+    HighlightWidth = "highlight_width",
+    HighlightOpacity = "highlight_opacity"
 }
 export declare enum FrameType {
     Frame = 1,
@@ -101,6 +104,7 @@ export declare enum FrameType {
 }
 export declare const ModuleContainsKeyword = "contains";
 export declare const GlobalDocumentName = "document";
+export declare const KeywordRefdesPrefix = "refdes_prefix";
 export declare const RenderFlags: {
     ShowElementFrames: boolean;
     ShowOrigin: boolean;

package/dist/types/helpers.d.ts

@@ -1,5 +1,5 @@
 import { ParserRuleContext } from "antlr4ng";
-import { BaseError } from "./utils.js";
+import { BaseError } from './errors.js';
 import { ATNSimulator, BaseErrorListener, CommonTokenStream, DefaultErrorStrategy, Parser, RecognitionException, Recognizer, Token } from "antlr4ng";
 import { CircuitScriptParser, ScriptContext } from "./antlr/CircuitScriptParser.js";
 import { CircuitScriptLexer } from "./antlr/CircuitScriptLexer.js";

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

@@ -20,6 +20,13 @@ export declare enum FrameParamKeys {
     SheetType = "sheet_type",
     GridStyle = "grid_style",
     GridColor = "grid_color",
+    BackgroundColor = "background_color",
+    LineColor = "line_color",
+    LineWidth = "line_width",
+    FillColor = "fill_color",
+    TextColor = "text_color",
+    WireColor = "wire_color",
+    WireWidth = "wire_width",
     TitleAlign = "title_align",
     HorizontalAlign = "align",
     VerticalAlign = "valign",

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

@@ -7,6 +7,7 @@ export declare class NumericValue {
     prefixPart: number;
     constructor(value: string | number | Big, prefix?: number);
     toString(): string;
+    copy(): NumericValue;
     toDisplayString(): string;
     toNumber(): number;
     toBigNumber(): Big;
@@ -18,6 +19,9 @@ export declare class NumericValue {
     mod(value: NumericValue | number): NumericValue;
     neg(): NumericValue;
     eq(value: NumericValue): boolean;
+    floor(): NumericValue;
+    ceil(): NumericValue;
+    roundDp(): NumericValue;
 }
 export type NumberOperatorType = NumericValue | PercentageValue | WrappedNumber;
 export declare class NumberOperator {
@@ -32,4 +36,4 @@ export declare function numeric(value: number | string): NumericValue;
 export declare function getNumberExponentialText(value: number): string;
 export declare function getNumberExponential(value: string): number;
 export declare function resolveToNumericValue(value: Big): NumericValue;
-export declare function roundValue(value: NumericValue): NumericValue;
+export declare function roundValue(value: NumericValue | number): NumericValue;

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

@@ -5,6 +5,7 @@ import { PinTypes } from "../objects/PinTypes.js";
 import { ParserRuleContext } from "antlr4ng";
 import { NumericValue } from "../objects/NumericValue.js";
 import { PinId } from "../objects/PinDefinition.js";
+import { Styles } from "src/styles.js";
 export declare abstract class SymbolGraphic {
     drawPortsName: boolean;
     displayBounds: boolean;
@@ -15,6 +16,7 @@ export declare abstract class SymbolGraphic {
     width: NumericValue;
     height: NumericValue;
     labelTexts: Map<string, string>;
+    styles?: Styles;
     constructor();
     get angle(): number;
     set angle(value: number);
@@ -29,6 +31,7 @@ export declare abstract class SymbolGraphic {
         width: NumericValue;
         height: NumericValue;
     };
+    setStyles(styles: Styles): void;
     abstract generateDrawing(): void;
     size(): {
         width: number;
@@ -58,6 +61,7 @@ export declare class SymbolText extends SymbolGraphic {
     generateDrawing(): void;
 }
 export declare class SymbolPlaceholder extends SymbolGraphic {
+    styles: Styles;
     generateDrawing(): void;
     private resolveReference;
     parseLabelStyle(keywordParams: Map<string, any>): {
@@ -65,6 +69,7 @@ export declare class SymbolPlaceholder extends SymbolGraphic {
     };
     drawPinParams(drawing: SymbolDrawingCommands, commandName: string, keywordParams: Map<string, any>, positionParams: any[], lineColor: string, pinNameColor: string): void;
     constructor(drawing: SymbolDrawing);
+    setStyles(styles: Styles): void;
 }
 export declare enum PlaceHolderCommands {
     arc = "arc",
@@ -80,10 +85,10 @@ export declare enum PlaceHolderCommands {
     line = "line",
     label = "label",
     path = "path",
-    lineWidth = "lineWidth",
+    lineWidth = "line_width",
     fill = "fill",
-    lineColor = "lineColor",
-    textColor = "textColor",
+    lineColor = "line_color",
+    textColor = "text_color",
     text = "text",
     units = "units",
     for = "for"

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

@@ -14,8 +14,8 @@ export type LabelStyle = {
     fontSize?: NumericValue;
     fontWeight?: string;
     angle?: NumericValue;
-    anchor?: HorizontalAlign.Left | HorizontalAlign.Middle | HorizontalAlign.Right;
-    vanchor?: VerticalAlign.Top | VerticalAlign.Middle | VerticalAlign.Bottom;
+    anchor?: HorizontalAlign.Left | HorizontalAlign.Center | HorizontalAlign.Right;
+    vanchor?: VerticalAlign.Top | VerticalAlign.Center | VerticalAlign.Bottom;
     textColor?: string;
     portType?: null | PinTypes;
 };
@@ -84,12 +84,12 @@ export declare class Geometry {
 type WirePointCount = [x: number, y: number, count: number];
 export declare enum HorizontalAlign {
     Left = "left",
-    Middle = "middle",
+    Center = "center",
     Right = "right"
 }
 export declare enum VerticalAlign {
     Top = "top",
-    Middle = "middle",
+    Center = "center",
     Bottom = "bottom"
 }
 export declare enum HorizontalAlignProp {

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

@@ -7,9 +7,12 @@ import { Net } from "../objects/Net.js";
 import { Logger } from "../logger.js";
 import { ComponentPinNetPair } from "../objects/types.js";
 import { PinId } from "../objects/PinDefinition.js";
+import { Styles } from "src/styles.js";
 export declare class NetGraph {
     logger: Logger;
+    styles: Styles;
     constructor(logger: Logger);
+    setStyles(styles: Styles): void;
     generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: PinId, net: Net][]): {
         graph: Graph;
         containerFrames: RenderFrame[];

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

@@ -118,15 +118,21 @@ export declare class RenderFrame extends RenderObject {
     padding: NumericValue;
     gap: NumericValue;
     borderWidth: NumericValue;
+    borderColor: string;
     direction: FramePlotDirection;
     width: NumericValue | null;
     height: NumericValue | null;
     subgraphId: string;
     renderType: RenderFrameType;
     containsTitle: boolean;
+    overwriteAlignParamsForTitleLayout: boolean;
+    virtual: boolean;
+    didResize: boolean;
+    lineIndex: number;
     frameId: number;
-    constructor(frame: Frame, type?: RenderFrameType);
+    constructor(frame: Frame, type?: RenderFrameType, virtual?: boolean);
     toString(): string;
+    static createContainer(gap: NumericValue): RenderFrame;
 }
 export declare enum RenderFrameType {
     Container = 1,

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

@@ -3,6 +3,7 @@ import { Svg } from '@svgdotjs/svg.js';
 import { SheetFrame } from "./layout.js";
 import { Logger } from '../logger.js';
 import { DocumentVariable } from 'src/objects/types.js';
-export declare function renderSheetsToSVG(sheetFrames: SheetFrame[], logger: Logger, documentVariable: DocumentVariable): Svg;
+import { Styles } from 'src/styles.js';
+export declare function renderSheetsToSVG(sheetFrames: SheetFrame[], logger: Logger, documentVariable: DocumentVariable, styles: Styles): Svg;
 export declare function generateSvgOutput(canvas: Svg, zoomScale?: number): string;
 export declare function generatePdfOutput(doc: PDFKit.PDFDocument, canvas: Svg, sheetSize: string, sheetSizeDefined: boolean, zoomScale?: number): void;

package/dist/types/styles.d.ts

@@ -0,0 +1,11 @@
+import { NumericValue } from "./objects/NumericValue.js";
+import { DocumentVariable } from "./objects/types.js";
+export declare class Styles {
+    lineColor?: string;
+    lineWidth?: NumericValue;
+    fillColor?: string;
+    textColor?: string;
+    wireColor?: string;
+    wireWidth?: NumericValue;
+}
+export declare function getStylesFromDocument(document: DocumentVariable): Styles;

package/dist/types/utils.d.ts

@@ -1,4 +1,4 @@
-import { ParserRuleContext, Token } from "antlr4ng";
+import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { SequenceAction, SequenceItem } from './objects/ExecutionScope.js';
 import { BlockTypes } from "./objects/BlockTypes.js";
@@ -24,43 +24,18 @@ export declare function resizeBounds(bounds: BoundBox, value: number): BoundBox;
 export declare function printBounds(bounds: BoundBox): string;
 export declare function resizeToNearestGrid(bounds: BoundBox, gridSize?: number): BoundBox;
 export declare function toNearestGrid(value: number, gridSize: number): number;
+export declare function toNearestGrid2(value: number, gridSize: number): number;
 export declare function getBoundsSize(bounds: BoundBox): {
     width: number;
     height: number;
 };
 export declare function getPortType(component: ClassComponent): string | null;
-export declare function throwWithContext(context: ParserRuleContext, messageOrError: string | BaseError): void;
-export declare function throwWithToken(message: string, token: Token): void;
-export declare function throwWithTokenRange(message: string, startToken: Token, endToken?: Token): void;
 export declare function combineMaps(map1: Map<string, any>, map2: Map<string, any>): Map<string, any>;
 export declare function isPointWithinArea(point: [x: number, y: number], bounds: BoundBox2): boolean;
 export declare function areasOverlap(area1: BoundBox2, area2: BoundBox2): boolean;
 export declare function sequenceActionString(sequenceAction: SequenceAction): string;
 export declare function generateDebugSequenceAction(sequence: SequenceItem[]): string[];
 export declare function getBlockTypeString(type: BlockTypes): string;
-export declare class BaseError extends Error {
-    name: string;
-    message: string;
-    startToken?: Token;
-    endToken?: Token;
-    filePath?: string;
-    constructor(message: string, startTokenOrCtx?: Token | ParserRuleContext, endToken?: Token, filePath?: string);
-    toString(): string;
-}
-export declare function getLinePositionAsString(ctx: ParserRuleContext): string | null;
-export declare class ParseSyntaxError extends BaseError {
-    name: string;
-}
-export declare class ParseError extends ParseSyntaxError {
-    name: string;
-}
-export declare class RuntimeExecutionError extends BaseError {
-    name: string;
-}
-export declare class RenderError extends Error {
-    stage?: string;
-    constructor(message: string, stage?: string);
-}
 export type ExecutionWarning = {
     message: string;
     fileName?: string;

package/dist/types/visitor.d.ts

@@ -11,7 +11,7 @@ import { NodeScriptEnvironment } from './environment/environment.js';
 export declare class ParserVisitor extends BaseVisitor {
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorHandler | null | undefined, environment: NodeScriptEnvironment);
     componentCreationIndex: number;
-    creationCtx: Map<Wire | ClassComponent, ParserRuleContext>;
+    creationCtx: Map<ClassComponent | Wire, ParserRuleContext>;
     visitPin_select_expr: (ctx: Pin_select_exprContext) => void;
     trackNewComponentCreated: (callback: () => void) => boolean;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;

package/libs/std.cst

@@ -7,7 +7,7 @@ def net(net_name, net_type = "any"):
         display: create graphic (params):
             hline: -50, 0, 100
             vpin: 1, 0, 50, -50, display_id=false
-            label: params.net_name, 0, -15, fontSize=50, anchor="middle"
+            label: params.net_name, 0, -15, fontSize=50, anchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -24,7 +24,7 @@ def label(value, anchor="left"):
         copy: true
         followWireOrientation: false
         display: create graphic (params):
-            textColor: "#222"
+            text_color: "#222"
             label: params.value, 0, -10, fontSize=50, anchor=anchor
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "net"
@@ -38,8 +38,8 @@ def port(value, portType="input"):
         pins: 1
         copy: true
         display: create graphic (params):
-            textColor: "#222"
-            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
+            text_color: "#222"
+            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="center", portType=portType
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
         params:
@@ -58,7 +58,7 @@ def res(value):
             hpin: 1, -width/2 - 30, 0, 30, display_id=false
             hpin: 2, width/2 + 30, 0, -30, display_id=false
             label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
-            label: params.value, 0, 0, fontSize=30, anchor="middle", vanchor="middle"
+            label: params.value, 0, 0, fontSize=30, anchor="center", vanchor="center"
         type: "res"
         params:
             value: value
@@ -73,13 +73,13 @@ def cap(value):
     return create component:
         pins: 2
         display: create graphic (params):
-            lineWidth: 13
+            line_width: 13
             hline: -width/2, 20, width
             hline: -width/2, -20, width
             vpin: 1, 0, -100, 80, display_id=false
             vpin: 2, 0, 100, -80, display_id=false
-            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="middle"
-            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="middle"
+            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="center"
+            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="center"
         type: "cap"
         params:
             value: value
@@ -101,7 +101,7 @@ def ind(value):
             hpin: 1, -width/2 - 100, 0, 100, display_id=false
             hpin: 2, width/2 + 100, 0, -100, display_id=false
             label: (params.refdes, -width/2, -height/2 - 25 , fontSize=50, anchor="left")
-            label: (params.value, 0, 50, fontSize=50, anchor="middle", vanchor="middle")
+            label: (params.value, 0, 50, fontSize=50, anchor="center", vanchor="center")
         params:
             value: value
 
@@ -119,7 +119,7 @@ def diode():
             vline: width/2, -height/2, height
             hpin: 1, -width/2-100, 0, 100    # cathode
             hpin: 2, width/2 + 100, 0, -100  # anode
-            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
+            label: params.refdes, 0, -100, fontSize=50, anchor="center", vanchor="top"
 
 def led(color):
     width = 100
@@ -140,8 +140,8 @@ def led(color):
                     "M", 180, 60, "L", 180, 90, "L", 150, 90)
             hpin: 1, width/2 + 100, 0, -100  # cathode
             hpin: 2, -width/2-100, 0, 100    # anode
-            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
-            label: params.color, 0, 100, fontSize=40, anchor="middle", vanchor="bottom"
+            label: params.refdes, 0, -100, fontSize=50, anchor="center", vanchor="top"
+            label: params.color, 0, 100, fontSize=40, anchor="center", vanchor="bottom"
         params:
             size: "0603"
             color: color
@@ -159,7 +159,7 @@ def cgnd():
             hline: -10, 5, 20
             hline: -5, 10, 10
             vpin: 1, 0, -10, 10, display_id=false
-            label: params.net_name, 0, 22, fontSize=50, anchor="middle"
+            label: params.net_name, 0, 22, fontSize=50, anchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -175,7 +175,7 @@ def dgnd(net_name="GND"):
         display: create graphic (params):
             triangle: 0, 0, 0, height, width
             vpin: 1, 0, -50, 50, display_id=false
-            label: params.net_name, 0, height + 50, fontSize=50, anchor="middle", vanchor="middle"
+            label: params.net_name, 0, height + 50, fontSize=50, anchor="center", vanchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -208,7 +208,7 @@ def arrow_point():
         pins: 1
         followWireOrientation: false
         display: create graphic:
-            lineWidth: 2
+            line_width: 2
             path: ("M", -10, -5, "L", -5, 0, "L", -10, 5)
             path: ("M", -5, 0, "L", -20, 0)
             hpin: 1, 0, 0, 0, display_id=false
@@ -269,12 +269,12 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
             fill: "none"
 
             # outer rect 
-            lineColor: "#cccccc"
+            line_color: "#cccccc"
             crect: (paper_width/2, paper_height/2, 
                 paper_width, paper_height, class="paper-area")
 
             # inner rect
-            lineColor: "#111111"
+            line_color: "#111111"
             crect: (paper_width/2, paper_height/2, 
                     inner_width, inner_height, class="plot-area")
 
@@ -296,30 +296,30 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
                     content: i
                     offset: tmp_x + tmp_width * ratio_x * (0.5 + (i-1)), tmp_y + inner_frame_margin * 0.5 + 2
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
                 text: 
                     content: i
                     offset: tmp_x + tmp_width * ratio_x * (0.5 + (i-1)), tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
             for index, val in enumerate(row_display_value):
                 text: 
                     content: val
                     offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * (0.5 + index)
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
                 text: 
                     content: val
                     offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * (0.5 + index)
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
             # Draw title frame
             text: 
@@ -375,47 +375,47 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
             grid_height: paper_height - 2 * margin_y
 
 def sheet_A1():
-    paper_width = toMils(841)
-    paper_height = toMils(594)
+    paper_width = to_mils(841)
+    paper_height = to_mils(594)
     margin = 400
 
     return sheet_generator("A1", paper_width, paper_height, margin, margin, 
         range(1, 17), ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"])
 
 def sheet_A2():
-    paper_width = toMils(594)
-    paper_height = toMils(420)
+    paper_width = to_mils(594)
+    paper_height = to_mils(420)
     margin = 400
 
     return sheet_generator("A2", paper_width, paper_height, margin, margin, 
         range(1, 13), ["A", "B", "C", "D", "E", "F", "G", "H"])
 
 def sheet_A3():
-    paper_width = toMils(420)
-    paper_height = toMils(297)
+    paper_width = to_mils(420)
+    paper_height = to_mils(297)
     margin = 400
 
     return sheet_generator("A3", paper_width, paper_height, margin, margin, 
         range(1, 9), ["A", "B", "C", "D", "E", "F"])
 
 def sheet_A4():
-    paper_width = toMils(297)
-    paper_height = toMils(210)
+    paper_width = to_mils(297)
+    paper_height = to_mils(210)
     margin = 400
 
     return sheet_generator("A4", paper_width, paper_height, margin, margin, 
         range(1, 7), ["A", "B", "C", "D"])
 
 def sheet_A5():
-    paper_width = toMils(210)
-    paper_height = toMils(148)
+    paper_width = to_mils(210)
+    paper_height = to_mils(148)
     margin = 400
 
     return sheet_generator("A5", paper_width, paper_height, margin, margin, range(1, 5), ["A", "B", "C"])
 
 def sheet_A6(revision="V1"):
-    paper_width = toMils(148)
-    paper_height = toMils(105)
+    paper_width = to_mils(148)
+    paper_height = to_mils(105)
     margin = 400
 
     tmp_sheet = sheet_generator("A6", paper_width, paper_height, margin, margin, range(1, 4), ["A", "B"])

package/package.json

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