Update TypeFlags order per tsgo PR 1226

jakebailey · jakebailey · commit 6758cd9f01a7 · 2025-06-18T21:44:01.000-07:00
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -6284,18 +6284,18 @@ export const enum TypeFlags {
     UniqueESSymbol  = 1 << 14,  // unique symbol
     EnumLiteral     = 1 << 15,  // Always combined with StringLiteral, NumberLiteral, or Union
     Enum            = 1 << 16,   // Numeric computed enum member value
-    Never           = 1 << 17,  // Never type
-    TypeParameter   = 1 << 18,  // Type parameter
-    Object          = 1 << 19,  // Object type
-    Union           = 1 << 20,  // Union (T | U)
-    Intersection    = 1 << 21,  // Intersection (T & U)
-    Index           = 1 << 22,  // keyof T
-    IndexedAccess   = 1 << 23,  // T[K]
-    Conditional     = 1 << 24,  // T extends U ? X : Y
-    Substitution    = 1 << 25,  // Type parameter substitution
-    NonPrimitive    = 1 << 26,  // intrinsic object type
-    TemplateLiteral = 1 << 27,  // Template literal type
-    StringMapping   = 1 << 28,  // Uppercase/Lowercase type
+    NonPrimitive    = 1 << 17,  // intrinsic object type
+    Never           = 1 << 18,  // Never type
+    TypeParameter   = 1 << 19,  // Type parameter
+    Object          = 1 << 20,  // Object type
+    Index           = 1 << 21,  // keyof T
+    IndexedAccess   = 1 << 22,  // T[K]
+    Conditional     = 1 << 23,  // T extends U ? X : Y
+    Substitution    = 1 << 24,  // Type parameter substitution
+    TemplateLiteral = 1 << 25,  // Template literal type
+    StringMapping   = 1 << 26,  // Uppercase/Lowercase type
+    Union           = 1 << 27,  // Union (T | U)
+    Intersection    = 1 << 28,  // Intersection (T & U)
     /** @internal */
     Reserved1       = 1 << 29,  // Used by union/intersection type construction
     /** @internal */
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -6585,38 +6585,38 @@ declare namespace ts {
         UniqueESSymbol = 16384,
         EnumLiteral = 32768,
         Enum = 65536,
-        Never = 131072,
-        TypeParameter = 262144,
-        Object = 524288,
-        Union = 1048576,
-        Intersection = 2097152,
-        Index = 4194304,
-        IndexedAccess = 8388608,
-        Conditional = 16777216,
-        Substitution = 33554432,
-        NonPrimitive = 67108864,
-        TemplateLiteral = 134217728,
-        StringMapping = 268435456,
+        NonPrimitive = 131072,
+        Never = 262144,
+        TypeParameter = 524288,
+        Object = 1048576,
+        Index = 2097152,
+        IndexedAccess = 4194304,
+        Conditional = 8388608,
+        Substitution = 16777216,
+        TemplateLiteral = 33554432,
+        StringMapping = 67108864,
+        Union = 134217728,
+        Intersection = 268435456,
         Literal = 15360,
         Unit = 97292,
         Freshable = 80896,
         StringOrNumberLiteral = 3072,
         PossiblyFalsy = 15868,
-        StringLike = 402654240,
+        StringLike = 100664352,
         NumberLike = 67648,
         BigIntLike = 8320,
         BooleanLike = 4352,
         EnumLike = 98304,
         ESSymbolLike = 16896,
         VoidLike = 20,
-        UnionOrIntersection = 3145728,
-        StructuredType = 3670016,
-        TypeVariable = 8650752,
-        InstantiableNonPrimitive = 58982400,
-        InstantiablePrimitive = 406847488,
-        Instantiable = 465829888,
-        StructuredOrInstantiable = 469499904,
-        Narrowable = 536707043,
+        UnionOrIntersection = 402653184,
+        StructuredType = 403701760,
+        TypeVariable = 4718592,
+        InstantiableNonPrimitive = 29884416,
+        InstantiablePrimitive = 102760448,
+        Instantiable = 132644864,
+        StructuredOrInstantiable = 536346624,
+        Narrowable = 536575971,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
diff --git a/tests/baselines/reference/conditionalTypes2.types b/tests/baselines/reference/conditionalTypes2.types
@@ -411,7 +411,7 @@ interface B1<T> extends A1<T> {
 declare function toString1(value: object | Function): string ;
 >toString1 : (value: object | Function) => string
 >          : ^     ^^                 ^^^^^      
->value : Function | object
+>value : object | Function
 >      : ^^^^^^^^^^^^^^^^^
 
 declare function toString2(value: Function): string ;
diff --git a/tests/baselines/reference/correlatedUnions.types b/tests/baselines/reference/correlatedUnions.types
@@ -1332,10 +1332,10 @@ function getConfigOrDefault<T extends keyof Config>(
 >    : ^
 
   const assertedCheck = userValue ? userValue! : defaultValue;
->assertedCheck : NonNullable<Partial<Config>[T]>
->              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->userValue ? userValue! : defaultValue : NonNullable<Partial<Config>[T]>
->                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>assertedCheck : Config[T]
+>              : ^^^^^^^^^
+>userValue ? userValue! : defaultValue : Config[T]
+>                                      : ^^^^^^^^^
 >userValue : Partial<Config>[T]
 >          : ^^^^^^^^^^^^^^^^^^
 >userValue! : NonNullable<Partial<Config>[T]>
@@ -1346,8 +1346,8 @@ function getConfigOrDefault<T extends keyof Config>(
 >             : ^^^^^^^^^
 
   return assertedCheck;
->assertedCheck : NonNullable<Partial<Config>[T]>
->              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>assertedCheck : Config[T]
+>              : ^^^^^^^^^
 }
 
 // repro from #47523
diff --git a/tests/baselines/reference/generatorYieldContextualType.types b/tests/baselines/reference/generatorYieldContextualType.types
@@ -274,7 +274,7 @@ function canPickStepContinue<T extends QuickPickStep>(
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
   _selection: StepItemType<T> | Directive
->_selection : Directive | StepItemType<T>
+>_selection : StepItemType<T> | Directive
 >           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ): _selection is StepItemType<T> {
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.errors.txt b/tests/baselines/reference/inOperatorWithValidOperands.errors.txt
@@ -1,7 +1,7 @@
 inOperatorWithValidOperands.ts(26,20): error TS2322: Type 'T' is not assignable to type 'object'.
 inOperatorWithValidOperands.ts(30,20): error TS2322: Type 'T | U' is not assignable to type 'object'.
   Type 'T' is not assignable to type 'object'.
-inOperatorWithValidOperands.ts(34,20): error TS2322: Type 'T | object' is not assignable to type 'object'.
+inOperatorWithValidOperands.ts(34,20): error TS2322: Type 'object | T' is not assignable to type 'object'.
   Type 'T' is not assignable to type 'object'.
 
 
@@ -48,7 +48,7 @@ inOperatorWithValidOperands.ts(34,20): error TS2322: Type 'T | object' is not as
     function unionCase2<T>(t: T | object) {
         var rb5 = x in t;
                        ~
-!!! error TS2322: Type 'T | object' is not assignable to type 'object'.
+!!! error TS2322: Type 'object | T' is not assignable to type 'object'.
 !!! error TS2322:   Type 'T' is not assignable to type 'object'.
 !!! related TS2208 inOperatorWithValidOperands.ts:33:21: This type parameter might need an `extends object` constraint.
     }
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.types b/tests/baselines/reference/inOperatorWithValidOperands.types
@@ -156,7 +156,7 @@ function unionCase<T, U>(t: T | U) {
 function unionCase2<T>(t: T | object) {
 >unionCase2 : <T>(t: T | object) => void
 >           : ^ ^^ ^^          ^^^^^^^^^
->t : T | object
+>t : object | T
 >  : ^^^^^^^^^^
 
     var rb5 = x in t;
@@ -166,7 +166,7 @@ function unionCase2<T>(t: T | object) {
 >       : ^^^^^^^
 >x : any
 >  : ^^^
->t : T | object
+>t : object | T
 >  : ^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/nonPrimitiveAndTypeVariables.errors.txt b/tests/baselines/reference/nonPrimitiveAndTypeVariables.errors.txt
@@ -1,5 +1,5 @@
 nonPrimitiveAndTypeVariables.ts(10,9): error TS2322: Type 'T' is not assignable to type 'object'.
-nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable to type 'U | object'.
+nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable to type 'object | U'.
 
 
 ==== nonPrimitiveAndTypeVariables.ts (2 errors) ====
@@ -18,7 +18,7 @@ nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable
 !!! related TS2208 nonPrimitiveAndTypeVariables.ts:9:14: This type parameter might need an `extends object` constraint.
         let b: U | object = x;  // Error
             ~
-!!! error TS2322: Type 'T' is not assignable to type 'U | object'.
-!!! related TS2208 nonPrimitiveAndTypeVariables.ts:9:14: This type parameter might need an `extends U | object` constraint.
+!!! error TS2322: Type 'T' is not assignable to type 'object | U'.
+!!! related TS2208 nonPrimitiveAndTypeVariables.ts:9:14: This type parameter might need an `extends object | U` constraint.
     }
     
diff --git a/tests/baselines/reference/nonPrimitiveAndTypeVariables.types b/tests/baselines/reference/nonPrimitiveAndTypeVariables.types
@@ -48,7 +48,7 @@ function foo<T, U>(x: T) {
 >  : ^
 
     let b: U | object = x;  // Error
->b : U | object
+>b : object | U
 >  : ^^^^^^^^^^
 >x : T
 >  : ^
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.types b/tests/baselines/reference/objectLiteralExcessProperties.types
@@ -237,8 +237,8 @@ function test<T extends IFoo>() {
 
     // No excess property checks when union includes 'object' type
     const obj5: object | { x: string } = { z: 'abc' }
->obj5 : { x: string; } | object
->     : ^^^^^      ^^^^^^^^^^^^
+>obj5 : object | { x: string; }
+>     : ^^^^^^^^^^^^^^      ^^^
 >x : string
 >  : ^^^^^^
 >{ z: 'abc' } : { z: string; }
diff --git a/tests/baselines/reference/spreadObjectOrFalsy.types b/tests/baselines/reference/spreadObjectOrFalsy.types
@@ -43,13 +43,13 @@ function f3<T extends undefined>(a: T) {
 function f4<T extends undefined>(a: object | T) {
 >f4 : <T extends undefined>(a: object | T) => {}
 >   : ^ ^^^^^^^^^         ^^ ^^          ^^^^^^^
->a : T | object
+>a : object | T
 >  : ^^^^^^^^^^
 
     return { ...a };
 >{ ...a } : {}
 >         : ^^
->a : T | object
+>a : object | T
 >  : ^^^^^^^^^^
 }
 
diff --git a/tests/baselines/reference/templateLiteralTypes3.types b/tests/baselines/reference/templateLiteralTypes3.types
@@ -936,21 +936,21 @@ function a<T extends {id: string}>() {
 >   : ^^^^^^
 
     let x: keyof T & string | `-${keyof T & string}`;
->x : (keyof T & string) | `-${keyof T & string}`
+>x : `-${keyof T & string}` | (keyof T & string)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     x = "id";
 >x = "id" : "id"
 >         : ^^^^
->x : (keyof T & string) | `-${keyof T & string}`
+>x : `-${keyof T & string}` | (keyof T & string)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"id" : "id"
 >     : ^^^^
 
     x = "-id";
 >x = "-id" : "-id"
 >          : ^^^^^
->x : (keyof T & string) | `-${keyof T & string}`
+>x : `-${keyof T & string}` | (keyof T & string)
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"-id" : "-id"
 >      : ^^^^^
diff --git a/tests/baselines/reference/typeGuardConstructorClassAndNumber.types b/tests/baselines/reference/typeGuardConstructorClassAndNumber.types
@@ -486,15 +486,15 @@ else {
 function foo(instance: Function | object) {
 >foo : (instance: Function | object) => number
 >    : ^        ^^                 ^^^^^^^^^^^
->instance : Function | object
+>instance : object | Function
 >         : ^^^^^^^^^^^^^^^^^
 
     if (typeof instance === 'function') {
 >typeof instance === 'function' : boolean
 >                               : ^^^^^^^
 >typeof instance : "bigint" | "boolean" | "function" | "number" | "object" | "string" | "symbol" | "undefined"
 >                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->instance : Function | object
+>instance : object | Function
 >         : ^^^^^^^^^^^^^^^^^
 >'function' : "function"
 >           : ^^^^^^^^^^
diff --git a/tests/baselines/reference/unionOfFunctionAndSignatureIsCallable.types b/tests/baselines/reference/unionOfFunctionAndSignatureIsCallable.types
@@ -39,8 +39,8 @@ function f1(c1: Function, c2: () => object,  callable: typeof c1 | typeof c2) {
 function f2(fetcherParams: object | (() => object)) {
 >f2 : (fetcherParams: object | (() => object)) => void
 >   : ^             ^^                       ^^^^^^^^^
->fetcherParams : (() => object) | object
->              : ^^^^^^^      ^^^^^^^^^^
+>fetcherParams : object | (() => object)
+>              : ^^^^^^^^^^^^^^^^      ^
 
     const data = typeof fetcherParams === 'function'
 >data : error
@@ -49,8 +49,8 @@ function f2(fetcherParams: object | (() => object)) {
 >                                    : ^^^^^^^
 >typeof fetcherParams : "bigint" | "boolean" | "function" | "number" | "object" | "string" | "symbol" | "undefined"
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->fetcherParams : (() => object) | object
->              : ^^^^^^^      ^^^^^^^^^^
+>fetcherParams : object | (() => object)
+>              : ^^^^^^^^^^^^^^^^      ^
 >'function' : "function"
 >           : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/vueLikeDataAndPropsInference2.types b/tests/baselines/reference/vueLikeDataAndPropsInference2.types
@@ -65,8 +65,8 @@ declare function test<Data, Props>(fn: ThisTypedOptions<Data, Props>): void;
 declare function test(fn: Options): void;
 >test : { <Data, Props>(fn: ThisTypedOptions<Data, Props>): void; (fn: Options): void; }
 >     : ^^^    ^^     ^^  ^^                             ^^^    ^^^  ^^       ^^^    ^^^
->fn : Options<((this: Instance) => object) | object, PropsDefinition<Record<string, any>>>
->   : ^^^^^^^^^^    ^^        ^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>fn : Options<object | ((this: Instance) => object), PropsDefinition<Record<string, any>>>
+>   : ^^^^^^^^^^^^^^^^^^^    ^^        ^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 test({
 >test({    props: {        foo: ''    },    data(): { bar: boolean } {        return {            bar: true        }    },    watch: {        foo(newVal: string, oldVal: string): void {            this.bar = false        }    }}) : void

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`nonPrimitiveAndTypeVariables.ts(10,9): error TS2322: Type 'T' is not assignable to type 'object'.`
`2`		`-nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable to type 'U \| object'.`
	`2`	`+nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable to type 'object \| U'.`
`3`	`3`
`4`	`4`
`5`	`5`	`==== nonPrimitiveAndTypeVariables.ts (2 errors) ====`
`@@ -18,7 +18,7 @@ nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable`
`18`	`18`	!!! related TS2208 nonPrimitiveAndTypeVariables.ts:9:14: This type parameter might need an `extends object` constraint.
`19`	`19`	`let b: U \| object = x; // Error`
`20`	`20`	`~`
`21`		`-!!! error TS2322: Type 'T' is not assignable to type 'U \| object'.`
`22`		-!!! related TS2208 nonPrimitiveAndTypeVariables.ts:9:14: This type parameter might need an `extends U \| object` constraint.
	`21`	`+!!! error TS2322: Type 'T' is not assignable to type 'object \| U'.`
	`22`	+!!! related TS2208 nonPrimitiveAndTypeVariables.ts:9:14: This type parameter might need an `extends object \| U` constraint.
`23`	`23`	`}`
`24`	`24`