circuitscript 0.1.20 → 0.1.23

package/dist/types/RefdesAnnotationVisitor.d.ts

@@ -0,0 +1,35 @@
+import { ParserRuleContext, CommonTokenStream } from 'antlr4ng';
+import { Add_component_exprContext, At_block_headerContext, At_blockContext, At_component_exprContext, Component_select_exprContext, Frame_exprContext, Function_def_exprContext, Function_return_exprContext, ScriptContext, To_component_exprContext } from './antlr/CircuitScriptParser.js';
+import { BaseVisitor } from './BaseVisitor.js';
+import { ClassComponent } from './objects/ClassComponent.js';
+export declare class RefdesAnnotationVisitor extends BaseVisitor {
+    private sourceText;
+    private tokenStream;
+    private modifications;
+    resultText: string;
+    debug: boolean;
+    componentCtxLinks: Map<ParserRuleContext, ClassComponent>;
+    constructor(silent: boolean, sourceText: string, tokenStream: CommonTokenStream, componentCtxLinks: Map<ParserRuleContext, ClassComponent>);
+    private getOriginalText;
+    visitScript: (ctx: ScriptContext) => Promise<void>;
+    visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
+    visitAt_component_expr: (ctx: At_component_exprContext) => void;
+    visitComponent_select_expr: (ctx: Component_select_exprContext) => void;
+    visitAt_block_header: (ctx: At_block_headerContext) => void;
+    visitAt_block: (ctx: At_blockContext) => void;
+    visitTo_component_expr: (ctx: To_component_exprContext) => void;
+    visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
+    visitFunction_return_expr: (ctx: Function_return_exprContext) => void;
+    visitFrame_expr: (ctx: Frame_exprContext) => void;
+    visitFunction_call_expr: (ctx: Function_call_exprContext) => void;
+    visitParameters: (ctx: ParametersContext) => void;
+    addedRefdesAnnotations: string[];
+    private generateRefdesAnnotationComment;
+    private addRefdesAnnotationComment;
+    getOutput(): string;
+    private generateModifiedText;
+    private buildContextTokenRanges;
+    private findContextForToken;
+    private markTokensAsProcessed;
+    private log;
+}

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

@@ -51,20 +51,21 @@ export declare class CircuitScriptLexer extends antlr.Lexer {
     static readonly DivideAssign = 49;
     static readonly MultiplyAssign = 50;
     static readonly ModulusAssign = 51;
-    static readonly OPEN_PAREN = 52;
-    static readonly CLOSE_PAREN = 53;
-    static readonly NOT_CONNECTED = 54;
-    static readonly BOOLEAN_VALUE = 55;
-    static readonly ID = 56;
-    static readonly INTEGER_VALUE = 57;
-    static readonly DECIMAL_VALUE = 58;
-    static readonly NUMERIC_VALUE = 59;
-    static readonly STRING_VALUE = 60;
-    static readonly PERCENTAGE_VALUE = 61;
-    static readonly ALPHA_NUMERIC = 62;
-    static readonly WS = 63;
-    static readonly NEWLINE = 64;
-    static readonly COMMENT = 65;
+    static readonly ANNOTATION_START = 52;
+    static readonly OPEN_PAREN = 53;
+    static readonly CLOSE_PAREN = 54;
+    static readonly NOT_CONNECTED = 55;
+    static readonly BOOLEAN_VALUE = 56;
+    static readonly ID = 57;
+    static readonly INTEGER_VALUE = 58;
+    static readonly DECIMAL_VALUE = 59;
+    static readonly NUMERIC_VALUE = 60;
+    static readonly STRING_VALUE = 61;
+    static readonly PERCENTAGE_VALUE = 62;
+    static readonly ALPHA_NUMERIC = 63;
+    static readonly WS = 64;
+    static readonly NEWLINE = 65;
+    static readonly COMMENT = 66;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];

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

@@ -53,22 +53,23 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly DivideAssign = 49;
     static readonly MultiplyAssign = 50;
     static readonly ModulusAssign = 51;
-    static readonly OPEN_PAREN = 52;
-    static readonly CLOSE_PAREN = 53;
-    static readonly NOT_CONNECTED = 54;
-    static readonly BOOLEAN_VALUE = 55;
-    static readonly ID = 56;
-    static readonly INTEGER_VALUE = 57;
-    static readonly DECIMAL_VALUE = 58;
-    static readonly NUMERIC_VALUE = 59;
-    static readonly STRING_VALUE = 60;
-    static readonly PERCENTAGE_VALUE = 61;
-    static readonly ALPHA_NUMERIC = 62;
-    static readonly WS = 63;
-    static readonly NEWLINE = 64;
-    static readonly COMMENT = 65;
-    static readonly INDENT = 66;
-    static readonly DEDENT = 67;
+    static readonly ANNOTATION_START = 52;
+    static readonly OPEN_PAREN = 53;
+    static readonly CLOSE_PAREN = 54;
+    static readonly NOT_CONNECTED = 55;
+    static readonly BOOLEAN_VALUE = 56;
+    static readonly ID = 57;
+    static readonly INTEGER_VALUE = 58;
+    static readonly DECIMAL_VALUE = 59;
+    static readonly NUMERIC_VALUE = 60;
+    static readonly STRING_VALUE = 61;
+    static readonly PERCENTAGE_VALUE = 62;
+    static readonly ALPHA_NUMERIC = 63;
+    static readonly WS = 64;
+    static readonly NEWLINE = 65;
+    static readonly COMMENT = 66;
+    static readonly INDENT = 67;
+    static readonly DEDENT = 68;
     static readonly RULE_script = 0;
     static readonly RULE_expression = 1;
     static readonly RULE_flow_expressions = 2;
@@ -91,49 +92,51 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly RULE_at_to_multiple_line_expr_to_pin = 19;
     static readonly RULE_at_block = 20;
     static readonly RULE_at_block_expressions = 21;
-    static readonly RULE_at_block_pin_expr = 22;
-    static readonly RULE_at_block_pin_expression_simple = 23;
-    static readonly RULE_at_block_pin_expression_complex = 24;
-    static readonly RULE_assignment_expr = 25;
-    static readonly RULE_operator_assignment_expr = 26;
-    static readonly RULE_keyword_assignment_expr = 27;
-    static readonly RULE_parameters = 28;
-    static readonly RULE_property_set_expr = 29;
-    static readonly RULE_double_dot_property_set_expr = 30;
-    static readonly RULE_data_expr = 31;
-    static readonly RULE_binary_operator = 32;
-    static readonly RULE_unary_operator = 33;
-    static readonly RULE_value_expr = 34;
-    static readonly RULE_function_def_expr = 35;
-    static readonly RULE_function_expr = 36;
-    static readonly RULE_function_args_expr = 37;
-    static readonly RULE_atom_expr = 38;
-    static readonly RULE_trailer_expr = 39;
-    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 RULE_at_block_header = 22;
+    static readonly RULE_at_block_pin_expr = 23;
+    static readonly RULE_at_block_pin_expression_simple = 24;
+    static readonly RULE_at_block_pin_expression_complex = 25;
+    static readonly RULE_assignment_expr = 26;
+    static readonly RULE_operator_assignment_expr = 27;
+    static readonly RULE_keyword_assignment_expr = 28;
+    static readonly RULE_parameters = 29;
+    static readonly RULE_property_set_expr = 30;
+    static readonly RULE_double_dot_property_set_expr = 31;
+    static readonly RULE_data_expr = 32;
+    static readonly RULE_binary_operator = 33;
+    static readonly RULE_unary_operator = 34;
+    static readonly RULE_value_expr = 35;
+    static readonly RULE_function_def_expr = 36;
+    static readonly RULE_function_expr = 37;
+    static readonly RULE_function_args_expr = 38;
+    static readonly RULE_atom_expr = 39;
+    static readonly RULE_trailer_expr = 40;
+    static readonly RULE_trailer_expr2 = 41;
+    static readonly RULE_function_call_expr = 42;
+    static readonly RULE_net_namespace_expr = 43;
+    static readonly RULE_function_return_expr = 44;
+    static readonly RULE_property_block_expr = 45;
+    static readonly RULE_create_component_expr = 46;
+    static readonly RULE_graphic_expressions_block = 47;
+    static readonly RULE_create_graphic_expr = 48;
+    static readonly RULE_create_module_expr = 49;
+    static readonly RULE_nested_properties_inner = 50;
+    static readonly RULE_graphic_expr = 51;
+    static readonly RULE_property_expr = 52;
+    static readonly RULE_property_key_expr = 53;
+    static readonly RULE_property_value_expr = 54;
+    static readonly RULE_wire_atom_expr = 55;
+    static readonly RULE_wire_expr = 56;
+    static readonly RULE_array_expr = 57;
+    static readonly RULE_point_expr = 58;
+    static readonly RULE_import_expr = 59;
+    static readonly RULE_frame_expr = 60;
+    static readonly RULE_if_expr = 61;
+    static readonly RULE_if_inner_expr = 62;
+    static readonly RULE_else_expr = 63;
+    static readonly RULE_while_expr = 64;
+    static readonly RULE_for_expr = 65;
+    static readonly RULE_annotation_comment_expr = 66;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -166,6 +169,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     at_to_multiple_line_expr_to_pin(): At_to_multiple_line_expr_to_pinContext;
     at_block(): At_blockContext;
     at_block_expressions(): At_block_expressionsContext;
+    at_block_header(): At_block_headerContext;
     at_block_pin_expr(): At_block_pin_exprContext;
     at_block_pin_expression_simple(): At_block_pin_expression_simpleContext;
     at_block_pin_expression_complex(): At_block_pin_expression_complexContext;
@@ -210,6 +214,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     else_expr(): Else_exprContext;
     while_expr(): While_exprContext;
     for_expr(): For_exprContext;
+    annotation_comment_expr(): Annotation_comment_exprContext;
     sempred(localContext: antlr.ParserRuleContext | null, ruleIndex: number, predIndex: number): boolean;
     private data_expr_sempred;
     static readonly _serializedATN: number[];
@@ -245,6 +250,7 @@ export declare class ExpressionContext extends antlr.ParserRuleContext {
     atom_expr(): Atom_exprContext | null;
     frame_expr(): Frame_exprContext | null;
     flow_expressions(): Flow_expressionsContext | null;
+    annotation_comment_expr(): Annotation_comment_exprContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
@@ -411,7 +417,7 @@ export declare class At_to_multiple_line_expr_to_pinContext extends antlr.Parser
 }
 export declare class At_blockContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
-    at_component_expr(): At_component_exprContext;
+    at_block_header(): At_block_headerContext;
     NEWLINE(): antlr.TerminalNode[];
     NEWLINE(i: number): antlr.TerminalNode | null;
     INDENT(): antlr.TerminalNode;
@@ -428,6 +434,14 @@ export declare class At_block_expressionsContext extends antlr.ParserRuleContext
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
+export declare class At_block_headerContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    at_component_expr(): At_component_exprContext;
+    annotation_comment_expr(): Annotation_comment_exprContext[];
+    annotation_comment_expr(i: number): Annotation_comment_exprContext | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
 export declare class At_block_pin_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     pin_select_expr2(): Pin_select_expr2Context;
@@ -914,3 +928,10 @@ export declare class For_exprContext extends antlr.ParserRuleContext {
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
+export declare class Annotation_comment_exprContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    ANNOTATION_START(): antlr.TerminalNode;
+    ID(): antlr.TerminalNode;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}

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

@@ -21,6 +21,7 @@ import { At_to_multiple_line_exprContext } from "./CircuitScriptParser.js";
 import { At_to_multiple_line_expr_to_pinContext } from "./CircuitScriptParser.js";
 import { At_blockContext } from "./CircuitScriptParser.js";
 import { At_block_expressionsContext } from "./CircuitScriptParser.js";
+import { At_block_headerContext } from "./CircuitScriptParser.js";
 import { At_block_pin_exprContext } from "./CircuitScriptParser.js";
 import { At_block_pin_expression_simpleContext } from "./CircuitScriptParser.js";
 import { At_block_pin_expression_complexContext } from "./CircuitScriptParser.js";
@@ -77,6 +78,7 @@ import { If_inner_exprContext } from "./CircuitScriptParser.js";
 import { Else_exprContext } from "./CircuitScriptParser.js";
 import { While_exprContext } from "./CircuitScriptParser.js";
 import { For_exprContext } from "./CircuitScriptParser.js";
+import { Annotation_comment_exprContext } from "./CircuitScriptParser.js";
 export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisitor<Result> {
     visitScript?: (ctx: ScriptContext) => Result;
     visitExpression?: (ctx: ExpressionContext) => Result;
@@ -100,6 +102,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitAt_to_multiple_line_expr_to_pin?: (ctx: At_to_multiple_line_expr_to_pinContext) => Result;
     visitAt_block?: (ctx: At_blockContext) => Result;
     visitAt_block_expressions?: (ctx: At_block_expressionsContext) => Result;
+    visitAt_block_header?: (ctx: At_block_headerContext) => Result;
     visitAt_block_pin_expr?: (ctx: At_block_pin_exprContext) => Result;
     visitAt_block_pin_expression_simple?: (ctx: At_block_pin_expression_simpleContext) => Result;
     visitAt_block_pin_expression_complex?: (ctx: At_block_pin_expression_complexContext) => Result;
@@ -156,4 +159,5 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitElse_expr?: (ctx: Else_exprContext) => Result;
     visitWhile_expr?: (ctx: While_exprContext) => Result;
     visitFor_expr?: (ctx: For_exprContext) => Result;
+    visitAnnotation_comment_expr?: (ctx: Annotation_comment_exprContext) => Result;
 }

package/dist/types/environment.d.ts

@@ -9,6 +9,7 @@ export declare class NodeScriptEnvironment {
     protected useModuleDirectoryPath: string | null;
     protected useDefaultLibsPath: string | null;
     protected globalCreateSVGWindow: (() => SVGWindow) | null;
+    private cachedVersion;
     protected supportedFonts: {
         Arial: string;
     };

package/dist/types/execute.d.ts

@@ -30,6 +30,10 @@ export declare class ExecutionContext {
     parentContext: ExecutionContext;
     componentAngleFollowsWire: boolean;
     warnings: ExecutionWarning[];
+    indexedStack: Map<ParserRuleContext, {
+        index: number;
+        funcCallIndex: Map<ParserRuleContext, number>;
+    }>;
     constructor(name: string, namespace: string, netNamespace: string, executionLevel: number | undefined, scopeLevel: number | undefined, silent: boolean | undefined, logger: Logger, warnings: ExecutionWarning[], parent: ExecutionContext);
     logWarning(message: string, context?: ParserRuleContext, fileName?: string): void;
     log(...params: any[]): void;
@@ -68,7 +72,10 @@ export declare class ExecutionContext {
     atPointBlock(): void;
     toPointBlock(): void;
     getPointBlockLocation(): [component: ClassComponent, pin: number, wireId: number];
+    getParentBreakContext(): null | ParserRuleContext;
     addBreakContext(ctx: ParserRuleContext): void;
+    setBreakContextIndex(index: number): void;
+    resetBreakContextFunctionCalls(): void;
     popBreakContext(): ParserRuleContext;
     getBreakContext(): ParserRuleContext;
     createFunction(functionName: string, __runFunc: CFunction, source?: ParserRuleContext, uniqueId?: string): void;
@@ -77,7 +84,7 @@ export declare class ExecutionContext {
     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;
+    mergeScope(childScope: ExecutionScope, namespace: string): ClassComponent[];
     addWire(segments: [string, (number | UnitDimension)?][]): void;
     addPoint(pointId: string, userDefined?: boolean): ComponentPin;
     private getPointSymbol;

package/dist/types/helpers.d.ts

@@ -18,6 +18,9 @@ export type ScriptOptions = {
     dumpData: boolean;
     showStats: boolean;
     environment: NodeScriptEnvironment;
+    inputPath?: string;
+    updateSource: boolean;
+    saveAnnotatedCopy: string | boolean;
 };
 export declare function prepareFile(textData: string): {
     parser: CircuitScriptParser;
@@ -42,7 +45,7 @@ export declare function renderScriptCustom(scriptData: string, outputPath: strin
 export declare abstract class ParseOutputHandler {
     beforeRender: boolean;
     afterRender: boolean;
-    abstract parse(visitor: ParserVisitor, outputPath: string | null, fileExtension: string | null): boolean;
+    abstract parse(visitor: ParserVisitor, outputPath: string | null, fileExtension: string | null, extra: any | null): boolean;
 }
 export declare class KiCadNetListOutputHandler extends ParseOutputHandler {
     beforeRender: boolean;

package/dist/types/lexer.d.ts

@@ -10,7 +10,7 @@ export declare class MainLexer extends CircuitScriptLexer {
     nextToken(): Token;
     createDedent(): Token;
     getCharIndex(): number;
-    commonToken(type: number, text: string): Token;
+    commonToken(type: number, text: string, start?: number, stop?: number): Token;
     getIndentationCount(whitespace: string): number;
     atStartOfInput(): boolean;
     openBrace(): void;

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

@@ -1,3 +1,4 @@
+import { ParserRuleContext } from 'antlr4ng';
 import { Expressions_blockContext } from 'src/antlr/CircuitScriptParser.js';
 import { SymbolDrawingCommands } from '../draw_symbols.js';
 import { Net } from './Net.js';
@@ -31,6 +32,9 @@ export declare class ClassComponent {
     useWireOrientationAngle: boolean;
     didSetWireOrientationAngle: boolean;
     assignedRefDes: string | null;
+    placeHolderRefDes: string | null;
+    ctxReferences: CtxReference[];
+    _creationIndex: number;
     constructor(instanceName: string, numPins: number);
     setupPins(): void;
     getDefaultPin(): PinId;
@@ -55,3 +59,8 @@ export declare class ModuleComponent extends ClassComponent {
     moduleExecutionContextName?: string;
     modulePinIdToPortMap?: Map<number, ClassComponent>;
 }
+export type CtxReference = {
+    ctx: ParserRuleContext;
+    indexedStack: [ParserRuleContext, number][];
+    creationFlag: boolean;
+};

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

@@ -1,6 +1,6 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ParseSymbolType, ValueType } from './types.js';
+import { CFunction, 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';
@@ -14,6 +14,7 @@ export declare class ExecutionScope {
     private nets;
     instances: Map<string, ClassComponent>;
     functions: Map<string, CFunctionEntry>;
+    functionCounter: Map<CFunction, number>;
     variables: Map<string, ValueType | ClassComponent>;
     symbols: Map<string, {
         type: ParseSymbolType;

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

@@ -16,6 +16,7 @@ export declare class CFunctionEntry {
 }
 export type CFunctionOptions = {
     netNamespace?: string;
+    functionCallIndex: number;
 };
 export type CFunctionResult = [
     executionContext: ExecutionContext,

package/dist/types/parser.d.ts

@@ -1,9 +1,10 @@
 import { CircuitScriptParser, ScriptContext } from './antlr/CircuitScriptParser.js';
-import { ANTLRErrorListener, ATNConfigSet, ATNSimulator, BitSet, DFA, Parser, RecognitionException, Recognizer, Token } from 'antlr4ng';
+import { ANTLRErrorListener, ATNConfigSet, ATNSimulator, BitSet, CommonTokenStream, DFA, Parser, RecognitionException, Recognizer, Token } from 'antlr4ng';
 import { BaseVisitor, OnErrorHandler } from './BaseVisitor.js';
 export declare function parseFileWithVisitor(visitor: BaseVisitor, data: string): Promise<{
     tree: ScriptContext;
     parser: CircuitScriptParser;
+    tokens: CommonTokenStream;
     hasError: boolean;
     hasParseError: boolean;
     parserTimeTaken: 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, 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, Graph_expressionsContext, Path_blockContext } 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, 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, Graph_expressionsContext, Path_blockContext, Annotation_comment_exprContext, At_block_headerContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet, ComponentPinNetPair } from './objects/types.js';
@@ -7,8 +7,10 @@ import { Net } from './objects/Net.js';
 import { BaseVisitor } from './BaseVisitor.js';
 import { ParserRuleContext } from 'antlr4ng';
 export declare class ParserVisitor extends BaseVisitor {
+    componentCreationIndex: number;
     visitKeyword_assignment_expr: (ctx: Keyword_assignment_exprContext) => void;
     visitPin_select_expr: (ctx: Pin_select_exprContext) => void;
+    trackNewComponentCreated: (callback: () => void) => boolean;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
     visitAt_component_expr: (ctx: At_component_exprContext) => ComponentPin;
     visitTo_component_expr: (ctx: To_component_exprContext) => ComponentPin;
@@ -40,6 +42,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
     visitPin_select_expr2: (ctx: Pin_select_expr2Context) => void;
     visitAt_block_pin_expr: (ctx: At_block_pin_exprContext) => void;
+    visitAt_block_header: (ctx: At_block_headerContext) => void;
     visitAt_block: (ctx: At_blockContext) => void;
     visitAt_block_pin_expression_simple: (ctx: At_block_pin_expression_simpleContext) => void;
     visitAt_block_pin_expression_complex: (ctx: At_block_pin_expression_complexContext) => void;
@@ -56,6 +59,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitIf_inner_expr: (ctx: If_inner_exprContext) => void;
     visitWhile_expr: (ctx: While_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
+    visitAnnotation_comment_expr: (ctx: Annotation_comment_exprContext) => void;
     private resolveDataExpr;
     private resolveDataValue;
     pinTypes: PinTypes[];
@@ -88,6 +92,9 @@ export declare class ParserVisitor extends BaseVisitor {
     private getPropertyExprList;
     getWarnings(): ExecutionWarning[];
 }
+export declare const ComponentRefDesPrefixes: {
+    [key: string]: string;
+};
 export type NetListItem = {
     instanceName: string;
     instance: ClassComponent;

package/package.json

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