@tsonic/frontend 0.0.13 → 0.0.15

package/dist/ir/converters/expressions/functions.js

@@ -2,87 +2,195 @@
  * Function expression converters (function expressions and arrow functions)
  */
 import * as ts from "typescript";
-import { getInferredType, getSourceSpan } from "./helpers.js";
+import { getSourceSpan } from "./helpers.js";
 import { convertExpression } from "../../expression-converter.js";
 import { convertBlockStatement } from "../../statement-converter.js";
-import { convertType, convertBindingName, inferLambdaParamTypes, } from "../../type-converter.js";
+import { convertBindingName } from "../../syntax/binding-patterns.js";
+/**
+ * Extract parameter types from an expected function type.
+ * DETERMINISTIC: Uses only the IR type structure, not TS type inference.
+ */
+const extractParamTypesFromExpectedType = (expectedType) => {
+    if (!expectedType)
+        return undefined;
+    if (expectedType.kind !== "functionType")
+        return undefined;
+    return expectedType.parameters.map((p) => p.type);
+};
 /**
  * Convert parameters for lambda expressions (arrow functions and function expressions).
- * Uses contextual signature inference for parameters without explicit type annotations.
+ *
+ * DETERMINISTIC TYPING: Parameter types come from:
+ * 1. Explicit type annotations on the parameter
+ * 2. expectedType (function type passed from call site via extractParameterTypes)
+ *
+ * If no type is available, parameter type is undefined (unknownType poison).
+ * Validation will emit TSN5202 for untyped lambda parameters.
  */
-const convertLambdaParameters = (node, checker) => {
-    // Get inferred types from contextual signature
-    const inference = inferLambdaParamTypes(node, checker);
+const convertLambdaParameters = (node, ctx, expectedType) => {
+    // DETERMINISTIC: Extract parameter types from expectedType (the ONLY source for unannotated params)
+    const expectedParamTypes = extractParamTypesFromExpectedType(expectedType);
     return node.parameters.map((param, index) => {
         let passing = "value";
         let actualType = param.type;
-        // Detect ref<T>, out<T>, in<T> wrapper types (explicit annotation only)
-        if (param.type &&
-            ts.isTypeReferenceNode(param.type) &&
-            ts.isIdentifier(param.type.typeName)) {
-            const typeName = param.type.typeName.text;
-            if ((typeName === "ref" || typeName === "out" || typeName === "in") &&
-                param.type.typeArguments &&
-                param.type.typeArguments.length > 0) {
+        let isExtensionReceiver = false;
+        // Detect wrapper types (explicit annotation only):
+        // - thisarg<T> marks an extension-method receiver parameter (emits C# `this`)
+        // - ref<T>/out<T>/in<T> wrapper types mark passing mode (unwrap to T)
+        while (actualType &&
+            ts.isTypeReferenceNode(actualType) &&
+            ts.isIdentifier(actualType.typeName) &&
+            actualType.typeArguments &&
+            actualType.typeArguments.length > 0) {
+            const typeName = actualType.typeName.text;
+            if (typeName === "thisarg") {
+                isExtensionReceiver = true;
+                actualType = actualType.typeArguments[0];
+                continue;
+            }
+            if (typeName === "ref" || typeName === "out" || typeName === "in") {
                 passing = typeName === "in" ? "in" : typeName;
-                actualType = param.type.typeArguments[0];
+                actualType = actualType.typeArguments[0];
+                continue;
             }
+            break;
         }
         // Determine the IrType for this parameter
+        // DETERMINISTIC Priority: 1. Explicit annotation, 2. expectedType from call site
         let irType;
         if (actualType) {
-            // Explicit type annotation - use it
-            irType = convertType(actualType, checker);
+            // Explicit type annotation
+            // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+            const typeSystem = ctx.typeSystem;
+            irType = typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(actualType));
         }
-        else if (inference) {
-            // No explicit type - use inferred type from contextual signature
-            irType = inference.paramTypes[index];
+        else if (expectedParamTypes && expectedParamTypes[index]) {
+            // Use expectedType from call site (deterministic)
+            irType = expectedParamTypes[index];
         }
+        // If no type available, irType stays undefined (unknownType poison)
+        // Validation will emit TSN5202 for untyped lambda parameters
         return {
             kind: "parameter",
             pattern: convertBindingName(param.name),
             type: irType,
+            // Pass parameter type for contextual typing of default value
             initializer: param.initializer
-                ? convertExpression(param.initializer, checker)
+                ? convertExpression(param.initializer, ctx, irType)
                 : undefined,
             isOptional: !!param.questionToken,
             isRest: !!param.dotDotDotToken,
             passing,
+            isExtensionReceiver: isExtensionReceiver || undefined,
         };
     });
 };
 /**
  * Convert function expression
+ *
+ * DETERMINISTIC TYPING: Build function type from declared parameters and return type.
+ * Parameter types come from explicit annotations or expectedType (no TS inference).
  */
-export const convertFunctionExpression = (node, checker) => {
+export const convertFunctionExpression = (node, ctx, expectedType) => {
+    // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+    const typeSystem = ctx.typeSystem;
+    // Get return type from declared annotation for contextual typing
+    const returnType = node.type
+        ? typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(node.type))
+        : undefined;
+    // DETERMINISTIC: Pass expectedType for parameter type inference
+    const parameters = convertLambdaParameters(node, ctx, expectedType);
+    const bodyCtx = (() => {
+        const env = new Map(ctx.lambdaTypeEnv ?? []);
+        for (const p of parameters) {
+            if (p.pattern.kind === "identifierPattern" && p.type) {
+                env.set(p.pattern.name, p.type);
+            }
+        }
+        return { ...ctx, lambdaTypeEnv: env };
+    })();
+    // DETERMINISTIC: Build function type from declared parameters and return type
+    const inferredType = {
+        kind: "functionType",
+        parameters,
+        returnType: returnType ?? { kind: "voidType" },
+    };
     return {
         kind: "functionExpression",
         name: node.name?.text,
-        parameters: convertLambdaParameters(node, checker),
-        returnType: node.type ? convertType(node.type, checker) : undefined,
+        parameters,
+        returnType,
+        // Pass return type to body for contextual typing of return statements
         body: node.body
-            ? convertBlockStatement(node.body, checker)
+            ? convertBlockStatement(node.body, bodyCtx, returnType)
             : { kind: "blockStatement", statements: [] },
         isAsync: !!node.modifiers?.some((m) => m.kind === ts.SyntaxKind.AsyncKeyword),
         isGenerator: !!node.asteriskToken,
-        inferredType: getInferredType(node, checker),
+        inferredType,
         sourceSpan: getSourceSpan(node),
     };
 };
 /**
  * Convert arrow function expression
+ *
+ * DETERMINISTIC TYPING: Build function type from declared parameters and return type.
+ * Parameter types come from explicit annotations or expectedType (no TS inference).
  */
-export const convertArrowFunction = (node, checker) => {
+export const convertArrowFunction = (node, ctx, expectedType) => {
+    // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+    const typeSystem = ctx.typeSystem;
+    const expectedFnType = expectedType?.kind === "functionType" ? expectedType : undefined;
+    // Get return type from declared annotation, or from expectedType if available
+    const declaredReturnType = node.type
+        ? typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(node.type))
+        : undefined;
+    // DETERMINISTIC: Use expectedType's return type if no explicit annotation
+    const expectedReturnType = expectedFnType?.returnType;
+    const shouldUseExpectedReturnType = expectedReturnType !== undefined &&
+        expectedReturnType.kind !== "typeParameterType" &&
+        !typeSystem.containsTypeParameter(expectedReturnType);
+    const contextualReturnType = declaredReturnType ??
+        (shouldUseExpectedReturnType ? expectedReturnType : undefined);
+    // DETERMINISTIC: Pass expectedType for parameter type inference
+    const parameters = convertLambdaParameters(node, ctx, expectedType);
+    const bodyCtx = (() => {
+        const env = new Map(ctx.lambdaTypeEnv ?? []);
+        for (const p of parameters) {
+            if (p.pattern.kind === "identifierPattern" && p.type) {
+                env.set(p.pattern.name, p.type);
+            }
+        }
+        return { ...ctx, lambdaTypeEnv: env };
+    })();
+    // Pass return type to body for contextual typing:
+    // - Block body: return statements get the expected type
+    // - Expression body: the expression gets the expected type
     const body = ts.isBlock(node.body)
-        ? convertBlockStatement(node.body, checker)
-        : convertExpression(node.body, checker);
+        ? convertBlockStatement(node.body, bodyCtx, declaredReturnType ?? expectedReturnType)
+        : convertExpression(node.body, bodyCtx, contextualReturnType);
+    const returnType = declaredReturnType ??
+        (shouldUseExpectedReturnType
+            ? expectedReturnType
+            : !ts.isBlock(node.body)
+                ? body.inferredType ??
+                    { kind: "voidType" }
+                : expectedReturnType);
+    // DETERMINISTIC TYPING: contextualType comes from expectedType
+    const contextualType = expectedType;
+    // DETERMINISTIC: Build function type from declared parameters and return type
+    const inferredType = {
+        kind: "functionType",
+        parameters,
+        returnType: returnType ?? { kind: "voidType" },
+    };
     return {
         kind: "arrowFunction",
-        parameters: convertLambdaParameters(node, checker),
-        returnType: node.type ? convertType(node.type, checker) : undefined,
+        parameters,
+        returnType,
         body,
         isAsync: !!node.modifiers?.some((m) => m.kind === ts.SyntaxKind.AsyncKeyword),
-        inferredType: getInferredType(node, checker),
+        inferredType,
+        contextualType,
         sourceSpan: getSourceSpan(node),
     };
 };

package/dist/ir/converters/expressions/functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/functions.ts"],"names":[],"mappings":"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"}

package/dist/ir/converters/expressions/helpers.d.ts

@@ -1,34 +1,35 @@
 /**
  * Helper functions for expression conversion
+ *
+ * ALICE'S SPEC: All type resolution goes through TypeSystem.
+ * NO getHandleRegistry() calls allowed here.
  */
 import * as ts from "typescript";
 import { IrType } from "../../types.js";
 import { SourceLocation } from "../../../types/diagnostic.js";
+import type { ProgramContext } from "../../program-context.js";
 /**
  * Get source span for a TypeScript node.
  * Returns a SourceLocation that can be used for diagnostics.
  */
 export declare const getSourceSpan: (node: ts.Node) => SourceLocation | undefined;
+export declare const deriveIdentifierType: (node: ts.Identifier, ctx: ProgramContext) => IrType | undefined;
 /**
- * Helper to get inferred type from TypeScript node
- * Prefers contextual type (from assignment target, return position, etc.)
- * over literal type to handle cases like empty arrays `[]` correctly.
+ * Extract explicit type arguments from a call or new expression.
  *
- * IMPORTANT: For numeric types, we do NOT use contextual type. This prevents
- * numeric intent from leaking through TypeScript's contextual typing.
- * The `numericNarrowing` IR node is the ONLY source of numeric intent.
- */
-export declare const getInferredType: (node: ts.Node, checker: ts.TypeChecker) => IrType | undefined;
-/**
- * Extract type arguments from a call or new expression
- * This captures both explicit type arguments and inferred ones
+ * DETERMINISTIC TYPING: Only returns type arguments that are explicitly
+ * specified in the source code. Does NOT use TypeScript's type inference
+ * to infer type arguments. For inferred type arguments, use expectedType
+ * threading in the caller (Step 6 of deterministic typing).
  */
-export declare const extractTypeArguments: (node: ts.CallExpression | ts.NewExpression, checker: ts.TypeChecker) => readonly IrType[] | undefined;
+export declare const extractTypeArguments: (node: ts.CallExpression | ts.NewExpression, ctx: ProgramContext) => readonly IrType[] | undefined;
 /**
  * Check if a call/new expression requires specialization
  * Returns true for conditional types, infer, variadic generics, this typing
+ *
+ * DETERMINISTIC: Uses Binding API to resolve signatures and extract declaration info.
  */
-export declare const checkIfRequiresSpecialization: (node: ts.CallExpression | ts.NewExpression, checker: ts.TypeChecker) => boolean;
+export declare const checkIfRequiresSpecialization: (node: ts.CallExpression | ts.NewExpression, ctx: ProgramContext) => boolean;
 /**
  * Convert TypeScript binary operator token to string
  */
@@ -38,16 +39,14 @@ export declare const convertBinaryOperator: (token: ts.BinaryOperatorToken) => s
  */
 export declare const isAssignmentOperator: (token: ts.BinaryOperatorToken) => boolean;
 /**
- * Get the contextual type for an expression (for object literals).
- * Returns an IrType with type arguments if the contextual type is a named type
- * (interface, class, generic), or undefined if it's an anonymous/primitive type.
+ * Get the contextual type for an expression from explicit TypeNodes.
  *
- * This captures the full type including generic type arguments (e.g., Container<T>),
- * which is essential for emitting correct C# object initializers.
- */
-export declare const getContextualType: (node: ts.Expression, checker: ts.TypeChecker) => IrType | undefined;
-/**
- * @deprecated Use getContextualType instead - returns IrType with type arguments
+ * DETERMINISTIC TYPING: Only extracts types from explicit TypeNodes in the
+ * source code. Does NOT use TypeScript's getContextualType (banned API).
+ * Returns undefined if no explicit type annotation is found.
+ *
+ * For complete expectedType threading (covering all contexts), see Step 6
+ * of deterministic typing implementation.
  */
-export declare const getContextualTypeName: (node: ts.Expression, checker: ts.TypeChecker) => string | undefined;
+export declare const getContextualType: (node: ts.Expression, ctx: ProgramContext) => IrType | undefined;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/ir/converters/expressions/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAA0B,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,cAAc,GAAG,SAc9D,CAAC;AAkIF;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,EAAE,CAAC,IAAI,EACb,SAAS,EAAE,CAAC,WAAW,KACtB,MAAM,GAAG,SA2EX,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,aAAa,EAC1C,SAAS,EAAE,CAAC,WAAW,KACtB,SAAS,MAAM,EAAE,GAAG,SAoCtB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,6BAA6B,GACxC,MAAM,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,aAAa,EAC1C,SAAS,EAAE,CAAC,WAAW,KACtB,OA0CF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,OAAO,EAAE,CAAC,mBAAmB,KAC5B,MA8CF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,OAAO,EAAE,CAAC,mBAAmB,KAC5B,OAKF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,EAAE,CAAC,UAAU,EACnB,SAAS,EAAE,CAAC,WAAW,KACtB,MAAM,GAAG,SAwCX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,EAAE,CAAC,UAAU,EACnB,SAAS,EAAE,CAAC,WAAW,KACtB,MAAM,GAAG,SAMX,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,cAAc,GAAG,SAc9D,CAAC;AAgLF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,EAAE,CAAC,UAAU,EACnB,KAAK,cAAc,KAClB,MAAM,GAAG,SAeX,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,aAAa,EAC1C,KAAK,cAAc,KAClB,SAAS,MAAM,EAAE,GAAG,SAkBtB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GACxC,MAAM,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,aAAa,EAC1C,KAAK,cAAc,KAClB,OA2BF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,OAAO,EAAE,CAAC,mBAAmB,KAC5B,MA8CF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,OAAO,EAAE,CAAC,mBAAmB,KAC5B,OAKF,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,EAAE,CAAC,UAAU,EACnB,KAAK,cAAc,KAClB,MAAM,GAAG,SA0FX,CAAC"}