circuitscript 0.0.24 → 0.0.25

package/libs/lib.cst

@@ -0,0 +1,183 @@
+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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.0.24",
+    "version": "0.0.25",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -10,7 +10,7 @@
     "module": "./dist/esm/index.mjs",
     "types": "./dist/types/index.d.ts",
     "bin": {
-        "circuitscript": "./dist/esm/main.mjs"
+        "circuitscript": "./dist/cjs/main.js"
     },
     "exports": {
         ".": {
@@ -19,7 +19,9 @@
         }
     },
     "files": [
-        "dist"
+        "dist",
+        "fonts",
+        "libs"
     ],
     "devDependencies": {
         "@types/figlet": "^1.5.8",
@@ -28,6 +30,7 @@
         "@types/svgdom": "^0.1.2",
         "@typescript-eslint/eslint-plugin": "~5.59",
         "@typescript-eslint/parser": "~5.59",
+        "antlr4ng-cli": "^2.0.0",
         "eslint": "~8.38",
         "eslint-config-prettier": "~8.8",
         "eslint-plugin-jest": "~27.2",
@@ -59,9 +62,11 @@
         "prettier": "prettier --config .prettierrc --write .",
         "test:watch": "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",
         "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"
+        "server": "node server.js",
+        "pack-local": "npm pack; rm circuitscript-install.tgz; mv `ls | grep circuitscript` circuitscript-install.tgz; cp circuitscript-install.tgz ../circuitscript-vscode/client; cp circuitscript-install.tgz ../circuitscript-vscode/server"
     },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
@@ -69,12 +74,12 @@
         "@dagrejs/graphlib": "2.1.13",
         "@flatten-js/core": "1.5.5",
         "@svgdotjs/svg.js": "3.2.0",
-        "antlr4": "^4.13.0",
+        "antlr4ng": "^3.0.4",
         "commander": "^11.1.0",
         "express": "^4.18.2",
         "figlet": "^1.7.0",
         "lodash": "^4.17.21",
-        "svgdom": "^0.1.14",
+        "svgdom": "0.1.14",
         "this-file": "^2.0.3",
         "tslib": "~2.5",
         "ws": "^8.14.2"