npm - @tsonic/frontend - Versions diffs - 0.0.73 → 0.0.75 - Mend

@tsonic/frontend 0.0.73 → 0.0.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1786) hide show

package/dist/ir/converters/statements/declarations/classes/methods.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/methods.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/methods.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/ir/converters/statements/declarations/classes/orchestrator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/orchestrator.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAiB,MAAM,sBAAsB,CAAC;AAazE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;~~AAkGrE~~;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,MAAM,EAAE,CAAC,gBAAgB,EACzB,KAAK,cAAc,KAClB,kBAAkB,GAAG,~~IAoJvB~~,CAAC"}
1	+ {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/orchestrator.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAiB,MAAM,sBAAsB,CAAC;AAazE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAmGrE;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,MAAM,EAAE,CAAC,gBAAgB,EACzB,KAAK,cAAc,KAClB,kBAAkB,GAAG,IAiIvB,CAAC"}

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

@@ -2,10 +2,12 @@
  * Class declaration conversion orchestrator
  */
 import * as ts from "typescript";
-import { hasExportModifier, convertTypeParameters, hasStaticModifier, hasDeclareModifier, } from "../../helpers.js";
+import { hasExportModifier, convertTypeParameters, hasDeclareModifier, } from "../../helpers.js";
 import { convertAccessorProperty, convertProperty } from "./properties.js";
-import { convertMethod, convertMethodOverloadGroup } from "./methods.js";
+import { convertMethod } from "./methods.js";
 import { convertConstructor, extractParameterProperties, } from "./constructors.js";
+import { getClassMemberName } from "./member-names.js";
+import { resolveHeritageReferenceType } from "../../../heritage-reference-type.js";
 /**
  * Convert a single class member
  */
@@ -102,32 +104,16 @@ export const convertClassDeclaration = (node, ctx) => {
         return true;
     })
         .map((t) => ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(unwrapInterfaceHeritageType(t)))) ?? [];
-    // Extract parameter properties from constructor
-    const constructor = node.members.find(ts.isConstructorDeclaration);
-    const parameterProperties = extractParameterProperties(constructor, ctx);
     // Filter to only include members declared directly on this class (not inherited)
     const ownMembers = filterOwnMembers(node);
-    // Pre-group overload method declarations by (static, name) so we can emit one C# method per signature.
-    const methodGroups = new Map();
-    for (const member of ownMembers) {
-        if (!ts.isMethodDeclaration(member))
-            continue;
-        if (!ts.isIdentifier(member.name))
-            continue; // computed names: don't group
-        const key = `${hasStaticModifier(member) ? "static" : "instance"}:${member.name.text}`;
-        const list = methodGroups.get(key);
-        if (list)
-            list.push(member);
-        else
-            methodGroups.set(key, [member]);
-    }
+    const constructorImplementation = ownMembers.find(ts.isConstructorDeclaration);
+    // Extract parameter properties from the implementation constructor when present.
+    const parameterProperties = extractParameterProperties(constructorImplementation, ctx);
     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 name = getClassMemberName(member.name);
             const entry = accessorPairs.get(name) ?? {};
             if (ts.isGetAccessorDeclaration(member)) {
                 entry.getter = member;
@@ -140,13 +126,10 @@ export const convertClassDeclaration = (node, ctx) => {
     }
     const convertedMembers = [];
     const seenAccessors = new Set();
-    const seenMethodGroups = new Set();
     for (const member of ownMembers) {
         if (ts.isGetAccessorDeclaration(member) ||
             ts.isSetAccessorDeclaration(member)) {
-            const name = ts.isIdentifier(member.name)
-                ? member.name.text
-                : "[computed]";
+            const name = getClassMemberName(member.name);
             if (seenAccessors.has(name))
                 continue;
             seenAccessors.add(name);
@@ -155,23 +138,14 @@ export const convertClassDeclaration = (node, ctx) => {
             continue;
         }
         if (ts.isMethodDeclaration(member)) {
-            if (ts.isIdentifier(member.name)) {
-                const key = `${hasStaticModifier(member) ? "static" : "instance"}:${member.name.text}`;
-                if (seenMethodGroups.has(key))
-                    continue;
-                seenMethodGroups.add(key);
-                const group = methodGroups.get(key);
-                if (!group) {
-                    throw new Error(`ICE: missing method group for key '${key}'`);
-                }
-                convertedMembers.push(...convertMethodOverloadGroup(group, ctx, superClass));
-                continue;
-            }
-            // Computed method names: no overload grouping.
             convertedMembers.push(convertMethod(member, ctx, superClass));
             continue;
         }
-        const converted = convertClassMember(member, ctx, superClass, constructor?.parameters);
+        if (ts.isConstructorDeclaration(member)) {
+            convertedMembers.push(convertConstructor(member, ctx, constructorImplementation?.parameters));
+            continue;
+        }
+        const converted = convertClassMember(member, ctx, superClass, constructorImplementation?.parameters);
         if (converted) {
             convertedMembers.push(converted);
         }
@@ -189,7 +163,7 @@ export const convertClassDeclaration = (node, ctx) => {
         name: node.name.text,
         typeParameters: convertTypeParameters(node.typeParameters, ctx),
         superClass: superClass
-            ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(superClass))
+            ? resolveHeritageReferenceType(superClass, ctx)
             : undefined,
         implements: implementsTypes,
         members: finalMembers,

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

	@@ -1 +1 @@
1	- {"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,EACL,iBAAiB,EACjB,qBAAqB,EACrB,~~iBAAiB,EACjB,~~kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,~~0BAA0B,EAAE,~~MAAM,cAAc,CAAC;~~AACzE~~,OAAO,EACL,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;~~AAG3B~~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~~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~~,~~uGAAuG;IACvG,~~MAAM,~~YAAY~~,GAAG,~~IAAI,GAAG,EAAkC,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,~~UAAU,~~EAAE,~~CAAC~~;QAChC~~,IAAI,~~CAAC~~,EAAE,CAAC,~~mBAAmB~~,~~CAAC~~,~~MAAM,~~CAAC;~~YAAE~~,~~SAAS~~;~~QAC9C~~,~~IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,~~MAAM,~~CAAC~~,~~IAAI,CAAC;YAAE,SAAS,CAAC,8BAA8B;QAC3E,MAAM,~~GAAG,~~GAAG~~,~~GAAG~~,~~iBAAiB~~,~~CAAC~~,~~MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,~~GAAG,~~YAAY~~,CAAC~~,GAAG,CAAC,GAAG,CAAC,CAAC~~;~~QACnC~~,~~IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,~~MAAM,~~CAAC,CAAC;;YACvB,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,~~aAAa,GAAG,IAAI,GAAG,EAG1B,CAAC;IACJ,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,IACE,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;YACnC,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EACnC,CAAC;YACD,MAAM,IAAI,GAAG,~~EAAE~~,CAAC,~~YAAY,CAAC,~~MAAM,CAAC,IAAI,CAAC~~;gBACvC~~,CAAC~~,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI~~;~~gBAClB~~,~~CAAC,CAAC,YAAY,CAAC;YACjB,~~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,~~MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,~~KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,IACE,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;YACnC,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EACnC,CAAC;YACD,MAAM,IAAI,GAAG,~~EAAE~~,CAAC,~~YAAY,CAAC,~~MAAM,CAAC,IAAI,CAAC~~;gBACvC~~,CAAC~~,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI~~;~~gBAClB~~,~~CAAC,CAAC,YAAY,CAAC;YACjB,~~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,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,~~IAAI~~,~~EAAE,~~CAAC,~~YAAY,CAAC,MAAM,CAAC,~~IAAI,CAAC,~~EAAE~~,CAAC~~;gBACjC~~,MAAM,~~GAAG~~,GAAG,~~GAAG~~,~~iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,~~UAAU,~~IAAI,MAAM,~~CAAC,~~IAAI,~~CAAC,~~IAAI,EAAE,~~CAAC;~~gBACvF~~,~~IAAI,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,~~SAAS;~~gBACxC~~,~~gBAAgB,~~CAAC~~,GAAG,CAAC,GAAG,CAAC,CAAC~~;~~gBAC1B~~,~~MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpC,~~IAAI,~~CAAC,KAAK,~~EAAE,CAAC~~;oBACX~~,~~MAAM~~,~~IAAI,KAAK,~~CAAC,~~sCAAsC~~,~~GAAG,GAAG,~~CAAC,~~CAAC;gBAChE~~,CAAC;~~gBACD~~,gBAAgB,CAAC,IAAI,CACnB,~~GAAG~~,~~0BAA0B,~~CAAC,~~KAAK~~,EAAE,GAAG,EAAE,~~UAAU~~,~~CAAC,CACtD,CAAC;gBACF,SAAS;YACX,CAAC;YAED,+CAA+C;YAC/C,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,~~EAAE,~~GAAG,EAAE,~~UAAU,CAAC,~~CAAC~~,CAAC;~~YAC9D~~,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"}
1	+ {"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/orchestrator.ts"],"names":[],"mappings":"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"}

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

@@ -12,7 +12,10 @@ export type OverrideInfo = {
     /**
      * Required C# accessibility for an override against a CLR base member.
      *
-     * TypeScript cannot express `protected internal`, so we infer it from bindings.json.
+     * CLR `protected internal` members must be overridden as `protected` in
+     * generated source when the override is emitted from a different assembly.
+     * TypeScript cannot express these CLR distinctions directly, so we
+     * normalize them from bindings metadata here.
      */
     readonly requiredAccessibility?: "public" | "protected" | "internal" | "protected internal" | "private";
 };

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

	@@ -1 +1 @@
1	- {"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;AACrE,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,sBAAsB,CAAC;~~AAEhE~~,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B~~;;;;OAIG~~;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAC3B,QAAQ,GACR,WAAW,GACX,UAAU,GACV,oBAAoB,GACpB,SAAS,CAAC;CACf,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,aAAa,SAAS,WAAW,EAAE,KAClC,~~YAmDF~~,CAAC"}
1	+ {"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;AACrE,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,sBAAsB,CAAC;AAIhE,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B;;;;;;;OAOG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAC3B,QAAQ,GACR,WAAW,GACX,UAAU,GACV,oBAAoB,GACpB,SAAS,CAAC;CACf,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,aAAa,SAAS,WAAW,EAAE,KAClC,YAgEF,CAAC"}

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

@@ -4,6 +4,7 @@
  * ALICE'S SPEC: Uses TypeSystem exclusively for declaration queries.
  */
 import * as ts from "typescript";
+import { resolveHeritageReferenceType } from "../../../heritage-reference-type.js";
 /**
  * Check if a method/property should be marked as override based on base class metadata.
  * DETERMINISTIC: Uses Binding API for symbol resolution.
@@ -12,6 +13,13 @@ export const detectOverride = (memberName, memberKind, superClass, ctx, paramete
     if (!superClass) {
         return { isOverride: false, isShadow: false };
     }
+    const heritageType = resolveHeritageReferenceType(superClass, ctx);
+    const heritageClrName = heritageType.kind === "referenceType"
+        ? (heritageType.resolvedClrType ?? heritageType.typeId?.clrName)
+        : undefined;
+    if (heritageClrName && ctx.metadata.getTypeMetadata(heritageClrName)) {
+        return detectDotNetOverride(memberName, memberKind, heritageClrName, ctx, parameters);
+    }
     // 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)
@@ -29,16 +37,11 @@ export const detectOverride = (memberName, memberKind, superClass, ctx, paramete
     const qualifiedName = declId
         ? ctx.binding.getFullyQualifiedName(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 && qualifiedName) {
+    if (qualifiedName && ctx.metadata.getTypeMetadata(qualifiedName)) {
         return detectDotNetOverride(memberName, memberKind, qualifiedName, ctx, parameters);
     }
-    else if (declId) {
-        // ALICE'S SPEC (Phase 5): Use semantic method instead of getDeclInfo
-        return ctx.typeSystem.checkTsClassMemberOverride(declId, memberName, memberKind);
+    if (declId) {
+        return ctx.typeSystem.checkTsClassMemberOverride(declId, memberName, memberKind, parameters, heritageType);
     }
     return { isOverride: false, isShadow: false };
 };
@@ -61,6 +64,7 @@ const getFullPropertyAccessName = (expr) => {
  * Detect override for .NET base classes using metadata
  */
 const detectDotNetOverride = (memberName, memberKind, qualifiedName, ctx, parameters) => {
+    const toOverrideAccessibility = (visibility) => visibility === "protected internal" ? "protected" : visibility;
     if (memberKind === "method" && parameters) {
         const parameterTypes = [];
         for (const p of parameters) {
@@ -84,7 +88,9 @@ const detectDotNetOverride = (memberName, memberKind, qualifiedName, ctx, parame
         return {
             isOverride: canOverride,
             isShadow: !canOverride,
-            requiredAccessibility: canOverride ? meta.visibility : undefined,
+            requiredAccessibility: canOverride
+                ? toOverrideAccessibility(meta.visibility)
+                : undefined,
         };
     }
     else if (memberKind === "property") {
@@ -96,7 +102,9 @@ const detectDotNetOverride = (memberName, memberKind, qualifiedName, ctx, parame
         return {
             isOverride: canOverride,
             isShadow: !canOverride,
-            requiredAccessibility: canOverride ? meta.visibility : undefined,
+            requiredAccessibility: canOverride
+                ? toOverrideAccessibility(meta.visibility)
+                : undefined,
         };
     }
     return { isOverride: false, isShadow: false };

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

	@@ -1 +1 @@
1	- {"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;~~AAoBjC~~;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,UAAkB,EAClB,UAAiC,EACjC,UAAsD,EACtD,GAAmB,EACnB,UAAmC,EACrB,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,kFAAkF;IAClF,MAAM,aAAa,GAAG,MAAM;QAC1B,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC;QAC3C,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,UAAU,CACX,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,UAAmC,EACrB,EAAE;IAChB,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YAChD,CAAC;YAED,+DAA+D;YAC/D,cAAc,CAAC,IAAI,CACjB,CAAC,CAAC,OAAO,KAAK,OAAO;gBACnB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACnB,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,GAAG,KAAK,GAAG,CAClB,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;QAE5D,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CACzC,aAAa,EACb,UAAU,EACV,cAAc,EACd,YAAY,CACb,CAAC;QAEF,oEAAoE;QACpE,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEzD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;QAClE,OAAO;YACL,UAAU,EAAE,WAAW;YACvB,QAAQ,EAAE,CAAC,WAAW;YACtB,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;~~SACjE~~,CAAC;IACJ,CAAC;SAAM,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QACrC,2CAA2C;QAC3C,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEzD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;QAClE,OAAO;YACL,UAAU,EAAE,WAAW;YACvB,QAAQ,EAAE,CAAC,WAAW;YACtB,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;~~SACjE~~,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAChD,CAAC,CAAC;~~AAEF~~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"}
1	+ {"version":3,"file":"override-detection.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/override-detection.ts"],"names":[],"mappings":"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"}

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

	@@ -1 +1 @@
1	- {"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;~~AAU9B~~,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAoDrE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,EAAE,CAAC,mBAAmB,EAC5B,KAAK,cAAc,EACnB,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,KACrD,~~aAoGF~~,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,~~aAwEF~~,CAAC"}
1	+ {"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;AAc9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAoDrE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,EAAE,CAAC,mBAAmB,EAC5B,KAAK,cAAc,EACnB,YAAY,EAAE,CAAC,2BAA2B,GAAG,SAAS,KACrD,aAyGF,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,aA4EF,CAAC"}

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

@@ -9,6 +9,7 @@ import { convertExpression } from "../../../../expression-converter.js";
 import { convertBlockStatement } from "../../control.js";
 import { hasStaticModifier, hasReadonlyModifier, getAccessibility, makeOptionalType, } from "../../helpers.js";
 import { detectOverride } from "./override-detection.js";
+import { getClassMemberName, isPrivateClassMemberName, } from "./member-names.js";
 import { createDiagnostic } from "../../../../../types/diagnostic.js";
 import { getSourceLocation } from "../../../../../program/diagnostics.js";
 /**
@@ -59,12 +60,13 @@ const deriveTypeFromGetterBody = (body) => {
  * the type is derived from the converted initializer expression.
  */
 export const convertProperty = (node, ctx, superClass) => {
-    const memberName = ts.isIdentifier(node.name) ? node.name.text : "[computed]";
+    const memberName = getClassMemberName(node.name);
+    const isEcmaPrivate = isPrivateClassMemberName(node.name);
     const overrideInfo = detectOverride(memberName, "property", superClass, ctx);
     const declaredAccessibility = getAccessibility(node);
     const accessibility = (() => {
         if (!overrideInfo.isOverride || !overrideInfo.requiredAccessibility) {
-            return declaredAccessibility;
+            return isEcmaPrivate ? "private" : declaredAccessibility;
         }
         // Airplane-grade: always emit CLR-required accessibility for overrides.
         // TS may not represent CLR access cleanly, but C# compilation enforces the truth.
@@ -99,6 +101,9 @@ export const convertProperty = (node, ctx, superClass) => {
         }
         break;
     }
+    if (isEcmaPrivate) {
+        emitAsField = true;
+    }
     if (emitAsField && overrideInfo.isOverride) {
         const sf = node.getSourceFile();
         ctx.diagnostics.push(createDiagnostic("TSN6204", "error", "`field<T>` cannot be used on an overriding property. C# fields cannot override base members.", getSourceLocation(sf, node.getStart(sf), node.getWidth(sf)), "Remove the `field<T>` marker or override as a property instead."));
@@ -167,9 +172,11 @@ export const convertAccessorProperty = (memberName, getter, setter, ctx, superCl
         : setter
             ? getAccessibility(setter)
             : "public";
+    const isEcmaPrivate = isPrivateClassMemberName(getter?.name) ||
+        isPrivateClassMemberName(setter?.name);
     const finalAccessibility = (() => {
         if (!overrideInfo.isOverride || !overrideInfo.requiredAccessibility) {
-            return accessibility;
+            return isEcmaPrivate ? "private" : accessibility;
         }
         return overrideInfo.requiredAccessibility;
     })();

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

	@@ -1 +1 @@
1	- {"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../../src/ir/converters/statements/declarations/classes/properties.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAOjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;~~AAEzD~~,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAC,IAAkB,EAAsB,EAAE;IAC1E,kEAAkE;IAClE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,uEAAuE;IACvE,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;QACD,mCAAmC;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,WAAW,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;gBAC3D,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,iEAAiE;IACjE,IAAI,cAAc,IAAI,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,oEAAoE;IACpE,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC/B,IAAsB,EACF,EAAE;IACtB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvD,OAAO,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,IAA4B,EAC5B,GAAmB,EACnB,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,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAE7E,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;QAC1B,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC;YACpE,OAAO,qBAAqB,CAAC;~~QAC/B~~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~~QACvB~~,CAAC;QAED,OAAO,YAAY,CAAC,qBAAqB,CAAC;IAC5C,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE;QAC5B,IAAI,CAAC,UAAU;YAAE,OAAO,SAAS,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC7B,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,YAAY;QAClB,UAAU;QACV,UAAU;QACV,eAAe;QACf,WAAW,EAAE,SAAS;QACtB,QAAQ;QACR,UAAU,EAAE,KAAK;QACjB,aAAa,EAAE,kBAAkB;QACjC,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"}
1	+ {"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/functions.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/functions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAO1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;~~AAElE~~;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,MAAM,EAAE,CAAC,mBAAmB,EAC5B,KAAK,cAAc,KAClB,qBAAqB,GAAG,~~IAyB1B~~,CAAC"}
1	+ {"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/functions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAO1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlE;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,MAAM,EAAE,CAAC,mBAAmB,EAC5B,KAAK,cAAc,KAClB,qBAAqB,GAAG,IAgC1B,CAAC"}

package/dist/ir/converters/statements/declarations/functions.js CHANGED Viewed

@@ -4,6 +4,8 @@
 import * as ts from "typescript";
 import { convertBlockStatement } from "../control.js";
 import { hasExportModifier, convertTypeParameters, convertParameters, } from "../helpers.js";
+import { withParameterTypeEnv } from "../../type-env.js";
+import { getReturnExpressionExpectedType } from "../../return-expression-types.js";
 /**
  * Convert function declaration
  */
@@ -15,16 +17,20 @@ export const convertFunctionDeclaration = (node, ctx) => {
     const returnType = node.type
         ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(node.type))
         : undefined;
+    const returnExpressionType = getReturnExpressionExpectedType(returnType, !!node.modifiers?.some((m) => m.kind === ts.SyntaxKind.AsyncKeyword));
+    const parameters = convertParameters(node.parameters, ctx);
+    const bodyCtx = withParameterTypeEnv(ctx, node.parameters, parameters);
     return {
         kind: "functionDeclaration",
         name: node.name.text,
         typeParameters: convertTypeParameters(node.typeParameters, ctx),
-        parameters: convertParameters(node.parameters, ctx),
+        parameters,
         returnType,
         // Pass return type to body for contextual typing of return statements
         body: node.body
-            ? convertBlockStatement(node.body, ctx, returnType)
+            ? convertBlockStatement(node.body, bodyCtx, returnExpressionType)
             : { kind: "blockStatement", statements: [] },
+        isDeclarationOnly: node.body ? undefined : true,
         isAsync: !!node.modifiers?.some((m) => m.kind === ts.SyntaxKind.AsyncKeyword),
         isGenerator: !!node.asteriskToken,
         isExported: hasExportModifier(node),

package/dist/ir/converters/statements/declarations/functions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/functions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,eAAe,CAAC;~~AAGvB~~;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,IAA4B,EAC5B,GAAmB,EACW,EAAE;IAChC,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAE5B,iEAAiE;IACjE,iEAAiE;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI;QAC1B,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzE,CAAC,CAAC,SAAS,CAAC;~~IAEd~~,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACpB,cAAc,EAAE,qBAAqB,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;QAC/D,UAAU~~,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC~~;~~QACnD~~,UAAU;QACV,sEAAsE;QACtE,IAAI,EAAE,IAAI,CAAC,IAAI;YACb,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,~~GAAG~~,EAAE,~~UAAU~~,CAAC;~~YACnD~~,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,EAAE;QAC9C,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAC7C;QACD,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa;QACjC,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;KACpC,CAAC;AACJ,CAAC,CAAC"}
1	+ {"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/functions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AAEnF;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,IAA4B,EAC5B,GAAmB,EACW,EAAE;IAChC,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAE5B,iEAAiE;IACjE,iEAAiE;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI;QAC1B,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzE,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,oBAAoB,GAAG,+BAA+B,CAC1D,UAAU,EACV,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CACrE,CAAC;IACF,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvE,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACpB,cAAc,EAAE,qBAAqB,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;QAC/D,UAAU;QACV,UAAU;QACV,sEAAsE;QACtE,IAAI,EAAE,IAAI,CAAC,IAAI;YACb,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC;YACjE,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,EAAE;QAC9C,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QAC/C,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAC7C;QACD,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa;QACjC,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;KACpC,CAAC;AACJ,CAAC,CAAC"}

package/dist/ir/converters/statements/declarations/interfaces.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/interfaces.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,sBAAsB,~~EAEvB~~,MAAM,mBAAmB,CAAC;AAO3B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;~~AAElE~~;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,WAAW,EACpB,KAAK,cAAc,KAClB,iBAAiB,GAAG,~~IA8BtB~~,CAAC;~~AAuHF~~;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,GACtC,MAAM,EAAE,CAAC,oBAAoB,EAC7B,KAAK,cAAc,KAClB,sBAAsB,GAAG,sBAAsB,GAAG,~~IA8DpD~~,CAAC"}
1	+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/interfaces.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,sBAAsB,EAGvB,MAAM,mBAAmB,CAAC;AAO3B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,WAAW,EACpB,KAAK,cAAc,KAClB,iBAAiB,GAAG,IAgCtB,CAAC;AAmLF;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,GACtC,MAAM,EAAE,CAAC,oBAAoB,EAC7B,KAAK,cAAc,KAClB,sBAAsB,GAAG,sBAAsB,GAAG,IA0EpD,CAAC"}

package/dist/ir/converters/statements/declarations/interfaces.js CHANGED Viewed

@@ -3,23 +3,30 @@
  */
 import * as ts from "typescript";
 import { hasExportModifier, hasReadonlyModifier, convertTypeParameters, convertParameters, } from "../helpers.js";
+import { tryResolveDeterministicPropertyName } from "../../../syntax/property-names.js";
 /**
  * Convert interface member
  */
 export const convertInterfaceMember = (node, ctx) => {
     if (ts.isPropertySignature(node) && node.type) {
+        const memberName = tryResolveDeterministicPropertyName(node.name);
+        if (!memberName)
+            return null;
         return {
             kind: "propertySignature",
-            name: node.name && ts.isIdentifier(node.name) ? node.name.text : "[computed]",
+            name: memberName,
             type: ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(node.type)),
             isOptional: !!node.questionToken,
             isReadonly: hasReadonlyModifier(node),
         };
     }
     if (ts.isMethodSignature(node)) {
+        const memberName = tryResolveDeterministicPropertyName(node.name);
+        if (!memberName)
+            return null;
         return {
             kind: "methodSignature",
-            name: node.name && ts.isIdentifier(node.name) ? node.name.text : "[computed]",
+            name: memberName,
             typeParameters: convertTypeParameters(node.typeParameters, ctx),
             parameters: convertParameters(node.parameters, ctx),
             returnType: node.type
@@ -97,6 +104,53 @@ const extractIndexSignatureOnlyInterface = (node, ctx) => {
     const valueType = ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(member.type));
     return { keyType, valueType };
 };
+const convertCallSignatureType = (node, ctx) => {
+    if (node.typeParameters && node.typeParameters.length > 0) {
+        return undefined;
+    }
+    return {
+        kind: "functionType",
+        parameters: convertParameters(node.parameters, ctx),
+        returnType: node.type
+            ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(node.type))
+            : { kind: "voidType" },
+    };
+};
+const extractCallableInterfaceOnlyType = (node, ctx) => {
+    if (node.typeParameters && node.typeParameters.length > 0) {
+        return undefined;
+    }
+    if (node.heritageClauses && node.heritageClauses.length > 0) {
+        return undefined;
+    }
+    if (node.members.length === 0) {
+        return undefined;
+    }
+    if (!node.members.every((member) => ts.isCallSignatureDeclaration(member))) {
+        return undefined;
+    }
+    const signatures = [];
+    for (const member of node.members) {
+        if (!ts.isCallSignatureDeclaration(member)) {
+            return undefined;
+        }
+        const signature = convertCallSignatureType(member, ctx);
+        if (!signature) {
+            return undefined;
+        }
+        signatures.push(signature);
+    }
+    if (signatures.length === 0) {
+        return undefined;
+    }
+    if (signatures.length === 1) {
+        return signatures[0];
+    }
+    return {
+        kind: "intersectionType",
+        types: signatures,
+    };
+};
 /**
  * Check if an interface declaration IS the struct marker itself (should be filtered out)
  */
@@ -143,6 +197,17 @@ export const convertInterfaceDeclaration = (node, ctx) => {
             isStruct: false,
         };
     }
+    const callableType = extractCallableInterfaceOnlyType(node, ctx);
+    if (callableType) {
+        return {
+            kind: "typeAliasDeclaration",
+            name: node.name.text,
+            typeParameters: [],
+            type: callableType,
+            isExported: hasExportModifier(node),
+            isStruct: false,
+        };
+    }
     // Detect struct marker in extends clause
     let isStruct = false;
     const extendsClause = node.heritageClauses?.find((h) => h.token === ts.SyntaxKind.ExtendsKeyword);