circuitscript 0.0.29 → 0.0.31

package/dist/cjs/main.js

@@ -52,16 +52,22 @@ async function main() {
     let scriptData;
     if (args.length > 0 && args[0]) {
         inputFilePath = args[0];
-        scriptData = (0, fs_1.readFileSync)(inputFilePath, { encoding: 'utf-8' });
-        if (currentDirectory === null) {
-            currentDirectory = path_1.default.dirname(inputFilePath);
+        if ((0, fs_1.existsSync)(inputFilePath)) {
+            scriptData = (0, fs_1.readFileSync)(inputFilePath, { encoding: 'utf-8' });
+            if (currentDirectory === null) {
+                currentDirectory = path_1.default.dirname(inputFilePath);
+            }
+        }
+        else {
+            console.error("Error: File could not be found");
+            return;
         }
     }
     else if (options.input) {
         scriptData = options.input;
     }
     else {
-        console.log("Error: No input provided");
+        console.error("Error: No input provided");
         return;
     }
     const scriptOptions = {

package/dist/cjs/objects/ClassComponent.js

@@ -21,8 +21,10 @@ class ClassComponent {
         this.followWireOrientationProp = true;
         this.wireOrientationAngle = 0;
         this.useWireOrientationAngle = true;
+        this.didSetWireOrientationAngle = false;
         this.styles = {};
         this.assignedRefDes = null;
+        this.moduleCounter = 0;
         this.instanceName = instanceName;
         this.numPins = numPins;
         this.className = className;

package/dist/cjs/objects/ExecutionScope.js

@@ -90,7 +90,7 @@ class ExecutionScope {
             }
         });
         return sortedNet.map(([component, pin, net]) => {
-            return [net.namespace + net.name, component.instanceName, pin];
+            return [net.toString(), component.instanceName, pin];
         });
     }
     printNets() {

package/dist/cjs/objects/Net.js

@@ -16,10 +16,11 @@ class Net {
         this.baseName = name;
     }
     toString() {
-        return this.name;
+        return this.namespace + this.name;
     }
     static isSame(netA, netB) {
-        return netA.name === netB.name &&
+        return netA.namespace === netB.namespace &&
+            netA.name === netB.name &&
             netA.baseName === netB.baseName &&
             netA.priority === netB.priority &&
             netA.type === netB.type;

package/dist/cjs/objects/PinTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PinTypes = void 0;
+exports.AllPinTypes = exports.PinTypes = void 0;
 var PinTypes;
 (function (PinTypes) {
     PinTypes["Any"] = "any";
@@ -9,3 +9,9 @@ var PinTypes;
     PinTypes["IO"] = "io";
     PinTypes["Power"] = "power";
 })(PinTypes || (exports.PinTypes = PinTypes = {}));
+exports.AllPinTypes = [
+    PinTypes.Any,
+    PinTypes.Input,
+    PinTypes.Output,
+    PinTypes.IO,
+];

package/dist/cjs/objects/types.js

@@ -1,12 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Direction = exports.ParseSymbolType = exports.UndeclaredReference = void 0;
+exports.Direction = exports.ParseSymbolType = exports.DeclaredReference = exports.UndeclaredReference = void 0;
 class UndeclaredReference {
     constructor(reference) {
         this.reference = reference;
     }
 }
 exports.UndeclaredReference = UndeclaredReference;
+class DeclaredReference {
+    constructor(refType) {
+        this.found = refType.found;
+        this.name = refType.name;
+        this.trailers = refType.trailers;
+        this.type = refType.type;
+        this.value = refType.value;
+    }
+}
+exports.DeclaredReference = DeclaredReference;
 var ParseSymbolType;
 (function (ParseSymbolType) {
     ParseSymbolType["Variable"] = "variable";

package/dist/cjs/regenerate-tests.js

@@ -9,7 +9,7 @@ const sizing_js_1 = require("./sizing.js");
 const mainDir = './__tests__/renderData/';
 const fontsPath = (0, helpers_js_1.getFontsPath)();
 const defaultLibsPath = (0, helpers_js_1.getDefaultLibsPath)();
-async function regenerateTests() {
+async function regenerateTests(extra = "") {
     await (0, sizing_js_1.prepareSVGEnvironment)(fontsPath);
     const cstFiles = [];
     const files = fs_1.default.readdirSync(mainDir);
@@ -21,12 +21,73 @@ async function regenerateTests() {
     cstFiles.forEach(file => {
         const inputPath = mainDir + file;
         const scriptData = fs_1.default.readFileSync(inputPath, { encoding: 'utf-8' });
-        const outputPath = inputPath + '.svg';
+        const outputPath = mainDir + 'svgs/' + file + extra + '.svg';
         (0, helpers_js_1.renderScript)(scriptData, outputPath, {
             currentDirectory: mainDir,
             defaultLibsPath,
         });
         console.log('generated ', outputPath);
     });
+    return cstFiles;
 }
-regenerateTests();
+(async () => {
+    const generateDiff = false;
+    const nextExtra = generateDiff ? '.next' : '';
+    const cstFiles = await regenerateTests(nextExtra);
+    const allFiles = [];
+    if (generateDiff) {
+        cstFiles.forEach(file => {
+            const svg1 = 'svgs/' + file + '.svg';
+            const svg2 = 'svgs/' + file + '.next.svg';
+            const cleanedName = file.replace('script', '').replace('.cst', '');
+            allFiles.push([file, svg1, svg2, cleanedName]);
+        });
+        const sortedFiles = allFiles.sort((a, b) => {
+            const nameA = a[3];
+            const nameB = b[3];
+            const indexA = Number(nameA);
+            const indexB = Number(nameB);
+            if (indexA > indexB) {
+                return 1;
+            }
+            else if (indexA < indexB) {
+                return -1;
+            }
+            else {
+                return 0;
+            }
+        });
+        const output = [];
+        sortedFiles.forEach(group => {
+            const [file, svg1, svg2] = group;
+            output.push(`<div class='group'>
+                <h3>${file}</h3>
+                <div class='items'>
+                    <div style='margin-right: 10px'>
+                        <h4>${svg1}</h4>
+                        <img src='${svg1}'/>
+                    </div>
+                    <div>
+                        <h4>${svg2}</h4>
+                        <img src='${svg2}'/>
+                    </div>
+                </div>
+            </div>`);
+        });
+        const result = `
+            <html>
+                <header>
+                    <title>SVG compare</title>
+                    <style>
+                        img { border: solid thin #ccc; }
+                        .items { display: flex; }
+                        body { font-family: Arial; }
+                    </style>
+                </header>
+                <body>
+                    ${output.join('')}
+                </body>
+            </html>`;
+        fs_1.default.writeFileSync(mainDir + "compiled.html", result);
+    }
+})();

package/dist/cjs/render.js

@@ -7,6 +7,7 @@ const sizing_js_1 = require("./sizing.js");
 const globals_js_1 = require("./globals.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const utils_js_1 = require("./utils.js");
+const helpers_js_1 = require("./helpers.js");
 function generateSVG2(graph) {
     const window = (0, sizing_js_1.getCreateSVGWindow)()();
     const document = window.document;
@@ -15,10 +16,10 @@ function generateSVG2(graph) {
     (0, sizing_js_1.applyFontsToSVG)(canvas);
     generateSVGChild(canvas, graph.components, graph.wires, graph.junctions, graph.mergedWires, graph.frameObjects, graph.textObjects);
     const { x, y, width, height } = canvas.bbox();
-    const margin = 5;
+    const margin = (0, helpers_js_1.milsToMM)(10);
     const widthAndMargin = width + margin * 2;
     const heightAndMargin = height + margin * 2;
-    const scale = 1;
+    const scale = globals_js_1.MMToPx * globals_js_1.defaultZoomScale;
     canvas.size(widthAndMargin * scale, heightAndMargin * scale);
     canvas.viewbox(x - margin, y - margin, widthAndMargin, heightAndMargin);
     return canvas.svg();
@@ -83,8 +84,11 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             const pt1 = segment[0];
             const pt2 = segment[1];
             mergedWireGroup.line([pt1, pt2])
-                .stroke({ width: 1, color: globals_js_1.ColorScheme.WireColor,
-                linecap: 'square' })
+                .stroke({
+                width: globals_js_1.defaultWireLineWidth,
+                color: globals_js_1.ColorScheme.WireColor,
+                linecap: 'square'
+            })
                 .fill('none');
         });
         intersectPoints.forEach(point => {
@@ -113,7 +117,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             }
             const tmpRect = frameGroup.rect(width, height)
                 .fill('none')
-                .stroke({ width: borderWidth, color: strokeColor });
+                .stroke({ width: (0, helpers_js_1.milsToMM)(borderWidth), color: strokeColor });
             tmpRect.translate(item.x, item.y);
         }
     });
@@ -124,13 +128,14 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         symbol.draw(innerGroup);
     });
     const drawOrigin = false;
+    const originSize = (0, helpers_js_1.milsToMM)(10);
     drawOrigin && canvas.group().translate(0, 0)
-        .circle(5)
-        .translate(-5 / 2, -5 / 2)
+        .circle(originSize)
+        .translate(-originSize / 2, -originSize / 2)
         .stroke('none').fill('red');
 }
 function drawGrid(group, canvasSize) {
-    const gridSize = 20;
+    const gridSize = globals_js_1.defaultGridSizeUnits;
     const { x, y, x2, y2 } = canvasSize;
     const gridStartX = (Math.floor(x / gridSize) - 1) * gridSize;
     const gridStartY = (Math.floor(y / gridSize) - 1) * gridSize;
@@ -138,19 +143,20 @@ function drawGrid(group, canvasSize) {
     const gridEndY = (Math.ceil(y2 / gridSize) + 1) * gridSize;
     const numCols = Math.ceil((gridEndX - gridStartX) / gridSize);
     const lines = [];
+    const smallOffset = (0, helpers_js_1.milsToMM)(3);
+    const startY = gridStartY - smallOffset / 2;
+    const endY = gridEndY + smallOffset;
     for (let i = 0; i <= numCols; i++) {
         const startX = gridStartX + i * gridSize;
-        const startY = gridStartY - 0.5;
-        const endY = gridEndY;
         lines.push(`M ${startX} ${startY} L ${startX} ${endY}`);
     }
+    const strokeSize = (0, helpers_js_1.milsToMM)(3);
     group.path(lines.join(" "))
-        .fill('none')
         .attr({
-        'stroke-dasharray': '1,' + (gridSize - 1),
+        'stroke-dasharray': `${strokeSize},${gridSize - strokeSize}`,
     })
         .stroke({
-        width: 1,
-        color: '#aaa'
+        width: strokeSize,
+        color: '#000'
     });
 }

package/dist/cjs/sizing.js

@@ -23,13 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.measureTextSize2 = exports.measureTextSize = exports.applyFontsToSVG = exports.getCreateSVGWindow = exports.prepareSVGEnvironment = void 0;
+exports.measureTextSize2 = exports.applyFontsToSVG = exports.getCreateSVGWindow = exports.prepareSVGEnvironment = void 0;
 const svg_js_1 = require("@svgdotjs/svg.js");
 const geometry_js_1 = require("./geometry.js");
 const globals_js_1 = require("./globals.js");
 const helpers_js_1 = require("./helpers.js");
 let MainCanvas = null;
-const supportedFonts = {};
+const supportedFonts = {
+    'Arial': 'Arial.ttf',
+};
 let globalCreateSVGWindow;
 async function prepareSVGEnvironment(fontsPath) {
     const moduleType = (0, helpers_js_1.detectJSModuleType)();
@@ -54,10 +56,6 @@ exports.getCreateSVGWindow = getCreateSVGWindow;
 function applyFontsToSVG(canvas) {
 }
 exports.applyFontsToSVG = applyFontsToSVG;
-async function measureTextSize(text, fontFamily, fontSize) {
-    return measureTextSize2(text, fontFamily, fontSize);
-}
-exports.measureTextSize = measureTextSize;
 const measureTextSizeCache = {};
 const measureTextSizeCacheHits = {};
 function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom) {

package/dist/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
 class SimpleStopwatch {
     constructor() {
         this.startTime = new Date();
@@ -28,11 +28,17 @@ function printBounds(bounds) {
     }
 }
 exports.printBounds = printBounds;
+function hasRemainder(value, value2) {
+    const tmpValue = Math.abs(value) / value2;
+    const flooredValue = Math.floor(tmpValue);
+    const diff = tmpValue - flooredValue;
+    return diff;
+}
 function resizeToNearestGrid(bounds, gridSize = 20) {
-    const addXMin = (bounds.xmin % gridSize) === 0 ? -1 : 0;
-    const addYMin = (bounds.ymin % gridSize) === 0 ? -1 : 0;
-    const addXMax = (bounds.xmax % gridSize) === 0 ? 1 : 0;
-    const addYMax = (bounds.ymax % gridSize) === 0 ? 1 : 0;
+    const addXMin = hasRemainder(bounds.xmin, gridSize) === 0 ? -1 : 0;
+    const addYMin = hasRemainder(bounds.ymin, gridSize) === 0 ? -1 : 0;
+    const addXMax = hasRemainder(bounds.xmax, gridSize) === 0 ? 1 : 0;
+    const addYMax = hasRemainder(bounds.ymax, gridSize) === 0 ? 1 : 0;
     return {
         xmin: Math.floor((bounds.xmin + addXMin) / gridSize) * gridSize,
         ymin: Math.floor((bounds.ymin + addYMin) / gridSize) * gridSize,
@@ -52,3 +58,21 @@ function getBoundsSize(bounds) {
     };
 }
 exports.getBoundsSize = getBoundsSize;
+function getPortType(component) {
+    const drawingCommands = component.displayProp;
+    let foundPinType = null;
+    const commands = drawingCommands.getCommands();
+    commands.some(item => {
+        if (item[0] === 'label' && item[2].has('portType')) {
+            foundPinType = item[2].get('portType');
+            return true;
+        }
+        return false;
+    });
+    return foundPinType;
+}
+exports.getPortType = getPortType;
+function roundValue(value) {
+    return +value.toFixed(7);
+}
+exports.roundValue = roundValue;

package/dist/cjs/visitor.js

@@ -9,6 +9,8 @@ const types_js_1 = require("./objects/types.js");
 const globals_js_1 = require("./globals.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const BaseVisitor_js_1 = require("./BaseVisitor.js");
+const utils_js_1 = require("./utils.js");
+const helpers_js_1 = require("./helpers.js");
 class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     constructor() {
         super(...arguments);
@@ -150,7 +152,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 arrange, display, type, width, copy,
                 angle, followWireOrientation
             };
-            this.setResult(ctx, this.getExecutor().createComponent(instanceName, pins, params, props));
+            const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
+            this.setResult(ctx, createdComponent);
         };
         this.visitCreate_graphic_expr = (ctx) => {
             const commands = ctx.graphic_expr().reduce((accum, item) => {
@@ -196,8 +199,82 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.visit(ctxParameters);
                 parameters = this.getResult(ctxParameters);
             }
+            if (commandName === 'label') {
+                parameters.forEach(item => {
+                    if (item[0] == 'keyword' && item[1] === 'portType') {
+                        if (item[2] === 'in') {
+                            item[2] = 'input';
+                        }
+                        else if (item[2] === 'out') {
+                            item[2] = 'output';
+                        }
+                    }
+                });
+            }
             this.setResult(ctx, [commandName, parameters]);
         };
+        this.visitCreate_module_expr = (ctx) => {
+            const properties = this.getPropertyExprList(ctx.property_expr());
+            const { left: leftPorts, right: rightPorts } = this.parseCreateModulePorts(properties.get('ports'));
+            const allPorts = [...leftPorts, ...rightPorts].filter(item => {
+                return !(item instanceof ParamDefinition_js_1.PinBlankValue);
+            });
+            const nameToPinId = new Map();
+            const tmpPorts = allPorts.map((portName, index) => {
+                nameToPinId.set(portName, index + 1);
+                return new PinDefinition_js_1.PinDefinition(index + 1, PinDefinition_js_1.PinIdType.Int, portName, PinTypes_js_1.PinTypes.Any);
+            });
+            const arrangeLeftItems = leftPorts.map(item => {
+                if (item instanceof ParamDefinition_js_1.PinBlankValue) {
+                    return item;
+                }
+                else {
+                    return nameToPinId.get(item);
+                }
+            });
+            const arrangeRightItems = rightPorts.map(item => {
+                if (item instanceof ParamDefinition_js_1.PinBlankValue) {
+                    return item;
+                }
+                else {
+                    return nameToPinId.get(item);
+                }
+            });
+            const arrange = new Map();
+            if (arrangeLeftItems.length > 0) {
+                arrange.set('left', arrangeLeftItems);
+            }
+            if (arrangeRightItems.length > 0) {
+                arrange.set('right', arrangeRightItems);
+            }
+            const width = properties.has('width') ?
+                properties.get('width') : null;
+            const blankParams = [];
+            const props = {
+                arrange, width
+            };
+            const moduleInstanceName = this.getExecutor().getUniqueInstanceName('');
+            const createdComponent = this.getExecutor().createComponent(moduleInstanceName, tmpPorts, blankParams, props);
+            createdComponent.typeProp = 'module';
+            const ctxPropertyBlock = ctx.property_block_expr();
+            if (ctxPropertyBlock) {
+                const [firstBlock] = ctxPropertyBlock;
+                this.visit(firstBlock);
+                const [keyName, expressionsBlock] = this.getResult(firstBlock);
+                if (keyName === 'contains') {
+                    createdComponent.moduleContainsExpressions = expressionsBlock;
+                    this.expandModuleContains(createdComponent, this.getExecutor().netNamespace);
+                }
+            }
+            this.setResult(ctx, createdComponent);
+        };
+        this.visitProperty_block_expr = (ctx) => {
+            const tmpCtx = ctx.property_key_expr();
+            this.visit(tmpCtx);
+            const keyName = this.getResult(tmpCtx);
+            const expressionsBlock = ctx.expressions_block();
+            this.setResult(ctx, [keyName, expressionsBlock]);
+        };
         this.visitProperty_expr = (ctx) => {
             const ctxPropertyKeyExpr = ctx.property_key_expr();
             const ctxPropertyValueExpr = ctx.property_value_expr();
@@ -275,6 +352,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 && component.copyProp) {
                 component = this.getExecutor().copyComponent(component);
             }
+            if (component instanceof types_js_1.DeclaredReference
+                && component.found
+                && component.trailers
+                && component.trailers.length > 0
+                && component.trailers[0] === 'contains') {
+                component = component.value;
+                this.placeModuleContains(component);
+            }
             if (component && component instanceof ClassComponent_js_1.ClassComponent) {
                 const modifiers = ctx.component_modifier_expr();
                 modifiers.forEach(modifier => {
@@ -333,7 +418,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 pinValue = this.getResult(ctxPinSelectExpr);
             }
             else {
-                pinValue = component.getDefaultPin();
+                if (component instanceof ClassComponent_js_1.ClassComponent) {
+                    pinValue = component.getDefaultPin();
+                }
+                else {
+                    const undeclaredRef = component;
+                    throw 'Invalid component: ' + undeclaredRef.reference.name;
+                }
             }
             this.setResult(ctx, [component, pinValue]);
         };
@@ -365,6 +456,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             let value;
             const ctxCreateComponentExpr = ctx.create_component_expr();
             const ctxCreateGraphicExpr = ctx.create_graphic_expr();
+            const ctxCreateModuleExpr = ctx.create_module_expr();
             if (ctxCreateComponentExpr) {
                 this.visit(ctxCreateComponentExpr);
                 value = this.getResult(ctxCreateComponentExpr);
@@ -373,6 +465,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.visit(ctxCreateGraphicExpr);
                 value = this.getResult(ctxCreateGraphicExpr);
             }
+            else if (ctxCreateModuleExpr) {
+                this.visit(ctxCreateModuleExpr);
+                value = this.getResult(ctxCreateModuleExpr);
+            }
             else {
                 throw "Invalid data expression";
             }
@@ -541,13 +637,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
         };
         this.visitAt_block_pin_expression_complex = (ctx) => {
-            ctx.expression().forEach(item => {
-                this.visit(item);
-            });
+            this.visit(ctx.expressions_block());
         };
         this.visitWire_expr_direction_only = (ctx) => {
             const value = ctx.ID().getText();
-            if (value === 'auto' || value === 'auto_') {
+            if (value === globals_js_1.WireAutoDirection.Auto || value === globals_js_1.WireAutoDirection.Auto_) {
                 this.setResult(ctx, [value]);
             }
             else {
@@ -568,7 +662,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     useValue = this.getResult(ctxDataExpr);
                 }
                 if (useValue !== null) {
-                    this.setResult(ctx, [direction, useValue]);
+                    this.setResult(ctx, [direction, new helpers_js_1.UnitDimension(useValue)]);
                     return;
                 }
             }
@@ -602,9 +696,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const propertyName = ctx.ID().getText();
             this.getExecutor().setProperty('..' + propertyName, result);
         };
+        this.visitExpressions_block = (ctx) => {
+            this.runExpressions(this.getExecutor(), ctx.expression());
+        };
         this.visitFrame_expr = (ctx) => {
             const frameId = this.getExecutor().enterFrame();
-            this.runExpressions(this.getExecutor(), ctx.expression());
+            this.visit(ctx.expressions_block());
             this.getExecutor().exitFrame(frameId);
         };
         this.visitNet_namespace_expr = (ctx) => {
@@ -635,7 +732,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.visit(ctxDataExpr);
             const result = this.getResult(ctxDataExpr);
             if (result) {
-                this.runExpressions(this.getExecutor(), ctx.expression());
+                this.visit(ctx.expressions_block());
             }
             else {
                 const ctxInnerIfExprs = ctx.if_inner_expr();
@@ -662,7 +759,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.visit(ctxDataExpr);
             const result = this.getResult(ctxDataExpr);
             if (result) {
-                this.runExpressions(this.getExecutor(), ctx.expression());
+                this.visit(ctx.expressions_block());
             }
             this.setResult(ctx, result);
         };
@@ -674,6 +771,55 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             PinTypes_js_1.PinTypes.Power,
         ];
     }
+    expandModuleContains(component, netNamespace) {
+        this.getExecutor().log('expanding module `contains`');
+        const executionStack = this.executionStack;
+        const resolveNet = this.createNetResolver(executionStack);
+        const executionContextName = this.getExecutor().namespace + "_"
+            + component.instanceName
+            + '_' + component.moduleCounter;
+        const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + "_" + component.moduleCounter);
+        const newExecutor = this.enterNewChildContext(executionStack, this.getExecutor(), executionContextName, { netNamespace: tmpNamespace }, [], []);
+        component.moduleCounter += 1;
+        newExecutor.resolveNet = resolveNet;
+        this.visit(component.moduleContainsExpressions);
+        const executionContext = executionStack.pop();
+        component.moduleExecutionContext = executionContext;
+        component.moduleExecutionContextName = executionContextName;
+        this.linkModuleSymbolWithContains(component, executionContext);
+    }
+    linkModuleSymbolWithContains(moduleComponent, executionContext) {
+        this.log('link module symbol');
+        const modulePinMapping = new Map();
+        moduleComponent.pins.forEach(pin => {
+            const pinName = pin.name;
+            modulePinMapping.set(pinName, pin.id);
+        });
+        const pinIdToPortMap = new Map();
+        moduleComponent.modulePinIdToPortMap = pinIdToPortMap;
+        for (const [key, component] of executionContext.scope.instances) {
+            if (component._copyID !== null && component.typeProp === 'port') {
+                const portName = component.parameters.get('net_name');
+                const modulePinId = modulePinMapping.get(portName);
+                pinIdToPortMap.set(modulePinId, component);
+                const portType = (0, utils_js_1.getPortType)(component);
+                const tmpPin = moduleComponent.pins.get(modulePinId);
+                tmpPin.pinType = portType;
+            }
+        }
+    }
+    placeModuleContains(moduleComponent) {
+        if (moduleComponent.typeProp === 'module'
+            && moduleComponent.moduleContainsExpressions) {
+            this.log('place module `contains`');
+            this.getExecutor().mergeScope(moduleComponent.moduleExecutionContext.scope, moduleComponent.moduleExecutionContextName);
+            this.log('connect module ports');
+            for (const [pinId, portComponent] of moduleComponent.modulePinIdToPortMap) {
+                this.getExecutor().atComponent(moduleComponent, pinId);
+                this.getExecutor().toComponent(portComponent, 1);
+            }
+        }
+    }
     parseCreateComponentPins(pinData) {
         const pins = [];
         if (typeof pinData === 'number') {
@@ -718,6 +864,26 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         }
         return pins;
     }
+    parseCreateModulePorts(portsDefinition) {
+        let leftItems = [];
+        let rightItems = [];
+        if (portsDefinition.has('left')) {
+            leftItems = portsDefinition.get('left');
+            if (!Array.isArray(leftItems)) {
+                leftItems = [leftItems];
+            }
+        }
+        if (portsDefinition.has('right')) {
+            rightItems = portsDefinition.get('right');
+            if (!Array.isArray(rightItems)) {
+                rightItems = [rightItems];
+            }
+        }
+        return {
+            left: leftItems,
+            right: rightItems
+        };
+    }
     parseCreateComponentParams(params) {
         const result = [];
         if (params) {

package/dist/esm/BaseVisitor.mjs

@@ -282,7 +282,12 @@ export class BaseVisitor extends CircuitScriptVisitor {
                     value = reference;
                 }
                 else {
-                    value = reference.value;
+                    if (reference.trailers && reference.trailers.length > 0) {
+                        value = reference;
+                    }
+                    else {
+                        value = reference.value;
+                    }
                 }
             }
         }