@aeriajs/core 0.0.174 → 0.0.176

package/dist/collection/reference.js

@@ -95,8 +95,9 @@ const recurseSetStage = (reference, path, parentElem, options = {
     noCond: false,
 }) => {
     const refName = path.at(-1);
+    const shouldUseArrayIndex = reference.isRecursive && !(reference.isArrayElement && reference.isArray === false);
     let indexOfArray;
-    if (reference.isRecursive && !(reference.isArrayElement && reference.isArray === false)) {
+    if (shouldUseArrayIndex) {
         indexOfArray = {
             $indexOfArray: [
                 `$${getTempName(path)}._id`,
@@ -189,7 +190,7 @@ const recurseSetStage = (reference, path, parentElem, options = {
         const stages = [];
         for (const [subRefName, subReference] of Object.entries(reference.deepReferences)) {
             let newElem;
-            if (reference.isRecursive) {
+            if (shouldUseArrayIndex) {
                 newElem = {
                     $arrayElemAt: [
                         `$${getTempName(path.slice(0, -1))}.${refName}`,

package/dist/collection/reference.mjs

@@ -88,8 +88,9 @@ export const recurseSetStage = (reference, path, parentElem, options = {
   noCond: false
 }) => {
   const refName = path.at(-1);
+  const shouldUseArrayIndex = reference.isRecursive && !(reference.isArrayElement && reference.isArray === false);
   let indexOfArray;
-  if (reference.isRecursive && !(reference.isArrayElement && reference.isArray === false)) {
+  if (shouldUseArrayIndex) {
     indexOfArray = {
       $indexOfArray: [
         `$${getTempName(path)}._id`,
@@ -179,7 +180,7 @@ export const recurseSetStage = (reference, path, parentElem, options = {
     const stages = [];
     for (const [subRefName, subReference] of Object.entries(reference.deepReferences)) {
       let newElem;
-      if (reference.isRecursive) {
+      if (shouldUseArrayIndex) {
         newElem = {
           $arrayElemAt: [
             `$${getTempName(path.slice(0, -1))}.${refName}`,

package/dist/collection/traverseDocument.js

@@ -27,6 +27,7 @@ exports.traverseDocument = void 0;
 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 mongodb_1 = require("mongodb");
 const assets_js_1 = require("../assets.js");
 const preload_js_1 = require("./preload.js");
@@ -127,7 +128,7 @@ const autoCast = (value, ctx) => {
             }
         }
         case 'object': {
-            if (!value || (0, common_1.isObjectId)(value)) {
+            if (!value || value instanceof mongodb_1.ObjectId) {
                 return value;
             }
             if (!('description' in ctx.options) || !ctx.options.recurseDeep) {
@@ -195,6 +196,10 @@ const moveFiles = async (value, ctx) => {
     if (!('$ref' in ctx.property) || ctx.property.$ref !== 'file') {
         return value;
     }
+    const tempFileCollection = await (0, entrypoint_1.getCollection)('tempFile');
+    if (!tempFileCollection) {
+        throw new Error('The "tempFile" collection is absent, yet it is required to upload files.');
+    }
     if (!isValidTempFile(value)) {
         return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
     }

package/dist/collection/traverseDocument.mjs

@@ -1,7 +1,8 @@
 "use strict";
 import { Result, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
-import { throwIfError, pipe, isReference, getValueFromPath, isObjectId, isError } from "@aeriajs/common";
+import { throwIfError, pipe, isReference, getValueFromPath, isError } from "@aeriajs/common";
 import { makeValidationError, validateProperty, validateWholeness } from "@aeriajs/validation";
+import { getCollection } from "@aeriajs/entrypoint";
 import { ObjectId } from "mongodb";
 import { getCollectionAsset } from "../assets.mjs";
 import { preloadDescription } from "./preload.mjs";
@@ -95,7 +96,7 @@ const autoCast = (value, ctx) => {
       }
     }
     case "object": {
-      if (!value || isObjectId(value)) {
+      if (!value || value instanceof ObjectId) {
         return value;
       }
       if (!("description" in ctx.options) || !ctx.options.recurseDeep) {
@@ -160,6 +161,10 @@ const moveFiles = async (value, ctx) => {
   if (!("$ref" in ctx.property) || ctx.property.$ref !== "file") {
     return value;
   }
+  const tempFileCollection = await getCollection("tempFile");
+  if (!tempFileCollection) {
+    throw new Error('The "tempFile" collection is absent, yet it is required to upload files.');
+  }
   if (!isValidTempFile(value)) {
     return Result.error(TraverseError.InvalidTempfile);
   }

package/dist/functions/getAll.d.ts

@@ -2,5 +2,6 @@ import type { Context, SchemaWithId, GetAllPayload } from '@aeriajs/types';
 import { Result } from '@aeriajs/types';
 export type GetAllOptions = {
     bypassSecurity?: boolean;
+    noDefaultLimit?: boolean;
 };
 export declare const getAll: <TContext extends Context>(payload: GetAllPayload<SchemaWithId<TContext["description"]>> | undefined, context: TContext, options?: GetAllOptions) => Promise<Result.Either<any, any>>;

package/dist/functions/getAll.js

@@ -6,7 +6,7 @@ const types_1 = require("@aeriajs/types");
 const common_1 = require("@aeriajs/common");
 const index_js_1 = require("../collection/index.js");
 const internalGetAll = async (payload, context) => {
-    const { limit = context.config.defaultPaginationLimit, sort, project, offset = 0, } = payload;
+    const { limit, sort, project, offset = 0, } = payload;
     const filters = payload.filters
         ? Object.assign({}, payload.filters)
         : {};
@@ -99,6 +99,9 @@ const getAll = async (payload, context, options = {}) => {
     if (error) {
         return types_1.Result.error(error);
     }
+    if (!options.noDefaultLimit) {
+        securedPayload.limit ||= context.config.defaultPaginationLimit;
+    }
     return (0, security_1.applyReadMiddlewares)(securedPayload, context, internalGetAll);
 };
 exports.getAll = getAll;

package/dist/functions/getAll.mjs

@@ -10,7 +10,7 @@ import {
 } from "../collection/index.mjs";
 const internalGetAll = async (payload, context) => {
   const {
-    limit = context.config.defaultPaginationLimit,
+    limit,
     sort,
     project,
     offset = 0
@@ -97,5 +97,8 @@ export const getAll = async (payload, context, options = {}) => {
   if (error) {
     return Result.error(error);
   }
+  if (!options.noDefaultLimit) {
+    securedPayload.limit ||= context.config.defaultPaginationLimit;
+  }
   return applyReadMiddlewares(securedPayload, context, internalGetAll);
 };

package/dist/functions/insert.d.ts

@@ -17,10 +17,10 @@ export declare const insertErrorSchema: () => {
             readonly required: readonly ["httpStatus", "code"];
             readonly properties: {
                 readonly httpStatus: {
-                    readonly enum: [HTTPStatus.Forbidden, HTTPStatus.NotFound, HTTPStatus.UnprocessableContent];
+                    readonly enum: [HTTPStatus.Forbidden, HTTPStatus.NotFound, HTTPStatus.UnprocessableContent, HTTPStatus.BadRequest];
                 };
                 readonly code: {
-                    readonly enum: [ACError.InsecureOperator, ACError.OwnershipError, ACError.ResourceNotFound, ACError.TargetImmutable, ValidationErrorCode.EmptyTarget, ValidationErrorCode.InvalidProperties, ValidationErrorCode.MissingProperties, TraverseError.InvalidDocumentId, TraverseError.InvalidTempfile];
+                    readonly enum: [ACError.InsecureOperator, ACError.OwnershipError, ACError.ResourceNotFound, ACError.TargetImmutable, ACError.MalformedInput, ValidationErrorCode.EmptyTarget, ValidationErrorCode.InvalidProperties, ValidationErrorCode.MissingProperties, TraverseError.InvalidDocumentId, TraverseError.InvalidTempfile];
                 };
                 readonly message: {
                     readonly type: "string";

package/dist/functions/insert.js

@@ -12,12 +12,14 @@ const insertErrorSchema = () => (0, common_1.endpointErrorSchema)({
         types_1.HTTPStatus.Forbidden,
         types_1.HTTPStatus.NotFound,
         types_1.HTTPStatus.UnprocessableContent,
+        types_1.HTTPStatus.BadRequest,
     ],
     code: [
         types_1.ACError.InsecureOperator,
         types_1.ACError.OwnershipError,
         types_1.ACError.ResourceNotFound,
         types_1.ACError.TargetImmutable,
+        types_1.ACError.MalformedInput,
         types_1.ValidationErrorCode.EmptyTarget,
         types_1.ValidationErrorCode.InvalidProperties,
         types_1.ValidationErrorCode.MissingProperties,
@@ -74,13 +76,16 @@ const internalInsert = async (payload, context) => {
         ...context,
         inherited: true,
     };
-    const newDocument = (0, common_1.throwIfError)(await (0, get_js_1.get)({
+    const { error: getError, result: newDocument } = await (0, get_js_1.get)({
         filters: {
             _id: newId,
         },
     }, inheritedContext, {
         bypassSecurity: true,
-    }));
+    });
+    if (getError) {
+        return types_1.Result.error(getError);
+    }
     return types_1.Result.result(newDocument);
 };
 const insert = async (payload, context, options = {}) => {

package/dist/functions/insert.mjs

@@ -2,20 +2,22 @@
 import { ObjectId } from "mongodb";
 import { Result, HTTPStatus, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
 import { useSecurity, applyWriteMiddlewares } from "@aeriajs/security";
-import { throwIfError, endpointErrorSchema } from "@aeriajs/common";
+import { endpointErrorSchema } from "@aeriajs/common";
 import { traverseDocument, prepareCreate, prepareUpdate } from "../collection/index.mjs";
 import { get } from "./get.mjs";
 export const insertErrorSchema = () => endpointErrorSchema({
   httpStatus: [
     HTTPStatus.Forbidden,
     HTTPStatus.NotFound,
-    HTTPStatus.UnprocessableContent
+    HTTPStatus.UnprocessableContent,
+    HTTPStatus.BadRequest
   ],
   code: [
     ACError.InsecureOperator,
     ACError.OwnershipError,
     ACError.ResourceNotFound,
     ACError.TargetImmutable,
+    ACError.MalformedInput,
     ValidationErrorCode.EmptyTarget,
     ValidationErrorCode.InvalidProperties,
     ValidationErrorCode.MissingProperties,
@@ -66,13 +68,16 @@ const internalInsert = async (payload, context) => {
     ...context,
     inherited: true
   };
-  const newDocument = throwIfError(await get({
+  const { error: getError, result: newDocument } = await get({
     filters: {
       _id: newId
     }
   }, inheritedContext, {
     bypassSecurity: true
-  }));
+  });
+  if (getError) {
+    return Result.error(getError);
+  }
   return Result.result(newDocument);
 };
 export const insert = async (payload, context, options = {}) => {

package/dist/functions/upload.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
 const types_1 = require("@aeriajs/types");
-const entrypoint_1 = require("@aeriajs/entrypoint");
 const validation_1 = require("@aeriajs/validation");
 const path = __importStar(require("path"));
 const fs_1 = require("fs");
@@ -60,10 +59,6 @@ const streamToFs = (metadata, context) => {
     });
 };
 const upload = async (_props, context) => {
-    const tempFileCollection = await (0, entrypoint_1.getCollection)('tempFile');
-    if (!tempFileCollection) {
-        throw new Error('The "tempFile" collection is absent, yet it is required to upload files.');
-    }
     const { error: headersError } = (0, validation_1.validate)(context.request.headers, {
         type: 'object',
         additionalProperties: true,

package/dist/functions/upload.mjs

@@ -1,6 +1,5 @@
 "use strict";
 import { Result, ACError, HTTPStatus } from "@aeriajs/types";
-import { getCollection } from "@aeriajs/entrypoint";
 import { validate, validator } from "@aeriajs/validation";
 import * as path from "path";
 import { createWriteStream } from "fs";
@@ -29,10 +28,6 @@ const streamToFs = (metadata, context) => {
   });
 };
 export const upload = async (_props, context) => {
-  const tempFileCollection = await getCollection("tempFile");
-  if (!tempFileCollection) {
-    throw new Error('The "tempFile" collection is absent, yet it is required to upload files.');
-  }
   const { error: headersError } = validate(context.request.headers, {
     type: "object",
     additionalProperties: true,

package/dist/token.d.ts

@@ -1,4 +1,3 @@
 import type { SignOptions } from 'jsonwebtoken';
-export declare const EXPIRES_IN = 36000;
 export declare const signToken: ({ iat, exp, ...payload }: Record<string, unknown>, secret?: string | null, options?: SignOptions) => Promise<string>;
 export declare const decodeToken: <TToken>(token: string, secret?: string) => Promise<TToken>;

package/dist/token.js

@@ -3,24 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeToken = exports.signToken = exports.EXPIRES_IN = void 0;
+exports.decodeToken = exports.signToken = void 0;
 const entrypoint_1 = require("@aeriajs/entrypoint");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-exports.EXPIRES_IN = 36000;
-const getApplicationSecret = async () => {
+const getTokenConfig = async () => {
     const config = await (0, entrypoint_1.getConfig)();
     if (!config.secret) {
         throw new Error('application secret is not set');
     }
-    return config.secret;
+    return {
+        name: config.name,
+        secret: config.secret,
+        tokenExpiration: config.security.tokenExpiration,
+    };
 };
 const signToken = async ({ iat, exp, ...payload }, secret, options) => {
-    return jsonwebtoken_1.default.sign(payload, secret || await getApplicationSecret(), options || {
-        expiresIn: exports.EXPIRES_IN,
+    const tokenConfig = await getTokenConfig();
+    if (tokenConfig.name) {
+        payload.aud = tokenConfig.name;
+    }
+    return jsonwebtoken_1.default.sign(payload, secret || tokenConfig.secret, options || {
+        expiresIn: tokenConfig.tokenExpiration,
     });
 };
 exports.signToken = signToken;
 const decodeToken = async (token, secret) => {
-    return jsonwebtoken_1.default.verify(token, secret || await getApplicationSecret());
+    const tokenConfig = await getTokenConfig();
+    return jsonwebtoken_1.default.verify(token, secret || tokenConfig.secret);
 };
 exports.decodeToken = decodeToken;

package/dist/token.mjs

@@ -1,19 +1,27 @@
 "use strict";
 import { getConfig } from "@aeriajs/entrypoint";
 import jwt from "jsonwebtoken";
-export const EXPIRES_IN = 36e3;
-const getApplicationSecret = async () => {
+const getTokenConfig = async () => {
   const config = await getConfig();
   if (!config.secret) {
     throw new Error("application secret is not set");
   }
-  return config.secret;
+  return {
+    name: config.name,
+    secret: config.secret,
+    tokenExpiration: config.security.tokenExpiration
+  };
 };
 export const signToken = async ({ iat, exp, ...payload }, secret, options) => {
-  return jwt.sign(payload, secret || await getApplicationSecret(), options || {
-    expiresIn: EXPIRES_IN
+  const tokenConfig = await getTokenConfig();
+  if (tokenConfig.name) {
+    payload.aud = tokenConfig.name;
+  }
+  return jwt.sign(payload, secret || tokenConfig.secret, options || {
+    expiresIn: tokenConfig.tokenExpiration
   });
 };
 export const decodeToken = async (token, secret) => {
-  return jwt.verify(token, secret || await getApplicationSecret());
+  const tokenConfig = await getTokenConfig();
+  return jwt.verify(token, secret || tokenConfig.secret);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.174",
+  "version": "0.0.176",
   "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.174",
-    "@aeriajs/common": "^0.0.105",
-    "@aeriajs/entrypoint": "^0.0.107",
-    "@aeriajs/http": "^0.0.118",
-    "@aeriajs/security": "^0.0.174",
-    "@aeriajs/types": "^0.0.88",
-    "@aeriajs/validation": "^0.0.108"
+    "@aeriajs/builtins": "^0.0.176",
+    "@aeriajs/common": "^0.0.106",
+    "@aeriajs/entrypoint": "^0.0.109",
+    "@aeriajs/http": "^0.0.120",
+    "@aeriajs/security": "^0.0.176",
+    "@aeriajs/types": "^0.0.89",
+    "@aeriajs/validation": "^0.0.109"
   },
   "dependencies": {
     "mongodb": "^6.5.0",