circuitscript 0.4.0 → 0.5.0

package/dist/cjs/render/layout.js

@@ -14,7 +14,7 @@ const utils_js_1 = require("../utils.js");
 const types_js_1 = require("../objects/types.js");
 const PinDefinition_js_1 = require("../objects/PinDefinition.js");
 const helpers_js_1 = require("../helpers.js");
-const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const NumericValue_js_1 = require("../objects/NumericValue.js");
 const graph_js_1 = require("./graph.js");
 class LayoutEngine {
     constructor(logger, options = { showBaseFrame: false }) {
@@ -170,7 +170,7 @@ class LayoutEngine {
                     lines,
                 });
                 intersectPoints.forEach(([x, y]) => {
-                    junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y), renderNet));
+                    junctions.push(new RenderJunction((0, NumericValue_js_1.numeric)(x), (0, NumericValue_js_1.numeric)(y), renderNet));
                 });
             }
         }
@@ -181,15 +181,15 @@ class LayoutEngine {
     }
     placeFrames(graph, subgraphInfo, frameObjects) {
         const baseFrame = frameObjects[0];
-        baseFrame.padding = (0, ParamDefinition_js_1.numeric)(0);
-        baseFrame.borderWidth = (0, ParamDefinition_js_1.numeric)(0);
+        baseFrame.padding = (0, NumericValue_js_1.numeric)(0);
+        baseFrame.borderWidth = (0, NumericValue_js_1.numeric)(0);
         if (this.showBaseFrame) {
-            baseFrame.borderWidth = (0, ParamDefinition_js_1.numeric)(5);
-            baseFrame.width = (0, ParamDefinition_js_1.numeric)(11692 - 400 * 2);
-            baseFrame.height = (0, ParamDefinition_js_1.numeric)(8267 - 400 * 2);
+            baseFrame.borderWidth = (0, NumericValue_js_1.numeric)(5);
+            baseFrame.width = (0, NumericValue_js_1.numeric)(11692 - 400 * 2);
+            baseFrame.height = (0, NumericValue_js_1.numeric)(8267 - 400 * 2);
         }
-        baseFrame.x = (0, ParamDefinition_js_1.numeric)(0);
-        baseFrame.y = (0, ParamDefinition_js_1.numeric)(0);
+        baseFrame.x = (0, NumericValue_js_1.numeric)(0);
+        baseFrame.y = (0, NumericValue_js_1.numeric)(0);
         baseFrame.bounds = {
             xmin: 0, ymin: 0,
             xmax: 0, ymax: 0,
@@ -235,8 +235,8 @@ class LayoutEngine {
         const innerItems = frame.innerItems;
         innerItems.forEach(innerFrame => {
             if (innerFrame.frame.frameType === globals_js_1.FrameType.Sheet) {
-                innerFrame.x = (0, ParamDefinition_js_1.numeric)(0);
-                innerFrame.y = (0, ParamDefinition_js_1.numeric)(0);
+                innerFrame.x = (0, NumericValue_js_1.numeric)(0);
+                innerFrame.y = (0, NumericValue_js_1.numeric)(0);
             }
             else {
                 innerFrame.x = innerFrame.x.add(frame.x);
@@ -298,10 +298,10 @@ class LayoutEngine {
         else {
             accumRowWidth = maxWidth;
         }
-        let frameWidth = (0, ParamDefinition_js_1.numeric)(0);
-        let frameHeight = (0, ParamDefinition_js_1.numeric)(0);
-        let frameXMin = (0, ParamDefinition_js_1.numeric)(0);
-        let frameYMin = (0, ParamDefinition_js_1.numeric)(0);
+        let frameWidth = (0, NumericValue_js_1.numeric)(0);
+        let frameHeight = (0, NumericValue_js_1.numeric)(0);
+        let frameXMin = (0, NumericValue_js_1.numeric)(0);
+        let frameYMin = (0, NumericValue_js_1.numeric)(0);
         const frameParams = frame.frame.parameters;
         const avoidAreas = [];
         if (frameParams.has(Frame_js_1.FrameParamKeys.SheetType)) {
@@ -311,8 +311,8 @@ class LayoutEngine {
             frameDrawing.variables = (0, utils_js_1.combineMaps)(frameComponent.parameters, frameParams);
             const rects = ExtractDrawingRects(frameDrawing);
             const drawableRect = rects.find(rect => rect.className === 'plot-area');
-            let frameMinX = (0, ParamDefinition_js_1.numeric)(0);
-            let frameMinY = (0, ParamDefinition_js_1.numeric)(0);
+            let frameMinX = (0, NumericValue_js_1.numeric)(0);
+            let frameMinY = (0, NumericValue_js_1.numeric)(0);
             if (drawableRect) {
                 frameMinX = (0, helpers_js_1.milsToMM)(drawableRect.x);
                 frameMinY = (0, helpers_js_1.milsToMM)(drawableRect.y);
@@ -364,14 +364,14 @@ class LayoutEngine {
         if (frameParams.has(Frame_js_1.FrameParamKeys.TitleAlign)) {
             title_align = frameParams.get(Frame_js_1.FrameParamKeys.TitleAlign);
         }
-        let accumX = (0, ParamDefinition_js_1.numeric)(0);
-        let accumY = (0, ParamDefinition_js_1.numeric)(0);
+        let accumX = (0, NumericValue_js_1.numeric)(0);
+        let accumY = (0, NumericValue_js_1.numeric)(0);
         innerFrames.forEach((innerFrame, index) => {
             const { width: innerFrameWidth, height: innerFrameHeight } = (0, utils_js_1.getBoundsSize)(innerFrame.bounds);
             let arrangeLineAttempts = 0;
             const maxAttempts = 10;
-            let innerFrameX = (0, ParamDefinition_js_1.numeric)(0);
-            let innerFrameY = (0, ParamDefinition_js_1.numeric)(0);
+            let innerFrameX = (0, NumericValue_js_1.numeric)(0);
+            let innerFrameY = (0, NumericValue_js_1.numeric)(0);
             if (innerFrame.containsTitle) {
                 innerFrame.x = offsetX.add(accumX);
                 innerFrame.y = offsetY.add(accumY);
@@ -395,9 +395,9 @@ class LayoutEngine {
                         const doesOverlapAreasToAvoid = overlaps.length > 0;
                         if (boundPoints.length > 0 && (doesExceedFrameHeight || doesOverlapAreasToAvoid)) {
                             innerFrameY = offsetY;
-                            const nextX = (0, ParamDefinition_js_1.numeric)(xmax).sub(offsetX).add(frame.gap);
+                            const nextX = (0, NumericValue_js_1.numeric)(xmax).sub(offsetX).add(frame.gap);
                             innerFrameX = offsetX.add(nextX);
-                            accumY = (0, ParamDefinition_js_1.numeric)(0);
+                            accumY = (0, NumericValue_js_1.numeric)(0);
                             accumX = nextX;
                         }
                         arrangeLineAttempts++;
@@ -426,9 +426,9 @@ class LayoutEngine {
                         if (boundPoints.length > 0 && (doesExceedFrameWidth || doesOverlapAreasToAvoid)) {
                             innerFrameX = offsetX.add(centeredOffsetX);
                             const { ymax } = getBoundsFromPoints(boundPoints);
-                            const nextY = (0, ParamDefinition_js_1.numeric)(ymax).sub(offsetY).add(frame.gap);
+                            const nextY = (0, NumericValue_js_1.numeric)(ymax).sub(offsetY).add(frame.gap);
                             innerFrameY = offsetY.add(nextY);
-                            accumX = (0, ParamDefinition_js_1.numeric)(0);
+                            accumX = (0, NumericValue_js_1.numeric)(0);
                             accumY = nextY;
                         }
                         else {
@@ -466,18 +466,18 @@ class LayoutEngine {
                 frameParams.get(Frame_js_1.FrameParamKeys.VerticalAlign);
         }
         if (frameParams.has(Frame_js_1.FrameParamKeys.SheetType)) {
-            frameXMin = (0, ParamDefinition_js_1.numeric)(0);
-            frameYMin = (0, ParamDefinition_js_1.numeric)(0);
+            frameXMin = (0, NumericValue_js_1.numeric)(0);
+            frameYMin = (0, NumericValue_js_1.numeric)(0);
         }
         else {
-            frameXMin = (0, ParamDefinition_js_1.numeric)(contentsBounds.xmin);
-            frameYMin = (0, ParamDefinition_js_1.numeric)(contentsBounds.ymin);
+            frameXMin = (0, NumericValue_js_1.numeric)(contentsBounds.xmin);
+            frameYMin = (0, NumericValue_js_1.numeric)(contentsBounds.ymin);
         }
         if (frameWidth.toNumber() === 0) {
-            frameWidth = (0, ParamDefinition_js_1.numeric)(contentsWidth);
+            frameWidth = (0, NumericValue_js_1.numeric)(contentsWidth);
         }
         if (frameHeight.toNumber() === 0) {
-            frameHeight = (0, ParamDefinition_js_1.numeric)(contentsHeight);
+            frameHeight = (0, NumericValue_js_1.numeric)(contentsHeight);
         }
         const titleFrame = innerFrames.find(frame => {
             return frame.containsTitle;
@@ -607,7 +607,7 @@ class LayoutEngine {
                 tmpFrame.containsTitle = true;
                 tmpFrame.subgraphId = title.replace(/\s/g, "_");
                 const textObject = new RenderText(title);
-                textObject.fontSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultFrameTitleTextSize);
+                textObject.fontSize = (0, NumericValue_js_1.numeric)(globals_js_1.defaultFrameTitleTextSize);
                 textObject.fontWeight = 'bold';
                 textObject.symbol.refreshDrawing();
                 tmpFrame.innerItems.push(textObject);
@@ -618,8 +618,8 @@ class LayoutEngine {
                     xmax: tmpBox.start[0] + tmpBox.width,
                     ymax: tmpBox.start[1] + tmpBox.height
                 };
-                textObject.x = (0, ParamDefinition_js_1.numeric)(0);
-                textObject.y = (0, ParamDefinition_js_1.numeric)(0);
+                textObject.x = (0, NumericValue_js_1.numeric)(0);
+                textObject.y = (0, NumericValue_js_1.numeric)(0);
                 frame.innerItems.splice(0, 0, tmpFrame);
                 this.printLevel(level, frame, 'added text', tmpFrame);
                 textObjects.push(textObject);
@@ -702,7 +702,7 @@ class LayoutEngine {
                 const componentUnit = node1.component.getUnit(unitId);
                 defaultPin = componentUnit.pinsFlat[0].id;
             }
-            this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, defaultPin);
+            this.placeNodeAtPosition((0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0), node1, defaultPin);
             return;
         }
         let fixedNode;
@@ -730,7 +730,7 @@ class LayoutEngine {
                 originNodes.push(node1);
                 originNodeGroups.set(node1.toString(), [node1]);
                 this.print('creating new origin node at', node1);
-                this.placeNodeAtPosition((0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0), node1, pin1);
+                this.placeNodeAtPosition((0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0), node1, pin1);
                 node1.isFloating = false;
                 fixedNode = node1;
                 fixedNodePin = pin1;
@@ -899,8 +899,8 @@ class LayoutEngine {
 }
 exports.LayoutEngine = LayoutEngine;
 function getNodePositionAtPin(item, pin) {
-    let x = (0, ParamDefinition_js_1.numeric)(0);
-    let y = (0, ParamDefinition_js_1.numeric)(0);
+    let x = (0, NumericValue_js_1.numeric)(0);
+    let y = (0, NumericValue_js_1.numeric)(0);
     if (item instanceof RenderComponent) {
         const pinPosition = item.symbol.pinPosition(pin);
         x = item.x.add(pinPosition.x);
@@ -918,7 +918,7 @@ function getNodePositionAtPin(item, pin) {
         }
     }
     return [
-        (0, utils_js_1.roundValue)(x), (0, utils_js_1.roundValue)(y)
+        (0, NumericValue_js_1.roundValue)(x), (0, NumericValue_js_1.roundValue)(y)
     ];
 }
 function getNeighbours(graph, nodeIds) {
@@ -1038,8 +1038,8 @@ function getBoundsFromPoints(points) {
 }
 class RenderObject {
     constructor() {
-        this.x = (0, ParamDefinition_js_1.numeric)(-1);
-        this.y = (0, ParamDefinition_js_1.numeric)(-1);
+        this.x = (0, NumericValue_js_1.numeric)(-1);
+        this.y = (0, NumericValue_js_1.numeric)(-1);
         this.isFloating = true;
         this.floatingRelativeTo = [];
     }
@@ -1084,7 +1084,7 @@ class RenderWire extends RenderObject {
                 tmpX += useValue;
             }
             else if (direction === globals_js_1.WireAutoDirection.Auto || direction === globals_js_1.WireAutoDirection.Auto_) {
-                const { valueXY = [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)] } = segment;
+                const { valueXY = [(0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0)] } = segment;
                 const tmpPoints = this.getAutoPoints(valueXY, direction);
                 tmpPoints.forEach(point => {
                     if (point[0] !== 0 || point[1] !== 0) {
@@ -1102,8 +1102,8 @@ class RenderWire extends RenderObject {
         this.points = points;
     }
     getAutoPoints(value, direction) {
-        const valueX = (0, utils_js_1.roundValue)(value[0]).toNumber();
-        const valueY = (0, utils_js_1.roundValue)(value[1]).toNumber();
+        const valueX = (0, NumericValue_js_1.roundValue)(value[0]).toNumber();
+        const valueY = (0, NumericValue_js_1.roundValue)(value[1]).toNumber();
         const inQuadrant = geometry_js_1.Geometry.getQuadrant(valueX, valueY);
         const [dx, dy] = [valueX, valueY];
         if (direction === globals_js_1.WireAutoDirection.Auto) {
@@ -1244,7 +1244,7 @@ class RenderText extends RenderObject {
     }
     constructor(text) {
         super();
-        this._fontSize = (0, ParamDefinition_js_1.numeric)(12);
+        this._fontSize = (0, NumericValue_js_1.numeric)(12);
         this._fontWeight = 'regular';
         this.symbol = new draw_symbols_js_1.SymbolText(text);
     }
@@ -1259,7 +1259,7 @@ class RenderFrame extends RenderObject {
         this.translateY = 0;
         this.padding = (0, helpers_js_1.milsToMM)(100);
         this.gap = (0, helpers_js_1.milsToMM)(100);
-        this.borderWidth = (0, ParamDefinition_js_1.numeric)(5);
+        this.borderWidth = (0, NumericValue_js_1.numeric)(5);
         this.direction = Frame_js_1.FramePlotDirection.Row;
         this.width = null;
         this.height = null;

package/dist/cjs/render/render.js

@@ -8,7 +8,7 @@ const svg_js_1 = require("@svgdotjs/svg.js");
 const layout_js_1 = require("./layout.js");
 const sizing_js_1 = require("../sizing.js");
 const globals_js_1 = require("../globals.js");
-const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const NumericValue_js_1 = require("../objects/NumericValue.js");
 const utils_js_1 = require("../utils.js");
 const helpers_js_1 = require("../helpers.js");
 const PaperSizes_js_1 = require("./PaperSizes.js");
@@ -37,7 +37,7 @@ function renderSheetsToSVG(sheetFrames, logger) {
         let extendGrid = true;
         let xOffset = 0;
         let yOffset = 0;
-        let sheetYOffset = (0, ParamDefinition_js_1.numeric)(0);
+        let sheetYOffset = (0, NumericValue_js_1.numeric)(0);
         if (sheet.frame.frame) {
             logger.add('drawing frame');
             const frameComponent = sheet.frame.frame.parameters
@@ -48,10 +48,10 @@ function renderSheetsToSVG(sheetFrames, logger) {
                     throw 'Invalid graphic object for sheet frame';
                 }
                 const frameRects = (0, layout_js_1.ExtractDrawingRects)(frameComponentUnit.displayProp) ?? [];
-                let originalWidthMM = (0, ParamDefinition_js_1.numeric)(0);
-                let originalHeightMM = (0, ParamDefinition_js_1.numeric)(0);
-                let widthMM = (0, ParamDefinition_js_1.numeric)(0);
-                let heightMM = (0, ParamDefinition_js_1.numeric)(0);
+                let originalWidthMM = (0, NumericValue_js_1.numeric)(0);
+                let originalHeightMM = (0, NumericValue_js_1.numeric)(0);
+                let widthMM = (0, NumericValue_js_1.numeric)(0);
+                let heightMM = (0, NumericValue_js_1.numeric)(0);
                 const paperRect = frameRects.find(item => item.className === 'paper-area');
                 const plotRect = frameRects.find(item => item.className === 'plot-area');
                 if (paperRect) {
@@ -149,7 +149,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             }
             else if (item.component.parameters.has('value')) {
                 let tmpValue = item.component.parameters.get('value');
-                if (tmpValue instanceof ParamDefinition_js_1.NumericValue) {
+                if (tmpValue instanceof NumericValue_js_1.NumericValue) {
                     tmpValue = tmpValue.value;
                 }
                 extra.value = tmpValue;
@@ -232,15 +232,15 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         })
             .fill('none');
         const halfJunctionSize = globals_js_1.junctionSize.half();
-        const highlightJunctionSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.junctionSize.toNumber() + displayHighlightWidth);
+        const highlightJunctionSize = (0, NumericValue_js_1.numeric)(globals_js_1.junctionSize.toNumber() + displayHighlightWidth);
         const tmpHighlightExtraSize = highlightJunctionSize.half();
         intersectPoints.forEach(point => {
             const [x, y,] = point;
-            const translateX = (0, ParamDefinition_js_1.numeric)(x).sub(halfJunctionSize);
-            const translateY = (0, ParamDefinition_js_1.numeric)(y).sub(halfJunctionSize);
+            const translateX = (0, NumericValue_js_1.numeric)(x).sub(halfJunctionSize);
+            const translateY = (0, NumericValue_js_1.numeric)(y).sub(halfJunctionSize);
             if (displayHighlight && displayHighlightColor !== null) {
-                const tmpTranslateX = (0, ParamDefinition_js_1.numeric)(x).sub(tmpHighlightExtraSize);
-                const tmpTranslateY = (0, ParamDefinition_js_1.numeric)(y).sub(tmpHighlightExtraSize);
+                const tmpTranslateX = (0, NumericValue_js_1.numeric)(x).sub(tmpHighlightExtraSize);
+                const tmpTranslateY = (0, NumericValue_js_1.numeric)(y).sub(tmpHighlightExtraSize);
                 mergedWireHighlightGroup.circle(highlightJunctionSize.toNumber())
                     .translate(tmpTranslateX.toNumber(), tmpTranslateY.toNumber())
                     .fill(displayHighlightColor)
@@ -298,14 +298,14 @@ function drawGrid(group, canvasSize, extendGrid, logger) {
     const gridSize = globals_js_1.defaultGridSizeUnits;
     const { xmin, ymin, xmax, ymax } = canvasSize;
     const extraValue = extendGrid ? 1 : 0;
-    const gridStartX = ((0, ParamDefinition_js_1.numeric)(Math.floor(xmin / gridSize)).sub(extraValue)).mul(gridSize);
-    const gridStartY = ((0, ParamDefinition_js_1.numeric)(Math.floor(ymin / gridSize)).sub(extraValue)).mul(gridSize);
+    const gridStartX = ((0, NumericValue_js_1.numeric)(Math.floor(xmin / gridSize)).sub(extraValue)).mul(gridSize);
+    const gridStartY = ((0, NumericValue_js_1.numeric)(Math.floor(ymin / gridSize)).sub(extraValue)).mul(gridSize);
     const gridEndX = extendGrid
-        ? ((0, ParamDefinition_js_1.numeric)(Math.ceil(xmax / gridSize)).add(extraValue)).mul(gridSize)
-        : ((0, ParamDefinition_js_1.numeric)(xmax).sub(xmin));
+        ? ((0, NumericValue_js_1.numeric)(Math.ceil(xmax / gridSize)).add(extraValue)).mul(gridSize)
+        : ((0, NumericValue_js_1.numeric)(xmax).sub(xmin));
     const gridEndY = extendGrid
-        ? ((0, ParamDefinition_js_1.numeric)(Math.ceil(ymax / gridSize)).add(extraValue)).mul(gridSize)
-        : ((0, ParamDefinition_js_1.numeric)(ymax).sub(ymin));
+        ? ((0, NumericValue_js_1.numeric)(Math.ceil(ymax / gridSize)).add(extraValue)).mul(gridSize)
+        : ((0, NumericValue_js_1.numeric)(ymax).sub(ymin));
     const numCols = Math.floor(gridEndX.sub(gridStartX).div(gridSize).toNumber())
         + (extendGrid ? 1 : 0);
     const originSize = (0, helpers_js_1.milsToMM)(10).toNumber();
@@ -316,7 +316,7 @@ function drawGrid(group, canvasSize, extendGrid, logger) {
     const smallOffset = (0, helpers_js_1.milsToMM)(3);
     const startY = gridStartY.sub(smallOffset.half());
     const endY = gridEndY.add(smallOffset);
-    const numericGridSize = (0, ParamDefinition_js_1.numeric)(gridSize);
+    const numericGridSize = (0, NumericValue_js_1.numeric)(gridSize);
     for (let i = 0; i < numCols; i++) {
         const startX = gridStartX.add(numericGridSize.mul(i)).toNumber();
         lines.push(`M ${startX} ${startY.toNumber()} L ${startX} ${endY.toNumber()}`);

package/dist/cjs/semantic-tokens/SemanticTokenVisitor.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareTokens = exports.SemanticTokensVisitor = void 0;
 const CircuitScriptParser_js_1 = require("../antlr/CircuitScriptParser.js");
 const BaseVisitor_js_1 = require("../BaseVisitor.js");
-const builtinMethods_js_1 = require("../builtinMethods.js");
 const globals_js_1 = require("../globals.js");
 class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
     constructor(silent = false, onErrorHandler = null, environment, lexer, script) {
@@ -26,13 +25,6 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.addSemanticToken(id, ['declaration'], 'parameter');
             });
         };
-        this.visitFunction_call_expr = (ctx) => {
-            const modifiers = [];
-            if (builtinMethods_js_1.buildInMethodNamesList.indexOf(ctx.ID().getText()) !== -1) {
-                modifiers.push('defaultLibrary');
-            }
-            this.addSemanticToken(ctx.ID(), modifiers, 'function');
-        };
         this.visitFunction_def_expr = (ctx) => {
             const functionName = ctx.ID().getText();
             this.addSemanticToken(ctx.ID(), ['declaration'], 'function');
@@ -46,17 +38,13 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.executionStack.pop();
         };
         this.visitCreateExpr = (ctx) => {
-            this.addSemanticToken(ctx.Create(), ['defaultLibrary'], 'function');
             this.visit(ctx.create_expr());
         };
         this.visitCreate_component_expr = (ctx) => {
-            ctx.property_expr().forEach(property_expr => {
-                this.visit(property_expr);
-            });
+            this.visitResult(ctx.properties_block());
         };
         this.visitCreate_graphic_expr = (ctx) => {
-            const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-            this.visitResult(graphicsExpressionsCtx);
+            this.visitResult(ctx.graphic_expressions_block());
         };
         this.visitProperty_key_expr = (ctx) => {
             let useValue = null;
@@ -90,27 +78,36 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.addSemanticToken(useValue, [], 'property');
             }
         };
-        this.visitValueAtomExpr = (ctx) => {
-            const ctxValueExpr = ctx.value_expr();
-            const ctxAtomExpr = ctx.atom_expr();
-            if (ctxValueExpr) {
-                this.visit(ctxValueExpr);
-            }
-            else if (ctxAtomExpr) {
-                this.visit(ctxAtomExpr);
-            }
-        };
         this.visitAssignment_expr = (ctx) => {
             this.visit(ctx.callable_expr());
             this.visit(ctx.data_expr());
         };
         this.visitCallable_expr = (ctx) => {
-            if (ctx.parent instanceof CircuitScriptParser_js_1.Assignment_exprContext && ctx.ID()) {
-                this.addSemanticToken(ctx.ID(), [], 'variable');
+            const id = ctx.ID();
+            if (!id)
+                return;
+            if (ctx.parent instanceof CircuitScriptParser_js_1.Assignment_exprContext) {
+                this.addSemanticToken(id, [], 'variable');
+                return;
+            }
+            const trailers = ctx.trailer();
+            if (trailers && trailers.length > 0) {
+                const firstTrailer = trailers[0];
+                if (firstTrailer.LParen()) {
+                    this.addSemanticToken(id, [], 'function');
+                    return;
+                }
             }
         };
-        this.visitImport_expr = (ctx) => {
-            this.addSemanticToken(ctx.ID(), [], 'namespace');
+        this.visitImport_simple = (ctx) => {
+        };
+        this.visitImport_specific_or_all = (ctx) => {
+            const funcNames = ctx.ID();
+            if (funcNames && funcNames.length > 0) {
+                funcNames.forEach(funcName => {
+                    this.addSemanticToken(funcName, ['defaultLibrary'], 'function');
+                });
+            }
         };
         this.visitFor_expr = (ctx) => {
             ctx.ID().forEach(item => {
@@ -121,7 +118,12 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitAnnotation_comment_expr = (ctx) => {
             this.addSemanticToken(ctx.ANNOTATION_START(), [], 'comment');
-            this.addSemanticToken(ctx.ID(), [], 'comment');
+            const ids = ctx.ID();
+            if (ids && ids.length > 0) {
+                ids.forEach(id => {
+                    this.addSemanticToken(id, [], 'comment');
+                });
+            }
         };
         this.lexer = lexer;
         this.script = script;
@@ -135,20 +137,21 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
         let stringValue = "";
         let textPart = "";
         if (this.lexer.symbolicNames[token.type] !== null && this.lexer.symbolicNames[token.type] !== undefined) {
-            stringValue = this.lexer.symbolicNames[token.type];
+            stringValue = this.lexer.symbolicNames[token.type] ?? '';
             if (stringValue !== "NEWLINE") {
                 textPart = this.script.substring(token.start, token.stop + 1);
             }
             else {
-                textPart = token.text.length - 1;
+                textPart = token.text || '';
             }
         }
         else if (this.lexer.literalNames[token.type] !== null && this.lexer.literalNames[token.type] !== undefined) {
-            stringValue = this.lexer.literalNames[token.type];
+            stringValue = this.lexer.literalNames[token.type] ?? '';
             textPart = this.script.substring(token.start, token.stop + 1);
         }
         else {
-            stringValue = token._text;
+            stringValue = token.text ?? '';
+            textPart = token.text || '';
         }
         return {
             line: token.line,
@@ -157,6 +160,7 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
             tokenType: tokenType !== null ? tokenType : stringValue,
             tokenModifiers: modifiers,
             textValue: textPart,
+            path: '',
         };
     }
     dumpTokens() {
@@ -171,38 +175,39 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
 exports.SemanticTokensVisitor = SemanticTokensVisitor;
 function prepareTokens(tokens, lexer, script) {
     const parsedTokens = [];
-    tokens.forEach(item => {
+    for (const item of tokens) {
         if (item.type !== -1) {
             let stringValue = "";
             let textPart = "";
             if (lexer.symbolicNames[item.type] !== null && lexer.symbolicNames[item.type] !== undefined) {
-                stringValue = lexer.symbolicNames[item.type];
+                stringValue = lexer.symbolicNames[item.type] ?? '';
                 if (stringValue !== "NEWLINE") {
                     textPart = script.substring(item.start, item.stop + 1);
                 }
                 else {
-                    textPart = item.text.length - 1;
+                    textPart = item.text || '';
                 }
             }
-            else if (lexer.literalNames[item.type] !== null && lexer.literalNames[item.type] !== undefined) {
-                stringValue = lexer.literalNames[item.type];
-                textPart = script.substring(item.start, item.stop + 1);
-            }
             else {
-                stringValue = item._text;
-            }
-            if (textPart !== 0 && textPart !== '') {
-                parsedTokens.push({
-                    line: item.line,
-                    column: item.column,
-                    length: item.stop - item.start + 1,
-                    tokenType: resolveTokenType(stringValue),
-                    tokenModifiers: resolveTokenModifiers(stringValue),
-                    textValue: textPart,
-                });
+                stringValue = item.text ?? '';
+                textPart = item.text || '';
+            }
+            if (textPart !== '') {
+                const tokenType = resolveTokenType(stringValue);
+                if (tokenType !== '') {
+                    parsedTokens.push({
+                        line: item.line,
+                        column: item.column,
+                        length: item.stop - item.start + 1,
+                        tokenType: tokenType,
+                        tokenModifiers: resolveTokenModifiers(stringValue),
+                        textValue: textPart,
+                        path: '',
+                    });
+                }
             }
         }
-    });
+    }
     return parsedTokens;
 }
 exports.prepareTokens = prepareTokens;
@@ -211,15 +216,10 @@ const languageKeywords = [
     'graphic', 'wire', 'pin', 'add', 'at', 'to',
     'point', 'join', 'parallel', 'return', 'def', 'from', 'import',
     'true', 'false', 'nc', 'sheet', 'frame', 'if', 'else', 'for', 'in',
-];
-const operatorKeywords = [
     'at', 'to', 'wire', 'add', 'frame', 'join', 'parallel', 'point'
 ];
 function resolveTokenType(tokenType) {
-    if (operatorKeywords.indexOf(tokenType.toLowerCase()) !== -1) {
-        return 'graphKeyword';
-    }
-    else if (languageKeywords.indexOf(tokenType.toLowerCase()) !== -1) {
+    if (languageKeywords.indexOf(tokenType.toLowerCase()) !== -1) {
         return 'keyword';
     }
     else {
@@ -239,7 +239,7 @@ function resolveTokenType(tokenType) {
             case 'COMMENT':
                 return 'comment';
         }
-        return null;
+        return '';
     }
 }
 function resolveTokenModifiers(tokenType) {