@redus/georedus-ui 0.21.0 → 0.22.1

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

@@ -10,58 +10,10 @@ export function vector_polygon_single({ style, ...viewSpec }: {
                 type: string;
                 clearable: boolean;
                 defaultValue: any;
-                options: ({
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
-                    value: string;
-                } | {
-                    label: import("react").JSX.Element;
+                options: {
                     value: string;
-                } | {
                     label: import("react").JSX.Element;
-                    value: string;
-                })[];
+                }[];
             };
             fillPattern: {
                 label: string;
@@ -81,6 +33,7 @@ export function vector_polygon_single({ style, ...viewSpec }: {
                 max: number;
                 step: number;
                 defaultValue: number;
+                notify: string;
             };
         };
     };

package/dist/viewSpecs/presets/vector_polygon_single/parseStyleSpec.d.ts

@@ -2,6 +2,7 @@ export type StyleSpec = {
     color?: string;
     fillPattern?: 'circles_1' | 'cross_1' | 'diamonds_1' | 'lines_1' | 'mosaic_1' | 'mosaic_2' | 'squares_1' | 'triangles_1' | 'waves_1' | 'solid';
     borderStyle?: 'solid' | 'dashed' | 'dotted' | 'none';
+    opacity?: number;
 };
 export type StyleSpecInput = string | StyleSpec;
 export declare function parseStyleSpec(styleInput?: StyleSpecInput): StyleSpec;

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

@@ -5,8 +5,8 @@ export declare function resolveConfSchema(viewSpec: ViewSpec, partialView: Parti
 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, "metadata" | "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<Record<string, any>>;
 export declare const resolveLayers: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "metadata" | "sources" | "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<Record<string, import("@orioro/react-maplibre-util").MapViewLayer>>;
-export declare const resolveControls: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "metadata" | "sources" | "layers" | "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewControls>;
-export declare const resolveDownload: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "metadata" | "sources" | "layers" | "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewDownload>;
+export declare const resolveControls: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "layers" | "metadata" | "sources" | "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewControls>;
+export declare const resolveDownload: (viewSpec: ViewSpec, partialViewAtStage: Pick<ResolvedView, "layers" | "metadata" | "sources" | "conf">, viewResolutionContextBase: ViewResolutionContextBase) => Promise<import("../types").ViewDownload>;
 export declare function resolveView(viewSpec: ViewSpec, viewConf: ResolvedViewConf, viewResolutionContextBase: ViewResolutionContextBase): Promise<{
     id: string;
     keywords: string | string[] | undefined;

package/dist/viewSpecs/types.d.ts

@@ -2,6 +2,8 @@ import { MapView, MapViewLayer, MapViewSource } from '@orioro/react-maplibre-uti
 import React from 'react';
 import { ViewConf, ViewConfState } from '../GeoReDUS/viewConfReducer';
 import { UseQueryOptions } from '@tanstack/react-query';
+import { InputSchema } from '@orioro/react-ui-core';
+import type { Merge } from 'type-fest';
 export type ExpressionOf<ResultT> = ResultT | [string, ...any[]];
 export type ViewMetadata = {
     [key: string]: any;
@@ -45,6 +47,9 @@ export type ViewSpec = {
     id: string;
     debug?: boolean;
     keywords?: string | string[];
+    confSchema?: Record<string, Record<string, Merge<InputSchema, {
+        notify: ViewStageKey | ViewStageKey[];
+    }>>>;
     metadata: ViewMetadataSpec;
     sources: ViewSourcesSpec;
     layers: ViewLayersSpec;

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

@@ -0,0 +1,22 @@
+import { ResolvedView, ViewResolutionContextBase, ViewSpec, ViewStageKey } from '../types';
+export declare const STAGE_LOADING: unique symbol;
+export declare const STAGE_ERROR: unique symbol;
+/**
+ * How a pipeline stage declares its upstream dependencies.
+ *
+ * - `null`                  — no dependencies; stage is always enabled
+ * - `'all_previous_stages'` — depends on all stages from every group that
+ *                             precedes this stage's group in `PIPELINE_STAGES`.
+ *                             Stages in the same group are parallel and are NOT
+ *                             included. Correct default for most stages, including
+ *                             parallel ones like `controls` and `download`.
+ * - `ViewStageKey[]`        — explicit list for cases where only a subset of
+ *                             upstream stages should invalidate this one
+ */
+export type StageDependencies = null | 'all_previous_stages' | ViewStageKey[];
+export type PipelineStage = {
+    stageKey: ViewStageKey;
+    dependsOnStages: StageDependencies;
+    resolveFn: (viewSpec: ViewSpec, partialView: Partial<ResolvedView>, ctx: ViewResolutionContextBase) => Promise<unknown>;
+};
+export declare const PIPELINE_STAGES: PipelineStage[][];

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

@@ -0,0 +1,42 @@
+import { ResolvedView, ViewResolutionContextBase, ViewSpec } from '../types';
+export declare const PIPELINE_STAGE_ORDER: any[];
+/**
+ * Orchestrates the full view resolution pipeline for all active views.
+ *
+ * Stages are resolved in sequence: `metadata → sources → layers →
+ * (controls, download)`. Each stage receives a snapshot of the preceding
+ * resolved queries as `partialViews` so downstream stages can read prior
+ * results.
+ *
+ * Each view × stage pair is an independent React Query query. This means a
+ * single view can update without triggering re-resolution of any other view.
+ *
+ * `resolvedViews` contains only views where `metadata`, `sources`, and
+ * `layers` are fully resolved — the minimum required for rendering.
+ * `download` is intentionally excluded from this gate.
+ *
+ * `resolvedViewSpecs` are resolved synchronously because schema changes must
+ * reflect immediately as the user edits conf values.
+ */
+export declare function useViews(viewResolutionContextBase: ViewResolutionContextBase): {
+    currentLoadingStage: (viewId?: string | null) => any;
+    queriesByStage: {
+        metadata: import("@tanstack/react-query").UseQueryResult<unknown, Error>[];
+        sources: import("@tanstack/react-query").UseQueryResult<unknown, Error>[];
+        layers: import("@tanstack/react-query").UseQueryResult<unknown, Error>[];
+        controls: import("@tanstack/react-query").UseQueryResult<unknown, Error>[];
+        download: import("@tanstack/react-query").UseQueryResult<unknown, Error>[];
+    };
+    resolvedViews: Partial<ResolvedView>[];
+    resolvedViewSpecs: (ViewSpec | {
+        confSchema: Partial<ResolvedView>;
+        id: string;
+        debug?: boolean;
+        keywords?: string | string[];
+        metadata: import("../types").ViewMetadataSpec;
+        sources: import("../types").ViewSourcesSpec;
+        layers: import("../types").ViewLayersSpec;
+        controls: import("../types").ViewControlsSpec;
+        download?: import("../types").ViewDownloadSpec;
+    })[];
+};

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

@@ -0,0 +1,15 @@
+import { UseQueryResult } from '@tanstack/react-query';
+import { ViewConf } from '../../GeoReDUS/viewConfReducer';
+import { ViewSpec } from '../types';
+export type ViewToResolve = {
+    viewId: string;
+    viewConf: ViewConf;
+    viewSpec: ViewSpec;
+};
+export type QueriesByStage = {
+    metadata: UseQueryResult[];
+    sources: UseQueryResult[];
+    layers: UseQueryResult[];
+    controls: UseQueryResult[];
+    download: UseQueryResult[];
+};

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

@@ -0,0 +1,23 @@
+import { ResolvedView, ViewResolutionContextBase, ViewStageKey } from '../types';
+import type { QueriesByStage, ViewToResolve } from './types';
+/**
+ * Fans out one React Query query per view for a single pipeline stage via
+ * `useQueries`.
+ *
+ * Each query is enabled only when:
+ * 1. The global `enabled` flag is true.
+ * 2. All `dependsOnStages` are resolved on that view's partial view.
+ *
+ * The query key includes the result of `viewSpec[stageKey]._dependencies` (if
+ * defined), allowing stages to declare fine-grained cache invalidation based
+ * on prior stage data or app context.
+ */
+export declare function useViewStageQueries({ enabled: extEnabled, stageKey, dependsOnStages, viewResolutionContextBase, queriesByStage, viewsToResolve, queryFn, }: {
+    enabled: boolean;
+    stageKey: ViewStageKey;
+    dependsOnStages?: ViewStageKey[] | null;
+    viewResolutionContextBase: ViewResolutionContextBase;
+    queriesByStage: Partial<QueriesByStage>;
+    viewsToResolve: ViewToResolve[];
+    queryFn: (viewToResolve: ViewToResolve, partialView: Partial<ResolvedView>) => Promise<Partial<ResolvedView>>;
+}): import("@tanstack/react-query").UseQueryResult<unknown, Error>[];

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

@@ -1,12 +1,41 @@
-import { UseQueryResult } from '@tanstack/react-query';
-import { ResolvedView, ViewResolutionContextBase, ViewSpec } from '../types';
+import { ViewResolutionContextBase, ViewSpec, ViewStageKey } from '../types';
+import type { QueriesByStage } from './types';
+/**
+ * Flat ordered list of all stage keys, derived from `PIPELINE_STAGES`.
+ * Parallel stages within the same group appear consecutively.
+ */
+export declare const PIPELINE_STAGE_ORDER: ViewStageKey[];
+/**
+ * Orchestrates the full view resolution pipeline for all active views.
+ *
+ * Stages are resolved in groups: `[metadata] → [sources] → [layers] →
+ * [controls, download]`. Stages within a group are parallel — they share the
+ * same upstream dependencies. Each stage receives a snapshot of all preceding
+ * resolved queries so downstream stages can read prior results.
+ *
+ * Each view × stage pair is an independent React Query query. A single view
+ * can update without triggering re-resolution of any other view.
+ *
+ * `resolvedViews` carries all active views with raw stage data (sentinels for
+ * unresolved stages). Use `viewsReadyAtStage` to obtain a filtered subset.
+ *
+ * `resolvedViewSpecs` are resolved synchronously because schema changes must
+ * reflect immediately as the user edits conf values.
+ */
 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[];
+    currentLoadingStage: (viewId?: string | null) => ViewStageKey | null;
+    queriesByStage: QueriesByStage;
+    viewsReadyAtStage: (stageKey: ViewStageKey) => Partial<import("../types").ResolvedView>[];
+    resolvedViews: Partial<import("../types").ResolvedView>[];
+    resolvedViewSpecs: (ViewSpec | {
+        confSchema: Partial<import("../types").ResolvedView>;
+        id: string;
+        debug?: boolean;
+        keywords?: string | string[];
+        metadata: import("../types").ViewMetadataSpec;
+        sources: import("../types").ViewSourcesSpec;
+        layers: import("../types").ViewLayersSpec;
+        controls: import("../types").ViewControlsSpec;
+        download?: import("../types").ViewDownloadSpec;
+    })[];
 };

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

@@ -0,0 +1,5 @@
+export * from './queryKeyHashFnWithFileSupport';
+export * from './useViewStageQueriesCache';
+export * from './viewsFromStageQueries';
+export * from './viewHasResolvedStages';
+export * from './viewStageQueryKey';

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

@@ -0,0 +1,2 @@
+import { ViewToResolve } from '../types';
+export declare function useViewStageQueriesCache(viewsToResolve: ViewToResolve[]): import("react").RefObject<Record<string, unknown>>;

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

@@ -0,0 +1,6 @@
+import { ResolvedView, ViewStageKey } from '../../types';
+/**
+ * Utility that checks whether a partial view
+ * has all stages from a list resolved
+ */
+export declare function viewHasResolvedStages(partialView: Partial<ResolvedView>, stages: ViewStageKey[]): boolean;

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

@@ -0,0 +1,45 @@
+import { ViewConf } from '../../../GeoReDUS/viewConfReducer';
+import { ResolvedView, ViewResolutionContextBase, ViewSpec, ViewStageKey } from '../../types';
+import { QueriesByStage } from '../types';
+type ViewStageQueryKeyProps = {
+    enabled: boolean;
+    stageKey: ViewStageKey;
+    dependsOnStages?: ViewStageKey[] | null;
+    viewResolutionContextBase: ViewResolutionContextBase;
+    queriesByStage: Partial<QueriesByStage>;
+    viewId: string;
+    viewIndex: number;
+    viewSpec: ViewSpec;
+    viewConf: ViewConf;
+    partialView: Partial<ResolvedView>;
+};
+/**
+ * Computes the React Query cache key for a single view × stage combination.
+ *
+ * The key is a seven-element array. Elements 0–2 are scoping identifiers that
+ * isolate each cache entry. Elements 3–6 are invalidation signals — React
+ * Query re-fetches the query whenever any of them changes.
+ *
+ * ```
+ * [0] 'GeoReDUS:ViewStage'          — namespace; prevents collisions with other query keys
+ * [1] viewId                         — one cache entry per view
+ * [2] stageKey                       — one cache entry per stage within a view
+ * [3] app                            — invalidates all stages for all views on app context change
+ * [4] viewConf (filtered)            — invalidates stages that declare interest in a conf prop;
+ *                                      see _keyViewConf for notify-based filtering
+ * [5] upstream stage versions        — invalidates this stage when an upstream stage refetches or errors;
+ *                                      null when dependsOnStages is absent
+ * [6] custom stage dependencies      — invalidates this stage based on the upstream data slice it
+ *                                      declared via viewSpec[stageKey]._dependencies;
+ *                                      'STABLE_DEPENDENCY' when not defined
+ * ```
+ *
+ * Invalidation scope summary:
+ *   - `app` change           → all stages, all views
+ *   - conf prop change       → directly invalidates stages whose `notify` matches;
+ *                              downstream stages cascade via element 5 once upstream re-resolves
+ *   - upstream stage refetch → all stages listing it in `dependsOnStages`
+ *   - upstream data unchanged (guarded by `_dependencies`) → no re-resolution
+ */
+export declare function viewStageQueryKey(props: ViewStageQueryKeyProps): any[];
+export {};

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

@@ -0,0 +1,12 @@
+import { ResolvedView } from '../../types';
+import { QueriesByStage, ViewToResolve } from '../types';
+/**
+ * Merges query results into partial views. For each stage in `queriesByStage`,
+ * assigns query data on success or a sentinel symbol (`STAGE_LOADING` /
+ * `STAGE_ERROR`) otherwise. When `queriesByStage` is `null`, returns base
+ * views with only `id` and `conf`.
+ */
+export declare function viewsFromStageQueries<QueriesByStagePartial extends Partial<QueriesByStage> = QueriesByStage>({ viewsToResolve, queriesByStage, }: {
+    viewsToResolve: ViewToResolve[];
+    queriesByStage: QueriesByStagePartial | null;
+}): Partial<ResolvedView>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redus/georedus-ui",
-  "version": "0.21.0",
+  "version": "0.22.1",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/main.js",
@@ -43,7 +43,8 @@
     "react-map-gl": "^8.0.0",
     "react-router-dom": "^7.4.1",
     "rollup": "^4.13.0",
-    "storybook": "^8.0.0"
+    "storybook": "^8.0.0",
+    "type-fest": "^5.8.0"
   },
   "dependencies": {
     "@mapbox/tilebelt": "2.0.0",
@@ -55,7 +56,7 @@
     "@orioro/react-csv": "^0.0.17",
     "@orioro/react-dialogs": "^0.1.5",
     "@orioro/react-dir-nav": "^0.2.2",
-    "@orioro/react-maplibre-util": "^0.8.1",
+    "@orioro/react-maplibre-util": "^0.9.1",
     "@orioro/react-sortable": "^0.0.16",
     "@orioro/react-ui-core": "^0.0.20",
     "@orioro/resolve": "^0.1.12",
@@ -63,7 +64,7 @@
     "@orioro/tree-model": "^0.0.10",
     "@orioro/util": "^0.16.0",
     "@orioro/validate": "^0.0.10",
-    "@orioro/vector-tile-util": "^0.3.2",
+    "@orioro/vector-tile-util": "^0.4.1",
     "@radix-ui/react-collapsible": "^1.1.3",
     "@tanstack/react-query": "^5.18.0",
     "@turf/turf": "^7.1.0",
@@ -75,6 +76,7 @@
     "d3-scale-chromatic": "^3.1.0",
     "file-saver": "^2.0.5",
     "gdal3.js": "^2.8.1",
+    "h3-js": "^4.5.0",
     "html-to-image": "^1.11.13",
     "katex": "^0.16.22",
     "lodash": "^4.17.21",