circuitscript 0.0.29 → 0.0.32

package/dist/cjs/execute.js

@@ -195,20 +195,20 @@ class ExecutionContext {
         return component;
     }
     printPoint(extra = '') {
-        let netName = globals_js_1.NoNetText;
+        let netString = globals_js_1.NoNetText;
         if (this.scope.currentComponent === null || this.scope.currentPin === null) {
             this.log((extra !== '' ? (extra + ' ') : '') + 'point is null');
             return;
         }
         if (this.scope.hasNet(this.scope.currentComponent, this.scope.currentPin)) {
-            netName = this.scope
+            netString = this.scope
                 .getNet(this.scope.currentComponent, this.scope.currentPin)
                 .toString();
         }
         this.log((extra !== '' ? (extra + ' ') : '') + 'point: ' +
             this.scope.currentComponent.instanceName +
             ' ' +
-            this.scope.currentPin + ' ' + netName);
+            this.scope.currentPin + ' ' + netString);
     }
     addComponentExisting(component, pin) {
         const startPin = pin;
@@ -462,34 +462,34 @@ class ExecutionContext {
         for (let i = 0; i < reversed.length; i++) {
             const context = reversed[i];
             if (context.hasFunction(idName)) {
-                return {
+                return new types_js_1.DeclaredReference({
                     found: true,
                     value: context.getFunction(idName),
                     type: globals_js_1.ReferenceTypes.function,
                     name: idName,
-                };
+                });
             }
             else if (context.scope.variables.has(idName)) {
-                return {
+                return new types_js_1.DeclaredReference({
                     found: true,
                     value: context.scope.variables.get(idName),
                     type: globals_js_1.ReferenceTypes.variable,
                     name: idName,
-                };
+                });
             }
             else if (context.scope.instances.has(idName)) {
-                return {
+                return new types_js_1.DeclaredReference({
                     found: true,
                     value: context.scope.instances.get(idName),
                     type: globals_js_1.ReferenceTypes.instance,
                     name: idName,
-                };
+                });
             }
         }
-        return {
+        return new types_js_1.DeclaredReference({
             found: false,
             name: idName,
-        };
+        });
     }
     callFunction(functionName, functionParams, executionStack, netNamespace) {
         let __runFunc = null;
@@ -516,6 +516,7 @@ class ExecutionContext {
         }
         if (__runFunc !== null) {
             this.log(`call function '${functionName}'`);
+            this.log(`net namespace: ${netNamespace}`);
             const functionResult = __runFunc(functionParams, { netNamespace });
             this.log(`done call function '${functionName}'`);
             return functionResult;
@@ -648,6 +649,10 @@ class ExecutionContext {
         this.scope.setActive(ExecutionScope_js_1.ActiveObject.Wire, wireId);
         this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.Wire, wireId, tmp]);
         this.scope.currentComponent.pinWires.set(this.scope.currentPin, tmp);
+        if (!this.scope.currentComponent.didSetWireOrientationAngle) {
+            this.applyComponentAngleFromWire(this.scope.currentComponent, this.scope.currentPin, true);
+            this.scope.currentComponent.didSetWireOrientationAngle = true;
+        }
     }
     addPoint(pointId, userDefined = true) {
         if (this.scope.instances.has(pointId)) {
@@ -698,18 +703,37 @@ class ExecutionContext {
             this.scope.currentComponent.styles[key] = styles[key];
         }
     }
-    applyComponentAngleFromWire(component, pin) {
+    applyComponentAngleFromWire(component, pin, opposite = false) {
         if (this.componentAngleFollowsWire
             && component.followWireOrientationProp
             && component.useWireOrientationAngle
+            && !component.didSetWireOrientationAngle
             && this.scope.currentWireId !== -1) {
             const currentWire = this.scope.wires[this.scope.currentWireId];
-            const lastSegment = currentWire.path[currentWire.path.length - 1];
+            let useSegment = currentWire.path[currentWire.path.length - 1];
+            if (opposite) {
+                useSegment = currentWire.path[0];
+            }
             const pinPositions = (0, layout_js_1.CalculatePinPositions)(component);
             if (pinPositions.has(pin)) {
                 const connectedPinPos = pinPositions.get(pin);
                 let targetAngle = null;
-                switch (lastSegment.direction) {
+                let useDirection = useSegment.direction;
+                if (opposite) {
+                    if (useDirection === types_js_1.Direction.Down) {
+                        useDirection = types_js_1.Direction.Up;
+                    }
+                    else if (useDirection === types_js_1.Direction.Up) {
+                        useDirection = types_js_1.Direction.Down;
+                    }
+                    else if (useDirection === types_js_1.Direction.Right) {
+                        useDirection = types_js_1.Direction.Left;
+                    }
+                    else if (useDirection === types_js_1.Direction.Left) {
+                        useDirection = types_js_1.Direction.Right;
+                    }
+                }
+                switch (useDirection) {
                     case types_js_1.Direction.Down:
                         targetAngle = 90;
                         break;
@@ -748,12 +772,14 @@ class ExecutionContext {
                     component.setParam('angle', 270);
                 }
                 component.wireOrientationAngle = useAngle;
+                component.didSetWireOrientationAngle = true;
             }
         }
     }
     enterFrame() {
         const frameId = this.scope.frames.length + 1;
         const frameObject = new Frame_js_1.Frame(frameId);
+        this.log('Enter frame', frameId);
         this.scope.frames.push(frameObject);
         this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.Frame,
             frameObject, ExecutionScope_js_1.FrameAction.Enter]);
@@ -765,6 +791,7 @@ class ExecutionContext {
         const frame = this.scope.frames[frameId - 1];
         this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.Frame,
             frame, ExecutionScope_js_1.FrameAction.Exit]);
+        this.log('Leave frame', frameId);
     }
 }
 exports.ExecutionContext = ExecutionContext;

package/dist/cjs/geometry.js

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Label = exports.Textbox = void 0;
+exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Textbox = void 0;
 const core_1 = __importDefault(require("@flatten-js/core"));
 const sizing_js_1 = require("./sizing.js");
 const globals_js_1 = require("./globals.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const PinTypes_js_1 = require("./objects/PinTypes.js");
+const utils_js_1 = require("./utils.js");
 class Textbox extends core_1.default.Polygon {
     get box() {
         return this.polygon.box;
@@ -41,34 +43,91 @@ class Textbox extends core_1.default.Polygon {
         else {
             throw 'Invalid string passed into textbox';
         }
-        const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', } = style ?? {};
-        const { width, height, box } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize, fontWeight, anchor, vanchor);
-        const polygonCoords = [
-            [box.x, box.y],
-            [box.x2, box.y],
-            [box.x2, box.y2],
-            [box.x, box.y2],
-            [box.x, box.y],
-        ];
+        const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', portType = null, } = style ?? {};
+        const { width, height, box } = (0, sizing_js_1.measureTextSize2)(useText, globals_js_1.defaultFont, fontSize * globals_js_1.fontDisplayScale, fontWeight, anchor, vanchor);
+        let polygonCoords = [];
+        let anchorOffsetX = 0;
+        let anchorOffsetY = 0;
+        if (portType === null) {
+            polygonCoords = [
+                [box.x, box.y],
+                [box.x2, box.y],
+                [box.x2, box.y2],
+                [box.x, box.y2],
+                [box.x, box.y],
+            ];
+        }
+        else if (PinTypes_js_1.AllPinTypes.indexOf(portType) !== -1) {
+            const paddingHorizontal = globals_js_1.PortPaddingHorizontal;
+            const paddingVert = globals_js_1.PortPaddingVertical;
+            if (portType === PinTypes_js_1.PinTypes.Input) {
+                polygonCoords = [
+                    [box.x - paddingHorizontal - globals_js_1.PortArrowSize, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal - globals_js_1.PortArrowSize, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal - globals_js_1.PortArrowSize, box.y - paddingVert],
+                ];
+                anchorOffsetX += (globals_js_1.PortArrowSize + paddingHorizontal);
+            }
+            else if (portType === PinTypes_js_1.PinTypes.Output) {
+                polygonCoords = [
+                    [box.x - paddingHorizontal, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal + globals_js_1.PortArrowSize, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal + globals_js_1.PortArrowSize, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal, box.y - paddingVert],
+                ];
+                anchorOffsetX += paddingHorizontal;
+            }
+            else if (portType === PinTypes_js_1.PinTypes.IO) {
+                polygonCoords = [
+                    [box.x - paddingHorizontal - globals_js_1.PortArrowSize, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal + globals_js_1.PortArrowSize, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal + globals_js_1.PortArrowSize, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal - globals_js_1.PortArrowSize, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal - globals_js_1.PortArrowSize, box.y - paddingVert],
+                ];
+                anchorOffsetX += paddingHorizontal + globals_js_1.PortArrowSize;
+            }
+            else if (portType === PinTypes_js_1.PinTypes.Any) {
+                polygonCoords = [
+                    [box.x - paddingHorizontal, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal, box.y - paddingVert],
+                    [box.x2 + paddingHorizontal, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal, box.y2 + paddingVert],
+                    [box.x - paddingHorizontal, box.y - paddingVert],
+                ];
+                anchorOffsetX += paddingHorizontal;
+            }
+            anchorOffsetY += paddingVert / 2;
+        }
         const polygon = new core_1.default.Polygon(polygonCoords);
-        return new Textbox(id, useText, [x, y], polygon, style, box, label);
+        return new Textbox(id, useText, [x + anchorOffsetX, y + anchorOffsetY], polygon, style, box, label);
     }
     rotate(angle, origin) {
         const feature = super.rotate(angle, origin);
-        return new Textbox(this.id, this.text, this.anchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+        const newAnchorPoint = this.transformAnchorPoint(segment => segment.rotate(angle, origin));
+        return new Textbox(this.id, this.text, newAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
     }
     transform(matrix) {
         const feature = super.transform(matrix);
-        return new Textbox(this.id, this.text, this.anchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+        const newAnchorPoint = this.transformAnchorPoint(segment => segment.transform(matrix));
+        return new Textbox(this.id, this.text, newAnchorPoint, feature, this.style, this.textMeasurementBounds, this.label);
+    }
+    transformAnchorPoint(callback) {
+        const anchorPointSegment = new core_1.default.Segment(new core_1.default.Point(0, 0), new core_1.default.Point(this.anchorPoint));
+        const newSegment = callback(anchorPointSegment);
+        const lastPoint = newSegment.vertices[newSegment.vertices.length - 1];
+        return [
+            lastPoint.x, lastPoint.y
+        ];
     }
     getLabelPosition() {
         return this.anchorPoint;
     }
 }
 exports.Textbox = Textbox;
-class Label extends Textbox {
-}
-exports.Label = Label;
 class GeometryProp {
     constructor(name, value) {
         this.name = name;
@@ -151,7 +210,7 @@ class Geometry {
                 && feature.text.trim().length === 0) {
                 return;
             }
-            if (feature instanceof Textbox && !feature.label) {
+            if (feature instanceof Textbox) {
                 const [x, y] = feature.anchorPoint;
                 box = {
                     xmin: box.xmin + x,
@@ -247,7 +306,9 @@ class Geometry {
         const existingSegments = [];
         wirePoints.forEach(points => {
             const tmpPoints = points.map(pt => {
-                return new core_1.default.Point(pt.x, pt.y);
+                const roundedX = (0, utils_js_1.roundValue)(pt.x);
+                const roundedY = (0, utils_js_1.roundValue)(pt.y);
+                return new core_1.default.Point(roundedX, roundedY);
             });
             for (let i = 0; i < tmpPoints.length - 1; i++) {
                 const pt1 = tmpPoints[i];

package/dist/cjs/globals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.portHeight = exports.portWidth = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = void 0;
+exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = void 0;
 var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
@@ -26,18 +26,49 @@ var SymbolPinSide;
     SymbolPinSide["Left"] = "left";
     SymbolPinSide["Right"] = "right";
 })(SymbolPinSide || (exports.SymbolPinSide = SymbolPinSide = {}));
+var LengthUnit;
+(function (LengthUnit) {
+    LengthUnit["mm"] = "mm";
+    LengthUnit["mils"] = "mils";
+    LengthUnit["px"] = "px";
+})(LengthUnit || (exports.LengthUnit = LengthUnit = {}));
+var WireAutoDirection;
+(function (WireAutoDirection) {
+    WireAutoDirection["Auto"] = "auto";
+    WireAutoDirection["Auto_"] = "auto_";
+})(WireAutoDirection || (exports.WireAutoDirection = WireAutoDirection = {}));
+exports.MilsToMM = 0.0254;
+exports.MMToPx = 3.779276;
+exports.MMToPt = 2.8346456693;
+exports.PxToMM = 0.2645833;
 exports.portWidth = 20;
 exports.portHeight = 2;
-exports.defaultFont = 'Open Sans-Regular, Arial';
-exports.defaultFontBold = 'Open Sans-Bold, Arial-Bold, Arial';
+exports.defaultGridSizeUnits = exports.MilsToMM * 100;
+exports.defaultZoomScale = 2.5;
+exports.fontDisplayScale = 0.032;
+exports.defaultSymbolLineWidth = exports.MilsToMM * 6;
+exports.defaultWireLineWidth = exports.MilsToMM * 6;
+exports.defaultPinNameTextSize = 40;
+exports.defaultPinIdTextSize = 30;
+exports.CustomSymbolPinTextSize = exports.defaultPinNameTextSize;
+exports.CustomSymbolPinIdSize = exports.defaultPinIdTextSize;
+exports.CustomSymbolRefDesSize = 50;
+exports.CustomSymbolParamTextSize = 40;
+exports.defaultFrameTitleTextSize = 60;
+exports.displayUnits = LengthUnit.mils;
+exports.defaultFont = 'Arial';
+exports.defaultFontBold = 'Arial';
 exports.defaultFontSize = 10;
-exports.junctionSize = 5;
+exports.junctionSize = exports.MilsToMM * 20;
+exports.PortArrowSize = exports.MilsToMM * 50;
+exports.PortPaddingHorizontal = exports.MilsToMM * 10;
+exports.PortPaddingVertical = exports.MilsToMM * 10;
 exports.ColorScheme = {
     BodyColor: 'rgb(255, 255, 194)',
     JunctionColor: 'rgba(0, 132, 0)',
     WireColor: 'rgb(0, 132, 0)',
-    PinLineColor: 'rgb(132, 0, 0)',
-    PinNameColor: 'rgb(0, 132, 132)',
+    PinLineColor: '#333',
+    PinNameColor: '#333',
 };
 var ComponentTypes;
 (function (ComponentTypes) {

package/dist/cjs/helpers.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageVersion = exports.getDefaultLibsPath = exports.getFontsPath = exports.getCurrentPath = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.getScriptText = exports.prepareFile = exports.JSModuleType = void 0;
+exports.pxToMM = exports.milsToMM = exports.UnitDimension = exports.getPackageVersion = exports.getDefaultLibsPath = exports.getFontsPath = exports.getCurrentPath = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.getScriptText = exports.prepareFile = exports.JSModuleType = void 0;
 const fs_1 = require("fs");
+const pdfkit_1 = __importDefault(require("pdfkit"));
+const svg_to_pdfkit_1 = __importDefault(require("svg-to-pdfkit"));
 const export_js_1 = require("./export.js");
 const layout_js_1 = require("./layout.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -19,6 +21,7 @@ const lexer_js_1 = require("./lexer.js");
 const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
 const SemanticTokenVisitor_js_1 = require("./SemanticTokenVisitor.js");
 const path_1 = __importDefault(require("path"));
+const globals_js_1 = require("./globals.js");
 var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
@@ -174,7 +177,10 @@ function renderScript(scriptData, outputPath, options) {
     const { tree, parser, hasParseError, hasError, parserTimeTaken, lexerTimeTaken } = (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
     showStats && console.log('Lexing took:', lexerTimeTaken);
     showStats && console.log('Parsing took:', parserTimeTaken);
-    dumpNets && console.log(visitor.dumpNets());
+    if (dumpNets) {
+        const nets = visitor.dumpNets();
+        console.log(nets);
+    }
     dumpData && (0, fs_1.writeFileSync)('dump/tree.lisp', tree.toStringTree(null, parser));
     dumpData && (0, fs_1.writeFileSync)('dump/raw-parser.txt', visitor.logger.dump());
     if (hasError || hasParseError) {
@@ -215,17 +221,47 @@ function renderScript(scriptData, outputPath, options) {
     dumpData && (0, fs_1.writeFileSync)('dump/raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = null;
     try {
-        const layoutEngine = new layout_js_1.LayoutEngine();
+        let fileExtension = null;
+        let showBaseFrame = false;
+        if (outputPath) {
+            fileExtension = path_1.default.extname(outputPath).substring(1);
+            if (fileExtension === 'pdf') {
+                showBaseFrame = true;
+            }
+        }
+        const layoutEngine = new layout_js_1.LayoutEngine({
+            showBaseFrame,
+        });
         const layoutTimer = new utils_js_1.SimpleStopwatch();
         const graph = layoutEngine.runLayout(sequence, nets);
         layoutEngine.printWarnings();
         showStats && console.log('Layout took:', layoutTimer.lap());
         dumpData && (0, fs_1.writeFileSync)('dump/raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new utils_js_1.SimpleStopwatch();
-        svgOutput = (0, render_js_1.generateSVG2)(graph);
+        const { svg: generatedSvg, width: svgWidth, height: svgHeight } = (0, render_js_1.generateSVG2)(graph);
+        svgOutput = generatedSvg;
         showStats && console.log('Render took:', generateSvgTimer.lap());
         if (outputPath) {
-            (0, fs_1.writeFileSync)(outputPath, svgOutput);
+            if (fileExtension === 'svg') {
+                (0, fs_1.writeFileSync)(outputPath, svgOutput);
+            }
+            else if (fileExtension === 'pdf') {
+                const doc = new pdfkit_1.default({
+                    layout: 'landscape',
+                    size: 'A4',
+                });
+                const outputStream = (0, fs_1.createWriteStream)(outputPath);
+                const paperWidthMM = 297;
+                const paperHeightMM = 210;
+                const xOffset = (paperWidthMM - svgWidth) / 2;
+                const yOffset = (paperHeightMM - svgHeight) / 2;
+                (0, svg_to_pdfkit_1.default)(doc, svgOutput, xOffset * globals_js_1.MMToPt, yOffset * globals_js_1.MMToPt);
+                doc.pipe(outputStream);
+                doc.end();
+            }
+            else {
+                throw "Invalid output format";
+            }
             console.log('Generated file', outputPath);
         }
     }
@@ -271,3 +307,37 @@ function getPackageVersion() {
     return version;
 }
 exports.getPackageVersion = getPackageVersion;
+class UnitDimension {
+    constructor(value, type = globals_js_1.LengthUnit.mils) {
+        this.value = value;
+        this.type = type;
+    }
+    getMM() {
+        switch (this.type) {
+            case globals_js_1.LengthUnit.mm:
+                return this.value;
+            case globals_js_1.LengthUnit.mils:
+                return this.value * globals_js_1.MilsToMM;
+            case globals_js_1.LengthUnit.px:
+                return this.value * globals_js_1.PxToMM;
+        }
+    }
+    static mm(value) {
+        return new UnitDimension(value, globals_js_1.LengthUnit.mm);
+    }
+    static mils(value) {
+        return new UnitDimension(value, globals_js_1.LengthUnit.mils);
+    }
+    static px(value) {
+        return new UnitDimension(value, globals_js_1.LengthUnit.px);
+    }
+}
+exports.UnitDimension = UnitDimension;
+function milsToMM(value) {
+    return value * globals_js_1.MilsToMM;
+}
+exports.milsToMM = milsToMM;
+function pxToMM(value) {
+    return value * globals_js_1.PxToMM;
+}
+exports.pxToMM = pxToMM;