@aeriajs/core 0.0.157 → 0.0.159

package/dist/collection/traverseDocument.d.ts

@@ -1,19 +1,27 @@
 import type { Description, Property, ValidationError, Context } from '@aeriajs/types';
 import { ACError, TraverseError } from '@aeriajs/types';
 import { ObjectId } from 'mongodb';
-export type TraverseOptions = {
+export type TraverseOptionsBase = {
     autoCast?: boolean;
-    getters?: boolean;
     validate?: boolean;
     validateRequired?: Description['required'];
-    moveFiles?: boolean;
     fromProperties?: boolean;
     allowOperators?: boolean;
     skipUndefined?: boolean;
     recurseDeep?: boolean;
     recurseReferences?: boolean;
-    context?: Context;
 };
+export type TraverseOptions = (TraverseOptionsBase & {
+    getters?: never;
+    moveFiles?: never;
+    context?: never;
+}) | (TraverseOptionsBase & {
+    getters: true;
+    context: Context;
+}) | (TraverseOptionsBase & {
+    moveFiles: true;
+    context: Context;
+});
 export type TraverseNormalized = {
     description: Description;
     pipe: <T = unknown>(value: unknown, phaseContext: PhaseContext) => T | Promise<T>;

package/dist/collection/traverseDocument.js

@@ -160,7 +160,10 @@ const autoCast = (value, ctx) => {
 };
 const getters = (value, ctx) => {
     if ('getter' in ctx.property) {
-        return ctx.property.getter(ctx.target);
+        if (!ctx.options.context) {
+            throw new Error;
+        }
+        return ctx.property.getter(ctx.target, ctx.options.context);
     }
     return value;
 };
@@ -230,7 +233,7 @@ const recurseDeep = async (value, ctx) => {
             });
             items.push(result);
         }
-        if (ctx.options.moveFiles && '$ref' in ctx.property.items && ctx.property.items.$ref === 'file') {
+        if ('moveFiles' in ctx.options && ctx.options.moveFiles && '$ref' in ctx.property.items && ctx.property.items.$ref === 'file') {
             await disposeOldFiles(ctx, {
                 preserveIds: items,
             });
@@ -251,7 +254,7 @@ const recurse = async (target, ctx) => {
         const value = target[propName];
         const property = getProperty(propName, ctx.property);
         if (ctx.options.skipUndefined) {
-            if (value === undefined && !(ctx.options.getters && property && 'getter' in property)) {
+            if (value === undefined && !('getters' in ctx.options && ctx.options.getters && property && 'getter' in property)) {
                 continue;
             }
         }
@@ -314,7 +317,10 @@ const recurse = async (target, ctx) => {
             ]);
         }
         if (property) {
-            if (ctx.options.getters && 'getter' in property) {
+            if (property.hidden) {
+                continue;
+            }
+            if ('getters' in ctx.options && ctx.options.getters && 'getter' in property) {
                 if (property.requires) {
                     const missing = property.requires.some((requiredPropName) => !(requiredPropName in target));
                     if (missing) {
@@ -393,7 +399,7 @@ const traverseDocument = async (what, description, _options) => {
     if (options.autoCast) {
         functions.push(autoCast);
     }
-    if (options.getters) {
+    if ('getters' in options && options.getters) {
         functions.push(getters);
     }
     if (options.validate) {
@@ -407,7 +413,7 @@ const traverseDocument = async (what, description, _options) => {
         }
         functions.push(validate);
     }
-    if (options.moveFiles) {
+    if ('moveFiles' in options && options.moveFiles) {
         functions.push(moveFiles);
     }
     let traverseError;

package/dist/collection/traverseDocument.mjs

@@ -126,7 +126,10 @@ const autoCast = (value, ctx) => {
 };
 const getters = (value, ctx) => {
   if ("getter" in ctx.property) {
-    return ctx.property.getter(ctx.target);
+    if (!ctx.options.context) {
+      throw new Error();
+    }
+    return ctx.property.getter(ctx.target, ctx.options.context);
   }
   return value;
 };
@@ -196,7 +199,7 @@ const recurseDeep = async (value, ctx) => {
       });
       items.push(result);
     }
-    if (ctx.options.moveFiles && "$ref" in ctx.property.items && ctx.property.items.$ref === "file") {
+    if ("moveFiles" in ctx.options && ctx.options.moveFiles && "$ref" in ctx.property.items && ctx.property.items.$ref === "file") {
       await disposeOldFiles(ctx, {
         preserveIds: items
       });
@@ -215,7 +218,7 @@ const recurse = async (target, ctx) => {
     const value = target[propName];
     const property = getProperty(propName, ctx.property);
     if (ctx.options.skipUndefined) {
-      if (value === void 0 && !(ctx.options.getters && property && "getter" in property)) {
+      if (value === void 0 && !("getters" in ctx.options && ctx.options.getters && property && "getter" in property)) {
         continue;
       }
     }
@@ -276,7 +279,10 @@ const recurse = async (target, ctx) => {
       ]);
     }
     if (property) {
-      if (ctx.options.getters && "getter" in property) {
+      if (property.hidden) {
+        continue;
+      }
+      if ("getters" in ctx.options && ctx.options.getters && "getter" in property) {
         if (property.requires) {
           const missing = property.requires.some((requiredPropName) => !(requiredPropName in target));
           if (missing) {
@@ -351,7 +357,7 @@ export const traverseDocument = async (what, description, _options) => {
   if (options.autoCast) {
     functions.push(autoCast);
   }
-  if (options.getters) {
+  if ("getters" in options && options.getters) {
     functions.push(getters);
   }
   if (options.validate) {
@@ -365,7 +371,7 @@ export const traverseDocument = async (what, description, _options) => {
     }
     functions.push(validate);
   }
-  if (options.moveFiles) {
+  if ("moveFiles" in options && options.moveFiles) {
     functions.push(moveFiles);
   }
   let traverseError;

package/dist/functions/get.js

@@ -43,6 +43,7 @@ const internalGet = async (payload, context) => {
         });
     }
     const result = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
+        context,
         getters: true,
         fromProperties: true,
         recurseReferences: true,

package/dist/functions/get.mjs

@@ -47,6 +47,7 @@ const internalGet = async (payload, context) => {
     });
   }
   const result = throwIfError(await traverseDocument(doc, context.description, {
+    context,
     getters: true,
     fromProperties: true,
     recurseReferences: true,

package/dist/functions/getAll.js

@@ -78,6 +78,7 @@ const internalGetAll = async (payload, context) => {
     const documents = [];
     for (const doc of result) {
         documents.push((0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
+            context,
             getters: true,
             fromProperties: true,
             recurseReferences: true,

package/dist/functions/getAll.mjs

@@ -76,6 +76,7 @@ const internalGetAll = async (payload, context) => {
   const documents = [];
   for (const doc of result) {
     documents.push(throwIfError(await traverseDocument(doc, context.description, {
+      context,
       getters: true,
       fromProperties: true,
       recurseReferences: true,

package/dist/functions/insert.js

@@ -70,9 +70,8 @@ const internalInsert = async (payload, context) => {
             _id: docId,
         }, content);
     }
-    let doc;
     if (context.collection.originalFunctions?.get) {
-        doc = (0, common_1.throwIfError)(await context.collection.originalFunctions.get({
+        return context.collection.originalFunctions.get({
             filters: {
                 _id: newId,
             },
@@ -80,21 +79,20 @@ const internalInsert = async (payload, context) => {
             inherited: true,
         }, context), {
             bypassSecurity: true,
-        }));
-    }
-    else {
-        doc = await context.collection.model.findOne({
-            _id: newId,
-        }, {
-            projection,
         });
     }
+    const doc = await context.collection.model.findOne({
+        _id: newId,
+    }, {
+        projection,
+    });
     if (!doc) {
         return context.error(types_1.HTTPStatus.NotFound, {
             code: types_1.ACError.ResourceNotFound,
         });
     }
     const result = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
+        context,
         getters: true,
         fromProperties: true,
         recurseReferences: true,

package/dist/functions/insert.mjs

@@ -60,9 +60,8 @@ const internalInsert = async (payload, context) => {
       _id: docId
     }, content);
   }
-  let doc;
   if (context.collection.originalFunctions?.get) {
-    doc = throwIfError(await context.collection.originalFunctions.get({
+    return context.collection.originalFunctions.get({
       filters: {
         _id: newId
       }
@@ -70,20 +69,20 @@ const internalInsert = async (payload, context) => {
       inherited: true
     }, context), {
       bypassSecurity: true
-    }));
-  } else {
-    doc = await context.collection.model.findOne({
-      _id: newId
-    }, {
-      projection
     });
   }
+  const doc = await context.collection.model.findOne({
+    _id: newId
+  }, {
+    projection
+  });
   if (!doc) {
     return context.error(HTTPStatus.NotFound, {
       code: ACError.ResourceNotFound
     });
   }
   const result = throwIfError(await traverseDocument(doc, context.description, {
+    context,
     getters: true,
     fromProperties: true,
     recurseReferences: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.157",
+  "version": "0.0.159",
   "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.157",
-    "@aeriajs/common": "^0.0.94",
-    "@aeriajs/entrypoint": "^0.0.96",
-    "@aeriajs/http": "^0.0.107",
-    "@aeriajs/security": "^0.0.157",
-    "@aeriajs/types": "^0.0.80",
-    "@aeriajs/validation": "^0.0.97"
+    "@aeriajs/builtins": "^0.0.159",
+    "@aeriajs/common": "^0.0.96",
+    "@aeriajs/entrypoint": "^0.0.98",
+    "@aeriajs/http": "^0.0.109",
+    "@aeriajs/security": "^0.0.159",
+    "@aeriajs/types": "^0.0.82",
+    "@aeriajs/validation": "^0.0.99"
   },
   "dependencies": {
     "mongodb": "^6.5.0",