circuitscript 0.0.38 → 0.1.2

package/dist/cjs/geometry.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Textbox = void 0;
+exports.VerticalAlignProp = exports.HorizontalAlignProp = exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Textbox = void 0;
 const core_1 = __importDefault(require("@flatten-js/core"));
 const sizing_js_1 = require("./sizing.js");
 const globals_js_1 = require("./globals.js");
@@ -16,7 +16,9 @@ class Textbox extends core_1.default.Polygon {
     }
     constructor(id, text, anchorPoint, polygon, style, bounds, label) {
         super(polygon.vertices);
-        this.anchorPoint = [0, 0];
+        this.anchorPoint = [
+            (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)
+        ];
         this.boundingBox = { width: -1, height: -1 };
         this.font = 'default';
         this.id = id;
@@ -43,8 +45,8 @@ class Textbox extends core_1.default.Polygon {
         else {
             throw 'Invalid string passed into textbox';
         }
-        const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
-        const { width, height, box } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize * globals_js_1.fontDisplayScale, fontWeight, anchor, vanchor);
+        const { fontSize = (0, ParamDefinition_js_1.numeric)(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
+        const { box } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize.mul(globals_js_1.fontDisplayScale).toNumber(), fontWeight, anchor, vanchor);
         let polygonCoords = [];
         let anchorOffsetX = 0;
         let anchorOffsetY = 0;
@@ -103,20 +105,31 @@ class Textbox extends core_1.default.Polygon {
             anchorOffsetY += paddingVert / 2;
         }
         const polygon = new core_1.default.Polygon(polygonCoords);
-        return new Textbox(id, useText, [x + anchorOffsetX, y + anchorOffsetY], polygon, style, box, label);
+        return new Textbox(id, useText, [x.add(anchorOffsetX), y.add(anchorOffsetY)], polygon, style, box, label);
     }
     rotate(angle, origin) {
         const feature = super.rotate(angle, origin);
         const newAnchorPoint = this.transformAnchorPoint(segment => segment.rotate(angle, origin));
-        return new Textbox(this.id, this.text, newAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+        const tmpAnchorPoint = [
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[0]),
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[1])
+        ];
+        return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transform(matrix) {
         const feature = super.transform(matrix);
         const newAnchorPoint = this.transformAnchorPoint(segment => segment.transform(matrix));
-        return new Textbox(this.id, this.text, newAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+        const tmpAnchorPoint = [
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[0]),
+            (0, ParamDefinition_js_1.numeric)(newAnchorPoint[1])
+        ];
+        return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transformAnchorPoint(callback) {
-        const anchorPointSegment = new core_1.default.Segment(new core_1.default.Point(0, 0), new core_1.default.Point(this.anchorPoint));
+        const anchorPointSegment = new core_1.default.Segment(new core_1.default.Point(0, 0), new core_1.default.Point([
+            this.anchorPoint[0].toNumber(),
+            this.anchorPoint[1].toNumber(),
+        ]));
         const newSegment = callback(anchorPointSegment);
         const lastPoint = newSegment.vertices[newSegment.vertices.length - 1];
         return [
@@ -137,7 +150,7 @@ class GeometryProp {
 exports.GeometryProp = GeometryProp;
 class Geometry {
     static point(x, y) {
-        return new core_1.default.Point(x, y);
+        return new core_1.default.Point(x.toNumber(), y.toNumber());
     }
     static line(x1, y1, x2, y2) {
         return new core_1.default.Line(Geometry.point(x1, y1), Geometry.point(x2, y2));
@@ -152,7 +165,12 @@ class Geometry {
         return new core_1.default.Segment(Geometry.point(start[0], start[1]), Geometry.point(end[0], end[1]));
     }
     static polygon(coords) {
-        return new core_1.default.Polygon(coords);
+        return new core_1.default.Polygon(coords.map(item => {
+            return [
+                item[0].toNumber(),
+                item[1].toNumber(),
+            ];
+        }));
     }
     static multiline(coords) {
         const segments = [];
@@ -162,11 +180,13 @@ class Geometry {
         return new core_1.default.Multiline(segments);
     }
     static arc(center, radius, startAngle, endAngle, sweepDirection) {
-        return new core_1.default.Arc(Geometry.point(center[0], center[1]), radius, startAngle, endAngle, sweepDirection);
+        return new core_1.default.Arc(Geometry.point(center[0], center[1]), radius.toNumber(), startAngle.toNumber(), endAngle.toNumber(), sweepDirection);
     }
     static getCoords(item) {
         const points = item.vertices.map(vertex => {
-            return [vertex.x, vertex.y];
+            return [
+                (0, ParamDefinition_js_1.numeric)(vertex.x), (0, ParamDefinition_js_1.numeric)(vertex.y)
+            ];
         });
         return points;
     }
@@ -213,10 +233,10 @@ class Geometry {
             if (feature instanceof Textbox) {
                 const [x, y] = feature.anchorPoint;
                 box = {
-                    xmin: box.xmin + x,
-                    ymin: box.ymin + y,
-                    xmax: box.xmax + x,
-                    ymax: box.ymax + y
+                    xmin: box.xmin + x.toNumber(),
+                    ymin: box.ymin + y.toNumber(),
+                    xmax: box.xmax + x.toNumber(),
+                    ymax: box.ymax + y.toNumber()
                 };
             }
             if (box.xmin === undefined) {
@@ -273,7 +293,7 @@ class Geometry {
                 for (let i = 0; i < coords.length; i++) {
                     const [x, y] = coords[i];
                     const command = (i === 0) ? 'M' : 'L';
-                    path.push(`${command}`, x, y);
+                    path.push(`${command}`, x.toNumber(), y.toNumber());
                 }
                 if (isClosedPolygon) {
                     path.push('Z');
@@ -306,8 +326,8 @@ class Geometry {
         const existingSegments = [];
         wirePoints.forEach(points => {
             const tmpPoints = points.map(pt => {
-                const roundedX = (0, utils_js_1.roundValue)(pt.x);
-                const roundedY = (0, utils_js_1.roundValue)(pt.y);
+                const roundedX = (0, utils_js_1.roundValue)(pt.x).toNumber();
+                const roundedY = (0, utils_js_1.roundValue)(pt.y).toNumber();
                 return new core_1.default.Point(roundedX, roundedY);
             });
             for (let i = 0; i < tmpPoints.length - 1; i++) {
@@ -520,6 +540,19 @@ var VerticalAlign;
     VerticalAlign["Middle"] = "middle";
     VerticalAlign["Bottom"] = "bottom";
 })(VerticalAlign || (exports.VerticalAlign = VerticalAlign = {}));
+var HorizontalAlignProp;
+(function (HorizontalAlignProp) {
+    HorizontalAlignProp["Start"] = "start";
+    HorizontalAlignProp["Middle"] = "middle";
+    HorizontalAlignProp["End"] = "end";
+})(HorizontalAlignProp || (exports.HorizontalAlignProp = HorizontalAlignProp = {}));
+var VerticalAlignProp;
+(function (VerticalAlignProp) {
+    VerticalAlignProp["Hanging"] = "hanging";
+    VerticalAlignProp["Middle"] = "middle";
+    VerticalAlignProp["Central"] = "central";
+    VerticalAlignProp["TextTop"] = "text-top";
+})(VerticalAlignProp || (exports.VerticalAlignProp = VerticalAlignProp = {}));
 function getArcPointRadians(centerX, centerY, radius, angleRads) {
     const dx = Math.cos(angleRads);
     const dy = Math.sin(angleRads);

package/dist/cjs/globals.js

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderFlags = exports.GlobalDocumentName = 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;
+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;
 var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
-    GlobalNames["gnd"] = "gnd";
-    GlobalNames["DefaultResistor"] = "res";
-    GlobalNames["DefaultCapacitor"] = "cap";
-    GlobalNames["DefaultInductor"] = "ind";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (exports.GlobalNames = GlobalNames = {}));
 exports.NoNetText = 'NO_NET';
@@ -15,6 +11,10 @@ var ParamKeys;
 (function (ParamKeys) {
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
+    ParamKeys["flip"] = "flip";
+    ParamKeys["flipX"] = "flipX";
+    ParamKeys["flipY"] = "flipY";
+    ParamKeys["angle"] = "angle";
 })(ParamKeys || (exports.ParamKeys = ParamKeys = {}));
 var LayoutDirection;
 (function (LayoutDirection) {
@@ -25,6 +25,8 @@ var SymbolPinSide;
 (function (SymbolPinSide) {
     SymbolPinSide["Left"] = "left";
     SymbolPinSide["Right"] = "right";
+    SymbolPinSide["Top"] = "top";
+    SymbolPinSide["Bottom"] = "bottom";
 })(SymbolPinSide || (exports.SymbolPinSide = SymbolPinSide = {}));
 var LengthUnit;
 (function (LengthUnit) {
@@ -74,11 +76,10 @@ exports.ColorScheme = {
 };
 var ComponentTypes;
 (function (ComponentTypes) {
-    ComponentTypes["gnd"] = "gnd";
     ComponentTypes["net"] = "net";
-    ComponentTypes["label"] = "label";
-    ComponentTypes["point"] = "point";
-    ComponentTypes["frame"] = "frame";
+    ComponentTypes["graphic"] = "graphic";
+    ComponentTypes["port"] = "port";
+    ComponentTypes["module"] = "module";
 })(ComponentTypes || (exports.ComponentTypes = ComponentTypes = {}));
 var ReferenceTypes;
 (function (ReferenceTypes) {
@@ -100,8 +101,12 @@ var FrameType;
     FrameType[FrameType["Frame"] = 1] = "Frame";
     FrameType[FrameType["Sheet"] = 2] = "Sheet";
 })(FrameType || (exports.FrameType = FrameType = {}));
+exports.ModuleContainsKeyword = 'contains';
 exports.GlobalDocumentName = 'document';
 exports.RenderFlags = {
     ShowElementFrames: false,
     ShowOrigin: false,
+    ShowGridOrigin: false,
+    ShowLabelBoxBounds: false,
+    ShowLabelOrigin: false,
 };

package/dist/cjs/helpers.js

@@ -22,6 +22,8 @@ const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
 const SemanticTokenVisitor_js_1 = require("./SemanticTokenVisitor.js");
 const globals_js_1 = require("./globals.js");
 const Frame_js_1 = require("./objects/Frame.js");
+const big_js_1 = __importDefault(require("big.js"));
+const logger_js_1 = require("./logger.js");
 var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
@@ -200,7 +202,13 @@ function renderScript(scriptData, outputPath, options) {
         const action = tmp[0];
         if (action === ExecutionScope_js_1.SequenceAction.Wire) {
             tmp[2] = tmp[2].map(item2 => {
-                return [item2.direction, item2.value].join(",");
+                const lengthValue = item2.value;
+                const useValue = [item2.direction];
+                if (lengthValue !== null) {
+                    useValue.push(lengthValue.value);
+                    useValue.push(lengthValue.type);
+                }
+                return useValue.join(",");
             }).join(" ");
         }
         else if (action === ExecutionScope_js_1.SequenceAction.Frame) {
@@ -238,8 +246,10 @@ function renderScript(scriptData, outputPath, options) {
         showStats && console.log('Layout took:', layoutTimer.lap());
         dumpData && (0, fs_1.writeFileSync)('dump/raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new utils_js_1.SimpleStopwatch();
-        const svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames);
+        const renderLogger = new logger_js_1.Logger();
+        const svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger);
         showStats && console.log('Render took:', generateSvgTimer.lap());
+        dumpData && (0, fs_1.writeFileSync)('dump/raw-render.txt', renderLogger.dump());
         svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
         if (outputPath) {
             if (fileExtension === 'svg') {
@@ -336,7 +346,10 @@ class UnitDimension {
 }
 exports.UnitDimension = UnitDimension;
 function milsToMM(value) {
-    return value * globals_js_1.MilsToMM;
+    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)));
 }
 exports.milsToMM = milsToMM;
 function pxToMM(value) {