circuitscript 0.0.18 → 0.0.20

package/__tests__/parseScripts.ts

@@ -438,4 +438,156 @@ to v5v`,
     [ '/NET_2', 'led_with_res_0.res_0.COMP_1_1k', 1 ],
     [ '/NET_2', 'led_with_res_1.led_1.COMP_1_0603', 1 ],
     [ '/NET_2', 'led_with_res_1.res_1.COMP_1_1k', 1 ]
-  ]);
+  ]);
+
+
+
+/**
+Tests the `point` branching keyword
+ */
+export const script14 = new ScriptTest(`
+import lib
+
+v5v = supply("5V")
+gnd = dgnd()
+
+at v5v
+wire down 20
+add res(360) down
+wire down 20
+
+point:
+    at v5v
+    wire down 20
+    add res(360) down
+    wire down 20 
+
+    branch:
+        wire left 100
+        to point
+
+    wire down 20
+    add res(360) down
+    wire down 20
+    to gnd
+
+    at point
+    wire right 200 down 20
+    add res(360) down
+    wire down 20
+    to gnd
+
+wire down 20
+add led("red") down
+wire down 40
+to gnd`, [
+    [ '/5V', 'v5v', 1 ],
+    [ '/5V', 'v5v:0', 1 ],
+    [ '/5V', 'res_0.COMP_1_360', 1 ],
+    [ '/5V', 'v5v:1', 1 ],
+    [ '/5V', 'res_1.COMP_1_360', 1 ],
+    [ '/GND', 'gnd', 1 ],
+    [ '/GND', 'gnd:0', 1 ],
+    [ '/GND', 'res_2.COMP_1_360', 2 ],
+    [ '/GND', 'gnd:1', 1 ],
+    [ '/GND', 'res_3.COMP_1_360', 2 ],
+    [ '/GND', 'gnd:2', 1 ],
+    [ '/GND', 'led_0.COMP_1_0603', 2 ],
+    [ '/NET_1', 'res_0.COMP_1_360', 2 ],
+    [ '/NET_1', '_point.__.0', 1 ],
+    [ '/NET_1', 'res_1.COMP_1_360', 2 ],
+    [ '/NET_1', 'res_2.COMP_1_360', 1 ],
+    [ '/NET_1', 'res_3.COMP_1_360', 1 ],
+    [ '/NET_1', 'led_0.COMP_1_0603', 1 ]
+]);
+
+/*
+Test with `paralell` keyword
+*/
+export const script15 = new ScriptTest(`
+import lib
+
+v5v = supply("5V")
+gnd = dgnd()
+
+at v5v
+wire down 20
+
+parallel:
+    wire down 20
+    add res(1k) down
+    wire down 20
+
+parallel:
+    wire right 60 down 20
+    add res(1k) down
+    wire auto
+
+parallel:
+    wire right 120 down 20
+    add res(1k) down
+    wire auto
+
+wire down 20
+to gnd
+`, [
+    ['/5V', 'v5v', 1],
+    ['/5V', 'v5v:0', 1],
+    ['/5V', '_parallel.__.0', 1],
+    ['/5V', 'res_0.COMP_1_1k', 1],
+    ['/5V', 'res_1.COMP_1_1k', 1],
+    ['/5V', 'res_2.COMP_1_1k', 1],
+    ['/GND', 'gnd', 1],
+    ['/GND', 'res_0.COMP_1_1k', 2],
+    ['/GND', '_parallel.__.1', 1],
+    ['/GND', 'res_1.COMP_1_1k', 2],
+    ['/GND', 'res_2.COMP_1_1k', 2],
+    ['/GND', 'gnd:0', 1]
+]);
+
+/*
+Test that consecutive blocks with different block type
+are parsed correctly.
+*/
+export const script16 = new ScriptTest(`
+import lib
+
+v5v = supply("5V")
+gnd = dgnd()
+
+join:
+    at v5v
+    wire down 20
+    add res(1k) down 
+    wire down 20
+
+join:
+    at v5v
+    wire down 20
+    add res(1k) down
+    wire left 100
+
+point:
+    at v5v
+    wire right 20
+    add res(1k) right
+    wire right 20
+    to point
+
+    wire down 20
+    to gnd`, [
+        [ '/5V', 'v5v', 1 ],
+        [ '/5V', 'v5v:0', 1 ],
+        [ '/5V', 'res_0.COMP_1_1k', 1 ],
+        [ '/5V', 'v5v:1', 1 ],
+        [ '/5V', 'res_1.COMP_1_1k', 1 ],
+        [ '/5V', 'v5v:2', 1 ],
+        [ '/5V', 'res_2.COMP_1_1k', 1 ],
+        [ '/GND', 'gnd', 1 ],
+        [ '/GND', 'res_0.COMP_1_1k', 2 ],
+        [ '/GND', '_join.__.0', 1 ],
+        [ '/GND', 'res_1.COMP_1_1k', 2 ],
+        [ '/GND', '_point.__.1', 1 ],
+        [ '/GND', 'res_2.COMP_1_1k', 2 ],
+        [ '/GND', 'gnd:0', 1 ]
+      ]);

package/__tests__/renderData/script7.cst

@@ -0,0 +1,26 @@
+import lib
+
+v5v = supply("5V")
+gnd = dgnd()
+
+# example with `parallel` keyword
+at v5v
+wire down 20
+
+parallel:
+    wire down 20
+    add res(1k) down
+    wire down 20
+
+parallel:
+    wire right 60 down 20
+    add res(1k) down
+    wire auto
+
+parallel:
+    wire right 120 down 20
+    add res(1k) down
+    wire auto
+
+wire down 20
+to gnd

package/__tests__/renderData/script7.cst.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" width="210" height="290.5" viewBox="-25 -25.5 210 290.5"><g transform="matrix(1,0,0,1,0,0)"><path d="M -20 -20.5 L -20 260 M 0 -20.5 L 0 260 M 20 -20.5 L 20 260 M 40 -20.5 L 40 260 M 60 -20.5 L 60 260 M 80 -20.5 L 80 260 M 100 -20.5 L 100 260 M 120 -20.5 L 120 260 M 140 -20.5 L 140 260 M 160 -20.5 L 160 260 M 180 -20.5 L 180 260" fill="none" stroke-dasharray="1,19" stroke-width="1" stroke="#aaaaaa"></path></g><g transform="matrix(1,0,0,1,20,30)"><g><path d="M -15 0 L 15 0" stroke-width="1" stroke="#333333" fill="none"></path><path d="M 0 10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,-5)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">5V</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,60)"><g><path d="M 0 0 L 0 0" stroke-width="2" stroke="#333333"></path></g></g><g transform="matrix(1,0,0,1,20,120)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1k</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R1</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,180)"><g><path d="M 0 0 L 0 0" stroke-width="2" stroke="#333333"></path></g></g><g transform="matrix(1,0,0,1,80,120)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1k</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R2</tspan></text></g></g></g><g transform="matrix(1,0,0,1,140,120)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1k</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R3</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,210)"><g><path d="M -10 0 L 10 0 L 0 10 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M 0 -10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">GND</tspan></text></g></g></g><g><line x1="20" y1="40" x2="20" y2="60" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="20" y1="60" x2="20" y2="80" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="20" y1="60" x2="80" y2="60" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="80" y1="60" x2="80" y2="80" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="80" y1="60" x2="140" y2="60" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="140" y1="60" x2="140" y2="80" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><circle r="2.5" cx="2.5" cy="2.5" transform="matrix(1,0,0,1,17.5,57.5)" fill="#008400" stroke="none"></circle><circle r="2.5" cx="2.5" cy="2.5" transform="matrix(1,0,0,1,77.5,57.5)" fill="#008400" stroke="none"></circle><line x1="20" y1="160" x2="20" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="80" y1="160" x2="80" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="80" y1="180" x2="20" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="140" y1="160" x2="140" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="140" y1="180" x2="80" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="20" y1="180" x2="20" y2="200" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><circle r="2.5" cx="2.5" cy="2.5" transform="matrix(1,0,0,1,17.5,177.5)" fill="#008400" stroke="none"></circle><circle r="2.5" cx="2.5" cy="2.5" transform="matrix(1,0,0,1,77.5,177.5)" fill="#008400" stroke="none"></circle></g><g></g></svg>

package/__tests__/renderData/script8.cst

@@ -0,0 +1,37 @@
+# Test `point` keyword
+
+import lib
+
+v5v = supply("5V")
+gnd = dgnd()
+
+at v5v
+wire down 20
+add res(360) down
+wire down 20
+
+point:
+    at v5v
+    wire down 20
+    add res(360) down
+    wire down 20 
+
+    branch:
+        wire left 100
+        to point
+
+    wire down 20
+    add res(360) down
+    wire down 20
+    to gnd
+
+    at point
+    wire right 200 down 20
+    add res(360) down
+    wire down 20
+    to gnd
+
+wire down 20
+add led("red") down
+wire down 40
+to gnd

package/__tests__/renderData/script8.cst.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" width="290" height="370.5" viewBox="-25 -25.5 290 370.5"><g transform="matrix(1,0,0,1,0,0)"><path d="M -20 -20.5 L -20 340 M 0 -20.5 L 0 340 M 20 -20.5 L 20 340 M 40 -20.5 L 40 340 M 60 -20.5 L 60 340 M 80 -20.5 L 80 340 M 100 -20.5 L 100 340 M 120 -20.5 L 120 340 M 140 -20.5 L 140 340 M 160 -20.5 L 160 340 M 180 -20.5 L 180 340 M 200 -20.5 L 200 340 M 220 -20.5 L 220 340 M 240 -20.5 L 240 340 M 260 -20.5 L 260 340" fill="none" stroke-dasharray="1,19" stroke-width="1" stroke="#aaaaaa"></path></g><g transform="matrix(1,0,0,1,20,30)"><g><path d="M -15 0 L 15 0" stroke-width="1" stroke="#333333" fill="none"></path><path d="M 0 10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,-5)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">5V</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,100)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">360</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R1</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,160)"><g><path d="M 0 0 L 0 0" stroke-width="2" stroke="#333333"></path></g></g><g transform="matrix(1,0,0,1,120,30)"><g><path d="M -15 0 L 15 0" stroke-width="1" stroke="#333333" fill="none"></path><path d="M 0 10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,-5)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">5V</tspan></text></g></g></g><g transform="matrix(1,0,0,1,120,100)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">360</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R2</tspan></text></g></g></g><g transform="matrix(1,0,0,1,120,220)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">360</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R3</tspan></text></g></g></g><g transform="matrix(1,0,0,1,120,290)"><g><path d="M -10 0 L 10 0 L 0 10 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M 0 -10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">GND</tspan></text></g></g></g><g transform="matrix(1,0,0,1,220,220)"><g><path d="M 9.999999999999998 -20 L 10.000000000000002 20 L -9.999999999999998 20 L -10.000000000000002 -20 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M -2.4492935982947065e-15 -40 L -1.2246467991473533e-15 -20 M 2.4492935982947065e-15 40 L 1.2246467991473533e-15 20" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999987,-22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.0000000000000013,22)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-1,6.123233995736766e-17)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="middle" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">360</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,14.999999999999998,-20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">R4</tspan></text></g></g></g><g transform="matrix(1,0,0,1,220,290)"><g><path d="M -10 0 L 10 0 L 0 10 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M 0 -10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">GND</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,210)"><g><path d="M -10 -10 L 10 -10 L 6.123233995736766e-16 10 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M 10 10 L -10 10" stroke-width="1" stroke="#333333" fill="none"></path><path d="M -8 4.898587196589413e-16 L -18 5.000000000000001" stroke-width="1" stroke="#333333" fill="none"></path><path d="M -8 3.0000000000000004 L -18 8.000000000000002" stroke-width="1" stroke="#333333" fill="none"></path><path d="M -1.83697019872103e-15 -30 L -6.123233995736766e-16 -10 M 1.83697019872103e-15 30 L 6.123233995736766e-16 10" stroke-width="2" stroke="#333333"></path><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,1.9999999999999993,-12)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="end" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,2.000000000000001,12)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="8" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">2</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-4.999999999999999,15)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="hanging" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">D1</tspan></text></g><g transform="matrix(6.123233995736766e-17,1,-1,6.123233995736766e-17,-25,15.000000000000002)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="start" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">red</tspan></text></g></g></g><g transform="matrix(1,0,0,1,20,290)"><g><path d="M -10 0 L 10 0 L 0 10 Z" stroke-width="1" stroke="#333333" fill="#ffffff"></path><path d="M 0 -10 L 0 0" stroke-width="2" stroke="#333333"></path><g transform="matrix(1,0,0,1,0,20)"><text fill="#333333" font-family="Open Sans-Regular, Arial" font-size="10" text-anchor="middle" dominant-baseline="text-top" font-weight="regular" transform="matrix(1,0,0,1,0,0)" svgjs:data="{&quot;leading&quot;:&quot;1.3&quot;}"><tspan dy="0" x="0" svgjs:data="{&quot;newLined&quot;:true}">GND</tspan></text></g></g></g><g><line x1="20" y1="40" x2="20" y2="60" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="120" y1="40" x2="120" y2="60" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="20" y1="140" x2="20" y2="160" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="120" y1="140" x2="120" y2="160" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="120" y1="160" x2="20" y2="160" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="120" y1="160" x2="120" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="120" y1="160" x2="220" y2="160" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="220" y1="160" x2="220" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="20" y1="160" x2="20" y2="180" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><circle r="2.5" cx="2.5" cy="2.5" transform="matrix(1,0,0,1,17.5,157.5)" fill="#008400" stroke="none"></circle><circle r="2.5" cx="2.5" cy="2.5" transform="matrix(1,0,0,1,117.5,157.5)" fill="#008400" stroke="none"></circle><line x1="120" y1="260" x2="120" y2="280" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="220" y1="260" x2="220" y2="280" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line><line x1="20" y1="240" x2="20" y2="280" stroke-linecap="square" stroke-width="1" stroke="#008400" fill="none"></line></g><g></g></svg>

package/__tests__/testParse.ts

@@ -1,6 +1,7 @@
 
 import { findItem, findItemByRefDes, runScript } from './helpers.js';
-import { script1, script10, script11, script12, script13, script2, script3, script6, script7, script8, script9 } from './parseScripts.js';
+import { script1, script10, script11, script12, script13, script14, script15, script16, script2, 
+    script3, script6, script7, script8, script9 } from './parseScripts.js';
 
 describe('test parsing', () => {
 
@@ -15,7 +16,10 @@ describe('test parsing', () => {
         ["assignment in at/to/add statement", script10],
         ["net namespace local and global", script11],
         ["create component with __is_net", script12],
-        ["corret nets after function call", script13],
+        ["corret nets after function call and also `join` keyword", script13],
+        ["path with 'point' keyword", script14],
+        ["path with 'parallel' keyword", script15],
+        ["consecutive blocks with 'join' then 'point'", script16]
         
     ])('parse script - %s', async (description, scriptTest) => {
         // Test only parsing, does not check the correctness of the 

package/__tests__/testRender.ts

@@ -14,7 +14,9 @@ describe('Render tests', () => {
         ['simple frame', 'script3.cst'],
         ['drawing functions for graphics', 'script4.cst'],
         ['drawing 180 deg flipped components', 'script5.cst'],
-        ['join command', 'script6.cst']
+        ['join command', 'script6.cst'],
+        ['parallel command', 'script7.cst'],
+        ['point block command', 'script8.cst']
 
     ])('render - %s (%s)', async (title, scriptPath) => {