@raphiniert/ra-data-postgrest 2.0.0-alpha.0 → 2.0.0-alpha.3

package/lib/urlBuilder.js

@@ -45,8 +45,10 @@ var postgrestOperators = [
     'or',
     'and',
 ];
-var parseFilters = function (filter, defaultListOp) {
+var parseFilters = function (params, defaultListOp) {
+    var filter = params.filter, _a = params.meta, meta = _a === void 0 ? {} : _a;
     var result = {};
+    result.filter = {};
     Object.keys(filter).forEach(function (key) {
         // key: the name of the object key
         var splitKey = key.split('@');
@@ -58,32 +60,69 @@ var parseFilters = function (filter, defaultListOp) {
             // we split the search term in words
             values = filter[key].trim().split(/\s+/);
         }
+        // CASE: Logical operator
+        else if (['or', 'and'].includes(operation)) {
+            // we extract each value entries and make it dot separated string.
+            var subFilter = (0, exports.parseFilters)({ filter: filter[key] }, defaultListOp).filter;
+            // something like { "age@lt": 18 } and { "age@gt": 21 }
+            var filterExpressions_1 = [];
+            Object.entries(subFilter).forEach(function (_a) {
+                var op = _a[0], val = _a[1];
+                if (Array.isArray(val))
+                    filterExpressions_1.push.apply(filterExpressions_1, val.map(function (v) { return [op, v].join('.'); }));
+                else
+                    filterExpressions_1.push([op, val].join('.'));
+            });
+            // finally we flatten all as single string and enclose with bracket.
+            values = ["(".concat(filterExpressions_1.join(','), ")")];
+        }
         else {
             values = [filter[key]];
         }
         values.forEach(function (value) {
-            // if operator is intentionally blank, rpc syntax
-            var op = operation.includes('like')
-                ? "".concat(operation, ".*").concat(value, "*")
-                : operation.length == 0
-                    ? "".concat(value)
-                    : "".concat(operation, ".").concat(value);
-            if (result[splitKey[0]] === undefined) {
-                // first operator for the key, we add it to the dict
-                result[splitKey[0]] = op;
+            var op = (function () {
+                // if operator is intentionally blank, rpc syntax
+                if (operation.length === 0)
+                    return "".concat(value);
+                if (operation.includes('like'))
+                    return "".concat(operation, ".*").concat(value, "*");
+                if (['and', 'or'].includes(operation))
+                    return "".concat(value);
+                if (['cs', 'cd'].includes(operation))
+                    return "".concat(operation, ".{").concat(value, "}");
+                return "".concat(operation, ".").concat(value);
+            })();
+            // If resulting filter haven't contains the fieldname, then add it.
+            if (result.filter[splitKey[0]] === undefined) {
+                // first operator for the key,
+                if (['and', 'or'].includes(operation)) {
+                    result.filter[operation] = op;
+                }
+                else {
+                    // we add it to the dict
+                    result.filter[splitKey[0]] = op;
+                }
             }
             else {
                 if (!Array.isArray(result[splitKey[0]])) {
                     // second operator, we transform to an array
-                    result[splitKey[0]] = [result[splitKey[0]], op];
+                    result.filter[splitKey[0]] = [
+                        result.filter[splitKey[0]],
+                        op,
+                    ];
                 }
                 else {
                     // third and subsequent, we add to array
-                    result[splitKey[0]].push(op);
+                    result.filter[splitKey[0]].push(op);
                 }
             }
         });
     });
+    if (meta === null || meta === void 0 ? void 0 : meta.columns) {
+        result.select = Array.isArray(meta.columns)
+            ? meta.columns.join(',')
+            : meta.columns;
+    }
     return result;
 };
 exports.parseFilters = parseFilters;
@@ -122,8 +161,10 @@ var isCompoundKey = function (primaryKey) {
     return primaryKey.length > 1;
 };
 exports.isCompoundKey = isCompoundKey;
-var getQuery = function (primaryKey, ids, resource) {
-    var _a;
+var getQuery = function (primaryKey, ids, resource, meta) {
+    var _a, _b;
+    if (meta === void 0) { meta = null; }
+    var result = {};
     if (Array.isArray(ids) && ids.length > 1) {
         // no standardized query with multiple ids possible for rpc endpoints which are api-exposed database functions
         if (resource.startsWith('rpc/')) {
@@ -131,18 +172,19 @@ var getQuery = function (primaryKey, ids, resource) {
             return;
         }
         if ((0, exports.isCompoundKey)(primaryKey)) {
-            // TODO: Should be URL encoded
-            return "or=(".concat(ids.map(function (id) {
-                var primaryKeyParams = (0, exports.decodeId)(id, primaryKey);
-                return "and(".concat(primaryKey
-                    .map(function (key, i) { return "".concat(key, ".eq.").concat(primaryKeyParams[i]); })
-                    .join(','), ")");
-            }), ")");
+            result = {
+                or: "(".concat(ids.map(function (id) {
+                    var primaryKeyParams = (0, exports.decodeId)(id, primaryKey);
+                    return "and(".concat(primaryKey
+                        .map(function (key, i) { return "".concat(key, ".eq.").concat(primaryKeyParams[i]); })
+                        .join(','), ")");
+                }), ")"),
+            };
         }
         else {
-            return new URLSearchParams((_a = {},
+            result = (_a = {},
                 _a[primaryKey[0]] = "in.(".concat(ids.join(','), ")"),
-                _a)).toString();
+                _a);
         }
     }
     else {
@@ -150,25 +192,32 @@ var getQuery = function (primaryKey, ids, resource) {
         var id = ids.toString();
         var primaryKeyParams_1 = (0, exports.decodeId)(id, primaryKey);
         if ((0, exports.isCompoundKey)(primaryKey)) {
-            if (resource.startsWith('rpc/'))
-                // TODO: Should be URL encoded
-                return "".concat(primaryKey
-                    .map(function (key, i) { return "".concat(key, "=").concat(primaryKeyParams_1[i]); })
-                    .join('&'));
-            // TODO: Should be URL encoded
-            else
-                return "and=(".concat(primaryKey
-                    .map(function (key, i) {
-                    return "".concat(key, ".eq.").concat(primaryKeyParams_1[i]);
-                })
-                    .join(','), ")");
+            if (resource.startsWith('rpc/')) {
+                result = {};
+                primaryKey.map(function (key, i) {
+                    return (result[key] = "".concat(primaryKeyParams_1[i]));
+                });
+            }
+            else {
+                result = {
+                    and: "(".concat(primaryKey.map(function (key, i) {
+                        return "".concat(key, ".eq.").concat(primaryKeyParams_1[i]);
+                    }), ")"),
+                };
+            }
         }
         else {
-            return new URLSearchParams([
-                [primaryKey[0], "eq.".concat(id)],
-            ]).toString();
+            result = (_b = {},
+                _b[primaryKey[0]] = "eq.".concat(id),
+                _b);
         }
     }
+    if (meta && meta.columns) {
+        result.select = Array.isArray(meta.columns)
+            ? meta.columns.join(',')
+            : meta.columns;
+    }
+    return result;
 };
 exports.getQuery = getQuery;
 var getKeyData = function (primaryKey, data) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@raphiniert/ra-data-postgrest",
-    "version": "2.0.0-alpha.0",
+    "version": "2.0.0-alpha.3",
     "description": "postgREST data provider for react-admin",
     "main": "lib/index.js",
     "module": "esm/index.js",
@@ -20,7 +20,8 @@
     "bugs": "https://github.com/raphiniert-com/ra-data-postgrest/issues",
     "license": "MIT",
     "scripts": {
-        "test": "jest --watch",
+        "coverage": "jest --coverage",
+        "test": "jest --watchAll",
         "build": "npm run build-cjs && npm run build-esm",
         "build-cjs": "rimraf ./lib && tsc",
         "build-esm": "rimraf ./esm && tsc --outDir esm --module es2015",
@@ -30,17 +31,21 @@
     },
     "devDependencies": {
         "@types/jest": "^28.1.4",
+        "@types/qs": "^6.9.7",
         "cross-env": "^7.0.3",
-        "eslint-config-prettier": "^8.5.0",
+        "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "install-peers-cli": "^2.2.0",
         "jest": "^28.1.2",
-        "prettier": "~2.1.1",
-        "rimraf": "^3.0.2",
+        "prettier": "~2.8.8",
+        "rimraf": "^5.0.0",
         "ts-jest": "^28.0.5",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "ra-core": "^4.1.0"
+    },
+    "dependencies": {
+        "qs": "^6.11.1"
     }
 }