@aeriajs/core 0.0.165 → 0.0.167

package/dist/assets.d.ts

@@ -1,6 +1,6 @@
-import type { AssetType, Context, Collection, Token } from '@aeriajs/types';
+import type { Context, Collection, Token } from '@aeriajs/types';
 import { ACError } from '@aeriajs/types';
-export declare const internalGetCollectionAsset: <TCollectionName extends string, TAssetName extends keyof Collections[TCollectionName] & AssetType>(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
+export declare const internalGetCollectionAsset: <TCollectionName extends string, TAssetName extends keyof Collections[TCollectionName] & keyof Collection>(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
     readonly _tag: "Error";
     readonly error: ACError.ResourceNotFound;
     readonly result: undefined;
@@ -9,7 +9,7 @@ export declare const internalGetCollectionAsset: <TCollectionName extends string
     readonly error: undefined;
     readonly result: NonNullable<Collection[TAssetName]>;
 }>;
-export declare const getCollectionAsset: <TCollectionName extends string, TAssetName extends keyof Collections[TCollectionName] & AssetType>(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
+export declare const getCollectionAsset: <TCollectionName extends string, TAssetName extends keyof Collections[TCollectionName] & keyof Collection>(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
     readonly _tag: "Error";
     readonly error: ACError.ResourceNotFound;
     readonly result: undefined;

package/dist/collection/cascadingRemove.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cascadingRemove = void 0;
+const mongodb_1 = require("mongodb");
 const context_js_1 = require("../context.js");
 const assets_js_1 = require("../assets.js");
 const database_js_1 = require("../database.js");
 const reference_js_1 = require("./reference.js");
+const isObject = (value) => {
+    return typeof value === 'object';
+};
 const preferredRemove = async (targetId, reference, parentContext) => {
     if (!reference.referencedCollection) {
         return;
@@ -46,7 +50,9 @@ const internalCascadingRemove = async (target, refMap, context) => {
             continue;
         }
         if (reference.isInline || reference.referencedCollection === 'file') {
-            await preferredRemove(target[refName], reference, context);
+            if (target[refName] instanceof mongodb_1.ObjectId) {
+                await preferredRemove(target[refName], reference, context);
+            }
         }
         if (reference.deepReferences) {
             if (Array.isArray(target[refName])) {
@@ -55,7 +61,9 @@ const internalCascadingRemove = async (target, refMap, context) => {
                 }
                 continue;
             }
-            await internalCascadingRemove(target[refName], reference.deepReferences, context);
+            if (isObject(target[refName])) {
+                await internalCascadingRemove(target[refName], reference.deepReferences, context);
+            }
         }
     }
 };

package/dist/collection/cascadingRemove.mjs

@@ -1,8 +1,12 @@
 "use strict";
+import { ObjectId } from "mongodb";
 import { createContext } from "../context.mjs";
 import { getFunction } from "../assets.mjs";
 import { getDatabaseCollection } from "../database.mjs";
 import { getReferences } from "./reference.mjs";
+const isObject = (value) => {
+  return typeof value === "object";
+};
 const preferredRemove = async (targetId, reference, parentContext) => {
   if (!reference.referencedCollection) {
     return;
@@ -44,7 +48,9 @@ const internalCascadingRemove = async (target, refMap, context) => {
       continue;
     }
     if (reference.isInline || reference.referencedCollection === "file") {
-      await preferredRemove(target[refName], reference, context);
+      if (target[refName] instanceof ObjectId) {
+        await preferredRemove(target[refName], reference, context);
+      }
     }
     if (reference.deepReferences) {
       if (Array.isArray(target[refName])) {
@@ -53,7 +59,9 @@ const internalCascadingRemove = async (target, refMap, context) => {
         }
         continue;
       }
-      await internalCascadingRemove(target[refName], reference.deepReferences, context);
+      if (isObject(target[refName])) {
+        await internalCascadingRemove(target[refName], reference.deepReferences, context);
+      }
     }
   }
 };

package/dist/collection/define.d.ts

@@ -1,8 +1,8 @@
 import type { SchemaWithId, Collection, StrictContext, Contract, ContractToFunction, Description, CollectionSecurityPolicy, AccessCondition, RoleFromAccessCondition } from '@aeriajs/types';
-export type ExtendCollection<TLeftCollection extends Collection, TRightCollection> = Omit<TLeftCollection & TRightCollection, 'item'> & {
+export type ExtendCollection<TLeftCollection extends Omit<Collection, 'item'>, TRightCollection> = TLeftCollection & TRightCollection & {
     item: SchemaWithId<(TLeftCollection & TRightCollection)['description']>;
 };
-export declare const defineCollection: <TCollection extends Collection<TCollection extends Collection ? TCollection : never> extends infer Coll ? Omit<Coll, "item" | "description" | "functions" | "exposedFunctions" | "security"> : never, const TDescription extends Description<TDescription>, const TContracts extends { [P in keyof TFunctions]?: Contract; }, const TExposedFunctions extends Partial<Record<keyof TFunctions, AccessCondition>>, const TFunctions extends Record<string, (payload: any, context: StrictContext<any>) => any> & { [P in keyof TContracts | keyof TExposedFunctions]: ContractToFunction<P extends keyof TContracts ? NonNullable<TContracts[P]> : any, StrictContext<P extends keyof TExposedFunctions ? RoleFromAccessCondition<TExposedFunctions[P]> : never, TDescription>>; }>(collection: TCollection & {
+export declare const defineCollection: <TCollection extends Collection<TCollection extends Collection ? TCollection : never> extends infer Coll ? Omit<Coll, "item" | "description" | "functions" | "exposedFunctions" | "security" | "middlewares"> : never, const TDescription extends Description<TDescription>, const TContracts extends { [P in keyof TFunctions]?: Contract; }, TExposedFunctions extends Partial<Record<keyof TFunctions, AccessCondition>>, TFunctions extends undefined | (Record<string, (payload: any, context: StrictContext<any>) => any> & { [P in keyof TContracts | keyof TExposedFunctions]: ContractToFunction<P extends keyof TContracts ? NonNullable<TContracts[P]> : any, StrictContext<P extends keyof TExposedFunctions ? RoleFromAccessCondition<TExposedFunctions[P]> : never, TDescription>>; })>(collection: TCollection & {
     description: TDescription;
     functions?: TFunctions;
     contracts?: TContracts;
@@ -10,10 +10,11 @@ export declare const defineCollection: <TCollection extends Collection<TCollecti
     security?: CollectionSecurityPolicy<{
         functions: TFunctions;
     }>;
+    middlewares?: Collection["middlewares"];
 }) => TCollection & {
     item: SchemaWithId<TDescription>;
     description: TDescription;
     functions: TFunctions;
     contracts: TContracts;
 };
-export declare const extendCollection: <const TLeftCollection extends Collection, const TRightCollection extends { [P in keyof Collection]?: Partial<Collection[P]>; }>(left: TLeftCollection, right: TRightCollection) => ExtendCollection<TLeftCollection, TRightCollection>;
+export declare const extendCollection: <const TLeftCollection extends Collection, const TRightCollection extends { [P in Exclude<keyof Collection, "item" | "middlewares">]?: Partial<Collection[P]>; }>(left: TLeftCollection, right: TRightCollection) => ExtendCollection<TLeftCollection, TRightCollection>;

package/dist/collection/makePagination.d.ts

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

package/dist/collection/prepareInsert.d.ts

@@ -1,2 +1,3 @@
 import type { Description } from '@aeriajs/types';
-export declare const prepareInsert: <TPayload extends Record<string, unknown>>(payload: TPayload, description: Description) => Record<string, any>;
+export declare const prepareCreate: (doc: Record<string, unknown>, description: Description) => Record<string, unknown>;
+export declare const prepareUpdate: (doc: Record<string, unknown>) => Record<string, Record<string, unknown>>;

package/dist/collection/prepareInsert.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareInsert = void 0;
+exports.prepareUpdate = exports.prepareCreate = void 0;
 const prepareCreate = (doc, description) => {
     const result = Object.assign({}, description.defaults || {});
     for (const propName in doc) {
@@ -12,6 +12,7 @@ const prepareCreate = (doc, description) => {
     }
     return result;
 };
+exports.prepareCreate = prepareCreate;
 const prepareUpdate = (doc) => {
     const result = {
         $set: {},
@@ -27,10 +28,4 @@ const prepareUpdate = (doc) => {
     }
     return result;
 };
-const prepareInsert = (payload, description) => {
-    const { _id: docId, ...doc } = Object.assign({}, payload);
-    return docId
-        ? prepareUpdate(doc)
-        : prepareCreate(doc, description);
-};
-exports.prepareInsert = prepareInsert;
+exports.prepareUpdate = prepareUpdate;

package/dist/collection/prepareInsert.mjs

@@ -1,5 +1,5 @@
 "use strict";
-const prepareCreate = (doc, description) => {
+export const prepareCreate = (doc, description) => {
   const result = Object.assign({}, description.defaults || {});
   for (const propName in doc) {
     const value = doc[propName];
@@ -10,7 +10,7 @@ const prepareCreate = (doc, description) => {
   }
   return result;
 };
-const prepareUpdate = (doc) => {
+export const prepareUpdate = (doc) => {
   const result = {
     $set: {},
     $unset: {}
@@ -25,7 +25,3 @@ const prepareUpdate = (doc) => {
   }
   return result;
 };
-export const prepareInsert = (payload, description) => {
-  const { _id: docId, ...doc } = Object.assign({}, payload);
-  return docId ? prepareUpdate(doc) : prepareCreate(doc, description);
-};

package/dist/collection/traverseDocument.d.ts

@@ -25,8 +25,11 @@ export type TraverseNormalized = {
     description: Description;
     pipe: <T = unknown>(value: unknown, phaseContext: PhaseContext) => T | Promise<T>;
 };
+export type ValidTempFile = undefined | ObjectId | {
+    tempId: string;
+};
 type PhaseContext = {
-    target: any;
+    target: Record<string, unknown>;
     root: {
         _id?: ObjectId | string;
     };
@@ -36,7 +39,7 @@ type PhaseContext = {
     options: TraverseOptions & TraverseNormalized;
     isArray?: boolean;
 };
-export declare const traverseDocument: <const TWhat extends Record<string, unknown> | null>(what: TWhat, description: Description, _options: TraverseOptions) => Promise<{
+export declare const traverseDocument: <TWhat>(what: TWhat, description: Description, _options: TraverseOptions) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
     readonly result: TWhat;

package/dist/collection/traverseDocument.js

@@ -169,7 +169,7 @@ const getters = (value, ctx) => {
 };
 const validate = (value, ctx) => {
     if (ctx.options.recurseDeep) {
-        if ('items' in ctx.property || 'properties' in ctx.property) {
+        if ('properties' in ctx.property) {
             return value;
         }
     }
@@ -181,19 +181,32 @@ const validate = (value, ctx) => {
     }
     return value;
 };
+const isValidTempFile = (value) => {
+    if (value && typeof value === 'object') {
+        return 'tempId' in value && typeof value.tempId === 'string';
+    }
+    return !!(value === undefined
+        || value instanceof mongodb_1.ObjectId);
+};
 const moveFiles = async (value, ctx) => {
-    if (!('$ref' in ctx.property) || ctx.property.$ref !== 'file' || value instanceof mongodb_1.ObjectId) {
+    if (!('$ref' in ctx.property) || ctx.property.$ref !== 'file') {
         return value;
     }
-    if (!ctx.options.context) {
-        throw new Error();
-    }
     if (!value) {
         if (ctx.root._id && !ctx.isArray) {
             await disposeOldFiles(ctx);
         }
         return null;
     }
+    if (!isValidTempFile(value)) {
+        return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
+    }
+    if (value instanceof mongodb_1.ObjectId) {
+        return value;
+    }
+    if (!ctx.options.context) {
+        throw new Error();
+    }
     const tempFile = await ctx.options.context.collections.tempFile.model.findOne({
         _id: new mongodb_1.ObjectId(value.tempId),
     });
@@ -421,9 +434,7 @@ const traverseDocument = async (what, description, _options) => {
     const mutateTarget = (fn) => {
         return async (value, ctx) => {
             const result = await fn(value, ctx);
-            if (ctx.target && typeof ctx.target === 'object') {
-                ctx.target[ctx.propName] = result;
-            }
+            ctx.target[ctx.propName] = result;
             return result;
         };
     };

package/dist/collection/traverseDocument.mjs

@@ -135,7 +135,7 @@ const getters = (value, ctx) => {
 };
 const validate = (value, ctx) => {
   if (ctx.options.recurseDeep) {
-    if ("items" in ctx.property || "properties" in ctx.property) {
+    if ("properties" in ctx.property) {
       return value;
     }
   }
@@ -147,19 +147,31 @@ const validate = (value, ctx) => {
   }
   return value;
 };
+const isValidTempFile = (value) => {
+  if (value && typeof value === "object") {
+    return "tempId" in value && typeof value.tempId === "string";
+  }
+  return !!(value === void 0 || value instanceof ObjectId);
+};
 const moveFiles = async (value, ctx) => {
-  if (!("$ref" in ctx.property) || ctx.property.$ref !== "file" || value instanceof ObjectId) {
+  if (!("$ref" in ctx.property) || ctx.property.$ref !== "file") {
     return value;
   }
-  if (!ctx.options.context) {
-    throw new Error();
-  }
   if (!value) {
     if (ctx.root._id && !ctx.isArray) {
       await disposeOldFiles(ctx);
     }
     return null;
   }
+  if (!isValidTempFile(value)) {
+    return Result.error(TraverseError.InvalidTempfile);
+  }
+  if (value instanceof ObjectId) {
+    return value;
+  }
+  if (!ctx.options.context) {
+    throw new Error();
+  }
   const tempFile = await ctx.options.context.collections.tempFile.model.findOne({
     _id: new ObjectId(value.tempId)
   });
@@ -379,9 +391,7 @@ export const traverseDocument = async (what, description, _options) => {
   const mutateTarget = (fn) => {
     return async (value, ctx) => {
       const result2 = await fn(value, ctx);
-      if (ctx.target && typeof ctx.target === "object") {
-        ctx.target[ctx.propName] = result2;
-      }
+      ctx.target[ctx.propName] = result2;
       return result2;
     };
   };

package/dist/context.d.ts

@@ -1,2 +1,2 @@
-import type { ContextOptions } from '@aeriajs/types';
-export declare const createContext: (options?: ContextOptions) => Promise<import("@aeriajs/types").RouteContext<null> & import("@aeriajs/types").CollectionContext<import("@aeriajs/types").Description, any>>;
+import type { Context, ContextOptions } from '@aeriajs/types';
+export declare const createContext: (options?: ContextOptions) => Promise<import("@aeriajs/types").RouteContext<null> & import("@aeriajs/types").CollectionContext<import("@aeriajs/types").Description, Record<string, (payload: any, context: Context<any>, ...args: any[]) => any> | undefined>>;

package/dist/functions/count.d.ts

@@ -3,8 +3,4 @@ import { Result } from '@aeriajs/types';
 export type CountOptions = {
     bypassSecurity?: boolean;
 };
-export declare const count: <TContext extends Context>(payload: CountPayload<SchemaWithId<TContext["description"]>>, context: TContext extends Context<any> ? TContext : never, options?: CountOptions) => Promise<{
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: any;
-} | Result.Error<any>>;
+export declare const count: <TContext extends Context>(payload: CountPayload<SchemaWithId<TContext["description"]>>, context: TContext extends Context ? TContext : never, options?: CountOptions) => Promise<Result.Either<any, any>>;

package/dist/functions/insert.js

@@ -6,6 +6,7 @@ const types_1 = require("@aeriajs/types");
 const security_1 = require("@aeriajs/security");
 const common_1 = require("@aeriajs/common");
 const index_js_1 = require("../collection/index.js");
+const get_js_1 = require("./get.js");
 const insertErrorSchema = () => (0, common_1.endpointErrorSchema)({
     httpStatus: [
         types_1.HTTPStatus.Forbidden,
@@ -52,12 +53,9 @@ const internalInsert = async (payload, context) => {
     const docId = '_id' in what && what._id instanceof mongodb_1.ObjectId
         ? what._id
         : null;
-    const content = (0, index_js_1.prepareInsert)(what, context.description);
-    const projection = payload.project
-        ? (0, index_js_1.normalizeProjection)(payload.project, context.description)
-        : {};
     let newId = docId;
     if (!newId) {
+        const content = (0, index_js_1.prepareCreate)(what, context.description);
         const now = new Date();
         Object.assign(content, {
             created_at: now,
@@ -66,40 +64,24 @@ const internalInsert = async (payload, context) => {
         newId = (await context.collection.model.insertOne(content)).insertedId;
     }
     else {
-        content.$set ??= {};
+        const content = (0, index_js_1.prepareUpdate)(what);
         content.$set.updated_at = new Date();
         await context.collection.model.updateOne({
             _id: newId,
         }, content);
     }
-    if (context.collection.originalFunctions?.get) {
-        return context.collection.originalFunctions.get({
-            filters: {
-                _id: newId,
-            },
-        }, Object.assign({
-            inherited: true,
-        }, context), {
-            bypassSecurity: true,
-        });
-    }
-    const doc = await context.collection.model.findOne({
-        _id: newId,
-    }, {
-        projection,
-    });
-    if (!doc) {
-        return context.error(types_1.HTTPStatus.NotFound, {
-            code: types_1.ACError.ResourceNotFound,
-        });
-    }
-    const result = (0, common_1.throwIfError)(await (0, index_js_1.traverseDocument)(doc, context.description, {
-        context,
-        getters: true,
-        fromProperties: true,
-        recurseReferences: true,
+    const inheritedContext = {
+        ...context,
+        inherited: true,
+    };
+    const newDocument = (0, common_1.throwIfError)(await (0, get_js_1.get)({
+        filters: {
+            _id: newId,
+        },
+    }, inheritedContext, {
+        bypassSecurity: true,
     }));
-    return types_1.Result.result(result);
+    return types_1.Result.result(newDocument);
 };
 const insert = async (payload, context, options = {}) => {
     if (options.bypassSecurity) {

package/dist/functions/insert.mjs

@@ -3,7 +3,8 @@ 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 { traverseDocument, normalizeProjection, prepareInsert } from "../collection/index.mjs";
+import { traverseDocument, prepareCreate, prepareUpdate } from "../collection/index.mjs";
+import { get } from "./get.mjs";
 export const insertErrorSchema = () => endpointErrorSchema({
   httpStatus: [
     HTTPStatus.Forbidden,
@@ -45,10 +46,9 @@ const internalInsert = async (payload, context) => {
     });
   }
   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;
   if (!newId) {
+    const content = prepareCreate(what, context.description);
     const now = /* @__PURE__ */ new Date();
     Object.assign(content, {
       created_at: now,
@@ -56,40 +56,24 @@ const internalInsert = async (payload, context) => {
     });
     newId = (await context.collection.model.insertOne(content)).insertedId;
   } else {
-    content.$set ??= {};
+    const content = prepareUpdate(what);
     content.$set.updated_at = /* @__PURE__ */ new Date();
     await context.collection.model.updateOne({
       _id: newId
     }, content);
   }
-  if (context.collection.originalFunctions?.get) {
-    return context.collection.originalFunctions.get({
-      filters: {
-        _id: newId
-      }
-    }, Object.assign({
-      inherited: true
-    }, context), {
-      bypassSecurity: true
-    });
-  }
-  const doc = await context.collection.model.findOne({
-    _id: newId
-  }, {
-    projection
-  });
-  if (!doc) {
-    return context.error(HTTPStatus.NotFound, {
-      code: ACError.ResourceNotFound
-    });
-  }
-  const result = throwIfError(await traverseDocument(doc, context.description, {
-    context,
-    getters: true,
-    fromProperties: true,
-    recurseReferences: true
+  const inheritedContext = {
+    ...context,
+    inherited: true
+  };
+  const newDocument = throwIfError(await get({
+    filters: {
+      _id: newId
+    }
+  }, inheritedContext, {
+    bypassSecurity: true
   }));
-  return Result.result(result);
+  return Result.result(newDocument);
 };
 export const insert = async (payload, context, options = {}) => {
   if (options.bypassSecurity) {

package/dist/use.d.ts

@@ -1 +1 @@
-export declare const createAeria: () => Promise<import("@aeriajs/types").RouteContext<null> & import("@aeriajs/types").CollectionContext<import("@aeriajs/types").Description, any>>;
+export declare const createAeria: () => Promise<import("@aeriajs/types").RouteContext<null> & import("@aeriajs/types").CollectionContext<import("@aeriajs/types").Description, Record<string, (payload: any, context: import("@aeriajs/types").Context<any>, ...args: any[]) => any> | undefined>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.165",
+  "version": "0.0.167",
   "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.165",
-    "@aeriajs/common": "^0.0.101",
-    "@aeriajs/entrypoint": "^0.0.103",
-    "@aeriajs/http": "^0.0.114",
-    "@aeriajs/security": "^0.0.165",
-    "@aeriajs/types": "^0.0.86",
-    "@aeriajs/validation": "^0.0.104"
+    "@aeriajs/builtins": "^0.0.167",
+    "@aeriajs/common": "^0.0.103",
+    "@aeriajs/entrypoint": "^0.0.105",
+    "@aeriajs/http": "^0.0.116",
+    "@aeriajs/security": "^0.0.167",
+    "@aeriajs/types": "^0.0.87",
+    "@aeriajs/validation": "^0.0.106"
   },
   "dependencies": {
     "mongodb": "^6.5.0",