@semapps/semantic-data-provider 1.0.2 → 1.0.4

package/dist/index.cjs.js

@@ -51,6 +51,9 @@ $parcel$export(module.exports, "ReificationArrayInput", () => $030f1232f6810456$
 $parcel$export(module.exports, "createWsChannel", () => $84ab912646919f8c$export$28772ab4c256e709);
 $parcel$export(module.exports, "getOrCreateWsChannel", () => $84ab912646919f8c$export$8d60734939c59ced);
 $parcel$export(module.exports, "createSolidNotificationChannel", () => $84ab912646919f8c$export$3edfe18db119b920);
+var $1bc09db736a9cb94$exports = {};
+/* eslint-disable @typescript-eslint/no-redundant-type-constituents */ 
+
 
 
 const $3db7a4510a668a04$var$fetchResource = async (resourceUri, config)=>{
@@ -105,13 +108,15 @@ var $9020b8e3f4a4c1a1$export$2e2bcd8739ae039 = $9020b8e3f4a4c1a1$var$getOneMetho
 
 const $6fcb30f76390d142$var$isFile = (o)=>o?.rawFile && o.rawFile instanceof File;
 const $6fcb30f76390d142$var$isFileToDelete = (o)=>o?.fileToDelete !== undefined && o?.fileToDelete !== null;
-const $6fcb30f76390d142$var$getUploadsContainerUri = (config)=>{
-    const serverKey = Object.keys(config.dataServers).find((key)=>config.dataServers[key].uploadsContainer);
-    if (serverKey && config.dataServers[serverKey].uploadsContainer) return (0, ($parcel$interopDefault($bkNnK$urljoin)))(config.dataServers[serverKey].baseUrl, config.dataServers[serverKey].uploadsContainer);
+const $6fcb30f76390d142$var$getUploadsContainerUri = (config, serverKey)=>{
+    // If no server key is defined, or if the server has no uploads container, find any server with a uploads container
+    if (!serverKey || !config.dataServers[serverKey].uploadsContainer) serverKey = Object.keys(config.dataServers).find((key)=>config.dataServers[key].uploadsContainer);
+    if (serverKey) return (0, ($parcel$interopDefault($bkNnK$urljoin)))(config.dataServers[serverKey].baseUrl, config.dataServers[serverKey].uploadsContainer);
+    else // No server has an uploads container
     return null;
 };
-const $6fcb30f76390d142$var$uploadFile = async (rawFile, config)=>{
-    const uploadsContainerUri = $6fcb30f76390d142$var$getUploadsContainerUri(config);
+const $6fcb30f76390d142$export$a5575dbeeffdad98 = async (rawFile, config, serverKey)=>{
+    const uploadsContainerUri = $6fcb30f76390d142$var$getUploadsContainerUri(config, serverKey);
     if (!uploadsContainerUri) throw new Error("You must define an uploadsContainer in one of the server's configuration");
     const response = await config.httpClient(uploadsContainerUri, {
         method: "POST",
@@ -131,7 +136,7 @@ const $6fcb30f76390d142$var$deleteFiles = async (filesToDelete, config)=>{
 /*
  * 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)=>{
+ */ const $6fcb30f76390d142$var$uploadAllFiles = async (record, config, serverKey)=>{
     const filesToDelete = [];
     const updatedRecord = {
         ...record
@@ -142,7 +147,7 @@ const $6fcb30f76390d142$var$deleteFiles = async (filesToDelete, config)=>{
             const itemValue = value[i];
             if ($6fcb30f76390d142$var$isFile(itemValue)) {
                 if ($6fcb30f76390d142$var$isFileToDelete(itemValue)) filesToDelete.push(itemValue.fileToDelete);
-                updatedRecord[property][i] = await $6fcb30f76390d142$var$uploadFile(itemValue.rawFile, config);
+                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;
@@ -150,7 +155,7 @@ const $6fcb30f76390d142$var$deleteFiles = async (filesToDelete, config)=>{
         }
         else if ($6fcb30f76390d142$var$isFile(value)) {
             if ($6fcb30f76390d142$var$isFileToDelete(value)) filesToDelete.push(value.fileToDelete);
-            updatedRecord[property] = await $6fcb30f76390d142$var$uploadFile(value.rawFile, config);
+            updatedRecord[property] = await $6fcb30f76390d142$export$a5575dbeeffdad98(value.rawFile, config, serverKey);
         } else if ($6fcb30f76390d142$var$isFileToDelete(value)) {
             filesToDelete.push(value.fileToDelete);
             updatedRecord[property] = null;
@@ -263,7 +268,7 @@ const $907cbc087f6529e2$var$createMethod = (config)=>async (resourceId, params)=
                 else headers.set("Slug", params.data[dataModel.fieldsMapping.title]);
             }
             // Upload files, if there are any
-            const { updatedRecord: updatedRecord } = await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).upload(params.data, config);
+            const { updatedRecord: updatedRecord } = await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).upload(params.data, config, serverKey);
             params.data = updatedRecord;
             const { headers: responseHeaders } = await httpClient(containerUri, {
                 method: "POST",
@@ -446,11 +451,8 @@ const $8c999cc29c8d6a6c$var$fetchContainers = async (containers, params, { httpC
     });
     // 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.sort.order === "ASC") return (a[params.sort.field] ?? "").localeCompare(b[params.sort.field] ?? "");
+        return (b[params.sort.field] ?? "").localeCompare(a[params.sort.field] ?? "");
     });
     // Pagination
     const total = resources.length;
@@ -1007,10 +1009,23 @@ var $fda69bf2752eb49a$export$2e2bcd8739ae039 = $fda69bf2752eb49a$var$patchMethod
 
 
 
+// Return the first server matching with the baseUrl
+const $59a07b932dae8600$var$getServerKeyFromUri = (uri, dataServers)=>{
+    if (!uri) throw Error(`No URI provided to getServerKeyFromUri`);
+    return Object.keys(dataServers).find((key)=>{
+        if (dataServers[key].pod) // The baseUrl ends with /data so remove this part to match with the webId and webId-related URLs (/inbox, /outbox...)
+        return dataServers[key].baseUrl && uri.startsWith(dataServers[key].baseUrl.replace("/data", ""));
+        return uri.startsWith(dataServers[key].baseUrl);
+    });
+};
+var $59a07b932dae8600$export$2e2bcd8739ae039 = $59a07b932dae8600$var$getServerKeyFromUri;
+
+
 const $ceaafb56f75454f0$var$updateMethod = (config)=>async (resourceId, params)=>{
-        const { httpClient: httpClient, jsonContext: jsonContext } = config;
+        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);
+        const { updatedRecord: updatedRecord, filesToDelete: filesToDelete } = await (0, $6fcb30f76390d142$export$2e2bcd8739ae039).upload(params.data, config, serverKey);
         params.data = updatedRecord;
         await httpClient(`${params.id}`, {
             method: "PUT",
@@ -1120,17 +1135,6 @@ var $915df908e0942746$export$2e2bcd8739ae039 = $915df908e0942746$var$fetchVoidEn
 
 
 
-// Return the first server matching with the baseUrl
-const $59a07b932dae8600$var$getServerKeyFromUri = (uri, dataServers)=>{
-    if (!uri) throw Error(`No URI provided to getServerKeyFromUri`);
-    return Object.keys(dataServers).find((key)=>{
-        if (dataServers[key].pod) // The baseUrl ends with /data so remove this part to match with the webId and webId-related URLs (/inbox, /outbox...)
-        return dataServers[key].baseUrl && uri.startsWith(dataServers[key].baseUrl.replace("/data", ""));
-        return uri.startsWith(dataServers[key].baseUrl);
-    });
-};
-var $59a07b932dae8600$export$2e2bcd8739ae039 = $59a07b932dae8600$var$getServerKeyFromUri;
-
 
 
 /*
@@ -1183,7 +1187,8 @@ var $59a07b932dae8600$export$2e2bcd8739ae039 = $59a07b932dae8600$var$getServerKe
 var $341dff85fe619d85$export$2e2bcd8739ae039 = $341dff85fe619d85$var$httpClient;
 
 
-const $7f6a16d0025dc83a$var$dataProvider = (config)=>{
+
+/** @type {(config: Configuration) => SemanticDataProvider} */ const $7f6a16d0025dc83a$var$dataProvider = (config)=>{
     // TODO verify all data provider config + data models
     if (!(0, $8f44b7c15b8b8e1d$export$2e2bcd8739ae039)("default", config.dataServers)) throw new Error("You must define a default server in your dataServers config");
     if (!config.jsonContext) config.jsonContext = Object.fromEntries(config.ontologies.map((o)=>[
@@ -1222,6 +1227,7 @@ const $7f6a16d0025dc83a$var$dataProvider = (config)=>{
         getDataServers: waitForConfig((0, $b16131432127b07b$export$2e2bcd8739ae039)(config)),
         getLocalDataServers: (0, $b16131432127b07b$export$2e2bcd8739ae039)(config),
         fetch: waitForConfig(config.httpClient),
+        uploadFile: waitForConfig((rawFile)=>(0, $6fcb30f76390d142$export$a5575dbeeffdad98)(rawFile, config)),
         refreshConfig: async ()=>{
             config = {
                 ...originalConfig
@@ -1724,8 +1730,6 @@ const $84ab912646919f8c$var$registeredWebSockets = new Map();
 };
 
 
-var $1bc09db736a9cb94$exports = {};
-/* eslint-disable @typescript-eslint/no-redundant-type-constituents */ 
 
 $parcel$exportWildcard(module.exports, $1bc09db736a9cb94$exports);