circuitscript 0.0.29 → 0.0.32

package/dist/esm/sizing.mjs

@@ -3,7 +3,9 @@ import { HorizontalAlign, VerticalAlign } from './geometry.mjs';
 import { defaultFont } from './globals.mjs';
 import { JSModuleType, detectJSModuleType } from './helpers.mjs';
 let MainCanvas = null;
-const supportedFonts = {};
+const supportedFonts = {
+    'Arial': 'Arial.ttf',
+};
 let globalCreateSVGWindow;
 export async function prepareSVGEnvironment(fontsPath) {
     const moduleType = detectJSModuleType();
@@ -25,9 +27,6 @@ export function getCreateSVGWindow() {
 }
 export function applyFontsToSVG(canvas) {
 }
-export async function measureTextSize(text, fontFamily, fontSize) {
-    return measureTextSize2(text, fontFamily, fontSize);
-}
 const measureTextSizeCache = {};
 const measureTextSizeCacheHits = {};
 export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom) {

package/dist/esm/utils.mjs

@@ -23,11 +23,17 @@ export function printBounds(bounds) {
         return 'null';
     }
 }
+function hasRemainder(value, value2) {
+    const tmpValue = Math.abs(value) / value2;
+    const flooredValue = Math.floor(tmpValue);
+    const diff = tmpValue - flooredValue;
+    return diff;
+}
 export 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,
@@ -44,3 +50,19 @@ export function getBoundsSize(bounds) {
         height: bounds.ymax - bounds.ymin,
     };
 }
+export 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;
+}
+export function roundValue(value) {
+    return +value.toFixed(7);
+}

package/dist/esm/visitor.mjs

@@ -1,11 +1,13 @@
 import { ClassComponent } from './objects/ClassComponent.mjs';
-import { NumericValue, ParamDefinition, } from './objects/ParamDefinition.mjs';
+import { NumericValue, ParamDefinition, PinBlankValue, } from './objects/ParamDefinition.mjs';
 import { PinDefinition, PinIdType } from './objects/PinDefinition.mjs';
 import { PinTypes } from './objects/PinTypes.mjs';
-import { UndeclaredReference } from './objects/types.mjs';
-import { BlockTypes, ComponentTypes, NoNetText, ReferenceTypes } from './globals.mjs';
+import { DeclaredReference, UndeclaredReference } from './objects/types.mjs';
+import { BlockTypes, ComponentTypes, NoNetText, ReferenceTypes, WireAutoDirection } from './globals.mjs';
 import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
 import { BaseVisitor } from './BaseVisitor.mjs';
+import { getPortType } from './utils.mjs';
+import { UnitDimension } from './helpers.mjs';
 export class ParserVisitor extends BaseVisitor {
     visitKeyword_assignment_expr = (ctx) => {
         const id = ctx.ID().getText();
@@ -145,7 +147,8 @@ export class ParserVisitor extends 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);
     };
     visitCreate_graphic_expr = (ctx) => {
         const commands = ctx.graphic_expr().reduce((accum, item) => {
@@ -191,8 +194,82 @@ export class ParserVisitor extends 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]);
     };
+    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 PinBlankValue);
+        });
+        const nameToPinId = new Map();
+        const tmpPorts = allPorts.map((portName, index) => {
+            nameToPinId.set(portName, index + 1);
+            return new PinDefinition(index + 1, PinIdType.Int, portName, PinTypes.Any);
+        });
+        const arrangeLeftItems = leftPorts.map(item => {
+            if (item instanceof PinBlankValue) {
+                return item;
+            }
+            else {
+                return nameToPinId.get(item);
+            }
+        });
+        const arrangeRightItems = rightPorts.map(item => {
+            if (item instanceof 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);
+    };
+    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]);
+    };
     visitProperty_expr = (ctx) => {
         const ctxPropertyKeyExpr = ctx.property_key_expr();
         const ctxPropertyValueExpr = ctx.property_value_expr();
@@ -270,6 +347,14 @@ export class ParserVisitor extends BaseVisitor {
             && component.copyProp) {
             component = this.getExecutor().copyComponent(component);
         }
+        if (component instanceof DeclaredReference
+            && component.found
+            && component.trailers
+            && component.trailers.length > 0
+            && component.trailers[0] === 'contains') {
+            component = component.value;
+            this.placeModuleContains(component);
+        }
         if (component && component instanceof ClassComponent) {
             const modifiers = ctx.component_modifier_expr();
             modifiers.forEach(modifier => {
@@ -328,10 +413,65 @@ export class ParserVisitor extends BaseVisitor {
             pinValue = this.getResult(ctxPinSelectExpr);
         }
         else {
-            pinValue = component.getDefaultPin();
+            if (component instanceof ClassComponent) {
+                pinValue = component.getDefaultPin();
+            }
+            else {
+                const undeclaredRef = component;
+                throw 'Invalid component: ' + undeclaredRef.reference.name;
+            }
         }
         this.setResult(ctx, [component, pinValue]);
     };
+    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 = 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);
+            }
+        }
+    }
     visitUnaryOperatorExpr = (ctx) => {
         this.visit(ctx.data_expr());
         let value = this.getResult(ctx.data_expr());
@@ -360,6 +500,7 @@ export class ParserVisitor extends 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);
@@ -368,6 +509,10 @@ export class ParserVisitor extends BaseVisitor {
             this.visit(ctxCreateGraphicExpr);
             value = this.getResult(ctxCreateGraphicExpr);
         }
+        else if (ctxCreateModuleExpr) {
+            this.visit(ctxCreateModuleExpr);
+            value = this.getResult(ctxCreateModuleExpr);
+        }
         else {
             throw "Invalid data expression";
         }
@@ -536,13 +681,11 @@ export class ParserVisitor extends BaseVisitor {
         }
     };
     visitAt_block_pin_expression_complex = (ctx) => {
-        ctx.expression().forEach(item => {
-            this.visit(item);
-        });
+        this.visit(ctx.expressions_block());
     };
     visitWire_expr_direction_only = (ctx) => {
         const value = ctx.ID().getText();
-        if (value === 'auto' || value === 'auto_') {
+        if (value === WireAutoDirection.Auto || value === WireAutoDirection.Auto_) {
             this.setResult(ctx, [value]);
         }
         else {
@@ -563,7 +706,7 @@ export class ParserVisitor extends BaseVisitor {
                 useValue = this.getResult(ctxDataExpr);
             }
             if (useValue !== null) {
-                this.setResult(ctx, [direction, useValue]);
+                this.setResult(ctx, [direction, new UnitDimension(useValue)]);
                 return;
             }
         }
@@ -597,9 +740,12 @@ export class ParserVisitor extends BaseVisitor {
         const propertyName = ctx.ID().getText();
         this.getExecutor().setProperty('..' + propertyName, result);
     };
+    visitExpressions_block = (ctx) => {
+        this.runExpressions(this.getExecutor(), ctx.expression());
+    };
     visitFrame_expr = (ctx) => {
         const frameId = this.getExecutor().enterFrame();
-        this.runExpressions(this.getExecutor(), ctx.expression());
+        this.visit(ctx.expressions_block());
         this.getExecutor().exitFrame(frameId);
     };
     visitNet_namespace_expr = (ctx) => {
@@ -630,7 +776,7 @@ export class ParserVisitor extends 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();
@@ -657,7 +803,7 @@ export class ParserVisitor extends 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);
     };
@@ -712,6 +858,26 @@ export class ParserVisitor extends 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/types/antlr/CircuitScriptLexer.d.ts

@@ -12,47 +12,48 @@ export declare class CircuitScriptLexer extends antlr.Lexer {
     static readonly Create = 10;
     static readonly Component = 11;
     static readonly Graphic = 12;
-    static readonly Wire = 13;
-    static readonly Pin = 14;
-    static readonly Add = 15;
-    static readonly At = 16;
-    static readonly To = 17;
-    static readonly Point = 18;
-    static readonly Join = 19;
-    static readonly Parallel = 20;
-    static readonly Return = 21;
-    static readonly Define = 22;
-    static readonly Import = 23;
-    static readonly If = 24;
-    static readonly Else = 25;
-    static readonly Not = 26;
-    static readonly Frame = 27;
-    static readonly Equals = 28;
-    static readonly NotEquals = 29;
-    static readonly GreaterThan = 30;
-    static readonly GreatOrEqualThan = 31;
-    static readonly LessThan = 32;
-    static readonly LessOrEqualThan = 33;
-    static readonly LogicalAnd = 34;
-    static readonly LogicalOr = 35;
-    static readonly Addition = 36;
-    static readonly Minus = 37;
-    static readonly Divide = 38;
-    static readonly Multiply = 39;
-    static readonly OPEN_PAREN = 40;
-    static readonly CLOSE_PAREN = 41;
-    static readonly NOT_CONNECTED = 42;
-    static readonly BOOLEAN_VALUE = 43;
-    static readonly ID = 44;
-    static readonly INTEGER_VALUE = 45;
-    static readonly DECIMAL_VALUE = 46;
-    static readonly NUMERIC_VALUE = 47;
-    static readonly STRING_VALUE = 48;
-    static readonly PERCENTAGE_VALUE = 49;
-    static readonly ALPHA_NUMERIC = 50;
-    static readonly WS = 51;
-    static readonly NEWLINE = 52;
-    static readonly COMMENT = 53;
+    static readonly Module = 13;
+    static readonly Wire = 14;
+    static readonly Pin = 15;
+    static readonly Add = 16;
+    static readonly At = 17;
+    static readonly To = 18;
+    static readonly Point = 19;
+    static readonly Join = 20;
+    static readonly Parallel = 21;
+    static readonly Return = 22;
+    static readonly Define = 23;
+    static readonly Import = 24;
+    static readonly If = 25;
+    static readonly Else = 26;
+    static readonly Not = 27;
+    static readonly Frame = 28;
+    static readonly Equals = 29;
+    static readonly NotEquals = 30;
+    static readonly GreaterThan = 31;
+    static readonly GreatOrEqualThan = 32;
+    static readonly LessThan = 33;
+    static readonly LessOrEqualThan = 34;
+    static readonly LogicalAnd = 35;
+    static readonly LogicalOr = 36;
+    static readonly Addition = 37;
+    static readonly Minus = 38;
+    static readonly Divide = 39;
+    static readonly Multiply = 40;
+    static readonly OPEN_PAREN = 41;
+    static readonly CLOSE_PAREN = 42;
+    static readonly NOT_CONNECTED = 43;
+    static readonly BOOLEAN_VALUE = 44;
+    static readonly ID = 45;
+    static readonly INTEGER_VALUE = 46;
+    static readonly DECIMAL_VALUE = 47;
+    static readonly NUMERIC_VALUE = 48;
+    static readonly STRING_VALUE = 49;
+    static readonly PERCENTAGE_VALUE = 50;
+    static readonly ALPHA_NUMERIC = 51;
+    static readonly WS = 52;
+    static readonly NEWLINE = 53;
+    static readonly COMMENT = 54;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];