@aeriajs/types 0.0.25 → 0.0.27

package/dist/condition.d.ts

@@ -4,7 +4,14 @@ export type FinalCondition<TSchema extends JsonSchema = any> = {
     operator: FinalOperator;
     term1: PropertiesWithId<TSchema>;
     term2: any;
-    else?: any;
+    fromState?: boolean;
+};
+export type RegexCondition<TSchema extends JsonSchema = any> = {
+    operator: 'regex';
+    term1: PropertiesWithId<TSchema>;
+    term2: string;
+    fromState?: boolean;
+    regexOptions?: string;
 };
 export type TruthyCondition<TSchema extends JsonSchema = any> = {
     operator: 'truthy';
@@ -19,4 +26,6 @@ export type AndCondition<TSchema extends JsonSchema = any> = {
 export type NotCondition<TSchema extends JsonSchema = any> = {
     not: Condition<TSchema>;
 };
-export type Condition<TSchema extends JsonSchema = any> = FinalCondition<TSchema> | TruthyCondition<TSchema> | AndCondition<TSchema> | OrCondition<TSchema> | NotCondition<TSchema>;
+export type Condition<TSchema extends JsonSchema = any> = (FinalCondition<TSchema> | RegexCondition<TSchema> | TruthyCondition<TSchema> | AndCondition<TSchema> | OrCondition<TSchema> | NotCondition<TSchema>) & {
+    else?: any;
+};

package/dist/config.d.ts

@@ -1,7 +1,8 @@
-import type { Context } from './context';
+import type { RouteContext, RouteUri } from '.';
 export type ApiConfig = {
     secret?: string;
     apiUrl?: string;
+    apiBase?: RouteUri;
     port?: number;
     paginationLimit?: number;
     database?: {
@@ -24,5 +25,5 @@ export type ApiConfig = {
     }>;
     logSuccessfulAuthentications?: boolean;
     tokenUserProperties?: string[];
-    errorHandler?: <TError extends Error>(context: Context, error: TError) => any | Promise<any>;
+    errorHandler?: <TError extends Error>(context: RouteContext, error: TError) => any | Promise<any>;
 };

package/dist/context.d.ts

@@ -2,7 +2,7 @@ import type { Collection as MongoCollection } from 'mongodb';
 import type { GenericRequest, GenericResponse } from './http';
 import type { Description, PackReferences, SchemaWithId, FunctionPath, DecodedToken, ApiConfig, CollectionDocument, CollectionFunctions } from '.';
 export type CollectionModel<TDescription extends Description> = MongoCollection<Omit<PackReferences<SchemaWithId<TDescription>>, '_id'>>;
-type OmitContextParameter<TFunction> = TFunction extends () => any ? TFunction : TFunction extends (payload: infer Payload, context: Context, ...args: infer Rest) => infer Return ? (payload: Payload, ...args: Rest) => Return : never;
+type OmitContextParameter<TFunction> = TFunction extends () => any ? TFunction : TFunction extends (payload: undefined, ...args: any[]) => infer Return ? () => Return : TFunction extends (payload: infer Payload, context: Context, ...args: infer Rest) => infer Return ? (payload: Payload, ...args: Rest) => Return : never;
 type RestParameters<TFunction> = TFunction extends (payload: any, context: Context, ...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;
@@ -26,16 +26,10 @@ export type ContextOptions<TContext> = {
     inherited?: boolean;
     calledFunction?: string;
 };
-export type Context<TDescription extends Description = any, TFunctions = any> = {
-    description: TDescription;
-    collection: TDescription['$id'] extends keyof Collections ? IndepthCollection<{
-        description: TDescription;
-        functions: TFunctions;
-    }> : TDescription;
+export type RouteContext = {
     collections: IndepthCollections;
     functionPath: FunctionPath;
     token: DecodedToken;
-    collectionName?: (keyof Collections & string) | string;
     request: GenericRequest;
     response: GenericResponse;
     log: (message: string, details?: any) => Promise<any>;
@@ -43,4 +37,12 @@ export type Context<TDescription extends Description = any, TFunctions = any> =
     inherited: boolean;
     calledFunction: string;
 };
+export type Context<TDescription extends Description = any, TFunctions = any> = RouteContext & {
+    description: TDescription;
+    collectionName?: (keyof Collections & string) | string;
+    collection: TDescription['$id'] extends keyof Collections ? IndepthCollection<{
+        description: TDescription;
+        functions: TFunctions;
+    }> : TDescription;
+};
 export {};

package/dist/contract.d.ts

@@ -1,8 +1,11 @@
 import type { Property, InferProperty, Context } from '.';
+export type ContractBase = {
+    builtin?: boolean;
+};
 export type ContractRoles = {
     roles?: (Collections['user']['item']['roles'][number] | 'root' | 'guest')[];
 };
-export type Contract = {
+export type Contract = ContractBase & ({
     response: Property | Property[];
 } | {
     payload: Property;
@@ -12,7 +15,7 @@ export type Contract = {
     response?: Property | Property[];
     payload?: Property;
     query?: 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 ? InferProperty<TContract['response']> : 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

@@ -2,6 +2,7 @@
 import type { ServerResponse, IncomingMessage } from 'http';
 import type { MapSchemaUnion } from '.';
 export declare const REQUEST_METHODS: readonly ["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "PATCH", "TRACE", "SEARCH"];
+export type RouteUri = `/${string}`;
 export type RequestMethod = (typeof REQUEST_METHODS)[number];
 export type GenericRequest = {
     url: string;

package/package.json

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