circuitscript 0.3.2 → 0.4.0

package/dist/types/{export.d.ts → render/export.d.ts}

@@ -1,4 +1,4 @@
-import { NetListItem } from "./visitor.js";
+import { NetListItem } from "../visitor.js";
 export declare function generateKiCadNetList(netlist: NetListItem[]): {
     tree: SExp;
     missingFootprints: {

package/dist/types/{geometry.d.ts → render/geometry.d.ts}

@@ -1,7 +1,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 { 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;

package/dist/types/{graph.d.ts → render/graph.d.ts}

@@ -1,12 +1,12 @@
 import { Graph } from "@dagrejs/graphlib";
 import { SymbolPinDefintion } from "./draw_symbols.js";
 import { RenderFrame, RenderComponent, RenderWire } from "./layout.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";
-import { ComponentPinNetPair } from "./objects/types.js";
-import { PinId } from "./objects/PinDefinition.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";
+import { ComponentPinNetPair } from "../objects/types.js";
+import { PinId } from "../objects/PinDefinition.js";
 export declare class NetGraph {
     logger: Logger;
     constructor(logger: Logger);

package/dist/types/{layout.d.ts → render/layout.d.ts}

@@ -1,15 +1,15 @@
 import { Graph } from '@dagrejs/graphlib';
 import { SymbolGraphic, SymbolText, SymbolDrawingCommands, SimplePoint } from "./draw_symbols.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';
-import { Logger } from './logger.js';
-import { Frame, FramePlotDirection } from './objects/Frame.js';
-import { BoundBox } from './utils.js';
-import { ComponentPinNetPair } from './objects/types.js';
-import { PinId } from './objects/PinDefinition.js';
-import { NumericValue } from './objects/ParamDefinition.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';
+import { Logger } from '../logger.js';
+import { Frame, FramePlotDirection } from '../objects/Frame.js';
+import { BoundBox } from '../utils.js';
+import { ComponentPinNetPair } from '../objects/types.js';
+import { PinId } from '../objects/PinDefinition.js';
+import { NumericValue } from '../objects/ParamDefinition.js';
 export declare class LayoutEngine {
     logger: Logger;
     layoutWarnings: string[];

package/dist/types/{render.d.ts → render/render.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="pdfkit" />
 import { Svg } from '@svgdotjs/svg.js';
 import { SheetFrame } from "./layout.js";
-import { Logger } from './logger.js';
+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/{SemanticTokenVisitor.d.ts → semantic-tokens/SemanticTokenVisitor.d.ts}

@@ -1,8 +1,8 @@
 import { TerminalNode, Token } from "antlr4ng";
-import { CircuitScriptLexer } from "./antlr/CircuitScriptLexer.js";
-import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Atom_exprContext, Property_key_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext, GraphicCommandExprContext, For_exprContext, Annotation_comment_exprContext, ScriptContext, Operator_assignment_exprContext } from "./antlr/CircuitScriptParser.js";
-import { BaseVisitor, OnErrorHandler } from "./BaseVisitor.js";
-import { NodeScriptEnvironment } from "./environment.js";
+import { CircuitScriptLexer } from "../antlr/CircuitScriptLexer.js";
+import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Callable_exprContext, Property_key_exprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, GraphicCommandExprContext, For_exprContext, Annotation_comment_exprContext, ScriptContext, CreateExprContext } from "../antlr/CircuitScriptParser.js";
+import { BaseVisitor, OnErrorHandler } from "../BaseVisitor.js";
+import { NodeScriptEnvironment } from "../environment/environment.js";
 export declare class SemanticTokensVisitor extends BaseVisitor {
     parsedTokens: IParsedToken[];
     lexer: CircuitScriptLexer;
@@ -13,14 +13,14 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     visitFunction_args_expr: (ctx: Function_args_exprContext) => void;
     visitFunction_call_expr: (ctx: Function_call_exprContext) => void;
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
+    visitCreateExpr: (ctx: CreateExprContext) => void;
     visitCreate_component_expr: (ctx: Create_component_exprContext) => void;
     visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
     visitProperty_key_expr: (ctx: Property_key_exprContext) => void;
     visitGraphicCommandExpr: (ctx: GraphicCommandExprContext) => void;
     visitValueAtomExpr: (ctx: ValueAtomExprContext) => void;
     visitAssignment_expr: (ctx: Assignment_exprContext) => void;
-    visitAtom_expr: (ctx: Atom_exprContext) => void;
-    visitOperator_assignment_expr: (ctx: Operator_assignment_exprContext) => void;
+    visitCallable_expr: (ctx: Callable_exprContext) => void;
     visitImport_expr: (ctx: Import_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
     visitAnnotation_comment_expr: (ctx: Annotation_comment_exprContext) => void;

package/dist/types/semantic-tokens/getSemanticTokens.d.ts

@@ -0,0 +1,6 @@
+import { ScriptOptions } from "../helpers.js";
+import { IParsedToken, SemanticTokensVisitor } from "./SemanticTokenVisitor.js";
+export declare function getSemanticTokens(filePath: string, scriptData: string, options: ScriptOptions): Promise<{
+    visitor: SemanticTokensVisitor;
+    parsedTokens: IParsedToken[];
+}>;

package/dist/types/sizing.d.ts

@@ -1,5 +1,5 @@
 import { Box, SVGTypeMapping } from '@svgdotjs/svg.js';
-import { HorizontalAlign, VerticalAlign } from './geometry.js';
+import { HorizontalAlign, VerticalAlign } from './render/geometry.js';
 export declare function applyFontsToSVG(canvas: SVGTypeMapping): void;
 export declare function measureTextSize2(text: string, fontFamily: string, fontSize: number, fontWeight?: string, anchor?: HorizontalAlign, vanchor?: VerticalAlign): {
     width: number;

package/dist/types/utils.d.ts

@@ -6,7 +6,7 @@ import { SequenceAction, SequenceItem } from './objects/ExecutionScope.js';
 import { BlockTypes } from './globals.js';
 import { DeclaredReference, AnyReference } from './objects/types.js';
 export declare class SimpleStopwatch {
-    startTime: Date;
+    startTime: number;
     constructor();
     lap(): number;
 }

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

@@ -2,6 +2,9 @@ import { Token } from "antlr4ng";
 import { ComplexType, FunctionDefinedParameter } from "../objects/types.js";
 import { SymbolValidatorVisitor } from "./SymbolValidatorVisitor.js";
 export declare class SymbolValidatorResolveVisitor extends SymbolValidatorVisitor {
+    enableCacheImports: boolean;
+    enableCachedImportsRead: boolean;
+    enableCachedImportsWrite: boolean;
     protected addSymbolVariable(token: Token, name: string, value: ComplexType): void;
     protected addSymbolFunction(token: Token, functionName: string, funcDefinedParameters: FunctionDefinedParameter[]): void;
 }

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

@@ -1,11 +1,14 @@
 import { TerminalNode, Token } from "antlr4ng";
-import { Assignment_exprContext, Atom_exprContext, Function_call_exprContext, ValueAtomExprContext, UnaryOperatorExprContext, MultiplyExprContext, AdditionExprContext, BinaryOperatorExprContext, DataExprContext, Function_def_exprContext, For_exprContext, Import_simpleContext, Import_all_simpleContext, Import_specificContext } from "../antlr/CircuitScriptParser.js";
+import { Assignment_exprContext, CallableExprContext, UnaryOperatorExprContext, MultiplyExprContext, AdditionExprContext, BinaryOperatorExprContext, Function_def_exprContext, For_exprContext, Import_simpleContext, Import_specific_or_allContext, Create_graphic_exprContext } from "../antlr/CircuitScriptParser.js";
 import { ExecutionContext } from "../execute.js";
 import { ComplexType, FunctionDefinedParameter } from "../objects/types.js";
 import { SymbolTableItem } from "./SymbolTable.js";
 import { SymbolTable } from "./SymbolTable.js";
 import { BaseVisitor } from "../BaseVisitor.js";
 export declare class SymbolValidatorVisitor extends BaseVisitor {
+    enableCacheImports: boolean;
+    enableCachedImportsRead: boolean;
+    enableCachedImportsWrite: boolean;
     symbolTable: SymbolTable;
     protected addSymbolVariable(token: Token, name: string, value: ComplexType, executor?: ExecutionContext | null): void;
     protected addSymbolFunction(token: Token, functionName: string, funcDefinedParameters: FunctionDefinedParameter[]): void;
@@ -13,21 +16,18 @@ export declare class SymbolValidatorVisitor extends BaseVisitor {
     protected addSymbolInstance(symbol: SymbolTableItem, token: Token): void;
     setSymbols(symbolTable: SymbolTable): void;
     private importCommon;
-    visitImport_simple: (ctx: Import_simpleContext) => Promise<void>;
-    visitImport_all_simple: (ctx: Import_all_simpleContext) => Promise<void>;
-    visitImport_specific: (ctx: Import_specificContext) => Promise<void>;
+    visitImport_simple: (ctx: Import_simpleContext) => void;
+    visitImport_specific_or_all: (ctx: Import_specific_or_allContext) => void;
     private applyLibraryImports;
     visitAssignment_expr: (ctx: Assignment_exprContext) => ComplexType;
-    visitAtom_expr: (ctx: Atom_exprContext) => void;
-    visitFunction_call_expr: (ctx: Function_call_exprContext) => void;
-    visitValueAtomExpr: (ctx: ValueAtomExprContext) => void;
+    visitCallableExpr: (ctx: CallableExprContext) => void;
     visitUnaryOperatorExpr: (ctx: UnaryOperatorExprContext) => void;
     visitMultiplyExpr: (ctx: MultiplyExprContext) => void;
     visitAdditionExpr: (ctx: AdditionExprContext) => void;
     visitBinaryOperatorExpr: (ctx: BinaryOperatorExprContext) => void;
-    visitDataExpr: (ctx: DataExprContext) => void;
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
+    visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
     getSymbols(): SymbolTable;
     dumpSymbols(): void;
 }

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

@@ -0,0 +1,3 @@
+import { ScriptOptions } from "../helpers.js";
+import { SymbolValidatorVisitor } from "./SymbolValidatorVisitor.js";
+export declare function validateScript(filePath: string, scriptData: string, options: ScriptOptions): Promise<SymbolValidatorVisitor>;

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, Annotation_comment_exprContext, At_block_headerContext, Part_set_exprContext, Part_set_keyContext, Part_match_blockContext, Part_sub_exprContext, Part_value_exprContext, Part_condition_exprContext, Part_condition_key_only_exprContext } from './antlr/CircuitScriptParser.js';
+import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_component_exprContext, BinaryOperatorExprContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, 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, Part_set_exprContext, Part_set_keyContext, Part_match_blockContext, Part_sub_exprContext, Part_value_exprContext, Part_condition_exprContext, CreateExprContext, Create_exprContext, Properties_blockContext } 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,12 +7,11 @@ import { Net } from './objects/Net.js';
 import { BaseVisitor, OnErrorHandler } from './BaseVisitor.js';
 import { ParserRuleContext } from 'antlr4ng';
 import { Wire } from './objects/Wire.js';
-import { NodeScriptEnvironment } from './environment.js';
+import { NodeScriptEnvironment } from './environment/environment.js';
 export declare class ParserVisitor extends BaseVisitor {
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorHandler | null | undefined, environment: NodeScriptEnvironment);
     componentCreationIndex: number;
-    creationCtx: Map<ClassComponent | Wire, ParserRuleContext>;
-    visitKeyword_assignment_expr: (ctx: Keyword_assignment_exprContext) => void;
+    creationCtx: Map<Wire | ClassComponent, ParserRuleContext>;
     visitPin_select_expr: (ctx: Pin_select_exprContext) => void;
     trackNewComponentCreated: (callback: () => void) => boolean;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
@@ -33,7 +32,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitProperty_block_expr: (ctx: Property_block_exprContext) => void;
     visitProperty_expr: (ctx: Property_exprContext) => void;
     visitSingle_line_property: (ctx: Single_line_propertyContext) => void;
-    visitNested_properties_inner: (ctx: Nested_properties_innerContext) => void;
+    visitProperties_block: (ctx: Properties_blockContext) => void;
     visitNested_properties: (ctx: Nested_propertiesContext) => void;
     visitProperty_key_expr: (ctx: Property_key_exprContext) => void;
     visitData_expr_with_assignment: (ctx: Data_expr_with_assignmentContext) => void;
@@ -41,23 +40,18 @@ export declare class ParserVisitor extends BaseVisitor {
     private linkModuleSymbolWithContains;
     private placeModuleContains;
     visitUnaryOperatorExpr: (ctx: UnaryOperatorExprContext) => void;
-    visitDataExpr: (ctx: DataExprContext) => void;
+    visitCreate_expr: (ctx: Create_exprContext) => void;
+    visitCreateExpr: (ctx: CreateExprContext) => void;
     visitBinaryOperatorExpr: (ctx: BinaryOperatorExprContext) => void;
     visitLogicalOperatorExpr: (ctx: LogicalOperatorExprContext) => void;
     visitMultiplyExpr: (ctx: MultiplyExprContext) => void;
     visitAdditionExpr: (ctx: AdditionExprContext) => void;
     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;
-    visitWire_expr_direction_only: (ctx: Wire_expr_direction_onlyContext) => void;
-    visitWire_expr_direction_value: (ctx: Wire_expr_direction_valueContext) => void;
     visitWire_expr: (ctx: Wire_exprContext) => void;
     visitPoint_expr: (ctx: Point_exprContext) => ComponentPin;
-    visitProperty_set_expr: (ctx: Property_set_exprContext) => void;
     visitDouble_dot_property_set_expr: (ctx: Double_dot_property_set_exprContext) => void;
     visitExpressions_block: (ctx: Expressions_blockContext) => void;
     visitFrame_expr: (ctx: Frame_exprContext) => void;
@@ -74,8 +68,8 @@ export declare class ParserVisitor extends BaseVisitor {
     visitPart_set_key: (ctx: Part_set_keyContext) => void;
     visitPart_value_expr: (ctx: Part_value_exprContext) => void;
     visitPart_condition_expr: (ctx: Part_condition_exprContext) => void;
-    visitPart_condition_key_only_expr: (ctx: Part_condition_key_only_exprContext) => void;
-    checkLibraryHasRefdesFile(filePath: string): Promise<void>;
+    getPathRefdesFile(filePath: string): string;
+    checkLibraryInRefdesFile(filePath: string): void;
     private resolveDataExpr;
     private resolveDataValue;
     pinTypes: PinTypes[];

package/libs/std.cst

@@ -4,10 +4,9 @@ def net(net_name, net_type = "any"):
     return create component:
         pins: 1
         copy: true
-        angle: -90
         display: create graphic (params):
             hline: -50, 0, 100
-            vpin: 1, 0, 50, -50, display_pin_id=false
+            vpin: 1, 0, 50, -50, display_id=false
             label: params.net_name, 0, -15, fontSize=50, anchor="middle"
         type: "net"
         params:
@@ -27,7 +26,7 @@ def label(value, anchor="left"):
         display: create graphic (params):
             textColor: "#222"
             label: params.value, 0, -10, fontSize=50, anchor=anchor
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
         type: "net"
         params:
             net_name: value
@@ -41,7 +40,7 @@ def port(value, portType="input"):
         display: create graphic (params):
             textColor: "#222"
             label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
         params:
             net_name: value
@@ -56,8 +55,8 @@ def res(value):
         pins: 2
         display: create graphic (params):
             crect: 0, 0, width, height
-            hpin: 1, -width/2 - 30, 0, 30
-            hpin: 2, width/2 + 30, 0, -30
+            hpin: 1, -width/2 - 30, 0, 30, display_id=false
+            hpin: 2, width/2 + 30, 0, -30, display_id=false
             label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
             label: params.value, 0, 0, fontSize=30, anchor="middle", vanchor="middle"
         type: "res"
@@ -73,13 +72,12 @@ def cap(value):
 
     return create component:
         pins: 2
-        angle: 90
         display: create graphic (params):
             lineWidth: 13
             hline: -width/2, 20, width
             hline: -width/2, -20, width
-            vpin: 1, 0, -100, 80
-            vpin: 2, 0, 100, -80
+            vpin: 1, 0, -100, 80, display_id=false
+            vpin: 2, 0, 100, -80, display_id=false
             label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="middle"
             label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="middle"
         type: "cap"
@@ -100,8 +98,8 @@ def ind(value):
             arc: -25, 0, 25, 180, 360
             arc: 25, 0, 25, 180, 360
             arc: 75, 0, 25, 180, 360
-            hpin: 1, -width/2 - 100, 0, 100
-            hpin: 2, width/2 + 100, 0, -100
+            hpin: 1, -width/2 - 100, 0, 100, display_id=false
+            hpin: 2, width/2 + 100, 0, -100, display_id=false
             label: (params.refdes, -width/2, -height/2 - 25 , fontSize=50, anchor="left")
             label: (params.value, 0, 50, fontSize=50, anchor="middle", vanchor="middle")
         params:
@@ -156,12 +154,11 @@ def cgnd():
     return create component:
         pins: 1
         copy: true
-        angle: 90
         display: create graphic (params):
             hline: -15, 0, 30
             hline: -10, 5, 20
             hline: -5, 10, 10
-            vpin: 1, 0, -10, 10, display_pin_id=false
+            vpin: 1, 0, -10, 10, display_id=false
             label: params.net_name, 0, 22, fontSize=50, anchor="middle"
         type: "net"
         params:
@@ -175,10 +172,9 @@ def dgnd(net_name="GND"):
     return create component:
         pins: 1
         copy: true
-        angle: 90
         display: create graphic (params):
             triangle: 0, 0, 0, height, width
-            vpin: 1, 0, -50, 50, display_pin_id=false
+            vpin: 1, 0, -50, 50, display_id=false
             label: params.net_name, 0, height + 50, fontSize=50, anchor="middle", vanchor="middle"
         type: "net"
         params:
@@ -191,7 +187,7 @@ def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
         followWireOrientation: false
         type: "graphic"
         display: create graphic:
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
             text:
                 content: value
                 offset: offsetX, offsetY
@@ -205,7 +201,7 @@ def marker_point():
         display: create graphic:
             hline: -5, 0, 10
             vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
 
 def arrow_point():
     return create component:
@@ -215,7 +211,7 @@ def arrow_point():
             lineWidth: 2
             path: ("M", -10, -5, "L", -5, 0, "L", -10, 5)
             path: ("M", -5, 0, "L", -20, 0)
-            hpin: 1, 0, 0, 0, display_pin_id=false
+            hpin: 1, 0, 0, 0, display_id=false
 
 def no_connect(size=20):
     return create component:
@@ -224,7 +220,7 @@ def no_connect(size=20):
         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
+            pin: 1, 0, 0, 0, 0, display_id=false
         params:
             no_connect: true
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.3.2",
+    "version": "0.4.0",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -67,7 +67,7 @@
         "prettier": "prettier --config .prettierrc --write .",
         "test:watch": "node --experimental-vm-modules node_modules/.bin/jest --watch",
         "antlr": "antlr4 -Dlanguage=TypeScript ./src/antlr/CircuitScript.g4 -no-listener -visitor",
-        "antlr4ng": "npx antlr4ng -Dlanguage=TypeScript -o src/antlr -visitor -no-listener -Xexact-output-dir src/antlr/CircuitScript.g4",
+        "antlr4ng": "npx antlr4ng -Dlanguage=TypeScript -o src/antlr -visitor -no-listener -Xexact-output-dir src/antlr/CircuitScriptLexer.g4 src/antlr/CircuitScriptParser.g4",
         "profile": "node --prof build/src/main.js examples/example_garden_pump.cst",
         "profile-flame": "node --prof-process --preprocess -j isolate*.log | flamebearer",
         "server": "node server.js",
@@ -85,7 +85,7 @@
         "@fast-csv/format": "^5.0.5",
         "@flatten-js/core": "1.5.5",
         "@svgdotjs/svg.js": "3.2.0",
-        "antlr4ng": "^3.0.4",
+        "antlr4ng": "^3.0.16",
         "big.js": "^6.2.2",
         "commander": "^11.1.0",
         "crypto-js": "^4.2.0",
@@ -100,9 +100,6 @@
         "tslib": "~2.5",
         "ws": "^8.14.2"
     },
-    "volta": {
-        "node": "18.12.1"
-    },
     "auto-changelog": {
         "output": "CHANGELOG.md",
         "commitLimit": false,

package/dist/cjs/antlr/CircuitScriptVisitor.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CircuitScriptVisitor = void 0;
-const antlr4ng_1 = require("antlr4ng");
-class CircuitScriptVisitor extends antlr4ng_1.AbstractParseTreeVisitor {
-}
-exports.CircuitScriptVisitor = CircuitScriptVisitor;