@scriptc/compiler 0.1.6 → 0.1.7

package/dist/frontend/lowering/lowerer.js

@@ -14,6 +14,7 @@ import { InternalCompilerError } from "../../errors.js";
  *   ("x.0", "x.1" for shadowing); the IR is scope-flat.
  */
 import { resolve } from "node:path";
+import { bindingSource } from "../binding-source.js";
 import { tsgoPath } from "../dts-paths.js";
 import * as ts from "../ts7/adapter.js";
 import { anyOpRequiresDynamicDiag, blockedBindingUseDiag, checkerPanicDiag, componentTypeDiag, isCheckerPanic, genericSignatureTypeDiag, indexSignatureTypeDiag, intersectionTypeDiag, noLoweringDiag, overloadedSignatureTypeDiag, recordShapeMismatchDiag, requiresDynamicApiDiag, requiresDynamicPackageDiag, requiresDynamicTypeDiag, unionMismatchDiag, unsupportedDiag, unsupportedTypeDiag, } from "../../diagnostics/diagnostic.js";
@@ -42,7 +43,7 @@ import { lowerUtilModuleCall } from "./lower-inspect.js";
 import { lowerComptime, comptimeBakeable, rejectComptimeCaptures, comptimeValueToIr } from "./lower-comptime.js";
 import { lowerStmts, noteBlockedBindings, isBlockedBinding, lowerScopedBlock, predeclareForwardCapture, predeclareForwardFnDecl, predeclareForwardVar, lowerStmt, lowerVarStatement, lowerDestructuringDecl, lowerDestructuringAssignParts, lowerBindingPattern, lowerJsvalBindingPattern, checkBindingElement, bindPatternTarget, isParseArgsDynCheckerType, lowerVarDeclList, lowerVarDecl, lowerSwitch, lowerTry, lowerExprStatement, lowerForOf, lowerForStatement } from "./lower-stmts.js";
 import { lowerExpr, maybeNarrow, lowerUnitComparison, lowerNullishCoalesce, lowerCondition, ensureBool, requireTruthyUnion, eqComparableUnion, lowerIntrinsicProperty, lowerArrayLiteral, lowerElementAccess, lowerElementWrite, lowerRecordKeyRead, ensureString, lowerTemplate, lowerAsExpression, lowerPrefixUnary, lowerBinary, lowerCaughtTypeofTest, caughtRead, caughtLocalOf, caughtToString, lowerInstanceOf, lowerRegexLiteral, lowerFieldRead, lowerUnionProperty, fieldTarget, fieldGetExpr, fieldSetStmt, lowerFieldCompound, uniqueSymbolKeyOf } from "./lower-exprs.js";
-import { finishOptionalChain, lowerOptionalChain } from "./expressions/optional-chains.js";
+import { finishOptionalChain, isOptionalChainTail, lowerOptionalChain } from "./expressions/optional-chains.js";
 import { foldedStringKeyOf, lowerDynObjectLiteral, lowerObjectLiteral, lowerShorthandValue, rejectThisInObjectMethod } from "./expressions/object-literals.js";
 import { lowerRecordFieldCall, lowerObjectMethodCall } from "./lower-calls.js";
 import { fenceCrossBlockNsRef, nsPathPrefix } from "./lower-namespaces.js";
@@ -3021,7 +3022,16 @@ export class Lowerer {
                 if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression)) {
                     const callbackIndices = hofCallbackIndices(node.expression.name.text, node.arguments.length >= 2);
                     const receiverNode = node.expression.expression;
-                    const receiver = this.mapTypeOf(this.typeOf(receiverNode));
+                    const receiverTs = this.typeOf(receiverNode);
+                    let receiver = this.mapTypeOf(receiverTs);
+                    // An array method after an optional-chain guard only runs on the
+                    // present receiver. The checker includes the chain's short-circuit
+                    // undefined in intermediate call types, so use the same narrowed
+                    // receiver the method lowerer sees when promoting HOF callbacks.
+                    if (callbackIndices !== null && receiver?.kind === "union" &&
+                        (node.expression.questionDotToken !== undefined || isOptionalChainTail(this, node))) {
+                        receiver = this.mapTypeOf(this.checker.getNonNullableType(receiverTs));
+                    }
                     const callback = callbackIndices === null ? undefined : node.arguments[0];
                     const tuple = receiver?.kind === "record" && this.shapes.get(receiver.shapeId)?.tuple === true;
                     // A JS/evolving-any array may have acquired a precise FLOW type
@@ -8109,7 +8119,7 @@ export class Lowerer {
         const ctx = this.ctx;
         const count = ctx.localCounters.get(name) ?? 0;
         ctx.localCounters.set(name, count + 1);
-        const local = { id: `${name}.${count}`, name, type, mutable };
+        const local = { id: `${name}.${count}`, name, type, mutable, source: bindingSource(nameNode) };
         ctx.locals.push(local);
         const symbol = this.checker.getSymbolAtLocation(nameNode);
         if (symbol)
@@ -8473,6 +8483,7 @@ export class Lowerer {
                         type: origin.type,
                         mutable: origin.mutable,
                         boxed: true,
+                        ...(origin.source ? { source: origin.source } : {}),
                         // TDZ travels with the binding: reads through ANY capture of a
                         // forward-captured const must trap while the box is empty.
                         ...(origin.tdz ? { tdz: true } : {}),