@aeriajs/core 0.0.167 → 0.0.169

package/dist/collection/index.d.ts

@@ -1,6 +1,7 @@
 export * from './cascadingRemove.js';
 export * from './define.js';
 export * from './description.js';
+export * from './isValidCollection.js';
 export * from './makePagination.js';
 export * from './normalizeProjection.js';
 export * from './preload.js';

package/dist/collection/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./cascadingRemove.js"), exports);
 __exportStar(require("./define.js"), exports);
 __exportStar(require("./description.js"), exports);
+__exportStar(require("./isValidCollection.js"), exports);
 __exportStar(require("./makePagination.js"), exports);
 __exportStar(require("./normalizeProjection.js"), exports);
 __exportStar(require("./preload.js"), exports);

package/dist/collection/index.mjs

@@ -2,6 +2,7 @@
 export * from "./cascadingRemove.mjs";
 export * from "./define.mjs";
 export * from "./description.mjs";
+export * from "./isValidCollection.mjs";
 export * from "./makePagination.mjs";
 export * from "./normalizeProjection.mjs";
 export * from "./preload.mjs";

package/dist/collection/isValidCollection.d.ts

@@ -0,0 +1,3 @@
+import type { Description, Collection } from '@aeriajs/types';
+export declare const isValidDescription: (value: unknown) => value is Description;
+export declare const isValidCollection: (value: unknown) => value is Collection;

package/dist/collection/isValidCollection.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidCollection = exports.isValidDescription = void 0;
+const isValidDescription = (value) => {
+    return !!(value
+        && typeof value === 'object'
+        && '$id' in value
+        && 'properties' in value
+        && value.properties
+        && typeof value.$id === 'string'
+        && typeof value.properties === 'object');
+};
+exports.isValidDescription = isValidDescription;
+const isValidCollection = (value) => {
+    return !!(value
+        && typeof value === 'object'
+        && 'description' in value
+        && (0, exports.isValidDescription)(value.description));
+};
+exports.isValidCollection = isValidCollection;

package/dist/collection/isValidCollection.mjs

@@ -0,0 +1,7 @@
+"use strict";
+export const isValidDescription = (value) => {
+  return !!(value && typeof value === "object" && "$id" in value && "properties" in value && value.properties && typeof value.$id === "string" && typeof value.properties === "object");
+};
+export const isValidCollection = (value) => {
+  return !!(value && typeof value === "object" && "description" in value && isValidDescription(value.description));
+};

package/dist/collection/makePagination.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makePagination = void 0;
+const count_js_1 = require("../functions/count.js");
 const common_1 = require("@aeriajs/common");
 const makePagination = async (payload, documents, context) => {
     const { offset = 0, limit = context.config.defaultPaginationLimit, } = payload;
@@ -8,7 +9,9 @@ const makePagination = async (payload, documents, context) => {
         ? (0, common_1.throwIfError)(await context.collection.functions.count({
             filters: payload.filters,
         }))
-        : await context.collection.model.countDocuments(payload.filters);
+        : (0, common_1.throwIfError)(await (0, count_js_1.count)({
+            filters: payload.filters,
+        }, context));
     return {
         recordsCount: documents.length,
         recordsTotal,

package/dist/collection/makePagination.mjs

@@ -1,4 +1,5 @@
 "use strict";
+import { count } from "../functions/count.mjs";
 import { throwIfError } from "@aeriajs/common";
 export const makePagination = async (payload, documents, context) => {
   const {
@@ -7,7 +8,9 @@ export const makePagination = async (payload, documents, context) => {
   } = 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);
+  })) : throwIfError(await count({
+    filters: payload.filters
+  }, context));
   return {
     recordsCount: documents.length,
     recordsTotal,

package/dist/collection/reference.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLookupPipeline = exports.buildLookupPipeline = exports.recurseSetStage = exports.getReferences = void 0;
 const common_1 = require("@aeriajs/common");
 const assets_js_1 = require("../assets.js");
-const database_js_1 = require("../database.js");
 const getTempName = (path) => {
     return `_${path.join('_')}`;
 };
@@ -288,7 +287,7 @@ const buildLookupPipeline = (refMap, options = {}) => {
                 : path.concat(refName).join('.');
             rootPipeline.unshift({
                 $lookup: {
-                    from: (0, database_js_1.prepareCollectionName)(reference.referencedCollection),
+                    from: reference.referencedCollection,
                     foreignField: '_id',
                     localField,
                     as: tempName,

package/dist/collection/reference.mjs

@@ -1,7 +1,6 @@
 "use strict";
 import { throwIfError, getReferenceProperty } from "@aeriajs/common";
 import { getCollectionAsset } from "../assets.mjs";
-import { prepareCollectionName } from "../database.mjs";
 const getTempName = (path) => {
   return `_${path.join("_")}`;
 };
@@ -276,7 +275,7 @@ export const buildLookupPipeline = (refMap, options = {}) => {
       const localField = reference.isRecursive ? `${getTempName(path)}.${refName}` : path.concat(refName).join(".");
       rootPipeline.unshift({
         $lookup: {
-          from: prepareCollectionName(reference.referencedCollection),
+          from: reference.referencedCollection,
           foreignField: "_id",
           localField,
           as: tempName,

package/dist/collection/traverseDocument.d.ts

@@ -25,7 +25,7 @@ export type TraverseNormalized = {
     description: Description;
     pipe: <T = unknown>(value: unknown, phaseContext: PhaseContext) => T | Promise<T>;
 };
-export type ValidTempFile = undefined | ObjectId | {
+export type ValidTempFile = null | undefined | ObjectId | {
     tempId: string;
 };
 type PhaseContext = {

package/dist/collection/traverseDocument.js

@@ -183,24 +183,27 @@ const validate = (value, ctx) => {
 };
 const isValidTempFile = (value) => {
     if (value && typeof value === 'object') {
-        return 'tempId' in value && typeof value.tempId === 'string';
+        if (value instanceof mongodb_1.ObjectId) {
+            return true;
+        }
+        return 'tempId' in value && (typeof value.tempId === 'string' || value.tempId instanceof mongodb_1.ObjectId);
     }
     return !!(value === undefined
-        || value instanceof mongodb_1.ObjectId);
+        || value === null);
 };
 const moveFiles = async (value, ctx) => {
     if (!('$ref' in ctx.property) || ctx.property.$ref !== 'file') {
         return value;
     }
+    if (!isValidTempFile(value)) {
+        return types_1.Result.error(types_1.TraverseError.InvalidTempfile);
+    }
     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;
     }
@@ -398,13 +401,14 @@ const recurse = async (target, ctx) => {
     return types_1.Result.result(Object.fromEntries(entries));
 };
 const traverseDocument = async (what, description, _options) => {
-    const options = Object.assign({}, _options);
-    const functions = [];
     if (!what) {
         return types_1.Result.result(what);
     }
-    if (!options.validate && Object.keys(what).length === 0) {
-        return types_1.Result.result(what);
+    const whatCopy = Object.assign({}, what);
+    const options = Object.assign({}, _options);
+    const functions = [];
+    if (!options.validate && Object.keys(whatCopy).length === 0) {
+        return types_1.Result.result(whatCopy);
     }
     if (options.recurseDeep) {
         functions.push(recurseDeep);
@@ -420,7 +424,7 @@ const traverseDocument = async (what, description, _options) => {
         if (options.validateRequired) {
             descriptionCopy.required = options.validateRequired;
         }
-        const wholenessError = (0, validation_1.validateWholeness)(what, descriptionCopy);
+        const wholenessError = (0, validation_1.validateWholeness)(whatCopy, descriptionCopy);
         if (wholenessError) {
             return types_1.Result.error(wholenessError);
         }
@@ -457,8 +461,8 @@ const traverseDocument = async (what, description, _options) => {
             },
         }),
     });
-    const { error, result } = await recurse(what, {
-        root: what,
+    const { error, result } = await recurse(whatCopy, {
+        root: whatCopy,
         property: description,
         propPath: '',
         options,

package/dist/collection/traverseDocument.mjs

@@ -149,23 +149,26 @@ const validate = (value, ctx) => {
 };
 const isValidTempFile = (value) => {
   if (value && typeof value === "object") {
-    return "tempId" in value && typeof value.tempId === "string";
+    if (value instanceof ObjectId) {
+      return true;
+    }
+    return "tempId" in value && (typeof value.tempId === "string" || value.tempId instanceof ObjectId);
   }
-  return !!(value === void 0 || value instanceof ObjectId);
+  return !!(value === void 0 || value === null);
 };
 const moveFiles = async (value, ctx) => {
   if (!("$ref" in ctx.property) || ctx.property.$ref !== "file") {
     return value;
   }
+  if (!isValidTempFile(value)) {
+    return Result.error(TraverseError.InvalidTempfile);
+  }
   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;
   }
@@ -355,13 +358,14 @@ const recurse = async (target, ctx) => {
   return Result.result(Object.fromEntries(entries));
 };
 export const traverseDocument = async (what, description, _options) => {
-  const options = Object.assign({}, _options);
-  const functions = [];
   if (!what) {
     return Result.result(what);
   }
-  if (!options.validate && Object.keys(what).length === 0) {
-    return Result.result(what);
+  const whatCopy = Object.assign({}, what);
+  const options = Object.assign({}, _options);
+  const functions = [];
+  if (!options.validate && Object.keys(whatCopy).length === 0) {
+    return Result.result(whatCopy);
   }
   if (options.recurseDeep) {
     functions.push(recurseDeep);
@@ -377,7 +381,7 @@ export const traverseDocument = async (what, description, _options) => {
     if (options.validateRequired) {
       descriptionCopy.required = options.validateRequired;
     }
-    const wholenessError = validateWholeness(what, descriptionCopy);
+    const wholenessError = validateWholeness(whatCopy, descriptionCopy);
     if (wholenessError) {
       return Result.error(wholenessError);
     }
@@ -414,8 +418,8 @@ export const traverseDocument = async (what, description, _options) => {
       }
     })
   });
-  const { error, result } = await recurse(what, {
-    root: what,
+  const { error, result } = await recurse(whatCopy, {
+    root: whatCopy,
     property: description,
     propPath: "",
     options

package/dist/context.js

@@ -39,7 +39,8 @@ const indepthCollection = (collectionName, collections, parentContext) => {
             if (typeof functionName !== 'string') {
                 throw new Error();
             }
-            if (!collection.functions?.[functionName]) {
+            const fn = collection.functions?.[functionName];
+            if (!fn) {
                 return null;
             }
             return async (props, ...args) => {
@@ -48,7 +49,7 @@ const indepthCollection = (collectionName, collections, parentContext) => {
                     collectionName,
                     inherited: true,
                 });
-                return collection.functions[functionName](props, childContext, ...args);
+                return fn(props, childContext, ...args);
             };
         },
     });

package/dist/context.mjs

@@ -12,7 +12,8 @@ const indepthCollection = (collectionName, collections, parentContext) => {
       if (typeof functionName !== "string") {
         throw new Error();
       }
-      if (!collection.functions?.[functionName]) {
+      const fn = collection.functions?.[functionName];
+      if (!fn) {
         return null;
       }
       return async (props, ...args) => {
@@ -21,7 +22,7 @@ const indepthCollection = (collectionName, collections, parentContext) => {
           collectionName,
           inherited: true
         });
-        return collection.functions[functionName](props, childContext, ...args);
+        return fn(props, childContext, ...args);
       };
     }
   });

package/dist/database.d.ts

@@ -6,5 +6,4 @@ export declare const getDatabase: () => Promise<{
     db: ReturnType<MongoClient["db"]> | undefined;
 }>;
 export declare const getDatabaseSync: () => import("mongodb").Db;
-export declare const prepareCollectionName: (collectionName: string) => string;
 export declare const getDatabaseCollection: <TDocument extends Record<string, unknown>>(collectionName: string) => import("mongodb").Collection<PackReferences<TDocument>>;

package/dist/database.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDatabaseCollection = exports.prepareCollectionName = exports.getDatabaseSync = exports.getDatabase = exports.ObjectId = void 0;
+exports.getDatabaseCollection = exports.getDatabaseSync = exports.getDatabase = exports.ObjectId = void 0;
 const entrypoint_1 = require("@aeriajs/entrypoint");
 const mongodb_1 = require("mongodb");
 var mongodb_2 = require("mongodb");
@@ -69,22 +69,8 @@ const getDatabaseSync = () => {
     return dbMemo.db;
 };
 exports.getDatabaseSync = getDatabaseSync;
-const prepareCollectionName = (collectionName) => {
-    let pluralized;
-    if (collectionName.endsWith('y')) {
-        pluralized = collectionName.replace(/y$/, 'ies');
-    }
-    else if (collectionName.endsWith('s')) {
-        pluralized = `${collectionName}es`;
-    }
-    else {
-        pluralized = `${collectionName}s`;
-    }
-    return pluralized.toLowerCase();
-};
-exports.prepareCollectionName = prepareCollectionName;
 const getDatabaseCollection = (collectionName) => {
     const db = (0, exports.getDatabaseSync)();
-    return db.collection((0, exports.prepareCollectionName)(collectionName));
+    return db.collection(collectionName);
 };
 exports.getDatabaseCollection = getDatabaseCollection;

package/dist/database.mjs

@@ -42,18 +42,7 @@ export const getDatabaseSync = () => {
   }
   return dbMemo.db;
 };
-export const prepareCollectionName = (collectionName) => {
-  let pluralized;
-  if (collectionName.endsWith("y")) {
-    pluralized = collectionName.replace(/y$/, "ies");
-  } else if (collectionName.endsWith("s")) {
-    pluralized = `${collectionName}es`;
-  } else {
-    pluralized = `${collectionName}s`;
-  }
-  return pluralized.toLowerCase();
-};
 export const getDatabaseCollection = (collectionName) => {
   const db = getDatabaseSync();
-  return db.collection(prepareCollectionName(collectionName));
+  return db.collection(collectionName);
 };

package/dist/functions/count.d.ts

@@ -3,4 +3,8 @@ 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 ? TContext : never, options?: CountOptions) => Promise<Result.Either<any, any>>;
+export declare const count: <TContext extends Context>(payload: CountPayload<SchemaWithId<TContext["description"]>>, context: TContext extends Context ? TContext : never, options?: CountOptions) => Promise<Result.Error<any> | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: any;
+}>;

package/package.json

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