@raphiniert/ra-data-postgrest 2.4.0 → 2.5.0

package/esm/index.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { getPrimaryKey, parseFilters, getOrderBy, dataWithVirtualId, dataWithoutVirtualId, removePrimaryKey, getQuery, encodeId, } from './urlBuilder';
 import qs from 'qs';
-import isEqual from 'lodash/isEqual';
+import { isDeepStrictEqual as isEqual } from 'node:util';
 export var defaultPrimaryKeys = new Map();
 export var defaultSchema = function () { return ''; };
 var useCustomSchema = function (schema, metaSchema, method) {
@@ -76,13 +76,17 @@ export default (function (config) { return ({
         };
         var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs.stringify(query));
         return config.httpClient(url, options).then(function (_a) {
+            var _b, _c, _d;
             var headers = _a.headers, json = _a.json;
             if (!headers.has('content-range')) {
                 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?");
             }
+            var data = json.map(function (obj) { return dataWithVirtualId(obj, primaryKey); });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
             return {
-                data: json.map(function (obj) { return dataWithVirtualId(obj, primaryKey); }),
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
                 total: parseInt(headers.get('content-range').split('/').pop(), 10),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
             };
         });
     },
@@ -99,10 +103,14 @@ export default (function (config) { return ({
             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'))),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: dataWithVirtualId(json, primaryKey),
-            });
+            var data = dataWithVirtualId(json, primaryKey);
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     getMany: function (resource, params) {
@@ -121,10 +129,16 @@ export default (function (config) { return ({
             headers: new Headers(__assign({}, useCustomSchema(config.schema, metaSchema, 'GET'))),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: json.map(function (data) { return dataWithVirtualId(data, primaryKey); }),
+            var data = json.map(function (data) {
+                return dataWithVirtualId(data, primaryKey);
             });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     getManyReference: function (resource, params) {
@@ -147,13 +161,17 @@ export default (function (config) { return ({
         };
         var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs.stringify(query));
         return config.httpClient(url, options).then(function (_a) {
+            var _b, _c, _d;
             var headers = _a.headers, json = _a.json;
             if (!headers.has('content-range')) {
                 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?");
             }
+            var data = json.map(function (data) { return dataWithVirtualId(data, primaryKey); });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
             return {
-                data: json.map(function (data) { return dataWithVirtualId(data, primaryKey); }),
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
                 total: parseInt(headers.get('content-range').split('/').pop(), 10),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
             };
         });
     },
@@ -177,10 +195,14 @@ export default (function (config) { return ({
             body: body,
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: dataWithVirtualId(json, primaryKey),
-            });
+            var data = dataWithVirtualId(json, primaryKey);
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     updateMany: function (resource, params) {
@@ -221,10 +243,14 @@ export default (function (config) { return ({
             body: JSON.stringify(dataWithoutVirtualId(params.data, primaryKey)),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: __assign(__assign({}, json), { id: encodeId(json, primaryKey) }),
-            });
+            var data = __assign(__assign({}, json), { id: encodeId(json, primaryKey) });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     delete: function (resource, params) {
@@ -241,10 +267,14 @@ export default (function (config) { return ({
             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'))),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: dataWithVirtualId(json, primaryKey),
-            });
+            var data = dataWithVirtualId(json, primaryKey);
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     deleteMany: function (resource, params) {
@@ -277,3 +307,73 @@ var getChanges = function (data, previousData) {
     }, {});
     return changes;
 };
+/**
+ * Extract embeds from Postgrest responses
+ *
+ * When calling Postgrest database.getOne('posts', 123, { embed: 'tags' }),
+ * the Postgrest response adds a `tags` key to the response, containing the
+ * related tags. Something like:
+ *
+ *     { id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }
+ *
+ * We want to copy all the embeds in a data object, that will later
+ * be included into the response meta.prefetched key.
+ *
+ * @example getPrefetchedData({ id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }, ['tags'])
+ * // {
+ * //   tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }]
+ * // }
+ */
+var getPrefetchedData = function (data, prefetchParam) {
+    if (!prefetchParam)
+        return undefined;
+    var prefetched = {};
+    var dataArray = Array.isArray(data) ? data : [data];
+    prefetchParam.forEach(function (resource) {
+        dataArray.forEach(function (record) {
+            if (!prefetched[resource]) {
+                prefetched[resource] = [];
+            }
+            var prefetchedData = Array.isArray(record[resource])
+                ? record[resource]
+                : [record[resource]];
+            prefetchedData.forEach(function (prefetchedRecord) {
+                if (prefetched[resource].some(function (r) { return r.id === prefetchedRecord.id; })) {
+                    // do not add the record if it's already there
+                    return;
+                }
+                prefetched[resource].push(prefetchedRecord);
+            });
+        });
+    });
+    return prefetched;
+};
+/**
+ * Remove embeds from Postgrest responses
+ *
+ * When calling Postgrest database.getOne('posts', 123, { embed: 'tags' }),
+ * the Postgrest response adds a `post` key to the response, containing the
+ * related post. Something like:
+ *
+ *     { id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }
+ *
+ * We want to remove all the embeds from the response.
+ *
+ * @example removePrefetchedData({ id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }, 'tags')
+ * // { id: 123, title: 'React-query in details' }
+ */
+var removePrefetchedData = function (data, prefetchParam) {
+    if (!prefetchParam)
+        return data;
+    var dataArray = Array.isArray(data) ? data : [data];
+    var newDataArray = dataArray.map(function (record) {
+        var newRecord = {};
+        for (var key in record) {
+            if (!prefetchParam.includes(key)) {
+                newRecord[key] = record[key];
+            }
+        }
+        return newRecord;
+    });
+    return Array.isArray(data) ? newDataArray : newDataArray[0];
+};

package/esm/urlBuilder.js

@@ -154,6 +154,14 @@ export var parseFilters = function (params, defaultListOp) {
             ? meta.columns.join(',')
             : meta.columns;
     }
+    if ((meta === null || meta === void 0 ? void 0 : meta.embed) || (meta === null || meta === void 0 ? void 0 : meta.prefetch)) {
+        var columns = getColumnsParam(meta.embed, meta.prefetch);
+        if (columns) {
+            result.select = result.select
+                ? "".concat(result.select, ",").concat(columns.join(','))
+                : "*,".concat(columns.join(','));
+        }
+    }
     return result;
 };
 export var getPrimaryKey = function (resource, primaryKeys) {
@@ -256,6 +264,15 @@ export var getQuery = function (primaryKey, ids, resource, meta) {
             ? meta.columns.join(',')
             : meta.columns;
     }
+    if ((meta === null || meta === void 0 ? void 0 : meta.embed) || (meta === null || meta === void 0 ? void 0 : meta.prefetch)) {
+        var columns = getColumnsParam(meta.embed, meta.prefetch);
+        if (columns) {
+            result.select = result.select
+                ? "".concat(result.select, ",").concat(columns.join(','))
+                : // if users did not specify any columns, we must add the wildcard select to not get only the embeds/prefetch
+                    "*,".concat(columns.join(','));
+        }
+    }
     return result;
 };
 export var getOrderBy = function (field, order, primaryKey, sortOrder) {
@@ -268,3 +285,16 @@ export var getOrderBy = function (field, order, primaryKey, sortOrder) {
         return "".concat(field, ".").concat(postgRestOrder);
     }
 };
+/**
+ * Compute the columns parameter for the embed and prefetch query meta properties
+ */
+var getColumnsParam = function (embed, prefetch) {
+    if (!embed && !prefetch)
+        return;
+    var param = new Set();
+    if (embed)
+        embed.forEach(function (resource) { return param.add("".concat(resource, "(*)")); });
+    if (prefetch)
+        prefetch.forEach(function (resource) { return param.add("".concat(resource, "(*)")); });
+    return Array.from(param);
+};

package/lib/index.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultSchema = exports.defaultPrimaryKeys = void 0;
 var urlBuilder_1 = require("./urlBuilder");
 var qs_1 = __importDefault(require("qs"));
-var isEqual_1 = __importDefault(require("lodash/isEqual"));
+var node_util_1 = require("node:util");
 exports.defaultPrimaryKeys = new Map();
 var defaultSchema = function () { return ''; };
 exports.defaultSchema = defaultSchema;
@@ -83,13 +83,17 @@ exports.default = (function (config) { return ({
         };
         var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
         return config.httpClient(url, options).then(function (_a) {
+            var _b, _c, _d;
             var headers = _a.headers, json = _a.json;
             if (!headers.has('content-range')) {
                 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?");
             }
+            var data = json.map(function (obj) { return (0, urlBuilder_1.dataWithVirtualId)(obj, primaryKey); });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
             return {
-                data: json.map(function (obj) { return (0, urlBuilder_1.dataWithVirtualId)(obj, primaryKey); }),
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
                 total: parseInt(headers.get('content-range').split('/').pop(), 10),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
             };
         });
     },
@@ -106,10 +110,14 @@ exports.default = (function (config) { return ({
             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'))),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: (0, urlBuilder_1.dataWithVirtualId)(json, primaryKey),
-            });
+            var data = (0, urlBuilder_1.dataWithVirtualId)(json, primaryKey);
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     getMany: function (resource, params) {
@@ -128,10 +136,16 @@ exports.default = (function (config) { return ({
             headers: new Headers(__assign({}, useCustomSchema(config.schema, metaSchema, 'GET'))),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: json.map(function (data) { return (0, urlBuilder_1.dataWithVirtualId)(data, primaryKey); }),
+            var data = json.map(function (data) {
+                return (0, urlBuilder_1.dataWithVirtualId)(data, primaryKey);
             });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     getManyReference: function (resource, params) {
@@ -154,13 +168,17 @@ exports.default = (function (config) { return ({
         };
         var url = "".concat(config.apiUrl, "/").concat(resource, "?").concat(qs_1.default.stringify(query));
         return config.httpClient(url, options).then(function (_a) {
+            var _b, _c, _d;
             var headers = _a.headers, json = _a.json;
             if (!headers.has('content-range')) {
                 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?");
             }
+            var data = json.map(function (data) { return (0, urlBuilder_1.dataWithVirtualId)(data, primaryKey); });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
             return {
-                data: json.map(function (data) { return (0, urlBuilder_1.dataWithVirtualId)(data, primaryKey); }),
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
                 total: parseInt(headers.get('content-range').split('/').pop(), 10),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
             };
         });
     },
@@ -184,10 +202,14 @@ exports.default = (function (config) { return ({
             body: body,
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: (0, urlBuilder_1.dataWithVirtualId)(json, primaryKey),
-            });
+            var data = (0, urlBuilder_1.dataWithVirtualId)(json, primaryKey);
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     updateMany: function (resource, params) {
@@ -228,10 +250,14 @@ exports.default = (function (config) { return ({
             body: JSON.stringify((0, urlBuilder_1.dataWithoutVirtualId)(params.data, primaryKey)),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: __assign(__assign({}, json), { id: (0, urlBuilder_1.encodeId)(json, primaryKey) }),
-            });
+            var data = __assign(__assign({}, json), { id: (0, urlBuilder_1.encodeId)(json, primaryKey) });
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     delete: function (resource, params) {
@@ -248,10 +274,14 @@ exports.default = (function (config) { return ({
             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'))),
         })
             .then(function (_a) {
+            var _b, _c, _d;
             var json = _a.json;
-            return ({
-                data: (0, urlBuilder_1.dataWithVirtualId)(json, primaryKey),
-            });
+            var data = (0, urlBuilder_1.dataWithVirtualId)(json, primaryKey);
+            var prefetched = getPrefetchedData(data, (_b = params.meta) === null || _b === void 0 ? void 0 : _b.prefetch);
+            return {
+                data: removePrefetchedData(data, (_c = params.meta) === null || _c === void 0 ? void 0 : _c.prefetch),
+                meta: ((_d = params.meta) === null || _d === void 0 ? void 0 : _d.prefetch) ? { prefetched: prefetched } : undefined,
+            };
         });
     },
     deleteMany: function (resource, params) {
@@ -277,10 +307,80 @@ exports.default = (function (config) { return ({
 }); });
 var getChanges = function (data, previousData) {
     var changes = Object.keys(data).reduce(function (changes, key) {
-        if (!(0, isEqual_1.default)(data[key], previousData[key])) {
+        if (!(0, node_util_1.isDeepStrictEqual)(data[key], previousData[key])) {
             changes[key] = data[key];
         }
         return changes;
     }, {});
     return changes;
 };
+/**
+ * Extract embeds from Postgrest responses
+ *
+ * When calling Postgrest database.getOne('posts', 123, { embed: 'tags' }),
+ * the Postgrest response adds a `tags` key to the response, containing the
+ * related tags. Something like:
+ *
+ *     { id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }
+ *
+ * We want to copy all the embeds in a data object, that will later
+ * be included into the response meta.prefetched key.
+ *
+ * @example getPrefetchedData({ id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }, ['tags'])
+ * // {
+ * //   tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }]
+ * // }
+ */
+var getPrefetchedData = function (data, prefetchParam) {
+    if (!prefetchParam)
+        return undefined;
+    var prefetched = {};
+    var dataArray = Array.isArray(data) ? data : [data];
+    prefetchParam.forEach(function (resource) {
+        dataArray.forEach(function (record) {
+            if (!prefetched[resource]) {
+                prefetched[resource] = [];
+            }
+            var prefetchedData = Array.isArray(record[resource])
+                ? record[resource]
+                : [record[resource]];
+            prefetchedData.forEach(function (prefetchedRecord) {
+                if (prefetched[resource].some(function (r) { return r.id === prefetchedRecord.id; })) {
+                    // do not add the record if it's already there
+                    return;
+                }
+                prefetched[resource].push(prefetchedRecord);
+            });
+        });
+    });
+    return prefetched;
+};
+/**
+ * Remove embeds from Postgrest responses
+ *
+ * When calling Postgrest database.getOne('posts', 123, { embed: 'tags' }),
+ * the Postgrest response adds a `post` key to the response, containing the
+ * related post. Something like:
+ *
+ *     { id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }
+ *
+ * We want to remove all the embeds from the response.
+ *
+ * @example removePrefetchedData({ id: 123, title: 'React-query in details', tags: [{ id: 1, name: 'react' }, { id: 1, name: 'query' }] }, 'tags')
+ * // { id: 123, title: 'React-query in details' }
+ */
+var removePrefetchedData = function (data, prefetchParam) {
+    if (!prefetchParam)
+        return data;
+    var dataArray = Array.isArray(data) ? data : [data];
+    var newDataArray = dataArray.map(function (record) {
+        var newRecord = {};
+        for (var key in record) {
+            if (!prefetchParam.includes(key)) {
+                newRecord[key] = record[key];
+            }
+        }
+        return newRecord;
+    });
+    return Array.isArray(data) ? newDataArray : newDataArray[0];
+};

package/lib/urlBuilder.js

@@ -157,6 +157,14 @@ var parseFilters = function (params, defaultListOp) {
             ? meta.columns.join(',')
             : meta.columns;
     }
+    if ((meta === null || meta === void 0 ? void 0 : meta.embed) || (meta === null || meta === void 0 ? void 0 : meta.prefetch)) {
+        var columns = getColumnsParam(meta.embed, meta.prefetch);
+        if (columns) {
+            result.select = result.select
+                ? "".concat(result.select, ",").concat(columns.join(','))
+                : "*,".concat(columns.join(','));
+        }
+    }
     return result;
 };
 exports.parseFilters = parseFilters;
@@ -266,6 +274,15 @@ var getQuery = function (primaryKey, ids, resource, meta) {
             ? meta.columns.join(',')
             : meta.columns;
     }
+    if ((meta === null || meta === void 0 ? void 0 : meta.embed) || (meta === null || meta === void 0 ? void 0 : meta.prefetch)) {
+        var columns = getColumnsParam(meta.embed, meta.prefetch);
+        if (columns) {
+            result.select = result.select
+                ? "".concat(result.select, ",").concat(columns.join(','))
+                : // if users did not specify any columns, we must add the wildcard select to not get only the embeds/prefetch
+                    "*,".concat(columns.join(','));
+        }
+    }
     return result;
 };
 exports.getQuery = getQuery;
@@ -280,3 +297,16 @@ var getOrderBy = function (field, order, primaryKey, sortOrder) {
     }
 };
 exports.getOrderBy = getOrderBy;
+/**
+ * Compute the columns parameter for the embed and prefetch query meta properties
+ */
+var getColumnsParam = function (embed, prefetch) {
+    if (!embed && !prefetch)
+        return;
+    var param = new Set();
+    if (embed)
+        embed.forEach(function (resource) { return param.add("".concat(resource, "(*)")); });
+    if (prefetch)
+        prefetch.forEach(function (resource) { return param.add("".concat(resource, "(*)")); });
+    return Array.from(param);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@raphiniert/ra-data-postgrest",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "description": "postgREST data provider for react-admin",
     "main": "lib/index.js",
     "module": "esm/index.js",
@@ -29,23 +29,22 @@
         "prettier": "prettier --config ./.prettierrc.js --write --list-different \"src/**/*.{js,json,ts,tsx,css,md}\""
     },
     "devDependencies": {
-        "@types/jest": "^29.5.12",
-        "@types/qs": "^6.9.15",
+        "@types/jest": "^29.5.14",
+        "@types/qs": "^6.9.18",
         "cross-env": "^7.0.3",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-config-prettier": "^10.1.2",
+        "eslint-plugin-prettier": "^5.2.6",
         "install-peers-cli": "^2.2.0",
         "jest": "^29.7.0",
-        "prettier": "^3.3.2",
+        "prettier": "^3.5.3",
         "rimraf": "^6.0.1",
-        "ts-jest": "^29.1.5",
-        "typescript": "^5.5.2"
+        "ts-jest": "^29.3.2",
+        "typescript": "^5.8.3"
     },
     "peerDependencies": {
-        "ra-core": "^3.0.0 || ^4.1.0 || ^5.0.1"
+        "ra-core": "^5.7.3"
     },
     "dependencies": {
-        "lodash.isequal": "^4.5.0",
-        "qs": "^6.12.1"
+        "qs": "^6.14.0"
     }
 }