@aeriajs/core 0.0.172 → 0.0.174

package/dist/collection/prepareInsert.d.ts

@@ -1,3 +1,3 @@
 import type { Description } from '@aeriajs/types';
 export declare const prepareCreate: (doc: Record<string, unknown>, description: Description) => Record<string, unknown>;
-export declare const prepareUpdate: (doc: Record<string, unknown>) => Record<string, Record<string, unknown>>;
+export declare const prepareUpdate: (doc: Record<string, unknown>) => Record<"$set" | "$unset", Record<string, unknown>>;

package/dist/collection/reference.d.ts

@@ -16,6 +16,7 @@ export type GetReferenceOptions = {
     depth?: number;
     maxDepth?: number;
     populate?: string[];
+    isArrayElement?: boolean;
 };
 export type BuildLookupPipelineOptions = {
     rootPipeline?: Document[];

package/dist/collection/reference.js

@@ -9,7 +9,7 @@ const getTempName = (path) => {
 const referenceMemo = {};
 const lookupMemo = {};
 const getReferences = async (properties, options = {}) => {
-    const { depth = 0, maxDepth = 3, memoize, populate, } = options;
+    const { depth = 0, maxDepth = 3, memoize, populate, isArrayElement, } = options;
     if (memoize) {
         if (referenceMemo[memoize]) {
             return referenceMemo[memoize];
@@ -33,6 +33,7 @@ const getReferences = async (properties, options = {}) => {
                     maxDepth: refProperty.populateDepth || maxDepth,
                     memoize: `${memoize}.${propName}`,
                     populate: Array.from(refProperty.populate),
+                    isArrayElement: 'items' in property,
                 });
                 if (Object.keys(deepReferences).length > 0) {
                     reference.deepReferences = deepReferences;
@@ -68,6 +69,9 @@ const getReferences = async (properties, options = {}) => {
         if ('items' in property) {
             reference.isArray = true;
         }
+        if (isArrayElement) {
+            reference.isArrayElement = true;
+        }
         if (depth > 0) {
             reference.isRecursive = true;
         }
@@ -92,7 +96,7 @@ const recurseSetStage = (reference, path, parentElem, options = {
 }) => {
     const refName = path.at(-1);
     let indexOfArray;
-    if (reference.isRecursive && !reference.isArrayElement) {
+    if (reference.isRecursive && !(reference.isArrayElement && reference.isArray === false)) {
         indexOfArray = {
             $indexOfArray: [
                 `$${getTempName(path)}._id`,
@@ -125,7 +129,6 @@ const recurseSetStage = (reference, path, parentElem, options = {
             mapIn = (0, exports.recurseSetStage)({
                 ...reference,
                 isArray: false,
-                isArrayElement: true,
             }, path, `$$${newElemName}`);
         }
         else {
@@ -135,19 +138,33 @@ const recurseSetStage = (reference, path, parentElem, options = {
                     (0, exports.recurseSetStage)({
                         ...reference,
                         isArray: false,
-                        isArrayElement: true,
                     }, path, `$$${newElemName}`),
                 ],
             };
         }
         let mapInput = parentElem;
         if (reference.isRecursive) {
-            mapInput = {
-                $arrayElemAt: [
-                    `$${getTempName(path.slice(0, -1))}.${refName}`,
-                    indexOfArray,
-                ],
-            };
+            if (reference.isArrayElement) {
+                mapInput = {
+                    $arrayElemAt: [
+                        `$${getTempName(path.slice(0, -1))}.${refName}`,
+                        {
+                            $indexOfArray: [
+                                `$${getTempName(path.slice(0, -1))}._id`,
+                                parentElem,
+                            ],
+                        },
+                    ],
+                };
+            }
+            else {
+                mapInput = {
+                    $arrayElemAt: [
+                        `$${getTempName(path.slice(0, -1))}.${refName}`,
+                        indexOfArray,
+                    ],
+                };
+            }
         }
         return {
             $filter: {

package/dist/collection/reference.mjs

@@ -11,7 +11,8 @@ export const getReferences = async (properties, options = {}) => {
     depth = 0,
     maxDepth = 3,
     memoize,
-    populate
+    populate,
+    isArrayElement
   } = options;
   if (memoize) {
     if (referenceMemo[memoize]) {
@@ -35,7 +36,8 @@ export const getReferences = async (properties, options = {}) => {
           depth: depth + 1,
           maxDepth: refProperty.populateDepth || maxDepth,
           memoize: `${memoize}.${propName}`,
-          populate: Array.from(refProperty.populate)
+          populate: Array.from(refProperty.populate),
+          isArrayElement: "items" in property
         });
         if (Object.keys(deepReferences).length > 0) {
           reference.deepReferences = deepReferences;
@@ -61,6 +63,9 @@ export const getReferences = async (properties, options = {}) => {
     if ("items" in property) {
       reference.isArray = true;
     }
+    if (isArrayElement) {
+      reference.isArrayElement = true;
+    }
     if (depth > 0) {
       reference.isRecursive = true;
     }
@@ -84,7 +89,7 @@ export const recurseSetStage = (reference, path, parentElem, options = {
 }) => {
   const refName = path.at(-1);
   let indexOfArray;
-  if (reference.isRecursive && !reference.isArrayElement) {
+  if (reference.isRecursive && !(reference.isArrayElement && reference.isArray === false)) {
     indexOfArray = {
       $indexOfArray: [
         `$${getTempName(path)}._id`,
@@ -115,8 +120,7 @@ export const recurseSetStage = (reference, path, parentElem, options = {
     if (reference.referencedCollection) {
       mapIn = recurseSetStage({
         ...reference,
-        isArray: false,
-        isArrayElement: true
+        isArray: false
       }, path, `$$${newElemName}`);
     } else {
       mapIn = {
@@ -124,20 +128,33 @@ export const recurseSetStage = (reference, path, parentElem, options = {
           `$$${newElemName}`,
           recurseSetStage({
             ...reference,
-            isArray: false,
-            isArrayElement: true
+            isArray: false
           }, path, `$$${newElemName}`)
         ]
       };
     }
     let mapInput = parentElem;
     if (reference.isRecursive) {
-      mapInput = {
-        $arrayElemAt: [
-          `$${getTempName(path.slice(0, -1))}.${refName}`,
-          indexOfArray
-        ]
-      };
+      if (reference.isArrayElement) {
+        mapInput = {
+          $arrayElemAt: [
+            `$${getTempName(path.slice(0, -1))}.${refName}`,
+            {
+              $indexOfArray: [
+                `$${getTempName(path.slice(0, -1))}._id`,
+                parentElem
+              ]
+            }
+          ]
+        };
+      } else {
+        mapInput = {
+          $arrayElemAt: [
+            `$${getTempName(path.slice(0, -1))}.${refName}`,
+            indexOfArray
+          ]
+        };
+      }
     }
     return {
       $filter: {

package/dist/context.js

@@ -112,9 +112,7 @@ const createContext = async (_options) => {
                 message,
                 details,
                 context: collectionName,
-                owner: token.authenticated
-                    ? token.sub
-                    : options.parentContext?.token.sub,
+                owner: token.sub,
                 created_at: new Date(),
             });
         },
@@ -131,7 +129,12 @@ const createContext = async (_options) => {
         const description = (0, common_1.throwIfError)(await getCollectionAsset(collectionName, 'description'));
         context.description = await (0, preload_js_1.preloadDescription)(description);
         context.collectionName = collectionName;
-        context.calledFunction = options.calledFunction;
+        if (!options.calledFunction && parentContext && 'calledFunction' in parentContext) {
+            context.calledFunction = parentContext.calledFunction;
+        }
+        else {
+            context.calledFunction = options.calledFunction;
+        }
         context.collection = indepthCollection(collectionName, collections, context);
     }
     return context;

package/dist/context.mjs

@@ -86,7 +86,7 @@ export const createContext = async (_options) => {
         message,
         details,
         context: collectionName,
-        owner: token.authenticated ? token.sub : options.parentContext?.token.sub,
+        owner: token.sub,
         created_at: /* @__PURE__ */ new Date()
       });
     },
@@ -103,7 +103,11 @@ export const createContext = async (_options) => {
     const description = throwIfError(await getCollectionAsset(collectionName, "description"));
     context.description = await preloadDescription(description);
     context.collectionName = collectionName;
-    context.calledFunction = options.calledFunction;
+    if (!options.calledFunction && parentContext && "calledFunction" in parentContext) {
+      context.calledFunction = parentContext.calledFunction;
+    } else {
+      context.calledFunction = options.calledFunction;
+    }
     context.collection = indepthCollection(collectionName, collections, context);
   }
   return context;

package/dist/database.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatabaseCollection = exports.getDatabaseSync = exports.getDatabase = exports.ObjectId = void 0;
 const entrypoint_1 = require("@aeriajs/entrypoint");
+const util_1 = require("util");
 const mongodb_1 = require("mongodb");
 var mongodb_2 = require("mongodb");
 Object.defineProperty(exports, "ObjectId", { enumerable: true, get: function () { return mongodb_2.ObjectId; } });
@@ -48,12 +49,10 @@ const getDatabase = async () => {
         });
         if (logQueries) {
             client.on('commandStarted', (event) => {
-                try {
-                    console.debug(JSON.stringify(event, null, 2));
-                }
-                catch (err) {
-                    console.debug(event);
-                }
+                console.debug((0, util_1.inspect)(event, {
+                    colors: true,
+                    compact: false,
+                }));
             });
         }
         dbMemo.client = client;

package/dist/database.mjs

@@ -1,5 +1,6 @@
 "use strict";
 import { getConfig } from "@aeriajs/entrypoint";
+import { inspect } from "util";
 import { MongoClient } from "mongodb";
 export {
   ObjectId
@@ -24,11 +25,10 @@ export const getDatabase = async () => {
     });
     if (logQueries) {
       client.on("commandStarted", (event) => {
-        try {
-          console.debug(JSON.stringify(event, null, 2));
-        } catch (err) {
-          console.debug(event);
-        }
+        console.debug(inspect(event, {
+          colors: true,
+          compact: false
+        }));
       });
     }
     dbMemo.client = client;

package/dist/index.d.ts

@@ -6,7 +6,6 @@ export * from './database.js';
 export * from './functions/index.js';
 export * from './endpoints.js';
 export * from './token.js';
-export * from './use.js';
 export * from './functions/index.js';
 export * as functions from './functions/index.js';
 export { ObjectId, } from 'mongodb';

package/dist/index.js

@@ -35,7 +35,6 @@ __exportStar(require("./database.js"), exports);
 __exportStar(require("./functions/index.js"), exports);
 __exportStar(require("./endpoints.js"), exports);
 __exportStar(require("./token.js"), exports);
-__exportStar(require("./use.js"), exports);
 __exportStar(require("./functions/index.js"), exports);
 exports.functions = __importStar(require("./functions/index.js"));
 var mongodb_1 = require("mongodb");

package/dist/index.mjs

@@ -7,7 +7,6 @@ export * from "./database.mjs";
 export * from "./functions/index.mjs";
 export * from "./endpoints.mjs";
 export * from "./token.mjs";
-export * from "./use.mjs";
 export * from "./functions/index.mjs";
 export * as functions from "./functions/index.mjs";
 export {

package/dist/token.d.ts

@@ -1,5 +1,4 @@
 import type { SignOptions } from 'jsonwebtoken';
 export declare const EXPIRES_IN = 36000;
-export declare const signToken: (_payload: Record<string, unknown>, secret?: string | null, options?: SignOptions) => Promise<string>;
-export declare const verifyToken: <TToken>(token: string, secret?: string) => Promise<TToken>;
+export declare const signToken: ({ iat, exp, ...payload }: Record<string, unknown>, secret?: string | null, options?: SignOptions) => Promise<string>;
 export declare const decodeToken: <TToken>(token: string, secret?: string) => Promise<TToken>;

package/dist/token.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeToken = exports.verifyToken = exports.signToken = exports.EXPIRES_IN = void 0;
+exports.decodeToken = exports.signToken = exports.EXPIRES_IN = void 0;
 const entrypoint_1 = require("@aeriajs/entrypoint");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 exports.EXPIRES_IN = 36000;
@@ -14,21 +14,13 @@ const getApplicationSecret = async () => {
     }
     return config.secret;
 };
-const signToken = async (_payload, secret, options) => {
-    const payload = Object.assign({}, _payload);
-    delete payload.iat;
-    delete payload.exp;
-    const signed = jsonwebtoken_1.default.sign(payload, secret || await getApplicationSecret(), options || {
+const signToken = async ({ iat, exp, ...payload }, secret, options) => {
+    return jsonwebtoken_1.default.sign(payload, secret || await getApplicationSecret(), options || {
         expiresIn: exports.EXPIRES_IN,
     });
-    return signed;
 };
 exports.signToken = signToken;
-const verifyToken = async (token, secret) => {
+const decodeToken = async (token, secret) => {
     return jsonwebtoken_1.default.verify(token, secret || await getApplicationSecret());
 };
-exports.verifyToken = verifyToken;
-const decodeToken = (token, secret) => {
-    return (0, exports.verifyToken)(token, secret);
-};
 exports.decodeToken = decodeToken;

package/dist/token.mjs

@@ -9,18 +9,11 @@ const getApplicationSecret = async () => {
   }
   return config.secret;
 };
-export const signToken = async (_payload, secret, options) => {
-  const payload = Object.assign({}, _payload);
-  delete payload.iat;
-  delete payload.exp;
-  const signed = jwt.sign(payload, secret || await getApplicationSecret(), options || {
+export const signToken = async ({ iat, exp, ...payload }, secret, options) => {
+  return jwt.sign(payload, secret || await getApplicationSecret(), options || {
     expiresIn: EXPIRES_IN
   });
-  return signed;
 };
-export const verifyToken = async (token, secret) => {
+export const decodeToken = async (token, secret) => {
   return jwt.verify(token, secret || await getApplicationSecret());
 };
-export const decodeToken = (token, secret) => {
-  return verifyToken(token, secret);
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.172",
+  "version": "0.0.174",
   "description": "",
   "main": "dist/index.js",
   "aeriaMain": "tests/fixtures/aeriaMain.js",
@@ -42,11 +42,11 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.172",
+    "@aeriajs/builtins": "^0.0.174",
     "@aeriajs/common": "^0.0.105",
     "@aeriajs/entrypoint": "^0.0.107",
     "@aeriajs/http": "^0.0.118",
-    "@aeriajs/security": "^0.0.172",
+    "@aeriajs/security": "^0.0.174",
     "@aeriajs/types": "^0.0.88",
     "@aeriajs/validation": "^0.0.108"
   },

package/dist/use.d.ts

@@ -1 +0,0 @@
-export declare const createAeria: () => Promise<import("@aeriajs/types").RouteContext>;

package/dist/use.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAeria = void 0;
-const entrypoint_1 = require("@aeriajs/entrypoint");
-const context_js_1 = require("./context.js");
-const database_js_1 = require("./database.js");
-const createAeria = async () => {
-    await (0, database_js_1.getDatabase)();
-    const context = await (0, context_js_1.createContext)({
-        config: await (0, entrypoint_1.getConfig)(),
-        token: {
-            authenticated: false,
-            sub: null,
-        },
-    });
-    return context;
-};
-exports.createAeria = createAeria;

package/dist/use.mjs

@@ -1,15 +0,0 @@
-"use strict";
-import { getConfig } from "@aeriajs/entrypoint";
-import { createContext } from "./context.mjs";
-import { getDatabase } from "./database.mjs";
-export const createAeria = async () => {
-  await getDatabase();
-  const context = await createContext({
-    config: await getConfig(),
-    token: {
-      authenticated: false,
-      sub: null
-    }
-  });
-  return context;
-};