circuitscript 0.1.2 → 0.1.3

package/dist/cjs/objects/Frame.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FramePlotDirection = exports.FrameParamKeys = exports.Frame = void 0;
+exports.FramePlotDirection = exports.FrameParamKeys = exports.FixedFrameIds = exports.Frame = void 0;
 const globals_js_1 = require("../globals.js");
 class Frame {
     constructor(frameId, frameType = globals_js_1.FrameType.Frame) {
@@ -10,6 +10,11 @@ class Frame {
     }
 }
 exports.Frame = Frame;
+var FixedFrameIds;
+(function (FixedFrameIds) {
+    FixedFrameIds[FixedFrameIds["BaseFrame"] = -1] = "BaseFrame";
+    FixedFrameIds[FixedFrameIds["FrameIdNotUsed"] = -2] = "FrameIdNotUsed";
+})(FixedFrameIds || (exports.FixedFrameIds = FixedFrameIds = {}));
 var FrameParamKeys;
 (function (FrameParamKeys) {
     FrameParamKeys["Title"] = "title";
@@ -20,6 +25,9 @@ var FrameParamKeys;
     FrameParamKeys["Height"] = "height";
     FrameParamKeys["PaperSize"] = "paper_size";
     FrameParamKeys["SheetType"] = "sheet_type";
+    FrameParamKeys["TitleAlign"] = "title_align";
+    FrameParamKeys["HorizontalAlign"] = "align";
+    FrameParamKeys["VerticalAlign"] = "valign";
     FrameParamKeys["SheetNumber"] = "sheet_number";
     FrameParamKeys["SheetTotal"] = "sheet_total";
 })(FrameParamKeys || (exports.FrameParamKeys = FrameParamKeys = {}));

package/dist/cjs/objects/ParamDefinition.js

@@ -54,6 +54,9 @@ class NumericValue {
         }
         return (0, utils_1.resolveToNumericValue)(this.toBigNumber().div(value.toBigNumber()));
     }
+    half() {
+        return this.div(2);
+    }
     mul(value) {
         if (typeof value === 'number') {
             value = numeric(value);

package/dist/cjs/render.js

@@ -34,7 +34,7 @@ function renderSheetsToSVG(sheetFrames, logger) {
         let extendGrid = true;
         let xOffset = 0;
         let yOffset = 0;
-        let sheetYOffset = 0;
+        let sheetYOffset = (0, ParamDefinition_js_1.numeric)(0);
         if (sheet.frame.frame) {
             logger.add('drawing frame');
             const frameComponent = sheet.frame.frame.parameters
@@ -44,29 +44,33 @@ function renderSheetsToSVG(sheetFrames, logger) {
                     throw 'Invalid graphic object for sheet frame';
                 }
                 const frameRects = (0, layout_js_1.ExtractDrawingRects)(frameComponent.displayProp) ?? [];
-                let originalWidthMM = 0;
-                let originalHeightMM = 0;
-                let widthMM = 0;
-                let heightMM = 0;
-                if (frameRects[0]) {
-                    originalWidthMM = (0, helpers_js_1.milsToMM)(frameRects[0].width).toNumber();
-                    originalHeightMM = (0, helpers_js_1.milsToMM)(frameRects[0].height).toNumber();
-                    logger.add('first frame size: ' + originalWidthMM + ' ' + originalHeightMM);
+                let originalWidthMM = (0, ParamDefinition_js_1.numeric)(0);
+                let originalHeightMM = (0, ParamDefinition_js_1.numeric)(0);
+                let widthMM = (0, ParamDefinition_js_1.numeric)(0);
+                let heightMM = (0, ParamDefinition_js_1.numeric)(0);
+                const paperRect = frameRects.find(item => item.className === 'paper-area');
+                const plotRect = frameRects.find(item => item.className === 'plot-area');
+                if (paperRect) {
+                    originalWidthMM = (0, helpers_js_1.milsToMM)(paperRect.width);
+                    originalHeightMM = (0, helpers_js_1.milsToMM)(paperRect.height);
+                    logger.add('first frame size: ' + originalWidthMM.toNumber()
+                        + ' ' + originalHeightMM.toNumber());
                 }
-                if (frameRects[1]) {
-                    widthMM = (0, helpers_js_1.milsToMM)(frameRects[1].width).toNumber();
-                    heightMM = (0, helpers_js_1.milsToMM)(frameRects[1].height).toNumber();
-                    logger.add('second frame size: ' + widthMM + ' ' + heightMM);
+                if (plotRect) {
+                    widthMM = (0, helpers_js_1.milsToMM)(plotRect.width);
+                    heightMM = (0, helpers_js_1.milsToMM)(plotRect.height);
+                    logger.add('second frame size: ' + widthMM.toNumber()
+                        + ' ' + heightMM.toNumber());
                 }
-                xOffset = (originalWidthMM - widthMM) / 2;
-                yOffset = (originalHeightMM - heightMM) / 2;
+                xOffset = (originalWidthMM.sub(widthMM)).half().toNumber();
+                yOffset = (originalHeightMM.sub(heightMM)).half().toNumber();
                 logger.add('offset', xOffset, yOffset);
-                sheetYOffset = index * (originalHeightMM + globals_js_1.defaultPageSpacingMM);
+                sheetYOffset = originalHeightMM.add(globals_js_1.defaultPageSpacingMM).mul(index);
                 gridBounds = {
                     xmin: 0,
                     ymin: 0,
-                    xmax: widthMM,
-                    ymax: heightMM
+                    xmax: widthMM.toNumber(),
+                    ymax: heightMM.toNumber()
                 };
                 extendGrid = false;
             }
@@ -76,7 +80,7 @@ function renderSheetsToSVG(sheetFrames, logger) {
         const sheetElements = sheetGroup.group().addClass('sheet-elements');
         generateSVGChild(sheetElements, components, wires, junctions, mergedWires, allFrames, textObjects, gridBounds, extendGrid, logger);
         sheetElements.translate(xOffset, yOffset);
-        sheetGroup.translate(0, sheetYOffset);
+        sheetGroup.translate(0, sheetYOffset.toNumber());
     });
     return canvas;
 }
@@ -186,10 +190,13 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             })
                 .fill('none');
         });
+        const halfJunctionSize = globals_js_1.junctionSize.half();
         intersectPoints.forEach(point => {
-            const [x, y, count] = point;
-            mergedWireGroup.circle(globals_js_1.junctionSize)
-                .translate(x - globals_js_1.junctionSize / 2, y - globals_js_1.junctionSize / 2)
+            const [x, y,] = point;
+            const translateX = (0, ParamDefinition_js_1.numeric)(x).sub(halfJunctionSize);
+            const translateY = (0, ParamDefinition_js_1.numeric)(y).sub(halfJunctionSize);
+            mergedWireGroup.circle(globals_js_1.junctionSize.toNumber())
+                .translate(translateX.toNumber(), translateY.toNumber())
                 .fill(globals_js_1.ColorScheme.JunctionColor)
                 .stroke('none');
         });
@@ -204,10 +211,10 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         }
         else {
             if (borderWidth.toNumber() > 0) {
-                if (item.type === layout_js_1.RenderFrameType.Container) {
+                if (item.renderType === layout_js_1.RenderFrameType.Container) {
                     strokeColor = '#111';
                 }
-                else if (item.type === layout_js_1.RenderFrameType.Elements) {
+                else if (item.renderType === layout_js_1.RenderFrameType.Elements) {
                     strokeColor = '#aaa';
                     if (!globals_js_1.RenderFlags.ShowElementFrames) {
                         return;
@@ -239,33 +246,34 @@ function drawGrid(group, canvasSize, extendGrid, logger) {
     const gridSize = globals_js_1.defaultGridSizeUnits;
     const { xmin, ymin, xmax, ymax } = canvasSize;
     const extraValue = extendGrid ? 1 : 0;
-    const gridStartX = (Math.floor(xmin / gridSize) - extraValue) * gridSize;
-    const gridStartY = (Math.floor(ymin / gridSize) - extraValue) * gridSize;
+    const gridStartX = ((0, ParamDefinition_js_1.numeric)(Math.floor(xmin / gridSize)).sub(extraValue)).mul(gridSize);
+    const gridStartY = ((0, ParamDefinition_js_1.numeric)(Math.floor(ymin / gridSize)).sub(extraValue)).mul(gridSize);
     const gridEndX = extendGrid
-        ? (Math.ceil(xmax / gridSize) + extraValue) * gridSize
-        : (xmax - xmin);
+        ? ((0, ParamDefinition_js_1.numeric)(Math.ceil(xmax / gridSize)).add(extraValue)).mul(gridSize)
+        : ((0, ParamDefinition_js_1.numeric)(xmax).sub(xmin));
     const gridEndY = extendGrid
-        ? (Math.ceil(ymax / gridSize) + extraValue) * gridSize
-        : (ymax - ymin);
-    const numCols = Math.floor((gridEndX - gridStartX) / gridSize)
+        ? ((0, ParamDefinition_js_1.numeric)(Math.ceil(ymax / gridSize)).add(extraValue)).mul(gridSize)
+        : ((0, ParamDefinition_js_1.numeric)(ymax).sub(ymin));
+    const numCols = Math.floor(gridEndX.sub(gridStartX).div(gridSize).toNumber())
         + (extendGrid ? 1 : 0);
     const originSize = (0, helpers_js_1.milsToMM)(10).toNumber();
     globals_js_1.RenderFlags.ShowGridOrigin && group.circle(originSize)
         .translate(-originSize / 2, -originSize / 2)
         .stroke('none').fill('blue');
     const lines = [];
-    const smallOffset = (0, helpers_js_1.milsToMM)(3).toNumber();
-    const startY = gridStartY - smallOffset / 2;
-    const endY = gridEndY + smallOffset;
+    const smallOffset = (0, helpers_js_1.milsToMM)(3);
+    const startY = gridStartY.sub(smallOffset.half());
+    const endY = gridEndY.add(smallOffset);
+    const numericGridSize = (0, ParamDefinition_js_1.numeric)(gridSize);
     for (let i = 0; i < numCols; i++) {
-        const startX = gridStartX + i * gridSize;
-        lines.push(`M ${startX} ${startY} L ${startX} ${endY}`);
+        const startX = gridStartX.add(numericGridSize.mul(i)).toNumber();
+        lines.push(`M ${startX} ${startY.toNumber()} L ${startX} ${endY.toNumber()}`);
     }
     const strokeSize = (0, helpers_js_1.milsToMM)(3);
     group.addClass('grid')
         .path(lines.join(" "))
         .attr({
-        'stroke-dasharray': `${strokeSize.toNumber()},${gridSize - strokeSize.toNumber()}`,
+        'stroke-dasharray': `${strokeSize.toNumber()},${numericGridSize.sub(strokeSize).toNumber()}`,
     })
         .stroke({
         width: strokeSize.toNumber(),

package/dist/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+exports.areasOverlap = exports.isPointWithinArea = exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
 const big_js_1 = require("big.js");
 const ParamDefinition_1 = require("./objects/ParamDefinition");
 class SimpleStopwatch {
@@ -166,3 +166,21 @@ function resolveToNumericValue(value) {
     return new ParamDefinition_1.NumericValue(useValue, prefixPart * 3);
 }
 exports.resolveToNumericValue = resolveToNumericValue;
+function isPointWithinArea(point, bounds) {
+    const [xPt, yPt] = point;
+    const [xmin, ymin, xmax, ymax] = bounds;
+    return (xPt > xmin && xPt < xmax && yPt > ymin && yPt < ymax);
+}
+exports.isPointWithinArea = isPointWithinArea;
+function areasOverlap(area1, area2) {
+    const [xmin, ymin, xmax, ymax] = area1;
+    const pt1 = [xmin, ymin];
+    const pt2 = [xmin, ymax];
+    const pt3 = [xmax, ymin];
+    const pt4 = [xmax, ymax];
+    return isPointWithinArea(pt1, area2)
+        || isPointWithinArea(pt2, area2)
+        || isPointWithinArea(pt3, area2)
+        || isPointWithinArea(pt4, area2);
+}
+exports.areasOverlap = areasOverlap;

package/dist/cjs/visitor.js

@@ -194,7 +194,16 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         }
                         return accum;
                     }, []);
-                    accum.push([commandName, positionParams, keywordParams, item]);
+                    let useCommandName = commandName;
+                    let usePositionParams = positionParams;
+                    if (commandName === draw_symbols_js_1.PlaceHolderCommands.crect) {
+                        useCommandName = draw_symbols_js_1.PlaceHolderCommands.rect;
+                        const [centerX, centerY, width, height] = positionParams;
+                        const newX = centerX.sub(width.half());
+                        const newY = centerY.sub(height.half());
+                        usePositionParams = [newX, newY, width, height];
+                    }
+                    accum.push([useCommandName, usePositionParams, keywordParams, item]);
                 }
                 return accum;
             }, []);

package/dist/esm/draw_symbols.mjs

@@ -94,7 +94,7 @@ export class SymbolGraphic {
         const bbox = this.drawing.getBoundingBox();
         const originSize = 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)
@@ -618,6 +618,7 @@ export var PlaceHolderCommands;
     PlaceHolderCommands["arc"] = "arc";
     PlaceHolderCommands["circle"] = "circle";
     PlaceHolderCommands["rect"] = "rect";
+    PlaceHolderCommands["crect"] = "crect";
     PlaceHolderCommands["triangle"] = "triangle";
     PlaceHolderCommands["pin"] = "pin";
     PlaceHolderCommands["hpin"] = "hpin";
@@ -669,7 +670,9 @@ export class SymbolCustom extends SymbolGraphic {
         const defaultLineColor = ColorScheme.PinLineColor;
         drawing.addSetLineColor(defaultLineColor);
         drawing.addSetLineWidth(numeric(5));
-        drawing.addRectMM(numeric(0), 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);
@@ -687,12 +690,12 @@ export 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;
@@ -767,7 +770,7 @@ export class SymbolCustom extends SymbolGraphic {
             });
         });
         const instanceName = drawing.variables.get('refdes');
-        instanceName && drawing.addLabel(bodyWidthMM.neg().div(2), bodyHeightMM.neg().div(2).sub(milsToMM(20)), instanceName, {
+        instanceName && drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.neg().half().sub(milsToMM(20)), instanceName, {
             fontSize: numeric(CustomSymbolRefDesSize),
             anchor: HorizontalAlign.Left,
         });
@@ -775,7 +778,7 @@ export 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(milsToMM(20)), labelValue, {
+                drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.half().add(milsToMM(20)), labelValue, {
                     fontSize: numeric(CustomSymbolParamTextSize),
                     anchor: HorizontalAlign.Left,
                     vanchor: VerticalAlign.Top,
@@ -818,12 +821,12 @@ export class SymbolCustomModule extends SymbolCustom {
     portWidth = milsToMM(100);
     portHeight = 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 => {
@@ -953,22 +956,18 @@ export class SymbolDrawing {
         this.items.push(Geometry.segment([startX, startY], [startX.add(value), startY]));
         return this;
     }
-    addRect(centerX, centerY, width, height) {
-        centerX = milsToMM(centerX);
-        centerY = milsToMM(centerY);
-        width = milsToMM(width);
-        height = milsToMM(height);
-        return this.addRectMM(centerX, centerY, width, height);
+    addRect(x, y, width, height) {
+        return this.addRectMM(milsToMM(x), milsToMM(y), milsToMM(width), 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.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;
     }
@@ -980,10 +979,10 @@ export class SymbolDrawing {
         width = milsToMM(width);
         const line = Geometry.line(startX, startY, endX, endY);
         const normLine = line.norm;
-        const dx1 = numeric(normLine.x).mul(width).div(2);
-        const dy1 = numeric(normLine.y).mul(width).div(2);
-        const dx2 = numeric(normLine.x).mul(width.neg()).div(2);
-        const dy2 = numeric(normLine.y).mul(width.neg()).div(2);
+        const dx1 = numeric(normLine.x).mul(width).half();
+        const dy1 = numeric(normLine.y).mul(width).half();
+        const dx2 = numeric(normLine.x).mul(width.neg()).half();
+        const dy2 = numeric(normLine.y).mul(width.neg()).half();
         this.items.push(Geometry.polygon([
             [dx1.add(startX), dy1.add(startY)],
             [dx2.add(startX), dy2.add(startY)],
@@ -1009,7 +1008,7 @@ export class SymbolDrawing {
         return this;
     }
     addModulePort(x, y, width, height, portType = PinTypes.Any, scaleX = 1, angle = 0) {
-        const height2 = height.div(2);
+        const height2 = height.half();
         let path = [];
         const arrowSize = milsToMM(30);
         if (portType === PinTypes.Any) {

package/dist/esm/execute.mjs

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

package/dist/esm/globals.mjs

@@ -1,3 +1,4 @@
+import { numeric } from "./objects/ParamDefinition";
 export var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
@@ -42,11 +43,11 @@ export const MMToPt = 2.8346456693;
 export const PxToMM = 0.2645833;
 export const portWidth = 20;
 export const portHeight = 2;
-export const defaultGridSizeUnits = MilsToMM * 100;
+export const defaultGridSizeUnits = numeric(MilsToMM).mul(100).toNumber();
 export const defaultZoomScale = 2.5;
 export const fontDisplayScale = 0.032;
-export const defaultSymbolLineWidth = MilsToMM * 6;
-export const defaultWireLineWidth = MilsToMM * 6;
+export const defaultSymbolLineWidth = numeric(MilsToMM).mul(6).toNumber();
+export const defaultWireLineWidth = numeric(MilsToMM).mul(6).toNumber();
 export const defaultPinNameTextSize = 40;
 export const defaultPinIdTextSize = 30;
 export const defaultPageMarginMM = 10;
@@ -60,7 +61,7 @@ export const displayUnits = LengthUnit.mils;
 export const defaultFont = 'Arial';
 export const defaultFontBold = 'Arial';
 export const defaultFontSize = 10;
-export const junctionSize = MilsToMM * 20;
+export const junctionSize = numeric(MilsToMM).mul(20);
 export const PortArrowSize = MilsToMM * 50;
 export const PortPaddingHorizontal = MilsToMM * 10;
 export const PortPaddingVertical = MilsToMM * 10;

package/dist/esm/helpers.mjs

@@ -333,7 +333,7 @@ export function milsToMM(value) {
     if (typeof value === 'number') {
         value = resolveToNumericValue(new Big(value));
     }
-    return resolveToNumericValue(value.toBigNumber().mul(new Big(MilsToMM)));
+    return resolveToNumericValue(value.toBigNumber().mul(new Big(MilsToMM)).round(6));
 }
 export function pxToMM(value) {
     return value * PxToMM;