@semapps/semantic-data-provider 1.1.1 → 1.1.3

package/dist/index.cjs.js

@@ -131,7 +131,6 @@ var $0edd1f2d07c8231f$export$2e2bcd8739ae039 = $0edd1f2d07c8231f$var$getUploadsC
 
 
 const $6fcb30f76390d142$var$isFile = (o)=>o?.rawFile && o.rawFile instanceof File;
-const $6fcb30f76390d142$var$isFileToDelete = (o)=>o?.fileToDelete !== undefined && o?.fileToDelete !== null;
 const $6fcb30f76390d142$export$a5575dbeeffdad98 = async (rawFile, config, serverKey)=>{
     const uploadsContainerUri = (0, $0edd1f2d07c8231f$export$2e2bcd8739ae039)(config, serverKey);
     if (!uploadsContainerUri) throw new Error("You must define an container with binaryResources in one of the server's configuration");
@@ -145,16 +144,10 @@ const $6fcb30f76390d142$export$a5575dbeeffdad98 = async (rawFile, config, server
     if (response.status === 201) return response.headers.get('Location');
     return null;
 };
-const $6fcb30f76390d142$var$deleteFiles = async (filesToDelete, config)=>{
-    return Promise.all(filesToDelete.map((file)=>config.httpClient(file, {
-            method: 'DELETE'
-        })));
-};
 /*
  * Look for raw files in the record data.
  * If there are any, upload them and replace the file by its URL.
  */ const $6fcb30f76390d142$var$uploadAllFiles = async (record, config, serverKey)=>{
-    const filesToDelete = [];
     const updatedRecord = {
         ...record
     };
@@ -162,30 +155,16 @@ const $6fcb30f76390d142$var$deleteFiles = async (filesToDelete, config)=>{
         const value = record[property];
         if (Array.isArray(value)) for(let i = 0; i < value.length; i++){
             const itemValue = value[i];
-            if ($6fcb30f76390d142$var$isFile(itemValue)) {
-                if ($6fcb30f76390d142$var$isFileToDelete(itemValue)) filesToDelete.push(itemValue.fileToDelete);
-                updatedRecord[property][i] = await $6fcb30f76390d142$export$a5575dbeeffdad98(itemValue.rawFile, config, serverKey);
-            } else if ($6fcb30f76390d142$var$isFileToDelete(itemValue)) {
-                filesToDelete.push(itemValue.fileToDelete);
-                updatedRecord[property][i] = null;
-            }
-        }
-        else if ($6fcb30f76390d142$var$isFile(value)) {
-            if ($6fcb30f76390d142$var$isFileToDelete(value)) filesToDelete.push(value.fileToDelete);
-            updatedRecord[property] = await $6fcb30f76390d142$export$a5575dbeeffdad98(value.rawFile, config, serverKey);
-        } else if ($6fcb30f76390d142$var$isFileToDelete(value)) {
-            filesToDelete.push(value.fileToDelete);
-            updatedRecord[property] = null;
+            if ($6fcb30f76390d142$var$isFile(itemValue)) updatedRecord[property][i] = await $6fcb30f76390d142$export$a5575dbeeffdad98(itemValue.rawFile, config, serverKey);
         }
+        else if ($6fcb30f76390d142$var$isFile(value)) updatedRecord[property] = await $6fcb30f76390d142$export$a5575dbeeffdad98(value.rawFile, config, serverKey);
     }
     return {
-        updatedRecord: updatedRecord,
-        filesToDelete: filesToDelete
+        updatedRecord: updatedRecord
     };
 };
 var $6fcb30f76390d142$export$2e2bcd8739ae039 = {
-    upload: $6fcb30f76390d142$var$uploadAllFiles,
-    delete: $6fcb30f76390d142$var$deleteFiles
+    upload: $6fcb30f76390d142$var$uploadAllFiles
 };
 
 
@@ -321,13 +300,11 @@ const $907cbc087f6529e2$var$createMethod = (config)=>async (resourceId, params)=
 var $907cbc087f6529e2$export$2e2bcd8739ae039 = $907cbc087f6529e2$var$createMethod;
 
 
-
 const $566b5adde94810fa$var$deleteMethod = (config)=>async (resourceId, params)=>{
         const { httpClient: httpClient } = config;
         await httpClient(`${params.id}`, {
             method: 'DELETE'
         });
-        if (params.meta?.filesToDelete) await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).delete(params.meta.filesToDelete, config);
         return {
             data: {
                 id: params.id
@@ -920,7 +897,7 @@ const $95cbc03f25caf72a$var$getListMethod = (config)=>async (resourceId, params)
         if (!dataModel) throw new Error(`Resource ${resourceId} is not mapped in resources file`);
         let containers = [];
         if (!params.filter?._servers && dataModel.list?.containers) {
-            if (Array.isArray(dataModel.list?.containers)) throw new Error(`The list.containers property of ${resourceId} dataModel must be of type object ({ serverKey: [containerUri] })`);
+            if (!Array.isArray(dataModel.list?.containers)) throw new Error(`The list.containers property of ${resourceId} dataModel must be of type array`);
             // If containers are set explicitly, use them
             containers = (0, $37c161736d0d7276$export$2e2bcd8739ae039)(dataModel.list.containers, dataServers);
         } else if (dataModel.shapeTreeUri) containers = (0, $1d94774735aa9ea2$export$2e2bcd8739ae039)(dataModel.shapeTreeUri, params?.filter?._servers || dataModel.list?.servers, dataServers);
@@ -1024,7 +1001,7 @@ const $ceaafb56f75454f0$var$updateMethod = (config)=>async (resourceId, params)=
         const { httpClient: httpClient, jsonContext: jsonContext, dataServers: dataServers } = config;
         const serverKey = (0, $59a07b932dae8600$export$2e2bcd8739ae039)(params.id, dataServers);
         // Upload files, if there are any
-        const { updatedRecord: updatedRecord, filesToDelete: filesToDelete } = await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).upload(params.data, config, serverKey);
+        const { updatedRecord: updatedRecord } = await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).upload(params.data, config, serverKey);
         params.data = updatedRecord;
         await httpClient(`${params.id}`, {
             method: 'PUT',
@@ -1033,8 +1010,6 @@ const $ceaafb56f75454f0$var$updateMethod = (config)=>async (resourceId, params)=
                 ...params.data
             })
         });
-        // Delete files only if update is successful
-        await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).delete(filesToDelete, config);
         return {
             data: params.data
         };
@@ -1101,16 +1076,16 @@ var $341dff85fe619d85$export$2e2bcd8739ae039 = $341dff85fe619d85$var$httpClient;
 
 
 
-const $9ab033d1ec46b5da$var$isURL = (value)=>(typeof value === 'string' || value instanceof String) && value.startsWith('http');
+const $9ab033d1ec46b5da$var$isURI = (value)=>(typeof value === 'string' || value instanceof String) && (value.startsWith('http') || value.startsWith('urn:'));
 const $9ab033d1ec46b5da$var$expandTypes = async (types, context)=>{
     // If types are already full URIs, return them immediately
-    if (types.every((type)=>$9ab033d1ec46b5da$var$isURL(type))) return types;
+    if (types.every((type)=>$9ab033d1ec46b5da$var$isURI(type))) return types;
     const result = await (0, ($parcel$interopDefault($bkNnK$jsonld))).expand({
         '@context': context,
         '@type': types
     });
     const expandedTypes = (0, $e6fbab1f303bdb93$export$2e2bcd8739ae039)(result[0]['@type']);
-    if (!expandedTypes.every((type)=>$9ab033d1ec46b5da$var$isURL(type))) throw new Error(`
+    if (!expandedTypes.every((type)=>$9ab033d1ec46b5da$var$isURI(type))) throw new Error(`
       Could not expand all types (${expandedTypes.join(', ')}).
       Is an ontology missing or not registered yet on the local context ?
     `);
@@ -1220,6 +1195,8 @@ var $fcf4eee3b18e8350$export$2e2bcd8739ae039 = $fcf4eee3b18e8350$var$getOntologi
         config.dataServers ??= {};
         // Configure httpClient with initial data servers, so that plugins may use it
         config.httpClient = (0, $341dff85fe619d85$export$2e2bcd8739ae039)(config.dataServers);
+        // Useful for debugging.
+        document.httpClient = config.httpClient;
         for (const plugin of config.plugins)if (plugin.transformConfig) config = await plugin.transformConfig(config);
         // Configure again httpClient with possibly updated data servers
         config.httpClient = (0, $341dff85fe619d85$export$2e2bcd8739ae039)(config.dataServers);
@@ -1553,16 +1530,22 @@ const $1395e306228d41f2$var$fetchVoidEndpoints = ()=>({
                             const expandedTypes = await (0, $9ab033d1ec46b5da$export$2e2bcd8739ae039)([
                                 type
                             ], result.context);
-                            const containerIndex = newConfig.dataServers[result.key].containers.findIndex((c)=>c.types?.some((t)=>expandedTypes.includes(t)));
-                            if (containerIndex && containerIndex !== -1) // If a container with this type already exist, overwrite path and types
-                            newConfig.dataServers[result.key].containers[containerIndex] = {
-                                ...newConfig.dataServers[result.key].containers[containerIndex],
+                            const containerIndex = newConfig.dataServers[result.key].containers.findIndex((c)=>c.path === path);
+                            if (containerIndex !== -1) {
+                                // If a container with this path already exist, merge types
+                                const mergedTypes = [
+                                    ...newConfig.dataServers[result.key].containers[containerIndex].types,
+                                    ...expandedTypes
+                                ].filter((v, i, a)=>a.indexOf(v) === i);
+                                newConfig.dataServers[result.key].containers[containerIndex] = {
+                                    ...newConfig.dataServers[result.key].containers[containerIndex],
+                                    types: mergedTypes,
+                                    binaryResources: mergedTypes.includes('http://semapps.org/ns/core#File')
+                                };
+                            } else newConfig.dataServers[result.key].containers.push({
                                 path: path,
-                                types: expandedTypes
-                            };
-                            else newConfig.dataServers[result.key].containers.push({
-                                path: path,
-                                types: expandedTypes
+                                types: expandedTypes,
+                                binaryResources: expandedTypes.includes('http://semapps.org/ns/core#File')
                             });
                         }
                     }
@@ -1725,7 +1708,6 @@ var $d3746ce11bc56f3b$export$2e2bcd8739ae039 = $d3746ce11bc56f3b$var$useContaine
 
 
 
-
 const $ff3623bf1421ebcc$var$findCreateContainerWithTypes = (types, createServerKey, dataServers)=>{
     if (!dataServers[createServerKey].containers) throw new Error(`Data server ${createServerKey} has no declared containers`);
     const matchingContainers = dataServers[createServerKey].containers.filter((container)=>container.types?.some((t)=>types.includes(t)));
@@ -1744,11 +1726,8 @@ const $32d32215b4e4729f$var$useGetCreateContainerUri = ()=>{
     const getCreateContainerUri = (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);
-        } else if (dataModel.create?.server) return (0, $ff3623bf1421ebcc$export$2e2bcd8739ae039)(dataModel.types, dataModel.create?.server, dataServers);
+        if (dataModel.create?.container) return dataModel.create.container;
+        else if (dataModel.create?.server) return (0, $ff3623bf1421ebcc$export$2e2bcd8739ae039)(dataModel.types, dataModel.create.server, dataServers);
         else {
             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`);