circuitscript 0.5.6 → 0.6.0

package/dist/cjs/cache/serializer.js

@@ -65,7 +65,7 @@ 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/cjs/execute.js

@@ -374,6 +374,7 @@ 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];
@@ -410,6 +411,7 @@ 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([ExecutionScope_js_1.SequenceAction.At,
                 component, usePinId]);
@@ -448,8 +450,12 @@ class ExecutionContext {
             || blockType === BlockTypes_js_1.BlockTypes.Parallel
             || blockType === BlockTypes_js_1.BlockTypes.Branch) {
             const key = (0, utils_js_1.getBlockTypeString)(blockType);
+            const wireIdBefore = this.scope.currentWireId;
             this.addPoint(`${globals_js_1.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: [
@@ -542,9 +548,7 @@ class ExecutionContext {
         }
         else if (blockType === BlockTypes_js_1.BlockTypes.Join || blockType === BlockTypes_js_1.BlockTypes.Parallel) {
             if (blockIndex === 0) {
-                const pointIdName = `${globals_js_1.Delimiter1}${(0, utils_js_1.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,
@@ -558,6 +562,11 @@ class ExecutionContext {
             }
         }
     }
+    addPointForBlockType(blockType) {
+        const pointIdName = `${globals_js_1.Delimiter1}${(0, utils_js_1.getBlockTypeString)(blockType)}`;
+        this.addPoint(`${pointIdName}.${this.name}.${this.tmpPointId}`, false);
+        this.tmpPointId += 1;
+    }
     atPointBlock() {
         const [component, pin,] = this.getPointBlockLocation();
         this.atComponent(component, pin, {
@@ -574,10 +583,12 @@ 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(`${globals_js_1.Delimiter1}point.`)) {
-                return start_point;
+            if (stackRef) {
+                const { start_point } = stackRef;
+                const component = start_point[0];
+                if (component.instanceName.startsWith(`${globals_js_1.Delimiter1}point.`)) {
+                    return start_point;
+                }
             }
         }
         this.log('did not find block point');

package/dist/cjs/objects/BlockTypes.js

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

package/dist/cjs/objects/Frame.js

@@ -37,6 +37,10 @@ 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 || (exports.FrameParamKeys = FrameParamKeys = {}));

package/dist/cjs/regenerate-tests.js

@@ -9,13 +9,15 @@ const environment_js_1 = require("./environment/environment.js");
 const mainDir = './__tests__/testData/renderData/';
 const env = new environment_js_1.NodeScriptEnvironment();
 environment_js_1.NodeScriptEnvironment.setInstance(env);
-async function regenerateTests(extra = "") {
+async function regenerateTests(extra = "", fileList = []) {
     await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs_1.default.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++) {
@@ -38,8 +40,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/cjs/render/draw_symbols.js

@@ -140,7 +140,7 @@ class SymbolGraphic {
         const labels = this.drawing.getLabels();
         for (const label of labels) {
             const tmpLabel = label;
-            const { fontSize = (0, NumericValue_js_1.numeric)(50), anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = (0, NumericValue_js_1.numeric)(0), textColor = "#333", } = tmpLabel.style ?? {};
+            const { fontSize = (0, NumericValue_js_1.numeric)(50), anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', fontStyle = 'normal', angle: tmpLabelAngle = (0, NumericValue_js_1.numeric)(0), textColor = "#333", } = tmpLabel.style ?? {};
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
@@ -294,15 +294,19 @@ class SymbolGraphic {
             if (isRotation180) {
                 useLabelAngle = (labelAngle + 180) % 360;
             }
-            textContainer.text(tmpLabel.text)
-                .fill(textColor)
-                .font({
+            const fontProperties = {
                 family: useFont,
                 size: fontSize.toNumber() * globals_js_1.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();
@@ -352,6 +356,8 @@ class SymbolText extends SymbolGraphic {
         super();
         this.fontSize = (0, NumericValue_js_1.numeric)(40);
         this.fontWeight = 'regular';
+        this.fontStyle = 'normal';
+        this.color = undefined;
         this.text = text;
     }
     generateDrawing() {
@@ -361,6 +367,8 @@ class SymbolText extends SymbolGraphic {
             fontSize: this.fontSize,
             anchor: geometry_js_1.HorizontalAlign.Center,
             fontWeight: this.fontWeight,
+            fontStyle: this.fontStyle,
+            textColor: this.color
         });
         this.drawing = drawing;
     }
@@ -505,18 +513,16 @@ 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/cjs/render/geometry.js

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

package/dist/cjs/render/layout.js

@@ -556,12 +556,20 @@ class LayoutEngine {
         const isSheetFrame = frameObject.frameType === globals_js_1.FrameType.Sheet;
         if (frameParams.has(Frame_js_1.FrameParamKeys.Title) && !isSheetFrame) {
             const title = frameParams.get(Frame_js_1.FrameParamKeys.Title);
+            const fontSize = frameParams.get(Frame_js_1.FrameParamKeys.FontSize) ?? (0, NumericValue_js_1.numeric)(globals_js_1.defaultFrameTitleTextSize);
+            const isBold = frameParams.get(Frame_js_1.FrameParamKeys.Bold) ?? true;
+            const isItalic = frameParams.get(Frame_js_1.FrameParamKeys.Italic) ?? false;
+            const titleColor = frameParams.get(Frame_js_1.FrameParamKeys.Color) ?? null;
             const titleFrame = new RenderFrame(new Frame_js_1.Frame(Frame_js_1.FixedFrameIds.FrameIdNotUsed), RenderFrameType.Elements);
             titleFrame.containsTitle = true;
             titleFrame.subgraphId = title.replace(/\s/g, "_");
             const textObject = new RenderText(title);
-            textObject.fontSize = (0, NumericValue_js_1.numeric)(globals_js_1.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 = (0, NumericValue_js_1.numeric)(0);
             textObject.y = (0, NumericValue_js_1.numeric)(0);
             textObject.symbol.refreshDrawing();
@@ -1228,10 +1236,26 @@ 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._fontSize = (0, NumericValue_js_1.numeric)(12);
         this._fontWeight = 'regular';
+        this._fontStyle = 'normal';
+        this._color = undefined;
         this.symbol = new draw_symbols_js_1.SymbolText(text);
     }
 }

package/dist/cjs/sizing.js

@@ -10,10 +10,10 @@ function applyFontsToSVG(canvas) {
 exports.applyFontsToSVG = applyFontsToSVG;
 const measureTextSizeCache = {};
 const measureTextSizeCacheHits = {};
-function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom) {
+function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', fontStyle = 'normal', anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom) {
     const environment = environment_js_1.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 = geometry_js_1.VerticalAlignProp.Hanging;
         switch (vanchor) {
@@ -46,6 +46,7 @@ function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', an
             anchor: useAnchor,
             'dominant-baseline': dominantBaseline,
             weight: fontWeight,
+            style: fontStyle,
         })
             .attr("xml:space", "preserve")
             .fill('#333');

package/dist/cjs/visitor.js

@@ -75,7 +75,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             return this.getExecutor().getCurrentPoint();
         };
         this.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);
@@ -90,7 +90,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     }
                 });
                 this.linkComponentToCtx(item, refComponent, creationFlag);
-            });
+            }
             return this.getExecutor().getCurrentPoint();
         };
         this.visitComponent_select_expr = (ctx) => {
@@ -149,7 +149,18 @@ class ParserVisitor extends BaseVisitor_js_1.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++;
         };
@@ -720,24 +731,63 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.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_js_1.BlockTypes.AtBlock) {
+                    useComponent = blockStackEntry.start_point[0];
+                    break;
+                }
+            }
             executor.closeOpenPathBlocks();
             const propKey = this.visitResult(ctx.property_key_expr());
             const atPin = new PinDefinition_js_1.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_js_1.BlockTypes.Join) {
+                if (blockIndex === 0 && parentBlockStackEntry.current_index === 0) {
+                    executor.addPointForBlockType(BlockTypes_js_1.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 });
+                }
+            }
+        };
+        this.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());
+                }
+            }
         };
         this.visitAt_block_header = (ctx) => {
             const ctxAtComponent = ctx.at_component_expr();
@@ -751,16 +801,30 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.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_js_1.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');
         };
         this.visitWire_expr = (ctx) => {
@@ -833,9 +897,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (ctx.Sheet()) {
                 frameType = globals_js_1.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);
+            }
         };
         this.visitNet_namespace_expr = (ctx) => {
             let dataValue;

package/dist/esm/BaseVisitor.js

@@ -295,6 +295,7 @@ export class BaseVisitor extends CircuitScriptParserVisitor {
             const rhsValue = unwrapValue(rhsCtxResult);
             this.assignValueToReference(sequenceParts, leftSideReference, lhsCtx, rhsValue);
             if (sequenceParts.length > 0) {
+                this.log('add sequence action: assign');
                 this.getScope().sequence.push([
                     SequenceAction.Assign, ...sequenceParts
                 ]);

package/dist/esm/annotate/RefdesAnnotationVisitor.js

@@ -47,9 +47,7 @@ export class RefdesAnnotationVisitor extends BaseVisitor {
     };
     visitAt_block = (ctx) => {
         this.visit(ctx.at_block_header());
-        ctx.at_block_expressions().forEach(expression => {
-            this.visit(expression);
-        });
+        this.visit(ctx.at_block_expressions());
     };
     visitTo_component_expr = (ctx) => {
         const allRefdes = [];