circuitscript 0.0.38 → 0.1.0

package/dist/cjs/builtinMethods.js

@@ -45,7 +45,7 @@ function range(...args) {
 }
 function enumerate(array) {
     if (!Array.isArray(array)) {
-        throw "Invalid parameter for enumerate function!";
+        throw "Invalid parameter for enumerate function";
     }
     const output = array.map((item, index) => {
         return [index, item];
@@ -86,7 +86,10 @@ function toString(obj) {
         return "[" + inner + "]";
     }
     else {
-        if (obj.toString) {
+        if (obj.toDisplayString) {
+            return obj.toDisplayString();
+        }
+        else if (obj.toString) {
             return obj.toString();
         }
         else {

package/dist/cjs/draw_symbols.js

@@ -6,6 +6,7 @@ const globals_js_1 = require("./globals.js");
 const geometry_js_1 = require("./geometry.js");
 const PinTypes_js_1 = require("./objects/PinTypes.js");
 const utils_js_1 = require("./utils.js");
+const types_js_1 = require("./objects/types.js");
 class SymbolGraphic {
     constructor() {
         this.drawPortsName = true;
@@ -14,6 +15,7 @@ class SymbolGraphic {
         this._flipX = 0;
         this._flipY = 0;
         this.labelTexts = new Map();
+        this.drawing = new SymbolDrawing();
     }
     get angle() {
         return (this._angle % 360);
@@ -312,15 +314,6 @@ class SymbolGraphic {
             return geometry_js_1.VerticalAlign.Middle;
         }
     }
-    setLabelValue(labelId, labelValue) {
-        this.labelTexts.set(labelId, labelValue);
-    }
-    getLabelValue(labelId) {
-        if (this.labelTexts.has(labelId)) {
-            return this.labelTexts.get(labelId);
-        }
-        return undefined;
-    }
 }
 exports.SymbolGraphic = SymbolGraphic;
 function SymbolFactory(name) {
@@ -333,7 +326,8 @@ function SymbolFactory(name) {
 exports.SymbolFactory = SymbolFactory;
 class SymbolPointHidden extends SymbolGraphic {
     generateDrawing() {
-        const drawing = new SymbolDrawing();
+        const drawing = this.drawing;
+        drawing.clear();
         drawing.addPin(1, 0, 0, 0, 0);
         this.drawing = drawing;
     }
@@ -347,7 +341,8 @@ class SymbolText extends SymbolGraphic {
         this.text = text;
     }
     generateDrawing() {
-        const drawing = new SymbolDrawing();
+        const drawing = this.drawing;
+        drawing.clear();
         drawing.addTextbox(0, 0, this.text, {
             fontSize: this.fontSize,
             anchor: geometry_js_1.HorizontalAlign.Middle,
@@ -375,7 +370,17 @@ class SymbolPlaceholder extends SymbolGraphic {
         drawing.log('id: ', drawing.id, 'angle: ', this._angle, "commands:", commands.length);
         let lineColor = "#333";
         let textColor = "#333";
-        commands.forEach(([commandName, positionParams, keywordParams]) => {
+        commands.forEach(([commandName, positionParams, keywordParams, ctx]) => {
+            positionParams = positionParams.map(param => {
+                return this.resolveReference(param);
+            });
+            if (keywordParams instanceof Map) {
+                const tmpKeywordParams = new Map(keywordParams);
+                tmpKeywordParams.forEach((value, key) => {
+                    tmpKeywordParams.set(key, this.resolveReference(value));
+                });
+                keywordParams = tmpKeywordParams;
+            }
             switch (commandName) {
                 case PlaceHolderCommands.rect:
                     drawing.log('add rect', ...positionParams);
@@ -431,16 +436,17 @@ class SymbolPlaceholder extends SymbolGraphic {
                     if (style['textColor'] === undefined) {
                         style['textColor'] = textColor;
                     }
-                    positionParams = [...positionParams];
-                    positionParams.push(style);
-                    const labelId = positionParams[0];
-                    const tmpPositionParams = [...positionParams];
-                    const tmpLabelValue = this.getLabelValue(labelId);
-                    if (tmpLabelValue !== undefined) {
-                        tmpPositionParams[3] = tmpLabelValue;
-                    }
+                    const tmpPositionParams = [
+                        positionParams[1], positionParams[2],
+                        positionParams[0], style
+                    ];
                     drawing.log('add label', JSON.stringify(tmpPositionParams));
-                    drawing.addLabelId(...tmpPositionParams);
+                    try {
+                        drawing.addLabelMils(...tmpPositionParams);
+                    }
+                    catch (err) {
+                        (0, utils_js_1.throwWithContext)(ctx, err);
+                    }
                     break;
                 }
                 case PlaceHolderCommands.text: {
@@ -464,13 +470,30 @@ class SymbolPlaceholder extends SymbolGraphic {
         });
         drawing.log("=== end generate drawing ===");
     }
+    resolveReference(param) {
+        if (param instanceof types_js_1.DeclaredReference) {
+            return param.value;
+        }
+        else if (param instanceof types_js_1.UndeclaredReference) {
+            throw "Undefined symbol: " + param.nameString();
+        }
+        return param;
+    }
     parseLabelStyle(keywordParams) {
         const keywords = ['fontSize', 'anchor', 'vanchor',
-            'angle', 'textColor', 'portType'];
+            'angle', 'textColor', 'portType', 'bold'];
         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';
+                    }
+                }
             }
         });
         return style;
@@ -629,7 +652,8 @@ class SymbolCustom extends SymbolGraphic {
         });
         const maxLeftPins = Math.max(...leftPins.map(item => item.position)) + 1;
         const maxRightPins = Math.max(...rightPins.map(item => item.position)) + 1;
-        const drawing = new SymbolDrawing();
+        this.drawing.clear();
+        const drawing = this.drawing;
         drawing.angle = this._angle;
         drawing.flipX = this._flipX;
         drawing.flipY = this._flipY;
@@ -682,14 +706,14 @@ class SymbolCustom extends SymbolGraphic {
                 textColor: defaultLineColor
             });
         });
-        const instanceName = this.getLabelValue("refdes");
+        const instanceName = drawing.variables.get('refdes');
         instanceName && drawing.addLabel(-bodyWidthMM / 2, -bodyHeightMM / 2 - (0, helpers_js_1.milsToMM)(20), instanceName, {
             fontSize: globals_js_1.CustomSymbolRefDesSize,
             anchor: geometry_js_1.HorizontalAlign.Left,
         });
         const acceptedMPNKeys = ['MPN', 'mpn', 'manufacturer_pn'];
         acceptedMPNKeys.some(key => {
-            const labelValue = this.getLabelValue(key);
+            const labelValue = drawing.variables.get(key);
             if (labelValue !== undefined) {
                 drawing.addLabel(-bodyWidthMM / 2, bodyHeightMM / 2 + (0, helpers_js_1.milsToMM)(20), labelValue, {
                     fontSize: globals_js_1.CustomSymbolParamTextSize,
@@ -752,6 +776,7 @@ class SymbolDrawing {
         this.flipY = 0;
         this.mainOrigin = [0, 0];
         this.logger = null;
+        this.variables = new Map();
     }
     clear() {
         this.items = [];
@@ -868,10 +893,10 @@ class SymbolDrawing {
         this.items.push(geometry_js_1.Geometry.label(null, x, y, textValue, style));
         return this;
     }
-    addLabelId(id, x, y, textValue, style) {
+    addLabelMils(x, y, textValue, style) {
         x = (0, helpers_js_1.milsToMM)(x);
         y = (0, helpers_js_1.milsToMM)(y);
-        this.items.push(geometry_js_1.Geometry.label(id, x, y, textValue, style));
+        this.items.push(geometry_js_1.Geometry.label(null, x, y, textValue, style));
         return this;
     }
     addTextbox(x, y, textValue, style) {
@@ -1097,32 +1122,25 @@ class SymbolDrawing {
 }
 exports.SymbolDrawing = SymbolDrawing;
 class SymbolDrawingCommands extends SymbolDrawing {
-    constructor(commands) {
+    constructor(callback) {
         super();
         this.id = "";
-        this.commands = commands;
+        this.commands = [];
+        this.paramIds = [];
+        this.callback = callback;
         this.id = Math.random().toString().slice(2);
     }
+    runCommands() {
+        this.commands = this.callback(this.variables);
+    }
     getCommands() {
+        this.runCommands();
         return this.commands;
     }
     clone() {
-        const tmpCommands = this.commands.map(item => {
-            if (item[0] === PlaceHolderCommands.label) {
-                const commandName = item[0];
-                const positionParams = item[1];
-                const keywordParams = item[2];
-                const newMap = new Map();
-                for (const [key, value] of keywordParams) {
-                    newMap.set(key, value);
-                }
-                return [commandName, positionParams, newMap];
-            }
-            else {
-                return [...item];
-            }
-        });
-        return new SymbolDrawingCommands(tmpCommands);
+        const cloned = new SymbolDrawingCommands(this.callback);
+        cloned.variables = this.variables;
+        return cloned;
     }
 }
 exports.SymbolDrawingCommands = SymbolDrawingCommands;

package/dist/cjs/execute.js

@@ -461,7 +461,7 @@ class ExecutionContext {
     getFunction(functionName) {
         return this.scope.functions.get(functionName);
     }
-    resolveVariable(executionStack, idName) {
+    resolveVariable(executionStack, idName, trailers = []) {
         const reversed = [...executionStack].reverse();
         for (let i = 0; i < reversed.length; i++) {
             const context = reversed[i];
@@ -473,21 +473,34 @@ class ExecutionContext {
                     name: idName,
                 });
             }
-            else if (context.scope.variables.has(idName)) {
-                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 new types_js_1.DeclaredReference({
-                    found: true,
-                    value: context.scope.instances.get(idName),
-                    type: globals_js_1.ReferenceTypes.instance,
-                    name: idName,
-                });
+            else {
+                const isVariable = context.scope.variables.has(idName);
+                const isComponentInstance = context.scope.instances.has(idName);
+                if (isVariable || isComponentInstance) {
+                    const scopeList = isVariable ? context.scope.variables
+                        : context.scope.instances;
+                    let parentValue = undefined;
+                    let useValue = scopeList.get(idName);
+                    if (trailers.length > 0) {
+                        parentValue = useValue;
+                        const trailersPath = trailers.join(".");
+                        if (isVariable) {
+                            useValue = parentValue[trailersPath];
+                        }
+                        else if (isComponentInstance) {
+                            useValue = parentValue.parameters.get(trailersPath);
+                        }
+                    }
+                    return new types_js_1.DeclaredReference({
+                        type: isVariable ? globals_js_1.ReferenceTypes.variable
+                            : globals_js_1.ReferenceTypes.instance,
+                        found: (useValue !== undefined),
+                        parentValue,
+                        value: useValue,
+                        name: idName,
+                        trailers,
+                    });
+                }
             }
         }
         return new types_js_1.DeclaredReference({

package/dist/cjs/globals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderFlags = exports.GlobalDocumentName = exports.FrameType = 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.defaultPageSpacingMM = exports.defaultPageMarginMM = 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;
+exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = 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.defaultPageSpacingMM = exports.defaultPageMarginMM = 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";
@@ -100,6 +100,7 @@ var FrameType;
     FrameType[FrameType["Frame"] = 1] = "Frame";
     FrameType[FrameType["Sheet"] = 2] = "Sheet";
 })(FrameType || (exports.FrameType = FrameType = {}));
+exports.ModuleContainsKeyword = 'contains';
 exports.GlobalDocumentName = 'document';
 exports.RenderFlags = {
     ShowElementFrames: false,

package/dist/cjs/layout.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.LayoutEngine = void 0;
+exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunction = exports.RenderFrameType = exports.RenderFrame = exports.RenderText = exports.RenderComponent = exports.RenderWire = exports.RenderObject = exports.getBounds = exports.applyComponentParamsToSymbol = 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");
 const globals_js_1 = require("./globals.js");
-const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const geometry_js_1 = require("./geometry.js");
 const logger_js_1 = require("./logger.js");
 const Frame_js_1 = require("./objects/Frame.js");
@@ -289,7 +288,9 @@ class LayoutEngine {
         const contentsBounds = (0, utils_js_1.resizeBounds)(getBoundsFromPoints(boundPoints), frame.padding);
         if (frame.frame.parameters.has(Frame_js_1.FrameParamKeys.SheetType)) {
             const frameComponent = frame.frame.parameters.get(Frame_js_1.FrameParamKeys.SheetType);
-            const rects = ExtractDrawingRects(frameComponent.displayProp);
+            const frameDrawing = frameComponent.displayProp;
+            frameDrawing.variables = (0, utils_js_1.combineMaps)(frameComponent.parameters, frame.frame.parameters);
+            const rects = ExtractDrawingRects(frameDrawing);
             let frameWidth = 0;
             let frameHeight = 0;
             if (rects[1]) {
@@ -375,7 +376,8 @@ class LayoutEngine {
         }, []);
         if (frame.type === RenderFrameType.Container) {
             const frameObject = frame.frame;
-            if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Title)) {
+            const isSheetFrame = frameObject.frameType === globals_js_1.FrameType.Sheet;
+            if (frameObject.parameters.has(Frame_js_1.FrameParamKeys.Title) && !isSheetFrame) {
                 const title = frameObject.parameters.get(Frame_js_1.FrameParamKeys.Title);
                 const tmpFrame = new RenderFrame(new Frame_js_1.Frame(-2), RenderFrameType.Elements);
                 tmpFrame.containsTitle = true;
@@ -450,7 +452,7 @@ class LayoutEngine {
                             tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions);
                         }
                     }
-                    applyComponentParamsToSymbol(typeProp, component, tmpSymbol);
+                    applyComponentParamsToSymbol(component, tmpSymbol);
                     let didSetAngle = false;
                     if (component.parameters.has('angle')) {
                         didSetAngle = true;
@@ -999,29 +1001,14 @@ function generateLayoutPinDefinition(component) {
     }
     return symbolPinDefinitions;
 }
-function applyComponentParamsToSymbol(typeProp, component, symbol) {
-    if (typeProp === 'net') {
-        symbol.setLabelValue("net_name", component.parameters.get(globals_js_1.ParamKeys.net_name));
-    }
-    if (component.assignedRefDes !== null) {
-        symbol.setLabelValue("refdes", component.assignedRefDes);
-    }
-    for (const [key, value] of component.parameters) {
-        if (key !== 'refdes' && key !== 'net_name') {
-            let useValue;
-            if (typeof value == 'object' && (value instanceof ParamDefinition_js_1.NumericValue)) {
-                useValue = value.toDisplayString();
-            }
-            else if (typeof value === 'number') {
-                useValue = value.toString();
-            }
-            else if (typeof value === 'string') {
-                useValue = value;
-            }
-            symbol.setLabelValue(key, useValue);
-        }
+function applyComponentParamsToSymbol(component, symbol) {
+    const newMap = new Map(component.parameters);
+    if (!newMap.has('refdes')) {
+        newMap.set('refdes', component.assignedRefDes ?? "?");
     }
+    symbol.drawing.variables = newMap;
 }
+exports.applyComponentParamsToSymbol = applyComponentParamsToSymbol;
 function calculateSymbolAngle(symbol, pin, direction) {
     let directionVector = 0;
     switch (direction) {
@@ -1342,6 +1329,7 @@ function CalculatePinPositions(component) {
         const symbolPinDefinitions = generateLayoutPinDefinition(component);
         tmpSymbol = new draw_symbols_js_1.SymbolCustom(symbolPinDefinitions);
     }
+    applyComponentParamsToSymbol(component, tmpSymbol);
     tmpSymbol.refreshDrawing();
     const pins = component.pins;
     pins.forEach((value, key) => {

package/dist/cjs/objects/Frame.js

@@ -19,6 +19,8 @@ var FrameParamKeys;
     FrameParamKeys["Height"] = "height";
     FrameParamKeys["PaperSize"] = "paper_size";
     FrameParamKeys["SheetType"] = "sheet_type";
+    FrameParamKeys["SheetNumber"] = "sheet_number";
+    FrameParamKeys["SheetTotal"] = "sheet_total";
 })(FrameParamKeys || (exports.FrameParamKeys = FrameParamKeys = {}));
 var FramePlotDirection;
 (function (FramePlotDirection) {

package/dist/cjs/objects/types.js

@@ -8,6 +8,17 @@ class UndeclaredReference {
     throwMessage() {
         return `Unknown symbol: ${this.reference.name}`;
     }
+    toString() {
+        return 'undefined';
+    }
+    nameString() {
+        const { name, trailers = [] } = this.reference;
+        let extra = '';
+        if (trailers.length > 0) {
+            extra = '.' + trailers.join('.');
+        }
+        return name + extra;
+    }
 }
 exports.UndeclaredReference = UndeclaredReference;
 class DeclaredReference {
@@ -17,10 +28,40 @@ class DeclaredReference {
         this.trailers = refType.trailers;
         this.type = refType.type;
         this.value = refType.value;
+        this.parentValue = refType.parentValue;
     }
     toString() {
         return `[DeclaredReference name: ${this.name} trailers:${this.trailers} found: ${this.found}]`;
     }
+    toDisplayString() {
+        let returnValue = undefined;
+        if (this.parentValue) {
+            const trailersString = this.trailers.join(".");
+            if (this.type === 'instance') {
+                returnValue = this.parentValue.parameters.get(trailersString);
+            }
+            else if (this.type === 'variable') {
+                returnValue = this.parentValue[trailersString];
+            }
+        }
+        else {
+            returnValue = this.value;
+        }
+        if (returnValue !== undefined) {
+            if (returnValue !== null) {
+                if (returnValue.toDisplayString) {
+                    return returnValue.toDisplayString();
+                }
+                else {
+                    return returnValue.toString();
+                }
+            }
+            else {
+                return 'null';
+            }
+        }
+        throw 'Could not find string value: ' + this;
+    }
 }
 exports.DeclaredReference = DeclaredReference;
 var ParseSymbolType;

package/dist/cjs/render.js

@@ -263,6 +263,7 @@ function drawSheetFrameBorder(frameGroup, frame) {
         if (displayProp) {
             const sheetFrameGroup = frameGroup.group();
             const symbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
+            symbol.drawing.variables = (0, utils_js_1.combineMaps)(frameComponent.parameters, frameParams);
             symbol.refreshDrawing();
             symbol.draw(sheetFrameGroup);
             const offsetX = (0, helpers_js_1.milsToMM)(frameComponent.getParam('offset_x'));

package/dist/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+exports.combineMaps = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
 class SimpleStopwatch {
     constructor() {
         this.startTime = new Date();
@@ -76,3 +76,27 @@ function roundValue(value) {
     return +value.toFixed(7);
 }
 exports.roundValue = roundValue;
+function throwWithContext(context, message) {
+    const startLine = context.start?.line;
+    const startColumn = context.start?.column;
+    const startString = startLine + ":" + startColumn;
+    const stopLine = context.stop?.line;
+    const stopColumn = context.stop?.column;
+    let stopString = "";
+    if (startLine === stopLine) {
+        stopString = stopColumn?.toString();
+    }
+    else {
+        stopString = stopLine + ":" + stopString;
+    }
+    throw `Parse exception at [${startString} - ${stopString}] : ${message}`;
+}
+exports.throwWithContext = throwWithContext;
+function combineMaps(map1, map2) {
+    const newMap = new Map(map1);
+    map2.forEach((value, key) => {
+        newMap.set(key, value);
+    });
+    return newMap;
+}
+exports.combineMaps = combineMaps;