@aeriajs/core 0.0.181 → 0.0.182

package/dist/collection/cascadingRemove.d.ts

@@ -1,2 +1,21 @@
-import type { Context } from '@aeriajs/types';
+import type { Context, RouteContext } from '@aeriajs/types';
+import { ObjectId } from 'mongodb';
+import { type Reference } from './reference.js';
+export declare const preferredRemove: (targetId: ObjectId | (ObjectId | null)[], reference: Reference, parentContext: RouteContext) => Promise<import("mongodb").DeleteResult | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: import("mongodb").DeleteResult;
+} | import("@aeriajs/types").Result.Error<{
+    readonly code: import("@aeriajs/types").ACError.OwnershipError;
+} & {
+    httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
+}> | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: import("mongodb").WithId<Omit<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description>>, "_id">> | null;
+} | import("@aeriajs/types").Result.Error<{
+    readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
+} & {
+    httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
+}> | undefined>;
 export declare const cascadingRemove: (target: Record<string, unknown>, context: Context) => Promise<void>;

package/dist/collection/cascadingRemove.js

@@ -1,13 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cascadingRemove = void 0;
+exports.cascadingRemove = exports.preferredRemove = void 0;
 const mongodb_1 = require("mongodb");
 const context_js_1 = require("../context.js");
 const assets_js_1 = require("../assets.js");
 const database_js_1 = require("../database.js");
 const reference_js_1 = require("./reference.js");
-const isObject = (value) => {
-    return typeof value === 'object';
+const internalCascadingRemove = async (target, refMap, context) => {
+    for (const refName in refMap) {
+        const reference = refMap[refName];
+        if (!target[refName]) {
+            continue;
+        }
+        if (reference.referencedCollection) {
+            if (reference.isInline || reference.referencedCollection === 'file') {
+                if (target[refName] instanceof mongodb_1.ObjectId || Array.isArray(target[refName])) {
+                    await (0, exports.preferredRemove)(target[refName], reference, context);
+                }
+            }
+        }
+        else if (reference.deepReferences) {
+            if (Array.isArray(target[refName])) {
+                for (const elem of target[refName]) {
+                    await internalCascadingRemove(elem, reference.deepReferences, context);
+                }
+                continue;
+            }
+            await internalCascadingRemove(target[refName], reference.deepReferences, context);
+        }
+    }
 };
 const preferredRemove = async (targetId, reference, parentContext) => {
     if (!reference.referencedCollection) {
@@ -19,15 +40,19 @@ const preferredRemove = async (targetId, reference, parentContext) => {
         collectionName: reference.referencedCollection,
     });
     if (Array.isArray(targetId)) {
+        if (targetId.length === 0) {
+            return;
+        }
+        const nonNullable = targetId.filter((id) => !!id);
         const { result: removeAll } = await (0, assets_js_1.getFunction)(reference.referencedCollection, 'removeAll');
         if (removeAll) {
             return removeAll({
-                filters: targetId,
+                filters: nonNullable,
             }, context);
         }
         return coll.deleteMany({
             _id: {
-                $in: targetId,
+                $in: nonNullable,
             },
         });
     }
@@ -43,30 +68,7 @@ const preferredRemove = async (targetId, reference, parentContext) => {
         _id: targetId,
     });
 };
-const internalCascadingRemove = async (target, refMap, context) => {
-    for (const refName in refMap) {
-        const reference = refMap[refName];
-        if (!target[refName]) {
-            continue;
-        }
-        if (reference.isInline || reference.referencedCollection === 'file') {
-            if (target[refName] instanceof mongodb_1.ObjectId) {
-                await preferredRemove(target[refName], reference, context);
-            }
-        }
-        if (reference.deepReferences) {
-            if (Array.isArray(target[refName])) {
-                for (const elem of target[refName]) {
-                    await internalCascadingRemove(elem, reference.deepReferences, context);
-                }
-                continue;
-            }
-            if (isObject(target[refName])) {
-                await internalCascadingRemove(target[refName], reference.deepReferences, context);
-            }
-        }
-    }
-};
+exports.preferredRemove = preferredRemove;
 const cascadingRemove = async (target, context) => {
     const refMap = await (0, reference_js_1.getReferences)(context.description.properties);
     return internalCascadingRemove(target, refMap, context);

package/dist/collection/cascadingRemove.mjs

@@ -4,10 +4,30 @@ import { createContext } from "../context.mjs";
 import { getFunction } from "../assets.mjs";
 import { getDatabaseCollection } from "../database.mjs";
 import { getReferences } from "./reference.mjs";
-const isObject = (value) => {
-  return typeof value === "object";
+const internalCascadingRemove = async (target, refMap, context) => {
+  for (const refName in refMap) {
+    const reference = refMap[refName];
+    if (!target[refName]) {
+      continue;
+    }
+    if (reference.referencedCollection) {
+      if (reference.isInline || reference.referencedCollection === "file") {
+        if (target[refName] instanceof ObjectId || Array.isArray(target[refName])) {
+          await preferredRemove(target[refName], reference, context);
+        }
+      }
+    } else if (reference.deepReferences) {
+      if (Array.isArray(target[refName])) {
+        for (const elem of target[refName]) {
+          await internalCascadingRemove(elem, reference.deepReferences, context);
+        }
+        continue;
+      }
+      await internalCascadingRemove(target[refName], reference.deepReferences, context);
+    }
+  }
 };
-const preferredRemove = async (targetId, reference, parentContext) => {
+export const preferredRemove = async (targetId, reference, parentContext) => {
   if (!reference.referencedCollection) {
     return;
   }
@@ -17,15 +37,19 @@ const preferredRemove = async (targetId, reference, parentContext) => {
     collectionName: reference.referencedCollection
   });
   if (Array.isArray(targetId)) {
+    if (targetId.length === 0) {
+      return;
+    }
+    const nonNullable = targetId.filter((id) => !!id);
     const { result: removeAll } = await getFunction(reference.referencedCollection, "removeAll");
     if (removeAll) {
       return removeAll({
-        filters: targetId
+        filters: nonNullable
       }, context);
     }
     return coll.deleteMany({
       _id: {
-        $in: targetId
+        $in: nonNullable
       }
     });
   }
@@ -41,30 +65,6 @@ const preferredRemove = async (targetId, reference, parentContext) => {
     _id: targetId
   });
 };
-const internalCascadingRemove = async (target, refMap, context) => {
-  for (const refName in refMap) {
-    const reference = refMap[refName];
-    if (!target[refName]) {
-      continue;
-    }
-    if (reference.isInline || reference.referencedCollection === "file") {
-      if (target[refName] instanceof ObjectId) {
-        await preferredRemove(target[refName], reference, context);
-      }
-    }
-    if (reference.deepReferences) {
-      if (Array.isArray(target[refName])) {
-        for (const elem of target[refName]) {
-          await internalCascadingRemove(elem, reference.deepReferences, context);
-        }
-        continue;
-      }
-      if (isObject(target[refName])) {
-        await internalCascadingRemove(target[refName], reference.deepReferences, context);
-      }
-    }
-  }
-};
 export const cascadingRemove = async (target, context) => {
   const refMap = await getReferences(context.description.properties);
   return internalCascadingRemove(target, refMap, context);

package/dist/collection/reference.js

@@ -24,15 +24,17 @@ const getReferences = async (properties, options = {}) => {
         }
         if (refProperty) {
             const description = (0, common_1.throwIfError)(await (0, assets_js_1.getCollectionAsset)(refProperty.$ref, 'description'));
-            if (refProperty.populate) {
-                if (refProperty.populate.length === 0) {
+            if (refProperty.inline || refProperty.populate) {
+                if (refProperty.populate && refProperty.populate.length === 0) {
                     continue;
                 }
                 const deepReferences = await (0, exports.getReferences)(description.properties, {
                     depth: depth + 1,
                     maxDepth: refProperty.populateDepth || maxDepth,
                     memoize: `${memoize}.${propName}`,
-                    populate: Array.from(refProperty.populate),
+                    populate: refProperty.populate
+                        ? Array.from(refProperty.populate)
+                        : undefined,
                     isArrayElement: 'items' in property,
                 });
                 if (Object.keys(deepReferences).length > 0) {

package/dist/collection/reference.mjs

@@ -28,15 +28,15 @@ export const getReferences = async (properties, options = {}) => {
     }
     if (refProperty) {
       const description = throwIfError(await getCollectionAsset(refProperty.$ref, "description"));
-      if (refProperty.populate) {
-        if (refProperty.populate.length === 0) {
+      if (refProperty.inline || refProperty.populate) {
+        if (refProperty.populate && refProperty.populate.length === 0) {
           continue;
         }
         const deepReferences = await getReferences(description.properties, {
           depth: depth + 1,
           maxDepth: refProperty.populateDepth || maxDepth,
           memoize: `${memoize}.${propName}`,
-          populate: Array.from(refProperty.populate),
+          populate: refProperty.populate ? Array.from(refProperty.populate) : void 0,
           isArrayElement: "items" in property
         });
         if (Object.keys(deepReferences).length > 0) {

package/dist/collection/traverseDocument.d.ts

@@ -10,6 +10,7 @@ export type TraverseOptionsBase = {
     undefinedToNull?: boolean;
     preserveHidden?: boolean;
     recurseDeep?: boolean;
+    cleanupReferences?: boolean;
     recurseReferences?: boolean;
 };
 export type TraverseOptions = (TraverseOptionsBase & {

package/dist/collection/traverseDocument.js

@@ -30,7 +30,10 @@ const validation_1 = require("@aeriajs/validation");
 const entrypoint_1 = require("@aeriajs/entrypoint");
 const mongodb_1 = require("mongodb");
 const assets_js_1 = require("../assets.js");
+const context_js_1 = require("../context.js");
 const preload_js_1 = require("./preload.js");
+const reference_js_1 = require("./reference.js");
+const cascadingRemove_js_1 = require("./cascadingRemove.js");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
 const getProperty = (propName, parentProperty) => {
@@ -49,52 +52,43 @@ const getProperty = (propName, parentProperty) => {
         return parentProperty.properties[propName];
     }
 };
-const disposeOldFiles = async (ctx, options = {}) => {
-    if (!options.preserveIds && Array.isArray(ctx.target[ctx.propName])) {
-        return;
-    }
-    const context = ctx.options.context;
-    const doc = await context.collections[ctx.options.description.$id].model.findOne({
-        _id: new mongodb_1.ObjectId(ctx.root._id),
-    }, {
-        projection: {
-            [ctx.propPath]: 1,
-        },
-    });
-    if (!doc) {
-        return types_1.Result.error(types_1.TraverseError.InvalidDocumentId);
-    }
-    let fileIds = (0, common_1.getValueFromPath)(doc, ctx.propPath);
-    if (!fileIds) {
-        return;
-    }
-    if (options.preserveIds) {
-        fileIds = fileIds.filter((id) => !id || !options.preserveIds.some((fromId) => {
-            return id.equals(fromId);
-        }));
-    }
-    const fileFilters = {
-        _id: {
-            $in: Array.isArray(fileIds)
-                ? fileIds
-                : [fileIds],
-        },
-    };
-    const files = context.collections.file.model.find(fileFilters, {
-        projection: {
-            absolute_path: 1,
-        },
-    });
-    let file;
-    while (file = await files.next()) {
-        try {
-            await fs.unlink(file.absolute_path);
-        }
-        catch (err) {
-            console.trace(err);
+const cleanupReferences = async (value, ctx) => {
+    if (ctx.root._id) {
+        const refProperty = (0, common_1.getReferenceProperty)(ctx.property);
+        if (refProperty && (refProperty.$ref === 'file' || refProperty.inline)) {
+            if (ctx.isArray && !Array.isArray(value)) {
+                return value;
+            }
+            const context = ctx.options.context;
+            const doc = await context.collections[ctx.options.description.$id].model.findOne({
+                _id: new mongodb_1.ObjectId(ctx.root._id),
+            }, {
+                projection: {
+                    [ctx.propPath]: 1,
+                },
+            });
+            if (!doc) {
+                return types_1.Result.error(types_1.TraverseError.InvalidDocumentId);
+            }
+            let referenceIds = (0, common_1.getValueFromPath)(doc, ctx.propPath);
+            if (!referenceIds) {
+                return value;
+            }
+            if (Array.isArray(referenceIds)) {
+                if (!Array.isArray(value)) {
+                    throw new Error;
+                }
+                referenceIds = referenceIds.filter((oldId) => !value.some((valueId) => valueId.equals(oldId)));
+            }
+            const refMap = await (0, reference_js_1.getReferences)(ctx.options.description.properties);
+            const reference = (0, common_1.getValueFromPath)(refMap, ctx.propPath);
+            await (0, cascadingRemove_js_1.preferredRemove)(referenceIds, reference, await (0, context_js_1.createContext)({
+                parentContext: context,
+                collectionName: refProperty.$ref,
+            }));
         }
     }
-    return context.collections.file.model.deleteMany(fileFilters);
+    return value;
 };
 const autoCast = (value, ctx) => {
     switch (typeof value) {
@@ -204,9 +198,6 @@ const moveFiles = async (value, ctx) => {
         return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
     }
     if (!value) {
-        if (ctx.root._id && !ctx.isArray) {
-            await disposeOldFiles(ctx);
-        }
         return null;
     }
     if (value instanceof mongodb_1.ObjectId) {
@@ -221,9 +212,6 @@ const moveFiles = async (value, ctx) => {
     if (!tempFile) {
         return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
     }
-    if (ctx.root._id && !ctx.isArray) {
-        await disposeOldFiles(ctx);
-    }
     const { _id: fileId, ...newFile } = tempFile;
     newFile.absolute_path = `${ctx.options.context.config.storage.fs}/${tempFile.absolute_path.split(path.sep).at(-1)}`;
     newFile.owner = ctx.options.context.token.sub;
@@ -255,11 +243,6 @@ const recurseDeep = async (value, ctx) => {
             });
             items.push(result);
         }
-        if ('moveFiles' in ctx.options && ctx.options.moveFiles && '$ref' in ctx.property.items && ctx.property.items.$ref === 'file') {
-            await disposeOldFiles(ctx, {
-                preserveIds: items,
-            });
-        }
         return items;
     }
     return value;
@@ -450,6 +433,9 @@ const traverseDocument = async (what, description, _options) => {
         }
         functions.push(validate);
     }
+    if (options.cleanupReferences) {
+        functions.push(cleanupReferences);
+    }
     if ('moveFiles' in options && options.moveFiles) {
         functions.push(moveFiles);
     }

package/dist/collection/traverseDocument.mjs

@@ -1,11 +1,14 @@
 "use strict";
 import { Result, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
-import { throwIfError, pipe, isReference, getValueFromPath, isError } from "@aeriajs/common";
+import { throwIfError, pipe, isReference, getReferenceProperty, getValueFromPath, isError } from "@aeriajs/common";
 import { makeValidationError, validateProperty, validateWholeness } from "@aeriajs/validation";
 import { getCollection } from "@aeriajs/entrypoint";
 import { ObjectId } from "mongodb";
 import { getCollectionAsset } from "../assets.mjs";
+import { createContext } from "../context.mjs";
 import { preloadDescription } from "./preload.mjs";
+import { getReferences } from "./reference.mjs";
+import { preferredRemove } from "./cascadingRemove.mjs";
 import * as path from "path";
 import * as fs from "fs/promises";
 const getProperty = (propName, parentProperty) => {
@@ -24,49 +27,43 @@ const getProperty = (propName, parentProperty) => {
     return parentProperty.properties[propName];
   }
 };
-const disposeOldFiles = async (ctx, options = {}) => {
-  if (!options.preserveIds && Array.isArray(ctx.target[ctx.propName])) {
-    return;
-  }
-  const context = ctx.options.context;
-  const doc = await context.collections[ctx.options.description.$id].model.findOne({
-    _id: new ObjectId(ctx.root._id)
-  }, {
-    projection: {
-      [ctx.propPath]: 1
-    }
-  });
-  if (!doc) {
-    return Result.error(TraverseError.InvalidDocumentId);
-  }
-  let fileIds = getValueFromPath(doc, ctx.propPath);
-  if (!fileIds) {
-    return;
-  }
-  if (options.preserveIds) {
-    fileIds = fileIds.filter((id) => !id || !options.preserveIds.some((fromId) => {
-      return id.equals(fromId);
-    }));
-  }
-  const fileFilters = {
-    _id: {
-      $in: Array.isArray(fileIds) ? fileIds : [fileIds]
-    }
-  };
-  const files = context.collections.file.model.find(fileFilters, {
-    projection: {
-      absolute_path: 1
-    }
-  });
-  let file;
-  while (file = await files.next()) {
-    try {
-      await fs.unlink(file.absolute_path);
-    } catch (err) {
-      console.trace(err);
+const cleanupReferences = async (value, ctx) => {
+  if (ctx.root._id) {
+    const refProperty = getReferenceProperty(ctx.property);
+    if (refProperty && (refProperty.$ref === "file" || refProperty.inline)) {
+      if (ctx.isArray && !Array.isArray(value)) {
+        return value;
+      }
+      const context = ctx.options.context;
+      const doc = await context.collections[ctx.options.description.$id].model.findOne({
+        _id: new ObjectId(ctx.root._id)
+      }, {
+        projection: {
+          [ctx.propPath]: 1
+        }
+      });
+      if (!doc) {
+        return Result.error(TraverseError.InvalidDocumentId);
+      }
+      let referenceIds = getValueFromPath(doc, ctx.propPath);
+      if (!referenceIds) {
+        return value;
+      }
+      if (Array.isArray(referenceIds)) {
+        if (!Array.isArray(value)) {
+          throw new Error();
+        }
+        referenceIds = referenceIds.filter((oldId) => !value.some((valueId) => valueId.equals(oldId)));
+      }
+      const refMap = await getReferences(ctx.options.description.properties);
+      const reference = getValueFromPath(refMap, ctx.propPath);
+      await preferredRemove(referenceIds, reference, await createContext({
+        parentContext: context,
+        collectionName: refProperty.$ref
+      }));
     }
   }
-  return context.collections.file.model.deleteMany(fileFilters);
+  return value;
 };
 const autoCast = (value, ctx) => {
   switch (typeof value) {
@@ -169,9 +166,6 @@ const moveFiles = async (value, ctx) => {
     return Result.error(TraverseError.InvalidTempfile);
   }
   if (!value) {
-    if (ctx.root._id && !ctx.isArray) {
-      await disposeOldFiles(ctx);
-    }
     return null;
   }
   if (value instanceof ObjectId) {
@@ -186,9 +180,6 @@ const moveFiles = async (value, ctx) => {
   if (!tempFile) {
     return Result.error(TraverseError.InvalidTempfile);
   }
-  if (ctx.root._id && !ctx.isArray) {
-    await disposeOldFiles(ctx);
-  }
   const { _id: fileId, ...newFile } = tempFile;
   newFile.absolute_path = `${ctx.options.context.config.storage.fs}/${tempFile.absolute_path.split(path.sep).at(-1)}`;
   newFile.owner = ctx.options.context.token.sub;
@@ -220,11 +211,6 @@ const recurseDeep = async (value, ctx) => {
       });
       items.push(result);
     }
-    if ("moveFiles" in ctx.options && ctx.options.moveFiles && "$ref" in ctx.property.items && ctx.property.items.$ref === "file") {
-      await disposeOldFiles(ctx, {
-        preserveIds: items
-      });
-    }
     return items;
   }
   return value;
@@ -406,6 +392,9 @@ export const traverseDocument = async (what, description, _options) => {
     }
     functions.push(validate);
   }
+  if (options.cleanupReferences) {
+    functions.push(cleanupReferences);
+  }
   if ("moveFiles" in options && options.moveFiles) {
     functions.push(moveFiles);
   }

package/dist/database.js

@@ -52,6 +52,7 @@ const getDatabase = async () => {
                 console.debug((0, util_1.inspect)(event, {
                     colors: true,
                     compact: false,
+                    depth: Infinity,
                 }));
             });
         }

package/dist/database.mjs

@@ -27,7 +27,8 @@ export const getDatabase = async () => {
       client.on("commandStarted", (event) => {
         console.debug(inspect(event, {
           colors: true,
-          compact: false
+          compact: false,
+          depth: Infinity
         }));
       });
     }

package/dist/functions/insert.js

@@ -46,6 +46,7 @@ const internalInsert = async (payload, context) => {
             ? []
             : context.description.required,
         moveFiles: true,
+        cleanupReferences: true,
         fromProperties: !isUpdate,
         undefinedToNull: true,
         preserveHidden: true,

package/dist/functions/insert.mjs

@@ -41,6 +41,7 @@ const internalInsert = async (payload, context) => {
     validate: true,
     validateRequired: isUpdate ? [] : context.description.required,
     moveFiles: true,
+    cleanupReferences: true,
     fromProperties: !isUpdate,
     undefinedToNull: true,
     preserveHidden: true,

package/dist/functions/removeAll.js

@@ -6,13 +6,11 @@ const common_1 = require("@aeriajs/common");
 const security_1 = require("@aeriajs/security");
 const index_js_1 = require("../collection/index.js");
 const internalRemoveAll = async (payload, context) => {
-    const filtersWithId = {
-        ...payload.filters,
+    const filters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)({
         _id: {
             $in: payload.filters,
         },
-    };
-    const filters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filtersWithId, context.description, {
+    }, context.description, {
         autoCast: true,
     }));
     const it = context.collection.model.find(filters);

package/dist/functions/removeAll.mjs

@@ -4,13 +4,11 @@ import { throwIfError } from "@aeriajs/common";
 import { useSecurity } from "@aeriajs/security";
 import { traverseDocument, cascadingRemove } from "../collection/index.mjs";
 const internalRemoveAll = async (payload, context) => {
-  const filtersWithId = {
-    ...payload.filters,
+  const filters = throwIfError(await traverseDocument({
     _id: {
       $in: payload.filters
     }
-  };
-  const filters = throwIfError(await traverseDocument(filtersWithId, context.description, {
+  }, context.description, {
     autoCast: true
   }));
   const it = context.collection.model.find(filters);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.181",
+  "version": "0.0.182",
   "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.181",
-    "@aeriajs/common": "^0.0.111",
-    "@aeriajs/entrypoint": "^0.0.114",
-    "@aeriajs/http": "^0.0.125",
-    "@aeriajs/security": "^0.0.181",
-    "@aeriajs/types": "^0.0.94",
-    "@aeriajs/validation": "^0.0.114"
+    "@aeriajs/builtins": "^0.0.182",
+    "@aeriajs/common": "^0.0.112",
+    "@aeriajs/entrypoint": "^0.0.115",
+    "@aeriajs/http": "^0.0.126",
+    "@aeriajs/security": "^0.0.182",
+    "@aeriajs/types": "^0.0.95",
+    "@aeriajs/validation": "^0.0.115"
   },
   "dependencies": {
     "mongodb": "^6.5.0",