Skip to content

Fix 8355: Fix emit metadata different between transpile and tsc --isolatedModule #9232

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.

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
merged 8 commits into from
Jun 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1265,9 +1265,13 @@ namespace ts {
const right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;

const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors);
if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) {
if (!namespace || nodeIsMissing(right)) {
return undefined;
}
else if (namespace === unknownSymbol) {
return namespace;
}

symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning);
if (!symbol) {
if (!ignoreErrors) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ var MyClass = (function () {
}
MyClass = __decorate([
someDecorator,
__metadata('design:paramtypes', [Object])
__metadata('design:paramtypes', [(typeof (_a = typeof db_1.default !== 'undefined' && db_1.default.db) === 'function' && _a) || Object])
], MyClass);
return MyClass;
var _a;
}());
exports.MyClass = MyClass;
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
define(["require", "exports", "angular2/core"], function (require, exports, ng) {
"use strict";
var MyClass1 = (function () {
function MyClass1(_elementRef) {
this._elementRef = _elementRef;
}
MyClass1 = __decorate([
foo,
__metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
], MyClass1);
return MyClass1;
var _a;
}());
exports.MyClass1 = MyClass1;
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use strict";
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var ng = require("angular2/core");
var MyClass1 = (function () {
function MyClass1(_elementRef) {
this._elementRef = _elementRef;
}
MyClass1 = __decorate([
foo,
__metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
], MyClass1);
return MyClass1;
var _a;
}());
exports.MyClass1 = MyClass1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
define(["require", "exports", "angular2/core"], function (require, exports, ng) {
"use strict";
var MyClass1 = (function () {
function MyClass1(_elementRef) {
this._elementRef = _elementRef;
}
MyClass1 = __decorate([
foo,
__metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
], MyClass1);
return MyClass1;
var _a;
}());
exports.MyClass1 = MyClass1;
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use strict";
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var ng = require("angular2/core");
var MyClass1 = (function () {
function MyClass1(_elementRef) {
this._elementRef = _elementRef;
}
MyClass1 = __decorate([
foo,
__metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
], MyClass1);
return MyClass1;
var _a;
}());
exports.MyClass1 = MyClass1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
define(["require", "exports", "angular2/core"], function (require, exports, ng) {
"use strict";
var MyClass1 = (function () {
function MyClass1(_elementRef) {
this._elementRef = _elementRef;
}
MyClass1 = __decorate([
foo,
__metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
], MyClass1);
return MyClass1;
var _a;
}());
exports.MyClass1 = MyClass1;
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use strict";
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var ng = require("angular2/core");
var MyClass1 = (function () {
function MyClass1(_elementRef) {
this._elementRef = _elementRef;
}
MyClass1 = __decorate([
foo,
__metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
], MyClass1);
return MyClass1;
var _a;
}());
exports.MyClass1 = MyClass1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.


==== main.ts (1 errors) ====
import * as ng from "angular2/core";
~~~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'angular2/core'.

declare function foo(...args: any[]);

@foo
export class MyClass1 {
constructor(private _elementRef: ng.ElementRef){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
"projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule",
"baselineCheck": true,
"runTest": true,
"resolvedInputFiles": [
"lib.d.ts",
"main.ts"
],
"emittedFiles": [
"main.js"
]
}
Loading