circuitscript 0.1.2 → 0.1.3

package/dist/cjs/draw_symbols.js

@@ -96,7 +96,7 @@ class SymbolGraphic {
         const bbox = this.drawing.getBoundingBox();
         const originSize = (0, helpers_js_1.milsToMM)(10);
         group.circle(originSize.toNumber())
-            .translate(originSize.neg().div(2).toNumber(), originSize.neg().div(2).toNumber())
+            .translate(originSize.neg().half().toNumber(), originSize.neg().half().toNumber())
             .fill('red')
             .stroke('none');
         group.rect(bbox.width, bbox.height)
@@ -622,6 +622,7 @@ var PlaceHolderCommands;
     PlaceHolderCommands["arc"] = "arc";
     PlaceHolderCommands["circle"] = "circle";
     PlaceHolderCommands["rect"] = "rect";
+    PlaceHolderCommands["crect"] = "crect";
     PlaceHolderCommands["triangle"] = "triangle";
     PlaceHolderCommands["pin"] = "pin";
     PlaceHolderCommands["hpin"] = "hpin";
@@ -672,7 +673,9 @@ class SymbolCustom extends SymbolGraphic {
         const defaultLineColor = globals_js_1.ColorScheme.PinLineColor;
         drawing.addSetLineColor(defaultLineColor);
         drawing.addSetLineWidth((0, ParamDefinition_js_1.numeric)(5));
-        drawing.addRectMM((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), bodyWidth, bodyHeight);
+        const xBody = bodyWidth.half().neg();
+        const yBody = bodyHeight.half().neg();
+        drawing.addRectMM(xBody, yBody, bodyWidth, bodyHeight);
         this.generateDrawingPins(drawing, bodyWidth, bodyHeight, {
             left: leftPins, right: rightPins, top: topPins, bottom: bottomPins
         }, defaultLineColor);
@@ -690,12 +693,12 @@ class SymbolCustom extends SymbolGraphic {
     }
     generateDrawingPins(drawing, bodyWidthMM, bodyHeightMM, pins, defaultLineColor) {
         const { left: leftPins, right: rightPins, top: topPins, bottom: bottomPins } = pins;
-        const leftPinStart = bodyWidthMM.neg().div(2);
-        const rightPinStart = bodyWidthMM.div(2);
-        const topPinStart = bodyHeightMM.neg().div(2);
-        const bottomPinStart = bodyHeightMM.div(2);
-        const pinStartY = bodyHeightMM.neg().div(2);
-        const pinStartX = bodyWidthMM.neg().div(2);
+        const leftPinStart = bodyWidthMM.neg().half();
+        const rightPinStart = bodyWidthMM.half();
+        const topPinStart = bodyHeightMM.neg().half();
+        const bottomPinStart = bodyHeightMM.half();
+        const pinStartY = bodyHeightMM.neg().half();
+        const pinStartX = bodyWidthMM.neg().half();
         const tmpPinSpacing = this.pinSpacing.toNumber();
         leftPins.forEach(pin => {
             const position = pin.position;
@@ -770,7 +773,7 @@ class SymbolCustom extends SymbolGraphic {
             });
         });
         const instanceName = drawing.variables.get('refdes');
-        instanceName && drawing.addLabel(bodyWidthMM.neg().div(2), bodyHeightMM.neg().div(2).sub((0, helpers_js_1.milsToMM)(20)), instanceName, {
+        instanceName && drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.neg().half().sub((0, helpers_js_1.milsToMM)(20)), instanceName, {
             fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolRefDesSize),
             anchor: geometry_js_1.HorizontalAlign.Left,
         });
@@ -778,7 +781,7 @@ class SymbolCustom extends SymbolGraphic {
         acceptedMPNKeys.some(key => {
             const labelValue = drawing.variables.get(key);
             if (labelValue !== undefined) {
-                drawing.addLabel(bodyWidthMM.neg().div(2), bodyHeightMM.div(2).add((0, helpers_js_1.milsToMM)(20)), labelValue, {
+                drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.half().add((0, helpers_js_1.milsToMM)(20)), labelValue, {
                     fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolParamTextSize),
                     anchor: geometry_js_1.HorizontalAlign.Left,
                     vanchor: geometry_js_1.VerticalAlign.Top,
@@ -825,12 +828,12 @@ class SymbolCustomModule extends SymbolCustom {
         this.portHeight = (0, helpers_js_1.milsToMM)(50);
     }
     generateDrawingPins(drawing, bodyWidthMM, bodyHeightMM, pins, defaultLineColor) {
-        const leftPinStart = bodyWidthMM.neg().div(2);
-        const rightPinStart = bodyWidthMM.div(2);
-        const topPinStart = bodyHeightMM.neg().div(2);
-        const bottomPinStart = bodyHeightMM.div(2);
-        const pinStartY = bodyHeightMM.neg().div(2);
-        const pinStartX = bodyWidthMM.neg().div(2);
+        const leftPinStart = bodyWidthMM.neg().half();
+        const rightPinStart = bodyWidthMM.half();
+        const topPinStart = bodyHeightMM.neg().half();
+        const bottomPinStart = bodyHeightMM.half();
+        const pinStartY = bodyHeightMM.neg().half();
+        const pinStartX = bodyWidthMM.neg().half();
         const tmpPinSpacing = this.pinSpacing.toNumber();
         const { left: leftPins, right: rightPins, top: topPins, bottom: bottomPins } = pins;
         leftPins.forEach(pin => {
@@ -963,22 +966,18 @@ class SymbolDrawing {
         this.items.push(geometry_js_1.Geometry.segment([startX, startY], [startX.add(value), startY]));
         return this;
     }
-    addRect(centerX, centerY, width, height) {
-        centerX = (0, helpers_js_1.milsToMM)(centerX);
-        centerY = (0, helpers_js_1.milsToMM)(centerY);
-        width = (0, helpers_js_1.milsToMM)(width);
-        height = (0, helpers_js_1.milsToMM)(height);
-        return this.addRectMM(centerX, centerY, width, height);
+    addRect(x, y, width, height) {
+        return this.addRectMM((0, helpers_js_1.milsToMM)(x), (0, helpers_js_1.milsToMM)(y), (0, helpers_js_1.milsToMM)(width), (0, helpers_js_1.milsToMM)(height));
     }
-    addRectMM(centerX, centerY, width, height) {
-        const width2 = width.div(2);
-        const height2 = height.div(2);
+    addRectMM(x, y, width, height) {
+        const x2 = x.add(width);
+        const y2 = y.add(height);
         this.items.push(geometry_js_1.Geometry.polygon([
-            [centerX.sub(width2), centerY.sub(height2)],
-            [centerX.add(width2), centerY.sub(height2)],
-            [centerX.add(width2), centerY.add(height2)],
-            [centerX.sub(width2), centerY.add(height2)],
-            [centerX.sub(width2), centerY.sub(height2)]
+            [x, y],
+            [x2, y],
+            [x2, y2],
+            [x, y2],
+            [x, y]
         ]));
         return this;
     }
@@ -990,10 +989,10 @@ class SymbolDrawing {
         width = (0, helpers_js_1.milsToMM)(width);
         const line = geometry_js_1.Geometry.line(startX, startY, endX, endY);
         const normLine = line.norm;
-        const dx1 = (0, ParamDefinition_js_1.numeric)(normLine.x).mul(width).div(2);
-        const dy1 = (0, ParamDefinition_js_1.numeric)(normLine.y).mul(width).div(2);
-        const dx2 = (0, ParamDefinition_js_1.numeric)(normLine.x).mul(width.neg()).div(2);
-        const dy2 = (0, ParamDefinition_js_1.numeric)(normLine.y).mul(width.neg()).div(2);
+        const dx1 = (0, ParamDefinition_js_1.numeric)(normLine.x).mul(width).half();
+        const dy1 = (0, ParamDefinition_js_1.numeric)(normLine.y).mul(width).half();
+        const dx2 = (0, ParamDefinition_js_1.numeric)(normLine.x).mul(width.neg()).half();
+        const dy2 = (0, ParamDefinition_js_1.numeric)(normLine.y).mul(width.neg()).half();
         this.items.push(geometry_js_1.Geometry.polygon([
             [dx1.add(startX), dy1.add(startY)],
             [dx2.add(startX), dy2.add(startY)],
@@ -1019,7 +1018,7 @@ class SymbolDrawing {
         return this;
     }
     addModulePort(x, y, width, height, portType = PinTypes_js_1.PinTypes.Any, scaleX = 1, angle = 0) {
-        const height2 = height.div(2);
+        const height2 = height.half();
         let path = [];
         const arrowSize = (0, helpers_js_1.milsToMM)(30);
         if (portType === PinTypes_js_1.PinTypes.Any) {

package/dist/cjs/execute.js

@@ -54,7 +54,7 @@ class ExecutionContext {
         console.log.apply(null, args);
     }
     setupRoot() {
-        const componentRoot = ClassComponent_js_1.ClassComponent.simple(globals_js_1.GlobalNames.__root, 1, '__root');
+        const componentRoot = ClassComponent_js_1.ClassComponent.simple(globals_js_1.GlobalNames.__root, 1);
         componentRoot.typeProp = globals_js_1.ComponentTypes.net;
         componentRoot.displayProp = this.getPointSymbol();
         this.scope.instances.set(globals_js_1.GlobalNames.__root, componentRoot);

package/dist/cjs/globals.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPageSpacingMM = exports.defaultPageMarginMM = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = void 0;
+const ParamDefinition_1 = require("./objects/ParamDefinition");
 var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
@@ -45,11 +46,11 @@ exports.MMToPt = 2.8346456693;
 exports.PxToMM = 0.2645833;
 exports.portWidth = 20;
 exports.portHeight = 2;
-exports.defaultGridSizeUnits = exports.MilsToMM * 100;
+exports.defaultGridSizeUnits = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(100).toNumber();
 exports.defaultZoomScale = 2.5;
 exports.fontDisplayScale = 0.032;
-exports.defaultSymbolLineWidth = exports.MilsToMM * 6;
-exports.defaultWireLineWidth = exports.MilsToMM * 6;
+exports.defaultSymbolLineWidth = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(6).toNumber();
+exports.defaultWireLineWidth = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(6).toNumber();
 exports.defaultPinNameTextSize = 40;
 exports.defaultPinIdTextSize = 30;
 exports.defaultPageMarginMM = 10;
@@ -63,7 +64,7 @@ exports.displayUnits = LengthUnit.mils;
 exports.defaultFont = 'Arial';
 exports.defaultFontBold = 'Arial';
 exports.defaultFontSize = 10;
-exports.junctionSize = exports.MilsToMM * 20;
+exports.junctionSize = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(20);
 exports.PortArrowSize = exports.MilsToMM * 50;
 exports.PortPaddingHorizontal = exports.MilsToMM * 10;
 exports.PortPaddingVertical = exports.MilsToMM * 10;

package/dist/cjs/helpers.js

@@ -349,7 +349,7 @@ function milsToMM(value) {
     if (typeof value === 'number') {
         value = (0, utils_js_1.resolveToNumericValue)(new big_js_1.default(value));
     }
-    return (0, utils_js_1.resolveToNumericValue)(value.toBigNumber().mul(new big_js_1.default(globals_js_1.MilsToMM)));
+    return (0, utils_js_1.resolveToNumericValue)(value.toBigNumber().mul(new big_js_1.default(globals_js_1.MilsToMM)).round(6));
 }
 exports.milsToMM = milsToMM;
 function pxToMM(value) {