@blitznocode/blitz-orm 0.0.43 → 0.0.44

package/dist/index.d.ts

@@ -66,19 +66,21 @@ type BormRelation = BormEntity & {
         [key: string]: RoleField;
     };
 };
-type EnrichedBormEntity = Omit<BormEntity, 'linkFields' | 'idFields'> & {
+type EnrichedBormEntity = Omit<BormEntity, 'linkFields' | 'idFields' | 'dataFields'> & {
     extends?: string;
     idFields: string[];
     thingType: 'entity';
     name: string;
     computedFields: string[];
     linkFields?: EnrichedLinkField[];
+    dataFields?: EnrichedDataField[];
 };
-type EnrichedBormRelation = Omit<BormRelation, 'linkFields'> & {
+type EnrichedBormRelation = Omit<BormRelation, 'linkFields' | 'dataFields'> & {
     thingType: 'relation';
     name: string;
     computedFields: string[];
     linkFields?: EnrichedLinkField[];
+    dataFields?: EnrichedDataField[];
     roles: {
         [key: string]: EnrichedRoleField;
     };
@@ -147,6 +149,9 @@ type DataField = BormField & {
     validations?: any;
     dbConnectors?: [DBConnector, ...DBConnector[]];
 };
+type EnrichedDataField = DataField & {
+    dbPath: string;
+};
 type ThingType = 'entity' | 'relation' | 'attribute';
 type RightType = 'CREATE' | 'DELETE' | 'UPDATE' | 'LINK' | 'UNLINK';
 type ContentType = 'ID' | 'JSON' | 'COLOR' | 'BOOLEAN' | 'POINT' | 'FILE' | 'EMAIL' | 'PHONE' | 'WEEK_DAY' | 'DURATION' | 'HOUR' | 'TIME' | 'DATE' | 'RATING' | 'CURRENCY' | 'PERCENTAGE' | 'NUMBER_DECIMAL' | 'NUMBER' | 'URL' | 'PASSWORD' | 'LANGUAGE_TEXT' | 'RICH_TEXT' | 'TEXT';
@@ -247,4 +252,4 @@ declare class BormClient {
     close: () => Promise<void>;
 }
 
-export { BQLField, BQLFieldObj, BQLMutationBlock, BQLResponse, BQLResponseMulti, BQLResponseSingle, BormConfig, BormEntity, BormField, BormRelation, BormSchema, CardinalityType, ContentType, DBConnector, DBHandles, DataField, DataFilter, EnrichedBormEntity, EnrichedBormRelation, EnrichedBormSchema, EnrichedLinkField, EnrichedRoleField, FilledBQLMutationBlock, Filter, LinkField, LinkFilter, LinkedFieldWithThing, MiddleFilter, ParsedBQLMutation, ParsedBQLQuery, ProviderObject, RawBQLMutation, RawBQLQuery, RelationClassType, RightType, RoleField, TQLEntityMutation, TQLRequest, ThingType, BormClient as default };
+export { BQLField, BQLFieldObj, BQLMutationBlock, BQLResponse, BQLResponseMulti, BQLResponseSingle, BormConfig, BormEntity, BormField, BormRelation, BormSchema, CardinalityType, ContentType, DBConnector, DBHandles, DataField, DataFilter, EnrichedBormEntity, EnrichedBormRelation, EnrichedBormSchema, EnrichedDataField, EnrichedLinkField, EnrichedRoleField, FilledBQLMutationBlock, Filter, LinkField, LinkFilter, LinkedFieldWithThing, MiddleFilter, ParsedBQLMutation, ParsedBQLQuery, ProviderObject, RawBQLMutation, RawBQLQuery, RelationClassType, RightType, RoleField, TQLEntityMutation, TQLRequest, ThingType, BormClient as default };

package/dist/index.js

@@ -44,9 +44,12 @@ var defaultConfig = {
 var import_immer = __toESM(require("immer"));
 var import_object_traversal = require("object-traversal");
 var import_radash = require("radash");
-var oFind = (obj, fn) => Object.values(
-  Object.fromEntries(Object.entries(obj).filter(([k, v]) => fn(k, v)))
-)[0];
+var getDbPath = (thing, attribute, shared) => shared ? attribute : `${thing}\xB7${attribute}`;
+var getPath = (dbPath) => {
+  const parts = dbPath.split("\xB7");
+  return parts[parts.length - 1];
+};
+var oFind = (obj, fn) => Object.values(Object.fromEntries(Object.entries(obj).filter(([k, v]) => fn(k, v))))[0];
 var oFilter = (obj, fn) => Object.fromEntries(Object.entries(obj).filter(([k, v]) => fn(k, v)));
 var enrichSchema = (schema) => {
   const allLinkedFields = [];
@@ -54,12 +57,34 @@ var enrichSchema = (schema) => {
     schema,
     (draft) => (0, import_object_traversal.traverse)(
       draft,
-      ({ value, meta }) => {
-        if (meta.depth === 2 && value.extends) {
+      ({ key, value, meta }) => {
+        if (meta.depth !== 2) {
+          return;
+        }
+        if (key) {
+          value.dataFields = value.dataFields?.map((df) => ({
+            ...df,
+            dbPath: getDbPath(key, df.path, df.shared)
+          }));
+        }
+        if (value.extends) {
           const extendedSchema = draft.entities[value.extends] || draft.relations[value.extends];
           value;
           value.idFields = extendedSchema.idFields ? (value.idFields || []).concat(extendedSchema.idFields) : value.idFields;
-          value.dataFields = extendedSchema.dataFields ? (value.dataFields || []).concat(extendedSchema.dataFields) : value.dataFields;
+          value.dataFields = extendedSchema.dataFields ? (value.dataFields || []).concat(
+            extendedSchema.dataFields.map((df) => {
+              let deepExtendedThing = value.extends;
+              let deepSchema = schema.entities[deepExtendedThing] || schema.relations[deepExtendedThing];
+              while (!deepSchema.dataFields?.find((deepDf) => deepDf.path === df.path)) {
+                deepExtendedThing = deepSchema.extends;
+                deepSchema = schema.entities[deepExtendedThing] || schema.relations[deepExtendedThing];
+              }
+              return {
+                ...df,
+                dbPath: getDbPath(deepExtendedThing, df.path, df.shared)
+              };
+            })
+          ) : value.dataFields;
           value.linkFields = extendedSchema.linkFields ? (value.linkFields || []).concat(extendedSchema.linkFields) : value.linkFields;
           if ("roles" in extendedSchema) {
             const val = value;
@@ -84,9 +109,7 @@ var enrichSchema = (schema) => {
         if (!meta.nodePath) {
           throw new Error("No path");
         }
-        const pathArray = meta.nodePath.split(".");
-        const thingPath = pathArray[0];
-        const thing = pathArray[1];
+        const [thingPath, thing] = meta.nodePath.split(".");
         const thingType = thingPath === "entities" ? "entity" : thingPath === "relations" ? "relation" : "";
         return {
           thing,
@@ -120,9 +143,7 @@ var enrichSchema = (schema) => {
         if ("roles" in value) {
           const val = value;
           Object.entries(val.roles).forEach(([roleKey, role]) => {
-            role.playedBy = allLinkedFields.filter(
-              (x) => x.relation === key && x.plays === roleKey
-            ) || [];
+            role.playedBy = allLinkedFields.filter((x) => x.relation === key && x.plays === roleKey) || [];
           });
         }
         if ("linkFields" in value && value.linkFields) {
@@ -138,9 +159,7 @@ var enrichSchema = (schema) => {
               ];
               return;
             }
-            const allOppositeLinkFields = allLinkedFields.filter(
-              (x) => x.relation === linkField.relation && x.plays !== linkField.plays
-            ) || [];
+            const allOppositeLinkFields = allLinkedFields.filter((x) => x.relation === linkField.relation && x.plays !== linkField.plays) || [];
             linkField.oppositeLinkFieldsPlayedBy = allOppositeLinkFields;
             const { filter } = linkField;
             linkField.oppositeLinkFieldsPlayedBy = linkField.oppositeLinkFieldsPlayedBy.filter(
@@ -166,11 +185,7 @@ var enrichSchema = (schema) => {
         }
       }
       if (typeof value === "object" && "playedBy" in value) {
-        if ([
-          ...new Set(
-            value.playedBy?.map((x) => x.thing)
-          )
-        ].length > 1) {
+        if ([...new Set(value.playedBy?.map((x) => x.thing))].length > 1) {
           throw new Error(
             `Unsupported: roleFields can be only played by one thing. Role: ${key} path:${meta.nodePath}`
           );
@@ -240,22 +255,13 @@ var getCurrentFields = (currentSchema, node) => {
       return x.$path;
     throw new Error(" Wrongly structured query");
   }) : (0, import_radash.listify)(node, (k) => k);
-  const localFilterFields = !node.$filter ? [] : (0, import_radash.listify)(
-    node.$filter,
-    (k) => k.toString().startsWith("$") ? void 0 : k.toString()
-  ).filter((x) => x && availableDataFields?.includes(x));
-  const nestedFilterFields = !node.$filter ? [] : (0, import_radash.listify)(
-    node.$filter,
-    (k) => k.toString().startsWith("$") ? void 0 : k.toString()
-  ).filter(
-    (x) => x && [
-      ...availableRoleFields || [],
-      ...availableLinkFields || []
-    ]?.includes(x)
+  const localFilterFields = !node.$filter ? [] : (0, import_radash.listify)(node.$filter, (k) => k.toString().startsWith("$") ? void 0 : k.toString()).filter(
+    (x) => x && availableDataFields?.includes(x)
   );
-  const unidentifiedFields = [...usedFields, ...localFilterFields].filter(
-    (x) => !allowedFields.includes(x)
+  const nestedFilterFields = !node.$filter ? [] : (0, import_radash.listify)(node.$filter, (k) => k.toString().startsWith("$") ? void 0 : k.toString()).filter(
+    (x) => x && [...availableRoleFields || [], ...availableLinkFields || []]?.includes(x)
   );
+  const unidentifiedFields = [...usedFields, ...localFilterFields].filter((x) => !allowedFields.includes(x));
   const localFilters = !node.$filter ? {} : oFilter(node.$filter, (k, _v) => localFilterFields.includes(k));
   const nestedFilters = !node.$filter ? {} : oFilter(node.$filter, (k, _v) => nestedFilterFields.includes(k));
   return {
@@ -269,13 +275,9 @@ var getCurrentFields = (currentSchema, node) => {
   };
 };
 var getLocalFilters = (currentSchema, node) => {
-  const thingPath = currentSchema.defaultDBConnector.path || currentSchema.name;
   const localFilters = node.$localFilters && (0, import_radash.listify)(node.$localFilters, (k, v) => {
-    const currentDataField = currentSchema.dataFields?.find(
-      (x) => x.path === k
-    );
-    const dbField = currentDataField?.shared ? k : `${thingPath}\xB7${k}`;
-    return `has ${dbField} '${v}'`;
+    const currentDataField = currentSchema.dataFields?.find((x) => x.path === k);
+    return `has ${currentDataField?.dbPath} '${v}'`;
   });
   const localFiltersTql = localFilters?.length ? `, ${localFilters.join(",")}` : "";
   return localFiltersTql;
@@ -301,9 +303,7 @@ var extractEntities = (conceptMapGroups, schema) => {
       if (!attribute) {
         return [];
       }
-      const nameParts = attribute.type.label.name.split("\xB7");
-      const attributeName = nameParts[nameParts.length - 1];
-      return [attributeName, attribute.value];
+      return [getPath(attribute.type.label.name), attribute.value];
     });
     const entity = Object.fromEntries(entityAttributes);
     return {
@@ -355,9 +355,7 @@ var parseTQLRes = async (req, res) => {
   const { query } = bqlRequest;
   if (!query) {
     if (rawTqlRes.insertions?.length === 0 && !tqlRequest?.deletions) {
-      throw new Error(
-        "Nothing has changed in DB, probably one of the ids specified in the mutation does not exist"
-      );
+      throw new Error("Nothing has changed in DB, probably one of the ids specified in the mutation does not exist");
     }
     const { mutation } = bqlRequest;
     if (!mutation) {
@@ -365,14 +363,10 @@ var parseTQLRes = async (req, res) => {
     }
     const expected = [...mutation.things, ...mutation.edges];
     const result = expected.map((x) => {
-      const currentNode = rawTqlRes.insertions?.[0].get(
-        `${x.$tempId || x.$id}`
-      );
+      const currentNode = rawTqlRes.insertions?.[0].get(`${x.$tempId || x.$id}`);
       if (x.$op === "create" || x.$op === "update" || x.$op === "link") {
         if (!currentNode?.asThing().iid) {
-          throw new Error(
-            `Thing not received on mutation: ${JSON.stringify(x)}`
-          );
+          throw new Error(`Thing not received on mutation: ${JSON.stringify(x)}`);
         }
         const dbIdd = currentNode?.asThing().iid;
         if (config.mutation?.noMetadata) {
@@ -404,9 +398,7 @@ var parseTQLRes = async (req, res) => {
       currentRelSchema.roles,
       (_k, v) => {
         if ([...new Set(v.playedBy?.map((x) => x.thing))].length !== 1) {
-          throw new Error(
-            "a role can be played by two entities throws the same relation"
-          );
+          throw new Error("a role can be played by two entities throws the same relation");
         }
         if (!v.playedBy)
           throw new Error("Role not being played by nobody");
@@ -541,9 +533,7 @@ var filterChildrenEntities = (things, ids, node, path) => things.map(([id, entit
     return id;
   if (node.$fields.includes(path))
     return id;
-  const currentFieldConf = node.$fields.find(
-    (f) => (0, import_radash4.isObject)(f) && f.$path === path
-  );
+  const currentFieldConf = node.$fields.find((f) => (0, import_radash4.isObject)(f) && f.$path === path);
   if (currentFieldConf) {
     const onlyMetadataEntity = {
       ...oFilter(entity, (k, _v) => k.startsWith("$"))
@@ -638,12 +628,7 @@ var buildBQLTree = async (req, res) => {
                 const thingEntities = cache.entities.get(x);
                 if (!thingEntities)
                   return [];
-                return filterChildrenEntities(
-                  [...thingEntities],
-                  uniqueLinkedIds,
-                  value,
-                  rolePath
-                );
+                return filterChildrenEntities([...thingEntities], uniqueLinkedIds, value, rolePath);
               });
               if (children?.length) {
                 if (children.length === 1 && children[0] === value.$id) {
@@ -667,15 +652,11 @@ var buildBQLTree = async (req, res) => {
             const tunnel = linkField.oppositeLinkFieldsPlayedBy;
             if (linkField.target === "relation") {
               const targetRelation = tunnel[0];
-              const targetRelationThings = cache.relations.get(
-                linkField.relation
-              );
+              const targetRelationThings = cache.relations.get(linkField.relation);
               const matchedLinks = !targetRelationThings ? [] : [...targetRelationThings].filter((link) => {
                 return currentIds.includes(link.get(thingName));
               }).map((x) => x.get(targetRelation.thing));
-              const targetRelationEntities = cache.entities.get(
-                targetRelation.thing
-              );
+              const targetRelationEntities = cache.entities.get(targetRelation.thing);
               if (!targetRelationEntities)
                 return null;
               const children = filterChildrenEntities(
@@ -769,9 +750,7 @@ var buildTQLQuery = async (req) => {
   const queryStr = `match $${thingPath}  isa ${thingPath}, has attribute $attribute ${localFiltersTql} ${idFilter} group $${thingPath};`;
   const rolesObj = allRoles.map((role) => {
     if (!role.schema.playedBy || [...new Set(role.schema.playedBy?.map((x) => x.thing))].length !== 1) {
-      throw new Error(
-        "Unsupported: Role played by multiple linkfields or none"
-      );
+      throw new Error("Unsupported: Role played by multiple linkfields or none");
     }
     const roleThingName = role.schema.playedBy[0].thing;
     return {
@@ -816,16 +795,9 @@ var parseBQLQuery = async (req) => {
   if (!currentSchema) {
     throw new Error(`Thing '${rawBqlQuery}' not found in schema`);
   }
-  const { unidentifiedFields, localFilters, nestedFilters } = getCurrentFields(
-    currentSchema,
-    rawBqlQuery
-  );
+  const { unidentifiedFields, localFilters, nestedFilters } = getCurrentFields(currentSchema, rawBqlQuery);
   if (unidentifiedFields && unidentifiedFields.length > 0) {
-    throw new Error(
-      `Unknown fields: [${unidentifiedFields.join(",")}] in ${JSON.stringify(
-        rawBqlQuery
-      )}`
-    );
+    throw new Error(`Unknown fields: [${unidentifiedFields.join(",")}] in ${JSON.stringify(rawBqlQuery)}`);
   }
   req.bqlRequest = {
     query: {
@@ -920,9 +892,7 @@ var dispatchPipeline = async (req, res) => {
   if (!$fields || !Array.isArray($fields)) {
     return;
   }
-  const expandedLinkAndRoleFields = $fields.filter(
-    (f) => typeof f !== "string" && f.$path
-  );
+  const expandedLinkAndRoleFields = $fields.filter((f) => typeof f !== "string" && f.$path);
   const nestedThingsByLF = $thing.linkFields?.filter(
     (linkField) => expandedLinkAndRoleFields.findIndex(
       (expanded) => expanded.$path === linkField.path
@@ -997,14 +967,12 @@ var buildTQLMutation = async (req) => {
     const attributes = (0, import_radash7.listify)(node, (k, v) => {
       if (k.startsWith("$") || k === idField || !v)
         return "";
-      const currentDataField = currentSchema.dataFields?.find(
-        (x) => x.path === k
-      );
+      const currentDataField = currentSchema.dataFields?.find((x) => x.path === k);
       const fieldDbPath = currentDataField?.path;
       if (!fieldDbPath) {
         return ``;
       }
-      const dbField = currentDataField.shared ? fieldDbPath : `${thingDbPath}\xB7${fieldDbPath}`;
+      const dbField = currentDataField.dbPath;
       if (["TEXT", "ID", "EMAIL"].includes(currentDataField.contentType)) {
         return `has ${dbField} '${v}'`;
       }
@@ -1020,28 +988,22 @@ var buildTQLMutation = async (req) => {
         }
         return `has ${dbField} ${new Date(v).toISOString().replace("Z", "")}`;
       }
-      throw new Error(
-        `Unsupported contentType ${currentDataField.contentType}`
-      );
+      throw new Error(`Unsupported contentType ${currentDataField.contentType}`);
     }).filter((x) => x);
     const attributesVar = `$${id}-atts`;
     const matchAttributes = (0, import_radash7.listify)(node, (k, v) => {
       if (k.startsWith("$") || k === idField || !v)
         return "";
-      const currentDataField = currentSchema.dataFields?.find(
-        (x) => x.path === k
-      );
+      const currentDataField = currentSchema.dataFields?.find((x) => x.path === k);
       const fieldDbPath = currentDataField?.path;
       if (!fieldDbPath) {
         return ``;
       }
-      const dbField = currentDataField.shared ? fieldDbPath : `${thingDbPath}\xB7${fieldDbPath}`;
+      const dbField = currentDataField.dbPath;
       return `{${attributesVar} isa ${dbField};}`;
     }).filter((x) => x);
     const idFieldValue = node[idField] || node.$id;
-    const idDataField = currentSchema.dataFields?.find(
-      (x) => x.path === idField
-    );
+    const idDataField = currentSchema.dataFields?.find((x) => x.path === idField);
     const idDefaultValue = node.$op === "create" ? idDataField?.default?.value() : null;
     const idValue = idFieldValue || idDefaultValue;
     const idAttributes = idValue ? [`has ${idField} '${idValue}'`] : [];
@@ -1099,9 +1061,7 @@ var buildTQLMutation = async (req) => {
       }
       return { path: roleDbPath, id: v };
     }).filter((x) => x).flat();
-    const fromRoleFieldsTql = fromRoleFields.map(
-      (x) => x ? `${x.path}: $${x.id}` : ""
-    );
+    const fromRoleFieldsTql = fromRoleFields.map((x) => x ? `${x.path}: $${x.id}` : "");
     const roles = fromRoleFields.length > 0 ? `( ${fromRoleFieldsTql.join(" , ")} )` : "";
     const relationTql = !roles ? "" : `$${id} ${roles} ${node[Symbol.for("edgeType")] === "linkField" ? `isa ${relationDbPath}` : ""}`;
     const getInsertions = () => {
@@ -1133,17 +1093,11 @@ var buildTQLMutation = async (req) => {
     if (Array.isArray(nodes)) {
       return nodes.map((x) => {
         const { insertionMatch: insertionMatch2, deletionMatch: deletionMatch2, insertion: insertion2, deletion: deletion2 } = typeQL(x);
-        return (0, import_radash7.shake)(
-          { insertionMatch: insertionMatch2, deletionMatch: deletionMatch2, insertion: insertion2, deletion: deletion2 },
-          (z) => !z
-        );
+        return (0, import_radash7.shake)({ insertionMatch: insertionMatch2, deletionMatch: deletionMatch2, insertion: insertion2, deletion: deletion2 }, (z) => !z);
       }).filter((y) => y);
     }
     const { insertionMatch, deletionMatch, insertion, deletion } = typeQL(nodes);
-    return (0, import_radash7.shake)(
-      { insertionMatch, deletionMatch, insertion, deletion },
-      (z) => !z
-    );
+    return (0, import_radash7.shake)({ insertionMatch, deletionMatch, insertion, deletion }, (z) => !z);
   };
   const nodeOperations = toTypeQL(mutation.things);
   const arrayNodeOperations = Array.isArray(nodeOperations) ? nodeOperations : [nodeOperations];
@@ -1193,16 +1147,11 @@ var parseBQLMutation = async (req) => {
             ...linkFields.map((x) => ({ fieldType: "linkField", path: x })),
             ...roleFields.map((x) => ({ fieldType: "roleField", path: x }))
           ]?.forEach((currentField) => {
-            const currentLinkFieldSchema = currentSchema.linkFields?.find(
-              (x) => x.path === currentField.path
-            );
+            const currentLinkFieldSchema = currentSchema.linkFields?.find((x) => x.path === currentField.path);
             const currentValue = value[currentField.path];
             if (currentValue === void 0)
               return;
-            const currentRoleFieldSchema = "roles" in currentSchema ? oFind(
-              currentSchema.roles,
-              (k) => k === currentField.path
-            ) : null;
+            const currentRoleFieldSchema = "roles" in currentSchema ? oFind(currentSchema.roles, (k) => k === currentField.path) : null;
             const currentFieldSchema = currentLinkFieldSchema || currentRoleFieldSchema;
             if (currentRoleFieldSchema && [...new Set(currentRoleFieldSchema.playedBy?.map((x) => x.thing))].length !== 1) {
               throw new Error(
@@ -1223,24 +1172,15 @@ var parseBQLMutation = async (req) => {
             };
             const relation = getCurrentRelation();
             const relationSchema = relation === "$self" ? currentSchema : schema.relations[relation];
-            const currentFieldRole = oFind(
-              relationSchema.roles,
-              (k, _v) => k === currentField.path
-            );
+            const currentFieldRole = oFind(relationSchema.roles, (k, _v) => k === currentField.path);
             if (currentFieldRole?.playedBy?.length === 0)
-              throw new Error(
-                `unused role: ${currentPath}.${currentField.path}`
-              );
+              throw new Error(`unused role: ${currentPath}.${currentField.path}`);
             if (!currentFieldSchema) {
               throw new Error(`Field ${currentField.path} not found in schema`);
             }
             const oppositeFields = currentLinkFieldSchema?.oppositeLinkFieldsPlayedBy || currentRoleFieldSchema?.playedBy;
             if (!oppositeFields) {
-              throw new Error(
-                `No opposite fields found for ${JSON.stringify(
-                  currentFieldSchema
-                )}`
-              );
+              throw new Error(`No opposite fields found for ${JSON.stringify(currentFieldSchema)}`);
             }
             if ([...new Set(oppositeFields?.map((x) => x.thing))].length > 1)
               throw new Error(
@@ -1252,9 +1192,7 @@ var parseBQLMutation = async (req) => {
               value[currentField.path] = { $op: "unlink" };
             }
             if (currentFieldSchema.cardinality === "ONE" && Array.isArray(currentValue)) {
-              throw new Error(
-                `Can't have an array in a cardinality === ONE link field`
-              );
+              throw new Error(`Can't have an array in a cardinality === ONE link field`);
             }
             if (currentValue.$entity || currentValue.$relation)
               return;
@@ -1317,105 +1255,81 @@ var parseBQLMutation = async (req) => {
   const fillBlocks = (blocks) => {
     return (0, import_immer3.default)(
       blocks,
-      (draft) => (0, import_object_traversal3.traverse)(
-        draft,
-        ({ parent, key, value: val, meta }) => {
-          if ((0, import_radash8.isObject)(val)) {
-            if (Object.keys(val).length === 0) {
-              throw new Error("Empty object!");
-            }
-            const value = val;
-            const nodePathArray = meta.nodePath?.split(".");
-            const notRoot = nodePathArray?.filter((x) => Number.isNaN(parseInt(x, 10))).join(".");
-            const currentSchema = getCurrentSchema(schema, value);
-            const { unidentifiedFields, dataFields, roleFields, linkFields } = getCurrentFields(currentSchema, value);
-            const hasUpdatedDataFields = Object.keys(value).some(
-              (x) => dataFields?.includes(x)
-            );
-            const hasUpdatedChildren = Object.keys(value).some(
-              (x) => [...roleFields, ...linkFields]?.includes(x)
-            );
-            const getOp = () => {
-              if (value.$op)
-                return value.$op;
-              if ((value.$id || value.$filter) && hasUpdatedDataFields)
-                return "update";
-              if ((value.$id || value.$filter) && notRoot && !hasUpdatedDataFields && !hasUpdatedChildren)
-                return "link";
-              if (!value.$filter && !value.$id)
-                return "create";
-              if ((value.$id || value.$filter) && !hasUpdatedDataFields && hasUpdatedChildren)
-                return "noop";
-              throw new Error("Wrong op");
-            };
-            if (!value.$op)
-              value.$op = getOp();
-            if (!parent)
-              value.$parentKey = "";
-            if (!(value.$id || value.$tempId || value.$filter) && ["delete", "link", "update", "unlink"].includes(value.$op)) {
-              throw new Error(
-                "Targeted operations (update, delete, link & unlink) require an $id or a $filter"
-              );
-            }
-            if (typeof parent === "object") {
-              const ArParent = Array.isArray(parent);
-              if (ArParent)
-                value[Symbol.for("index")] = key;
-              value[Symbol.for("path")] = meta.nodePath;
-              value[Symbol.for("isRoot")] = !notRoot;
-              value[Symbol.for("depth")] = notRoot?.split(".").length;
-            }
-            if (!value.$entity && !value.$relation) {
-              throw new Error(
-                `Node ${JSON.stringify(value)} without $entity/$relation`
-              );
-            }
-            const { idFields, computedFields } = currentSchema;
-            if (!idFields)
-              throw new Error("No idFields found");
-            const idField = idFields[0];
-            if (value[idField] && !value.$id) {
-              value.$id = value[idField];
+      (draft) => (0, import_object_traversal3.traverse)(draft, ({ parent, key, value: val, meta }) => {
+        if ((0, import_radash8.isObject)(val)) {
+          if (Object.keys(val).length === 0) {
+            throw new Error("Empty object!");
+          }
+          const value = val;
+          const nodePathArray = meta.nodePath?.split(".");
+          const notRoot = nodePathArray?.filter((x) => Number.isNaN(parseInt(x, 10))).join(".");
+          const currentSchema = getCurrentSchema(schema, value);
+          const { unidentifiedFields, dataFields, roleFields, linkFields } = getCurrentFields(currentSchema, value);
+          const hasUpdatedDataFields = Object.keys(value).some((x) => dataFields?.includes(x));
+          const hasUpdatedChildren = Object.keys(value).some((x) => [...roleFields, ...linkFields]?.includes(x));
+          const getOp = () => {
+            if (value.$op)
+              return value.$op;
+            if ((value.$id || value.$filter) && hasUpdatedDataFields)
+              return "update";
+            if ((value.$id || value.$filter) && notRoot && !hasUpdatedDataFields && !hasUpdatedChildren)
+              return "link";
+            if (!value.$filter && !value.$id)
+              return "create";
+            if ((value.$id || value.$filter) && !hasUpdatedDataFields && hasUpdatedChildren)
+              return "noop";
+            throw new Error("Wrong op");
+          };
+          if (!value.$op)
+            value.$op = getOp();
+          if (!parent)
+            value.$parentKey = "";
+          if (!(value.$id || value.$tempId || value.$filter) && ["delete", "link", "update", "unlink"].includes(value.$op)) {
+            throw new Error("Targeted operations (update, delete, link & unlink) require an $id or a $filter");
+          }
+          if (typeof parent === "object") {
+            const ArParent = Array.isArray(parent);
+            if (ArParent)
+              value[Symbol.for("index")] = key;
+            value[Symbol.for("path")] = meta.nodePath;
+            value[Symbol.for("isRoot")] = !notRoot;
+            value[Symbol.for("depth")] = notRoot?.split(".").length;
+          }
+          if (!value.$entity && !value.$relation) {
+            throw new Error(`Node ${JSON.stringify(value)} without $entity/$relation`);
+          }
+          const { idFields, computedFields } = currentSchema;
+          if (!idFields)
+            throw new Error("No idFields found");
+          const idField = idFields[0];
+          if (value[idField] && !value.$id) {
+            value.$id = value[idField];
+          }
+          const filledFields = (0, import_radash8.listify)(value, (attKey, v) => v ? attKey : void 0);
+          const missingComputedFields = computedFields.filter((x) => !filledFields.includes(x));
+          missingComputedFields.forEach((fieldPath) => {
+            const currentFieldDef = currentSchema.dataFields?.find((x) => x.path === fieldPath);
+            const currentLinkDef = currentSchema.linkFields?.find((x) => x.path === fieldPath);
+            const currentLinkedDef = currentLinkDef?.oppositeLinkFieldsPlayedBy[0];
+            const currentRoleDef = "roles" in currentSchema ? oFind(currentSchema.roles, (k, _v) => k === fieldPath) : void 0;
+            const currentDef = currentFieldDef || currentLinkedDef || currentRoleDef;
+            if (!currentDef) {
+              throw new Error(`no field Def for ${fieldPath}`);
             }
-            const filledFields = (0, import_radash8.listify)(
-              value,
-              (attKey, v) => v ? attKey : void 0
-            );
-            const missingComputedFields = computedFields.filter(
-              (x) => !filledFields.includes(x)
-            );
-            missingComputedFields.forEach((fieldPath) => {
-              const currentFieldDef = currentSchema.dataFields?.find(
-                (x) => x.path === fieldPath
-              );
-              const currentLinkDef = currentSchema.linkFields?.find(
-                (x) => x.path === fieldPath
-              );
-              const currentLinkedDef = currentLinkDef?.oppositeLinkFieldsPlayedBy[0];
-              const currentRoleDef = "roles" in currentSchema ? oFind(currentSchema.roles, (k, _v) => k === fieldPath) : void 0;
-              const currentDef = currentFieldDef || currentLinkedDef || currentRoleDef;
-              if (!currentDef) {
-                throw new Error(`no field Def for ${fieldPath}`);
+            if (fieldPath === idField && value.$op === "create" && !value[fieldPath]) {
+              const defaultValue = "default" in currentDef ? currentDef.default?.value() : void 0;
+              if (!defaultValue) {
+                throw new Error(`No default value for ${fieldPath}`);
               }
-              if (fieldPath === idField && value.$op === "create" && !value[fieldPath]) {
-                const defaultValue = "default" in currentDef ? currentDef.default?.value() : void 0;
-                if (!defaultValue) {
-                  throw new Error(`No default value for ${fieldPath}`);
-                }
-                value[fieldPath] = defaultValue;
-                value.$id = defaultValue;
-              }
-            });
-            if (unidentifiedFields.length > 0) {
-              throw new Error(
-                `Unknown fields: [${unidentifiedFields.join(
-                  ","
-                )}] in ${JSON.stringify(value)}`
-              );
+              value[fieldPath] = defaultValue;
+              value.$id = defaultValue;
             }
+          });
+          if (unidentifiedFields.length > 0) {
+            throw new Error(`Unknown fields: [${unidentifiedFields.join(",")}] in ${JSON.stringify(value)}`);
           }
         }
-      )
+      })
     );
   };
   const filledBQLMutation = fillBlocks(withObjects);
@@ -1450,9 +1364,7 @@ var parseBQLMutation = async (req) => {
           if (value.$op === "link" || value.$op === "unlink") {
             if (value.$id || value.$filter) {
               if (value.$tempId) {
-                throw new Error(
-                  "can't specify a existing and a new element at once. Use an id/filter or a tempId"
-                );
+                throw new Error("can't specify a existing and a new element at once. Use an id/filter or a tempId");
               }
               nodes.push({ ...value, $op: "noop" });
             }
@@ -1502,10 +1414,7 @@ var parseBQLMutation = async (req) => {
               "An id must be specified either in the mutation or has tu have a default value in the schema"
             );
           }
-          const rolesObjFiltered = oFilter(
-            val,
-            (k, _v) => roleFieldPaths.includes(k)
-          );
+          const rolesObjFiltered = oFilter(val, (k, _v) => roleFieldPaths.includes(k));
           const rolesObjOnlyIds = (0, import_radash8.mapEntries)(rolesObjFiltered, (k, v) => {
             return [k, v.$id || v];
           });
@@ -1538,26 +1447,18 @@ var parseBQLMutation = async (req) => {
                   (x) => x.$op === "link" || x.$op === "create"
                 )
               );
-              const rolesWithLinksFiltered = (0, import_radash8.mapEntries)(
-                rolesWithLinks,
-                (k, v) => [
-                  k,
-                  v.filter((x) => x.$op === "link" || x.$op === "create").map((y) => y.$id)
-                ]
-              );
+              const rolesWithLinksFiltered = (0, import_radash8.mapEntries)(rolesWithLinks, (k, v) => [
+                k,
+                v.filter((x) => x.$op === "link" || x.$op === "create").map((y) => y.$id)
+              ]);
               const rolesWithUnlinks = oFilter(
                 rolesObjOnlyIds,
-                (_k, v) => v.some(
-                  (x) => x.$op === "unlink" || x.$op === "delete"
-                )
-              );
-              const rolesWithUnlinksFiltered = (0, import_radash8.mapEntries)(
-                rolesWithUnlinks,
-                (k, v) => [
-                  k,
-                  v.filter((x) => x.$op === "unlink" || x.$op === "delete").map((y) => y.$id)
-                ]
+                (_k, v) => v.some((x) => x.$op === "unlink" || x.$op === "delete")
               );
+              const rolesWithUnlinksFiltered = (0, import_radash8.mapEntries)(rolesWithUnlinks, (k, v) => [
+                k,
+                v.filter((x) => x.$op === "unlink" || x.$op === "delete").map((y) => y.$id)
+              ]);
               const rolesWithReplaces = {};
               [
                 { op: "link", obj: rolesWithLinksFiltered },
@@ -1585,17 +1486,13 @@ var parseBQLMutation = async (req) => {
   };
   const [parsedThings, parsedEdges] = listNodes(filledBQLMutation);
   const mergedEdges = parsedEdges.reduce((acc, curr) => {
-    const existingEdge = acc.find(
-      (r) => r.$id === curr.$id && r.$relation === curr.$relation
-    );
+    const existingEdge = acc.find((r) => r.$id === curr.$id && r.$relation === curr.$relation);
     if (existingEdge) {
       const newRelation = {
         ...existingEdge,
         ...curr
       };
-      const newAcc = acc.filter(
-        (r) => r.$id !== curr.$id || r.$relation !== curr.$relation
-      );
+      const newAcc = acc.filter((r) => r.$id !== curr.$id || r.$relation !== curr.$relation);
       return [...newAcc, newRelation];
     }
     return [...acc, curr];
@@ -1643,13 +1540,7 @@ var runTQLMutation = async (req, res) => {
 
 // src/pipeline/pipeline.ts
 var Pipelines = {
-  query: [
-    parseBQLQuery,
-    buildTQLQuery,
-    runTQLQuery,
-    parseTQLRes,
-    dispatchPipeline
-  ],
+  query: [parseBQLQuery, buildTQLQuery, runTQLQuery, parseTQLRes, dispatchPipeline],
   mutation: [parseBQLMutation, buildTQLMutation, runTQLMutation, parseTQLRes]
 };
 var finalPipeline = [buildBQLTree];
@@ -1658,12 +1549,7 @@ var runPipeline = async (pipeline, req, res = {}, root = true) => {
     const next = await operation(req, res);
     if (next && Array.isArray(next)) {
       for (const nextPipeline of next) {
-        await runPipeline(
-          nextPipeline.pipeline,
-          nextPipeline.req,
-          nextPipeline.res,
-          false
-        );
+        await runPipeline(nextPipeline.pipeline, nextPipeline.req, nextPipeline.res, false);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitznocode/blitz-orm",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -53,12 +53,6 @@
     "tsup": "^6.5.0",
     "typescript": "^4.9.5"
   },
-  "peerDependencies": {},
-  "peerDependenciesMeta": {
-    "essentials": {
-      "optional": true
-    }
-  },
   "description": "Blitz-orm is a public package that can be open-sourced",
   "bugs": {
     "url": "https://github.com/Blitzapps/blitz-orm/issues"
@@ -68,7 +62,9 @@
     "test": "tests"
   },
   "keywords": [
-    "ORM"
+    "ORM",
+    "database",
+    "graph-database"
   ],
   "author": "blitznocode"
 }