@aeriajs/types 0.0.86 → 0.0.87

package/dist/collection.d.ts

@@ -1,3 +1,4 @@
+import type { WithId } from 'mongodb';
 import type { AccessCondition } from './accessControl.js';
 import type { CollectionSecurityPolicy, CollectionMiddleware } from './security.js';
 import type { Context } from './context.js';
@@ -5,13 +6,12 @@ import type { Contract } from './contract.js';
 import type { Description } from './description.js';
 export type Collection<TCollection extends Collection = any> = {
     description: Description;
-    item?: any;
+    item: WithId<unknown>;
     functions?: Record<string, (payload: any, context: Context<any>, ...args: any[]) => any>;
     contracts?: Record<string, Contract>;
     exposedFunctions?: Record<string, AccessCondition>;
     security?: CollectionSecurityPolicy<TCollection>;
-    middlewares?: CollectionMiddleware<any> | CollectionMiddleware<any>[];
+    middlewares?: CollectionMiddleware<TCollection['item']> | CollectionMiddleware<TCollection['item']>[];
 };
 export type CollectionItem<TCollectionName extends keyof Collections> = Omit<Collections[TCollectionName]['item'], '_id'>;
 export type CollectionItemWithId<TCollectionName extends keyof Collections> = Collections[TCollectionName]['item'];
-export type AssetType = keyof Collection;

package/dist/condition.d.ts

@@ -1,31 +1,31 @@
 import type { JsonSchema, PropertiesWithId } from './property.js';
 export type FinalOperator = 'equal' | 'in' | 'gt' | 'lt' | 'gte' | 'lte';
-export type FinalCondition<TSchema extends JsonSchema = any> = {
+export type FinalCondition<TSchema extends JsonSchema> = {
     operator: FinalOperator;
     term1: PropertiesWithId<TSchema>;
-    term2: any;
+    term2: unknown;
     fromState?: boolean;
 };
-export type RegexCondition<TSchema extends JsonSchema = any> = {
+export type RegexCondition<TSchema extends JsonSchema> = {
     operator: 'regex';
     term1: PropertiesWithId<TSchema>;
     term2: string;
     fromState?: boolean;
     regexOptions?: string;
 };
-export type TruthyCondition<TSchema extends JsonSchema = any> = {
+export type TruthyCondition<TSchema extends JsonSchema> = {
     operator: 'truthy';
     term1: PropertiesWithId<TSchema>;
 };
-export type OrCondition<TSchema extends JsonSchema = any> = {
+export type OrCondition<TSchema extends JsonSchema> = {
     or: readonly Condition<TSchema>[];
 };
-export type AndCondition<TSchema extends JsonSchema = any> = {
+export type AndCondition<TSchema extends JsonSchema> = {
     and: readonly Condition<TSchema>[];
 };
-export type NotCondition<TSchema extends JsonSchema = any> = {
+export type NotCondition<TSchema extends JsonSchema> = {
     not: Condition<TSchema>;
 };
-export type Condition<TSchema extends JsonSchema = any> = (FinalCondition<TSchema> | RegexCondition<TSchema> | TruthyCondition<TSchema> | AndCondition<TSchema> | OrCondition<TSchema> | NotCondition<TSchema>) & {
-    else?: any;
+export type Condition<TSchema extends JsonSchema = JsonSchema> = (FinalCondition<TSchema> | RegexCondition<TSchema> | TruthyCondition<TSchema> | AndCondition<TSchema> | OrCondition<TSchema> | NotCondition<TSchema>) & {
+    else?: unknown;
 };

package/dist/context.d.ts

@@ -1,8 +1,8 @@
-import type { Collection as MongoCollection } from 'mongodb';
+import type { Collection as MongoCollection, WithId } from 'mongodb';
 import type { AcceptedRole } from './token.js';
 import type { Collection } from './collection.js';
 import type { ApiConfig } from './config.js';
-import type { CollectionDocument, CollectionFunctions } from './functions.js';
+import type { CollectionFunctions } from './functions.js';
 import type { Description } from './description.js';
 import type { Result } from './result.js';
 import type { EndpointError } from './endpointError.js';
@@ -11,15 +11,16 @@ import type { PackReferences, SchemaWithId } from './schema.js';
 import type { RateLimitingParams, RateLimitingError } from './security.js';
 import type { Token } from './token.js';
 export type CollectionModel<TDescription extends Description> = MongoCollection<Omit<PackReferences<SchemaWithId<TDescription>>, '_id'>>;
-type OmitContextParameter<TFunction> = TFunction extends () => any ? TFunction : TFunction extends (payload: undefined, ...args: any[]) => infer Return ? () => Return : TFunction extends (payload: infer Payload, context: Context<any>, ...args: infer Rest) => infer Return ? (payload: Payload, ...args: Rest) => Return : never;
-type RestParameters<TFunction> = TFunction extends (payload: any, context: Context<any>, ...args: infer Rest) => any ? Rest : never;
-type UnionFunctions<TFunctions, TSchema extends CollectionDocument<any>> = {
-    [P in keyof TFunctions]: (P extends keyof CollectionFunctions<any> ? CollectionFunctions<TSchema>[P] extends infer CollFunction ? CollFunction extends (...args: any[]) => any ? Extract<undefined, Parameters<CollFunction>[0]> extends never ? (payload: Parameters<CollFunction>[0], ...args: RestParameters<TFunctions[P]>) => ReturnType<CollFunction> : (payload?: Parameters<CollFunction>[0], ...args: RestParameters<TFunctions[P]>) => ReturnType<CollFunction> : never : never : OmitContextParameter<TFunctions[P]>) extends (...args: infer Args) => infer Return ? Return extends Promise<any> ? (...args: Args) => Return : (...args: Args) => Promise<Return> : never;
+type OmitContextParameter<TFunction> = TFunction extends () => unknown ? TFunction : TFunction extends (payload: undefined, ...args: any[]) => infer Return ? () => Return : TFunction extends (payload: infer Payload, context: Context<any>, ...args: infer Rest) => infer Return ? (payload: Payload, ...args: Rest) => Return : never;
+type RestParameters<TFunction> = TFunction extends (payload: any, context: Context<any>, ...args: infer Rest) => unknown ? Rest : never;
+type UnionFunctions<TFunctions, TSchema extends WithId<unknown>> = {
+    [P in keyof TFunctions]: (P extends keyof CollectionFunctions ? CollectionFunctions<TSchema>[P] extends infer CollFunction ? CollFunction extends (...args: infer Args) => unknown ? Extract<undefined, Args[0]> extends never ? (payload: Args[0], ...args: RestParameters<TFunctions[P]>) => ReturnType<CollFunction> : (payload?: Args[0], ...args: RestParameters<TFunctions[P]>) => ReturnType<CollFunction> : never : never : OmitContextParameter<TFunctions[P]>) extends (...args: infer Args) => infer Return ? Return extends Promise<unknown> ? (...args: Args) => Return : (...args: Args) => Promise<Return> : never;
 };
 export type IndepthCollection<TCollection> = TCollection extends {
     description: infer InferredDescription;
     functions?: infer CollFunctions;
 } ? Omit<TCollection, 'functions'> & {
+    item: SchemaWithId<InferredDescription>;
     functions: UnionFunctions<CollFunctions, SchemaWithId<InferredDescription>>;
     originalFunctions: CollFunctions;
     model: InferredDescription extends Description ? CollectionModel<InferredDescription> : never;
@@ -31,7 +32,7 @@ export type IndepthCollections = {
 export type ContextOptions = {
     config?: ApiConfig;
     parentContext?: RouteContext | Context;
-    collectionName?: string;
+    collectionName?: Extract<keyof Collections, string>;
     token?: Token;
     inherited?: boolean;
     calledFunction?: string;
@@ -41,7 +42,7 @@ export type RouteContext<TAcceptedRole extends AcceptedRole = null> = {
     token: Token<TAcceptedRole>;
     request: GenericRequest;
     response: GenericResponse;
-    log: (message: string, details?: any) => Promise<any>;
+    log: (message: string, details?: unknown) => Promise<unknown>;
     error: <const THTTPStatus extends HTTPStatus, const TEndpointError extends EndpointError>(httpStatus: THTTPStatus, error: TEndpointError) => Result.Error<TEndpointError & {
         httpStatus: THTTPStatus;
     }>;
@@ -55,14 +56,14 @@ export type RouteContext<TAcceptedRole extends AcceptedRole = null> = {
     inherited: boolean;
     calledFunction: string;
 };
-export type CollectionContext<TDescription extends Description = any, TFunctions = any> = {
+export type CollectionContext<TDescription extends Description, TFunctions = Collection['functions']> = {
     description: TDescription;
-    collectionName?: (keyof Collections & string) | string;
+    collectionName?: Extract<keyof Collections, string>;
     collection: TDescription['$id'] extends keyof Collections ? IndepthCollection<{
         description: TDescription;
         functions: TFunctions;
     }> : IndepthCollection<any>;
 };
-export type Context<TDescription extends Description = Description, TFunctions = any> = RouteContext & CollectionContext<TDescription, TFunctions>;
-export type StrictContext<TAcceptedRole extends AcceptedRole = null, TDescription extends Description = any, TFunctions = any> = RouteContext<TAcceptedRole> & CollectionContext<TDescription, TFunctions>;
+export type Context<TDescription extends Description = Description, TFunctions = Collection['functions']> = RouteContext & CollectionContext<TDescription, TFunctions>;
+export type StrictContext<TAcceptedRole extends AcceptedRole = null, TDescription extends Description = any, TFunctions = Collection['functions']> = RouteContext<TAcceptedRole> & CollectionContext<TDescription, TFunctions>;
 export {};

package/dist/contract.d.ts

@@ -15,5 +15,5 @@ export type Contract = ContractBase & {
     query?: Property | Property[];
 };
 export type ContractWithRoles = ContractRoles & Contract;
-export type ContractToFunction<TContract extends Contract | ContractWithRoles, ContextParameter = Context> = ('payload' extends keyof TContract ? InferProperties<TContract['payload']> : undefined) extends infer Payload ? ('response' extends keyof TContract ? InferProperties<TContract['response']> extends infer InferredResponse ? InferredResponse | Promise<InferredResponse> : never : any) extends infer Response ? Payload extends undefined ? (payload: Payload | undefined, context: ContextParameter) => Response : (payload: Payload, context: ContextParameter) => Response : never : never;
+export type ContractToFunction<TContract extends Contract | ContractWithRoles, ContextParameter = Context> = ('payload' extends keyof TContract ? InferProperties<TContract['payload']> : undefined) extends infer Payload ? ('response' extends keyof TContract ? InferProperties<TContract['response']> extends infer InferredResponse ? InferredResponse | Promise<InferredResponse> : never : unknown) extends infer Response ? Payload extends undefined ? (payload: Payload | undefined, context: ContextParameter) => Response : (payload: Payload, context: ContextParameter) => Response : never : never;
 export declare const defineContract: <const TContractWithRoles extends ContractWithRoles>(contract: TContractWithRoles) => TContractWithRoles;

package/dist/description.d.ts

@@ -11,8 +11,8 @@ export type CollectionActionRoute = {
         setItem?: boolean;
         fetchItem?: boolean;
         clearItem?: boolean;
-        params?: Record<string, any>;
-        query?: Record<string, any>;
+        params?: Record<string, unknown>;
+        query?: Record<string, unknown>;
     };
 };
 export type CollectionActionFunction = {
@@ -46,7 +46,7 @@ export type FormLayoutField<TDescription extends Description> = {
     if?: Condition<TDescription>;
     component?: {
         name: string;
-        props?: Record<string, any>;
+        props?: Record<string, unknown>;
     };
 };
 export type TableLayoutAction<TDescription extends Description> = {
@@ -59,13 +59,13 @@ export type TableLayout<TDescription extends Description> = {
 export type FiltersPreset<TDescription extends Description> = {
     label?: string;
     icon?: Icon;
-    filters?: Partial<Record<PropertiesWithId<TDescription> | `$${string}`, any>>;
+    filters?: Partial<Record<PropertiesWithId<TDescription> | `$${string}`, unknown>>;
     table?: readonly PropertiesWithId<TDescription>[];
     badgeFunction?: string;
     default?: boolean;
 };
 export type LayoutName = 'tabular' | 'grid' | 'list';
-export type LayoutOptions<TDescription extends Description = any> = {
+export type LayoutOptions<TDescription extends Description = Description> = {
     title?: PropertiesWithId<TDescription>;
     picture?: PropertiesWithId<TDescription>;
     badge?: PropertiesWithId<TDescription>;
@@ -73,7 +73,7 @@ export type LayoutOptions<TDescription extends Description = any> = {
     active?: PropertiesWithId<TDescription>;
     translateBadge?: boolean;
 };
-export type Layout<TDescription extends Description = any> = {
+export type Layout<TDescription extends Description = Description> = {
     name: LayoutName;
     options?: LayoutOptions<TDescription>;
 };
@@ -82,7 +82,7 @@ export type SearchOptions<TDescription extends Description> = {
     placeholder?: string;
     exactMatches?: boolean;
 };
-export type RuntimeDescription<TDescription extends Description = any> = Pick<TDescription, 'actions' | 'individualActions' | 'filters' | 'filtersPresets' | 'layout' | 'table' | 'tableMeta' | 'form' | 'tableLayout' | 'formLayout'>;
+export type RuntimeDescription<TDescription extends Description = Description> = Pick<TDescription, 'actions' | 'individualActions' | 'filters' | 'filtersPresets' | 'layout' | 'table' | 'tableMeta' | 'form' | 'tableLayout' | 'formLayout'>;
 export type Description<TDescription extends Description = any> = JsonSchema<TDescription> & {
     title?: string;
     categories?: readonly string[];
@@ -90,14 +90,14 @@ export type Description<TDescription extends Description = any> = JsonSchema<TDe
     preferred?: Record<string, RuntimeDescription<TDescription>>;
     icon?: Icon;
     indexes?: readonly PropertiesWithId<TDescription>[];
-    defaults?: Record<string, any>;
+    defaults?: Record<string, unknown>;
     owned?: OwnershipMode;
     temporary?: {
         index: keyof TDescription['properties'];
         expireAfterSeconds: number;
     };
     timestamps?: false;
-    immutable?: boolean | readonly (keyof TDescription['properties'])[] | ((doc: WithId<any>) => boolean | Promise<boolean>);
+    immutable?: boolean | readonly (keyof TDescription['properties'])[] | ((doc: WithId<unknown>) => boolean | Promise<boolean>);
     route?: readonly string[];
     presets?: readonly DescriptionPreset[];
     table?: readonly PropertiesWithId<TDescription>[];

package/dist/functions.d.ts

@@ -1,4 +1,4 @@
-import type { FilterOperators, StrictFilter as Filter, WithId, OptionalId, ObjectId } from 'mongodb';
+import type { FilterOperators, StrictFilter as Filter, WithId, ObjectId } from 'mongodb';
 import type { Result } from './result.js';
 import type { EndpointError, StrictEndpointError } from './endpointError.js';
 import type { PackReferences } from './schema.js';
@@ -17,7 +17,7 @@ export type Pagination = {
 };
 type FilterProperty<T> = T extends ObjectId ? T | string : T;
 type DocumentFilter<TDocument> = PackReferences<TDocument> extends infer Document ? {
-    [P in keyof Document]: Document[P] extends (infer E)[] ? FilterProperty<E>[] : FilterProperty<Document[P]>;
+    [P in keyof Document]: null | (Document[P] extends (infer E)[] ? FilterProperty<E>[] : FilterProperty<Document[P]>);
 } : never;
 type RemoveAny<T> = {
     [P in keyof T as 0 extends (T[P] & 1) ? never : P]: T[P];
@@ -27,27 +27,26 @@ export type StrictFilterOperators<TDocument> = RemoveAny<FilterOperators<Documen
 export type Filters<TDocument> = StrictFilter<TDocument> & Partial<{
     [P in keyof TDocument | `${Extract<keyof TDocument, string>}.${string}`]: (P extends keyof TDocument ? TDocument[P] extends infer Field ? Field extends ObjectId ? Field | string : Field extends {
         _id: infer Id;
-    } ? Id | string : Field : never : any) extends infer Field ? Field | StrictFilterOperators<Field> : never;
+    } ? Id | string : Field : never : unknown) extends infer Field ? Field | StrictFilterOperators<Field> | null : never;
 }>;
 export type What<TDocument> = ({
     _id: ObjectId | string;
 } & Partial<Omit<PackReferences<TDocument>, '_id'>> | {
     _id?: null;
-} & Omit<PackReferences<TDocument>, '_id'>) extends infer Document ? {
-    [P in keyof Document]: Document[P];
+} & Omit<PackReferences<TDocument>, '_id'>) extends infer InferredDocument ? {
+    [P in keyof InferredDocument]: InferredDocument[P] | null;
 } : never;
 export type Projection<TDocument> = keyof TDocument | '_id' extends infer DocumentProp ? [DocumentProp] extends [string] ? DocumentProp[] : string[] : never;
 export type QuerySort<TDocument> = Partial<Record<keyof WithId<TDocument>, 1 | -1>>;
-export type CollectionDocument<TDocument> = TDocument;
-export type CountPayload<TDocument extends CollectionDocument<OptionalId<any>>> = {
+export type CountPayload<TDocument extends WithId<unknown>> = {
     filters?: Filters<TDocument>;
 };
-export type GetPayload<TDocument extends CollectionDocument<OptionalId<any>>> = {
+export type GetPayload<TDocument extends WithId<unknown>> = {
     filters: Filters<TDocument>;
     project?: Projection<TDocument>;
     populate?: (keyof TDocument)[];
 };
-export type GetAllPayload<TDocument extends CollectionDocument<OptionalId<any>>> = {
+export type GetAllPayload<TDocument extends WithId<unknown>> = {
     filters?: Filters<TDocument>;
     project?: Projection<TDocument>;
     offset?: number;
@@ -55,19 +54,19 @@ export type GetAllPayload<TDocument extends CollectionDocument<OptionalId<any>>>
     sort?: QuerySort<TDocument>;
     populate?: (keyof TDocument)[];
 };
-export type InsertPayload<TDocument extends CollectionDocument<any>> = {
+export type InsertPayload<TDocument extends WithId<unknown>> = {
     what: What<TDocument>;
     project?: Projection<TDocument>;
 };
-export type RemovePayload<TDocument extends CollectionDocument<OptionalId<any>>> = {
+export type RemovePayload<TDocument extends WithId<unknown>> = {
     filters: Filters<TDocument>;
 };
 export type RemoveAllPayload = {
-    filters: (string | ObjectId)[];
+    filters: (ObjectId | string)[];
 };
 export type RemoveFilePayload = UploadAuxProps & {
     filters: {
-        _id: any;
+        _id: ObjectId | string;
     };
 };
 export type InsertReturnType<TDocument> = Result.Either<StrictEndpointError<ACError.InsecureOperator | ACError.OwnershipError | ACError.ResourceNotFound | ACError.TargetImmutable | ValidationErrorCode | TraverseError.InvalidDocumentId | TraverseError.InvalidTempfile, unknown, HTTPStatus.Forbidden | HTTPStatus.NotFound | HTTPStatus.UnprocessableContent>, TDocument>;
@@ -79,22 +78,22 @@ export type PaginatedGetAllReturnType<TDocument> = Result.Either<EndpointError,
     data: TDocument[];
     pagination: Pagination;
 }>;
-export type CollectionFunctions<TDocument extends CollectionDocument<OptionalId<any>>> = {
+export type CollectionFunctions<TDocument extends WithId<unknown> = WithId<unknown>> = {
     count: (payload: CountPayload<TDocument>) => Promise<CountReturnType>;
     get: (payload: GetPayload<TDocument>) => Promise<GetReturnType<TDocument>>;
     getAll: (payload?: GetAllPayload<TDocument>) => Promise<GetAllReturnType<TDocument>>;
     insert: (payload: InsertPayload<TDocument>) => Promise<InsertReturnType<TDocument>>;
     remove: (payload: RemovePayload<TDocument>) => Promise<RemoveReturnType<TDocument>>;
-    removeAll: (payload: RemoveAllPayload) => Promise<any>;
-    removeFile: (payload: RemoveFilePayload) => Promise<any>;
+    removeAll: (payload: RemoveAllPayload) => Promise<unknown>;
+    removeFile: (payload: RemoveFilePayload) => Promise<unknown>;
 };
-export type CollectionFunctionsSDK<TDocument extends CollectionDocument<OptionalId<any>>> = {
+export type CollectionFunctionsSDK<TDocument extends WithId<unknown> = WithId<unknown>> = {
     count: (payload: CountPayload<TDocument>) => Promise<WithACErrors<CountReturnType>>;
     get: (payload: GetPayload<TDocument>) => Promise<WithACErrors<GetReturnType<TDocument>>>;
     getAll: (payload?: GetAllPayload<TDocument>) => Promise<WithACErrors<PaginatedGetAllReturnType<TDocument>>>;
     insert: (payload: InsertPayload<TDocument>) => Promise<WithACErrors<InsertReturnType<TDocument>>>;
     remove: (payload: RemovePayload<TDocument>) => Promise<WithACErrors<RemoveReturnType<TDocument>>>;
-    removeAll: (payload: RemoveAllPayload) => Promise<any>;
-    removeFile: (payload: RemoveFilePayload) => Promise<any>;
+    removeAll: (payload: RemoveAllPayload) => Promise<unknown>;
+    removeFile: (payload: RemoveFilePayload) => Promise<unknown>;
 };
 export {};

package/dist/http.d.ts

@@ -29,10 +29,10 @@ export type GenericResponse = ServerResponse & {
     [STREAMED_RESPONSE]?: boolean;
 };
 type ExtractCode<TRouteResponse> = TRouteResponse extends EndpointError<infer PCode> ? PCode : never;
-type ExtractHTTPStatus<TRouteResponse> = TRouteResponse extends EndpointError<any, unknown, infer PHTTPStatus> ? PHTTPStatus : never;
+type ExtractHTTPStatus<TRouteResponse> = TRouteResponse extends EndpointError<string, unknown, infer PHTTPStatus> ? PHTTPStatus : never;
 export type NativeError = ACError.AuthenticationError | ACError.AuthorizationError | RateLimitingError.LimitReached | RateLimitingError.Unauthenticated;
 export type NativeHTTPErrorStatus = HTTPStatus.Unauthorized | HTTPStatus.TooManyRequests;
 export type WithACErrors<TRouteResponse> = TRouteResponse extends Result.Either<infer InferredError, unknown> ? Result.Either<ExtractError<TRouteResponse> | StrictEndpointError<ExtractCode<InferredError> | NativeError, unknown, ExtractHTTPStatus<InferredError> | NativeHTTPErrorStatus>, ExtractResult<TRouteResponse>> : TRouteResponse | Result.Error<StrictEndpointError<NativeError, unknown, NativeHTTPErrorStatus>>;
-export type EndpointFunction<TRouteMethod extends RequestMethod, TRouteResponse, TRoutePayload> = (TRoutePayload extends null ? <T = TRouteResponse>(payload?: any) => Promise<WithACErrors<T>> : TRoutePayload extends undefined ? <T = TRouteResponse>() => Promise<WithACErrors<T>> : <T = TRouteResponse>(payload: TRoutePayload) => Promise<WithACErrors<T>>) extends infer Function ? Record<TRouteMethod, Function> : never;
-export type MakeEndpoint<TRoute extends string, TRouteMethod extends RequestMethod, TRouteResponse = any, TRoutePayload = null> = TRoute extends `/${infer RouteTail}` ? MakeEndpoint<RouteTail, TRouteMethod, TRouteResponse, TRoutePayload> : TRoute extends `${infer Route}/${infer RouteTail}` ? Record<Route, MakeEndpoint<RouteTail, TRouteMethod, TRouteResponse, TRoutePayload>> : TRoute extends `(${string}` ? Record<string, EndpointFunction<TRouteMethod, TRouteResponse, TRoutePayload>> : Record<TRoute, EndpointFunction<TRouteMethod, TRouteResponse, TRoutePayload>>;
+export type EndpointFunction<TRouteMethod extends RequestMethod, TRouteResponse, TRoutePayload> = (TRoutePayload extends null ? <T = TRouteResponse>(payload?: unknown) => Promise<WithACErrors<T>> : TRoutePayload extends undefined ? <T = TRouteResponse>() => Promise<WithACErrors<T>> : <T = TRouteResponse>(payload: TRoutePayload) => Promise<WithACErrors<T>>) extends infer Function ? Record<TRouteMethod, Function> : never;
+export type MakeEndpoint<TRoute extends string, TRouteMethod extends RequestMethod, TRouteResponse = unknown, TRoutePayload = null> = TRoute extends `/${infer RouteTail}` ? MakeEndpoint<RouteTail, TRouteMethod, TRouteResponse, TRoutePayload> : TRoute extends `${infer Route}/${infer RouteTail}` ? Record<Route, MakeEndpoint<RouteTail, TRouteMethod, TRouteResponse, TRoutePayload>> : TRoute extends `(${string}` ? Record<string, EndpointFunction<TRouteMethod, TRouteResponse, TRoutePayload>> : Record<TRoute, EndpointFunction<TRouteMethod, TRouteResponse, TRoutePayload>>;
 export {};

package/dist/index.d.ts

@@ -14,4 +14,3 @@ export * from './schema.js';
 export * from './security.js';
 export * from './token.js';
 export * from './validation.js';
-export type { WithId, OptionalId, } from 'mongodb';

package/dist/property.d.ts

@@ -6,7 +6,7 @@ export type PropertyArrayElement = 'checkbox' | 'radio' | 'select';
 export type PropertyInputType = 'text' | 'email' | 'password' | 'search' | 'time' | 'month';
 export type PropertyInputElement = 'input' | 'textarea';
 export type PropertyFormat = 'date' | 'date-time';
-export type PropertiesWithId<TSchema extends JsonSchema> = keyof TSchema['properties'] | '_id';
+export type PropertiesWithId<TSchema extends JsonSchema> = Extract<keyof TSchema['properties'], string> | '_id';
 export type RequiredProperties<TSchema extends JsonSchema> = readonly PropertiesWithId<TSchema>[] | Partial<Record<PropertiesWithId<TSchema>, Condition<TSchema> | boolean>>;
 export type JsonSchema<TJsonSchema extends JsonSchema = any> = {
     $id: string;
@@ -37,8 +37,8 @@ export type FileProperty = Omit<RefProperty, '$ref'> & {
     extensions?: readonly string[];
 };
 export type EnumProperty = {
-    enum: readonly any[];
-    default?: any;
+    enum: readonly unknown[];
+    default?: unknown;
     element?: PropertyArrayElement;
 };
 export type ArrayProperty = {
@@ -63,7 +63,7 @@ export type VariableObjectProperty = {
 };
 export type ObjectProperty = (FixedObjectProperty | VariableObjectProperty) & {
     type: 'object';
-    default?: any;
+    default?: unknown;
 };
 export type StringProperty = {
     type: 'string';
@@ -112,7 +112,7 @@ export type PropertyBase = {
     icon?: PhosphorIcon['name'];
     translate?: boolean;
     hint?: string;
-    componentProps?: Record<string, any>;
+    componentProps?: Record<string, unknown>;
     noForm?: boolean;
     noLabel?: boolean;
     hidden?: boolean;

package/dist/schema.d.ts

@@ -49,7 +49,7 @@ export type Schema<TSchema> = CaseTimestamped<TSchema, CaseOwned<TSchema, InferS
 export type SchemaWithId<TSchema> = Schema<TSchema> & {
     _id: ObjectId;
 };
-export type InferProperties<TSchema> = TSchema extends readonly any[] ? TSchema extends readonly (infer SchemaOption)[] ? SchemaOption extends any ? SchemaOption extends {
+export type InferProperties<TSchema> = TSchema extends readonly unknown[] ? TSchema extends readonly (infer SchemaOption)[] ? SchemaOption extends unknown ? SchemaOption extends {
     $ref: infer K;
 } | {
     items: {
@@ -81,9 +81,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 ObjectId ? T : T extends {
+type PackReferencesAux<T> = T extends (...args: unknown[]) => unknown ? T : T extends ObjectId ? T : T extends {
     _id: infer Id;
-} ? Id : T extends Record<string, any> ? PackReferences<T> : T extends any[] | readonly any[] ? PackReferencesAux<T[number]>[] : T;
+} ? Id : T extends Record<string, unknown> ? PackReferences<T> : T extends unknown[] | readonly unknown[] ? PackReferencesAux<T[number]>[] : T;
 type CombineProperties<TSchema> = TSchema extends {
     properties: infer Properties;
 } ? FilterReadonlyProperties<Properties> extends infer ReadonlyProperties ? Readonly<ReadonlyProperties> & {

package/dist/security.d.ts

@@ -1,6 +1,7 @@
 import type { Context } from './context.js';
 import type { What } from './functions.js';
 import type { Result } from './result.js';
+import type { QuerySort } from './functions.js';
 export type OwnershipMode = boolean | 'always' | 'on-write';
 export declare enum RateLimitingError {
     Unauthenticated = "UNAUTHENTICATED",
@@ -32,24 +33,24 @@ export type CollectionSecurityPolicy<TCollection extends {
 }> = {
     functions?: Partial<Record<keyof TCollection['functions'], SecurityPolicy>>;
 };
-export type CollectionProps<TPayload = any> = {
+export type CollectionProps<TPayload> = {
     propName?: string;
     parentId?: string;
     childId?: string;
     payload: TPayload;
 };
 export type CollectionReadPayload = {
-    filters: Record<string, any>;
-    sort?: Record<string, any>;
+    filters: Record<string, unknown> | unknown[];
+    sort?: QuerySort<unknown>;
     limit?: number;
     offset?: number;
 };
 export type CollectionWritePayload = {
-    what: What<Record<string, any>>;
+    what: What<Record<string, unknown>>;
 };
 export type GenericMiddlewareNext<TPayload, TReturn> = (payload: TPayload, context: Context) => TReturn;
 export type MiddlewareNext = <TPayload, TReturn>(payload: TPayload, context: Context) => TReturn;
-export type Middleware<TPayload = any, TReturn = any, TReturnNext extends GenericMiddlewareNext<TPayload, TReturn> = GenericMiddlewareNext<TPayload, TReturn>> = (payload: TPayload, context: Context, next: TReturnNext) => TReturn;
+export type Middleware<TPayload = unknown, TReturn = unknown, TReturnNext extends GenericMiddlewareNext<TPayload, TReturn> = GenericMiddlewareNext<TPayload, TReturn>> = (payload: TPayload, context: Context, next: TReturnNext) => TReturn;
 export type CollectionMiddleware<TDocument> = {
     beforeRead?: Middleware<CollectionReadPayload, Promise<Result.Either<any, TDocument | TDocument[]>>>;
     beforeWrite?: Middleware<CollectionWritePayload, Promise<Result.Either<any, TDocument>>>;

package/dist/token.d.ts

@@ -1,12 +1,14 @@
 import type { ObjectId } from 'mongodb';
 import type { PackReferences } from './schema.js';
-export type UserRole = (Collections['user']['item']['roles'][number] extends infer UserDefinedRole ? UserDefinedRole extends string ? `${UserDefinedRole}${UserDefinedRole}` extends UserDefinedRole ? 'root' : UserDefinedRole : never : never) | 'root' | 'unauthenticated';
+export type UserRole = (Collections['user']['item'] extends {
+    roles: infer Roles;
+} ? Roles extends unknown[] ? Roles[number] extends infer UserDefinedRole ? UserDefinedRole extends string ? `${UserDefinedRole}${UserDefinedRole}` extends UserDefinedRole ? 'root' : UserDefinedRole : never : never : never : never) | 'root' | 'unauthenticated';
 export type AcceptedRole = UserRole | UserRole[] | null | unknown;
-export type AuthenticatedToken<TAcceptedRole extends AcceptedRole = null> = {
+export type AuthenticatedToken<TAcceptedRole extends AcceptedRole = null, TUserRole = UserRole, TUserInfo = Omit<Collections['user']['item'], '_id' | 'roles'>> = {
     authenticated: true;
     sub: ObjectId;
-    roles: readonly (TAcceptedRole extends null ? UserRole : TAcceptedRole)[];
-    userinfo: Omit<Collections['user']['item'], '_id' | 'roles'> extends infer UserItem ? UserItem | PackReferences<UserItem> : never;
+    roles: readonly (TAcceptedRole extends null ? TUserRole : TAcceptedRole)[];
+    userinfo: TUserInfo | PackReferences<TUserInfo>;
 };
 export type UnauthenticatedToken = {
     authenticated: false;
@@ -16,4 +18,4 @@ export type TokenRecipient = {
     type: 'bearer';
     content: string;
 };
-export type Token<TAcceptedRole extends AcceptedRole = null> = (null extends TAcceptedRole ? true : 'unauthenticated' extends TAcceptedRole ? true : false) extends true ? AuthenticatedToken | UnauthenticatedToken : AuthenticatedToken<TAcceptedRole>;
+export type Token<TAcceptedRole extends AcceptedRole = null, TUserRole = UserRole, TUserInfo = Omit<Collections['user']['item'], '_id' | 'roles'>> = (null extends TAcceptedRole ? true : 'unauthenticated' extends TAcceptedRole ? true : false) extends true ? AuthenticatedToken<null, TUserRole, TUserInfo> | UnauthenticatedToken : AuthenticatedToken<TAcceptedRole>;

package/dist/validation.d.ts

@@ -8,6 +8,8 @@ export declare enum PropertyValidationErrorCode {
     Extraneous = "EXTRANEOUS_PROPERTY",
     Unmatching = "UNMATCHING_PROPERTIES",
     ExtraneousElement = "EXTRANEOUS_ELEMENT",
+    MoreItemsExpected = "MORE_ITEMS_EXPECTED",
+    LessItemsExpected = "LESS_ITEMS_EXPECTED",
     NumericConstraint = "NUMERIC_CONSTRAINT"
 }
 export declare enum TraverseError {
@@ -17,9 +19,9 @@ export declare enum TraverseError {
 export type PropertyValidationError = {
     type: PropertyValidationErrorCode;
     index?: number;
-    details: {
-        expected: any;
-        got: any;
+    details?: {
+        expected: unknown;
+        got: unknown;
     };
 };
 export type ValidationErrorInvalidProperties = {

package/dist/validation.js

@@ -13,6 +13,8 @@ var PropertyValidationErrorCode;
     PropertyValidationErrorCode["Extraneous"] = "EXTRANEOUS_PROPERTY";
     PropertyValidationErrorCode["Unmatching"] = "UNMATCHING_PROPERTIES";
     PropertyValidationErrorCode["ExtraneousElement"] = "EXTRANEOUS_ELEMENT";
+    PropertyValidationErrorCode["MoreItemsExpected"] = "MORE_ITEMS_EXPECTED";
+    PropertyValidationErrorCode["LessItemsExpected"] = "LESS_ITEMS_EXPECTED";
     PropertyValidationErrorCode["NumericConstraint"] = "NUMERIC_CONSTRAINT";
 })(PropertyValidationErrorCode || (exports.PropertyValidationErrorCode = PropertyValidationErrorCode = {}));
 var TraverseError;

package/dist/validation.mjs

@@ -10,6 +10,8 @@ export var PropertyValidationErrorCode = /* @__PURE__ */ ((PropertyValidationErr
   PropertyValidationErrorCode2["Extraneous"] = "EXTRANEOUS_PROPERTY";
   PropertyValidationErrorCode2["Unmatching"] = "UNMATCHING_PROPERTIES";
   PropertyValidationErrorCode2["ExtraneousElement"] = "EXTRANEOUS_ELEMENT";
+  PropertyValidationErrorCode2["MoreItemsExpected"] = "MORE_ITEMS_EXPECTED";
+  PropertyValidationErrorCode2["LessItemsExpected"] = "LESS_ITEMS_EXPECTED";
   PropertyValidationErrorCode2["NumericConstraint"] = "NUMERIC_CONSTRAINT";
   return PropertyValidationErrorCode2;
 })(PropertyValidationErrorCode || {});

package/package.json

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