@aeriajs/types 0.0.10 → 0.0.13

package/dist/functions.d.ts

@@ -1,5 +1,5 @@
-import type { FilterOperators, StrictUpdateFilter, WithId, OptionalId, ObjectId } from 'mongodb';
-import type { PackReferences, Either, ValidationError, ACErrors, Context, Description } from '.';
+import type { FilterOperators, StrictFilter as Filter, StrictUpdateFilter, WithId, OptionalId, ObjectId } from 'mongodb';
+import type { PackReferences, Either, ValidationError, ACErrors } from '.';
 export type UploadAuxProps = {
     parentId: string;
     propertyName: string;
@@ -10,13 +10,24 @@ export type Pagination = {
     offset: number;
     limit: number;
 };
-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];
+type DocumentFilter<TDocument> = PackReferences<TDocument> extends infer Document ? {
+    [P in keyof Document]: null | (Document[P] extends ObjectId ? Document[P] | string : Document[P]);
 } : never;
-export type Filters<TDocument> = Partial<{
-    [P in keyof TDocument]: PackReferences<TDocument, true>[P] | StrictFilterOperators<PackReferences<TDocument, true>[P]>;
+type RemoveAny<T> = {
+    [P in keyof T as 0 extends (T[P] & 1) ? never : P]: T[P];
+};
+export type StrictFilter<TDocument> = RemoveAny<Filter<DocumentFilter<TDocument>>>;
+export type StrictFilterOperators<TDocument> = RemoveAny<FilterOperators<DocumentFilter<TDocument>>>;
+export type Filters<TDocument> = StrictFilter<any> & Partial<{
+    [P in keyof TDocument]: null | (TDocument[P] extends infer Field ? Field extends ObjectId ? Field | string : Field extends {
+        _id: infer Id;
+    } ? Id | string : Field : never) extends infer Field ? Field | StrictFilterOperators<Field> | null : never;
 }>;
-export type What<TDocument> = Partial<PackReferences<TDocument, true>> & StrictUpdateFilter<TDocument>;
+export type What<TDocument> = DocumentFilter<TDocument> extends infer Document ? Partial<{
+    [P in keyof Document]: Document[P] extends null ? null : Document[P] | StrictUpdateFilter<Document[P]>;
+}> & {
+    _id?: ObjectId | string;
+} : never;
 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;
@@ -66,9 +77,4 @@ export type CollectionFunctionsPaginated<TDocument extends CollectionDocument<Op
         pagination: Pagination;
     }>;
 };
-export type CollectionFunctionsWithBypass<TDocument extends CollectionDocument<OptionalId<any>>> = Omit<CollectionFunctions<TDocument>, 'insert'> & {
-    insert: (payload: InsertPayload<TDocument, true>) => Promise<Either<ValidationError | ACErrors, TDocument>>;
-};
-export type CollectionFunctionsWithContext<TDocument extends CollectionDocument<OptionalId<any>>, TDescription extends Description = any, TFunctions = any> = {
-    [P in keyof CollectionFunctionsWithBypass<TDocument>]: (payload: Parameters<CollectionFunctionsWithBypass<TDocument>[P]>[0], context: Context<TDescription, TFunctions>) => ReturnType<CollectionFunctions<TDocument>[P]>;
-};
+export {};

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, AllowCoercion = false> = {
-    [P in keyof T]: PackReferencesAux<T[P], AllowCoercion>;
+export type PackReferences<T> = {
+    [P in keyof T]: PackReferencesAux<T[P]>;
 };
 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, AllowCoercion = false> = T extends (...args: any[]) => any ? T : T extends ObjectId ? AllowCoercion extends true ? T | string : T : T extends {
+type PackReferencesAux<T> = T extends (...args: any[]) => any ? T : T extends {
     _id: infer Id;
-} ? AllowCoercion extends true ? Id | string : Id : T extends Record<string, any> ? PackReferences<T, AllowCoercion> : T extends any[] | readonly any[] ? PackReferencesAux<T[number], AllowCoercion>[] : T;
+} ? Id : T extends Record<string, any> ? PackReferences<T> : T extends any[] | readonly any[] ? PackReferencesAux<T[number]>[] : 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.10",
+  "version": "0.0.13",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",