circuitscript 0.1.7 → 0.1.8

package/dist/cjs/export.js

@@ -50,11 +50,6 @@ function generateKiCADNetList(netlist) {
             }
         }
         else {
-            if (instance.typeProp !== globals_js_1.ComponentTypes.net &&
-                instance.typeProp !== globals_js_1.ComponentTypes.graphic &&
-                instance.typeProp !== null) {
-                console.log('Skipping', instance.instanceName);
-            }
         }
     });
     const netItems = [];

package/dist/cjs/helpers.js

@@ -164,7 +164,21 @@ async function renderScript(scriptData, outputPath, options) {
             errors.push(error);
         }
         else if (error && error instanceof antlr4ng_1.RecognitionException) {
-            errors.push(new utils_js_1.ParseSyntaxError(message, context.start, context.stop));
+            if (context !== null) {
+                errors.push(new utils_js_1.ParseSyntaxError(message, context.start, context.stop));
+            }
+            else {
+                if (error.recognizer) {
+                    const recognizer = error.recognizer;
+                    errors.push(new utils_js_1.ParseSyntaxError(message, {
+                        line: recognizer.currentTokenStartLine,
+                        column: recognizer.currentTokenColumn
+                    }));
+                }
+                else {
+                    errors.push(new utils_js_1.ParseSyntaxError(message));
+                }
+            }
         }
         else {
             errors.push(new utils_js_1.ParseError(message, context.start, context.stop));
@@ -224,7 +238,10 @@ async function renderScript(scriptData, outputPath, options) {
                 });
                 (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
                 console.log('Generated file', outputPath);
-                return null;
+                return {
+                    svgOutput: null,
+                    errors,
+                };
             }
             const layoutEngine = new layout_js_1.LayoutEngine();
             const layoutTimer = new utils_js_1.SimpleStopwatch();

package/dist/cjs/layout.js

@@ -1,11 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.applyComponentParamsToSymbol = exports.LayoutEngine = void 0;
-const graphlib_1 = __importDefault(require("@dagrejs/graphlib"));
-const { Graph, alg } = graphlib_1.default;
+const graphlib_1 = __importStar(require("@dagrejs/graphlib"));
+const { alg } = graphlib_1.default;
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const globals_js_1 = require("./globals.js");
@@ -35,7 +55,7 @@ class LayoutEngine {
         return "[" + value + "]" + padding;
     }
     runLayout(sequence, nets) {
-        const logNodesAndEdges = false;
+        const logNodesAndEdges = true;
         this.print('===== creating graph and populating with nodes =====');
         const { graph, containerFrames } = this.generateLayoutGraph(sequence, nets);
         this.print('===== done populating graph =====');
@@ -52,7 +72,7 @@ class LayoutEngine {
             this.print('===== graph nodes =====');
             const nodes = graph.nodes();
             nodes.forEach(node => {
-                this.print(node, graph.node(node));
+                this.print(`name:${node}, value:${graph.node(node)}`);
             });
             this.print('===== end nodes =====');
             this.print('');
@@ -610,8 +630,8 @@ class LayoutEngine {
     generateLayoutGraph(sequence, nets) {
         let previousNode = null;
         let previousPin = null;
-        const graph = new Graph({
-            directed: false,
+        const graph = new graphlib_1.Graph({
+            directed: true,
             compound: true,
         });
         this.print('sequence length:', sequence.length);
@@ -629,7 +649,7 @@ class LayoutEngine {
                     const tmpInstanceName = component.instanceName;
                     if (!graph.hasNode(tmpInstanceName)) {
                         this.print('create instance', tmpInstanceName);
-                        const { displayProp = null, widthProp = null, heightProp = null } = component;
+                        const { displayProp = null } = component;
                         let tmpSymbol;
                         if (displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
                             tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
@@ -645,26 +665,6 @@ class LayoutEngine {
                             }
                         }
                         applyComponentParamsToSymbol(component, tmpSymbol);
-                        if (component.parameters.has(globals_js_1.ParamKeys.angle)) {
-                            const value = component.parameters.get(globals_js_1.ParamKeys.angle).toNumber();
-                            tmpSymbol.angle = value;
-                        }
-                        if (component.parameters.has(globals_js_1.ParamKeys.flipX)) {
-                            tmpSymbol.flipX =
-                                component.parameters.get(globals_js_1.ParamKeys.flipX);
-                        }
-                        if (component.parameters.has(globals_js_1.ParamKeys.flipY)) {
-                            tmpSymbol.flipY =
-                                component.parameters.get(globals_js_1.ParamKeys.flipY);
-                        }
-                        if (tmpSymbol instanceof draw_symbols_js_1.SymbolCustom) {
-                            if (widthProp) {
-                                tmpSymbol.bodyWidth = (0, helpers_js_1.milsToMM)(widthProp);
-                            }
-                            if (heightProp) {
-                                tmpSymbol.bodyHeight = (0, helpers_js_1.milsToMM)(heightProp);
-                            }
-                        }
                         tmpSymbol.refreshDrawing();
                         const { width: useWidth, height: useHeight } = tmpSymbol.size();
                         tmpComponent = new RenderComponent(component, useWidth, useHeight);
@@ -770,7 +770,11 @@ class LayoutEngine {
         };
     }
     setGraphEdge(graph, node1, node2, edgeValue) {
+        if (!graph.isDirected && graph.hasEdge(node1, node2)) {
+            this.print(`Warning: edge already exists ${node1} ${node2}`);
+        }
         graph.setEdge(node1, node2, edgeValue);
+        this.print(`created edge: node1:${node1} node2:${node2} edgeValue:${edgeValue}`);
     }
     sizeSubGraphs(graph) {
         const subGraphs = alg.components(graph);
@@ -827,7 +831,6 @@ class LayoutEngine {
         this.placeSubgraphV2(graph, firstNodeId, subgraphEdges);
     }
     placeSubgraphV2(graph, firstNodeId, subgraphEdges) {
-        let firstNodePlaced = false;
         const originNodes = [];
         const originNodeGroups = new Map();
         function findOriginNode(node) {
@@ -853,14 +856,6 @@ class LayoutEngine {
             const [nodeId1, pin1, nodeId2, pin2] = graph.edge(edge);
             const [, node1] = graph.node(nodeId1);
             const [, node2] = graph.node(nodeId2);
-            if (nodeId1 === firstNodeId && !firstNodePlaced) {
-                this.print('first node placed at origin');
-                this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, pin1);
-                firstNodePlaced = true;
-                node1.isFloating = false;
-                originNodes.push(node1);
-                originNodeGroups.set(node1.toString(), [node1]);
-            }
             this.print('edge:', '[', node1, pin1, node1.isFloating, ']', '[', node2, pin2, node2.isFloating, ']');
             if (!node1.isFloating && node2.isFloating) {
                 fixedNode = node1;
@@ -938,6 +933,7 @@ class LayoutEngine {
                     this.print(`set wire auto end at: ${untilX} ${untilY}`);
                 }
             });
+            this.print('----');
         });
     }
     mergeOriginNodes(node1, pin1, node2, pin2, originNode1, originNode2, originNodes, originNodeGroups) {
@@ -1138,11 +1134,32 @@ function generateLayoutPinDefinition(component) {
     return symbolPinDefinitions;
 }
 function applyComponentParamsToSymbol(component, symbol) {
+    const { widthProp = null, heightProp = null } = component;
     const newMap = new Map(component.parameters);
     if (!newMap.has('refdes')) {
         newMap.set('refdes', component.assignedRefDes ?? "?");
     }
     symbol.drawing.variables = newMap;
+    if (component.parameters.has(globals_js_1.ParamKeys.angle)) {
+        const value = component.parameters.get(globals_js_1.ParamKeys.angle).toNumber();
+        symbol.angle = value;
+    }
+    if (component.parameters.has(globals_js_1.ParamKeys.flipX)) {
+        symbol.flipX =
+            component.parameters.get(globals_js_1.ParamKeys.flipX);
+    }
+    if (component.parameters.has(globals_js_1.ParamKeys.flipY)) {
+        symbol.flipY =
+            component.parameters.get(globals_js_1.ParamKeys.flipY);
+    }
+    if (symbol instanceof draw_symbols_js_1.SymbolCustom) {
+        if (widthProp) {
+            symbol.bodyWidth = (0, helpers_js_1.milsToMM)(widthProp);
+        }
+        if (heightProp) {
+            symbol.bodyHeight = (0, helpers_js_1.milsToMM)(heightProp);
+        }
+    }
 }
 exports.applyComponentParamsToSymbol = applyComponentParamsToSymbol;
 function calculateSymbolAngle(symbol, pin, direction) {

package/dist/cjs/regenerate-tests.js

@@ -10,7 +10,7 @@ const mainDir = './__tests__/renderData/';
 const env = new environment_js_1.NodeScriptEnvironment();
 environment_js_1.NodeScriptEnvironment.setInstance(env);
 async function regenerateTests(extra = "") {
-    env.prepareSVGEnvironment();
+    await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs_1.default.readdirSync(mainDir);
     files.forEach(file => {
@@ -18,19 +18,20 @@ async function regenerateTests(extra = "") {
             cstFiles.push(file);
         }
     });
-    cstFiles.forEach(file => {
+    for (let i = 0; i < cstFiles.length; i++) {
+        const file = cstFiles[i];
         const inputPath = mainDir + file;
         const scriptData = fs_1.default.readFileSync(inputPath, { encoding: 'utf-8' });
         const outputPath = mainDir + 'svgs/' + file + extra + '.svg';
         env.setModuleDirectory(mainDir);
-        (0, helpers_js_1.renderScript)(scriptData, outputPath, {
+        env.setDefaultLibsPath(mainDir + '../../libs/');
+        await (0, helpers_js_1.renderScript)(scriptData, outputPath, {
             dumpNets: false,
             dumpData: false,
             showStats: false,
             environment: env,
         });
-        console.log('generated ', outputPath);
-    });
+    }
     return cstFiles;
 }
 (async () => {

package/dist/cjs/validate.js

@@ -69,6 +69,7 @@ async function validate() {
     };
     const visitor = await (0, helpers_js_1.validateScript)(inputFilePath, scriptData, scriptOptions);
     const symbols = visitor.getSymbols().getSymbols();
+    const undefinedSymbols = [];
     symbols.forEach((value, key) => {
         if (value.type !== types_js_1.ParseSymbolType.Undefined) {
             value = value;
@@ -78,12 +79,30 @@ async function validate() {
                 console.log("    " + instance.line + ":" + instance.column + " " + instance.start);
             });
         }
+        else {
+            undefinedSymbols.push(value);
+        }
     });
     const { parsedTokens } = await (0, helpers_js_1.getSemanticTokens)(scriptData, scriptOptions);
     parsedTokens.forEach(item => {
         const { line, column, tokenType, tokenModifiers, textValue } = item;
         console.log(`${line}:${column} - ${textValue} - ${tokenType} | ${tokenModifiers.join(',')}`);
     });
+    console.log('--- undefined ---');
+    undefinedSymbols.forEach(symbol => {
+        const { token } = symbol;
+        const info = {
+            start: {
+                line: (token?.line || 1),
+                character: token?.column || 0
+            },
+            end: {
+                line: (token?.line || 1),
+                character: (token?.column || 0) + ((token?.stop || 0) - (token?.start || 0) + 1)
+            }
+        };
+        console.log(token.text, info);
+    });
 }
 exports.default = validate;
 validate();

package/dist/esm/export.js

@@ -1,4 +1,4 @@
-import { ComponentTypes, NoNetText } from "./globals.js";
+import { NoNetText } from "./globals.js";
 import { NumericValue } from "./objects/ParamDefinition.js";
 export function generateKiCADNetList(netlist) {
     const componentsList = [];
@@ -47,11 +47,6 @@ export function generateKiCADNetList(netlist) {
             }
         }
         else {
-            if (instance.typeProp !== ComponentTypes.net &&
-                instance.typeProp !== ComponentTypes.graphic &&
-                instance.typeProp !== null) {
-                console.log('Skipping', instance.instanceName);
-            }
         }
     });
     const netItems = [];

package/dist/esm/helpers.js

@@ -154,7 +154,21 @@ export async function renderScript(scriptData, outputPath, options) {
             errors.push(error);
         }
         else if (error && error instanceof RecognitionException) {
-            errors.push(new ParseSyntaxError(message, context.start, context.stop));
+            if (context !== null) {
+                errors.push(new ParseSyntaxError(message, context.start, context.stop));
+            }
+            else {
+                if (error.recognizer) {
+                    const recognizer = error.recognizer;
+                    errors.push(new ParseSyntaxError(message, {
+                        line: recognizer.currentTokenStartLine,
+                        column: recognizer.currentTokenColumn
+                    }));
+                }
+                else {
+                    errors.push(new ParseSyntaxError(message));
+                }
+            }
         }
         else {
             errors.push(new ParseError(message, context.start, context.stop));
@@ -214,7 +228,10 @@ export async function renderScript(scriptData, outputPath, options) {
                 });
                 writeFileSync(outputPath, printTree(kicadNetList));
                 console.log('Generated file', outputPath);
-                return null;
+                return {
+                    svgOutput: null,
+                    errors,
+                };
             }
             const layoutEngine = new LayoutEngine();
             const layoutTimer = new SimpleStopwatch();

package/dist/esm/layout.js

@@ -1,5 +1,5 @@
-import pkg from '@dagrejs/graphlib';
-const { Graph, alg } = pkg;
+import graphlib, { Graph } from '@dagrejs/graphlib';
+const { alg } = graphlib;
 import { SymbolCustom, SymbolDrawing, SymbolCustomModule, SymbolPlaceholder, SymbolText, PlaceHolderCommands } from "./draw_symbols.js";
 import { FrameAction, SequenceAction } from "./objects/ExecutionScope.js";
 import { ComponentTypes, defaultFrameTitleTextSize, defaultGridSizeUnits, FrameType, ParamKeys, SymbolPinSide, WireAutoDirection } from './globals.js';
@@ -30,7 +30,7 @@ export class LayoutEngine {
         return "[" + value + "]" + padding;
     }
     runLayout(sequence, nets) {
-        const logNodesAndEdges = false;
+        const logNodesAndEdges = true;
         this.print('===== creating graph and populating with nodes =====');
         const { graph, containerFrames } = this.generateLayoutGraph(sequence, nets);
         this.print('===== done populating graph =====');
@@ -47,7 +47,7 @@ export class LayoutEngine {
             this.print('===== graph nodes =====');
             const nodes = graph.nodes();
             nodes.forEach(node => {
-                this.print(node, graph.node(node));
+                this.print(`name:${node}, value:${graph.node(node)}`);
             });
             this.print('===== end nodes =====');
             this.print('');
@@ -606,7 +606,7 @@ export class LayoutEngine {
         let previousNode = null;
         let previousPin = null;
         const graph = new Graph({
-            directed: false,
+            directed: true,
             compound: true,
         });
         this.print('sequence length:', sequence.length);
@@ -624,7 +624,7 @@ export class LayoutEngine {
                     const tmpInstanceName = component.instanceName;
                     if (!graph.hasNode(tmpInstanceName)) {
                         this.print('create instance', tmpInstanceName);
-                        const { displayProp = null, widthProp = null, heightProp = null } = component;
+                        const { displayProp = null } = component;
                         let tmpSymbol;
                         if (displayProp instanceof SymbolDrawing) {
                             tmpSymbol = new SymbolPlaceholder(displayProp);
@@ -640,26 +640,6 @@ export class LayoutEngine {
                             }
                         }
                         applyComponentParamsToSymbol(component, tmpSymbol);
-                        if (component.parameters.has(ParamKeys.angle)) {
-                            const value = component.parameters.get(ParamKeys.angle).toNumber();
-                            tmpSymbol.angle = value;
-                        }
-                        if (component.parameters.has(ParamKeys.flipX)) {
-                            tmpSymbol.flipX =
-                                component.parameters.get(ParamKeys.flipX);
-                        }
-                        if (component.parameters.has(ParamKeys.flipY)) {
-                            tmpSymbol.flipY =
-                                component.parameters.get(ParamKeys.flipY);
-                        }
-                        if (tmpSymbol instanceof SymbolCustom) {
-                            if (widthProp) {
-                                tmpSymbol.bodyWidth = milsToMM(widthProp);
-                            }
-                            if (heightProp) {
-                                tmpSymbol.bodyHeight = milsToMM(heightProp);
-                            }
-                        }
                         tmpSymbol.refreshDrawing();
                         const { width: useWidth, height: useHeight } = tmpSymbol.size();
                         tmpComponent = new RenderComponent(component, useWidth, useHeight);
@@ -765,7 +745,11 @@ export class LayoutEngine {
         };
     }
     setGraphEdge(graph, node1, node2, edgeValue) {
+        if (!graph.isDirected && graph.hasEdge(node1, node2)) {
+            this.print(`Warning: edge already exists ${node1} ${node2}`);
+        }
         graph.setEdge(node1, node2, edgeValue);
+        this.print(`created edge: node1:${node1} node2:${node2} edgeValue:${edgeValue}`);
     }
     sizeSubGraphs(graph) {
         const subGraphs = alg.components(graph);
@@ -822,7 +806,6 @@ export class LayoutEngine {
         this.placeSubgraphV2(graph, firstNodeId, subgraphEdges);
     }
     placeSubgraphV2(graph, firstNodeId, subgraphEdges) {
-        let firstNodePlaced = false;
         const originNodes = [];
         const originNodeGroups = new Map();
         function findOriginNode(node) {
@@ -848,14 +831,6 @@ export class LayoutEngine {
             const [nodeId1, pin1, nodeId2, pin2] = graph.edge(edge);
             const [, node1] = graph.node(nodeId1);
             const [, node2] = graph.node(nodeId2);
-            if (nodeId1 === firstNodeId && !firstNodePlaced) {
-                this.print('first node placed at origin');
-                this.placeNodeAtPosition(numeric(0), numeric(0), node1, pin1);
-                firstNodePlaced = true;
-                node1.isFloating = false;
-                originNodes.push(node1);
-                originNodeGroups.set(node1.toString(), [node1]);
-            }
             this.print('edge:', '[', node1, pin1, node1.isFloating, ']', '[', node2, pin2, node2.isFloating, ']');
             if (!node1.isFloating && node2.isFloating) {
                 fixedNode = node1;
@@ -933,6 +908,7 @@ export class LayoutEngine {
                     this.print(`set wire auto end at: ${untilX} ${untilY}`);
                 }
             });
+            this.print('----');
         });
     }
     mergeOriginNodes(node1, pin1, node2, pin2, originNode1, originNode2, originNodes, originNodeGroups) {
@@ -1132,11 +1108,32 @@ function generateLayoutPinDefinition(component) {
     return symbolPinDefinitions;
 }
 export function applyComponentParamsToSymbol(component, symbol) {
+    const { widthProp = null, heightProp = null } = component;
     const newMap = new Map(component.parameters);
     if (!newMap.has('refdes')) {
         newMap.set('refdes', component.assignedRefDes ?? "?");
     }
     symbol.drawing.variables = newMap;
+    if (component.parameters.has(ParamKeys.angle)) {
+        const value = component.parameters.get(ParamKeys.angle).toNumber();
+        symbol.angle = value;
+    }
+    if (component.parameters.has(ParamKeys.flipX)) {
+        symbol.flipX =
+            component.parameters.get(ParamKeys.flipX);
+    }
+    if (component.parameters.has(ParamKeys.flipY)) {
+        symbol.flipY =
+            component.parameters.get(ParamKeys.flipY);
+    }
+    if (symbol instanceof SymbolCustom) {
+        if (widthProp) {
+            symbol.bodyWidth = milsToMM(widthProp);
+        }
+        if (heightProp) {
+            symbol.bodyHeight = milsToMM(heightProp);
+        }
+    }
 }
 function calculateSymbolAngle(symbol, pin, direction) {
     let directionVector = 0;

package/dist/esm/regenerate-tests.js

@@ -5,7 +5,7 @@ const mainDir = './__tests__/renderData/';
 const env = new NodeScriptEnvironment();
 NodeScriptEnvironment.setInstance(env);
 async function regenerateTests(extra = "") {
-    env.prepareSVGEnvironment();
+    await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs.readdirSync(mainDir);
     files.forEach(file => {
@@ -13,19 +13,20 @@ async function regenerateTests(extra = "") {
             cstFiles.push(file);
         }
     });
-    cstFiles.forEach(file => {
+    for (let i = 0; i < cstFiles.length; i++) {
+        const file = cstFiles[i];
         const inputPath = mainDir + file;
         const scriptData = fs.readFileSync(inputPath, { encoding: 'utf-8' });
         const outputPath = mainDir + 'svgs/' + file + extra + '.svg';
         env.setModuleDirectory(mainDir);
-        renderScript(scriptData, outputPath, {
+        env.setDefaultLibsPath(mainDir + '../../libs/');
+        await renderScript(scriptData, outputPath, {
             dumpNets: false,
             dumpData: false,
             showStats: false,
             environment: env,
         });
-        console.log('generated ', outputPath);
-    });
+    }
     return cstFiles;
 }
 (async () => {

package/dist/esm/validate.js

@@ -67,6 +67,7 @@ export default async function validate() {
     };
     const visitor = await validateScript(inputFilePath, scriptData, scriptOptions);
     const symbols = visitor.getSymbols().getSymbols();
+    const undefinedSymbols = [];
     symbols.forEach((value, key) => {
         if (value.type !== ParseSymbolType.Undefined) {
             value = value;
@@ -76,11 +77,29 @@ export default async function validate() {
                 console.log("    " + instance.line + ":" + instance.column + " " + instance.start);
             });
         }
+        else {
+            undefinedSymbols.push(value);
+        }
     });
     const { parsedTokens } = await getSemanticTokens(scriptData, scriptOptions);
     parsedTokens.forEach(item => {
         const { line, column, tokenType, tokenModifiers, textValue } = item;
         console.log(`${line}:${column} - ${textValue} - ${tokenType} | ${tokenModifiers.join(',')}`);
     });
+    console.log('--- undefined ---');
+    undefinedSymbols.forEach(symbol => {
+        const { token } = symbol;
+        const info = {
+            start: {
+                line: (token?.line || 1),
+                character: token?.column || 0
+            },
+            end: {
+                line: (token?.line || 1),
+                character: (token?.column || 0) + ((token?.stop || 0) - (token?.start || 0) + 1)
+            }
+        };
+        console.log(token.text, info);
+    });
 }
 validate();

package/dist/types/layout.d.ts

@@ -0,0 +1,148 @@
+import { Graph } from '@dagrejs/graphlib';
+import { SymbolGraphic, SymbolText, SymbolDrawingCommands } from "./draw_symbols.js";
+import { ClassComponent } from "./objects/ClassComponent.js";
+import { SequenceItem } from "./objects/ExecutionScope.js";
+import { WireAutoDirection } from './globals.js';
+import { WireSegment } from './objects/Wire.js';
+import { Net } from './objects/Net.js';
+import { Logger } from './logger.js';
+import { Frame, FramePlotDirection } from './objects/Frame.js';
+import { BoundBox } from './utils.js';
+import { NumericValue } from './objects/ParamDefinition.js';
+export declare class LayoutEngine {
+    logger: Logger;
+    layoutWarnings: string[];
+    showBaseFrame: boolean;
+    constructor(options?: {
+        showBaseFrame: boolean;
+    });
+    protected print(...params: any[]): void;
+    protected printLevel(level: number, ...params: any[]): void;
+    protected padLevel(value: number): string;
+    runLayout(sequence: SequenceItem[], nets: [ClassComponent, pin: number, net: Net][]): SheetFrame[];
+    private flattenFrameItems;
+    private findJunctions;
+    private placeFrames;
+    collectElementFrames(frame: RenderFrame, level?: number): RenderFrame[];
+    applyFrameOffset(frame: RenderFrame, level?: number): void;
+    private placeAndSizeFrame;
+    dumpFrame(frame: RenderFrame, level?: number): void;
+    private prepareFrames;
+    private checkAddFrameTitle;
+    generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: number, net: Net][]): {
+        graph: Graph;
+        containerFrames: RenderFrame[];
+    };
+    private setGraphEdge;
+    private sizeSubGraphs;
+    private walkAndPlaceGraph;
+    private placeSubgraphV2;
+    mergeOriginNodes(node1: RenderItem, pin1: number, node2: RenderItem, pin2: number, originNode1: string, originNode2: string, originNodes: RenderItem[], originNodeGroups: Map<string, RenderItem[]>): void;
+    translateNodeBy(offsetX: number, offsetY: number, item: RenderItem): void;
+    placeNodeAtPosition(fromX: NumericValue, fromY: NumericValue, item: RenderItem, pin: number, depth?: number): void;
+    placeFloatingItems(graph: Graph, item: RenderItem, depth?: number): void;
+    printWarnings(): void;
+}
+type RenderItem = RenderComponent | RenderWire | RenderText;
+export declare function applyComponentParamsToSymbol(component: ClassComponent, symbol: SymbolGraphic): void;
+export declare function getBounds(components: (RenderComponent | RenderText)[], wires: RenderWire[], junctions: RenderJunction[], frames: RenderFrame[]): BoundBox;
+export declare class RenderObject {
+    x: NumericValue;
+    y: NumericValue;
+    isFloating: boolean;
+    floatingRelativeTo: [selfPin: number, nodeId: string, pin: number][];
+}
+export declare class RenderWire extends RenderObject {
+    id: number;
+    segments: WireSegment[];
+    points: {
+        x: number;
+        y: number;
+    }[];
+    netName: string;
+    constructor(x: NumericValue, y: NumericValue, segments: WireSegment[]);
+    refreshPoints(): void;
+    getAutoPoints(value: [x: NumericValue, y: NumericValue], direction: WireAutoDirection): [dx: number, dy: number][];
+    getWireEnd(): {
+        x: number;
+        y: number;
+    };
+    isEndAutoLength(): boolean;
+    getEndAuto(): [instance: ClassComponent, pin: number];
+    setEndAuto(untilX: NumericValue, untilY: NumericValue): void;
+    toString(): string;
+}
+export type MergedWire = {
+    netName: string;
+    segments: [x: number, y: number][][];
+    intersectPoints: [x: number, y: number, count: number][];
+};
+export declare class RenderComponent extends RenderObject {
+    component: ClassComponent;
+    symbol: SymbolGraphic;
+    width: number;
+    height: number;
+    displaySymbol: string | null;
+    constructor(component: ClassComponent, width: number, height: number);
+    doesOverlap(other: RenderComponent): boolean;
+    toString(): string;
+}
+export declare class RenderText extends RenderObject {
+    symbol: SymbolText;
+    _fontSize: NumericValue;
+    _fontWeight: string;
+    get fontSize(): NumericValue;
+    set fontSize(value: NumericValue);
+    get fontWeight(): string;
+    set fontWeight(value: string);
+    constructor(text: string);
+}
+export declare class RenderFrame extends RenderObject {
+    bounds: BoundBox | null;
+    frame: Frame;
+    innerItems: (RenderComponent | RenderFrame | RenderText)[];
+    translateX: number;
+    translateY: number;
+    padding: NumericValue;
+    gap: NumericValue;
+    borderWidth: NumericValue;
+    direction: FramePlotDirection;
+    width: NumericValue | null;
+    height: NumericValue | null;
+    subgraphId: string;
+    renderType: RenderFrameType;
+    containsTitle: boolean;
+    constructor(frame: Frame, type?: RenderFrameType);
+    toString(): string;
+}
+export declare enum RenderFrameType {
+    Container = 1,
+    Elements = 2
+}
+export declare class RenderJunction {
+    x: NumericValue;
+    y: NumericValue;
+    constructor(x: NumericValue, y: NumericValue);
+}
+export type SheetFrame = {
+    frame: RenderFrame;
+    frames: RenderFrame[];
+    components: RenderComponent[];
+    wires: RenderWire[];
+    textObjects: RenderText[];
+    junctions: RenderJunction[];
+    mergedWires: MergedWire[];
+};
+export declare function CalculatePinPositions(component: ClassComponent): Map<number, {
+    x: NumericValue;
+    y: NumericValue;
+    angle: NumericValue;
+}>;
+export declare function ExtractDrawingRects(drawing: SymbolDrawingCommands): {
+    x: NumericValue;
+    y: NumericValue;
+    width: NumericValue;
+    height: NumericValue;
+    className: string | undefined;
+}[];
+export { BoundBox };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -78,7 +78,7 @@
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
     "dependencies": {
-        "@dagrejs/graphlib": "2.1.13",
+        "@dagrejs/graphlib": "^2.2.4",
         "@flatten-js/core": "1.5.5",
         "@svgdotjs/svg.js": "3.2.0",
         "antlr4ng": "^3.0.4",