circuitscript 0.0.7 → 0.0.13

package/examples/example_arduino_uno.cst

@@ -42,6 +42,10 @@ def solder_bridge():
     return create component:
         pins: 2
 
+gnd = dgnd()
+v3v3 = supply("3V3")
+v5v = supply("5V")
+
 atmega = create component:
     pins:
         1: "XTAL1"
@@ -189,7 +193,7 @@ at atmega:
         wire left 40 
         branch:
             wire up 20
-            to net("5V")
+            to v5v
         wire down 20
         branch:
             wire auto 
@@ -223,7 +227,7 @@ at atmega:
             to icsp_conn2 pin 5
 
         branch:
-            at net("5V")
+            at v5v
             wire down 20 left 20
             to icsp_conn2 pin 2
             point tmp4
@@ -393,19 +397,19 @@ at atmega:
         wire right 40
         add label("RXLED")
         wire right 100 down 100 right 60
-        add led("yellow") pin 1 ..angle=180
+        add led("yellow") pin 2 right
         wire right 20
         add res(1k)
         wire right 20 up 80 
         point tmp6
         wire up 20 
-        to net("5V")
+        to v5v
 
     11:
         wire right 40
         add label("TXLED")
         wire right 120 down 40 right 40
-        add led("yellow") pin 1 ..angle=180
+        add led("yellow") pin 2 right
         wire right 20
         add res(1k)
         wire auto 
@@ -419,11 +423,11 @@ power_conn2 = create component:
 
 at power_conn2:
     2:
-        wire left 40
-        add label("3V3")
+        wire left 60 up 80
+        add v3v3
     3:
-        wire left 80 up 100
-        to net("5V")
+        wire left 100 up 100
+        to v5v
 
     4: 
         wire left 20 down 20
@@ -446,7 +450,7 @@ at atmega8:
             wire up 20
             add res(10k) pin 2 ..angle=90
             wire up 20
-            to net("5V")
+            to v5v
         branch:
             wire left 40 up 420 right 120
             to power_conn2 pin 1
@@ -482,7 +486,7 @@ at atmega8:
         wire left 40
         branch:
             wire up 20
-            to net("5V")
+            to v5v
         wire down 20
         add cap(100n)
         wire down 20
@@ -626,7 +630,7 @@ at icsp_conn:
         to gnd
     2:
         wire right 20 up 20
-        to net("5V")
+        to v5v
 
     5:
         wire left 140
@@ -649,23 +653,6 @@ at icsp_conn:
         to gnd
 
 
-# Block for 5V leds
-at net("5V")
-wire down 20
-branch:
-    wire right 20
-    add res(1k)
-    wire right 20
-    point tmp9
-    wire right 20
-    add led("green") pin 2
-    wire right 20 down 20
-    to gnd
-wire down 40 right 20
-add res(1k)
-wire auto_
-to tmp9
-
 # 3V3 output converter
 dcdc_3v3 = create component:
     pins:
@@ -724,123 +711,157 @@ fet = create component:
     param:
         manufacturer_pn: "FDN304V"
 
-at label("VIN")
-wire right 40 down 20
-add res(10k) ..angle=90
-wire down 20
-branch:
-    wire down 20
-    add res(10k) ..angle=90
-    to gnd
-wire right 80
-add label("CMP")
-wire right 20
-to opamp_1 pin 3
-
-at label("3V3")
-wire right 40
-to opamp_1 pin 2
-
-at label("USBVCC")
-wire right 40 to fet pin 1
-
-at opamp_1 pin 1
-wire right 80 down 100 left 20
-to fet pin 2
-
-at fet pin 3
-wire right 60
-branch:
-    wire up 20
-    to net("5V")
-wire right 60
-branch:
-    wire right 20
-    to dcdc_3v3 pin 1
-wire auto_
-to dcdc_3v3 pin 3
-
-at dcdc_3v3:
-    2:
-        wire left 20 down 20
-        to gnd
-
-    5:
-        wire right 20
-        add label("3V3")
-        wire right 20 down 20
-        add cap(1u)
-        to gnd
-    
-
-
-# Block for 5V power
-power_conn = create component:
-    pins: 3
-    arrange:
-        left: 1,3
-        right: 2
-
-at power_conn:
-    1:
-        wire left 20 down 20
-        branch:
-            wire auto
-            to power_conn pin 3
+frame: 
+    ..title = "Supply generation"
+    ..direction = "row"
+        
+    frame:
+        ..title = "3V3 power"
+            
+        at label("VIN")
+        wire right 40 down 20
+        add res(10k) ..angle=90
         wire down 20
-        to gnd
-    2:
-        wire right 20
-        add label("PWRIN")
-        wire right 40
-        add diode()
-        wire right 40
         branch:
             wire down 20
-            add cap(47u)
+            add res(10k) ..angle=90
             to gnd
+        wire right 80
+        add label("CMP")
         wire right 20
-        point tmp10
+        to opamp_1 pin 3
 
-at dcdc_5V:
-    1:
-        wire left 20 down 20
-        to gnd
-    3:
-        wire left 80
-        to tmp10
+        at v3v3 left
+        wire right 20
+        to opamp_1 pin 2
 
-        wire up 20
-        branch:
-            wire right 20
-            add label("VIN")
-            wire right 40
-        wire up 100 right 80
-        to dcdc_5V_2 pin 3
-    2:
-        wire right 40
-        point tmp11
+        at label("USBVCC")
+        wire right 40 to fet pin 1
+
+        at opamp_1 pin 1
+        wire right 80 down 100 left 20
+        to fet pin 2
+
+        at fet pin 3
+        wire right 60
         branch:
-            wire down 20
-            add cap(47u)
-            to gnd
+            wire up 20
+            to v5v
         wire right 60
         branch:
-            wire down 20
-            add cap(100n)
-            to gnd
-        wire right 20 up 20
-        to net("5V")
-
+            wire right 20
+            to dcdc_3v3 pin 1
+        wire auto_
+        to dcdc_3v3 pin 3
+
+        at dcdc_3v3:
+            2:
+                wire left 20 down 20
+                to gnd
+
+            5:
+                wire right 40
+                branch:
+                    wire up 20 
+                    to v3v3
+                wire down 20
+                add cap(1u)
+                to gnd
+        
 
-at dcdc_5V_2:
-    1:
-        wire left 20 down 20
-        to gnd
-    4:
-        wire right 20 down 20
-        branch:
-            wire auto 
-            to dcdc_5V_2 pin 2
-        wire auto
-        to tmp11
+    frame:
+        ..title = "5V power"
+
+        # Block for 5V power
+        power_conn = create component:
+            pins: 3
+            arrange:
+                left: 1,3
+                right: 2
+
+        at power_conn:
+            1:
+                wire left 20 down 20
+                branch:
+                    wire auto
+                    to power_conn pin 3
+                wire down 20
+                to gnd
+            2:
+                wire right 20
+                add label("PWRIN")
+                wire right 40
+                add diode()
+                wire right 40
+                branch:
+                    wire down 20
+                    add cap(47u)
+                    to gnd
+                wire right 20
+                point tmp10
+
+        at dcdc_5V:
+            1:
+                wire left 20 down 20
+                to gnd
+            3:
+                wire left 80
+                to tmp10
+
+                wire up 20
+                branch:
+                    wire right 20
+                    add label("VIN")
+                    wire right 40
+                wire up 100 right 80
+                to dcdc_5V_2 pin 3
+            2:
+                wire right 40
+                point tmp11
+                branch:
+                    wire down 20
+                    add cap(47u)
+                    to gnd
+                wire right 60
+                branch:
+                    wire down 20
+                    add cap(100n)
+                    to gnd
+                wire right 20 up 20
+                to v5v
+
+
+        at dcdc_5V_2:
+            1:
+                wire left 20 down 20
+                to gnd
+            4:
+                wire right 20 down 20
+                branch:
+                    wire auto 
+                    to dcdc_5V_2 pin 2
+                wire auto
+                to tmp11
+
+        frame:
+            ..title = "5V indication"
+            ..border = 0
+
+            # Block for 5V leds
+            at v5v
+            wire down 20
+            branch:
+                wire right 20
+                add res(1k)
+                wire right 20
+                point tmp9
+                wire right 20
+
+                add led("green")
+                wire right 20 down 20
+                to gnd
+
+            wire down 40 right 20
+            add res(1k)
+            wire auto_
+            to tmp9

package/jest.config.js

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,190 @@
+// Circuitscript default lib
+
+def net(net_name):
+    return create component:
+        pins: 1
+        display: create graphic:
+            hline: -15, 0, 30
+            pin: 1, 0, 10, 0, 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
+            pin: 1, 0, 10, 0, 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
+        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
+            pin: 1, -width/2 - 20, 0, -width / 2, 0
+            pin: 2, width/2 + 20, 0, width/2, 0
+            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
+            pin: 1, 0, -height/2, 0, -3
+            pin: 2, 0, height/2, 0, 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
+            pin: 1, -width/2 - 20, 0, -width / 2, 0
+            pin: 2, width/2 + 20, 0, width/2, 0
+            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:
+            path: ("M", width/2, -height/2, "L", width/2, height/2,
+                   "M", -width/2, -height/2, "L", -width/2, height/2,
+                   "L", width/2, 0, "L", -width/2, -height/2)
+            pin: 1, -width/2-20, 0, -width/2, 0     # anode
+            pin: 2, width/2 + 20, 0, width/2, 0     # 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:
+            path: ("M", width/2, -height/2, "L", width/2, height/2,
+                   "M", -width/2, -height/2, "L", -width/2, height/2,
+                   "L", width/2, 0, "L", -width/2, -height/2)
+            path: ("M", 0, 8, "L", 5, 18, 
+                   "M", 3, 8, "L", 8, 18)
+            pin: 1, -width/2-20, 0, -width/2, 0     # anode
+            pin: 2, width/2 + 20, 0, width/2, 0     # cathode
+            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
+        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
+            pin: 1, 0, -10, 0, 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:
+            path: ("M", -width/2, 0, 
+                    "L", width/2, 0, 
+                    "L", 0, height, 
+                    "Z")
+            pin: 1, 0, -10, 0, 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
+        type: "net"
+
+def arrow_point():
+    return create component:
+        pins: 1
+        display: create graphic:
+            path: ("M", 15, -5, "L", 20, 0, "L", 15, 5)
+            pin: 1, 0, 0, 20, 0
+        type: "net"

package/package.json

@@ -1,7 +1,8 @@
 {
     "name": "circuitscript",
-    "version": "0.0.7",
+    "version": "0.0.13",
     "description": "Interpreter for the circuitscript language",
+    "homepage": "https://circuitscript.net",
     "engines": {
         "node": ">=16.0"
     },
@@ -45,27 +46,6 @@
         "profile-flame": "node --prof-process --preprocess -j isolate*.log | flamebearer",
         "server": "node server.js"
     },
-    "jest": {
-        "preset": "ts-jest",
-        "verbose": true,
-        "testMatch": [
-            "**/__tests__/test**.ts"
-        ],
-        "transform": {
-            "^.+\\.tsx?$": [
-                "ts-jest",
-                {
-                    "diagnostics": false
-                }
-            ]
-        },
-        "collectCoverageFrom": [
-            "src/**/*.ts"
-        ],
-        "coveragePathIgnorePatterns": [
-            "src/antlr"
-        ]
-    },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
     "dependencies": {

package/src/antlr/CircuitScriptLexer.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 // Generated from ./src/antlr/CircuitScript.g4 by ANTLR 4.13.1
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 import {

package/src/antlr/CircuitScriptParser.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 // Generated from ./src/antlr/CircuitScript.g4 by ANTLR 4.13.1
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 

package/src/antlr/CircuitScriptVisitor.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 // Generated from ./src/antlr/CircuitScript.g4 by ANTLR 4.13.1
 
 import {ParseTreeVisitor} from 'antlr4';

package/src/draw_symbols.ts

@@ -160,7 +160,9 @@ export abstract class SymbolGraphic {
             let dominantBaseline = 'auto';
 
             let useAnchor = anchor;
-            if (this.angle === 180){
+            const isRotation180 = Math.abs(this.angle) === 180;
+
+            if (isRotation180){
                 // Special case to flip the text instead of rotating
                 useAnchor = this.flipTextAnchor(anchor);
             }
@@ -194,7 +196,7 @@ export abstract class SymbolGraphic {
             }
 
             const position = tmpLabel.getLabelPosition();
-            
+
             let useFont = defaultFont;
             if (fontWeight === 'bold'){
                 useFont = 'Inter-Bold';
@@ -210,7 +212,7 @@ export abstract class SymbolGraphic {
                     // weight: fontWeight,
                 });
 
-            if (this.angle === 180){
+            if (isRotation180){
                 text.translate(-position[0], position[1]);
             } else {
                 text.translate(position[0], position[1])