@aeriajs/core 0.0.192 → 0.0.194

package/dist/collection/traverseDocument.mjs

@@ -238,156 +238,155 @@ const recurse = async (target, ctx) => {
     _id: null,
     ...ctx.property.properties
   } : target;
-  entrypoint:
-    for (const propName in entrypoint) {
-      const value = target[propName];
-      const property = getProperty(propName, ctx.property);
-      if (propName === "_id") {
-        if (value) {
-          if (ctx.options.autoCast) {
-            entries.push([
+  entrypoint: for (const propName in entrypoint) {
+    const value = target[propName];
+    const property = getProperty(propName, ctx.property);
+    if (propName === "_id") {
+      if (value) {
+        if (ctx.options.autoCast) {
+          entries.push([
+            propName,
+            autoCast(value, {
+              ...ctx,
+              target,
               propName,
-              autoCast(value, {
-                ...ctx,
-                target,
+              property: {
+                $ref: ""
+              }
+            })
+          ]);
+        } else {
+          entries.push([
+            propName,
+            value
+          ]);
+        }
+      }
+      continue;
+    }
+    if (ctx.options.undefinedToNull) {
+      if (value === void 0) {
+        entries.push([
+          propName,
+          null
+        ]);
+        continue;
+      }
+    }
+    if (value && typeof value === "object") {
+      for (const key in value) {
+        if (key.startsWith("$")) {
+          if (!ctx.options.allowOperators) {
+            return Result.error(ACError.InsecureOperator);
+          }
+          if (key === "$regex" && typeof value[key] === "string") {
+            if (!ctx.options.noRegExpEscaping) {
+              entries.push([
                 propName,
-                property: {
-                  $ref: ""
+                {
+                  ...value,
+                  $regex: escapeRegExp(value[key])
                 }
-              })
-            ]);
-          } else {
-            entries.push([
-              propName,
-              value
-            ]);
+              ]);
+              continue entrypoint;
+            }
           }
         }
-        continue;
       }
-      if (ctx.options.undefinedToNull) {
-        if (value === void 0) {
+    }
+    if (!property) {
+      if (value && (value.constructor === Object || value.constructor === Array)) {
+        if (Array.isArray(value)) {
+          const operations = [];
+          for (const operation of value) {
+            const { error: error2, result } = await recurse(operation, ctx);
+            if (error2) {
+              return Result.error(error2);
+            }
+            operations.push(result);
+          }
           entries.push([
             propName,
-            null
+            operations
           ]);
           continue;
         }
+        const { error, result: operator } = await recurse(value, ctx);
+        if (error) {
+          return Result.error(error);
+        }
+        entries.push([
+          propName,
+          operator
+        ]);
+        continue;
       }
-      if (value && typeof value === "object") {
-        for (const key in value) {
-          if (key.startsWith("$")) {
-            if (!ctx.options.allowOperators) {
-              return Result.error(ACError.InsecureOperator);
-            }
-            if (key === "$regex" && typeof value[key] === "string") {
-              if (!ctx.options.noRegExpEscaping) {
-                entries.push([
-                  propName,
-                  {
-                    ...value,
-                    $regex: escapeRegExp(value[key])
-                  }
-                ]);
-                continue entrypoint;
-              }
-            }
+      entries.push([
+        propName,
+        value
+      ]);
+    } else {
+      if (!ctx.options.preserveHidden && property.hidden) {
+        continue;
+      }
+      if ("getters" in ctx.options && ctx.options.getters && "getter" in property) {
+        if (property.requires) {
+          const missing = property.requires.some((requiredPropName) => !(requiredPropName in target));
+          if (missing) {
+            continue;
           }
         }
       }
-      if (!property) {
-        if (value && (value.constructor === Object || value.constructor === Array)) {
+      if (ctx.options.recurseReferences) {
+        const propCast = "items" in property ? property.items : property;
+        if ("$ref" in propCast && value && !(value instanceof ObjectId)) {
+          const targetDescription = await preloadDescription(throwIfError(await getCollectionAsset(propCast.$ref, "description")));
           if (Array.isArray(value)) {
-            const operations = [];
-            for (const operation of value) {
-              const { error: error2, result } = await recurse(operation, ctx);
+            const documents = [];
+            for (const elem of value) {
+              if (elem instanceof ObjectId) {
+                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);
               }
-              operations.push(result);
+              documents.push(result);
             }
             entries.push([
               propName,
-              operations
+              documents
             ]);
             continue;
           }
-          const { error, result: operator } = await recurse(value, ctx);
+          const { error, result: document } = await traverseDocument(value, targetDescription, ctx.options);
           if (error) {
             return Result.error(error);
           }
           entries.push([
             propName,
-            operator
+            document
           ]);
           continue;
         }
-        entries.push([
-          propName,
-          value
-        ]);
-      } else {
-        if (!ctx.options.preserveHidden && property.hidden) {
-          continue;
-        }
-        if ("getters" in ctx.options && ctx.options.getters && "getter" in property) {
-          if (property.requires) {
-            const missing = property.requires.some((requiredPropName) => !(requiredPropName in target));
-            if (missing) {
-              continue;
-            }
-          }
-        }
-        if (ctx.options.recurseReferences) {
-          const propCast = "items" in property ? property.items : property;
-          if ("$ref" in propCast && value && !(value instanceof ObjectId)) {
-            const targetDescription = await preloadDescription(throwIfError(await getCollectionAsset(propCast.$ref, "description")));
-            if (Array.isArray(value)) {
-              const documents = [];
-              for (const elem of value) {
-                if (elem instanceof ObjectId) {
-                  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);
-                }
-                documents.push(result);
-              }
-              entries.push([
-                propName,
-                documents
-              ]);
-              continue;
-            }
-            const { error, result: document } = await traverseDocument(value, targetDescription, ctx.options);
-            if (error) {
-              return Result.error(error);
-            }
-            entries.push([
-              propName,
-              document
-            ]);
-            continue;
-          }
-        }
-        entries.push([
-          propName,
-          await ctx.options.pipe(value, {
-            ...ctx,
-            target,
-            propName,
-            propPath: ctx.propPath ? `${ctx.propPath}.${propName}` : propName,
-            property
-          })
-        ]);
       }
+      entries.push([
+        propName,
+        await ctx.options.pipe(value, {
+          ...ctx,
+          target,
+          propName,
+          propPath: ctx.propPath ? `${ctx.propPath}.${propName}` : propName,
+          property
+        })
+      ]);
     }
+  }
   return Result.result(Object.fromEntries(entries));
 };
 export const traverseDocument = async (what, description, _options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.192",
+  "version": "0.0.194",
   "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.192",
-    "@aeriajs/common": "^0.0.118",
-    "@aeriajs/entrypoint": "^0.0.121",
-    "@aeriajs/http": "^0.0.132",
-    "@aeriajs/security": "^0.0.192",
-    "@aeriajs/types": "^0.0.101",
-    "@aeriajs/validation": "^0.0.121"
+    "@aeriajs/builtins": "^0.0.194",
+    "@aeriajs/common": "^0.0.119",
+    "@aeriajs/entrypoint": "^0.0.122",
+    "@aeriajs/http": "^0.0.134",
+    "@aeriajs/security": "^0.0.194",
+    "@aeriajs/types": "^0.0.102",
+    "@aeriajs/validation": "^0.0.123"
   },
   "dependencies": {
     "mongodb": "^6.5.0",