@mgarlik/datastore 0.1.21 → 0.1.23

package/dist/index.js

@@ -632,8 +632,6 @@ var buildUri = ({
   return dataSource.uri || `${dataSource.model || ""}/`;
 };
 var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime }) => {
-  if (dataSource) console.error("[axios] GET Data Source: ", buildUri({ dataSource, method: "read" }));
-  else console.error("axios No DataSource for ", id);
   let persistedData = [];
   var params = { ...dataSource?.params };
   if (dataSource?.filter) params.filter = dataSource.filter;
@@ -649,7 +647,6 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
       if (changeTime) {
         params.changeTime = changeTime;
       } else if (isPersisting && SQLite) {
-        console.error("[axios] Nacitani dat z SQLite pro ", id, " s parametrem changeTimeFrom: ", params.changeTimeFrom);
         const qDatum = await SQLite.read(`SELECT * FROM documents WHERE model = '${id}' ORDER BY lastUpdate DESC`);
         console.warn("[axios] SQLite.read Posledni datum update: ", qDatum[0]?.lastUpdate);
         if (qDatum[0]?.lastUpdate) params.changeTimeFrom = qDatum[0].lastUpdate;
@@ -668,7 +665,6 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
         }).filter((item) => item !== null);
       }
       if (dataSource) {
-        console.error("[axios] Stahuji data z ", buildUri({ dataSource, method: "read" }), " s parametry ", params);
         const axiosResponse = await axios.get(buildUri({ dataSource, method: "read" }), { params: serializeParams(params) });
         if (schema && !dataSource.readAllFields) {
           const mapBySchema = (element) => {
@@ -705,14 +701,6 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
         } else {
           newData = axiosResponse.data.data;
         }
-        const dataCount = Array.isArray(newData) ? newData.length : "single";
-        console.error(
-          `[axios](SERVER TIME: ${axiosResponse.data.queryTime}) Data:`,
-          dataCount,
-          "items, Size:",
-          JSON.stringify(newData).length,
-          "Bytes"
-        );
         if (isPersisting && SQLite) {
           await saveData({ providerId: id, newData, SQLite, dateUpdate: axiosResponse.data.queryAt || (/* @__PURE__ */ new Date()).toISOString() });
         }
@@ -723,7 +711,6 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
       persistedData.forEach((item) => map.set(item.id, item));
       newData.forEach((item) => map.set(item.id, item));
       const updatedArray = Array.from(map.values());
-      console.error("[axios] NEW DATA: ", updatedArray);
       return updatedArray;
     } else {
       return newData || [];
@@ -750,6 +737,7 @@ var patchData = async ({ dataSource, variant, data }) => {
     return response.data.data;
   } catch (e) {
     console.error(`[AXIOS] PATCH DATA: ${e}`);
+    return e;
   }
 };
 var deleteData = async ({ dataSource, data }) => {
@@ -1021,7 +1009,6 @@ var DataStoreProvider = forwardRef(
               ...rest,
               changeTime: lastUpdate.time
             });
-            console.error("[DSP] synchronizeDataStore response:", key, response);
             if (response.length > 0) {
               const updateData = {};
               response.forEach((item) => {
@@ -1309,7 +1296,6 @@ var DataStoreProvider = forwardRef(
               schema: dP.schema,
               SQLite: persistenceStorage || void 0
             });
-            console.error("[DSP] updateDocument dataFromSource:", model, documentId, dataFromSource);
             data = dataFromSource;
           }
         }
@@ -1714,7 +1700,6 @@ var DataStoreProvider = forwardRef(
               isPersisting: !!newItem.isPersisting && !!persistenceStorage,
               SQLite: persistenceStorage || void 0
             });
-            console.error("[DSP] registerProvider dataFromSource:", id, dataFromSource);
             var dataList = [];
             var items = {};
             const dataS = Array.isArray(dataFromSource) ? dataFromSource : [dataFromSource];
@@ -1884,78 +1869,66 @@ var DataStoreProvider_default = DataStoreProvider;
 
 // src/useDataProvider.tsx
 import { useCallback as useCallback2, useContext as useContext2, useEffect as useEffect2, useMemo as useMemo2, useState as useState2, useSyncExternalStore } from "react";
-var getDynamicOptionsConfig = (schema) => {
-  if (!schema) return [];
-  const configs = [];
-  Object.entries(schema).forEach(([fieldKey, schemaItem]) => {
-    if (!schemaItem || typeof schemaItem !== "object") return;
-    if (schemaItem.options && !Array.isArray(schemaItem.options) && typeof schemaItem.options === "object" && schemaItem.options.dataProvider) {
-      configs.push({
-        fieldKey,
-        dataProvider: schemaItem.options.dataProvider,
-        optionKeys: schemaItem.options.optionKeys,
-        filter: schemaItem.options.filter
-      });
-      return;
-    }
-    if (schemaItem.dataSource?.dataProvider) {
-      configs.push({
-        fieldKey,
-        dataProvider: schemaItem.dataSource.dataProvider,
-        optionKeys: schemaItem.optionKeys,
-        filter: schemaItem.filter
-      });
-    }
-  });
-  return configs;
+import { filterJsonDocuments as filterDocuments2 } from "@mgarlik/json-filter";
+var findAllDataProviders = (obj) => {
+  if (!obj || typeof obj !== "object") return [];
+  if (obj.dataSource?.dataProvider) return [obj.dataSource.dataProvider];
+  if (Array.isArray(obj)) return obj.flatMap(findAllDataProviders);
+  return Object.values(obj).flatMap(findAllDataProviders);
 };
 var resolveProviderRef = (providerId, providers, presetProviders, params) => {
   if (providers[providerId]) {
-    return {
-      templateId: providerId,
-      runtimeId: providerId
-    };
+    return { templateId: providerId, runtimeId: providerId };
   }
   if (presetProviders[providerId]) {
     const renderedProvider = renderJSONTemplate(presetProviders[providerId], params ?? void 0);
-    return {
-      templateId: providerId,
-      runtimeId: renderedProvider.id
-    };
+    return { templateId: providerId, runtimeId: renderedProvider.id };
   }
-  return {
-    templateId: providerId,
-    runtimeId: providerId
-  };
+  return { templateId: providerId, runtimeId: providerId };
 };
-var createOptionFromDocument = (doc, optionKeys) => {
-  const valuePath = optionKeys?.value || "id";
-  const optionValue = getValueByDotPath(doc, valuePath, doc.id);
-  const labelDefinition = optionKeys?.label;
-  let optionLabel = "";
-  let optionIcon;
-  if (typeof labelDefinition === "string") {
-    optionLabel = String(getValueByDotPath(doc, labelDefinition, optionValue ?? ""));
-  } else if (labelDefinition && typeof labelDefinition === "object") {
-    const labelPath = labelDefinition.title || "name";
-    optionLabel = String(getValueByDotPath(doc, labelPath, optionValue ?? ""));
-    if (labelDefinition.icon) {
-      optionIcon = getValueByDotPath(doc, labelDefinition.icon);
+var createOptionFromDocument = (doc, map) => {
+  if (!map) {
+    return { ...doc };
+  }
+  return Object.entries(map).reduce(
+    (acc, [targetKey, sourcePath]) => {
+      if (typeof sourcePath === "string") {
+        acc[targetKey] = getValueByDotPath(doc, sourcePath);
+      } else if (sourcePath && typeof sourcePath === "object") {
+        const titlePath = sourcePath.title || sourcePath.name;
+        if (titlePath) acc[targetKey] = getValueByDotPath(doc, titlePath);
+        if (sourcePath.icon) acc[`${targetKey}Icon`] = getValueByDotPath(doc, sourcePath.icon);
+      }
+      return acc;
+    },
+    {}
+  );
+};
+var resolveDataSourcesDeep = (obj, providers, documents, presetProviders, params, logLabel = "options") => {
+  if (!obj || typeof obj !== "object") return obj;
+  if (obj.dataSource?.dataProvider) {
+    const providerRef = resolveProviderRef(obj.dataSource.dataProvider, providers, presetProviders, params);
+    const optionProvider = providers[providerRef.runtimeId];
+    if (!optionProvider) {
+      systemLog("usedp", `Nenalezen provider pro ${logLabel}`, obj.dataSource.dataProvider);
+      return obj;
     }
-  } else {
-    optionLabel = String(optionValue ?? "");
+    let optionDocuments = (optionProvider.data || []).map((docId) => {
+      const docData = documents[docId];
+      if (!docData) return null;
+      return { id: docId, ...docData };
+    }).filter((item) => !!item);
+    if (obj.dataSource.filter) {
+      optionDocuments = filterDocuments2(optionDocuments, obj.dataSource.filter);
+    }
+    return optionDocuments.map((item) => createOptionFromDocument(item, obj.dataSource.map));
   }
-  if (optionIcon) {
-    return {
-      value: optionValue,
-      label: optionLabel,
-      icon: optionIcon
-    };
+  if (Array.isArray(obj)) {
+    return obj.map((item) => resolveDataSourcesDeep(item, providers, documents, presetProviders, params, logLabel));
   }
-  return {
-    value: optionValue,
-    label: optionLabel
-  };
+  return Object.fromEntries(
+    Object.entries(obj).map(([key, val]) => [key, resolveDataSourcesDeep(val, providers, documents, presetProviders, params, logLabel)])
+  );
 };
 var useDataProvider = (id, params, dataFilter, settings) => {
   const [providerId, setProviderId] = useState2(null);
@@ -1986,12 +1959,13 @@ var useDataProvider = (id, params, dataFilter, settings) => {
   );
   const dependentProviders = useMemo2(() => {
     const providers = getExternalProviders();
-    if (!providerId || !providers[providerId]?.schema) return [];
+    if (!providerId || !providers[providerId]) return [];
     const schema = providers[providerId]?.schema;
-    const optionConfigs = getDynamicOptionsConfig(schema);
+    const layout = providers[providerId]?.layout;
+    const allProviderIds = [...findAllDataProviders(schema), ...findAllDataProviders(layout)];
     const uniqueProviders = {};
-    optionConfigs.forEach((cfg) => {
-      const resolved = resolveProviderRef(cfg.dataProvider, providers, presetProviders, params);
+    allProviderIds.forEach((dataProvider) => {
+      const resolved = resolveProviderRef(dataProvider, providers, presetProviders, params);
       if (resolved.runtimeId === providerId) return;
       uniqueProviders[resolved.runtimeId] = resolved;
     });
@@ -2106,7 +2080,7 @@ var useDataProvider = (id, params, dataFilter, settings) => {
     dispatch("deleteProviderItem", { providerId, data, params: params2 }, callback);
   };
   const createItem = (data, callback) => {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       const wrappedCallback = (result) => {
         callback?.(result);
         resolve(result);
@@ -2119,10 +2093,7 @@ var useDataProvider = (id, params, dataFilter, settings) => {
     const providers = getExternalProviders();
     const documents = getExternalDocuments();
     if (!providerId || !providers[providerId]) {
-      return {
-        data: [],
-        schema: void 0
-      };
+      return { data: [], schema: void 0, layout: void 0 };
     }
     let docs = [];
     providers[providerId]?.data.forEach((docId) => {
@@ -2134,54 +2105,23 @@ var useDataProvider = (id, params, dataFilter, settings) => {
       } else if (settings?.document) {
         dData = recalculateObjectWithDocument(documents[docId], settings.document);
       }
-      docs.push({
-        id: docId,
-        ...dData
-      });
+      docs.push({ id: docId, ...dData });
     });
     systemLog("usedp", "KonecVytvoreni dat: ", providerId);
     if (filter) {
       systemLog("usedp", "Jdu filterovat: ", JSON.stringify(filter));
-      docs = filterDocuments(docs, filter);
+      docs = filterDocuments2(docs, filter);
       systemLog("usedp", "Konec filteru: ");
     }
     const schema = providers[providerId].schema;
-    let resolvedSchema = schema;
-    if (schema) {
-      const optionConfigs = getDynamicOptionsConfig(schema);
-      if (optionConfigs.length > 0) {
-        resolvedSchema = { ...schema };
-        optionConfigs.forEach((cfg) => {
-          const providerRef = resolveProviderRef(cfg.dataProvider, providers, presetProviders, params);
-          const optionProvider = providers[providerRef.runtimeId];
-          if (!optionProvider) {
-            systemLog("usedp", "Nenalezen provider pro schema.options", cfg.dataProvider);
-            return;
-          }
-          let optionDocuments = (optionProvider.data || []).map((docId) => {
-            const docData = documents[docId];
-            if (!docData) return null;
-            return {
-              id: docId,
-              ...docData
-            };
-          }).filter((item) => !!item);
-          if (cfg.filter) {
-            optionDocuments = filterDocuments(optionDocuments, cfg.filter);
-          }
-          const computedOptions = optionDocuments.map((item) => createOptionFromDocument(item, cfg.optionKeys));
-          const nextItem = {
-            ...resolvedSchema[cfg.fieldKey],
-            options: computedOptions
-          };
-          resolvedSchema[cfg.fieldKey] = nextItem;
-        });
-      }
-    }
+    const layout = providers[providerId].layout;
+    const resolvedSchema = resolveDataSourcesDeep(schema, providers, documents, presetProviders, params, "schema");
+    const resolvedLayout = resolveDataSourcesDeep(layout, providers, documents, presetProviders, params, "layout");
     return {
       ...providers[providerId],
       data: docs,
-      schema: resolvedSchema
+      schema: resolvedSchema,
+      layout: resolvedLayout
     };
   }, [
     providerId,
@@ -2196,11 +2136,9 @@ var useDataProvider = (id, params, dataFilter, settings) => {
   ]);
   systemLog("usedp", `${providerId} END`);
   return {
-    // provider,
     documents: provider.data,
     schema: provider.schema,
     layout: provider.layout,
-    // dispatch,
     update,
     updateItem,
     deleteItem,