@aeriajs/core 0.0.242 → 0.0.244

package/dist/collection/preload.d.ts

@@ -81,4 +81,4 @@ export declare const applyPreset: (entry: Partial<Description> | Description["pr
 });
 export declare const preloadDescription: <Options extends PreloadOptions, Return = Options extends {
     serialize: true;
-} ? Buffer<ArrayBufferLike> : Description>(originalDescription: Partial<Description>, options?: Options) => Promise<Return>;
+} ? Buffer : Description>(originalDescription: Partial<Description>, options?: Options) => Promise<Return>;

package/dist/collection/reference.js

@@ -205,7 +205,12 @@ const recurseSetStage = (reference, path, parentElem, options = {
                     newElem = {
                         $arrayElemAt: [
                             `$${getTempName(path.slice(0, -1))}.${refName}`,
-                            indexOfArray,
+                            {
+                                $indexOfArray: [
+                                    `$${getTempName(path.slice(0, -1))}._id`,
+                                    parentElem,
+                                ],
+                            },
                         ],
                     };
                 }
@@ -317,7 +322,7 @@ const buildLookupPipeline = (refMap, options = {}) => {
             const tempName = getTempName(newPath);
             const lookupPipeline = [];
             tempNames.unshift(tempName);
-            if (reference.populate && reference.populate.length > 0) {
+            if (reference.populate && reference.populate.length > 0 && !reference.isInline) {
                 lookupPipeline.push({
                     $project: Object.fromEntries(reference.populate.map((index) => [
                         index,
@@ -330,10 +335,19 @@ const buildLookupPipeline = (refMap, options = {}) => {
                 localField = `${getTempName(path)}.${refName}`;
             }
             else {
-                const localFieldPath = newPath.map(([segment]) => segment).join('.');
+                let separator = '_';
                 localField = path[0] && path[0][1]
-                    ? `_${localFieldPath}`
-                    : localFieldPath;
+                    ? '_'
+                    : '';
+                for (let i = 0; i < newPath.length; i++) {
+                    localField += newPath[i][0];
+                    if (newPath[i + 1]) {
+                        if (!newPath[i][1] || !newPath[i + 1][1]) {
+                            separator = '.';
+                        }
+                        localField += separator;
+                    }
+                }
             }
             rootPipeline.unshift({
                 $lookup: {

package/dist/collection/reference.mjs

@@ -194,7 +194,12 @@ export const recurseSetStage = (reference, path, parentElem, options = {
           newElem = {
             $arrayElemAt: [
               `$${getTempName(path.slice(0, -1))}.${refName}`,
-              indexOfArray
+              {
+                $indexOfArray: [
+                  `$${getTempName(path.slice(0, -1))}._id`,
+                  parentElem
+                ]
+              }
             ]
           };
         } else {
@@ -305,7 +310,7 @@ export const buildLookupPipeline = (refMap, options = {}) => {
       const tempName = getTempName(newPath);
       const lookupPipeline = [];
       tempNames.unshift(tempName);
-      if (reference.populate && reference.populate.length > 0) {
+      if (reference.populate && reference.populate.length > 0 && !reference.isInline) {
         lookupPipeline.push({
           $project: Object.fromEntries(reference.populate.map((index) => [
             index,
@@ -317,8 +322,17 @@ export const buildLookupPipeline = (refMap, options = {}) => {
       if (reference.isRecursive) {
         localField = `${getTempName(path)}.${refName}`;
       } else {
-        const localFieldPath = newPath.map(([segment]) => segment).join(".");
-        localField = path[0] && path[0][1] ? `_${localFieldPath}` : localFieldPath;
+        let separator = "_";
+        localField = path[0] && path[0][1] ? "_" : "";
+        for (let i = 0; i < newPath.length; i++) {
+          localField += newPath[i][0];
+          if (newPath[i + 1]) {
+            if (!newPath[i][1] || !newPath[i + 1][1]) {
+              separator = ".";
+            }
+            localField += separator;
+          }
+        }
       }
       rootPipeline.unshift({
         $lookup: {

package/dist/functions/removeAll.js

@@ -11,8 +11,7 @@ const internalRemoveAll = async (payload, context) => {
         context,
     }));
     const it = context.collection.model.find(filters);
-    let doc;
-    while (doc = await it.next()) {
+    for await (const doc of it) {
         await (0, index_js_1.cascadingRemove)(doc, context);
     }
     return types_1.Result.result(await context.collection.model.deleteMany(filters));

package/dist/functions/removeAll.mjs

@@ -9,8 +9,7 @@ const internalRemoveAll = async (payload, context) => {
     context
   }));
   const it = context.collection.model.find(filters);
-  let doc;
-  while (doc = await it.next()) {
+  for await (const doc of it) {
     await cascadingRemove(doc, context);
   }
   return Result.result(await context.collection.model.deleteMany(filters));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.242",
+  "version": "0.0.244",
   "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.242",
+    "@aeriajs/builtins": "^0.0.244",
     "@aeriajs/common": "^0.0.136",
     "@aeriajs/entrypoint": "^0.0.140",
     "@aeriajs/http": "^0.0.164",
-    "@aeriajs/security": "^0.0.242",
+    "@aeriajs/security": "^0.0.244",
     "@aeriajs/types": "^0.0.118",
     "@aeriajs/validation": "^0.0.152"
   },
@@ -59,6 +59,7 @@
   },
   "scripts": {
     "test": "vitest run",
+    "test:typecheck": "tsc -p tsconfig.test.json",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "build": "pnpm build:cjs && pnpm build:esm",