Skip to content

🐛 Fix if reflect-metadata not imported #70

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

🐛 Fix if reflect-metadata not imported #70

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
0034ce6
🐛 Fix if reflect-metadata not imported
sirenkovladd Aug 8, 2023
ea595ac
fix createMetadataDesignDecorator
sirenkovladd Sep 13, 2023
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
26 changes: 17 additions & 9 deletions src/metadata/metadataVisitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,26 @@ import { serializeType } from './serializeType';

function createMetadataDesignDecorator(
design: 'design:type' | 'design:paramtypes' | 'design:returntype' | 'design:typeinfo',
typeArg: t.Expression | t.SpreadElement | t.JSXNamespacedName | t.ArgumentPlaceholder
typeArg: t.Expression | t.SpreadElement | t.JSXNamespacedName
): t.Decorator {
return t.decorator(
t.callExpression(
t.memberExpression(
t.identifier('Reflect'),
t.identifier('metadata')
t.logicalExpression(
'||',
t.optionalCallExpression(
t.memberExpression(
t.identifier('Reflect'),
t.identifier('metadata')
),
[
t.stringLiteral(design),
typeArg
],
true
),
[
t.stringLiteral(design),
typeArg
]
t.arrowFunctionExpression(
[t.identifier('t')],
t.identifier('t')
)
)
)
}
Expand Down
4 changes: 2 additions & 2 deletions test/__fixtures__/generics/output.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/__fixtures__/nest-injection/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }

import { AppService } from './app.service';
export let AppController = (_dec = Controller(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof AppService === "undefined" ? Object : AppService]), _dec4 = Inject(), _dec5 = Reflect.metadata("design:type", typeof AppService === "undefined" ? Object : AppService), _dec6 = Inject(), _dec7 = Reflect.metadata("design:type", typeof AppService === "undefined" ? Object : AppService), _dec8 = Get(), _dec9 = Reflect.metadata("design:type", Function), _dec10 = Reflect.metadata("design:paramtypes", []), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = class AppController {
export let AppController = (_dec = Controller(), _dec2 = Reflect.metadata?.("design:type", Function) || (t => t), _dec3 = Reflect.metadata?.("design:paramtypes", [typeof AppService === "undefined" ? Object : AppService]) || (t => t), _dec4 = Inject(), _dec5 = Reflect.metadata?.("design:type", typeof AppService === "undefined" ? Object : AppService) || (t => t), _dec6 = Inject(), _dec7 = Reflect.metadata?.("design:type", typeof AppService === "undefined" ? Object : AppService) || (t => t), _dec8 = Get(), _dec9 = Reflect.metadata?.("design:type", Function) || (t => t), _dec10 = Reflect.metadata?.("design:paramtypes", []) || (t => t), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = class AppController {
constructor(appService) {
this.appService = appService;

Expand Down
14 changes: 7 additions & 7 deletions test/__fixtures__/parameter-decorator-typed/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ class Injected {}

let MyClass = (_dec = function (target, key) {
return inject()(target, undefined, 0);
}, _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected]), _dec(_class = _dec2(_class = _dec3(_class = class MyClass {
}, _dec2 = Reflect.metadata?.("design:type", Function) || (t => t), _dec3 = Reflect.metadata?.("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected]) || (t => t), _dec(_class = _dec2(_class = _dec3(_class = class MyClass {
constructor(parameter) {}

}) || _class) || _class) || _class);
let MyOtherClass = (_dec4 = function (target, key) {
return inject()(target, undefined, 0);
}, _dec5 = function (target, key) {
return inject('KIND')(target, undefined, 1);
}, _dec6 = Reflect.metadata("design:type", Function), _dec7 = Reflect.metadata("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected, typeof Injected === "undefined" ? Object : Injected]), _dec8 = function (target, key) {
}, _dec6 = Reflect.metadata?.("design:type", Function) || (t => t), _dec7 = Reflect.metadata?.("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected, typeof Injected === "undefined" ? Object : Injected]) || (t => t), _dec8 = function (target, key) {
return demo()(target, key, 0);
}, _dec9 = Reflect.metadata("design:type", Function), _dec10 = Reflect.metadata("design:paramtypes", [String, void 0]), _dec11 = decorate('named'), _dec12 = function (target, key) {
}, _dec9 = Reflect.metadata?.("design:type", Function) || (t => t), _dec10 = Reflect.metadata?.("design:paramtypes", [String, void 0]) || (t => t), _dec11 = decorate('named'), _dec12 = function (target, key) {
return inject()(target, key, 0);
}, _dec13 = function (target, key) {
return arg()(target, key, 1);
}, _dec14 = Reflect.metadata("design:type", Function), _dec15 = Reflect.metadata("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected, typeof Schema === "undefined" ? Object : Schema]), _dec16 = function (target, key) {
}, _dec14 = Reflect.metadata?.("design:type", Function) || (t => t), _dec15 = Reflect.metadata?.("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected, typeof Schema === "undefined" ? Object : Schema]) || (t => t), _dec16 = function (target, key) {
return argObjectSpread()(target, key, 0);
}, _dec17 = Reflect.metadata("design:type", Function), _dec18 = Reflect.metadata("design:paramtypes", [typeof SchemaObjectSpread === "undefined" ? Object : SchemaObjectSpread]), _dec4(_class2 = _dec5(_class2 = _dec6(_class2 = _dec7(_class2 = (_class3 = class MyOtherClass {
}, _dec17 = Reflect.metadata?.("design:type", Function) || (t => t), _dec18 = Reflect.metadata?.("design:paramtypes", [typeof SchemaObjectSpread === "undefined" ? Object : SchemaObjectSpread]) || (t => t), _dec4(_class2 = _dec5(_class2 = _dec6(_class2 = _dec7(_class2 = (_class3 = class MyOtherClass {
constructor(parameter, otherParam) {
this.parameter = parameter;
}
Expand All @@ -40,9 +40,9 @@ let DecoratedClass = (_dec19 = function (target, key) {
return inject()(target, undefined, 0);
}, _dec20 = function (target, key) {
return inject()(target, undefined, 1);
}, _dec21 = Reflect.metadata("design:type", Function), _dec22 = Reflect.metadata("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected, typeof Injected === "undefined" ? Object : Injected]), _dec23 = decorate('example'), _dec24 = function (target, key) {
}, _dec21 = Reflect.metadata?.("design:type", Function) || (t => t), _dec22 = Reflect.metadata?.("design:paramtypes", [typeof Injected === "undefined" ? Object : Injected, typeof Injected === "undefined" ? Object : Injected]) || (t => t), _dec23 = decorate('example'), _dec24 = function (target, key) {
return inject()(target, key, 0);
}, _dec25 = Reflect.metadata("design:type", Function), _dec26 = Reflect.metadata("design:paramtypes", [String]), Decorate(_class4 = _dec19(_class4 = _dec20(_class4 = _dec21(_class4 = _dec22(_class4 = (_class5 = class DecoratedClass {
}, _dec25 = Reflect.metadata?.("design:type", Function) || (t => t), _dec26 = Reflect.metadata?.("design:paramtypes", [String]) || (t => t), Decorate(_class4 = _dec19(_class4 = _dec20(_class4 = _dec21(_class4 = _dec22(_class4 = (_class5 = class DecoratedClass {
constructor(module, otherModule) {
this.module = module;
}
Expand Down
4 changes: 2 additions & 2 deletions test/__fixtures__/type-serialization/output.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/__modules__/member-expression/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de

let SomeService = (_dec = Injectable(), _dec2 = function (target, key) {
return Inject('aws.s3')(target, undefined, 0);
}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _awsSdk.default.S3 === "undefined" ? Object : _awsSdk.default.S3]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class SomeService {
}, _dec3 = Reflect.metadata?.("design:type", Function) || (t => t), _dec4 = Reflect.metadata?.("design:paramtypes", [typeof _awsSdk.default.S3 === "undefined" ? Object : _awsSdk.default.S3]) || (t => t), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class SomeService {
constructor(s3client) {
this.s3client = s3client;
}
Expand Down
4 changes: 2 additions & 2 deletions test/__node__/function-param-decorator/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ let Named = (_dec = function (target, key) {
return (0, _decorator.default)(_some.Some)(target, undefined, 0);
}, _dec2 = function (target, key) {
return (0, _decorator.default)(target, undefined, 1);
}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _some.Some === "undefined" ? Object : _some.Some, typeof _some.Some === "undefined" ? Object : _some.Some]), _dec5 = (0, _based.default)(), _dec6 = function (target, key) {
}, _dec3 = Reflect.metadata?.("design:type", Function) || (t => t), _dec4 = Reflect.metadata?.("design:paramtypes", [typeof _some.Some === "undefined" ? Object : _some.Some, typeof _some.Some === "undefined" ? Object : _some.Some]) || (t => t), _dec5 = (0, _based.default)(), _dec6 = function (target, key) {
return (0, _graphql.Args)()(target, key, 0);
}, _dec7 = function (target, key) {
return (0, _graphql.Context)()(target, key, 1);
}, _dec8 = function (target, key) {
return (0, _decorator.default)(_xyz.Xyz)(target, key, 2);
}, _dec9 = Reflect.metadata("design:type", Function), _dec10 = Reflect.metadata("design:paramtypes", [typeof _graphql.Args === "undefined" ? Object : _graphql.Args, typeof _graphql.Context === "undefined" ? Object : _graphql.Context, Object]), (0, _based.default)(_class = _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = (_class2 = class Named {
}, _dec9 = Reflect.metadata?.("design:type", Function) || (t => t), _dec10 = Reflect.metadata?.("design:paramtypes", [typeof _graphql.Args === "undefined" ? Object : _graphql.Args, typeof _graphql.Context === "undefined" ? Object : _graphql.Context, Object]) || (t => t), (0, _based.default)(_class = _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = (_class2 = class Named {
constructor(param, param2) {
this.param = param;
this.param2 = param2;
Expand Down
2 changes: 1 addition & 1 deletion test/__node__/self-reference/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con

function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }

let Self = (_dec = injectable(), _dec2 = (0, _lib.inject)(), _dec3 = Reflect.metadata("design:type", Object), _dec(_class = (_class2 = class Self {
let Self = (_dec = injectable(), _dec2 = (0, _lib.inject)(), _dec3 = Reflect.metadata?.("design:type", Object) || (t => t), _dec(_class = (_class2 = class Self {
constructor() {
_initializerDefineProperty(this, "child", _descriptor, this);
}
Expand Down