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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/IDEAS.md +46 -0
  3. package/README.md +50 -17
  4. package/esm/index.d.ts +58 -7
  5. package/esm/index.js +226 -219
  6. package/esm/urlBuilder.js +37 -8
  7. package/lib/index.d.ts +58 -7
  8. package/lib/index.js +228 -219
  9. package/lib/urlBuilder.js +37 -8
  10. package/package.json +5 -4
  11. package/src/index.ts +180 -103
  12. package/src/urlBuilder.ts +38 -8
package/lib/index.js CHANGED
@@ -14,234 +14,243 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  return (mod && mod.__esModule) ? mod : { "default": mod };
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- var ra_core_1 = require("ra-core");
17
+ exports.defaultSchema = exports.defaultPrimaryKeys = void 0;
18
18
  var urlBuilder_1 = require("./urlBuilder");
19
19
  var qs_1 = __importDefault(require("qs"));
20
- /**
21
- * Maps react-admin queries to a postgrest REST API
22
- *
23
- * This REST dialect uses postgrest syntax
24
- *
25
- * @see https://postgrest.org/en/stable/api.html#embedded-filters
26
- *
27
- * @example
28
- *
29
- * getList => GET http://my.api.url/posts?order=title.asc&offset=0&limit=24&filterField=eq.value
30
- * getOne => GET http://my.api.url/posts?id=eq.123
31
- * getMany => GET http://my.api.url/posts?id=in.(123,456,789)
32
- * getManyReference => GET http://my.api.url/posts?author_id=eq.345
33
- * create => POST http://my.api.url/posts
34
- * update => PATCH http://my.api.url/posts?id=eq.123
35
- * updateMany => PATCH http://my.api.url/posts?id=in.(123,456,789)
36
- * delete => DELETE http://my.api.url/posts?id=eq.123
37
- * deleteMany => DELETE http://my.api.url/posts?id=in.(123,456,789)
38
- *
39
- * @example
40
- *
41
- * import * as React from 'react';
42
- * import { Admin, Resource } from 'react-admin';
43
- * import postgrestRestProvider from '@raphiniert/ra-data-postgrest';
44
- *
45
- * import { PostList } from './posts';
46
- *
47
- * const App = () => (
48
- * <Admin dataProvider={postgrestRestProvider('http://path.to.my.api/')}>
49
- * <Resource name="posts" list={PostList} />
50
- * </Admin>
51
- * );
52
- *
53
- * export default App;
54
- */
55
- var defaultPrimaryKeys = new Map();
56
- exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
57
- if (httpClient === void 0) { httpClient = ra_core_1.fetchUtils.fetchJson; }
58
- if (defaultListOp === void 0) { defaultListOp = 'eq'; }
59
- if (primaryKeys === void 0) { primaryKeys = defaultPrimaryKeys; }
60
- return ({
61
- getList: function (resource, params) {
62
- var _a;
63
- if (params === void 0) { params = {}; }
64
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
65
- var _b = params.pagination, page = _b.page, perPage = _b.perPage;
66
- var _c = params.sort || {}, field = _c.field, order = _c.order;
67
- var _d = (0, urlBuilder_1.parseFilters)(params, defaultListOp), filter = _d.filter, select = _d.select;
68
- var query = __assign({ offset: String((page - 1) * perPage), limit: String(perPage) }, filter);
69
- if (field) {
70
- query.order = (0, urlBuilder_1.getOrderBy)(field, order, primaryKey);
71
- }
72
- if (select) {
73
- query.select = select;
20
+ exports.defaultPrimaryKeys = new Map();
21
+ var defaultSchema = function () { return ''; };
22
+ exports.defaultSchema = defaultSchema;
23
+ var useCustomSchema = function (schema, metaSchema, method) {
24
+ var _a;
25
+ var funcHeaderSchema = schema;
26
+ if (metaSchema !== undefined) {
27
+ funcHeaderSchema = function () { return metaSchema; };
28
+ }
29
+ if (funcHeaderSchema().length > 0) {
30
+ var schemaHeader = '';
31
+ if (['GET', 'HEAD'].includes(method)) {
32
+ schemaHeader = 'Accept-Profile';
33
+ }
34
+ else if (['POST', 'PATCH', 'PUT', 'DELETE'].includes(method)) {
35
+ schemaHeader = 'Content-Profile';
36
+ }
37
+ else
38
+ return {};
39
+ return _a = {}, _a[schemaHeader] = funcHeaderSchema(), _a;
40
+ }
41
+ else
42
+ return {};
43
+ };
44
+ exports.default = (function (config) { return ({
45
+ getList: function (resource, params) {
46
+ var _a, _b;
47
+ if (params === void 0) { params = {}; }
48
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
49
+ var _c = params.pagination, page = _c.page, perPage = _c.perPage;
50
+ var _d = params.sort || {}, field = _d.field, order = _d.order;
51
+ var _e = (0, urlBuilder_1.parseFilters)(params, config.defaultListOp), filter = _e.filter, select = _e.select;
52
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
53
+ var query = __assign({ offset: String((page - 1) * perPage), limit: String(perPage) }, filter);
54
+ if (field) {
55
+ query.order = (0, urlBuilder_1.getOrderBy)(field, order, primaryKey);
56
+ }
57
+ if (select) {
58
+ query.select = select;
59
+ }
60
+ // add header that Content-Range is in returned header
61
+ var options = {
62
+ headers: new Headers(__assign(__assign({ Accept: 'application/json', Prefer: 'count=exact' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'GET'))),
63
+ };
64
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
65
+ return config.httpClient(url, options).then(function (_a) {
66
+ var headers = _a.headers, json = _a.json;
67
+ if (!headers.has('content-range')) {
68
+ throw new Error("The Content-Range header is missing in the HTTP Response. The postgREST data provider expects \n responses for lists of resources to contain this header with the total number of results to build \n the pagination. If you are using CORS, did you declare Content-Range in the Access-Control-Expose-Headers header?");
74
69
  }
75
- // add header that Content-Range is in returned header
76
- var options = {
77
- headers: new Headers(__assign({ Accept: 'application/json', Prefer: 'count=exact' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
70
+ return {
71
+ data: json.map(function (obj) { return (0, urlBuilder_1.dataWithId)(obj, primaryKey); }),
72
+ total: parseInt(headers.get('content-range').split('/').pop(), 10),
78
73
  };
79
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
80
- return httpClient(url, options).then(function (_a) {
81
- var headers = _a.headers, json = _a.json;
82
- if (!headers.has('content-range')) {
83
- throw new Error("The Content-Range header is missing in the HTTP Response. The postgREST data provider expects \n responses for lists of resources to contain this header with the total number of results to build \n the pagination. If you are using CORS, did you declare Content-Range in the Access-Control-Expose-Headers header?");
84
- }
85
- return {
86
- data: json.map(function (obj) { return (0, urlBuilder_1.dataWithId)(obj, primaryKey); }),
87
- total: parseInt(headers.get('content-range').split('/').pop(), 10),
88
- };
89
- });
90
- },
91
- getOne: function (resource, params) {
92
- var _a;
93
- if (params === void 0) { params = {}; }
94
- var id = params.id, meta = params.meta;
95
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
96
- var query = (0, urlBuilder_1.getQuery)(primaryKey, id, resource, meta);
97
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
98
- return httpClient(url, {
99
- headers: new Headers(__assign({ accept: 'application/vnd.pgrst.object+json' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
100
- }).then(function (_a) {
101
- var json = _a.json;
102
- return ({
103
- data: (0, urlBuilder_1.dataWithId)(json, primaryKey),
104
- });
74
+ });
75
+ },
76
+ getOne: function (resource, params) {
77
+ var _a, _b;
78
+ if (params === void 0) { params = {}; }
79
+ var id = params.id, meta = params.meta;
80
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
81
+ var query = (0, urlBuilder_1.getQuery)(primaryKey, id, resource, meta);
82
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
83
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
84
+ return config
85
+ .httpClient(url, {
86
+ headers: new Headers(__assign(__assign({ accept: 'application/vnd.pgrst.object+json' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'GET'))),
87
+ })
88
+ .then(function (_a) {
89
+ var json = _a.json;
90
+ return ({
91
+ data: (0, urlBuilder_1.dataWithId)(json, primaryKey),
105
92
  });
106
- },
107
- getMany: function (resource, params) {
108
- if (params === void 0) { params = {}; }
109
- var ids = params.ids;
110
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
111
- var query = (0, urlBuilder_1.getQuery)(primaryKey, ids, resource, params.meta);
112
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
113
- return httpClient(url).then(function (_a) {
114
- var json = _a.json;
115
- return ({
116
- data: json.map(function (data) { return (0, urlBuilder_1.dataWithId)(data, primaryKey); }),
117
- });
93
+ });
94
+ },
95
+ getMany: function (resource, params) {
96
+ var _a;
97
+ if (params === void 0) { params = {}; }
98
+ var ids = params.ids;
99
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
100
+ var query = (0, urlBuilder_1.getQuery)(primaryKey, ids, resource, params.meta);
101
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
102
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
103
+ return config
104
+ .httpClient(url, {
105
+ headers: new Headers(__assign({}, useCustomSchema(config.schema, metaSchema, 'GET'))),
106
+ })
107
+ .then(function (_a) {
108
+ var json = _a.json;
109
+ return ({
110
+ data: json.map(function (data) { return (0, urlBuilder_1.dataWithId)(data, primaryKey); }),
118
111
  });
119
- },
120
- getManyReference: function (resource, params) {
121
- var _a;
122
- var _b;
123
- if (params === void 0) { params = {}; }
124
- var _c = params.pagination, page = _c.page, perPage = _c.perPage;
125
- var _d = params.sort, field = _d.field, order = _d.order;
126
- var _e = (0, urlBuilder_1.parseFilters)(params, defaultListOp), filter = _e.filter, select = _e.select;
127
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
128
- var query = params.target
129
- ? __assign((_a = {}, _a[params.target] = "eq.".concat(params.id), _a.order = (0, urlBuilder_1.getOrderBy)(field, order, primaryKey), _a.offset = String((page - 1) * perPage), _a.limit = String(perPage), _a), filter) : __assign({ order: (0, urlBuilder_1.getOrderBy)(field, order, primaryKey), offset: String((page - 1) * perPage), limit: String(perPage) }, filter);
130
- if (select) {
131
- query.select = select;
112
+ });
113
+ },
114
+ getManyReference: function (resource, params) {
115
+ var _a;
116
+ var _b, _c;
117
+ if (params === void 0) { params = {}; }
118
+ var _d = params.pagination, page = _d.page, perPage = _d.perPage;
119
+ var _e = params.sort, field = _e.field, order = _e.order;
120
+ var _f = (0, urlBuilder_1.parseFilters)(params, config.defaultListOp), filter = _f.filter, select = _f.select;
121
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
122
+ var metaSchema = (_b = params.meta) === null || _b === void 0 ? void 0 : _b.schema;
123
+ var query = params.target
124
+ ? __assign((_a = {}, _a[params.target] = "eq.".concat(params.id), _a.order = (0, urlBuilder_1.getOrderBy)(field, order, primaryKey), _a.offset = String((page - 1) * perPage), _a.limit = String(perPage), _a), filter) : __assign({ order: (0, urlBuilder_1.getOrderBy)(field, order, primaryKey), offset: String((page - 1) * perPage), limit: String(perPage) }, filter);
125
+ if (select) {
126
+ query.select = select;
127
+ }
128
+ // add header that Content-Range is in returned header
129
+ var options = {
130
+ headers: new Headers(__assign(__assign({ Accept: 'application/json', Prefer: 'count=exact' }, (((_c = params.meta) === null || _c === void 0 ? void 0 : _c.headers) || {})), useCustomSchema(config.schema, metaSchema, 'GET'))),
131
+ };
132
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
133
+ return config.httpClient(url, options).then(function (_a) {
134
+ var headers = _a.headers, json = _a.json;
135
+ if (!headers.has('content-range')) {
136
+ throw new Error("The Content-Range header is missing in the HTTP Response. The postgREST data provider expects \n responses for lists of resources to contain this header with the total number of results to build \n the pagination. If you are using CORS, did you declare Content-Range in the Access-Control-Expose-Headers header?");
132
137
  }
133
- // add header that Content-Range is in returned header
134
- var options = {
135
- headers: new Headers(__assign({ Accept: 'application/json', Prefer: 'count=exact' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {}))),
138
+ return {
139
+ data: json.map(function (data) { return (0, urlBuilder_1.dataWithId)(data, primaryKey); }),
140
+ total: parseInt(headers.get('content-range').split('/').pop(), 10),
136
141
  };
137
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
138
- return httpClient(url, options).then(function (_a) {
139
- var headers = _a.headers, json = _a.json;
140
- if (!headers.has('content-range')) {
141
- throw new Error("The Content-Range header is missing in the HTTP Response. The postgREST data provider expects \n responses for lists of resources to contain this header with the total number of results to build \n the pagination. If you are using CORS, did you declare Content-Range in the Access-Control-Expose-Headers header?");
142
- }
143
- return {
144
- data: json.map(function (data) { return (0, urlBuilder_1.dataWithId)(data, primaryKey); }),
145
- total: parseInt(headers.get('content-range').split('/').pop(), 10),
146
- };
147
- });
148
- },
149
- update: function (resource, params) {
150
- var _a;
151
- if (params === void 0) { params = {}; }
152
- var id = params.id, data = params.data, meta = params.meta;
153
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
154
- var query = (0, urlBuilder_1.getQuery)(primaryKey, id, resource, meta);
155
- var primaryKeyData = (0, urlBuilder_1.getKeyData)(primaryKey, data);
156
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
157
- var body = JSON.stringify(__assign(__assign({}, data), primaryKeyData));
158
- return httpClient(url, {
159
- method: 'PATCH',
160
- headers: new Headers(__assign({ Accept: 'application/vnd.pgrst.object+json', Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
161
- body: body,
162
- }).then(function (_a) {
163
- var json = _a.json;
164
- return ({ data: (0, urlBuilder_1.dataWithId)(json, primaryKey) });
165
- });
166
- },
167
- updateMany: function (resource, params) {
168
- var _a;
169
- if (params === void 0) { params = {}; }
170
- var ids = params.ids;
171
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
172
- var body = JSON.stringify(params.ids.map(function (id) {
173
- var data = params.data;
174
- var primaryKeyParams = (0, urlBuilder_1.decodeId)(id, primaryKey);
175
- var primaryKeyData = {};
176
- if ((0, urlBuilder_1.isCompoundKey)(primaryKey)) {
177
- primaryKey.forEach(function (key, index) {
178
- primaryKeyData[key] = primaryKeyParams[index];
179
- });
180
- }
181
- else {
182
- primaryKeyData[primaryKey[0]] = primaryKeyParams[0];
183
- }
184
- return __assign(__assign({}, data), primaryKeyData);
185
- }));
186
- var url = "".concat(apiUrl, "/").concat(resource);
187
- return httpClient(url, {
188
- method: 'PATCH',
189
- headers: new Headers(__assign({ Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
190
- body: body,
191
- }).then(function (_a) {
192
- var json = _a.json;
193
- return ({
194
- data: json.map(function (data) { return (0, urlBuilder_1.encodeId)(data, primaryKey); }),
195
- });
196
- });
197
- },
198
- create: function (resource, params) {
199
- var _a;
200
- if (params === void 0) { params = {}; }
201
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
202
- var url = "".concat(apiUrl, "/").concat(resource);
203
- return httpClient(url, {
204
- method: 'POST',
205
- headers: new Headers(__assign({ Accept: 'application/vnd.pgrst.object+json', Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
206
- body: JSON.stringify(params.data),
207
- }).then(function (_a) {
208
- var json = _a.json;
209
- return ({
210
- data: __assign(__assign({}, json), { id: (0, urlBuilder_1.encodeId)(json, primaryKey) }),
142
+ });
143
+ },
144
+ update: function (resource, params) {
145
+ var _a, _b;
146
+ if (params === void 0) { params = {}; }
147
+ var id = params.id, data = params.data, meta = params.meta;
148
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
149
+ var query = (0, urlBuilder_1.getQuery)(primaryKey, id, resource, meta);
150
+ var primaryKeyData = (0, urlBuilder_1.getKeyData)(primaryKey, data);
151
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
152
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
153
+ var body = JSON.stringify(__assign(__assign({}, data), primaryKeyData));
154
+ return config
155
+ .httpClient(url, {
156
+ method: 'PATCH',
157
+ headers: new Headers(__assign(__assign({ Accept: 'application/vnd.pgrst.object+json', Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'PATCH'))),
158
+ body: body,
159
+ })
160
+ .then(function (_a) {
161
+ var json = _a.json;
162
+ return ({ data: (0, urlBuilder_1.dataWithId)(json, primaryKey) });
163
+ });
164
+ },
165
+ updateMany: function (resource, params) {
166
+ var _a, _b;
167
+ if (params === void 0) { params = {}; }
168
+ var ids = params.ids;
169
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
170
+ var body = JSON.stringify(params.ids.map(function (id) {
171
+ var data = params.data;
172
+ var primaryKeyParams = (0, urlBuilder_1.decodeId)(id, primaryKey);
173
+ var primaryKeyData = {};
174
+ if ((0, urlBuilder_1.isCompoundKey)(primaryKey)) {
175
+ primaryKey.forEach(function (key, index) {
176
+ primaryKeyData[key] = primaryKeyParams[index];
211
177
  });
178
+ }
179
+ else {
180
+ primaryKeyData[primaryKey[0]] = primaryKeyParams[0];
181
+ }
182
+ return __assign(__assign({}, data), primaryKeyData);
183
+ }));
184
+ var url = "".concat(config.apiUrl, "/").concat(resource);
185
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
186
+ return config
187
+ .httpClient(url, {
188
+ method: 'PATCH',
189
+ headers: new Headers(__assign(__assign({ Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'PATCH'))),
190
+ body: body,
191
+ })
192
+ .then(function (_a) {
193
+ var json = _a.json;
194
+ return ({
195
+ data: json.map(function (data) { return (0, urlBuilder_1.encodeId)(data, primaryKey); }),
212
196
  });
213
- },
214
- delete: function (resource, params) {
215
- var _a;
216
- if (params === void 0) { params = {}; }
217
- var id = params.id, meta = params.meta;
218
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
219
- var query = (0, urlBuilder_1.getQuery)(primaryKey, id, resource, meta);
220
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
221
- return httpClient(url, {
222
- method: 'DELETE',
223
- headers: new Headers(__assign({ Accept: 'application/vnd.pgrst.object+json', Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
224
- }).then(function (_a) {
225
- var json = _a.json;
226
- return ({ data: (0, urlBuilder_1.dataWithId)(json, primaryKey) });
197
+ });
198
+ },
199
+ create: function (resource, params) {
200
+ var _a, _b;
201
+ if (params === void 0) { params = {}; }
202
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
203
+ var url = "".concat(config.apiUrl, "/").concat(resource);
204
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
205
+ return config
206
+ .httpClient(url, {
207
+ method: 'POST',
208
+ headers: new Headers(__assign(__assign({ Accept: 'application/vnd.pgrst.object+json', Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'POST'))),
209
+ body: JSON.stringify(params.data),
210
+ })
211
+ .then(function (_a) {
212
+ var json = _a.json;
213
+ return ({
214
+ data: __assign(__assign({}, json), { id: (0, urlBuilder_1.encodeId)(json, primaryKey) }),
227
215
  });
228
- },
229
- deleteMany: function (resource, params) {
230
- var _a;
231
- if (params === void 0) { params = {}; }
232
- var ids = params.ids, meta = params.meta;
233
- var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, primaryKeys);
234
- var query = (0, urlBuilder_1.getQuery)(primaryKey, ids, resource, meta);
235
- var url = "".concat(apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
236
- return httpClient(url, {
237
- method: 'DELETE',
238
- headers: new Headers(__assign({ Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_a = params.meta) === null || _a === void 0 ? void 0 : _a.headers) || {}))),
239
- }).then(function (_a) {
240
- var json = _a.json;
241
- return ({
242
- data: json.map(function (data) { return (0, urlBuilder_1.encodeId)(data, primaryKey); }),
243
- });
216
+ });
217
+ },
218
+ delete: function (resource, params) {
219
+ var _a, _b;
220
+ if (params === void 0) { params = {}; }
221
+ var id = params.id, meta = params.meta;
222
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
223
+ var query = (0, urlBuilder_1.getQuery)(primaryKey, id, resource, meta);
224
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
225
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
226
+ return config
227
+ .httpClient(url, {
228
+ method: 'DELETE',
229
+ headers: new Headers(__assign(__assign({ Accept: 'application/vnd.pgrst.object+json', Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'DELETE'))),
230
+ })
231
+ .then(function (_a) {
232
+ var json = _a.json;
233
+ return ({ data: (0, urlBuilder_1.dataWithId)(json, primaryKey) });
234
+ });
235
+ },
236
+ deleteMany: function (resource, params) {
237
+ var _a, _b;
238
+ if (params === void 0) { params = {}; }
239
+ var ids = params.ids, meta = params.meta;
240
+ var primaryKey = (0, urlBuilder_1.getPrimaryKey)(resource, config.primaryKeys);
241
+ var query = (0, urlBuilder_1.getQuery)(primaryKey, ids, resource, meta);
242
+ var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
243
+ var metaSchema = (_a = params.meta) === null || _a === void 0 ? void 0 : _a.schema;
244
+ return config
245
+ .httpClient(url, {
246
+ method: 'DELETE',
247
+ headers: new Headers(__assign(__assign({ Prefer: 'return=representation', 'Content-Type': 'application/json' }, (((_b = params.meta) === null || _b === void 0 ? void 0 : _b.headers) || {})), useCustomSchema(config.schema, metaSchema, 'DELETE'))),
248
+ })
249
+ .then(function (_a) {
250
+ var json = _a.json;
251
+ return ({
252
+ data: json.map(function (data) { return (0, urlBuilder_1.encodeId)(data, primaryKey); }),
244
253
  });
245
- },
246
- });
247
- });
254
+ });
255
+ },
256
+ }); });
package/lib/urlBuilder.js CHANGED
@@ -60,19 +60,48 @@ var parseFilters = function (params, defaultListOp) {
60
60
  // we split the search term in words
61
61
  values = filter[key].trim().split(/\s+/);
62
62
  }
63
+ // CASE: Logical operator
64
+ else if (['or', 'and'].includes(operation)) {
65
+ // we extract each value entries and make it dot separated string.
66
+ var subFilter = (0, exports.parseFilters)({ filter: filter[key] }, defaultListOp).filter;
67
+ // something like { "age@lt": 18 } and { "age@gt": 21 }
68
+ var filterExpressions_1 = [];
69
+ Object.entries(subFilter).forEach(function (_a) {
70
+ var op = _a[0], val = _a[1];
71
+ if (Array.isArray(val))
72
+ filterExpressions_1.push.apply(filterExpressions_1, val.map(function (v) { return [op, v].join('.'); }));
73
+ else
74
+ filterExpressions_1.push([op, val].join('.'));
75
+ });
76
+ // finally we flatten all as single string and enclose with bracket.
77
+ values = ["(".concat(filterExpressions_1.join(','), ")")];
78
+ }
63
79
  else {
64
80
  values = [filter[key]];
65
81
  }
66
82
  values.forEach(function (value) {
67
- // if operator is intentionally blank, rpc syntax
68
- var op = operation.includes('like')
69
- ? "".concat(operation, ".*").concat(value, "*")
70
- : operation.length == 0
71
- ? "".concat(value)
72
- : "".concat(operation, ".").concat(value);
83
+ var op = (function () {
84
+ // if operator is intentionally blank, rpc syntax
85
+ if (operation.length === 0)
86
+ return "".concat(value);
87
+ if (operation.includes('like'))
88
+ return "".concat(operation, ".*").concat(value, "*");
89
+ if (['and', 'or'].includes(operation))
90
+ return "".concat(value);
91
+ if (['cs', 'cd'].includes(operation))
92
+ return "".concat(operation, ".{").concat(value, "}");
93
+ return "".concat(operation, ".").concat(value);
94
+ })();
95
+ // If resulting filter haven't contains the fieldname, then add it.
73
96
  if (result.filter[splitKey[0]] === undefined) {
74
- // first operator for the key, we add it to the dict
75
- result.filter[splitKey[0]] = op;
97
+ // first operator for the key,
98
+ if (['and', 'or'].includes(operation)) {
99
+ result.filter[operation] = op;
100
+ }
101
+ else {
102
+ // we add it to the dict
103
+ result.filter[splitKey[0]] = op;
104
+ }
76
105
  }
77
106
  else {
78
107
  if (!Array.isArray(result[splitKey[0]])) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@raphiniert/ra-data-postgrest",
3
- "version": "2.0.0-alpha.1",
3
+ "version": "2.0.0-alpha.3",
4
4
  "description": "postgREST data provider for react-admin",
5
5
  "main": "lib/index.js",
6
6
  "module": "esm/index.js",
@@ -31,15 +31,16 @@
31
31
  },
32
32
  "devDependencies": {
33
33
  "@types/jest": "^28.1.4",
34
+ "@types/qs": "^6.9.7",
34
35
  "cross-env": "^7.0.3",
35
36
  "eslint-config-prettier": "^8.8.0",
36
37
  "eslint-plugin-prettier": "^4.2.1",
37
38
  "install-peers-cli": "^2.2.0",
38
39
  "jest": "^28.1.2",
39
- "prettier": "~2.8.7",
40
- "rimraf": "^4.4.1",
40
+ "prettier": "~2.8.8",
41
+ "rimraf": "^5.0.0",
41
42
  "ts-jest": "^28.0.5",
42
- "typescript": "^4.9.5"
43
+ "typescript": "^5.0.4"
43
44
  },
44
45
  "peerDependencies": {
45
46
  "ra-core": "^4.1.0"