@mgarlik/datastore 0.1.22 → 0.1.23

package/dist/index.d.cts

@@ -1,6 +1,65 @@
 import React$1, { ReactNode } from 'react';
+import { filterType } from '@mgarlik/json-filter';
 import { D as DataStoreStorage } from './storage-D_xv8gFb.cjs';
 
+type formTypes = "textInput" | "select" | "switch" | "dateTime" | "radio";
+
+type textInputProps = {
+    placeholder?: string;
+    multiline?: boolean;
+    numberOfLines?: number;
+    secure: boolean;
+};
+
+type switchProps = {
+    thumbColor?: string;
+    trackColor?: { true: string; false: string };
+};
+
+type dateTimeProps = {
+    mode: "date" | "time" | "datetime";
+};
+
+type DataSourceOptions = {
+    dataProvider: string;
+    filter?: filterType;
+    map: Record<string, string>;
+};
+
+type selectProps = {
+    multiple?: boolean;
+    options?:
+    | Array<{ value: string | number; label: string }>
+    | { dataSource: DataSourceOptions };
+};
+
+// type selectProps = {
+//     multiple?: boolean;
+//     options?:
+//     Array<{ value: string | number; label: string }>
+//     | {
+//         dataSource: ProviderDataSourceType & {
+//             map: { value: string; label: string };
+//         };
+//     };
+// };
+
+type FormTypeMap = {
+    textInput: textInputProps;
+    select: selectProps;
+    switch: switchProps;
+    dateTime: dateTimeProps;
+    radio: never; // zatím žádné props
+};
+
+type FormTypeObject = {
+    [K in keyof FormTypeMap]: FormTypeMap[K] extends never
+    ? { type: K; props?: never }
+    : { type: K; props?: FormTypeMap[K] };
+}[keyof FormTypeMap];
+
+type formType = formTypes | FormTypeObject;
+
 type ProviderDataSourceType = {
     /**
      * Adresa pro CRUD data
@@ -16,6 +75,7 @@ type ProviderDataSourceType = {
         delete?: string;
         // updates?: { [key: string]: string };
     };
+    dataProvider?: string;
     /**
      * Prime zadani pole dat
      * */
@@ -29,7 +89,7 @@ type ProviderDataSourceType = {
      * Nacist vsechny pole bez ohledu na schema
      */
     readAllFields?: boolean;
-    filter?: FilterType$1;
+    filter?: filterType;
     /**
      * Nazvy naslouchajicich socketu
      */
@@ -41,9 +101,6 @@ type DataProviderActionType = "create" | "update" | "delete";
 //TODO: Rule type
 type RuleType = {};
 
-//TODO: Filter type
-type FilterType$1 = {};
-
 type ProviderEditorType = {
     title?: string;
     /**
@@ -69,18 +126,18 @@ type ProviderLayoutType = {
         description?: string;
         footer?: string;
         tooltip?: string | React.ReactNode;
-        visible?: boolean | JsonFilter;
+        visible?: boolean | filterType;
         items: Array<{
             field: string;
-            form?: "textInput" | "select" | "switch" | "dateTime";
+            form?: formType;
             label?: string; // jen override
-            visible?: boolean | JsonFilter;
+            visible?: boolean | filterType;
             tooltip?: string | React.ReactNode;
         }>;
     }[];
 };
 
-type ProviderSchemaItemType = {
+type BasicProviderSchemaItemType = {
     /**
      * Zdrojove pole pro hodnotu (např. "name" nebo "price"). Pokud není uvedeno, očekává se, že hodnota bude přímo v kořenovém objektu.
      */
@@ -89,44 +146,28 @@ type ProviderSchemaItemType = {
      * Výchozí hodnota pole, která se použije, pokud není poskytnuta žádná jiná hodnota. Může být typu string, number, boolean nebo jiného vhodného typu v závislosti na kontextu použití.
      */
     default?: any;
+}
+
+type ProviderSchemaItemType = BasicProviderSchemaItemType & {
+    /** Typ hodnoty */
+    type?: "string" | "number" | "date" | "boolean";
     /**
      * Povolene hodnoty
      *
      */
     enum?: any[];
     /**
-     * Je pole vyžadováno pri editaci?
+     * Je pole vyžadováno pro model ( pri create nebo pri update )?
      */
     required?: boolean;
-    /**
-     * Je pole pri editaci viditelné?
-     */
-    visibility?: "hidden" | "visible";
     /**
      * Polozku lze editovat
      */
     editable?: boolean | RuleType;
-    type?: "string" | "number" | "date" | "boolean";
-    form?: "textInput" | "select" | "switch" | "dateTime" | "radio";
-    multiple?: boolean;
-    mode?: "screen";
-    title?: string;
-    placeholder?: string;
-    // Pro select a radio
-    options?: { value: any; label?: string, icon?: string }[] | {
-        dataProvider: ProviderTypes;
-        optionKeys?: { value: string; label: LabelProps | { title: string; icon: string } };
-        filter?: string | RuleType;
-    };
+    form?: formType;
+    label?: string;
     description?: string;
-    /** TODO: Divna definice labelu */
-    optionKeys?: { value: string; label: LabelProps | { title: string; icon: string } };
     validations?: ValidationType;
-    /**
-     * Text input nezobrazuje znaky
-     */
-    secure?: boolean;
-    hidden?: boolean;
 };
 
 type DataProviderType = {
@@ -392,35 +433,11 @@ interface UseDataProviderResult {
     /** Vytvoří novou položku providera. */
     createItem: (data: JSONType, callback?: (value: JSONType) => void) => Promise<JSONType>;
 }
-/**
- * Zaregistruje/zpřístupní providera a vrátí normalizované dokumenty spolu s CRUD helpery.
- *
- * @param id Provider id nebo inline definice providera.
- * @param params Parametry šablony používané při renderu URI/definice.
- * @param dataFilter Volitelný client-side filtr dokumentů providera.
- * @param settings Volitelný závislý dokument použitý pro přepočet dat.
- */
-declare const useDataProvider: (
-/**
- * Provider id nebo objekt data {key: value}
- */
-id: string | {
+declare const useDataProvider: (id: string | {
     [key: string]: any;
-} | false, 
-/**
- * Parametry pro prerenderovani providera (profiles/<%= profileId %>)
- */
-params?: {
+} | false, params?: {
     [key: string]: string;
-} | null, 
-/**
- * Filtrovani dat
- */
-dataFilter?: JSONType | null, 
-/**
- * Nejake nastaveni
- */
-settings?: {
+} | null, dataFilter?: filterType | null, settings?: {
     documentId?: string;
     document?: JSONType;
 }) => UseDataProviderResult;

package/dist/index.d.ts

@@ -1,6 +1,65 @@
 import React$1, { ReactNode } from 'react';
+import { filterType } from '@mgarlik/json-filter';
 import { D as DataStoreStorage } from './storage-D_xv8gFb.js';
 
+type formTypes = "textInput" | "select" | "switch" | "dateTime" | "radio";
+
+type textInputProps = {
+    placeholder?: string;
+    multiline?: boolean;
+    numberOfLines?: number;
+    secure: boolean;
+};
+
+type switchProps = {
+    thumbColor?: string;
+    trackColor?: { true: string; false: string };
+};
+
+type dateTimeProps = {
+    mode: "date" | "time" | "datetime";
+};
+
+type DataSourceOptions = {
+    dataProvider: string;
+    filter?: filterType;
+    map: Record<string, string>;
+};
+
+type selectProps = {
+    multiple?: boolean;
+    options?:
+    | Array<{ value: string | number; label: string }>
+    | { dataSource: DataSourceOptions };
+};
+
+// type selectProps = {
+//     multiple?: boolean;
+//     options?:
+//     Array<{ value: string | number; label: string }>
+//     | {
+//         dataSource: ProviderDataSourceType & {
+//             map: { value: string; label: string };
+//         };
+//     };
+// };
+
+type FormTypeMap = {
+    textInput: textInputProps;
+    select: selectProps;
+    switch: switchProps;
+    dateTime: dateTimeProps;
+    radio: never; // zatím žádné props
+};
+
+type FormTypeObject = {
+    [K in keyof FormTypeMap]: FormTypeMap[K] extends never
+    ? { type: K; props?: never }
+    : { type: K; props?: FormTypeMap[K] };
+}[keyof FormTypeMap];
+
+type formType = formTypes | FormTypeObject;
+
 type ProviderDataSourceType = {
     /**
      * Adresa pro CRUD data
@@ -16,6 +75,7 @@ type ProviderDataSourceType = {
         delete?: string;
         // updates?: { [key: string]: string };
     };
+    dataProvider?: string;
     /**
      * Prime zadani pole dat
      * */
@@ -29,7 +89,7 @@ type ProviderDataSourceType = {
      * Nacist vsechny pole bez ohledu na schema
      */
     readAllFields?: boolean;
-    filter?: FilterType$1;
+    filter?: filterType;
     /**
      * Nazvy naslouchajicich socketu
      */
@@ -41,9 +101,6 @@ type DataProviderActionType = "create" | "update" | "delete";
 //TODO: Rule type
 type RuleType = {};
 
-//TODO: Filter type
-type FilterType$1 = {};
-
 type ProviderEditorType = {
     title?: string;
     /**
@@ -69,18 +126,18 @@ type ProviderLayoutType = {
         description?: string;
         footer?: string;
         tooltip?: string | React.ReactNode;
-        visible?: boolean | JsonFilter;
+        visible?: boolean | filterType;
         items: Array<{
             field: string;
-            form?: "textInput" | "select" | "switch" | "dateTime";
+            form?: formType;
             label?: string; // jen override
-            visible?: boolean | JsonFilter;
+            visible?: boolean | filterType;
             tooltip?: string | React.ReactNode;
         }>;
     }[];
 };
 
-type ProviderSchemaItemType = {
+type BasicProviderSchemaItemType = {
     /**
      * Zdrojove pole pro hodnotu (např. "name" nebo "price"). Pokud není uvedeno, očekává se, že hodnota bude přímo v kořenovém objektu.
      */
@@ -89,44 +146,28 @@ type ProviderSchemaItemType = {
      * Výchozí hodnota pole, která se použije, pokud není poskytnuta žádná jiná hodnota. Může být typu string, number, boolean nebo jiného vhodného typu v závislosti na kontextu použití.
      */
     default?: any;
+}
+
+type ProviderSchemaItemType = BasicProviderSchemaItemType & {
+    /** Typ hodnoty */
+    type?: "string" | "number" | "date" | "boolean";
     /**
      * Povolene hodnoty
      *
      */
     enum?: any[];
     /**
-     * Je pole vyžadováno pri editaci?
+     * Je pole vyžadováno pro model ( pri create nebo pri update )?
      */
     required?: boolean;
-    /**
-     * Je pole pri editaci viditelné?
-     */
-    visibility?: "hidden" | "visible";
     /**
      * Polozku lze editovat
      */
     editable?: boolean | RuleType;
-    type?: "string" | "number" | "date" | "boolean";
-    form?: "textInput" | "select" | "switch" | "dateTime" | "radio";
-    multiple?: boolean;
-    mode?: "screen";
-    title?: string;
-    placeholder?: string;
-    // Pro select a radio
-    options?: { value: any; label?: string, icon?: string }[] | {
-        dataProvider: ProviderTypes;
-        optionKeys?: { value: string; label: LabelProps | { title: string; icon: string } };
-        filter?: string | RuleType;
-    };
+    form?: formType;
+    label?: string;
     description?: string;
-    /** TODO: Divna definice labelu */
-    optionKeys?: { value: string; label: LabelProps | { title: string; icon: string } };
     validations?: ValidationType;
-    /**
-     * Text input nezobrazuje znaky
-     */
-    secure?: boolean;
-    hidden?: boolean;
 };
 
 type DataProviderType = {
@@ -392,35 +433,11 @@ interface UseDataProviderResult {
     /** Vytvoří novou položku providera. */
     createItem: (data: JSONType, callback?: (value: JSONType) => void) => Promise<JSONType>;
 }
-/**
- * Zaregistruje/zpřístupní providera a vrátí normalizované dokumenty spolu s CRUD helpery.
- *
- * @param id Provider id nebo inline definice providera.
- * @param params Parametry šablony používané při renderu URI/definice.
- * @param dataFilter Volitelný client-side filtr dokumentů providera.
- * @param settings Volitelný závislý dokument použitý pro přepočet dat.
- */
-declare const useDataProvider: (
-/**
- * Provider id nebo objekt data {key: value}
- */
-id: string | {
+declare const useDataProvider: (id: string | {
     [key: string]: any;
-} | false, 
-/**
- * Parametry pro prerenderovani providera (profiles/<%= profileId %>)
- */
-params?: {
+} | false, params?: {
     [key: string]: string;
-} | null, 
-/**
- * Filtrovani dat
- */
-dataFilter?: JSONType | null, 
-/**
- * Nejake nastaveni
- */
-settings?: {
+} | null, dataFilter?: filterType | null, settings?: {
     documentId?: string;
     document?: JSONType;
 }) => UseDataProviderResult;

package/dist/index.js

@@ -1869,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);
@@ -1971,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;
     });
@@ -2091,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);
@@ -2104,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) => {
@@ -2119,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,
@@ -2181,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,