@aeriajs/core 0.0.174 → 0.0.175

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");
@@ -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

@@ -2,6 +2,7 @@
 import { Result, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
 import { throwIfError, pipe, isReference, getValueFromPath, isObjectId, 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";
@@ -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/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.175",
   "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.174",
+    "@aeriajs/builtins": "^0.0.175",
     "@aeriajs/common": "^0.0.105",
-    "@aeriajs/entrypoint": "^0.0.107",
-    "@aeriajs/http": "^0.0.118",
-    "@aeriajs/security": "^0.0.174",
+    "@aeriajs/entrypoint": "^0.0.108",
+    "@aeriajs/http": "^0.0.119",
+    "@aeriajs/security": "^0.0.175",
     "@aeriajs/types": "^0.0.88",
     "@aeriajs/validation": "^0.0.108"
   },