@aeriajs/core 0.0.123 → 0.0.124

package/dist/collection/traverseDocument.d.ts

@@ -1,5 +1,5 @@
 import type { Description, Property, ValidationError, Context } from '@aeriajs/types';
-import { ACError } from '@aeriajs/types';
+import { ACError, TraverseError } from '@aeriajs/types';
 import { ObjectId } from 'mongodb';
 export type TraverseOptions = {
     autoCast?: boolean;
@@ -18,10 +18,6 @@ export type TraverseNormalized = {
     description: Description;
     pipe: <T = unknown>(value: unknown, phaseContext: PhaseContext) => T | Promise<T>;
 };
-export declare enum TraverseError {
-    InvalidDocumentId = "INVALID_DOCUMENT_ID",
-    InvalidTempfile = "INVALID_TEMPFILE"
-}
 type PhaseContext = {
     target: any;
     root: {
@@ -31,6 +27,7 @@ type PhaseContext = {
     propPath: string;
     property: Property;
     options: TraverseOptions & TraverseNormalized;
+    isArray?: boolean;
 };
 export declare const traverseDocument: <const TWhat extends Record<string, unknown>>(what: TWhat, description: Description, _options: TraverseOptions) => Promise<{
     readonly _tag: "Result";
@@ -38,7 +35,7 @@ export declare const traverseDocument: <const TWhat extends Record<string, unkno
     readonly result: any;
 } | {
     readonly _tag: "Error";
-    readonly error: ACError.InsecureOperator | ValidationError;
+    readonly error: ACError.InsecureOperator | ValidationError | TraverseError;
     readonly result: undefined;
 }>;
 export {};

package/dist/collection/traverseDocument.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseDocument = exports.TraverseError = void 0;
+exports.traverseDocument = void 0;
 const types_1 = require("@aeriajs/types");
 const common_1 = require("@aeriajs/common");
 const validation_1 = require("@aeriajs/validation");
@@ -31,11 +31,6 @@ const mongodb_1 = require("mongodb");
 const assets_js_1 = require("../assets.js");
 const preload_js_1 = require("./preload.js");
 const fs = __importStar(require("fs/promises"));
-var TraverseError;
-(function (TraverseError) {
-    TraverseError["InvalidDocumentId"] = "INVALID_DOCUMENT_ID";
-    TraverseError["InvalidTempfile"] = "INVALID_TEMPFILE";
-})(TraverseError || (exports.TraverseError = TraverseError = {}));
 const getProperty = (propertyName, parentProperty) => {
     if (propertyName === '_id') {
         return {
@@ -53,7 +48,7 @@ const getProperty = (propertyName, parentProperty) => {
     }
 };
 const disposeOldFiles = async (ctx, options = {}) => {
-    if (!options.fromIds && Array.isArray(ctx.target[ctx.propName])) {
+    if (!options.preserveIds && Array.isArray(ctx.target[ctx.propName])) {
         return;
     }
     const context = ctx.options.context;
@@ -65,12 +60,12 @@ const disposeOldFiles = async (ctx, options = {}) => {
         },
     });
     if (!doc) {
-        return types_1.Result.error(TraverseError.InvalidDocumentId);
+        return types_1.Result.error(types_1.TraverseError.InvalidDocumentId);
     }
     let fileIds = (0, common_1.getValueFromPath)(doc, ctx.propPath);
-    if (options.fromIds) {
-        fileIds = fileIds.filter((id) => !options.fromIds.some((fromId) => {
-            return !id || id.equals(fromId);
+    if (options.preserveIds) {
+        fileIds = fileIds.filter((id) => !id || !options.preserveIds.some((fromId) => {
+            return id.equals(fromId);
         }));
     }
     const fileFilters = {
@@ -187,7 +182,7 @@ const moveFiles = async (value, ctx) => {
         throw new Error();
     }
     if (!value) {
-        if (ctx.root._id) {
+        if (ctx.root._id && !ctx.isArray) {
             await disposeOldFiles(ctx);
         }
         return null;
@@ -196,9 +191,9 @@ const moveFiles = async (value, ctx) => {
         _id: new mongodb_1.ObjectId(value.tempId),
     });
     if (!tempFile) {
-        return types_1.Result.error(TraverseError.InvalidTempfile);
+        return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
     }
-    if (ctx.root._id) {
+    if (ctx.root._id && !ctx.isArray) {
         await disposeOldFiles(ctx);
     }
     const { _id: fileId, ...newFile } = tempFile;
@@ -227,12 +222,13 @@ const recurseDeep = async (value, ctx) => {
             const result = await ctx.options.pipe(item, {
                 ...ctx,
                 property: ctx.property.items,
+                isArray: true,
             });
             items.push(result);
         }
         if (ctx.options.moveFiles && '$ref' in ctx.property.items && ctx.property.items.$ref === 'file') {
             await disposeOldFiles(ctx, {
-                fromIds: items,
+                preserveIds: items,
             });
         }
         return items;
@@ -395,6 +391,7 @@ const traverseDocument = async (what, description, _options) => {
     if (options.moveFiles) {
         functions.push(moveFiles);
     }
+    let traverseError;
     let validationError;
     const mutateTarget = (fn) => {
         return async (value, ctx) => {
@@ -409,8 +406,16 @@ const traverseDocument = async (what, description, _options) => {
     Object.assign(options, {
         pipe: (0, common_1.pipe)(functions.map(mutateTarget), {
             returnFirst: (value) => {
-                if (value?._tag === 'Left') {
-                    validationError = value.value;
+                if ((0, common_1.isError)(value)) {
+                    const error = value.error;
+                    switch (error) {
+                        case types_1.TraverseError.InvalidDocumentId:
+                        case types_1.TraverseError.InvalidTempfile:
+                            traverseError = error;
+                            break;
+                        default:
+                            validationError = error;
+                    }
                     return value;
                 }
             },
@@ -425,6 +430,9 @@ const traverseDocument = async (what, description, _options) => {
     if (error) {
         return types_1.Result.error(error);
     }
+    if (traverseError) {
+        return types_1.Result.error(traverseError);
+    }
     if (validationError) {
         return types_1.Result.error((0, validation_1.makeValidationError)({
             code: types_1.ValidationErrorCode.InvalidProperties,

package/dist/collection/traverseDocument.mjs

@@ -1,16 +1,11 @@
 "use strict";
-import { Result, ACError, ValidationErrorCode } from "@aeriajs/types";
-import { throwIfError, pipe, isReference, getValueFromPath, isObjectId } from "@aeriajs/common";
+import { Result, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
+import { throwIfError, pipe, isReference, getValueFromPath, isObjectId, isError } from "@aeriajs/common";
 import { makeValidationError, validateProperty, validateWholeness } from "@aeriajs/validation";
 import { ObjectId } from "mongodb";
 import { getCollectionAsset } from "../assets.mjs";
 import { preloadDescription } from "./preload.mjs";
 import * as fs from "fs/promises";
-export var TraverseError = /* @__PURE__ */ ((TraverseError2) => {
-  TraverseError2["InvalidDocumentId"] = "INVALID_DOCUMENT_ID";
-  TraverseError2["InvalidTempfile"] = "INVALID_TEMPFILE";
-  return TraverseError2;
-})(TraverseError || {});
 const getProperty = (propertyName, parentProperty) => {
   if (propertyName === "_id") {
     return {
@@ -28,7 +23,7 @@ const getProperty = (propertyName, parentProperty) => {
   }
 };
 const disposeOldFiles = async (ctx, options = {}) => {
-  if (!options.fromIds && Array.isArray(ctx.target[ctx.propName])) {
+  if (!options.preserveIds && Array.isArray(ctx.target[ctx.propName])) {
     return;
   }
   const context = ctx.options.context;
@@ -40,12 +35,12 @@ const disposeOldFiles = async (ctx, options = {}) => {
     }
   });
   if (!doc) {
-    return Result.error("INVALID_DOCUMENT_ID" /* InvalidDocumentId */);
+    return Result.error(TraverseError.InvalidDocumentId);
   }
   let fileIds = getValueFromPath(doc, ctx.propPath);
-  if (options.fromIds) {
-    fileIds = fileIds.filter((id) => !options.fromIds.some((fromId) => {
-      return !id || id.equals(fromId);
+  if (options.preserveIds) {
+    fileIds = fileIds.filter((id) => !id || !options.preserveIds.some((fromId) => {
+      return id.equals(fromId);
     }));
   }
   const fileFilters = {
@@ -153,7 +148,7 @@ const moveFiles = async (value, ctx) => {
     throw new Error();
   }
   if (!value) {
-    if (ctx.root._id) {
+    if (ctx.root._id && !ctx.isArray) {
       await disposeOldFiles(ctx);
     }
     return null;
@@ -162,9 +157,9 @@ const moveFiles = async (value, ctx) => {
     _id: new ObjectId(value.tempId)
   });
   if (!tempFile) {
-    return Result.error("INVALID_TEMPFILE" /* InvalidTempfile */);
+    return Result.error(TraverseError.InvalidTempfile);
   }
-  if (ctx.root._id) {
+  if (ctx.root._id && !ctx.isArray) {
     await disposeOldFiles(ctx);
   }
   const { _id: fileId, ...newFile } = tempFile;
@@ -192,13 +187,14 @@ const recurseDeep = async (value, ctx) => {
     for (const item of value) {
       const result = await ctx.options.pipe(item, {
         ...ctx,
-        property: ctx.property.items
+        property: ctx.property.items,
+        isArray: true
       });
       items.push(result);
     }
     if (ctx.options.moveFiles && "$ref" in ctx.property.items && ctx.property.items.$ref === "file") {
       await disposeOldFiles(ctx, {
-        fromIds: items
+        preserveIds: items
       });
     }
     return items;
@@ -353,6 +349,7 @@ export const traverseDocument = async (what, description, _options) => {
   if (options.moveFiles) {
     functions.push(moveFiles);
   }
+  let traverseError;
   let validationError;
   const mutateTarget = (fn) => {
     return async (value, ctx) => {
@@ -367,8 +364,16 @@ export const traverseDocument = async (what, description, _options) => {
   Object.assign(options, {
     pipe: pipe(functions.map(mutateTarget), {
       returnFirst: (value) => {
-        if (value?._tag === "Left") {
-          validationError = value.value;
+        if (isError(value)) {
+          const error2 = value.error;
+          switch (error2) {
+            case TraverseError.InvalidDocumentId:
+            case TraverseError.InvalidTempfile:
+              traverseError = error2;
+              break;
+            default:
+              validationError = error2;
+          }
           return value;
         }
       }
@@ -383,6 +388,9 @@ export const traverseDocument = async (what, description, _options) => {
   if (error) {
     return Result.error(error);
   }
+  if (traverseError) {
+    return Result.error(traverseError);
+  }
   if (validationError) {
     return Result.error(makeValidationError({
       code: ValidationErrorCode.InvalidProperties,

package/dist/functions/builtin/insert.d.ts

@@ -1,5 +1,5 @@
 import type { Context, SchemaWithId, InsertPayload, InsertReturnType } from '@aeriajs/types';
-import { HTTPStatus, ACError, ValidationErrorCode } from '@aeriajs/types';
+import { HTTPStatus, ACError, ValidationErrorCode, TraverseError } from '@aeriajs/types';
 export type InsertOptions = {
     bypassSecurity?: boolean;
 };
@@ -20,7 +20,7 @@ export declare const insertErrorSchema: () => {
                     readonly enum: [HTTPStatus.UnprocessableContent, HTTPStatus.NotFound];
                 };
                 readonly code: {
-                    readonly enum: [ACError.InsecureOperator, ACError.OwnershipError, ACError.ResourceNotFound, ACError.TargetImmutable, ValidationErrorCode.EmptyTarget, ValidationErrorCode.InvalidProperties, ValidationErrorCode.MissingProperties];
+                    readonly enum: [ACError.InsecureOperator, ACError.OwnershipError, ACError.ResourceNotFound, ACError.TargetImmutable, ValidationErrorCode.EmptyTarget, ValidationErrorCode.InvalidProperties, ValidationErrorCode.MissingProperties, TraverseError.InvalidDocumentId, TraverseError.InvalidTempfile];
                 };
                 readonly message: {
                     readonly type: "string";

package/dist/functions/builtin/insert.js

@@ -18,6 +18,8 @@ const insertErrorSchema = () => (0, common_1.endpointErrorSchema)({
         types_1.ValidationErrorCode.EmptyTarget,
         types_1.ValidationErrorCode.InvalidProperties,
         types_1.ValidationErrorCode.MissingProperties,
+        types_1.TraverseError.InvalidDocumentId,
+        types_1.TraverseError.InvalidTempfile,
     ],
 });
 exports.insertErrorSchema = insertErrorSchema;

package/dist/functions/builtin/insert.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { Result, HTTPStatus, ACError, ValidationErrorCode } from "@aeriajs/types";
+import { Result, HTTPStatus, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
 import { useSecurity } from "@aeriajs/security";
 import { throwIfError, endpointErrorSchema } from "@aeriajs/common";
 import { traverseDocument, normalizeProjection, prepareInsert, fill } from "../../collection/index.mjs";
@@ -15,7 +15,9 @@ export const insertErrorSchema = () => endpointErrorSchema({
     ACError.TargetImmutable,
     ValidationErrorCode.EmptyTarget,
     ValidationErrorCode.InvalidProperties,
-    ValidationErrorCode.MissingProperties
+    ValidationErrorCode.MissingProperties,
+    TraverseError.InvalidDocumentId,
+    TraverseError.InvalidTempfile
   ]
 });
 export const insert = async (payload, context, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.123",
+  "version": "0.0.124",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,13 +41,13 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.123",
-    "@aeriajs/common": "^0.0.77",
-    "@aeriajs/entrypoint": "^0.0.79",
-    "@aeriajs/http": "^0.0.88",
-    "@aeriajs/security": "^0.0.123",
-    "@aeriajs/types": "^0.0.67",
-    "@aeriajs/validation": "^0.0.80"
+    "@aeriajs/builtins": "^0.0.124",
+    "@aeriajs/common": "^0.0.78",
+    "@aeriajs/entrypoint": "^0.0.80",
+    "@aeriajs/http": "^0.0.89",
+    "@aeriajs/security": "^0.0.124",
+    "@aeriajs/types": "^0.0.68",
+    "@aeriajs/validation": "^0.0.81"
   },
   "dependencies": {
     "mongodb": "^6.5.0",