Update proposal types & type tests

Author: slowcheetah

packages/core-js/types/proposals/iterator-joint.d.ts

@@ -9,9 +9,11 @@ type ZipOptions = {
   padding?: object;
 };
 
-interface Iterator<T> {
-  zip<U>(iterables: Iterable<U>, options?: ZipOptions): CoreJsIteratorObject<[T, U]>;
+interface IteratorConstructor {
+  zip<T, U>(iterables: Iterable<U>, options?: ZipOptions): CoreJsIteratorObject<[T, U]>;
 
-  zipKeyed<U>(iterables: Iterable<U>, options?: ZipOptions): CoreJsIteratorObject<[number, T, U]>;
-  zipKeyed<U>(record: Record<PropertyKey, Iterable<U>>, options?: ZipOptions): CoreJsIteratorObject<[PropertyKey, T, U]>;
+  zipKeyed<T, U>(iterables: Iterable<U>, options?: ZipOptions): CoreJsIteratorObject<[number, T, U]>;
+  zipKeyed<T, U>(record: Record<PropertyKey, Iterable<U>>, options?: ZipOptions): CoreJsIteratorObject<[PropertyKey, T, U]>;
 }
+
+declare var Iterator: IteratorConstructor;

packages/core-js/types/proposals/iterator-sequencing.d.ts

@@ -1,5 +1,7 @@
 // proposal stage: 2.7
 // https://github.com/tc39/proposal-iterator-sequencing
-interface Iterator<T> {
-  concat<U>(...iterators: Iterable<U>[]): CoreJsIteratorObject<T | U>;
+interface IteratorConstructor {
+  concat<T, U>(...iterators: Iterable<U>[]): CoreJsIteratorObject<T | U>;
 }
+
+declare var Iterator: IteratorConstructor;

scripts/build-entries/templates.mjs

@@ -21,6 +21,56 @@ function isAllowedFunctionName(name) {
   }
 }
 
+const namespacesWithTwoGeneric = [
+  'Map',
+  'ReadonlyMap',
+  'WeakMap',
+];
+
+const namespacesWithOneGeneric = [
+  'Array',
+  'ReadonlyArray',
+  'Set',
+  'ReadonlySet',
+  'WeakSet',
+  'Promise',
+  'Iterator',
+  'AsyncIterator',
+];
+
+function getGenericsForNamespace(namespace) {
+  if (namespace === 'WeakMap') {
+    return '<K extends WeakKey, V>';
+  }
+  if (namespacesWithTwoGeneric.includes(namespace)) {
+    return '<K, V>';
+  }
+  if (namespacesWithOneGeneric.includes(namespace)) {
+    return '<T>';
+  }
+  return '';
+}
+
+function getCommonGenericsForNamespace(namespace) {
+  if (namespacesWithTwoGeneric.includes(namespace)) {
+    return '<K, V>';
+  }
+  if (namespacesWithOneGeneric.includes(namespace)) {
+    return '<T>';
+  }
+  return '';
+}
+
+function getAnyGenericsForNamespace(namespace) {
+  if (namespacesWithTwoGeneric.includes(namespace)) {
+    return '<any, any>';
+  }
+  if (namespacesWithOneGeneric.includes(namespace)) {
+    return '<any>';
+  }
+  return '';
+}
+
 export const wrapEntry = template => `'use strict';\n${ template }\n`;
 export const wrapDts = (template, p) => `${ importTypes(p) }${ p.types.length ? '\n\n' : '' }${ template }\n`;
 
@@ -68,11 +118,11 @@ export const $uncurried = p => ({
     module.exports = entryUnbind('${ p.namespace }', '${ p.name }');
   `,
   dts: dedent`
-    declare const method: (
-      thisArg: any,
-      ...args: Parameters<typeof ${ p.namespace }.prototype.${ p.name }>
-    ) => ReturnType<typeof ${ p.namespace }.prototype.${ p.name }>;
-    export default method;
+    type method = ${ p.namespace }${ getAnyGenericsForNamespace(p.namespace) }['${ p.name }'];
+    type uncurriedMethod${ getGenericsForNamespace(p.namespace) } = (self: ${ p.namespace }${ getCommonGenericsForNamespace(p.namespace) }, ...args: Parameters<method>) => ReturnType<method>;
+    declare const resultMethod: uncurriedMethod${ getAnyGenericsForNamespace(p.namespace) };
+    
+    export default resultMethod;
   `,
 });
 
@@ -86,11 +136,11 @@ export const $uncurriedIterator = p => ({
     module.exports = uncurryThis(getIteratorMethod(${ p.source }));
   `,
   dts: dedent`
-    declare const method: (
-      thisArg: any,
-      ...args: Parameters<typeof ${ p.namespace }.prototype[typeof Symbol.iterator]>
-    ) => ReturnType<typeof ${ p.namespace }.prototype[typeof Symbol.iterator]>;
-    export default method;
+    type method = ${ p.namespace }<any>[typeof Symbol.iterator];
+    type uncurriedMethod<T> = (self: ${ p.namespace }<T>, ...args: Parameters<method>) => ReturnType<method>;
+    declare const resultMethod: uncurriedMethod<any>;
+    
+    export default resultMethod;
   `,
 });
 

…ns/proposals/array-buffer-base64.test.ts …osals/global/array-buffer-base64.test.tstests/type-definitions/proposals/array-buffer-base64.test.ts renamed to tests/type-definitions/proposals/global/array-buffer-base64.test.ts tests/type-definitions/proposals/array-buffer-base64.test.ts renamed to tests/type-definitions/proposals/global/array-buffer-base64.test.ts

@@ -28,10 +28,6 @@ AsyncIterator.from({});
 // @ts-expect-error
 AsyncIterator.from();
 // @ts-expect-error
-AsyncIterator.from(null);
-// @ts-expect-error
-AsyncIterator.from(undefined);
-// @ts-expect-error
 AsyncIterator.from({ next: () => 1 });
 
 const raits: AsyncIterator<string> = is.toAsync();