Create a new pull request by comparing changes

src/compiler/binder.ts

@@ -1069,7 +1069,6 @@ namespace ts {
                 node = node.parent;
             }
             return !isStatementCondition(node) &&
-                !isLogicalAssignmentExpression(node.parent) &&
                 !isLogicalExpression(node.parent) &&
                 !(isOptionalChain(node.parent) && node.parent.expression === node);
         }
@@ -3288,7 +3287,7 @@ namespace ts {
             }
 
             if (!isBindingPattern(node.name)) {
-                if (isInJSFile(node) && isVariableDeclarationInitializedToBareOrAccessedRequire(node) && !getJSDocTypeTag(node)) {
+                if (isInJSFile(node) && isVariableDeclarationInitializedToBareOrAccessedRequire(node) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & ModifierFlags.Export)) {
                     declareSymbolAndAddToSymbolTable(node as Declaration, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
                 }
                 else if (isBlockOrCatchScoped(node)) {

src/lib/es5.d.ts

@@ -210,7 +210,7 @@ interface ObjectConstructor {
      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
      * @param o Object on which to lock the attributes.
      */
-    freeze<T extends {[idx: string]: U | null | undefined | object}, U extends string | bigint | number | symbol>(o: T): Readonly<T>;
+    freeze<T extends {[idx: string]: U | null | undefined | object}, U extends string | bigint | number | boolean | symbol>(o: T): Readonly<T>;
 
     /**
      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.

tests/baselines/reference/circularContextualReturnType.types

@@ -3,19 +3,19 @@
 
 Object.freeze({
 >Object.freeze({    foo() {        return Object.freeze('a');    },}) : Readonly<{ foo(): string; }>
->Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >Object : ObjectConstructor
->freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >{    foo() {        return Object.freeze('a');    },} : { foo(): string; }
 
     foo() {
 >foo : () => string
 
         return Object.freeze('a');
 >Object.freeze('a') : string
->Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >Object : ObjectConstructor
->freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >'a' : "a"
 
     },

tests/baselines/reference/importNonExportedMember12.symbols

@@ -0,0 +1,16 @@
+=== /node_modules/foo/src/index.js ===
+module.exports = 1;
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
+>module : Symbol(export=, Decl(index.js, 0, 0))
+>exports : Symbol(export=, Decl(index.js, 0, 0))
+
+=== /a.js ===
+export const A = require("foo");
+>A : Symbol(A, Decl(a.js, 0, 12))
+>require : Symbol(require)
+>"foo" : Symbol("/node_modules/foo/src/index", Decl(index.js, 0, 0))
+
+=== /b.ts ===
+import { A } from "./a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+

tests/baselines/reference/importNonExportedMember12.types

@@ -0,0 +1,19 @@
+=== /node_modules/foo/src/index.js ===
+module.exports = 1;
+>module.exports = 1 : number
+>module.exports : number
+>module : { exports: number; }
+>exports : number
+>1 : 1
+
+=== /a.js ===
+export const A = require("foo");
+>A : number
+>require("foo") : number
+>require : any
+>"foo" : "foo"
+
+=== /b.ts ===
+import { A } from "./a";
+>A : number
+

tests/baselines/reference/jsEnumTagOnObjectFrozen.types

@@ -49,9 +49,9 @@ cbThing(type => {
 const Thing = Object.freeze({
 >Thing : Readonly<{ a: "thing"; b: "chill"; }>
 >Object.freeze({    a: "thing",    b: "chill"}) : Readonly<{ a: "thing"; b: "chill"; }>
->Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >Object : ObjectConstructor
->freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >{    a: "thing",    b: "chill"} : { a: "thing"; b: "chill"; }
 
     a: "thing",

tests/baselines/reference/keyofAndIndexedAccess.types

@@ -1876,9 +1876,9 @@ class SampleClass<P> {
 >this : this
 >props : Readonly<P>
 >Object.freeze(props) : Readonly<P>
->Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>Object.freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >Object : ObjectConstructor
->freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
+>freeze : { <T>(a: T[]): readonly T[]; <T extends Function>(f: T): T; <T extends { [idx: string]: object | U | null | undefined; }, U extends string | number | bigint | boolean | symbol>(o: T): Readonly<T>; <T>(o: T): Readonly<T>; }
 >props : P
     }
 }

tests/baselines/reference/logicalAssignment11(target=es2015).js

@@ -0,0 +1,20 @@
+//// [logicalAssignment11.ts]
+let x: string | undefined;
+
+let d: string | undefined;
+d ?? (d = x ?? "x")
+d.length;
+
+let e: string | undefined;
+e ??= x ?? "x"
+e.length
+
+//// [logicalAssignment11.js]
+"use strict";
+let x;
+let d;
+d !== null && d !== void 0 ? d : (d = x !== null && x !== void 0 ? x : "x");
+d.length;
+let e;
+e !== null && e !== void 0 ? e : (e = x !== null && x !== void 0 ? x : "x");
+e.length;

tests/baselines/reference/logicalAssignment11(target=es2015).symbols

@@ -0,0 +1,29 @@
+=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment11.ts ===
+let x: string | undefined;
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+let d: string | undefined;
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+
+d ?? (d = x ?? "x")
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+d.length;
+>d.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+
+let e: string | undefined;
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+
+e ??= x ?? "x"
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+e.length
+>e.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+

tests/baselines/reference/logicalAssignment11(target=es2015).types

@@ -0,0 +1,37 @@
+=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment11.ts ===
+let x: string | undefined;
+>x : string | undefined
+
+let d: string | undefined;
+>d : string | undefined
+
+d ?? (d = x ?? "x")
+>d ?? (d = x ?? "x") : string
+>d : string | undefined
+>(d = x ?? "x") : string
+>d = x ?? "x" : string
+>d : string | undefined
+>x ?? "x" : string
+>x : string | undefined
+>"x" : "x"
+
+d.length;
+>d.length : number
+>d : string
+>length : number
+
+let e: string | undefined;
+>e : string | undefined
+
+e ??= x ?? "x"
+>e ??= x ?? "x" : string
+>e : string | undefined
+>x ?? "x" : string
+>x : string | undefined
+>"x" : "x"
+
+e.length
+>e.length : number
+>e : string
+>length : number
+

tests/baselines/reference/logicalAssignment11(target=es2020).js

@@ -0,0 +1,20 @@
+//// [logicalAssignment11.ts]
+let x: string | undefined;
+
+let d: string | undefined;
+d ?? (d = x ?? "x")
+d.length;
+
+let e: string | undefined;
+e ??= x ?? "x"
+e.length
+
+//// [logicalAssignment11.js]
+"use strict";
+let x;
+let d;
+d ?? (d = x ?? "x");
+d.length;
+let e;
+e ?? (e = x ?? "x");
+e.length;

tests/baselines/reference/logicalAssignment11(target=es2020).symbols

@@ -0,0 +1,29 @@
+=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment11.ts ===
+let x: string | undefined;
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+let d: string | undefined;
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+
+d ?? (d = x ?? "x")
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+d.length;
+>d.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+
+let e: string | undefined;
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+
+e ??= x ?? "x"
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+e.length
+>e.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+

tests/baselines/reference/logicalAssignment11(target=es2020).types

@@ -0,0 +1,37 @@
+=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment11.ts ===
+let x: string | undefined;
+>x : string | undefined
+
+let d: string | undefined;
+>d : string | undefined
+
+d ?? (d = x ?? "x")
+>d ?? (d = x ?? "x") : string
+>d : string | undefined
+>(d = x ?? "x") : string
+>d = x ?? "x" : string
+>d : string | undefined
+>x ?? "x" : string
+>x : string | undefined
+>"x" : "x"
+
+d.length;
+>d.length : number
+>d : string
+>length : number
+
+let e: string | undefined;
+>e : string | undefined
+
+e ??= x ?? "x"
+>e ??= x ?? "x" : string
+>e : string | undefined
+>x ?? "x" : string
+>x : string | undefined
+>"x" : "x"
+
+e.length
+>e.length : number
+>e : string
+>length : number
+

tests/baselines/reference/logicalAssignment11(target=esnext).js

@@ -0,0 +1,20 @@
+//// [logicalAssignment11.ts]
+let x: string | undefined;
+
+let d: string | undefined;
+d ?? (d = x ?? "x")
+d.length;
+
+let e: string | undefined;
+e ??= x ?? "x"
+e.length
+
+//// [logicalAssignment11.js]
+"use strict";
+let x;
+let d;
+d ?? (d = x ?? "x");
+d.length;
+let e;
+e ??= x ?? "x";
+e.length;

tests/baselines/reference/logicalAssignment11(target=esnext).symbols

@@ -0,0 +1,29 @@
+=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment11.ts ===
+let x: string | undefined;
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+let d: string | undefined;
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+
+d ?? (d = x ?? "x")
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+d.length;
+>d.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>d : Symbol(d, Decl(logicalAssignment11.ts, 2, 3))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+
+let e: string | undefined;
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+
+e ??= x ?? "x"
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+>x : Symbol(x, Decl(logicalAssignment11.ts, 0, 3))
+
+e.length
+>e.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>e : Symbol(e, Decl(logicalAssignment11.ts, 6, 3))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+

tests/baselines/reference/logicalAssignment11(target=esnext).types

@@ -0,0 +1,37 @@
+=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment11.ts ===
+let x: string | undefined;
+>x : string | undefined
+
+let d: string | undefined;
+>d : string | undefined
+
+d ?? (d = x ?? "x")
+>d ?? (d = x ?? "x") : string
+>d : string | undefined
+>(d = x ?? "x") : string
+>d = x ?? "x" : string
+>d : string | undefined
+>x ?? "x" : string
+>x : string | undefined
+>"x" : "x"
+
+d.length;
+>d.length : number
+>d : string
+>length : number
+
+let e: string | undefined;
+>e : string | undefined
+
+e ??= x ?? "x"
+>e ??= x ?? "x" : string
+>e : string | undefined
+>x ?? "x" : string
+>x : string | undefined
+>"x" : "x"
+
+e.length
+>e.length : number
+>e : string
+>length : number
+