circuitscript 0.1.3 → 0.1.5

package/dist/cjs/BaseVisitor.js

@@ -15,6 +15,7 @@ const types_1 = require("./objects/types");
 const globals_1 = require("./globals");
 const builtinMethods_1 = require("./builtinMethods");
 const utils_1 = require("./utils");
+const ExecutionScope_1 = require("./objects/ExecutionScope");
 class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     constructor(silent = false, onErrorHandler = null, currentDirectory, defaultLibsPath) {
         super();
@@ -51,12 +52,9 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             const trailers = reference.trailers ?? [];
             if (trailers.length === 0) {
                 if (value instanceof ClassComponent_1.ClassComponent) {
-                    const instances = this.getExecutor().scope.instances;
-                    const tmpComponent = value;
-                    const oldName = tmpComponent.instanceName;
-                    tmpComponent.instanceName = reference.name;
-                    instances.delete(oldName);
-                    instances.set(reference.name, tmpComponent);
+                    const variables = this.getExecutor().scope.variables;
+                    variables.set(reference.name, value);
+                    this.getExecutor().scope.sequence.push([ExecutionScope_1.SequenceAction.Assign, reference.name, value]);
                     this.log2(`assigned '${reference.name}' to ClassComponent`);
                 }
                 else {
@@ -162,7 +160,6 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                     executor.scope.setNet(tmpComponent, pinId, net);
                 }
             }
-            this.log2(`atomId: ${atomId} ${currentReference}`);
             if (ctx.parent instanceof CircuitScriptParser_1.ExpressionContext && !currentReference.found) {
                 this.throwWithContext(ctx, "Unknown symbol: " + atomId);
             }
@@ -378,12 +375,18 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         };
         this.logger = new logger_1.Logger();
         this.onErrorCallbackHandler = onErrorHandler;
-        this.startingContext = new execute_1.ExecutionContext('__', '__.', '/', 0, 0, silent, this.logger, null);
-        this.startingContext.scope.variables.set(globals_1.GlobalDocumentName, {});
-        this.setupPrintFunction(this.startingContext);
+        this.startingContext = new execute_1.ExecutionContext(globals_1.DoubleDelimiter1, `${globals_1.DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, null);
+        const scope = this.startingContext.scope;
+        scope.sequence.push([
+            ExecutionScope_1.SequenceAction.At, scope.componentRoot, scope.currentPin
+        ]);
+        scope.variables.set(globals_1.GlobalDocumentName, {});
+        this.setupBuiltInFunctions(this.startingContext);
         this.executionStack = [this.startingContext];
         this.startingContext.resolveNet =
             this.createNetResolver(this.executionStack);
+        this.startingContext.resolveComponentPinNet =
+            this.createComponentPinNetResolver(this.executionStack);
         this.silent = silent;
         this.currentDirectory = currentDirectory;
         this.defaultLibsPath = defaultLibsPath;
@@ -391,7 +394,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     getExecutor() {
         return this.executionStack[this.executionStack.length - 1];
     }
-    setupPrintFunction(context) {
+    setupBuiltInFunctions(context) {
         (0, builtinMethods_1.linkBuiltInMethods)(context, this);
     }
     createNetResolver(executionStack) {
@@ -414,6 +417,19 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         };
         return resolveNet;
     }
+    createComponentPinNetResolver(executionStack) {
+        return (component, pin) => {
+            const reversed = [...executionStack].reverse();
+            for (let i = 0; i < reversed.length; i++) {
+                const context = reversed[i];
+                const net = context.scope.getNet(component, pin);
+                if (net !== null) {
+                    return net;
+                }
+            }
+            return null;
+        };
+    }
     log(...params) {
         const indentOutput = ''.padStart(this.indentLevel * 4, '    ');
         const indentLevelText = this.indentLevel.toString().padStart(3, ' ');
@@ -592,7 +608,6 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         const executionContextNamespace = currentExecutionContext.namespace
             + executionContextName + ".";
         const newExecutor = new execute_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, parentContext);
-        this.setupPrintFunction(newExecutor);
         executionStack.push(newExecutor);
         this.setupDefinedParameters(funcDefinedParameters, passedInParameters, newExecutor);
         return newExecutor;

package/dist/cjs/builtinMethods.js

@@ -23,6 +23,8 @@ function linkBuiltInMethods(context, visitor) {
         ['toMils', toMils],
         ['range', range],
         ['len', objectLength],
+        ['arrayPush', arrayPush],
+        ['arrayGet', arrayGet],
     ];
     builtIns.forEach(([functionName, functionImpl]) => {
         context.createFunction(functionName, params => {
@@ -87,6 +89,26 @@ function objectLength(obj) {
         }
     }
 }
+function arrayPush(arrayObject, valueToPush) {
+    if (!Array.isArray(arrayObject)) {
+        throw "Invalid array object to push";
+    }
+    arrayObject.push(valueToPush);
+    return arrayObject;
+}
+function arrayGet(arrayObject, index) {
+    if (!Array.isArray(arrayObject)) {
+        throw "Invalid array object to get";
+    }
+    let useValue;
+    if (index instanceof ParamDefinition_1.NumericValue) {
+        useValue = index.toNumber();
+    }
+    else {
+        useValue = index;
+    }
+    return arrayObject[useValue];
+}
 function getPositionParams(params) {
     return params.map(([, , value]) => value);
 }

package/dist/cjs/draw_symbols.js

@@ -792,7 +792,10 @@ class SymbolCustom extends SymbolGraphic {
     calculateSize() {
         const tmpPinSpacing = this.pinSpacing.toNumber();
         const tmpPinLength = this.pinLength.toNumber();
-        const { [globals_js_1.SymbolPinSide.Top]: maxTopPins, [globals_js_1.SymbolPinSide.Bottom]: maxBottomPins, [globals_js_1.SymbolPinSide.Left]: maxLeftPins, [globals_js_1.SymbolPinSide.Right]: maxRightPins } = this.pinMaxPositions;
+        const maxTopPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Top);
+        const maxBottomPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Bottom);
+        const maxLeftPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Left);
+        const maxRightPins = this.pinMaxPositions.get(globals_js_1.SymbolPinSide.Right);
         const bodyWidthFromPins = (0, ParamDefinition_js_1.numeric)((1 + Math.max(maxTopPins, maxBottomPins)) * tmpPinSpacing);
         const bodyWidth = Math.max(bodyWidthFromPins.toNumber(), this.bodyWidth.toNumber());
         let tmpBodyHeight = 0;

package/dist/cjs/execute.js

@@ -13,6 +13,7 @@ const Frame_js_1 = require("./objects/Frame.js");
 const layout_js_1 = require("./layout.js");
 const helpers_js_1 = require("./helpers.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
+const utils_js_1 = require("./utils.js");
 class ExecutionContext {
     constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
         this.tmpPointId = 0;
@@ -30,13 +31,6 @@ class ExecutionContext {
         this.scope = ExecutionScope_js_1.ExecutionScope.create();
         this.scope.indentLevel = indentLevel;
         this.setupRoot();
-        if (name === '__') {
-            this.scope.sequence.push([
-                ExecutionScope_js_1.SequenceAction.At,
-                this.scope.componentRoot,
-                this.scope.currentPin
-            ]);
-        }
         this.silent = silent;
         this.log('create new execution context', this.namespace, this.name, this.scope.indentLevel);
         this.parentContext = parent;
@@ -62,12 +56,12 @@ class ExecutionContext {
         this.scope.componentRoot = componentRoot;
     }
     getUniqueInstanceName() {
-        const tmpName = 'COMP_' + this.scope.unnamedCounter;
+        const tmpName = `COMP${globals_js_1.Delimiter1}${this.scope.unnamedCounter}`;
         this.scope.unnamedCounter += 1;
         return tmpName;
     }
     getUniqueNetName() {
-        const tmpName = 'NET_' + this.scope.netCounter;
+        const tmpName = `NET${globals_js_1.Delimiter1}${this.scope.netCounter}`;
         this.scope.netCounter++;
         return tmpName;
     }
@@ -77,7 +71,7 @@ class ExecutionContext {
     linkComponentPinNet(component1, component1Pin, component2, component2Pin) {
         const net1 = this.scope.getNet(component1, component1Pin);
         const net2 = this.scope.getNet(component2, component2Pin);
-        this.log('link nets', component1, component1Pin, net1, 'to', component2, component2Pin, net2);
+        this.log('link nets', component1, component1Pin, net1, 'priority:' + net1?.priority, 'to', component2, component2Pin, net2, 'priority:' + net2?.priority);
         let returnNet;
         if (net1 === null && net2 === null) {
             const tmpNet = new Net_js_1.Net(this.netNamespace, this.getUniqueNetName());
@@ -101,7 +95,7 @@ class ExecutionContext {
                 returnNet = net1;
             }
         }
-        this.log('final net after link: ', returnNet);
+        this.log('final net after link: ', returnNet, returnNet.priority);
         return returnNet;
     }
     mergeNets(net1, net2) {
@@ -162,8 +156,9 @@ class ExecutionContext {
                 tmpNet = new Net_js_1.Net(this.netNamespace, netName, priority);
                 this.log('net not found, added net instance', tmpNet.namespace, tmpNet.name);
             }
-            this.scope.setNet(component, 1, tmpNet);
-            this.log('set net', netName, 'component', component);
+            const defaultPin = 1;
+            this.scope.setNet(component, defaultPin, tmpNet);
+            this.log('set net', netName, 'component', component, defaultPin);
         }
         const { pins: pinSides, maxPositions } = getPortSide(component.pins, component.arrangeProps);
         component.pinsMaxPositions = maxPositions;
@@ -205,7 +200,6 @@ class ExecutionContext {
         this.atComponent(component, nextPin, {
             addSequence: true
         });
-        this.printPoint();
         return this.getCurrentPoint();
     }
     toComponent(component, pinId, options) {
@@ -279,6 +273,7 @@ class ExecutionContext {
         return this.getCurrentPoint();
     }
     copyComponent(component) {
+        this.log('create clone of net component:', component);
         let componentCopy = null;
         if (!this.scope.copyIDs.has(component.instanceName)) {
             this.scope.copyIDs.set(component.instanceName, 0);
@@ -291,14 +286,24 @@ class ExecutionContext {
         const cloneInstanceName = component.instanceName + ':' + idNum;
         this.scope.instances.set(cloneInstanceName, componentCopy);
         componentCopy.instanceName = cloneInstanceName;
-        this.linkComponentPinNet(component, 1, componentCopy, 1);
+        const defaultPin = 1;
+        if (this.scope.getNet(component, defaultPin) === null) {
+            const foundNet = this.resolveComponentPinNet(component, defaultPin);
+            if (foundNet !== null) {
+                this.log('found net in upper scopes', foundNet);
+                this.scope.setNet(component, defaultPin, foundNet);
+            }
+        }
+        this.linkComponentPinNet(component, defaultPin, componentCopy, defaultPin);
         this.log('created clone of net component:', cloneInstanceName);
         return componentCopy;
     }
     enterBlocks(blockType) {
-        if (blockType === globals_js_1.BlockTypes.Point || blockType === globals_js_1.BlockTypes.Parallel) {
-            const key = blockType === globals_js_1.BlockTypes.Point ? 'point' : 'parallel';
-            this.addPoint(`_${key}.${this.name}.${this.tmpPointId}`, false);
+        if (blockType === globals_js_1.BlockTypes.Point
+            || blockType === globals_js_1.BlockTypes.Parallel
+            || blockType === globals_js_1.BlockTypes.Branch) {
+            const key = (0, utils_js_1.getBlockTypeString)(blockType);
+            this.addPoint(`${globals_js_1.Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
         }
         this.scope.blockStack.set(this.scope.indentLevel, {
@@ -373,7 +378,7 @@ class ExecutionContext {
         }
         else if (blockType === globals_js_1.BlockTypes.Join || blockType === globals_js_1.BlockTypes.Parallel) {
             if (blockIndex === 0) {
-                const pointIdName = (blockType === globals_js_1.BlockTypes.Join) ? '_join' : '_parallel';
+                const pointIdName = `${globals_js_1.Delimiter1}${(0, utils_js_1.getBlockTypeString)(blockType)}`;
                 this.addPoint(`${pointIdName}.${this.name}.${this.tmpPointId}`, false);
                 this.tmpPointId += 1;
                 stackRef['final_point'] = [
@@ -407,7 +412,7 @@ class ExecutionContext {
             const stackRef = this.scope.blockStack.get(this.scope.indentLevel - 1 - i);
             const { entered_at } = stackRef;
             const component = entered_at[0];
-            if (component.instanceName.startsWith('_point.')) {
+            if (component.instanceName.startsWith(`${globals_js_1.Delimiter1}point.`)) {
                 return entered_at;
             }
         }
@@ -522,14 +527,12 @@ class ExecutionContext {
         const currentComponent = this.scope.currentComponent;
         const currentPin = this.scope.currentPin;
         const currentWireId = this.scope.currentWireId;
-        const gndCopyIdOffset = 0;
         const tmpInstances = childScope.instances;
         const tmpNets = childScope.getNets();
         for (const [instanceName, component] of tmpInstances) {
             const newInstanceName = `${namespace}.${instanceName}`;
             component.instanceName = newInstanceName;
-            if (component === childScope.componentGnd ||
-                component === childScope.componentRoot) {
+            if (component === childScope.componentRoot) {
                 continue;
             }
             if (!this.scope.instances.has(newInstanceName)) {
@@ -539,6 +542,16 @@ class ExecutionContext {
                 throw "Invalid instance name to merge into parent scope!";
             }
         }
+        const childScopeUniqueNets = new Set(tmpNets.map(([, , net]) => net));
+        childScopeUniqueNets.forEach(net => {
+            if (net.priority === 0
+                && this.scope.getNetWithNamespacePath(net.namespace, net.name) !== null) {
+                this.log('net namespace and name already used in parent scope', net);
+                const newNetName = this.getUniqueNetName();
+                net.name = newNetName;
+                this.log('assigned new name: ', net);
+            }
+        });
         tmpNets.forEach(([component, pin, net]) => {
             this.scope.setNet(component, pin, net);
         });
@@ -553,7 +566,6 @@ class ExecutionContext {
                     this.scope.setNet(currentComponent, currentPin, netConnectedToRoot);
                     currentNet = tmpNet;
                 }
-                netConnectedToRoot.priority = currentNet.priority - 1;
                 this.toComponent(tmpRoot, 1);
             }
         }
@@ -642,7 +654,7 @@ class ExecutionContext {
             this.log('Warning: ' + pointId + ' is being redefined');
         }
         const useName = userDefined ? 'point.' + pointId : pointId;
-        const componentPoint = ClassComponent_js_1.ClassComponent.simple(useName, 1, "point");
+        const componentPoint = ClassComponent_js_1.ClassComponent.simple(useName, 1);
         componentPoint.displayProp = this.getPointSymbol();
         componentPoint.typeProp = globals_js_1.ComponentTypes.net;
         this.scope.instances.set(pointId, componentPoint);
@@ -797,12 +809,11 @@ function isWireSegmentsEndAuto(segments) {
 }
 function getPortSide(pins, arrangeProps) {
     const result = [];
-    const maxPositions = {
-        [globals_js_1.SymbolPinSide.Left]: 0,
-        [globals_js_1.SymbolPinSide.Right]: 0,
-        [globals_js_1.SymbolPinSide.Top]: 0,
-        [globals_js_1.SymbolPinSide.Bottom]: 0,
-    };
+    const maxPositions = new Map();
+    maxPositions.set(globals_js_1.SymbolPinSide.Left, 0);
+    maxPositions.set(globals_js_1.SymbolPinSide.Right, 0);
+    maxPositions.set(globals_js_1.SymbolPinSide.Top, 0);
+    maxPositions.set(globals_js_1.SymbolPinSide.Bottom, 0);
     if (arrangeProps === null) {
         let counter = 0;
         for (const [pinId] of pins) {
@@ -820,8 +831,8 @@ function getPortSide(pins, arrangeProps) {
         const rightSideItems = result.filter(item => {
             return item.side === PinDefinition_js_1.PortSide.EAST;
         });
-        maxPositions[globals_js_1.SymbolPinSide.Left] = leftSideItems.length;
-        maxPositions[globals_js_1.SymbolPinSide.Right] = rightSideItems.length;
+        maxPositions.set(globals_js_1.SymbolPinSide.Left, leftSideItems.length);
+        maxPositions.set(globals_js_1.SymbolPinSide.Right, rightSideItems.length);
     }
     else {
         let counter = pins.size;
@@ -868,7 +879,7 @@ function getPortSide(pins, arrangeProps) {
                     }
                 }
             });
-            maxPositions[key] = position;
+            maxPositions.set(key, position);
         }
     }
     return {

package/dist/cjs/globals.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = 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.defaultPageSpacingMM = exports.defaultPageMarginMM = 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;
+exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = 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.defaultPageSpacingMM = exports.defaultPageMarginMM = 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 = exports.DoubleDelimiter1 = exports.Delimiter1 = void 0;
 const ParamDefinition_1 = require("./objects/ParamDefinition");
+exports.Delimiter1 = '-';
+exports.DoubleDelimiter1 = `${exports.Delimiter1}${exports.Delimiter1}`;
 var GlobalNames;
 (function (GlobalNames) {
-    GlobalNames["__root"] = "__root";
+    GlobalNames["__root"] = "--root";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (exports.GlobalNames = GlobalNames = {}));
 exports.NoNetText = 'NO_NET';

package/dist/cjs/helpers.js

@@ -9,7 +9,6 @@ const path_1 = __importDefault(require("path"));
 const pdfkit_1 = __importDefault(require("pdfkit"));
 const export_js_1 = require("./export.js");
 const layout_js_1 = require("./layout.js");
-const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const parser_js_1 = require("./parser.js");
 const render_js_1 = require("./render.js");
 const utils_js_1 = require("./utils.js");
@@ -181,10 +180,16 @@ function renderScript(scriptData, outputPath, options) {
     showStats && console.log('Parsing took:', parserTimeTaken);
     if (dumpNets) {
         const nets = visitor.dumpNets();
-        console.log(nets);
+        nets.forEach(item => console.log(item.join(" | ")));
     }
-    dumpData && (0, fs_1.writeFileSync)('dump/tree.lisp', tree.toStringTree(null, parser));
-    dumpData && (0, fs_1.writeFileSync)('dump/raw-parser.txt', visitor.logger.dump());
+    const dumpDirectory = currentDirectory + '/dump/';
+    if (dumpData) {
+        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;
@@ -197,29 +202,8 @@ function renderScript(scriptData, outputPath, options) {
         console.log('Error during annotation: ', err);
     }
     const { sequence, nets } = visitor.getGraph();
-    const tmpSequence = sequence.map(item => {
-        const tmp = [...item];
-        const action = tmp[0];
-        if (action === ExecutionScope_js_1.SequenceAction.Wire) {
-            tmp[2] = tmp[2].map(item2 => {
-                const lengthValue = item2.value;
-                const useValue = [item2.direction];
-                if (lengthValue !== null) {
-                    useValue.push(lengthValue.value);
-                    useValue.push(lengthValue.type);
-                }
-                return useValue.join(",");
-            }).join(" ");
-        }
-        else if (action === ExecutionScope_js_1.SequenceAction.Frame) {
-            tmp[1] = item[1].frameId;
-        }
-        else if (action !== ExecutionScope_js_1.SequenceAction.WireJump) {
-            tmp[1] = item[1].instanceName;
-        }
-        return tmp.join(" | ");
-    });
-    dumpData && (0, fs_1.writeFileSync)('dump/raw-sequence.txt', tmpSequence.join('\n'));
+    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;
@@ -244,12 +228,12 @@ function renderScript(scriptData, outputPath, options) {
         const sheetFrames = 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());
+        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)('dump/raw-render.txt', renderLogger.dump());
+        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-render.txt', renderLogger.dump());
         svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
         if (outputPath) {
             if (fileExtension === 'svg') {

package/dist/cjs/layout.js

@@ -348,7 +348,7 @@ class LayoutEngine {
                         const frameArea = [tmpX1, tmpY1, tmpX2, tmpY2];
                         const overlaps = avoidAreas.filter(area => (0, utils_js_1.areasOverlap)(frameArea, area));
                         const doesOverlapAreasToAvoid = overlaps.length > 0;
-                        if (doesExceedFrameHeight || doesOverlapAreasToAvoid) {
+                        if (boundPoints.length > 0 && (doesExceedFrameHeight || doesOverlapAreasToAvoid)) {
                             innerFrameY = offsetY;
                             const nextX = (0, ParamDefinition_js_1.numeric)(xmax).sub(offsetX).add(frame.gap);
                             innerFrameX = offsetX.add(nextX);
@@ -378,7 +378,7 @@ class LayoutEngine {
                         const frameArea = [tmpX1, tmpY1, tmpX2, tmpY2];
                         const overlaps = avoidAreas.filter(area => (0, utils_js_1.areasOverlap)(frameArea, area));
                         const doesOverlapAreasToAvoid = overlaps.length > 0;
-                        if (doesExceedFrameWidth || doesOverlapAreasToAvoid) {
+                        if (boundPoints.length > 0 && (doesExceedFrameWidth || doesOverlapAreasToAvoid)) {
                             innerFrameX = offsetX.add(centeredOffsetX);
                             const { ymax } = getBoundsFromPoints(boundPoints);
                             const nextY = (0, ParamDefinition_js_1.numeric)(ymax).sub(offsetY).add(frame.gap);
@@ -1396,7 +1396,7 @@ class RenderFrame extends RenderObject {
         this.padding = (0, helpers_js_1.milsToMM)(100);
         this.gap = (0, helpers_js_1.milsToMM)(100);
         this.borderWidth = (0, ParamDefinition_js_1.numeric)(5);
-        this.direction = Frame_js_1.FramePlotDirection.Column;
+        this.direction = Frame_js_1.FramePlotDirection.Row;
         this.width = null;
         this.height = null;
         this.subgraphId = "";

package/dist/cjs/main.js

@@ -24,7 +24,8 @@ async function main() {
         .option('-w, --watch', 'Watch for file changes')
         .option('-n, --dump-nets', 'Dump out net information')
         .option('-d, --dump-data', 'Dump data during parsing')
-        .option('-s, --stats', 'Show stats during generation');
+        .option('-s, --stats', 'Show stats during generation')
+        .option('-x, --skip-output', 'Skip output generation');
     commander_1.program.addHelpText('before', figlet_1.default.textSync('circuitscript', {
         font: 'Small Slant'
     }));
@@ -80,7 +81,7 @@ async function main() {
         outputPath = args[1];
     }
     const output = (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
-    if (outputPath === null && output) {
+    if (outputPath === null && output && (options.skipOutput === undefined)) {
         console.log(output);
     }
     if (watchFileChanges) {

package/dist/cjs/objects/ClassComponent.js

@@ -11,7 +11,7 @@ class ClassComponent {
         this.pins = new Map();
         this.pinNets = new Map();
         this.pinWires = new Map();
-        this.pinsMaxPositions = {};
+        this.pinsMaxPositions = new Map();
         this._copyID = null;
         this._copyFrom = null;
         this.arrangeProps = null;
@@ -144,6 +144,9 @@ class ClassComponent {
         for (const [key, value] of this.pins) {
             component.pins.set(key, value);
         }
+        for (const [key, value] of this.pinsMaxPositions) {
+            component.pinsMaxPositions.set(key, value);
+        }
         component.refreshCache();
         return component;
     }

package/dist/cjs/objects/ExecutionScope.js

@@ -19,8 +19,6 @@ class ExecutionScope {
         this.currentPin = null;
         this.currentWireId = -1;
         this.currentFrameId = -1;
-        this.netGnd = null;
-        this.componentGnd = null;
         this.componentRoot = null;
         this.copyIDs = new Map();
         this.sequence = [];
@@ -42,6 +40,12 @@ class ExecutionScope {
         });
         return found ? found[2] : null;
     }
+    getNetWithNamespacePath(namespace, name) {
+        const found = this.nets.find(([, , net]) => {
+            return net.namespace === namespace && net.name === name;
+        });
+        return found ? found[2] : null;
+    }
     hasNet(component, pin) {
         return this.findNet(component, pin) !== undefined;
     }
@@ -129,6 +133,7 @@ var SequenceAction;
     SequenceAction["Wire"] = "wire";
     SequenceAction["WireJump"] = "wire-jump";
     SequenceAction["Frame"] = "frame";
+    SequenceAction["Assign"] = "assign";
 })(SequenceAction || (exports.SequenceAction = SequenceAction = {}));
 var FrameAction;
 (function (FrameAction) {

package/dist/cjs/sizing.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.measureTextSize2 = exports.applyFontsToSVG = exports.getCreateSVGWindow = exports.prepareSVGEnvironment = void 0;
 const svg_js_1 = require("@svgdotjs/svg.js");
+const big_js_1 = require("big.js");
 const geometry_js_1 = require("./geometry.js");
 const globals_js_1 = require("./globals.js");
 const helpers_js_1 = require("./helpers.js");
@@ -116,9 +117,11 @@ function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', an
         }
         const { width, height } = textbox;
         tmpTextElement.remove();
+        const finalWidth = new big_js_1.Big(width).round(4).toNumber();
+        const finalHeight = new big_js_1.Big(height).round(4).toNumber();
         measureTextSizeCache[key] = {
-            width: Math.round(width * 100) / 100,
-            height: Math.round(height * 100) / 100,
+            width: finalWidth,
+            height: finalHeight,
             box: textbox,
         };
         measureTextSizeCacheHits[key] = 0;

package/dist/cjs/utils.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = 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 ClassComponent_1 = require("./objects/ClassComponent");
 const ParamDefinition_1 = require("./objects/ParamDefinition");
+const ExecutionScope_1 = require("./objects/ExecutionScope");
+const globals_1 = require("./globals");
 class SimpleStopwatch {
     constructor() {
         this.startTime = new Date();
@@ -184,3 +187,76 @@ function areasOverlap(area1, area2) {
         || isPointWithinArea(pt4, area2);
 }
 exports.areasOverlap = areasOverlap;
+function sequenceActionString(sequenceAction) {
+    const tmp = [...sequenceAction];
+    const action = tmp[0];
+    if (action === ExecutionScope_1.SequenceAction.Wire) {
+        tmp[2] = tmp[2].map(item2 => {
+            const lengthValue = item2.value;
+            const useValue = [item2.direction];
+            if (lengthValue !== null) {
+                useValue.push(lengthValue.value);
+                useValue.push(lengthValue.type);
+            }
+            return useValue.join(",");
+        }).join(" ");
+    }
+    else if (action === ExecutionScope_1.SequenceAction.Frame) {
+        tmp[1] = sequenceAction[1].frameId;
+    }
+    else if (action !== ExecutionScope_1.SequenceAction.WireJump) {
+        const [, component] = sequenceAction;
+        if (component instanceof ClassComponent_1.ClassComponent) {
+            tmp[1] = sequenceAction[1].instanceName;
+        }
+    }
+    return tmp.join(" | ");
+}
+exports.sequenceActionString = sequenceActionString;
+function generateDebugSequenceAction(sequence) {
+    const variableMapping = new Map();
+    return sequence.map(item => {
+        const returnResult = [...item];
+        const [action,] = item;
+        if (action === ExecutionScope_1.SequenceAction.Assign) {
+            const [, name, component] = item;
+            variableMapping.set(name, component);
+        }
+        else {
+            if (action === ExecutionScope_1.SequenceAction.At || action === ExecutionScope_1.SequenceAction.To) {
+                const [, component,] = item;
+                const foundIndex = Array.from(variableMapping.values()).findIndex(item2 => {
+                    if (component._copyFrom !== null) {
+                        return component._copyFrom === item2;
+                    }
+                    return component === item2;
+                });
+                if (foundIndex !== -1) {
+                    const name = Array.from(variableMapping.keys())[foundIndex];
+                    returnResult[1] = name + ':' + component._copyID;
+                }
+            }
+        }
+        return returnResult;
+    });
+}
+exports.generateDebugSequenceAction = generateDebugSequenceAction;
+function getBlockTypeString(type) {
+    let returnValue = 'branch';
+    switch (type) {
+        case globals_1.BlockTypes.Branch:
+            returnValue = 'branch';
+            break;
+        case globals_1.BlockTypes.Join:
+            returnValue = 'join';
+            break;
+        case globals_1.BlockTypes.Parallel:
+            returnValue = 'parallel';
+            break;
+        case globals_1.BlockTypes.Point:
+            returnValue = 'point';
+            break;
+    }
+    return returnValue;
+}
+exports.getBlockTypeString = getBlockTypeString;