wabe 0.6.3 → 0.6.4

package/dist/index.d.ts

@@ -408,8 +408,18 @@ export declare class DatabaseController<T extends WabeTypes> {
 		}>;
 		selectWithoutPointers: Select;
 	};
-	_isRelationField(originClassName: string, context: WabeContext<T>, pointerClassName?: string): boolean | undefined;
-	_isPointerField(originClassName: string, context: WabeContext<T>, pointerClassName?: string): boolean | undefined;
+	_isRelationField({ pointerField, currentClassName, context, originClassName, }: {
+		pointerField: string;
+		originClassName: string;
+		context: WabeContext<T>;
+		currentClassName?: string;
+	}): boolean | undefined;
+	_isPointerField({ pointerField, currentClassName, context, originClassName, }: {
+		originClassName: string;
+		context: WabeContext<T>;
+		pointerField: string;
+		currentClassName?: string;
+	}): boolean | undefined;
 	_getWhereObjectWithPointerOrRelation<U extends keyof T["types"]>(className: U, where: WhereType<T, U>, context: WabeContext<T>): Promise<Partial<{
 		[P in keyof T["types"][U]]: (T["types"][U][P] extends infer T_1 ? T_1 extends T["types"][U][P] ? T_1 extends string | number | boolean ? true : false : never : never) extends false ? Partial<T["types"][U][P]> extends infer T_2 ? {
 			[P_1 in keyof T_2]: (Partial<T["types"][U][P]>[P_1] extends infer T_3 ? T_3 extends Partial<T["types"][U][P]>[P_1] ? T_3 extends string | number | boolean ? true : false : never : never) extends false ? Partial<Partial<T["types"][U][P]>[P_1]> extends infer T_4 ? {

package/dist/index.js

@@ -59500,15 +59500,25 @@ class DatabaseController2 {
       };
     }, { pointers: {}, selectWithoutPointers: {} });
   }
-  _isRelationField(originClassName, context, pointerClassName) {
-    if (!pointerClassName)
+  _isRelationField({
+    pointerField,
+    currentClassName,
+    context,
+    originClassName
+  }) {
+    if (!currentClassName)
       return false;
-    return context.wabe.config.schema?.classes?.some((c) => c.name.toLowerCase() === originClassName.toLowerCase() && Object.values(c.fields).find((field) => field.type === "Relation" && field.class.toLowerCase() === pointerClassName.toLowerCase()));
+    return context.wabe.config.schema?.classes?.some((c) => c.name.toLowerCase() === originClassName.toLowerCase() && Object.entries(c.fields).find(([fieldName, field]) => fieldName === pointerField && field.type === "Relation" && field.class.toLowerCase() === currentClassName.toLowerCase()));
   }
-  _isPointerField(originClassName, context, pointerClassName) {
-    if (!pointerClassName)
+  _isPointerField({
+    pointerField,
+    currentClassName,
+    context,
+    originClassName
+  }) {
+    if (!currentClassName)
       return false;
-    return context.wabe.config.schema?.classes?.some((c) => c.name.toLowerCase() === originClassName.toLowerCase() && Object.values(c.fields).find((field) => field.type === "Pointer" && field.class.toLowerCase() === pointerClassName.toLowerCase()));
+    return context.wabe.config.schema?.classes?.some((c) => c.name.toLowerCase() === originClassName.toLowerCase() && Object.entries(c.fields).find(([fieldName, field]) => fieldName === pointerField && field.type === "Pointer" && field.class.toLowerCase() === currentClassName.toLowerCase()));
   }
   async _getWhereObjectWithPointerOrRelation(className, where, context) {
     const whereKeys = Object.keys(where);
@@ -59629,7 +59639,12 @@ class DatabaseController2 {
   }) {
     return Object.entries(pointers).reduce(async (acc, [pointerField, { className: currentClassName, select: currentSelect }]) => {
       const accObject = await acc;
-      const isPointer = this._isPointerField(originClassName, context, currentClassName);
+      const isPointer = this._isPointerField({
+        originClassName,
+        context,
+        currentClassName,
+        pointerField
+      });
       if (isPointer) {
         if (!object[pointerField]) {
           return {
@@ -59649,8 +59664,13 @@ class DatabaseController2 {
           [pointerField]: objectOfPointerClass
         };
       }
-      const isRelation = this._isRelationField(originClassName, context, currentClassName);
-      if (isRelation) {
+      const isRelation = this._isRelationField({
+        originClassName,
+        context,
+        currentClassName,
+        pointerField
+      });
+      if (isRelation && object[pointerField]) {
         const relationObjects = await this.getObjects({
           className: currentClassName,
           select: currentSelect,
@@ -64209,8 +64229,6 @@ var add = async ({
 }) => {
   if (typeOfExecution === "create")
     return add2;
-  const classInSchema = getClassFromClassName(className, context.wabe.config);
-  const fieldInClass = classInSchema.fields[fieldName];
   if (typeOfExecution === "update" && id) {
     const currentValue = await context.wabe.controllers.database.getObject({
       className,
@@ -64222,22 +64240,14 @@ var add = async ({
   }
   if (typeOfExecution === "updateMany" && where) {
     const allObjectsMatchedWithWhere = await context.wabe.controllers.database.getObjects({
-      className: fieldInClass.class,
+      className,
       where,
       select: { [fieldName]: true },
       context
     });
-    await Promise.all(allObjectsMatchedWithWhere.map((object) => {
+    return Promise.all(allObjectsMatchedWithWhere.flatMap((object) => {
       const currentValue = object[fieldName];
-      return context.wabe.controllers.database.updateObject({
-        className: classInSchema.fields[fieldName].class,
-        id: object.id,
-        data: {
-          [fieldName]: [...currentValue || [], ...add2]
-        },
-        context,
-        select: {}
-      });
+      return [...currentValue || [], ...add2];
     }));
   }
 };
@@ -64252,6 +64262,7 @@ var remove = async ({
 }) => {
   if (typeOfExecution === "create")
     return [];
+  const classInSchema = getClassFromClassName(className, context.wabe.config);
   if (typeOfExecution === "update" && id) {
     const currentValue = await context.wabe.controllers.database.getObject({
       className,
@@ -64260,6 +64271,12 @@ var remove = async ({
       context
     });
     const olderValues = [currentValue?.id || ""];
+    await context.wabe.controllers.database.deleteObjects({
+      className: classInSchema.fields[fieldName].class,
+      where: { id: { in: remove2 } },
+      context,
+      select: {}
+    });
     return olderValues.filter((olderValue) => !remove2.includes(olderValue));
   }
   if (typeOfExecution === "updateMany" && where) {
@@ -64269,17 +64286,15 @@ var remove = async ({
       select: { id: true },
       context
     });
-    await Promise.all(allObjectsMatchedWithWhere.map(async (object) => {
+    await context.wabe.controllers.database.deleteObjects({
+      className: classInSchema.fields[fieldName].class,
+      where: { id: { in: remove2 } },
+      context,
+      select: {}
+    });
+    return Promise.all(allObjectsMatchedWithWhere.flatMap((object) => {
       const olderValues = object[fieldName]?.[fieldName] || [];
-      return context.wabe.controllers.database.updateObject({
-        className,
-        id: object.id,
-        data: {
-          [fieldName]: olderValues.filter((olderValue) => !remove2.includes(olderValue))
-        },
-        context,
-        select: {}
-      });
+      return olderValues.filter((olderValue) => !remove2.includes(olderValue));
     }));
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wabe",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Your backend in minutes not days",
   "homepage": "https://wabe.dev",
   "author": {