@aeriajs/core 0.0.259 → 0.0.261

package/dist/collection/traverseDocument.d.ts

@@ -1,4 +1,5 @@
 import type { Description, Property, ValidationError, RouteContext, TempId } from '@aeriajs/types';
+import { Result } from '@aeriajs/types';
 import { ObjectId } from 'mongodb';
 export type TraverseOptionsBase = {
     autoCast?: boolean;
@@ -24,7 +25,7 @@ export type TraverseOptions = (TraverseOptionsBase & {
 });
 export type TraverseNormalized = {
     description: Description;
-    pipe: (value: unknown, phaseContext: PhaseContext) => unknown;
+    pipe: (value: unknown, phaseContext: PhaseContext) => Promise<Result.Either<unknown, unknown>>;
 };
 export type ValidTempFile = null | undefined | ObjectId | TempId;
 type PhaseContext = {

package/dist/collection/traverseDocument.js

@@ -70,7 +70,7 @@ const cleanupReferences = async (value, ctx) => {
         const refProperty = (0, common_1.getReferenceProperty)(ctx.property);
         if (refProperty && (refProperty.$ref === 'file' || refProperty.inline)) {
             if (ctx.isArray && !Array.isArray(value)) {
-                return value;
+                return types_1.Result.result(value);
             }
             const context = ctx.options.context;
             const doc = await context.collections[ctx.options.description.$id].model.findOne({
@@ -85,7 +85,7 @@ const cleanupReferences = async (value, ctx) => {
             }
             let referenceIds = (0, common_1.getValueFromPath)(doc, ctx.propPath);
             if (!referenceIds) {
-                return value;
+                return types_1.Result.result(value);
             }
             if (Array.isArray(referenceIds)) {
                 if (!Array.isArray(value)) {
@@ -95,7 +95,7 @@ const cleanupReferences = async (value, ctx) => {
             }
             else {
                 if (referenceIds.equals(value)) {
-                    return value;
+                    return types_1.Result.result(value);
                 }
             }
             const refMap = await (0, reference_js_1.getReferences)({
@@ -107,47 +107,47 @@ const cleanupReferences = async (value, ctx) => {
             }));
         }
     }
-    return value;
+    return types_1.Result.result(value);
 };
 const autoCast = (value, ctx) => {
     switch (typeof value) {
         case 'boolean': {
-            return !!value;
+            return types_1.Result.result(!!value);
         }
         case 'string': {
             if ((0, common_1.isReference)(ctx.property)) {
-                return mongodb_1.ObjectId.isValid(value)
+                return types_1.Result.result(mongodb_1.ObjectId.isValid(value)
                     ? new mongodb_1.ObjectId(value)
-                    : value;
+                    : value);
             }
             if ('format' in ctx.property) {
                 if (ctx.property.format === 'date' || ctx.property.format === 'date-time') {
                     const timestamp = Date.parse(value);
-                    return !Number.isNaN(timestamp)
+                    return types_1.Result.result(!Number.isNaN(timestamp)
                         ? new Date(timestamp)
-                        : null;
+                        : null);
                 }
             }
             break;
         }
         case 'number': {
             if ('type' in ctx.property && ctx.property.type === 'integer') {
-                return parseInt(value.toString());
+                return types_1.Result.result(parseInt(value.toString()));
             }
             if ('format' in ctx.property) {
                 if (ctx.property.format === 'date' || ctx.property.format === 'date-time') {
-                    return new Date(value);
+                    return types_1.Result.result(new Date(value));
                 }
             }
             break;
         }
         case 'object': {
             if (!value || value instanceof mongodb_1.ObjectId) {
-                return value;
+                return types_1.Result.result(value);
             }
             if (!('description' in ctx.options) || !ctx.options.recurseDeep) {
                 if (Array.isArray(value)) {
-                    return value.map((v) => autoCast(v, ctx));
+                    return types_1.Result.result(value.map((v) => (0, common_1.throwIfError)(autoCast(v, ctx))));
                 }
                 if (Object.keys(value).length > 0) {
                     const entries = {};
@@ -158,40 +158,44 @@ const autoCast = (value, ctx) => {
                         if (!subProperty) {
                             continue;
                         }
-                        entries[k] = autoCast(v, {
+                        entries[k] = (0, common_1.throwIfError)(autoCast(v, {
                             ...ctx,
                             property: subProperty,
-                        });
+                        }));
                     }
-                    return entries;
+                    return types_1.Result.result(entries);
                 }
             }
         }
     }
-    return value;
+    return types_1.Result.result(value);
 };
-const getters = (value, ctx) => {
+const getters = async (value, ctx) => {
     if ('getter' in ctx.property) {
         if (!ctx.options.context) {
             throw new Error;
         }
-        return ctx.property.getter(ctx.target, ctx.options.context);
+        return types_1.Result.result(await ctx.property.getter(ctx.target, ctx.options.context));
     }
-    return value;
+    return types_1.Result.result(value);
 };
-const validate = (value, ctx) => {
+const validate = async (value, ctx) => {
     if (ctx.options.recurseDeep) {
         if ('properties' in ctx.property) {
-            return value;
+            return types_1.Result.result(value);
         }
     }
-    const { error } = (0, validation_1.validateProperty)(value, ctx.property);
+    const { error } = await (0, validation_1.validatePropertyWithRefs)(value, ctx.property, {
+        checkObjectIds: true,
+        context: ctx.options.context,
+        objectIdConstructor: mongodb_1.ObjectId,
+    });
     if (error) {
         return types_1.Result.error({
             [ctx.propName]: error,
         });
     }
-    return value;
+    return types_1.Result.result(value);
 };
 const isValidTempFile = (value) => {
     if (value && typeof value === 'object') {
@@ -208,7 +212,7 @@ const isMissingPropertyError = (error) => {
 };
 const moveFiles = async (value, ctx) => {
     if (!('$ref' in ctx.property) || ctx.property.$ref !== 'file') {
-        return value;
+        return types_1.Result.result(value);
     }
     const tempFileCollection = await (0, entrypoint_1.getCollection)('tempFile');
     if (!tempFileCollection) {
@@ -218,10 +222,10 @@ const moveFiles = async (value, ctx) => {
         return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
     }
     if (!value) {
-        return null;
+        return types_1.Result.result(null);
     }
     if (value instanceof mongodb_1.ObjectId) {
-        return value;
+        return types_1.Result.result(value);
     }
     if (!ctx.options.context) {
         throw new Error();
@@ -237,11 +241,11 @@ const moveFiles = async (value, ctx) => {
     newFile.owner = ctx.options.context.token.sub;
     await fs.rename(tempFile.absolute_path, newFile.absolute_path);
     const file = await ctx.options.context.collections.file.model.insertOne(newFile);
-    return file.insertedId;
+    return types_1.Result.result(file.insertedId);
 };
 const recurseDeep = async (value, ctx) => {
     if (!value) {
-        return value;
+        return types_1.Result.result(value);
     }
     if ('properties' in ctx.property) {
         if (ctx.options.validateWholeness) {
@@ -250,28 +254,26 @@ const recurseDeep = async (value, ctx) => {
                 return types_1.Result.error(wholenessError);
             }
         }
-        const { error, result } = await recurse(value, ctx);
-        if (error) {
-            return types_1.Result.error(error);
-        }
-        return result;
+        return recurse(value, ctx);
     }
     if ('items' in ctx.property) {
         if (!Array.isArray(value)) {
-            return value;
+            return types_1.Result.result(value);
         }
         const items = [];
         for (const item of value) {
-            const result = await ctx.options.pipe(item, {
+            const { error, result } = await ctx.options.pipe(item, {
                 ...ctx,
                 property: ctx.property.items,
                 isArray: true,
             });
-            items.push(result);
+            if (!error) {
+                items.push(result);
+            }
         }
-        return items;
+        return types_1.Result.result(items);
     }
-    return value;
+    return types_1.Result.result(value);
 };
 const recurse = async (target, ctx) => {
     const entries = {};
@@ -287,14 +289,14 @@ const recurse = async (target, ctx) => {
         if (propName === '_id') {
             if (value) {
                 if (ctx.options.autoCast) {
-                    entries[propName] = autoCast(value, {
+                    entries[propName] = (0, common_1.throwIfError)(autoCast(value, {
                         ...ctx,
                         target,
                         propName,
                         property: {
                             $ref: '',
                         },
-                    });
+                    }));
                 }
                 else {
                     entries[propName] = value;
@@ -395,7 +397,7 @@ const recurse = async (target, ctx) => {
                     continue;
                 }
             }
-            entries[propName] = await ctx.options.pipe(value, {
+            const { error, result } = await ctx.options.pipe(value, {
                 ...ctx,
                 target,
                 propName,
@@ -404,6 +406,9 @@ const recurse = async (target, ctx) => {
                     : propName,
                 property,
             });
+            if (!error) {
+                entries[propName] = result;
+            }
         }
     }
     return types_1.Result.result(entries);
@@ -445,30 +450,27 @@ const traverseDocument = async (what, description, _options) => {
         functions.push(moveFiles);
     }
     let traverseError, validationError;
-    const mutateTarget = (fn) => {
-        return async (value, ctx) => {
-            const result = await fn(value, ctx);
-            ctx.target[ctx.propName] = result;
-            return result;
-        };
-    };
-    options.pipe = (0, common_1.pipe)(functions.map(mutateTarget), {
-        returnFirst: (value) => {
-            if ((0, common_1.isError)(value)) {
-                const error = value.error;
-                switch (error) {
+    options.pipe = async (initialValue, ctx) => {
+        let value = initialValue;
+        for (const fn of functions) {
+            const { error, result } = await fn(value, ctx);
+            if (error) {
+                const narrowedError = error;
+                switch (narrowedError) {
                     case types_1.TraverseError.InvalidDocumentId:
                     case types_1.TraverseError.InvalidTempfile:
-                        traverseError = error;
+                        traverseError = narrowedError;
                         break;
                     default: {
-                        validationError = error;
+                        validationError = narrowedError;
                     }
                 }
-                return value;
+                return types_1.Result.error(error);
             }
-        },
-    });
+            value = ctx.target[ctx.propName] = result;
+        }
+        return types_1.Result.result(value);
+    };
     const { error, result } = await recurse(whatCopy, {
         root: whatCopy,
         property: description,

package/dist/collection/traverseDocument.mjs

@@ -2,8 +2,8 @@
 import * as path from "node:path";
 import * as fs from "node:fs/promises";
 import { Result, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
-import { throwIfError, pipe, isReference, getReferenceProperty, getValueFromPath, isError } from "@aeriajs/common";
-import { makeValidationError, validateProperty, validateWholeness } from "@aeriajs/validation";
+import { throwIfError, isReference, getReferenceProperty, getValueFromPath } from "@aeriajs/common";
+import { makeValidationError, validatePropertyWithRefs, validateWholeness } from "@aeriajs/validation";
 import { getCollection } from "@aeriajs/entrypoint";
 import { ObjectId } from "mongodb";
 import { getCollectionAsset } from "../assets.mjs";
@@ -35,7 +35,7 @@ const cleanupReferences = async (value, ctx) => {
     const refProperty = getReferenceProperty(ctx.property);
     if (refProperty && (refProperty.$ref === "file" || refProperty.inline)) {
       if (ctx.isArray && !Array.isArray(value)) {
-        return value;
+        return Result.result(value);
       }
       const context = ctx.options.context;
       const doc = await context.collections[ctx.options.description.$id].model.findOne({
@@ -50,7 +50,7 @@ const cleanupReferences = async (value, ctx) => {
       }
       let referenceIds = getValueFromPath(doc, ctx.propPath);
       if (!referenceIds) {
-        return value;
+        return Result.result(value);
       }
       if (Array.isArray(referenceIds)) {
         if (!Array.isArray(value)) {
@@ -59,7 +59,7 @@ const cleanupReferences = async (value, ctx) => {
         referenceIds = referenceIds.filter((oldId) => !value.some((valueId) => valueId.equals(oldId)));
       } else {
         if (referenceIds.equals(value)) {
-          return value;
+          return Result.result(value);
         }
       }
       const refMap = await getReferences({
@@ -71,43 +71,43 @@ const cleanupReferences = async (value, ctx) => {
       }));
     }
   }
-  return value;
+  return Result.result(value);
 };
 const autoCast = (value, ctx) => {
   switch (typeof value) {
     case "boolean": {
-      return !!value;
+      return Result.result(!!value);
     }
     case "string": {
       if (isReference(ctx.property)) {
-        return ObjectId.isValid(value) ? new ObjectId(value) : value;
+        return Result.result(ObjectId.isValid(value) ? new ObjectId(value) : value);
       }
       if ("format" in ctx.property) {
         if (ctx.property.format === "date" || ctx.property.format === "date-time") {
           const timestamp = Date.parse(value);
-          return !Number.isNaN(timestamp) ? new Date(timestamp) : null;
+          return Result.result(!Number.isNaN(timestamp) ? new Date(timestamp) : null);
         }
       }
       break;
     }
     case "number": {
       if ("type" in ctx.property && ctx.property.type === "integer") {
-        return parseInt(value.toString());
+        return Result.result(parseInt(value.toString()));
       }
       if ("format" in ctx.property) {
         if (ctx.property.format === "date" || ctx.property.format === "date-time") {
-          return new Date(value);
+          return Result.result(new Date(value));
         }
       }
       break;
     }
     case "object": {
       if (!value || value instanceof ObjectId) {
-        return value;
+        return Result.result(value);
       }
       if (!("description" in ctx.options) || !ctx.options.recurseDeep) {
         if (Array.isArray(value)) {
-          return value.map((v) => autoCast(v, ctx));
+          return Result.result(value.map((v) => throwIfError(autoCast(v, ctx))));
         }
         if (Object.keys(value).length > 0) {
           const entries = {};
@@ -116,40 +116,44 @@ const autoCast = (value, ctx) => {
             if (!subProperty) {
               continue;
             }
-            entries[k] = autoCast(v, {
+            entries[k] = throwIfError(autoCast(v, {
               ...ctx,
               property: subProperty
-            });
+            }));
           }
-          return entries;
+          return Result.result(entries);
         }
       }
     }
   }
-  return value;
+  return Result.result(value);
 };
-const getters = (value, ctx) => {
+const getters = async (value, ctx) => {
   if ("getter" in ctx.property) {
     if (!ctx.options.context) {
       throw new Error();
     }
-    return ctx.property.getter(ctx.target, ctx.options.context);
+    return Result.result(await ctx.property.getter(ctx.target, ctx.options.context));
   }
-  return value;
+  return Result.result(value);
 };
-const validate = (value, ctx) => {
+const validate = async (value, ctx) => {
   if (ctx.options.recurseDeep) {
     if ("properties" in ctx.property) {
-      return value;
+      return Result.result(value);
     }
   }
-  const { error } = validateProperty(value, ctx.property);
+  const { error } = await validatePropertyWithRefs(value, ctx.property, {
+    checkObjectIds: true,
+    context: ctx.options.context,
+    objectIdConstructor: ObjectId
+  });
   if (error) {
     return Result.error({
       [ctx.propName]: error
     });
   }
-  return value;
+  return Result.result(value);
 };
 const isValidTempFile = (value) => {
   if (value && typeof value === "object") {
@@ -165,7 +169,7 @@ const isMissingPropertyError = (error) => {
 };
 const moveFiles = async (value, ctx) => {
   if (!("$ref" in ctx.property) || ctx.property.$ref !== "file") {
-    return value;
+    return Result.result(value);
   }
   const tempFileCollection = await getCollection("tempFile");
   if (!tempFileCollection) {
@@ -175,10 +179,10 @@ const moveFiles = async (value, ctx) => {
     return Result.error(TraverseError.InvalidTempfile);
   }
   if (!value) {
-    return null;
+    return Result.result(null);
   }
   if (value instanceof ObjectId) {
-    return value;
+    return Result.result(value);
   }
   if (!ctx.options.context) {
     throw new Error();
@@ -194,11 +198,11 @@ const moveFiles = async (value, ctx) => {
   newFile.owner = ctx.options.context.token.sub;
   await fs.rename(tempFile.absolute_path, newFile.absolute_path);
   const file = await ctx.options.context.collections.file.model.insertOne(newFile);
-  return file.insertedId;
+  return Result.result(file.insertedId);
 };
 const recurseDeep = async (value, ctx) => {
   if (!value) {
-    return value;
+    return Result.result(value);
   }
   if ("properties" in ctx.property) {
     if (ctx.options.validateWholeness) {
@@ -207,28 +211,26 @@ const recurseDeep = async (value, ctx) => {
         return Result.error(wholenessError);
       }
     }
-    const { error, result } = await recurse(value, ctx);
-    if (error) {
-      return Result.error(error);
-    }
-    return result;
+    return recurse(value, ctx);
   }
   if ("items" in ctx.property) {
     if (!Array.isArray(value)) {
-      return value;
+      return Result.result(value);
     }
     const items = [];
     for (const item of value) {
-      const result = await ctx.options.pipe(item, {
+      const { error, result } = await ctx.options.pipe(item, {
         ...ctx,
         property: ctx.property.items,
         isArray: true
       });
-      items.push(result);
+      if (!error) {
+        items.push(result);
+      }
     }
-    return items;
+    return Result.result(items);
   }
-  return value;
+  return Result.result(value);
 };
 const recurse = async (target, ctx) => {
   const entries = {};
@@ -242,14 +244,14 @@ const recurse = async (target, ctx) => {
     if (propName === "_id") {
       if (value) {
         if (ctx.options.autoCast) {
-          entries[propName] = autoCast(value, {
+          entries[propName] = throwIfError(autoCast(value, {
             ...ctx,
             target,
             propName,
             property: {
               $ref: ""
             }
-          });
+          }));
         } else {
           entries[propName] = value;
         }
@@ -329,30 +331,33 @@ const recurse = async (target, ctx) => {
                 documents.push(new ObjectId(elem));
                 continue;
               }
-              const { error: error2, result } = await traverseDocument(elem, targetDescription, ctx.options);
-              if (error2) {
-                return Result.error(error2);
+              const { error: error3, result: result2 } = await traverseDocument(elem, targetDescription, ctx.options);
+              if (error3) {
+                return Result.error(error3);
               }
-              documents.push(result);
+              documents.push(result2);
             }
             entries[propName] = documents;
             continue;
           }
-          const { error, result: doc } = await traverseDocument(value, targetDescription, ctx.options);
-          if (error) {
-            return Result.error(error);
+          const { error: error2, result: doc } = await traverseDocument(value, targetDescription, ctx.options);
+          if (error2) {
+            return Result.error(error2);
           }
           entries[propName] = doc;
           continue;
         }
       }
-      entries[propName] = await ctx.options.pipe(value, {
+      const { error, result } = await ctx.options.pipe(value, {
         ...ctx,
         target,
         propName,
         propPath: ctx.propPath ? `${ctx.propPath}.${propName}` : propName,
         property
       });
+      if (!error) {
+        entries[propName] = result;
+      }
     }
   }
   return Result.result(entries);
@@ -394,30 +399,27 @@ export const traverseDocument = async (what, description, _options) => {
     functions.push(moveFiles);
   }
   let traverseError, validationError;
-  const mutateTarget = (fn) => {
-    return async (value, ctx) => {
-      const result2 = await fn(value, ctx);
-      ctx.target[ctx.propName] = result2;
-      return result2;
-    };
-  };
-  options.pipe = pipe(functions.map(mutateTarget), {
-    returnFirst: (value) => {
-      if (isError(value)) {
-        const error2 = value.error;
-        switch (error2) {
+  options.pipe = async (initialValue, ctx) => {
+    let value = initialValue;
+    for (const fn of functions) {
+      const { error: error2, result: result2 } = await fn(value, ctx);
+      if (error2) {
+        const narrowedError = error2;
+        switch (narrowedError) {
           case TraverseError.InvalidDocumentId:
           case TraverseError.InvalidTempfile:
-            traverseError = error2;
+            traverseError = narrowedError;
             break;
           default: {
-            validationError = error2;
+            validationError = narrowedError;
           }
         }
-        return value;
+        return Result.error(error2);
       }
+      value = ctx.target[ctx.propName] = result2;
     }
-  });
+    return Result.result(value);
+  };
   const { error, result } = await recurse(whatCopy, {
     root: whatCopy,
     property: description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.259",
+  "version": "0.0.261",
   "description": "",
   "main": "dist/index.js",
   "aeriaMain": "tests/fixtures/aeriaMain.js",
@@ -42,13 +42,13 @@
     "mongodb-memory-server": "^10.1.4"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.259",
-    "@aeriajs/common": "^0.0.144",
-    "@aeriajs/entrypoint": "^0.0.149",
-    "@aeriajs/http": "^0.0.175",
-    "@aeriajs/security": "^0.0.259",
-    "@aeriajs/types": "^0.0.126",
-    "@aeriajs/validation": "^0.0.162"
+    "@aeriajs/builtins": "^0.0.261",
+    "@aeriajs/common": "^0.0.146",
+    "@aeriajs/entrypoint": "^0.0.151",
+    "@aeriajs/http": "^0.0.177",
+    "@aeriajs/security": "^0.0.261",
+    "@aeriajs/types": "^0.0.127",
+    "@aeriajs/validation": "^0.0.164"
   },
   "dependencies": {
     "mongodb": "^6.16.0",