diff --git a/goldens/public-api/angular_devkit/core/index.api.md b/goldens/public-api/angular_devkit/core/index.api.md index 6dfb312f350e..fe8b609ccf68 100644 --- a/goldens/public-api/angular_devkit/core/index.api.md +++ b/goldens/public-api/angular_devkit/core/index.api.md @@ -564,15 +564,15 @@ export class PartiallyOrderedSet implements Set { clear(): void; // (undocumented) delete(item: T): boolean; - entries(): IterableIterator<[T, T]>; + entries(): SetIterator<[T, T]>; // (undocumented) forEach(callbackfn: (value: T, value2: T, set: PartiallyOrderedSet) => void, thisArg?: any): void; // (undocumented) has(item: T): boolean; - keys(): IterableIterator; + keys(): SetIterator; // (undocumented) get size(): number; - values(): IterableIterator; + values(): SetIterator; } // @public diff --git a/package.json b/package.json index c859b58ede7f..fe574445c862 100644 --- a/package.json +++ b/package.json @@ -224,6 +224,7 @@ } }, "resolutions": { - "@bazel/concatjs@npm:5.8.1": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch" + "@bazel/concatjs@npm:5.8.1": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch", + "@microsoft/api-extractor/typescript": "5.6.2" } } diff --git a/packages/angular_devkit/core/src/utils/partially-ordered-set.ts b/packages/angular_devkit/core/src/utils/partially-ordered-set.ts index 1ab59d9ec828..41b68170f35e 100644 --- a/packages/angular_devkit/core/src/utils/partially-ordered-set.ts +++ b/packages/angular_devkit/core/src/utils/partially-ordered-set.ts @@ -51,7 +51,7 @@ export class PartiallyOrderedSet implements Set { /** * Returns an iterable of [v,v] pairs for every value `v` in the set. */ - *entries(): IterableIterator<[T, T]> { + *entries(): SetIterator<[T, T]> { for (const item of this) { yield [item, item]; } @@ -60,14 +60,14 @@ export class PartiallyOrderedSet implements Set { /** * Despite its name, returns an iterable of the values in the set, */ - keys(): IterableIterator { + keys(): SetIterator { return this.values(); } /** * Returns an iterable of values in the set. */ - values(): IterableIterator { + values(): SetIterator { return this[Symbol.iterator](); } diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts index e133148c33e0..dc3bf4ab4608 100644 --- a/packages/angular_devkit/core/src/workspace/definitions.ts +++ b/packages/angular_devkit/core/src/workspace/definitions.ts @@ -85,19 +85,19 @@ class DefinitionCollection implements ReadonlyMap { return this._map.size; } - [Symbol.iterator](): IterableIterator<[string, V]> { + [Symbol.iterator](): MapIterator<[string, V]> { return this._map[Symbol.iterator](); } - entries(): IterableIterator<[string, V]> { + entries(): MapIterator<[string, V]> { return this._map.entries(); } - keys(): IterableIterator { + keys(): MapIterator { return this._map.keys(); } - values(): IterableIterator { + values(): MapIterator { return this._map.values(); } } diff --git a/yarn.lock b/yarn.lock index 32e6e622761f..478c60ea0a77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16919,16 +16919,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.4.2": - version: 5.4.2 - resolution: "typescript@npm:5.4.2" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52 - languageName: node - linkType: hard - "typescript@npm:5.6.2": version: 5.6.2 resolution: "typescript@npm:5.6.2" @@ -16949,16 +16939,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.4.2#optional!builtin": - version: 5.4.2 - resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/fcf6658073d07283910d9a0e04b1d5d0ebc822c04dbb7abdd74c3151c7aa92fcddbac7d799404e358197222006ccdc4c0db219d223d2ee4ccd9e2b01333b49be - languageName: node - linkType: hard - "typescript@patch:typescript@npm%3A5.6.2#optional!builtin": version: 5.6.2 resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=74658d"