@aeriajs/core 0.0.162 → 0.0.164

package/dist/__scripts__/postinstall.js

@@ -32,7 +32,7 @@ import type {} from '@aeriajs/types'
 declare global {
   type UnpackCollections<TCollections> =  {
     [P in keyof TCollections]: TCollections[P] extends infer Candidate
-      ? Candidate extends (...args: any[]) => infer Coll
+      ? Candidate extends (...args: unknown[]) => infer Coll
         ? Coll
         : Candidate
       : never

package/dist/__scripts__/postinstall.mjs

@@ -8,7 +8,7 @@ import type {} from '@aeriajs/types'
 declare global {
   type UnpackCollections<TCollections> =  {
     [P in keyof TCollections]: TCollections[P] extends infer Candidate
-      ? Candidate extends (...args: any[]) => infer Coll
+      ? Candidate extends (...args: unknown[]) => infer Coll
         ? Coll
         : Candidate
       : never

package/dist/assets.d.ts

@@ -18,7 +18,7 @@ export declare const getCollectionAsset: <TCollectionName extends string, TAsset
     readonly error: undefined;
     readonly result: NonNullable<Collection[TAssetName]>;
 }>;
-export declare const getFunction: <TCollectionName extends string, TFunctionName extends string>(collectionName: TCollectionName, functionName: TFunctionName, token?: Token, options?: {
+export declare const getFunction: <TFunction extends (payload: any, context: Context) => unknown>(collectionName: string, functionName: string, token?: Token, options?: {
     exposedOnly: boolean;
 }) => Promise<{
     readonly _tag: "Error";
@@ -39,5 +39,5 @@ export declare const getFunction: <TCollectionName extends string, TFunctionName
 } | {
     readonly _tag: "Result";
     readonly error: undefined;
-    readonly result: (payload: unknown, context: Context) => Promise<any>;
+    readonly result: TFunction;
 }>;

package/dist/collection/cascadingRemove.js

@@ -15,9 +15,8 @@ const preferredRemove = async (targetId, reference, parentContext) => {
         collectionName: reference.referencedCollection,
     });
     if (Array.isArray(targetId)) {
-        const { result } = await (0, assets_js_1.getFunction)(reference.referencedCollection, 'removeAll');
-        if (result) {
-            const removeAll = result;
+        const { result: removeAll } = await (0, assets_js_1.getFunction)(reference.referencedCollection, 'removeAll');
+        if (removeAll) {
             return removeAll({
                 filters: targetId,
             }, context);
@@ -28,9 +27,8 @@ const preferredRemove = async (targetId, reference, parentContext) => {
             },
         });
     }
-    const { result } = await (0, assets_js_1.getFunction)(reference.referencedCollection, 'remove');
-    if (result) {
-        const remove = result;
+    const { result: remove } = await (0, assets_js_1.getFunction)(reference.referencedCollection, 'remove');
+    if (remove) {
         return remove({
             filters: {
                 _id: targetId,

package/dist/collection/cascadingRemove.mjs

@@ -13,9 +13,8 @@ const preferredRemove = async (targetId, reference, parentContext) => {
     collectionName: reference.referencedCollection
   });
   if (Array.isArray(targetId)) {
-    const { result: result2 } = await getFunction(reference.referencedCollection, "removeAll");
-    if (result2) {
-      const removeAll = result2;
+    const { result: removeAll } = await getFunction(reference.referencedCollection, "removeAll");
+    if (removeAll) {
       return removeAll({
         filters: targetId
       }, context);
@@ -26,9 +25,8 @@ const preferredRemove = async (targetId, reference, parentContext) => {
       }
     });
   }
-  const { result } = await getFunction(reference.referencedCollection, "remove");
-  if (result) {
-    const remove = result;
+  const { result: remove } = await getFunction(reference.referencedCollection, "remove");
+  if (remove) {
     return remove({
       filters: {
         _id: targetId

package/dist/collection/makePagination.js

@@ -3,10 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makePagination = void 0;
 const common_1 = require("@aeriajs/common");
 const makePagination = async (payload, documents, context) => {
-    const limit = payload.limit
-        ? payload.limit
-        : context.config.paginationLimit;
-    const offset = payload.offset || 0;
+    const { offset = 0, limit = context.config.defaultPaginationLimit, } = payload;
     const recordsTotal = typeof context.collection.functions.count === 'function'
         ? (0, common_1.throwIfError)(await context.collection.functions.count({
             filters: payload.filters,

package/dist/collection/makePagination.mjs

@@ -1,8 +1,10 @@
 "use strict";
 import { throwIfError } from "@aeriajs/common";
 export const makePagination = async (payload, documents, context) => {
-  const limit = payload.limit ? payload.limit : context.config.paginationLimit;
-  const offset = payload.offset || 0;
+  const {
+    offset = 0,
+    limit = context.config.defaultPaginationLimit
+  } = payload;
   const recordsTotal = typeof context.collection.functions.count === "function" ? throwIfError(await context.collection.functions.count({
     filters: payload.filters
   })) : await context.collection.model.countDocuments(payload.filters);

package/dist/collection/prepareInsert.js

@@ -5,7 +5,7 @@ const prepareCreate = (doc, description) => {
     const result = Object.assign({}, description.defaults || {});
     for (const propName in doc) {
         const value = doc[propName];
-        if (value === null || value === undefined) {
+        if (value === undefined) {
             continue;
         }
         result[propName] = value;
@@ -19,7 +19,7 @@ const prepareUpdate = (doc) => {
     };
     for (const propName in doc) {
         const value = doc[propName];
-        if (value === null || value === undefined) {
+        if (value === undefined) {
             result.$unset[propName] = value;
             continue;
         }

package/dist/collection/prepareInsert.mjs

@@ -3,7 +3,7 @@ const prepareCreate = (doc, description) => {
   const result = Object.assign({}, description.defaults || {});
   for (const propName in doc) {
     const value = doc[propName];
-    if (value === null || value === void 0) {
+    if (value === void 0) {
       continue;
     }
     result[propName] = value;
@@ -17,7 +17,7 @@ const prepareUpdate = (doc) => {
   };
   for (const propName in doc) {
     const value = doc[propName];
-    if (value === null || value === void 0) {
+    if (value === void 0) {
       result.$unset[propName] = value;
       continue;
     }

package/dist/collection/traverseDocument.d.ts

@@ -39,7 +39,7 @@ type PhaseContext = {
 export declare const traverseDocument: <const TWhat extends Record<string, unknown> | null>(what: TWhat, description: Description, _options: TraverseOptions) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
-    readonly result: any;
+    readonly result: TWhat;
 } | {
     readonly _tag: "Error";
     readonly error: ACError.InsecureOperator | ValidationError | TraverseError;

package/dist/collection/traverseDocument.js

@@ -391,7 +391,7 @@ const traverseDocument = async (what, description, _options) => {
         return types_1.Result.result(what);
     }
     if (!options.validate && Object.keys(what).length === 0) {
-        return types_1.Result.result({});
+        return types_1.Result.result(what);
     }
     if (options.recurseDeep) {
         functions.push(recurseDeep);

package/dist/collection/traverseDocument.mjs

@@ -349,7 +349,7 @@ export const traverseDocument = async (what, description, _options) => {
     return Result.result(what);
   }
   if (!options.validate && Object.keys(what).length === 0) {
-    return Result.result({});
+    return Result.result(what);
   }
   if (options.recurseDeep) {
     functions.push(recurseDeep);

package/dist/functions/count.d.ts

@@ -1,4 +1,5 @@
 import type { Context, SchemaWithId, CountPayload } from '@aeriajs/types';
+import { Result } from '@aeriajs/types';
 export type CountOptions = {
     bypassSecurity?: boolean;
 };
@@ -6,8 +7,4 @@ export declare const count: <TContext extends Context>(payload: CountPayload<Sch
     readonly _tag: "Result";
     readonly error: undefined;
     readonly result: any;
-} | {
-    readonly _tag: "Error";
-    readonly error: import("@aeriajs/types").ACError.InvalidLimit | import("@aeriajs/types").ACError.OwnershipError;
-    readonly result: undefined;
-}>;
+} | Result.Error<any>>;

package/dist/functions/count.js

@@ -46,6 +46,6 @@ const count = async (payload, context, options = {}) => {
     if (error) {
         return types_1.Result.error(error);
     }
-    return internalCount(securedPayload, context);
+    return (0, security_1.applyReadMiddlewares)(securedPayload, context, internalCount);
 };
 exports.count = count;

package/dist/functions/count.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { useSecurity } from "@aeriajs/security";
+import { useSecurity, applyReadMiddlewares } from "@aeriajs/security";
 import { Result } from "@aeriajs/types";
 import { throwIfError } from "@aeriajs/common";
 import { traverseDocument } from "../collection/index.mjs";
@@ -40,5 +40,5 @@ export const count = async (payload, context, options = {}) => {
   if (error) {
     return Result.error(error);
   }
-  return internalCount(securedPayload, context);
+  return applyReadMiddlewares(securedPayload, context, internalCount);
 };

package/dist/functions/get.js

@@ -65,6 +65,6 @@ const get = async (payload, context, options = {}) => {
             code: error,
         });
     }
-    return internalGet(securedPayload, context);
+    return (0, security_1.applyReadMiddlewares)(securedPayload, context, internalGet);
 };
 exports.get = get;

package/dist/functions/get.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { useSecurity } from "@aeriajs/security";
+import { useSecurity, applyReadMiddlewares } from "@aeriajs/security";
 import { Result, HTTPStatus, ACError } from "@aeriajs/types";
 import { throwIfError } from "@aeriajs/common";
 import {
@@ -70,5 +70,5 @@ export const get = async (payload, context, options = {}) => {
       code: error
     });
   }
-  return internalGet(securedPayload, context);
+  return applyReadMiddlewares(securedPayload, context, internalGet);
 };

package/dist/functions/getAll.d.ts

@@ -1,13 +1,6 @@
 import type { Context, SchemaWithId, GetAllPayload } from '@aeriajs/types';
+import { Result } from '@aeriajs/types';
 export type GetAllOptions = {
     bypassSecurity?: boolean;
 };
-export declare const getAll: <TContext extends Context>(payload: GetAllPayload<SchemaWithId<TContext["description"]>> | undefined, context: TContext, options?: GetAllOptions) => Promise<{
-    readonly _tag: "Error";
-    readonly error: import("@aeriajs/types").ACError.InvalidLimit | import("@aeriajs/types").ACError.OwnershipError;
-    readonly result: undefined;
-} | {
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: SchemaWithId<TContext["description"]>[];
-}>;
+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.paginationLimit, sort, project, offset = 0, } = payload;
+    const { limit = context.config.defaultPaginationLimit, sort, project, offset = 0, } = payload;
     const filters = payload.filters
         ? Object.assign({}, payload.filters)
         : {};
@@ -99,6 +99,6 @@ const getAll = async (payload, context, options = {}) => {
     if (error) {
         return types_1.Result.error(error);
     }
-    return internalGetAll(securedPayload, context);
+    return (0, security_1.applyReadMiddlewares)(securedPayload, context, internalGetAll);
 };
 exports.getAll = getAll;

package/dist/functions/getAll.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { useSecurity } from "@aeriajs/security";
+import { useSecurity, applyReadMiddlewares } from "@aeriajs/security";
 import { Result } from "@aeriajs/types";
 import { throwIfError } from "@aeriajs/common";
 import {
@@ -10,7 +10,7 @@ import {
 } from "../collection/index.mjs";
 const internalGetAll = async (payload, context) => {
   const {
-    limit = context.config.paginationLimit,
+    limit = context.config.defaultPaginationLimit,
     sort,
     project,
     offset = 0
@@ -97,5 +97,5 @@ export const getAll = async (payload, context, options = {}) => {
   if (error) {
     return Result.error(error);
   }
-  return internalGetAll(securedPayload, context);
+  return applyReadMiddlewares(securedPayload, context, internalGetAll);
 };

package/dist/functions/insert.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insert = exports.insertErrorSchema = void 0;
+const mongodb_1 = require("mongodb");
 const types_1 = require("@aeriajs/types");
 const security_1 = require("@aeriajs/security");
 const common_1 = require("@aeriajs/common");
@@ -48,7 +49,7 @@ const internalInsert = async (payload, context) => {
             details: error.errors,
         });
     }
-    const docId = '_id' in what
+    const docId = '_id' in what && what._id instanceof mongodb_1.ObjectId
         ? what._id
         : null;
     const content = (0, index_js_1.prepareInsert)(what, context.description);
@@ -68,7 +69,7 @@ const internalInsert = async (payload, context) => {
         content.$set ??= {};
         content.$set.updated_at = new Date();
         await context.collection.model.updateOne({
-            _id: docId,
+            _id: newId,
         }, content);
     }
     if (context.collection.originalFunctions?.get) {
@@ -111,6 +112,6 @@ const insert = async (payload, context, options = {}) => {
             code: error,
         });
     }
-    return internalInsert(securedPayload, context);
+    return (0, security_1.applyWriteMiddlewares)(securedPayload, context, internalInsert);
 };
 exports.insert = insert;

package/dist/functions/insert.mjs

@@ -1,6 +1,7 @@
 "use strict";
+import { ObjectId } from "mongodb";
 import { Result, HTTPStatus, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
-import { useSecurity } from "@aeriajs/security";
+import { useSecurity, applyWriteMiddlewares } from "@aeriajs/security";
 import { throwIfError, endpointErrorSchema } from "@aeriajs/common";
 import { traverseDocument, normalizeProjection, prepareInsert } from "../collection/index.mjs";
 export const insertErrorSchema = () => endpointErrorSchema({
@@ -43,7 +44,7 @@ const internalInsert = async (payload, context) => {
       details: error.errors
     });
   }
-  const docId = "_id" in what ? what._id : null;
+  const docId = "_id" in what && what._id instanceof ObjectId ? what._id : null;
   const content = prepareInsert(what, context.description);
   const projection = payload.project ? normalizeProjection(payload.project, context.description) : {};
   let newId = docId;
@@ -58,7 +59,7 @@ const internalInsert = async (payload, context) => {
     content.$set ??= {};
     content.$set.updated_at = /* @__PURE__ */ new Date();
     await context.collection.model.updateOne({
-      _id: docId
+      _id: newId
     }, content);
   }
   if (context.collection.originalFunctions?.get) {
@@ -101,5 +102,5 @@ export const insert = async (payload, context, options = {}) => {
       code: error
     });
   }
-  return internalInsert(securedPayload, context);
+  return applyWriteMiddlewares(securedPayload, context, internalInsert);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.162",
+  "version": "0.0.164",
   "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.162",
-    "@aeriajs/common": "^0.0.98",
-    "@aeriajs/entrypoint": "^0.0.100",
-    "@aeriajs/http": "^0.0.111",
-    "@aeriajs/security": "^0.0.162",
-    "@aeriajs/types": "^0.0.84",
-    "@aeriajs/validation": "^0.0.101"
+    "@aeriajs/builtins": "^0.0.164",
+    "@aeriajs/common": "^0.0.100",
+    "@aeriajs/entrypoint": "^0.0.102",
+    "@aeriajs/http": "^0.0.113",
+    "@aeriajs/security": "^0.0.164",
+    "@aeriajs/types": "^0.0.86",
+    "@aeriajs/validation": "^0.0.103"
   },
   "dependencies": {
     "mongodb": "^6.5.0",