circuitscript 0.0.25 → 0.0.26

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

@@ -26,30 +26,37 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly Define = 22;
     static readonly Import = 23;
     static readonly If = 24;
-    static readonly Not = 25;
-    static readonly Frame = 26;
-    static readonly Equals = 27;
-    static readonly NotEquals = 28;
-    static readonly Addition = 29;
-    static readonly Minus = 30;
-    static readonly Divide = 31;
-    static readonly Multiply = 32;
-    static readonly OPEN_PAREN = 33;
-    static readonly CLOSE_PAREN = 34;
-    static readonly NOT_CONNECTED = 35;
-    static readonly BOOLEAN_VALUE = 36;
-    static readonly ID = 37;
-    static readonly INTEGER_VALUE = 38;
-    static readonly DECIMAL_VALUE = 39;
-    static readonly NUMERIC_VALUE = 40;
-    static readonly STRING_VALUE = 41;
-    static readonly PERCENTAGE_VALUE = 42;
-    static readonly ALPHA_NUMERIC = 43;
-    static readonly WS = 44;
-    static readonly NEWLINE = 45;
-    static readonly COMMENT = 46;
-    static readonly INDENT = 47;
-    static readonly DEDENT = 48;
+    static readonly Else = 25;
+    static readonly Not = 26;
+    static readonly Frame = 27;
+    static readonly Equals = 28;
+    static readonly NotEquals = 29;
+    static readonly GreaterThan = 30;
+    static readonly GreatOrEqualThan = 31;
+    static readonly LessThan = 32;
+    static readonly LessOrEqualThan = 33;
+    static readonly LogicalAnd = 34;
+    static readonly LogicalOr = 35;
+    static readonly Addition = 36;
+    static readonly Minus = 37;
+    static readonly Divide = 38;
+    static readonly Multiply = 39;
+    static readonly OPEN_PAREN = 40;
+    static readonly CLOSE_PAREN = 41;
+    static readonly NOT_CONNECTED = 42;
+    static readonly BOOLEAN_VALUE = 43;
+    static readonly ID = 44;
+    static readonly INTEGER_VALUE = 45;
+    static readonly DECIMAL_VALUE = 46;
+    static readonly NUMERIC_VALUE = 47;
+    static readonly STRING_VALUE = 48;
+    static readonly PERCENTAGE_VALUE = 49;
+    static readonly ALPHA_NUMERIC = 50;
+    static readonly WS = 51;
+    static readonly NEWLINE = 52;
+    static readonly COMMENT = 53;
+    static readonly INDENT = 54;
+    static readonly DEDENT = 55;
     static readonly RULE_script = 0;
     static readonly RULE_expression = 1;
     static readonly RULE_path_blocks = 2;
@@ -92,7 +99,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly RULE_function_return_expr = 39;
     static readonly RULE_create_component_expr = 40;
     static readonly RULE_create_graphic_expr = 41;
-    static readonly RULE_sub_expr = 42;
+    static readonly RULE_graphic_expr = 42;
     static readonly RULE_property_expr = 43;
     static readonly RULE_property_key_expr = 44;
     static readonly RULE_property_value_expr = 45;
@@ -102,6 +109,9 @@ export declare class CircuitScriptParser extends antlr.Parser {
     static readonly RULE_point_expr = 49;
     static readonly RULE_import_expr = 50;
     static readonly RULE_frame_expr = 51;
+    static readonly RULE_if_expr = 52;
+    static readonly RULE_if_inner_expr = 53;
+    static readonly RULE_else_expr = 54;
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
     static readonly ruleNames: string[];
@@ -155,7 +165,7 @@ export declare class CircuitScriptParser extends antlr.Parser {
     function_return_expr(): Function_return_exprContext;
     create_component_expr(): Create_component_exprContext;
     create_graphic_expr(): Create_graphic_exprContext;
-    sub_expr(): Sub_exprContext;
+    graphic_expr(): Graphic_exprContext;
     property_expr(): Property_exprContext;
     property_key_expr(): Property_key_exprContext;
     property_value_expr(): Property_value_exprContext;
@@ -165,6 +175,9 @@ export declare class CircuitScriptParser extends antlr.Parser {
     point_expr(): Point_exprContext;
     import_expr(): Import_exprContext;
     frame_expr(): Frame_exprContext;
+    if_expr(): If_exprContext;
+    if_inner_expr(): If_inner_exprContext;
+    else_expr(): Else_exprContext;
     sempred(localContext: antlr.ParserRuleContext | null, ruleIndex: number, predIndex: number): boolean;
     private data_expr_sempred;
     static readonly _serializedATN: number[];
@@ -203,6 +216,7 @@ export declare class ExpressionContext extends antlr.ParserRuleContext {
     at_block(): At_blockContext | null;
     path_blocks(): Path_blocksContext | null;
     point_expr(): Point_exprContext | null;
+    if_expr(): If_exprContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
@@ -456,6 +470,14 @@ export declare class MultiplyExprContext extends Data_exprContext {
     Divide(): antlr.TerminalNode | null;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
+export declare class LogicalOperatorExprContext extends Data_exprContext {
+    constructor(ctx: Data_exprContext);
+    data_expr(): Data_exprContext[];
+    data_expr(i: number): Data_exprContext | null;
+    LogicalAnd(): antlr.TerminalNode | null;
+    LogicalOr(): antlr.TerminalNode | null;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
 export declare class DataExprContext extends Data_exprContext {
     constructor(ctx: Data_exprContext);
     create_component_expr(): Create_component_exprContext | null;
@@ -492,6 +514,10 @@ export declare class Binary_operatorContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     Equals(): antlr.TerminalNode | null;
     NotEquals(): antlr.TerminalNode | null;
+    GreaterThan(): antlr.TerminalNode | null;
+    GreatOrEqualThan(): antlr.TerminalNode | null;
+    LessThan(): antlr.TerminalNode | null;
+    LessOrEqualThan(): antlr.TerminalNode | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
@@ -608,12 +634,12 @@ export declare class Create_graphic_exprContext extends antlr.ParserRuleContext
     NEWLINE(i: number): antlr.TerminalNode | null;
     INDENT(): antlr.TerminalNode;
     DEDENT(): antlr.TerminalNode;
-    sub_expr(): Sub_exprContext[];
-    sub_expr(i: number): Sub_exprContext | null;
+    graphic_expr(): Graphic_exprContext[];
+    graphic_expr(i: number): Graphic_exprContext | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
-export declare class Sub_exprContext extends antlr.ParserRuleContext {
+export declare class Graphic_exprContext extends antlr.ParserRuleContext {
     _command?: Token | null;
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     ID(): antlr.TerminalNode | null;
@@ -717,3 +743,45 @@ export declare class Frame_exprContext extends antlr.ParserRuleContext {
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
+export declare class If_exprContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    If(): antlr.TerminalNode;
+    data_expr(): Data_exprContext;
+    NEWLINE(): antlr.TerminalNode[];
+    NEWLINE(i: number): antlr.TerminalNode | null;
+    INDENT(): antlr.TerminalNode;
+    DEDENT(): antlr.TerminalNode;
+    expression(): ExpressionContext[];
+    expression(i: number): ExpressionContext | null;
+    if_inner_expr(): If_inner_exprContext[];
+    if_inner_expr(i: number): If_inner_exprContext | null;
+    else_expr(): Else_exprContext | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
+export declare class If_inner_exprContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    Else(): antlr.TerminalNode;
+    If(): antlr.TerminalNode;
+    data_expr(): Data_exprContext;
+    NEWLINE(): antlr.TerminalNode[];
+    NEWLINE(i: number): antlr.TerminalNode | null;
+    INDENT(): antlr.TerminalNode;
+    DEDENT(): antlr.TerminalNode;
+    expression(): ExpressionContext[];
+    expression(i: number): ExpressionContext | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}
+export declare class Else_exprContext extends antlr.ParserRuleContext {
+    constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
+    Else(): antlr.TerminalNode;
+    NEWLINE(): antlr.TerminalNode[];
+    NEWLINE(i: number): antlr.TerminalNode | null;
+    INDENT(): antlr.TerminalNode;
+    DEDENT(): antlr.TerminalNode;
+    expression(): ExpressionContext[];
+    expression(i: number): ExpressionContext | null;
+    get ruleIndex(): number;
+    accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
+}

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

@@ -30,6 +30,7 @@ import { Double_dot_property_set_exprContext } from "./CircuitScriptParser.js";
 import { FunctionCallExprContext } from "./CircuitScriptParser.js";
 import { AdditionExprContext } from "./CircuitScriptParser.js";
 import { MultiplyExprContext } from "./CircuitScriptParser.js";
+import { LogicalOperatorExprContext } from "./CircuitScriptParser.js";
 import { DataExprContext } from "./CircuitScriptParser.js";
 import { UnaryOperatorExprContext } from "./CircuitScriptParser.js";
 import { ValueAtomExprContext } from "./CircuitScriptParser.js";
@@ -48,7 +49,7 @@ import { Net_namespace_exprContext } from "./CircuitScriptParser.js";
 import { Function_return_exprContext } from "./CircuitScriptParser.js";
 import { Create_component_exprContext } from "./CircuitScriptParser.js";
 import { Create_graphic_exprContext } from "./CircuitScriptParser.js";
-import { Sub_exprContext } from "./CircuitScriptParser.js";
+import { Graphic_exprContext } from "./CircuitScriptParser.js";
 import { Property_exprContext } from "./CircuitScriptParser.js";
 import { Property_key_exprContext } from "./CircuitScriptParser.js";
 import { Nested_propertiesContext } from "./CircuitScriptParser.js";
@@ -60,6 +61,9 @@ import { Wire_exprContext } from "./CircuitScriptParser.js";
 import { Point_exprContext } from "./CircuitScriptParser.js";
 import { Import_exprContext } from "./CircuitScriptParser.js";
 import { Frame_exprContext } from "./CircuitScriptParser.js";
+import { If_exprContext } from "./CircuitScriptParser.js";
+import { If_inner_exprContext } from "./CircuitScriptParser.js";
+import { Else_exprContext } from "./CircuitScriptParser.js";
 export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisitor<Result> {
     visitScript?: (ctx: ScriptContext) => Result;
     visitExpression?: (ctx: ExpressionContext) => Result;
@@ -92,6 +96,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitFunctionCallExpr?: (ctx: FunctionCallExprContext) => Result;
     visitAdditionExpr?: (ctx: AdditionExprContext) => Result;
     visitMultiplyExpr?: (ctx: MultiplyExprContext) => Result;
+    visitLogicalOperatorExpr?: (ctx: LogicalOperatorExprContext) => Result;
     visitDataExpr?: (ctx: DataExprContext) => Result;
     visitUnaryOperatorExpr?: (ctx: UnaryOperatorExprContext) => Result;
     visitValueAtomExpr?: (ctx: ValueAtomExprContext) => Result;
@@ -110,7 +115,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitFunction_return_expr?: (ctx: Function_return_exprContext) => Result;
     visitCreate_component_expr?: (ctx: Create_component_exprContext) => Result;
     visitCreate_graphic_expr?: (ctx: Create_graphic_exprContext) => Result;
-    visitSub_expr?: (ctx: Sub_exprContext) => Result;
+    visitGraphic_expr?: (ctx: Graphic_exprContext) => Result;
     visitProperty_expr?: (ctx: Property_exprContext) => Result;
     visitProperty_key_expr?: (ctx: Property_key_exprContext) => Result;
     visitNested_properties?: (ctx: Nested_propertiesContext) => Result;
@@ -122,4 +127,7 @@ export declare class CircuitScriptVisitor<Result> extends AbstractParseTreeVisit
     visitPoint_expr?: (ctx: Point_exprContext) => Result;
     visitImport_expr?: (ctx: Import_exprContext) => Result;
     visitFrame_expr?: (ctx: Frame_exprContext) => Result;
+    visitIf_expr?: (ctx: If_exprContext) => Result;
+    visitIf_inner_expr?: (ctx: If_inner_exprContext) => Result;
+    visitElse_expr?: (ctx: Else_exprContext) => Result;
 }

package/dist/types/draw_symbols.d.ts

@@ -136,7 +136,7 @@ export declare class SymbolDrawing {
         angle: number;
     };
 }
-export type SubExpressionCommand = [
+export type GraphicExprCommand = [
     commandName: string,
     positionParams: any[],
     keywordParams: Map<string, any>
@@ -144,8 +144,8 @@ export type SubExpressionCommand = [
 export declare class SymbolDrawingCommands extends SymbolDrawing {
     id: string;
     private commands;
-    constructor(commands: SubExpressionCommand[]);
-    getCommands(): SubExpressionCommand[];
+    constructor(commands: GraphicExprCommand[]);
+    getCommands(): GraphicExprCommand[];
     clone(): SymbolDrawingCommands;
 }
 type SimplePoint = [x: number, y: number];

package/dist/types/execute.d.ts

@@ -36,6 +36,7 @@ export declare class ExecutionContext {
         display?: string;
         type?: string;
         width?: number;
+        copy: boolean;
     }): ClassComponent;
     printPoint(extra?: string): void;
     addComponentExisting(component: ClassComponent, pin: number): ComponentPin;
@@ -45,7 +46,7 @@ export declare class ExecutionContext {
     atComponent(component: ClassComponent, pinId: number | null, options?: {
         addSequence?: boolean;
     }): ComponentPin;
-    cloneComponent(component: ClassComponent): ClassComponent;
+    copyComponent(component: ClassComponent): ClassComponent;
     enterBlocks(blockType: BlockTypes): void;
     exitBlocks(): void;
     enterBlock(blockIndex: number): void;
@@ -69,9 +70,6 @@ export declare class ExecutionContext {
     enterFrame(): number;
     exitFrame(frameId: number): void;
 }
-export declare function isNetComponent(component: ClassComponent): boolean;
-export declare function isLabelComponent(component: ClassComponent): boolean;
-export declare function isNetOnlyComponent(component: ClassComponent): boolean;
 export declare function getPortSide(pins: Map<number, PinDefinition>, arrangeProps: null | Map<string, number[]>): PortSideItem[];
 type PortSideItem = {
     pinId: number;

package/dist/types/export.d.ts

@@ -1,2 +1,28 @@
 import { NetListItem } from "./visitor.js";
-export declare function generateKiCADNetList(netlist: NetListItem[]): string;
+export declare function generateKiCADNetList(netlist: NetListItem[]): {
+    tree: SExp;
+    missingFootprints: {
+        refdes: string;
+        instanceName: string;
+    }[];
+};
+export declare function printTree(tree: (IdObject | string)[] | string, level?: number): string;
+export declare class IdObject {
+    keyName: string;
+    constructor(keyName: string);
+}
+export declare function _id(key: string): IdObject;
+export declare class SExpObject {
+    object: SExp;
+    constructor(object: SExp);
+    getKey(object?: SExp | null): IdObject;
+    getValue(object?: SExp | null): any;
+    getJSON(object?: SExp | null): {
+        [key: string]: any;
+    };
+    getWithId(id: string, object?: SExp | null): SExp | null;
+    print(): void;
+}
+export type SExpString = [id: IdObject, string];
+export type SExpNested = [id: IdObject, SExp];
+export type SExp = [id: IdObject, ...(SExpString | SExpNested)[]];

package/dist/types/globals.d.ts

@@ -8,8 +8,6 @@ export declare enum GlobalNames {
 }
 export declare const NoNetText = "NO_NET";
 export declare enum ParamKeys {
-    __is_net = "__is_net",
-    __is_label = "__is_label",
     priority = "priority",
     net_name = "net_name"
 }
@@ -40,7 +38,8 @@ export declare enum ReferenceTypes {
     function = "function",
     value = "value",
     variable = "variable",
-    instance = "instance"
+    instance = "instance",
+    pinType = "pinType"
 }
 export declare enum BlockTypes {
     Branch = 1,

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

@@ -18,6 +18,7 @@ export declare class ClassComponent {
     displayProp: string | SymbolDrawingCommands | null;
     widthProp: number | null;
     typeProp: string | null;
+    copyProp: boolean;
     styles: {
         [key: string]: number | string;
     };

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, Path_blocksContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, DataExprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, Keyword_assignment_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_expr2Context, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Property_set_exprContext, Single_line_propertyContext, Sub_exprContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, Wire_expr_direction_onlyContext, Wire_expr_direction_valueContext } 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, Path_blocksContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, DataExprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, Keyword_assignment_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_expr2Context, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Property_set_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, Wire_expr_direction_onlyContext, Wire_expr_direction_valueContext, Graphic_exprContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet } from './objects/types.js';
@@ -15,7 +15,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitPath_blocks: (ctx: Path_blocksContext) => ComponentPin;
     visitCreate_component_expr: (ctx: Create_component_exprContext) => void;
     visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
-    visitSub_expr: (ctx: Sub_exprContext) => void;
+    visitGraphic_expr: (ctx: Graphic_exprContext) => void;
     visitProperty_expr: (ctx: Property_exprContext) => void;
     visitSingle_line_property: (ctx: Single_line_propertyContext) => void;
     visitNested_properties: (ctx: Nested_propertiesContext) => void;
@@ -24,6 +24,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitUnaryOperatorExpr: (ctx: UnaryOperatorExprContext) => void;
     visitDataExpr: (ctx: DataExprContext) => 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;
@@ -40,6 +41,8 @@ export declare class ParserVisitor extends BaseVisitor {
     visitDouble_dot_property_set_expr: (ctx: Double_dot_property_set_exprContext) => void;
     visitFrame_expr: (ctx: Frame_exprContext) => void;
     visitNet_namespace_expr: (ctx: Net_namespace_exprContext) => void;
+    visitIf_expr: (ctx: If_exprContext) => void;
+    visitIf_inner_expr: (ctx: If_inner_exprContext) => void;
     pinTypes: PinTypes[];
     private parseCreateComponentPins;
     private parseCreateComponentParams;

package/libs/lib.cst

@@ -1,38 +1,40 @@
+# Circuitscript default lib
+
 def net(net_name):
     return create component:
         pins: 1
+        copy: true
         display: create graphic:
             hline: -15, 0, 30
             vpin: 1, 0, 10, -10, display_pin_id=0
             label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
-            __is_net: 1
             net_name: net_name
             priority: 10
 
 def supply(net_name):
     return create component:
         pins: 1
+        copy: true
         display: create graphic:
             hline: -15, 0, 30
             vpin: 1, 0, 10, -10, display_pin_id=0
             label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
-            __is_net: 1
             net_name: net_name
             priority: 20
 
 def label(value):
     return create component:
         pins: 1
+        copy: true
         display: create graphic:
             label: "value", 0, -2, "?", fontSize=10, anchor="left"
             pin: 1, 0, 0, 0, 0, display_pin_id=0
         type: "label"
         params:
-            __is_net: 1
             net_name: value
             value: value
             priority: 5
@@ -136,6 +138,7 @@ def cgnd():
     net_name = "gnd"
     return create component:
         pins: 1
+        copy: true
         display: create graphic:
             hline: -15, 0, 30
             hline: -10, 5, 20
@@ -144,24 +147,22 @@ def cgnd():
             label: "net_name", 0, 22, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
-            __is_net: 1
             net_name: net_name
             priority: 100
 
-def dgnd():
+def dgnd(net_name="GND"):
     height = 10
     width = 20
 
-    net_name = "GND"
     return create component:
         pins: 1
+        copy: true
         display: create graphic:
             triangle: 0, 0, 0, height, width
             vpin: 1, 0, -10, 10, display_pin_id=0
             label: "net_name", 0, height + 10, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
-            __is_net: 1
             net_name: net_name
             priority: 100
 

package/package.json

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