remove approximate mapping

Author: Azzerty23

packages/schema/src/language-server/validator/attribute-application-validator.ts

@@ -30,12 +30,7 @@ import {
 import { ValidationAcceptor, streamAllContents, streamAst } from 'langium';
 import pluralize from 'pluralize';
 import { AstValidator } from '../types';
-import {
-    getStringLiteral,
-    mapBuiltinTypeToExpressionType,
-    translateExpressionTypeToResolve,
-    typeAssignable,
-} from './utils';
+import { getStringLiteral, mapBuiltinTypeToExpressionType, typeAssignable } from './utils';
 
 // a registry of function handlers marked with @check
 const attributeCheckers = new Map<string, PropertyDescriptor>();
@@ -424,10 +419,8 @@ function isAliasAssignableToType(alias: AliasDecl, dstType: string, attr: Attrib
         return false;
     }
 
-    const mappedAliasResolvedType = translateExpressionTypeToResolve(alias.expression.$type);
-    return (
-        effectiveDstType === mappedAliasResolvedType || effectiveDstType === 'Any' || mappedAliasResolvedType === 'Any'
-    );
+    const aliasExpressionType = alias.expression.$resolvedType?.decl;
+    return effectiveDstType === aliasExpressionType || effectiveDstType === 'Any' || aliasExpressionType === 'Any';
 }
 
 function resolveEffectiveDestinationType(dstType: string, attr: AttributeApplication): string | null {

packages/schema/src/language-server/validator/utils.ts

@@ -99,26 +99,6 @@ export function mapBuiltinTypeToExpressionType(
     }
 }
 
-/**
- * Map an expression $type (e.g. StringLiteral) to a resolved ExpressionType (e.g. String)
- */
-export function translateExpressionTypeToResolve(expressionType: Expression['$type']): ExpressionType {
-    switch (expressionType) {
-        case 'StringLiteral':
-            return 'String';
-        case 'NumberLiteral':
-            return 'Int';
-        case 'BooleanLiteral':
-            return 'Boolean';
-        case 'ObjectExpr':
-            return 'Object';
-        case 'NullExpr':
-            return 'Null';
-        default:
-            return 'Any';
-    }
-}
-
 export function isAuthOrAuthMemberAccess(expr: Expression): boolean {
     return isAuthInvocation(expr) || (isMemberAccessExpr(expr) && isAuthOrAuthMemberAccess(expr.operand));
 }