circuitscript 0.0.24 → 0.0.26

package/dist/cjs/antlr/CircuitScriptVisitor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const antlr4_1 = require("antlr4");
-class CircuitScriptVisitor extends antlr4_1.ParseTreeVisitor {
+exports.CircuitScriptVisitor = void 0;
+const antlr4ng_1 = require("antlr4ng");
+class CircuitScriptVisitor extends antlr4ng_1.AbstractParseTreeVisitor {
 }
-exports.default = CircuitScriptVisitor;
+exports.CircuitScriptVisitor = CircuitScriptVisitor;

package/dist/cjs/draw_symbols.js

@@ -3,12 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SymbolDrawingCommands = exports.SymbolDrawing = exports.SymbolCustom = exports.PlaceHolderCommands = exports.SymbolPlaceholder = exports.SymbolText = exports.SymbolPointHidden = exports.SymbolFactory = exports.SymbolGraphic = void 0;
 const globals_js_1 = require("./globals.js");
 const geometry_js_1 = require("./geometry.js");
+const PinTypes_js_1 = require("./objects/PinTypes.js");
 const defaultSymbolLineWidth = 2;
 class SymbolGraphic {
     constructor() {
         this.drawPortsName = true;
         this.displayBounds = true;
         this._angle = 0;
+        this._flipX = 0;
+        this._flipY = 0;
         this.labelTexts = new Map();
     }
     get angle() {
@@ -17,6 +20,18 @@ class SymbolGraphic {
     set angle(value) {
         this._angle = value;
     }
+    get flipX() {
+        return this._flipX;
+    }
+    set flipX(value) {
+        this._flipX = value;
+    }
+    get flipY() {
+        return this._flipY;
+    }
+    set flipY(value) {
+        this._flipY = value;
+    }
     refreshDrawing(calculateSize = true) {
         this.generateDrawing();
         calculateSize && this.calculateSize();
@@ -42,10 +57,11 @@ class SymbolGraphic {
     drawPlaceRemove(group, extra) {
         if (extra && extra.place === false) {
             const { start, end } = this.drawing.getBoundingBox(true);
-            group.path([
+            const path = geometry_js_1.Geometry.roundPathValues([
                 "M", start[0], start[1], "L", end[0], end[1],
                 "M", end[0], start[1], "L", start[0], end[1]
-            ].join(" "))
+            ]);
+            group.path(path)
                 .stroke({
                 width: defaultSymbolLineWidth,
                 color: 'red'
@@ -112,27 +128,33 @@ class SymbolGraphic {
             }
             switch (useAnchor) {
                 case geometry_js_1.HorizontalAlign.Left:
-                    anchorStyle = 'start';
+                    anchorStyle = (this.flipX === 0) ? 'start' : 'end';
                     break;
                 case geometry_js_1.HorizontalAlign.Middle:
                     anchorStyle = 'middle';
                     break;
                 case geometry_js_1.HorizontalAlign.Right:
-                    anchorStyle = 'end';
+                    anchorStyle = (this.flipX === 0) ? 'end' : 'start';
                     break;
             }
             switch (useDominantBaseline) {
                 case geometry_js_1.VerticalAlign.Top:
-                    dominantBaseline = 'hanging';
+                    dominantBaseline = (this.flipY === 0) ? 'hanging' : 'text-top';
                     break;
                 case geometry_js_1.VerticalAlign.Middle:
                     dominantBaseline = 'middle';
                     break;
                 case geometry_js_1.VerticalAlign.Bottom:
-                    dominantBaseline = 'text-top';
+                    dominantBaseline = (this.flipY === 0) ? 'text-top' : 'hanging';
                     break;
             }
             const position = tmpLabel.getLabelPosition();
+            if (this.flipX !== 0) {
+                position[0] *= -1;
+            }
+            if (this.flipY !== 0) {
+                position[1] *= -1;
+            }
             const useFont = globals_js_1.defaultFont;
             const textContainer = group.group();
             const text = textContainer.text(tmpLabel.text)
@@ -156,11 +178,26 @@ class SymbolGraphic {
                 translateY = position[1];
                 useRotateAngle = this.angle;
             }
+            translateX = this.roundValues(translateX);
+            translateY = this.roundValues(translateY);
             text.rotate(labelAngle);
             textContainer.translate(translateX, translateY)
                 .rotate(useRotateAngle, -translateX, -translateY);
+            const { a, b, c, d, e, f } = textContainer.matrix();
+            const newMatrix = {
+                a: this.roundValues(a),
+                b: this.roundValues(b),
+                c: this.roundValues(c),
+                d: this.roundValues(d),
+                e: this.roundValues(e),
+                f: this.roundValues(f),
+            };
+            textContainer.transform(newMatrix);
         });
     }
+    roundValues(value) {
+        return +value.toFixed(7);
+    }
     flipTextAnchor(value) {
         if (value === geometry_js_1.HorizontalAlign.Left) {
             return geometry_js_1.HorizontalAlign.Right;
@@ -234,6 +271,8 @@ class SymbolPlaceholder extends SymbolGraphic {
         drawing.log("=== start generate drawing ===");
         drawing.clear();
         drawing.angle = this._angle;
+        drawing.flipX = this._flipX;
+        drawing.flipY = this._flipY;
         const commands = drawing.getCommands();
         drawing.log('id: ', drawing.id, 'angle: ', this._angle, "commands:", commands.length);
         commands.forEach(([commandName, positionParams, keywordParams]) => {
@@ -310,12 +349,16 @@ class SymbolPlaceholder extends SymbolGraphic {
         drawing.log('add pin', ...positionParams);
         const keywordDisplayPinId = 'display_pin_id';
         let displayPinId = true;
-        if (keywordParams.has(keywordDisplayPinId)) {
-            if (keywordParams.get(keywordDisplayPinId) === 0) {
-                displayPinId = false;
-            }
+        if (keywordParams.has(keywordDisplayPinId)
+            && keywordParams.get(keywordDisplayPinId) === 0) {
+            displayPinId = false;
         }
         let pinNameParam = null;
+        let pinType = PinTypes_js_1.PinTypes.Any;
+        if (positionParams[1].type && positionParams[1].type === globals_js_1.ReferenceTypes.pinType) {
+            pinType = positionParams[1].value;
+            positionParams = [positionParams[0], ...positionParams.slice(2)];
+        }
         if (typeof positionParams[1] === 'string') {
             pinNameParam = positionParams[1];
             positionParams = [positionParams[0], ...positionParams.slice(2)];
@@ -343,8 +386,8 @@ class SymbolPlaceholder extends SymbolGraphic {
             ];
         }
         drawing.addPin(...positionParams);
-        const latestPin = this.drawing.pins[this.drawing.pins.length - 1];
-        const [pinId, , angle] = latestPin;
+        const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
+        const [pinId, , angle] = lastAddedPin;
         const [, , , endX, endY] = positionParams;
         let pinNameAlignment = geometry_js_1.HorizontalAlign.Left;
         let pinNameOffsetX = 4;
@@ -437,6 +480,8 @@ class SymbolCustom extends SymbolGraphic {
         const maxRightPins = Math.max(...rightPins.map(item => item.position)) + 1;
         const drawing = new SymbolDrawing();
         drawing.angle = this._angle;
+        drawing.flipX = this._flipX;
+        drawing.flipY = this._flipY;
         const bodyWidth = this.bodyWidth;
         const bodyHeight = (1 + Math.max(maxLeftPins, maxRightPins)) * this.pinSpacing;
         drawing.addRect(0, 0, bodyWidth, bodyHeight);
@@ -504,6 +549,8 @@ class SymbolDrawing {
         this.items = [];
         this.pins = [];
         this.angle = 0;
+        this.flipX = 0;
+        this.flipY = 0;
         this.mainOrigin = [0, 0];
         this.logger = null;
     }
@@ -683,8 +730,9 @@ class SymbolDrawing {
                     }
                 }
                 else {
-                    const rotatedPath = geometry_js_1.Geometry.groupRotate([item], this.angle, this.mainOrigin);
-                    const { path, isClosedPolygon } = this.featuresToPath(rotatedPath);
+                    let tmpResult = geometry_js_1.Geometry.groupFlip([item], this.flipX, this.flipY);
+                    tmpResult = geometry_js_1.Geometry.groupRotate(tmpResult, this.angle, this.mainOrigin);
+                    const { path, isClosedPolygon } = this.featuresToPath(tmpResult);
                     pathItems.push({
                         path: path,
                         lineWidth: currentLineWidth,
@@ -697,9 +745,10 @@ class SymbolDrawing {
         return pathItems;
     }
     getPinsPath() {
-        const features = this.pins.map(item => item[1]);
-        const withAngle = geometry_js_1.Geometry.groupRotate(features, this.angle, this.mainOrigin);
-        const { path } = this.featuresToPath(withAngle);
+        let features = this.pins.map(item => item[1]);
+        features = geometry_js_1.Geometry.groupFlip(features, this.flipX, this.flipY);
+        features = geometry_js_1.Geometry.groupRotate(features, this.angle, this.mainOrigin);
+        const { path } = this.featuresToPath(features);
         return path;
     }
     getLabels() {
@@ -720,9 +769,10 @@ class SymbolDrawing {
             }
             return accum;
         }, []);
-        const measureItems = [...drawingFeatures, ...pinFeatures];
-        const withAngle = geometry_js_1.Geometry.groupRotate(measureItems, this.angle, this.mainOrigin);
-        return geometry_js_1.Geometry.groupBounds(withAngle);
+        let features = [...drawingFeatures, ...pinFeatures];
+        features = geometry_js_1.Geometry.groupFlip(features, this.flipX, this.flipY);
+        features = geometry_js_1.Geometry.groupRotate(features, this.angle, this.mainOrigin);
+        return geometry_js_1.Geometry.groupBounds(features);
     }
     getPinPosition(pinId) {
         const pin = this.pins.find(item => {
@@ -730,8 +780,9 @@ class SymbolDrawing {
         });
         if (pin) {
             const [, feature, angle] = pin;
-            const withAngle = geometry_js_1.Geometry.rotateDegs(feature, this.angle, this.mainOrigin);
-            const coords = geometry_js_1.Geometry.getCoords(withAngle);
+            let tmpFeature = geometry_js_1.Geometry.flip(feature, this.flipX, this.flipY);
+            tmpFeature = geometry_js_1.Geometry.rotateDegs(tmpFeature, this.angle, this.mainOrigin);
+            const coords = geometry_js_1.Geometry.getCoords(tmpFeature);
             return {
                 start: coords[0],
                 end: coords[1],

package/dist/cjs/execute.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPortSide = exports.isLabelComponent = exports.isNetComponent = exports.ExecutionContext = void 0;
+exports.getPortSide = exports.ExecutionContext = void 0;
 const globals_js_1 = require("./globals.js");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -9,7 +9,7 @@ const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 const Wire_js_1 = require("./objects/Wire.js");
 const Frame_js_1 = require("./objects/Frame.js");
 class ExecutionContext {
-    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger) {
+    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
         this.tmpPointId = 0;
         this.resolveNet = null;
         this.stopFurtherExpressions = false;
@@ -24,10 +24,18 @@ class ExecutionContext {
         this.scope = ExecutionScope_js_1.ExecutionScope.create();
         this.scope.indentLevel = indentLevel;
         this.setupRoot();
+        if (name === '__') {
+            this.scope.sequence.push([
+                ExecutionScope_js_1.SequenceAction.At,
+                this.scope.componentRoot,
+                this.scope.currentPin
+            ]);
+        }
         this.silent = silent;
-        this.print('create new execution context', this.namespace, this.name, this.scope.indentLevel);
+        this.log('create new execution context', this.namespace, this.name, this.scope.indentLevel);
+        this.parentContext = parent;
     }
-    print(...params) {
+    log(...params) {
         const indentOutput = ''.padStart(this.scope.indentLevel * 4, '    ');
         const indentLevelText = this.scope.indentLevel
             .toString()
@@ -41,18 +49,13 @@ class ExecutionContext {
     }
     setupRoot() {
         const componentRoot = ClassComponent_js_1.ClassComponent.simple(globals_js_1.GlobalNames.__root, 1, '__root');
-        componentRoot.typeProp = globals_js_1.ComponentTypes.net;
+        componentRoot.typeProp = globals_js_1.ComponentTypes.point;
+        componentRoot.displayProp = 'point';
         this.scope.instances.set(globals_js_1.GlobalNames.__root, componentRoot);
         this.scope.currentComponent = componentRoot;
         this.scope.currentPin = componentRoot.getDefaultPin();
         this.scope.componentRoot = componentRoot;
     }
-    instanceExists(instanceName) {
-        return this.scope.instances.has(instanceName);
-    }
-    getComponent(instanceName) {
-        return this.scope.instances.get(instanceName);
-    }
     getUniqueInstanceName(className) {
         let extraPrefix = '';
         switch (className) {
@@ -87,7 +90,7 @@ class ExecutionContext {
         const net2 = net2_exists
             ? this.scope.getNet(component2, component2Pin)
             : null;
-        this.print('link nets', component1, component1Pin, net1, 'to', component2, component2Pin, net2);
+        this.log('link nets', component1, component1Pin, net1, 'to', component2, component2Pin, net2);
         let returnNet;
         if (net1 === null && net2 === null) {
             const tmpNet = new Net_js_1.Net(this.netNamespace, this.getUniqueNetName());
@@ -137,33 +140,34 @@ class ExecutionContext {
         pins.forEach((pin) => {
             component.pins.set(pin.id, pin);
         });
+        component.arrangeProps = props.arrange ?? null;
+        component.displayProp = props.display ?? null;
+        component.widthProp = props.width ?? null;
+        component.typeProp = props.type ?? null;
+        component.copyProp = props.copy ?? false;
         const paramsMap = new Map();
         params.forEach((param) => {
             component.parameters.set(param.paramName, param.paramValue);
             paramsMap.set(param.paramName, param.paramValue);
         });
-        if (paramsMap.has(globals_js_1.ParamKeys.__is_net)) {
+        if (component.typeProp === globals_js_1.ComponentTypes.net
+            || component.typeProp === globals_js_1.ComponentTypes.label) {
             const netName = paramsMap.get(globals_js_1.ParamKeys.net_name);
             const priority = paramsMap.get(globals_js_1.ParamKeys.priority);
             const result = this.resolveNet(netName, this.netNamespace);
             let tmpNet;
             if (result.found) {
                 tmpNet = result.net;
-                this.print('net found', tmpNet.namespace, tmpNet.name);
+                this.log('net found', tmpNet.namespace, tmpNet.name);
             }
             else {
                 tmpNet = new Net_js_1.Net(this.netNamespace, netName, priority);
-                this.print('net not found, added net instance', tmpNet.namespace, tmpNet.name);
+                this.log('net not found, added net instance', tmpNet.namespace, tmpNet.name);
             }
             this.scope.setNet(component, 1, tmpNet);
-            this.print('set net', netName, 'component', component);
+            this.log('set net', netName, 'component', component);
         }
-        const { arrange = null } = props;
-        component.arrangeProps = arrange;
-        component.displayProp = props.display ?? null;
-        component.widthProp = props.width ?? null;
-        component.typeProp = props.type ?? null;
-        const portSides = getPortSide(component.pins, arrange);
+        const portSides = getPortSide(component.pins, component.arrangeProps);
         portSides.forEach(({ pinId, side, position }) => {
             if (component.pins.has(pinId)) {
                 const tmpPin = component.pins.get(pinId);
@@ -175,17 +179,21 @@ class ExecutionContext {
         const pinsOutput = pins.map((pin) => {
             return pin.id + ':' + pin.name;
         });
-        this.print('add symbol', instanceName, '[' + pinsOutput.join(', ') + ']');
+        this.log('add symbol', instanceName, '[' + pinsOutput.join(', ') + ']');
         return component;
     }
     printPoint(extra = '') {
         let netName = 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
                 .getNet(this.scope.currentComponent, this.scope.currentPin)
                 .toString();
         }
-        this.print((extra !== '' ? (extra + ' ') : '') + 'point: ' +
+        this.log((extra !== '' ? (extra + ' ') : '') + 'point: ' +
             this.scope.currentComponent.instanceName +
             ' ' +
             this.scope.currentPin + ' ' + netName);
@@ -194,7 +202,7 @@ class ExecutionContext {
         const startPin = pin;
         const nextPin = component.getNextPinAfter(startPin);
         this.toComponent(component, startPin, { addSequence: true });
-        this.print('move to next pin: ' + nextPin);
+        this.log('move to next pin: ' + nextPin);
         this.atComponent(component, nextPin, {
             addSequence: true
         });
@@ -202,11 +210,8 @@ class ExecutionContext {
         return this.getCurrentPoint();
     }
     toComponent(component, pinId, options) {
-        this.print('to component');
-        const { addSequence = false, cloneNetComponent = false } = options ?? {};
-        if (cloneNetComponent && this.isNetOnlyComponent(component)) {
-            component = this.cloneComponent(component);
-        }
+        this.log('to component');
+        const { addSequence = false } = options ?? {};
         if (!(component instanceof ClassComponent_js_1.ClassComponent)) {
             throw "Not a valid component!";
         }
@@ -226,7 +231,7 @@ class ExecutionContext {
             }
         }
         if (this.scope.hasNet(this.scope.currentComponent, this.scope.currentPin)) {
-            this.print('net: ', this.scope
+            this.log('net: ', this.scope
                 .getNet(this.scope.currentComponent, this.scope.currentPin)
                 .toString());
         }
@@ -253,11 +258,8 @@ class ExecutionContext {
         return this.getCurrentPoint();
     }
     atComponent(component, pinId, options) {
-        this.print('at component');
-        const { addSequence = false, cloneNetComponent = false } = options ?? {};
-        if (cloneNetComponent && this.isNetOnlyComponent(component)) {
-            component = this.cloneComponent(component);
-        }
+        this.log('at component');
+        const { addSequence = false } = options ?? {};
         this.scope.currentComponent = component;
         let usePinId;
         if (pinId === null) {
@@ -282,25 +284,22 @@ class ExecutionContext {
         this.printPoint();
         return this.getCurrentPoint();
     }
-    isNetOnlyComponent(component) {
-        return isNetComponent(component) && !isLabelComponent(component);
-    }
-    cloneComponent(component) {
-        let clonedComponent = null;
+    copyComponent(component) {
+        let componentCopy = null;
         if (!this.scope.copyIDs.has(component.instanceName)) {
             this.scope.copyIDs.set(component.instanceName, 0);
         }
         const idNum = this.scope.copyIDs.get(component.instanceName);
-        clonedComponent = component.clone();
-        clonedComponent._copyID = idNum;
-        clonedComponent._copyFrom = component;
+        componentCopy = component.clone();
+        componentCopy._copyID = idNum;
+        componentCopy._copyFrom = component;
         this.scope.copyIDs.set(component.instanceName, idNum + 1);
         const cloneInstanceName = component.instanceName + ':' + idNum;
-        this.scope.instances.set(cloneInstanceName, clonedComponent);
-        clonedComponent.instanceName = cloneInstanceName;
-        this.linkComponentPinNet(component, 1, clonedComponent, 1);
-        this.print('created clone of net component:', cloneInstanceName);
-        return clonedComponent;
+        this.scope.instances.set(cloneInstanceName, componentCopy);
+        componentCopy.instanceName = cloneInstanceName;
+        this.linkComponentPinNet(component, 1, componentCopy, 1);
+        this.log('created clone of net component:', cloneInstanceName);
+        return componentCopy;
     }
     enterBlocks(blockType) {
         if (blockType === globals_js_1.BlockTypes.Point) {
@@ -321,7 +320,7 @@ class ExecutionContext {
             current_index: null,
             type: blockType,
         });
-        this.print('enter blocks');
+        this.log('enter blocks');
     }
     exitBlocks() {
         const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
@@ -342,7 +341,7 @@ class ExecutionContext {
             const { entered_at: [component, pin,] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
         }
-        this.print('exit blocks');
+        this.log('exit blocks');
     }
     enterBlock(blockIndex) {
         const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
@@ -361,7 +360,7 @@ class ExecutionContext {
             const { entered_at: [component, pin,] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
         }
-        this.print(`enter inner block of type (${blockType}) >>>`);
+        this.log(`enter inner block of type (${blockType}) >>>`);
         this.scope.indentLevel += 1;
     }
     exitBlock(blockIndex) {
@@ -375,7 +374,7 @@ class ExecutionContext {
         ];
         stackRef['block_index'] = null;
         this.scope.indentLevel -= 1;
-        this.print('exit inner block <<<');
+        this.log('exit inner block <<<');
         if (blockType === globals_js_1.BlockTypes.Branch) {
             const { entered_at: [component, pin, wireId] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
@@ -414,7 +413,7 @@ class ExecutionContext {
         });
     }
     getPointBlockLocation() {
-        this.print('get block point');
+        this.log('get block point');
         for (let i = 0; i < this.scope.indentLevel; i++) {
             const stackRef = this.scope.blockStack.get(this.scope.indentLevel - 1 - i);
             const { entered_at } = stackRef;
@@ -423,11 +422,11 @@ class ExecutionContext {
                 return entered_at;
             }
         }
-        this.print('did not find block point');
+        this.log('did not find block point');
         return null;
     }
     breakBranch() {
-        this.print('break branch');
+        this.log('break branch');
         const branchesInfo = this.scope.blockStack.get(this.scope.indentLevel - 1);
         const branchIndex = branchesInfo['block_index'];
         const branchIndexRef = branchesInfo['inner_blocks'].get(branchIndex);
@@ -436,7 +435,7 @@ class ExecutionContext {
     createFunction(functionName, __runFunc) {
         this.scope.functions.set(functionName, __runFunc);
         this.__functionCache[functionName] = __runFunc;
-        this.print(`defined new function '${functionName}'`);
+        this.log(`defined new function '${functionName}'`);
     }
     hasFunction(functionName) {
         return this.scope.functions.has(functionName);
@@ -485,7 +484,7 @@ class ExecutionContext {
                 __runFunc = this.getFunction(functionName);
             }
             if (__runFunc === null) {
-                this.print(`searching for function ${functionName} in upper context`);
+                this.log(`searching for function ${functionName} in upper context`);
                 const tmpResolveResult = this.resolveVariable(executionStack, functionName);
                 if (tmpResolveResult.found) {
                     __runFunc = tmpResolveResult.value;
@@ -494,17 +493,17 @@ class ExecutionContext {
                     throw `Invalid function ${functionName}`;
                 }
             }
-            this.print('save function to cache:', functionName);
+            this.log('save function to cache:', functionName);
             this.__functionCache[functionName] = __runFunc;
         }
         else {
-            this.print('found function in cache:', functionName);
+            this.log('found function in cache:', functionName);
             __runFunc = this.__functionCache[functionName];
         }
         if (__runFunc !== null) {
-            this.print(`call function '${functionName}'`);
+            this.log(`call function '${functionName}'`);
             const functionResult = __runFunc(functionParams, { netNamespace });
-            this.print(`done call function '${functionName}'`);
+            this.log(`done call function '${functionName}'`);
             return functionResult;
         }
         else {
@@ -512,7 +511,7 @@ class ExecutionContext {
         }
     }
     mergeScope(childScope, namespace) {
-        this.print('-- merging scope to parent --');
+        this.log('-- merging scope to parent --');
         const currentComponent = this.scope.currentComponent;
         const currentPin = this.scope.currentPin;
         const currentWireId = this.scope.currentWireId;
@@ -567,7 +566,8 @@ class ExecutionContext {
             }
             else if (action === ExecutionScope_js_1.SequenceAction.At || action === ExecutionScope_js_1.SequenceAction.To) {
                 const tmpComponent = sequenceAction[1];
-                if (isNetComponent(tmpComponent) && tmpComponent.parameters.get(globals_js_1.ParamKeys.net_name) === 'gnd') {
+                if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net
+                    && tmpComponent.parameters.get(globals_js_1.ParamKeys.net_name) === 'gnd') {
                     tmpComponent._copyID = gndCopyIdOffset + incrementGndLinkId;
                     incrementGndLinkId += 1;
                 }
@@ -602,16 +602,16 @@ class ExecutionContext {
             this.scope.currentWireId = childScope.currentWireId + wireIdOffset;
         }
         this.printPoint('resume at');
-        this.print('-- nets --');
+        this.log('-- nets --');
         const currentNets = this.scope.getNets();
         currentNets.reduce((accum, [, , net]) => {
             if (accum.indexOf(net) === -1) {
                 accum.push(net);
-                this.print(`${net.namespace}${net.name} ${net.priority}`);
+                this.log(`${net.namespace}${net.name} ${net.priority}`);
             }
             return accum;
         }, []);
-        this.print('-- done merging scope --');
+        this.log('-- done merging scope --');
     }
     addWire(segments) {
         if (this.scope.currentComponent === null) {
@@ -630,14 +630,14 @@ class ExecutionContext {
         segments.forEach(item => {
             output.push(item.join(","));
         });
-        this.print('add wire: ', output.join("|"));
+        this.log('add wire: ', output.join("|"));
         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);
     }
     addPoint(pointId, userDefined = true) {
         if (this.scope.instances.has(pointId)) {
-            this.print('Warning: ' + pointId + ' is being redefined');
+            this.log('Warning: ' + pointId + ' is being redefined');
         }
         const useName = userDefined ? 'point.' + pointId : pointId;
         const componentPoint = ClassComponent_js_1.ClassComponent.simple(useName, 1, "point");
@@ -648,7 +648,7 @@ class ExecutionContext {
         return this.getCurrentPoint();
     }
     setProperty(nameWithProp, value) {
-        this.print('set property', nameWithProp, 'value', value);
+        this.log('set property', nameWithProp, 'value', value);
         let idName;
         let paramName;
         let useActive = false;
@@ -709,14 +709,6 @@ function isWireSegmentsEndAuto(segments) {
     }
     return false;
 }
-function isNetComponent(component) {
-    return component.parameters.has(globals_js_1.ParamKeys.__is_net);
-}
-exports.isNetComponent = isNetComponent;
-function isLabelComponent(component) {
-    return component.parameters.has(globals_js_1.ParamKeys.__is_label);
-}
-exports.isLabelComponent = isLabelComponent;
 function getPortSide(pins, arrangeProps) {
     const result = [];
     if (arrangeProps === null) {