circuitscript 0.1.5 → 0.1.8

package/dist/cjs/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPaperSize = exports.isSupportedPaperSize = exports.PaperGridReferences = 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;
+exports.getPaperSize = exports.isSupportedPaperSize = exports.PaperGridReferences = exports.pxToMM = exports.milsToMM = exports.UnitDimension = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.prepareFile = exports.JSModuleType = void 0;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const pdfkit_1 = __importDefault(require("pdfkit"));
@@ -13,8 +13,8 @@ const parser_js_1 = require("./parser.js");
 const render_js_1 = require("./render.js");
 const utils_js_1 = require("./utils.js");
 const visitor_js_1 = require("./visitor.js");
-const this_file_1 = require("this-file");
-const SymbolValidatorVisitor_js_1 = require("./SymbolValidatorVisitor.js");
+const SymbolValidatorVisitor_js_1 = require("./validate/SymbolValidatorVisitor.js");
+const SymbolValidatorResolveVisitor_js_1 = require("./validate/SymbolValidatorResolveVisitor.js");
 const antlr4ng_1 = require("antlr4ng");
 const lexer_js_1 = require("./lexer.js");
 const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
@@ -44,22 +44,12 @@ function prepareFile(textData) {
     };
 }
 exports.prepareFile = prepareFile;
-function getScriptText(filePath) {
-    try {
-        return (0, fs_1.readFileSync)(filePath, { encoding: 'utf-8' });
-    }
-    catch (err) {
-        return null;
-    }
-}
-exports.getScriptText = getScriptText;
-function getSemanticTokens(scriptData, options) {
+async function getSemanticTokens(scriptData, options) {
     const { parser, lexer, tokens } = prepareFile(scriptData);
     const tree = parser.script();
-    const { currentDirectory = null, defaultLibsPath, } = options;
-    const visitor = new SemanticTokenVisitor_js_1.SemanticTokensVisitor(true, null, currentDirectory, defaultLibsPath, lexer, scriptData);
+    const visitor = new SemanticTokenVisitor_js_1.SemanticTokensVisitor(true, null, options.environment, lexer, scriptData);
     parser.removeErrorListeners();
-    visitor.onImportFile = (visitor, textData) => {
+    visitor.onImportFile = async (visitor, filePath, textData) => {
         let hasError = false;
         let hasParseError = false;
         if (textData !== null) {
@@ -72,6 +62,7 @@ function getSemanticTokens(scriptData, options) {
                 console.log('Error while parsing: ', err);
                 hasParseError = true;
                 hasError = true;
+                throw new utils_js_1.ParseError(`Error parsing semantic tokens in imported file: ${err}`);
             }
         }
         else {
@@ -82,7 +73,7 @@ function getSemanticTokens(scriptData, options) {
             hasError, hasParseError
         };
     };
-    visitor.visit(tree);
+    await visitor.visitAsync(tree);
     const semanticTokens = visitor.getTokens();
     const parsedTokens = (0, SemanticTokenVisitor_js_1.prepareTokens)(tokens.getTokens(), lexer, scriptData);
     const finalParsedTokens = [];
@@ -120,27 +111,30 @@ class ParseErrorStrategy extends antlr4ng_1.DefaultErrorStrategy {
     }
 }
 exports.ParseErrorStrategy = ParseErrorStrategy;
-function validateScript(scriptData, options) {
+async function validateScript(filePath, scriptData, options) {
     const { parser } = prepareFile(scriptData);
     parser.removeErrorListeners();
     parser.errorHandler = new ParseErrorStrategy();
     parser.addErrorListener(new TokenErrorListener());
     const tree = parser.script();
-    const { currentDirectory = null, defaultLibsPath, } = options;
-    const visitor = new SymbolValidatorVisitor_js_1.SymbolValidatorVisitor(true, null, currentDirectory, defaultLibsPath);
-    visitor.onImportFile = (visitor, textData) => {
+    const visitor = new SymbolValidatorVisitor_js_1.SymbolValidatorVisitor(true, null, options.environment);
+    visitor.enterFile(filePath);
+    visitor.onImportFile = async (visitor, filePath, textData) => {
+        visitor.enterFile(filePath);
         let hasError = false;
         let hasParseError = false;
         if (textData !== null) {
             const { parser } = prepareFile(textData);
             const tree = parser.script();
             try {
-                visitor.visit(tree);
+                await visitor.visitAsync(tree);
+                visitor.exitFile();
             }
             catch (err) {
                 console.log('got an error while parsing tree: ', err);
                 hasParseError = true;
                 hasError = true;
+                throw new utils_js_1.ParseError(`Error parsing validation in imported file: ${err}`);
             }
         }
         else {
@@ -151,120 +145,177 @@ function validateScript(scriptData, options) {
             hasError, hasParseError
         };
     };
-    visitor.visit(tree);
+    await visitor.visitAsync(tree);
     const symbolTable = visitor.getSymbols();
     symbolTable.clearUndefined();
-    const visitorResolver = new SymbolValidatorVisitor_js_1.SymbolValidatorResolveVisitor(true, null, currentDirectory, defaultLibsPath);
+    const visitorResolver = new SymbolValidatorResolveVisitor_js_1.SymbolValidatorResolveVisitor(true, null, options.environment);
+    visitorResolver.enterFile(filePath);
     visitorResolver.setSymbols(visitor.getSymbols());
     visitorResolver.onImportFile = visitor.onImportFile;
-    visitorResolver.visit(tree);
+    await visitorResolver.visitAsync(tree);
     return visitorResolver;
 }
 exports.validateScript = validateScript;
-function renderScript(scriptData, outputPath, options) {
-    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, showStats = false } = options;
-    const onErrorHandler = (line, column, message, error) => {
-        if (error instanceof visitor_js_1.VisitorExecutionException) {
-            console.log('Error', line, column, message, error.errorMessage);
+async function renderScript(scriptData, outputPath, options) {
+    const { dumpNets = false, dumpData = false, showStats = false, environment } = options;
+    const errors = [];
+    const onErrorHandler = (message, context, error) => {
+        if (error && error instanceof utils_js_1.RuntimeExecutionError) {
+            errors.push(error);
+        }
+        else if (error && error instanceof antlr4ng_1.RecognitionException) {
+            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));
         }
     };
-    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, currentDirectory, defaultLibsPath);
-    visitor.onImportFile = (visitor, fileData) => {
-        const { hasError, hasParseError } = (0, parser_js_1.parseFileWithVisitor)(visitor, fileData);
+    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, options.environment);
+    visitor.onImportFile = async (visitor, filePath, fileData) => {
+        const { hasError, hasParseError } = await (0, parser_js_1.parseFileWithVisitor)(visitor, fileData);
+        if (hasError || hasParseError) {
+            throw new utils_js_1.ParseError(`Error parsing imported file: ${filePath}`, undefined, undefined, filePath);
+        }
         return { hasError, hasParseError };
     };
     visitor.log('reading file');
     visitor.log('done reading file');
-    const { tree, parser, hasParseError, hasError, parserTimeTaken, lexerTimeTaken } = (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
+    const { tree, parser, parserTimeTaken, lexerTimeTaken } = await (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
     showStats && console.log('Lexing took:', lexerTimeTaken);
     showStats && console.log('Parsing took:', parserTimeTaken);
     if (dumpNets) {
         const nets = visitor.dumpNets();
         nets.forEach(item => console.log(item.join(" | ")));
     }
-    const dumpDirectory = currentDirectory + '/dump/';
+    const dumpDirectory = environment.getRelativeToModule('/dump/');
     if (dumpData) {
+        console.log('Dump data to:', dumpDirectory);
         if (!(0, fs_1.existsSync)(dumpDirectory)) {
             (0, fs_1.mkdirSync)(dumpDirectory);
         }
     }
     dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
     dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
-    if (hasError || hasParseError) {
-        console.log('Error while parsing');
-        return null;
-    }
-    const { frameComponent } = visitor.applySheetFrameComponent();
-    try {
-        visitor.annotateComponents();
-    }
-    catch (err) {
-        console.log('Error during annotation: ', err);
-    }
-    const { sequence, nets } = visitor.getGraph();
-    const tmpSequence = (0, utils_js_1.generateDebugSequenceAction)(sequence).map(item => (0, utils_js_1.sequenceActionString)(item));
-    dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = "";
-    try {
-        let fileExtension = null;
-        let outputDefaultZoom = globals_js_1.defaultZoomScale;
-        if (outputPath) {
-            fileExtension = path_1.default.extname(outputPath).substring(1);
-            if (fileExtension === "pdf") {
-                outputDefaultZoom = 1;
-            }
+    if (errors.length === 0) {
+        const { frameComponent } = visitor.applySheetFrameComponent();
+        try {
+            visitor.annotateComponents();
         }
-        if (fileExtension === 'net') {
-            const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
-            missingFootprints.forEach(entry => {
-                console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
-            });
-            (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
-            console.log('Generated file', outputPath);
-            return null;
+        catch (err) {
+            throw new utils_js_1.RenderError(`Error during component annotation: ${err}`, 'annotation');
         }
-        const layoutEngine = new layout_js_1.LayoutEngine();
-        const layoutTimer = new utils_js_1.SimpleStopwatch();
-        const sheetFrames = layoutEngine.runLayout(sequence, nets);
-        layoutEngine.printWarnings();
-        showStats && console.log('Layout took:', layoutTimer.lap());
-        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
-        const generateSvgTimer = new utils_js_1.SimpleStopwatch();
-        const renderLogger = new logger_js_1.Logger();
-        const svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger);
-        showStats && console.log('Render took:', generateSvgTimer.lap());
-        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-render.txt', renderLogger.dump());
-        svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
-        if (outputPath) {
-            if (fileExtension === 'svg') {
-                (0, fs_1.writeFileSync)(outputPath, svgOutput);
-            }
-            else if (fileExtension === 'pdf') {
-                let sheetSize = "A4";
-                let sheetSizeDefined = false;
-                if (frameComponent) {
-                    sheetSize = frameComponent.getParam(Frame_js_1.FrameParamKeys.PaperSize);
-                    sheetSizeDefined = true;
+        const { sequence, nets } = visitor.getGraph();
+        const tmpSequence = (0, utils_js_1.generateDebugSequenceAction)(sequence).map(item => (0, utils_js_1.sequenceActionString)(item));
+        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
+        try {
+            let fileExtension = null;
+            let outputDefaultZoom = globals_js_1.defaultZoomScale;
+            if (outputPath) {
+                fileExtension = path_1.default.extname(outputPath).substring(1);
+                if (fileExtension === "pdf") {
+                    outputDefaultZoom = 1;
                 }
-                const doc = new pdfkit_1.default({
-                    layout: 'landscape',
-                    size: sheetSize
+            }
+            if (fileExtension === 'net') {
+                const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
+                missingFootprints.forEach(entry => {
+                    console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
                 });
-                const outputStream = (0, fs_1.createWriteStream)(outputPath);
-                (0, render_js_1.generatePdfOutput)(doc, svgCanvas, sheetSize, sheetSizeDefined, outputDefaultZoom);
-                doc.pipe(outputStream);
-                doc.end();
+                (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
+                console.log('Generated file', outputPath);
+                return {
+                    svgOutput: null,
+                    errors,
+                };
             }
-            else {
-                throw "Invalid output format";
+            const layoutEngine = new layout_js_1.LayoutEngine();
+            const layoutTimer = new utils_js_1.SimpleStopwatch();
+            let sheetFrames;
+            try {
+                sheetFrames = layoutEngine.runLayout(sequence, nets);
+            }
+            catch (err) {
+                throw new utils_js_1.RenderError(`Error during layout generation: ${err}`, 'layout');
+            }
+            layoutEngine.printWarnings();
+            showStats && console.log('Layout took:', layoutTimer.lap());
+            dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
+            const generateSvgTimer = new utils_js_1.SimpleStopwatch();
+            const renderLogger = new logger_js_1.Logger();
+            let svgCanvas;
+            try {
+                svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger);
+            }
+            catch (err) {
+                throw new utils_js_1.RenderError(`Error during SVG generation: ${err}`, 'svg_generation');
+            }
+            showStats && console.log('Render took:', generateSvgTimer.lap());
+            dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-render.txt', renderLogger.dump());
+            try {
+                svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
+            }
+            catch (err) {
+                throw new utils_js_1.RenderError(`Error generating SVG output: ${err}`, 'svg_output');
+            }
+            if (outputPath) {
+                if (fileExtension === 'svg') {
+                    try {
+                        (0, fs_1.writeFileSync)(outputPath, svgOutput);
+                    }
+                    catch (err) {
+                        throw new utils_js_1.RenderError(`Error writing SVG file: ${err}`, 'file_output');
+                    }
+                }
+                else if (fileExtension === 'pdf') {
+                    let sheetSize = "A4";
+                    let sheetSizeDefined = false;
+                    if (frameComponent) {
+                        sheetSize = frameComponent.getParam(Frame_js_1.FrameParamKeys.PaperSize);
+                        sheetSizeDefined = true;
+                    }
+                    try {
+                        const doc = new pdfkit_1.default({
+                            layout: 'landscape',
+                            size: sheetSize
+                        });
+                        const outputStream = (0, fs_1.createWriteStream)(outputPath);
+                        (0, render_js_1.generatePdfOutput)(doc, svgCanvas, sheetSize, sheetSizeDefined, outputDefaultZoom);
+                        doc.pipe(outputStream);
+                        doc.end();
+                    }
+                    catch (err) {
+                        throw new utils_js_1.RenderError(`Error generating PDF file: ${err}`, 'pdf_output');
+                    }
+                }
+                else {
+                    throw new utils_js_1.RenderError(`Invalid output format: ${fileExtension}`, 'file_output');
+                }
+                console.log('Generated file', outputPath);
             }
-            console.log('Generated file', outputPath);
+        }
+        catch (err) {
+            throw new utils_js_1.RenderError(`Error during rendering: ${err}`, 'output_generation');
         }
     }
-    catch (err) {
-        console.log('Error during render: ', err);
-    }
-    return svgOutput;
+    return {
+        svgOutput,
+        errors
+    };
 }
 exports.renderScript = renderScript;
 function detectJSModuleType() {
@@ -277,32 +328,6 @@ function detectJSModuleType() {
     }
 }
 exports.detectJSModuleType = detectJSModuleType;
-const context = (0, this_file_1.createContext)();
-function getCurrentPath() {
-    const filename = context.filename;
-    return { filePath: filename };
-}
-exports.getCurrentPath = getCurrentPath;
-function getToolsPath() {
-    const { filePath } = getCurrentPath();
-    return path_1.default.normalize(path_1.default.dirname(filePath) + '/../../');
-}
-function getFontsPath() {
-    const toolsPath = getToolsPath();
-    return path_1.default.normalize(toolsPath + "fonts");
-}
-exports.getFontsPath = getFontsPath;
-function getDefaultLibsPath() {
-    const toolsPath = getToolsPath();
-    return path_1.default.normalize(toolsPath + "libs");
-}
-exports.getDefaultLibsPath = getDefaultLibsPath;
-function getPackageVersion() {
-    const packageJson = JSON.parse((0, fs_1.readFileSync)(getToolsPath() + 'package.json').toString());
-    const { version } = packageJson;
-    return version;
-}
-exports.getPackageVersion = getPackageVersion;
 class UnitDimension {
     constructor(value, type = globals_js_1.LengthUnit.mils) {
         this.value = value;

package/dist/cjs/index.js

@@ -29,3 +29,8 @@ __exportStar(require("./utils.js"), exports);
 __exportStar(require("./visitor.js"), exports);
 __exportStar(require("./sizing.js"), exports);
 __exportStar(require("./objects/types.js"), exports);
+__exportStar(require("./builtinMethods.js"), exports);
+__exportStar(require("./validate/SymbolTable.js"), exports);
+__exportStar(require("./validate/SymbolValidatorResolveVisitor.js"), exports);
+__exportStar(require("./validate/SymbolValidatorVisitor.js"), exports);
+__exportStar(require("./environment.js"), exports);

package/dist/cjs/layout.js

@@ -1,7 +1,31 @@
 "use strict";
+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 = require("@dagrejs/graphlib");
+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");
@@ -31,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 =====');
@@ -48,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('');
@@ -111,6 +135,7 @@ class LayoutEngine {
     findJunctions(wireGroups) {
         const junctions = [];
         const mergedWires = [];
+        const debugSegments = false;
         for (const [key, wires] of wireGroups) {
             const allLines = wires.map(wire => {
                 return wire.points.map(pt => {
@@ -120,15 +145,35 @@ class LayoutEngine {
                     };
                 });
             });
-            const { intersectPoints, segments } = geometry_js_1.Geometry.mergeWires(allLines);
-            mergedWires.push({
-                netName: key,
-                segments,
-                intersectPoints,
-            });
-            intersectPoints.forEach(([x, y]) => {
-                junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y)));
-            });
+            if (debugSegments) {
+                const tmpSegments = [];
+                allLines.forEach(wire => {
+                    for (let i = 1; i < wire.length; i++) {
+                        const pt1 = wire[i - 1];
+                        const pt2 = wire[i];
+                        tmpSegments.push([
+                            [pt1.x.toNumber(), pt1.y.toNumber()],
+                            [pt2.x.toNumber(), pt2.y.toNumber()],
+                        ]);
+                    }
+                });
+                mergedWires.push({
+                    netName: key,
+                    segments: tmpSegments,
+                    intersectPoints: [],
+                });
+            }
+            else {
+                const { intersectPoints, segments } = geometry_js_1.Geometry.mergeWires(allLines);
+                mergedWires.push({
+                    netName: key,
+                    segments,
+                    intersectPoints,
+                });
+                intersectPoints.forEach(([x, y]) => {
+                    junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y)));
+                });
+            }
         }
         return {
             junctions,
@@ -586,7 +631,7 @@ class LayoutEngine {
         let previousNode = null;
         let previousPin = null;
         const graph = new graphlib_1.Graph({
-            directed: false,
+            directed: true,
             compound: true,
         });
         this.print('sequence length:', sequence.length);
@@ -604,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);
@@ -620,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);
@@ -745,10 +770,14 @@ 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 = graphlib_1.alg.components(graph);
+        const subGraphs = alg.components(graph);
         const subGraphsStarts = [];
         this.print('===== placing subgraphs =====');
         this.print('number of subgraphs: ', subGraphs.length);
@@ -802,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) {
@@ -828,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;
@@ -913,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) {
@@ -1113,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) {