@aeriajs/types 0.0.7 → 0.0.10

package/dist/functions.d.ts

@@ -10,15 +10,13 @@ export type Pagination = {
     offset: number;
     limit: number;
 };
-export type StrictFilterOperators<TDocument> = FilterOperators<TDocument> extends infer InferredFilters ? {
+export type StrictFilterOperators<TDocument> = FilterOperators<PackReferences<TDocument, true>> extends infer InferredFilters ? {
     [P in keyof InferredFilters as 0 extends (InferredFilters[P] & 1) ? never : P]: InferredFilters[P];
 } : never;
 export type Filters<TDocument> = Partial<{
-    [P in keyof TDocument]: TDocument[P] | StrictFilterOperators<TDocument[P]>;
+    [P in keyof TDocument]: PackReferences<TDocument, true>[P] | StrictFilterOperators<PackReferences<TDocument, true>[P]>;
 }>;
-export type What<TDocument> = StrictUpdateFilter<TDocument> & {
-    [P in keyof TDocument]?: '_id' extends keyof TDocument[P] ? TDocument[P] | string : TDocument[P];
-};
+export type What<TDocument> = Partial<PackReferences<TDocument, true>> & StrictUpdateFilter<TDocument>;
 export type Projection<TDocument> = keyof TDocument | '_id' extends infer DocumentProp ? TDocument extends string ? DocumentProp[] : string[] : never;
 export type QuerySort<TDocument> = Partial<Record<keyof WithId<TDocument>, 1 | -1>>;
 export type CollectionDocument<TDocument> = TDocument;
@@ -39,7 +37,7 @@ export type GetAllPayload<TDocument extends CollectionDocument<OptionalId<any>>>
     populate?: (keyof TDocument | string)[];
 };
 export type InsertPayload<TDocument extends CollectionDocument<any>, BypassTypeRestriction = false> = {
-    what: BypassTypeRestriction extends true ? any : What<PackReferences<TDocument>>;
+    what: BypassTypeRestriction extends true ? any : What<TDocument>;
     project?: Projection<TDocument>;
 };
 export type RemovePayload<TDocument extends CollectionDocument<OptionalId<any>>> = {

package/dist/schema.d.ts

@@ -64,8 +64,8 @@ export type ObjectToSchema<TObject, TRequired extends string[] | null = null> =
     required: TRequired;
     properties: Properties;
 } : never;
-export type PackReferences<T> = {
-    [P in keyof T]: PackReferencesAux<T[P]>;
+export type PackReferences<T, AllowCoercion = false> = {
+    [P in keyof T]: PackReferencesAux<T[P], AllowCoercion>;
 };
 export type FilterReadonlyProperties<TProperties> = {
     [P in keyof TProperties as TProperties[P] extends {
@@ -89,9 +89,9 @@ type MapReferences<TSchema> = TSchema extends {
         }>;
     }> ? K extends keyof Collections ? Collections[K]['item'][] : never : never : never;
 } : never;
-type PackReferencesAux<T> = T extends (...args: any[]) => any ? T : T extends {
+type PackReferencesAux<T, AllowCoercion = false> = T extends (...args: any[]) => any ? T : T extends ObjectId ? AllowCoercion extends true ? T | string : T : T extends {
     _id: infer Id;
-} ? Id : T extends Record<string, any> ? PackReferences<T> : T extends any[] | readonly any[] ? PackReferencesAux<T[number]>[] : T;
+} ? AllowCoercion extends true ? Id | string : Id : T extends Record<string, any> ? PackReferences<T, AllowCoercion> : T extends any[] | readonly any[] ? PackReferencesAux<T[number], AllowCoercion>[] : T;
 type CombineProperties<TSchema> = TSchema extends {
     properties: infer Properties;
 } ? FilterReadonlyProperties<Properties> extends infer ReadonlyProperties ? Readonly<ReadonlyProperties> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/types",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",