Skip to content
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

Jump to bottom

feat(Symbol.iterator): no longer polyfilled #3389

Merged
merged 1 commit into from
Mar 7, 2018
Merged

feat(Symbol.iterator): no longer polyfilled #3389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 0 additions & 100 deletions spec/symbol/iterator-spec.ts
View file
Open in desktop

This file was deleted.

40 changes: 9 additions & 31 deletions src/internal/symbol/iterator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,16 @@
import { root } from '../util/root';

export function symbolIteratorPonyfill(root: any) {
const Symbol: any = root.Symbol;

if (typeof Symbol === 'function') {
if (!Symbol.iterator) {
Symbol.iterator = Symbol('iterator polyfill');
}
return Symbol.iterator;
} else {
// [for Mozilla Gecko 27-35:](https://mzl.la/2ewE1zC)
const { Set } = root;
if (Set && typeof new Set()['@@iterator'] === 'function') {
return '@@iterator';
}
const { Map } = root;
// required for compatability with es6-shim
if (Map) {
let keys = Object.getOwnPropertyNames(Map.prototype);
for (let i = 0; i < keys.length; ++i) {
let key = keys[i];
// according to spec, Map.prototype[@@iterator] and Map.orototype.entries must be equal.
if (key !== 'entries' && key !== 'size' && Map.prototype[key] === Map.prototype['entries']) {
return key;
}
}
}
return '@@iterator';
}
/* NOTE: Warning users that they don't have a Symbol.iterator
polyfill. We don't want to throw on this, because it's not required
by the library. However it will provide clues to users on older
browsers why things like `from(iterable)` doesn't work. */
if (!Symbol || !Symbol.iterator) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@benlesh This still has the "Symbol is not defined" problem. Needed to use typeof checks. Here's a follow up PR to fix: #3394

console.warn('RxJS: Symbol.observable does not exist');
}

export const iterator = symbolIteratorPonyfill(root);
/** The native Symbol.iterator instance or a string */
export const iterator = Symbol && Symbol.iterator || '@@iterator';

/**
* @deprecated use iterator instead
* @deprecated use {@link iterator} instead
*/
export const $$iterator = iterator;