@aeriajs/core 0.0.248 → 0.0.250

package/dist/collection/makePagination.d.ts

@@ -1,5 +1,4 @@
-import type { WithId } from 'mongodb';
-import type { Context, Description, Pagination, GetAllPayload, CountReturnType } from '@aeriajs/types';
-export declare const makePagination: <T>(payload: GetAllPayload<WithId<T>>, documents: unknown[], context: Context<Description, {
+import type { Context, SchemaWithId, Description, Pagination, GetAllPayload, CountReturnType } from '@aeriajs/types';
+export declare const makePagination: <TDescription extends Description>(payload: GetAllPayload<SchemaWithId<TDescription>>, documents: unknown[], context: Context<Description, undefined | {
     count?: (...args: unknown[]) => Promise<CountReturnType>;
 }>) => Promise<Pagination>;

package/dist/context.js

@@ -65,6 +65,10 @@ const indepthCollection = (collectionName, collections, parentContext) => {
     });
     return {
         ...collection,
+        context: () => (0, exports.createContext)({
+            parentContext,
+            collectionName,
+        }),
         functions: proxiedFunctions,
         originalFunctions: collection.functions,
         model: (0, database_js_1.getDatabaseCollection)(collectionName),

package/dist/context.mjs

@@ -28,6 +28,10 @@ const indepthCollection = (collectionName, collections, parentContext) => {
   });
   return {
     ...collection,
+    context: () => createContext({
+      parentContext,
+      collectionName
+    }),
     functions: proxiedFunctions,
     originalFunctions: collection.functions,
     model: getDatabaseCollection(collectionName)

package/dist/functions/getAll.d.ts

@@ -1,7 +1,4 @@
-import type { Context, SchemaWithId, GetAllPayload, GetAllReturnType } from '@aeriajs/types';
-export type GetAllOptions = {
-    bypassSecurity?: boolean;
-    noDefaultLimit?: 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"]>>>;
+import { type Description, type GetAllPayload, type SchemaWithId, type Context, type CountReturnType, type GetAllReturnType } from '@aeriajs/types';
+export declare const getAll: <TDescription extends Description, TFunctions>(payload: GetAllPayload<SchemaWithId<TDescription>>, context: Context<TDescription, undefined | (TFunctions & {
+    count?: (...args: unknown[]) => Promise<CountReturnType>;
+})>) => Promise<GetAllReturnType<SchemaWithId<TDescription>>>;

package/dist/functions/getAll.js

@@ -1,124 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAll = void 0;
-const security_1 = require("@aeriajs/security");
 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, options) => {
-    const { limit, sort, project, offset = 0, } = payload;
-    const filters = payload.filters
-        ? Object.assign({}, payload.filters)
-        : {};
-    const $text = payload.filters && '$text' in payload.filters
-        ? payload.filters.$text
-        : undefined;
-    if ('$text' in filters) {
-        delete filters.$text;
-    }
-    const pipeline = [];
-    const refMap = await (0, index_js_1.getReferences)(context.description.properties, {
-        memoize: context.description.$id,
-    });
-    if ($text) {
-        pipeline.push({
-            $match: {
-                $text,
-            },
-        });
-    }
-    const preferredSort = sort
-        ? sort
-        : context.description.timestamps !== false
-            ? {
-                _id: -1,
-            }
-            : null;
-    if (preferredSort) {
-        pipeline.push({
-            $sort: preferredSort,
-        });
-    }
-    const { error: filtersError, result: traversedFilters } = await (0, index_js_1.traverseDocument)(filters, context.description, {
-        autoCast: true,
-        allowOperators: true,
-        noRegExpEscaping: options.noRegExpEscaping,
-        context,
-    });
-    if (filtersError) {
-        switch (filtersError) {
-            case types_1.ACError.InsecureOperator: return context.error(types_1.HTTPStatus.Forbidden, {
-                code: filtersError,
-            });
-            default: throw new Error;
-        }
-    }
-    if (Object.keys(filters).length > 0) {
-        pipeline.push({
-            $match: traversedFilters,
-        });
-    }
-    if (offset > 0) {
-        pipeline.push({
-            $skip: offset,
-        });
-    }
-    if (limit) {
-        pipeline.push({
-            $limit: limit,
-        });
-    }
-    if (project) {
-        const projection = (0, index_js_1.normalizeProjection)(project, context.description);
-        if (projection) {
-            pipeline.push({
-                $project: projection,
-            });
-        }
-    }
-    pipeline.push(...(0, index_js_1.buildLookupPipeline)(refMap, {
-        memoize: context.description.$id,
-        project: payload.populate
-            ? payload.populate
-            : project,
-    }));
-    if (Object.keys(refMap).length > 0 && preferredSort) {
-        pipeline.push({
-            $sort: preferredSort,
-        });
-    }
-    const result = await context.collection.model.aggregate(pipeline).toArray();
-    const documents = [];
-    for (const doc of result) {
-        documents.push((0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
-            context,
-            getters: true,
-            fromProperties: true,
-            recurseReferences: true,
-            recurseDeep: true,
-        })));
-    }
-    return types_1.Result.result(documents);
-};
-const getAll = async (payload, context, options = {}) => {
-    if (!payload) {
-        return internalGetAll({}, context, options);
-    }
-    if (options.bypassSecurity) {
-        return internalGetAll(payload, context, options);
-    }
-    const security = (0, security_1.useSecurity)(context);
-    const { error, result: securedPayload } = await security.secureReadPayload(payload);
+const makePagination_js_1 = require("../collection/makePagination.js");
+const unpaginatedGetAll_js_1 = require("./unpaginatedGetAll.js");
+const getAll = async (payload, context) => {
+    const { error, result } = await (0, unpaginatedGetAll_js_1.unpaginatedGetAll)(payload, context);
     if (error) {
-        return context.error(types_1.HTTPStatus.Forbidden, {
-            code: error,
-        });
-    }
-    if (!options.noDefaultLimit) {
-        securedPayload.limit ||= context.config.defaultPaginationLimit;
+        return types_1.Result.error(error);
     }
-    return (0, security_1.applyReadMiddlewares)(securedPayload, context, (payload, context) => {
-        return internalGetAll(payload, context, options);
+    return types_1.Result.result({
+        data: result,
+        pagination: await (0, makePagination_js_1.makePagination)(payload, result, context),
     });
 };
 exports.getAll = getAll;

package/dist/functions/getAll.mjs

@@ -1,123 +1,14 @@
 "use strict";
-import { useSecurity, applyReadMiddlewares } from "@aeriajs/security";
-import { Result, HTTPStatus, ACError } from "@aeriajs/types";
-import { throwIfError } from "@aeriajs/common";
-import {
-  traverseDocument,
-  normalizeProjection,
-  getReferences,
-  buildLookupPipeline
-} from "../collection/index.mjs";
-const internalGetAll = async (payload, context, options) => {
-  const {
-    limit,
-    sort,
-    project,
-    offset = 0
-  } = payload;
-  const filters = payload.filters ? Object.assign({}, payload.filters) : {};
-  const $text = payload.filters && "$text" in payload.filters ? payload.filters.$text : void 0;
-  if ("$text" in filters) {
-    delete filters.$text;
-  }
-  const pipeline = [];
-  const refMap = await getReferences(context.description.properties, {
-    memoize: context.description.$id
-  });
-  if ($text) {
-    pipeline.push({
-      $match: {
-        $text
-      }
-    });
-  }
-  const preferredSort = sort ? sort : context.description.timestamps !== false ? {
-    _id: -1
-  } : null;
-  if (preferredSort) {
-    pipeline.push({
-      $sort: preferredSort
-    });
-  }
-  const { error: filtersError, result: traversedFilters } = await traverseDocument(filters, context.description, {
-    autoCast: true,
-    allowOperators: true,
-    noRegExpEscaping: options.noRegExpEscaping,
-    context
-  });
-  if (filtersError) {
-    switch (filtersError) {
-      case ACError.InsecureOperator:
-        return context.error(HTTPStatus.Forbidden, {
-          code: filtersError
-        });
-      default:
-        throw new Error();
-    }
-  }
-  if (Object.keys(filters).length > 0) {
-    pipeline.push({
-      $match: traversedFilters
-    });
-  }
-  if (offset > 0) {
-    pipeline.push({
-      $skip: offset
-    });
-  }
-  if (limit) {
-    pipeline.push({
-      $limit: limit
-    });
-  }
-  if (project) {
-    const projection = normalizeProjection(project, context.description);
-    if (projection) {
-      pipeline.push({
-        $project: projection
-      });
-    }
-  }
-  pipeline.push(...buildLookupPipeline(refMap, {
-    memoize: context.description.$id,
-    project: payload.populate ? payload.populate : project
-  }));
-  if (Object.keys(refMap).length > 0 && preferredSort) {
-    pipeline.push({
-      $sort: preferredSort
-    });
-  }
-  const result = await context.collection.model.aggregate(pipeline).toArray();
-  const documents = [];
-  for (const doc of result) {
-    documents.push(throwIfError(await traverseDocument(doc, context.description, {
-      context,
-      getters: true,
-      fromProperties: true,
-      recurseReferences: true,
-      recurseDeep: true
-    })));
-  }
-  return Result.result(documents);
-};
-export const getAll = async (payload, context, options = {}) => {
-  if (!payload) {
-    return internalGetAll({}, context, options);
-  }
-  if (options.bypassSecurity) {
-    return internalGetAll(payload, context, options);
-  }
-  const security = useSecurity(context);
-  const { error, result: securedPayload } = await security.secureReadPayload(payload);
+import { Result } from "@aeriajs/types";
+import { makePagination } from "../collection/makePagination.mjs";
+import { unpaginatedGetAll } from "./unpaginatedGetAll.mjs";
+export const getAll = async (payload, context) => {
+  const { error, result } = await unpaginatedGetAll(payload, context);
   if (error) {
-    return context.error(HTTPStatus.Forbidden, {
-      code: error
-    });
-  }
-  if (!options.noDefaultLimit) {
-    securedPayload.limit ||= context.config.defaultPaginationLimit;
+    return Result.error(error);
   }
-  return applyReadMiddlewares(securedPayload, context, (payload2, context2) => {
-    return internalGetAll(payload2, context2, options);
+  return Result.result({
+    data: result,
+    pagination: await makePagination(payload, result, context)
   });
 };

package/dist/functions/index.d.ts

@@ -5,4 +5,5 @@ export * from './insert.js';
 export * from './remove.js';
 export * from './removeAll.js';
 export * from './removeFile.js';
+export * from './unpaginatedGetAll.js';
 export { upload, } from './upload.js';

package/dist/functions/index.js

@@ -22,5 +22,6 @@ __exportStar(require("./insert.js"), exports);
 __exportStar(require("./remove.js"), exports);
 __exportStar(require("./removeAll.js"), exports);
 __exportStar(require("./removeFile.js"), exports);
+__exportStar(require("./unpaginatedGetAll.js"), exports);
 var upload_js_1 = require("./upload.js");
 Object.defineProperty(exports, "upload", { enumerable: true, get: function () { return upload_js_1.upload; } });

package/dist/functions/index.mjs

@@ -6,6 +6,7 @@ export * from "./insert.mjs";
 export * from "./remove.mjs";
 export * from "./removeAll.mjs";
 export * from "./removeFile.mjs";
+export * from "./unpaginatedGetAll.mjs";
 export {
   upload
 } from "./upload.mjs";

package/dist/functions/unpaginatedGetAll.d.ts

@@ -0,0 +1,7 @@
+import type { Context, SchemaWithId, GetAllPayload, UnpaginatedGetAllReturnType } from '@aeriajs/types';
+export type GetAllOptions = {
+    bypassSecurity?: boolean;
+    noDefaultLimit?: boolean;
+    noRegExpEscaping?: boolean;
+};
+export declare const unpaginatedGetAll: <TContext extends Context>(payload: GetAllPayload<SchemaWithId<TContext["description"]>> | undefined, context: TContext, options?: GetAllOptions) => Promise<UnpaginatedGetAllReturnType<SchemaWithId<TContext["description"]>>>;

package/dist/functions/unpaginatedGetAll.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unpaginatedGetAll = void 0;
+const security_1 = require("@aeriajs/security");
+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, options) => {
+    const { limit, sort, project, offset = 0, } = payload;
+    const filters = payload.filters
+        ? Object.assign({}, payload.filters)
+        : {};
+    const $text = payload.filters && '$text' in payload.filters
+        ? payload.filters.$text
+        : undefined;
+    if ('$text' in filters) {
+        delete filters.$text;
+    }
+    const pipeline = [];
+    const refMap = await (0, index_js_1.getReferences)(context.description.properties, {
+        memoize: context.description.$id,
+    });
+    if ($text) {
+        pipeline.push({
+            $match: {
+                $text,
+            },
+        });
+    }
+    const preferredSort = sort
+        ? sort
+        : context.description.timestamps !== false
+            ? {
+                _id: -1,
+            }
+            : null;
+    if (preferredSort) {
+        pipeline.push({
+            $sort: preferredSort,
+        });
+    }
+    const { error: filtersError, result: traversedFilters } = await (0, index_js_1.traverseDocument)(filters, context.description, {
+        autoCast: true,
+        allowOperators: true,
+        noRegExpEscaping: options.noRegExpEscaping,
+        context,
+    });
+    if (filtersError) {
+        switch (filtersError) {
+            case types_1.ACError.InsecureOperator: return context.error(types_1.HTTPStatus.Forbidden, {
+                code: filtersError,
+            });
+            default: throw new Error;
+        }
+    }
+    if (Object.keys(filters).length > 0) {
+        pipeline.push({
+            $match: traversedFilters,
+        });
+    }
+    if (offset > 0) {
+        pipeline.push({
+            $skip: offset,
+        });
+    }
+    if (limit) {
+        pipeline.push({
+            $limit: limit,
+        });
+    }
+    if (project) {
+        const projection = (0, index_js_1.normalizeProjection)(project, context.description);
+        if (projection) {
+            pipeline.push({
+                $project: projection,
+            });
+        }
+    }
+    pipeline.push(...(0, index_js_1.buildLookupPipeline)(refMap, {
+        memoize: context.description.$id,
+        project: payload.populate
+            ? payload.populate
+            : project,
+    }));
+    if (Object.keys(refMap).length > 0 && preferredSort) {
+        pipeline.push({
+            $sort: preferredSort,
+        });
+    }
+    const result = await context.collection.model.aggregate(pipeline).toArray();
+    const documents = [];
+    for (const doc of result) {
+        documents.push((0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
+            context,
+            getters: true,
+            fromProperties: true,
+            recurseReferences: true,
+            recurseDeep: true,
+        })));
+    }
+    return types_1.Result.result(documents);
+};
+const unpaginatedGetAll = async (payload, context, options = {}) => {
+    if (!payload) {
+        return internalGetAll({}, context, options);
+    }
+    if (options.bypassSecurity) {
+        return internalGetAll(payload, context, options);
+    }
+    const security = (0, security_1.useSecurity)(context);
+    const { error, result: securedPayload } = await security.secureReadPayload(payload);
+    if (error) {
+        return context.error(types_1.HTTPStatus.Forbidden, {
+            code: error,
+        });
+    }
+    if (!options.noDefaultLimit) {
+        securedPayload.limit ||= context.config.defaultPaginationLimit;
+    }
+    return (0, security_1.applyReadMiddlewares)(securedPayload, context, (payload, context) => {
+        return internalGetAll(payload, context, options);
+    });
+};
+exports.unpaginatedGetAll = unpaginatedGetAll;

package/dist/functions/unpaginatedGetAll.mjs

@@ -0,0 +1,123 @@
+"use strict";
+import { useSecurity, applyReadMiddlewares } from "@aeriajs/security";
+import { Result, HTTPStatus, ACError } from "@aeriajs/types";
+import { throwIfError } from "@aeriajs/common";
+import {
+  traverseDocument,
+  normalizeProjection,
+  getReferences,
+  buildLookupPipeline
+} from "../collection/index.mjs";
+const internalGetAll = async (payload, context, options) => {
+  const {
+    limit,
+    sort,
+    project,
+    offset = 0
+  } = payload;
+  const filters = payload.filters ? Object.assign({}, payload.filters) : {};
+  const $text = payload.filters && "$text" in payload.filters ? payload.filters.$text : void 0;
+  if ("$text" in filters) {
+    delete filters.$text;
+  }
+  const pipeline = [];
+  const refMap = await getReferences(context.description.properties, {
+    memoize: context.description.$id
+  });
+  if ($text) {
+    pipeline.push({
+      $match: {
+        $text
+      }
+    });
+  }
+  const preferredSort = sort ? sort : context.description.timestamps !== false ? {
+    _id: -1
+  } : null;
+  if (preferredSort) {
+    pipeline.push({
+      $sort: preferredSort
+    });
+  }
+  const { error: filtersError, result: traversedFilters } = await traverseDocument(filters, context.description, {
+    autoCast: true,
+    allowOperators: true,
+    noRegExpEscaping: options.noRegExpEscaping,
+    context
+  });
+  if (filtersError) {
+    switch (filtersError) {
+      case ACError.InsecureOperator:
+        return context.error(HTTPStatus.Forbidden, {
+          code: filtersError
+        });
+      default:
+        throw new Error();
+    }
+  }
+  if (Object.keys(filters).length > 0) {
+    pipeline.push({
+      $match: traversedFilters
+    });
+  }
+  if (offset > 0) {
+    pipeline.push({
+      $skip: offset
+    });
+  }
+  if (limit) {
+    pipeline.push({
+      $limit: limit
+    });
+  }
+  if (project) {
+    const projection = normalizeProjection(project, context.description);
+    if (projection) {
+      pipeline.push({
+        $project: projection
+      });
+    }
+  }
+  pipeline.push(...buildLookupPipeline(refMap, {
+    memoize: context.description.$id,
+    project: payload.populate ? payload.populate : project
+  }));
+  if (Object.keys(refMap).length > 0 && preferredSort) {
+    pipeline.push({
+      $sort: preferredSort
+    });
+  }
+  const result = await context.collection.model.aggregate(pipeline).toArray();
+  const documents = [];
+  for (const doc of result) {
+    documents.push(throwIfError(await traverseDocument(doc, context.description, {
+      context,
+      getters: true,
+      fromProperties: true,
+      recurseReferences: true,
+      recurseDeep: true
+    })));
+  }
+  return Result.result(documents);
+};
+export const unpaginatedGetAll = async (payload, context, options = {}) => {
+  if (!payload) {
+    return internalGetAll({}, context, options);
+  }
+  if (options.bypassSecurity) {
+    return internalGetAll(payload, context, options);
+  }
+  const security = useSecurity(context);
+  const { error, result: securedPayload } = await security.secureReadPayload(payload);
+  if (error) {
+    return context.error(HTTPStatus.Forbidden, {
+      code: error
+    });
+  }
+  if (!options.noDefaultLimit) {
+    securedPayload.limit ||= context.config.defaultPaginationLimit;
+  }
+  return applyReadMiddlewares(securedPayload, context, (payload2, context2) => {
+    return internalGetAll(payload2, context2, options);
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.248",
+  "version": "0.0.250",
   "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.248",
-    "@aeriajs/common": "^0.0.137",
-    "@aeriajs/entrypoint": "^0.0.141",
-    "@aeriajs/http": "^0.0.166",
-    "@aeriajs/security": "^0.0.248",
-    "@aeriajs/types": "^0.0.119",
-    "@aeriajs/validation": "^0.0.153"
+    "@aeriajs/builtins": "^0.0.250",
+    "@aeriajs/common": "^0.0.139",
+    "@aeriajs/entrypoint": "^0.0.143",
+    "@aeriajs/http": "^0.0.168",
+    "@aeriajs/security": "^0.0.250",
+    "@aeriajs/types": "^0.0.121",
+    "@aeriajs/validation": "^0.0.155"
   },
   "dependencies": {
     "mongodb": "^6.5.0",