Release 3.37.0

Deprecate websql.

Add group_by parameter to allDocs.

Queries: Fix some parsing/serialization issues

Makefile

@@ -26,7 +26,7 @@ TESTDIR = test
 EXAMPLEDIR = examples
 EXTERNALDIR = external
 
-VERSION = 3.36.1
+VERSION = 3.37.0
 JIOVERSION = ${DISTDIR}/jio-v${VERSION}.js
 JIOLATEST = ${DISTDIR}/jio-latest.js
 JIONODEVERSION = ${DISTDIR}/jio-v${VERSION}-node.js

dist/jio-latest-node.js

@@ -7870,11 +7870,11 @@ var arrayExtend = function () {
   }
   return {type:"complex",operator:operator,query_list:query_list2};
 
-}, simpleQuerySetKey = function (query, key) {
+}, querySetKey = function (query, key) {
   var i;
   if (query.type === "complex") {
     for (i = 0; i < query.query_list.length; ++i) {
-      simpleQuerySetKey (query.query_list[i],key);
+      querySetKey(query.query_list[i], key);
     }
     return true;
   }
@@ -7995,7 +7995,7 @@ case 12:
  this.$ = $$[$0-1]; 
 break;
 case 13:
- simpleQuerySetKey($$[$0], $$[$0-2]); this.$ = $$[$0]; 
+ querySetKey($$[$0], $$[$0-2]); this.$ = $$[$0]; 
 break;
 case 15:
  $$[$0].operator = $$[$0-1] ; this.$ = $$[$0]; 
@@ -9124,21 +9124,8 @@ return new Parser;
    * #crossLink "Query/toString:method"
    */
   ComplexQuery.prototype.toString = function () {
-    var str_list = [], this_operator = this.operator;
-    if (this.operator === "NOT") {
-      str_list.push("NOT (");
-      str_list.push(this.query_list[0].toString());
-      str_list.push(")");
-      return str_list.join(" ");
-    }
-    this.query_list.forEach(function (query) {
-      str_list.push("(");
-      str_list.push(query.toString());
-      str_list.push(")");
-      str_list.push(this_operator);
-    });
-    str_list.length -= 1;
-    return str_list.join(" ");
+    /*global objectToSearchText */
+    return objectToSearchText(this.toJSON());
   };
 
   /**
@@ -9237,21 +9224,60 @@ return new Parser;
   };
 
   function objectToSearchText(query) {
-    var str_list = [];
-    if (query.type === "complex") {
-      str_list.push("(");
-      (query.query_list || []).forEach(function (sub_query) {
-        str_list.push(objectToSearchText(sub_query));
-        str_list.push(query.operator);
-      });
-      str_list.length -= 1;
-      str_list.push(")");
-      return str_list.join(" ");
-    }
+    var i = 0,
+      query_list = null,
+      string_list = null,
+      operator = "",
+      common_key = "";
     if (query.type === "simple") {
       return (query.key ? query.key + ": " : "") +
         (query.operator || "") + ' "' + query.value + '"';
     }
+    if (query.type === "complex") {
+      query_list = query.query_list;
+      if (!query_list || query_list.length === 0) {
+        return "";
+      }
+      operator = query.operator || "";
+      if (operator === "NOT") {
+        // fallback to AND operator if several queries are given
+        // i.e. `NOT ( a AND b )`
+        return "NOT ( " + objectToSearchText(
+          {type: "complex", operator: "AND", query_list: query_list}
+        ) + " )";
+      }
+      if (query_list.length === 1) {
+        return objectToSearchText(query_list[0]);
+      }
+
+      common_key = query_list[i].key;
+      for (i = 1; i < query_list.length; i += 1) {
+        if (query_list[i].type !== "simple" ||
+            query_list[i].key !== common_key) {
+          break;
+        }
+      }
+      string_list = [];
+      if (i === query_list.length) {
+        for (i = 0; i < query_list.length; i += 1) {
+          string_list.push(
+            (query_list[i].operator || "") +
+              ' "' + query_list[i].value + '"'
+          );
+        }
+      } else {
+        common_key = "";
+        for (i = 0; i < query_list.length; i += 1) {
+          string_list.push(objectToSearchText(query_list[i]));
+        }
+      }
+      if (string_list.length > 1) {
+        return (common_key ? common_key + ": " : "") +
+          "( " + string_list.join(" " + operator + " ") + " )";
+      }
+      return (common_key ? common_key + ": " : "") +
+        string_list[0];
+    }
     throw new TypeError("This object is not a query");
   }
 
@@ -9419,8 +9445,7 @@ return new Parser;
    * #crossLink "Query/toString:method"
    */
   SimpleQuery.prototype.toString = function () {
-    return (this.key ? this.key + ":" : "") +
-      (this.operator ? " " + this.operator : "") + ' "' + this.value + '"';
+    return objectToSearchText(this.toJSON());
   };
 
   /**
@@ -10090,17 +10115,11 @@ var XMLHttpRequest = global.XMLHttpRequest || module.exports,
  * See https://www.nexedi.com/licensing for rationale and options.
  */
 /*global window, RSVP, Blob, XMLHttpRequest, QueryFactory, Query, atob,
-  FileReader, ArrayBuffer, Uint8Array, navigator */
+  FileReader, ArrayBuffer, Uint8Array */
 (function (window, RSVP, Blob, QueryFactory, Query, atob,
-           FileReader, ArrayBuffer, Uint8Array, navigator) {
+           FileReader, ArrayBuffer, Uint8Array) {
   "use strict";
 
-  if (window.openDatabase === undefined) {
-    window.openDatabase = function () {
-      throw new Error('WebSQL is not supported by ' + navigator.userAgent);
-    };
-  }
-
   /* Safari does not define DOMError */
   if (window.DOMError === undefined) {
     window.DOMError = {};
@@ -10546,6 +10565,7 @@ var XMLHttpRequest = global.XMLHttpRequest || module.exports,
       if (context.hasCapacity("list") &&
           ((options.query === undefined) || context.hasCapacity("query")) &&
           ((options.sort_on === undefined) || context.hasCapacity("sort")) &&
+          ((options.group_by === undefined) || context.hasCapacity("group")) &&
           ((options.select_list === undefined) ||
            context.hasCapacity("select")) &&
           ((options.include_docs === undefined) ||
@@ -10632,7 +10652,7 @@ var XMLHttpRequest = global.XMLHttpRequest || module.exports,
   window.jIO = jIO;
 
 }(window, RSVP, Blob, QueryFactory, Query, atob,
-  FileReader, ArrayBuffer, Uint8Array, navigator));
+  FileReader, ArrayBuffer, Uint8Array));
 /*
  * Copyright 2018, Nexedi SA
  *
@@ -14178,7 +14198,7 @@ var jIO = window.jIO,
   ERP5Storage.prototype.hasCapacity = function (name) {
     return ((name === "list") || (name === "query") ||
             (name === "select") || (name === "limit") ||
-            (name === "sort"));
+            (name === "sort") || (name === "group"));
   };
 
   function isSingleLocalRoles(parsed_query) {
@@ -14246,7 +14266,8 @@ var jIO = window.jIO,
           local_roles,
           local_role_found = false,
           selection_domain,
-          sort_list = [];
+          sort_list = [],
+          group_list = [];
         if (options.query) {
           parsed_query = jIO.QueryFactory.create(options.query);
           result_list = isSingleLocalRoles(parsed_query);
@@ -14318,6 +14339,10 @@ var jIO = window.jIO,
           }
         }
 
+        if (options.group_by) {
+          group_list = options.group_by;
+        }
+
         if (selection_domain) {
           selection_domain = JSON.stringify(selection_domain);
         }
@@ -14331,6 +14356,7 @@ var jIO = window.jIO,
               select_list: options.select_list || ["title", "reference"],
               limit: options.limit,
               sort_on: sort_list,
+              group_by: group_list,
               local_roles: local_roles,
               selection_domain: selection_domain
             })

package.json

 {
   "name": "jio",
-  "version": "v3.36.0",
+  "version": "v3.37.0",
   "license": "GPLv3+",
   "author": "Nexedi SA",
   "contributors": [