-
Notifications
You must be signed in to change notification settings - Fork 318
fixed decorators to return a property descriptor to work with babel d… #206
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
import { BabelPropertyDescriptor } from './decorators'; | ||
|
||
/** | ||
* @license | ||
* Copyright (c) 2017 The Polymer Project Authors. All rights reserved. | ||
|
@@ -172,7 +174,8 @@ export abstract class UpdatingElement extends HTMLElement { | |
*/ | ||
static createProperty(name: PropertyKey, | ||
options: | ||
PropertyDeclaration = defaultPropertyDeclaration) { | ||
PropertyDeclaration = defaultPropertyDeclaration, | ||
descriptor?: BabelPropertyDescriptor): PropertyDescriptor | null { | ||
// ensure private storage for property declarations. | ||
if (!this.hasOwnProperty('_classProperties')) { | ||
this._classProperties = new Map(); | ||
|
@@ -187,19 +190,29 @@ export abstract class UpdatingElement extends HTMLElement { | |
// Allow user defined accessors by not replacing an existing own-property | ||
// accessor. | ||
if (this.prototype.hasOwnProperty(name)) { | ||
return; | ||
return null; | ||
} | ||
|
||
const key = typeof name === 'symbol' ? Symbol() : `__${name}`; | ||
Object.defineProperty(this.prototype, name, { | ||
get() { return this[key]; }, | ||
set(value) { | ||
|
||
let defaultInitializer: null | (() => any) = descriptor ? descriptor!.initializer || null : null; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This whole handling of the default value seems just a little messy but i can see why... The default value really needs to be in the constructor but babel annoyingly doesn't put it there... |
||
return { | ||
get(this: any) { | ||
if (defaultInitializer) { | ||
return defaultInitializer(); | ||
} else { | ||
return this[key]; | ||
} | ||
}, | ||
set(this: any, value) { | ||
defaultInitializer = null; | ||
const oldValue = this[name]; | ||
this[key] = value; | ||
this._requestPropertyUpdate(name, oldValue, options); | ||
}, | ||
configurable : true, | ||
enumerable : true | ||
}); | ||
}; | ||
} | ||
|
||
/** | ||
|
@@ -230,7 +243,10 @@ export abstract class UpdatingElement extends HTMLElement { | |
for (const p of propKeys) { | ||
// note, use of `any` is due to TypeSript lack of support for symbol in | ||
// index types | ||
this.createProperty(p, (props as any)[p]); | ||
const descriptor = this.createProperty(p, (props as any)[p]); | ||
if (descriptor) { | ||
Object.defineProperty(this.prototype, p, descriptor); | ||
} | ||
} | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to satisfy typescript (temporarily) and be consistent with how other decorators are written, this should probably return
any
.