@redus/georedus-ui 0.2.0 → 0.3.1

package/dist/viewSpecs/presets/cem_censo_2010_2022/index.d.ts

@@ -6,7 +6,7 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
     sourceLabel: string;
     viewType: string;
     keywords: any[];
-    conf: {
+    confSchema: {
         data: {
             variableId: {
                 label: string;
@@ -29,11 +29,10 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
                 inactive: {
                     [x: string]: any;
                     $$resolver: symbol;
-                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
-                    dependencies: any;
-                    value: (...args: any[]) => any;
-                    defaultValue?: any;
                     context?: any;
+                    defaultValue?: import("@orioro/resolve").ResolutionNode | any;
+                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                    value: any;
                 };
                 clearable: boolean;
                 type: string;
@@ -50,11 +49,10 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
                 label: {
                     [x: string]: any;
                     $$resolver: symbol;
-                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
-                    dependencies: any;
-                    value: (...args: any[]) => any;
-                    defaultValue?: any;
                     context?: any;
+                    defaultValue?: import("@orioro/resolve").ResolutionNode | any;
+                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                    value: any;
                 };
                 helperText: string;
                 min: number;
@@ -64,22 +62,20 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
                 inactive: {
                     [x: string]: any;
                     $$resolver: symbol;
-                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
-                    dependencies: any;
-                    value: (...args: any[]) => any;
-                    defaultValue?: any;
                     context?: any;
+                    defaultValue?: import("@orioro/resolve").ResolutionNode | any;
+                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                    value: any;
                 };
             };
             dissolveOverlappingGeometries: {
                 inactive: {
                     [x: string]: any;
                     $$resolver: symbol;
-                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
-                    dependencies: any;
-                    value: (...args: any[]) => any;
-                    defaultValue?: any;
                     context?: any;
+                    defaultValue?: import("@orioro/resolve").ResolutionNode | any;
+                    $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                    value: any;
                 };
                 type: string;
                 label: string;
@@ -99,52 +95,67 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
             };
         };
     };
-    metadata: (string | {
-        customGeoJSON: (string | (string | string[])[] | {
-            [x: string]: any;
-            $$resolver: symbol;
-            $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
-            dependencies: any;
-            value: (...args: any[]) => any;
-            defaultValue?: any;
-            context?: any;
-        } | null)[];
-    } | (string | {
-        variableValues: (string | (string | (string | (string | {
-            variableId: string[];
-            municipioId: string[];
-            source_table_id: any[];
-        })[])[])[] | (string | {
-            href: any;
-            pathname: string;
-            method?: undefined;
-            headers?: undefined;
-            body?: undefined;
+    metadata: {
+        _dependencies: ({ viewConfState }: {
+            viewConfState: any;
+        }) => string;
+        _value: (string | {
+            customGeoJSON: (string | (string | string[])[] | {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            } | null)[];
+        } | (string | {
+            variableValues: (string | (string | (string | (string | {
+                variableId: string[];
+                municipioId: string[];
+                source_table_id: any[];
+            })[])[])[] | (string | {
+                href: any;
+                pathname: string;
+                method?: undefined;
+                headers?: undefined;
+                body?: undefined;
+            } | {
+                method: string;
+                headers: {
+                    'Content-Type': string;
+                };
+                body: {
+                    geometries: (string | string[])[];
+                    view: string;
+                    agg_column: string[];
+                    agg_type: (string | (string | string[])[])[];
+                };
+                href?: undefined;
+                pathname?: undefined;
+            })[])[];
+            labels?: undefined;
+            measureUnits?: undefined;
+            customGeoJSON?: undefined;
+            customGeoJSON2?: undefined;
+            colorScaleStops?: undefined;
         } | {
-            method: string;
-            headers: {
-                'Content-Type': string;
+            labels: any;
+            measureUnits: any;
+            variableValues: string[];
+            customGeoJSON: string[];
+            customGeoJSON2: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
             };
-            body: {
-                geometries: (string | string[])[];
-                view: string;
-                agg_column: string[];
-                agg_type: (string | (string | string[])[])[];
-            };
-            href?: undefined;
-            pathname?: undefined;
+            colorScaleStops: any[];
         })[])[];
-        labels?: undefined;
-        measureUnits?: undefined;
-        customGeoJSON?: undefined;
-        colorScaleStops?: undefined;
-    } | {
-        labels: any;
-        measureUnits: any;
-        variableValues: string[];
-        customGeoJSON: string[];
-        colorScaleStops: any[];
-    })[])[];
+    };
     sources: {
         customGeoJSON_Points: (string | {
             [x: string]: any;

package/dist/viewSpecs/resolveView/resolveView.d.ts

@@ -1,12 +1,18 @@
-import { ResolvedViewConf, ViewContext, ViewSpec } from '../types';
-export declare function resolveView(viewSpec: ViewSpec, viewConf: ResolvedViewConf, viewContext: ViewContext): Promise<{
+import { ResolvedView, ResolvedViewConf, ViewSpec, ViewResolutionContextBase } from '../types';
+export declare const STAGE_VALUE_KEY = "_value";
+export declare const STAGE_SPECIAL_KEYS: string[];
+export declare function resolveConfSchema(viewSpec: ViewSpec, partialView: Partial<ResolvedView>, viewResolutionContextBase: ViewResolutionContextBase): Partial<ResolvedView>;
+export declare const resolveMetadata: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewMetadata>;
+export declare const resolveSources: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf" | "metadata">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<Record<string, any>>;
+export declare const resolveLayers: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf" | "sources" | "metadata">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<Record<string, import("@orioro/react-maplibre-util").MapViewLayer>>;
+export declare const resolveControls: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf" | "sources" | "layers" | "metadata">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewControls>;
+export declare const resolveDownload: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf" | "sources" | "layers" | "metadata">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewDownload>;
+export declare function resolveView(viewSpec: ViewSpec, viewConf: ResolvedViewConf, viewResolutionContextBase: ViewResolutionContextBase): Promise<{
     id: string;
     keywords: string | string[] | undefined;
-    metadata: unknown;
-    sources: unknown;
-    layers: {
-        [k: string]: any;
-    };
-    legends: any;
-    download: unknown;
+    metadata: import("../types").ViewMetadata;
+    sources: Record<string, any>;
+    layers: Record<string, import("@orioro/react-maplibre-util").MapViewLayer>;
+    controls: import("../types").ViewControls;
+    download: import("../types").ViewDownload;
 }>;

package/dist/viewSpecs/resolveView/tmp_resolveView.future.d.ts

@@ -0,0 +1,14 @@
+import { ResolvedView, ResolvedViewConf, ViewSpec, ViewResolutionContextBase } from '../types';
+export declare const resolveViewMetadata: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewMetadata>;
+export declare const resolveViewSources: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "conf" | "metadata">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<Record<string, any>>;
+export declare function resolveView(viewSpec: ViewSpec, viewConf: ResolvedViewConf, viewResolutionContextBase: ViewResolutionContextBase): Promise<{
+    id: string;
+    keywords: string | string[] | undefined;
+    metadata: import("../types").ViewMetadata;
+    sources: Record<string, any>;
+    layers: {
+        [k: string]: any;
+    };
+    legends: any;
+    download: unknown;
+}>;

package/dist/viewSpecs/types.d.ts

@@ -1,38 +1,67 @@
 import { MapView, MapViewLayer, MapViewSource } from '@orioro/react-maplibre-util';
+import React from 'react';
+import { ViewConf, ViewConfState } from '../GeoReDUS/viewConfReducer';
+import { UseQueryOptions } from '@tanstack/react-query';
 export type ExpressionOf<ResultT> = ResultT | [string, ...any[]];
-export type ViewMetadata = Record<string, any>;
-export type ViewConfSpec = {
-    data?: Record<string, Record<string, any>>;
-    style?: Record<string, Record<string, any>>;
+export type ViewMetadata = {
+    [key: string]: any;
 };
+export type ViewResolutionContextBase = {
+    viewSpecs: ViewSpec[];
+    viewConfState: ViewConfState;
+    app: AppContext;
+};
+type StageSpec<Spec extends {
+    [key: string]: any;
+}, PartialViewAtState extends Partial<ResolvedView | null>> = Spec & {
+    _loading?: MapView & {
+        message?: React.ReactNode;
+    };
+    _dependencies?: (resolutionCtx: ViewResolutionContextBase & {
+        view: PartialViewAtState;
+    }) => any;
+    _value?: Spec;
+    _query?: Pick<UseQueryOptions, 'gcTime'>;
+};
+export type ViewMetadataSpec = StageSpec<ViewMetadata, Pick<ResolvedView, 'conf'>>;
+export type ViewSources = {
+    [key: string]: MapViewSource;
+};
+export type ViewSourcesSpec = StageSpec<ViewSources, Pick<ResolvedView, 'conf' | 'metadata'>>;
+export type ViewLayers = {
+    [key: string]: MapViewLayer;
+};
+export type ViewLayersSpec = StageSpec<ViewLayers, Pick<ResolvedView, 'conf' | 'metadata' | 'sources'>>;
+export type ViewControls = {
+    legends?: MapView['legends'];
+};
+export type ViewControlsSpec = StageSpec<ViewControls, Pick<ResolvedView, 'conf' | 'metadata' | 'sources' | 'layers'>>;
+export type ViewDownload = (conf: {
+    dialogs: Record<string, any>;
+}) => Promise<any>;
+export type ViewDownloadSpec = StageSpec<ViewDownload, Pick<ResolvedView, 'conf' | 'metadata' | 'sources' | 'layers'>>;
+export type ViewStageKey = 'metadata' | 'sources' | 'layers' | 'controls' | 'download';
 export type ViewSpec = {
     id: string;
     debug?: boolean;
     keywords?: string | string[];
-    metadata: ExpressionOf<ViewMetadata>;
-    sources: ExpressionOf<Record<string, MapViewSource>>;
-    layers: ExpressionOf<Record<string, MapViewLayer>>;
-    download?: ExpressionOf<({ dialogs: {} }: {
-        dialogs: {};
-    }) => Promise<void>>;
-    conf: ViewConfSpec;
-};
-export type ResolvedViewConf = {
+    metadata: ViewMetadataSpec;
+    sources: ViewSourcesSpec;
+    layers: ViewLayersSpec;
+    controls: ViewControlsSpec;
+    download?: ViewDownloadSpec;
+};
+export type ResolvedViewConf = ViewConf & {
     data?: Record<string, any>;
     style?: Record<string, any>;
 };
-type ResolvedLegend = Record<string, any>;
 export type ResolvedView = MapView & {
-    metadata: ViewMetadata;
-    legends: ResolvedLegend[];
     conf: ResolvedViewConf;
+    metadata: ViewMetadata;
+    controls: ViewControls;
+    download: ViewDownload;
 };
-export type ViewContext = {
-    focus: {
-        type: 'municipio';
-        ids: string[];
-    } | null;
-};
+export type AppContext = Record<string, any>;
 export type PresetFn<InputT extends Record<string, any> = Record<string, any>> = (input: InputT) => ViewSpec;
 export type ResolveViewSpecsContext = {
     METADATA_API_ENDPOINT: string;

package/dist/viewSpecs/useViews/index.d.ts

@@ -0,0 +1 @@
+export * from './useViews';

package/dist/viewSpecs/useViews/queryKeyHashFnWithFileSupport.d.ts

@@ -0,0 +1,2 @@
+import type { QueryKey } from '@tanstack/react-query';
+export declare function queryKeyHashFnWithFileSupport(queryKey: QueryKey): string;

package/dist/viewSpecs/useViews/useViews.d.ts

@@ -0,0 +1,12 @@
+import { UseQueryResult } from '@tanstack/react-query';
+import { ResolvedView, ViewResolutionContextBase, ViewSpec } from '../types';
+export declare function useViews(viewResolutionContextBase: ViewResolutionContextBase): {
+    isLoading: boolean;
+    metadataQueries: UseQueryResult<unknown, Error>[];
+    sourcesQueries: UseQueryResult<unknown, Error>[];
+    layersQueries: UseQueryResult<unknown, Error>[];
+    controlsQueries: UseQueryResult<unknown, Error>[];
+    downloadQueries: UseQueryResult<unknown, Error>[];
+    resolvedViews: Partial<ResolvedView>[];
+    resolvedViewSpecs: ViewSpec[];
+};

package/dist/viewSpecs/util/index.d.ts

@@ -45,5 +45,6 @@ export * from "./colorSchemes";
 export * from "./filter";
 export * from "./setupVariants";
 export * from "./downloadResolver";
+export * from "./zoomSensitiveLinearSizes";
 export const BASE_MAP_LAYERS_Z_INDEX_BASE: 100;
 export const ABOVE_BASE_MAP_LAYERS_Z_INDEX_BASE: 1000;

package/dist/viewSpecs/util/zoomSensitiveLinearSizes.d.ts

@@ -0,0 +1,10 @@
+type ZoomSensitiveLinearSizesProps = {
+    variable: any;
+    minValue?: any;
+    maxValue?: any;
+    minSize: number;
+    maxSize: number;
+    zoomBreakpoint?: number;
+};
+export declare function zoomSensitiveLinearSizes({ variable, minValue, maxValue, minSize, maxSize, zoomBreakpoint, }: ZoomSensitiveLinearSizesProps): (string | number | any[])[];
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redus/georedus-ui",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/main.js",
@@ -43,7 +43,7 @@
     "@orioro/react-csv": "^0.0.2",
     "@orioro/react-dialogs": "^0.0.2",
     "@orioro/react-dir-nav": "^0.1.0",
-    "@orioro/react-maplibre-util": "^0.2.0",
+    "@orioro/react-maplibre-util": "^0.3.1",
     "@orioro/react-sortable": "^0.0.2",
     "@orioro/react-ui-core": "^0.0.6",
     "@orioro/resolve": "^0.1.2",