circuitscript 0.3.2 → 0.4.1

package/dist/cjs/{draw_symbols.js → render/draw_symbols.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SymbolDrawingCommands = exports.SymbolDrawing = exports.SymbolCustomModule = exports.SymbolCustom = exports.PlaceHolderCommands = exports.SymbolPlaceholder = exports.SymbolText = exports.SymbolGraphic = void 0;
-const helpers_js_1 = require("./helpers.js");
-const globals_js_1 = require("./globals.js");
+const helpers_js_1 = require("../helpers.js");
+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");
-const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
-const PinDefinition_js_1 = require("./objects/PinDefinition.js");
+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;
@@ -138,18 +138,19 @@ class SymbolGraphic {
         for (const label of labels) {
             const tmpLabel = label;
             const { fontSize = (0, ParamDefinition_js_1.numeric)(50), anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = (0, ParamDefinition_js_1.numeric)(0), textColor = "#333", } = tmpLabel.style ?? {};
-            const labelAngle = tmpLabelAngle.toNumber();
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
             let useDominantBaseline = vanchor;
-            const isRotation180 = Math.abs(this.angle) === 180;
+            const labelAngle = tmpLabelAngle.toNumber();
+            const finalLabelAngle = labelAngle + this.angle;
+            const isRotation180 = Math.abs(finalLabelAngle) === 180;
             if (isRotation180) {
                 useAnchor = this.flipTextAnchor(anchor);
                 useDominantBaseline = this.flipDominantBaseline(vanchor);
             }
-            const isHorizontalLabel = labelAngle === 0 || labelAngle === 180;
-            const isVerticalLabel = labelAngle === 90 || labelAngle === -90;
+            const isHorizontalLabel = finalLabelAngle === 0 || finalLabelAngle === 180;
+            const isVerticalLabel = finalLabelAngle === 90 || finalLabelAngle === -90;
             if (useAnchor === geometry_js_1.HorizontalAlign.Middle) {
                 anchorStyle = geometry_js_1.HorizontalAlignProp.Middle;
             }
@@ -189,16 +190,9 @@ class SymbolGraphic {
             const textContainer = group.group();
             let translateX, translateY;
             let useRotateAngle = 0;
-            if (isRotation180) {
-                translateX = position[0].neg();
-                translateY = position[1].neg();
-                useRotateAngle = 0;
-            }
-            else {
-                translateX = position[0];
-                translateY = position[1];
-                useRotateAngle = this.angle;
-            }
+            translateX = position[0];
+            translateY = position[1];
+            useRotateAngle = this.angle;
             translateX = (0, utils_js_1.roundValue)(translateX);
             translateY = (0, utils_js_1.roundValue)(translateY);
             const { portType = null } = tmpLabel.style;
@@ -293,6 +287,10 @@ class SymbolGraphic {
             }
             textContainer.translate(translateX.toNumber(), translateY.toNumber())
                 .rotate(useRotateAngle, -translateX.toNumber(), -translateY.toNumber());
+            let useLabelAngle = labelAngle;
+            if (isRotation180) {
+                useLabelAngle = (labelAngle + 180) % 360;
+            }
             textContainer.text(tmpLabel.text)
                 .fill(textColor)
                 .font({
@@ -303,7 +301,7 @@ class SymbolGraphic {
                 weight: fontWeight,
             })
                 .attr("xml:space", "preserve")
-                .rotate(labelAngle, 0, 0);
+                .rotate(useLabelAngle, 0, 0);
             const { a, b, c, d, e, f } = textContainer.matrix();
             const newMatrix = {
                 a: (0, utils_js_1.roundValue)((0, ParamDefinition_js_1.numeric)(a)).toNumber(),
@@ -515,16 +513,21 @@ class SymbolPlaceholder extends SymbolGraphic {
     drawPinParams(drawing, commandName, keywordParams, positionParams, lineColor, pinNameColor) {
         drawing.log('add pin', ...positionParams);
         positionParams = [...positionParams];
-        const keywordDisplayPinId = 'display_pin_id';
+        const keywordDisplayPinId = 'display_id';
+        const keywordDisplayPinName = 'display_name';
         let displayPinId = true;
+        let displayPinName = true;
         if (keywordParams.has(keywordDisplayPinId)) {
             const value = keywordParams.get(keywordDisplayPinId);
-            if (value instanceof ParamDefinition_js_1.NumericValue && value.toNumber() === 0) {
-                displayPinId = false;
-            }
-            if (value === 0 || value === false) {
-                displayPinId = false;
-            }
+            displayPinId = ((value instanceof ParamDefinition_js_1.NumericValue && value.toNumber() === 0)
+                || (value === 0)
+                || (value === false)) ? false : true;
+        }
+        if (keywordParams.has(keywordDisplayPinName)) {
+            const value = keywordParams.get(keywordDisplayPinName);
+            displayPinName = ((value instanceof ParamDefinition_js_1.NumericValue && value.toNumber() === 0)
+                || (value === 0)
+                || (value === false)) ? false : true;
         }
         let pinNameParam = null;
         let pinType = PinTypes_js_1.PinTypes.Any;
@@ -532,6 +535,10 @@ class SymbolPlaceholder extends SymbolGraphic {
             pinType = positionParams[1].value;
             positionParams = [positionParams[0], ...positionParams.slice(2)];
         }
+        else if (typeof positionParams[1] === 'string' && globals_js_1.PinTypesList.indexOf(positionParams[1]) !== -1) {
+            pinType = positionParams[1];
+            positionParams = [positionParams[0], ...positionParams.slice(2)];
+        }
         if (typeof positionParams[1] === 'string') {
             pinNameParam = positionParams[1];
             positionParams = [positionParams[0], ...positionParams.slice(2)];
@@ -581,12 +588,14 @@ class SymbolPlaceholder extends SymbolGraphic {
         let pinNameAlignment = geometry_js_1.HorizontalAlign.Left;
         const offset1 = 15;
         const offset2 = 15;
-        let pinNameOffsetX = (0, helpers_js_1.milsToMM)(offset1);
+        let pinNameOffsetX = (0, helpers_js_1.milsToMM)(0);
+        let pinNameOffsetY = (0, helpers_js_1.milsToMM)(0);
         let pinIdOffsetX = (0, ParamDefinition_js_1.numeric)(0);
         let pinIdAlignment = geometry_js_1.HorizontalAlign.Left;
         let pinIdVAlignment = geometry_js_1.VerticalAlign.Bottom;
         let pinIdOffsetY = (0, helpers_js_1.milsToMM)(-offset2);
         const angleValue = angle.toNumber();
+        let usePinIdAngle = 0;
         switch (angleValue) {
             case 0:
                 pinNameAlignment = geometry_js_1.HorizontalAlign.Left;
@@ -595,6 +604,15 @@ class SymbolPlaceholder extends SymbolGraphic {
                 pinIdOffsetX = (0, helpers_js_1.milsToMM)(-offset2);
                 break;
             case 90:
+                pinNameAlignment = geometry_js_1.HorizontalAlign.Right;
+                pinNameOffsetX = (0, helpers_js_1.milsToMM)(0);
+                pinNameOffsetY = (0, helpers_js_1.milsToMM)(offset1);
+                pinIdAlignment = geometry_js_1.HorizontalAlign.Left;
+                pinIdOffsetX = (0, helpers_js_1.milsToMM)(-offset2);
+                pinIdOffsetY = (0, helpers_js_1.milsToMM)(-offset2);
+                pinIdVAlignment = geometry_js_1.VerticalAlign.Bottom;
+                usePinIdAngle = -90;
+                break;
             case 180:
                 pinNameAlignment = geometry_js_1.HorizontalAlign.Right;
                 pinNameOffsetX = (0, helpers_js_1.milsToMM)(-offset1);
@@ -603,27 +621,31 @@ class SymbolPlaceholder extends SymbolGraphic {
                 break;
             case 270:
                 pinNameAlignment = geometry_js_1.HorizontalAlign.Left;
-                pinNameOffsetX = (0, helpers_js_1.milsToMM)(offset1);
-                pinIdAlignment = geometry_js_1.HorizontalAlign.Left;
-                pinIdOffsetX = (0, helpers_js_1.milsToMM)(offset2);
+                pinNameOffsetX = (0, helpers_js_1.milsToMM)(0);
+                pinNameOffsetY = (0, helpers_js_1.milsToMM)(-offset1);
+                pinIdAlignment = geometry_js_1.HorizontalAlign.Right;
+                pinIdOffsetX = (0, helpers_js_1.milsToMM)(-offset2);
                 pinIdOffsetY = (0, helpers_js_1.milsToMM)(offset2);
-                pinIdVAlignment = geometry_js_1.VerticalAlign.Top;
+                pinIdVAlignment = geometry_js_1.VerticalAlign.Bottom;
+                usePinIdAngle = -90;
                 break;
         }
         if (angleValue === 0 || angleValue === 90 || angleValue === 180 || angleValue === 270) {
             const usePinName = pinNameParam ?? "";
-            usePinName !== "" && drawing.addLabel(endX.add(pinNameOffsetX), endY, usePinName, {
+            displayPinName && usePinName !== "" && drawing.addLabel(endX.add(pinNameOffsetX), endY.add(pinNameOffsetY), usePinName, {
                 fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.defaultPinNameTextSize),
                 anchor: pinNameAlignment,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
                 textColor: pinNameColor,
+                angle: (0, ParamDefinition_js_1.numeric)(usePinIdAngle)
             });
             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,
-                textColor: lineColor
+                textColor: lineColor,
+                angle: (0, ParamDefinition_js_1.numeric)(usePinIdAngle)
             });
         }
     }

package/dist/cjs/{export.js → render/export.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SExpObject = exports._id = exports.IdObject = exports.printTree = exports.generateKiCadNetList = void 0;
-const globals_js_1 = require("./globals.js");
-const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const globals_js_1 = require("../globals.js");
+const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
 function generateKiCadNetList(netlist) {
     const componentsList = [];
     const nets = {};

package/dist/cjs/{geometry.js → render/geometry.js}

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VerticalAlignProp = exports.HorizontalAlignProp = exports.VerticalAlign = exports.HorizontalAlign = exports.Geometry = exports.GeometryProp = exports.Textbox = void 0;
 const core_1 = __importDefault(require("@flatten-js/core"));
-const sizing_js_1 = require("./sizing.js");
-const globals_js_1 = require("./globals.js");
-const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
-const PinTypes_js_1 = require("./objects/PinTypes.js");
-const utils_js_1 = require("./utils.js");
+const sizing_js_1 = require("../sizing.js");
+const globals_js_1 = require("../globals.js");
+const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const PinTypes_js_1 = require("../objects/PinTypes.js");
+const utils_js_1 = require("../utils.js");
 class Textbox extends core_1.default.Polygon {
     get box() {
         return this.polygon.box;

package/dist/cjs/{graph.js → render/graph.js}

@@ -26,15 +26,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderItemType = exports.generateLayoutPinDefinition = exports.getWireName = exports.NetGraph = void 0;
 const graphlib_1 = require("@dagrejs/graphlib");
 const draw_symbols_js_1 = require("./draw_symbols.js");
-const globals_js_1 = require("./globals.js");
-const helpers_js_1 = require("./helpers.js");
+const globals_js_1 = require("../globals.js");
+const helpers_js_1 = require("../helpers.js");
 const layout_js_1 = require("./layout.js");
-const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
-const Frame_js_1 = require("./objects/Frame.js");
-const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
-const types_js_1 = require("./objects/types.js");
+const ExecutionScope_js_1 = require("../objects/ExecutionScope.js");
+const Frame_js_1 = require("../objects/Frame.js");
+const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const types_js_1 = require("../objects/types.js");
 const ml_matrix_1 = __importStar(require("ml-matrix"));
-const PinDefinition_js_1 = require("./objects/PinDefinition.js");
+const PinDefinition_js_1 = require("../objects/PinDefinition.js");
 class NetGraph {
     constructor(logger) {
         this.logger = logger;

package/dist/cjs/{layout.js → render/layout.js}

@@ -7,14 +7,14 @@ exports.ExtractDrawingRects = exports.CalculatePinPositions = exports.RenderJunc
 const graphlib_1 = __importDefault(require("@dagrejs/graphlib"));
 const { alg } = graphlib_1.default;
 const draw_symbols_js_1 = require("./draw_symbols.js");
-const globals_js_1 = require("./globals.js");
+const globals_js_1 = require("../globals.js");
 const geometry_js_1 = require("./geometry.js");
-const Frame_js_1 = require("./objects/Frame.js");
-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 Frame_js_1 = require("../objects/Frame.js");
+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 graph_js_1 = require("./graph.js");
 class LayoutEngine {
     constructor(logger, options = { showBaseFrame: false }) {
@@ -1310,7 +1310,7 @@ function CalculatePinPositions(unit) {
     }
     applyComponentParamsToSymbol(unit, tmpSymbol);
     tmpSymbol.refreshDrawing();
-    const pins = unit.pins;
+    const { pins } = unit;
     pins.forEach((value, key) => {
         if (unit._unplacedPins.indexOf(key) === -1) {
             pinPositionMapping.set(key, tmpSymbol.pinPosition(key));

package/dist/cjs/{render.js → render/render.js}

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePdfOutput = exports.generateSvgOutput = exports.renderSheetsToSVG = void 0;
 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 utils_js_1 = require("./utils.js");
-const helpers_js_1 = require("./helpers.js");
-const environment_js_1 = require("./environment.js");
+const sizing_js_1 = require("../sizing.js");
+const globals_js_1 = require("../globals.js");
+const ParamDefinition_js_1 = require("../objects/ParamDefinition.js");
+const utils_js_1 = require("../utils.js");
+const helpers_js_1 = require("../helpers.js");
+const PaperSizes_js_1 = require("./PaperSizes.js");
+const environment_js_1 = require("../environment/environment.js");
 const svg_to_pdfkit_1 = __importDefault(require("svg-to-pdfkit"));
-const Frame_js_1 = require("./objects/Frame.js");
+const Frame_js_1 = require("../objects/Frame.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 function createSvgCanvas() {
     const env = environment_js_1.NodeScriptEnvironment.getInstance();
@@ -102,7 +103,7 @@ function generatePdfOutput(doc, canvas, sheetSize, sheetSizeDefined, zoomScale =
     const children = canvas.children();
     const numChildren = children.length;
     const scale = globals_js_1.MMToPx * zoomScale;
-    const { originalWidthMM, originalHeightMM } = (0, helpers_js_1.getPaperSize)(sheetSize);
+    const { originalWidthMM, originalHeightMM } = (0, PaperSizes_js_1.getPaperSize)(sheetSize);
     children.forEach((child, index) => {
         const sheetCanvas = createSvgCanvas();
         sheetCanvas.add(child);

package/dist/cjs/rules-check/no-connect-on-connected-pin.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuleCheck_NoConnectOnConnectedPin = void 0;
-const graph_js_1 = require("../graph.js");
+const graph_js_1 = require("../render/graph.js");
 const rules_js_1 = require("./rules.js");
 function RuleCheck_NoConnectOnConnectedPin(graph, nets) {
     const allNodes = graph.nodes();

package/dist/cjs/rules-check/unconnected-pins.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuleCheck_UnconnectedPinsWires = void 0;
-const graph_js_1 = require("../graph.js");
+const graph_js_1 = require("../render/graph.js");
 const rules_js_1 = require("./rules.js");
 function RuleCheck_UnconnectedPinsWires(graph) {
     const items = [];

package/dist/cjs/{SemanticTokenVisitor.js → semantic-tokens/SemanticTokenVisitor.js}

@@ -1,10 +1,10 @@
 "use strict";
 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");
+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) {
         super(silent, onErrorHandler, environment);
@@ -45,14 +45,16 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.runExpressions(newExecutor, ctx.function_expr());
             this.executionStack.pop();
         };
-        this.visitCreate_component_expr = (ctx) => {
+        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.visitCreate_graphic_expr = (ctx) => {
-            this.addSemanticToken(ctx.Create(), ['defaultLibrary'], 'function');
             const graphicsExpressionsCtx = ctx.graphic_expressions_block();
             this.visitResult(graphicsExpressionsCtx);
         };
@@ -99,18 +101,14 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
         };
         this.visitAssignment_expr = (ctx) => {
-            this.visit(ctx.atom_expr());
+            this.visit(ctx.callable_expr());
             this.visit(ctx.data_expr());
         };
-        this.visitAtom_expr = (ctx) => {
-            if (ctx.parent instanceof CircuitScriptParser_js_1.Assignment_exprContext && ctx.ID(0)) {
-                this.addSemanticToken(ctx.ID(0), [], 'variable');
+        this.visitCallable_expr = (ctx) => {
+            if (ctx.parent instanceof CircuitScriptParser_js_1.Assignment_exprContext && ctx.ID()) {
+                this.addSemanticToken(ctx.ID(), [], 'variable');
             }
         };
-        this.visitOperator_assignment_expr = (ctx) => {
-            this.visit(ctx.atom_expr());
-            this.visit(ctx.data_expr());
-        };
         this.visitImport_expr = (ctx) => {
             this.addSemanticToken(ctx.ID(), [], 'namespace');
         };

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSemanticTokens = void 0;
+const helpers_js_1 = require("../helpers.js");
+const SemanticTokenVisitor_js_1 = require("./SemanticTokenVisitor.js");
+const utils_js_1 = require("../utils.js");
+async function getSemanticTokens(filePath, scriptData, options) {
+    const { parser, lexer, tokens } = (0, helpers_js_1.prepareFile)(scriptData);
+    const tree = parser.script();
+    const visitor = new SemanticTokenVisitor_js_1.SemanticTokensVisitor(true, null, options.environment, lexer, scriptData);
+    parser.removeErrorListeners();
+    visitor.onImportFile = async (visitor, filePath, textData) => {
+        let hasError = false;
+        let hasParseError = false;
+        if (textData !== null) {
+            const { parser } = (0, helpers_js_1.prepareFile)(textData);
+            const tree = parser.script();
+            try {
+                visitor.visit(tree);
+            }
+            catch (err) {
+                console.log('Error while parsing: ', err);
+                hasParseError = true;
+                hasError = true;
+                throw new utils_js_1.ParseError(`Error parsing semantic tokens in imported file: ${err}`);
+            }
+        }
+        else {
+            console.log('File does not exist');
+            hasError = true;
+        }
+        return {
+            hasError, hasParseError
+        };
+    };
+    await visitor.resolveImportsAndLoad(filePath, scriptData);
+    visitor.visit(tree);
+    const semanticTokens = visitor.getTokens();
+    const parsedTokens = (0, SemanticTokenVisitor_js_1.prepareTokens)(tokens.getTokens(), lexer, scriptData);
+    const finalParsedTokens = [];
+    parsedTokens.forEach(token => {
+        const location = `${token.line}_${token.column}_${token.length}`;
+        if (semanticTokens.has(location)) {
+            finalParsedTokens.push(semanticTokens.get(location));
+        }
+        else {
+            finalParsedTokens.push(token);
+        }
+    });
+    return {
+        visitor,
+        parsedTokens: finalParsedTokens
+    };
+}
+exports.getSemanticTokens = getSemanticTokens;

package/dist/cjs/sizing.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.measureTextSize2 = exports.applyFontsToSVG = void 0;
 const big_js_1 = require("big.js");
-const geometry_js_1 = require("./geometry.js");
+const geometry_js_1 = require("./render/geometry.js");
 const globals_js_1 = require("./globals.js");
-const environment_js_1 = require("./environment.js");
+const environment_js_1 = require("./environment/environment.js");
 function applyFontsToSVG(canvas) {
 }
 exports.applyFontsToSVG = applyFontsToSVG;

package/dist/cjs/utils.js

@@ -10,10 +10,10 @@ const globals_js_1 = require("./globals.js");
 const types_js_1 = require("./objects/types.js");
 class SimpleStopwatch {
     constructor() {
-        this.startTime = new Date();
+        this.startTime = performance.now();
     }
     lap() {
-        return (new Date()).getTime() - this.startTime.getTime();
+        return performance.now() - this.startTime;
     }
 }
 exports.SimpleStopwatch = SimpleStopwatch;

package/dist/cjs/validate/SymbolValidatorResolveVisitor.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SymbolValidatorResolveVisitor = void 0;
 const SymbolValidatorVisitor_js_1 = require("./SymbolValidatorVisitor.js");
 class SymbolValidatorResolveVisitor extends SymbolValidatorVisitor_js_1.SymbolValidatorVisitor {
+    constructor() {
+        super(...arguments);
+        this.enableCacheImports = false;
+        this.enableCachedImportsRead = false;
+        this.enableCachedImportsWrite = false;
+    }
     addSymbolVariable(token, name, value) {
     }
     addSymbolFunction(token, functionName, funcDefinedParameters) {

package/dist/cjs/validate/SymbolValidatorVisitor.js

@@ -11,21 +11,25 @@ const globals_js_1 = require("../globals.js");
 class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
     constructor() {
         super(...arguments);
+        this.enableCacheImports = false;
+        this.enableCachedImportsRead = false;
+        this.enableCachedImportsWrite = false;
         this.symbolTable = new SymbolTable_js_2.SymbolTable();
-        this.visitImport_simple = async (ctx) => {
-            await this.importCommon(ctx, types_js_1.ImportFunctionHandling.AllWithNamespace);
+        this.visitImport_simple = (ctx) => {
+            this.importCommon(ctx, types_js_1.ImportFunctionHandling.AllWithNamespace);
         };
-        this.visitImport_all_simple = async (ctx) => {
-            await this.importCommon(ctx, types_js_1.ImportFunctionHandling.AllMergeIntoNamespace);
-        };
-        this.visitImport_specific = async (ctx) => {
-            await this.importCommon(ctx, types_js_1.ImportFunctionHandling.SpecificMergeIntoNamespace);
+        this.visitImport_specific_or_all = (ctx) => {
+            let importType = types_js_1.ImportFunctionHandling.SpecificMergeIntoNamespace;
+            if (ctx._all) {
+                importType = types_js_1.ImportFunctionHandling.AllMergeIntoNamespace;
+            }
+            this.importCommon(ctx, importType);
         };
         this.visitAssignment_expr = (ctx) => {
             const ctxDataExpr = ctx.data_expr();
             this.visit(ctxDataExpr);
             const value = this.getResult(ctxDataExpr);
-            const atomId = ctx.atom_expr().ID(0);
+            const atomId = ctx.callable_expr().ID();
             const atomText = atomId.getText();
             const executor = this.getExecutor();
             if (!this.symbolTable.exists(executor, atomText)) {
@@ -37,37 +41,25 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             return null;
         };
-        this.visitAtom_expr = (ctx) => {
-            const tmpSymbol = this.handleAtomSymbol(ctx.ID(0));
-            this.setResult(ctx, tmpSymbol);
-        };
-        this.visitFunction_call_expr = (ctx) => {
-            this.handleAtomSymbol(ctx.ID());
-            if (ctx.trailer_expr().length > 0) {
-                ctx.trailer_expr().forEach(item => {
-                    if (item.OPEN_PAREN() && item.CLOSE_PAREN()) {
-                        const params = item.parameters();
+        this.visitCallableExpr = (ctx) => {
+            const innerCtx = ctx.callable_expr();
+            const innerCtxID = innerCtx.ID();
+            if (globals_js_1.PinTypesList.indexOf(innerCtxID.getText()) !== -1 && innerCtx.trailer().length === 0) {
+                return;
+            }
+            else {
+                const tmpSymbol = this.handleAtomSymbol(innerCtxID);
+                innerCtx.trailer().forEach(trailer => {
+                    if (trailer.LParen() && trailer.RParen()) {
+                        const params = trailer.parameters();
                         if (params) {
                             this.visit(params);
                         }
                     }
                 });
+                this.setResult(ctx, tmpSymbol);
             }
         };
-        this.visitValueAtomExpr = (ctx) => {
-            let value = null;
-            const ctxValueExpr = ctx.value_expr();
-            const cxtAtomExpr = ctx.atom_expr();
-            if (ctxValueExpr) {
-                this.visit(ctxValueExpr);
-                value = this.getResult(ctxValueExpr);
-            }
-            else if (cxtAtomExpr) {
-                this.visit(cxtAtomExpr);
-                value = this.getResult(cxtAtomExpr);
-            }
-            this.setResult(ctx, value);
-        };
         this.visitUnaryOperatorExpr = (ctx) => {
             this.visit(ctx.data_expr());
         };
@@ -83,9 +75,6 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.visit(ctx.data_expr(0));
             this.visit(ctx.data_expr(1));
         };
-        this.visitDataExpr = (ctx) => {
-            return;
-        };
         this.visitFunction_def_expr = (ctx) => {
             const functionName = ctx.ID().getText();
             let funcDefinedParameters = [];
@@ -111,6 +100,12 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.addSymbolVariable(item.getSymbol(), item.getText(), null);
             });
         };
+        this.visitCreate_graphic_expr = (ctx) => {
+            const ctxID = ctx.ID();
+            if (ctxID) {
+                this.addSymbolVariable(ctxID.getSymbol(), ctxID.getText(), null);
+            }
+        };
     }
     addSymbolVariable(token, name, value, executor = null) {
         const useExecutor = executor === null ? this.getExecutor() : executor;
@@ -159,16 +154,16 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
     setSymbols(symbolTable) {
         this.symbolTable = symbolTable;
     }
-    async importCommon(ctx, handling) {
+    importCommon(ctx, handling) {
         const specifiedImports = [];
-        if (ctx instanceof CircuitScriptParser_js_1.Import_specificContext) {
+        if (ctx instanceof CircuitScriptParser_js_1.Import_specific_or_allContext) {
             const tmpImports = ctx._funcNames.map(item => {
                 return item.text;
             });
             specifiedImports.push(...tmpImports);
         }
-        const id = ctx._libraryName.text;
-        const { pathExists, importedLibrary } = await this.handleImportFile(id, handling, true, ctx, specifiedImports);
+        const id = ctx._libraryName.text.slice(1, -1);
+        const { pathExists, importedLibrary } = this.handleImportFile(id, handling, true, ctx, specifiedImports);
         if (!pathExists) {
             this.symbolTable.addUndefined(this.getCurrentFile(), this.getExecutor(), id, ctx._libraryName);
         }