feat: Accept all ObjectId constructor types in getIds

Author: duncanbeevers

src/__tests__/utils.test.ts

@@ -2,7 +2,14 @@ import { describe, expect, test } from '@jest/globals';
 import { ObjectId } from 'mongodb';
 import { expectType } from 'ts-expect';
 import { DefaultsOption } from '../schema';
-import { NestedPaths, ProjectionType, getIds, PropertyType, getDefaultValues } from '../utils';
+import {
+  NestedPaths,
+  ProjectionType,
+  getIds,
+  PropertyType,
+  getDefaultValues,
+  ObjectIdConstructorParameter,
+} from '../utils';
 
 describe('utils', () => {
   interface TestDocument {
@@ -372,7 +379,8 @@ describe('utils', () => {
   });
 
   describe('getIds', () => {
-    test.each<[string, readonly (ObjectId | string)[], readonly ObjectId[]]>([
+    // prettier-ignore
+    test.each<[string, readonly ObjectIdConstructorParameter[], readonly ObjectId[]]>([
       [
         'strings',
         ['123456789012345678900001', '123456789012345678900002'],
@@ -383,6 +391,14 @@ describe('utils', () => {
         [new ObjectId('123456789012345678900099'), new ObjectId('123456789012345678900022')],
         [new ObjectId('123456789012345678900099'), new ObjectId('123456789012345678900022')],
       ],
+      [
+        'Uint8Array',
+        [
+          new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]),
+          new Uint8Array([13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24])
+        ],
+        [new ObjectId('0102030405060708090a0b0c'), new ObjectId('0d0e0f101112131415161718')],
+      ],
       [
         'mixed',
         ['123456789012345678900014', new ObjectId('123456789012345678900088')],

src/utils.ts

@@ -194,8 +194,9 @@ export type RequireAtLeastOne<TObj, Keys extends keyof TObj = keyof TObj> = {
 }[Keys] &
   Pick<TObj, Exclude<keyof TObj, Keys>>;
 
-export function getIds(ids: Set<string> | readonly (ObjectId | string)[]): ObjectId[] {
-  return [...ids].map((id) => new ObjectId(id));
+export type ObjectIdConstructorParameter = ConstructorParameters<typeof ObjectId>[0];
+export function getIds(ids: Iterable<ObjectIdConstructorParameter>): ObjectId[] {
+  return Array.from(ids).map((id) => new ObjectId(id));
 }
 
 /**