circuitscript 0.5.4 → 0.5.6

package/dist/types/utils.d.ts

@@ -1,4 +1,4 @@
-import { ParserRuleContext, Token } from "antlr4ng";
+import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { SequenceAction, SequenceItem } from './objects/ExecutionScope.js';
 import { BlockTypes } from "./objects/BlockTypes.js";
@@ -24,43 +24,18 @@ export declare function resizeBounds(bounds: BoundBox, value: number): BoundBox;
 export declare function printBounds(bounds: BoundBox): string;
 export declare function resizeToNearestGrid(bounds: BoundBox, gridSize?: number): BoundBox;
 export declare function toNearestGrid(value: number, gridSize: number): number;
+export declare function toNearestGrid2(value: number, gridSize: number): number;
 export declare function getBoundsSize(bounds: BoundBox): {
     width: number;
     height: number;
 };
 export declare function getPortType(component: ClassComponent): string | null;
-export declare function throwWithContext(context: ParserRuleContext, messageOrError: string | BaseError): void;
-export declare function throwWithToken(message: string, token: Token): void;
-export declare function throwWithTokenRange(message: string, startToken: Token, endToken?: Token): void;
 export declare function combineMaps(map1: Map<string, any>, map2: Map<string, any>): Map<string, any>;
 export declare function isPointWithinArea(point: [x: number, y: number], bounds: BoundBox2): boolean;
 export declare function areasOverlap(area1: BoundBox2, area2: BoundBox2): boolean;
 export declare function sequenceActionString(sequenceAction: SequenceAction): string;
 export declare function generateDebugSequenceAction(sequence: SequenceItem[]): string[];
 export declare function getBlockTypeString(type: BlockTypes): string;
-export declare class BaseError extends Error {
-    name: string;
-    message: string;
-    startToken?: Token;
-    endToken?: Token;
-    filePath?: string;
-    constructor(message: string, startTokenOrCtx?: Token | ParserRuleContext, endToken?: Token, filePath?: string);
-    toString(): string;
-}
-export declare function getLinePositionAsString(ctx: ParserRuleContext): string | null;
-export declare class ParseSyntaxError extends BaseError {
-    name: string;
-}
-export declare class ParseError extends ParseSyntaxError {
-    name: string;
-}
-export declare class RuntimeExecutionError extends BaseError {
-    name: string;
-}
-export declare class RenderError extends Error {
-    stage?: string;
-    constructor(message: string, stage?: string);
-}
 export type ExecutionWarning = {
     message: string;
     fileName?: string;

package/dist/types/visitor.d.ts

@@ -11,7 +11,7 @@ import { NodeScriptEnvironment } from './environment/environment.js';
 export declare class ParserVisitor extends BaseVisitor {
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorHandler | null | undefined, environment: NodeScriptEnvironment);
     componentCreationIndex: number;
-    creationCtx: Map<Wire | ClassComponent, ParserRuleContext>;
+    creationCtx: Map<ClassComponent | Wire, ParserRuleContext>;
     visitPin_select_expr: (ctx: Pin_select_exprContext) => void;
     trackNewComponentCreated: (callback: () => void) => boolean;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;

package/libs/std.cst

@@ -7,7 +7,7 @@ def net(net_name, net_type = "any"):
         display: create graphic (params):
             hline: -50, 0, 100
             vpin: 1, 0, 50, -50, display_id=false
-            label: params.net_name, 0, -15, fontSize=50, anchor="middle"
+            label: params.net_name, 0, -15, fontSize=50, anchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -39,7 +39,7 @@ def port(value, portType="input"):
         copy: true
         display: create graphic (params):
             text_color: "#222"
-            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
+            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="center", portType=portType
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
         params:
@@ -58,7 +58,7 @@ def res(value):
             hpin: 1, -width/2 - 30, 0, 30, display_id=false
             hpin: 2, width/2 + 30, 0, -30, display_id=false
             label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
-            label: params.value, 0, 0, fontSize=30, anchor="middle", vanchor="middle"
+            label: params.value, 0, 0, fontSize=30, anchor="center", vanchor="center"
         type: "res"
         params:
             value: value
@@ -78,8 +78,8 @@ def cap(value):
             hline: -width/2, -20, width
             vpin: 1, 0, -100, 80, display_id=false
             vpin: 2, 0, 100, -80, display_id=false
-            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="middle"
-            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="middle"
+            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="center"
+            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="center"
         type: "cap"
         params:
             value: value
@@ -101,7 +101,7 @@ def ind(value):
             hpin: 1, -width/2 - 100, 0, 100, display_id=false
             hpin: 2, width/2 + 100, 0, -100, display_id=false
             label: (params.refdes, -width/2, -height/2 - 25 , fontSize=50, anchor="left")
-            label: (params.value, 0, 50, fontSize=50, anchor="middle", vanchor="middle")
+            label: (params.value, 0, 50, fontSize=50, anchor="center", vanchor="center")
         params:
             value: value
 
@@ -119,7 +119,7 @@ def diode():
             vline: width/2, -height/2, height
             hpin: 1, -width/2-100, 0, 100    # cathode
             hpin: 2, width/2 + 100, 0, -100  # anode
-            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
+            label: params.refdes, 0, -100, fontSize=50, anchor="center", vanchor="top"
 
 def led(color):
     width = 100
@@ -140,8 +140,8 @@ def led(color):
                     "M", 180, 60, "L", 180, 90, "L", 150, 90)
             hpin: 1, width/2 + 100, 0, -100  # cathode
             hpin: 2, -width/2-100, 0, 100    # anode
-            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
-            label: params.color, 0, 100, fontSize=40, anchor="middle", vanchor="bottom"
+            label: params.refdes, 0, -100, fontSize=50, anchor="center", vanchor="top"
+            label: params.color, 0, 100, fontSize=40, anchor="center", vanchor="bottom"
         params:
             size: "0603"
             color: color
@@ -159,7 +159,7 @@ def cgnd():
             hline: -10, 5, 20
             hline: -5, 10, 10
             vpin: 1, 0, -10, 10, display_id=false
-            label: params.net_name, 0, 22, fontSize=50, anchor="middle"
+            label: params.net_name, 0, 22, fontSize=50, anchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -175,7 +175,7 @@ def dgnd(net_name="GND"):
         display: create graphic (params):
             triangle: 0, 0, 0, height, width
             vpin: 1, 0, -50, 50, display_id=false
-            label: params.net_name, 0, height + 50, fontSize=50, anchor="middle", vanchor="middle"
+            label: params.net_name, 0, height + 50, fontSize=50, anchor="center", vanchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -296,30 +296,30 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
                     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"
+                    anchor: "center"
+                    vanchor: "center"
 
                 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"
+                    anchor: "center"
+                    vanchor: "center"
 
             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"
+                    anchor: "center"
+                    vanchor: "center"
 
                 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"
+                    anchor: "center"
+                    vanchor: "center"
 
             # Draw title frame
             text: 
@@ -375,47 +375,47 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
             grid_height: paper_height - 2 * margin_y
 
 def sheet_A1():
-    paper_width = toMils(841)
-    paper_height = toMils(594)
+    paper_width = to_mils(841)
+    paper_height = to_mils(594)
     margin = 400
 
     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"])
 
 def sheet_A2():
-    paper_width = toMils(594)
-    paper_height = toMils(420)
+    paper_width = to_mils(594)
+    paper_height = to_mils(420)
     margin = 400
 
     return sheet_generator("A2", paper_width, paper_height, margin, margin, 
         range(1, 13), ["A", "B", "C", "D", "E", "F", "G", "H"])
 
 def sheet_A3():
-    paper_width = toMils(420)
-    paper_height = toMils(297)
+    paper_width = to_mils(420)
+    paper_height = to_mils(297)
     margin = 400
 
     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)
+    paper_width = to_mils(297)
+    paper_height = to_mils(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)
+    paper_width = to_mils(210)
+    paper_height = to_mils(148)
     margin = 400
 
     return sheet_generator("A5", paper_width, paper_height, margin, margin, range(1, 5), ["A", "B", "C"])
 
 def sheet_A6(revision="V1"):
-    paper_width = toMils(148)
-    paper_height = toMils(105)
+    paper_width = to_mils(148)
+    paper_height = to_mils(105)
     margin = 400
 
     tmp_sheet = 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.5.4",
+    "version": "0.5.6",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -39,6 +39,7 @@
         "eslint-config-prettier": "~8.8",
         "eslint-plugin-jest": "~27.2",
         "jest": "~29.5",
+        "license-check-and-add": "^4.0.5",
         "prettier": "~2.8",
         "rimraf": "~5.0",
         "source-map-support": "^0.5.21",
@@ -76,7 +77,9 @@
         "changelog": "auto-changelog --handlebars-setup ../changelog/helper.js -p",
         "preversion": "npm run test",
         "version": "npm run changelog && git add CHANGELOG.md",
-        "copy-assets": "mkdir -p dist/fonts && mkdir -p dist/libs && cp -r fonts dist/ && cp -r libs dist/"
+        "copy-assets": "mkdir -p dist/fonts && mkdir -p dist/libs && cp -r fonts dist/ && cp -r libs dist/",
+        "license:check": "license-check-and-add check -f licensecheck.json",
+        "license:add": "license-check-and-add add -f licensecheck.json"
     },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",