@aeriajs/core 0.0.84 → 0.0.86

package/dist/assets.d.ts

@@ -1,7 +1,7 @@
 import type { Context, Collection, Token } from '@aeriajs/types';
 import { ACErrors } from '@aeriajs/types';
-export declare const internalGetCollectionAsset: <TCollectionName extends string, TAssetName extends "item" | "description" | "security" | "functions" | "functionContracts" | "exposedFunctions">(collectionName: TCollectionName, assetName: TAssetName) => Promise<import("@aeriajs/types").Left<ACErrors.ResourceNotFound> | import("@aeriajs/types").Left<ACErrors.AssetNotFound> | import("@aeriajs/types").Right<any>>;
-export declare const getCollectionAsset: <TCollectionName extends string, TAssetName extends "item" | "description" | "security" | "functions" | "functionContracts" | "exposedFunctions">(collectionName: TCollectionName, assetName: TAssetName) => Promise<import("@aeriajs/types").Left<ACErrors.ResourceNotFound> | import("@aeriajs/types").Left<ACErrors.AssetNotFound> | import("@aeriajs/types").Right<NonNullable<Collection[TAssetName]>>>;
+export declare const internalGetCollectionAsset: <TCollectionName extends string, TAssetName extends "item" | "description" | "security" | "functions" | "contracts" | "exposedFunctions">(collectionName: TCollectionName, assetName: TAssetName) => Promise<import("@aeriajs/types").Left<ACErrors.ResourceNotFound> | import("@aeriajs/types").Left<ACErrors.AssetNotFound> | import("@aeriajs/types").Right<any>>;
+export declare const getCollectionAsset: <TCollectionName extends string, TAssetName extends "item" | "description" | "security" | "functions" | "contracts" | "exposedFunctions">(collectionName: TCollectionName, assetName: TAssetName) => Promise<import("@aeriajs/types").Left<ACErrors.ResourceNotFound> | import("@aeriajs/types").Left<ACErrors.AssetNotFound> | import("@aeriajs/types").Right<NonNullable<Collection[TAssetName]>>>;
 export declare const getFunction: <TCollectionName extends string, TFunctionName extends string>(collectionName: TCollectionName, functionName: TFunctionName, token?: Token, options?: {
     exposedOnly: boolean;
 }) => Promise<import("@aeriajs/types").Left<ACErrors.ResourceNotFound> | import("@aeriajs/types").Left<ACErrors.AssetNotFound> | import("@aeriajs/types").Left<ACErrors.FunctionNotFound> | import("@aeriajs/types").Left<ACErrors.FunctionNotExposed> | import("@aeriajs/types").Left<ACErrors.AuthorizationError> | import("@aeriajs/types").Right<(payload: unknown, context: Context) => Promise<any>>>;

package/dist/collection/define.d.ts

@@ -1,27 +1,27 @@
-import type { SchemaWithId, Collection, Context, Contract, ContractToFunction, Description, CollectionSecurityPolicy, AccessCondition } from '@aeriajs/types';
+import type { SchemaWithId, Collection, StrictContext, Contract, ContractToFunction, Description, CollectionSecurityPolicy, AccessCondition, RoleFromAccessCondition } from '@aeriajs/types';
 export type ExtendCollection<TLeftCollection extends Collection, TRightCollection> = Omit<TLeftCollection & TRightCollection, 'item'> & {
     item: SchemaWithId<(TLeftCollection & TRightCollection)['description']>;
 };
-export declare const defineCollection: <TCollection extends Omit<Collection<TCollection extends Collection ? TCollection : never>, "item" | "description" | "security" | "functions" | "exposedFunctions">, const TDescription extends Description<TDescription>, const TFunctionContracts extends { [P in keyof TFunctions]?: Contract | undefined; }, const TFunctions extends Record<string, (payload: any, context: Context) => any> & { [P_1 in keyof TFunctionContracts]: ContractToFunction<NonNullable<TFunctionContracts[P_1]>, Context<TDescription>>; }>(collection: TCollection & {
+export declare const defineCollection: <TCollection extends Omit<Collection<TCollection extends Collection ? TCollection : never>, "item" | "description" | "security" | "functions" | "exposedFunctions">, const TDescription extends Description<TDescription>, const TContracts extends { [P in keyof TFunctions]?: Contract | undefined; }, const TExposedFunctions extends Partial<Record<keyof TFunctions, AccessCondition>>, const TFunctions extends Record<string, (payload: any, context: StrictContext<any>) => any> & { [P_1 in keyof TContracts | keyof TExposedFunctions]: ContractToFunction<P_1 extends keyof TContracts ? NonNullable<TContracts[P_1]> : any, StrictContext<P_1 extends keyof TExposedFunctions ? RoleFromAccessCondition<TExposedFunctions[P_1]> : never, TDescription>>; }>(collection: TCollection & {
     description: TDescription;
     functions?: TFunctions;
-    functionContracts?: TFunctionContracts;
-    exposedFunctions?: Partial<Record<keyof TFunctions, AccessCondition>>;
+    contracts?: TContracts;
+    exposedFunctions?: TExposedFunctions;
     security?: CollectionSecurityPolicy<{
         description: NoInfer<TDescription>;
-        functions: TFunctions;
+        functions: NoInfer<TFunctions>;
     }>;
 }) => TCollection & {
     item: SchemaWithId<TDescription>;
     description: TDescription;
     functions: TFunctions;
-    functionContracts: TFunctionContracts;
+    contracts: TContracts;
 };
 export declare const extendCollection: <const TLeftCollection extends Collection, const TRightCollection extends {
     description?: Partial<Description> | undefined;
     item?: Partial<any> | undefined;
     security?: Partial<CollectionSecurityPolicy<any> | undefined>;
-    functions?: Partial<Record<string, (payload: any, context: Context, ...args: any[]) => any> | undefined>;
-    functionContracts?: Partial<Record<string, Contract> | undefined>;
+    functions?: Partial<Record<string, (payload: any, context: import("@aeriajs/types").Context, ...args: any[]) => any> | undefined>;
+    contracts?: Partial<Record<string, Contract> | undefined>;
     exposedFunctions?: Partial<Record<string, AccessCondition> | undefined>;
 }>(left: TLeftCollection, right: TRightCollection) => ExtendCollection<TLeftCollection, TRightCollection>;

package/dist/context.js

@@ -76,8 +76,8 @@ const createContext = async (options = {}) => {
             created_at: new Date(),
         });
     };
-    context.error = (error) => {
-        return (0, common_1.endpointError)(error, context);
+    context.error = (endpointError) => {
+        return (0, common_1.error)(endpointError, context);
     };
     context.limitRate = (params) => {
         return (0, security_1.limitRate)(params, context);

package/dist/context.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { unsafe, endpointError } from "@aeriajs/common";
+import { unsafe, error } from "@aeriajs/common";
 import { getCollections } from "@aeriajs/entrypoint";
 import { limitRate } from "@aeriajs/security";
 import { getDatabaseCollection } from "./database.mjs";
@@ -51,8 +51,8 @@ export const createContext = async (options = {}) => {
       created_at: /* @__PURE__ */ new Date()
     });
   };
-  context.error = (error) => {
-    return endpointError(error, context);
+  context.error = (endpointError) => {
+    return error(endpointError, context);
   };
   context.limitRate = (params) => {
     return limitRate(params, context);

package/dist/endpoints.js

@@ -37,7 +37,7 @@ const getEndpoints = async () => {
         const collection = typeof candidate === 'function'
             ? candidate()
             : candidate;
-        const { description, functions: collectionFunctions, functionContracts, exposedFunctions = {}, } = collection;
+        const { description, functions: collectionFunctions, contracts, exposedFunctions = {}, } = collection;
         if (collectionFunctions) {
             for (const fnName in collectionFunctions) {
                 const exposedStatus = await (0, accessControl_js_1.isFunctionExposed)(collection, fnName);
@@ -51,22 +51,22 @@ const getEndpoints = async () => {
                     : exposed
                         ? await (0, entrypoint_1.getAvailableRoles)()
                         : [];
-                const contracts = {
+                const endpointContracts = {
                     POST: null,
                 };
                 if (roles.length) {
-                    contracts.POST ??= {};
-                    contracts.POST.roles = roles;
+                    endpointContracts.POST ??= {};
+                    endpointContracts.POST.roles = roles;
                 }
-                if (functionContracts && fnName in functionContracts) {
-                    contracts.POST ??= {};
-                    Object.assign(contracts.POST, functionContracts[fnName]);
+                if (contracts && fnName in contracts) {
+                    endpointContracts.POST ??= {};
+                    Object.assign(endpointContracts.POST, contracts[fnName]);
                 }
                 if (fnName in builtinFunctions) {
-                    contracts.POST ??= {};
-                    contracts.POST.builtin = true;
+                    endpointContracts.POST ??= {};
+                    endpointContracts.POST.builtin = true;
                 }
-                functions[endpoint] = contracts;
+                functions[endpoint] = endpointContracts;
             }
         }
     }

package/dist/endpoints.mjs

@@ -13,7 +13,7 @@ export const getEndpoints = async () => {
     const {
       description,
       functions: collectionFunctions,
-      functionContracts,
+      contracts,
       exposedFunctions = {}
     } = collection;
     if (collectionFunctions) {
@@ -25,22 +25,22 @@ export const getEndpoints = async () => {
         const endpoint = `/${description.$id}/${fnName}`;
         const exposed = exposedFunctions[fnName];
         const roles = Array.isArray(exposed) ? exposed : exposed ? await getAvailableRoles() : [];
-        const contracts = {
+        const endpointContracts = {
           POST: null
         };
         if (roles.length) {
-          contracts.POST ??= {};
-          contracts.POST.roles = roles;
+          endpointContracts.POST ??= {};
+          endpointContracts.POST.roles = roles;
         }
-        if (functionContracts && fnName in functionContracts) {
-          contracts.POST ??= {};
-          Object.assign(contracts.POST, functionContracts[fnName]);
+        if (contracts && fnName in contracts) {
+          endpointContracts.POST ??= {};
+          Object.assign(endpointContracts.POST, contracts[fnName]);
         }
         if (fnName in builtinFunctions) {
-          contracts.POST ??= {};
-          contracts.POST.builtin = true;
+          endpointContracts.POST ??= {};
+          endpointContracts.POST.builtin = true;
         }
-        functions[endpoint] = contracts;
+        functions[endpoint] = endpointContracts;
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,13 +41,13 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.84",
-    "@aeriajs/common": "^0.0.50",
-    "@aeriajs/entrypoint": "^0.0.50",
-    "@aeriajs/http": "^0.0.58",
-    "@aeriajs/security": "^0.0.84",
-    "@aeriajs/types": "^0.0.47",
-    "@aeriajs/validation": "^0.0.53"
+    "@aeriajs/builtins": "^0.0.86",
+    "@aeriajs/common": "^0.0.52",
+    "@aeriajs/entrypoint": "^0.0.52",
+    "@aeriajs/http": "^0.0.60",
+    "@aeriajs/security": "^0.0.86",
+    "@aeriajs/types": "^0.0.49",
+    "@aeriajs/validation": "^0.0.55"
   },
   "dependencies": {
     "mongodb": "^6.5.0",