@aeriajs/core 0.0.138 → 0.0.139

package/dist/collection/reference.d.ts

@@ -2,6 +2,7 @@ import type { FixedObjectProperty, Description } from '@aeriajs/types';
 export type GetReferenceOptions = {
     memoize?: string;
     depth?: number;
+    maxDepth?: number;
 };
 export type Reference = {
     isArray?: boolean;

package/dist/collection/reference.js

@@ -67,7 +67,7 @@ const buildArrayCleanupStages = (referenceMap) => {
         : null;
 };
 const getReferences = async (properties, options) => {
-    const { depth = 0, memoize, } = options || {};
+    const { depth = 0, maxDepth = 3, memoize, } = options || {};
     if (memoize) {
         if (referenceMemo[memoize]) {
             return referenceMemo[memoize];
@@ -77,10 +77,25 @@ const getReferences = async (properties, options) => {
     for (const [propName, property] of Object.entries(properties)) {
         const refProperty = (0, common_1.getReferenceProperty)(property);
         const reference = {};
-        if (depth === 2 || (refProperty && refProperty.populate && refProperty.populate.length === 0)) {
+        if (depth === maxDepth || (refProperty && refProperty.populate && refProperty.populate.length === 0)) {
             continue;
         }
-        if (!refProperty) {
+        if (refProperty) {
+            const description = (0, common_1.throwIfError)(await (0, assets_js_1.getCollectionAsset)(refProperty.$ref, 'description'));
+            const deepReferences = await (0, exports.getReferences)(description.properties, {
+                depth: depth + 1,
+                maxDepth: refProperty.populateDepth || maxDepth,
+                memoize: `${memoize}.${propName}`,
+            });
+            if (Object.keys(deepReferences).length > 0) {
+                reference.deepReferences = deepReferences;
+            }
+            const indexes = refProperty.indexes
+                ? refProperty.indexes
+                : description.indexes || [];
+            reference.populatedProperties = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === 'string'));
+        }
+        else {
             const entrypoint = 'items' in property
                 ? property.items
                 : property;
@@ -99,20 +114,6 @@ const getReferences = async (properties, options) => {
                 }
             }
         }
-        else {
-            const description = (0, common_1.throwIfError)(await (0, assets_js_1.getCollectionAsset)(refProperty.$ref, 'description'));
-            const deepReferences = await (0, exports.getReferences)(description.properties, {
-                depth: depth + 1,
-                memoize: `${memoize}.${propName}`,
-            });
-            if (Object.keys(deepReferences).length > 0) {
-                reference.deepReferences = deepReferences;
-            }
-            const indexes = refProperty.indexes
-                ? refProperty.indexes
-                : description.indexes || [];
-            reference.populatedProperties = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === 'string'));
-        }
         if (!refProperty?.$ref && !reference.deepReferences) {
             continue;
         }
@@ -215,12 +216,14 @@ const buildLookupStages = async (reference, propName, options) => {
     }
     else if (reference.deepReferences && depth <= maxDepth) {
         refHasDeepReferences = true;
-        stages.push({
-            $unwind: {
-                path: `$${withParent(propName)}`,
-                preserveNullAndEmptyArrays: true,
-            },
-        });
+        if (reference.isArray) {
+            stages.push({
+                $unwind: {
+                    path: `$${withParent(propName)}`,
+                    preserveNullAndEmptyArrays: true,
+                },
+            });
+        }
         for (const [refName, refMap] of Object.entries(reference.deepReferences)) {
             if (!refMap) {
                 continue;

package/dist/collection/reference.mjs

@@ -63,6 +63,7 @@ const buildArrayCleanupStages = (referenceMap) => {
 export const getReferences = async (properties, options) => {
   const {
     depth = 0,
+    maxDepth = 3,
     memoize
   } = options || {};
   if (memoize) {
@@ -74,24 +75,14 @@ export const getReferences = async (properties, options) => {
   for (const [propName, property] of Object.entries(properties)) {
     const refProperty = getReferenceProperty(property);
     const reference = {};
-    if (depth === 2 || refProperty && refProperty.populate && refProperty.populate.length === 0) {
+    if (depth === maxDepth || refProperty && refProperty.populate && refProperty.populate.length === 0) {
       continue;
     }
-    if (!refProperty) {
-      const entrypoint = "items" in property ? property.items : property;
-      if ("properties" in entrypoint) {
-        const deepReferences = await getReferences(entrypoint.properties, {
-          memoize: `${memoize}.${propName}`
-        });
-        if (Object.keys(deepReferences).length > 0) {
-          reference.deepReferences ??= {};
-          reference.deepReferences = deepReferences;
-        }
-      }
-    } else {
+    if (refProperty) {
       const description = throwIfError(await getCollectionAsset(refProperty.$ref, "description"));
       const deepReferences = await getReferences(description.properties, {
         depth: depth + 1,
+        maxDepth: refProperty.populateDepth || maxDepth,
         memoize: `${memoize}.${propName}`
       });
       if (Object.keys(deepReferences).length > 0) {
@@ -99,6 +90,17 @@ export const getReferences = async (properties, options) => {
       }
       const indexes = refProperty.indexes ? refProperty.indexes : description.indexes || [];
       reference.populatedProperties = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === "string"));
+    } else {
+      const entrypoint = "items" in property ? property.items : property;
+      if ("properties" in entrypoint) {
+        const deepReferences = await getReferences(entrypoint.properties, {
+          memoize: `${memoize}.${propName}`
+        });
+        if (Object.keys(deepReferences).length > 0) {
+          reference.deepReferences ??= {};
+          reference.deepReferences = deepReferences;
+        }
+      }
     }
     if (!refProperty?.$ref && !reference.deepReferences) {
       continue;
@@ -198,12 +200,14 @@ const buildLookupStages = async (reference, propName, options) => {
     }
   } else if (reference.deepReferences && depth <= maxDepth) {
     refHasDeepReferences = true;
-    stages.push({
-      $unwind: {
-        path: `$${withParent(propName)}`,
-        preserveNullAndEmptyArrays: true
-      }
-    });
+    if (reference.isArray) {
+      stages.push({
+        $unwind: {
+          path: `$${withParent(propName)}`,
+          preserveNullAndEmptyArrays: true
+        }
+      });
+    }
     for (const [refName, refMap] of Object.entries(reference.deepReferences)) {
       if (!refMap) {
         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.138",
+  "version": "0.0.139",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,13 +41,13 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.138",
-    "@aeriajs/common": "^0.0.87",
-    "@aeriajs/entrypoint": "^0.0.89",
-    "@aeriajs/http": "^0.0.98",
-    "@aeriajs/security": "^0.0.138",
-    "@aeriajs/types": "^0.0.75",
-    "@aeriajs/validation": "^0.0.90"
+    "@aeriajs/builtins": "^0.0.139",
+    "@aeriajs/common": "^0.0.88",
+    "@aeriajs/entrypoint": "^0.0.90",
+    "@aeriajs/http": "^0.0.99",
+    "@aeriajs/security": "^0.0.139",
+    "@aeriajs/types": "^0.0.76",
+    "@aeriajs/validation": "^0.0.91"
   },
   "dependencies": {
     "mongodb": "^6.5.0",