@eodash/eodash 5.6.0 → 5.7.0

package/widgets/EodashProcess/methods/outputs.js

@@ -4,12 +4,21 @@ import axios from "@/plugins/axios";
 import { createTiffLayerDefinition, separateEndpointLinks } from "./utils";
 import { useSTAcStore } from "@/store/stac";
 import { isFirstLoad } from "@/utils/states";
+import {
+  getMultiQueryMatches,
+  getPostMultiQueryValues,
+  getScalarMultiQueryValues,
+  createMultiQueryContext,
+  aggregateInlineResponses,
+  renderJsonBodyTemplate,
+} from "./template-helpers";
 
 ////// --- CHARTS --- //////
 /**
  * @param {object} options
  * @param {import("stac-ts").StacLink[] | undefined} options.links
  * @param {Record<string,any> | undefined} options.jsonformValue
+ * @param {Record<string,any> | undefined} [options.rawJsonformValue]
  * @param {string} options.specUrl
  * @param {(input:import("^/EodashProcess/types").CustomEnpointInput)=>Promise<Record<string,any>[] | undefined | null>} [options.customEndpointsHandler]
  * @param {import("vue").Ref<boolean>} options.isPolling
@@ -22,6 +31,7 @@ import { isFirstLoad } from "@/utils/states";
 export async function processCharts({
   links,
   jsonformValue,
+  rawJsonformValue,
   specUrl,
   customEndpointsHandler,
   jsonformSchema,
@@ -51,6 +61,7 @@ export async function processCharts({
     (await customEndpointsHandler({
       jsonformSchema,
       jsonformValue,
+      rawJsonformValue,
       links: endpointLinks,
       selectedStac,
       isPolling,
@@ -114,6 +125,7 @@ export async function processCharts({
           await injectVegaInlineData(spec, {
             url: link.href,
             jsonformValue: jsonformValue,
+            rawJsonformValue,
             link: link,
             flatstyleUrl: /** @type string */ (link["eox:flatstyle"]),
             jsonformSchema,
@@ -153,46 +165,39 @@ export async function processCharts({
  * @param {object} injectables
  * @param {string} injectables.url
  * @param {Record<string,any>} [injectables.jsonformValue]
+ * @param {Record<string,any>} [injectables.rawJsonformValue]
  * @param {import("stac-ts").StacLink} injectables.link
  * @param {url} [injectables.flatstyleUrl]
  * @param {import("json-schema").JSONSchema7} [injectables.jsonformSchema]
  */
 async function injectVegaInlineData(
   spec,
-  { url, jsonformValue, link, flatstyleUrl, jsonformSchema },
+  { url, jsonformValue, rawJsonformValue, link, flatstyleUrl, jsonformSchema },
 ) {
   if (!spec.data) {
     return;
   }
+  // @ts-expect-error JSONSchema7 is structurally compatible with Record<string, any>
+  const multiQueryMatches = getMultiQueryMatches(jsonformValue, jsonformSchema);
   if (link.method == "GET") {
-    // we see if any of the multiQuery values match an array in the jsonformValue
-    // and if so, we can do multiple requests and merge all data together.
-    //@ts-expect-error type jsonform Schema
-    const multiQuery = jsonformSchema?.options?.multiQuery;
-    const matches = Object.keys(jsonformValue ?? {}).filter((key) => {
-      return Array.isArray(multiQuery)
-        ? multiQuery.includes(key)
-        : multiQuery === key;
-    });
-    if (matches.length > 0 && jsonformValue) {
+    if (multiQueryMatches.length > 0 && jsonformValue) {
       const dataValues = [];
-      for (const match of matches) {
-        if (Array.isArray(jsonformValue[match])) {
-          for (const value of jsonformValue[match]) {
-            const dataUrl = await renderDataUrl(
-              url,
-              { ...jsonformValue, [match]: value },
-              flatstyleUrl,
-            );
-            dataValues.push(await axios.get(dataUrl).then((resp) => resp.data));
-          }
-        } else {
-          const dataUrl = await renderDataUrl(url, jsonformValue, flatstyleUrl);
+      for (const match of multiQueryMatches) {
+        const queryValues = getScalarMultiQueryValues(match, jsonformValue);
+        if (!queryValues.length) {
+          continue;
+        }
+        for (const value of queryValues) {
+          const dataUrl = await renderDataUrl(
+            url,
+            { ...jsonformValue, [match]: value },
+            flatstyleUrl,
+          );
           dataValues.push(await axios.get(dataUrl).then((resp) => resp.data));
         }
       }
       /** @type {import("vega-lite/build/src/data").InlineData} */
-      (spec.data).values = dataValues.flat();
+      (spec.data).values = aggregateInlineResponses(dataValues);
       return spec;
     }
     // if no array matches, we can just do a single request
@@ -216,11 +221,49 @@ async function injectVegaInlineData(
       .then((resp) => {
         return resp.data;
       });
-    const body = JSON.parse(
-      mustache.render(bodyTemplate, {
-        ...(jsonformValue ?? {}),
-      }),
-    );
+    if (
+      // @ts-expect-error jsonform options extension not in JSONSchema7
+      jsonformSchema?.options?.multiQuery &&
+      multiQueryMatches.length === 0
+    ) {
+      /** @type {import("vega-lite/build/src/data").InlineData} */
+      (spec.data).values = [];
+      return spec;
+    }
+    if (multiQueryMatches.length > 0 && jsonformValue) {
+      const responses = [];
+      for (const match of multiQueryMatches) {
+        const queryValues = getPostMultiQueryValues(
+          match,
+          jsonformValue,
+          rawJsonformValue,
+          /** @type {Record<string, any>} */ (jsonformSchema),
+        );
+        if (!queryValues.length) {
+          continue;
+        }
+        // Sequential POSTs (not parallel) to avoid rate-limiting on endpoints
+        // like TiTiler-PgSTAC. For small selection counts this is fine; if
+        // parallelism is needed later, switch to Promise.all.
+        for (const [index, value] of queryValues.entries()) {
+          const requestContext = createMultiQueryContext(
+            jsonformValue,
+            match,
+            value,
+            index,
+          );
+          const body = renderJsonBodyTemplate(bodyTemplate, requestContext);
+          responses.push(await axios.post(url, body).then((resp) => resp.data));
+        }
+      }
+      /** @type {import("vega-lite/build/src/data").InlineData} */
+      (spec.data).values = aggregateInlineResponses(responses);
+      return spec;
+    }
+
+    const body = renderJsonBodyTemplate(bodyTemplate, {
+      ...(jsonformValue ?? {}),
+    });
     /** @type {import("vega-lite/build/src/data").InlineData} */
     (spec.data).values = await axios.post(url, body).then((resp) => {
       return resp.data;
@@ -229,6 +272,8 @@ async function injectVegaInlineData(
   return spec;
 }
 
+// MultiQuery helpers and template rendering are in ./template-helpers.js
+
 /**
  * @param {import("vega-lite").TopLevelSpec} spec
  * @param {object} injectables

package/widgets/EodashProcess/methods/template-helpers.js

@@ -0,0 +1,246 @@
+import mustache from "mustache";
+
+/**
+ * Returns form value keys that match the multiQuery configuration.
+ * @param {Record<string, any> | undefined} jsonformValue
+ * @param {Record<string, any>} jsonformSchema
+ * @returns {string[]}
+ */
+export function getMultiQueryMatches(jsonformValue, jsonformSchema) {
+  const multiQuery = jsonformSchema?.options?.multiQuery;
+  return Object.keys(jsonformValue ?? {}).filter((key) => {
+    return Array.isArray(multiQuery)
+      ? multiQuery.includes(key)
+      : multiQuery === key;
+  });
+}
+
+/**
+ * Extracts iterable scalar values for a multiQuery field.
+ * Wraps single values in an array; returns empty array for undefined.
+ * @param {string} match - The multiQuery field name
+ * @param {Record<string, any>} jsonformValue
+ * @returns {any[]}
+ */
+export function getScalarMultiQueryValues(match, jsonformValue) {
+  const value = jsonformValue?.[match];
+  if (Array.isArray(value)) {
+    return value;
+  }
+  return value === undefined ? [] : [value];
+}
+
+/**
+ * Extracts iterable values for a POST multiQuery field.
+ * For GeoJSON fields, uses rawJsonformValue to get original Feature objects
+ * (before extractGeometries stringifies them). For scalar fields, delegates
+ * to getScalarMultiQueryValues.
+ * @param {string} match - The multiQuery field name
+ * @param {Record<string, any>} jsonformValue - Form values after geometry extraction
+ * @param {Record<string, any> | undefined} rawJsonformValue - Form values before geometry extraction
+ * @param {Record<string, any>} jsonformSchema
+ * @returns {any[]}
+ */
+export function getPostMultiQueryValues(
+  match,
+  jsonformValue,
+  rawJsonformValue,
+  jsonformSchema,
+) {
+  if (jsonformSchema?.properties?.[match]?.type === "geojson") {
+    return getGeoJsonMultiQueryValues(rawJsonformValue?.[match]);
+  }
+  return getScalarMultiQueryValues(match, jsonformValue);
+}
+
+/**
+ * Extracts individual GeoJSON Feature objects from a value that may be
+ * a FeatureCollection, a single Feature, or an array of Features.
+ * Filters for valid Features with geometry and deduplicates.
+ * @param {any} value
+ * @returns {Record<string, any>[]}
+ */
+export function getGeoJsonMultiQueryValues(value) {
+  if (value?.type === "FeatureCollection") {
+    return dedupeMultiQueryValues(
+      (value.features ?? []).filter(
+        (/** @type {any} */ feature) =>
+          feature?.type === "Feature" && feature.geometry,
+      ),
+    );
+  }
+  if (value?.type === "Feature") {
+    return [value];
+  }
+  if (Array.isArray(value)) {
+    return dedupeMultiQueryValues(
+      value.filter(
+        (/** @type {any} */ feature) =>
+          feature?.type === "Feature" && feature.geometry,
+      ),
+    );
+  }
+  return [];
+}
+
+/**
+ * Removes duplicate values using JSON serialization as the identity key.
+ * @param {any[]} values
+ * @returns {any[]}
+ */
+export function dedupeMultiQueryValues(values) {
+  const seen = new Set();
+  const deduped = [];
+  for (const value of values ?? []) {
+    const key =
+      value && typeof value === "object"
+        ? JSON.stringify(value)
+        : String(value);
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    deduped.push(value);
+  }
+  return deduped;
+}
+
+/**
+ * Builds the Mustache rendering context for one multiQuery iteration.
+ * Spreads the full form value, overrides the matched field with the current
+ * iteration value, and adds a 1-based `multiQueryIndex`.
+ * @param {Record<string, any>} jsonformValue
+ * @param {string} match - The multiQuery field name being iterated
+ * @param {any} value - The current iteration value
+ * @param {number} index - Zero-based iteration index
+ * @returns {Record<string, any>}
+ */
+export function createMultiQueryContext(jsonformValue, match, value, index) {
+  return {
+    ...(jsonformValue ?? {}),
+    [match]: value,
+    multiQueryIndex: index + 1,
+  };
+}
+
+/**
+ * Flattens an array of POST responses into a single values array.
+ * Each response that is itself an array is spread; scalars are wrapped.
+ * @param {any[]} values
+ * @returns {any[]}
+ */
+export function aggregateInlineResponses(values) {
+  return values.flatMap((value) => (Array.isArray(value) ? value : [value]));
+}
+
+/**
+ * Renders a JSON body template string with the given context.
+ * Primary path: parses the template as JSON, then recursively renders each
+ * node (preserving object-valued placeholders as raw JSON).
+ * Fallback: treats the template as a Mustache string, renders, then parses.
+ * @param {string} bodyTemplate - JSON template string (may contain Mustache placeholders)
+ * @param {Record<string, any>} context - Values to substitute into the template
+ * @returns {any} Parsed JSON body ready for POST
+ */
+export function renderJsonBodyTemplate(bodyTemplate, context) {
+  try {
+    const parsedTemplate = JSON.parse(bodyTemplate);
+    return renderTemplateNode(parsedTemplate, context);
+  } catch {
+    try {
+      return JSON.parse(
+        mustache.render(bodyTemplate, {
+          ...(context ?? {}),
+        }),
+      );
+    } catch (e) {
+      throw new Error(
+        `[eodash] Failed to render POST body template: ${e instanceof Error ? e.message : String(e)}`,
+      );
+    }
+  }
+}
+
+/**
+ * Recursively renders a parsed JSON template node with context values.
+ * - Arrays and objects are traversed recursively.
+ * - Exact placeholders (where the entire string value is `"{{path}}"` or
+ *   `"{{{path}}}"`) are resolved to their original typed value (object, array,
+ *   number, etc.) instead of being stringified. This is critical for embedding
+ *   GeoJSON geometry objects in POST bodies.
+ * - Partial placeholders and mixed strings use standard Mustache interpolation.
+ * @param {any} templateNode
+ * @param {Record<string, any>} context
+ * @returns {any}
+ */
+export function renderTemplateNode(templateNode, context) {
+  if (Array.isArray(templateNode)) {
+    return templateNode.map((value) => renderTemplateNode(value, context));
+  }
+  if (templateNode && typeof templateNode === "object") {
+    return Object.fromEntries(
+      Object.entries(templateNode).map(([key, value]) => [
+        mustache.render(key, context),
+        renderTemplateNode(value, context),
+      ]),
+    );
+  }
+  if (typeof templateNode !== "string") {
+    return templateNode;
+  }
+
+  // Detect exact placeholder: entire value is "{{path}}" or "{{{path}}}".
+  // Matches both double-brace {{...}} and triple-brace {{{...}}} syntax.
+  // When matched, the resolved value is returned as its original type (e.g. an
+  // object), rather than being coerced to a string by Mustache.
+  const exactPlaceholder = templateNode.match(
+    /^\{\{\{?\s*([^{}]+?)\s*\}?\}\}$/,
+  );
+  if (exactPlaceholder) {
+    const resolvedValue = resolveTemplatePath(context, exactPlaceholder[1]);
+    if (resolvedValue !== undefined) {
+      return cloneTemplateValue(resolvedValue);
+    }
+  }
+
+  return mustache.render(templateNode, context);
+}
+
+/**
+ * Resolves a dot/bracket-notation path against a context object.
+ * Supports paths like `"feature.geometry"` or `"list[0].name"`.
+ * @param {Record<string, any>} context
+ * @param {string} path
+ * @returns {any}
+ */
+export function resolveTemplatePath(context, path) {
+  const segments = path
+    .replace(/\[(\d+)\]/g, ".$1")
+    .split(".")
+    .map((segment) => segment.trim())
+    .filter(Boolean);
+
+  let currentValue = context;
+  for (const segment of segments) {
+    if (currentValue === null || currentValue === undefined) {
+      return undefined;
+    }
+    currentValue = currentValue[segment];
+  }
+  return currentValue;
+}
+
+/**
+ * Deep-clones objects via JSON round-trip to prevent template rendering
+ * from mutating the original context values. This also strips non-JSON-
+ * serializable properties (e.g. OL Feature methods from drawtools),
+ * producing clean plain objects. Primitives pass through.
+ * @param {any} value
+ * @returns {any}
+ */
+export function cloneTemplateValue(value) {
+  if (value && typeof value === "object") {
+    return JSON.parse(JSON.stringify(value));
+  }
+  return value;
+}

package/widgets/EodashProcess/methods/utils.js

@@ -500,13 +500,17 @@ export function extractAsyncResults(resultItem) {
   return extracted;
 }
 
-/** @param {*} jsonformSchema */
-export const getDrawToolsProperty = (jsonformSchema) => {
+/** @param {*} jsonformSchema
+ * @returns { string[] }
+ */
+export const getDrawToolsProperties = (jsonformSchema) => {
+  const properties = [];
   for (const property in jsonformSchema.properties) {
     if (jsonformSchema.properties[property]?.options?.drawtools) {
-      return property;
+      properties.push(property);
     }
   }
+  return properties;
 };
 
 /**
@@ -553,17 +557,3 @@ export const applyProcessLayersToMap = (mapElement, processLayers) => {
     mapElement.layers = layers;
   }
 };
-/**
- * Updates the jsonform schema to target the compare map
- * @param {Record<string,any> | null | undefined} jsonformSchema
- */
-export function updateJsonformSchemaTarget(jsonformSchema) {
-  if (!jsonformSchema) {
-    return jsonformSchema;
-  }
-  const stringified = JSON.stringify(jsonformSchema).replaceAll(
-    "eox-map#main",
-    "eox-map#compare",
-  );
-  return JSON.parse(stringified);
-}

package/widgets/EodashProcess/types.ts

@@ -5,6 +5,7 @@ export interface CustomEnpointInput {
   links: StacLink[];
   jsonformSchema: Record<string, any>;
   jsonformValue: Record<string, any>;
+  rawJsonformValue?: Record<string, any>;
   selectedStac: StacCollection;
   isPolling?: Ref<boolean>;
   enableCompare?: boolean;

package/widgets/EodashStacInfo.vue

@@ -25,38 +25,38 @@ const { allowHtml, featured, footer, header, body, tags } = defineProps({
   },
 
   header: {
-    /** 
+    /**
      * @type {import("vue").PropType<
-     *   (string | { 
-     *     key: string, 
-     *     filter?: (item: any) => boolean 
+     *   (string | {
+     *     key: string,
+     *     filter?: (item: any) => boolean
      *   })[]
-     * >} 
-    */
+     * >}
+     */
     type: Array,
     default: () => ["title"],
   },
   tags: {
-    /** 
+    /**
      * @type {import("vue").PropType<
-     *   (string | { 
-     *     key: string, 
-     *     filter?: (item: any) => boolean 
+     *   (string | {
+     *     key: string,
+     *     filter?: (item: any) => boolean
      *   })[]
-     * >} 
-    */
+     * >}
+     */
     type: Array,
     default: () => ["themes"],
   },
   body: {
-    /** 
+    /**
      * @type {import("vue").PropType<
-     *   (string | { 
-     *     key: string, 
-     *     filter?: (item: any) => boolean 
+     *   (string | {
+     *     key: string,
+     *     filter?: (item: any) => boolean
      *   })[]
-     * >} 
-    */
+     * >}
+     */
     type: Array,
     default: () => [
       "satellite",
@@ -68,26 +68,26 @@ const { allowHtml, featured, footer, header, body, tags } = defineProps({
     ],
   },
   featured: {
-    /** 
+    /**
      * @type {import("vue").PropType<
-     *   (string | { 
-     *     key: string, 
-     *     filter?: (item: any) => boolean 
+     *   (string | {
+     *     key: string,
+     *     filter?: (item: any) => boolean
      *   })[]
-     * >} 
-    */
+     * >}
+     */
     type: Array,
     default: () => ["description", "providers", "assets", "links"],
   },
   footer: {
-    /** 
+    /**
      * @type {import("vue").PropType<
-     *   (string | { 
-     *     key: string, 
-     *     filter?: (item: any) => boolean 
+     *   (string | {
+     *     key: string,
+     *     filter?: (item: any) => boolean
      *   })[]
-     * >} 
-    */
+     * >}
+     */
     type: Array,
     default: () => ["sci:citation", "sci:doi", "sci:publication"],
   },