@aeriajs/core 0.0.148 → 0.0.149

package/dist/collection/reference.d.ts

@@ -1,9 +1,5 @@
 import type { FixedObjectProperty, Description } from '@aeriajs/types';
-export type GetReferenceOptions = {
-    memoize?: string;
-    depth?: number;
-    maxDepth?: number;
-};
+import type { Document } from 'mongodb';
 export type Reference = {
     isArray?: boolean;
     isArrayElement?: boolean;
@@ -12,11 +8,17 @@ export type Reference = {
     deepReferences?: ReferenceMap;
     referencedCollection?: string;
     indexes?: string[];
+    populate?: string[];
 };
 export type ReferenceMap = Record<string, Reference>;
-export type PipelineStage = {};
+export type GetReferenceOptions = {
+    memoize?: string;
+    depth?: number;
+    maxDepth?: number;
+    populate?: string[];
+};
 export type BuildLookupPipelineOptions = {
-    rootPipeline?: PipelineStage[];
+    rootPipeline?: Document[];
     path?: string[];
     tempNames?: string[];
     memoize?: string;
@@ -25,6 +27,6 @@ export type BuildLookupPipelineOptions = {
 export declare const getReferences: (properties: FixedObjectProperty["properties"], options?: GetReferenceOptions) => Promise<{}>;
 export declare const recurseSetStage: (reference: Reference, path: string[], parentElem: {}, options?: {
     noCond: boolean;
-}) => PipelineStage;
-export declare const buildLookupPipeline: (refMap: ReferenceMap, options?: BuildLookupPipelineOptions) => PipelineStage[];
-export declare const getLookupPipeline: (description: Description, options: BuildLookupPipelineOptions) => Promise<PipelineStage[]>;
+}) => Document;
+export declare const buildLookupPipeline: (refMap: ReferenceMap, options?: BuildLookupPipelineOptions) => Document[];
+export declare const getLookupPipeline: (description: Description, options: BuildLookupPipelineOptions) => Promise<Document[]>;

package/dist/collection/reference.js

@@ -10,7 +10,7 @@ const getTempName = (path) => {
 const referenceMemo = {};
 const lookupMemo = {};
 const getReferences = async (properties, options = {}) => {
-    const { depth = 0, maxDepth = 3, memoize, } = options;
+    const { depth = 0, maxDepth = 3, memoize, populate, } = options;
     if (memoize) {
         if (referenceMemo[memoize]) {
             return referenceMemo[memoize];
@@ -18,25 +18,28 @@ const getReferences = async (properties, options = {}) => {
     }
     const refMap = {};
     for (const [propName, property] of Object.entries(properties)) {
-        const refProperty = (0, common_1.getReferenceProperty)(property);
         const reference = {};
-        if (depth === maxDepth || (refProperty && refProperty.populate && refProperty.populate.length === 0)) {
+        const refProperty = (0, common_1.getReferenceProperty)(property);
+        if (depth === maxDepth || (populate && !populate.includes(propName))) {
             continue;
         }
         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;
+            if (refProperty.populate) {
+                const deepReferences = await (0, exports.getReferences)(description.properties, {
+                    depth: depth + 1,
+                    maxDepth: refProperty.populateDepth || maxDepth,
+                    memoize: `${memoize}.${propName}`,
+                    populate: Array.from(refProperty.populate),
+                });
+                if (Object.keys(deepReferences).length > 0) {
+                    reference.deepReferences = deepReferences;
+                }
             }
             const indexes = refProperty.indexes
                 ? refProperty.indexes
-                : description.indexes || Object.keys(description.properties).slice(0, 1);
-            reference.indexes = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === 'string'));
+                : description.indexes || [];
+            reference.populate = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === 'string'));
         }
         else {
             const entrypoint = 'items' in property
@@ -269,13 +272,9 @@ const buildLookupPipeline = (refMap, options = {}) => {
             const tempName = getTempName(path.concat(refName));
             const lookupPipeline = [];
             tempNames.unshift(tempName);
-            if (reference.indexes && reference.indexes.length > 0) {
-                const lookupPopulate = reference.indexes;
-                if (reference.deepReferences) {
-                    lookupPopulate.push(...Object.keys(reference.deepReferences));
-                }
+            if (reference.populate && reference.populate.length > 0) {
                 lookupPipeline.push({
-                    $project: Object.fromEntries(reference.indexes.map((index) => [
+                    $project: Object.fromEntries(reference.populate.map((index) => [
                         index,
                         1,
                     ])),

package/dist/collection/reference.mjs

@@ -11,7 +11,8 @@ export const getReferences = async (properties, options = {}) => {
   const {
     depth = 0,
     maxDepth = 3,
-    memoize
+    memoize,
+    populate
   } = options;
   if (memoize) {
     if (referenceMemo[memoize]) {
@@ -20,23 +21,26 @@ export const getReferences = async (properties, options = {}) => {
   }
   const refMap = {};
   for (const [propName, property] of Object.entries(properties)) {
-    const refProperty = getReferenceProperty(property);
     const reference = {};
-    if (depth === maxDepth || refProperty && refProperty.populate && refProperty.populate.length === 0) {
+    const refProperty = getReferenceProperty(property);
+    if (depth === maxDepth || populate && !populate.includes(propName)) {
       continue;
     }
     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) {
-        reference.deepReferences = deepReferences;
+      if (refProperty.populate) {
+        const deepReferences = await getReferences(description.properties, {
+          depth: depth + 1,
+          maxDepth: refProperty.populateDepth || maxDepth,
+          memoize: `${memoize}.${propName}`,
+          populate: Array.from(refProperty.populate)
+        });
+        if (Object.keys(deepReferences).length > 0) {
+          reference.deepReferences = deepReferences;
+        }
       }
-      const indexes = refProperty.indexes ? refProperty.indexes : description.indexes || Object.keys(description.properties).slice(0, 1);
-      reference.indexes = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === "string"));
+      const indexes = refProperty.indexes ? refProperty.indexes : description.indexes || [];
+      reference.populate = (refProperty.populate || []).concat(indexes.filter((index) => typeof index === "string"));
     } else {
       const entrypoint = "items" in property ? property.items : property;
       if ("properties" in entrypoint) {
@@ -258,13 +262,9 @@ export const buildLookupPipeline = (refMap, options = {}) => {
       const tempName = getTempName(path.concat(refName));
       const lookupPipeline = [];
       tempNames.unshift(tempName);
-      if (reference.indexes && reference.indexes.length > 0) {
-        const lookupPopulate = reference.indexes;
-        if (reference.deepReferences) {
-          lookupPopulate.push(...Object.keys(reference.deepReferences));
-        }
+      if (reference.populate && reference.populate.length > 0) {
         lookupPipeline.push({
-          $project: Object.fromEntries(reference.indexes.map((index) => [
+          $project: Object.fromEntries(reference.populate.map((index) => [
             index,
             1
           ]))

package/dist/collection/traverseDocument.js

@@ -326,6 +326,10 @@ const recurse = async (target, ctx) => {
                                 documents.push(elem);
                                 continue;
                             }
+                            if (typeof elem === 'string') {
+                                documents.push(new mongodb_1.ObjectId(elem));
+                                continue;
+                            }
                             const { error, result } = await (0, exports.traverseDocument)(elem, targetDescription, ctx.options);
                             if (error) {
                                 return types_1.Result.error(error);

package/dist/collection/traverseDocument.mjs

@@ -286,6 +286,10 @@ const recurse = async (target, ctx) => {
                 documents.push(elem);
                 continue;
               }
+              if (typeof elem === "string") {
+                documents.push(new ObjectId(elem));
+                continue;
+              }
               const { error: error2, result } = await traverseDocument(elem, targetDescription, ctx.options);
               if (error2) {
                 return Result.error(error2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.148",
+  "version": "0.0.149",
   "description": "",
   "main": "dist/index.js",
   "aeriaMain": "tests/fixtures/aeriaMain.js",
@@ -42,11 +42,11 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.148",
+    "@aeriajs/builtins": "^0.0.149",
     "@aeriajs/common": "^0.0.90",
     "@aeriajs/entrypoint": "^0.0.92",
     "@aeriajs/http": "^0.0.102",
-    "@aeriajs/security": "^0.0.148",
+    "@aeriajs/security": "^0.0.149",
     "@aeriajs/types": "^0.0.78",
     "@aeriajs/validation": "^0.0.93"
   },