@aeriajs/core 0.0.136 → 0.0.137

package/dist/functions/builtin/count.js

@@ -7,21 +7,25 @@ const common_1 = require("@aeriajs/common");
 const index_js_1 = require("../../collection/index.js");
 const count = async (payload, context) => {
     const security = (0, security_1.useSecurity)(context);
-    const { filters } = (0, common_1.throwIfError)(await security.beforeRead(payload));
-    const { $text, ...filtersRest } = filters;
-    const traversedFilters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filtersRest, context.description, {
+    const sanitizedPayload = (0, common_1.throwIfError)(await security.beforeRead(payload));
+    const filters = sanitizedPayload.filters;
+    const $text = '$text' in sanitizedPayload.filters
+        ? sanitizedPayload.filters.$text
+        : undefined;
+    if ('$text' in filters) {
+        delete filters.$text;
+    }
+    const traversedFilters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filters, context.description, {
         autoCast: true,
         allowOperators: true,
     }));
     if ($text) {
         const pipeline = [];
-        if ($text) {
-            pipeline.push({
-                $match: {
-                    $text,
-                },
-            });
-        }
+        pipeline.push({
+            $match: {
+                $text,
+            },
+        });
         pipeline.push({
             $match: traversedFilters,
         });

package/dist/functions/builtin/count.mjs

@@ -5,21 +5,23 @@ import { throwIfError } from "@aeriajs/common";
 import { traverseDocument } from "../../collection/index.mjs";
 export const count = async (payload, context) => {
   const security = useSecurity(context);
-  const { filters } = throwIfError(await security.beforeRead(payload));
-  const { $text, ...filtersRest } = filters;
-  const traversedFilters = throwIfError(await traverseDocument(filtersRest, context.description, {
+  const sanitizedPayload = throwIfError(await security.beforeRead(payload));
+  const filters = sanitizedPayload.filters;
+  const $text = "$text" in sanitizedPayload.filters ? sanitizedPayload.filters.$text : void 0;
+  if ("$text" in filters) {
+    delete filters.$text;
+  }
+  const traversedFilters = throwIfError(await traverseDocument(filters, context.description, {
     autoCast: true,
     allowOperators: true
   }));
   if ($text) {
     const pipeline = [];
-    if ($text) {
-      pipeline.push({
-        $match: {
-          $text
-        }
-      });
-    }
+    pipeline.push({
+      $match: {
+        $text
+      }
+    });
     pipeline.push({
       $match: traversedFilters
     });

package/dist/functions/builtin/get.js

@@ -7,9 +7,10 @@ const common_1 = require("@aeriajs/common");
 const index_js_1 = require("../../collection/index.js");
 const get = async (payload, context, options) => {
     const security = (0, security_1.useSecurity)(context);
-    const { filters = {}, project = [], } = !options?.bypassSecurity
+    const sanitizedPayload = !options?.bypassSecurity
         ? (0, common_1.throwIfError)(await security.beforeRead(payload))
         : payload;
+    const { filters = {}, project = [], } = sanitizedPayload;
     if (Object.keys(filters).length === 0) {
         return context.error(types_1.HTTPStatus.BadRequest, {
             code: types_1.ACError.MalformedInput,
@@ -33,7 +34,9 @@ const get = async (payload, context, options) => {
     }
     pipeline.push(...await (0, index_js_1.buildLookupPipeline)(references, {
         memoize: context.description.$id,
-        project: payload.populate || project,
+        project: sanitizedPayload.populate
+            ? sanitizedPayload.populate
+            : project,
         properties: context.description.properties,
     }));
     const doc = await context.collection.model.aggregate(pipeline).next();

package/dist/functions/builtin/get.mjs

@@ -11,10 +11,11 @@ import {
 } from "../../collection/index.mjs";
 export const get = async (payload, context, options) => {
   const security = useSecurity(context);
+  const sanitizedPayload = !options?.bypassSecurity ? throwIfError(await security.beforeRead(payload)) : payload;
   const {
     filters = {},
     project = []
-  } = !options?.bypassSecurity ? throwIfError(await security.beforeRead(payload)) : payload;
+  } = sanitizedPayload;
   if (Object.keys(filters).length === 0) {
     return context.error(HTTPStatus.BadRequest, {
       code: ACError.MalformedInput
@@ -38,7 +39,7 @@ export const get = async (payload, context, options) => {
   }
   pipeline.push(...await buildLookupPipeline(references, {
     memoize: context.description.$id,
-    project: payload.populate || project,
+    project: sanitizedPayload.populate ? sanitizedPayload.populate : project,
     properties: context.description.properties
   }));
   const doc = await context.collection.model.aggregate(pipeline).next();

package/dist/functions/builtin/getAll.js

@@ -8,10 +8,17 @@ const index_js_1 = require("../../collection/index.js");
 const getAll = async (_payload, context, options = {}) => {
     const security = (0, security_1.useSecurity)(context);
     const payload = _payload || {};
-    const { filters = {}, limit = context.config.paginationLimit, sort, project = [], offset = 0, } = !options.bypassSecurity
+    const sanitizedPayload = !options.bypassSecurity
         ? (0, common_1.throwIfError)(await security.beforeRead(payload))
         : payload;
-    const { $text, ...filtersRest } = filters;
+    const { limit = context.config.paginationLimit, sort, project = [], offset = 0, } = sanitizedPayload;
+    const filters = sanitizedPayload.filters || {};
+    const $text = sanitizedPayload.filters && '$text' in sanitizedPayload.filters
+        ? sanitizedPayload.filters.$text
+        : undefined;
+    if ('$text' in filters) {
+        delete filters.$text;
+    }
     const pipeline = [];
     const references = await (0, index_js_1.getReferences)(context.description.properties, {
         memoize: context.description.$id,
@@ -35,9 +42,9 @@ const getAll = async (_payload, context, options = {}) => {
             $sort: preferredSort,
         });
     }
-    if (Object.keys(filtersRest).length > 0) {
+    if (Object.keys(filters).length > 0) {
         pipeline.push({
-            $match: (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filtersRest, context.description, {
+            $match: (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filters, context.description, {
                 autoCast: true,
                 allowOperators: true,
             })),
@@ -59,7 +66,9 @@ const getAll = async (_payload, context, options = {}) => {
     }
     pipeline.push(...await (0, index_js_1.buildLookupPipeline)(references, {
         memoize: context.description.$id,
-        project: payload.populate || project,
+        project: sanitizedPayload.populate
+            ? sanitizedPayload.populate
+            : project,
         properties: context.description.properties,
     }));
     if (Object.keys(references).length > 0 && preferredSort) {

package/dist/functions/builtin/getAll.mjs

@@ -12,14 +12,18 @@ import {
 export const getAll = async (_payload, context, options = {}) => {
   const security = useSecurity(context);
   const payload = _payload || {};
+  const sanitizedPayload = !options.bypassSecurity ? throwIfError(await security.beforeRead(payload)) : payload;
   const {
-    filters = {},
     limit = context.config.paginationLimit,
     sort,
     project = [],
     offset = 0
-  } = !options.bypassSecurity ? throwIfError(await security.beforeRead(payload)) : payload;
-  const { $text, ...filtersRest } = filters;
+  } = sanitizedPayload;
+  const filters = sanitizedPayload.filters || {};
+  const $text = sanitizedPayload.filters && "$text" in sanitizedPayload.filters ? sanitizedPayload.filters.$text : void 0;
+  if ("$text" in filters) {
+    delete filters.$text;
+  }
   const pipeline = [];
   const references = await getReferences(context.description.properties, {
     memoize: context.description.$id
@@ -39,9 +43,9 @@ export const getAll = async (_payload, context, options = {}) => {
       $sort: preferredSort
     });
   }
-  if (Object.keys(filtersRest).length > 0) {
+  if (Object.keys(filters).length > 0) {
     pipeline.push({
-      $match: throwIfError(await traverseDocument(filtersRest, context.description, {
+      $match: throwIfError(await traverseDocument(filters, context.description, {
         autoCast: true,
         allowOperators: true
       }))
@@ -63,7 +67,7 @@ export const getAll = async (_payload, context, options = {}) => {
   }
   pipeline.push(...await buildLookupPipeline(references, {
     memoize: context.description.$id,
-    project: payload.populate || project,
+    project: sanitizedPayload.populate ? sanitizedPayload.populate : project,
     properties: context.description.properties
   }));
   if (Object.keys(references).length > 0 && preferredSort) {

package/dist/functions/builtin/removeFile.js

@@ -5,7 +5,7 @@ const security_1 = require("@aeriajs/security");
 const types_1 = require("@aeriajs/types");
 const removeFile = async (payload, context) => {
     const { propertyName, parentId, ...props } = payload;
-    await (0, security_1.checkImmutability)({
+    await (0, security_1.checkImmutabilityRead)({
         propertyName,
         parentId,
         childId: props.filters._id,

package/dist/functions/builtin/removeFile.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { checkImmutability } from "@aeriajs/security";
+import { checkImmutabilityRead } from "@aeriajs/security";
 import { Result } from "@aeriajs/types";
 export const removeFile = async (payload, context) => {
   const {
@@ -7,7 +7,7 @@ export const removeFile = async (payload, context) => {
     parentId,
     ...props
   } = payload;
-  await checkImmutability({
+  await checkImmutabilityRead({
     propertyName,
     parentId,
     childId: props.filters._id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.136",
+  "version": "0.0.137",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,13 +41,13 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.136",
-    "@aeriajs/common": "^0.0.85",
-    "@aeriajs/entrypoint": "^0.0.87",
-    "@aeriajs/http": "^0.0.96",
-    "@aeriajs/security": "^0.0.136",
-    "@aeriajs/types": "^0.0.73",
-    "@aeriajs/validation": "^0.0.88"
+    "@aeriajs/builtins": "^0.0.137",
+    "@aeriajs/common": "^0.0.86",
+    "@aeriajs/entrypoint": "^0.0.88",
+    "@aeriajs/http": "^0.0.97",
+    "@aeriajs/security": "^0.0.137",
+    "@aeriajs/types": "^0.0.74",
+    "@aeriajs/validation": "^0.0.89"
   },
   "dependencies": {
     "mongodb": "^6.5.0",