circuitscript 0.1.29 → 0.1.32

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

@@ -25,48 +25,49 @@ export declare class CircuitScriptLexer extends antlr.Lexer {
     static readonly Return = 23;
     static readonly Define = 24;
     static readonly Import = 25;
-    static readonly For = 26;
-    static readonly In = 27;
-    static readonly While = 28;
-    static readonly Continue = 29;
-    static readonly If = 30;
-    static readonly Else = 31;
-    static readonly Not = 32;
-    static readonly Frame = 33;
-    static readonly Sheet = 34;
-    static readonly Equals = 35;
-    static readonly NotEquals = 36;
-    static readonly GreaterThan = 37;
-    static readonly GreatOrEqualThan = 38;
-    static readonly LessThan = 39;
-    static readonly LessOrEqualThan = 40;
-    static readonly LogicalAnd = 41;
-    static readonly LogicalOr = 42;
-    static readonly Addition = 43;
-    static readonly Minus = 44;
-    static readonly Divide = 45;
-    static readonly Multiply = 46;
-    static readonly Modulus = 47;
-    static readonly AdditionAssign = 48;
-    static readonly MinusAssign = 49;
-    static readonly DivideAssign = 50;
-    static readonly MultiplyAssign = 51;
-    static readonly ModulusAssign = 52;
-    static readonly ANNOTATION_START = 53;
-    static readonly OPEN_PAREN = 54;
-    static readonly CLOSE_PAREN = 55;
-    static readonly NOT_CONNECTED = 56;
-    static readonly BOOLEAN_VALUE = 57;
-    static readonly ID = 58;
-    static readonly INTEGER_VALUE = 59;
-    static readonly DECIMAL_VALUE = 60;
-    static readonly NUMERIC_VALUE = 61;
-    static readonly STRING_VALUE = 62;
-    static readonly PERCENTAGE_VALUE = 63;
-    static readonly ALPHA_NUMERIC = 64;
-    static readonly WS = 65;
-    static readonly NEWLINE = 66;
-    static readonly COMMENT = 67;
+    static readonly From = 26;
+    static readonly For = 27;
+    static readonly In = 28;
+    static readonly While = 29;
+    static readonly Continue = 30;
+    static readonly If = 31;
+    static readonly Else = 32;
+    static readonly Not = 33;
+    static readonly Frame = 34;
+    static readonly Sheet = 35;
+    static readonly Equals = 36;
+    static readonly NotEquals = 37;
+    static readonly GreaterThan = 38;
+    static readonly GreatOrEqualThan = 39;
+    static readonly LessThan = 40;
+    static readonly LessOrEqualThan = 41;
+    static readonly LogicalAnd = 42;
+    static readonly LogicalOr = 43;
+    static readonly Addition = 44;
+    static readonly Minus = 45;
+    static readonly Divide = 46;
+    static readonly Multiply = 47;
+    static readonly Modulus = 48;
+    static readonly AdditionAssign = 49;
+    static readonly MinusAssign = 50;
+    static readonly DivideAssign = 51;
+    static readonly MultiplyAssign = 52;
+    static readonly ModulusAssign = 53;
+    static readonly ANNOTATION_START = 54;
+    static readonly OPEN_PAREN = 55;
+    static readonly CLOSE_PAREN = 56;
+    static readonly NOT_CONNECTED = 57;
+    static readonly BOOLEAN_VALUE = 58;
+    static readonly ID = 59;
+    static readonly INTEGER_VALUE = 60;
+    static readonly DECIMAL_VALUE = 61;
+    static readonly NUMERIC_VALUE = 62;
+    static readonly STRING_VALUE = 63;
+    static readonly PERCENTAGE_VALUE = 64;
+    static readonly ALPHA_NUMERIC = 65;
+    static readonly WS = 66;
+    static readonly NEWLINE = 67;
+    static readonly COMMENT = 68;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];

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

@@ -27,50 +27,51 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly Return = 23;
     static readonly Define = 24;
     static readonly Import = 25;
-    static readonly For = 26;
-    static readonly In = 27;
-    static readonly While = 28;
-    static readonly Continue = 29;
-    static readonly If = 30;
-    static readonly Else = 31;
-    static readonly Not = 32;
-    static readonly Frame = 33;
-    static readonly Sheet = 34;
-    static readonly Equals = 35;
-    static readonly NotEquals = 36;
-    static readonly GreaterThan = 37;
-    static readonly GreatOrEqualThan = 38;
-    static readonly LessThan = 39;
-    static readonly LessOrEqualThan = 40;
-    static readonly LogicalAnd = 41;
-    static readonly LogicalOr = 42;
-    static readonly Addition = 43;
-    static readonly Minus = 44;
-    static readonly Divide = 45;
-    static readonly Multiply = 46;
-    static readonly Modulus = 47;
-    static readonly AdditionAssign = 48;
-    static readonly MinusAssign = 49;
-    static readonly DivideAssign = 50;
-    static readonly MultiplyAssign = 51;
-    static readonly ModulusAssign = 52;
-    static readonly ANNOTATION_START = 53;
-    static readonly OPEN_PAREN = 54;
-    static readonly CLOSE_PAREN = 55;
-    static readonly NOT_CONNECTED = 56;
-    static readonly BOOLEAN_VALUE = 57;
-    static readonly ID = 58;
-    static readonly INTEGER_VALUE = 59;
-    static readonly DECIMAL_VALUE = 60;
-    static readonly NUMERIC_VALUE = 61;
-    static readonly STRING_VALUE = 62;
-    static readonly PERCENTAGE_VALUE = 63;
-    static readonly ALPHA_NUMERIC = 64;
-    static readonly WS = 65;
-    static readonly NEWLINE = 66;
-    static readonly COMMENT = 67;
-    static readonly INDENT = 68;
-    static readonly DEDENT = 69;
+    static readonly From = 26;
+    static readonly For = 27;
+    static readonly In = 28;
+    static readonly While = 29;
+    static readonly Continue = 30;
+    static readonly If = 31;
+    static readonly Else = 32;
+    static readonly Not = 33;
+    static readonly Frame = 34;
+    static readonly Sheet = 35;
+    static readonly Equals = 36;
+    static readonly NotEquals = 37;
+    static readonly GreaterThan = 38;
+    static readonly GreatOrEqualThan = 39;
+    static readonly LessThan = 40;
+    static readonly LessOrEqualThan = 41;
+    static readonly LogicalAnd = 42;
+    static readonly LogicalOr = 43;
+    static readonly Addition = 44;
+    static readonly Minus = 45;
+    static readonly Divide = 46;
+    static readonly Multiply = 47;
+    static readonly Modulus = 48;
+    static readonly AdditionAssign = 49;
+    static readonly MinusAssign = 50;
+    static readonly DivideAssign = 51;
+    static readonly MultiplyAssign = 52;
+    static readonly ModulusAssign = 53;
+    static readonly ANNOTATION_START = 54;
+    static readonly OPEN_PAREN = 55;
+    static readonly CLOSE_PAREN = 56;
+    static readonly NOT_CONNECTED = 57;
+    static readonly BOOLEAN_VALUE = 58;
+    static readonly ID = 59;
+    static readonly INTEGER_VALUE = 60;
+    static readonly DECIMAL_VALUE = 61;
+    static readonly NUMERIC_VALUE = 62;
+    static readonly STRING_VALUE = 63;
+    static readonly PERCENTAGE_VALUE = 64;
+    static readonly ALPHA_NUMERIC = 65;
+    static readonly WS = 66;
+    static readonly NEWLINE = 67;
+    static readonly COMMENT = 68;
+    static readonly INDENT = 69;
+    static readonly DEDENT = 70;
     static readonly RULE_script = 0;
     static readonly RULE_expression = 1;
     static readonly RULE_flow_expressions = 2;
@@ -131,20 +132,21 @@ export declare class CircuitScriptParser extends antlr.Parser {
     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_part_set_expr = 66;
-    static readonly RULE_part_set_key = 67;
-    static readonly RULE_part_match_block = 68;
-    static readonly RULE_part_sub_expr = 69;
-    static readonly RULE_part_condition_expr = 70;
-    static readonly RULE_part_condition_key_only_expr = 71;
-    static readonly RULE_part_value_expr = 72;
-    static readonly RULE_annotation_comment_expr = 73;
+    static readonly RULE_import_annotation_expr = 60;
+    static readonly RULE_frame_expr = 61;
+    static readonly RULE_if_expr = 62;
+    static readonly RULE_if_inner_expr = 63;
+    static readonly RULE_else_expr = 64;
+    static readonly RULE_while_expr = 65;
+    static readonly RULE_for_expr = 66;
+    static readonly RULE_part_set_expr = 67;
+    static readonly RULE_part_set_key = 68;
+    static readonly RULE_part_match_block = 69;
+    static readonly RULE_part_sub_expr = 70;
+    static readonly RULE_part_condition_expr = 71;
+    static readonly RULE_part_condition_key_only_expr = 72;
+    static readonly RULE_part_value_expr = 73;
+    static readonly RULE_annotation_comment_expr = 74;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -216,6 +218,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     array_expr(): Array_exprContext;
     point_expr(): Point_exprContext;
     import_expr(): Import_exprContext;
+    import_annotation_expr(): Import_annotation_exprContext;
     frame_expr(): Frame_exprContext;
     if_expr(): If_exprContext;
     if_inner_expr(): If_inner_exprContext;
@@ -813,9 +816,12 @@ export declare class GraphicForExprContext extends Graphic_exprContext {
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
 export declare class Property_exprContext extends antlr.ParserRuleContext {
+    _extra?: Token | null;
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     property_key_expr(): Property_key_exprContext;
     property_value_expr(): Property_value_exprContext;
+    STRING_VALUE(): antlr.TerminalNode[];
+    STRING_VALUE(i: number): antlr.TerminalNode | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
@@ -885,8 +891,46 @@ export declare class Point_exprContext extends antlr.ParserRuleContext {
 }
 export declare class Import_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    get ruleIndex(): number;
+    copyFrom(ctx: Import_exprContext): void;
+}
+export declare class Import_specificContext extends Import_exprContext {
+    _moduleName?: Token | null;
+    _ID?: Token | null;
+    _funcNames: antlr.Token[];
+    constructor(ctx: Import_exprContext);
+    From(): antlr.TerminalNode;
     Import(): antlr.TerminalNode;
+    ID(): antlr.TerminalNode[];
+    ID(i: number): antlr.TerminalNode | null;
+    import_annotation_expr(): Import_annotation_exprContext | null;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
+export declare class Import_all_simpleContext extends Import_exprContext {
+    _moduleName?: Token | null;
+    constructor(ctx: Import_exprContext);
+    From(): antlr.TerminalNode;
+    Import(): antlr.TerminalNode;
+    Multiply(): antlr.TerminalNode;
     ID(): antlr.TerminalNode;
+    import_annotation_expr(): Import_annotation_exprContext | null;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
+export declare class Import_simpleContext extends Import_exprContext {
+    _moduleName?: Token | null;
+    constructor(ctx: Import_exprContext);
+    Import(): antlr.TerminalNode;
+    ID(): antlr.TerminalNode;
+    import_annotation_expr(): Import_annotation_exprContext | null;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
+export declare class Import_annotation_exprContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    ANNOTATION_START(): antlr.TerminalNode;
+    ID(): antlr.TerminalNode[];
+    ID(i: number): antlr.TerminalNode | null;
+    Minus(): antlr.TerminalNode[];
+    Minus(i: number): antlr.TerminalNode | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }

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

@@ -71,7 +71,10 @@ import { Wire_expr_direction_onlyContext } from "./CircuitScriptParser.js";
 import { Wire_exprContext } from "./CircuitScriptParser.js";
 import { Array_exprContext } from "./CircuitScriptParser.js";
 import { Point_exprContext } from "./CircuitScriptParser.js";
-import { Import_exprContext } from "./CircuitScriptParser.js";
+import { Import_simpleContext } from "./CircuitScriptParser.js";
+import { Import_all_simpleContext } from "./CircuitScriptParser.js";
+import { Import_specificContext } from "./CircuitScriptParser.js";
+import { Import_annotation_exprContext } from "./CircuitScriptParser.js";
 import { Frame_exprContext } from "./CircuitScriptParser.js";
 import { If_exprContext } from "./CircuitScriptParser.js";
 import { If_inner_exprContext } from "./CircuitScriptParser.js";
@@ -159,7 +162,10 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitWire_expr?: (ctx: Wire_exprContext) => Result;
     visitArray_expr?: (ctx: Array_exprContext) => Result;
     visitPoint_expr?: (ctx: Point_exprContext) => Result;
-    visitImport_expr?: (ctx: Import_exprContext) => Result;
+    visitImport_simple?: (ctx: Import_simpleContext) => Result;
+    visitImport_all_simple?: (ctx: Import_all_simpleContext) => Result;
+    visitImport_specific?: (ctx: Import_specificContext) => Result;
+    visitImport_annotation_expr?: (ctx: Import_annotation_exprContext) => Result;
     visitFrame_expr?: (ctx: Frame_exprContext) => Result;
     visitIf_expr?: (ctx: If_exprContext) => Result;
     visitIf_inner_expr?: (ctx: If_inner_exprContext) => Result;

package/dist/types/environment.d.ts

@@ -28,11 +28,18 @@ export declare class NodeScriptEnvironment {
     textMeasurementCanvas: Dom | undefined;
     getCanvasWindow(): Dom;
     prepareSVGEnvironment(): Promise<void>;
-    readFile(path: PathOrFileDescriptor, options: any): Promise<string>;
+    readFile(path: PathOrFileDescriptor, options?: any): Promise<string>;
+    writeFileSync(path: PathOrFileDescriptor, data: string): void;
     getAbsolutePath(filePath: string): string;
     getDirPath(filePath: string): string;
     setCurrentFile(filePath: string): string;
     getCurrentFile(): string;
     getRelativeToCurrentFolder(filePath: string): string;
     exists(path: PathLike): Promise<boolean>;
+    hashStringSHA256(value: string): string;
+    dirname(filePath: string): string;
+    extname(filePath: string): string;
+    basename(filePath: string, ext: string): string;
+    join(...paths: string[]): string;
+    relative(from: string, to: string): string;
 }

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, PinId } from './objects/PinDefinition.js';
-import { AnyReference, CFunction, CFunctionEntry, CFunctionResult, CallableParameter, ComponentPin } from './objects/types.js';
+import { AnyReference, CFunction, CFunctionEntry, CFunctionResult, CallableParameter, ComponentPin, ComponentUnitDefinition } from './objects/types.js';
 import { Wire } from './objects/Wire.js';
 import { Logger } from './logger.js';
 import { UnitDimension } from './helpers.js';
@@ -53,7 +53,10 @@ export declare class ExecutionContext {
         copy: boolean;
         angle?: NumericValue;
         followWireOrientation: boolean;
+        units: [string, ComponentUnitDefinition][];
     }, isModule?: boolean): ClassComponent;
+    private extractPinsFromUnits;
+    private generateComponentUnits;
     private removeArrangePropDuplicates;
     private getArrangePropPins;
     printPoint(extra?: string): void;
@@ -79,12 +82,12 @@ export declare class ExecutionContext {
     resetBreakContextFunctionCalls(): void;
     popBreakContext(): ParserRuleContext;
     getBreakContext(): ParserRuleContext;
-    createFunction(functionName: string, __runFunc: CFunction, source?: ParserRuleContext, uniqueId?: string): void;
+    createFunction(namespace: string, functionName: string, __runFunc: CFunction, source?: ParserRuleContext, uniqueId?: string): void;
     hasFunction(functionName: string): boolean;
     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;
+    callFunction(functionReference: AnyReference, functionParams: CallableParameter[], executionStack: ExecutionContext[], netNamespace: string): CFunctionResult;
     mergeScope(childScope: ExecutionScope, namespace: string): ClassComponent[];
     addWire(segments: [string, (number | UnitDimension)?][]): Wire;
     addPoint(pointId: string, userDefined?: boolean): ComponentPin;

package/dist/types/globals.d.ts

@@ -1,6 +1,8 @@
 export declare const TOOL_VERSION = "0.1.5";
 export declare const Delimiter1 = "-";
 export declare const DoubleDelimiter1 = "--";
+export declare const BaseNamespace = "--.";
+export declare const RefdesFileSuffix = ".refdes.json";
 export declare enum GlobalNames {
     __root = "--root",
     symbol = "symbol"
@@ -82,6 +84,7 @@ export declare enum ReferenceTypes {
     variable = "variable",
     instance = "instance",
     pinType = "pinType",
+    module = "module",
     unknown = "unknown"
 }
 export declare enum BlockTypes {
@@ -112,3 +115,4 @@ export declare const RenderFlags: {
 };
 export declare const SymbolValidatorContext = "_sym";
 export declare const TrailerArrayIndex = "index";
+export declare const DefaultComponentUnit = "__default";

package/dist/types/graph.d.ts

@@ -1,7 +1,7 @@
 import { Graph } from "@dagrejs/graphlib";
 import { SymbolPinDefintion } from "./draw_symbols.js";
 import { RenderFrame, RenderComponent, RenderWire } from "./layout.js";
-import { ClassComponent } from "./objects/ClassComponent.js";
+import { ClassComponent, ComponentUnit } from "./objects/ClassComponent.js";
 import { SequenceItem } from "./objects/ExecutionScope.js";
 import { Net } from "./objects/Net.js";
 import { Logger } from "./logger.js";
@@ -22,7 +22,7 @@ export declare class NetGraph {
     private getComponentName;
 }
 export declare function getWireName(wireId: number): string;
-export declare function generateLayoutPinDefinition(component: ClassComponent): SymbolPinDefintion[];
+export declare function generateLayoutPinDefinition(componentUnit: ComponentUnit): SymbolPinDefintion[];
 export declare enum RenderItemType {
     Wire = "wire",
     Component = "component"

package/dist/types/helpers.d.ts

@@ -11,6 +11,7 @@ export type SVGWindow = any;
 import { NumericValue } from "./objects/ParamDefinition.js";
 import { NodeScriptEnvironment } from "./environment.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
+import { ImportedModule } from "./objects/types.js";
 export declare enum JSModuleType {
     CommonJs = "cjs",
     ESM = "mjs"
@@ -46,7 +47,7 @@ type RenderScriptReturn = {
     errors: BaseError[];
 };
 export declare function renderScript(scriptData: string, outputPath: string | null, options: ScriptOptions): Promise<RenderScriptReturn>;
-export declare function renderScriptCustom(scriptData: string, outputPath: string | null, options: ScriptOptions, parseHandlers: ParseOutputHandler[], postAnnotationCallbacks: ((options: ScriptOptions, scriptData: string, tree: ScriptContext, tokens: CommonTokenStream, componentLinks: Map<ParserRuleContext, ClassComponent>) => void)[]): Promise<RenderScriptReturn>;
+export declare function renderScriptCustom(scriptData: string, outputPath: string | null, options: ScriptOptions, parseHandlers: ParseOutputHandler[], postAnnotationCallbacks: ((options: ScriptOptions, scriptData: string, tree: ScriptContext, tokens: CommonTokenStream, componentLinks: Map<ParserRuleContext, ClassComponent>, importedModule: ImportedModule[], environment: NodeScriptEnvironment) => void)[]): Promise<RenderScriptReturn>;
 export declare abstract class ParseOutputHandler {
     beforeRender: boolean;
     afterRender: boolean;

package/dist/types/layout.d.ts

@@ -1,6 +1,6 @@
 import { Graph } from '@dagrejs/graphlib';
 import { SymbolGraphic, SymbolText, SymbolDrawingCommands, SimplePoint } from "./draw_symbols.js";
-import { ClassComponent } from "./objects/ClassComponent.js";
+import { ClassComponent, ComponentUnit } from "./objects/ClassComponent.js";
 import { WireAutoDirection } from './globals.js';
 import { Wire, WireSegment } from './objects/Wire.js';
 import { Net } from './objects/Net.js';
@@ -41,7 +41,7 @@ export declare class LayoutEngine {
     printWarnings(): void;
 }
 type RenderItem = RenderComponent | RenderWire | RenderText;
-export declare function applyComponentParamsToSymbol(component: ClassComponent, symbol: SymbolGraphic): void;
+export declare function applyComponentParamsToSymbol(componentUnit: ComponentUnit, symbol: SymbolGraphic): void;
 export declare function getBounds(components: (RenderComponent | RenderText)[], wires: RenderWire[], junctions: RenderJunction[], frames: RenderFrame[]): BoundBox;
 export declare class RenderObject {
     x: NumericValue;
@@ -89,11 +89,12 @@ export type MergedWire = {
 };
 export declare class RenderComponent extends RenderObject {
     component: ClassComponent;
+    unitId: string;
     symbol: SymbolGraphic;
     width: number;
     height: number;
     displaySymbol: string | null;
-    constructor(component: ClassComponent, width: number, height: number);
+    constructor(component: ClassComponent, unitId: string, width: number, height: number);
     doesOverlap(other: RenderComponent): boolean;
     toString(): string;
 }
@@ -146,7 +147,7 @@ export type SheetFrame = {
     junctions: RenderJunction[];
     mergedWires: MergedWire[];
 };
-export declare function CalculatePinPositions(component: ClassComponent): Map<number, {
+export declare function CalculatePinPositions(unit: ComponentUnit): Map<number, {
     x: NumericValue;
     y: NumericValue;
     angle: NumericValue;

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

@@ -6,6 +6,32 @@ import { PinDefinition, PinId } from './PinDefinition.js';
 import { WireSegment } from './Wire.js';
 import { ExecutionContext } from '../execute.js';
 import { NumericValue } from './ParamDefinition.js';
+export declare class ComponentUnit {
+    parent: ClassComponent;
+    unitId: string;
+    refdesSuffix: string;
+    suffix: string | null;
+    get instanceName(): string;
+    parameters: Map<string, number | string | NumericValue>;
+    numPins: number;
+    pins: Map<PinId, PinDefinition>;
+    pinsFlat: PinDefinition[];
+    pinsMaxPositions: Map<string, number>;
+    arrangeProps: Map<string, PinId[]> | null;
+    displayProp: SymbolDrawingCommands | null;
+    widthProp: number | null;
+    heightProp: number | null;
+    angleProp: number;
+    followWireOrientationProp: boolean;
+    wireOrientationAngle: number;
+    useWireOrientationAngle: boolean;
+    didSetWireOrientationAngle: boolean;
+    _unplacedPins: PinId[];
+    constructor(unitId: string, parent: ClassComponent);
+    clone(): ComponentUnit;
+    setParam(key: string, value: number | string | NumericValue): void;
+    isEqual(other: ComponentUnit): boolean;
+}
 export declare class ClassComponent {
     instanceName: string;
     numPins: number;
@@ -14,27 +40,21 @@ export declare class ClassComponent {
     pinNets: Map<PinId, Net>;
     pinWires: Map<number, WireSegment[]>;
     pinsMaxPositions: Map<string, number>;
+    units: ComponentUnit[];
     _cachedPins: string;
     _cachedParams: string;
     _copyID?: number;
     _copyFrom?: ClassComponent;
     _pointLinkComponent?: ClassComponent;
     _unplacedPins: PinId[];
-    arrangeProps: Map<string, PinId[]> | null;
-    displayProp: SymbolDrawingCommands | null;
-    widthProp: number | null;
-    heightProp: number | null;
     typeProp: string | null;
     copyProp: boolean;
-    angleProp: number;
-    followWireOrientationProp: boolean;
-    wireOrientationAngle: number;
-    useWireOrientationAngle: boolean;
-    didSetWireOrientationAngle: boolean;
     assignedRefDes: string | null;
     placeHolderRefDes: string | null;
+    forceSaveRefdesAnnotation: boolean;
     ctxReferences: CtxReference[];
     _creationIndex: number;
+    pinUnitMap: Map<PinId, ComponentUnit>;
     constructor(instanceName: string, numPins: number);
     setupPins(): void;
     getDefaultPin(): PinId;
@@ -51,6 +71,10 @@ export declare class ClassComponent {
     static simple(instanceName: string, numPins: number): ClassComponent;
     isEqual(other: ClassComponent): boolean;
     clone(): ClassComponent;
+    getUnit(unitId?: string | null): ComponentUnit;
+    addDefaultUnit(displayProp: SymbolDrawingCommands): void;
+    refreshPinUnitMap(): void;
+    getUnitForPin(pinId: PinId): ComponentUnit;
 }
 export declare class ModuleComponent extends ClassComponent {
     moduleContainsExpressions?: Expressions_blockContext;
@@ -63,4 +87,5 @@ export type CtxReference = {
     ctx: ParserRuleContext;
     indexedStack: [ParserRuleContext, number][];
     creationFlag: boolean;
+    filePath: string;
 };

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

@@ -1,6 +1,6 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { CFunction, CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ParseSymbolType, ValueType } from './types.js';
+import { CFunction, CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ImportedModule, ParseSymbolType, ValueType } from './types.js';
 import { BlockTypes, LayoutDirection } from '../globals.js';
 import { Wire, WireSegment } from './Wire.js';
 import { Frame } from './Frame.js';
@@ -19,6 +19,7 @@ export declare class ExecutionScope {
     symbols: Map<string, {
         type: ParseSymbolType;
     }>;
+    modules: Map<string, ImportedModule>;
     blockStack: Map<number, BlockStackEntry>;
     contextStack: ParserRuleContext[];
     onPropertyHandler: OnPropertyHandler[];
@@ -59,6 +60,7 @@ export declare class ExecutionScope {
     popOnPropertyHandler(): OnPropertyHandler;
     triggerPropertyHandler(visitor: BaseVisitor, value: any, valueCtx: ParserRuleContext): void;
     getInstances(): ClassComponent[];
+    copyTo(scope: ExecutionScope): void;
 }
 export declare enum SequenceAction {
     To = "to",

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

@@ -1,23 +1,32 @@
-import { ParserRuleContext, Token } from 'antlr4ng';
+import { CommonTokenStream, 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';
-import { PinId } from './PinDefinition.js';
+import { PinDefinition, PinId } from './PinDefinition.js';
+import { ScriptContext } from 'src/antlr/CircuitScriptParser.js';
+import { SymbolDrawingCommands } from 'src/draw_symbols.js';
 export type CFunction = (args: CallableParameter[], options?: CFunctionOptions) => CFunctionResult;
 export declare class CFunctionEntry {
     name: string;
+    namespace: string;
+    originalNamespace: string;
     execute: CFunction;
     uniqueId?: string;
     source?: ParserRuleContext;
-    constructor(name: string, execute: CFunction, source?: ParserRuleContext, uniqueId?: string);
+    constructor(namespace: string, name: string, execute: CFunction, source?: ParserRuleContext, uniqueId?: string);
     toString(): string;
 }
 export type CFunctionOptions = {
     netNamespace?: string;
     functionCallIndex: number;
 };
+export type NewContextOptions = {
+    netNamespace?: string;
+    namespace?: string;
+    functionCallIndex: number;
+};
 export type CFunctionResult = [
     executionContext: ExecutionContext,
     result: ValueType | ClassComponent | null
@@ -113,3 +122,31 @@ export declare enum NetTypes {
     Any = "any",
     Source = "source"
 }
+export declare class ImportedModule {
+    moduleName: string;
+    context: ExecutionContext;
+    importHandlingFlag: ImportFunctionHandling;
+    specifiedImports: string[];
+    moduleNamespace: string;
+    moduleFilePath: string;
+    enableRefdesAnnotation: boolean;
+    enableRefdesAnnotationFile: boolean;
+    tree: ScriptContext;
+    tokens: CommonTokenStream;
+    constructor(moduleName: string, moduleNamespace: string, moduleFilePath: string, tree: ScriptContext, tokens: CommonTokenStream, context: ExecutionContext, flag: ImportFunctionHandling, specifiedImports: string[]);
+}
+export declare enum ImportFunctionHandling {
+    AllWithNamespace = "all-with-namespace",
+    AllMergeIntoNamespace = "all-merge-into-namespace",
+    SpecificMergeIntoNamespace = "specific-merge-into-namespace"
+}
+export type ComponentUnitDefinition = {
+    width: NumericValue | null;
+    height: NumericValue | null;
+    angle: NumericValue | null;
+    followWireOrientation: boolean | null;
+    pins: PinDefinition[];
+    display: SymbolDrawingCommands | null;
+    arrange: any | null;
+    suffix: string | null;
+};

package/dist/types/validate/SymbolTable.d.ts

@@ -18,6 +18,7 @@ export declare class SymbolTable {
     searchParentContext(executionContext: ExecutionContext, id: string): ExecutionContext | null;
     clearUndefined(): void;
 }
+export declare function cloneSymbol(symbol: SymbolTableItemDefined): SymbolTableItemDefined;
 export type SymbolTableItemDefined = {
     id: string;
     type: ParseSymbolType;