Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Accept changed baselines
  • Loading branch information
weswigham committed Jan 2, 2020
commit 3ca0f401667c65059fd3d3b0c295176c8d6cfab3
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,15 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1');
function __export(m) {
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
enumerable: true,
get: function () {
return m[p];
}
});
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,15 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1');
function __export(m) {
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
enumerable: true,
get: function () {
return m[p];
}
});
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
Expand Down
28 changes: 25 additions & 3 deletions tests/baselines/reference/jsDeclarationsExportForms.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,36 @@ exports.func = func;
//// [bar.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
__export(require("./cls"));
//// [bar2.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
__export(require("./func"));
Expand All @@ -91,7 +113,7 @@ __export(require("./cls"));
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var cls_1 = require("./cls");
exports.Foo = cls_1.Foo;
Object.defineProperty(exports, "Foo", { enumerable: true, get: () => cls_1.Foo });
//// [bat.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
Expand Down
13 changes: 12 additions & 1 deletion tests/baselines/reference/jsDeclarationsExportFormsErr.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,18 @@ module.exports = ns; // We refuse to bind cjs module exports assignments in the
//// [globalNs.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
__export(require("./cls"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ exports.OtherThing = OtherThing;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var source_1 = require("./source");
exports.Thing = source_1.Thing;
exports.default = source_1.OtherThing;
Object.defineProperty(exports, "Thing", { enumerable: true, get: () => source_1.Thing });
Object.defineProperty(exports, "default", { enumerable: true, get: () => source_1.OtherThing });


//// [source.d.ts]
Expand Down
24 changes: 12 additions & 12 deletions tests/baselines/reference/jsDeclarationsMultipleExportFromMerge.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,31 @@ exports.c = 3;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var items_1 = require("./items");
exports.a = items_1.a;
exports.b = items_1.b;
exports.c = items_1.c;
Object.defineProperty(exports, "a", { enumerable: true, get: () => items_1.a });
Object.defineProperty(exports, "b", { enumerable: true, get: () => items_1.b });
Object.defineProperty(exports, "c", { enumerable: true, get: () => items_1.c });
//// [two.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var items_1 = require("./items");
exports.a = items_1.a;
Object.defineProperty(exports, "a", { enumerable: true, get: () => items_1.a });
var items_2 = require("./items");
exports.b = items_2.b;
exports.c = items_2.c;
Object.defineProperty(exports, "b", { enumerable: true, get: () => items_2.b });
Object.defineProperty(exports, "c", { enumerable: true, get: () => items_2.c });
//// [multiple.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var items_1 = require("./items");
exports.a = items_1.a;
exports.b = items_1.b;
Object.defineProperty(exports, "a", { enumerable: true, get: () => items_1.a });
Object.defineProperty(exports, "b", { enumerable: true, get: () => items_1.b });
var two_1 = require("./two");
exports.aa = two_1.a;
Object.defineProperty(exports, "aa", { enumerable: true, get: () => two_1.a });
var two_2 = require("./two");
exports.bb = two_2.b;
Object.defineProperty(exports, "bb", { enumerable: true, get: () => two_2.b });
var two_3 = require("./two");
exports.c = two_3.c;
Object.defineProperty(exports, "c", { enumerable: true, get: () => two_3.c });
var items_2 = require("./items");
exports.cc = items_2.c;
Object.defineProperty(exports, "cc", { enumerable: true, get: () => items_2.c });


//// [items.d.ts]
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/jsDeclarationsReexportAliases.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
var cls_1 = require("./cls");
exports.x = new cls_1.default();
var cls_2 = require("./cls");
exports.Foob = cls_2.default;
Object.defineProperty(exports, "Foob", { enumerable: true, get: () => cls_2.default });


//// [cls.d.ts]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
var cls_1 = __importDefault(require("./cls"));
exports.x = new cls_1.default();
var cls_2 = require("./cls");
exports.Foob = cls_2.default;
Object.defineProperty(exports, "Foob", { enumerable: true, get: () => cls_2.default });


//// [cls.d.ts]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
function __export(m) {
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
enumerable: true,
get: function () {
return m[p];
}
});
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export { createDog, Dog };
Object.defineProperty(exports, "__esModule", { value: true });
var animal_1 = require("./animal");
var dog_1 = require("./dog");
exports.createDog = dog_1.createDog;
Object.defineProperty(exports, "createDog", { enumerable: true, get: () => dog_1.createDog });


//// [/src/lib/animals/tsconfig.tsbuildinfo]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export { default as bar } from './bar';
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var bar_1 = require("./bar");
exports.bar = bar_1.default;
Object.defineProperty(exports, "bar", { enumerable: true, get: () => bar_1.default });
var bar_2 = require("./bar");
bar_2.default("hello");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ export default interface Animal {
Object.defineProperty(exports, "__esModule", { value: true });
var animal_1 = require("./animal");
var dog_1 = require("./dog");
exports.createDog = dog_1.createDog;
Object.defineProperty(exports, "createDog", { enumerable: true, get: () => dog_1.createDog });


//// [/user/username/projects/demo/lib/animals/index.d.ts]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,18 @@ export * from './keys';
//// [/src/pkg3/dist/index.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
Object.defineProperty(exports, "__esModule", { value: true });
__export(require("./keys"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,18 @@ export interface ITest {
//// [/user/username/projects/myproject/lib1/tools/public.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
exports.__esModule = true;
__export(require("./tools.interface"));
Expand All @@ -81,7 +92,18 @@ export * from "./tools.interface";
//// [/user/username/projects/myproject/lib1/public.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
exports.__esModule = true;
__export(require("./tools/public"));
Expand Down Expand Up @@ -138,7 +160,18 @@ export declare class Data {
//// [/user/username/projects/myproject/lib2/public.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
exports.__esModule = true;
__export(require("./data"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,18 @@ export interface ITest {
//// [/user/username/projects/myproject/lib1/tools/public.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
exports.__esModule = true;
__export(require("./tools.interface"));
Expand All @@ -75,7 +86,18 @@ export * from "./tools.interface";
//// [/user/username/projects/myproject/lib1/public.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
exports.__esModule = true;
__export(require("./tools/public"));
Expand Down Expand Up @@ -112,7 +134,18 @@ export declare class Data {
//// [/user/username/projects/myproject/lib2/public.js]
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
for (var p in m) b(p);
function b(p) {
if (!exports.hasOwnProperty(p))
Object.create
? Object.defineProperty(exports, p, {
enumerable: true,
get: function() {
return m[p];
}
})
: (exports[p] = m[p]);
}
}
exports.__esModule = true;
__export(require("./data"));
Expand Down
Loading