fix: address PR feedback

Author: avaly

src/mongo_types.ts

@@ -442,11 +442,13 @@ export type PropertyType<Type, Property extends string> = string extends Propert
   ? unknown
   : Property extends keyof Type
   ? Type[Property]
+  : Property extends `${number}`
+  ? Type extends ReadonlyArray<infer ArrayType>
+    ? ArrayType
+    : unknown
   : Property extends `${infer Key}.${infer Rest}`
   ? Key extends `${number}`
-    ? Type extends Array<infer ArrayType>
-      ? PropertyType<ArrayType, Rest>
-      : Type extends ReadonlyArray<infer ArrayType>
+    ? Type extends ReadonlyArray<infer ArrayType>
       ? PropertyType<ArrayType, Rest>
       : unknown
     : Key extends keyof Type
@@ -456,10 +458,20 @@ export type PropertyType<Type, Property extends string> = string extends Propert
 
 // We dont't support nested circular references
 /** @public */
-export type NestedPaths<Type> = Type extends string | number | boolean | Date | ObjectId
+export type NestedPaths<Type> = Type extends
+  | string
+  | number
+  | boolean
+  | BSONRegExp
+  | Binary
+  | Date
+  | Decimal128
+  | Double
+  | Int32
+  | Long
+  | ObjectId
+  | Timestamp
   ? []
-  : Type extends Array<infer ArrayType>
-  ? [number, ...NestedPaths<ArrayType>]
   : Type extends ReadonlyArray<infer ArrayType>
   ? [number, ...NestedPaths<ArrayType>]
   : // eslint-disable-next-line @typescript-eslint/ban-types

test/types/community/collection/filterQuery.test-d.ts

@@ -120,11 +120,11 @@ collectionT.find({ 'meta.deep.nested.level': 123 });
 collectionT.find({ meta: { deep: { nested: { level: 123 } } } }); // no impact on actual nesting
 collectionT.find({ 'friends.0.name': 'John' });
 collectionT.find({ 'playmates.0.name': 'John' });
+// supports arrays with primitive types
+collectionT.find({ 'treats.0': 'bone' });
 
-// There's an issue with the special BSON types
-collectionT.find({ 'numOfPats.__isLong__': true });
+// Handle special BSON types
 collectionT.find({ numOfPats: Long.fromBigInt(2n) });
-collectionT.find({ 'playTimePercent.bytes.BYTES_PER_ELEMENT': 1 });
 collectionT.find({ playTimePercent: new Decimal128('123.2') });
 
 // works with some extreme indexes
@@ -140,10 +140,12 @@ expectNotType<Filter<PetModel>>({ 'meta.deep.nested.level': true });
 expectNotType<Filter<PetModel>>({ 'meta.deep.nested.level': new Date() });
 expectNotType<Filter<PetModel>>({ 'friends.0.name': 123 });
 expectNotType<Filter<PetModel>>({ 'playmates.0.name': 123 });
+expectNotType<Filter<PetModel>>({ 'treats.0': 123 });
+expectNotType<Filter<PetModel>>({ 'numOfPats.__isLong__': true });
+expectNotType<Filter<PetModel>>({ 'playTimePercent.bytes.BYTES_PER_ELEMENT': 1 });
 
 // Nested arrays aren't checked
-expectType<Filter<PetModel>>({ 'meta.deep.nestedArray.0': 'not a number' });
-expectNotType<Filter<PetModel>>({ 'meta.deep.nestedArray.23': 'not a number' });
+expectNotType<Filter<PetModel>>({ 'meta.deep.nestedArray.0': 'not a number' });
 
 /// it should query __array__ fields by exact match
 await collectionT.find({ treats: ['kibble', 'bone'] }).toArray();