Unwrap substitution types early in `getPropertyTypeForIndexType` #57113

Andarist · 2024-01-21T10:29:54Z

Andarist · 2024-01-21T10:31:23Z

src/compiler/checker.ts

@@ -16173,7 +16173,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
    }

    function getSubstitutionType(baseType: Type, constraint: Type) {
-        return constraint.flags & TypeFlags.AnyOrUnknown || constraint === baseType || baseType.flags & TypeFlags.Any ?
+        return constraint.flags & TypeFlags.AnyOrUnknown || constraint === baseType || baseType.flags & TypeFlags.Any || !isGenericType(constraint) && !isGenericType(baseType) && isTypeAssignableTo(baseType, constraint) ?


alternatively, substitution types could get some improved handling in getPropertyTypeForIndexType

Yeah, I think I'd prefer getPropertyNameFromIndex + getPropertyTypeForIndexType being updated to handle substitutions - the more places we recognize them as transparently their original type (if the substituted version isn't useful), the better, since it makes it easier on us to broaden the scope of how we use substitution types to support other features.

As far as this approach goes... instantiateTypeWorker has similar logic to this - honestly, a lot of that logic should probably get moved into here, so it happens on initial construction and instantiation, rather than just instantiation.

I agree, the right approach is to erase them where needed. Omitting the substitution type just because the constraint is assignable isn't right and will definitely have adverse effects as the constraint may be a more specific type.

I pushed out the requested change. I decided to use a similar approach of unwrapping the substation type early in getPropertyTypeForIndexType like it was done in #58292

…ubstitution-types

jakebailey · 2024-06-27T14:27:34Z

@typescript-bot test it

typescript-bot · 2024-06-27T14:27:38Z

Starting jobs; this comment will be updated as builds start and complete.

Command	Status	Results
`test top400`	✅ Started	✅ Results
`user test this`	✅ Started	✅ Results
`run dt`	✅ Started	✅ Results
`perf test this faster`	✅ Started	👀 Results

typescript-bot · 2024-06-27T14:49:25Z

Hey @jakebailey, the results of running the DT tests are ready.

Everything looks the same!

You can check the log here.

typescript-bot · 2024-06-27T15:00:25Z

@jakebailey Here are the results of running the user tests with tsc comparing main and refs/pull/57113/merge:

Everything looks good!

typescript-bot · 2024-06-27T15:03:38Z

@jakebailey
The results of the perf run you requested are in!

Here they are:

tsc

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{Compiler-Unions - node (v18.15.0, x64)}
_Errors	₃₀	₃₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_62,153	_62,153	_~	_~	_~	_{p=1.000 n=6}
_Types	_50,242	_50,242	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{192,803k (± 0.75%)}	_{193,802k (± 0.95%)}	_~	_192,109k	_195,760k	_{p=0.630 n=6}
_{Parse Time}	_{1.30s (± 0.79%)}	_{1.30s (± 1.06%)}	_~	_1.29s	_1.32s	_{p=0.799 n=6}
_{Bind Time}	_{0.71s (± 0.57%)}	_0.71s	_~	_~	_~	_{p=0.405 n=6}
_{Check Time}	_{9.45s (± 0.47%)}	_{9.46s (± 0.94%)}	_~	_9.40s	_9.63s	_{p=0.469 n=6}
_{Emit Time}	_{2.74s (± 0.54%)}	_{2.75s (± 1.16%)}	_~	_2.71s	_2.79s	_{p=0.571 n=6}
_{Total Time}	_{14.21s (± 0.35%)}	_{14.22s (± 0.68%)}	_~	_14.12s	_14.40s	_{p=0.936 n=6}
_{angular-1 - node (v18.15.0, x64)}
_Errors	₅	₅	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_944,114	_944,114	_~	_~	_~	_{p=1.000 n=6}
_Types	_407,050	_407,050	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{1,218,375k (± 0.00%)}	_{1,218,347k (± 0.01%)}	_~	_1,218,259k	_1,218,405k	_{p=0.471 n=6}
_{Parse Time}	_{6.67s (± 0.54%)}	_{6.66s (± 0.77%)}	_~	_6.58s	_6.73s	_{p=1.000 n=6}
_{Bind Time}	_{1.86s (± 0.59%)}	_{1.86s (± 0.81%)}	_~	_1.84s	_1.88s	_{p=0.663 n=6}
_{Check Time}	_{30.67s (± 0.48%)}	_{30.63s (± 0.23%)}	_~	_30.54s	_30.74s	_{p=0.471 n=6}
_{Emit Time}	_{13.56s (± 0.39%)}	_{13.54s (± 0.32%)}	_~	_13.47s	_13.60s	_{p=0.746 n=6}
_{Total Time}	_{52.76s (± 0.38%)}	_{52.69s (± 0.15%)}	_~	_52.60s	_52.80s	_{p=0.230 n=6}
_{mui-docs - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_2,133,050	_2,133,050	_~	_~	_~	_{p=1.000 n=6}
_Types	_926,444	_926,444	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{2,115,455k (± 0.01%)}	_{2,115,550k (± 0.00%)}	_~	_2,115,352k	_2,115,635k	_{p=0.298 n=6}
_{Parse Time}	_{6.66s (± 0.52%)}	_{6.62s (± 0.23%)}	_{-0.04s (- 0.63%)}	_6.59s	_6.63s	_{p=0.045 n=6}
_{Bind Time}	_{2.34s (± 1.11%)}	_{2.30s (± 0.70%)}	_{-0.04s (- 1.64%)}	_2.29s	_2.33s	_{p=0.019 n=6}
_{Check Time}	_{70.54s (± 1.23%)}	_{70.96s (± 0.48%)}	_~	_70.37s	_71.37s	_{p=0.297 n=6}
_{Emit Time}	_{0.14s (± 2.95%)}	_{0.14s (± 5.69%)}	_~	_0.13s	_0.15s	_{p=0.206 n=6}
_{Total Time}	_{79.68s (± 1.06%)}	_{80.02s (± 0.39%)}	_~	_79.48s	_80.40s	_{p=0.575 n=6}
_{self-build-src - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_1,231,640	_1,231,640	_~	_~	_~	_{p=1.000 n=6}
_Types	_261,187	_261,187	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{2,347,498k (± 0.06%)}	_{2,347,606k (± 0.02%)}	_~	_2,347,131k	_2,348,198k	_{p=0.810 n=6}
_{Parse Time}	_{5.08s (± 0.99%)}	_{5.06s (± 0.89%)}	_~	_5.01s	_5.12s	_{p=0.572 n=6}
_{Bind Time}	_{1.94s (± 0.97%)}	_{1.93s (± 1.01%)}	_~	_1.90s	_1.96s	_{p=0.624 n=6}
_{Check Time}	_{34.17s (± 0.20%)}	_{34.09s (± 0.24%)}	_~	_33.98s	_34.21s	_{p=0.173 n=6}
_{Emit Time}	_{2.73s (± 3.96%)}	_{2.75s (± 2.36%)}	_~	_2.68s	_2.83s	_{p=0.335 n=6}
_{Total Time}	_{43.92s (± 0.32%)}	_{43.83s (± 0.34%)}	_~	_43.66s	_44.06s	_{p=0.378 n=6}
_{self-build-src-public-api - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_1,231,640	_1,231,640	_~	_~	_~	_{p=1.000 n=6}
_Types	_261,187	_261,187	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{2,425,268k (± 0.06%)}	_{2,423,967k (± 0.08%)}	_~	_2,421,935k	_2,426,256k	_{p=0.298 n=6}
_{Parse Time}	_{7.80s (± 1.00%)}	_{7.82s (± 1.27%)}	_~	_7.70s	_7.96s	_{p=0.689 n=6}
_{Bind Time}	_{2.54s (± 0.99%)}	_{2.51s (± 0.92%)}	_~	_2.49s	_2.54s	_{p=0.052 n=6}
_{Check Time}	_{50.00s (± 0.25%)}	_{50.05s (± 0.27%)}	_~	_49.87s	_50.21s	_{p=0.521 n=6}
_{Emit Time}	_{3.95s (± 4.70%)}	_{4.00s (± 2.99%)}	_~	_3.82s	_4.12s	_{p=0.423 n=6}
_{Total Time}	_{64.31s (± 0.33%)}	_{64.40s (± 0.40%)}	_~	_64.00s	_64.68s	_{p=0.423 n=6}
_{self-compiler - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_258,818	_258,818	_~	_~	_~	_{p=1.000 n=6}
_Types	_104,842	_104,842	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{428,255k (± 0.01%)}	_{428,248k (± 0.01%)}	_~	_428,222k	_428,276k	_{p=0.521 n=6}
_{Parse Time}	_{3.31s (± 0.30%)}	_{3.34s (± 1.33%)}	_~	_3.27s	_3.39s	_{p=0.193 n=6}
_{Bind Time}	_{1.30s (± 0.63%)}	_{1.30s (± 0.63%)}	_~	_1.29s	_1.31s	_{p=1.000 n=6}
_{Check Time}	_{17.79s (± 0.36%)}	_{17.77s (± 0.34%)}	_~	_17.67s	_17.81s	_{p=0.936 n=6}
_{Emit Time}	_{1.38s (± 1.21%)}	_{1.39s (± 1.20%)}	_~	_1.38s	_1.42s	_{p=0.616 n=6}
_{Total Time}	_{23.78s (± 0.27%)}	_{23.80s (± 0.22%)}	_~	_23.75s	_23.87s	_{p=1.000 n=6}
_{ts-pre-modules - node (v18.15.0, x64)}
_Errors	₃₅	₃₅	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_224,565	_224,565	_~	_~	_~	_{p=1.000 n=6}
_Types	_93,734	_93,734	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{369,531k (± 0.03%)}	_{369,465k (± 0.03%)}	_~	_369,395k	_369,669k	_{p=0.298 n=6}
_{Parse Time}	_{2.77s (± 1.11%)}	_{2.76s (± 0.81%)}	_~	_2.74s	_2.79s	_{p=1.000 n=6}
_{Bind Time}	_{1.57s (± 0.70%)}	_{1.58s (± 1.09%)}	_~	_1.56s	_1.60s	_{p=0.240 n=6}
_{Check Time}	_{15.46s (± 0.32%)}	_{15.43s (± 0.34%)}	_~	_15.39s	_15.53s	_{p=0.145 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{19.80s (± 0.31%)}	_{19.77s (± 0.31%)}	_~	_19.71s	_19.88s	_{p=0.422 n=6}
_{vscode - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_2,878,628	_2,878,628	_~	_~	_~	_{p=1.000 n=6}
_Types	_975,175	_975,175	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{3,042,138k (± 0.00%)}	_{3,042,122k (± 0.00%)}	_~	_3,042,068k	_3,042,161k	_{p=0.810 n=6}
_{Parse Time}	_{13.51s (± 0.27%)}	_{13.54s (± 0.53%)}	_~	_13.48s	_13.67s	_{p=0.570 n=6}
_{Bind Time}	_{4.18s (± 1.96%)}	_{4.15s (± 0.28%)}	_~	_4.13s	_4.16s	_{p=1.000 n=6}
_{Check Time}	_{72.79s (± 0.30%)}	_{72.85s (± 0.24%)}	_~	_72.66s	_73.10s	_{p=0.810 n=6}
_{Emit Time}	_{23.75s (± 0.38%)}	_{23.84s (± 0.73%)}	_~	_23.58s	_24.02s	_{p=0.574 n=6}
_{Total Time}	_{114.23s (± 0.23%)}	_{114.38s (± 0.17%)}	_~	_114.15s	_114.68s	_{p=0.422 n=6}
_{webpack - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_267,117	_267,117	_~	_~	_~	_{p=1.000 n=6}
_Types	_108,775	_108,775	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{411,577k (± 0.01%)}	_{411,560k (± 0.02%)}	_~	_411,489k	_411,659k	_{p=0.810 n=6}
_{Parse Time}	_{3.83s (± 0.77%)}	_{3.83s (± 0.79%)}	_~	_3.79s	_3.88s	_{p=0.936 n=6}
_{Bind Time}	_{1.69s (± 0.49%)}	_{1.70s (± 0.81%)}	_~	_1.67s	_1.71s	_{p=0.672 n=6}
_{Check Time}	_{16.71s (± 0.24%)}	_{16.73s (± 0.35%)}	_~	_16.63s	_16.80s	_{p=0.515 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{22.24s (± 0.10%)}	_{22.25s (± 0.32%)}	_~	_22.13s	_22.33s	_{p=0.377 n=6}
_{xstate-main - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_525,251	_525,251	_~	_~	_~	_{p=1.000 n=6}
_Types	_178,574	_178,574	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{462,877k (± 0.06%)}	_{462,522k (± 0.05%)}	_~	_462,335k	_462,920k	_{p=0.066 n=6}
_{Parse Time}	_{3.19s (± 0.54%)}	_{3.19s (± 0.79%)}	_~	_3.16s	_3.23s	_{p=1.000 n=6}
_{Bind Time}	_{1.17s (± 0.35%)}	_{1.18s (± 0.99%)}	_~	_1.17s	_1.20s	_{p=0.248 n=6}
_{Check Time}	_{17.93s (± 0.44%)}	_{17.90s (± 0.48%)}	_~	_17.77s	_17.98s	_{p=0.686 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{22.30s (± 0.36%)}	_{22.27s (± 0.36%)}	_~	_22.14s	_22.35s	_{p=0.809 n=6}

System info unknown

Hosts

node (v18.15.0, x64)

Scenarios

Compiler-Unions - node (v18.15.0, x64)
angular-1 - node (v18.15.0, x64)
mui-docs - node (v18.15.0, x64)
self-build-src - node (v18.15.0, x64)
self-build-src-public-api - node (v18.15.0, x64)
self-compiler - node (v18.15.0, x64)
ts-pre-modules - node (v18.15.0, x64)
vscode - node (v18.15.0, x64)
webpack - node (v18.15.0, x64)
xstate-main - node (v18.15.0, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Developer Information:

Download Benchmarks

typescript-bot · 2024-06-27T16:24:41Z

@jakebailey Here are the results of running the top 400 repos with tsc comparing main and refs/pull/57113/merge:

Everything looks good!

Avoid creating redundant substitution types in non-generic contexts

fdc0b7e

typescript-bot added the For Uncommitted Bug PR for untriaged, rejected, closed or missing bug label Jan 21, 2024

Andarist commented Jan 21, 2024

View reviewed changes

RyanCavanaugh requested a review from ahejlsberg January 22, 2024 21:27

typescript-bot added For Backlog Bug PRs that fix a backlog bug and removed For Uncommitted Bug PR for untriaged, rejected, closed or missing bug labels Jan 22, 2024

RyanCavanaugh mentioned this pull request Jan 22, 2024

[NewErrors] 5.4.0-dev.20240121 vs 5.3.3 #57117

Closed

sandersn requested a review from weswigham February 15, 2024 14:54

sandersn assigned ahejlsberg Feb 15, 2024

Andarist added 2 commits June 27, 2024 09:57

Merge remote-tracking branch 'origin/main' into fix/avoid-redundant-s…

6163188

…ubstitution-types

Unwrap substitution types early in getPropertyTypeForIndexType

fec72b5

Andarist changed the title ~~Avoid creating redundant substitution types in non-generic contexts~~ Unwrap substitution types early in getPropertyTypeForIndexType Jun 27, 2024

add extra test case

c647e5d

Andarist mentioned this pull request Jul 13, 2024

Prevent substitution types from leaking out of non-deferred conditionals #54894

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unwrap substitution types early in `getPropertyTypeForIndexType` #57113

Unwrap substitution types early in `getPropertyTypeForIndexType` #57113

Andarist commented Jan 21, 2024 •

edited

Loading

Andarist Jan 21, 2024

weswigham Apr 19, 2024

ahejlsberg Apr 19, 2024

Andarist Jun 27, 2024

jakebailey commented Jun 27, 2024

typescript-bot commented Jun 27, 2024 •

edited

Loading

typescript-bot commented Jun 27, 2024

typescript-bot commented Jun 27, 2024

typescript-bot commented Jun 27, 2024

tsc

typescript-bot commented Jun 27, 2024

Unwrap substitution types early in getPropertyTypeForIndexType #57113

Are you sure you want to change the base?

Unwrap substitution types early in getPropertyTypeForIndexType #57113

Conversation

Andarist commented Jan 21, 2024 • edited Loading

Andarist Jan 21, 2024

Choose a reason for hiding this comment

weswigham Apr 19, 2024

Choose a reason for hiding this comment

ahejlsberg Apr 19, 2024

Choose a reason for hiding this comment

Andarist Jun 27, 2024

Choose a reason for hiding this comment

jakebailey commented Jun 27, 2024

typescript-bot commented Jun 27, 2024 • edited Loading

typescript-bot commented Jun 27, 2024

typescript-bot commented Jun 27, 2024

typescript-bot commented Jun 27, 2024

tsc

typescript-bot commented Jun 27, 2024

Unwrap substitution types early in `getPropertyTypeForIndexType` #57113

Unwrap substitution types early in `getPropertyTypeForIndexType` #57113

Andarist commented Jan 21, 2024 •

edited

Loading

typescript-bot commented Jun 27, 2024 •

edited

Loading