@aeriajs/types 0.0.74 → 0.0.75

package/dist/contract.d.ts

@@ -1,6 +1,5 @@
 import type { Context } from './context.js';
-import type { InferProperty } from './schema.js';
-import type { InferResponse } from './http.js';
+import type { InferProperties } from './schema.js';
 import type { Property } from './property.js';
 import type { UserRole } from './token.js';
 export type ContractBase = {
@@ -10,17 +9,11 @@ export type ContractBase = {
 export type ContractRoles = {
     roles?: readonly UserRole[] | boolean | 'unauthenticated' | 'unauthenticated-only';
 };
-export type Contract = ContractBase & ({
-    response: Property | Property[];
-} | {
-    payload: Property;
-} | {
-    query: Property;
-} | {
+export type Contract = ContractBase & {
     response?: Property | Property[];
-    payload?: Property;
-    query?: Property;
-});
+    payload?: Property | Property[];
+    query?: Property | Property[];
+};
 export type ContractWithRoles = ContractRoles & Contract;
-export type ContractToFunction<TContract extends Contract | ContractWithRoles, ContextParameter = Context> = ('payload' extends keyof TContract ? InferProperty<TContract['payload']> : undefined) extends infer Payload ? ('response' extends keyof TContract ? InferResponse<TContract['response']> : 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 : any) 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/http.d.ts

@@ -1,5 +1,4 @@
 import type { ServerResponse, IncomingMessage } from 'http';
-import type { MapSchemaUnion } from './schema.js';
 import type { Result, ExtractError, ExtractResult } from './result.js';
 import type { EndpointError, StrictEndpointError } from './endpointError.js';
 import type { ACError } from './accessControl.js';
@@ -36,6 +35,4 @@ export type NativeHTTPErrorStatus = HTTPStatus.Unauthorized | HTTPStatus.TooMany
 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>>;
-type UnwrapResponse<TResponse> = TResponse extends readonly any[] ? TResponse : TResponse[];
-export type InferResponse<TResponse> = MapSchemaUnion<UnwrapResponse<TResponse>> extends infer InferredResponse ? InferredResponse | Promise<InferredResponse> : never;
 export {};

package/dist/property.d.ts

@@ -56,7 +56,7 @@ export type FixedObjectProperty = {
 export type VariableObjectProperty = {
     variable: true;
 } | {
-    additionalProperties: Property;
+    additionalProperties: boolean | Property;
 };
 export type ObjectProperty = (FixedObjectProperty | VariableObjectProperty) & {
     type: 'object';

package/dist/schema.d.ts

@@ -49,13 +49,13 @@ export type Schema<TSchema> = CaseTimestamped<TSchema, CaseOwned<TSchema, InferS
 export type SchemaWithId<TSchema> = Schema<TSchema> & {
     _id: ObjectId;
 };
-export type MapSchemaUnion<TSchema> = TSchema extends readonly (infer SchemaOption)[] ? SchemaOption extends any ? SchemaOption extends {
+export type InferProperties<TSchema> = TSchema extends readonly any[] ? TSchema extends readonly (infer SchemaOption)[] ? SchemaOption extends any ? SchemaOption extends {
     $ref: infer K;
 } | {
     items: {
         $ref: infer K;
     };
-} ? K extends keyof Collections ? 'items' extends keyof SchemaOption ? Collections[K]['item'][] : Collections[K]['item'] : never : InferProperty<SchemaOption> : never : InferProperty<TSchema>;
+} ? K extends keyof Collections ? 'items' extends keyof SchemaOption ? Collections[K]['item'][] : Collections[K]['item'] : never : InferProperty<SchemaOption> : never : never : InferProperty<TSchema>;
 export type ObjectToSchema<TObject, TRequired extends string[] | null = null> = TObject extends readonly [infer K] ? ValueToProperty<[K]> : keyof TObject extends never ? {
     type: 'object';
 } : {

package/dist/security.d.ts

@@ -1,6 +1,4 @@
-import type { Result } from './result.js';
 import type { Context } from './context.js';
-import type { ACError } from './accessControl.js';
 export type OwnershipMode = boolean | 'always' | 'on-write';
 export declare enum RateLimitingError {
     Unauthenticated = "UNAUTHENTICATED",
@@ -38,8 +36,10 @@ export type CollectionHookProps<TPayload = any> = {
     childId?: string;
     payload: TPayload;
 };
-export type CollectionHook<TPayload = any> = (props: CollectionHookProps, context: Context) => Promise<Result.Either<ACError, 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: CollectionHook;
-    beforeWrite: CollectionHook;
+    beforeRead: Middleware;
+    beforeWrite: Middleware;
 };

package/package.json

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