Skip to content

Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mohamed Hegazy (mhegazy) merged 2 commits into from
Dec 29, 2016
Merged

Merge master 12/29 #13220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf7c51c
Do not report helper module errors in ambient contexts for Rest helper
mhegazy Dec 28, 2016
cc306f6
Aggregate flags for ExpressionWithTypeArguments
rbuckton Dec 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
}

if (node.kind === SyntaxKind.BindingElement) {
if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
}
// check computed properties inside property names of binding elements
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/visitor.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
// We do not transform ambient declarations or types, so there is no need to
// recursively aggregate transform flags.
if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
return TransformFlags.None;
}

Expand Down
59 changes: 59 additions & 0 deletions tests/baselines/reference/importHelpersInAmbientContext.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
({descendants, read}?: {
descendants?: boolean;
read?: any;
}): any;
}


// Object Rest
interface Foo {
a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
// Extends
class C { }
class D extends C { }

// Destructuring
interface I {
({descendants, read}?: {
descendants?: boolean;
read?: any;
}): any;
}


// Object Rest
interface Foo {
a: number; b: string;
}
export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";
131 changes: 131 additions & 0 deletions tests/baselines/reference/importHelpersInAmbientContext.symbols
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

}): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

// Extends
class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

// Destructuring
interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

}): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

131 changes: 131 additions & 0 deletions tests/baselines/reference/importHelpersInAmbientContext.types
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

({descendants, read}?: {
>descendants : boolean
>read : any

descendants?: boolean;
>descendants : boolean

read?: any;
>read : any

}): any;
}


// Object Rest
interface Foo {
>Foo : Foo

a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

// Extends
class C { }
>C : C

class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

({descendants, read}?: {
>descendants : boolean
>read : any

descendants?: boolean;
>descendants : boolean

read?: any;
>read : any

}): any;
}


// Object Rest
interface Foo {
>Foo : Foo

a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function

35 changes: 35 additions & 0 deletions tests/baselines/reference/jsxInExtendsClause.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
interface ComponentClass<P> { new (): Component<P, {}>; }
class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
render() {
return <span>Hello, world!</span>;
}
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
__extends(Foo, _super);
function Foo() {
return _super.apply(this, arguments) || this;
}
return Foo;
}(createComponentClass(function () { return (function (_super) {
__extends(class_1, _super);
function class_1() {
return _super.apply(this, arguments) || this;
}
class_1.prototype.render = function () {
return React.createElement("span", null, "Hello, world!");
};
return class_1;
}(React.Component)); })));
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Merge master 12/29 by mhegazy · Pull Request #13220 · microsoft/TypeScript · GitHub
Skip to content
Merge master 12/29#13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Mohamed Hegazy (mhegazy)
merged 2 commits into

from

Dec 29, 2016
 Merged


Merge master 12/29
#13220
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bf7c51c

Do not report helper module errors in ambient contexts for Rest helper


mhegazy Dec 28, 2016
cc306f6

Aggregate flags for ExpressionWithTypeArguments


rbuckton Dec 28, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/compiler/checker.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="moduleNameResolver.ts"/>
/// <reference path="binder.ts"/>

/* @internal */
Expand DownExpand Up@@ -17233,7 +17233,7 @@ namespace ts {
 }

 if (node.kind === SyntaxKind.BindingElement) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
 if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext && !isInAmbientContext(node)) {
 checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
 }
 // check computed properties inside property names of binding elements
Expand Down

2 changes: 1 addition & 1 deletion
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1328,7 +1328,7 @@ namespace ts {
 function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
 // We do not transform ambient declarations or types, so there is no need to
 // recursively aggregate transform flags.
 if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
 if (hasModifier(node, ModifierFlags.Ambient) || (isTypeNode(node) && node.kind !== SyntaxKind.ExpressionWithTypeArguments)) {
 return TransformFlags.None;
 }

Expand Down

59 changes: 59 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
//// [tests/cases/compiler/importHelpersInAmbientContext.ts] ////

//// [a.d.ts]

export { };

// Extends
declare class C { }
declare class D extends C { }

// Destructuring
interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
}


// Object Rest
interface Foo {
 a: number; b: string;
}
export var { a, ...x } : Foo;

//// [b.ts]
export {};
declare namespace N {
	// Extends
	class C { }
	class D extends C { }

	// Destructuring
	interface I {
 ({descendants, read}?: {
 descendants?: boolean;
 read?: any;
 }): any;
	}


	// Object Rest
	interface Foo {
 a: number; b: string;
	}
	export var { a, ...x } : Foo;
}

//// [tslib.d.ts]
export declare function __extends(d: Function, b: Function): void;
export declare function __assign(t: any, ...sources: any[]): any;
export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
export declare function __param(paramIndex: number, decorator: Function): Function;
export declare function __metadata(metadataKey: any, metadataValue: any): Function;
export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;


//// [b.js]
"use strict";

131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : Symbol(C, Decl(a.d.ts, 1, 11))

declare class D extends C { }
>D : Symbol(D, Decl(a.d.ts, 4, 19))
>C : Symbol(C, Decl(a.d.ts, 1, 11))

// Destructuring
interface I {
>I : Symbol(I, Decl(a.d.ts, 5, 29))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 6))
>read : Symbol(read, Decl(a.d.ts, 9, 18))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(a.d.ts, 9, 28))

 read?: any;
>read : Symbol(read, Decl(a.d.ts, 10, 30))

 }): any;
}


// Object Rest
interface Foo {
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(a.d.ts, 17, 15))
>b : Symbol(Foo.b, Decl(a.d.ts, 18, 14))
}
export var { a, ...x } : Foo;
>a : Symbol(a, Decl(a.d.ts, 20, 12))
>x : Symbol(x, Decl(a.d.ts, 20, 15))
>Foo : Symbol(Foo, Decl(a.d.ts, 13, 1))

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : Symbol(N, Decl(b.ts, 0, 10))

	// Extends
	class C { }
>C : Symbol(C, Decl(b.ts, 1, 21))

	class D extends C { }
>D : Symbol(D, Decl(b.ts, 3, 12))
>C : Symbol(C, Decl(b.ts, 1, 21))

	// Destructuring
	interface I {
>I : Symbol(I, Decl(b.ts, 4, 22))

 ({descendants, read}?: {
>descendants : Symbol(descendants, Decl(b.ts, 8, 4))
>read : Symbol(read, Decl(b.ts, 8, 16))

 descendants?: boolean;
>descendants : Symbol(descendants, Decl(b.ts, 8, 26))

 read?: any;
>read : Symbol(read, Decl(b.ts, 9, 25))

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))

 a: number; b: string;
>a : Symbol(Foo.a, Decl(b.ts, 16, 16))
>b : Symbol(Foo.b, Decl(b.ts, 17, 12))
	}
	export var { a, ...x } : Foo;
>a : Symbol(a, Decl(b.ts, 19, 13))
>x : Symbol(x, Decl(b.ts, 19, 16))
>Foo : Symbol(Foo, Decl(b.ts, 12, 2))
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
>d : Symbol(d, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>b : Symbol(b, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
>t : Symbol(t, Decl(tslib.d.ts, --, --))
>sources : Symbol(sources, Decl(tslib.d.ts, --, --))

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>target : Symbol(target, Decl(tslib.d.ts, --, --))
>key : Symbol(key, Decl(tslib.d.ts, --, --))
>desc : Symbol(desc, Decl(tslib.d.ts, --, --))

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
>P : Symbol(P, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))


131 changes: 131 additions & 0 deletions
tests/baselines/reference/importHelpersInAmbientContext.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
=== tests/cases/compiler/a.d.ts ===

export { };

// Extends
declare class C { }
>C : C

declare class D extends C { }
>D : D
>C : C

// Destructuring
interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
}


// Object Rest
interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
}
export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo

=== tests/cases/compiler/b.ts ===
export {};
declare namespace N {
>N : typeof N

	// Extends
	class C { }
>C : C

	class D extends C { }
>D : D
>C : C

	// Destructuring
	interface I {
>I : I

 ({descendants, read}?: {
>descendants : boolean
>read : any

 descendants?: boolean;
>descendants : boolean

 read?: any;
>read : any

 }): any;
	}


	// Object Rest
	interface Foo {
>Foo : Foo

 a: number; b: string;
>a : number
>b : string
	}
	export var { a, ...x } : Foo;
>a : number
>x : { b: string; }
>Foo : Foo
}

=== tests/cases/compiler/tslib.d.ts ===
export declare function __extends(d: Function, b: Function): void;
>__extends : (d: Function, b: Function) => void
>d : Function
>Function : Function
>b : Function
>Function : Function

export declare function __assign(t: any, ...sources: any[]): any;
>__assign : (t: any, ...sources: any[]) => any
>t : any
>sources : any[]

export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
>decorators : Function[]
>Function : Function
>target : any
>key : string | symbol
>desc : any

export declare function __param(paramIndex: number, decorator: Function): Function;
>__param : (paramIndex: number, decorator: Function) => Function
>paramIndex : number
>decorator : Function
>Function : Function
>Function : Function

export declare function __metadata(metadataKey: any, metadataValue: any): Function;
>__metadata : (metadataKey: any, metadataValue: any) => Function
>metadataKey : any
>metadataValue : any
>Function : Function

export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
>thisArg : any
>_arguments : any
>P : Function
>Function : Function
>generator : Function
>Function : Function


35 changes: 35 additions & 0 deletions
tests/baselines/reference/jsxInExtendsClause.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
//// [jsxInExtendsClause.tsx]
// https://github.com/Microsoft/TypeScript/issues/13157
declare namespace React {
 interface ComponentClass<P> { new (): Component<P, {}>; }
 class Component<A, B> {}
}
declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 render() {
 return <span>Hello, world!</span>;
 }
}) {}

//// [jsxInExtendsClause.js]
var __extends = (this && this.__extends) || function (d, b) {
 for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 function __() { this.constructor = d; }
 d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Foo = (function (_super) {
 __extends(Foo, _super);
 function Foo() {
 return _super.apply(this, arguments) || this;
 }
 return Foo;
}(createComponentClass(function () { return (function (_super) {
 __extends(class_1, _super);
 function class_1() {
 return _super.apply(this, arguments) || this;
 }
 class_1.prototype.render = function () {
 return React.createElement("span", null, "Hello, world!");
 };
 return class_1;
}(React.Component)); })));
Loading