@semapps/semantic-data-provider 0.6.4 → 0.6.6

package/dist/index.cjs.js

@@ -1,6 +1,5 @@
 var $bkNnK$urljoin = require("url-join");
 var $bkNnK$jsonld = require("jsonld");
-var $bkNnK$isobject = require("isobject");
 var $bkNnK$rdfjsdatamodel = require("@rdfjs/data-model");
 var $bkNnK$sparqljs = require("sparqljs");
 var $bkNnK$cryptojsmd5 = require("crypto-js/md5");
@@ -25,9 +24,10 @@ $parcel$export(module.exports, "buildBlankNodesQuery", () => $64d4ce40c79d1509$e
 $parcel$export(module.exports, "useGetExternalLink", () => $85e9a897c6d7c14a$export$2e2bcd8739ae039);
 $parcel$export(module.exports, "useContainers", () => $3158e0dc13ffffaa$export$2e2bcd8739ae039);
 $parcel$export(module.exports, "useCreateContainer", () => $99ed32cbdb76cb50$export$2e2bcd8739ae039);
+$parcel$export(module.exports, "useCreateContainerUri", () => $298b78bb7d4a3358$export$2e2bcd8739ae039);
 $parcel$export(module.exports, "useDataModel", () => $63a32f1a35c6f80e$export$2e2bcd8739ae039);
-$parcel$export(module.exports, "useDataModels", () => $8d622cbd05acb834$export$2e2bcd8739ae039);
-$parcel$export(module.exports, "useDataServers", () => $9b817943cd488c90$export$2e2bcd8739ae039);
+$parcel$export(module.exports, "useDataModels", () => $20621bc841a5205a$export$2e2bcd8739ae039);
+$parcel$export(module.exports, "useDataServers", () => $c9933a88e2acc4da$export$2e2bcd8739ae039);
 $parcel$export(module.exports, "FilterHandler", () => $f763906f9b20f2d8$export$2e2bcd8739ae039);
 $parcel$export(module.exports, "GroupedReferenceHandler", () => $b4703fef6d6af456$export$2e2bcd8739ae039);
 $parcel$export(module.exports, "ReificationArrayInput", () => $030f1232f6810456$export$2e2bcd8739ae039);
@@ -196,7 +196,7 @@ const $047a107b0d203793$var$findContainersWithTypes = (types, serverKeys, dataSe
     const existingContainers = [];
     const parsedServerKeys = (0, $982f4f2fb185d606$export$2e2bcd8739ae039)(serverKeys, dataServers);
     Object.keys(dataServers).filter((dataServerKey)=>dataServers[dataServerKey].containers).forEach((dataServerKey)=>{
-        Object.keys(dataServers[dataServerKey].containers).forEach((containerKey)=>{
+        Object.keys(dataServers[dataServerKey].containers || {}).forEach((containerKey)=>{
             if (!parsedServerKeys || parsedServerKeys.includes(containerKey)) Object.keys(dataServers[dataServerKey].containers[containerKey]).forEach((type)=>{
                 if (types.includes(type)) dataServers[dataServerKey].containers[containerKey][type].map((path)=>{
                     const containerUri = (0, ($parcel$interopDefault($bkNnK$urljoin)))(dataServers[containerKey].baseUrl, path);
@@ -327,8 +327,7 @@ var $241c41c6f6021c7a$export$2e2bcd8739ae039 = $241c41c6f6021c7a$var$getDataMode
 
 
 
-
-const $4d160872c02aa8d3$var$arrayOf = (value)=>{
+const $e6fbab1f303bdb93$var$arrayOf = (value)=>{
     // If the field is null-ish, we suppose there are no values.
     if (!value) return [];
     // Return as is.
@@ -338,86 +337,110 @@ const $4d160872c02aa8d3$var$arrayOf = (value)=>{
         value
     ];
 };
-var $4d160872c02aa8d3$export$2e2bcd8739ae039 = $4d160872c02aa8d3$var$arrayOf;
+var $e6fbab1f303bdb93$export$2e2bcd8739ae039 = $e6fbab1f303bdb93$var$arrayOf;
 
 
-const $6e66f3a2f960b9ca$export$26b9f946b448f23e = (type, resource)=>{
-    const resourceType = resource.type || resource["@type"];
-    return Array.isArray(resourceType) ? resourceType.includes(type) : resourceType === type;
+const $8c999cc29c8d6a6c$var$isValidLDPContainer = (container)=>{
+    const resourceType = container.type || container["@type"];
+    return Array.isArray(resourceType) ? resourceType.includes("ldp:Container") : resourceType === "ldp:Container";
 };
-const $6e66f3a2f960b9ca$var$fetchContainers = async (containers, resourceId, params, config)=>{
-    const { httpClient: httpClient, jsonContext: jsonContext } = config;
-    // Transform in an containerUri:serverKey object
-    const containersServers = Object.keys(containers).reduce((acc, serverKey)=>({
-            ...acc,
-            ...Object.fromEntries(containers[serverKey].map((containerUri)=>[
-                    containerUri,
-                    serverKey
-                ]))
-        }), {});
-    const fetchPromises = Object.keys(containersServers).map((containerUri)=>httpClient(containerUri).then(({ json: json })=>{
+const $8c999cc29c8d6a6c$var$isObject = (val)=>{
+    return val != null && typeof val === "object" && !Array.isArray(val);
+};
+const $8c999cc29c8d6a6c$var$fetchContainers = async (containers, params, { httpClient: httpClient, jsonContext: jsonContext })=>{
+    const containersUri = Object.values(containers).flat();
+    const fetchPromises = containersUri.map((containerUri)=>httpClient(containerUri).then(async ({ json: json })=>{
+            const jsonResponse = json;
             // If container's context is different, compact it to have an uniform result
             // TODO deep compare if the context is an object
-            if (json["@context"] !== jsonContext) return (0, ($parcel$interopDefault($bkNnK$jsonld))).compact(json, jsonContext);
-            return json;
+            if (jsonResponse["@context"] !== jsonContext) return (0, ($parcel$interopDefault($bkNnK$jsonld))).compact(jsonResponse, jsonContext);
+            return jsonResponse;
         }).then((json)=>{
-            if ($6e66f3a2f960b9ca$export$26b9f946b448f23e("ldp:Container", json)) return (0, $4d160872c02aa8d3$export$2e2bcd8739ae039)(json["ldp:contains"]).map((resource)=>({
+            if (!$8c999cc29c8d6a6c$var$isValidLDPContainer(json)) throw new Error(`${containerUri} is not a LDP container`);
+            return (0, $e6fbab1f303bdb93$export$2e2bcd8739ae039)(json["ldp:contains"]).map((resource)=>({
                     "@context": json["@context"],
                     ...resource
                 }));
-            throw new Error(`${containerUri} is not a LDP container`);
         }));
     // Fetch simultaneously all containers
-    let results = await Promise.all(fetchPromises);
-    if (results.length === 0) return {
-        data: [],
-        total: 0
-    };
-    // Merge all results in one array
-    results = [].concat.apply(...results);
-    let returnData = results.map((item)=>{
-        item.id = item.id || item["@id"];
-        return item;
+    const results = await Promise.all(fetchPromises);
+    let resources = results.flat();
+    resources = resources.map((resource)=>{
+        resource.id = resource.id || resource["@id"];
+        return resource;
     });
     // Apply filter to results
-    if (params.filter) {
-        // For SPARQL queries, we use "a" to filter types, but in containers it must be "type"
-        if (params.filter.a) {
-            params.filter.type = params.filter.a;
-            delete params.filter.a;
-        }
-        if (Object.keys(params.filter).length > 0) returnData = returnData.filter((resource)=>{
-            return Object.entries(params.filter).every(([k, v])=>{
-                if (k == "q") return Object.entries(resource).some(([kr, vr])=>{
-                    if (!(0, ($parcel$interopDefault($bkNnK$isobject)))(vr)) {
-                        const arrayValues = Array.isArray(vr) ? vr : [
-                            vr
-                        ];
-                        return arrayValues.some((va)=>{
-                            if (typeof va === "string" || va instanceof String) return va.toLowerCase().normalize("NFD").includes(v.toLowerCase().normalize("NFD"));
-                        });
-                    }
-                    return false;
-                });
-                if (resource[k]) return Array.isArray(resource[k]) ? resource[k].some((va)=>va.includes(v)) : resource[k].includes(v);
-                return false;
+    const filters = params.filter;
+    // For SPARQL queries, we use "a" to filter types, but in containers it must be "type"
+    if (filters.a) {
+        filters.type = filters.a;
+        delete filters.a;
+    }
+    // Filter resources attributes according to _predicates list
+    if (filters._predicates && Array.isArray(filters._predicates)) {
+        const predicates = filters._predicates;
+        const mandatoryAttributes = [
+            "id"
+        ];
+        resources = resources.map((resource)=>{
+            return Object.keys(resource).filter((key)=>predicates.includes(key) || mandatoryAttributes.includes(key)).reduce((filteredResource, key)=>{
+                filteredResource[key] = resource[key];
+                return filteredResource;
+            }, {
+                "@context": []
             });
         });
     }
-    if (params.sort) returnData = returnData.sort((a, b)=>{
+    if (Object.keys(filters).filter((f)=>![
+            "_predicates",
+            "_servers"
+        ].includes(f)).length > 0) resources = resources.filter((resource)=>{
+        // Full text filtering
+        if (filters.q) return Object.values(resource).some((attributeValue)=>{
+            if (!$8c999cc29c8d6a6c$var$isObject(attributeValue)) {
+                const arrayValues = Array.isArray(attributeValue) ? attributeValue : [
+                    attributeValue
+                ];
+                return arrayValues.some((value)=>{
+                    if (typeof value === "string") return value.toLowerCase().normalize("NFD").includes(filters.q.toLowerCase().normalize("NFD"));
+                    return false;
+                });
+            }
+            return false;
+        });
+        // Attribute filtering
+        const attributesFilters = Object.keys(filters).filter((f)=>![
+                "_predicates",
+                "_servers",
+                "q"
+            ].includes(f));
+        return attributesFilters.every((attribute)=>{
+            if (resource[attribute]) {
+                const arrayValues = Array.isArray(resource[attribute]) ? resource[attribute] : [
+                    resource[attribute]
+                ];
+                return arrayValues.some((value)=>typeof value === "string" && value.includes(filters[attribute]));
+            }
+            return false;
+        });
+    });
+    // Sorting
+    if (params.sort) resources = resources.sort((a, b)=>{
         if (a[params.sort.field] && b[params.sort.field]) {
             if (params.sort.order === "ASC") return a[params.sort.field].localeCompare(b[params.sort.field]);
             return b[params.sort.field].localeCompare(a[params.sort.field]);
         }
         return true;
     });
-    if (params.pagination) returnData = returnData.slice((params.pagination.page - 1) * params.pagination.perPage, params.pagination.page * params.pagination.perPage);
+    // Pagination
+    const total = resources.length;
+    if (params.pagination) resources = resources.slice((params.pagination.page - 1) * params.pagination.perPage, params.pagination.page * params.pagination.perPage);
     return {
-        data: returnData,
-        total: results.length
+        data: resources,
+        total: total
     };
 };
-var $6e66f3a2f960b9ca$export$2e2bcd8739ae039 = $6e66f3a2f960b9ca$var$fetchContainers;
+var $8c999cc29c8d6a6c$export$2e2bcd8739ae039 = $8c999cc29c8d6a6c$var$fetchContainers;
 
 
 
@@ -882,7 +905,7 @@ const $b6ed253f3374f5d4$var$getListMethod = (config)=>async (resourceId, params
             containers = (0, $e3a78b3d48a0a0fb$export$2e2bcd8739ae039)(dataModel.list.containers, dataServers);
         } else // Otherwise find the container URIs on the given servers (either in the filter or the data model)
         containers = (0, $047a107b0d203793$export$2e2bcd8739ae039)(dataModel.types, params.filter?._servers || dataModel.list?.servers, dataServers);
-        if (dataModel.list?.fetchContainer) return (0, $6e66f3a2f960b9ca$export$2e2bcd8739ae039)(containers, resourceId, params, config);
+        if (dataModel.list?.fetchContainer) return (0, $8c999cc29c8d6a6c$export$2e2bcd8739ae039)(containers, params, config);
         return (0, $1e7a94d745f8597b$export$2e2bcd8739ae039)(containers, resourceId, params, config);
     };
 var $b6ed253f3374f5d4$export$2e2bcd8739ae039 = $b6ed253f3374f5d4$var$getListMethod;
@@ -1220,25 +1243,26 @@ var $63a32f1a35c6f80e$export$2e2bcd8739ae039 = $63a32f1a35c6f80e$var$useDataMode
 
 
 
-const $9b817943cd488c90$var$useDataServers = ()=>{
-    // Get the raw data provider, since useDataProvider returns a wrapper
-    const dataProvider = (0, $bkNnK$react.useContext)((0, $bkNnK$reactadmin.DataProviderContext));
+const $c9933a88e2acc4da$var$useDataServers = ()=>{
+    const dataProvider = (0, $bkNnK$reactadmin.useDataProvider)();
     const [dataServers, setDataServers] = (0, $bkNnK$react.useState)();
     (0, $bkNnK$react.useEffect)(()=>{
-        dataProvider.getDataServers().then((results)=>setDataServers(results));
+        dataProvider.getDataServers().then((results)=>{
+            setDataServers(results);
+        });
     }, [
         dataProvider,
         setDataServers
     ]);
     return dataServers;
 };
-var $9b817943cd488c90$export$2e2bcd8739ae039 = $9b817943cd488c90$var$useDataServers;
+var $c9933a88e2acc4da$export$2e2bcd8739ae039 = $c9933a88e2acc4da$var$useDataServers;
 
 
 
 const $3158e0dc13ffffaa$var$useContainers = (resourceId, serverKeys = "@all")=>{
     const dataModel = (0, $63a32f1a35c6f80e$export$2e2bcd8739ae039)(resourceId);
-    const dataServers = (0, $9b817943cd488c90$export$2e2bcd8739ae039)();
+    const dataServers = (0, $c9933a88e2acc4da$export$2e2bcd8739ae039)();
     const [containers, setContainers] = (0, $bkNnK$react.useState)();
     (0, $bkNnK$react.useEffect)(()=>{
         if (dataModel && dataServers) setContainers((0, $047a107b0d203793$export$2e2bcd8739ae039)(dataModel.types, serverKeys, dataServers));
@@ -1257,10 +1281,10 @@ var $3158e0dc13ffffaa$export$2e2bcd8739ae039 = $3158e0dc13ffffaa$var$useContaine
 
 
 
-const $b32fd11d6aa83d1c$var$findCreateContainerWithTypes = (types, createServerKey, dataServers)=>{
+const $ff3623bf1421ebcc$var$findCreateContainerWithTypes = (types, createServerKey, dataServers)=>{
     const containers = [];
-    if (dataServers[createServerKey].containers?.[createServerKey] && Object.keys(dataServers[createServerKey].containers[createServerKey]).length > 0) Object.keys(dataServers[createServerKey].containers[createServerKey]).forEach((type)=>{
-        if (types.includes(type)) dataServers[createServerKey].containers[createServerKey][type].map((path)=>{
+    Object.keys(dataServers[createServerKey].containers?.[createServerKey] || {}).forEach((type)=>{
+        if (types.includes(type)) dataServers[createServerKey].containers[createServerKey][type].forEach((path)=>{
             const containerUri = (0, ($parcel$interopDefault($bkNnK$urljoin)))(dataServers[createServerKey].baseUrl, path);
             if (!containers.includes(containerUri)) containers.push(containerUri);
         });
@@ -1269,13 +1293,13 @@ const $b32fd11d6aa83d1c$var$findCreateContainerWithTypes = (types, createServerK
     else if (containers.length > 1) throw new Error(`More than one container found matching with types ${JSON.stringify(types)}. You must set the create.server or create.container property for the resource.`);
     return containers[0];
 };
-var $b32fd11d6aa83d1c$export$2e2bcd8739ae039 = $b32fd11d6aa83d1c$var$findCreateContainerWithTypes;
+var $ff3623bf1421ebcc$export$2e2bcd8739ae039 = $ff3623bf1421ebcc$var$findCreateContainerWithTypes;
 
 
 
-const $99ed32cbdb76cb50$var$useCreateContainer = (resourceId)=>{
+/** @deprecated Use "useCreateContainerUri" instead */ const $99ed32cbdb76cb50$var$useCreateContainer = (resourceId)=>{
     const dataModel = (0, $63a32f1a35c6f80e$export$2e2bcd8739ae039)(resourceId);
-    const dataServers = (0, $9b817943cd488c90$export$2e2bcd8739ae039)();
+    const dataServers = (0, $c9933a88e2acc4da$export$2e2bcd8739ae039)();
     const [createContainer, setCreateContainer] = (0, $bkNnK$react.useState)();
     (0, $bkNnK$react.useEffect)(()=>{
         if (dataModel && dataServers) {
@@ -1283,10 +1307,10 @@ const $99ed32cbdb76cb50$var$useCreateContainer = (resourceId)=>{
                 const [serverKey, path] = Object.entries(dataModel.create.container)[0];
                 if (!serverKey || !dataServers[serverKey]) throw new Error(`Wrong key for the dataModel.create.container config of resource ${resourceId}`);
                 setCreateContainer((0, ($parcel$interopDefault($bkNnK$urljoin)))(dataServers[serverKey].baseUrl, path));
-            } else if (dataModel.create?.server) setCreateContainer((0, $b32fd11d6aa83d1c$export$2e2bcd8739ae039)(dataModel.types, dataModel.create?.server, dataServers));
+            } else if (dataModel.create?.server) setCreateContainer((0, $ff3623bf1421ebcc$export$2e2bcd8739ae039)(dataModel.types, dataModel.create?.server, dataServers));
             else {
                 const defaultServerKey = (0, $8f44b7c15b8b8e1d$export$2e2bcd8739ae039)("default", dataServers);
-                setCreateContainer((0, $b32fd11d6aa83d1c$export$2e2bcd8739ae039)(dataModel.types, defaultServerKey, dataServers));
+                setCreateContainer((0, $ff3623bf1421ebcc$export$2e2bcd8739ae039)(dataModel.types, defaultServerKey, dataServers));
             }
         }
     }, [
@@ -1302,19 +1326,50 @@ var $99ed32cbdb76cb50$export$2e2bcd8739ae039 = $99ed32cbdb76cb50$var$useCreateCo
 
 
 
-const $8d622cbd05acb834$var$useDataModels = ()=>{
-    // Get the raw data provider, since useDataProvider returns a wrapper
-    const dataProvider = (0, $bkNnK$react.useContext)((0, $bkNnK$reactadmin.DataProviderContext));
+
+
+
+
+const $20621bc841a5205a$var$useDataModels = ()=>{
+    const dataProvider = (0, $bkNnK$reactadmin.useDataProvider)();
     const [dataModels, setDataModels] = (0, $bkNnK$react.useState)();
     (0, $bkNnK$react.useEffect)(()=>{
-        dataProvider.getDataModels().then((results)=>setDataModels(results));
+        dataProvider.getDataModels().then((results)=>{
+            setDataModels(results);
+        });
     }, [
         dataProvider,
         setDataModels
     ]);
     return dataModels;
 };
-var $8d622cbd05acb834$export$2e2bcd8739ae039 = $8d622cbd05acb834$var$useDataModels;
+var $20621bc841a5205a$export$2e2bcd8739ae039 = $20621bc841a5205a$var$useDataModels;
+
+
+const $298b78bb7d4a3358$var$useCreateContainerUri = ()=>{
+    const dataModels = (0, $20621bc841a5205a$export$2e2bcd8739ae039)();
+    const dataServers = (0, $c9933a88e2acc4da$export$2e2bcd8739ae039)();
+    const getContainerUri = (0, $bkNnK$react.useCallback)((resourceId)=>{
+        if (!dataModels || !dataServers || !dataModels[resourceId]) return undefined;
+        const dataModel = dataModels[resourceId];
+        if (dataModel.create?.container) {
+            const [serverKey, path] = Object.entries(dataModel.create.container)[0];
+            if (!serverKey || !dataServers[serverKey]) throw new Error(`Wrong key for the dataModel.create.container config of resource ${resourceId}`);
+            return (0, ($parcel$interopDefault($bkNnK$urljoin)))(dataServers[serverKey].baseUrl, path);
+        }
+        if (dataModel.create?.server) return (0, $ff3623bf1421ebcc$export$2e2bcd8739ae039)(dataModel.types, dataModel.create?.server, dataServers);
+        const defaultServerKey = (0, $8f44b7c15b8b8e1d$export$2e2bcd8739ae039)("default", dataServers);
+        if (!defaultServerKey) throw new Error(`No default dataServer found. You can set explicitly one setting the "default" attribute to true`);
+        return (0, $ff3623bf1421ebcc$export$2e2bcd8739ae039)(dataModel.types, defaultServerKey, dataServers);
+    }, [
+        dataModels,
+        dataServers
+    ]);
+    return getContainerUri;
+};
+var $298b78bb7d4a3358$export$2e2bcd8739ae039 = $298b78bb7d4a3358$var$useCreateContainerUri;
+
+