@esri/solutions-components 5.0.3 → 5.0.4-next.2

package/dist/chunks/popupUtils.js

@@ -1,8 +1,8 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.0/LICENSE.txt */
-import { _ as c } from "./downloadUtils.js";
-import * as l from "@arcgis/core/arcade";
-import * as f from "@arcgis/core/intl";
-class T {
+import { _ as _prepareAttributeValue } from "./downloadUtils.js";
+import * as arcade from "@arcgis/core/arcade";
+import * as intl from "@arcgis/core/intl";
+class PopupUtils {
   /**
    * Get the popup title that honors arcade expressions
    *
@@ -11,29 +11,43 @@ class T {
    * @returns Promise resolving with the popup title
    * @protected
    */
-  async getPopupTitle(t, u) {
-    let a = {};
-    for (const [e, r] of Object.entries(t.attributes))
-      a = {
-        ...a,
-        [`{${e.toUpperCase()}}`]: r
+  async getPopupTitle(graphic, map) {
+    let attributes = {};
+    for (const [key, value] of Object.entries(graphic.attributes)) {
+      attributes = {
+        ...attributes,
+        [`{${key.toUpperCase()}}`]: value
       };
-    const o = t.layer, i = this._removeTags(o?.popupTemplate?.title);
-    if (i.includes("{expression/expr") && o?.popupTemplate?.expressionInfos != null)
-      for (let e = 0; e < o.popupTemplate?.expressionInfos.length; e++) {
-        const r = o.popupTemplate.expressionInfos[e], n = l.createArcadeProfile("popup");
+    }
+    const layer = graphic.layer;
+    const popupTitle = this._removeTags(layer?.popupTemplate?.title);
+    if (popupTitle.includes("{expression/expr") && layer?.popupTemplate?.expressionInfos != null) {
+      for (let i = 0; i < layer.popupTemplate?.expressionInfos.length; i++) {
+        const info = layer.popupTemplate.expressionInfos[i];
+        const profile = arcade.createArcadeProfile("popup");
         try {
-          const p = await (await l.createArcadeExecutor(r.expression, n)).executeAsync({ $feature: t, $layer: o, $map: u });
-          (p !== null || p !== "") && (a[`{expression/${r.name}}`.toUpperCase()] = p);
-        } catch (s) {
-          console.error(s);
+          const arcadeExecutor = await arcade.createArcadeExecutor(info.expression, profile);
+          const arcadeTitle = await arcadeExecutor.executeAsync({ $feature: graphic, $layer: layer, $map: map });
+          if (arcadeTitle !== null || arcadeTitle !== "") {
+            attributes[`{expression/${info.name}}`.toUpperCase()] = arcadeTitle;
+          }
+        } catch (e) {
+          console.error(e);
           continue;
         }
       }
-    return o.popupTemplate?.fieldInfos && o.fields.forEach((e) => {
-      const r = t.attributes[e.name], n = (o?.popupTemplate?.fieldInfos || []).find((p) => p.fieldName.toLowerCase() === e.name.toLowerCase()), s = c(r, e.type, e?.domain, n?.format, f);
-      a[`{${e.name.toUpperCase()}}`] = s ?? r;
-    }), i?.replace(/{.*?}/g, (e) => a[e.toUpperCase()] != null ? a[e.toUpperCase()] : "");
+    }
+    if (layer.popupTemplate?.fieldInfos) {
+      layer.fields.forEach((field) => {
+        const attributeValue = graphic.attributes[field.name];
+        const fieldInfo = (layer?.popupTemplate?.fieldInfos || []).find((fInfo) => fInfo.fieldName.toLowerCase() === field.name.toLowerCase());
+        const formattedAttributeValue = _prepareAttributeValue(attributeValue, field.type, field?.domain, fieldInfo?.format, intl);
+        attributes[`{${field.name.toUpperCase()}}`] = formattedAttributeValue ?? attributeValue;
+      });
+    }
+    return popupTitle?.replace(/{.*?}/g, (placeholder) => {
+      return attributes[placeholder.toUpperCase()] != null ? attributes[placeholder.toUpperCase()] : "";
+    });
   }
   /**
    * Remove any tags from the title
@@ -41,10 +55,13 @@ class T {
    * @returns title string without tags
    * @protected
    */
-  _removeTags(t) {
-    return t == null || t === "" ? "" : t.toString().replace(/(<([^>]+)>)/gi, "");
+  _removeTags(str) {
+    if (str == null || str === "") {
+      return "";
+    }
+    return str.toString().replace(/(<([^>]+)>)/gi, "");
   }
 }
 export {
-  T as P
+  PopupUtils as P
 };

package/dist/chunks/publicNotificationContext.js

@@ -1,6 +1,6 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.0/LICENSE.txt */
-import { createContext as t } from "@lit/context";
-const e = t("pn");
+import { createContext } from "@lit/context";
+const pnContext = createContext("pn");
 export {
-  e as p
+  pnContext as p
 };

package/dist/chunks/queryUtils.js

@@ -1,69 +1,119 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.0/LICENSE.txt */
-import * as m from "@arcgis/core/geometry/operators/unionOperator";
-import * as l from "@arcgis/core/geometry/operators/projectOperator";
-import * as q from "@arcgis/core/geometry/support/webMercatorUtils";
-async function F(t, e) {
-  let n = [];
-  const r = t ? t.map((s) => w(s, e)) : [Promise.resolve()];
-  return (await Promise.all(r)).forEach((s) => {
-    n = [...n, ...s || []];
-  }), n;
+import * as unionOperator from "@arcgis/core/geometry/operators/unionOperator";
+import * as projectOperator from "@arcgis/core/geometry/operators/projectOperator";
+import * as webMercatorUtils from "@arcgis/core/geometry/support/webMercatorUtils";
+async function queryObjectIds(geometries, layer) {
+  let ids = [];
+  const queryDefs = geometries ? geometries.map((g) => _intersectQuery(g, layer)) : [Promise.resolve()];
+  const results = await Promise.all(queryDefs);
+  results.forEach((resultIds) => {
+    ids = [...ids, ...resultIds || []];
+  });
+  return ids;
 }
-async function j(t, e, n, r, o, s) {
-  const c = e.capabilities?.query.maxRecordCount || 1e3, d = 0;
-  t.length === 0 && (t = await e.queryObjectIds());
-  const u = e.createQuery();
-  if (u.returnGeometry = r, u.objectIds = t.slice(d, c), o && (u.outSpatialReference = o), s) {
-    const p = e.fields.map((a) => a.name.toLowerCase());
-    u.outFields = s.filter((a) => p.indexOf(a.toLowerCase()) > -1);
+async function queryFeaturesByID(ids, layer, graphics, returnGeometry, outSpatialReference, fields) {
+  const num = layer.capabilities?.query.maxRecordCount || 1e3;
+  const start = 0;
+  if (ids.length === 0) {
+    ids = await layer.queryObjectIds();
   }
-  const y = await e.queryFeatures(u);
-  n = n.concat(y.features);
-  const f = t.slice(c, t.length);
-  return f.length > 0 ? j(f, e, n, r, o, s) : Promise.resolve(n);
+  const q = layer.createQuery();
+  q.returnGeometry = returnGeometry;
+  q.objectIds = ids.slice(start, num);
+  if (outSpatialReference) {
+    q.outSpatialReference = outSpatialReference;
+  }
+  if (fields) {
+    const layerFields = layer.fields.map((f) => f.name.toLowerCase());
+    q.outFields = fields.filter((f) => layerFields.indexOf(f.toLowerCase()) > -1);
+  }
+  const result = await layer.queryFeatures(q);
+  graphics = graphics.concat(result.features);
+  const remainingIds = ids.slice(num, ids.length);
+  return remainingIds.length > 0 ? queryFeaturesByID(remainingIds, layer, graphics, returnGeometry, outSpatialReference, fields) : Promise.resolve(graphics);
 }
-async function I(t, e) {
-  const n = e.globalIdField;
-  if (!n)
+async function queryFeaturesByGlobalID(globalIds, layer) {
+  const globalIdField = layer.globalIdField;
+  if (!globalIdField) {
     return [];
-  const r = e.createQuery();
-  return r.returnGeometry = !1, r.outFields = [e.objectIdField], r.where = t.map((s) => `${n} = '${s}'`).join(" or "), (await e.queryFeatures(r)).features;
+  }
+  const q = layer.createQuery();
+  q.returnGeometry = false;
+  q.outFields = [layer.objectIdField];
+  q.where = globalIds.map((g) => `${globalIdField} = '${g}'`).join(" or ");
+  const result = await layer.queryFeatures(q);
+  return result.features;
 }
-async function b(t, e, n, r) {
-  const o = e.capabilities?.query.maxRecordCount || 1e3, s = e.createQuery();
-  s.start = t, s.num = o, s.geometry = n;
-  const c = await e.queryFeatures(s);
-  return r[e.id] = r[e.id].concat(c.features), c.exceededTransferLimit ? b(t += o, e, n, r) : Promise.resolve(r);
+async function queryFeaturesByGeometry(start, layer, geometry, featuresCollection) {
+  const num = layer.capabilities?.query.maxRecordCount || 1e3;
+  const query = layer.createQuery();
+  query.start = start;
+  query.num = num;
+  query.geometry = geometry;
+  const result = await layer.queryFeatures(query);
+  featuresCollection[layer.id] = featuresCollection[layer.id].concat(result.features);
+  return result.exceededTransferLimit ? queryFeaturesByGeometry(start += num, layer, geometry, featuresCollection) : Promise.resolve(featuresCollection);
 }
-async function x(t, e) {
-  const n = e.createQuery();
-  return n.objectIds = t, e.queryExtent(n);
+async function queryExtent(ids, layer) {
+  const query = layer.createQuery();
+  query.objectIds = ids;
+  return layer.queryExtent(query);
 }
-function h(t) {
-  const e = [], n = i(t, "polygon");
-  n && e.push(n);
-  const r = i(t, "polyline");
-  r && e.push(r);
-  const o = i(t, "point");
-  return o && e.push(o), e;
+function getQueryGeoms(geometries) {
+  const unionGeoms = [];
+  const unionPolygon = _unionGeoms(geometries, "polygon");
+  if (unionPolygon) {
+    unionGeoms.push(unionPolygon);
+  }
+  const unionPolyline = _unionGeoms(geometries, "polyline");
+  if (unionPolyline) {
+    unionGeoms.push(unionPolyline);
+  }
+  const unionPoint = _unionGeoms(geometries, "point");
+  if (unionPoint) {
+    unionGeoms.push(unionPoint);
+  }
+  return unionGeoms;
 }
-function i(t, e) {
-  const n = (t || []).filter((r) => r.type === e);
-  return n.length <= 1 ? n[0] : m.executeMany(n);
+function _unionGeoms(geometries, type) {
+  const geoms = (geometries || []).filter((g) => g.type === type);
+  return geoms.length <= 1 ? geoms[0] : unionOperator.executeMany(geoms);
 }
-async function w(t, e) {
-  const n = e.createQuery();
-  return n.spatialRelationship = "intersects", n.geometry = t, e.queryObjectIds(n);
+async function _intersectQuery(geometry, layer) {
+  const q = layer.createQuery();
+  q.spatialRelationship = "intersects";
+  q.geometry = geometry;
+  return layer.queryObjectIds(q);
 }
-async function P(t, e) {
-  return e ? t.spatialReference ? t.spatialReference.equals(e) || e.isWGS84 || e.wkid === 4326 ? t : t.spatialReference.isWGS84 || t.spatialReference.wkid === 4326 ? q.project(t, e) : (await l.load(), l.execute(t, e)) : (console.error("Input geometry does not have a spatial reference"), t) : (console.error("Target spatial reference is undefined"), t);
+async function projectToSpatialReference(inputGeometry, targetSR) {
+  if (!targetSR) {
+    console.error("Target spatial reference is undefined");
+    return inputGeometry;
+  }
+  if (!inputGeometry.spatialReference) {
+    console.error("Input geometry does not have a spatial reference");
+    return inputGeometry;
+  }
+  if (inputGeometry.spatialReference.equals(targetSR)) {
+    return inputGeometry;
+  }
+  if (targetSR.isWGS84 || targetSR.wkid === 4326) {
+    return inputGeometry;
+  }
+  if (inputGeometry.spatialReference.isWGS84 || inputGeometry.spatialReference.wkid === 4326) {
+    const projectedGeometry2 = webMercatorUtils.project(inputGeometry, targetSR);
+    return projectedGeometry2;
+  }
+  await projectOperator.load();
+  const projectedGeometry = projectOperator.execute(inputGeometry, targetSR);
+  return projectedGeometry;
 }
 export {
-  j as a,
-  I as b,
-  F as c,
-  b as d,
-  h as g,
-  P as p,
-  x as q
+  queryFeaturesByID as a,
+  queryFeaturesByGlobalID as b,
+  queryObjectIds as c,
+  queryFeaturesByGeometry as d,
+  getQueryGeoms as g,
+  projectToSpatialReference as p,
+  queryExtent as q
 };

package/dist/chunks/runtime.js

@@ -1,15 +1,16 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.0/LICENSE.txt */
 import "../cdn/main.css";
-import { makeRuntime as e } from "@arcgis/lumina";
-import { trackAccess as s, createObservable as r, createTrackingTarget as a, runTracked as c } from "@arcgis/core/applications/Components/reactiveUtils.js";
-const t = e({ defaultAssetPath: "https://js.arcgis.com/5.0.2/solutions-components/", hydratedAttribute: "hydrated" }), { customElement: n, getAssetPath: i, setAssetPath: u } = t;
-t.t = s;
-t.o = r;
-t.c = a;
-t.r = c;
+import { makeRuntime } from "@arcgis/lumina";
+import { trackAccess, createObservable, createTrackingTarget, runTracked } from "@arcgis/core/applications/Components/reactiveUtils.js";
+const runtime = makeRuntime({ defaultAssetPath: "https://jsdev.arcgis.com/5.0.4-next/solutions-components/", hydratedAttribute: "hydrated" });
+const { customElement, getAssetPath, setAssetPath } = runtime;
+runtime.t = trackAccess;
+runtime.o = createObservable;
+runtime.c = createTrackingTarget;
+runtime.r = runTracked;
 export {
-  n as c,
-  i as g,
-  t as r,
-  u as s
+  customElement as c,
+  getAssetPath as g,
+  runtime as r,
+  setAssetPath as s
 };