@aeriajs/core 0.0.191 → 0.0.192

package/dist/collection/reference.d.ts

@@ -25,7 +25,7 @@ export type BuildLookupPipelineOptions = {
     memoize?: string;
     project?: string[];
 };
-export declare const getReferences: (properties: FixedObjectProperty["properties"], options?: GetReferenceOptions) => Promise<{}>;
+export declare const getReferences: (properties: FixedObjectProperty["properties"], options?: GetReferenceOptions) => Promise<ReferenceMap>;
 export declare const recurseSetStage: (reference: Reference, path: string[], parentElem: {}, options?: {
     noCond: boolean;
 }) => Document;

package/dist/collection/traverseDocument.d.ts

@@ -7,7 +7,7 @@ export type TraverseOptionsBase = {
     validateWholeness?: boolean | 'deep';
     fromProperties?: boolean;
     allowOperators?: boolean;
-    allowInsecureOperators?: boolean;
+    noRegExpEscaping?: boolean;
     undefinedToNull?: boolean;
     preserveHidden?: boolean;
     recurseDeep?: boolean;

package/dist/collection/traverseDocument.js

@@ -28,7 +28,6 @@ const types_1 = require("@aeriajs/types");
 const common_1 = require("@aeriajs/common");
 const validation_1 = require("@aeriajs/validation");
 const entrypoint_1 = require("@aeriajs/entrypoint");
-const security_1 = require("@aeriajs/security");
 const mongodb_1 = require("mongodb");
 const assets_js_1 = require("../assets.js");
 const context_js_1 = require("../context.js");
@@ -37,6 +36,9 @@ const reference_js_1 = require("./reference.js");
 const cascadingRemove_js_1 = require("./cascadingRemove.js");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
+const escapeRegExp = (text) => {
+    return text.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&');
+};
 const getProperty = (propName, parentProperty) => {
     if (propName === '_id') {
         return {
@@ -86,9 +88,10 @@ const cleanupReferences = async (value, ctx) => {
                     return value;
                 }
             }
-            const refMap = await (0, reference_js_1.getReferences)(ctx.options.description.properties);
-            const reference = (0, common_1.getValueFromPath)(refMap, ctx.propPath.split('.').join('.deepReferences.'));
-            await (0, cascadingRemove_js_1.preferredRemove)(referenceIds, reference, await (0, context_js_1.createContext)({
+            const refMap = await (0, reference_js_1.getReferences)({
+                [ctx.propName]: ctx.property,
+            });
+            await (0, cascadingRemove_js_1.preferredRemove)(referenceIds, refMap[ctx.propName], await (0, context_js_1.createContext)({
                 parentContext: context,
                 collectionName: refProperty.$ref,
             }));
@@ -270,7 +273,7 @@ const recurse = async (target, ctx) => {
             ...ctx.property.properties,
         }
         : target;
-    for (const propName in entrypoint) {
+    entrypoint: for (const propName in entrypoint) {
         const value = target[propName];
         const property = getProperty(propName, ctx.property);
         if (propName === '_id') {
@@ -312,11 +315,17 @@ const recurse = async (target, ctx) => {
                     if (!ctx.options.allowOperators) {
                         return types_1.Result.error(types_1.ACError.InsecureOperator);
                     }
-                    const allowInsecureOperators = ctx.options.allowInsecureOperators === undefined
-                        ? ctx.options.context?.config.security.allowInsecureOperators
-                        : ctx.options.allowInsecureOperators;
-                    if (!allowInsecureOperators && security_1.INSECURE_OPERATORS.includes(key)) {
-                        return types_1.Result.error(types_1.ACError.InsecureOperator);
+                    if (key === '$regex' && typeof value[key] === 'string') {
+                        if (!ctx.options.noRegExpEscaping) {
+                            entries.push([
+                                propName,
+                                {
+                                    ...value,
+                                    $regex: escapeRegExp(value[key]),
+                                },
+                            ]);
+                            continue entrypoint;
+                        }
                     }
                 }
             }

package/dist/collection/traverseDocument.mjs

@@ -3,7 +3,6 @@ import { Result, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/ty
 import { throwIfError, pipe, isReference, getReferenceProperty, getValueFromPath, isError } from "@aeriajs/common";
 import { makeValidationError, validateProperty, validateWholeness } from "@aeriajs/validation";
 import { getCollection } from "@aeriajs/entrypoint";
-import { INSECURE_OPERATORS } from "@aeriajs/security";
 import { ObjectId } from "mongodb";
 import { getCollectionAsset } from "../assets.mjs";
 import { createContext } from "../context.mjs";
@@ -12,6 +11,9 @@ import { getReferences } from "./reference.mjs";
 import { preferredRemove } from "./cascadingRemove.mjs";
 import * as path from "path";
 import * as fs from "fs/promises";
+const escapeRegExp = (text) => {
+  return text.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&");
+};
 const getProperty = (propName, parentProperty) => {
   if (propName === "_id") {
     return {
@@ -60,9 +62,10 @@ const cleanupReferences = async (value, ctx) => {
           return value;
         }
       }
-      const refMap = await getReferences(ctx.options.description.properties);
-      const reference = getValueFromPath(refMap, ctx.propPath.split(".").join(".deepReferences."));
-      await preferredRemove(referenceIds, reference, await createContext({
+      const refMap = await getReferences({
+        [ctx.propName]: ctx.property
+      });
+      await preferredRemove(referenceIds, refMap[ctx.propName], await createContext({
         parentContext: context,
         collectionName: refProperty.$ref
       }));
@@ -235,147 +238,156 @@ const recurse = async (target, ctx) => {
     _id: null,
     ...ctx.property.properties
   } : target;
-  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,
+  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,
-              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);
-          }
-          const allowInsecureOperators = ctx.options.allowInsecureOperators === void 0 ? ctx.options.context?.config.security.allowInsecureOperators : ctx.options.allowInsecureOperators;
-          if (!allowInsecureOperators && INSECURE_OPERATORS.includes(key)) {
-            return Result.error(ACError.InsecureOperator);
+              autoCast(value, {
+                ...ctx,
+                target,
+                propName,
+                property: {
+                  $ref: ""
+                }
+              })
+            ]);
+          } else {
+            entries.push([
+              propName,
+              value
+            ]);
           }
         }
+        continue;
       }
-    }
-    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);
-          }
+      if (ctx.options.undefinedToNull) {
+        if (value === void 0) {
           entries.push([
             propName,
-            operations
+            null
           ]);
           continue;
         }
-        const { error, result: operator } = await recurse(value, ctx);
-        if (error) {
-          return Result.error(error);
-        }
-        entries.push([
-          propName,
-          operator
-        ]);
-        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 (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;
+              }
+            }
           }
         }
       }
-      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 (!property) {
+        if (value && (value.constructor === Object || value.constructor === Array)) {
           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);
+            const operations = [];
+            for (const operation of value) {
+              const { error: error2, result } = await recurse(operation, ctx);
               if (error2) {
                 return Result.error(error2);
               }
-              documents.push(result);
+              operations.push(result);
             }
             entries.push([
               propName,
-              documents
+              operations
             ]);
             continue;
           }
-          const { error, result: document } = await traverseDocument(value, targetDescription, ctx.options);
+          const { error, result: operator } = await recurse(value, ctx);
           if (error) {
             return Result.error(error);
           }
           entries.push([
             propName,
-            document
+            operator
           ]);
           continue;
         }
-      }
-      entries.push([
-        propName,
-        await ctx.options.pipe(value, {
-          ...ctx,
-          target,
+        entries.push([
           propName,
-          propPath: ctx.propPath ? `${ctx.propPath}.${propName}` : propName,
-          property
-        })
-      ]);
+          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
+          })
+        ]);
+      }
     }
-  }
   return Result.result(Object.fromEntries(entries));
 };
 export const traverseDocument = async (what, description, _options) => {

package/dist/functions/count.d.ts

@@ -1,6 +1,6 @@
 import type { Context, SchemaWithId, CountPayload, CountReturnType } from '@aeriajs/types';
 export type CountOptions = {
     bypassSecurity?: boolean;
-    allowInsecureOperators?: boolean;
+    noRegExpEscaping?: boolean;
 };
 export declare const count: <TContext extends Context>(payload: CountPayload<SchemaWithId<TContext["description"]>>, context: TContext extends Context ? TContext : never, options?: CountOptions) => Promise<CountReturnType>;

package/dist/functions/count.js

@@ -16,7 +16,7 @@ const internalCount = async (payload, context, options) => {
     const traversedFilters = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(filters, context.description, {
         autoCast: true,
         allowOperators: true,
-        allowInsecureOperators: options.allowInsecureOperators,
+        noRegExpEscaping: options.noRegExpEscaping,
         context,
     }));
     if ($text) {

package/dist/functions/count.mjs

@@ -12,7 +12,7 @@ const internalCount = async (payload, context, options) => {
   const traversedFilters = throwIfError(await traverseDocument(filters, context.description, {
     autoCast: true,
     allowOperators: true,
-    allowInsecureOperators: options.allowInsecureOperators,
+    noRegExpEscaping: options.noRegExpEscaping,
     context
   }));
   if ($text) {

package/dist/functions/get.d.ts

@@ -1,6 +1,6 @@
 import type { Context, SchemaWithId, GetPayload, GetReturnType } from '@aeriajs/types';
 export type GetOptions = {
     bypassSecurity?: boolean;
-    allowInsecureOperators?: boolean;
+    noRegExpEscaping?: boolean;
 };
 export declare const get: <TContext extends Context>(payload: GetPayload<SchemaWithId<TContext["description"]>>, context: TContext, options?: GetOptions) => Promise<GetReturnType<SchemaWithId<TContext["description"]>>>;

package/dist/functions/get.js

@@ -19,7 +19,7 @@ const internalGet = async (payload, context, options) => {
     const { error: filtersError, result: traversedFilters } = await (0, index_js_1.traverseDocument)(filters, context.description, {
         autoCast: true,
         allowOperators: true,
-        allowInsecureOperators: options.allowInsecureOperators,
+        noRegExpEscaping: options.noRegExpEscaping,
         context,
     });
     if (filtersError) {

package/dist/functions/get.mjs

@@ -25,7 +25,7 @@ const internalGet = async (payload, context, options) => {
   const { error: filtersError, result: traversedFilters } = await traverseDocument(filters, context.description, {
     autoCast: true,
     allowOperators: true,
-    allowInsecureOperators: options.allowInsecureOperators,
+    noRegExpEscaping: options.noRegExpEscaping,
     context
   });
   if (filtersError) {

package/dist/functions/getAll.d.ts

@@ -2,6 +2,6 @@ import type { Context, SchemaWithId, GetAllPayload, GetAllReturnType } from '@ae
 export type GetAllOptions = {
     bypassSecurity?: boolean;
     noDefaultLimit?: boolean;
-    allowInsecureOperators?: boolean;
+    noRegExpEscaping?: boolean;
 };
 export declare const getAll: <TContext extends Context>(payload: GetAllPayload<SchemaWithId<TContext["description"]>> | undefined, context: TContext, options?: GetAllOptions) => Promise<GetAllReturnType<SchemaWithId<TContext["description"]>>>;

package/dist/functions/getAll.js

@@ -42,7 +42,7 @@ const internalGetAll = async (payload, context, options) => {
     const { error: filtersError, result: traversedFilters } = await (0, index_js_1.traverseDocument)(filters, context.description, {
         autoCast: true,
         allowOperators: true,
-        allowInsecureOperators: options.allowInsecureOperators,
+        noRegExpEscaping: options.noRegExpEscaping,
         context,
     });
     if (filtersError) {

package/dist/functions/getAll.mjs

@@ -42,7 +42,7 @@ const internalGetAll = async (payload, context, options) => {
   const { error: filtersError, result: traversedFilters } = await traverseDocument(filters, context.description, {
     autoCast: true,
     allowOperators: true,
-    allowInsecureOperators: options.allowInsecureOperators,
+    noRegExpEscaping: options.noRegExpEscaping,
     context
   });
   if (filtersError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.191",
+  "version": "0.0.192",
   "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.191",
-    "@aeriajs/common": "^0.0.117",
-    "@aeriajs/entrypoint": "^0.0.120",
-    "@aeriajs/http": "^0.0.131",
-    "@aeriajs/security": "^0.0.191",
-    "@aeriajs/types": "^0.0.100",
-    "@aeriajs/validation": "^0.0.120"
+    "@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"
   },
   "dependencies": {
     "mongodb": "^6.5.0",