[WIP] Angular versions support #2467
+133
−64
There are no files selected for viewing
This file contains 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 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 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 |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* eslint-disable no-param-reassign */ | ||
| /* globals window */ | ||
|
|
||
| import { VERSION } from '@angular/core'; | ||
|
|
||
| function getMeta(component, [name1, name2], defaultValue) { | ||
| if (!name2) { | ||
| name2 = name1; | ||
| name1 = `__${name1}__`; | ||
| } | ||
|
|
||
| if (VERSION.major === '5') { | ||
| if (component[name1]) { | ||
| return component[name1]; | ||
| } | ||
|
|
||
| if (component[name2]) { | ||
| return component[name2]; | ||
| } | ||
| } | ||
|
|
||
| if (VERSION.major === '4') { | ||
| return window.Reflect.getMetadata(name2, component) || defaultValue; | ||
| } | ||
|
|
||
| return defaultValue; | ||
| } | ||
|
|
||
| function setMeta(component, [name1, name2], value) { | ||
| if (!name2) { | ||
| name2 = name1; | ||
| name1 = `__${name1}__`; | ||
| } | ||
|
|
||
| if (VERSION.major === '5') { | ||
| component[name1] = value; | ||
| } | ||
|
|
||
| if (VERSION.major === '4') { | ||
| window.Reflect.defineMetadata(name2, value, component); | ||
| } | ||
| } | ||
|
|
||
| export function getAnnotations(component) { | ||
| return getMeta(component, ['annotations'], []); | ||
| } | ||
|
|
||
| export function getPropMetadata(component) { | ||
| return getMeta(component, ['__prop__metadata__', 'propMetadata'], {}); | ||
| } | ||
|
|
||
| export function getParameters(component) { | ||
| return getMeta(component, ['parameters'], []); | ||
| } | ||
|
|
||
| export function setAnnotations(component, value) { | ||
| setMeta(component, ['annotations'], value); | ||
| } | ||
|
|
||
| export function setParameters(component, value) { | ||
| setMeta(component, ['parameters'], value); | ||
| } |
This file contains 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 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 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 |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import { VERSION } from '@angular/core'; | ||
|
|
||
| function getMeta(component, [name1, name2]: any, defaultValue) { | ||
|
There was a problem hiding this comment. Where can I put this util ? It's duplicated in two projects: There was a problem hiding this comment. Hmm, @ndelangen, where would be the best place to put this util? 🤔 There was a problem hiding this comment. I was under the impression that there was an ongoing effort to remove duplicate parts of the code to a core package. Dunno if that's still a thing for 3.3 tho. We might just leave this as is for the time being and wait for that core module to be ready (?) There was a problem hiding this comment. It was kinda decided to leave the refactor until after the initial release of 3.3, and release it as a patch. @shilman started the refactor branch, @Hypnosphi wanted to hold it off, if I remember correctly.
Please give me a bit more context so I can answer your question |
||
| if (!name2) { | ||
| name2 = name1; | ||
| name1 = `__${name1}__`; | ||
| } | ||
|
|
||
| if (VERSION.major === '5') { | ||
| if (component[name1]) { | ||
| return component[name1]; | ||
| } | ||
|
|
||
| if (component[name2]) { | ||
| return component[name2]; | ||
| } | ||
| } | ||
|
|
||
| if (VERSION.major === '4') { | ||
| return window['Reflect'].getMetadata(name2, component) || defaultValue; | ||
| } | ||
|
|
||
| return defaultValue; | ||
| } | ||
|
|
||
| function setMeta(component, [name1, name2]: any, value) { | ||
| if (!name2) { | ||
| name2 = name1; | ||
| name1 = `__${name1}__`; | ||
| } | ||
|
|
||
| if (VERSION.major === '5') { | ||
| component[name1] = value; | ||
| } | ||
|
|
||
| if (VERSION.major === '4') { | ||
| window['Reflect'].defineMetadata(name2, value, component); | ||
| } | ||
| } | ||
|
|
||
| export function getAnnotations(component) { | ||
| return getMeta(component, ['annotations'], []); | ||
| } | ||
|
|
||
| export function getPropMetadata(component) { | ||
| return getMeta(component, ['__prop__metadata__', 'propMetadata'], {}); | ||
| } | ||
|
|
||
| export function getParameters(component) { | ||
| return getMeta(component, ['parameters'], []); | ||
| } | ||
|
|
||
| export function setAnnotations(component, value) { | ||
| setMeta(component, ['annotations'], value); | ||
| } | ||
|
|
||
| export function setParameters(component, value) { | ||
| setMeta(component, ['parameters'], value); | ||
| } | ||
|
|
||
| export function setPropMetadata(component, value) { | ||
| setMeta(component, ['__prop__metadata__', 'propMetadata'], value); | ||
| } | ||
This file contains 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 |
|---|---|---|
|
|
@@ -14,23 +14,23 @@ | |
| }, | ||
| "private": true, | ||
| "dependencies": { | ||
| "@angular/animations": "4.3.5", | ||
|
There was a problem hiding this comment. wanted to check if it works with v4 (#269 (comment)) |
||
| "@angular/common": "4.3.5", | ||
| "@angular/compiler": "4.3.5", | ||
| "@angular/core": "4.3.5", | ||
| "@angular/forms": "4.3.5", | ||
| "@angular/http": "4.3.5", | ||
| "@angular/platform-browser": "4.3.5", | ||
| "@angular/platform-browser-dynamic": "4.3.5", | ||
| "@angular/router": "4.3.5", | ||
| "core-js": "^2.4.1", | ||
| "rxjs": "^5.4.2", | ||
| "zone.js": "^0.8.14" | ||
| }, | ||
| "devDependencies": { | ||
| "@angular/cli": "1.3.0", | ||
| "@angular/compiler-cli": "4.3.5", | ||
| "@angular/language-service": "4.3.5", | ||
| "@storybook/addon-actions": "^3.3.0-alpha.4", | ||
| "@storybook/addon-links": "^3.3.0-alpha.4", | ||
| "@storybook/addon-notes": "^3.3.0-alpha.4", | ||
|
|
||
Oops, something went wrong.
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.
We already have
lodash.debouncein the project. Why not using it.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.
If we have it available than let's use it. I was under the impression that we didn't :)