Merge branch 'master' of https://github.com/vivocha/arrest

src/defaults.ts

@@ -169,6 +169,12 @@ export const DEFAULT_DOCUMENT: OpenAPIV3.Document = {
               minLength: 1,
               maxLength: 1,
             },
+            decimal: {
+              description: 'decimal separator character (default: ".")',
+              type: 'string',
+              minLength: 1,
+              maxLength: 1,
+            },
             eol: {
               description: 'End-of-line character sequence',
               type: 'string',

src/mongo/util.ts

@@ -3,6 +3,10 @@ import { rulesToQuery } from '@casl/ability/extra';
 import { JSONPatch } from 'jsonref';
 import { ObjectId } from 'mongodb';
 
+function haveKeysInCommon(a: any, b: any): boolean {
+  return !!Object.keys(a).find((k) => (typeof b[k] !== 'undefined' ? k : undefined));
+}
+
 export function addConstraint(query: any, constraint: any): any {
   if (!query) {
     query = {};
@@ -23,13 +27,13 @@ export function addConstraint(query: any, constraint: any): any {
         query = { $and: [query, constraint] };
       } else if (query.$and && Object.keys(constraint).length > 0) {
         const lastCond = query.$and[query.$and.length - 1];
-        if (lastCond && !(lastCond.$or && constraint.$or) && !(lastCond.$and && constraint.$and)) {
+        if (lastCond && !(lastCond.$or && constraint.$or) && !(lastCond.$and && constraint.$and) && !haveKeysInCommon(lastCond, constraint)) {
           Object.assign(lastCond, constraint);
         } else {
           query.$and.push(constraint);
         }
       } else {
-        if (Object.keys(constraint).find((k) => (typeof query[k] !== 'undefined' ? k : undefined))) {
+        if (haveKeysInCommon(query, constraint)) {
           query = { $and: [query, constraint] };
         } else {
           Object.assign(query, constraint);

src/util.ts

@@ -338,6 +338,7 @@ export interface CSVOptions {
   fields: string[] | { [key: string]: string };
   unwind?: string;
   separator?: string;
+  decimal?: string;
   quotes?: boolean;
   escape?: string;
   eol?: string;
@@ -378,7 +379,12 @@ export function toCSV(data: any[], options: CSVOptions): string {
       const l: string[] = [];
       // TODO optimize with a transversal map
       for (let k in fieldMap) {
-        l.push(dot.get(item, k) || '');
+        const value: any = dot.get(item, k);
+        if (options.decimal && typeof value === 'number') {
+          l.push(value.toString().replace('.', options.decimal));
+        } else {
+          l.push((value || '').toString());
+        }
       }
       out.push(l);
     });

test/ts/mongo.util.test.ts

@@ -73,6 +73,7 @@ describe('util', function () {
       });
       it('should handle multiple constraints on a property producing an $and', function () {
         addConstraint({ a: 1 }, { a: 2 }).should.deep.equal({ $and: [{ a: 1 }, { a: 2 }] });
+        addConstraint({ $and: [{ a: 1 }, { a: 2 }] }, { a: 3 }).should.deep.equal({ $and: [{ a: 1 }, { a: 2 }, { a: 3 }] });
       });
     });
   });

test/ts/pipeline.test.ts

@@ -206,7 +206,7 @@ XXX,,YYY`
 
     it('should return the requested top level fields as csv, with quoted fields', function () {
       csv_options = {
-        fields: ['a', 'b'],
+        fields: ['a', 'b', 'c'],
         quotes: true,
       };
       csv_data = [
@@ -219,8 +219,8 @@ XXX,,YYY`
         .expect('Content-Type', /text\/csv/)
         .then(({ text: data }) => {
           data.should.equal(
-            `"AAA","BBB"
-"XXX","YYY"`
+            `"AAA","BBB","1"
+"XXX","YYY","1"`
           );
         });
     });
@@ -287,6 +287,26 @@ XXX,,YYY`
         });
     });
 
+    it('should return the requested top level fields as csv, with custom decimal separator', function () {
+      csv_options = {
+        fields: ['a', 'b', 'c'],
+        decimal: ',',
+        quotes: true,
+      };
+      csv_data = [
+        { a: 'AAA', b: 'BBB', c: 1.5, d: true },
+        { a: 'XXX', b: 'YYY', c: 1.9, d: false },
+      ];
+      return request
+        .get('/tests')
+        .expect(200)
+        .expect('Content-Type', /text\/csv/)
+        .then(({ text: data }) => {
+          data.should.equal(`"AAA","BBB","1,5"
+"XXX","YYY","1,9"`);
+        });
+    });
+
     it('should return the requested top level fields as csv, with header', function () {
       csv_options = {
         fields: ['a', 'b'],