microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update opposite direction of #28218 (#28384)

Browse Source
This commit is contained in:
Wesley Wigham 2018-11-06 13:52:35 -08:00 committed by GitHub
parent d7390c03f0
commit d351610e7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 134 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@ -12035,8 +12035,8 @@ namespace ts {
}
if (target.flags & TypeFlags.TypeParameter) {
// A source type { [P in keyof T]: X } is related to a target type T if X is related to T[P].
if (getObjectFlags(source) & ObjectFlags.Mapped && getConstraintTypeFromMappedType(<MappedType>source) === getIndexType(target)) {
// A source type { [P in Q]: X } is related to a target type T if keyof T is related to Q and X is related to T[Q].
if (getObjectFlags(source) & ObjectFlags.Mapped && isRelatedTo(getIndexType(target), getConstraintTypeFromMappedType(<MappedType>source))) {
if (!(getMappedTypeModifiers(<MappedType>source) & MappedTypeModifiers.IncludeOptional)) {
const templateType = getTemplateTypeFromMappedType(<MappedType>source);
const indexedAccessType = getIndexedAccessType(target, getTypeParameterFromMappedType(<MappedType>source));
@ -12090,7 +12090,7 @@ namespace ts {
(<IndexedAccessType>template).indexType === getTypeParameterFromMappedType(target)) {
return Ternary.True;
}
// A source type T is related to a target type { [P in keyof T]: X } if T[P] is related to X.
// A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
if (!isGenericMappedType(source) && isRelatedTo(getConstraintTypeFromMappedType(target), getIndexType(source))) {
const indexedAccessType = getIndexedAccessType(source, getTypeParameterFromMappedType(target));
const templateType = getTemplateTypeFromMappedType(target);

53
tests/baselines/reference/reactHOCSpreadprops.js Normal file
View File

@ -0,0 +1,53 @@
//// [reactHOCSpreadprops.tsx]
/// <reference path="/.lib/react16.d.ts" />
import React = require("react");
function f<P>(App: React.ComponentClass<P> | React.StatelessComponent<P>): void {
class C extends React.Component<P & { x: number }> {
render() {
return <App {...this.props} />;
}
}
}
//// [reactHOCSpreadprops.js]
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
return __assign.apply(this, arguments);
};
exports.__esModule = true;
/// <reference path="react16.d.ts" />
var React = require("react");
function f(App) {
var C = /** @class */ (function (_super) {
__extends(C, _super);
function C() {
return _super !== null && _super.apply(this, arguments) || this;
}
C.prototype.render = function () {
return React.createElement(App, __assign({}, this.props));
};
return C;
}(React.Component));
}

36
tests/baselines/reference/reactHOCSpreadprops.symbols Normal file
View File

@ -0,0 +1,36 @@
=== tests/cases/compiler/reactHOCSpreadprops.tsx ===
/// <reference path="react16.d.ts" />
import React = require("react");
>React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
function f<P>(App: React.ComponentClass<P> | React.StatelessComponent<P>): void {
>f : Symbol(f, Decl(reactHOCSpreadprops.tsx, 1, 32))
>P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
>App : Symbol(App, Decl(reactHOCSpreadprops.tsx, 2, 14))
>React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
>ComponentClass : Symbol(React.ComponentClass, Decl(react16.d.ts, 421, 9))
>P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
>React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
>StatelessComponent : Symbol(React.StatelessComponent, Decl(react16.d.ts, 406, 49))
>P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
class C extends React.Component<P & { x: number }> {
>C : Symbol(C, Decl(reactHOCSpreadprops.tsx, 2, 81))
>React.Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
>React : Symbol(React, Decl(reactHOCSpreadprops.tsx, 0, 0))
>Component : Symbol(React.Component, Decl(react16.d.ts, 345, 54), Decl(react16.d.ts, 349, 94))
>P : Symbol(P, Decl(reactHOCSpreadprops.tsx, 2, 11))
>x : Symbol(x, Decl(reactHOCSpreadprops.tsx, 3, 41))
render() {
>render : Symbol(C.render, Decl(reactHOCSpreadprops.tsx, 3, 56))
return <App {...this.props} />;
>App : Symbol(App, Decl(reactHOCSpreadprops.tsx, 2, 14))
>this.props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
>this : Symbol(C, Decl(reactHOCSpreadprops.tsx, 2, 81))
>props : Symbol(React.Component.props, Decl(react16.d.ts, 367, 32))
}
}
}

31
tests/baselines/reference/reactHOCSpreadprops.types Normal file
View File

@ -0,0 +1,31 @@
=== tests/cases/compiler/reactHOCSpreadprops.tsx ===
/// <reference path="react16.d.ts" />
import React = require("react");
>React : typeof React
function f<P>(App: React.ComponentClass<P> | React.StatelessComponent<P>): void {
>f : <P>(App: React.ComponentClass<P, any> | React.StatelessComponent<P>) => void
>App : React.ComponentClass<P, any> | React.StatelessComponent<P>
>React : any
>React : any
class C extends React.Component<P & { x: number }> {
>C : C
>React.Component : React.Component<P & { x: number; }, {}, any>
>React : typeof React
>Component : typeof React.Component
>x : number
render() {
>render : () => JSX.Element
return <App {...this.props} />;
><App {...this.props} /> : JSX.Element
>App : React.ComponentClass<P, any> | React.StatelessComponent<P>
>this.props : Readonly<{ children?: React.ReactNode; }> & Readonly<P & { x: number; }>
>this : this
>props : Readonly<{ children?: React.ReactNode; }> & Readonly<P & { x: number; }>
}
}
}

11
tests/cases/compiler/reactHOCSpreadprops.tsx Normal file
View File

@ -0,0 +1,11 @@
// @jsx: react
// @strict: true
/// <reference path="/.lib/react16.d.ts" />
import React = require("react");
function f<P>(App: React.ComponentClass<P> | React.StatelessComponent<P>): void {
class C extends React.Component<P & { x: number }> {
render() {
return <App {...this.props} />;
}
}
}