circuitscript 0.1.3 → 0.1.5

package/dist/cjs/visitor.js

@@ -123,7 +123,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 if (paramValue instanceof ParamDefinition_js_1.NumericValue) {
                     appendValue = paramValue.value;
                 }
-                instanceName += '_' + appendValue;
+                instanceName += `${globals_js_1.Delimiter1}${appendValue}`;
             }
             const arrange = properties.has('arrange') ?
                 properties.get('arrange') : null;
@@ -614,11 +614,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const executionStack = this.executionStack;
             const functionCounter = { counter: 0 };
             const resolveNet = this.createNetResolver(this.executionStack);
+            const resolveComponentPinNet = this.createComponentPinNetResolver(this.executionStack);
             const __runFunc = (passedInParameters, options) => {
-                const executionContextName = functionName + '_' + functionCounter['counter'];
+                const executionContextName = `${functionName}-${functionCounter['counter']}`;
                 const newExecutor = this.enterNewChildContext(executionStack, this.getExecutor(), executionContextName, options, funcDefinedParameters, passedInParameters);
                 functionCounter['counter'] += 1;
                 newExecutor.resolveNet = resolveNet;
+                newExecutor.resolveComponentPinNet = resolveComponentPinNet;
                 const returnValue = this.runExpressions(newExecutor, ctx.function_expr());
                 const lastExecution = executionStack.pop();
                 const nextLastExecution = executionStack[executionStack.length - 1];
@@ -882,15 +884,15 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     expandModuleContains(component, netNamespace) {
         this.getExecutor().log('expanding module `contains`');
         const executionStack = this.executionStack;
-        const resolveNet = this.createNetResolver(executionStack);
         const executor = this.getExecutor();
-        const executionContextName = executor.namespace + "_"
+        const executionContextName = executor.namespace + globals_js_1.Delimiter1
             + component.instanceName
-            + '_' + component.moduleCounter;
-        const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + "_" + component.moduleCounter);
+            + globals_js_1.Delimiter1 + component.moduleCounter;
+        const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + globals_js_1.Delimiter1 + component.moduleCounter);
         const newExecutor = this.enterNewChildContext(executionStack, executor, executionContextName, { netNamespace: tmpNamespace }, [], []);
         component.moduleCounter += 1;
-        newExecutor.resolveNet = resolveNet;
+        newExecutor.resolveNet = this.createNetResolver(executionStack);
+        newExecutor.resolveComponentPinNet = this.createComponentPinNetResolver(executionStack);
         this.visit(component.moduleContainsExpressions);
         const executionContext = executionStack.pop();
         component.moduleExecutionContext = executionContext;

package/dist/esm/BaseVisitor.mjs

@@ -9,9 +9,10 @@ import { ClassComponent } from "./objects/ClassComponent";
 import { NumberOperator, NumericValue, PercentageValue } from "./objects/ParamDefinition";
 import { PinTypes } from "./objects/PinTypes";
 import { Direction, UndeclaredReference } from "./objects/types";
-import { GlobalDocumentName, ReferenceTypes } from './globals';
+import { DoubleDelimiter1, GlobalDocumentName, ReferenceTypes } from './globals';
 import { linkBuiltInMethods } from './builtinMethods';
 import { resolveToNumericValue, throwWithContext } from './utils';
+import { SequenceAction } from './objects/ExecutionScope';
 export class BaseVisitor extends CircuitScriptVisitor {
     indentLevel = 0;
     startingContext;
@@ -41,12 +42,18 @@ export class BaseVisitor extends CircuitScriptVisitor {
         super();
         this.logger = new Logger();
         this.onErrorCallbackHandler = onErrorHandler;
-        this.startingContext = new ExecutionContext('__', '__.', '/', 0, 0, silent, this.logger, null);
-        this.startingContext.scope.variables.set(GlobalDocumentName, {});
-        this.setupPrintFunction(this.startingContext);
+        this.startingContext = new ExecutionContext(DoubleDelimiter1, `${DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, null);
+        const scope = this.startingContext.scope;
+        scope.sequence.push([
+            SequenceAction.At, scope.componentRoot, scope.currentPin
+        ]);
+        scope.variables.set(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;
@@ -54,7 +61,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
     getExecutor() {
         return this.executionStack[this.executionStack.length - 1];
     }
-    setupPrintFunction(context) {
+    setupBuiltInFunctions(context) {
         linkBuiltInMethods(context, this);
     }
     createNetResolver(executionStack) {
@@ -77,6 +84,19 @@ export class BaseVisitor extends 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, ' ');
@@ -103,12 +123,9 @@ export class BaseVisitor extends CircuitScriptVisitor {
         const trailers = reference.trailers ?? [];
         if (trailers.length === 0) {
             if (value instanceof 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([SequenceAction.Assign, reference.name, value]);
                 this.log2(`assigned '${reference.name}' to ClassComponent`);
             }
             else {
@@ -229,7 +246,6 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 executor.scope.setNet(tmpComponent, pinId, net);
             }
         }
-        this.log2(`atomId: ${atomId} ${currentReference}`);
         if (ctx.parent instanceof ExpressionContext && !currentReference.found) {
             this.throwWithContext(ctx, "Unknown symbol: " + atomId);
         }
@@ -594,7 +610,6 @@ export class BaseVisitor extends CircuitScriptVisitor {
         const executionContextNamespace = currentExecutionContext.namespace
             + executionContextName + ".";
         const newExecutor = new 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/esm/builtinMethods.mjs

@@ -17,6 +17,8 @@ export function linkBuiltInMethods(context, visitor) {
         ['toMils', toMils],
         ['range', range],
         ['len', objectLength],
+        ['arrayPush', arrayPush],
+        ['arrayGet', arrayGet],
     ];
     builtIns.forEach(([functionName, functionImpl]) => {
         context.createFunction(functionName, params => {
@@ -80,6 +82,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 NumericValue) {
+        useValue = index.toNumber();
+    }
+    else {
+        useValue = index;
+    }
+    return arrayObject[useValue];
+}
 function getPositionParams(params) {
     return params.map(([, , value]) => value);
 }

package/dist/esm/draw_symbols.mjs

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

package/dist/esm/execute.mjs

@@ -1,4 +1,4 @@
-import { BlockTypes, ComponentTypes, GlobalNames, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide } from './globals.mjs';
+import { BlockTypes, ComponentTypes, Delimiter1, GlobalNames, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide } from './globals.mjs';
 import { ClassComponent, ModuleComponent } from './objects/ClassComponent.mjs';
 import { ActiveObject, ExecutionScope, FrameAction, SequenceAction } from './objects/ExecutionScope.mjs';
 import { Net } from './objects/Net.mjs';
@@ -10,6 +10,7 @@ import { Frame } from './objects/Frame.mjs';
 import { CalculatePinPositions } from './layout.mjs';
 import { UnitDimension } from './helpers.mjs';
 import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
+import { getBlockTypeString } from './utils.mjs';
 export class ExecutionContext {
     name;
     namespace;
@@ -18,6 +19,7 @@ export class ExecutionContext {
     scope;
     tmpPointId = 0;
     resolveNet = null;
+    resolveComponentPinNet;
     stopFurtherExpressions = false;
     returnValue = null;
     silent = false;
@@ -34,13 +36,6 @@ export class ExecutionContext {
         this.scope = ExecutionScope.create();
         this.scope.indentLevel = indentLevel;
         this.setupRoot();
-        if (name === '__') {
-            this.scope.sequence.push([
-                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;
@@ -66,12 +61,12 @@ export class ExecutionContext {
         this.scope.componentRoot = componentRoot;
     }
     getUniqueInstanceName() {
-        const tmpName = 'COMP_' + this.scope.unnamedCounter;
+        const tmpName = `COMP${Delimiter1}${this.scope.unnamedCounter}`;
         this.scope.unnamedCounter += 1;
         return tmpName;
     }
     getUniqueNetName() {
-        const tmpName = 'NET_' + this.scope.netCounter;
+        const tmpName = `NET${Delimiter1}${this.scope.netCounter}`;
         this.scope.netCounter++;
         return tmpName;
     }
@@ -81,7 +76,7 @@ export 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(this.netNamespace, this.getUniqueNetName());
@@ -105,7 +100,7 @@ export 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) {
@@ -166,8 +161,9 @@ export class ExecutionContext {
                 tmpNet = new 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;
@@ -209,7 +205,6 @@ export class ExecutionContext {
         this.atComponent(component, nextPin, {
             addSequence: true
         });
-        this.printPoint();
         return this.getCurrentPoint();
     }
     toComponent(component, pinId, options) {
@@ -283,6 +278,7 @@ export 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);
@@ -295,14 +291,24 @@ export 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 === BlockTypes.Point || blockType === BlockTypes.Parallel) {
-            const key = blockType === BlockTypes.Point ? 'point' : 'parallel';
-            this.addPoint(`_${key}.${this.name}.${this.tmpPointId}`, false);
+        if (blockType === BlockTypes.Point
+            || blockType === BlockTypes.Parallel
+            || blockType === BlockTypes.Branch) {
+            const key = getBlockTypeString(blockType);
+            this.addPoint(`${Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
         }
         this.scope.blockStack.set(this.scope.indentLevel, {
@@ -377,7 +383,7 @@ export class ExecutionContext {
         }
         else if (blockType === BlockTypes.Join || blockType === BlockTypes.Parallel) {
             if (blockIndex === 0) {
-                const pointIdName = (blockType === BlockTypes.Join) ? '_join' : '_parallel';
+                const pointIdName = `${Delimiter1}${getBlockTypeString(blockType)}`;
                 this.addPoint(`${pointIdName}.${this.name}.${this.tmpPointId}`, false);
                 this.tmpPointId += 1;
                 stackRef['final_point'] = [
@@ -411,7 +417,7 @@ export 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(`${Delimiter1}point.`)) {
                 return entered_at;
             }
         }
@@ -526,14 +532,12 @@ export 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)) {
@@ -543,6 +547,16 @@ export 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);
         });
@@ -557,7 +571,6 @@ export class ExecutionContext {
                     this.scope.setNet(currentComponent, currentPin, netConnectedToRoot);
                     currentNet = tmpNet;
                 }
-                netConnectedToRoot.priority = currentNet.priority - 1;
                 this.toComponent(tmpRoot, 1);
             }
         }
@@ -646,7 +659,7 @@ export class ExecutionContext {
             this.log('Warning: ' + pointId + ' is being redefined');
         }
         const useName = userDefined ? 'point.' + pointId : pointId;
-        const componentPoint = ClassComponent.simple(useName, 1, "point");
+        const componentPoint = ClassComponent.simple(useName, 1);
         componentPoint.displayProp = this.getPointSymbol();
         componentPoint.typeProp = ComponentTypes.net;
         this.scope.instances.set(pointId, componentPoint);
@@ -800,12 +813,11 @@ function isWireSegmentsEndAuto(segments) {
 }
 export function getPortSide(pins, arrangeProps) {
     const result = [];
-    const maxPositions = {
-        [SymbolPinSide.Left]: 0,
-        [SymbolPinSide.Right]: 0,
-        [SymbolPinSide.Top]: 0,
-        [SymbolPinSide.Bottom]: 0,
-    };
+    const maxPositions = new Map();
+    maxPositions.set(SymbolPinSide.Left, 0);
+    maxPositions.set(SymbolPinSide.Right, 0);
+    maxPositions.set(SymbolPinSide.Top, 0);
+    maxPositions.set(SymbolPinSide.Bottom, 0);
     if (arrangeProps === null) {
         let counter = 0;
         for (const [pinId] of pins) {
@@ -823,8 +835,8 @@ export function getPortSide(pins, arrangeProps) {
         const rightSideItems = result.filter(item => {
             return item.side === PortSide.EAST;
         });
-        maxPositions[SymbolPinSide.Left] = leftSideItems.length;
-        maxPositions[SymbolPinSide.Right] = rightSideItems.length;
+        maxPositions.set(SymbolPinSide.Left, leftSideItems.length);
+        maxPositions.set(SymbolPinSide.Right, rightSideItems.length);
     }
     else {
         let counter = pins.size;
@@ -871,7 +883,7 @@ export function getPortSide(pins, arrangeProps) {
                     }
                 }
             });
-            maxPositions[key] = position;
+            maxPositions.set(key, position);
         }
     }
     return {

package/dist/esm/globals.mjs

@@ -1,7 +1,9 @@
 import { numeric } from "./objects/ParamDefinition";
+export const Delimiter1 = '-';
+export const DoubleDelimiter1 = `${Delimiter1}${Delimiter1}`;
 export var GlobalNames;
 (function (GlobalNames) {
-    GlobalNames["__root"] = "__root";
+    GlobalNames["__root"] = "--root";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (GlobalNames = {}));
 export const NoNetText = 'NO_NET';

package/dist/esm/helpers.mjs

@@ -1,12 +1,11 @@
-import { readFileSync, writeFileSync, createWriteStream } from "fs";
+import { readFileSync, writeFileSync, createWriteStream, existsSync, mkdirSync } from "fs";
 import path from "path";
 import PDFDocument from "pdfkit";
 import { generateKiCADNetList, printTree } from "./export.mjs";
 import { LayoutEngine } from "./layout.mjs";
-import { SequenceAction } from "./objects/ExecutionScope.mjs";
 import { parseFileWithVisitor } from "./parser.mjs";
 import { generatePdfOutput, generateSvgOutput, renderSheetsToSVG } from "./render.mjs";
-import { resolveToNumericValue, SimpleStopwatch } from "./utils.mjs";
+import { generateDebugSequenceAction, resolveToNumericValue, sequenceActionString, SimpleStopwatch } from "./utils.mjs";
 import { ParserVisitor, VisitorExecutionException } from "./visitor.mjs";
 import { createContext } from "this-file";
 import { SymbolValidatorResolveVisitor, SymbolValidatorVisitor } from "./SymbolValidatorVisitor.mjs";
@@ -170,10 +169,16 @@ export 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 && writeFileSync('dump/tree.lisp', tree.toStringTree(null, parser));
-    dumpData && writeFileSync('dump/raw-parser.txt', visitor.logger.dump());
+    const dumpDirectory = currentDirectory + '/dump/';
+    if (dumpData) {
+        if (!existsSync(dumpDirectory)) {
+            mkdirSync(dumpDirectory);
+        }
+    }
+    dumpData && writeFileSync(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
+    dumpData && writeFileSync(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
     if (hasError || hasParseError) {
         console.log('Error while parsing');
         return null;
@@ -186,29 +191,8 @@ export 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 === 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 === SequenceAction.Frame) {
-            tmp[1] = item[1].frameId;
-        }
-        else if (action !== SequenceAction.WireJump) {
-            tmp[1] = item[1].instanceName;
-        }
-        return tmp.join(" | ");
-    });
-    dumpData && writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
+    const tmpSequence = generateDebugSequenceAction(sequence).map(item => sequenceActionString(item));
+    dumpData && writeFileSync(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = "";
     try {
         let fileExtension = null;
@@ -233,12 +217,12 @@ export function renderScript(scriptData, outputPath, options) {
         const sheetFrames = layoutEngine.runLayout(sequence, nets);
         layoutEngine.printWarnings();
         showStats && console.log('Layout took:', layoutTimer.lap());
-        dumpData && writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
+        dumpData && writeFileSync(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new SimpleStopwatch();
         const renderLogger = new Logger();
         const svgCanvas = renderSheetsToSVG(sheetFrames, renderLogger);
         showStats && console.log('Render took:', generateSvgTimer.lap());
-        dumpData && writeFileSync('dump/raw-render.txt', renderLogger.dump());
+        dumpData && writeFileSync(dumpDirectory + 'raw-render.txt', renderLogger.dump());
         svgOutput = generateSvgOutput(svgCanvas, outputDefaultZoom);
         if (outputPath) {
             if (fileExtension === 'svg') {

package/dist/esm/layout.mjs

@@ -346,7 +346,7 @@ export class LayoutEngine {
                         const frameArea = [tmpX1, tmpY1, tmpX2, tmpY2];
                         const overlaps = avoidAreas.filter(area => areasOverlap(frameArea, area));
                         const doesOverlapAreasToAvoid = overlaps.length > 0;
-                        if (doesExceedFrameHeight || doesOverlapAreasToAvoid) {
+                        if (boundPoints.length > 0 && (doesExceedFrameHeight || doesOverlapAreasToAvoid)) {
                             innerFrameY = offsetY;
                             const nextX = numeric(xmax).sub(offsetX).add(frame.gap);
                             innerFrameX = offsetX.add(nextX);
@@ -376,7 +376,7 @@ export class LayoutEngine {
                         const frameArea = [tmpX1, tmpY1, tmpX2, tmpY2];
                         const overlaps = avoidAreas.filter(area => 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 = numeric(ymax).sub(offsetY).add(frame.gap);
@@ -1391,7 +1391,7 @@ export class RenderFrame extends RenderObject {
     padding = milsToMM(100);
     gap = milsToMM(100);
     borderWidth = numeric(5);
-    direction = FramePlotDirection.Column;
+    direction = FramePlotDirection.Row;
     width = null;
     height = null;
     subgraphId = "";

package/dist/esm/main.mjs

@@ -19,7 +19,8 @@ export default 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');
     program.addHelpText('before', figlet.textSync('circuitscript', {
         font: 'Small Slant'
     }));
@@ -75,7 +76,7 @@ export default async function main() {
         outputPath = args[1];
     }
     const output = renderScript(scriptData, outputPath, scriptOptions);
-    if (outputPath === null && output) {
+    if (outputPath === null && output && (options.skipOutput === undefined)) {
         console.log(output);
     }
     if (watchFileChanges) {

package/dist/esm/objects/ClassComponent.mjs

@@ -9,7 +9,7 @@ export class ClassComponent {
     pins = new Map();
     pinNets = new Map();
     pinWires = new Map();
-    pinsMaxPositions = {};
+    pinsMaxPositions = new Map();
     _cachedPins;
     _cachedParams;
     _copyID = null;
@@ -145,6 +145,9 @@ export 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/esm/objects/ExecutionScope.mjs

@@ -16,8 +16,6 @@ export class ExecutionScope {
     currentPin = null;
     currentWireId = -1;
     currentFrameId = -1;
-    netGnd = null;
-    componentGnd = null;
     componentRoot = null;
     copyIDs = new Map();
     sequence = [];
@@ -41,6 +39,12 @@ export 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;
     }
@@ -126,6 +130,7 @@ export var SequenceAction;
     SequenceAction["Wire"] = "wire";
     SequenceAction["WireJump"] = "wire-jump";
     SequenceAction["Frame"] = "frame";
+    SequenceAction["Assign"] = "assign";
 })(SequenceAction || (SequenceAction = {}));
 export var FrameAction;
 (function (FrameAction) {

package/dist/esm/sizing.mjs

@@ -1,4 +1,5 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
+import { Big } from 'big.js';
 import { HorizontalAlign, HorizontalAlignProp, VerticalAlign, VerticalAlignProp } from './geometry.mjs';
 import { defaultFont } from './globals.mjs';
 import { JSModuleType, detectJSModuleType } from './helpers.mjs';
@@ -87,9 +88,11 @@ export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regul
         }
         const { width, height } = textbox;
         tmpTextElement.remove();
+        const finalWidth = new Big(width).round(4).toNumber();
+        const finalHeight = new 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;