@raphiniert/ra-data-postgrest 1.1.6 → 1.1.9

package/CHANGELOG.md

@@ -2,9 +2,23 @@
 
 Find all notable changes of this project in this file.
 
+## v1.1.9 - 2023-08-23
+- [#30](https://github.com/raphiniert-com/ra-data-postgrest/pull/30), updated ts and modified code, such that some package dependencies became unrequired - @[corrideat](https://github.com/corrideat)
+
+## v1.1.8 - 2022-01-07
+- required re-release as I missed to transpile all and upload the features of 1.1.7 to npm.
+
+## v1.1.7 - 2022-01-07
+### Fixes
+- fixed bad behaivor with compound keys while using field named `id` [issue #27](https://github.com/raphiniert-com/ra-data-postgrest/issues/27) and [issue #19](https://github.com/raphiniert-com/ra-data-postgrest/pull/19) - @[kenfehling](https://github.com/kenfehling)
+
+### New feature
+- [#26](https://github.com/raphiniert-com/ra-data-postgrest/pull/26), added rpc filter support, which is explained [here](https://github.com/raphiniert-com/ra-data-postgrest#special-filter-feature-rpc-functions) - @[TheRealAstroboy](https://github.com/TheRealAstroboy)
+
+
 ## v1.1.6 - 2021-01-16
 ### Fixes
-- fixed eq. prefix for non-compound keys [issue #23](https://github.com/raphiniert-com/ra-data-postgrest/issues/23) - @[andymed-jlp](https://github.com/andymed-jlp)
+- [#24](https://github.com/raphiniert-com/ra-data-postgrest/pull/24), fixed eq. prefix for non-compound keys [issue #23](https://github.com/raphiniert-com/ra-data-postgrest/issues/23) - @[andymed-jlp](https://github.com/andymed-jlp)
 
 ## v1.1.5 - 2021-01-16
 ### Fixes
@@ -45,7 +59,7 @@ Find all notable changes of this project in this file.
 
 ## v1.0.7 - 2020-08-23
 ### New feature
-- [#14](https://github.com/raphiniert-com/ra-data-postgrest/pull/14) compound primary keys (see [README.md](https://github.com/raphiniert-com/ra-data-postgrest/blob/master/README.md#compound-primary-keys)) - @[programmarchy](https://github.com/programmarchy)
+- [#14](https://github.com/raphiniert-com/ra-data-postgrest/pull/14), added compound primary keys (see [README.md](https://github.com/raphiniert-com/ra-data-postgrest/blob/master/README.md#compound-primary-keys)) - @[programmarchy](https://github.com/programmarchy)
 
 ### Maintenance
 - `import React from 'react';` -> `import * as React from 'react';`

package/README.md

@@ -135,6 +135,15 @@ The dataProvider is designed to enable you to specify the comparator in your rea
 
 One can simply append the comparator with an `@` to the source. In this example the field `post_title` would be filtered with `ilike` whereas `post_author` would be filtered using `eq` which is the default if no special comparator is specified.
 
+#### RPC Functions
+Given a RPC call as ```GET /rpc/add_them?post_author=Herbert HTTP/1.1```, the dataProvider allows you to filter such endpoints. As they are no view, but a SQL procedure, several postgREST features do not apply. I.e. no comparators such as `ilike`, `like`, `eq` are applicable. Only the raw value without comparator needs to be send to the API. In order to realize this behavior, just add an "empty" comparator to the field, i.e. end `source` with an `@` as in the example:
+
+```jsx
+<Filter {...props}>
+  <TextInput label="Search" source="post_author@" alwaysOn />
+  // some more filters
+</Filter>
+```
 
 ### Compound primary keys
 If one has data resources without primary keys named `id`, one will have to define this specifically. Also, if there is a primary key, which is defined over multiple columns:

package/esm/dataProvider/index.js

@@ -20,7 +20,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { stringify } from 'query-string';
 import { fetchUtils } from 'ra-core';
 /**
  * Maps react-admin queries to a postgrest REST API
@@ -72,7 +71,8 @@ function parseFilters(filter, defaultListOp) {
             values = [filter[key]];
         }
         values.forEach(function (value) {
-            var op = operation.includes('like') ? operation + ".*" + value + "*" : operation + "." + 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;
@@ -111,7 +111,7 @@ var encodeId = function (data, primaryKey) {
     }
 };
 var dataWithId = function (data, primaryKey) {
-    if (primaryKey === ['id'] || (data && data.id)) {
+    if (primaryKey === ['id']) {
         return data;
     }
     return Object.assign(data, {
@@ -122,7 +122,7 @@ var isCompoundKey = function (primaryKey) {
     return primaryKey.length > 1;
 };
 var getQuery = function (primaryKey, ids, resource) {
-    var _a, _b;
+    var _a;
     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/')) {
@@ -130,13 +130,13 @@ var getQuery = function (primaryKey, ids, resource) {
             return;
         }
         if (isCompoundKey(primaryKey)) {
-            return "or=(\n          " + ids.map(function (id) {
+            return "or=(\n          ".concat(ids.map(function (id) {
                 var primaryKeyParams = decodeId(id, primaryKey);
-                return "and(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams[i]; }).join(',') + ")";
-            }) + "\n        )";
+                return "and(".concat(primaryKey.map(function (key, i) { return "".concat(key, ".eq.").concat(primaryKeyParams[i]); }).join(','), ")");
+            }), "\n        )");
         }
         else {
-            return stringify((_a = {}, _a[primaryKey[0]] = "in.(" + ids.join(',') + ")", _a));
+            return new URLSearchParams((_a = {}, _a[primaryKey[0]] = "in.(".concat(ids.join(','), ")"), _a)).toString();
         }
     }
     else {
@@ -145,12 +145,12 @@ var getQuery = function (primaryKey, ids, resource) {
         var primaryKeyParams_1 = decodeId(id, primaryKey);
         if (isCompoundKey(primaryKey)) {
             if (resource.startsWith('rpc/'))
-                return "" + primaryKey.map(function (key, i) { return key + "=" + primaryKeyParams_1[i]; }).join('&');
+                return "".concat(primaryKey.map(function (key, i) { return "".concat(key, "=").concat(primaryKeyParams_1[i]); }).join('&'));
             else
-                return "and=(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams_1[i]; }).join(',') + ")";
+                return "and=(".concat(primaryKey.map(function (key, i) { return "".concat(key, ".eq.").concat(primaryKeyParams_1[i]); }).join(','), ")");
         }
         else {
-            return stringify((_b = {}, _b[primaryKey[0]] = "eq." + id, _b));
+            return new URLSearchParams([[primaryKey[0], "eq.".concat(id)]]).toString();
         }
     }
 };
@@ -168,10 +168,10 @@ var getKeyData = function (primaryKey, data) {
 };
 var getOrderBy = function (field, order, primaryKey) {
     if (field == 'id') {
-        return primaryKey.map(function (key) { return (key + "." + order.toLowerCase()); }).join(',');
+        return primaryKey.map(function (key) { return ("".concat(key, ".").concat(order.toLowerCase())); }).join(',');
     }
     else {
-        return field + "." + order.toLowerCase();
+        return "".concat(field, ".").concat(order.toLowerCase());
     }
 };
 var defaultPrimaryKeys = new Map();
@@ -185,7 +185,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var _a = params.pagination, page = _a.page, perPage = _a.perPage;
             var _b = params.sort, field = _b.field, order = _b.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
-            var query = __assign({ order: getOrderBy(field, order, primaryKey), offset: (page - 1) * perPage, limit: perPage }, parsedFilter);
+            var query = __assign({ order: getOrderBy(field, order, primaryKey), offset: String((page - 1) * perPage), limit: String(perPage) }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({
@@ -193,7 +193,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
                     Prefer: 'count=exact'
                 })
             };
-            var url = apiUrl + "/" + resource + "?" + stringify(query);
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(new URLSearchParams(query));
             return httpClient(url, options).then(function (_a) {
                 var headers = _a.headers, json = _a.json;
                 if (!headers.has('content-range')) {
@@ -212,7 +212,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var id = params.id;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, id, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 headers: new Headers({ 'accept': 'application/vnd.pgrst.object+json' }),
             }).then(function (_a) {
@@ -226,7 +226,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var ids = params.ids;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, ids, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url).then(function (_a) {
                 var json = _a.json;
                 return ({ data: json.map(function (data) { return dataWithId(data, primaryKey); }) });
@@ -238,7 +238,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var _c = params.sort, field = _c.field, order = _c.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
             var primaryKey = getPrimaryKey(resource, primaryKeys);
-            var query = __assign((_a = {}, _a[params.target] = "eq." + params.id, _a.order = getOrderBy(field, order, primaryKey), _a.offset = (page - 1) * perPage, _a.limit = perPage, _a), parsedFilter);
+            var query = params.target ? __assign((_a = {}, _a[params.target] = "eq.".concat(params.id), _a.order = getOrderBy(field, order, primaryKey), _a.offset = String((page - 1) * perPage), _a.limit = String(perPage), _a), parsedFilter) : __assign({ order: getOrderBy(field, order, primaryKey), offset: String((page - 1) * perPage), limit: String(perPage) }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({
@@ -246,7 +246,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
                     Prefer: 'count=exact'
                 })
             };
-            var url = apiUrl + "/" + resource + "?" + stringify(query);
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(new URLSearchParams(query));
             return httpClient(url, options).then(function (_a) {
                 var headers = _a.headers, json = _a.json;
                 if (!headers.has('content-range')) {
@@ -266,7 +266,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, id, resource);
             var primaryKeyData = getKeyData(primaryKey, data);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             var body = JSON.stringify(__assign(__assign({}, data), primaryKeyData));
             return httpClient(url, {
                 method: 'PATCH',
@@ -290,7 +290,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
                 var primaryKeyData = getKeyData(primaryKey, data);
                 return __assign(__assign({}, data), primaryKeyData);
             }));
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 method: 'PATCH',
                 headers: new Headers({
@@ -307,7 +307,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
         },
         create: function (resource, params) {
             var primaryKey = getPrimaryKey(resource, primaryKeys);
-            var url = apiUrl + "/" + resource;
+            var url = "".concat(apiUrl, "/").concat(resource);
             return httpClient(url, {
                 method: 'POST',
                 headers: new Headers({
@@ -327,7 +327,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var id = params.id;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, id, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 method: 'DELETE',
                 headers: new Headers({
@@ -344,7 +344,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var ids = params.ids;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, ids, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 method: 'DELETE',
                 headers: new Headers({

package/lib/dataProvider/index.js

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var query_string_1 = require("query-string");
 var ra_core_1 = require("ra-core");
 /**
  * Maps react-admin queries to a postgrest REST API
@@ -74,7 +73,8 @@ function parseFilters(filter, defaultListOp) {
             values = [filter[key]];
         }
         values.forEach(function (value) {
-            var op = operation.includes('like') ? operation + ".*" + value + "*" : operation + "." + 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;
@@ -113,7 +113,7 @@ var encodeId = function (data, primaryKey) {
     }
 };
 var dataWithId = function (data, primaryKey) {
-    if (primaryKey === ['id'] || (data && data.id)) {
+    if (primaryKey === ['id']) {
         return data;
     }
     return Object.assign(data, {
@@ -124,7 +124,7 @@ var isCompoundKey = function (primaryKey) {
     return primaryKey.length > 1;
 };
 var getQuery = function (primaryKey, ids, resource) {
-    var _a, _b;
+    var _a;
     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/')) {
@@ -132,13 +132,13 @@ var getQuery = function (primaryKey, ids, resource) {
             return;
         }
         if (isCompoundKey(primaryKey)) {
-            return "or=(\n          " + ids.map(function (id) {
+            return "or=(\n          ".concat(ids.map(function (id) {
                 var primaryKeyParams = decodeId(id, primaryKey);
-                return "and(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams[i]; }).join(',') + ")";
-            }) + "\n        )";
+                return "and(".concat(primaryKey.map(function (key, i) { return "".concat(key, ".eq.").concat(primaryKeyParams[i]); }).join(','), ")");
+            }), "\n        )");
         }
         else {
-            return query_string_1.stringify((_a = {}, _a[primaryKey[0]] = "in.(" + ids.join(',') + ")", _a));
+            return new URLSearchParams((_a = {}, _a[primaryKey[0]] = "in.(".concat(ids.join(','), ")"), _a)).toString();
         }
     }
     else {
@@ -147,12 +147,12 @@ var getQuery = function (primaryKey, ids, resource) {
         var primaryKeyParams_1 = decodeId(id, primaryKey);
         if (isCompoundKey(primaryKey)) {
             if (resource.startsWith('rpc/'))
-                return "" + primaryKey.map(function (key, i) { return key + "=" + primaryKeyParams_1[i]; }).join('&');
+                return "".concat(primaryKey.map(function (key, i) { return "".concat(key, "=").concat(primaryKeyParams_1[i]); }).join('&'));
             else
-                return "and=(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams_1[i]; }).join(',') + ")";
+                return "and=(".concat(primaryKey.map(function (key, i) { return "".concat(key, ".eq.").concat(primaryKeyParams_1[i]); }).join(','), ")");
         }
         else {
-            return query_string_1.stringify((_b = {}, _b[primaryKey[0]] = "eq." + id, _b));
+            return new URLSearchParams([[primaryKey[0], "eq.".concat(id)]]).toString();
         }
     }
 };
@@ -170,10 +170,10 @@ var getKeyData = function (primaryKey, data) {
 };
 var getOrderBy = function (field, order, primaryKey) {
     if (field == 'id') {
-        return primaryKey.map(function (key) { return (key + "." + order.toLowerCase()); }).join(',');
+        return primaryKey.map(function (key) { return ("".concat(key, ".").concat(order.toLowerCase())); }).join(',');
     }
     else {
-        return field + "." + order.toLowerCase();
+        return "".concat(field, ".").concat(order.toLowerCase());
     }
 };
 var defaultPrimaryKeys = new Map();
@@ -187,7 +187,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var _a = params.pagination, page = _a.page, perPage = _a.perPage;
             var _b = params.sort, field = _b.field, order = _b.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
-            var query = __assign({ order: getOrderBy(field, order, primaryKey), offset: (page - 1) * perPage, limit: perPage }, parsedFilter);
+            var query = __assign({ order: getOrderBy(field, order, primaryKey), offset: String((page - 1) * perPage), limit: String(perPage) }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({
@@ -195,7 +195,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
                     Prefer: 'count=exact'
                 })
             };
-            var url = apiUrl + "/" + resource + "?" + query_string_1.stringify(query);
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(new URLSearchParams(query));
             return httpClient(url, options).then(function (_a) {
                 var headers = _a.headers, json = _a.json;
                 if (!headers.has('content-range')) {
@@ -214,7 +214,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var id = params.id;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, id, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 headers: new Headers({ 'accept': 'application/vnd.pgrst.object+json' }),
             }).then(function (_a) {
@@ -228,7 +228,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var ids = params.ids;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, ids, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url).then(function (_a) {
                 var json = _a.json;
                 return ({ data: json.map(function (data) { return dataWithId(data, primaryKey); }) });
@@ -240,7 +240,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var _c = params.sort, field = _c.field, order = _c.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
             var primaryKey = getPrimaryKey(resource, primaryKeys);
-            var query = __assign((_a = {}, _a[params.target] = "eq." + params.id, _a.order = getOrderBy(field, order, primaryKey), _a.offset = (page - 1) * perPage, _a.limit = perPage, _a), parsedFilter);
+            var query = params.target ? __assign((_a = {}, _a[params.target] = "eq.".concat(params.id), _a.order = getOrderBy(field, order, primaryKey), _a.offset = String((page - 1) * perPage), _a.limit = String(perPage), _a), parsedFilter) : __assign({ order: getOrderBy(field, order, primaryKey), offset: String((page - 1) * perPage), limit: String(perPage) }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({
@@ -248,7 +248,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
                     Prefer: 'count=exact'
                 })
             };
-            var url = apiUrl + "/" + resource + "?" + query_string_1.stringify(query);
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(new URLSearchParams(query));
             return httpClient(url, options).then(function (_a) {
                 var headers = _a.headers, json = _a.json;
                 if (!headers.has('content-range')) {
@@ -268,7 +268,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, id, resource);
             var primaryKeyData = getKeyData(primaryKey, data);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             var body = JSON.stringify(__assign(__assign({}, data), primaryKeyData));
             return httpClient(url, {
                 method: 'PATCH',
@@ -292,7 +292,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
                 var primaryKeyData = getKeyData(primaryKey, data);
                 return __assign(__assign({}, data), primaryKeyData);
             }));
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 method: 'PATCH',
                 headers: new Headers({
@@ -309,7 +309,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
         },
         create: function (resource, params) {
             var primaryKey = getPrimaryKey(resource, primaryKeys);
-            var url = apiUrl + "/" + resource;
+            var url = "".concat(apiUrl, "/").concat(resource);
             return httpClient(url, {
                 method: 'POST',
                 headers: new Headers({
@@ -329,7 +329,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var id = params.id;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, id, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 method: 'DELETE',
                 headers: new Headers({
@@ -346,7 +346,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var ids = params.ids;
             var primaryKey = getPrimaryKey(resource, primaryKeys);
             var query = getQuery(primaryKey, ids, resource);
-            var url = apiUrl + "/" + resource + "?" + query;
+            var url = "".concat(apiUrl, "/").concat(resource, "?").concat(query);
             return httpClient(url, {
                 method: 'DELETE',
                 headers: new Headers({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@raphiniert/ra-data-postgrest",
-    "version": "1.1.6",
+    "version": "1.1.9",
     "description": "postgREST data provider for react-admin",
     "main": "lib/index.js",
     "module": "esm/index.js",
@@ -26,16 +26,13 @@
         "watch": "tsc --outDir esm --module es2015 --watch",
         "prepare": "install-peers"
     },
-    "dependencies": {
-        "query-string": "^5.1.1"
-    },
     "devDependencies": {
-        "cross-env": "^5.2.0",
+        "cross-env": "^7.0.3",
         "install-peers-cli": "^2.2.0",
-        "rimraf": "^2.6.3",
-        "typescript": "^3.9.5"
+        "rimraf": "^3.0.2",
+        "typescript": "^4.6.4"
     },
     "peerDependencies": {
-        "ra-core": "^3.8.4"
+        "ra-core": "^3.19.6"
     }
 }

package/src/dataProvider/index.ts

@@ -1,4 +1,3 @@
-import { stringify } from 'query-string';
 import { fetchUtils, DataProvider, Identifier } from 'ra-core';
 
 /**
@@ -53,7 +52,9 @@ function parseFilters(filter, defaultListOp) {
     }
 
     values.forEach(value => {
-      let op = operation.includes('like') ? `${operation}.*${value}*` : `${operation}.${value}`;
+      // if operator is intentionally blank, rpc syntax 
+      let op = operation.includes('like') ? `${operation}.*${value}*` : operation.length == 0 ? `${value}` : `${operation}.${value}`;
+
       if (result[splitKey[0]] === undefined) {
         // first operator for the key, we add it to the dict
         result[splitKey[0]] = op;
@@ -99,7 +100,7 @@ const encodeId = (data: any, primaryKey: PrimaryKey): Identifier => {
 }
 
 const dataWithId = (data: any, primaryKey: PrimaryKey) => {
-  if (primaryKey === ['id'] || (data && data.id)) {
+  if (primaryKey === ['id']) {
     return data;
   }
 
@@ -130,7 +131,7 @@ const getQuery = (primaryKey : PrimaryKey, ids: Identifier | Array<Identifier>,
             }
         )`;
       } else {
-        return stringify({ [primaryKey[0]]: `in.(${ids.join(',')})` });
+        return new URLSearchParams({ [primaryKey[0]]: `in.(${ids.join(',')})` }).toString();
       }
   } else {
     // if ids is one Identifier
@@ -143,7 +144,7 @@ const getQuery = (primaryKey : PrimaryKey, ids: Identifier | Array<Identifier>,
       else
         return `and=(${primaryKey.map((key : string, i: any) => `${key}.eq.${primaryKeyParams[i]}`).join(',')})`;
     } else {
-      return stringify({ [primaryKey[0]]: `eq.${id}` });
+      return new URLSearchParams([[primaryKey[0], `eq.${id}`]]).toString();
     }
   }
 }
@@ -182,8 +183,8 @@ export default (apiUrl, httpClient = fetchUtils.fetchJson, defaultListOp = 'eq',
 
     const query = {
       order: getOrderBy(field, order, primaryKey),
-      offset: (page - 1) * perPage,
-      limit: perPage,
+      offset: String((page - 1) * perPage),
+      limit: String(perPage),
       // append filters
       ...parsedFilter
     };
@@ -196,7 +197,7 @@ export default (apiUrl, httpClient = fetchUtils.fetchJson, defaultListOp = 'eq',
       })
     };
 
-    const url = `${apiUrl}/${resource}?${stringify(query)}`;
+    const url = `${apiUrl}/${resource}?${new URLSearchParams(query)}`;
 
     return httpClient(url, options).then(({ headers, json }) => {
       if (!headers.has('content-range')) {
@@ -251,11 +252,16 @@ export default (apiUrl, httpClient = fetchUtils.fetchJson, defaultListOp = 'eq',
     const parsedFilter = parseFilters(params.filter, defaultListOp);
     const primaryKey = getPrimaryKey(resource, primaryKeys);
 
-    const query = {
+    const query = params.target ? {
       [params.target]: `eq.${params.id}`,
       order: getOrderBy(field, order, primaryKey),
-      offset: (page - 1) * perPage,
-      limit: perPage,
+      offset: String((page - 1) * perPage),
+      limit: String(perPage),
+      ...parsedFilter,
+    }:{
+      order: getOrderBy(field, order, primaryKey),
+      offset: String((page - 1) * perPage),
+      limit: String(perPage),
       ...parsedFilter,
     };
 
@@ -267,7 +273,7 @@ export default (apiUrl, httpClient = fetchUtils.fetchJson, defaultListOp = 'eq',
       })
     }
 
-    const url = `${apiUrl}/${resource}?${stringify(query)}`;
+    const url = `${apiUrl}/${resource}?${new URLSearchParams(query)}`;
 
     return httpClient(url, options).then(({ headers, json }) => {
       if (!headers.has('content-range')) {