circuitscript 0.4.0 → 0.5.0

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

@@ -1,6 +1,5 @@
 import { Assignment_exprContext } from "../antlr/CircuitScriptParser.js";
 import { BaseVisitor } from "../BaseVisitor.js";
-import { buildInMethodNamesList } from "../builtinMethods.js";
 import { SymbolValidatorContext } from "../globals.js";
 export class SemanticTokensVisitor extends BaseVisitor {
     parsedTokens = [];
@@ -28,13 +27,6 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(id, ['declaration'], 'parameter');
         });
     };
-    visitFunction_call_expr = (ctx) => {
-        const modifiers = [];
-        if (buildInMethodNamesList.indexOf(ctx.ID().getText()) !== -1) {
-            modifiers.push('defaultLibrary');
-        }
-        this.addSemanticToken(ctx.ID(), modifiers, 'function');
-    };
     visitFunction_def_expr = (ctx) => {
         const functionName = ctx.ID().getText();
         this.addSemanticToken(ctx.ID(), ['declaration'], 'function');
@@ -48,17 +40,13 @@ export class SemanticTokensVisitor extends BaseVisitor {
         this.executionStack.pop();
     };
     visitCreateExpr = (ctx) => {
-        this.addSemanticToken(ctx.Create(), ['defaultLibrary'], 'function');
         this.visit(ctx.create_expr());
     };
     visitCreate_component_expr = (ctx) => {
-        ctx.property_expr().forEach(property_expr => {
-            this.visit(property_expr);
-        });
+        this.visitResult(ctx.properties_block());
     };
     visitCreate_graphic_expr = (ctx) => {
-        const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-        this.visitResult(graphicsExpressionsCtx);
+        this.visitResult(ctx.graphic_expressions_block());
     };
     visitProperty_key_expr = (ctx) => {
         let useValue = null;
@@ -92,27 +80,36 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(useValue, [], 'property');
         }
     };
-    visitValueAtomExpr = (ctx) => {
-        const ctxValueExpr = ctx.value_expr();
-        const ctxAtomExpr = ctx.atom_expr();
-        if (ctxValueExpr) {
-            this.visit(ctxValueExpr);
-        }
-        else if (ctxAtomExpr) {
-            this.visit(ctxAtomExpr);
-        }
-    };
     visitAssignment_expr = (ctx) => {
         this.visit(ctx.callable_expr());
         this.visit(ctx.data_expr());
     };
     visitCallable_expr = (ctx) => {
-        if (ctx.parent instanceof Assignment_exprContext && ctx.ID()) {
-            this.addSemanticToken(ctx.ID(), [], 'variable');
+        const id = ctx.ID();
+        if (!id)
+            return;
+        if (ctx.parent instanceof 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;
+            }
         }
     };
-    visitImport_expr = (ctx) => {
-        this.addSemanticToken(ctx.ID(), [], 'namespace');
+    visitImport_simple = (ctx) => {
+    };
+    visitImport_specific_or_all = (ctx) => {
+        const funcNames = ctx.ID();
+        if (funcNames && funcNames.length > 0) {
+            funcNames.forEach(funcName => {
+                this.addSemanticToken(funcName, ['defaultLibrary'], 'function');
+            });
+        }
     };
     visitFor_expr = (ctx) => {
         ctx.ID().forEach(item => {
@@ -123,7 +120,12 @@ export class SemanticTokensVisitor extends BaseVisitor {
     };
     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');
+            });
+        }
     };
     addSemanticToken(node, modifiers, tokenType = null) {
         const parsedToken = this.parseToken(node, modifiers, tokenType);
@@ -134,20 +136,21 @@ export class SemanticTokensVisitor extends 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,
@@ -156,6 +159,7 @@ export class SemanticTokensVisitor extends BaseVisitor {
             tokenType: tokenType !== null ? tokenType : stringValue,
             tokenModifiers: modifiers,
             textValue: textPart,
+            path: '',
         };
     }
     dumpTokens() {
@@ -169,38 +173,39 @@ export class SemanticTokensVisitor extends BaseVisitor {
 }
 export 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;
+                stringValue = item.text ?? '';
+                textPart = 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,
-                });
+            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;
 }
 const languageKeywords = [
@@ -208,15 +213,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 {
@@ -236,7 +236,7 @@ function resolveTokenType(tokenType) {
             case 'COMMENT':
                 return 'comment';
         }
-        return null;
+        return '';
     }
 }
 function resolveTokenModifiers(tokenType) {

package/dist/esm/utils.js

@@ -1,9 +1,7 @@
-import { Big } from 'big.js';
 import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent.js";
-import { NumericValue } from "./objects/ParamDefinition.js";
 import { SequenceAction } from './objects/ExecutionScope.js';
-import { BlockTypes } from './globals.js';
+import { BlockTypes } from "./objects/BlockTypes.js";
 import { DeclaredReference, AnyReference } from './objects/types.js';
 export class SimpleStopwatch {
     startTime;
@@ -71,9 +69,6 @@ export function getPortType(component) {
     });
     return foundPinType;
 }
-export function roundValue(value) {
-    return resolveToNumericValue(new Big(value.toBigNumber().toFixed(7)));
-}
 export function throwWithContext(context, messageOrError) {
     if (messageOrError instanceof BaseError) {
         throw messageOrError;
@@ -93,67 +88,6 @@ export function combineMaps(map1, map2) {
     });
     return newMap;
 }
-export function getNumberExponential(value) {
-    value = value.trim();
-    switch (value) {
-        case 'G':
-            return 9;
-        case 'M':
-            return 6;
-        case 'k':
-        case 'K':
-            return 3;
-        case 'm':
-            return -3;
-        case 'u':
-            return -6;
-        case 'n':
-            return -9;
-        case 'p':
-            return -12;
-        case 'f':
-            return -15;
-        default:
-            return 0;
-    }
-}
-export function getNumberExponentialText(value) {
-    switch (value) {
-        case -15:
-            return 'f';
-        case -12:
-            return 'p';
-        case -9:
-            return 'n';
-        case -6:
-            return 'u';
-        case -3:
-            return 'm';
-        case 3:
-            return 'k';
-        case 6:
-            return 'M';
-        case 9:
-            return 'G';
-        case 0:
-        default:
-            return '';
-    }
-}
-export function resolveToNumericValue(value) {
-    if (value.toNumber() === 0) {
-        return new NumericValue(0);
-    }
-    const isNeg = value.lt(0);
-    const positiveValue = isNeg ? value.neg() : value;
-    const prefixPart = Math.floor(Math.log10(positiveValue.toNumber()) / 3);
-    let useValue = value;
-    if (prefixPart !== 0) {
-        const tmpValue1 = positiveValue.div(Math.pow(10, prefixPart * 3));
-        useValue = isNeg ? tmpValue1.neg() : tmpValue1;
-    }
-    return new NumericValue(useValue, prefixPart * 3);
-}
 export function isPointWithinArea(point, bounds) {
     const [xPt, yPt] = point;
     const [xmin, ymin, xmax, ymax] = bounds;
@@ -276,18 +210,26 @@ export function getLinePositionAsString(ctx) {
     if (ctx === null || ctx === undefined) {
         return null;
     }
-    const startToken = ctx.start;
-    const endToken = ctx.stop;
+    const { start: startToken, stop: stopToken } = ctx;
     let result = null;
     if (startToken) {
         const { line, column } = startToken;
-        if (endToken && (endToken.line !== startToken.line || endToken.column !== startToken.column)) {
-            const endLine = endToken.line;
-            const endColumn = endToken.column + (endToken.stop - endToken.start);
-            result = ` at ${line}:${column}-${endLine}:${endColumn}`;
+        let stopLine = 0;
+        let stopCol = 0;
+        if (stopToken && (stopToken.line !== startToken.line || stopToken.column !== startToken.column)) {
+            stopLine = stopToken.line;
+            stopCol = stopToken.column + (stopToken.stop - stopToken.start);
+        }
+        else if (startToken === stopToken || startToken) {
+            stopLine = line;
+            stopCol = column + 1 + (startToken.stop - startToken.start);
         }
         else {
-            result = ` at ${line}:${column}`;
+            stopCol = -1;
+        }
+        result = ` at ${line}:${column + 1}`;
+        if (stopCol !== -1) {
+            result += `-${stopLine}:${stopCol + 1}`;
         }
     }
     return result;

package/dist/esm/visitor.js

@@ -1,9 +1,12 @@
 import { ClassComponent } from './objects/ClassComponent.js';
-import { NumberOperator, numeric, NumericValue, ParamDefinition } from './objects/ParamDefinition.js';
+import { NumberOperator, NumericValue } from './objects/NumericValue.js';
+import { ParamDefinition } from "./objects/ParamDefinition.js";
+import { numeric } from "./objects/NumericValue.js";
 import { PinDefinition, PinId, PinIdType } from './objects/PinDefinition.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { DeclaredReference, UndeclaredReference } from './objects/types.js';
-import { BlockTypes, ComponentTypes, Delimiter1, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, RefdesFileSuffix, ReferenceTypes, SymbolPinSide, ValidPinSides, WireAutoDirection } from './globals.js';
+import { ComponentTypes, Delimiter1, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, RefdesFileSuffix, ReferenceTypes, SymbolPinSide, ValidPinSides, WireAutoDirection } from './globals.js';
+import { BlockTypes } from "./objects/BlockTypes.js";
 import { unwrapValue } from "./utils.js";
 import { PlaceHolderCommands, SymbolDrawingCommands } from './render/draw_symbols.js';
 import { BaseVisitor } from './BaseVisitor.js';
@@ -663,7 +666,12 @@ export class ParserVisitor extends BaseVisitor {
         }
         dataResult = unwrapValue(dataResult);
         if (dataResult === null || dataResult === undefined) {
-            this.throwWithContext(componentCtx, "Could not find component: " + componentCtx.getText());
+            if (componentCtx) {
+                this.throwWithContext(componentCtx, "Could not find component: " + componentCtx.getText());
+            }
+            else {
+                this.throwWithContext(ctx, "Failed to parse");
+            }
         }
         if (dataResult instanceof ClassComponent
             && dataResult.copyProp) {
@@ -1009,7 +1017,13 @@ export class ParserVisitor extends BaseVisitor {
                 }
                 segments.push([value, new UnitDimension(useValue)]);
             }
+            else {
+                this.throwWithContext(ctx, "Invalid wire expression");
+            }
         });
+        if (segments.length === 0) {
+            this.throwWithContext(ctx, "Invalid wire expression");
+        }
         const newWire = this.getExecutor().addWire(segments);
         this.creationCtx.set(newWire, ctx);
     };

package/dist/types/ComponentMatchConditions.d.ts

@@ -1,5 +1,5 @@
 import { ClassComponent } from "./objects/ClassComponent.js";
-import { NumericValue } from "./objects/ParamDefinition.js";
+import { NumericValue } from "./objects/NumericValue.js";
 export type ConditionNode = {
     key: {
         type: string;

package/dist/types/annotate/RefdesAnnotationVisitor.d.ts

@@ -1,5 +1,5 @@
 import { ParserRuleContext, CommonTokenStream } from 'antlr4ng';
-import { Add_component_exprContext, At_block_headerContext, At_blockContext, At_component_exprContext, Component_select_exprContext, Frame_exprContext, Function_def_exprContext, Function_return_exprContext, ScriptContext, To_component_exprContext, TrailerContext } from '../antlr/CircuitScriptParser.js';
+import { Add_component_exprContext, Assignment_exprContext, At_block_headerContext, At_blockContext, At_component_exprContext, Callable_exprContext, Component_select_exprContext, Frame_exprContext, Function_def_exprContext, Function_return_exprContext, ScriptContext, To_component_exprContext, TrailerContext } from '../antlr/CircuitScriptParser.js';
 import { BaseVisitor } from '../BaseVisitor.js';
 import { ClassComponent } from '../objects/ClassComponent.js';
 import { RefdesModification } from './utils.js';
@@ -14,6 +14,8 @@ export declare class RefdesAnnotationVisitor extends BaseVisitor {
     getModifications(): Map<ParserRuleContext, RefdesModification>;
     private getOriginalText;
     visitScript: (ctx: ScriptContext) => Promise<void>;
+    visitCallable_expr: (ctx: Callable_exprContext) => void;
+    visitAssignment_expr: (ctx: Assignment_exprContext) => void;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
     visitAt_component_expr: (ctx: At_component_exprContext) => void;
     visitComponent_select_expr: (ctx: Component_select_exprContext) => void;

package/dist/types/execute.d.ts

@@ -1,9 +1,11 @@
-import { BlockTypes, FrameType, ReferenceTypes } from './globals.js';
+import { FrameType, ReferenceTypes } from './globals.js';
+import { BlockTypes } from "./objects/BlockTypes.js";
 import { ExecutionWarning } from "./utils.js";
 import { ClassComponent } from './objects/ClassComponent.js';
 import { ExecutionScope } from './objects/ExecutionScope.js';
 import { Net } from './objects/Net.js';
-import { NumericValue, ParamDefinition } from './objects/ParamDefinition.js';
+import { NumericValue } from './objects/NumericValue.js';
+import { ParamDefinition } from "./objects/ParamDefinition.js";
 import { PinDefinition, PinId } from './objects/PinDefinition.js';
 import { AnyReference, CFunction, CFunctionEntry, CFunctionResult, CallableParameter, ComponentPin, ComponentUnitDefinition } from './objects/types.js';
 import { Wire } from './objects/Wire.js';

package/dist/types/globals.d.ts

@@ -61,7 +61,7 @@ export declare const displayUnits = LengthUnit.mils;
 export declare const defaultFont = "Arial";
 export declare const defaultFontBold = "Arial";
 export declare const defaultFontSize = 10;
-export declare const junctionSize: import("./objects/ParamDefinition.js").NumericValue;
+export declare const junctionSize: import("./objects/NumericValue.js").NumericValue;
 export declare const PortArrowSize: number;
 export declare const PortPaddingHorizontal: number;
 export declare const PortPaddingVertical: number;
@@ -88,12 +88,6 @@ export declare enum ReferenceTypes {
     library = "library",
     unknown = "unknown"
 }
-export declare enum BlockTypes {
-    Branch = 1,
-    Join = 2,
-    Parallel = 3,
-    Point = 4
-}
 export declare enum NetGraphicsParams {
     Color = "color",
     LineWidth = "lineWidth",

package/dist/types/helpers.d.ts

@@ -1,11 +1,11 @@
-import { BaseError } from "./utils.js";
 import { ParserRuleContext } from "antlr4ng";
+import { BaseError } from "./utils.js";
 import { ATNSimulator, BaseErrorListener, CommonTokenStream, DefaultErrorStrategy, Parser, RecognitionException, Recognizer, Token } from "antlr4ng";
 import { CircuitScriptParser, ScriptContext } from "./antlr/CircuitScriptParser.js";
 import { CircuitScriptLexer } from "./antlr/CircuitScriptLexer.js";
 import { LengthUnit } from "./globals.js";
 export type SVGWindow = any;
-import { NumericValue } from "./objects/ParamDefinition.js";
+import { NumericValue } from "./objects/NumericValue.js";
 import { NodeScriptEnvironment } from "./environment/environment.js";
 import { ImportedLibrary } from "./objects/types.js";
 export declare enum JSModuleType {

package/dist/types/index.d.ts

@@ -1,15 +1,17 @@
 export * from './render/draw_symbols.js';
 export * from './execute.js';
-export * from './export.js';
+export * from './render/export.js';
 export * from './render/geometry.js';
+export * from './pipeline.js';
 export * from './globals.js';
 export * from './helpers.js';
 export * from './render/layout.js';
+export * from './render/render.js';
+export * from './render/KiCadNetListOutputHandler.js';
 export * from './lexer.js';
 export * from './LexerDiagnosticListener.js';
 export * from './logger.js';
 export * from './parser.js';
-export * from './render/render.js';
 export * from './utils.js';
 export * from './visitor.js';
 export * from './sizing.js';
@@ -18,5 +20,7 @@ export * from './builtinMethods.js';
 export * from './validate/SymbolTable.js';
 export * from './validate/SymbolValidatorResolveVisitor.js';
 export * from './validate/SymbolValidatorVisitor.js';
+export * from './validate/validateScript.js';
 export * from './environment/environment.js';
 export * from './annotate/RefdesAnnotationVisitor.js';
+export * from './semantic-tokens/getSemanticTokens.js';

package/dist/types/lexer.d.ts

@@ -8,6 +8,7 @@ export declare class MainLexer extends CircuitScriptLexer {
     opened: number;
     diagnosticCollector: LexerDiagnosticCollector;
     lineOffset: number;
+    enableDiagnostics: boolean;
     constructor(input: CharStream, enableDiagnostics?: boolean);
     reset(): void;
     emitToken(token: Token): void;

package/dist/types/objects/BlockTypes.d.ts

@@ -0,0 +1,6 @@
+export declare enum BlockTypes {
+    Branch = 1,
+    Join = 2,
+    Parallel = 3,
+    Point = 4
+}

package/dist/types/objects/ClassComponent.d.ts

@@ -5,7 +5,7 @@ import { Net } from './Net.js';
 import { PinDefinition, PinId } from './PinDefinition.js';
 import { WireSegment } from './Wire.js';
 import { ExecutionContext } from '../execute.js';
-import { NumericValue } from './ParamDefinition.js';
+import { NumericValue } from './NumericValue.js';
 export declare class ComponentUnit {
     parent: ClassComponent;
     unitId: string;

package/dist/types/objects/ExecutionScope.d.ts

@@ -1,7 +1,8 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
 import { CFunction, CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ImportedLibrary, ValueType } from './types.js';
-import { BlockTypes, LayoutDirection } from '../globals.js';
+import { LayoutDirection } from '../globals.js';
+import { BlockTypes } from "./BlockTypes.js";
 import { Wire, WireSegment } from './Wire.js';
 import { Frame } from './Frame.js';
 import { ParserRuleContext } from 'antlr4ng';

package/dist/types/objects/NumericValue.d.ts

@@ -0,0 +1,35 @@
+import { Big } from 'big.js';
+import { PercentageValue } from "./PercentageValue.js";
+import { WrappedNumber } from "./WrappedNumber.js";
+export declare class NumericValue {
+    value: string | number | Big;
+    valuePart: Big;
+    prefixPart: number;
+    constructor(value: string | number | Big, prefix?: number);
+    toString(): string;
+    toDisplayString(): string;
+    toNumber(): number;
+    toBigNumber(): Big;
+    div(value: NumericValue | number): NumericValue;
+    half(): NumericValue;
+    mul(value: NumericValue | number): NumericValue;
+    add(value: NumericValue | number): NumericValue;
+    sub(value: NumericValue | number): NumericValue;
+    mod(value: NumericValue | number): NumericValue;
+    neg(): NumericValue;
+    eq(value: NumericValue): boolean;
+}
+export type NumberOperatorType = NumericValue | PercentageValue | WrappedNumber;
+export declare class NumberOperator {
+    prepare(value: number | NumberOperatorType): NumberOperatorType;
+    multiply(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    divide(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    addition(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    subtraction(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+    modulus(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
+}
+export declare function numeric(value: number | string): NumericValue;
+export declare function getNumberExponentialText(value: number): string;
+export declare function getNumberExponential(value: string): number;
+export declare function resolveToNumericValue(value: Big): NumericValue;
+export declare function roundValue(value: NumericValue): NumericValue;

package/dist/types/objects/ParamDefinition.d.ts

@@ -1,46 +1,5 @@
-import { Big } from 'big.js';
 export declare class ParamDefinition {
     paramName: string;
     paramValue: string | number | any;
     constructor(paramName: string, paramValue: any);
 }
-export declare class NumericValue {
-    value: string | number | Big;
-    valuePart: Big;
-    prefixPart: number;
-    constructor(value: string | number | Big, prefix?: number);
-    toString(): string;
-    toDisplayString(): string;
-    toNumber(): number;
-    toBigNumber(): Big;
-    div(value: NumericValue | number): NumericValue;
-    half(): NumericValue;
-    mul(value: NumericValue | number): NumericValue;
-    add(value: NumericValue | number): NumericValue;
-    sub(value: NumericValue | number): NumericValue;
-    mod(value: NumericValue | number): NumericValue;
-    neg(): NumericValue;
-    eq(value: NumericValue): boolean;
-}
-export declare function numeric(value: number | string): NumericValue;
-export declare class PercentageValue {
-    value: string | number;
-    constructor(value: string | number);
-    toString(): string;
-    toNumber(): number;
-}
-export declare class WrappedNumber {
-    value: number;
-    constructor(value: number);
-    toString(): string;
-    toNumber(): number;
-}
-export type NumberOperatorType = NumericValue | PercentageValue | WrappedNumber;
-export declare class NumberOperator {
-    prepare(value: number | NumberOperatorType): NumberOperatorType;
-    multiply(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
-    divide(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
-    addition(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
-    subtraction(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
-    modulus(value1: NumberOperatorType, value2: NumberOperatorType): NumberOperatorType;
-}

package/dist/types/objects/PercentageValue.d.ts

@@ -0,0 +1,6 @@
+export declare class PercentageValue {
+    value: string | number;
+    constructor(value: string | number);
+    toString(): string;
+    toNumber(): number;
+}

package/dist/types/objects/PinDefinition.d.ts

@@ -1,4 +1,4 @@
-import { NumericValue } from './ParamDefinition.js';
+import { NumericValue } from './NumericValue.js';
 import { PinTypes } from './PinTypes.js';
 export declare class PinId {
     private value;

package/dist/types/objects/WrappedNumber.d.ts

@@ -0,0 +1,6 @@
+export declare class WrappedNumber {
+    value: number;
+    constructor(value: number);
+    toString(): string;
+    toNumber(): number;
+}

package/dist/types/objects/types.d.ts

@@ -2,7 +2,8 @@ import { CommonTokenStream, ParserRuleContext, Token } from 'antlr4ng';
 import { ExecutionContext } from '../execute.js';
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { NumericValue, PercentageValue } from './ParamDefinition.js';
+import { NumericValue } from './NumericValue.js';
+import { PercentageValue } from "./PercentageValue.js";
 import { ReferenceTypes } from '../globals.js';
 import { PinDefinition, PinId } from './PinDefinition.js';
 import { ScriptContext } from 'src/antlr/CircuitScriptParser.js';

package/dist/types/render/draw_symbols.d.ts

@@ -3,7 +3,7 @@ import { Feature, GeometryProp, HorizontalAlign, LabelStyle, Textbox, VerticalAl
 import { Logger } from "../logger.js";
 import { PinTypes } from "../objects/PinTypes.js";
 import { ParserRuleContext } from "antlr4ng";
-import { NumericValue } from "../objects/ParamDefinition.js";
+import { NumericValue } from "../objects/NumericValue.js";
 import { PinId } from "../objects/PinDefinition.js";
 export declare abstract class SymbolGraphic {
     drawPortsName: boolean;