@aeriajs/core 0.0.178 → 0.0.180

package/dist/collection/index.d.ts

@@ -5,6 +5,6 @@ export * from './isValidCollection.js';
 export * from './makePagination.js';
 export * from './normalizeProjection.js';
 export * from './preload.js';
-export * from './prepareInsert.js';
+export * from './prepareCreate.js';
 export * from './reference.js';
 export * from './traverseDocument.js';

package/dist/collection/index.js

@@ -21,6 +21,6 @@ __exportStar(require("./isValidCollection.js"), exports);
 __exportStar(require("./makePagination.js"), exports);
 __exportStar(require("./normalizeProjection.js"), exports);
 __exportStar(require("./preload.js"), exports);
-__exportStar(require("./prepareInsert.js"), exports);
+__exportStar(require("./prepareCreate.js"), exports);
 __exportStar(require("./reference.js"), exports);
 __exportStar(require("./traverseDocument.js"), exports);

package/dist/collection/index.mjs

@@ -6,6 +6,6 @@ export * from "./isValidCollection.mjs";
 export * from "./makePagination.mjs";
 export * from "./normalizeProjection.mjs";
 export * from "./preload.mjs";
-export * from "./prepareInsert.mjs";
+export * from "./prepareCreate.mjs";
 export * from "./reference.mjs";
 export * from "./traverseDocument.mjs";

package/dist/collection/{prepareInsert.d.ts → prepareCreate.d.ts}

@@ -1,3 +1,2 @@
 import type { Description } from '@aeriajs/types';
 export declare const prepareCreate: (doc: Record<string, unknown>, description: Description) => Record<string, unknown>;
-export declare const prepareUpdate: (doc: Record<string, unknown>) => Record<"$set" | "$unset", Record<string, unknown>>;

package/dist/collection/prepareCreate.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareCreate = void 0;
+const prepareCreate = (doc, description) => {
+    const result = {};
+    if (description.defaults) {
+        Object.assign(result, description.defaults);
+    }
+    Object.assign(result, doc);
+    return result;
+};
+exports.prepareCreate = prepareCreate;

package/dist/collection/prepareCreate.mjs

@@ -0,0 +1,9 @@
+"use strict";
+export const prepareCreate = (doc, description) => {
+  const result = {};
+  if (description.defaults) {
+    Object.assign(result, description.defaults);
+  }
+  Object.assign(result, doc);
+  return result;
+};

package/dist/collection/traverseDocument.d.ts

@@ -7,7 +7,7 @@ export type TraverseOptionsBase = {
     validateRequired?: Description['required'];
     fromProperties?: boolean;
     allowOperators?: boolean;
-    skipUndefined?: boolean;
+    undefinedToNull?: boolean;
     preserveHidden?: boolean;
     recurseDeep?: boolean;
     recurseReferences?: boolean;

package/dist/collection/traverseDocument.js

@@ -275,24 +275,38 @@ const recurse = async (target, ctx) => {
     for (const propName in entrypoint) {
         const value = target[propName];
         const property = getProperty(propName, ctx.property);
-        if (ctx.options.skipUndefined) {
-            if (value === undefined && !('getters' in ctx.options && ctx.options.getters && property && 'getter' in property)) {
-                continue;
+        if (propName === '_id') {
+            if (value) {
+                if (ctx.options.autoCast) {
+                    entries.push([
+                        propName,
+                        autoCast(value, {
+                            ...ctx,
+                            target,
+                            propName,
+                            property: {
+                                $ref: '',
+                            },
+                        }),
+                    ]);
+                }
+                else {
+                    entries.push([
+                        propName,
+                        value,
+                    ]);
+                }
             }
+            continue;
         }
-        if (ctx.options.autoCast && propName === '_id') {
-            entries.push([
-                propName,
-                autoCast(value, {
-                    ...ctx,
-                    target,
+        if (ctx.options.undefinedToNull) {
+            if (value === undefined) {
+                entries.push([
                     propName,
-                    property: {
-                        $ref: '',
-                    },
-                }),
-            ]);
-            continue;
+                    null,
+                ]);
+                continue;
+            }
         }
         if (!property) {
             if (value && (value.constructor === Object || value.constructor === Array)) {

package/dist/collection/traverseDocument.mjs

@@ -238,24 +238,37 @@ const recurse = async (target, ctx) => {
   for (const propName in entrypoint) {
     const value = target[propName];
     const property = getProperty(propName, ctx.property);
-    if (ctx.options.skipUndefined) {
-      if (value === void 0 && !("getters" in ctx.options && ctx.options.getters && property && "getter" in property)) {
-        continue;
+    if (propName === "_id") {
+      if (value) {
+        if (ctx.options.autoCast) {
+          entries.push([
+            propName,
+            autoCast(value, {
+              ...ctx,
+              target,
+              propName,
+              property: {
+                $ref: ""
+              }
+            })
+          ]);
+        } else {
+          entries.push([
+            propName,
+            value
+          ]);
+        }
       }
+      continue;
     }
-    if (ctx.options.autoCast && propName === "_id") {
-      entries.push([
-        propName,
-        autoCast(value, {
-          ...ctx,
-          target,
+    if (ctx.options.undefinedToNull) {
+      if (value === void 0) {
+        entries.push([
           propName,
-          property: {
-            $ref: ""
-          }
-        })
-      ]);
-      continue;
+          null
+        ]);
+        continue;
+      }
     }
     if (!property) {
       if (value && (value.constructor === Object || value.constructor === Array)) {

package/dist/functions/insert.js

@@ -29,15 +29,17 @@ const insertErrorSchema = () => (0, common_1.endpointErrorSchema)({
 });
 exports.insertErrorSchema = insertErrorSchema;
 const internalInsert = async (payload, context) => {
+    const isUpdate = !!('_id' in payload.what && payload.what._id);
     const { error, result: what } = await (0, index_js_1.traverseDocument)(payload.what, context.description, {
         recurseDeep: true,
         autoCast: true,
         validate: true,
-        validateRequired: '_id' in payload.what && payload.what._id
+        validateRequired: isUpdate
             ? []
             : context.description.required,
         moveFiles: true,
-        skipUndefined: true,
+        fromProperties: !isUpdate,
+        undefinedToNull: true,
         preserveHidden: true,
         context,
     });
@@ -66,11 +68,14 @@ const internalInsert = async (payload, context) => {
         newId = (await context.collection.model.insertOne(content)).insertedId;
     }
     else {
-        const content = (0, index_js_1.prepareUpdate)(what);
-        content.$set.updated_at = new Date();
         await context.collection.model.updateOne({
             _id: newId,
-        }, content);
+        }, {
+            $set: {
+                ...what,
+                updated_at: new Date(),
+            },
+        });
     }
     const inheritedContext = {
         ...context,

package/dist/functions/insert.mjs

@@ -3,7 +3,7 @@ import { ObjectId } from "mongodb";
 import { Result, HTTPStatus, ACError, ValidationErrorCode, TraverseError } from "@aeriajs/types";
 import { useSecurity, applyWriteMiddlewares } from "@aeriajs/security";
 import { endpointErrorSchema } from "@aeriajs/common";
-import { traverseDocument, prepareCreate, prepareUpdate } from "../collection/index.mjs";
+import { traverseDocument, prepareCreate } from "../collection/index.mjs";
 import { get } from "./get.mjs";
 export const insertErrorSchema = () => endpointErrorSchema({
   httpStatus: [
@@ -26,13 +26,15 @@ export const insertErrorSchema = () => endpointErrorSchema({
   ]
 });
 const internalInsert = async (payload, context) => {
+  const isUpdate = !!("_id" in payload.what && payload.what._id);
   const { error, result: what } = await traverseDocument(payload.what, context.description, {
     recurseDeep: true,
     autoCast: true,
     validate: true,
-    validateRequired: "_id" in payload.what && payload.what._id ? [] : context.description.required,
+    validateRequired: isUpdate ? [] : context.description.required,
     moveFiles: true,
-    skipUndefined: true,
+    fromProperties: !isUpdate,
+    undefinedToNull: true,
     preserveHidden: true,
     context
   });
@@ -58,11 +60,14 @@ const internalInsert = async (payload, context) => {
     });
     newId = (await context.collection.model.insertOne(content)).insertedId;
   } else {
-    const content = prepareUpdate(what);
-    content.$set.updated_at = /* @__PURE__ */ new Date();
     await context.collection.model.updateOne({
       _id: newId
-    }, content);
+    }, {
+      $set: {
+        ...what,
+        updated_at: /* @__PURE__ */ new Date()
+      }
+    });
   }
   const inheritedContext = {
     ...context,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.178",
+  "version": "0.0.180",
   "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.178",
-    "@aeriajs/common": "^0.0.108",
-    "@aeriajs/entrypoint": "^0.0.111",
-    "@aeriajs/http": "^0.0.122",
-    "@aeriajs/security": "^0.0.178",
-    "@aeriajs/types": "^0.0.91",
-    "@aeriajs/validation": "^0.0.111"
+    "@aeriajs/builtins": "^0.0.180",
+    "@aeriajs/common": "^0.0.110",
+    "@aeriajs/entrypoint": "^0.0.113",
+    "@aeriajs/http": "^0.0.124",
+    "@aeriajs/security": "^0.0.180",
+    "@aeriajs/types": "^0.0.93",
+    "@aeriajs/validation": "^0.0.113"
   },
   "dependencies": {
     "mongodb": "^6.5.0",

package/dist/collection/prepareInsert.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareUpdate = exports.prepareCreate = void 0;
-const prepareCreate = (doc, description) => {
-    const result = Object.assign({}, description.defaults || {});
-    for (const propName in doc) {
-        const value = doc[propName];
-        if (value === null || value === undefined) {
-            continue;
-        }
-        result[propName] = value;
-    }
-    return result;
-};
-exports.prepareCreate = prepareCreate;
-const prepareUpdate = (doc) => {
-    const result = {
-        $set: {},
-        $unset: {},
-    };
-    for (const propName in doc) {
-        const value = doc[propName];
-        if (value === null || value === undefined) {
-            result.$unset[propName] = value;
-            continue;
-        }
-        result.$set[propName] = value;
-    }
-    return result;
-};
-exports.prepareUpdate = prepareUpdate;

package/dist/collection/prepareInsert.mjs

@@ -1,27 +0,0 @@
-"use strict";
-export 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) {
-      continue;
-    }
-    result[propName] = value;
-  }
-  return result;
-};
-export const prepareUpdate = (doc) => {
-  const result = {
-    $set: {},
-    $unset: {}
-  };
-  for (const propName in doc) {
-    const value = doc[propName];
-    if (value === null || value === void 0) {
-      result.$unset[propName] = value;
-      continue;
-    }
-    result.$set[propName] = value;
-  }
-  return result;
-};