@tsonic/frontend 0.0.13 → 0.0.15

package/dist/ir/converters/statements/declarations/classes/orchestrator.js

@@ -2,48 +2,33 @@
  * Class declaration conversion orchestrator
  */
 import * as ts from "typescript";
-import { convertExpression } from "../../../../expression-converter.js";
-import { convertType } from "../../../../type-converter.js";
 import { hasExportModifier, convertTypeParameters } from "../../helpers.js";
-import { convertProperty } from "./properties.js";
+import { convertAccessorProperty, convertProperty } from "./properties.js";
 import { convertMethod } from "./methods.js";
 import { convertConstructor, extractParameterProperties, } from "./constructors.js";
 /**
  * Convert a single class member
  */
-const convertClassMember = (node, checker, superClass, constructorParams) => {
+const convertClassMember = (node, ctx, superClass, constructorParams) => {
     if (ts.isPropertyDeclaration(node)) {
-        return convertProperty(node, checker, superClass);
+        return convertProperty(node, ctx, superClass);
     }
     if (ts.isMethodDeclaration(node)) {
-        return convertMethod(node, checker, superClass);
+        return convertMethod(node, ctx, superClass);
     }
     if (ts.isConstructorDeclaration(node)) {
-        return convertConstructor(node, checker, constructorParams);
+        return convertConstructor(node, ctx, constructorParams);
     }
     return null;
 };
 /**
- * Filter members to only include those declared directly on this class
+ * Filter members to only include those declared directly on this class.
+ * DETERMINISTIC: Uses AST structure only, all members in node.members are own members.
  */
-const filterOwnMembers = (node, checker) => {
-    return node.members.filter((m) => {
-        // Always include constructors and methods declared on this class
-        if (ts.isConstructorDeclaration(m) || ts.isMethodDeclaration(m)) {
-            return true;
-        }
-        // For properties, only include if they're declared directly on this class
-        if (ts.isPropertyDeclaration(m)) {
-            // Check if this property has a declaration on this specific class node
-            const symbol = checker.getSymbolAtLocation(m.name);
-            if (!symbol)
-                return true; // Include if we can't determine
-            const declarations = symbol.getDeclarations() || [];
-            // Only include if this exact node is in the declarations
-            return declarations.some((d) => d === m);
-        }
-        return true;
-    });
+const filterOwnMembers = (node) => {
+    // All members directly on node.members ARE own members by definition
+    // The AST doesn't include inherited members in the class's members array
+    return node.members;
 };
 /**
  * Deduplicate members by name, keeping first occurrence
@@ -68,16 +53,21 @@ const deduplicateMembers = (members) => {
     });
 };
 /**
- * Check if a type reference is the struct marker
+ * Check if a type reference is the struct marker.
+ * DETERMINISTIC: Uses only the AST expression text, not TypeScript type resolution.
  */
-const isStructMarker = (typeRef, checker) => {
-    const symbol = checker.getSymbolAtLocation(typeRef.expression);
-    return symbol?.escapedName === "struct" || symbol?.escapedName === "Struct";
+const isStructMarker = (typeRef) => {
+    // Check the expression directly - it should be an identifier named "struct" or "Struct"
+    if (ts.isIdentifier(typeRef.expression)) {
+        const name = typeRef.expression.text;
+        return name === "struct" || name === "Struct";
+    }
+    return false;
 };
 /**
  * Convert class declaration to IR
  */
-export const convertClassDeclaration = (node, checker) => {
+export const convertClassDeclaration = (node, ctx) => {
     if (!node.name)
         return null;
     const superClass = node.heritageClauses?.find((h) => h.token === ts.SyntaxKind.ExtendsKeyword)?.types[0];
@@ -86,21 +76,49 @@ export const convertClassDeclaration = (node, checker) => {
     const implementsClause = node.heritageClauses?.find((h) => h.token === ts.SyntaxKind.ImplementsKeyword);
     const implementsTypes = implementsClause?.types
         .filter((t) => {
-        if (isStructMarker(t, checker)) {
+        if (isStructMarker(t)) {
             isStruct = true;
             return false; // Remove marker from implements
         }
         return true;
     })
-        .map((t) => convertType(t, checker)) ?? [];
+        .map((t) => ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(t))) ?? [];
     // Extract parameter properties from constructor
     const constructor = node.members.find(ts.isConstructorDeclaration);
-    const parameterProperties = extractParameterProperties(constructor, checker);
+    const parameterProperties = extractParameterProperties(constructor, ctx);
     // Filter to only include members declared directly on this class (not inherited)
-    const ownMembers = filterOwnMembers(node, checker);
-    const convertedMembers = ownMembers
-        .map((m) => convertClassMember(m, checker, superClass, constructor?.parameters))
-        .filter((m) => m !== null);
+    const ownMembers = filterOwnMembers(node);
+    const accessorPairs = new Map();
+    for (const member of ownMembers) {
+        if (ts.isGetAccessorDeclaration(member) || ts.isSetAccessorDeclaration(member)) {
+            const name = ts.isIdentifier(member.name) ? member.name.text : "[computed]";
+            const entry = accessorPairs.get(name) ?? {};
+            if (ts.isGetAccessorDeclaration(member)) {
+                entry.getter = member;
+            }
+            else {
+                entry.setter = member;
+            }
+            accessorPairs.set(name, entry);
+        }
+    }
+    const convertedMembers = [];
+    const seenAccessors = new Set();
+    for (const member of ownMembers) {
+        if (ts.isGetAccessorDeclaration(member) || ts.isSetAccessorDeclaration(member)) {
+            const name = ts.isIdentifier(member.name) ? member.name.text : "[computed]";
+            if (seenAccessors.has(name))
+                continue;
+            seenAccessors.add(name);
+            const pair = accessorPairs.get(name);
+            convertedMembers.push(convertAccessorProperty(name, pair?.getter, pair?.setter, ctx, superClass));
+            continue;
+        }
+        const converted = convertClassMember(member, ctx, superClass, constructor?.parameters);
+        if (converted) {
+            convertedMembers.push(converted);
+        }
+    }
     // Deduplicate members by name (keep first occurrence)
     // Parameter properties should take precedence over regular properties with same name
     const allMembers = [...parameterProperties, ...convertedMembers];
@@ -112,8 +130,10 @@ export const convertClassDeclaration = (node, checker) => {
     return {
         kind: "classDeclaration",
         name: node.name.text,
-        typeParameters: convertTypeParameters(node.typeParameters, checker),
-        superClass: superClass ? convertExpression(superClass, checker) : undefined,
+        typeParameters: convertTypeParameters(node.typeParameters, ctx),
+        superClass: superClass
+            ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(superClass))
+            : undefined,
         implements: implementsTypes,
         members: finalMembers,
         isExported: hasExportModifier(node),

package/dist/ir/converters/statements/declarations/classes/orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/orchestrator.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAG3B;;GAEG;AACH,MAAM,kBAAkB,GAAG,CACzB,IAAqB,EACrB,GAAmB,EACnB,UAAsD,EACtD,iBAAyD,EACnC,EAAE;IACxB,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAG,CACvB,IAAyB,EACG,EAAE;IAC9B,qEAAqE;IACrE,yEAAyE;IACzE,OAAO,IAAI,CAAC,OAAO,CAAC;AACtB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,kBAAkB,GAAG,CACzB,OAAiC,EACP,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC,CAAC,6BAA6B;QAC5C,CAAC;QACD,MAAM,IAAI,GACR,MAAM,CAAC,IAAI,KAAK,qBAAqB;YACrC,MAAM,CAAC,IAAI,KAAK,mBAAmB;YACjC,CAAC,CAAC,MAAM,CAAC,IAAI;YACb,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,CAAC,iBAAiB;QACjC,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,cAAc,GAAG,CAAC,OAAuC,EAAW,EAAE;IAC1E,wFAAwF;IACxF,IAAI,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;QACrC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,IAAyB,EACzB,GAAmB,EACQ,EAAE;IAC7B,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAChD,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEZ,4CAA4C;IAC5C,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CACnD,CAAC;IACF,MAAM,eAAe,GACnB,gBAAgB,EAAE,KAAK;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;YACtB,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,KAAK,CAAC,CAAC,gCAAgC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAChE,IAAI,EAAE,CAAC;IAEZ,gDAAgD;IAChD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAEzE,iFAAiF;IACjF,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAG,IAAI,GAAG,EAG1B,CAAC;IACJ,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/E,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;YAC5E,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACxB,CAAC;YACD,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/E,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;YAC5E,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YACtC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrC,gBAAgB,CAAC,IAAI,CACnB,uBAAuB,CACrB,IAAI,EACJ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,GAAG,EACH,UAAU,CACX,CACF,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,kBAAkB,CAClC,MAAM,EACN,GAAG,EACH,UAAU,EACV,WAAW,EAAE,UAAU,CACxB,CAAC;QACF,IAAI,SAAS,EAAE,CAAC;YACd,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,qFAAqF;IACrF,MAAM,UAAU,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,gBAAgB,CAAC,CAAC;IACjE,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAE3D,kDAAkD;IAClD,MAAM,YAAY,GAAG,QAAQ;QAC3B,CAAC,CAAC,mBAAmB,CAAC,MAAM,CACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAChE;QACH,CAAC,CAAC,mBAAmB,CAAC;IAExB,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACpB,cAAc,EAAE,qBAAqB,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;QAC/D,UAAU,EAAE,UAAU;YACpB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAC1E,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,eAAe;QAC3B,OAAO,EAAE,YAAY;QACrB,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;QACnC,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC"}

package/dist/ir/converters/statements/declarations/classes/override-detection.d.ts

@@ -1,13 +1,17 @@
 /**
  * Override detection for class members
+ *
+ * ALICE'S SPEC: Uses TypeSystem exclusively for declaration queries.
  */
 import * as ts from "typescript";
+import type { ProgramContext } from "../../../../program-context.js";
 export type OverrideInfo = {
     readonly isOverride: boolean;
     readonly isShadow: boolean;
 };
 /**
- * Check if a method/property should be marked as override based on base class metadata
+ * Check if a method/property should be marked as override based on base class metadata.
+ * DETERMINISTIC: Uses Binding API for symbol resolution.
  */
-export declare const detectOverride: (memberName: string, memberKind: "method" | "property", superClass: ts.ExpressionWithTypeArguments | undefined, checker: ts.TypeChecker, parameterTypes?: readonly string[]) => OverrideInfo;
+export declare const detectOverride: (memberName: string, memberKind: "method" | "property", superClass: ts.ExpressionWithTypeArguments | undefined, ctx: ProgramContext, parameterTypes?: readonly string[]) => OverrideInfo;
 //# sourceMappingURL=override-detection.d.ts.map

package/dist/ir/converters/statements/declarations/classes/override-detection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"override-detection.d.ts","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/override-detection.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GACzB,YAAY,MAAM,EAClB,YAAY,QAAQ,GAAG,UAAU,EACjC,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,EACtD,SAAS,EAAE,CAAC,WAAW,EACvB,iBAAiB,SAAS,MAAM,EAAE,KACjC,YAgCF,CAAC"}
+{"version":3,"file":"override-detection.d.ts","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/override-detection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,YAAY,MAAM,EAClB,YAAY,QAAQ,GAAG,UAAU,EACjC,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,EACtD,KAAK,cAAc,EACnB,iBAAiB,SAAS,MAAM,EAAE,KACjC,YAmDF,CAAC"}

package/dist/ir/converters/statements/declarations/classes/override-detection.js

@@ -1,79 +1,78 @@
 /**
  * Override detection for class members
+ *
+ * ALICE'S SPEC: Uses TypeSystem exclusively for declaration queries.
  */
 import * as ts from "typescript";
-import { getMetadataRegistry } from "../registry.js";
 /**
- * Check if a method/property should be marked as override based on base class metadata
+ * Check if a method/property should be marked as override based on base class metadata.
+ * DETERMINISTIC: Uses Binding API for symbol resolution.
  */
-export const detectOverride = (memberName, memberKind, superClass, checker, parameterTypes) => {
+export const detectOverride = (memberName, memberKind, superClass, ctx, parameterTypes) => {
     if (!superClass) {
         return { isOverride: false, isShadow: false };
     }
-    // Resolve the base class type
-    const baseType = checker.getTypeAtLocation(superClass.expression);
-    const baseSymbol = baseType.getSymbol();
-    if (!baseSymbol) {
+    // DETERMINISTIC: Get base class name directly from AST
+    // For simple identifiers, get the name; for qualified names, get the full path
+    const baseClassName = ts.isIdentifier(superClass.expression)
+        ? superClass.expression.text
+        : ts.isPropertyAccessExpression(superClass.expression)
+            ? getFullPropertyAccessName(superClass.expression)
+            : undefined;
+    if (!baseClassName) {
         return { isOverride: false, isShadow: false };
     }
-    // Get fully-qualified name for .NET types
-    const qualifiedName = checker.getFullyQualifiedName(baseSymbol);
+    // Try to resolve the identifier to get more context
+    const declId = ts.isIdentifier(superClass.expression) &&
+        ctx.binding.resolveIdentifier(superClass.expression);
+    // Get qualified name from the resolved declaration if available
+    const qualifiedName = declId
+        ? ctx.typeSystem.getFQNameOfDecl(declId)
+        : baseClassName;
     // Check if this is a .NET type (starts with "System." or other .NET namespaces)
-    const isDotNetType = qualifiedName.startsWith("System.") ||
-        qualifiedName.startsWith("Microsoft.") ||
-        qualifiedName.startsWith("Tsonic.Runtime.");
-    if (isDotNetType) {
-        return detectDotNetOverride(memberName, memberKind, qualifiedName, parameterTypes);
+    const isDotNetType = qualifiedName?.startsWith("System.") ||
+        qualifiedName?.startsWith("Microsoft.") ||
+        qualifiedName?.startsWith("Tsonic.Runtime.");
+    if (isDotNetType && qualifiedName) {
+        return detectDotNetOverride(memberName, memberKind, qualifiedName, ctx, parameterTypes);
     }
-    else {
-        return detectTypeScriptOverride(memberName, memberKind, baseSymbol);
+    else if (declId) {
+        // ALICE'S SPEC (Phase 5): Use semantic method instead of getDeclInfo
+        return ctx.typeSystem.checkTsClassMemberOverride(declId, memberName, memberKind);
     }
+    return { isOverride: false, isShadow: false };
+};
+/**
+ * Get full property access name (e.g., "System.Collections.Generic.List")
+ */
+const getFullPropertyAccessName = (expr) => {
+    const parts = [expr.name.text];
+    let current = expr.expression;
+    while (ts.isPropertyAccessExpression(current)) {
+        parts.unshift(current.name.text);
+        current = current.expression;
+    }
+    if (ts.isIdentifier(current)) {
+        parts.unshift(current.text);
+    }
+    return parts.join(".");
 };
 /**
  * Detect override for .NET base classes using metadata
  */
-const detectDotNetOverride = (memberName, memberKind, qualifiedName, parameterTypes) => {
-    const metadata = getMetadataRegistry();
+const detectDotNetOverride = (memberName, memberKind, qualifiedName, ctx, parameterTypes) => {
     if (memberKind === "method" && parameterTypes) {
         const signature = `${memberName}(${parameterTypes.join(",")})`;
-        const isVirtual = metadata.isVirtualMember(qualifiedName, signature);
-        const isSealed = metadata.isSealedMember(qualifiedName, signature);
+        const isVirtual = ctx.metadata.isVirtualMember(qualifiedName, signature);
+        const isSealed = ctx.metadata.isSealedMember(qualifiedName, signature);
         return { isOverride: isVirtual && !isSealed, isShadow: !isVirtual };
     }
     else if (memberKind === "property") {
         // For properties, check without parameters
-        const isVirtual = metadata.isVirtualMember(qualifiedName, memberName);
-        const isSealed = metadata.isSealedMember(qualifiedName, memberName);
+        const isVirtual = ctx.metadata.isVirtualMember(qualifiedName, memberName);
+        const isSealed = ctx.metadata.isSealedMember(qualifiedName, memberName);
         return { isOverride: isVirtual && !isSealed, isShadow: !isVirtual };
     }
     return { isOverride: false, isShadow: false };
 };
-/**
- * Detect override for TypeScript base classes
- */
-const detectTypeScriptOverride = (memberName, memberKind, baseSymbol) => {
-    const baseDeclarations = baseSymbol.getDeclarations();
-    if (!baseDeclarations || baseDeclarations.length === 0) {
-        return { isOverride: false, isShadow: false };
-    }
-    for (const baseDecl of baseDeclarations) {
-        if (ts.isClassDeclaration(baseDecl)) {
-            // Check if base class has this member
-            const baseMember = baseDecl.members.find((m) => {
-                if (memberKind === "method" && ts.isMethodDeclaration(m)) {
-                    return ts.isIdentifier(m.name) && m.name.text === memberName;
-                }
-                else if (memberKind === "property" && ts.isPropertyDeclaration(m)) {
-                    return ts.isIdentifier(m.name) && m.name.text === memberName;
-                }
-                return false;
-            });
-            if (baseMember) {
-                // In TypeScript, all methods can be overridden unless final (not supported in TS)
-                return { isOverride: true, isShadow: false };
-            }
-        }
-    }
-    return { isOverride: false, isShadow: false };
-};
 //# sourceMappingURL=override-detection.js.map

package/dist/ir/converters/statements/declarations/classes/override-detection.js.map

@@ -1 +1 @@
-{"version":3,"file":"override-detection.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/override-detection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"override-detection.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/override-detection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAQjC;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,UAAkB,EAClB,UAAiC,EACjC,UAAsD,EACtD,GAAmB,EACnB,cAAkC,EACpB,EAAE;IAChB,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAChD,CAAC;IAED,uDAAuD;IACvD,+EAA+E;IAC/E,MAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC;QAC1D,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI;QAC5B,CAAC,CAAC,EAAE,CAAC,0BAA0B,CAAC,UAAU,CAAC,UAAU,CAAC;YACpD,CAAC,CAAC,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC;YAClD,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAChD,CAAC;IAED,oDAAoD;IACpD,MAAM,MAAM,GACV,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC;QACtC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAEvD,gEAAgE;IAChE,MAAM,aAAa,GAAG,MAAM;QAC1B,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC;QACxC,CAAC,CAAC,aAAa,CAAC;IAElB,gFAAgF;IAChF,MAAM,YAAY,GAChB,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC;QACpC,aAAa,EAAE,UAAU,CAAC,YAAY,CAAC;QACvC,aAAa,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAE/C,IAAI,YAAY,IAAI,aAAa,EAAE,CAAC;QAClC,OAAO,oBAAoB,CACzB,UAAU,EACV,UAAU,EACV,aAAa,EACb,GAAG,EACH,cAAc,CACf,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAClB,qEAAqE;QACrE,OAAO,GAAG,CAAC,UAAU,CAAC,0BAA0B,CAC9C,MAAM,EACN,UAAU,EACV,UAAU,CACX,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAChD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,yBAAyB,GAAG,CAChC,IAAiC,EACzB,EAAE;IACV,MAAM,KAAK,GAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,OAAO,GAAkB,IAAI,CAAC,UAAU,CAAC;IAE7C,OAAO,EAAE,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAC/B,CAAC;IAED,IAAI,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,oBAAoB,GAAG,CAC3B,UAAkB,EAClB,UAAiC,EACjC,aAAqB,EACrB,GAAmB,EACnB,cAAkC,EACpB,EAAE;IAChB,IAAI,UAAU,KAAK,QAAQ,IAAI,cAAc,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,GAAG,UAAU,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAC/D,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACvE,OAAO,EAAE,UAAU,EAAE,SAAS,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC;IACtE,CAAC;SAAM,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QACrC,2CAA2C;QAC3C,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QACxE,OAAO,EAAE,UAAU,EAAE,SAAS,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC;IACtE,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAChD,CAAC,CAAC"}

package/dist/ir/converters/statements/declarations/classes/properties.d.ts

@@ -1,10 +1,18 @@
 /**
  * Property member conversion
+ *
+ * DETERMINISTIC TYPING: Property types are derived from initializers when
+ * no explicit annotation is present, not from TypeScript inference.
  */
 import * as ts from "typescript";
 import { IrClassMember } from "../../../../types.js";
+import type { ProgramContext } from "../../../../program-context.js";
 /**
  * Convert property declaration to IR
+ *
+ * DETERMINISTIC TYPING: For properties without explicit annotations,
+ * the type is derived from the converted initializer expression.
  */
-export declare const convertProperty: (node: ts.PropertyDeclaration, checker: ts.TypeChecker, superClass: ts.ExpressionWithTypeArguments | undefined) => IrClassMember;
+export declare const convertProperty: (node: ts.PropertyDeclaration, ctx: ProgramContext, superClass: ts.ExpressionWithTypeArguments | undefined) => IrClassMember;
+export declare const convertAccessorProperty: (memberName: string, getter: ts.GetAccessorDeclaration | undefined, setter: ts.SetAccessorDeclaration | undefined, ctx: ProgramContext, superClass: ts.ExpressionWithTypeArguments | undefined) => IrClassMember;
 //# sourceMappingURL=properties.d.ts.map

package/dist/ir/converters/statements/declarations/classes/properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/properties.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA2BrD;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,EAAE,CAAC,mBAAmB,EAC5B,SAAS,EAAE,CAAC,WAAW,EACvB,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,KACrD,aAuBF,CAAC"}
+{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/properties.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAEL,aAAa,EAGd,MAAM,sBAAsB,CAAC;AAS9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAkDrE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,EAAE,CAAC,mBAAmB,EAC5B,KAAK,cAAc,EACnB,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,KACrD,aAqCF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAClB,QAAQ,EAAE,CAAC,sBAAsB,GAAG,SAAS,EAC7C,QAAQ,EAAE,CAAC,sBAAsB,GAAG,SAAS,EAC7C,KAAK,cAAc,EACnB,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,KACrD,aAgEF,CAAC"}

package/dist/ir/converters/statements/declarations/classes/properties.js

@@ -1,37 +1,87 @@
 /**
  * Property member conversion
+ *
+ * DETERMINISTIC TYPING: Property types are derived from initializers when
+ * no explicit annotation is present, not from TypeScript inference.
  */
 import * as ts from "typescript";
 import { convertExpression } from "../../../../expression-converter.js";
-import { convertType, inferType } from "../../../../type-converter.js";
+import { convertBlockStatement } from "../../control.js";
 import { hasStaticModifier, hasReadonlyModifier, getAccessibility, } from "../../helpers.js";
 import { detectOverride } from "./override-detection.js";
 /**
- * Get the IR type for a property declaration.
- * Uses explicit annotation if present, otherwise infers from TypeChecker.
- * C# requires explicit types for class fields (no 'var').
+ * Derive type from a converted IR expression (deterministic).
+ * NO TYPESCRIPT FALLBACK - types must be derivable from IR or undefined.
  */
-const getPropertyType = (node, checker) => {
-    // If there's an explicit type annotation, use it
-    if (node.type) {
-        return convertType(node.type, checker);
+const deriveTypeFromExpression = (expr) => {
+    // For literals, the inferredType is already set deterministically
+    if (expr.kind === "literal") {
+        return expr.inferredType;
     }
-    // Infer type from checker (always needed for class fields)
-    return inferType(node, checker);
+    // For arrays, derive from first element's type or array's inferredType
+    if (expr.kind === "array") {
+        if (expr.inferredType) {
+            return expr.inferredType;
+        }
+        // Try to derive from first element
+        if (expr.elements.length > 0) {
+            const firstElement = expr.elements[0];
+            if (firstElement) {
+                const elementType = deriveTypeFromExpression(firstElement);
+                if (elementType) {
+                    return { kind: "arrayType", elementType };
+                }
+            }
+        }
+        return undefined;
+    }
+    // For all other expressions, use their inferredType if available
+    if ("inferredType" in expr && expr.inferredType) {
+        return expr.inferredType;
+    }
+    // Cannot determine type - return undefined (no TypeScript fallback)
+    return undefined;
+};
+const deriveTypeFromGetterBody = (body) => {
+    for (const stmt of body.statements) {
+        if (stmt.kind === "returnStatement" && stmt.expression) {
+            return deriveTypeFromExpression(stmt.expression);
+        }
+    }
+    return undefined;
 };
 /**
  * Convert property declaration to IR
+ *
+ * DETERMINISTIC TYPING: For properties without explicit annotations,
+ * the type is derived from the converted initializer expression.
  */
-export const convertProperty = (node, checker, superClass) => {
+export const convertProperty = (node, ctx, superClass) => {
     const memberName = ts.isIdentifier(node.name) ? node.name.text : "[computed]";
-    const overrideInfo = detectOverride(memberName, "property", superClass, checker);
+    const overrideInfo = detectOverride(memberName, "property", superClass, ctx);
+    // Get explicit type annotation (if present) for contextual typing
+    // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+    const explicitType = node.type
+        ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(node.type))
+        : undefined;
+    // Convert initializer FIRST (with explicit type as expectedType if present)
+    const convertedInitializer = node.initializer
+        ? convertExpression(node.initializer, ctx, explicitType)
+        : undefined;
+    // Derive property type:
+    // 1. Use explicit annotation if present
+    // 2. Otherwise derive from converted initializer (NO TypeScript fallback)
+    // 3. If no initializer and no annotation, undefined (error at emit time)
+    const propertyType = explicitType
+        ? explicitType
+        : convertedInitializer
+            ? deriveTypeFromExpression(convertedInitializer)
+            : undefined;
     return {
         kind: "propertyDeclaration",
         name: memberName,
-        type: getPropertyType(node, checker),
-        initializer: node.initializer
-            ? convertExpression(node.initializer, checker)
-            : undefined,
+        type: propertyType,
+        initializer: convertedInitializer,
         isStatic: hasStaticModifier(node),
         isReadonly: hasReadonlyModifier(node),
         accessibility: getAccessibility(node),
@@ -39,4 +89,57 @@ export const convertProperty = (node, checker, superClass) => {
         isShadow: overrideInfo.isShadow ? true : undefined,
     };
 };
+export const convertAccessorProperty = (memberName, getter, setter, ctx, superClass) => {
+    const overrideInfo = detectOverride(memberName, "property", superClass, ctx);
+    const getterType = getter?.type
+        ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(getter.type))
+        : undefined;
+    const setterValueParam = setter?.parameters[0];
+    const setterType = setterValueParam?.type !== undefined
+        ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(setterValueParam.type))
+        : undefined;
+    const explicitType = getterType ?? setterType;
+    const getterBody = getter?.body
+        ? convertBlockStatement(getter.body, ctx, explicitType)
+        : undefined;
+    const setterBody = setter?.body
+        ? convertBlockStatement(setter.body, ctx, undefined)
+        : undefined;
+    const inferredFromGetter = getterBody
+        ? deriveTypeFromGetterBody(getterBody)
+        : undefined;
+    const propertyType = explicitType ?? inferredFromGetter;
+    const isStatic = getter
+        ? hasStaticModifier(getter)
+        : setter
+            ? hasStaticModifier(setter)
+            : false;
+    const accessibility = getter
+        ? getAccessibility(getter)
+        : setter
+            ? getAccessibility(setter)
+            : "public";
+    const setterParamName = (() => {
+        if (!setterBody)
+            return undefined;
+        const param = setter?.parameters[0];
+        if (!param)
+            return undefined;
+        return ts.isIdentifier(param.name) ? param.name.text : undefined;
+    })();
+    return {
+        kind: "propertyDeclaration",
+        name: memberName,
+        type: propertyType,
+        getterBody,
+        setterBody,
+        setterParamName,
+        initializer: undefined,
+        isStatic,
+        isReadonly: false,
+        accessibility,
+        isOverride: overrideInfo.isOverride ? true : undefined,
+        isShadow: overrideInfo.isShadow ? true : undefined,
+    };
+};
 //# sourceMappingURL=properties.js.map

package/dist/ir/converters/statements/declarations/classes/properties.js.map

@@ -1 +1 @@
-{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/properties.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD;;;;GAIG;AACH,MAAM,eAAe,GAAG,CACtB,IAA4B,EAC5B,OAAuB,EACvB,EAAE;IACF,iDAAiD;IACjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IACD,2DAA2D;IAC3D,OAAO,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,IAA4B,EAC5B,OAAuB,EACvB,UAAsD,EACvC,EAAE;IACjB,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;IAE9E,MAAM,YAAY,GAAG,cAAc,CACjC,UAAU,EACV,UAAU,EACV,UAAU,EACV,OAAO,CACR,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;QACpC,WAAW,EAAE,IAAI,CAAC,WAAW;YAC3B,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC;YAC9C,CAAC,CAAC,SAAS;QACb,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC;QACjC,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC;QACrC,aAAa,EAAE,gBAAgB,CAAC,IAAI,CAAC;QACrC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACtD,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;KACnD,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/properties.ts"],"names":[],"mappings":"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"}

package/dist/ir/converters/statements/declarations/enums.d.ts

@@ -3,8 +3,9 @@
  */
 import * as ts from "typescript";
 import { IrEnumDeclaration } from "../../../types.js";
+import type { ProgramContext } from "../../../program-context.js";
 /**
  * Convert enum declaration
  */
-export declare const convertEnumDeclaration: (node: ts.EnumDeclaration, checker: ts.TypeChecker) => IrEnumDeclaration;
+export declare const convertEnumDeclaration: (node: ts.EnumDeclaration, ctx: ProgramContext) => IrEnumDeclaration;
 //# sourceMappingURL=enums.d.ts.map

package/dist/ir/converters/statements/declarations/enums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/enums.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAItD;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,eAAe,EACxB,SAAS,EAAE,CAAC,WAAW,KACtB,iBAaF,CAAC"}
+{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/enums.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAU,MAAM,mBAAmB,CAAC;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAQlE;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,eAAe,EACxB,KAAK,cAAc,KAClB,iBAcF,CAAC"}

package/dist/ir/converters/statements/declarations/enums.js

@@ -4,18 +4,24 @@
 import * as ts from "typescript";
 import { convertExpression } from "../../../expression-converter.js";
 import { hasExportModifier } from "../helpers.js";
+/**
+ * Int type constant for enum initializers
+ * Enums in C# use int values, so we pass this as expectedType for deterministic typing.
+ */
+const INT_TYPE = { kind: "primitiveType", name: "int" };
 /**
  * Convert enum declaration
  */
-export const convertEnumDeclaration = (node, checker) => {
+export const convertEnumDeclaration = (node, ctx) => {
     return {
         kind: "enumDeclaration",
         name: node.name.text,
         members: node.members.map((m) => ({
             kind: "enumMember",
             name: ts.isIdentifier(m.name) ? m.name.text : "[computed]",
+            // Thread int type to enum initializers for deterministic typing
             initializer: m.initializer
-                ? convertExpression(m.initializer, checker)
+                ? convertExpression(m.initializer, ctx, INT_TYPE)
                 : undefined,
         })),
         isExported: hasExportModifier(node),

package/dist/ir/converters/statements/declarations/enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/enums.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAwB,EACxB,OAAuB,EACJ,EAAE;IACrB,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,EAAE,YAAqB;YAC3B,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY;YAC1D,WAAW,EAAE,CAAC,CAAC,WAAW;gBACxB,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC;gBAC3C,CAAC,CAAC,SAAS;SACd,CAAC,CAAC;QACH,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;KACpC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/enums.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGlD;;;GAGG;AACH,MAAM,QAAQ,GAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAwB,EACxB,GAAmB,EACA,EAAE;IACrB,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,EAAE,YAAqB;YAC3B,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY;YAC1D,gEAAgE;YAChE,WAAW,EAAE,CAAC,CAAC,WAAW;gBACxB,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC;gBACjD,CAAC,CAAC,SAAS;SACd,CAAC,CAAC;QACH,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;KACpC,CAAC;AACJ,CAAC,CAAC"}