@aeriajs/types 0.0.133 → 0.0.135

package/dist/config.d.ts

@@ -1,9 +1,12 @@
 import type { RouteContext } from './context.js';
-import type { RouteUri } from './http.js';
+import type { GenericRequest, GenericResponse, RouteUri } from './http.js';
 import type { RateLimitingParams } from './security.js';
 import type { CollectionItem } from './collection.js';
-import type { UserRole } from './token.js';
+import type { Token, UserRole } from './token.js';
+import type { Result } from './result.js';
 export type RolesHierarchy = Record<UserRole, readonly UserRole[] | boolean>;
+export type GetTokenFunction = (request: GenericRequest, context: RouteContext) => Promise<Result.Either<unknown, Token>>;
+export type CorsFunction = (req: GenericRequest, res: GenericResponse, config: CorsConfig) => Promise<null | undefined>;
 export type CorsConfig = {
     allowOrigin?: readonly string[];
     allowMethods?: readonly string[];
@@ -15,7 +18,8 @@ export type ServerOptions = {
     port?: number;
     enableLogging?: boolean;
     noWarmup?: boolean;
-    cors?: CorsConfig | null;
+    cors?: null | CorsConfig | CorsFunction;
+    getToken?: GetTokenFunction;
 };
 export type ApiConfig = {
     name?: string;

package/dist/functions.d.ts

@@ -1,4 +1,4 @@
-import type { FilterOperators, StrictFilter as Filter, WithId, ObjectId } from 'mongodb';
+import type { FilterOperators, StrictFilter as Filter, ObjectId } from 'mongodb';
 import type { Result, ExtractError } from './result.js';
 import type { EndpointError } from './endpointError.js';
 import type { SchemaWithId, InferSchema, PackReferences } from './schema.js';
@@ -41,16 +41,19 @@ export type What<TDocument> = ({
     [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 CountPayload<TDocument extends WithId<unknown>> = {
+export type WithStringId<TDocument> = TDocument & {
+    _id: ObjectId | string;
+};
+export type QuerySort<TDocument> = Partial<Record<keyof WithStringId<TDocument>, 1 | -1>>;
+export type CountPayload<TDocument extends WithStringId<unknown>> = {
     filters?: Filters<TDocument>;
 };
-export type GetPayload<TDocument extends WithId<unknown>> = {
+export type GetPayload<TDocument extends WithStringId<unknown>> = {
     filters: Filters<TDocument>;
     project?: Projection<TDocument>;
     populate?: (keyof TDocument)[];
 };
-export type GetAllPayload<TDocument extends WithId<unknown>> = {
+export type GetAllPayload<TDocument extends WithStringId<unknown>> = {
     filters?: Filters<TDocument>;
     project?: Projection<TDocument>;
     offset?: number;
@@ -58,11 +61,11 @@ export type GetAllPayload<TDocument extends WithId<unknown>> = {
     sort?: QuerySort<TDocument>;
     populate?: (keyof TDocument)[];
 };
-export type InsertPayload<TDocument extends WithId<unknown>> = {
+export type InsertPayload<TDocument extends WithStringId<unknown>> = {
     what: What<TDocument>;
     project?: Projection<TDocument>;
 };
-export type RemovePayload<TDocument extends WithId<unknown>> = {
+export type RemovePayload<TDocument extends WithStringId<unknown>> = {
     filters: Filters<TDocument>;
 };
 export type RemoveAllPayload = {
@@ -82,7 +85,7 @@ export type GetAllReturnType<TDocument> = Result.Either<ExtractError<Unpaginated
     data: TDocument[];
     pagination: Pagination;
 }>;
-export type CollectionFunctions<TSchema extends JsonSchema = JsonSchema> = SchemaWithId<TSchema> extends infer InferredDocument ? InferredDocument extends WithId<unknown> ? {
+export type CollectionFunctions<TSchema extends JsonSchema = JsonSchema> = SchemaWithId<TSchema> extends infer InferredDocument ? InferredDocument extends WithStringId<unknown> ? {
     count: (payload: CountPayload<InferredDocument>) => Promise<CountReturnType>;
     get: (payload: GetPayload<InferredDocument>) => Promise<GetReturnType<InferredDocument>>;
     getAll: (payload?: GetAllPayload<InferredDocument>) => Promise<GetAllReturnType<InferredDocument>>;
@@ -94,7 +97,9 @@ export type CollectionFunctions<TSchema extends JsonSchema = JsonSchema> = Schem
     removeFile: (payload: RemoveFilePayload) => Promise<unknown>;
     unpaginatedGetAll: (payload?: GetAllPayload<InferredDocument>) => Promise<UnpaginatedGetAllReturnType<InferredDocument>>;
 } : never : never;
-export type CollectionFunctionsSDK<TSchema extends JsonSchema = JsonSchema> = SchemaWithId<TSchema> extends infer InferredDocument ? InferredDocument extends WithId<unknown> ? {
+export type CollectionFunctionsSDK<TSchema extends JsonSchema = JsonSchema> = SchemaWithId<TSchema, {
+    useObjectIds: false;
+}> extends infer InferredDocument ? InferredDocument extends WithStringId<unknown> ? {
     count: (payload: CountPayload<InferredDocument>) => Promise<WithACErrors<CountReturnType>>;
     get: (payload: GetPayload<InferredDocument>) => Promise<WithACErrors<GetReturnType<InferredDocument>>>;
     getAll: (payload?: GetAllPayload<InferredDocument>) => Promise<WithACErrors<GetAllReturnType<InferredDocument>>>;

package/package.json

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