@aeriajs/security 0.0.136 → 0.0.137

package/dist/immutability.d.ts

@@ -1,10 +1,23 @@
-import type { Context } from '@aeriajs/types';
-import type { SecurityCheckProps, SecurityCheckReadPayload, SecurityCheckWritePayload } from './types.js';
+import type { Context, CollectionHookProps } from '@aeriajs/types';
+import type { CollectionHookReadPayload, CollectionHookWritePayload } from './types.js';
 import { ACError } from '@aeriajs/types';
-export declare const checkImmutability: (props: SecurityCheckProps<SecurityCheckReadPayload | SecurityCheckWritePayload>, context: Context) => Promise<{
+export declare const checkImmutabilityRead: (props: CollectionHookProps<CollectionHookReadPayload>, context: Context) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
-    readonly result: SecurityCheckReadPayload | SecurityCheckWritePayload;
+    readonly result: any;
+} | {
+    readonly _tag: "Error";
+    readonly error: ACError.ResourceNotFound;
+    readonly result: undefined;
+} | {
+    readonly _tag: "Error";
+    readonly error: ACError.TargetImmutable;
+    readonly result: undefined;
+}>;
+export declare const checkImmutabilityWrite: (props: CollectionHookProps<CollectionHookWritePayload>, context: Context) => Promise<{
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: any;
 } | {
     readonly _tag: "Error";
     readonly error: ACError.ResourceNotFound;

package/dist/immutability.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkImmutability = void 0;
+exports.checkImmutabilityWrite = exports.checkImmutabilityRead = void 0;
 const types_1 = require("@aeriajs/types");
-const checkImmutability = async (props, context) => {
+const checkImmutability = async (docId, props, context) => {
     if (!context.description.immutable) {
         return types_1.Result.result(props.payload);
     }
-    const docId = 'filters' in props.payload
-        ? props.payload.filters._id
-        : props.payload.what._id;
     if (docId) {
         if (typeof context.description.immutable === 'function') {
             const doc = await context.collection.model.findOne({
@@ -26,4 +23,11 @@ const checkImmutability = async (props, context) => {
     }
     return types_1.Result.result(props.payload);
 };
-exports.checkImmutability = checkImmutability;
+const checkImmutabilityRead = async (props, context) => {
+    return checkImmutability(props.payload.filters._id, props, context);
+};
+exports.checkImmutabilityRead = checkImmutabilityRead;
+const checkImmutabilityWrite = async (props, context) => {
+    return checkImmutability(props.payload.what._id, props, context);
+};
+exports.checkImmutabilityWrite = checkImmutabilityWrite;

package/dist/immutability.mjs

@@ -1,10 +1,9 @@
 "use strict";
 import { Result, ACError } from "@aeriajs/types";
-export const checkImmutability = async (props, context) => {
+const checkImmutability = async (docId, props, context) => {
   if (!context.description.immutable) {
     return Result.result(props.payload);
   }
-  const docId = "filters" in props.payload ? props.payload.filters._id : props.payload.what._id;
   if (docId) {
     if (typeof context.description.immutable === "function") {
       const doc = await context.collection.model.findOne({
@@ -20,3 +19,9 @@ export const checkImmutability = async (props, context) => {
   }
   return Result.result(props.payload);
 };
+export const checkImmutabilityRead = async (props, context) => {
+  return checkImmutability(props.payload.filters._id, props, context);
+};
+export const checkImmutabilityWrite = async (props, context) => {
+  return checkImmutability(props.payload.what._id, props, context);
+};

package/dist/ownership.d.ts

@@ -1,15 +1,15 @@
-import type { Context, InsertPayload } from '@aeriajs/types';
-import type { SecurityCheckProps, SecurityCheckReadPayload } from './types.js';
+import type { Context, CollectionHookProps } from '@aeriajs/types';
+import type { CollectionHookReadPayload, CollectionHookWritePayload } from './types.js';
 import { ACError } from '@aeriajs/types';
-export declare const checkOwnershipRead: (props: SecurityCheckProps<SecurityCheckReadPayload>, context: Context) => Promise<{
+export declare const checkOwnershipRead: <T extends CollectionHookReadPayload>(props: CollectionHookProps<T>, context: Context) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
-    readonly result: SecurityCheckReadPayload;
+    readonly result: {} & T;
 }>;
-export declare const checkOwnershipWrite: (props: SecurityCheckProps<InsertPayload<any>>, context: Context) => Promise<{
+export declare const checkOwnershipWrite: <T extends CollectionHookWritePayload>(props: CollectionHookProps<T>, context: Context) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
-    readonly result: InsertPayload<any>;
+    readonly result: {} & T;
 } | {
     readonly _tag: "Error";
     readonly error: ACError.OwnershipError;

package/dist/pagination.d.ts

@@ -1,11 +1,12 @@
-import type { SecurityCheckProps, SecurityCheckReadPayload } from './types.js';
+import type { CollectionHookProps } from '@aeriajs/types';
+import type { CollectionHookReadPayload } from './types.js';
 import { ACError } from '@aeriajs/types';
-export declare const checkPagination: (props: SecurityCheckProps<SecurityCheckReadPayload>) => Promise<{
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: SecurityCheckReadPayload;
-} | {
+export declare const checkPagination: <T extends CollectionHookReadPayload>(props: CollectionHookProps<T>) => Promise<{
     readonly _tag: "Error";
     readonly error: ACError.InvalidLimit;
     readonly result: undefined;
+} | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: T;
 }>;

package/dist/types.d.ts

@@ -1,17 +1,9 @@
-import type { Result, Context, GetAllPayload, InsertPayload, ACError } from '@aeriajs/types';
-export type SecurityCheckReadPayload = {
+export type CollectionHookReadPayload = {
     filters: Record<string, any>;
     sort?: Record<string, any>;
     limit?: number;
     offset?: number;
 };
-export type SecurityCheckWritePayload = {
+export type CollectionHookWritePayload = {
     what: Record<string, any>;
 };
-export type SecurityCheckProps<TPayload extends Record<string, any> = any> = {
-    propertyName?: string;
-    parentId?: string;
-    childId?: string;
-    payload: TPayload;
-};
-export type SecurityCheck = (props: SecurityCheckProps, context: Context) => Promise<Result.Either<ACError, GetAllPayload<any> | InsertPayload<any>>>;

package/dist/use.d.ts

@@ -1,21 +1,26 @@
-import type { Context, Description, GetAllPayload, InsertPayload } from '@aeriajs/types';
+import type { Context, Description } from '@aeriajs/types';
+import type { CollectionHookReadPayload, CollectionHookWritePayload } from './types.js';
 export declare const useSecurity: <TDescription extends Description>(context: Context<TDescription>) => {
-    beforeRead: <TPayload extends Partial<GetAllPayload<any>>>(payload?: TPayload) => Promise<{
+    beforeRead: <TPayload extends Partial<CollectionHookReadPayload>>(payload?: TPayload) => Promise<{
         readonly _tag: "Error";
         readonly error: import("@aeriajs/types").ACError;
         readonly result: undefined;
     } | {
         readonly _tag: "Result";
         readonly error: undefined;
-        readonly result: any;
+        readonly result: {
+            filters: {};
+        } & TPayload;
     }>;
-    beforeWrite: <TPayload extends Partial<InsertPayload<any>>>(payload?: TPayload) => Promise<{
+    beforeWrite: <TPayload extends CollectionHookWritePayload>(payload?: TPayload) => Promise<{
         readonly _tag: "Error";
         readonly error: import("@aeriajs/types").ACError;
         readonly result: undefined;
     } | {
         readonly _tag: "Result";
         readonly error: undefined;
-        readonly result: any;
+        readonly result: {
+            what: {};
+        } & TPayload;
     }>;
 };

package/dist/use.js

@@ -4,9 +4,7 @@ exports.useSecurity = void 0;
 const types_1 = require("@aeriajs/types");
 const index_js_1 = require("./index.js");
 const chainFunctions = async (_props, context, functions) => {
-    const props = Object.assign({
-        filters: {},
-    }, _props);
+    const props = Object.assign({}, _props);
     for (const fn of functions) {
         if (!fn) {
             continue;
@@ -21,8 +19,9 @@ const chainFunctions = async (_props, context, functions) => {
 };
 const useSecurity = (context) => {
     const beforeRead = async (payload) => {
-        const newPayload = Object.assign({}, payload);
-        newPayload.filters ??= {};
+        const newPayload = Object.assign({
+            filters: {},
+        }, payload);
         const props = {
             payload: newPayload,
         };
@@ -42,7 +41,7 @@ const useSecurity = (context) => {
         };
         return chainFunctions(props, context, [
             index_js_1.checkOwnershipWrite,
-            index_js_1.checkImmutability,
+            index_js_1.checkImmutabilityWrite,
         ]);
     };
     return {

package/dist/use.mjs

@@ -1,15 +1,13 @@
 "use strict";
 import { Result } from "@aeriajs/types";
 import {
-  checkImmutability,
+  checkImmutabilityWrite,
   checkOwnershipRead,
   checkOwnershipWrite,
   checkPagination
 } from "./index.mjs";
 const chainFunctions = async (_props, context, functions) => {
-  const props = Object.assign({
-    filters: {}
-  }, _props);
+  const props = Object.assign({}, _props);
   for (const fn of functions) {
     if (!fn) {
       continue;
@@ -24,8 +22,9 @@ const chainFunctions = async (_props, context, functions) => {
 };
 export const useSecurity = (context) => {
   const beforeRead = async (payload) => {
-    const newPayload = Object.assign({}, payload);
-    newPayload.filters ??= {};
+    const newPayload = Object.assign({
+      filters: {}
+    }, payload);
     const props = {
       payload: newPayload
     };
@@ -43,7 +42,7 @@ export const useSecurity = (context) => {
     };
     return chainFunctions(props, context, [
       checkOwnershipWrite,
-      checkImmutability
+      checkImmutabilityWrite
     ]);
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/security",
-  "version": "0.0.136",
+  "version": "0.0.137",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,9 +28,9 @@
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.136",
-    "@aeriajs/common": "^0.0.85",
-    "@aeriajs/types": "^0.0.73",
+    "@aeriajs/core": "^0.0.137",
+    "@aeriajs/common": "^0.0.86",
+    "@aeriajs/types": "^0.0.74",
     "mongodb": "^6.5.0"
   },
   "scripts": {