circuitscript 0.1.14 → 0.1.16

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

@@ -109,30 +109,31 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly RULE_function_args_expr = 37;
     static readonly RULE_atom_expr = 38;
     static readonly RULE_trailer_expr = 39;
-    static readonly RULE_function_call_expr = 40;
-    static readonly RULE_net_namespace_expr = 41;
-    static readonly RULE_function_return_expr = 42;
-    static readonly RULE_property_block_expr = 43;
-    static readonly RULE_create_component_expr = 44;
-    static readonly RULE_graphic_expressions_block = 45;
-    static readonly RULE_create_graphic_expr = 46;
-    static readonly RULE_create_module_expr = 47;
-    static readonly RULE_nested_properties_inner = 48;
-    static readonly RULE_graphic_expr = 49;
-    static readonly RULE_property_expr = 50;
-    static readonly RULE_property_key_expr = 51;
-    static readonly RULE_property_value_expr = 52;
-    static readonly RULE_wire_atom_expr = 53;
-    static readonly RULE_wire_expr = 54;
-    static readonly RULE_array_expr = 55;
-    static readonly RULE_point_expr = 56;
-    static readonly RULE_import_expr = 57;
-    static readonly RULE_frame_expr = 58;
-    static readonly RULE_if_expr = 59;
-    static readonly RULE_if_inner_expr = 60;
-    static readonly RULE_else_expr = 61;
-    static readonly RULE_while_expr = 62;
-    static readonly RULE_for_expr = 63;
+    static readonly RULE_trailer_expr2 = 40;
+    static readonly RULE_function_call_expr = 41;
+    static readonly RULE_net_namespace_expr = 42;
+    static readonly RULE_function_return_expr = 43;
+    static readonly RULE_property_block_expr = 44;
+    static readonly RULE_create_component_expr = 45;
+    static readonly RULE_graphic_expressions_block = 46;
+    static readonly RULE_create_graphic_expr = 47;
+    static readonly RULE_create_module_expr = 48;
+    static readonly RULE_nested_properties_inner = 49;
+    static readonly RULE_graphic_expr = 50;
+    static readonly RULE_property_expr = 51;
+    static readonly RULE_property_key_expr = 52;
+    static readonly RULE_property_value_expr = 53;
+    static readonly RULE_wire_atom_expr = 54;
+    static readonly RULE_wire_expr = 55;
+    static readonly RULE_array_expr = 56;
+    static readonly RULE_point_expr = 57;
+    static readonly RULE_import_expr = 58;
+    static readonly RULE_frame_expr = 59;
+    static readonly RULE_if_expr = 60;
+    static readonly RULE_if_inner_expr = 61;
+    static readonly RULE_else_expr = 62;
+    static readonly RULE_while_expr = 63;
+    static readonly RULE_for_expr = 64;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -184,6 +185,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     function_args_expr(): Function_args_exprContext;
     atom_expr(): Atom_exprContext;
     trailer_expr(): Trailer_exprContext;
+    trailer_expr2(): Trailer_expr2Context;
     function_call_expr(): Function_call_exprContext;
     net_namespace_expr(): Net_namespace_exprContext;
     function_return_expr(): Function_return_exprContext;
@@ -507,6 +509,12 @@ export declare class ArrayExprContext extends Data_exprContext {
     array_expr(): Array_exprContext;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
+export declare class ArrayIndexExprContext extends Data_exprContext {
+    constructor(ctx: Data_exprContext);
+    data_expr(): Data_exprContext[];
+    data_expr(i: number): Data_exprContext | null;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
 export declare class FunctionCallExprContext extends Data_exprContext {
     constructor(ctx: Data_exprContext);
     function_call_expr(): Function_call_exprContext;
@@ -634,8 +642,9 @@ export declare class Function_args_exprContext extends antlr.ParserRuleContext {
 }
 export declare class Atom_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
-    ID(): antlr.TerminalNode[];
-    ID(i: number): antlr.TerminalNode | null;
+    ID(): antlr.TerminalNode;
+    trailer_expr2(): Trailer_expr2Context[];
+    trailer_expr2(i: number): Trailer_expr2Context | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
@@ -644,7 +653,14 @@ export declare class Trailer_exprContext extends antlr.ParserRuleContext {
     OPEN_PAREN(): antlr.TerminalNode | null;
     CLOSE_PAREN(): antlr.TerminalNode | null;
     parameters(): ParametersContext | null;
+    trailer_expr2(): Trailer_expr2Context | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
+export declare class Trailer_expr2Context extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     ID(): antlr.TerminalNode | null;
+    data_expr(): Data_exprContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }

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

@@ -31,6 +31,7 @@ import { ParametersContext } from "./CircuitScriptParser.js";
 import { Property_set_exprContext } from "./CircuitScriptParser.js";
 import { Double_dot_property_set_exprContext } from "./CircuitScriptParser.js";
 import { ArrayExprContext } from "./CircuitScriptParser.js";
+import { ArrayIndexExprContext } from "./CircuitScriptParser.js";
 import { FunctionCallExprContext } from "./CircuitScriptParser.js";
 import { AdditionExprContext } from "./CircuitScriptParser.js";
 import { MultiplyExprContext } from "./CircuitScriptParser.js";
@@ -48,6 +49,7 @@ import { Function_exprContext } from "./CircuitScriptParser.js";
 import { Function_args_exprContext } from "./CircuitScriptParser.js";
 import { Atom_exprContext } from "./CircuitScriptParser.js";
 import { Trailer_exprContext } from "./CircuitScriptParser.js";
+import { Trailer_expr2Context } from "./CircuitScriptParser.js";
 import { Function_call_exprContext } from "./CircuitScriptParser.js";
 import { Net_namespace_exprContext } from "./CircuitScriptParser.js";
 import { Function_return_exprContext } from "./CircuitScriptParser.js";
@@ -108,6 +110,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitProperty_set_expr?: (ctx: Property_set_exprContext) => Result;
     visitDouble_dot_property_set_expr?: (ctx: Double_dot_property_set_exprContext) => Result;
     visitArrayExpr?: (ctx: ArrayExprContext) => Result;
+    visitArrayIndexExpr?: (ctx: ArrayIndexExprContext) => Result;
     visitFunctionCallExpr?: (ctx: FunctionCallExprContext) => Result;
     visitAdditionExpr?: (ctx: AdditionExprContext) => Result;
     visitMultiplyExpr?: (ctx: MultiplyExprContext) => Result;
@@ -125,6 +128,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitFunction_args_expr?: (ctx: Function_args_exprContext) => Result;
     visitAtom_expr?: (ctx: Atom_exprContext) => Result;
     visitTrailer_expr?: (ctx: Trailer_exprContext) => Result;
+    visitTrailer_expr2?: (ctx: Trailer_expr2Context) => Result;
     visitFunction_call_expr?: (ctx: Function_call_exprContext) => Result;
     visitNet_namespace_expr?: (ctx: Net_namespace_exprContext) => Result;
     visitFunction_return_expr?: (ctx: Function_return_exprContext) => Result;

package/dist/types/draw_symbols.d.ts

@@ -200,7 +200,7 @@ export declare class SymbolDrawingCommands extends SymbolDrawing {
     clone(): SymbolDrawingCommands;
     eq(other: SymbolDrawingCommands): boolean;
 }
-type SimplePoint = [x: number, y: number];
+export type SimplePoint = [x: number, y: number];
 type SymbolPinLayout = {
     pinId: number;
     angle: number;

package/dist/types/execute.d.ts

@@ -5,7 +5,7 @@ import { ExecutionScope } from './objects/ExecutionScope.js';
 import { Net } from './objects/Net.js';
 import { NumericValue, ParamDefinition } from './objects/ParamDefinition.js';
 import { PinDefinition } from './objects/PinDefinition.js';
-import { AnyReference, CFunction, CFunctionResult, CallableParameter, ComponentPin, DeclaredReference } from './objects/types.js';
+import { AnyReference, CFunction, CFunctionEntry, CFunctionResult, CallableParameter, ComponentPin } from './objects/types.js';
 import { Logger } from './logger.js';
 import { UnitDimension } from './helpers.js';
 import { ParserRuleContext } from 'antlr4ng';
@@ -26,7 +26,7 @@ export declare class ExecutionContext {
     returnValue: null;
     silent: boolean;
     logger: Logger;
-    __functionCache: {};
+    __functionCache: Map<string, CFunction>;
     parentContext: ExecutionContext;
     componentAngleFollowsWire: boolean;
     warnings: ExecutionWarning[];
@@ -71,10 +71,10 @@ export declare class ExecutionContext {
     addBreakContext(ctx: ParserRuleContext): void;
     popBreakContext(): ParserRuleContext;
     getBreakContext(): ParserRuleContext;
-    createFunction(functionName: string, __runFunc: CFunction): void;
+    createFunction(functionName: string, __runFunc: CFunction, source?: ParserRuleContext, uniqueId?: string): void;
     hasFunction(functionName: string): boolean;
-    getFunction(functionName: string): CFunction;
-    resolveVariable(executionStack: ExecutionContext[], idName: string, trailers?: string[]): DeclaredReference;
+    getFunction(functionName: string): CFunctionEntry;
+    resolveVariable(executionStack: ExecutionContext[], idName: string, trailers?: string[]): AnyReference;
     resolveTrailers(type: ReferenceTypes, item: any, trailers?: string[]): AnyReference;
     callFunction(functionName: string, functionParams: CallableParameter[], executionStack: ExecutionContext[], netNamespace: string): CFunctionResult;
     mergeScope(childScope: ExecutionScope, namespace: string): void;

package/dist/types/geometry.d.ts

@@ -2,6 +2,7 @@ import Flatten from '@flatten-js/core';
 import { Box } from '@svgdotjs/svg.js';
 import { NumericValue } from './objects/ParamDefinition.js';
 import { PinTypes } from './objects/PinTypes.js';
+import { SimplePoint } from './draw_symbols.js';
 export type Segment = Flatten.Segment;
 export type Polygon = Flatten.Polygon;
 export type Multiline = Flatten.Multiline;
@@ -76,7 +77,8 @@ export declare class Geometry {
         y: NumericValue;
     }[][]): {
         intersectPoints: WirePointCount[];
-        segments: [x: number, y: number][][];
+        segments: SimplePoint[][];
+        lines: SimplePoint[][];
     };
 }
 type WirePointCount = [x: number, y: number, count: number];

package/dist/types/globals.d.ts

@@ -80,7 +80,8 @@ export declare enum ReferenceTypes {
     value = "value",
     variable = "variable",
     instance = "instance",
-    pinType = "pinType"
+    pinType = "pinType",
+    unknown = "unknown"
 }
 export declare enum BlockTypes {
     Branch = 1,
@@ -90,8 +91,10 @@ export declare enum BlockTypes {
 }
 export declare enum NetGraphicsParams {
     Color = "color",
-    Highight = "highlight",
-    LineWidth = "lineWidth"
+    LineWidth = "lineWidth",
+    Highlight = "highlight",
+    HighlightWidth = "highlightWidth",
+    HighlightOpacity = "highlightOpacity"
 }
 export declare enum FrameType {
     Frame = 1,
@@ -107,3 +110,4 @@ export declare const RenderFlags: {
     ShowLabelOrigin: boolean;
 };
 export declare const SymbolValidatorContext = "_sym";
+export declare const TrailerArrayIndex = "index";

package/dist/types/graph.d.ts

@@ -0,0 +1,28 @@
+import { Graph } from "@dagrejs/graphlib";
+import { SymbolPinDefintion } from "./draw_symbols.js";
+import { RenderFrame } from "./layout.js";
+import { ClassComponent } from "./objects/ClassComponent.js";
+import { SequenceItem } from "./objects/ExecutionScope.js";
+import { Net } from "./objects/Net.js";
+import { Logger } from "./logger.js";
+import { ComponentPinNetPair } from "./objects/types.js";
+export declare class NetGraph {
+    logger: Logger;
+    constructor(logger: Logger);
+    generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: number, net: Net][]): {
+        graph: Graph;
+        containerFrames: RenderFrame[];
+    };
+    private setGraphEdge;
+    protected print(...params: any[]): void;
+    generateNetGraph(nets: ComponentPinNetPair[]): void;
+    findNodePaths(graph: Graph, startNode: string, endNode: string, seenNodes?: string[]): string[][];
+    private getNetNodeName;
+    private getComponentName;
+}
+export declare function getWireName(wireId: number): string;
+export declare function generateLayoutPinDefinition(component: ClassComponent): SymbolPinDefintion[];
+export declare enum RenderItemType {
+    Wire = "wire",
+    Component = "component"
+}

package/dist/types/layout.d.ts

@@ -1,7 +1,6 @@
 import { Graph } from '@dagrejs/graphlib';
-import { SymbolGraphic, SymbolText, SymbolDrawingCommands } from "./draw_symbols.js";
+import { SymbolGraphic, SymbolText, SymbolDrawingCommands, SimplePoint } 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';
@@ -14,13 +13,13 @@ export declare class LayoutEngine {
     logger: Logger;
     layoutWarnings: string[];
     showBaseFrame: boolean;
-    constructor(options?: {
+    constructor(logger: Logger, options?: {
         showBaseFrame: boolean;
     });
     protected print(...params: any[]): void;
     protected printLevel(level: number, ...params: any[]): void;
     protected padLevel(value: number): string;
-    runLayout(sequence: SequenceItem[], nets: ComponentPinNetPair[]): SheetFrame[];
+    runLayout(graph: Graph, containerFrames: RenderFrame[], nets: ComponentPinNetPair[]): SheetFrame[];
     private collectRenderNets;
     private flattenFrameItems;
     private findJunctions;
@@ -31,11 +30,6 @@ export declare class LayoutEngine {
     dumpFrame(frame: RenderFrame, level?: number): void;
     private prepareFrames;
     private checkAddFrameTitle;
-    generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: number, net: Net][]): {
-        graph: Graph;
-        containerFrames: RenderFrame[];
-    };
-    private setGraphEdge;
     private sizeSubGraphs;
     private walkAndPlaceGraph;
     private placeSubgraphV2;
@@ -61,6 +55,7 @@ export type RenderNet = {
     lineWidth?: number;
     highlight?: string;
     highlightOpacity?: number;
+    highlightWidth?: number;
 };
 export declare class RenderWire extends RenderObject {
     id: number;
@@ -85,9 +80,10 @@ export declare class RenderWire extends RenderObject {
 }
 export type MergedWire = {
     netName: string;
-    segments: [x: number, y: number][][];
+    segments: SimplePoint[][];
     intersectPoints: [x: number, y: number, count: number][];
     net: RenderNet;
+    lines?: SimplePoint[][];
 };
 export declare class RenderComponent extends RenderObject {
     component: ClassComponent;

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

@@ -1,6 +1,6 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { CFunction, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ParseSymbolType, ValueType } from './types.js';
+import { CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ParseSymbolType, ValueType } from './types.js';
 import { BlockTypes, LayoutDirection } from '../globals.js';
 import { Wire, WireSegment } from './Wire.js';
 import { Frame } from './Frame.js';
@@ -12,7 +12,7 @@ export declare class ExecutionScope {
     scopeId: number;
     private nets;
     instances: Map<string, ClassComponent>;
-    functions: Map<string, CFunction>;
+    functions: Map<string, CFunctionEntry>;
     variables: Map<string, ValueType | ClassComponent>;
     symbols: Map<string, {
         type: ParseSymbolType;
@@ -33,7 +33,7 @@ export declare class ExecutionScope {
     componentRoot: ClassComponent | null;
     copyIDs: Map<string, number>;
     sequence: SequenceItem[];
-    constructor(scopeId: number);
+    private constructor();
     static scopeId: number;
     static create(): ExecutionScope;
     private findNet;

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

@@ -1,10 +1,18 @@
-import { Token } from 'antlr4ng';
+import { ParserRuleContext, Token } from 'antlr4ng';
 import { ExecutionContext } from '../execute.js';
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
 import { NumericValue, PercentageValue } from './ParamDefinition.js';
 import { ReferenceTypes } from '../globals.js';
 export type CFunction = (args: CallableParameter[], options?: CFunctionOptions) => CFunctionResult;
+export declare class CFunctionEntry {
+    name: string;
+    execute: CFunction;
+    uniqueId?: string;
+    source?: ParserRuleContext;
+    constructor(name: string, execute: CFunction, source?: ParserRuleContext, uniqueId?: string);
+    toString(): string;
+}
 export type CFunctionOptions = {
     netNamespace?: string;
 };
@@ -50,20 +58,22 @@ export type FunctionDefinedParameter = [
 export declare class AnyReference {
     found: boolean;
     name?: string;
-    trailers: string[];
-    type?: ReferenceTypes;
+    trailers: (string | ['index', number])[];
+    type: ReferenceTypes;
     value?: any;
     parentValue?: any;
+    referenceName: string;
     constructor(refType: {
         found: boolean;
         name?: string;
-        trailers?: string[];
+        trailers?: (string | ['index', number])[];
         type?: ReferenceTypes;
         value?: any;
         parentValue?: any;
     });
+    toString(): string;
 }
-export declare class UndeclaredReference {
+export declare class UndeclaredReference extends AnyReference {
     reference: AnyReference;
     constructor(reference: AnyReference);
     throwMessage(): string;
@@ -71,7 +81,7 @@ export declare class UndeclaredReference {
     nameString(): string;
 }
 export declare class DeclaredReference extends AnyReference {
-    toString(): string;
+    referenceName: string;
     toDisplayString(): string;
 }
 export declare enum ParseSymbolType {

package/package.json

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