circuitscript 0.0.35 → 0.0.37

package/dist/types/BaseVisitor.d.ts

@@ -28,7 +28,6 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | Refe
     };
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorCallback | null | undefined, currentDirectory: string | null, defaultLibsPath: string);
     getExecutor(): ExecutionContext;
-    protected toString(obj: any): string;
     protected setupPrintFunction(context: ExecutionContext): void;
     createNetResolver(executionStack: ExecutionContext[]): (netName: string, netNamespace: string) => {
         found: boolean;

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

@@ -886,7 +886,8 @@ export declare class While_exprContext extends antlr.ParserRuleContext {
 export declare class For_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     For(): antlr.TerminalNode;
-    ID(): antlr.TerminalNode;
+    ID(): antlr.TerminalNode[];
+    ID(i: number): antlr.TerminalNode | null;
     In(): antlr.TerminalNode;
     data_expr(): Data_exprContext;
     expressions_block(): Expressions_blockContext;

package/dist/types/builtinMethods.d.ts

@@ -0,0 +1,3 @@
+import { BaseVisitor } from "./BaseVisitor";
+import { ExecutionContext } from "./execute";
+export declare function linkBuiltInMethods(context: ExecutionContext, visitor: BaseVisitor): void;

package/dist/types/globals.d.ts

@@ -67,7 +67,8 @@ export declare enum ComponentTypes {
     gnd = "gnd",
     net = "net",
     label = "label",
-    point = "point"
+    point = "point",
+    frame = "frame"
 }
 export declare enum ReferenceTypes {
     function = "function",

package/dist/types/helpers.d.ts

@@ -13,7 +13,6 @@ export type ScriptOptions = {
     defaultLibsPath: string;
     dumpNets: boolean;
     dumpData: boolean;
-    kicadNetlistPath: string | null;
     showStats: boolean;
 };
 export declare function prepareFile(textData: string): {

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

@@ -13,7 +13,7 @@ export declare enum FrameParamKeys {
     Width = "width",
     Height = "height",
     PaperSize = "paper_size",
-    SheetFrame = "sheet_frame"
+    SheetType = "sheet_type"
 }
 export declare enum FramePlotDirection {
     Row = "row",

package/libs/lib.cst

@@ -221,45 +221,9 @@ def arrow_point():
             path: ("M", -5, 0, "L", -20, 0)
             hpin: 1, 0, 0, 0, display_pin_id=false
 
-def frame_generator(paper_size_name, paper_width, paper_height, margin_x, margin_y):
-    inner_frame_margin = 50
-    return create component:
-        type: "frame"
-        display: create graphic:
-            fill: "none"
-
-            # outer rect 
-            lineColor: "#cccccc"
-            rect: paper_width/2, paper_height/2, paper_width, paper_height
-
-            # inner rect
-            lineColor: "#111111"
-            rect: paper_width/2, paper_height/2, paper_width - 2 * margin_x, paper_height - 2 * margin_y
-
-            rect: (paper_width/2, paper_height/2, 
-                    paper_width - 2 * margin_x + inner_frame_margin * 2, 
-                    paper_height - 2 * margin_y  + inner_frame_margin * 2)
-
-        params:
-            paper_size: paper_size_name
-            paper_width: paper_width
-            paper_height: paper_height
-            
-            offset_x: margin_x
-            offset_y: margin_y
-            
-            grid_width: paper_width - 2 * margin_x
-            grid_height: paper_height - 2 * margin_y
-
-
-def frame_A4 ():
-    paper_width = 297 / 25.4 * 1000
-    paper_height = 210 / 25.4 * 1000
-    margin_x = 400
-    margin_y = 400
-
-    inner_frame_margin = 50
-
+def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin_y, 
+    col_display_value, row_display_value, inner_frame_margin = 50):
+    
     horizontal_1 = margin_x - inner_frame_margin
     horizontal_2 = paper_width - margin_x + inner_frame_margin
 
@@ -274,8 +238,11 @@ def frame_A4 ():
 
     fontSize = 30
 
-    ratio_x = 0.16667
-    ratio_y = 0.25
+    num_columns = len(col_display_value)
+    num_rows = len(row_display_value)
+
+    ratio_x = 1 / num_columns
+    ratio_y = 1 / num_rows
 
     return create component:
         type: "frame"
@@ -294,170 +261,47 @@ def frame_A4 ():
                     paper_width - 2 * margin_x + inner_frame_margin * 2, 
                     paper_height - 2 * margin_y  + inner_frame_margin * 2)
 
-            hline: horizontal_1, (tmp_y + tmp_height * ratio_y), inner_frame_margin
-            hline: horizontal_1, (tmp_y + tmp_height * ratio_y * 2), inner_frame_margin
-            hline: horizontal_1, (tmp_y + tmp_height * ratio_y * 3), inner_frame_margin
-
-            hline: horizontal_2, (tmp_y + tmp_height * ratio_y), -inner_frame_margin
-            hline: horizontal_2, (tmp_y + tmp_height * ratio_y * 2), -inner_frame_margin
-            hline: horizontal_2, (tmp_y + tmp_height * ratio_y * 3), -inner_frame_margin
-
-            vline: (tmp_x + tmp_width * ratio_x),     vertical_1, inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 2), vertical_1, inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 3), vertical_1, inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 4), vertical_1, inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 5), vertical_1, inner_frame_margin
+            for i in range(1, num_rows):
+                hline: horizontal_1, (tmp_y + tmp_height * ratio_y * i), inner_frame_margin
+                hline: horizontal_2, (tmp_y + tmp_height * ratio_y * i), -inner_frame_margin
 
-            vline: (tmp_x + tmp_width * ratio_x),     vertical_2, -inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 2), vertical_2, -inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 3), vertical_2, -inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 4), vertical_2, -inner_frame_margin
-            vline: (tmp_x + tmp_width * ratio_x * 5), vertical_2, -inner_frame_margin
+            for i in range(1, num_columns):
+                vline: (tmp_x + tmp_width * ratio_x * i),     vertical_1, inner_frame_margin
+                vline: (tmp_x + tmp_width * ratio_x * i),     vertical_2, -inner_frame_margin
 
             # labels on the columns
-            text: 
-                content: "1"
-                offset: tmp_x + tmp_width * ratio_x * 0.5, tmp_y + inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "1"
-                offset: tmp_x + tmp_width * ratio_x * 0.5, tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "2"
-                offset: tmp_x + tmp_width * ratio_x * 1.5, tmp_y + inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "2"
-                offset: tmp_x + tmp_width * ratio_x * 1.5, tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "3"
-                offset: tmp_x + tmp_width * ratio_x * 2.5, tmp_y + inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "3"
-                offset: tmp_x + tmp_width * ratio_x * 2.5, tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "4"
-                offset: tmp_x + tmp_width * ratio_x * 3.5, tmp_y + inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "4"
-                offset: tmp_x + tmp_width * ratio_x * 3.5, tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-        
-            text: 
-                content: "5"
-                offset: tmp_x + tmp_width * ratio_x * 4.5, tmp_y + inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "5"
-                offset: tmp_x + tmp_width * ratio_x * 4.5, tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "6"
-                offset: tmp_x + tmp_width * ratio_x * 5.5, tmp_y + inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "6"
-                offset: tmp_x + tmp_width * ratio_x * 5.5, tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            # labels on the rows
-            text: 
-                content: "A"
-                offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 0.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "A"
-                offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 0.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "B"
-                offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 1.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "B"
-                offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 1.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "C"
-                offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 2.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "C"
-                offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 2.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "D"
-                offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 3.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
-
-            text: 
-                content: "D"
-                offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * 3.5
-                fontSize: fontSize
-                anchor: "middle"
-                vanchor: "middle"
+            for i in col_display_value:
+                text: 
+                    content: i
+                    offset: tmp_x + tmp_width * ratio_x * (0.5 + (i-1)), tmp_y + inner_frame_margin * 0.5 + 2
+                    fontSize: fontSize
+                    anchor: "middle"
+                    vanchor: "middle"
+
+                text: 
+                    content: i
+                    offset: tmp_x + tmp_width * ratio_x * (0.5 + (i-1)), tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
+                    fontSize: fontSize
+                    anchor: "middle"
+                    vanchor: "middle"
+
+            for index, val in enumerate(row_display_value):
+                text: 
+                    content: val
+                    offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * (0.5 + index)
+                    fontSize: fontSize
+                    anchor: "middle"
+                    vanchor: "middle"
+
+                text: 
+                    content: val
+                    offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * (0.5 + index)
+                    fontSize: fontSize
+                    anchor: "middle"
+                    vanchor: "middle"
 
         params:
-            paper_size: "A4"
+            paper_size: paper_size_name
             paper_width: paper_width
             paper_height: paper_height
             
@@ -467,39 +311,48 @@ def frame_A4 ():
             grid_width: paper_width - 2 * margin_x
             grid_height: paper_height - 2 * margin_y
 
+def sheet_A1():
+    paper_width = toMils(841)
+    paper_height = toMils(594)
+    margin = 400
 
-def frame_generator(paper_size_name, paper_width, paper_height, margin_x, margin_y, inner_frame_margin = 50):
-    return create component:
-        type: "frame"
-        display: create graphic:
-            fill: "none"
+    return sheet_generator("A1", paper_width, paper_height, margin, margin, 
+        range(1, 17), ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"])
 
-            # outer rect 
-            lineColor: "#cccccc"
-            rect: paper_width/2, paper_height/2, paper_width, paper_height
+def sheet_A2():
+    paper_width = toMils(594)
+    paper_height = toMils(420)
+    margin = 400
 
-            # inner rect
-            lineColor: "#111111"
-            rect: paper_width/2, paper_height/2, paper_width - 2 * margin_x, paper_height - 2 * margin_y
+    return sheet_generator("A2", paper_width, paper_height, margin, margin, 
+        range(1, 13), ["A", "B", "C", "D", "E", "F", "G", "H"])
 
-            rect: (paper_width/2, paper_height/2, 
-                    paper_width - 2 * margin_x + inner_frame_margin * 2, 
-                    paper_height - 2 * margin_y  + inner_frame_margin * 2)
+def sheet_A3():
+    paper_width = toMils(420)
+    paper_height = toMils(297)
+    margin = 400
 
-        params:
-            paper_size: paper_size_name
-            paper_width: paper_width
-            paper_height: paper_height
-            
-            offset_x: margin_x
-            offset_y: margin_y
-            
-            grid_width: paper_width - 2 * margin_x
-            grid_height: paper_height - 2 * margin_y
+    return sheet_generator("A3", paper_width, paper_height, margin, margin, 
+        range(1, 9), ["A", "B", "C", "D", "E", "F"])
+
+def sheet_A4():
+    paper_width = toMils(297)
+    paper_height = toMils(210)
+    margin = 400
+
+    return sheet_generator("A4", paper_width, paper_height, margin, margin, 
+        range(1, 7), ["A", "B", "C", "D"])
+
+def sheet_A5():
+    paper_width = toMils(210)
+    paper_height = toMils(148)
+    margin = 400
+
+    return sheet_generator("A5", paper_width, paper_height, margin, margin, range(1, 5), ["A", "B", "C"])
 
-def frame_A6():
-    paper_width = 148 / 25.4 * 1000
-    paper_height = 105 / 25.4 * 1000
+def sheet_A6():
+    paper_width = toMils(148)
+    paper_height = toMils(105)
     margin = 400
 
-    return frame_generator("A6", paper_width, paper_height, margin, margin, 20)
+    return sheet_generator("A6", paper_width, paper_height, margin, margin, range(1, 4), ["A", "B"])

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.0.35",
+    "version": "0.0.37",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -68,7 +68,8 @@
         "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",
-        "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"
+        "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",
+        "changelog": "auto-changelog --handlebars-setup ../changelog/helper.js"
     },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
@@ -90,5 +91,10 @@
     },
     "volta": {
         "node": "18.12.1"
+    },
+    "auto-changelog": {
+        "output": "CHANGELOG.md",
+        "commitLimit": false,
+        "template": "../changelog/template.hbs"
     }
 }