@aeriajs/types 0.0.84 → 0.0.86

package/dist/accessControl.d.ts

@@ -12,5 +12,5 @@ export declare enum ACError {
     ResourceNotFound = "RESOURCE_NOT_FOUND",
     InsecureOperator = "INSECURE_OPERATOR",
     MalformedInput = "MALFORMED_INPUT",
-    UnknownError = "UNKNOWN_INPUT"
+    UnknownError = "UNKNOWN_ERROR"
 }

package/dist/accessControl.js

@@ -13,5 +13,5 @@ var ACError;
     ACError["ResourceNotFound"] = "RESOURCE_NOT_FOUND";
     ACError["InsecureOperator"] = "INSECURE_OPERATOR";
     ACError["MalformedInput"] = "MALFORMED_INPUT";
-    ACError["UnknownError"] = "UNKNOWN_INPUT";
+    ACError["UnknownError"] = "UNKNOWN_ERROR";
 })(ACError || (exports.ACError = ACError = {}));

package/dist/accessControl.mjs

@@ -10,6 +10,6 @@ export var ACError = /* @__PURE__ */ ((ACError2) => {
   ACError2["ResourceNotFound"] = "RESOURCE_NOT_FOUND";
   ACError2["InsecureOperator"] = "INSECURE_OPERATOR";
   ACError2["MalformedInput"] = "MALFORMED_INPUT";
-  ACError2["UnknownError"] = "UNKNOWN_INPUT";
+  ACError2["UnknownError"] = "UNKNOWN_ERROR";
   return ACError2;
 })(ACError || {});

package/dist/collection.d.ts

@@ -10,7 +10,7 @@ export type Collection<TCollection extends Collection = any> = {
     contracts?: Record<string, Contract>;
     exposedFunctions?: Record<string, AccessCondition>;
     security?: CollectionSecurityPolicy<TCollection>;
-    middlewares?: CollectionMiddleware | CollectionMiddleware[];
+    middlewares?: CollectionMiddleware<any> | CollectionMiddleware<any>[];
 };
 export type CollectionItem<TCollectionName extends keyof Collections> = Omit<Collections[TCollectionName]['item'], '_id'>;
 export type CollectionItemWithId<TCollectionName extends keyof Collections> = Collections[TCollectionName]['item'];

package/dist/config.d.ts

@@ -6,7 +6,7 @@ export type ApiConfig = {
     baseUrl?: RouteUri;
     publicUrl?: string;
     port?: number;
-    paginationLimit?: number;
+    defaultPaginationLimit?: number;
     database?: {
         mongodbUrl?: string;
         noDatabase?: boolean;
@@ -28,8 +28,9 @@ export type ApiConfig = {
             roles: string[];
             active: boolean;
         }>;
+        paginationLimit?: number;
         exposeFunctionsByDefault?: boolean | 'unauthenticated';
     };
     tokenUserProperties?: string[];
-    errorHandler?: <TError extends Error>(context: RouteContext, error: TError) => unknown | Promise<unknown>;
+    errorHandler?: <TError>(context: RouteContext, error: TError) => unknown | Promise<unknown>;
 };

package/dist/context.d.ts

@@ -1,5 +1,6 @@
 import type { Collection as MongoCollection } 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 { Description } from './description.js';
@@ -22,6 +23,7 @@ export type IndepthCollection<TCollection> = TCollection extends {
     functions: UnionFunctions<CollFunctions, SchemaWithId<InferredDescription>>;
     originalFunctions: CollFunctions;
     model: InferredDescription extends Description ? CollectionModel<InferredDescription> : never;
+    middlewares?: Collection['middlewares'];
 } : TCollection;
 export type IndepthCollections = {
     [P in keyof Collections]: IndepthCollection<Collections[P]>;

package/dist/functions.d.ts

@@ -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]: null | (Document[P] extends (infer E)[] ? FilterProperty<E>[] : FilterProperty<Document[P]>);
+    [P in keyof Document]: 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,14 +27,14 @@ 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> | null : never;
+    } ? Id | string : Field : never : any) extends infer Field ? Field | StrictFilterOperators<Field> : 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] | null;
+    [P in keyof Document]: Document[P];
 } : 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>>;

package/dist/security.d.ts

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

package/dist/token.d.ts

@@ -5,7 +5,7 @@ export type AcceptedRole = UserRole | UserRole[] | null | unknown;
 export type AuthenticatedToken<TAcceptedRole extends AcceptedRole = null> = {
     authenticated: true;
     sub: ObjectId;
-    roles: readonly (TAcceptedRole extends null ? string : TAcceptedRole)[];
+    roles: readonly (TAcceptedRole extends null ? UserRole : TAcceptedRole)[];
     userinfo: Omit<Collections['user']['item'], '_id' | 'roles'> extends infer UserItem ? UserItem | PackReferences<UserItem> : never;
 };
 export type UnauthenticatedToken = {

package/package.json

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