circuitscript 0.0.21 → 0.0.24

package/examples/lib.cst

@@ -1,185 +0,0 @@
-// Circuitscript default lib
-
-def net(net_name):
-    return create component:
-        pins: 1
-        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
-        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
-        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
-
-def res(value):
-    width = 40
-    height = 20
- 
-    return create component:
-        pins: 2
-        display: create graphic:
-            rect: 0, 0, width, height
-            hpin: 1, -width/2 - 20, 0, 20
-            hpin: 2, width/2 + 20, 0, -20
-            label: ("value", 0, 1, value, fontSize=10, anchor="middle", vanchor="middle")
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
-        type: "res"
-        params:
-            value: value
-            size: "0402"
-            footprint: "Resistor_SMD:R_0402_1005Metric"
-
-def cap(value):
-    width = 20
-    height = 40
-
-    return create component:
-        pins: 2
-        display: create graphic:
-            hline: -width/2, -3, width
-            hline: -width/2, 3, width
-            vpin: 1, 0, -height/2, 20-3
-            vpin: 2, 0, height/2, -20+3
-            label: "refdes", width/2+2, 0, "?", fontSize = 10, anchor="left"
-            label: "value", width/2+2, 5, value, fontSize = 10, anchor = "left", vanchor="top"
-        type: "cap"
-        params:
-            value: value
-            size: "0402"
-            footprint: "Capacitor_SMD:C_0402_1005Metric"
-
-def ind(value):
-    width = 40
-    height = 20
-
-    return create component:
-        pins: 2
-        type: "ind"
-        display: create graphic:
-            arc: -15, 0, 5, 180, 360
-            arc: -5, 0, 5, 180, 360
-            arc: 5, 0, 5, 180, 360
-            arc: 15, 0, 5, 180, 360
-            hpin: 1, -width/2 - 20, 0, 20
-            hpin: 2, width/2 + 20, 0, -20
-            label: ("value", 0, 10, value, fontSize=10, anchor="middle", vanchor="middle")
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
-        params:
-            value: value
-
-def diode():
-    width = 20
-    height = 20
-
-    # Diode is drawn horizontally
-    #  -|>|-
-    return create component:
-        pins: 2
-        type: "diode"
-        display: create graphic:
-            triangle: -width/2, 0, width/2, 0, height
-            vline: width/2, -height/2, height
-            hpin: 1, -width/2-20, 0, 20    # anode
-            hpin: 2, width/2 + 20, 0, -20  # cathode
-            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
-
-def led(color):
-    width = 20
-    height = 20
-
-    return create component:
-        pins:   
-            1: "cathode"
-            2: "anode"
-        type: "diode"
-        display: create graphic:
-            triangle: -width/2, 0, width/2, 0, height
-            vline: width/2, -height/2, height
-            path: ("M", 0, 8, "L", 5, 18, 
-                   "M", 3, 8, "L", 8, 18)
-            hpin: 1, -width/2-20, 0, 20    # anode
-            hpin: 2, width/2 + 20, 0, -20  # cathode
-            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
-            label: "color", width/2 + 5, 25, color
-        params:
-            size: "0603"
-            footprint: "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder"
-
-
-def cgnd():
-    net_name = "gnd"
-    return create component:
-        pins: 1
-        display: create graphic:
-            hline: -15, 0, 30
-            hline: -10, 5, 20
-            hline: -5, 10, 10
-            vpin: 1, 0, -10, 10, display_pin_id=0
-            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():
-    height = 10
-    width = 20
-
-    net_name = "GND"
-    return create component:
-        pins: 1
-        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
-
-def marker_point():
-    return create component:
-        pins: 1
-        display: create graphic:
-            hline: -5, 0, 10
-            vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0, display_pin_id=0
-        type: "net"
-
-def arrow_point():
-    return create component:
-        pins: 1
-        display: create graphic:
-            path: ("M", 15, -5, "L", 20, 0, "L", 15, 5)
-            hpin: 1, 0, 0, 20
-        type: "net"

package/jest.config.js

@@ -1,23 +0,0 @@
-export default {
-    testEnvironment: 'node',
-    preset: 'ts-jest/presets/default-esm',
-    transform: {
-        '^.+\\.m?[tj]s?$': ['ts-jest', {
-            useESM: true,
-            diagnostics: false
-        }],
-    },
-    moduleNameMapper: {
-        '^(\\.{1,2}/.*)\\.(m)?js$': '$1',
-    },
-    testMatch: [
-        "<rootDir>/__tests__/test**.(ts|tsx)",
-    ],
-    coverageDirectory: 'coverage',
-    collectCoverageFrom: [
-        'src/**/*.ts',
-        'src/**/*.mts',
-        '!src/**/*.d.ts',
-        '!src/**/*.d.mts',
-    ],
-};

package/libs/lib.cst

@@ -1,185 +0,0 @@
-// Circuitscript default lib
-
-def net(net_name):
-    return create component:
-        pins: 1
-        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
-        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
-        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
-
-def res(value):
-    width = 40
-    height = 20
- 
-    return create component:
-        pins: 2
-        display: create graphic:
-            rect: 0, 0, width, height
-            hpin: 1, -width/2 - 20, 0, 20
-            hpin: 2, width/2 + 20, 0, -20
-            label: ("value", 0, 1, value, fontSize=10, anchor="middle", vanchor="middle")
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
-        type: "res"
-        params:
-            value: value
-            size: "0402"
-            footprint: "Resistor_SMD:R_0402_1005Metric"
-
-def cap(value):
-    width = 20
-    height = 40
-
-    return create component:
-        pins: 2
-        display: create graphic:
-            hline: -width/2, -3, width
-            hline: -width/2, 3, width
-            vpin: 1, 0, -height/2, 20-3
-            vpin: 2, 0, height/2, -20+3
-            label: "refdes", width/2+2, 0, "?", fontSize = 10, anchor="left"
-            label: "value", width/2+2, 5, value, fontSize = 10, anchor = "left", vanchor="top"
-        type: "cap"
-        params:
-            value: value
-            size: "0402"
-            footprint: "Capacitor_SMD:C_0402_1005Metric"
-
-def ind(value):
-    width = 40
-    height = 20
-
-    return create component:
-        pins: 2
-        type: "ind"
-        display: create graphic:
-            arc: -15, 0, 5, 180, 360
-            arc: -5, 0, 5, 180, 360
-            arc: 5, 0, 5, 180, 360
-            arc: 15, 0, 5, 180, 360
-            hpin: 1, -width/2 - 20, 0, 20
-            hpin: 2, width/2 + 20, 0, -20
-            label: ("value", 0, 10, value, fontSize=10, anchor="middle", vanchor="middle")
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
-        params:
-            value: value
-
-def diode():
-    width = 20
-    height = 20
-
-    # Diode is drawn horizontally
-    #  -|>|-
-    return create component:
-        pins: 2
-        type: "diode"
-        display: create graphic:
-            triangle: -width/2, 0, width/2, 0, height
-            vline: width/2, -height/2, height
-            hpin: 1, -width/2-20, 0, 20    # anode
-            hpin: 2, width/2 + 20, 0, -20  # cathode
-            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
-
-def led(color):
-    width = 20
-    height = 20
-
-    return create component:
-        pins:   
-            1: "cathode"
-            2: "anode"
-        type: "diode"
-        display: create graphic:
-            triangle: -width/2, 0, width/2, 0, height
-            vline: width/2, -height/2, height
-            path: ("M", 0, 8, "L", 5, 18, 
-                   "M", 3, 8, "L", 8, 18)
-            hpin: 1, -width/2-20, 0, 20    # anode
-            hpin: 2, width/2 + 20, 0, -20  # cathode
-            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
-            label: "color", width/2 + 5, 25, color
-        params:
-            size: "0603"
-            footprint: "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder"
-
-
-def cgnd():
-    net_name = "gnd"
-    return create component:
-        pins: 1
-        display: create graphic:
-            hline: -15, 0, 30
-            hline: -10, 5, 20
-            hline: -5, 10, 10
-            vpin: 1, 0, -10, 10, display_pin_id=0
-            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():
-    height = 10
-    width = 20
-
-    net_name = "GND"
-    return create component:
-        pins: 1
-        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
-
-def marker_point():
-    return create component:
-        pins: 1
-        display: create graphic:
-            hline: -5, 0, 10
-            vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0, display_pin_id=0
-        type: "net"
-
-def arrow_point():
-    return create component:
-        pins: 1
-        display: create graphic:
-            path: ("M", 15, -5, "L", 20, 0, "L", 15, 5)
-            hpin: 1, 0, 0, 20
-        type: "net"

package/refresh.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-    <title>Circuitscript - Refresh</title>
-    <style>
-        @font-face{
-            font-family: Inter;
-            src: url('fonts/Inter-Regular.ttf');
-        }
-        @font-face {
-            font-family: Inter-Bold;
-            src: url('fonts/Inter-Bold.ttf');
-        }
-        body {
-            padding: 0;
-            margin: 0;
-            font-family: Arial;
-        }
-    </style>
-</head>
-
-<body>
-    <div id="main"/>
-</body>
-
-<script>
-
-    const socket = new WebSocket("ws://localhost:3000");
-    socket.addEventListener("open", (event) => {
-        socket.send("hello");
-    });
-
-    socket.addEventListener("message", (event) => {
-        console.log((new Date()).toISOString(), 'got update', event.data.length);
-
-        if (event.data.length > 0){
-            document.getElementById('main').innerHTML = event.data;
-        }
-    });
-
-</script>
-</html>

package/server.cjs

@@ -1,50 +0,0 @@
-const express = require('express')
-const ws = require('ws');
-const fs = require('fs');
-
-const app = express()
-
-const wsServer = new ws.Server({ noServer: true });
-wsServer.on('connection', socket => {
-
-    const fileName = 'output.svg';
-
-    function emitFile(){
-        fs.readFile(fileName, 'utf8', (err, data) => {
-            if (err) {
-                throw err;
-            }
-            console.log((new Date()).toISOString(), 'send data');
-            socket.send(data);
-        });
-    }
-
-    let emitTimeout = null;
-    fs.watch(fileName, (event, targetFile) => {
-        if (event === 'change') {
-            console.log((new Date()).toISOString(), 'file changed!');
-
-            // emit the change
-            clearInterval(emitTimeout);
-            emitTimeout = setTimeout(() => {
-                emitFile();
-            }, 200);
-        }
-    });
-
-    socket.on('message', message => {
-        console.log(message.toString());
-        emitFile();
-    });
-});
-
-app.use(express.static('./'))
-
-const server = app.listen(3000);
-server.on('upgrade', (request, socket, head) => {
-    wsServer.handleUpgrade(request, socket, head, socket => {
-        wsServer.emit('connection', socket, request);
-    });
-});
-
-console.log('server started at port 3000');

package/src/antlr/CircuitScript.g4

@@ -1,209 +0,0 @@
-grammar CircuitScript;
-
-// Generate with: antlr4 -Dlanguage=Python3 CircuitScript.g4 -no-listener -visitor
-// Generate with: antlr4 -Dlanguage=TypeScript CircuitScript.g4 -no-listener -visitor
-
-tokens { INDENT, DEDENT }
-
-// Keywords
-Break:      'break';
-Branch:     'branch';
-Create:     'create';
-Component:  'component';
-Graphic:    'graphic';
-Wire:       'wire';
-Pin:        'pin';
-Add:        'add';
-At:         'at';
-To:         'to';
-Point:      'point';
-Join:       'join';
-Parallel:   'parallel';
-
-Return:     'return';
-Define:     'def';
-Import:     'import';
-
-If:         'if';
-Not:        '!';
-
-Equals:     '==';
-NotEquals:  '!=';
-Addition:   '+';
-Minus:      '-';
-Divide:     '/';
-Multiply:   '*';
-
-
-script: (expression | NEWLINE)+ EOF;
-
-// These expressions are related to circuit building only
-expression: add_component_expr
-		| to_component_expr
-        | at_component_expr
-        | assignment_expr
-        | property_set_expr
-        | property_set_expr2
-        | double_dot_property_set_expr
-        | break_keyword
-        | function_def_expr
-        | wire_expr
-        | import_expr
-        | frame_expr
-        | atom_expr
-        
-        | at_block
-        | path_blocks
-        | point_expr
-        ;
-
-path_blocks: path_block_inner+;
-path_block_inner:
-	(Branch | Join | Parallel | Point) ':' NEWLINE INDENT (NEWLINE | expression)+ DEDENT;
-
-property_set_expr2:
-	atom_expr ':' NEWLINE INDENT ( NEWLINE | assignment_expr2)+ DEDENT;
-assignment_expr2: (ID | INTEGER_VALUE) ':' value_expr;
-
-data_expr_with_assignment: (data_expr | assignment_expr) pin_select_expr?;
-
-add_component_expr: Add data_expr_with_assignment ID?;
-
-component_select_expr: data_expr_with_assignment | pin_select_expr;
-pin_select_expr:        Pin (INTEGER_VALUE | STRING_VALUE);
-// This does not have the 'pin' word
-pin_select_expr2: INTEGER_VALUE | STRING_VALUE;
-
-at_component_expr:      At ((component_select_expr ID?) | Point);                           // ID? is for orientation
-// at_component_expr_next:   'at' component_select_expr (',' component_select_expr)*;
-
-to_component_expr: To ((component_select_expr (',' component_select_expr)* ID?) | Point);   // ID? is for orientation
-// pin_select_expr_next:   'pin' INTEGER_VALUE (',' INTEGER_VALUE)?;
-
-at_to_multiple_expr: At component_select_expr To component_select_expr (',' component_select_expr)* ':' NEWLINE INDENT (NEWLINE | at_to_multiple_line_expr) + DEDENT;
-at_to_multiple_line_expr: pin_select_expr2 ':' at_to_multiple_line_expr_to_pin (',' at_to_multiple_line_expr_to_pin)*;
-
-at_to_multiple_line_expr_to_pin: (INTEGER_VALUE | NOT_CONNECTED);
-
-at_block: at_component_expr ':' NEWLINE INDENT (NEWLINE | at_block_expressions) + DEDENT;
-at_block_expressions: expression | at_block_pin_expr;
-
-// Expression to allow direct pin assignment
-at_block_pin_expr: pin_select_expr2 ':' (at_block_pin_expression_simple | at_block_pin_expression_complex);
-
-at_block_pin_expression_simple: (expression | NOT_CONNECTED);
-at_block_pin_expression_complex: NEWLINE INDENT ( NEWLINE | expression)+ DEDENT;
-
-break_keyword: Break;
-
-assignment_expr: atom_expr '=' data_expr;
-keyword_assignment_expr: ID '=' data_expr;
-
-parameters: (data_expr (',' data_expr)* (',' keyword_assignment_expr)*)
-            | (keyword_assignment_expr (',' keyword_assignment_expr)*);
-
-property_set_expr: atom_expr '=' data_expr;
-double_dot_property_set_expr: '..' ID '=' data_expr;
-
-data_expr: 
-    '(' data_expr ')'                                   #RoundedBracketsExpr
-    | (value_expr | atom_expr)                          #ValueAtomExpr
-    | unary_operator data_expr                          #UnaryOperatorExpr
-    | data_expr (Multiply | Divide) data_expr           #MultiplyExpr
-    | data_expr (Addition | Minus) data_expr            #AdditionExpr
-    | data_expr binary_operator data_expr               #BinaryOperatorExpr
-    | create_component_expr                             #DataExpr
-    | create_graphic_expr                               #DataExpr
-    ;           
-
-binary_operator: Equals 
-    | NotEquals
-    ;
-
-unary_operator: Not | Minus;
-
-value_expr: ('-'? 
-    (NUMERIC_VALUE
-    | DECIMAL_VALUE
-    | INTEGER_VALUE
-    | STRING_VALUE 
-    | PERCENTAGE_VALUE
-    | BOOLEAN_VALUE)) 
-    | blank_expr;
-
-function_def_expr: Define ID '(' function_args_expr? ')' ':' NEWLINE INDENT (NEWLINE | function_expr)+ DEDENT;
-function_expr: expression | function_return_expr;
-
-function_args_expr: 
-    ID (',' ID)* (',' ID '=' value_expr)*
-    | ID '=' value_expr (',' ID '=' value_expr)*
-    ;
-
-atom_expr: net_namespace_expr? ID trailer_expr*;
-trailer_expr: '(' parameters? ')'
-        | '.' ID;
-
-net_namespace_expr: '+'? '/' data_expr?;
-
-function_return_expr: Return data_expr ;
-
-create_component_expr: Create Component ':' NEWLINE INDENT (NEWLINE | property_expr)+ DEDENT;
-create_graphic_expr: Create Graphic ':' NEWLINE INDENT (NEWLINE | sub_expr)+ DEDENT;
-
-sub_expr: (ID | Pin) ':' (parameters | '(' parameters ')');
-
-property_expr: property_key_expr ':' property_value_expr;
-property_key_expr: ID | INTEGER_VALUE | STRING_VALUE;
-property_value_expr: NEWLINE INDENT (NEWLINE | property_expr)+ DEDENT     # nested_properties
-                    | data_expr (',' data_expr)*                          # single_line_property
-                    ;
-
-blank_expr: '[' INTEGER_VALUE ']';
-
-wire_expr: Wire ID (INTEGER_VALUE | ID)*;
-point_expr: Point ID;
-import_expr: Import ID;
-
-frame_expr: 'frame' ':' NEWLINE INDENT (NEWLINE | expression)+ DEDENT;
-
-
-OPEN_PAREN : '(' {this.openBrace();};
-CLOSE_PAREN : ')' {this.closeBrace();};
-
-// A place holder to indicate that a pin is not connected
-NOT_CONNECTED: 'nc' | 'NC';
-
-BOOLEAN_VALUE:  'true' | 'false';
-
-ID: [_a-zA-Z][_a-zA-Z0-9]*;
-
-// This value takes a number with an alphabet at the end to indicate 
-// the multipler to the number
-
-fragment DecimalIntegerLiteral
-    : '0'
-    | [1-9] [0-9_]*
-    ;
-
-INTEGER_VALUE: ([1-9]+ [0-9]*) | [0];
-DECIMAL_VALUE: DecimalIntegerLiteral '.' [0-9][0-9_]*;
-NUMERIC_VALUE: (INTEGER_VALUE | DECIMAL_VALUE) [kmMunp]?;
-
-STRING_VALUE: '"' (.)*? '"';
-PERCENTAGE_VALUE: [1-9]+[0-9]* '%';
-ALPHA_NUMERIC: [a-zA-Z0-9]+;
-
-WS: [ \t]+ -> skip;
-
-NEWLINE
- : ( '\r'? '\n' | '\r' | '\f' ) SPACES? {this.onNewLine();}
- ;
-
- fragment SPACES
- : [ \t]+
- ;
-
-// Follow python's comment symbol for now
-fragment COMMENT: '#' ~[\r\n\f]*;
-
-SKIP_: (WS | COMMENT) -> skip;