circuitscript 0.0.31 → 0.0.32

package/dist/cjs/execute.js

@@ -779,6 +779,7 @@ class ExecutionContext {
     enterFrame() {
         const frameId = this.scope.frames.length + 1;
         const frameObject = new Frame_js_1.Frame(frameId);
+        this.log('Enter frame', frameId);
         this.scope.frames.push(frameObject);
         this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.Frame,
             frameObject, ExecutionScope_js_1.FrameAction.Enter]);
@@ -790,6 +791,7 @@ class ExecutionContext {
         const frame = this.scope.frames[frameId - 1];
         this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.Frame,
             frame, ExecutionScope_js_1.FrameAction.Exit]);
+        this.log('Leave frame', frameId);
     }
 }
 exports.ExecutionContext = ExecutionContext;

package/dist/cjs/globals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = void 0;
+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.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";
@@ -39,6 +39,7 @@ var WireAutoDirection;
 })(WireAutoDirection || (exports.WireAutoDirection = WireAutoDirection = {}));
 exports.MilsToMM = 0.0254;
 exports.MMToPx = 3.779276;
+exports.MMToPt = 2.8346456693;
 exports.PxToMM = 0.2645833;
 exports.portWidth = 20;
 exports.portHeight = 2;

package/dist/cjs/helpers.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pxToMM = exports.milsToMM = exports.UnitDimension = exports.getPackageVersion = exports.getDefaultLibsPath = exports.getFontsPath = exports.getCurrentPath = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.getScriptText = exports.prepareFile = exports.JSModuleType = void 0;
 const fs_1 = require("fs");
+const pdfkit_1 = __importDefault(require("pdfkit"));
+const svg_to_pdfkit_1 = __importDefault(require("svg-to-pdfkit"));
 const export_js_1 = require("./export.js");
 const layout_js_1 = require("./layout.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -219,17 +221,47 @@ function renderScript(scriptData, outputPath, options) {
     dumpData && (0, fs_1.writeFileSync)('dump/raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = null;
     try {
-        const layoutEngine = new layout_js_1.LayoutEngine();
+        let fileExtension = null;
+        let showBaseFrame = false;
+        if (outputPath) {
+            fileExtension = path_1.default.extname(outputPath).substring(1);
+            if (fileExtension === 'pdf') {
+                showBaseFrame = true;
+            }
+        }
+        const layoutEngine = new layout_js_1.LayoutEngine({
+            showBaseFrame,
+        });
         const layoutTimer = new utils_js_1.SimpleStopwatch();
         const graph = layoutEngine.runLayout(sequence, nets);
         layoutEngine.printWarnings();
         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();
-        svgOutput = (0, render_js_1.generateSVG2)(graph);
+        const { svg: generatedSvg, width: svgWidth, height: svgHeight } = (0, render_js_1.generateSVG2)(graph);
+        svgOutput = generatedSvg;
         showStats && console.log('Render took:', generateSvgTimer.lap());
         if (outputPath) {
-            (0, fs_1.writeFileSync)(outputPath, svgOutput);
+            if (fileExtension === 'svg') {
+                (0, fs_1.writeFileSync)(outputPath, svgOutput);
+            }
+            else if (fileExtension === 'pdf') {
+                const doc = new pdfkit_1.default({
+                    layout: 'landscape',
+                    size: 'A4',
+                });
+                const outputStream = (0, fs_1.createWriteStream)(outputPath);
+                const paperWidthMM = 297;
+                const paperHeightMM = 210;
+                const xOffset = (paperWidthMM - svgWidth) / 2;
+                const yOffset = (paperHeightMM - svgHeight) / 2;
+                (0, svg_to_pdfkit_1.default)(doc, svgOutput, xOffset * globals_js_1.MMToPt, yOffset * globals_js_1.MMToPt);
+                doc.pipe(outputStream);
+                doc.end();
+            }
+            else {
+                throw "Invalid output format";
+            }
             console.log('Generated file', outputPath);
         }
     }

package/dist/cjs/layout.js

@@ -13,10 +13,13 @@ const utils_js_1 = require("./utils.js");
 const types_js_1 = require("./objects/types.js");
 const helpers_js_1 = require("./helpers.js");
 class LayoutEngine {
-    constructor() {
+    constructor(options = { showBaseFrame: false }) {
         this.placeSubgraphVersion = 2;
         this.layoutWarnings = [];
+        this.showBaseFrame = false;
         this.logger = new logger_js_1.Logger();
+        const { showBaseFrame = false } = options ?? {};
+        this.showBaseFrame = showBaseFrame;
     }
     print(...params) {
         this.logger.add(params.join(' '));
@@ -124,6 +127,11 @@ class LayoutEngine {
         const baseFrame = frameObjects[0];
         baseFrame.padding = 0;
         baseFrame.borderWidth = 0;
+        if (this.showBaseFrame) {
+            baseFrame.borderWidth = 5;
+            baseFrame.width = 11692 - 400 * 2;
+            baseFrame.height = 8267 - 400 * 2;
+        }
         baseFrame.x = 0;
         baseFrame.y = 0;
         let textObjects = [];
@@ -136,7 +144,7 @@ class LayoutEngine {
             const result = this.prepareFrames(graph, subgraphInfo, baseFrame);
             textObjects = result.textObjects;
             elementFrames = result.elementFrames;
-            const logFrames = false;
+            const logFrames = true;
             if (logFrames) {
                 this.print('===== dump frames =====');
                 this.dumpFrame(baseFrame);
@@ -260,6 +268,12 @@ class LayoutEngine {
             boundPoints.push([innerFrame.x, innerFrame.y], [innerFrame.x + frameWidth, innerFrame.y + frameHeight]);
         });
         frame.bounds = (0, utils_js_1.resizeBounds)(getBoundsFromPoints(boundPoints), frame.padding);
+        if (frame.width !== null) {
+            frame.bounds.xmax = (0, helpers_js_1.milsToMM)(frame.bounds.xmin + frame.width);
+        }
+        if (frame.height !== null) {
+            frame.bounds.ymax = (0, helpers_js_1.milsToMM)(frame.bounds.ymin + frame.height);
+        }
     }
     dumpFrame(frame, level = 0) {
         this.print(level, "".padStart(level * 4), 'frame, items:', frame.innerItems.length);
@@ -497,6 +511,14 @@ class LayoutEngine {
                         newFrame.borderWidth =
                             frameObject.parameters.get(Frame_js_1.FrameParamKeys.Border);
                     }
+                    if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Width)) {
+                        newFrame.width =
+                            frameObject.parameters.get(Frame_js_1.FrameParamKeys.Width);
+                    }
+                    if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Height)) {
+                        newFrame.height =
+                            frameObject.parameters.get(Frame_js_1.FrameParamKeys.Height);
+                    }
                     containerFrames.push(newFrame);
                     frameStack.push(newFrame);
                     prevFrame && prevFrame.innerItems.push(newFrame);
@@ -658,14 +680,20 @@ class LayoutEngine {
                 floatingNode.isFloating = false;
                 this.print('set node as not floating:', floatingNode);
                 const originNode = findOriginNode(fixedNode);
-                originNodeGroups.get(originNode).push(floatingNode);
-                this.print('linking node', floatingNode, 'to origin node', originNode);
+                const itemsArray = originNodeGroups.get(originNode);
+                if (itemsArray.indexOf(floatingNode) === -1) {
+                    itemsArray.push(floatingNode);
+                    this.print('linking node', floatingNode, 'to origin node', originNode);
+                }
+                else {
+                    this.print('node is alread linked', floatingNode, 'to origin node', originNode);
+                }
             }
             [node1, node2].forEach(item => {
                 if (item instanceof RenderWire && item.isEndAutoLength()) {
                     const [instance, pin] = item.getEndAuto();
                     const [, targetNode] = graph.node(instance.instanceName);
-                    this.print('wire auto length to target:', instance, pin);
+                    this.print('wire', item, 'auto length to target:', instance, pin);
                     if (targetNode.isFloating) {
                         throw "Cannot create auto wire with floating node! Wire id: " + item.id + " to node " + instance + " pin " + pin;
                     }
@@ -676,6 +704,7 @@ class LayoutEngine {
                     }
                     const [untilX, untilY] = getNodePositionAtPin(targetNode, pin);
                     item.setEndAuto(untilX, untilY);
+                    this.print(`set wire auto end at: ${untilX} ${untilY}`);
                 }
             });
         });
@@ -1230,6 +1259,8 @@ class RenderFrame extends RenderObject {
         this.gap = (0, helpers_js_1.milsToMM)(100);
         this.direction = Frame_js_1.FramePlotDirection.Column;
         this.borderWidth = 5;
+        this.width = null;
+        this.height = null;
         this.subgraphId = "";
         this.containsTitle = false;
         this.frame = frame;

package/dist/cjs/objects/Frame.js

@@ -14,6 +14,8 @@ var FrameParamKeys;
     FrameParamKeys["Direction"] = "direction";
     FrameParamKeys["Padding"] = "padding";
     FrameParamKeys["Border"] = "border";
+    FrameParamKeys["Width"] = "width";
+    FrameParamKeys["Height"] = "height";
 })(FrameParamKeys || (exports.FrameParamKeys = FrameParamKeys = {}));
 var FramePlotDirection;
 (function (FramePlotDirection) {

package/dist/cjs/render.js

@@ -15,14 +15,16 @@ function generateSVG2(graph) {
     const canvas = (0, svg_js_1.SVG)(document.documentElement);
     (0, sizing_js_1.applyFontsToSVG)(canvas);
     generateSVGChild(canvas, graph.components, graph.wires, graph.junctions, graph.mergedWires, graph.frameObjects, graph.textObjects);
-    const { x, y, width, height } = canvas.bbox();
-    const margin = (0, helpers_js_1.milsToMM)(10);
-    const widthAndMargin = width + margin * 2;
-    const heightAndMargin = height + margin * 2;
     const scale = globals_js_1.MMToPx * globals_js_1.defaultZoomScale;
-    canvas.size(widthAndMargin * scale, heightAndMargin * scale);
-    canvas.viewbox(x - margin, y - margin, widthAndMargin, heightAndMargin);
-    return canvas.svg();
+    const { x, y, width, height } = canvas.bbox();
+    const scaledWidth = width * scale;
+    const scaledHeight = height * scale;
+    canvas.size(scaledWidth, scaledHeight);
+    canvas.viewbox(x, y, width, height);
+    return {
+        svg: canvas.svg(),
+        width, height,
+    };
 }
 exports.generateSVG2 = generateSVG2;
 function generateSVGChild(canvas, components, wires, junctions, mergedWires, frameObjects, textObjects) {
@@ -71,8 +73,8 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         wires.forEach(wire => {
             wiresGroup.text(wire.id.toString())
                 .font({
-                family: 'Inter',
-                size: 10,
+                family: 'Arial',
+                size: 50 * globals_js_1.fontDisplayScale,
             })
                 .translate(wire.x + 5, wire.y + 5);
         });

package/dist/esm/execute.mjs

@@ -783,6 +783,7 @@ export class ExecutionContext {
     enterFrame() {
         const frameId = this.scope.frames.length + 1;
         const frameObject = new Frame(frameId);
+        this.log('Enter frame', frameId);
         this.scope.frames.push(frameObject);
         this.scope.sequence.push([SequenceAction.Frame,
             frameObject, FrameAction.Enter]);
@@ -794,6 +795,7 @@ export class ExecutionContext {
         const frame = this.scope.frames[frameId - 1];
         this.scope.sequence.push([SequenceAction.Frame,
             frame, FrameAction.Exit]);
+        this.log('Leave frame', frameId);
     }
 }
 function isWireSegmentsEndAuto(segments) {

package/dist/esm/globals.mjs

@@ -36,6 +36,7 @@ export var WireAutoDirection;
 })(WireAutoDirection || (WireAutoDirection = {}));
 export const MilsToMM = 0.0254;
 export const MMToPx = 3.779276;
+export const MMToPt = 2.8346456693;
 export const PxToMM = 0.2645833;
 export const portWidth = 20;
 export const portHeight = 2;

package/dist/esm/helpers.mjs

@@ -1,4 +1,6 @@
-import { readFileSync, writeFileSync } from "fs";
+import { readFileSync, writeFileSync, createWriteStream } from "fs";
+import PDFDocument from "pdfkit";
+import SVGtoPDF from "svg-to-pdfkit";
 import { generateKiCADNetList, printTree } from "./export.mjs";
 import { LayoutEngine } from "./layout.mjs";
 import { SequenceAction } from "./objects/ExecutionScope.mjs";
@@ -13,7 +15,7 @@ import { MainLexer } from "./lexer.mjs";
 import { CircuitScriptParser } from "./antlr/CircuitScriptParser.mjs";
 import { prepareTokens, SemanticTokensVisitor } from "./SemanticTokenVisitor.mjs";
 import path from "path";
-import { LengthUnit, MilsToMM, PxToMM } from "./globals.mjs";
+import { LengthUnit, MilsToMM, MMToPt, PxToMM } from "./globals.mjs";
 export var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
@@ -208,17 +210,47 @@ export function renderScript(scriptData, outputPath, options) {
     dumpData && writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = null;
     try {
-        const layoutEngine = new LayoutEngine();
+        let fileExtension = null;
+        let showBaseFrame = false;
+        if (outputPath) {
+            fileExtension = path.extname(outputPath).substring(1);
+            if (fileExtension === 'pdf') {
+                showBaseFrame = true;
+            }
+        }
+        const layoutEngine = new LayoutEngine({
+            showBaseFrame,
+        });
         const layoutTimer = new SimpleStopwatch();
         const graph = layoutEngine.runLayout(sequence, nets);
         layoutEngine.printWarnings();
         showStats && console.log('Layout took:', layoutTimer.lap());
         dumpData && writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new SimpleStopwatch();
-        svgOutput = generateSVG2(graph);
+        const { svg: generatedSvg, width: svgWidth, height: svgHeight } = generateSVG2(graph);
+        svgOutput = generatedSvg;
         showStats && console.log('Render took:', generateSvgTimer.lap());
         if (outputPath) {
-            writeFileSync(outputPath, svgOutput);
+            if (fileExtension === 'svg') {
+                writeFileSync(outputPath, svgOutput);
+            }
+            else if (fileExtension === 'pdf') {
+                const doc = new PDFDocument({
+                    layout: 'landscape',
+                    size: 'A4',
+                });
+                const outputStream = createWriteStream(outputPath);
+                const paperWidthMM = 297;
+                const paperHeightMM = 210;
+                const xOffset = (paperWidthMM - svgWidth) / 2;
+                const yOffset = (paperHeightMM - svgHeight) / 2;
+                SVGtoPDF(doc, svgOutput, xOffset * MMToPt, yOffset * MMToPt);
+                doc.pipe(outputStream);
+                doc.end();
+            }
+            else {
+                throw "Invalid output format";
+            }
             console.log('Generated file', outputPath);
         }
     }

package/dist/esm/layout.mjs

@@ -13,8 +13,11 @@ export class LayoutEngine {
     logger;
     placeSubgraphVersion = 2;
     layoutWarnings = [];
-    constructor() {
+    showBaseFrame = false;
+    constructor(options = { showBaseFrame: false }) {
         this.logger = new Logger();
+        const { showBaseFrame = false } = options ?? {};
+        this.showBaseFrame = showBaseFrame;
     }
     print(...params) {
         this.logger.add(params.join(' '));
@@ -122,6 +125,11 @@ export class LayoutEngine {
         const baseFrame = frameObjects[0];
         baseFrame.padding = 0;
         baseFrame.borderWidth = 0;
+        if (this.showBaseFrame) {
+            baseFrame.borderWidth = 5;
+            baseFrame.width = 11692 - 400 * 2;
+            baseFrame.height = 8267 - 400 * 2;
+        }
         baseFrame.x = 0;
         baseFrame.y = 0;
         let textObjects = [];
@@ -134,7 +142,7 @@ export class LayoutEngine {
             const result = this.prepareFrames(graph, subgraphInfo, baseFrame);
             textObjects = result.textObjects;
             elementFrames = result.elementFrames;
-            const logFrames = false;
+            const logFrames = true;
             if (logFrames) {
                 this.print('===== dump frames =====');
                 this.dumpFrame(baseFrame);
@@ -258,6 +266,12 @@ export class LayoutEngine {
             boundPoints.push([innerFrame.x, innerFrame.y], [innerFrame.x + frameWidth, innerFrame.y + frameHeight]);
         });
         frame.bounds = resizeBounds(getBoundsFromPoints(boundPoints), frame.padding);
+        if (frame.width !== null) {
+            frame.bounds.xmax = milsToMM(frame.bounds.xmin + frame.width);
+        }
+        if (frame.height !== null) {
+            frame.bounds.ymax = milsToMM(frame.bounds.ymin + frame.height);
+        }
     }
     dumpFrame(frame, level = 0) {
         this.print(level, "".padStart(level * 4), 'frame, items:', frame.innerItems.length);
@@ -495,6 +509,14 @@ export class LayoutEngine {
                         newFrame.borderWidth =
                             frameObject.parameters.get(FrameParamKeys.Border);
                     }
+                    if (frameObject.parameters.has(FrameParamKeys.Width)) {
+                        newFrame.width =
+                            frameObject.parameters.get(FrameParamKeys.Width);
+                    }
+                    if (frameObject.parameters.has(FrameParamKeys.Height)) {
+                        newFrame.height =
+                            frameObject.parameters.get(FrameParamKeys.Height);
+                    }
                     containerFrames.push(newFrame);
                     frameStack.push(newFrame);
                     prevFrame && prevFrame.innerItems.push(newFrame);
@@ -656,14 +678,20 @@ export class LayoutEngine {
                 floatingNode.isFloating = false;
                 this.print('set node as not floating:', floatingNode);
                 const originNode = findOriginNode(fixedNode);
-                originNodeGroups.get(originNode).push(floatingNode);
-                this.print('linking node', floatingNode, 'to origin node', originNode);
+                const itemsArray = originNodeGroups.get(originNode);
+                if (itemsArray.indexOf(floatingNode) === -1) {
+                    itemsArray.push(floatingNode);
+                    this.print('linking node', floatingNode, 'to origin node', originNode);
+                }
+                else {
+                    this.print('node is alread linked', floatingNode, 'to origin node', originNode);
+                }
             }
             [node1, node2].forEach(item => {
                 if (item instanceof RenderWire && item.isEndAutoLength()) {
                     const [instance, pin] = item.getEndAuto();
                     const [, targetNode] = graph.node(instance.instanceName);
-                    this.print('wire auto length to target:', instance, pin);
+                    this.print('wire', item, 'auto length to target:', instance, pin);
                     if (targetNode.isFloating) {
                         throw "Cannot create auto wire with floating node! Wire id: " + item.id + " to node " + instance + " pin " + pin;
                     }
@@ -674,6 +702,7 @@ export class LayoutEngine {
                     }
                     const [untilX, untilY] = getNodePositionAtPin(targetNode, pin);
                     item.setEndAuto(untilX, untilY);
+                    this.print(`set wire auto end at: ${untilX} ${untilY}`);
                 }
             });
         });
@@ -1226,6 +1255,8 @@ export class RenderFrame extends RenderObject {
     gap = milsToMM(100);
     direction = FramePlotDirection.Column;
     borderWidth = 5;
+    width = null;
+    height = null;
     subgraphId = "";
     type;
     containsTitle = false;

package/dist/esm/objects/Frame.mjs

@@ -11,6 +11,8 @@ export var FrameParamKeys;
     FrameParamKeys["Direction"] = "direction";
     FrameParamKeys["Padding"] = "padding";
     FrameParamKeys["Border"] = "border";
+    FrameParamKeys["Width"] = "width";
+    FrameParamKeys["Height"] = "height";
 })(FrameParamKeys || (FrameParamKeys = {}));
 export var FramePlotDirection;
 (function (FramePlotDirection) {

package/dist/esm/render.mjs

@@ -1,7 +1,7 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
 import { RenderFrameType, getBounds } from "./layout.mjs";
 import { applyFontsToSVG, getCreateSVGWindow } from './sizing.mjs';
-import { ColorScheme, ComponentTypes, MMToPx, ParamKeys, defaultGridSizeUnits, defaultWireLineWidth, defaultZoomScale, junctionSize } from './globals.mjs';
+import { ColorScheme, ComponentTypes, MMToPx, ParamKeys, defaultGridSizeUnits, defaultWireLineWidth, defaultZoomScale, fontDisplayScale, junctionSize } from './globals.mjs';
 import { NumericValue } from './objects/ParamDefinition.mjs';
 import { getBoundsSize } from './utils.mjs';
 import { milsToMM } from './helpers.mjs';
@@ -12,14 +12,16 @@ export function generateSVG2(graph) {
     const canvas = SVG(document.documentElement);
     applyFontsToSVG(canvas);
     generateSVGChild(canvas, graph.components, graph.wires, graph.junctions, graph.mergedWires, graph.frameObjects, graph.textObjects);
-    const { x, y, width, height } = canvas.bbox();
-    const margin = milsToMM(10);
-    const widthAndMargin = width + margin * 2;
-    const heightAndMargin = height + margin * 2;
     const scale = MMToPx * defaultZoomScale;
-    canvas.size(widthAndMargin * scale, heightAndMargin * scale);
-    canvas.viewbox(x - margin, y - margin, widthAndMargin, heightAndMargin);
-    return canvas.svg();
+    const { x, y, width, height } = canvas.bbox();
+    const scaledWidth = width * scale;
+    const scaledHeight = height * scale;
+    canvas.size(scaledWidth, scaledHeight);
+    canvas.viewbox(x, y, width, height);
+    return {
+        svg: canvas.svg(),
+        width, height,
+    };
 }
 function generateSVGChild(canvas, components, wires, junctions, mergedWires, frameObjects, textObjects) {
     const displayWireId = false;
@@ -67,8 +69,8 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         wires.forEach(wire => {
             wiresGroup.text(wire.id.toString())
                 .font({
-                family: 'Inter',
-                size: 10,
+                family: 'Arial',
+                size: 50 * fontDisplayScale,
             })
                 .translate(wire.x + 5, wire.y + 5);
         });

package/dist/types/globals.d.ts

@@ -30,6 +30,7 @@ export declare enum WireAutoDirection {
 }
 export declare const MilsToMM = 0.0254;
 export declare const MMToPx = 3.779276;
+export declare const MMToPt = 2.8346456693;
 export declare const PxToMM = 0.2645833;
 export declare const portWidth = 20;
 export declare const portHeight = 2;

package/dist/types/layout.d.ts

@@ -12,7 +12,10 @@ export declare class LayoutEngine {
     logger: Logger;
     placeSubgraphVersion: number;
     layoutWarnings: string[];
-    constructor();
+    showBaseFrame: boolean;
+    constructor(options?: {
+        showBaseFrame: boolean;
+    });
     protected print(...params: any[]): void;
     protected printLevel(level: number, ...params: any[]): void;
     protected padLevel(value: number): string;
@@ -125,6 +128,8 @@ export declare class RenderFrame extends RenderObject {
     gap: number;
     direction: FramePlotDirection;
     borderWidth: number;
+    width: number | null;
+    height: number | null;
     subgraphId: string;
     type: RenderFrameType;
     containsTitle: boolean;

package/dist/types/objects/Frame.d.ts

@@ -7,7 +7,9 @@ export declare enum FrameParamKeys {
     Title = "title",
     Direction = "direction",
     Padding = "padding",
-    Border = "border"
+    Border = "border",
+    Width = "width",
+    Height = "height"
 }
 export declare enum FramePlotDirection {
     Row = "row",

package/dist/types/render.d.ts

@@ -7,4 +7,8 @@ export declare function generateSVG2(graph: {
     debugRects?: BoundBox[];
     frameObjects: RenderFrame[];
     textObjects: RenderText[];
-}): string;
+}): {
+    svg: string;
+    width: number;
+    height: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.0.31",
+    "version": "0.0.32",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -27,6 +27,8 @@
         "@types/figlet": "^1.5.8",
         "@types/jest": "~29.5",
         "@types/node": "~18",
+        "@types/pdfkit": "^0.13.6",
+        "@types/svg-to-pdfkit": "^0.1.3",
         "@types/svgdom": "^0.1.2",
         "@typescript-eslint/eslint-plugin": "~5.59",
         "@typescript-eslint/parser": "~5.59",
@@ -79,6 +81,8 @@
         "express": "^4.18.2",
         "figlet": "^1.7.0",
         "lodash": "^4.17.21",
+        "pdfkit": "^0.15.1",
+        "svg-to-pdfkit": "^0.1.8",
         "svgdom": "0.1.14",
         "this-file": "^2.0.3",
         "tslib": "~2.5",