circuitscript 0.1.15 → 0.1.17

package/dist/cjs/builtinMethods.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.linkBuiltInMethods = exports.buildInMethodNamesList = void 0;
 const big_js_1 = __importDefault(require("big.js"));
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const types_js_1 = require("./objects/types.js");
 const utils_js_1 = require("./utils.js");
 const builtInMethods = [
     ['enumerate', enumerate],
@@ -151,8 +152,17 @@ function toString(obj) {
     else if (obj instanceof ParamDefinition_js_1.NumericValue) {
         return obj.toBigNumber().toString();
     }
+    else if (obj instanceof types_js_1.CFunctionEntry) {
+        return obj.toString();
+    }
     else {
-        if (obj.toDisplayString) {
+        if (obj === undefined) {
+            return 'undefined';
+        }
+        else if (obj === null) {
+            return 'null';
+        }
+        else if (obj.toDisplayString) {
             return obj.toDisplayString();
         }
         else if (obj.toString) {

package/dist/cjs/draw_symbols.js

@@ -8,6 +8,7 @@ const PinTypes_js_1 = require("./objects/PinTypes.js");
 const utils_js_1 = require("./utils.js");
 const types_js_1 = require("./objects/types.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 class SymbolGraphic {
     constructor() {
         this.drawPortsName = true;
@@ -563,6 +564,12 @@ class SymbolPlaceholder extends SymbolGraphic {
                 (0, helpers_js_1.milsToMM)(endY)
             ];
         }
+        if (positionParams[0] instanceof ParamDefinition_js_1.NumericValue) {
+            positionParams[0] = new PinDefinition_js_1.PinId(positionParams[0].toNumber());
+        }
+        else if (typeof positionParams[0] === 'number' || typeof positionParams[0] === 'string') {
+            positionParams[0] = new PinDefinition_js_1.PinId(positionParams[0]);
+        }
         drawing.addPinMM(...positionParams, lineColor);
         const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
         const [pinId, , angle] = lastAddedPin;
@@ -607,7 +614,8 @@ class SymbolPlaceholder extends SymbolGraphic {
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: pinNameColor,
             });
-            displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinId.toDisplayString(), {
+            const pinDisplayText = pinId.toString();
+            displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinDisplayText, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultPinIdTextSize),
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
@@ -707,7 +715,7 @@ class SymbolCustom extends SymbolGraphic {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addLabel(leftPinStart.add((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
@@ -724,7 +732,7 @@ class SymbolCustom extends SymbolGraphic {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addLabel(rightPinStart.sub((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
@@ -741,7 +749,7 @@ class SymbolCustom extends SymbolGraphic {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
             drawing.addLabel(pinX, topPinStart.add((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
@@ -760,7 +768,7 @@ class SymbolCustom extends SymbolGraphic {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
             drawing.addLabel(pinX, bottomPinStart.sub((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
@@ -846,7 +854,7 @@ class SymbolCustomModule extends SymbolCustom {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addModulePort(leftPinStart, pinY, this.portWidth, this.portHeight, pin.pinType);
             drawing.addLabel(leftPinStart.add(this.portWidth).add((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -858,7 +866,7 @@ class SymbolCustomModule extends SymbolCustom {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addModulePort(rightPinStart, pinY, this.portWidth, this.portHeight, pin.pinType, -1);
             drawing.addLabel(rightPinStart.sub(this.portWidth).sub((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -870,7 +878,7 @@ class SymbolCustomModule extends SymbolCustom {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
             drawing.addModulePort(pinX, topPinStart, this.portWidth, this.portHeight, pin.pinType, 1, 90);
             drawing.addLabel(pinX, topPinStart.add(this.portWidth).add((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -883,7 +891,7 @@ class SymbolCustomModule extends SymbolCustom {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM((0, ParamDefinition_js_1.numeric)(pin.pinId), pinX, bottomPinStart, pinX, bottomPinStart.sub(this.pinLength), defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, bottomPinStart, pinX, bottomPinStart.sub(this.pinLength), defaultLineColor);
             drawing.addModulePort(pinX, bottomPinStart, this.portWidth, this.portHeight, pin.pinType, 1, -90);
             drawing.addLabel(pinX, bottomPinStart.sub(this.portWidth).sub((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(40),
@@ -922,13 +930,6 @@ class SymbolDrawing {
         this.items.push(geometry_js_1.Geometry.segment([startX, startY], [endX, endY]));
         return this;
     }
-    addPin(pinId, startX, startY, endX, endY, lineColor) {
-        startX = (0, helpers_js_1.milsToMM)(startX);
-        startY = (0, helpers_js_1.milsToMM)(startY);
-        endX = (0, helpers_js_1.milsToMM)(endX);
-        endY = (0, helpers_js_1.milsToMM)(endY);
-        return this.addPinMM(pinId, startX, startY, endX, endY, lineColor);
-    }
     addPinMM(pinId, startXMM, startYMM, endXMM, endYMM, lineColor) {
         let angle = 0;
         const tmpStartXMM = startXMM.toNumber();
@@ -1231,7 +1232,7 @@ class SymbolDrawing {
     }
     getPinPosition(pinId) {
         const pin = this.pins.find(item => {
-            return item[0].toNumber() === pinId;
+            return item[0].equals(pinId);
         });
         if (pin) {
             const [, feature, angle] = pin;

package/dist/cjs/execute.js

@@ -21,7 +21,7 @@ class ExecutionContext {
         this.stopFurtherExpressions = false;
         this.returnValue = null;
         this.silent = false;
-        this.__functionCache = {};
+        this.__functionCache = new Map();
         this.componentAngleFollowsWire = true;
         this.warnings = [];
         this.name = name;
@@ -146,7 +146,7 @@ class ExecutionContext {
             const tmpArrangeRight = [];
             pins.forEach((pin, index) => {
                 const useArray = (index % 2 === 0) ? tmpArrangeLeft : tmpArrangeRight;
-                useArray.push((0, ParamDefinition_js_1.numeric)(pin.id));
+                useArray.push(pin.id);
             });
             const arrangeProp = new Map([
                 [globals_js_1.SymbolPinSide.Left, tmpArrangeLeft],
@@ -156,11 +156,9 @@ class ExecutionContext {
         }
         if (props.arrange !== null) {
             component.arrangeProps = this.removeArrangePropDuplicates(props.arrange);
-            const arrangePropPins = this.getArrangePropPins(component.arrangeProps).map(item => {
-                return item.toNumber();
-            });
+            const arrangePropPins = this.getArrangePropPins(component.arrangeProps);
             pins.forEach(pin => {
-                if (arrangePropPins.indexOf(pin.id) === -1) {
+                if (arrangePropPins.find(id => id.equals(pin.id)) === undefined) {
                     this.logWarning(`Pin ${pin.id} is not specified in arrange property`);
                 }
             });
@@ -177,6 +175,7 @@ class ExecutionContext {
         });
         if (component.typeProp === globals_js_1.ComponentTypes.net) {
             const netName = paramsMap.get(globals_js_1.ParamKeys.net_name);
+            const netType = paramsMap.get(globals_js_1.ParamKeys.net_type);
             let priority = 0;
             if (paramsMap.has(globals_js_1.ParamKeys.priority)) {
                 priority = paramsMap.get(globals_js_1.ParamKeys.priority).toNumber();
@@ -188,21 +187,26 @@ class ExecutionContext {
                 this.log('net found', tmpNet.namespace, tmpNet.name);
             }
             else {
-                tmpNet = new Net_js_1.Net(this.netNamespace, netName, priority);
+                tmpNet = new Net_js_1.Net(this.netNamespace, netName, priority, netType);
                 this.log('net not found, added net instance', tmpNet.namespace, tmpNet.name);
             }
-            const defaultPin = 1;
+            const defaultPin = new PinDefinition_js_1.PinId(1);
             this.scope.setNet(component, defaultPin, tmpNet);
             this.log('set net', netName, 'component', component, defaultPin);
         }
         const { pins: pinSides, maxPositions } = getPortSide(component.pins, component.arrangeProps);
         component.pinsMaxPositions = maxPositions;
+        const pinIdKeys = Array.from(component.pins.keys());
         pinSides.forEach(({ pinId, side, position }) => {
-            if (component.pins.has(pinId)) {
-                const tmpPin = component.pins.get(pinId);
+            const matchedPinId = pinIdKeys.find(id => id.equals(pinId));
+            if (matchedPinId) {
+                const tmpPin = component.pins.get(matchedPinId);
                 tmpPin.side = side;
                 tmpPin.position = position;
             }
+            else {
+                throw 'Not found!';
+            }
         });
         this.scope.instances.set(instanceName, component);
         const pinsOutput = pins.map((pin) => {
@@ -225,15 +229,32 @@ class ExecutionContext {
             if (!Array.isArray(items)) {
                 items = [items];
             }
+            items = items.map(item => {
+                if (item instanceof ParamDefinition_js_1.NumericValue) {
+                    item = item.toNumber();
+                }
+                if (item instanceof PinDefinition_js_1.PinId) {
+                    return item;
+                }
+                else if (PinDefinition_js_1.PinId.isPinIdType(item)) {
+                    return new PinDefinition_js_1.PinId(item);
+                }
+                return item;
+            });
+            arrangeProp.set(side, items);
+            if (!Array.isArray(items)) {
+                items = [items];
+            }
             const uniqueItems = [];
             items.forEach(item => {
-                if (item instanceof ParamDefinition_js_1.NumericValue) {
-                    if (seenIds.indexOf(item.toNumber()) === -1) {
-                        seenIds.push(item.toNumber());
+                if (item instanceof PinDefinition_js_1.PinId) {
+                    const found = seenIds.find(id => id.equals(item));
+                    if (!found) {
+                        seenIds.push(item);
                         uniqueItems.push(item);
                     }
                     else {
-                        this.logWarning(`Pin ${item.toNumber()} specified more than once in arrange property`);
+                        this.logWarning(`Pin ${item.toString()} specified more than once in arrange property`);
                     }
                 }
                 else {
@@ -256,7 +277,7 @@ class ExecutionContext {
             const items = arrangeProps.get(side);
             if (items) {
                 items.forEach(item => {
-                    if (item instanceof ParamDefinition_js_1.NumericValue) {
+                    if (item instanceof PinDefinition_js_1.PinId) {
                         pins.push(item);
                     }
                 });
@@ -378,7 +399,7 @@ class ExecutionContext {
         const cloneInstanceName = component.instanceName + ':' + idNum;
         this.scope.instances.set(cloneInstanceName, componentCopy);
         componentCopy.instanceName = cloneInstanceName;
-        const defaultPin = 1;
+        const defaultPin = new PinDefinition_js_1.PinId(1);
         if (this.scope.getNet(component, defaultPin) === null) {
             const foundNet = this.resolveComponentPinNet(component, defaultPin);
             if (foundNet !== null) {
@@ -533,9 +554,9 @@ class ExecutionContext {
     getBreakContext() {
         return this.scope.breakStack[this.scope.breakStack.length - 1];
     }
-    createFunction(functionName, __runFunc) {
-        this.scope.functions.set(functionName, __runFunc);
-        this.__functionCache[functionName] = __runFunc;
+    createFunction(functionName, __runFunc, source, uniqueId) {
+        this.scope.functions.set(functionName, new types_js_1.CFunctionEntry(functionName, __runFunc, source, uniqueId));
+        this.__functionCache.set(functionName, __runFunc);
         this.log(`defined new function '${functionName}'`);
     }
     hasFunction(functionName) {
@@ -597,19 +618,24 @@ class ExecutionContext {
             else if (type === globals_js_1.ReferenceTypes.instance) {
                 const tmpComponent = parentValue;
                 if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net) {
-                    const usedNet = this.scope.getNet(tmpComponent, 1);
+                    const usedNet = this.scope.getNet(tmpComponent, new PinDefinition_js_1.PinId(1));
                     if (usedNet) {
                         const trailerValue = trailers.join(".");
                         useValue = usedNet.params.get(trailerValue) ?? null;
                     }
                 }
                 else {
-                    useValue = parentValue.parameters.get(trailersPath);
+                    useValue = parentValue
+                        .parameters.get(trailersPath);
                 }
             }
         }
+        let found = false;
+        if (parentValue !== undefined && useValue !== undefined) {
+            found = true;
+        }
         return new types_js_1.AnyReference({
-            found: true,
+            found,
             type: type,
             parentValue,
             trailers,
@@ -618,26 +644,28 @@ class ExecutionContext {
     }
     callFunction(functionName, functionParams, executionStack, netNamespace) {
         let __runFunc = null;
-        if (this.__functionCache[functionName] === undefined) {
+        if (!this.__functionCache.has(functionName)) {
             if (this.hasFunction(functionName)) {
-                __runFunc = this.getFunction(functionName);
+                const entry = this.getFunction(functionName);
+                __runFunc = entry.execute;
             }
             if (__runFunc === null) {
                 this.log(`searching for function ${functionName} in upper context`);
                 const tmpResolveResult = this.resolveVariable(executionStack, functionName);
                 if (tmpResolveResult.found) {
-                    __runFunc = tmpResolveResult.value;
+                    const entry = tmpResolveResult.value;
+                    __runFunc = entry.execute;
                 }
                 else {
                     throw `Invalid function ${functionName}`;
                 }
             }
             this.log('save function to cache:', functionName);
-            this.__functionCache[functionName] = __runFunc;
+            this.__functionCache.set(functionName, __runFunc);
         }
         else {
             this.log('found function in cache:', functionName);
-            __runFunc = this.__functionCache[functionName];
+            __runFunc = this.__functionCache.get(functionName);
         }
         if (__runFunc !== null) {
             this.log(`call function '${functionName}'`);
@@ -684,7 +712,7 @@ class ExecutionContext {
         const linkRootComponent = true;
         const tmpRoot = childScope.componentRoot;
         if (linkRootComponent) {
-            const netConnectedToRoot = childScope.getNet(tmpRoot, 1);
+            const netConnectedToRoot = childScope.getNet(tmpRoot, new PinDefinition_js_1.PinId(1));
             if (netConnectedToRoot !== null) {
                 let currentNet = this.scope.getNet(currentComponent, currentPin);
                 if (currentNet === null) {
@@ -1032,10 +1060,9 @@ function getPortSide(pins, arrangeProps) {
                     position += item[0].toNumber();
                 }
                 else {
-                    const itemValue = item.toNumber();
-                    if (existingPinIds.indexOf(itemValue) !== -1) {
+                    if (existingPinIds.find(id => id.equals(item))) {
                         result.push({
-                            pinId: itemValue,
+                            pinId: item,
                             side: useSide,
                             position,
                             order: counter

package/dist/cjs/globals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SymbolValidatorContext = exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.NetGraphicsParams = 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.ValidPinSides = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.DoubleDelimiter1 = exports.Delimiter1 = exports.TOOL_VERSION = void 0;
+exports.TrailerArrayIndex = exports.SymbolValidatorContext = exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.NetGraphicsParams = 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.ValidPinSides = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.DoubleDelimiter1 = exports.Delimiter1 = exports.TOOL_VERSION = void 0;
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 exports.TOOL_VERSION = '0.1.5';
 exports.Delimiter1 = '-';
@@ -15,6 +15,7 @@ var ParamKeys;
 (function (ParamKeys) {
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
+    ParamKeys["net_type"] = "net_type";
     ParamKeys["flip"] = "flip";
     ParamKeys["flipX"] = "flipX";
     ParamKeys["flipY"] = "flipY";
@@ -95,6 +96,7 @@ var ReferenceTypes;
     ReferenceTypes["variable"] = "variable";
     ReferenceTypes["instance"] = "instance";
     ReferenceTypes["pinType"] = "pinType";
+    ReferenceTypes["unknown"] = "unknown";
 })(ReferenceTypes || (exports.ReferenceTypes = ReferenceTypes = {}));
 var BlockTypes;
 (function (BlockTypes) {
@@ -126,3 +128,4 @@ exports.RenderFlags = {
     ShowLabelOrigin: false,
 };
 exports.SymbolValidatorContext = '_sym';
+exports.TrailerArrayIndex = 'index';