circuitscript 0.5.6 → 0.6.0

package/dist/esm/antlr/CircuitScriptParserVisitor.js

@@ -2,6 +2,7 @@ import { AbstractParseTreeVisitor } from "antlr4ng";
 export class CircuitScriptParserVisitor extends AbstractParseTreeVisitor {
     visitScript;
     visitExpression;
+    visitNon_newline_expression;
     visitFlow_expressions;
     visitGraph_expressions;
     visitExpressions_block;
@@ -17,6 +18,7 @@ export class CircuitScriptParserVisitor extends AbstractParseTreeVisitor {
     visitAt_block_header;
     visitAt_block;
     visitAt_block_expressions;
+    visitAt_block_expressions_inner;
     visitAt_block_pin_expr;
     visitKeyword_assignment_expr;
     visitParameters;

package/dist/esm/cache/serializer.js

@@ -62,7 +62,7 @@ export function serializeLibraryScope(importedLib, contentHash) {
             prevStopLine = null;
         };
         for (const exprCtx of tree.expression()) {
-            if (exprCtx.function_def_expr() !== null) {
+            if (exprCtx.non_newline_expression()?.function_def_expr() !== null) {
                 flushGroup();
                 continue;
             }

package/dist/esm/execute.js

@@ -379,6 +379,7 @@ export class ExecutionContext {
         this.applyComponentAngleFromWire(component, pinId);
         this.scope.setCurrent(component, pinId);
         this.scope.clearActive();
+        this.log('clear active wire/frame (to component)');
         if (addSequence) {
             if (this.scope.sequence.length > 0) {
                 const [entryType, , segments] = this.scope.sequence[this.scope.sequence.length - 1];
@@ -415,6 +416,7 @@ export class ExecutionContext {
             this.scope.setNet(component, usePinId, tmpNet);
         }
         this.scope.clearActive();
+        this.log('clear active wire/frame (at component)');
         if (addSequence) {
             this.scope.sequence.push([SequenceAction.At,
                 component, usePinId]);
@@ -453,8 +455,12 @@ export class ExecutionContext {
             || blockType === BlockTypes.Parallel
             || blockType === BlockTypes.Branch) {
             const key = getBlockTypeString(blockType);
+            const wireIdBefore = this.scope.currentWireId;
             this.addPoint(`${Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
+            if (wireIdBefore !== -1) {
+                this.scope.currentWireId = wireIdBefore;
+            }
         }
         this.scope.blockStack.set(this.scope.scopeLevel, {
             start_point: [
@@ -547,9 +553,7 @@ export class ExecutionContext {
         }
         else if (blockType === BlockTypes.Join || blockType === BlockTypes.Parallel) {
             if (blockIndex === 0) {
-                const pointIdName = `${Delimiter1}${getBlockTypeString(blockType)}`;
-                this.addPoint(`${pointIdName}.${this.name}.${this.tmpPointId}`, false);
-                this.tmpPointId += 1;
+                this.addPointForBlockType(blockType);
                 stackRef.end_point = [
                     this.scope.currentComponent,
                     this.scope.currentPin,
@@ -563,6 +567,11 @@ export class ExecutionContext {
             }
         }
     }
+    addPointForBlockType(blockType) {
+        const pointIdName = `${Delimiter1}${getBlockTypeString(blockType)}`;
+        this.addPoint(`${pointIdName}.${this.name}.${this.tmpPointId}`, false);
+        this.tmpPointId += 1;
+    }
     atPointBlock() {
         const [component, pin,] = this.getPointBlockLocation();
         this.atComponent(component, pin, {
@@ -579,10 +588,12 @@ export class ExecutionContext {
         this.log('get block point');
         for (let i = 0; i < this.scope.scopeLevel; i++) {
             const stackRef = this.scope.blockStack.get(this.scope.scopeLevel - 1 - i);
-            const { start_point } = stackRef;
-            const component = start_point[0];
-            if (component.instanceName.startsWith(`${Delimiter1}point.`)) {
-                return start_point;
+            if (stackRef) {
+                const { start_point } = stackRef;
+                const component = start_point[0];
+                if (component.instanceName.startsWith(`${Delimiter1}point.`)) {
+                    return start_point;
+                }
             }
         }
         this.log('did not find block point');

package/dist/esm/objects/BlockTypes.js

@@ -4,4 +4,5 @@ export var BlockTypes;
     BlockTypes[BlockTypes["Join"] = 2] = "Join";
     BlockTypes[BlockTypes["Parallel"] = 3] = "Parallel";
     BlockTypes[BlockTypes["Point"] = 4] = "Point";
+    BlockTypes[BlockTypes["AtBlock"] = 5] = "AtBlock";
 })(BlockTypes || (BlockTypes = {}));

package/dist/esm/objects/Frame.js

@@ -35,6 +35,10 @@ export var FrameParamKeys;
     FrameParamKeys["TitleAlign"] = "title_align";
     FrameParamKeys["HorizontalAlign"] = "align";
     FrameParamKeys["VerticalAlign"] = "valign";
+    FrameParamKeys["FontSize"] = "font_size";
+    FrameParamKeys["Bold"] = "bold";
+    FrameParamKeys["Italic"] = "italic";
+    FrameParamKeys["Color"] = "color";
     FrameParamKeys["SheetNumber"] = "sheet_number";
     FrameParamKeys["SheetTotal"] = "sheet_total";
 })(FrameParamKeys || (FrameParamKeys = {}));

package/dist/esm/regenerate-tests.js

@@ -4,13 +4,15 @@ import { NodeScriptEnvironment } from "./environment/environment.js";
 const mainDir = './__tests__/testData/renderData/';
 const env = new NodeScriptEnvironment();
 NodeScriptEnvironment.setInstance(env);
-async function regenerateTests(extra = "") {
+async function regenerateTests(extra = "", fileList = []) {
     await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs.readdirSync(mainDir);
     files.forEach(file => {
         if (file.endsWith('.cst') && file.startsWith('script')) {
-            cstFiles.push(file);
+            if (fileList.length === 0 || fileList.includes(file)) {
+                cstFiles.push(file);
+            }
         }
     });
     for (let i = 0; i < cstFiles.length; i++) {
@@ -33,8 +35,15 @@ async function regenerateTests(extra = "") {
 (async () => {
     const generateDiff = (process.argv.indexOf('-diff') !== -1);
     console.log('diff flag: ', generateDiff);
+    const listIndex = process.argv.indexOf('--list');
+    const fileList = listIndex !== -1 && process.argv[listIndex + 1]
+        ? process.argv[listIndex + 1].split(',').map(f => f.trim())
+        : [];
+    if (fileList.length > 0) {
+        console.log('filtering to files: ', fileList);
+    }
     const nextExtra = generateDiff ? '.next' : '';
-    const cstFiles = await regenerateTests(nextExtra);
+    const cstFiles = await regenerateTests(nextExtra, fileList);
     const allFiles = [];
     if (generateDiff) {
         cstFiles.forEach(file => {

package/dist/esm/render/draw_symbols.js

@@ -139,7 +139,7 @@ export class SymbolGraphic {
         const labels = this.drawing.getLabels();
         for (const label of labels) {
             const tmpLabel = label;
-            const { fontSize = numeric(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = numeric(0), textColor = "#333", } = tmpLabel.style ?? {};
+            const { fontSize = numeric(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', fontStyle = 'normal', angle: tmpLabelAngle = numeric(0), textColor = "#333", } = tmpLabel.style ?? {};
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
@@ -293,15 +293,19 @@ export class SymbolGraphic {
             if (isRotation180) {
                 useLabelAngle = (labelAngle + 180) % 360;
             }
-            textContainer.text(tmpLabel.text)
-                .fill(textColor)
-                .font({
+            const fontProperties = {
                 family: useFont,
                 size: fontSize.toNumber() * fontDisplayScale,
                 anchor: anchorStyle,
                 'dominant-baseline': dominantBaseline,
                 weight: fontWeight,
-            })
+            };
+            if (fontStyle !== 'normal') {
+                fontProperties.style = fontStyle;
+            }
+            textContainer.text(tmpLabel.text)
+                .fill(textColor)
+                .font(fontProperties)
                 .attr("xml:space", "preserve")
                 .rotate(useLabelAngle, 0, 0);
             const { a, b, c, d, e, f } = textContainer.matrix();
@@ -349,6 +353,8 @@ export class SymbolText extends SymbolGraphic {
     text;
     fontSize = numeric(40);
     fontWeight = 'regular';
+    fontStyle = 'normal';
+    color = undefined;
     constructor(text) {
         super();
         this.text = text;
@@ -360,6 +366,8 @@ export class SymbolText extends SymbolGraphic {
             fontSize: this.fontSize,
             anchor: HorizontalAlign.Center,
             fontWeight: this.fontWeight,
+            fontStyle: this.fontStyle,
+            textColor: this.color
         });
         this.drawing = drawing;
     }
@@ -504,18 +512,16 @@ export class SymbolPlaceholder extends SymbolGraphic {
     }
     parseLabelStyle(keywordParams) {
         const keywords = ['fontSize', 'anchor', 'vanchor',
-            'angle', 'textColor', 'portType', 'bold'];
+            'angle', 'textColor', 'portType', 'bold', 'italic'];
         const style = {};
         keywords.forEach(item => {
             if (keywordParams.has(item)) {
                 style[item] = keywordParams.get(item);
                 if (item === 'bold') {
-                    if (keywordParams.get(item) === true) {
-                        style['fontWeight'] = 'bold';
-                    }
-                    else {
-                        style['fontWeight'] = 'normal';
-                    }
+                    style.fontWeight = keywordParams.get(item) === true ? 'bold' : 'regular';
+                }
+                else if (item === 'italic') {
+                    style.fontStyle = keywordParams.get(item) === true ? 'italic' : 'normal';
                 }
             }
         });

package/dist/esm/render/geometry.js

@@ -44,8 +44,8 @@ export class Textbox extends Flatten.Polygon {
         else {
             throw 'Invalid string passed into textbox';
         }
-        const { fontSize = numeric(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
-        const { box } = measureTextSize2(useText, defaultFont, fontSize.mul(fontDisplayScale).toNumber(), fontWeight, anchor, vanchor);
+        const { fontSize = numeric(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', fontStyle = 'normal', portType = null, } = style ?? {};
+        const { box } = measureTextSize2(useText, defaultFont, fontSize.mul(fontDisplayScale).toNumber(), fontWeight, fontStyle, anchor, vanchor);
         let polygonCoords = [];
         let anchorOffsetX = 0;
         let anchorOffsetY = 0;

package/dist/esm/render/layout.js

@@ -551,12 +551,20 @@ export class LayoutEngine {
         const isSheetFrame = frameObject.frameType === FrameType.Sheet;
         if (frameParams.has(FrameParamKeys.Title) && !isSheetFrame) {
             const title = frameParams.get(FrameParamKeys.Title);
+            const fontSize = frameParams.get(FrameParamKeys.FontSize) ?? numeric(defaultFrameTitleTextSize);
+            const isBold = frameParams.get(FrameParamKeys.Bold) ?? true;
+            const isItalic = frameParams.get(FrameParamKeys.Italic) ?? false;
+            const titleColor = frameParams.get(FrameParamKeys.Color) ?? null;
             const titleFrame = new RenderFrame(new Frame(FixedFrameIds.FrameIdNotUsed), RenderFrameType.Elements);
             titleFrame.containsTitle = true;
             titleFrame.subgraphId = title.replace(/\s/g, "_");
             const textObject = new RenderText(title);
-            textObject.fontSize = numeric(defaultFrameTitleTextSize);
-            textObject.fontWeight = 'bold';
+            textObject.fontSize = fontSize;
+            textObject.fontWeight = isBold ? 'bold' : 'regular';
+            textObject.fontStyle = isItalic ? 'italic' : 'normal';
+            if (titleColor !== null) {
+                textObject.color = titleColor;
+            }
             textObject.x = numeric(0);
             textObject.y = numeric(0);
             textObject.symbol.refreshDrawing();
@@ -1212,6 +1220,8 @@ export class RenderText extends RenderObject {
     symbol;
     _fontSize = numeric(12);
     _fontWeight = 'regular';
+    _fontStyle = 'normal';
+    _color = undefined;
     get fontSize() {
         return this._fontSize;
     }
@@ -1226,6 +1236,20 @@ export class RenderText extends RenderObject {
         this._fontWeight = value;
         this.symbol.fontWeight = value;
     }
+    get fontStyle() {
+        return this._fontStyle;
+    }
+    set fontStyle(value) {
+        this._fontStyle = value;
+        this.symbol.fontStyle = value;
+    }
+    get color() {
+        return this._color;
+    }
+    set color(value) {
+        this._color = value;
+        this.symbol.color = value;
+    }
     constructor(text) {
         super();
         this.symbol = new SymbolText(text);

package/dist/esm/sizing.js

@@ -6,10 +6,10 @@ export function applyFontsToSVG(canvas) {
 }
 const measureTextSizeCache = {};
 const measureTextSizeCacheHits = {};
-export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom) {
+export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', fontStyle = 'normal', anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom) {
     const environment = NodeScriptEnvironment.getInstance();
     const mainCanvas = environment.getCanvasWindow();
-    const key = `${text}-${fontFamily}-${fontSize}-${fontWeight}-${anchor}-${vanchor}`;
+    const key = `${text}-${fontFamily}-${fontSize}-${fontWeight}-${fontStyle}-${anchor}-${vanchor}`;
     if (measureTextSizeCache[key] === undefined) {
         let dominantBaseline = VerticalAlignProp.Hanging;
         switch (vanchor) {
@@ -42,6 +42,7 @@ export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regul
             anchor: useAnchor,
             'dominant-baseline': dominantBaseline,
             weight: fontWeight,
+            style: fontStyle,
         })
             .attr("xml:space", "preserve")
             .fill('#333');

package/dist/esm/visitor.js

@@ -80,7 +80,7 @@ export class ParserVisitor extends BaseVisitor {
         return this.getExecutor().getCurrentPoint();
     };
     visitTo_component_expr = (ctx) => {
-        ctx.component_select_expr().forEach(item => {
+        for (const item of ctx.component_select_expr()) {
             let refComponent;
             const creationFlag = this.trackNewComponentCreated(() => {
                 const [component, pin] = this.visitResult(item);
@@ -95,7 +95,7 @@ export class ParserVisitor extends BaseVisitor {
                 }
             });
             this.linkComponentToCtx(item, refComponent, creationFlag);
-        });
+        }
         return this.getExecutor().getCurrentPoint();
     };
     visitComponent_select_expr = (ctx) => {
@@ -154,7 +154,18 @@ export class ParserVisitor extends BaseVisitor {
         const blockStackEntry = scope.blockStack.get(scopeLevel);
         const { current_index } = blockStackEntry;
         executor.enterBlock(current_index);
-        this.visit(ctx.expressions_block());
+        const ctxNonNewlineExpressions = ctx.non_newline_expression();
+        const ctxExpressionsBlock = ctx.expressions_block();
+        const ctxAtBlockExpressions = ctx.at_block_expressions();
+        if (ctxNonNewlineExpressions.length > 0) {
+            this.runExpressions(executor, ctxNonNewlineExpressions);
+        }
+        else if (ctxExpressionsBlock) {
+            this.visit(ctxExpressionsBlock);
+        }
+        else if (ctxAtBlockExpressions) {
+            this.visit(ctxAtBlockExpressions);
+        }
         executor.exitBlock(current_index);
         blockStackEntry.current_index++;
     };
@@ -959,24 +970,63 @@ export class ParserVisitor extends BaseVisitor {
     };
     visitAt_block_pin_expr = (ctx) => {
         const executor = this.getExecutor();
-        const [currentComponent, currentPin] = executor.getCurrentPoint();
+        const scope = this.getScope();
+        const scopeLevel = scope.scopeLevel;
+        const params = this.getResult(ctx);
+        const blockIndex = params.index;
+        let useComponent;
+        for (let i = scopeLevel - 1; i >= 0; i--) {
+            const blockStackEntry = scope.blockStack.get(i);
+            if (blockStackEntry.type === BlockTypes.AtBlock) {
+                useComponent = blockStackEntry.start_point[0];
+                break;
+            }
+        }
         executor.closeOpenPathBlocks();
         const propKey = this.visitResult(ctx.property_key_expr());
         const atPin = new PinId(propKey);
-        executor.atComponent(currentComponent, atPin, {
+        executor.atComponent(useComponent, atPin, {
             addSequence: true
         });
-        executor.log('at block pin expressions');
-        const ctxExpression = ctx.expression();
+        executor.log(`at block pin expressions, pin id: ${atPin}`);
+        const ctxExpression = ctx.non_newline_expression();
         const ctxExpressionsBlock = ctx.expressions_block();
-        if (ctxExpression) {
-            this.visit(ctxExpression);
+        if (ctxExpression.length > 0) {
+            this.runExpressions(executor, ctxExpression);
         }
         else if (ctxExpressionsBlock) {
             this.visit(ctxExpressionsBlock);
         }
-        executor.log('end at block pin expressions');
-        executor.atComponent(currentComponent, currentPin);
+        const parentBlockStackEntry = scope.blockStack.get(scopeLevel - 1);
+        if (parentBlockStackEntry.type === BlockTypes.Join) {
+            if (blockIndex === 0 && parentBlockStackEntry.current_index === 0) {
+                executor.addPointForBlockType(BlockTypes.Join);
+                parentBlockStackEntry.end_point = [
+                    scope.currentComponent,
+                    scope.currentPin,
+                    scope.currentWireId
+                ];
+            }
+            else {
+                const { end_point: finalPoint } = parentBlockStackEntry;
+                const [component, pin] = finalPoint;
+                executor.toComponent(component, pin, { addSequence: true });
+            }
+        }
+    };
+    visitAt_block_expressions = (ctx) => {
+        let atBlockPinIndex = 0;
+        for (const tmpCtx of ctx.at_block_expressions_inner()) {
+            const ctxAtBlockPin = tmpCtx.at_block_pin_expr();
+            if (ctxAtBlockPin) {
+                this.setResult(ctxAtBlockPin, { index: atBlockPinIndex });
+                atBlockPinIndex++;
+                this.visit(ctxAtBlockPin);
+            }
+            else {
+                this.visit(tmpCtx.expression());
+            }
+        }
     };
     visitAt_block_header = (ctx) => {
         const ctxAtComponent = ctx.at_component_expr();
@@ -990,16 +1040,30 @@ export class ParserVisitor extends BaseVisitor {
     };
     visitAt_block = (ctx) => {
         const executor = this.getExecutor();
-        executor.log('entering at block');
+        const scope = this.getScope();
+        const scopeLevel = scope.scopeLevel;
+        if (scope.blockStack.has(scopeLevel)) {
+            executor.exitBlocks();
+        }
         const ctxAtBlockComponent = ctx.at_block_header();
         this.visit(ctxAtBlockComponent);
         const [currentComponent, currentPin] = executor.getCurrentPoint();
-        executor.scope.scopeLevel += 1;
-        ctx.at_block_expressions().forEach(expression => {
-            this.visit(expression);
+        scope.blockStack.set(scopeLevel, {
+            start_point: [
+                scope.currentComponent,
+                scope.currentPin,
+                scope.currentWireId
+            ],
+            end_point: null,
+            current_index: 0,
+            type: BlockTypes.AtBlock,
         });
+        executor.log('entering at block');
+        executor.scope.scopeLevel += 1;
+        this.visit(ctx.at_block_expressions());
         executor.scope.scopeLevel -= 1;
         executor.scope.setCurrent(currentComponent, currentPin);
+        scope.blockStack.delete(scopeLevel);
         executor.log('leaving at block');
     };
     visitWire_expr = (ctx) => {
@@ -1072,9 +1136,12 @@ export class ParserVisitor extends BaseVisitor {
         if (ctx.Sheet()) {
             frameType = FrameType.Sheet;
         }
-        const frameId = this.getExecutor().enterFrame(frameType);
-        this.visit(ctx.expressions_block());
-        this.getExecutor().exitFrame(frameId);
+        const ctxExpressionsBlock = ctx.expressions_block();
+        if (ctxExpressionsBlock) {
+            const frameId = this.getExecutor().enterFrame(frameType);
+            this.visit(ctxExpressionsBlock);
+            this.getExecutor().exitFrame(frameId);
+        }
     };
     visitNet_namespace_expr = (ctx) => {
         let dataValue;

package/dist/libs/std.cst

@@ -181,7 +181,7 @@ def dgnd(net_name="GND"):
             net_name: net_name
             priority: 100
 
-def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
+def text(value, offsetX = 0, offsetY = 0, fontSize = 50, bold = false, italic = false):
     return create component:
         pins: 1
         followWireOrientation: false
@@ -192,6 +192,8 @@ def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
                 content: value
                 offset: offsetX, offsetY
                 fontSize: fontSize
+                bold: bold
+                italic: italic
 
 # Drawing markers
 

package/dist/types/BaseVisitor.d.ts

@@ -1,4 +1,4 @@
-import { ArrayExprContext, Assignment_exprContext, Callable_exprContext, CallableExprContext, Double_dot_property_set_exprContext, ExpressionContext, Flow_expressionsContext, Function_args_exprContext, Function_exprContext, Function_return_exprContext, Import_exprContext, Import_simpleContext, Import_specific_or_allContext, Keyword_assignment_exprContext, ParametersContext, RoundedBracketsExprContext, ScriptContext, TrailerContext, Value_exprContext, ValueExprContext } from "./antlr/CircuitScriptParser.js";
+import { ArrayExprContext, Assignment_exprContext, Callable_exprContext, CallableExprContext, Double_dot_property_set_exprContext, ExpressionContext, Flow_expressionsContext, Function_args_exprContext, Function_exprContext, Function_return_exprContext, Import_exprContext, Import_simpleContext, Import_specific_or_allContext, Keyword_assignment_exprContext, Non_newline_expressionContext, ParametersContext, RoundedBracketsExprContext, ScriptContext, TrailerContext, Value_exprContext, ValueExprContext } from "./antlr/CircuitScriptParser.js";
 import { CircuitScriptParserVisitor } from "./antlr/CircuitScriptParserVisitor.js";
 import { ExecutionContext } from "./execute.js";
 import { Logger } from "./logger.js";
@@ -87,7 +87,7 @@ export declare class BaseVisitor extends CircuitScriptParserVisitor<ComplexType
     getRefdesFileAnnotationKey(filePath: string, startLine: number, startColumn: number, stopLine: number, stopColumn: number): string;
     visitRoundedBracketsExpr: (ctx: RoundedBracketsExprContext) => void;
     protected setupDefinedParameters(funcDefinedParameters: FunctionDefinedParameter[], passedInParameters: CallableParameter[], executor: ExecutionContext): void;
-    protected runExpressions(executor: ExecutionContext, expressions: ExpressionContext[] | Function_exprContext[]): ComplexType;
+    protected runExpressions(executor: ExecutionContext, expressions: ExpressionContext[] | Function_exprContext[] | Non_newline_expressionContext[]): ComplexType;
     protected getNetNamespace(executorNetNamespace: string, passedNetNamespace: string | null): string;
     protected setInstanceParam(object: ClassComponent, trailers: string[], value: any): void;
     protected getInstanceParam<T>(object: ClassComponent, trailers: string[]): T;