@dnax/core 0.8.9 → 0.8.11

package/driver/mongo/rest.ts

@@ -108,6 +108,7 @@ class useRest {
 
     if (col?.schema) {
       let schema = col.schema as Schema;
+      schema = schema;
 
       if (options.partial) {
         let partialSchema = schema.fork(
@@ -116,9 +117,13 @@ class useRest {
             return sc.optional();
           }
         );
-        control = partialSchema.validate(data) as any;
+        control = partialSchema.validate(data, {
+          allowUnknown: false,
+        }) as any;
       } else {
-        control = schema.validate(data) as any;
+        control = schema.validate(data, {
+          allowUnknown: false,
+        }) as any;
       }
 
       const { error, value } = control;
@@ -441,19 +446,22 @@ class useRest {
         let result = {} as any;
         for await (let query of queries) {
           let resultName = query.as || query.collection;
-          if (query.action == "findOne") {
+          if (
+            query.action == "findOne" &&
+            (query?.filter?.id || query?.filter?._id)
+          ) {
             result[resultName] = await this.findOne(
               query.collection,
-              query.filter.id,
-              query.filter.params,
+              query?.filter?.id || query?.filter?._id,
+              query?.filter?.params || {},
               query.options
             );
           }
           if (query.action == "find") {
             result[resultName] = await this.find(
               query.collection,
-              query.filter.params,
-              query.options
+              query?.filter?.params || {},
+              query?.options || {}
             );
           }
         }

package/driver/mongo/utils.ts

@@ -375,7 +375,24 @@ function formatData(
   return data;
 }
 
+function removeKeysAtFirstLevel(data: any, keysToRemove: string[]) {
+  if (Array.isArray(data)) {
+    return data.map((item) => removeKeys(item, keysToRemove));
+  } else {
+    return removeKeys(data, keysToRemove);
+  }
+}
+
+function removeKeys(obj: object, keysToRemove: string[]) {
+  const newObj = { ...obj };
+  keysToRemove.forEach((key) => {
+    delete newObj[key];
+  });
+  return newObj;
+}
+
 export {
+  removeKeysAtFirstLevel,
   buildPipeline,
   deepSetId,
   toBson,

package/lib/collection.ts

@@ -226,6 +226,14 @@ async function syncCollectionDatabase() {
   }
 }
 
+function getKeyFields(col: Collection) {
+  let keyFields: string[] = [];
+  col?.fields?.map((f) => {
+    keyFields.push(f.name);
+  });
+  return keyFields;
+}
+
 export {
   loadAllCollections,
   getCollection,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.8.9",
+  "version": "0.8.11",
   "module": "index.ts",
   "type": "module",
   "bin": {