circuitscript 0.1.0 → 0.1.3

package/dist/types/logger.d.ts

@@ -1,6 +1,6 @@
 export declare class Logger {
     logs: string[];
     constructor();
-    add(message: string): void;
+    add(...args: (string | number)[]): void;
     dump(): string;
 }

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

@@ -3,22 +3,26 @@ 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';
+import { ExecutionContext } from '../execute.js';
+import { NumericValue } from './ParamDefinition.js';
 export declare class ClassComponent {
     instanceName: string;
     numPins: number;
-    parameters: Map<string, number | string>;
+    parameters: Map<string, number | string | NumericValue>;
     pins: Map<number, PinDefinition>;
     pinNets: Map<number, Net>;
     pinWires: Map<number, WireSegment[]>;
+    pinsMaxPositions: {
+        [key: string]: number;
+    };
     _cachedPins: string;
     _cachedParams: string;
-    className: string;
     _copyID?: number;
     _copyFrom?: ClassComponent;
-    arrangeProps: Map<string, number[]> | null;
-    displayProp: string | SymbolDrawingCommands | null;
+    arrangeProps: Map<string, NumericValue[]> | null;
+    displayProp: SymbolDrawingCommands | null;
     widthProp: number | null;
+    heightProp: number | null;
     typeProp: string | null;
     copyProp: boolean;
     angleProp: number;
@@ -26,29 +30,28 @@ export declare class ClassComponent {
     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);
+    constructor(instanceName: string, numPins: number);
     setupPins(): void;
     getDefaultPin(): number;
     hasPin(pinId: number | string): boolean;
     getPin(pinId: number | string): PinId;
     getNextPinAfter(pinIndex: number): number;
-    setParam(key: string, value: number | string): void;
+    setParam(key: string, value: number | string | NumericValue): void;
     hasParam(key: string): boolean;
     private refreshParamCache;
     private refreshPinsCache;
     refreshCache(): void;
     getParam<T>(key: string): T;
     toString(): string;
-    static simple(instanceName: string, numPins: number, className: string): ClassComponent;
+    static simple(instanceName: string, numPins: number): ClassComponent;
     isEqual(other: ClassComponent): boolean;
     clone(): ClassComponent;
 }
+export declare class ModuleComponent extends ClassComponent {
+    moduleContainsExpressions?: Expressions_blockContext;
+    moduleCounter: number;
+    moduleExecutionContext?: ExecutionContext;
+    moduleExecutionContextName?: string;
+    modulePinIdToPortMap?: Map<number, ClassComponent>;
+}

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

@@ -29,14 +29,14 @@ export declare class ExecutionScope {
     componentGnd: ClassComponent | null;
     componentRoot: ClassComponent | null;
     copyIDs: Map<string, number>;
-    sequence: any[];
+    sequence: SequenceItem[];
     constructor(scopeId: number);
     static scopeId: number;
     static create(): ExecutionScope;
     private findNet;
     getNetWithName(name: string): Net;
     hasNet(component: ClassComponent, pin: number): boolean;
-    getNet(component: ClassComponent, pin: number): Net;
+    getNet(component: ClassComponent, pin: number): Net | null;
     setNet(component: ClassComponent, pin: number, net: Net): void;
     removeNet(component: ClassComponent, pin: number): void;
     getNets(): ComponentPinNetPair[];
@@ -44,6 +44,7 @@ export declare class ExecutionScope {
     printNets(): void;
     setActive(type: ActiveObject, item: any): void;
     clearActive(): void;
+    setCurrent(component: ClassComponent | null, pin?: number | null): void;
 }
 export declare enum SequenceAction {
     To = "to",

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

@@ -1,9 +1,13 @@
-import { FrameType } from "src/globals";
+import { FrameType } from "../globals.js";
 export declare class Frame {
     parameters: Map<string, any>;
     frameId: number;
     frameType: FrameType;
-    constructor(frameId: number, frameType: FrameType);
+    constructor(frameId: number, frameType?: FrameType);
+}
+export declare enum FixedFrameIds {
+    BaseFrame = -1,
+    FrameIdNotUsed = -2
 }
 export declare enum FrameParamKeys {
     Title = "title",
@@ -14,6 +18,9 @@ export declare enum FrameParamKeys {
     Height = "height",
     PaperSize = "paper_size",
     SheetType = "sheet_type",
+    TitleAlign = "title_align",
+    HorizontalAlign = "align",
+    VerticalAlign = "valign",
     SheetNumber = "sheet_number",
     SheetTotal = "sheet_total"
 }

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

@@ -1,16 +1,46 @@
+import { Big } from 'big.js';
 export declare class ParamDefinition {
     paramName: string;
     paramValue: string | number | any;
     constructor(paramName: string, paramValue: any);
 }
 export declare class NumericValue {
-    value: string | number;
-    constructor(value: string | number);
+    value: string | number | Big;
+    valuePart: Big;
+    prefixPart: number;
+    constructor(value: string | number | Big, prefix?: number);
     toString(): string;
     toDisplayString(): string;
+    toNumber(): number;
+    toBigNumber(): Big;
+    div(value: NumericValue | number): NumericValue;
+    half(): NumericValue;
+    mul(value: NumericValue | number): NumericValue;
+    add(value: NumericValue | number): NumericValue;
+    sub(value: NumericValue | number): NumericValue;
+    mod(value: NumericValue | number): NumericValue;
+    neg(): NumericValue;
+    eq(value: NumericValue): boolean;
 }
+export declare function numeric(value: number): NumericValue;
 export declare class PercentageValue {
     value: string | number;
     constructor(value: string | number);
     toString(): string;
+    toNumber(): number;
+}
+export declare class WrappedNumber {
+    value: number;
+    constructor(value: number);
+    toString(): string;
+    toNumber(): number;
+}
+export type NumberOperatorType = NumericValue | PercentageValue | WrappedNumber;
+export declare class NumberOperator {
+    prepare(value: number | NumberOperatorType): NumberOperatorType;
+    multiply(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    divide(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    addition(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    subtraction(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    modulus(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
 }

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

@@ -20,5 +20,3 @@ export declare enum PortSide {
     SOUTH = "SOUTH",
     NORTH = "NORTH"
 }
-export declare class PinReference {
-}

package/dist/types/render.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="pdfkit" />
 import { Svg } from '@svgdotjs/svg.js';
 import { SheetFrame } from "./layout.js";
-export declare function renderSheetsToSVG(sheetFrames: SheetFrame[]): Svg;
+import { Logger } from './logger.js';
+export declare function renderSheetsToSVG(sheetFrames: SheetFrame[], logger: Logger): 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/utils.d.ts

@@ -1,5 +1,7 @@
+import { Big } from 'big.js';
 import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent";
+import { NumericValue } from "./objects/ParamDefinition";
 export declare class SimpleStopwatch {
     startTime: Date;
     constructor();
@@ -11,6 +13,12 @@ export type BoundBox = {
     xmax: number;
     ymax: number;
 };
+export type BoundBox2 = [
+    xmin: number,
+    ymin: number,
+    xmax: number,
+    ymax: number
+];
 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;
@@ -20,6 +28,11 @@ export declare function getBoundsSize(bounds: BoundBox): {
     height: number;
 };
 export declare function getPortType(component: ClassComponent): string | null;
-export declare function roundValue(value: number): number;
+export declare function roundValue(value: NumericValue): NumericValue;
 export declare function throwWithContext(context: ParserRuleContext, message: string): void;
 export declare function combineMaps(map1: Map<string, any>, map2: Map<string, any>): Map<string, any>;
+export declare function getNumberExponential(value: string): number;
+export declare function getNumberExponentialText(value: number): string;
+export declare function resolveToNumericValue(value: Big): NumericValue;
+export declare function isPointWithinArea(point: [x: number, y: number], bounds: BoundBox2): boolean;
+export declare function areasOverlap(area1: BoundBox2, area2: BoundBox2): boolean;

package/dist/types/visitor.d.ts

@@ -1,7 +1,7 @@
 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, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, Nested_properties_innerContext, Expressions_blockContext, Create_module_exprContext, Property_block_exprContext, While_exprContext, For_exprContext, GraphicCommandExprContext, Graphic_expressions_blockContext, GraphicForExprContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
-import { ComponentPin, ComponentPinNet } from './objects/types.js';
+import { ComponentPin, ComponentPinNet, ComponentPinNetPair } from './objects/types.js';
 import { Net } from './objects/Net.js';
 import { BaseVisitor } from './BaseVisitor.js';
 import { ParserRuleContext } from 'antlr4ng';
@@ -59,6 +59,8 @@ export declare class ParserVisitor extends BaseVisitor {
     pinTypes: PinTypes[];
     private parseCreateComponentPins;
     private parseCreateModulePorts;
+    private getArrangePropFromModulePorts;
+    private getPortItems;
     private parseCreateComponentParams;
     printNets(): void;
     dumpNets(): ComponentPinNet[];
@@ -73,16 +75,13 @@ export declare class ParserVisitor extends BaseVisitor {
     getNetList(): NetListItem[];
     getGraph(): {
         sequence: any[];
-        nets: import("./objects/types.js").ComponentPinNetPair[];
-        components: ClassComponent[];
+        nets: ComponentPinNetPair[];
     };
     annotateComponents(): void;
     applySheetFrameComponent(): {
         frameComponent: ClassComponent | null;
     };
     private resolveNets;
-    private setComponentOrientation;
-    private setComponentFlip;
     private getPropertyExprList;
 }
 export type NetListItem = {

package/libs/lib.cst

@@ -37,7 +37,7 @@ def label(value, anchor="left"):
             textColor: "#222"
             label: params.value, 0, -10, fontSize=50, anchor=anchor
             pin: 1, 0, 0, 0, 0, display_pin_id=false
-        type: "label"
+        type: "net"
         params:
             net_name: value
             value: value
@@ -64,11 +64,11 @@ def res(value):
     return create component:
         pins: 2
         display: create graphic (params):
-            rect: 0, 0, width, height
+            crect: 0, 0, width, height
             hpin: 1, -width/2 - 30, 0, 30
             hpin: 2, width/2 + 30, 0, -30
             label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
-            label: params.value, 0, 4, fontSize=30, anchor="middle", vanchor="middle"
+            label: params.value, 0, 0, fontSize=30, anchor="middle", vanchor="middle"
         type: "res"
         params:
             value: value
@@ -195,6 +195,7 @@ def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
     return create component:
         pins: 1
         followWireOrientation: false
+        type: "graphic"
         display: create graphic:
             pin: 1, 0, 0, 0, 0, display_pin_id=false
             text:
@@ -222,6 +223,17 @@ def arrow_point():
             path: ("M", -5, 0, "L", -20, 0)
             hpin: 1, 0, 0, 0, display_pin_id=false
 
+def no_connect(size=20):
+    return create component:
+        pins: 1
+        display: create graphic:
+            path: "M", -size, -size, "L", size, size
+            path: "M", -size, size, "L", size, -size
+            pin: 1, 0, 0, 0, 0, display_pin_id=false
+
+def dnc(size=20):
+    return no_connect(size)
+
 def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin_y, 
     col_display_value, row_display_value, inner_frame_margin = 50):
     
@@ -259,19 +271,21 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
     title_block_y2 = title_block_y + title_block_height
 
     return create component:
-        type: "frame"
+        type: "graphic"
         display: create graphic (params):
             fill: "none"
 
             # outer rect 
             lineColor: "#cccccc"
-            rect: paper_width/2, paper_height/2, paper_width, paper_height
+            crect: (paper_width/2, paper_height/2, 
+                paper_width, paper_height, class="paper-area")
 
             # inner rect
             lineColor: "#111111"
-            rect: paper_width/2, paper_height/2, inner_width, inner_height
+            crect: (paper_width/2, paper_height/2, 
+                    inner_width, inner_height, class="plot-area")
 
-            rect: (paper_width/2, paper_height/2, 
+            crect: (paper_width/2, paper_height/2, 
                     paper_width - 2 * margin_x + inner_frame_margin * 2, 
                     paper_height - 2 * margin_y  + inner_frame_margin * 2)
 
@@ -346,7 +360,10 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
                 anchor: "left"
                 vanchor: "bottom"
 
-            rect: title_block_x + title_block_width / 2, title_block_y + title_block_height / 2, title_block_width, title_block_height
+            crect: (title_block_x + title_block_width / 2, 
+                    title_block_y + title_block_height / 2, 
+                    title_block_width, title_block_height,
+                    class="keepout-area")
 
         params:
             title: "Sheet title"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.0",
+    "version": "0.1.3",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -24,6 +24,7 @@
         "libs"
     ],
     "devDependencies": {
+        "@types/big.js": "^6.2.2",
         "@types/figlet": "^1.5.8",
         "@types/jest": "~29.5",
         "@types/node": "~18",
@@ -69,7 +70,9 @@
         "profile-flame": "node --prof-process --preprocess -j isolate*.log | flamebearer",
         "server": "node server.js",
         "pack-local": "npm pack; rm circuitscript-install.tgz; mv `ls | grep circuitscript` circuitscript-install.tgz; cp circuitscript-install.tgz ../circuitscript-vscode/client; cp circuitscript-install.tgz ../circuitscript-vscode/server",
-        "changelog": "auto-changelog --handlebars-setup ../changelog/helper.js"
+        "changelog": "auto-changelog --handlebars-setup ../changelog/helper.js -p",
+        "preversion": "npm run test",
+        "version": "npm run changelog && git add CHANGELOG.md"
     },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
@@ -78,13 +81,14 @@
         "@flatten-js/core": "1.5.5",
         "@svgdotjs/svg.js": "3.2.0",
         "antlr4ng": "^3.0.4",
+        "big.js": "^6.2.2",
         "commander": "^11.1.0",
         "express": "^4.18.2",
         "figlet": "^1.7.0",
         "lodash": "^4.17.21",
         "pdfkit": "^0.15.1",
         "svg-to-pdfkit": "^0.1.8",
-        "svgdom": "0.1.14",
+        "svgdom": "^0.1.14",
         "this-file": "^2.0.3",
         "tslib": "~2.5",
         "ws": "^8.14.2"