circuitscript 0.0.25 → 0.0.27

package/dist/cjs/layout.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.LayoutEngine = void 0;
+exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.LayoutEngine = void 0;
 const graphlib_1 = require("@dagrejs/graphlib");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -10,6 +10,7 @@ const geometry_js_1 = require("./geometry.js");
 const logger_js_1 = require("./logger.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const utils_js_1 = require("./utils.js");
+const types_js_1 = require("./objects/types.js");
 class LayoutEngine {
     constructor() {
         this.placeSubgraphVersion = 2;
@@ -938,16 +939,16 @@ function applyComponentParamsToSymbol(typeProp, component, symbol) {
 function calculateSymbolAngle(symbol, pin, direction) {
     let directionVector = 0;
     switch (direction) {
-        case 'right':
+        case types_js_1.Direction.Right:
             directionVector = 0;
             break;
-        case 'down':
+        case types_js_1.Direction.Down:
             directionVector = 90;
             break;
-        case 'left':
+        case types_js_1.Direction.Left:
             directionVector = 180;
             break;
-        case 'up':
+        case types_js_1.Direction.Up:
             directionVector = 270;
             break;
     }
@@ -1017,16 +1018,16 @@ class RenderWire extends RenderObject {
         this.segments.forEach(segment => {
             const { direction, value } = segment;
             let didAddPoint = false;
-            if (direction === 'down') {
+            if (direction === types_js_1.Direction.Down) {
                 tmpY += value;
             }
-            else if (direction === 'up') {
+            else if (direction === types_js_1.Direction.Up) {
                 tmpY -= value;
             }
-            else if (direction === 'left') {
+            else if (direction === types_js_1.Direction.Left) {
                 tmpX -= value;
             }
-            else if (direction === 'right') {
+            else if (direction === types_js_1.Direction.Right) {
                 tmpX += value;
             }
             else if (direction === 'auto' || direction === "auto_") {
@@ -1095,16 +1096,16 @@ class RenderWire extends RenderObject {
         let tmpY = this.y;
         excludeLastSegment.forEach(segment => {
             const { direction, value } = segment;
-            if (direction === 'down') {
+            if (direction === types_js_1.Direction.Down) {
                 tmpY += value;
             }
-            else if (direction === 'up') {
+            else if (direction === types_js_1.Direction.Up) {
                 tmpY -= value;
             }
-            else if (direction === 'left') {
+            else if (direction === types_js_1.Direction.Left) {
                 tmpX -= value;
             }
-            else if (direction === 'right') {
+            else if (direction === types_js_1.Direction.Right) {
                 tmpX += value;
             }
         });
@@ -1112,16 +1113,16 @@ class RenderWire extends RenderObject {
         let valueXY = null;
         const lastSegment = this.segments[this.segments.length - 1];
         switch (lastSegment.direction) {
-            case 'left':
+            case types_js_1.Direction.Left:
                 useValue = tmpX - untilX;
                 break;
-            case 'right':
+            case types_js_1.Direction.Right:
                 useValue = untilX - tmpX;
                 break;
-            case 'up':
+            case types_js_1.Direction.Up:
                 useValue = untilY - tmpY;
                 break;
-            case 'down':
+            case types_js_1.Direction.Down:
                 useValue = tmpY - untilY;
                 break;
             case 'auto':
@@ -1225,6 +1226,25 @@ class RenderJunction {
     }
 }
 exports.RenderJunction = RenderJunction;
+function CalculatePinPositions(component) {
+    const pinPositionMapping = new Map();
+    let tmpSymbol;
+    if (component.displayProp !== null
+        && component.displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
+        tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(component.displayProp);
+    }
+    else {
+        const symbolPinDefinitions = generateLayoutPinDefinition(component);
+        tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions);
+    }
+    tmpSymbol.refreshDrawing();
+    const pins = component.pins;
+    pins.forEach((value, key) => {
+        pinPositionMapping.set(key, tmpSymbol.pinPosition(key));
+    });
+    return pinPositionMapping;
+}
+exports.CalculatePinPositions = CalculatePinPositions;
 function isPointOverlap(x, y, other) {
     return (x >= other.x && y >= other.y && x <= (other.x + other.width) && y <= (other.y + other.height));
 }

package/dist/cjs/main.js

@@ -17,9 +17,9 @@ async function main() {
     commander_1.program
         .description('generate graphical output from circuitscript files')
         .version(version)
+        .argument('[input path]', 'Input path')
+        .argument('[output path]', 'Output path')
         .option('-i, --input text <input text>', 'Input text directly')
-        .option('-f, --input-file <path>', 'Input file')
-        .option('-o, --output <path>', 'Output path')
         .option('-c, --current-directory <path>', 'Set current directory')
         .option('-k, --kicad-netlist <filename>', 'Create KiCad netlist')
         .option('-w, --watch', 'Watch for file changes')
@@ -34,8 +34,8 @@ async function main() {
     }
     commander_1.program.parse();
     const options = commander_1.program.opts();
+    const args = commander_1.program.args;
     const watchFileChanges = options.watch;
-    const outputPath = options.output ?? null;
     const dumpNets = options.dumpNets;
     const dumpData = options.dumpData;
     const kicadNetlist = options.kicadNetlist;
@@ -44,18 +44,26 @@ async function main() {
         console.log('watching for file changes...');
     }
     await (0, sizing_js_1.prepareSVGEnvironment)(fontsPath);
-    let inputFilePath = null;
-    let scriptData;
-    if (options.input) {
-        scriptData = options.input;
+    let inputFilePath = "";
+    if (args.length > 2) {
+        console.log("Error: Extra arguments passed");
+        return;
     }
-    else {
-        inputFilePath = options.inputFile;
+    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);
         }
     }
+    else if (options.input) {
+        scriptData = options.input;
+    }
+    else {
+        console.log("Error: No input provided");
+        return;
+    }
     const scriptOptions = {
         currentDirectory,
         defaultLibsPath,
@@ -64,6 +72,10 @@ async function main() {
         kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
+    let outputPath = null;
+    if (args.length > 0 && args[1]) {
+        outputPath = args[1];
+    }
     const output = (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
     if (outputPath === null && output) {
         console.log(output);

package/dist/cjs/objects/ClassComponent.js

@@ -16,6 +16,11 @@ class ClassComponent {
         this.displayProp = null;
         this.widthProp = null;
         this.typeProp = null;
+        this.copyProp = false;
+        this.angleProp = 0;
+        this.followWireOrientationProp = true;
+        this.wireOrientationAngle = 0;
+        this.useWireOrientationAngle = true;
         this.styles = {};
         this.assignedRefDes = null;
         this.instanceName = instanceName;
@@ -117,6 +122,9 @@ class ClassComponent {
         component.arrangeProps = this.arrangeProps;
         component.widthProp = this.widthProp;
         component.typeProp = this.typeProp;
+        component.angleProp = this.angleProp;
+        component.followWireOrientationProp = this.followWireOrientationProp;
+        component.useWireOrientationAngle = this.useWireOrientationAngle;
         if (this.displayProp) {
             if (typeof this.displayProp === "string") {
                 component.displayProp = this.displayProp;

package/dist/cjs/objects/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParseSymbolType = exports.UndeclaredReference = void 0;
+exports.Direction = exports.ParseSymbolType = exports.UndeclaredReference = void 0;
 class UndeclaredReference {
     constructor(reference) {
         this.reference = reference;
@@ -13,3 +13,10 @@ var ParseSymbolType;
     ParseSymbolType["Function"] = "function";
     ParseSymbolType["Undefined"] = "undefined";
 })(ParseSymbolType || (exports.ParseSymbolType = ParseSymbolType = {}));
+var Direction;
+(function (Direction) {
+    Direction["Left"] = "left";
+    Direction["Right"] = "right";
+    Direction["Down"] = "down";
+    Direction["Up"] = "up";
+})(Direction || (exports.Direction = Direction = {}));

package/dist/cjs/render.js

@@ -40,7 +40,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         const { symbol = null } = item;
         if (symbol !== null && symbol) {
             const extra = {};
-            if (item.component.parameters.has('__is_net')) {
+            if (item.component.typeProp === globals_js_1.ComponentTypes.net) {
                 extra.net_name = item.component.parameters.get(globals_js_1.ParamKeys.net_name);
             }
             else if (item.component.parameters.has('value')) {

package/dist/cjs/visitor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VisitorExecutionException = exports.ParserVisitor = void 0;
-const execute_js_1 = require("./execute.js");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const PinDefinition_js_1 = require("./objects/PinDefinition.js");
@@ -34,10 +33,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitAdd_component_expr = (ctx) => {
             const ctxDataWithAssignmentExpr = ctx.data_expr_with_assignment();
-            this.setParam(ctxDataWithAssignmentExpr, { clone: false });
             this.visit(ctxDataWithAssignmentExpr);
             const [component, pinValue] = this.getResult(ctxDataWithAssignmentExpr);
-            return this.getExecutor().addComponentExisting(component, pinValue);
+            this.getExecutor().addComponentExisting(component, pinValue);
         };
         this.visitAt_component_expr = (ctx) => {
             if (ctx.Point()) {
@@ -140,18 +138,22 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 properties.get('display') : null;
             const type = properties.has('type') ?
                 properties.get('type') : null;
+            const copy = properties.has('copy') ?
+                properties.get('copy') : false;
             const width = properties.has('width') ?
                 properties.get('width') : null;
+            const angle = properties.has('angle') ?
+                properties.get('angle') : null;
+            const followWireOrientation = properties.has('followWireOrientation') ?
+                properties.get('followWireOrientation') : true;
             const props = {
-                arrange,
-                display,
-                type,
-                width,
+                arrange, display, type, width, copy,
+                angle, followWireOrientation
             };
             this.setResult(ctx, this.getExecutor().createComponent(instanceName, pins, params, props));
         };
         this.visitCreate_graphic_expr = (ctx) => {
-            const commands = ctx.sub_expr().reduce((accum, item) => {
+            const commands = ctx.graphic_expr().reduce((accum, item) => {
                 this.visit(item);
                 const [commandName, parameters] = this.getResult(item);
                 const keywordParams = new Map();
@@ -171,7 +173,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             drawing.source = ctx.getText();
             this.setResult(ctx, drawing);
         };
-        this.visitSub_expr = (ctx) => {
+        this.visitGraphic_expr = (ctx) => {
             let commandName = null;
             const command = ctx._command;
             if (command) {
@@ -180,9 +182,20 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             else {
                 throw "Invalid command!";
             }
-            const ctxParameters = ctx.parameters();
-            this.visit(ctxParameters);
-            const parameters = this.getResult(ctxParameters);
+            let parameters = [];
+            const ctxNestedProperties = ctx.nested_properties_inner();
+            if (ctxNestedProperties) {
+                this.visit(ctxNestedProperties);
+                const nestedKeyValues = this.getResult(ctxNestedProperties);
+                nestedKeyValues.forEach((value, key) => {
+                    parameters.push(['keyword', key, value]);
+                });
+            }
+            else {
+                const ctxParameters = ctx.parameters();
+                this.visit(ctxParameters);
+                parameters = this.getResult(ctxParameters);
+            }
             this.setResult(ctx, [commandName, parameters]);
         };
         this.visitProperty_expr = (ctx) => {
@@ -211,7 +224,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             this.setResult(ctx, value);
         };
-        this.visitNested_properties = (ctx) => {
+        this.visitNested_properties_inner = (ctx) => {
             const result = new Map();
             ctx.property_expr().forEach((item) => {
                 this.visit(item);
@@ -222,6 +235,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             });
             this.setResult(ctx, result);
         };
+        this.visitNested_properties = (ctx) => {
+            const ctxNested = ctx.nested_properties_inner();
+            this.visit(ctxNested);
+            this.setResult(ctx, this.getResult(ctxNested));
+        };
         this.visitProperty_key_expr = (ctx) => {
             const ctxID = ctx.ID();
             const ctxIntegerValue = ctx.INTEGER_VALUE();
@@ -253,14 +271,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.visit(ctxAssignmentExpr);
                 component = this.getResult(ctxAssignmentExpr);
             }
-            let allowClone = true;
-            if (this.hasParam(ctx)) {
-                const { clone } = this.getParam(ctx);
-                allowClone = clone;
-            }
-            if (allowClone && component instanceof ClassComponent_js_1.ClassComponent
-                && (0, execute_js_1.isNetOnlyComponent)(component)) {
-                component = this.getExecutor().cloneComponent(component);
+            if (component instanceof ClassComponent_js_1.ClassComponent
+                && component.copyProp) {
+                component = this.getExecutor().copyComponent(component);
             }
             if (component && component instanceof ClassComponent_js_1.ClassComponent) {
                 const modifiers = ctx.component_modifier_expr();
@@ -276,18 +289,40 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     else if (ctxID2) {
                         result = ctxID2.getText();
                     }
+                    let shouldIgnoreWireOrientation = false;
                     if (modifierText === 'flip') {
                         const flipValue = result;
                         if (flipValue.indexOf('x') !== -1) {
                             component.setParam('flipX', 1);
+                            shouldIgnoreWireOrientation = true;
                         }
                         if (flipValue.indexOf('y') !== -1) {
                             component.setParam('flipY', 1);
+                            shouldIgnoreWireOrientation = true;
                         }
                     }
                     else if (modifierText === 'angle') {
                         const angleValue = Number(result);
                         component.setParam('angle', angleValue);
+                        shouldIgnoreWireOrientation = true;
+                    }
+                    else if (modifierText === 'anchor') {
+                        if (component.displayProp
+                            && component.displayProp instanceof draw_symbols_js_1.SymbolDrawingCommands) {
+                            const commands = (component.displayProp)
+                                .getCommands();
+                            commands.forEach(command => {
+                                const positionParams = command[1];
+                                const keywordParams = command[2];
+                                if (command[0] === draw_symbols_js_1.PlaceHolderCommands.label
+                                    && positionParams[0] === 'value') {
+                                    keywordParams.set('anchor', result);
+                                }
+                            });
+                        }
+                    }
+                    if (shouldIgnoreWireOrientation) {
+                        component.useWireOrientationAngle = false;
                     }
                 });
             }
@@ -358,6 +393,41 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             else if (binaryOperatorType.NotEquals()) {
                 result = value1 != value2;
             }
+            else if (binaryOperatorType.GreaterThan()) {
+                result = value1 > value2;
+            }
+            else if (binaryOperatorType.GreatOrEqualThan()) {
+                result = value1 >= value2;
+            }
+            else if (binaryOperatorType.LessThan()) {
+                result = value1 < value2;
+            }
+            else if (binaryOperatorType.LessOrEqualThan()) {
+                result = value1 <= value2;
+            }
+            this.setResult(ctx, result);
+        };
+        this.visitLogicalOperatorExpr = (ctx) => {
+            const ctx0 = ctx.data_expr(0);
+            const ctx1 = ctx.data_expr(1);
+            this.visit(ctx0);
+            const value1 = this.getResult(ctx0);
+            let value2 = false;
+            let skipNext = false;
+            if (ctx.LogicalOr() && value1) {
+                skipNext = true;
+            }
+            if (!skipNext) {
+                this.visit(ctx1);
+                value2 = this.getResult(ctx1);
+            }
+            let result = null;
+            if (ctx.LogicalAnd()) {
+                result = value1 && value2;
+            }
+            else if (ctx.LogicalOr()) {
+                result = value1 || value2;
+            }
             this.setResult(ctx, result);
         };
         this.visitMultiplyExpr = (ctx) => {
@@ -560,6 +630,42 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             this.setResult(ctx, (hasPlus ? "+" : "") + netNamespace);
         };
+        this.visitIf_expr = (ctx) => {
+            const ctxDataExpr = ctx.data_expr();
+            this.visit(ctxDataExpr);
+            const result = this.getResult(ctxDataExpr);
+            if (result) {
+                this.runExpressions(this.getExecutor(), ctx.expression());
+            }
+            else {
+                const ctxInnerIfExprs = ctx.if_inner_expr();
+                let innerIfWasTrue = false;
+                for (let i = 0; i < ctxInnerIfExprs.length; i++) {
+                    const tmpCtx = ctxInnerIfExprs[i];
+                    this.visit(tmpCtx);
+                    const innerResult = this.getResult(tmpCtx);
+                    if (innerResult) {
+                        innerIfWasTrue = true;
+                        break;
+                    }
+                }
+                if (!innerIfWasTrue) {
+                    const elseCtx = ctx.else_expr();
+                    if (elseCtx) {
+                        this.visit(elseCtx);
+                    }
+                }
+            }
+        };
+        this.visitIf_inner_expr = (ctx) => {
+            const ctxDataExpr = ctx.data_expr();
+            this.visit(ctxDataExpr);
+            const result = this.getResult(ctxDataExpr);
+            if (result) {
+                this.runExpressions(this.getExecutor(), ctx.expression());
+            }
+            this.setResult(ctx, result);
+        };
         this.pinTypes = [
             PinTypes_js_1.PinTypes.Any,
             PinTypes_js_1.PinTypes.IO,
@@ -588,8 +694,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 }
                 if (Array.isArray(pinDef)) {
                     const firstValue = pinDef[0];
-                    if (this.pinTypes.indexOf(firstValue) !== -1) {
-                        pinType = firstValue;
+                    if (firstValue.type
+                        && firstValue.type === globals_js_1.ReferenceTypes.pinType
+                        && this.pinTypes.indexOf(firstValue.value) !== -1) {
+                        pinType = firstValue.value;
                         pinName = pinDef[1];
                         if (pinDef.length > 2) {
                             altPinNames = pinDef.slice(2);

package/dist/esm/BaseVisitor.mjs

@@ -7,7 +7,8 @@ import { Logger } from "./logger";
 import { ClassComponent } from "./objects/ClassComponent";
 import { NumericValue, PercentageValue, PinBlankValue } from "./objects/ParamDefinition";
 import { PinTypes } from "./objects/PinTypes";
-import { UndeclaredReference } from "./objects/types";
+import { Direction, UndeclaredReference } from "./objects/types";
+import { ReferenceTypes } from './globals';
 export class BaseVisitor extends CircuitScriptVisitor {
     indentLevel = 0;
     startingContext;
@@ -18,7 +19,8 @@ export class BaseVisitor extends CircuitScriptVisitor {
     defaultLibsPath;
     printStream = [];
     printToConsole = true;
-    acceptedDirections = ['left', 'right', 'up', 'down'];
+    acceptedDirections = [Direction.Up, Direction.Down,
+        Direction.Right, Direction.Left];
     acceptedFlip = ['flipX', 'flipY'];
     resultData = new Map;
     paramData = new Map;
@@ -138,7 +140,8 @@ export class BaseVisitor extends CircuitScriptVisitor {
         if (this.pinTypesList.indexOf(atomId) !== -1) {
             currentReference = {
                 found: true,
-                value: atomId
+                value: atomId,
+                type: ReferenceTypes.pinType,
             };
         }
         else {
@@ -275,7 +278,12 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 value = new UndeclaredReference(reference);
             }
             else {
-                value = reference.value;
+                if (reference.type && reference.type === ReferenceTypes.pinType) {
+                    value = reference;
+                }
+                else {
+                    value = reference.value;
+                }
             }
         }
         this.setResult(ctx, value);
@@ -340,15 +348,6 @@ export class BaseVisitor extends CircuitScriptVisitor {
     getResult(ctx) {
         return this.resultData.get(ctx);
     }
-    setParam(ctx, value) {
-        this.paramData.set(ctx, value);
-    }
-    getParam(ctx) {
-        return this.paramData.get(ctx);
-    }
-    hasParam(ctx) {
-        return this.paramData.has(ctx);
-    }
     handleImportFile(name, throwErrors = true) {
         let hasError = false;
         let hasParseError = false;
@@ -420,6 +419,11 @@ export class BaseVisitor extends CircuitScriptVisitor {
                         }
                     }
                 }
+                else if (tmpPassedInArgs[0] === 'keyword') {
+                    const variableName = tmpPassedInArgs[1];
+                    executor.log('set variable in scope, var name: ', variableName);
+                    executor.scope.variables.set(variableName, tmpPassedInArgs[2]);
+                }
             }
             else if (tmpFuncArg.length === 2) {
                 const variableName = tmpFuncArg[0];

package/dist/esm/SemanticTokenVisitor.mjs

@@ -39,8 +39,8 @@ export class SemanticTokensVisitor extends BaseVisitor {
     };
     visitCreate_graphic_expr = (ctx) => {
         this.addSemanticToken(ctx.Create(), ['defaultLibrary'], 'function');
-        ctx.sub_expr().forEach(sub_expr => {
-            this.visit(sub_expr);
+        ctx.graphic_expr().forEach(graphic_expr => {
+            this.visit(graphic_expr);
         });
     };
     visitProperty_key_expr = (ctx) => {
@@ -61,7 +61,7 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(useValue, [], 'property');
         }
     };
-    visitSub_expr = (ctx) => {
+    visitGraphic_expr = (ctx) => {
         let useValue = null;
         const ctxId = ctx.ID();
         const ctxPin = ctx.Pin();