boperators 0.1.0 → 0.1.2

package/dist/cjs/core/OverloadStore.js

@@ -5,6 +5,7 @@ const ts_morph_1 = require("ts-morph");
 const operatorSymbols_1 = require("../lib/operatorSymbols");
 const ErrorManager_1 = require("./ErrorManager");
 const getOperatorStringFromProperty_1 = require("./helpers/getOperatorStringFromProperty");
+const resolveExpressionType_1 = require("./helpers/resolveExpressionType");
 const unwrapInitializer_1 = require("./helpers/unwrapInitializer");
 const operatorMap_1 = require("./operatorMap");
 class OverloadStore extends Map {
@@ -158,7 +159,7 @@ class OverloadStore extends Map {
         this._parsedFiles.add(filePath);
         const classes = sourceFile.getClasses();
         classes.forEach((classDecl) => {
-            const classType = classDecl.getType().getText();
+            const classType = (0, resolveExpressionType_1.normalizeTypeName)(classDecl.getType().getText());
             classDecl.getProperties().forEach((property) => {
                 var _a, _b;
                 if (!ts_morph_1.Node.isPropertyDeclaration(property))
@@ -255,12 +256,14 @@ class OverloadStore extends Map {
         });
     }
     _addBinaryOverload(syntaxKind, classDecl, classType, filePath, property, element, parameters, operatorString, index, isStatic) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let hasWarning = false;
-        const lhsType = isStatic ? (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText() : classType;
+        const lhsType = isStatic
+            ? (0, resolveExpressionType_1.normalizeTypeName)((_b = (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText()) !== null && _b !== void 0 ? _b : "")
+            : classType;
         const rhsType = isStatic
-            ? (_b = parameters[1]) === null || _b === void 0 ? void 0 : _b.getType().getText()
-            : (_c = parameters[0]) === null || _c === void 0 ? void 0 : _c.getType().getText();
+            ? (0, resolveExpressionType_1.normalizeTypeName)((_d = (_c = parameters[1]) === null || _c === void 0 ? void 0 : _c.getType().getText()) !== null && _d !== void 0 ? _d : "")
+            : (0, resolveExpressionType_1.normalizeTypeName)((_f = (_e = parameters[0]) === null || _e === void 0 ? void 0 : _e.getType().getText()) !== null && _f !== void 0 ? _f : "");
         if (isStatic && lhsType !== classType && rhsType !== classType) {
             this._errorManager.addWarning(new ErrorManager_1.ErrorDescription(`Overload for operator ${operatorString} ` +
                 "must have either LHS or RHS parameter matching its class type.", property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
@@ -277,8 +280,8 @@ class OverloadStore extends Map {
                 `must have a return type of 'void', got '${returnType}'.`, property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
         }
-        const operatorOverloads = (_d = this.get(syntaxKind)) !== null && _d !== void 0 ? _d : new Map();
-        const lhsMap = (_e = operatorOverloads.get(lhsType)) !== null && _e !== void 0 ? _e : new Map();
+        const operatorOverloads = (_g = this.get(syntaxKind)) !== null && _g !== void 0 ? _g : new Map();
+        const lhsMap = (_h = operatorOverloads.get(lhsType)) !== null && _h !== void 0 ? _h : new Map();
         if (lhsMap.has(rhsType)) {
             this._errorManager.addWarning(new ErrorManager_1.ErrorDescription(`Duplicate overload for operator ${operatorString} with LHS type ${lhsType} and RHS type ${rhsType}`, property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
@@ -311,15 +314,15 @@ class OverloadStore extends Map {
         fileEntries.push({ syntaxKind, lhsType, rhsType });
     }
     _addPrefixUnaryOverload(syntaxKind, classDecl, classType, filePath, property, element, parameters, operatorString, index) {
-        var _a, _b;
+        var _a, _b, _c;
         let hasWarning = false;
-        const operandType = (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText();
+        const operandType = (0, resolveExpressionType_1.normalizeTypeName)((_b = (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText()) !== null && _b !== void 0 ? _b : "");
         if (operandType !== classType) {
             this._errorManager.addWarning(new ErrorManager_1.ErrorDescription(`Prefix unary overload for operator ${operatorString} ` +
                 "must have its parameter matching its class type.", property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
         }
-        const operatorOverloads = (_b = this._prefixUnaryOverloads.get(syntaxKind)) !== null && _b !== void 0 ? _b : new Map();
+        const operatorOverloads = (_c = this._prefixUnaryOverloads.get(syntaxKind)) !== null && _c !== void 0 ? _c : new Map();
         if (operatorOverloads.has(operandType)) {
             this._errorManager.addWarning(new ErrorManager_1.ErrorDescription(`Duplicate prefix unary overload for operator ${operatorString} with operand type ${operandType}`, property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
@@ -419,7 +422,10 @@ class OverloadStore extends Map {
                 const decl = sym.getValueDeclaration();
                 if (!decl)
                     continue;
-                params.push({ name, type: decl.getType().getText() });
+                params.push({
+                    name,
+                    type: (0, resolveExpressionType_1.normalizeTypeName)(decl.getType().getText()),
+                });
             }
             const paramCount = params.length;
             const returnType = sig.getReturnType().getText();
@@ -574,7 +580,7 @@ class OverloadStore extends Map {
             if (classDecl) {
                 let current = classDecl.getBaseClass();
                 while (current) {
-                    chain.push(current.getType().getText());
+                    chain.push((0, resolveExpressionType_1.normalizeTypeName)(current.getType().getText()));
                     current = current.getBaseClass();
                 }
                 break;

package/dist/cjs/core/helpers/resolveExpressionType.js

@@ -1,7 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeTypeName = normalizeTypeName;
 exports.resolveExpressionType = resolveExpressionType;
 const ts_morph_1 = require("ts-morph");
+/**
+ * Strips `import("...").` qualification from a type name as returned by
+ * ts-morph's `getType().getText()`. Language-server and cross-package contexts
+ * produce fully-qualified names like `import("/path/to/file").ClassName`, but
+ * overloads are keyed by short class names.
+ */
+function normalizeTypeName(typeName) {
+    return typeName.replace(/import\("[^"]*"\)\./g, "");
+}
 /**
  * Resolves the effective type name for a node in a binary expression.
  *
@@ -10,6 +20,7 @@ const ts_morph_1 = require("ts-morph");
  * - Boolean literals (not in string context) → `"boolean"`
  * - `"any"` type → falls back to the declared type of the symbol
  *   (needed for compound assignments where TS can't infer the result type)
+ * - Qualified type names → stripped to short class name via `normalizeTypeName`
  */
 function resolveExpressionType(node) {
     var _a;
@@ -26,5 +37,5 @@ function resolveExpressionType(node) {
         if (decl)
             typeName = decl.getType().getText();
     }
-    return typeName;
+    return normalizeTypeName(typeName);
 }

package/dist/cjs/core/operatorMap.js

@@ -13,6 +13,8 @@ exports.operatorMap = {
     [operatorSymbols_1.Operator.MINUS_EQUALS]: ts_morph_1.SyntaxKind.MinusEqualsToken,
     [operatorSymbols_1.Operator.MULTIPLY]: ts_morph_1.SyntaxKind.AsteriskToken,
     [operatorSymbols_1.Operator.MULTIPLY_EQUALS]: ts_morph_1.SyntaxKind.AsteriskEqualsToken,
+    [operatorSymbols_1.Operator.EXPONENT]: ts_morph_1.SyntaxKind.AsteriskAsteriskToken,
+    [operatorSymbols_1.Operator.EXPONENT_EQUALS]: ts_morph_1.SyntaxKind.AsteriskAsteriskEqualsToken,
     [operatorSymbols_1.Operator.DIVIDE]: ts_morph_1.SyntaxKind.SlashToken,
     [operatorSymbols_1.Operator.DIVIDE_EQUALS]: ts_morph_1.SyntaxKind.SlashEqualsToken,
     [operatorSymbols_1.Operator.GREATER_THAN]: ts_morph_1.SyntaxKind.GreaterThanToken,
@@ -43,6 +45,7 @@ exports.instanceOperators = new Set([
     exports.operatorMap[operatorSymbols_1.Operator.PLUS_EQUALS],
     exports.operatorMap[operatorSymbols_1.Operator.MINUS_EQUALS],
     exports.operatorMap[operatorSymbols_1.Operator.MULTIPLY_EQUALS],
+    exports.operatorMap[operatorSymbols_1.Operator.EXPONENT_EQUALS],
     exports.operatorMap[operatorSymbols_1.Operator.DIVIDE_EQUALS],
     exports.operatorMap[operatorSymbols_1.Operator.MODULO_EQUALS],
     exports.operatorMap[operatorSymbols_1.Operator.AND_EQUALS],

package/dist/cjs/lib/operatorSymbols.js

@@ -12,6 +12,8 @@ var Operator;
     Operator["MINUS_EQUALS"] = "-=";
     Operator["MULTIPLY"] = "*";
     Operator["MULTIPLY_EQUALS"] = "*=";
+    Operator["EXPONENT"] = "**";
+    Operator["EXPONENT_EQUALS"] = "**=";
     Operator["DIVIDE"] = "/";
     Operator["DIVIDE_EQUALS"] = "/=";
     Operator["GREATER_THAN"] = ">";

package/dist/esm/core/OverloadStore.js

@@ -2,6 +2,7 @@ import { Node, SourceFile, SyntaxKind, } from "ts-morph";
 import { operatorSymbols } from "../lib/operatorSymbols";
 import { ErrorDescription } from "./ErrorManager";
 import { getOperatorStringFromProperty } from "./helpers/getOperatorStringFromProperty";
+import { normalizeTypeName } from "./helpers/resolveExpressionType";
 import { unwrapInitializer } from "./helpers/unwrapInitializer";
 import { comparisonOperators, instanceOperators, operatorMap, postfixUnaryOperatorMap, prefixUnaryOperatorMap, } from "./operatorMap";
 export class OverloadStore extends Map {
@@ -155,7 +156,7 @@ export class OverloadStore extends Map {
         this._parsedFiles.add(filePath);
         const classes = sourceFile.getClasses();
         classes.forEach((classDecl) => {
-            const classType = classDecl.getType().getText();
+            const classType = normalizeTypeName(classDecl.getType().getText());
             classDecl.getProperties().forEach((property) => {
                 var _a, _b;
                 if (!Node.isPropertyDeclaration(property))
@@ -252,12 +253,14 @@ export class OverloadStore extends Map {
         });
     }
     _addBinaryOverload(syntaxKind, classDecl, classType, filePath, property, element, parameters, operatorString, index, isStatic) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let hasWarning = false;
-        const lhsType = isStatic ? (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText() : classType;
+        const lhsType = isStatic
+            ? normalizeTypeName((_b = (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText()) !== null && _b !== void 0 ? _b : "")
+            : classType;
         const rhsType = isStatic
-            ? (_b = parameters[1]) === null || _b === void 0 ? void 0 : _b.getType().getText()
-            : (_c = parameters[0]) === null || _c === void 0 ? void 0 : _c.getType().getText();
+            ? normalizeTypeName((_d = (_c = parameters[1]) === null || _c === void 0 ? void 0 : _c.getType().getText()) !== null && _d !== void 0 ? _d : "")
+            : normalizeTypeName((_f = (_e = parameters[0]) === null || _e === void 0 ? void 0 : _e.getType().getText()) !== null && _f !== void 0 ? _f : "");
         if (isStatic && lhsType !== classType && rhsType !== classType) {
             this._errorManager.addWarning(new ErrorDescription(`Overload for operator ${operatorString} ` +
                 "must have either LHS or RHS parameter matching its class type.", property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
@@ -274,8 +277,8 @@ export class OverloadStore extends Map {
                 `must have a return type of 'void', got '${returnType}'.`, property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
         }
-        const operatorOverloads = (_d = this.get(syntaxKind)) !== null && _d !== void 0 ? _d : new Map();
-        const lhsMap = (_e = operatorOverloads.get(lhsType)) !== null && _e !== void 0 ? _e : new Map();
+        const operatorOverloads = (_g = this.get(syntaxKind)) !== null && _g !== void 0 ? _g : new Map();
+        const lhsMap = (_h = operatorOverloads.get(lhsType)) !== null && _h !== void 0 ? _h : new Map();
         if (lhsMap.has(rhsType)) {
             this._errorManager.addWarning(new ErrorDescription(`Duplicate overload for operator ${operatorString} with LHS type ${lhsType} and RHS type ${rhsType}`, property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
@@ -308,15 +311,15 @@ export class OverloadStore extends Map {
         fileEntries.push({ syntaxKind, lhsType, rhsType });
     }
     _addPrefixUnaryOverload(syntaxKind, classDecl, classType, filePath, property, element, parameters, operatorString, index) {
-        var _a, _b;
+        var _a, _b, _c;
         let hasWarning = false;
-        const operandType = (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText();
+        const operandType = normalizeTypeName((_b = (_a = parameters[0]) === null || _a === void 0 ? void 0 : _a.getType().getText()) !== null && _b !== void 0 ? _b : "");
         if (operandType !== classType) {
             this._errorManager.addWarning(new ErrorDescription(`Prefix unary overload for operator ${operatorString} ` +
                 "must have its parameter matching its class type.", property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
         }
-        const operatorOverloads = (_b = this._prefixUnaryOverloads.get(syntaxKind)) !== null && _b !== void 0 ? _b : new Map();
+        const operatorOverloads = (_c = this._prefixUnaryOverloads.get(syntaxKind)) !== null && _c !== void 0 ? _c : new Map();
         if (operatorOverloads.has(operandType)) {
             this._errorManager.addWarning(new ErrorDescription(`Duplicate prefix unary overload for operator ${operatorString} with operand type ${operandType}`, property.getSourceFile().getFilePath(), property.getStartLineNumber(), this._minifyString(element.getText())));
             hasWarning = true;
@@ -416,7 +419,10 @@ export class OverloadStore extends Map {
                 const decl = sym.getValueDeclaration();
                 if (!decl)
                     continue;
-                params.push({ name, type: decl.getType().getText() });
+                params.push({
+                    name,
+                    type: normalizeTypeName(decl.getType().getText()),
+                });
             }
             const paramCount = params.length;
             const returnType = sig.getReturnType().getText();
@@ -571,7 +577,7 @@ export class OverloadStore extends Map {
             if (classDecl) {
                 let current = classDecl.getBaseClass();
                 while (current) {
-                    chain.push(current.getType().getText());
+                    chain.push(normalizeTypeName(current.getType().getText()));
                     current = current.getBaseClass();
                 }
                 break;

package/dist/esm/core/helpers/resolveExpressionType.d.ts

@@ -1,4 +1,11 @@
 import { type Node } from "ts-morph";
+/**
+ * Strips `import("...").` qualification from a type name as returned by
+ * ts-morph's `getType().getText()`. Language-server and cross-package contexts
+ * produce fully-qualified names like `import("/path/to/file").ClassName`, but
+ * overloads are keyed by short class names.
+ */
+export declare function normalizeTypeName(typeName: string): string;
 /**
  * Resolves the effective type name for a node in a binary expression.
  *
@@ -7,5 +14,6 @@ import { type Node } from "ts-morph";
  * - Boolean literals (not in string context) → `"boolean"`
  * - `"any"` type → falls back to the declared type of the symbol
  *   (needed for compound assignments where TS can't infer the result type)
+ * - Qualified type names → stripped to short class name via `normalizeTypeName`
  */
 export declare function resolveExpressionType(node: Node): string;

package/dist/esm/core/helpers/resolveExpressionType.js

@@ -1,4 +1,13 @@
 import { SyntaxKind } from "ts-morph";
+/**
+ * Strips `import("...").` qualification from a type name as returned by
+ * ts-morph's `getType().getText()`. Language-server and cross-package contexts
+ * produce fully-qualified names like `import("/path/to/file").ClassName`, but
+ * overloads are keyed by short class names.
+ */
+export function normalizeTypeName(typeName) {
+    return typeName.replace(/import\("[^"]*"\)\./g, "");
+}
 /**
  * Resolves the effective type name for a node in a binary expression.
  *
@@ -7,6 +16,7 @@ import { SyntaxKind } from "ts-morph";
  * - Boolean literals (not in string context) → `"boolean"`
  * - `"any"` type → falls back to the declared type of the symbol
  *   (needed for compound assignments where TS can't infer the result type)
+ * - Qualified type names → stripped to short class name via `normalizeTypeName`
  */
 export function resolveExpressionType(node) {
     var _a;
@@ -23,5 +33,5 @@ export function resolveExpressionType(node) {
         if (decl)
             typeName = decl.getType().getText();
     }
-    return typeName;
+    return normalizeTypeName(typeName);
 }

package/dist/esm/core/operatorMap.d.ts

@@ -9,6 +9,8 @@ export declare const operatorMap: {
     readonly "-=": SyntaxKind.MinusEqualsToken;
     readonly "*": SyntaxKind.AsteriskToken;
     readonly "*=": SyntaxKind.AsteriskEqualsToken;
+    readonly "**": SyntaxKind.AsteriskAsteriskToken;
+    readonly "**=": SyntaxKind.AsteriskAsteriskEqualsToken;
     readonly "/": SyntaxKind.SlashToken;
     readonly "/=": SyntaxKind.SlashEqualsToken;
     readonly ">": SyntaxKind.GreaterThanToken;
@@ -28,7 +30,7 @@ export declare const operatorMap: {
     readonly "??": SyntaxKind.QuestionQuestionToken;
 };
 export type OperatorString = keyof typeof operatorMap;
-export declare const operatorSyntaxKinds: (SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.EqualsEqualsToken | SyntaxKind.ExclamationEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken | SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken | SyntaxKind.QuestionQuestionToken | SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.BarBarEqualsToken | SyntaxKind.AmpersandAmpersandEqualsToken)[];
+export declare const operatorSyntaxKinds: (SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.EqualsEqualsToken | SyntaxKind.ExclamationEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.AsteriskToken | SyntaxKind.AsteriskAsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken | SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken | SyntaxKind.QuestionQuestionToken | SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.BarBarEqualsToken | SyntaxKind.AmpersandAmpersandEqualsToken)[];
 export type OperatorSyntaxKind = (typeof operatorMap)[OperatorString];
 export declare const isOperatorSyntaxKind: (syntaxKind: SyntaxKind) => syntaxKind is OperatorSyntaxKind;
 /**

package/dist/esm/core/operatorMap.js

@@ -10,6 +10,8 @@ export const operatorMap = {
     [Operator.MINUS_EQUALS]: SyntaxKind.MinusEqualsToken,
     [Operator.MULTIPLY]: SyntaxKind.AsteriskToken,
     [Operator.MULTIPLY_EQUALS]: SyntaxKind.AsteriskEqualsToken,
+    [Operator.EXPONENT]: SyntaxKind.AsteriskAsteriskToken,
+    [Operator.EXPONENT_EQUALS]: SyntaxKind.AsteriskAsteriskEqualsToken,
     [Operator.DIVIDE]: SyntaxKind.SlashToken,
     [Operator.DIVIDE_EQUALS]: SyntaxKind.SlashEqualsToken,
     [Operator.GREATER_THAN]: SyntaxKind.GreaterThanToken,
@@ -39,6 +41,7 @@ export const instanceOperators = new Set([
     operatorMap[Operator.PLUS_EQUALS],
     operatorMap[Operator.MINUS_EQUALS],
     operatorMap[Operator.MULTIPLY_EQUALS],
+    operatorMap[Operator.EXPONENT_EQUALS],
     operatorMap[Operator.DIVIDE_EQUALS],
     operatorMap[Operator.MODULO_EQUALS],
     operatorMap[Operator.AND_EQUALS],

package/dist/esm/lib/operatorSymbols.d.ts

@@ -8,6 +8,8 @@ export declare enum Operator {
     MINUS_EQUALS = "-=",
     MULTIPLY = "*",
     MULTIPLY_EQUALS = "*=",
+    EXPONENT = "**",
+    EXPONENT_EQUALS = "**=",
     DIVIDE = "/",
     DIVIDE_EQUALS = "/=",
     GREATER_THAN = ">",

package/dist/esm/lib/operatorSymbols.js

@@ -9,6 +9,8 @@ export var Operator;
     Operator["MINUS_EQUALS"] = "-=";
     Operator["MULTIPLY"] = "*";
     Operator["MULTIPLY_EQUALS"] = "*=";
+    Operator["EXPONENT"] = "**";
+    Operator["EXPONENT_EQUALS"] = "**=";
     Operator["DIVIDE"] = "/";
     Operator["DIVIDE_EQUALS"] = "/=";
     Operator["GREATER_THAN"] = ">";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "boperators",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"license": "MIT",
 	"description": "Operator overloading for TypeScript.",
 	"repository": {