circuitscript 0.0.38 → 0.1.2

package/dist/esm/geometry.mjs

@@ -1,13 +1,15 @@
 import Flatten from '@flatten-js/core';
 import { measureTextSize2 } from './sizing.mjs';
 import { defaultFont, fontDisplayScale, PortArrowSize, PortPaddingHorizontal, PortPaddingVertical } from './globals.mjs';
-import { NumericValue } from './objects/ParamDefinition.mjs';
+import { numeric, NumericValue } from './objects/ParamDefinition.mjs';
 import { AllPinTypes, PinTypes } from './objects/PinTypes.mjs';
 import { roundValue } from './utils.mjs';
 export class Textbox extends Flatten.Polygon {
     id;
     text;
-    anchorPoint = [0, 0];
+    anchorPoint = [
+        numeric(0), numeric(0)
+    ];
     boundingBox = { width: -1, height: -1 };
     polygon;
     font = 'default';
@@ -43,8 +45,8 @@ export class Textbox extends Flatten.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 } = measureTextSize2(useText, defaultFont, fontSize * fontDisplayScale, fontWeight, anchor, vanchor);
+        const { fontSize = numeric(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
+        const { box } = measureTextSize2(useText, defaultFont, fontSize.mul(fontDisplayScale).toNumber(), fontWeight, anchor, vanchor);
         let polygonCoords = [];
         let anchorOffsetX = 0;
         let anchorOffsetY = 0;
@@ -103,20 +105,31 @@ export class Textbox extends Flatten.Polygon {
             anchorOffsetY += paddingVert / 2;
         }
         const polygon = new Flatten.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 = [
+            numeric(newAnchorPoint[0]),
+            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 = [
+            numeric(newAnchorPoint[0]),
+            numeric(newAnchorPoint[1])
+        ];
+        return new Textbox(this.id, this.text, tmpAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transformAnchorPoint(callback) {
-        const anchorPointSegment = new Flatten.Segment(new Flatten.Point(0, 0), new Flatten.Point(this.anchorPoint));
+        const anchorPointSegment = new Flatten.Segment(new Flatten.Point(0, 0), new Flatten.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 @@ export class GeometryProp {
 }
 export class Geometry {
     static point(x, y) {
-        return new Flatten.Point(x, y);
+        return new Flatten.Point(x.toNumber(), y.toNumber());
     }
     static line(x1, y1, x2, y2) {
         return new Flatten.Line(Geometry.point(x1, y1), Geometry.point(x2, y2));
@@ -152,7 +165,12 @@ export class Geometry {
         return new Flatten.Segment(Geometry.point(start[0], start[1]), Geometry.point(end[0], end[1]));
     }
     static polygon(coords) {
-        return new Flatten.Polygon(coords);
+        return new Flatten.Polygon(coords.map(item => {
+            return [
+                item[0].toNumber(),
+                item[1].toNumber(),
+            ];
+        }));
     }
     static multiline(coords) {
         const segments = [];
@@ -162,11 +180,13 @@ export class Geometry {
         return new Flatten.Multiline(segments);
     }
     static arc(center, radius, startAngle, endAngle, sweepDirection) {
-        return new Flatten.Arc(Geometry.point(center[0], center[1]), radius, startAngle, endAngle, sweepDirection);
+        return new Flatten.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 [
+                numeric(vertex.x), numeric(vertex.y)
+            ];
         });
         return points;
     }
@@ -213,10 +233,10 @@ export 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) {
@@ -274,7 +294,7 @@ export 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');
@@ -307,8 +327,8 @@ export class Geometry {
         const existingSegments = [];
         wirePoints.forEach(points => {
             const tmpPoints = points.map(pt => {
-                const roundedX = roundValue(pt.x);
-                const roundedY = roundValue(pt.y);
+                const roundedX = roundValue(pt.x).toNumber();
+                const roundedY = roundValue(pt.y).toNumber();
                 return new Flatten.Point(roundedX, roundedY);
             });
             for (let i = 0; i < tmpPoints.length - 1; i++) {
@@ -519,6 +539,19 @@ export var VerticalAlign;
     VerticalAlign["Middle"] = "middle";
     VerticalAlign["Bottom"] = "bottom";
 })(VerticalAlign || (VerticalAlign = {}));
+export var HorizontalAlignProp;
+(function (HorizontalAlignProp) {
+    HorizontalAlignProp["Start"] = "start";
+    HorizontalAlignProp["Middle"] = "middle";
+    HorizontalAlignProp["End"] = "end";
+})(HorizontalAlignProp || (HorizontalAlignProp = {}));
+export var VerticalAlignProp;
+(function (VerticalAlignProp) {
+    VerticalAlignProp["Hanging"] = "hanging";
+    VerticalAlignProp["Middle"] = "middle";
+    VerticalAlignProp["Central"] = "central";
+    VerticalAlignProp["TextTop"] = "text-top";
+})(VerticalAlignProp || (VerticalAlignProp = {}));
 function getArcPointRadians(centerX, centerY, radius, angleRads) {
     const dx = Math.cos(angleRads);
     const dy = Math.sin(angleRads);

package/dist/esm/globals.mjs

@@ -1,10 +1,6 @@
 export var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
-    GlobalNames["gnd"] = "gnd";
-    GlobalNames["DefaultResistor"] = "res";
-    GlobalNames["DefaultCapacitor"] = "cap";
-    GlobalNames["DefaultInductor"] = "ind";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (GlobalNames = {}));
 export const NoNetText = 'NO_NET';
@@ -12,6 +8,10 @@ export 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 || (ParamKeys = {}));
 export var LayoutDirection;
 (function (LayoutDirection) {
@@ -22,6 +22,8 @@ export var SymbolPinSide;
 (function (SymbolPinSide) {
     SymbolPinSide["Left"] = "left";
     SymbolPinSide["Right"] = "right";
+    SymbolPinSide["Top"] = "top";
+    SymbolPinSide["Bottom"] = "bottom";
 })(SymbolPinSide || (SymbolPinSide = {}));
 export var LengthUnit;
 (function (LengthUnit) {
@@ -71,11 +73,10 @@ export const ColorScheme = {
 };
 export 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 || (ComponentTypes = {}));
 export var ReferenceTypes;
 (function (ReferenceTypes) {
@@ -97,8 +98,12 @@ export var FrameType;
     FrameType[FrameType["Frame"] = 1] = "Frame";
     FrameType[FrameType["Sheet"] = 2] = "Sheet";
 })(FrameType || (FrameType = {}));
+export const ModuleContainsKeyword = 'contains';
 export const GlobalDocumentName = 'document';
 export const RenderFlags = {
     ShowElementFrames: false,
     ShowOrigin: false,
+    ShowGridOrigin: false,
+    ShowLabelBoxBounds: false,
+    ShowLabelOrigin: false,
 };

package/dist/esm/helpers.mjs

@@ -6,7 +6,7 @@ import { LayoutEngine } from "./layout.mjs";
 import { SequenceAction } from "./objects/ExecutionScope.mjs";
 import { parseFileWithVisitor } from "./parser.mjs";
 import { generatePdfOutput, generateSvgOutput, renderSheetsToSVG } from "./render.mjs";
-import { SimpleStopwatch } from "./utils.mjs";
+import { resolveToNumericValue, SimpleStopwatch } from "./utils.mjs";
 import { ParserVisitor, VisitorExecutionException } from "./visitor.mjs";
 import { createContext } from "this-file";
 import { SymbolValidatorResolveVisitor, SymbolValidatorVisitor } from "./SymbolValidatorVisitor.mjs";
@@ -16,6 +16,8 @@ import { CircuitScriptParser } from "./antlr/CircuitScriptParser.mjs";
 import { prepareTokens, SemanticTokensVisitor } from "./SemanticTokenVisitor.mjs";
 import { defaultPageMarginMM, defaultZoomScale, LengthUnit, MilsToMM, PxToMM } from "./globals.mjs";
 import { FrameParamKeys } from "./objects/Frame.mjs";
+import Big from "big.js";
+import { Logger } from "./logger.mjs";
 export var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
@@ -189,7 +191,13 @@ export function renderScript(scriptData, outputPath, options) {
         const action = tmp[0];
         if (action === 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 === SequenceAction.Frame) {
@@ -227,8 +235,10 @@ export function renderScript(scriptData, outputPath, options) {
         showStats && console.log('Layout took:', layoutTimer.lap());
         dumpData && writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new SimpleStopwatch();
-        const svgCanvas = renderSheetsToSVG(sheetFrames);
+        const renderLogger = new Logger();
+        const svgCanvas = renderSheetsToSVG(sheetFrames, renderLogger);
         showStats && console.log('Render took:', generateSvgTimer.lap());
+        dumpData && writeFileSync('dump/raw-render.txt', renderLogger.dump());
         svgOutput = generateSvgOutput(svgCanvas, outputDefaultZoom);
         if (outputPath) {
             if (fileExtension === 'svg') {
@@ -320,7 +330,10 @@ export class UnitDimension {
     }
 }
 export function milsToMM(value) {
-    return value * MilsToMM;
+    if (typeof value === 'number') {
+        value = resolveToNumericValue(new Big(value));
+    }
+    return resolveToNumericValue(value.toBigNumber().mul(new Big(MilsToMM)));
 }
 export function pxToMM(value) {
     return value * PxToMM;