@aeriajs/core 0.0.170 → 0.0.171

package/dist/context.d.ts

@@ -1,2 +1,4 @@
-import type { Context, ContextOptions } from '@aeriajs/types';
-export declare const createContext: (options?: ContextOptions) => Promise<import("@aeriajs/types").RouteContext<null> & import("@aeriajs/types").CollectionContext<import("@aeriajs/types").Description, Record<string, (payload: any, context: Context<any>, ...args: any[]) => any> | undefined>>;
+import type { Context, ContextOptions, RouteContext } from '@aeriajs/types';
+export declare const createContext: <TContextOptions extends ContextOptions>(_options?: TContextOptions) => Promise<TContextOptions extends {
+    collectionName: unknown;
+} ? Context : RouteContext>;

package/dist/context.js

@@ -60,51 +60,79 @@ const indepthCollection = (collectionName, collections, parentContext) => {
         model: (0, database_js_1.getDatabaseCollection)(collectionName),
     };
 };
-const createContext = async (options = {}) => {
-    const { collectionName, parentContext, token = {
+const isCollectionContext = (_context, collectionName) => {
+    return !!collectionName;
+};
+const createContext = async (_options) => {
+    const options = _options || {};
+    const { collectionName, parentContext, token = parentContext?.token || {
         authenticated: false,
         sub: null,
     }, } = options;
     const { getCollectionAsset } = await Promise.resolve().then(() => __importStar(require('./assets.js')));
     const collections = await (0, entrypoint_1.getCollections)();
-    const context = Object.assign({}, parentContext);
-    Object.assign(context, {
-        ...options,
+    let config;
+    if (options.config) {
+        config = options.config;
+    }
+    else if (parentContext?.config) {
+        config = parentContext.config;
+    }
+    else {
+        config = {
+            security: {},
+        };
+    }
+    let request, response, inherited = !!options.inherited;
+    if (parentContext) {
+        request = parentContext.request;
+        response = parentContext.response;
+        inherited ||= parentContext.inherited;
+    }
+    else {
+        request = {};
+        response = {};
+    }
+    const context = {
         token,
-    });
-    context.log = async (message, details) => {
-        return (0, database_js_1.getDatabaseCollection)('log').insertOne({
-            message,
-            details,
-            context: collectionName,
-            owner: token.authenticated
-                ? token.sub
-                : options.parentContext?.token.sub,
-            created_at: new Date(),
-        });
-    };
-    context.error = (httpStatus, error) => {
-        return (0, common_1.endpointError)(Object.assign({
-            httpStatus,
-        }, error));
-    };
-    context.limitRate = (params) => {
-        return (0, security_1.limitRate)(params, context);
+        config,
+        inherited,
+        request,
+        response,
+        collections: new Proxy({}, {
+            get: (_, collectionName) => {
+                if (typeof collectionName !== 'string') {
+                    throw new Error();
+                }
+                return indepthCollection(collectionName, collections, context);
+            },
+        }),
+        log: async (message, details) => {
+            return (0, database_js_1.getDatabaseCollection)('log').insertOne({
+                message,
+                details,
+                context: collectionName,
+                owner: token.authenticated
+                    ? token.sub
+                    : options.parentContext?.token.sub,
+                created_at: new Date(),
+            });
+        },
+        error: (httpStatus, error) => {
+            return (0, common_1.endpointError)(Object.assign({
+                httpStatus,
+            }, error));
+        },
+        limitRate: (params) => {
+            return (0, security_1.limitRate)(params, context);
+        },
     };
-    if (collectionName) {
+    if (isCollectionContext(context, collectionName) && collectionName) {
         const description = (0, common_1.throwIfError)(await getCollectionAsset(collectionName, 'description'));
         context.description = await (0, preload_js_1.preloadDescription)(description);
         context.collectionName = collectionName;
         context.collection = indepthCollection(collectionName, collections, context);
     }
-    context.collections = new Proxy({}, {
-        get: (_, collectionName) => {
-            if (typeof collectionName !== 'string') {
-                throw new Error();
-            }
-            return indepthCollection(collectionName, collections, context);
-        },
-    });
     return context;
 };
 exports.createContext = createContext;

package/dist/context.mjs

@@ -33,52 +33,77 @@ const indepthCollection = (collectionName, collections, parentContext) => {
     model: getDatabaseCollection(collectionName)
   };
 };
-export const createContext = async (options = {}) => {
+const isCollectionContext = (_context, collectionName) => {
+  return !!collectionName;
+};
+export const createContext = async (_options) => {
+  const options = _options || {};
   const {
     collectionName,
     parentContext,
-    token = {
+    token = parentContext?.token || {
       authenticated: false,
       sub: null
     }
   } = options;
   const { getCollectionAsset } = await import("./assets.mjs");
   const collections = await getCollections();
-  const context = Object.assign({}, parentContext);
-  Object.assign(context, {
-    ...options,
-    token
-  });
-  context.log = async (message, details) => {
-    return getDatabaseCollection("log").insertOne({
-      message,
-      details,
-      context: collectionName,
-      owner: token.authenticated ? token.sub : options.parentContext?.token.sub,
-      created_at: /* @__PURE__ */ new Date()
-    });
-  };
-  context.error = (httpStatus, error) => {
-    return endpointError(Object.assign({
-      httpStatus
-    }, error));
-  };
-  context.limitRate = (params) => {
-    return limitRate(params, context);
+  let config;
+  if (options.config) {
+    config = options.config;
+  } else if (parentContext?.config) {
+    config = parentContext.config;
+  } else {
+    config = {
+      security: {}
+    };
+  }
+  let request, response, inherited = !!options.inherited;
+  if (parentContext) {
+    request = parentContext.request;
+    response = parentContext.response;
+    inherited ||= parentContext.inherited;
+  } else {
+    request = {};
+    response = {};
+  }
+  const context = {
+    token,
+    config,
+    inherited,
+    request,
+    response,
+    collections: new Proxy({}, {
+      get: (_, collectionName2) => {
+        if (typeof collectionName2 !== "string") {
+          throw new Error();
+        }
+        return indepthCollection(collectionName2, collections, context);
+      }
+    }),
+    log: async (message, details) => {
+      return getDatabaseCollection("log").insertOne({
+        message,
+        details,
+        context: collectionName,
+        owner: token.authenticated ? token.sub : options.parentContext?.token.sub,
+        created_at: /* @__PURE__ */ new Date()
+      });
+    },
+    error: (httpStatus, error) => {
+      return endpointError(Object.assign({
+        httpStatus
+      }, error));
+    },
+    limitRate: (params) => {
+      return limitRate(params, context);
+    }
   };
-  if (collectionName) {
+  if (isCollectionContext(context, collectionName) && collectionName) {
     const description = throwIfError(await getCollectionAsset(collectionName, "description"));
     context.description = await preloadDescription(description);
     context.collectionName = collectionName;
     context.collection = indepthCollection(collectionName, collections, context);
   }
-  context.collections = new Proxy({}, {
-    get: (_, collectionName2) => {
-      if (typeof collectionName2 !== "string") {
-        throw new Error();
-      }
-      return indepthCollection(collectionName2, collections, context);
-    }
-  });
   return context;
 };

package/dist/use.d.ts

@@ -1 +1 @@
-export declare const createAeria: () => Promise<import("@aeriajs/types").RouteContext<null> & import("@aeriajs/types").CollectionContext<import("@aeriajs/types").Description, Record<string, (payload: any, context: import("@aeriajs/types").Context<any>, ...args: any[]) => any> | undefined>>;
+export declare const createAeria: () => Promise<import("@aeriajs/types").RouteContext>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.170",
+  "version": "0.0.171",
   "description": "",
   "main": "dist/index.js",
   "aeriaMain": "tests/fixtures/aeriaMain.js",
@@ -42,13 +42,13 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.170",
-    "@aeriajs/common": "^0.0.104",
-    "@aeriajs/entrypoint": "^0.0.106",
-    "@aeriajs/http": "^0.0.117",
-    "@aeriajs/security": "^0.0.170",
-    "@aeriajs/types": "^0.0.87",
-    "@aeriajs/validation": "^0.0.107"
+    "@aeriajs/builtins": "^0.0.171",
+    "@aeriajs/common": "^0.0.105",
+    "@aeriajs/entrypoint": "^0.0.107",
+    "@aeriajs/http": "^0.0.118",
+    "@aeriajs/security": "^0.0.171",
+    "@aeriajs/types": "^0.0.88",
+    "@aeriajs/validation": "^0.0.108"
   },
   "dependencies": {
     "mongodb": "^6.5.0",