Skip to content

Adding support for getter/setter descriptors #76

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 3 commits into
base: master
Choose a base branch
from
Open

Adding support for getter/setter descriptors #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aa5362
Adding support for getter/setter descriptors
osi-oswald Apr 13, 2018
e49e9d4
Bumped version number
osi-oswald Apr 13, 2018
539f227
Added tests
osi-oswald Apr 16, 2018
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
15 changes: 9 additions & 6 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@ const buildInitializerDefineProperty = template(`
function NAME(target, property, descriptor, context){
if (!descriptor) return;

Object.defineProperty(target, property, {
enumerable: descriptor.enumerable,
configurable: descriptor.configurable,
writable: descriptor.writable,
value: descriptor.initializer ? descriptor.initializer.call(context) : void 0,
});
var initializer = descriptor.initializer;
if (initializer && !(descriptor.set || descriptor.get)) {
descriptor.value = initializer.call(context);
}

Object.defineProperty(target, property, descriptor);
if (initializer && descriptor.set) {
target[property] = initializer.call(context);
}
}
`);

Expand Down
51 changes: 44 additions & 7 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,15 +707,21 @@ describe('decorators', function(){

target.decoratedProps = (target.decoratedProps || []).concat([name]);

let accessorValue;
let initializer = descriptor.initializer;
return {
let isAccessor = name.indexOf('accessor') !== -1;
return Object.assign({
enumerable: name.indexOf('enum') !== -1,
configurable: name.indexOf('conf') !== -1,
writable: name.indexOf('write') !== -1,
initializer: function(...args){
return '__' + initializer.apply(this, args) + '__';
},
};
}, isAccessor ? {
get(){ return accessorValue; },
set(value){ accessorValue = value },
} : {
writable: name.indexOf('write') !== -1,
});
}

class Example {
Expand All @@ -741,7 +747,10 @@ describe('decorators', function(){
write = 7;

@dec
_ = 8;
accessor = 8;

@dec
_ = 9;
}
const inst = new Example();

Expand All @@ -754,6 +763,7 @@ describe('decorators', function(){
"confwrite",
"conf",
"write",
"accessor",
"_",
]);

Expand Down Expand Up @@ -793,10 +803,17 @@ describe('decorators', function(){
expect(descs.write.configurable).to.be.false;
expect(inst.write).to.eql('__7__');

expect(descs.accessor.enumerable).to.be.false;
expect(descs.accessor.writable).to.be.undefined;
expect(descs.accessor.configurable).to.be.false;
expect(descs.accessor.set).to.be.a('function');
expect(descs.accessor.get).to.be.a('function');
expect(inst.accessor).to.eql('__8__');

expect(descs._.enumerable).to.be.false;
expect(descs._.writable).to.be.false;
expect(descs._.configurable).to.be.false;
expect(inst._).to.eql('__8__');
expect(inst._).to.eql('__9__');
});

it('should allow mutating the original descriptor', function(){
Expand All @@ -807,15 +824,24 @@ describe('decorators', function(){

target.decoratedProps = (target.decoratedProps || []).concat([name]);

let accessorValue;
let initializer = descriptor.initializer;
let isAccessor = name.indexOf('accessor') !== -1;
Object.assign(descriptor, {
enumerable: name.indexOf('enum') !== -1,
configurable: name.indexOf('conf') !== -1,
writable: name.indexOf('write') !== -1,
initializer: function(...args){
return '__' + initializer.apply(this, args) + '__';
},
}, isAccessor && {
get(){ return accessorValue; },
set(value){ accessorValue = value },
});

if (isAccessor) {
delete descriptor.writable;
}
}

class Example {
Expand All @@ -841,7 +867,10 @@ describe('decorators', function(){
write = 7;

@dec
_ = 8;
accessor = 8;

@dec
_ = 9;
}
const inst = new Example();

Expand All @@ -854,6 +883,7 @@ describe('decorators', function(){
"confwrite",
"conf",
"write",
"accessor",
"_",
]);

Expand Down Expand Up @@ -893,10 +923,17 @@ describe('decorators', function(){
expect(descs.write.configurable).to.be.false;
expect(inst.write).to.eql('__7__');

expect(descs.accessor.enumerable).to.be.false;
expect(descs.accessor.writable).to.be.undefined;
expect(descs.accessor.configurable).to.be.false;
expect(descs.accessor.set).to.be.a('function');
expect(descs.accessor.get).to.be.a('function');
expect(inst.accessor).to.eql('__8__');

expect(descs._.enumerable).to.be.false;
expect(descs._.writable).to.be.false;
expect(descs._.configurable).to.be.false;
expect(inst._).to.eql('__8__');
expect(inst._).to.eql('__9__');
});
});

Expand Down