@vertigis/arcgis-extensions 52.2.0 → 53.1.0

package/mapping/support/_SublayerExtensionCollection.d.ts

@@ -1,7 +1,9 @@
 import Collection from "@arcgis/core/core/Collection";
+import type { EventedCallback, EventNames } from "@arcgis/core/core/Evented.js";
+import type { ResourceHandle } from "@arcgis/core/core/Handles.js";
 import type { InitializableCollection } from "../../support/InitializableCollectionProxy.js";
 import { InitializableCollectionProxy } from "../../support/InitializableCollectionProxy.js";
-import type { CollectionAfterAddEventHandler, CollectionAfterChangesEventHandler, CollectionAfterRemoveEventHandler, CollectionBeforeAddEventHandler, CollectionBeforeChangesEventHandler, CollectionBeforeRemoveEventHandler, CollectionChangeEventHandler, EventHandler, SublayerLike } from "../../support/esri.js";
+import type { SublayerLike } from "../../support/esri.js";
 import { type Observable } from "../../support/observableUtils.js";
 import type { LayerExtension } from "../_LayerExtension.js";
 import type { SublayerExtensionProperties } from "../_SublayerExtension.js";
@@ -80,14 +82,7 @@ export declare abstract class SublayerExtensionCollectionBase extends Initializa
      *   parent corresponding to the underlying collection of sublayers.
      */
     constructor(parent: Observable, sublayersProperty: string);
-    on(type: "after-add", listener: CollectionAfterAddEventHandler<LayerExtension>): IHandle;
-    on(type: "after-changes", listener: CollectionAfterChangesEventHandler): IHandle;
-    on(type: "after-remove", listener: CollectionAfterRemoveEventHandler<LayerExtension>): IHandle;
-    on(type: "before-add", listener: CollectionBeforeAddEventHandler<LayerExtension>): IHandle;
-    on(type: "before-changes", listener: CollectionBeforeChangesEventHandler): IHandle;
-    on(type: "before-remove", listener: CollectionBeforeRemoveEventHandler<LayerExtension>): IHandle;
-    on(type: "change", listener: CollectionChangeEventHandler<LayerExtension>): IHandle;
-    on(type: string, listener: EventHandler): IHandle;
+    on<Type extends EventNames<this>>(eventName: Type, listener: EventedCallback<this["@eventTypes"][Type]>): ResourceHandle;
     clone(): SublayerExtensionCollectionBase;
     /**
      * @inheritDoc

package/mapping/support/_SublayerExtensionCollection.js

@@ -1 +1 @@
-import e from"@arcgis/core/core/Collection";import{InitializableCollectionProxy as t}from"../../support/InitializableCollectionProxy.js";import{createIHandle as s,notifyChange as r,onWatch as i,watch as a,watchEvent as n}from"../../support/observableUtils.js";import o from"../../utilities/_ReferenceCountedHandle.js";import{checkArg as l}from"../../utilities/checkArg.js";import{onCollectionPropertyChange as h}from"../../utilities/watch.js";import{SublayerExtension as u}from"../_SublayerExtension.js";export class SublayerExtensionCollectionBase extends t{_parent;get _collection(){return this._sublayers.map((e=>this._forSublayer(e))).concat(Array.from(this._uninitializedSublayerExtensions))}get _sublayers(){const t=this._sublayersProperty.split(".");let s=this._parent;for(const e of t){if(null==s){s=void 0;break}s=s[e]}return s||(this._tempSublayers||(this._tempSublayers=new e),s=this._tempSublayers),s}_sublayersProperty;_tempSublayers;_sublayerExtensionMap=new WeakMap;_uninitializedSublayerExtensions=new Set;_onChangeSublayersHandle=new o((()=>h(this._parent,this._sublayersProperty,(e=>{const t={added:(e.added||[]).map((e=>this._forSublayer(e))),moved:(e.moved||[]).map((e=>this._forSublayer(e))),removed:(e.removed||[]).map((e=>this._forSublayer(e)))};this.emit("change",t)}))));_onBeforeAddSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["before-add",e=>this.emit("before-add",{...e,item:this._forSublayer(e.item),target:this})])));_onBeforeRemoveSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["before-remove",e=>this.emit("before-remove",{...e,item:this._forSublayer(e.item),target:this})])));_onBeforeChangesSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["before-changes",e=>this.emit("before-changes",{...e,target:this})])));_onAfterAddSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["after-add",e=>this.emit("after-add",{...e,item:this._forSublayer(e.item),target:this})],(e=>{if(null!=e)for(const t of e)this.emit("after-add",{item:this._forSublayer(t),target:this})}))));_onAfterRemoveSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["after-remove",e=>this.emit("after-remove",{...e,item:this._forSublayer(e.item),target:this})],((e,t)=>{if(null!=t)for(const e of t)this.emit("after-remove",{item:this._forSublayer(e),target:this})}))));_onAfterChangesSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["after-changes",e=>this.emit("after-changes",{...e,target:this})],(()=>{this.emit("after-changes",{target:this})}))));constructor(e,t){super(),this._parent=e,this._sublayersProperty=t,i(this,"length",(()=>a(this._parent,`${this._sublayersProperty}.length`,(()=>r(this,"length")),{sync:!0})))}on(e,t){const r=[];return"change"===e?r.push(this._onChangeSublayersHandle.add()):"before-add"===e?r.push(this._onBeforeAddSublayersHandle.add()):"before-remove"===e?r.push(this._onBeforeRemoveSublayersHandle.add()):"before-changes"===e?r.push(this._onBeforeChangesSublayersHandle.add()):"after-add"===e?r.push(this._onAfterAddSublayersHandle.add()):"after-remove"===e?r.push(this._onAfterRemoveSublayersHandle.add()):"after-changes"===e&&r.push(this._onAfterChangesSublayersHandle.add()),r.push(super.on(e,t)),s(r)}clone(){const e=super.clone();return e._sublayerExtensionMap=this._sublayerExtensionMap,e}findById(e){return l("id",e).isNotMissing(),this.find((t=>t.id===e))}findBySublayerId(e){return l("id",e).isNotMissing(),this.find((t=>t._sublayerId===e))}forSublayer(e){if(l("sublayer",e).isNotMissing(),!(this._sublayers.indexOf(e)<0))return this._forSublayer(e)}add(e,t){return l("sublayerX",e).isNotMissing(),this._register(e),e.sublayer&&(this._sublayers.includes(e.sublayer)?void 0!==t&&this.reorder(e,t):this._sublayers.add(e.sublayer,t)),this}removeAt(e){const t=this.getItemAt(e);if(void 0!==t){if(this._uninitializedSublayerExtensions.has(t)){this._uninitializedSublayerExtensions.delete(t);const e={added:[],moved:[],removed:[t],target:this};this.emit("after-remove",{item:t,target:this}),this.emit("after-changes",{target:this}),this.emit("change",e)}else this._sublayers.removeAt(e);return this._onRemoved(t),t}}reorder(e,t){if(!e)return;const s=this._sublayers.indexOf(e.sublayer);return s<0?void 0:(s!==t&&this._sublayers.reorder(e.sublayer,t),e)}sort(e){return this._sublayers.sort(((t,s)=>e(this._forSublayer(t),this._forSublayer(s)))),this}onParentInitialized(){this._tempSublayers?.length&&(this.addMany(this._tempSublayers.map((e=>this._forSublayer(e)))),this._tempSublayers=void 0)}onLayerExtensionChanged(){for(const e of this.toArray())e._setLayerExtension(this._layerExtension)}_register(e){if(l("sublayerX",e).isNotMissing(),e._setLayerExtension(this._layerExtension),e.sublayer||e._resolveSublayer(),e.sublayer){const t=this._sublayerExtensionMap.get(e.sublayer);if(e===t)return;if(this._sublayerExtensionMap.set(e.sublayer,e),t&&(this._onRemoved(t),this._sublayers.includes(e.sublayer))){const s={added:[e],moved:[],removed:[t],target:this};this.emit("after-add",{item:e,target:this}),null!=t&&this.emit("after-remove",{item:t,target:this}),this.emit("after-changes",{target:this}),this.emit("change",s)}}else{this._uninitializedSublayerExtensions.add(e);const t={added:[e],moved:[],removed:[],target:this};this.emit("after-add",{item:e,target:this}),this.emit("after-changes",{target:this}),this.emit("change",t)}this._onAdded(e)}_itemIsInitialized(e){return super._itemIsInitialized(e)&&!!e.sublayer}_onAdded(e){}_onRemoved(e){e._setLayerExtension(void 0)}_forSublayer(e){for(const e of this._uninitializedSublayerExtensions)e._resolveSublayer(),e.sublayer&&(this._sublayerExtensionMap.set(e.sublayer,e),this._uninitializedSublayerExtensions.delete(e));if(!this._sublayerExtensionMap.has(e)){const t=u.create({sublayer:e});this._register(t)}return this._sublayerExtensionMap.get(e)}}
+import e from"@arcgis/core/core/Collection";import{InitializableCollectionProxy as t}from"../../support/InitializableCollectionProxy.js";import{createIHandle as s,notifyChange as r,onWatch as i,watch as a,watchEvent as n}from"../../support/observableUtils.js";import o from"../../utilities/_ReferenceCountedHandle.js";import{checkArg as l}from"../../utilities/checkArg.js";import{onCollectionPropertyChange as h}from"../../utilities/watch.js";import{SublayerExtension as u}from"../_SublayerExtension.js";export class SublayerExtensionCollectionBase extends t{_parent;get _collection(){return this._sublayers.map((e=>this._forSublayer(e))).concat(Array.from(this._uninitializedSublayerExtensions))}get _sublayers(){const t=this._sublayersProperty.split(".");let s=this._parent;for(const e of t){if(null==s){s=void 0;break}s=s[e]}return s||(this._tempSublayers||(this._tempSublayers=new e),s=this._tempSublayers),s}_sublayersProperty;_tempSublayers;_sublayerExtensionMap=new WeakMap;_uninitializedSublayerExtensions=new Set;_onChangeSublayersHandle=new o((()=>h(this._parent,this._sublayersProperty,(e=>{const t={added:(e.added||[]).map((e=>this._forSublayer(e))),moved:(e.moved||[]).map((e=>this._forSublayer(e))),removed:(e.removed||[]).map((e=>this._forSublayer(e)))};this.emit("change",t)}))));_onBeforeAddSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["before-add",e=>this.emit("before-add",{...e,item:this._forSublayer(e.item)})])));_onBeforeRemoveSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["before-remove",e=>this.emit("before-remove",{...e,item:this._forSublayer(e.item)})])));_onBeforeChangesSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["before-changes",e=>this.emit("before-changes",{...e})])));_onAfterAddSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["after-add",e=>this.emit("after-add",{...e,item:this._forSublayer(e.item)})],(e=>{if(null!=e)for(const t of e)this.emit("after-add",{item:this._forSublayer(t)})}))));_onAfterRemoveSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["after-remove",e=>this.emit("after-remove",{...e,item:this._forSublayer(e.item)})],((e,t)=>{if(null!=t)for(const e of t)this.emit("after-remove",{item:this._forSublayer(e)})}))));_onAfterChangesSublayersHandle=new o((()=>n(this._parent,this._sublayersProperty,["after-changes",e=>this.emit("after-changes",{...e,target:this})],(()=>{this.emit("after-changes",{target:this})}))));constructor(e,t){super(),this._parent=e,this._sublayersProperty=t,i(this,"length",(()=>a(this._parent,`${this._sublayersProperty}.length`,(()=>r(this,"length")),{sync:!0})))}on(e,t){const r=[];return"change"===e?r.push(this._onChangeSublayersHandle.add()):"before-add"===e?r.push(this._onBeforeAddSublayersHandle.add()):"before-remove"===e?r.push(this._onBeforeRemoveSublayersHandle.add()):"before-changes"===e?r.push(this._onBeforeChangesSublayersHandle.add()):"after-add"===e?r.push(this._onAfterAddSublayersHandle.add()):"after-remove"===e?r.push(this._onAfterRemoveSublayersHandle.add()):"after-changes"===e&&r.push(this._onAfterChangesSublayersHandle.add()),r.push(super.on(e,t)),s(r)}clone(){const e=super.clone();return e._sublayerExtensionMap=this._sublayerExtensionMap,e}findById(e){return l("id",e).isNotMissing(),this.find((t=>t.id===e))}findBySublayerId(e){return l("id",e).isNotMissing(),this.find((t=>t._sublayerId===e))}forSublayer(e){if(l("sublayer",e).isNotMissing(),!(this._sublayers.indexOf(e)<0))return this._forSublayer(e)}add(e,t){return l("sublayerX",e).isNotMissing(),this._register(e),e.sublayer&&(this._sublayers.includes(e.sublayer)?void 0!==t&&this.reorder(e,t):this._sublayers.add(e.sublayer,t)),this}removeAt(e){const t=this.getItemAt(e);if(void 0!==t){if(this._uninitializedSublayerExtensions.has(t)){this._uninitializedSublayerExtensions.delete(t);const e={added:[],moved:[],removed:[t],target:this};this.emit("after-remove",{item:t}),this.emit("after-changes",{}),this.emit("change",e)}else this._sublayers.removeAt(e);return this._onRemoved(t),t}}reorder(e,t){if(!e)return;const s=this._sublayers.indexOf(e.sublayer);return s<0?void 0:(s!==t&&this._sublayers.reorder(e.sublayer,t),e)}sort(e){return this._sublayers.sort(((t,s)=>e(this._forSublayer(t),this._forSublayer(s)))),this}onParentInitialized(){this._tempSublayers?.length&&(this.addMany(this._tempSublayers.map((e=>this._forSublayer(e)))),this._tempSublayers=void 0)}onLayerExtensionChanged(){for(const e of this.toArray())e._setLayerExtension(this._layerExtension)}_register(e){if(l("sublayerX",e).isNotMissing(),e._setLayerExtension(this._layerExtension),e.sublayer||e._resolveSublayer(),e.sublayer){const t=this._sublayerExtensionMap.get(e.sublayer);if(e===t)return;if(this._sublayerExtensionMap.set(e.sublayer,e),t&&(this._onRemoved(t),this._sublayers.includes(e.sublayer))){const s={added:[e],moved:[],removed:[t],target:this};this.emit("after-add",{item:e}),null!=t&&this.emit("after-remove",{item:t}),this.emit("after-changes",{target:this}),this.emit("change",s)}}else{this._uninitializedSublayerExtensions.add(e);const t={added:[e],moved:[],removed:[],target:this};this.emit("after-add",{item:e}),this.emit("after-changes",{target:this}),this.emit("change",t)}this._onAdded(e)}_itemIsInitialized(e){return super._itemIsInitialized(e)&&!!e.sublayer}_onAdded(e){}_onRemoved(e){e._setLayerExtension(void 0)}_forSublayer(e){for(const e of this._uninitializedSublayerExtensions)e._resolveSublayer(),e.sublayer&&(this._sublayerExtensionMap.set(e.sublayer,e),this._uninitializedSublayerExtensions.delete(e));if(!this._sublayerExtensionMap.has(e)){const t=u.create({sublayer:e});this._register(t)}return this._sublayerExtensionMap.get(e)}}

package/mapping/support/featureService.js

@@ -1 +1 @@
-import{createFeatureServices as e}from"@arcgis/core/rest/featureService/utils";import{FeatureSaveError as t}from"../../data/FeatureSaveError.js";import{applyEditsProcessEditedFeatures as a,applyEditsProcessResults as s}from"../../support/_featureEdit.js";import{getGdbVersion as r}from"../../utilities/_version.js";import{isFeatureLayerExtension as d,isSubtypeGroupLayerExtension as u,isSubtypeSublayerExtension as i}from"../../utilities/extensions.js";import{map as o}from"../../utilities/iterable.js";import{getGlobalIdField as l,isGlobalIdUsed as n}from"./layers.js";export async function applyEdits(c){const{addFeatures:p=[],updateFeatures:F=[],deleteFeatures:m=[]}=c,f=new Map,h=new WeakMap,g=new WeakMap,y=new WeakMap,E=(e,t)=>{const a=(e=>d(e.source)||u(e.source)?e.source.layer:i(e.source)?e.source.layerExtension.layer:e.source.table)(e),s=l(a),{objectIdField:r}=a;f.has(a)||f.set(a,{id:a.layerId,identifierFields:{globalIdField:s,objectIdField:r},addFeatures:[],updateFeatures:[],deleteFeatures:[],addAttachments:void 0,updateAttachments:void 0,deleteAttachments:void 0});const o=f.get(a),n=e.toGraphic();"updateFeatures"===t&&e.source?.schema.fieldExtensions.forEach((e=>{e.field.editable||e.field.name===r||e.field.name===s||delete n.attributes[e.field.name]})),o[t].push(n);let c=h;"updateFeatures"===t?c=g:"deleteFeatures"===t&&(c=y),c.has(a)||c.set(a,[]),c.get(a).push(e)};p.forEach((e=>E(e,"addFeatures"))),F.forEach((e=>E(e,"updateFeatures"))),m.forEach((e=>E(e,"deleteFeatures")));const b=e([...f.keys()]),w=new t("Errors encountered when applying edits."),v=await Promise.all(o(b.values(),(async({featureService:e,layers:t})=>{await e.load();const d=[];t.forEach((e=>{d.push(f.get(e))}));try{const u=await e.applyEdits(d,{globalIdUsed:t.every((e=>n(e,f.get(e)))),gdbVersion:t[0].gdbVersion??r(t[0].customParameters)});for(const e of u){const r=t.find((t=>t.layerId===e.id));null!=r&&(s(r,h.get(r),e.addFeatureResults,"add",w),s(r,g.get(r),e.updateFeatureResults,"update",w),s(r,y.get(r),e.deleteFeatureResults,"delete",w),null!=e.editedFeatures&&a(r,{adds:h.get(r),updates:g.get(r)},e.editedFeatures),r.emit("edits",{deletedFeatures:e.deleteFeatureResults??[],updatedFeatures:e.updateFeatureResults??[],addedFeatures:e.addFeatureResults??[],deletedAttachments:[],updatedAttachments:[]}))}return u}catch(e){return w.errors.set("",e),[]}})));if(w.errors.size>0)throw w;return v}
+import{createFeatureServices as e}from"@arcgis/core/rest/featureService/utils";import{FeatureSaveError as t}from"../../data/FeatureSaveError.js";import{applyEditsProcessEditedFeatures as a,applyEditsProcessResults as s}from"../../support/_featureEdit.js";import{getGdbVersion as r}from"../../utilities/_version.js";import{isFeatureLayerExtension as d,isSubtypeGroupLayerExtension as u,isSubtypeSublayerExtension as i}from"../../utilities/extensions.js";import{map as o}from"../../utilities/iterable.js";import{getGlobalIdField as l,isGlobalIdUsed as n}from"./layers.js";export async function applyEdits(c){const{addFeatures:p=[],updateFeatures:m=[],deleteFeatures:F=[]}=c,f=new Map,h=new WeakMap,g=new WeakMap,y=new WeakMap,E=(e,t)=>{const a=(e=>d(e.source)||u(e.source)?e.source.layer:i(e.source)?e.source.layerExtension.layer:e.source.table)(e),s=l(a),{objectIdField:r}=a;f.has(a)||f.set(a,{id:a.layerId,identifierFields:{globalIdField:s,objectIdField:r},addFeatures:[],updateFeatures:[],deleteFeatures:[],addAttachments:void 0,updateAttachments:void 0,deleteAttachments:void 0});const o=f.get(a),n=e.toGraphic();"updateFeatures"===t&&e.source?.schema.fieldExtensions.forEach((e=>{e.field.editable||e.field.name===r||e.field.name===s||delete n.attributes[e.field.name]})),o[t].push(n);let c=h;"updateFeatures"===t?c=g:"deleteFeatures"===t&&(c=y),c.has(a)||c.set(a,[]),c.get(a).push(e)};p.forEach((e=>E(e,"addFeatures"))),m.forEach((e=>E(e,"updateFeatures"))),F.forEach((e=>E(e,"deleteFeatures")));const b=e([...f.keys()]),w=new t("Errors encountered when applying edits."),v=await Promise.all(o(b.values(),(async({featureService:e,layers:t})=>{await e.load();const d=[];t.forEach((e=>{d.push(f.get(e))}));try{const u=await e.applyEdits(d,{globalIdUsed:t.every((e=>n(e,f.get(e)))),gdbVersion:t[0].gdbVersion??r(t[0].customParameters)});for(const e of u){const r=t.find((t=>t.layerId===e.id));null!=r&&(s(r,h.get(r),e.addFeatureResults,"add",w),s(r,g.get(r),e.updateFeatureResults,"update",w),s(r,y.get(r),e.deleteFeatureResults,"delete",w),null!=e.editedFeatures&&a(r,{adds:h.get(r),updates:g.get(r)},e.editedFeatures),r.emit("edits",{deletedFeatures:e.deleteFeatureResults??[],updatedFeatures:e.updateFeatureResults??[],addedFeatures:e.addFeatureResults??[],deletedAttachments:[],updatedAttachments:[],addedAttachments:[],exceededTransferLimit:!1}))}return u}catch(e){return w.errors.set("",e),[]}})));if(w.errors.size>0)throw w;return v}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vertigis/arcgis-extensions",
   "license": "SEE LICENSE IN LICENSE",
-  "version": "52.2.0",
+  "version": "53.1.0",
   "repository": {
     "type": "git",
     "url": "https://dev.azure.com/vertigis/Studio/_git/arcgis-extensions-ts"
@@ -113,7 +113,7 @@
     "whatwg-fetch": "3.6.20"
   },
   "peerDependencies": {
-    "@arcgis/core": "4.33.13",
+    "@arcgis/core": "^5.0.10",
     "tslib": "^2.6.2"
   },
   "overrides": {

package/portal/CSVLayer.d.ts

@@ -62,7 +62,7 @@ export interface CSVLayer extends OperationalLayerBase {
      * You can set this property using any of the following: ",", " ", ";", "|",
      * "\t". Used with CSV layers only.
      */
-    columnDelimiter?: string;
+    columnDelimiter?: "," | " " | ";" | "|" | "\t";
     /**
      * Indicates whether to allow a client to ignore popups defined by the
      * service item.

package/portal/ElevationInfo.d.ts

@@ -1,4 +1,5 @@
-import type { ElevationMode as EsriApiElevationMode, FeatureLayerElevationInfo as EsriFeatureLayerElevationInfo } from "../support/esri.js";
+import EsriElevationInfo from "@arcgis/core/symbols/support/ElevationInfo.js";
+import type { ElevationMode as EsriApiElevationMode } from "../support/esri.js";
 export declare namespace ElevationInfo {
     /**
      * Converts an ArcGIS Portal JSON representation of elevation info to its
@@ -7,7 +8,7 @@ export declare namespace ElevationInfo {
      * @deprecated Use "json/*" modules instead.
      * @param json The elevation info JSON to convert.
      */
-    function toEsriApiElevationInfo(json: ElevationInfo): EsriFeatureLayerElevationInfo;
+    function toEsriApiElevationInfo(json: ElevationInfo): EsriElevationInfo;
     /**
      * Converts an Esri JavaScript API ElevationInfo object to its ArcGIS Portal
      * JSON representation.
@@ -15,7 +16,7 @@ export declare namespace ElevationInfo {
      * @deprecated Use "json/*" modules instead.
      * @param elevationInfo The elevationInfo object to convert.
      */
-    function fromEsriApiElevationInfo(elevationInfo: EsriFeatureLayerElevationInfo): ElevationInfo;
+    function fromEsriApiElevationInfo(elevationInfo: EsriElevationInfo): ElevationInfo;
 }
 /**
  * Defines how the graphic is placed with respect to the terrain surface.

package/portal/ElevationInfo.js

@@ -1 +1 @@
-import{assertNever as e,checkArg as t}from"../utilities/checkArg.js";import{deepClone as o}from"../utilities/object.js";export var ElevationInfo;!function(e){e.toEsriApiElevationInfo=function(e){t("json",e).isNotMissing();const n=o(e);if(e.hasOwnProperty("mode")&&null!=e.mode&&(n.mode=ElevationMode.toEsriApiElevationMode(e.mode)),e.hasOwnProperty("unit"))switch(e.unit){case"foot":n.unit="feet";break;case"kilometer":n.unit="kilometers";break;case"meter":n.unit="meters";break;case"mile":n.unit="miles";break;case"us-foot":n.unit="us-feet";break;case"yard":n.unit="yards"}return n},e.fromEsriApiElevationInfo=function(e){t("elevationInfo",e).isNotMissing();const n=o(e);if(e.hasOwnProperty("mode")&&(n.mode=ElevationMode.fromEsriApiElevationMode(e.mode)),e.hasOwnProperty("unit"))switch(e.unit){case"feet":n.unit="foot";break;case"kilometers":n.unit="kilometer";break;case"meters":n.unit="meter";break;case"miles":n.unit="mile";break;case"us-feet":n.unit="us-foot";break;case"yards":n.unit="yard"}return n}}(ElevationInfo||(ElevationInfo={}));export var ElevationMode;function n(t,o){const n=t;switch(n){case"on-the-ground":return"onTheGround";case"relative-to-ground":return"relativeToGround";case"relative-to-scene":return"relativeToScene";case"absolute-height":return"absoluteHeight";default:return e(n,o)}}function r(t,o){const n=t;switch(n){case"onTheGround":return"on-the-ground";case"relativeToGround":return"relative-to-ground";case"relativeToScene":return"relative-to-scene";case"absoluteHeight":return"absolute-height";default:return e(n,o)}}!function(e){e.fromEsriApiElevationMode=function(e){return!!r(e)?e:n(e,new Error("Unrecognized elevation mode."))},e.toEsriApiElevationMode=function(e){return!!n(e)?e:r(e,new Error("Unrecognized elevation mode."))}}(ElevationMode||(ElevationMode={}));
+import e from"@arcgis/core/symbols/support/ElevationInfo.js";import{assertNever as t,checkArg as o}from"../utilities/checkArg.js";export var ElevationInfo;!function(t){t.toEsriApiElevationInfo=function(t){o("json",t).isNotMissing();const{mode:n,unit:r,...i}=t,a=new e(i);if(t.hasOwnProperty("mode")&&null!=t.mode&&(a.mode=ElevationMode.toEsriApiElevationMode(t.mode)),t.hasOwnProperty("unit"))switch(t.unit){case"foot":a.unit="feet";break;case"kilometer":a.unit="kilometers";break;case"meter":a.unit="meters";break;case"mile":a.unit="miles";break;case"us-foot":a.unit="us-feet";break;case"yard":a.unit="yards"}return a},t.fromEsriApiElevationInfo=function(e){o("elevationInfo",e).isNotMissing();const t=e.toJSON();if(e.hasOwnProperty("mode")&&(t.mode=ElevationMode.fromEsriApiElevationMode(e.mode)),e.hasOwnProperty("unit"))switch(e.unit){case"feet":t.unit="foot";break;case"kilometers":t.unit="kilometer";break;case"meters":t.unit="meter";break;case"miles":t.unit="mile";break;case"us-feet":t.unit="us-foot";break;case"yards":t.unit="yard"}return t}}(ElevationInfo||(ElevationInfo={}));export var ElevationMode;function n(e,o){const n=e;switch(n){case"on-the-ground":return"onTheGround";case"relative-to-ground":return"relativeToGround";case"relative-to-scene":return"relativeToScene";case"absolute-height":return"absoluteHeight";default:return t(n,o)}}function r(e,o){const n=e;switch(n){case"onTheGround":return"on-the-ground";case"relativeToGround":return"relative-to-ground";case"relativeToScene":return"relative-to-scene";case"absoluteHeight":return"absolute-height";default:return t(n,o)}}!function(e){e.fromEsriApiElevationMode=function(e){return!!r(e)?e:n(e,new Error("Unrecognized elevation mode."))},e.toEsriApiElevationMode=function(e){return!!n(e)?e:r(e,new Error("Unrecognized elevation mode."))}}(ElevationMode||(ElevationMode={}));

package/portal/LabelingInfo.js

@@ -1 +1 @@
-import e from"@arcgis/core/layers/support/LabelClass";import{assertNever as r,checkArg as n}from"../utilities/checkArg.js";export var LabelingInfo;!function(r){r.toEsriApiLabelClass=function(r){return n("labelingInfo",r).isNotMissing(),e.fromJSON(r)},r.fromEsriApiLabelClass=function(e){return n("labelClass",e).isNotMissing(),e.toJSON()}}(LabelingInfo||(LabelingInfo={}));export var LabelPlacement;function t(e,n){const t=e;switch(t){case"above-after":return"esriServerLinePlacementAboveAfter";case"above-along":return"esriServerLinePlacementAboveAlong";case"above-before":return"esriServerLinePlacementAboveBefore";case"above-center":return"esriServerPointLabelPlacementAboveCenter";case"above-end":return"esriServerLinePlacementAboveEnd";case"above-left":return"esriServerPointLabelPlacementAboveLeft";case"above-right":return"esriServerPointLabelPlacementAboveRight";case"above-start":return"esriServerLinePlacementAboveStart";case"always-horizontal":return"esriServerPolygonPlacementAlwaysHorizontal";case"below-after":return"esriServerLinePlacementBelowAfter";case"below-along":return"esriServerLinePlacementBelowAlong";case"below-before":return"esriServerLinePlacementBelowBefore";case"below-center":return"esriServerPointLabelPlacementBelowCenter";case"below-end":return"esriServerLinePlacementBelowEnd";case"below-left":return"esriServerPointLabelPlacementBelowLeft";case"below-right":return"esriServerPointLabelPlacementBelowRight";case"below-start":return"esriServerLinePlacementBelowStart";case"center-after":return"esriServerLinePlacementCenterAfter";case"center-along":return"esriServerLinePlacementCenterAlong";case"center-before":return"esriServerLinePlacementCenterBefore";case"center-center":return"esriServerPointLabelPlacementCenterCenter";case"center-end":return"esriServerLinePlacementCenterEnd";case"center-left":return"esriServerPointLabelPlacementCenterLeft";case"center-right":return"esriServerPointLabelPlacementCenterRight";case"center-start":return"esriServerLinePlacementCenterStart";default:return r(t,n)}}function a(e,n){const t=e;switch(t){case"esriServerLinePlacementAboveAfter":return"above-after";case"esriServerLinePlacementAboveAlong":return"above-along";case"esriServerLinePlacementAboveBefore":return"above-before";case"esriServerPointLabelPlacementAboveCenter":return"above-center";case"esriServerLinePlacementAboveEnd":return"above-end";case"esriServerPointLabelPlacementAboveLeft":return"above-left";case"esriServerPointLabelPlacementAboveRight":return"above-right";case"esriServerLinePlacementAboveStart":return"above-start";case"esriServerPolygonPlacementAlwaysHorizontal":return"always-horizontal";case"esriServerLinePlacementBelowAfter":return"below-after";case"esriServerLinePlacementBelowAlong":return"below-along";case"esriServerLinePlacementBelowBefore":return"below-before";case"esriServerPointLabelPlacementBelowCenter":return"below-center";case"esriServerLinePlacementBelowEnd":return"below-end";case"esriServerPointLabelPlacementBelowLeft":return"below-left";case"esriServerPointLabelPlacementBelowRight":return"below-right";case"esriServerLinePlacementBelowStart":return"below-start";case"esriServerLinePlacementCenterAfter":return"center-after";case"esriServerLinePlacementCenterAlong":return"center-along";case"esriServerLinePlacementCenterBefore":return"center-before";case"esriServerPointLabelPlacementCenterCenter":return"center-center";case"esriServerLinePlacementCenterEnd":return"center-end";case"esriServerPointLabelPlacementCenterLeft":return"center-left";case"esriServerPointLabelPlacementCenterRight":return"center-right";case"esriServerLinePlacementCenterStart":return"center-start";default:return r(t,n)}}!function(e){e.fromEsriApiLabelPlacement=function(e){return!!a(e)?e:t(e,new Error("Unrecognized label placement."))},e.toEsriApiLabelPlacement=function(e){return!!t(e)?e:a(e,new Error("Unrecognized label placement."))}}(LabelPlacement||(LabelPlacement={}));
+import e from"@arcgis/core/layers/support/LabelClass";import{assertNever as r,checkArg as n}from"../utilities/checkArg.js";export var LabelingInfo;!function(r){r.toEsriApiLabelClass=function(r){return n("labelingInfo",r).isNotMissing(),e.fromJSON(r)},r.fromEsriApiLabelClass=function(e){return n("labelClass",e).isNotMissing(),e.toJSON()}}(LabelingInfo||(LabelingInfo={}));export var LabelPlacement;function t(e,n){const t=e;switch(t){case"above-along":return"esriServerLinePlacementAboveAlong";case"above-center":return"esriServerPointLabelPlacementAboveCenter";case"above-left":return"esriServerPointLabelPlacementAboveLeft";case"above-right":return"esriServerPointLabelPlacementAboveRight";case"always-horizontal":return"esriServerPolygonPlacementAlwaysHorizontal";case"below-along":return"esriServerLinePlacementBelowAlong";case"below-center":return"esriServerPointLabelPlacementBelowCenter";case"below-left":return"esriServerPointLabelPlacementBelowLeft";case"below-right":return"esriServerPointLabelPlacementBelowRight";case"center-along":return"esriServerLinePlacementCenterAlong";case"center-center":return"esriServerPointLabelPlacementCenterCenter";case"center-left":return"esriServerPointLabelPlacementCenterLeft";case"center-right":return"esriServerPointLabelPlacementCenterRight";default:return r(t,n)}}function a(e,n){const t=e;switch(t){case"esriServerLinePlacementAboveAfter":case"esriServerLinePlacementAboveEnd":case"esriServerPointLabelPlacementAboveRight":return"above-right";case"esriServerLinePlacementAboveAlong":return"above-along";case"esriServerLinePlacementAboveBefore":case"esriServerPointLabelPlacementAboveLeft":case"esriServerLinePlacementAboveStart":return"above-left";case"esriServerPointLabelPlacementAboveCenter":return"above-center";case"esriServerPolygonPlacementAlwaysHorizontal":return"always-horizontal";case"esriServerLinePlacementBelowAfter":case"esriServerLinePlacementBelowEnd":case"esriServerPointLabelPlacementBelowRight":return"below-right";case"esriServerLinePlacementBelowAlong":return"below-along";case"esriServerLinePlacementBelowBefore":case"esriServerPointLabelPlacementBelowLeft":case"esriServerLinePlacementBelowStart":return"below-left";case"esriServerPointLabelPlacementBelowCenter":return"below-center";case"esriServerLinePlacementCenterAfter":case"esriServerLinePlacementCenterEnd":case"esriServerPointLabelPlacementCenterRight":return"center-right";case"esriServerLinePlacementCenterAlong":return"center-along";case"esriServerLinePlacementCenterBefore":case"esriServerPointLabelPlacementCenterLeft":case"esriServerLinePlacementCenterStart":return"center-left";case"esriServerPointLabelPlacementCenterCenter":return"center-center";default:return r(t,n)}}!function(e){e.fromEsriApiLabelPlacement=function(e){return!!a(e)?e:t(e,new Error("Unrecognized label placement."))},e.toEsriApiLabelPlacement=function(e){return!!t(e)?e:a(e,new Error("Unrecognized label placement."))}}(LabelPlacement||(LabelPlacement={}));

package/portal/LayerDefinition.js

@@ -1 +1 @@
-import e from"@arcgis/core/geometry/Extent";import i from"@arcgis/core/layers/support/TimeInfo";import{DataLayerSource as t,MapLayerSource as r}from"../support/_esriInternal.js";import{isBuildingSceneLayer as o,isCSVLayer as a,isFeatureLayer as s,isFeatureLayerBase as n,isGeoJSONLayer as p,isMapImageSublayer as l,isMapNotesLayer as f,isMapNotesSublayer as c,isRouteLayer as m,isSubtypeSublayer as y,isSceneLayer as d,isStreamLayer as u,isTimeAwareLayer as h}from"../utilities/_layers.js";import{checkArg as E}from"../utilities/checkArg.js";import{isBuildingComponentSublayer as I,isGraphicsLayer as w,isLayer as x,isPointCloudLayer as b}from"../utilities/layers.js";import{isEmpty as g}from"../utilities/object.js";import{DrawingInfo as A}from"./DrawingInfo.js";import{ElevationInfo as R}from"./ElevationInfo.js";import{FeatureReduction as O}from"./FeatureReduction.js";import{Field as T}from"./Field.js";import{GeometryType as P}from"./Geometry.js";import{toEsriLayerFloorInfo as j,toPortalLayerFloorInfo as S}from"./LayerFloorInfo.js";import{SpatialReference as v}from"./SpatialReference.js";import{Template as D}from"./Template.js";import{Type as L}from"./Type.js";export var LayerDefinition;!function(F){F.applyToEsriApiLayer=async function(o,f){E("json",o).isNotMissing(),E("layer",f).isNotMissing();const c=f,m=f;if((n(c)||y(c))&&(o.hasOwnProperty("objectIdField")&&null!=o.objectIdField&&(u(c)?c.objectIdField="__esri_stream_id__":c.objectIdField=o.objectIdField),o.hasOwnProperty("geometryType")&&null!=o.geometryType&&(c.geometryType=P.toEsriApiGeometryType(o.geometryType)),o.hasOwnProperty("hasAttachments")&&m._set("capabilities.data.supportsAttachment",o.hasAttachments),o.hasOwnProperty("maxRecordCount")&&null!=o.maxRecordCount&&(m.maxRecordCount=o.maxRecordCount),o.hasOwnProperty("hasM")&&m._set("hasM",o.hasM),o.hasOwnProperty("hasZ")&&m._set("hasZ",o.hasZ),o.hasOwnProperty("types")&&s(c)&&(c.types=o.types?.map((e=>L.toEsriApiFeatureType(e)))),o.hasOwnProperty("templates")&&(c.templates=o.templates?.map((e=>D.toEsriApiFeatureTemplate(e)))),o.hasOwnProperty("floorInfo")&&o.floorInfo&&(c.floorInfo=await j(o.floorInfo))),(o.hasOwnProperty("orderBy")&&(s(c)||a(c))||p(c))&&(o.orderBy?c.orderBy=o.orderBy.map((e=>({field:e.field,order:"desc"===e.order?"descending":"ascending"}))):c.orderBy=void 0),o.hasOwnProperty("source")&&null!=o.source&&l(f)&&!f.layer?.loaded){const{type:e,...i}=o.source;"dataLayer"===e?m._set("source",new t(i)):"mapLayer"===e&&m._set("source",new r(i))}if(o.hasOwnProperty("copyrightText")&&(f.copyright=o.copyrightText),o.hasOwnProperty("defaultVisibility")&&null!=o.defaultVisibility&&(f.visible=o.defaultVisibility),o.hasOwnProperty("definitionExpression")&&(f.definitionExpression=o.definitionExpression),o.hasOwnProperty("elevationInfo")&&o.elevationInfo&&(f.elevationInfo=R.toEsriApiElevationInfo(o.elevationInfo)),o.hasOwnProperty("extent")&&(f.fullExtent=o.extent?e.fromJSON(o.extent):void 0),o.hasOwnProperty("fields")){const e=[];o.fields?.forEach((i=>{e.push(T.toEsriApiField(i))})),m._set("fields",e)}o.hasOwnProperty("maxScale")&&null!=o.maxScale&&(f.maxScale=o.maxScale),o.hasOwnProperty("minScale")&&null!=o.minScale&&(f.minScale=o.minScale),o.hasOwnProperty("name")&&!f.title&&(f.title=o.name);try{o.hasOwnProperty("spatialReference")&&null!=o.spatialReference?f.spatialReference=v.toEsriApiSpatialReference(o.spatialReference):f.fullExtent?.spatialReference&&f.spatialReference&&(f.spatialReference=f.fullExtent.spatialReference.clone())}catch{}o.hasOwnProperty("timeInfo")&&h(f)&&(f.timeInfo=i.fromJSON(o.timeInfo)),o.hasOwnProperty("featureReduction")&&o.featureReduction&&await O.applyToEsriApiLayer(o.featureReduction,f),o.hasOwnProperty("drawingInfo")&&null!=o.drawingInfo&&await A.applyToEsriApiLayer(o.drawingInfo,f)},F.fromEsriApiLayer=function(e,i={}){E("layer",e).isNotMissing();const t={},r=e,y=e;if(n(r)){const o=e;r.objectIdField&&(t.objectIdField=r.objectIdField),o.geometryType&&(t.geometryType=P.fromEsriApiGeometryType(o.geometryType)),r.capabilities&&r.capabilities.data.supportsAttachment!==i.hasAttachments&&(t.hasAttachments=r.capabilities.data.supportsAttachment),isNaN(y.maxRecordCount)||null==y.maxRecordCount||(t.maxRecordCount=y.maxRecordCount),r.capabilities&&(t.capabilities=LayerDefinitionCapabilities.fromEsriApiFeatureLayerCapabilities(r.capabilities),r.capabilities.query&&(t.supportsAdvancedQueries=r.capabilities.query.supportsOrderBy||r.capabilities.query.supportsDistinct,t.supportsStatistics=r.capabilities.query.supportsStatistics)),r.hasM!==i.hasM&&(t.hasM=r.hasM),r.hasZ!==i.hasZ&&(t.hasZ=r.hasZ),r.templates&&r.templates.length>0&&(t.templates=r.templates.map((e=>D.fromEsriApiFeatureTemplate(e)))),r.floorInfo&&(t.floorInfo=S(r.floorInfo))}if(e.featureReduction&&(t.featureReduction=O.fromEsriApiLayer(e)),l(e)&&e.source&&("data-layer"===e.source.type||"map-layer"===e.source.type)&&(t.source=e.source.toJSON()),e.copyright&&(t.copyrightText=e.copyright),e.visible===i.visible||l(e)||(t.defaultVisibility=e.visible),e.definitionExpression&&(t.definitionExpression=e.definitionExpression),t.drawingInfo=A.fromEsriApiLayer(e),g(t.drawingInfo)&&delete t.drawingInfo,(I(e)?!!e.layer?.elevationInfo:!!e.elevationInfo)&&(t.elevationInfo=R.fromEsriApiElevationInfo(e.elevationInfo)),(s(e)&&e.source||a(e)||w(e)||p(e)||u(e)||m(e)||f(e))&&(e.fullExtent&&!e.fullExtent.equals(i.fullExtent)&&(t.extent=e.fullExtent.toJSON()),e.fields?.length)){const i=[];e.fields.forEach((e=>{i.push(T.fromEsriApiField(e))})),t.fields=i}if((s(r)||a(r)||p(r))&&r.orderBy&&(t.orderBy=r.orderBy.map((e=>({field:e.field,order:"descending"===e.order?"desc":"asc"})))),s(r)||a(r)||u(r)||d(r)||o(r)||b(r)||f(r)||c(r)||m(r)||w(r)){const{maxScale:e}=r,{minScale:o}=r;isNaN(e)||null===e||e===i.maxScale&&e===o||(t.maxScale=e),isNaN(o)||null===o||o===i.minScale&&o===e||(t.minScale=o)}return h(r)&&(t.timeInfo=r.timeInfo?.toJSON()),t.name=e.title??void 0,x(e)&&e.spatialReference&&e.spatialReference.wkid!==i.wkid&&(t.spatialReference=v.fromEsriApiSpatialReference(e.spatialReference)),t}}(LayerDefinition||(LayerDefinition={}));export var LayerDefinitionCapabilities;!function(e){e.ADD="Add",e.DELETE="Delete",e.EDITING="Editing",e.QUERY="Query",e.UPDATE="Update",e.fromEsriApiFeatureLayerCapabilities=function(i){E("capabilities",i).isNotMissing();const t=[];return i.operations.supportsAdd&&t.push(e.ADD),i.operations.supportsDelete&&t.push(e.DELETE),i.operations.supportsEditing&&t.push(e.EDITING),i.operations.supportsQuery&&t.push(e.QUERY),i.operations.supportsUpdate&&t.push(e.UPDATE),t.join(",")}}(LayerDefinitionCapabilities||(LayerDefinitionCapabilities={}));
+import e from"@arcgis/core/geometry/Extent";import i from"@arcgis/core/layers/support/TimeInfo";import t from"@arcgis/core/rest/layerSources/DynamicDataLayer.js";import r from"@arcgis/core/rest/layerSources/DynamicMapLayer.js";import{isBuildingSceneLayer as o,isCSVLayer as a,isFeatureLayer as s,isFeatureLayerBase as n,isGeoJSONLayer as p,isMapImageSublayer as l,isMapNotesLayer as f,isMapNotesSublayer as c,isRouteLayer as m,isSubtypeSublayer as y,isSceneLayer as d,isStreamLayer as u,isTimeAwareLayer as h}from"../utilities/_layers.js";import{checkArg as E}from"../utilities/checkArg.js";import{isBuildingComponentSublayer as I,isGraphicsLayer as g,isLayer as x,isPointCloudLayer as b}from"../utilities/layers.js";import{isEmpty as w}from"../utilities/object.js";import{DrawingInfo as A}from"./DrawingInfo.js";import{ElevationInfo as O}from"./ElevationInfo.js";import{FeatureReduction as R}from"./FeatureReduction.js";import{Field as S}from"./Field.js";import{GeometryType as T}from"./Geometry.js";import{toEsriLayerFloorInfo as j,toPortalLayerFloorInfo as P}from"./LayerFloorInfo.js";import{SpatialReference as D}from"./SpatialReference.js";import{Template as L}from"./Template.js";import{Type as v}from"./Type.js";export var LayerDefinition;!function(F){F.applyToEsriApiLayer=async function(o,f){E("json",o).isNotMissing(),E("layer",f).isNotMissing();const c=f,m=f;if((n(c)||y(c))&&(o.hasOwnProperty("objectIdField")&&null!=o.objectIdField&&(u(c)?c.objectIdField="__esri_stream_id__":c.objectIdField=o.objectIdField),o.hasOwnProperty("geometryType")&&null!=o.geometryType&&(c.geometryType=T.toEsriApiGeometryType(o.geometryType)),o.hasOwnProperty("hasAttachments")&&m._set("capabilities.data.supportsAttachment",o.hasAttachments),o.hasOwnProperty("maxRecordCount")&&null!=o.maxRecordCount&&(m.maxRecordCount=o.maxRecordCount),o.hasOwnProperty("hasM")&&m._set("hasM",o.hasM),o.hasOwnProperty("hasZ")&&m._set("hasZ",o.hasZ),o.hasOwnProperty("types")&&s(c)&&(c.types=o.types?.map((e=>v.toEsriApiFeatureType(e)))),o.hasOwnProperty("templates")&&(c.templates=o.templates?.map((e=>L.toEsriApiFeatureTemplate(e)))),o.hasOwnProperty("floorInfo")&&o.floorInfo&&(c.floorInfo=await j(o.floorInfo))),(o.hasOwnProperty("orderBy")&&(s(c)||a(c))||p(c))&&(o.orderBy?c.orderBy=o.orderBy.map((e=>({field:e.field,order:"desc"===e.order?"descending":"ascending"}))):c.orderBy=void 0),o.hasOwnProperty("source")&&null!=o.source&&l(f)&&!f.layer?.loaded){const{type:e,...i}=o.source;"dataLayer"===e?m._set("source",t.fromJSON(i)):"mapLayer"===e&&m._set("source",r.fromJSON(i))}if(o.hasOwnProperty("copyrightText")&&(f.copyright=o.copyrightText),o.hasOwnProperty("defaultVisibility")&&null!=o.defaultVisibility&&(f.visible=o.defaultVisibility),o.hasOwnProperty("definitionExpression")&&(f.definitionExpression=o.definitionExpression),o.hasOwnProperty("elevationInfo")&&o.elevationInfo&&(f.elevationInfo=O.toEsriApiElevationInfo(o.elevationInfo)),o.hasOwnProperty("extent")&&(f.fullExtent=o.extent?e.fromJSON(o.extent):void 0),o.hasOwnProperty("fields")){const e=[];o.fields?.forEach((i=>{e.push(S.toEsriApiField(i))})),m._set("fields",e)}o.hasOwnProperty("maxScale")&&null!=o.maxScale&&(f.maxScale=o.maxScale),o.hasOwnProperty("minScale")&&null!=o.minScale&&(f.minScale=o.minScale),o.hasOwnProperty("name")&&!f.title&&(f.title=o.name);try{o.hasOwnProperty("spatialReference")&&null!=o.spatialReference?f.spatialReference=D.toEsriApiSpatialReference(o.spatialReference):f.fullExtent?.spatialReference&&f.spatialReference&&(f.spatialReference=f.fullExtent.spatialReference.clone())}catch{}o.hasOwnProperty("timeInfo")&&h(f)&&(f.timeInfo=i.fromJSON(o.timeInfo)),o.hasOwnProperty("featureReduction")&&o.featureReduction&&await R.applyToEsriApiLayer(o.featureReduction,f),o.hasOwnProperty("drawingInfo")&&null!=o.drawingInfo&&await A.applyToEsriApiLayer(o.drawingInfo,f)},F.fromEsriApiLayer=function(e,i={}){E("layer",e).isNotMissing();const t={},r=e,y=e;if(n(r)){const o=e;r.objectIdField&&(t.objectIdField=r.objectIdField),o.geometryType&&(t.geometryType=T.fromEsriApiGeometryType(o.geometryType)),r.capabilities&&r.capabilities.data.supportsAttachment!==i.hasAttachments&&(t.hasAttachments=r.capabilities.data.supportsAttachment),isNaN(y.maxRecordCount)||null==y.maxRecordCount||(t.maxRecordCount=y.maxRecordCount),r.capabilities&&(t.capabilities=LayerDefinitionCapabilities.fromEsriApiFeatureLayerCapabilities(r.capabilities),r.capabilities.query&&(t.supportsAdvancedQueries=r.capabilities.query.supportsOrderBy||r.capabilities.query.supportsDistinct,t.supportsStatistics=r.capabilities.query.supportsStatistics)),r.hasM!==i.hasM&&(t.hasM=r.hasM),r.hasZ!==i.hasZ&&(t.hasZ=r.hasZ),r.templates&&r.templates.length>0&&(t.templates=r.templates.map((e=>L.fromEsriApiFeatureTemplate(e)))),r.floorInfo&&(t.floorInfo=P(r.floorInfo))}if(e.featureReduction&&(t.featureReduction=R.fromEsriApiLayer(e)),l(e)&&e.source&&("data-layer"===e.source.type||"map-layer"===e.source.type)&&(t.source=e.source.toJSON()),e.copyright&&(t.copyrightText=e.copyright),e.visible===i.visible||l(e)||(t.defaultVisibility=e.visible),e.definitionExpression&&(t.definitionExpression=e.definitionExpression),t.drawingInfo=A.fromEsriApiLayer(e),w(t.drawingInfo)&&delete t.drawingInfo,(I(e)?!!e.layer?.elevationInfo:!!e.elevationInfo)&&(t.elevationInfo=O.fromEsriApiElevationInfo(e.elevationInfo)),(s(e)&&e.source||a(e)||g(e)||p(e)||u(e)||m(e)||f(e))&&(e.fullExtent&&!e.fullExtent.equals(i.fullExtent)&&(t.extent=e.fullExtent.toJSON()),e.fields?.length)){const i=[];e.fields.forEach((e=>{i.push(S.fromEsriApiField(e))})),t.fields=i}if((s(r)||a(r)||p(r))&&r.orderBy&&(t.orderBy=r.orderBy.map((e=>({field:e.field,order:"descending"===e.order?"desc":"asc"})))),s(r)||a(r)||u(r)||d(r)||o(r)||b(r)||f(r)||c(r)||m(r)||g(r)){const{maxScale:e}=r,{minScale:o}=r;isNaN(e)||null===e||e===i.maxScale&&e===o||(t.maxScale=e),isNaN(o)||null===o||o===i.minScale&&o===e||(t.minScale=o)}return h(r)&&(t.timeInfo=r.timeInfo?.toJSON()),t.name=e.title??void 0,x(e)&&e.spatialReference&&e.spatialReference.wkid!==i.wkid&&(t.spatialReference=D.fromEsriApiSpatialReference(e.spatialReference)),t}}(LayerDefinition||(LayerDefinition={}));export var LayerDefinitionCapabilities;!function(e){e.ADD="Add",e.DELETE="Delete",e.EDITING="Editing",e.QUERY="Query",e.UPDATE="Update",e.fromEsriApiFeatureLayerCapabilities=function(i){E("capabilities",i).isNotMissing();const t=[];return i.operations.supportsAdd&&t.push(e.ADD),i.operations.supportsDelete&&t.push(e.DELETE),i.operations.supportsEditing&&t.push(e.EDITING),i.operations.supportsQuery&&t.push(e.QUERY),i.operations.supportsUpdate&&t.push(e.UPDATE),t.join(",")}}(LayerDefinitionCapabilities||(LayerDefinitionCapabilities={}));

package/portal/MapServiceLayer.js

@@ -1 +1 @@
-import e from"@arcgis/core/core/Collection";import r from"@arcgis/core/portal/Portal";import a from"@arcgis/core/portal/PortalItem";import{isMapImageLayer as i}from"../utilities/_layers.js";import{checkArg as s}from"../utilities/checkArg.js";import{compareAsync as o}from"../utilities/collection.js";import{deepClone as l}from"../utilities/object.js";import{Layer as n}from"./Layer.js";import{ERR_LAYER_TYPE_MISMATCH as t,applyLayerBaseToEsriApiLayer as y,applyBasemapLayerToEsriApiLayer as p,applyOperationalLayerToEsriApiLayer as c,fromEsriApiLayerToLayerBase as d,fromEsriApiLayerToOperationalLayer as f}from"./_layerHelper.js";export var MapServiceLayer;function u(e){if(e.layerDefinition){if(e.layerDefinition.source)return!0;const{drawingInfo:r}=e.layerDefinition;if(r&&(r.renderer||r.labelingInfo||void 0!==r.showLabels&&null!==r.showLabels))return!0}return!1}function m(e){const{layerDefinition:r}=e;if(r){r.source&&(delete r.source,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.source"));const{drawingInfo:e}=r;e&&(e.renderer&&(delete e.renderer,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.drawingInfo.renderer")),e.labelingInfo&&(delete e.labelingInfo,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.drawingInfo.labelingInfo")),void 0!==e.showLabels&&null!==e.showLabels&&(delete e.showLabels,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.showLabels.labelingInfo")))}}async function b(r,a){const i=a.capabilities?.exportMap?.supportsDynamicLayers;if(r.layers)if(i&&r.layers.some(u)){const i=[...r.layers].reverse(),s=new Map;await o(a.allSublayers,i,{equals:(e,r)=>e.id===+(r.id??NaN),onMatch:async(e,r)=>{await n.applyToEsriApiSublayer(r,e)},onMissing:e=>{a.sublayers?.remove(e)},onNew:async e=>{const r=await n.toEsriApiSublayer(e,"ArcGISMapServiceLayer");r.layer=a,s.set(r.id,r)}}),i.forEach(((r,o)=>{const l=+(r.id??NaN),n=s.get(l);if(n)if(null!=r.parentLayerId&&-1!==r.parentLayerId){const a=s.get(r.parentLayerId);a&&(a.sublayers=a.sublayers??new e,a.sublayers.add(n))}else a.sublayers?.add(n);else{const e=a.allSublayers.find((e=>e.id===l));if(e){let s,l=a.allSublayers.find((e=>e.id===r.parentLayerId));if(l){s=i.filter((e=>e.parentLayerId===l.id)).map((e=>i.indexOf(e))).indexOf(o)}else s=o,l=a;l.sublayers?.reorder(e,s)}}}))}else if(a.sublayers)for(const e of r.layers){if(void 0===e.id||null===e.id)continue;const r=a.allSublayers.find((r=>r.id===e.id));r&&(u(e)&&m(e),await n.applyToEsriApiSublayer(e,r))}if(r.visibleLayers&&a.allSublayers)for(const e of a.allSublayers.toArray())e.visible=r.visibleLayers.includes(e.id)}!function(e){async function o(e,o,n){s("layerJson",e).isNotMissing(),s("layerJson.layerType",e.layerType).satisfies((e=>!e||"ArcGISMapServiceLayer"===e),t),s("layer",o).isNotMissing().satisfies(i,t);const d=l(e);if(y(d,o),p(d,o),c(d,o),d.hasOwnProperty("url")&&(o.url=d.url),d.hasOwnProperty("itemId")&&(o.portalItem?o.portalItem.id=d.itemId:o.portalItem=new a({id:d.itemId,portal:n||r.getDefault()})),e.customParameters?.hasOwnProperty("gdbVersion")&&(o.gdbVersion=e.customParameters.gdbVersion),o.loaded)await b(d,o);else{const e=o.load;let r=!1;o.load=async()=>{await e(),r||(r=!0,await b(d,o))}}}e.esriMapImageLayerDefaults={legendEnabled:!0,visible:!0,opacity:1},e.toEsriApiLayer=async function(e){s("layerJson",e).isNotMissing(),s("layerJson.layerType",e.layerType).satisfies((e=>!e||"ArcGISMapServiceLayer"===e),t);const r=new((await import("@arcgis/core/layers/MapImageLayer")).default);return await o(e,r),r},e.applyToEsriApiLayer=o,e.fromEsriApiMapImageLayer=function(r){s("layer",r).isNotMissing();const a={...d(r,e.esriMapImageLayerDefaults),...f(r),layerType:"ArcGISMapServiceLayer",url:r.url??void 0};if(r.portalItem&&(a.itemId=r.portalItem.id??void 0),r.gdbVersion&&(a.customParameters={...a.customParameters,gdbVersion:r.gdbVersion}),r.sublayers){a.layers=[],a.visibleLayers=[];const e=i=>{i.visible&&a.visibleLayers.push(i.id),a.layers.push(n.fromEsriApiSublayer(i,r)),i.sublayers&&i.sublayers.toArray().reverse().forEach(e)};r.sublayers.toArray().reverse().forEach(e)}return a}}(MapServiceLayer||(MapServiceLayer={}));
+import e from"@arcgis/core/core/Collection";import r from"@arcgis/core/portal/Portal";import a from"@arcgis/core/portal/PortalItem";import{isMapImageLayer as i}from"../utilities/_layers.js";import{checkArg as s}from"../utilities/checkArg.js";import{compareAsync as o}from"../utilities/collection.js";import{deepClone as l}from"../utilities/object.js";import{Layer as n}from"./Layer.js";import{ERR_LAYER_TYPE_MISMATCH as t,applyLayerBaseToEsriApiLayer as y,applyBasemapLayerToEsriApiLayer as p,applyOperationalLayerToEsriApiLayer as c,fromEsriApiLayerToLayerBase as d,fromEsriApiLayerToOperationalLayer as f}from"./_layerHelper.js";export var MapServiceLayer;function u(e){if(e.layerDefinition){if(e.layerDefinition.source)return!0;const{drawingInfo:r}=e.layerDefinition;if(r&&(r.renderer||r.labelingInfo||void 0!==r.showLabels&&null!==r.showLabels))return!0}return!1}function m(e){const{layerDefinition:r}=e;if(r){r.source&&(delete r.source,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.source"));const{drawingInfo:e}=r;e&&(e.renderer&&(delete e.renderer,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.drawingInfo.renderer")),e.labelingInfo&&(delete e.labelingInfo,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.drawingInfo.labelingInfo")),void 0!==e.showLabels&&null!==e.showLabels&&(delete e.showLabels,console.warn("The map service does not support dynamic layers. Ignoring property: layer.layerDefinition.showLabels.labelingInfo")))}}async function b(r,a){const i=a.capabilities?.exportMap?.supportsDynamicLayers;if(r.layers)if(i&&r.layers.some(u)){const i=[...r.layers].reverse(),s=new Map;await o(a.allSublayers,i,{equals:(e,r)=>e.id===+(r.id??NaN),onMatch:async(e,r)=>{await n.applyToEsriApiSublayer(r,e)},onMissing:e=>{a.sublayers?.remove(e)},onNew:async e=>{const r=await n.toEsriApiSublayer(e,"ArcGISMapServiceLayer");r.layer=a,s.set(r.id,r)}}),i.forEach(((r,o)=>{const l=+(r.id??NaN),n=s.get(l);if(n)if(null!=r.parentLayerId&&-1!==r.parentLayerId){const a=s.get(r.parentLayerId);a&&(a.sublayers=a.sublayers??new e,a.sublayers.add(n))}else a.sublayers?.add(n);else{const e=a.allSublayers.find((e=>e.id===l));if(e){let s,l=a.allSublayers.find((e=>e.id===r.parentLayerId));if(l){s=i.filter((e=>e.parentLayerId===l.id)).map((e=>i.indexOf(e))).indexOf(o)}else s=o,l=a;l.sublayers?.reorder(e,s)}}}))}else if(a.sublayers)for(const e of r.layers){if(void 0===e.id||null===e.id)continue;const r=a.allSublayers.find((r=>r.id===e.id));r&&(u(e)&&m(e),await n.applyToEsriApiSublayer(e,r))}if(r.visibleLayers&&a.allSublayers)for(const e of a.allSublayers.toArray())e.visible=r.visibleLayers.includes(e.id)}!function(e){async function o(e,o,n){s("layerJson",e).isNotMissing(),s("layerJson.layerType",e.layerType).satisfies((e=>!e||"ArcGISMapServiceLayer"===e),t),s("layer",o).isNotMissing().satisfies(i,t);const d=l(e);if(y(d,o),p(d,o),c(d,o),d.hasOwnProperty("url")&&(o.url=d.url),d.hasOwnProperty("itemId")&&(o.portalItem?o.portalItem.id=d.itemId:o.portalItem=new a({id:d.itemId,portal:n||r.getDefault()})),e.customParameters?.hasOwnProperty("gdbVersion")&&(o.gdbVersion=e.customParameters.gdbVersion),o.loaded)await b(d,o);else{const e=o.load;let r=!1;o.load=async a=>(await e(a),r||(r=!0,await b(d,o)),o)}}e.esriMapImageLayerDefaults={legendEnabled:!0,visible:!0,opacity:1},e.toEsriApiLayer=async function(e){s("layerJson",e).isNotMissing(),s("layerJson.layerType",e.layerType).satisfies((e=>!e||"ArcGISMapServiceLayer"===e),t);const r=new((await import("@arcgis/core/layers/MapImageLayer")).default);return await o(e,r),r},e.applyToEsriApiLayer=o,e.fromEsriApiMapImageLayer=function(r){s("layer",r).isNotMissing();const a={...d(r,e.esriMapImageLayerDefaults),...f(r),layerType:"ArcGISMapServiceLayer",url:r.url??void 0};if(r.portalItem&&(a.itemId=r.portalItem.id??void 0),r.gdbVersion&&(a.customParameters={...a.customParameters,gdbVersion:r.gdbVersion}),r.sublayers){a.layers=[],a.visibleLayers=[];const e=i=>{i.visible&&a.visibleLayers.push(i.id),a.layers.push(n.fromEsriApiSublayer(i,r)),i.sublayers&&i.sublayers.toArray().reverse().forEach(e)};r.sublayers.toArray().reverse().forEach(e)}return a}}(MapServiceLayer||(MapServiceLayer={}));

package/portal/Slide.js

@@ -1 +1 @@
-import i from"@arcgis/core/webscene/Slide";import{checkArg as t}from"../utilities/checkArg.js";import{isBasemap as e}from"../utilities/mapping.js";import{deepClone as n}from"../utilities/object.js";import{Lighting as r}from"./Lighting.js";import{Viewpoint as s}from"./Viewpoint.js";import{WebSceneBaseMap as o}from"./WebSceneBaseMap.js";export var Slide;!function(p){p.toEsriApiSlide=async function(e){t("slideJson",e).isNotMissing();const p={};e.hasOwnProperty("visibleLayers")&&(p.visibleLayers=e.visibleLayers);const a=new i(p);return e.hasOwnProperty("baseMap")&&(a.basemap=await o.toEsriApiBasemap(e.baseMap)),e.hasOwnProperty("description")&&null!=e.description&&(a.description.text=e.description.text),e.hasOwnProperty("environment")&&null!=e.environment?.lighting&&(a.environment={lighting:r.toEsriApiLighting(e.environment.lighting)}),e.hasOwnProperty("thumbnail")&&e.thumbnail?.url&&(a.thumbnail.url=e.thumbnail.url),e.hasOwnProperty("title")&&null!=e.title&&(a.title=n(e.title)),e.hasOwnProperty("id")&&null!=e.id&&(a.id=e.id),e.hasOwnProperty("viewpoint")&&null!=e.viewpoint&&(a.viewpoint=s.toEsriApiViewpoint(e.viewpoint)),a},p.fromEsriApiSlide=function(i){t("slide",i).isNotMissing();const n={};return e(i.basemap)?n.baseMap=o.fromEsriApiBasemap(i.basemap):i.basemap&&(n.baseMap=i.basemap),i.description&&(n.description={text:i.description.text}),i.environment&&(n.environment={lighting:r.fromEsriApiLighting(i.environment.lighting)}),i.visibleLayers&&(n.visibleLayers=[],i.visibleLayers.forEach((i=>{n.visibleLayers.push({id:i.id})}))),i.thumbnail&&(n.thumbnail={url:i.thumbnail.url}),i.title&&(n.title={text:i.title.text}),i.id&&(n.id=i.id),i.viewpoint&&(n.viewpoint=s.fromEsriApiViewpoint(i.viewpoint)),n}}(Slide||(Slide={}));
+import i,{}from"@arcgis/core/webscene/Slide";import{checkArg as t}from"../utilities/checkArg.js";import{isBasemap as e}from"../utilities/mapping.js";import{deepClone as n}from"../utilities/object.js";import{Lighting as r}from"./Lighting.js";import{Viewpoint as s}from"./Viewpoint.js";import{WebSceneBaseMap as o}from"./WebSceneBaseMap.js";export var Slide;!function(p){p.toEsriApiSlide=async function(e){t("slideJson",e).isNotMissing();const p={};e.hasOwnProperty("visibleLayers")&&(p.visibleLayers=e.visibleLayers);const a=new i(p);return e.hasOwnProperty("baseMap")&&(a.basemap=await o.toEsriApiBasemap(e.baseMap)),e.hasOwnProperty("description")&&null!=e.description&&(a.description.text=e.description.text),e.hasOwnProperty("environment")&&null!=e.environment?.lighting&&(a.environment={lighting:r.toEsriApiLighting(e.environment.lighting)}),e.hasOwnProperty("thumbnail")&&e.thumbnail?.url&&(a.thumbnail.url=e.thumbnail.url),e.hasOwnProperty("title")&&null!=e.title&&(a.title=n(e.title)),e.hasOwnProperty("id")&&null!=e.id&&(a.id=e.id),e.hasOwnProperty("viewpoint")&&null!=e.viewpoint&&(a.viewpoint=s.toEsriApiViewpoint(e.viewpoint)),a},p.fromEsriApiSlide=function(i){t("slide",i).isNotMissing();const n={};return e(i.basemap)?n.baseMap=o.fromEsriApiBasemap(i.basemap):i.basemap&&(n.baseMap=i.basemap),i.description&&(n.description={text:i.description.text}),i.environment&&(n.environment={lighting:r.fromEsriApiLighting(i.environment.lighting)}),i.visibleLayers&&(n.visibleLayers=[],i.visibleLayers.forEach((i=>{n.visibleLayers.push({id:i.id})}))),i.thumbnail&&(n.thumbnail={url:i.thumbnail.url}),i.title&&(n.title={text:i.title.text}),i.id&&(n.id=i.id),i.viewpoint&&(n.viewpoint=s.fromEsriApiViewpoint(i.viewpoint)),n}}(Slide||(Slide={}));

package/portal/SubtypeGroupLayer.d.ts

@@ -47,7 +47,7 @@ export interface SubtypeGroupLayer extends OperationalLayerBase {
      * A sequence of custom parameters appended to the URL of all requests
      * related to supporting ArcGIS layer types.
      */
-    customParameters?: Record<string, unknown>;
+    customParameters?: Record<string, string>;
     /**
      * A layerDefinition object defining the attribute schema and drawing
      * information for the layer.
@@ -84,7 +84,7 @@ export interface SubtypeSubtypeGroupLayer extends Omit<SubtypeGroupLayer, "layer
      * A sequence of custom parameters appended to the URL of all requests
      * related to supporting ArcGIS layer types.
      */
-    customParameters?: Record<string, unknown>;
+    customParameters?: Record<string, string>;
     /**
      * String indicating the layer type.
      */

package/portal/Symbol.d.ts

@@ -85,7 +85,7 @@ export interface Font {
  *
  * @deprecated Use "json/*" modules instead.
  */
-export type Color = number[];
+export type Color = [number, number, number, number] | [number, number, number];
 /**
  * The type of the Symbol.
  *

package/portal/Symbol.js

@@ -1 +1 @@
-import r from"@arcgis/core/symbols/CIMSymbol";import e from"@arcgis/core/symbols/LabelSymbol3D";import o from"@arcgis/core/symbols/LineSymbol3D";import s from"@arcgis/core/symbols/MeshSymbol3D";import l from"@arcgis/core/symbols/PictureFillSymbol";import i from"@arcgis/core/symbols/PictureMarkerSymbol";import m from"@arcgis/core/symbols/PointSymbol3D";import t from"@arcgis/core/symbols/PolygonSymbol3D";import n from"@arcgis/core/symbols/SimpleFillSymbol";import c from"@arcgis/core/symbols/SimpleLineSymbol";import y from"@arcgis/core/symbols/SimpleMarkerSymbol";import S from"@arcgis/core/symbols/TextSymbol";import{assertNever as a}from"../utilities/checkArg.js";import{isIconSymbol3DLayer as b,isLineSymbol3D as u,isMeshSymbol3D as f,isObjectSymbol3DLayer as p,isPictureFillSymbol as g,isPictureMarkerSymbol as D,isPointSymbol3D as d,isPolygonSymbol3D as h,isSymbol as M}from"../utilities/symbol.js";export function toEsriApiSymbol(a){if(a){if(M(a))return a;switch(a.type){case"esriSMS":return y.fromJSON(a);case"esriSLS":return c.fromJSON(a);case"esriSFS":return n.fromJSON(a);case"esriPMS":return i.fromJSON(a);case"esriPFS":return l.fromJSON(a);case"esriTS":return S.fromJSON(a);case"MeshSymbol3D":return s.fromJSON(a);case"PointSymbol3D":return m.fromJSON(a);case"LineSymbol3D":return o.fromJSON(a);case"PolygonSymbol3D":return t.fromJSON(a);case"LabelSymbol3D":return e.fromJSON(a);case"CIMSymbolReference":return r.fromJSON(a);default:throw new Error("Unrecognized symbol type.")}}}export function fromEsriApiSymbol(r){const e=r.toJSON();return!D(r)&&!g(r)||e.imageData?(d(r)||u(r)||h(r)||f(r))&&r.styleOrigin?.styleUrl?e.styleOrigin.styleUrl=r.styleOrigin.styleUrl:r.symbolLayers&&r.symbolLayers.forEach(((r,o)=>{(b(r)||p(r))&&r.resource?.href&&(e.symbolLayers[o].resource.href=r.resource.href)})):e.url=r.url??void 0,e}export var SymbolType;function O(r,e){const o=r;switch(o){case"simple-marker":return"esriSMS";case"simple-line":return"esriSLS";case"simple-fill":return"esriSFS";case"picture-marker":return"esriPMS";case"picture-fill":return"esriPFS";case"text":return"esriTS";case"label-3d":return"LabelSymbol3D";case"line-3d":return"LineSymbol3D";case"mesh-3d":return"MeshSymbol3D";case"point-3d":return"PointSymbol3D";case"polygon-3d":return"PolygonSymbol3D";case"web-style":return"styleSymbolReference";case"cim":return"CIMSymbolReference";case"shield-label-symbol":if(e)throw e;return;default:return a(o,e)}}function P(r,e){const o=r;switch(o){case"esriSMS":return"simple-marker";case"esriSLS":return"simple-line";case"esriSFS":return"simple-fill";case"esriPMS":return"picture-marker";case"esriPFS":return"picture-fill";case"esriTS":return"text";case"LabelSymbol3D":return"label-3d";case"LineSymbol3D":return"line-3d";case"MeshSymbol3D":return"mesh-3d";case"PointSymbol3D":return"point-3d";case"PolygonSymbol3D":return"polygon-3d";case"styleSymbolReference":return"web-style";case"CIMSymbolReference":return"cim";default:return a(o,e)}}!function(r){r.fromEsriApiSymbolType=function(r){return!!P(r)?r:O(r,new Error("Unrecognized symbol type."))},r.toEsriApiSymbolType=function(r){return!!O(r)||"cim"===r||"shield-label-symbol"===r?r:P(r,new Error("Symbol.toEsriApiSymbolType: Unrecognized symbol type."))}}(SymbolType||(SymbolType={}));
+import r from"@arcgis/core/symbols/CIMSymbol";import e from"@arcgis/core/symbols/LabelSymbol3D";import o from"@arcgis/core/symbols/LineSymbol3D";import s from"@arcgis/core/symbols/MeshSymbol3D";import i from"@arcgis/core/symbols/PictureFillSymbol";import l from"@arcgis/core/symbols/PictureMarkerSymbol";import m from"@arcgis/core/symbols/PointSymbol3D";import t from"@arcgis/core/symbols/PolygonSymbol3D";import n from"@arcgis/core/symbols/SimpleFillSymbol";import c from"@arcgis/core/symbols/SimpleLineSymbol";import y from"@arcgis/core/symbols/SimpleMarkerSymbol";import S from"@arcgis/core/symbols/TextSymbol";import{assertNever as a}from"../utilities/checkArg.js";import{isIconSymbol3DLayer as b,isLineSymbol3D as u,isMeshSymbol3D as f,isObjectSymbol3DLayer as p,isPictureFillSymbol as g,isPictureMarkerSymbol as D,isPointSymbol3D as d,isPolygonSymbol3D as h,isSymbol as M}from"../utilities/symbol.js";export function toEsriApiSymbol(a){if(a){if(M(a))return a;switch(a.type){case"esriSMS":return y.fromJSON(a);case"esriSLS":return c.fromJSON(a);case"esriSFS":return n.fromJSON(a);case"esriPMS":return l.fromJSON(a);case"esriPFS":return i.fromJSON(a);case"esriTS":return S.fromJSON(a);case"MeshSymbol3D":return s.fromJSON(a);case"PointSymbol3D":return m.fromJSON(a);case"LineSymbol3D":return o.fromJSON(a);case"PolygonSymbol3D":return t.fromJSON(a);case"LabelSymbol3D":return e.fromJSON(a);case"CIMSymbolReference":return r.fromJSON(a);default:throw new Error("Unrecognized symbol type.")}}}export function fromEsriApiSymbol(r){const e=r.toJSON();return!D(r)&&!g(r)||e.imageData?(d(r)||u(r)||h(r)||f(r))&&r.styleOrigin?.styleUrl?e.styleOrigin.styleUrl=r.styleOrigin.styleUrl:r.symbolLayers&&r.symbolLayers.forEach(((r,o)=>{(b(r)||p(r))&&r.resource?.href&&(e.symbolLayers[o].resource.href=r.resource.href)})):e.url=r.url??void 0,e}export var SymbolType;function O(r,e){const o=r;switch(o){case"simple-marker":return"esriSMS";case"simple-line":return"esriSLS";case"simple-fill":return"esriSFS";case"picture-marker":return"esriPMS";case"picture-fill":return"esriPFS";case"text":return"esriTS";case"label-3d":return"LabelSymbol3D";case"line-3d":return"LineSymbol3D";case"mesh-3d":return"MeshSymbol3D";case"point-3d":return"PointSymbol3D";case"polygon-3d":return"PolygonSymbol3D";case"web-style":return"styleSymbolReference";case"cim":return"CIMSymbolReference";default:return a(o,e)}}function P(r,e){const o=r;switch(o){case"esriSMS":return"simple-marker";case"esriSLS":return"simple-line";case"esriSFS":return"simple-fill";case"esriPMS":return"picture-marker";case"esriPFS":return"picture-fill";case"esriTS":return"text";case"LabelSymbol3D":return"label-3d";case"LineSymbol3D":return"line-3d";case"MeshSymbol3D":return"mesh-3d";case"PointSymbol3D":return"point-3d";case"PolygonSymbol3D":return"polygon-3d";case"styleSymbolReference":return"web-style";case"CIMSymbolReference":return"cim";default:return a(o,e)}}!function(r){r.fromEsriApiSymbolType=function(r){return!!P(r)?r:O(r,new Error("Unrecognized symbol type."))},r.toEsriApiSymbolType=function(r){return!!O(r)||"cim"===r||"shield-label-symbol"===r?r:P(r,new Error("Symbol.toEsriApiSymbolType: Unrecognized symbol type."))}}(SymbolType||(SymbolType={}));

package/portal/TiledMapServiceLayer.d.ts

@@ -59,7 +59,7 @@ export interface TiledMapServiceLayer extends OperationalLayerBase, BaseMapLayer
      * A sequence of custom parameters appended to the URL of all requests
      * related to supporting ArcGIS layer types.
      */
-    customParameters?: Record<string, unknown>;
+    customParameters?: Record<string, string> | null;
     /**
      * NOTE: Applicable if used as a baseMapLayer. Integer value(s) indicating
      * the display levels of the basemap layer. Only applicable for

package/portal/TiledMapServiceLayer.js

@@ -1 +1 @@
-import e from"@arcgis/core/portal/Portal";import r from"@arcgis/core/portal/PortalItem";import{isTileLayer as a}from"../utilities/_layers.js";import{checkArg as i}from"../utilities/checkArg.js";import{Layer as t}from"./Layer.js";import{ERR_LAYER_TYPE_MISMATCH as s,applyLayerBaseToEsriApiLayer as l,applyBasemapLayerToEsriApiLayer as o,applyOperationalLayerToEsriApiLayer as y,fromEsriApiLayerToLayerBase as n,fromEsriApiLayerToOperationalLayer as c}from"./_layerHelper.js";export var TiledMapServiceLayer;async function p(e,r){if(e.layers&&r.sublayers)for(const a of e.layers){if(void 0===a.id||null===a.id)continue;const e=r.allSublayers.find((e=>e.id===a.id));e&&await t.applyToEsriApiSublayer(a,e)}}!function(t){async function m(t,n,c){if(i("layerJson",t).isNotMissing(),i("layerJson.layerType",t.layerType).satisfies((e=>!e||"ArcGISTiledMapServiceLayer"===e),s),i("layer",n).isNotMissing().satisfies(a,s),l(t,n),o(t,n),y(t,n),t.hasOwnProperty("customParameters")&&(n.customParameters=t.customParameters),t.hasOwnProperty("url")&&(n.url=t.url),t.hasOwnProperty("itemId")&&(n.portalItem?n.portalItem.id=t.itemId:n.portalItem=new r({id:t.itemId,portal:c||e.getDefault()})),n.loaded)await p(t,n);else{const e=n.load;let r=!1;n.load=async()=>{await e(),r||(r=!0,await p(t,n))}}}t.esriTileLayerDefaults={legendEnabled:!0,visible:!0,opacity:1,minScale:0,maxScale:0},t.toEsriApiLayer=async function(e){i("layerJson",e).isNotMissing(),i("layerJson.layerType",e.layerType).satisfies((e=>!e||"ArcGISTiledMapServiceLayer"===e),s);const r={};e?.url&&(r.url=e.url);const a=new((await import("@arcgis/core/layers/TileLayer")).default)(r);return await m(e,a),a},t.applyToEsriApiLayer=m,t.fromEsriApiTileLayer=function(e){i("layer",e).isNotMissing();const r={...n(e,t.esriTileLayerDefaults),...c(e),customParameters:e.customParameters,layerType:"ArcGISTiledMapServiceLayer",url:e.url??void 0};return e.portalItem&&(r.itemId=e.portalItem.id??void 0),r}}(TiledMapServiceLayer||(TiledMapServiceLayer={}));
+import e from"@arcgis/core/portal/Portal";import r from"@arcgis/core/portal/PortalItem";import{isTileLayer as a}from"../utilities/_layers.js";import{checkArg as i}from"../utilities/checkArg.js";import{Layer as t}from"./Layer.js";import{ERR_LAYER_TYPE_MISMATCH as s,applyLayerBaseToEsriApiLayer as l,applyBasemapLayerToEsriApiLayer as o,applyOperationalLayerToEsriApiLayer as y,fromEsriApiLayerToLayerBase as n,fromEsriApiLayerToOperationalLayer as c}from"./_layerHelper.js";export var TiledMapServiceLayer;async function p(e,r){if(e.layers&&r.sublayers)for(const a of e.layers){if(void 0===a.id||null===a.id)continue;const e=r.allSublayers.find((e=>e.id===a.id));e&&await t.applyToEsriApiSublayer(a,e)}}!function(t){async function m(t,n,c){if(i("layerJson",t).isNotMissing(),i("layerJson.layerType",t.layerType).satisfies((e=>!e||"ArcGISTiledMapServiceLayer"===e),s),i("layer",n).isNotMissing().satisfies(a,s),l(t,n),o(t,n),y(t,n),t.hasOwnProperty("customParameters")&&(n.customParameters=t.customParameters),t.hasOwnProperty("url")&&(n.url=t.url),t.hasOwnProperty("itemId")&&(n.portalItem?n.portalItem.id=t.itemId:n.portalItem=new r({id:t.itemId,portal:c||e.getDefault()})),n.loaded)await p(t,n);else{const e=n.load;let r=!1;n.load=async a=>(await e(a),r||(r=!0,await p(t,n)),n)}}t.esriTileLayerDefaults={legendEnabled:!0,visible:!0,opacity:1,minScale:0,maxScale:0},t.toEsriApiLayer=async function(e){i("layerJson",e).isNotMissing(),i("layerJson.layerType",e.layerType).satisfies((e=>!e||"ArcGISTiledMapServiceLayer"===e),s);const r={};e?.url&&(r.url=e.url);const a=new((await import("@arcgis/core/layers/TileLayer")).default)(r);return await m(e,a),a},t.applyToEsriApiLayer=m,t.fromEsriApiTileLayer=function(e){i("layer",e).isNotMissing();const r={...n(e,t.esriTileLayerDefaults),...c(e),customParameters:e.customParameters,layerType:"ArcGISTiledMapServiceLayer",url:e.url??void 0};return e.portalItem&&(r.itemId=e.portalItem.id??void 0),r}}(TiledMapServiceLayer||(TiledMapServiceLayer={}));

package/portal/WMSLayer.d.ts

@@ -1,4 +1,5 @@
 import type EsriWMSLayer from "@arcgis/core/layers/WMSLayer";
+import type { WMSLayerFormatType } from "@arcgis/core/layers/WMSLayer";
 import Portal from "@arcgis/core/portal/Portal";
 import type { BaseMapLayerBase } from "./BaseMapLayer.js";
 import type { OperationalLayerBase } from "./OperationalLayer.js";
@@ -54,14 +55,14 @@ export interface WMSLayer extends OperationalLayerBase, BaseMapLayerBase {
      * customLayerParameters property takes precedence if customParameters is
      * also present.
      */
-    customLayerParameters?: Record<string, unknown>;
+    customLayerParameters?: Record<string, string>;
     /**
      * A sequence of custom parameters to all WMS requests. These parameters are
      * applied to GetCapabilities, GetMap, and GetFeatureInfo requests. If used
      * with the customLayerParameters property, customParameters will not take
      * precedence.
      */
-    customParameters?: Record<string, unknown>;
+    customParameters?: Record<string, string>;
     /**
      * The rectangular map extent that should be requested from the service.
      */
@@ -77,7 +78,7 @@ export interface WMSLayer extends OperationalLayerBase, BaseMapLayerBase {
     /**
      * A string containing the image format to be requested from a WMS service.
      */
-    format?: string;
+    format?: WMSLayerFormatType;
     /**
      * Optional string containing the item ID of the service if it's registered
      * on ArcGIS Online or your organization's portal.

package/portal/WMTSInfo.d.ts

@@ -32,14 +32,14 @@ export interface WMTSInfo {
      * customLayerParameters property takes precedence if customParameters is
      * also present.
      */
-    customLayerParameters?: Record<string, unknown>;
+    customLayerParameters?: Record<string, string>;
     /**
      * A sequence of parameters used to append custom parameters to all WMTS
      * requests. These parameters are applied to GetCapabilities and GetTile. If
      * used with the customLayerParameters property, customParameters will not
      * take precedence.
      */
-    customParameters?: Record<string, unknown>;
+    customParameters?: Record<string, string>;
     /**
      * Identifier for the specific layer used in the WMTS service. Required
      * input by the user.

package/portal/WebMap.js

@@ -1 +1 @@
-import i from"@arcgis/core/Viewpoint";import e from"@arcgis/core/WebMap";import r from"@arcgis/core/core/Collection";import o from"@arcgis/core/geometry/SpatialReference";import{geographicToWebMercator as t}from"@arcgis/core/geometry/support/webMercatorUtils";import a from"@arcgis/core/webmap/Bookmark";import s from"@arcgis/core/webmap/InitialViewProperties";import{applyToEsriTable as n,toEsriApiTable as p}from"../data/Table.js";import{WellKnownBasemap as l}from"../support/esri.js";import{basemapsAreEquivalent as m,standardBasemaps as w}from"../utilities/_layers.js";import{checkArg as f}from"../utilities/checkArg.js";import{compareAsync as u}from"../utilities/collection.js";import{isPortalItem as c}from"../utilities/esri.js";import{isWebMap as y}from"../utilities/mapping.js";import{BaseMap as b}from"./BaseMap.js";import{toEsriApiGeometry as g}from"./Geometry.js";import{Item as h}from"./Item.js";import{LayerBase as A}from"./LayerBase.js";import{MapFloorInfo as P}from"./MapFloorInfo.js";import{SpatialReference as V}from"./SpatialReference.js";import{UtilityNetwork as v}from"./UtilityNetwork.js";import{Viewpoint as M}from"./Viewpoint.js";import{applyToEsriApiWidgetsObject as d,fromEsriApiWidgetsObject as k}from"./Widgets.js";export var WebMap;!function(O){async function N(e,l,w){if(f("json",e).isNotMissing(),f("map",l).isNotMissing(),y(l)){const m=l;if(e.hasOwnProperty("authoringApp")&&(m.authoringApp=e.authoringApp),e.hasOwnProperty("authoringAppVersion")&&(m.authoringAppVersion=e.authoringAppVersion),e.hasOwnProperty("bookmarks")&&(m.bookmarks.removeAll(),m.bookmarks.addMany((e.bookmarks??[]).map((e=>new a({name:e.name,thumbnail:e.thumbnail,viewpoint:(e.viewpoint&&i.fromJSON(e.viewpoint))??new i({targetGeometry:null==e.extent?void 0:g(e.extent)})}))))),e.hasOwnProperty("presentation"),l.initialViewProperties||(l.initialViewProperties=new s),e.hasOwnProperty("spatialReference")&&null!=e.spatialReference?l.initialViewProperties.spatialReference=V.toEsriApiSpatialReference(e.spatialReference):null===l.initialViewProperties.spatialReference&&(l.initialViewProperties.spatialReference=o.WebMercator),e.initialState?.viewpoint)l.initialViewProperties.viewpoint=M.toEsriApiViewpoint(e.initialState.viewpoint);else if(e.hasOwnProperty("$initialViewpoint"))console.warn("The '$initialViewpoint' property has been deprecated as of August 2020 and will be removed in a future release. Use WebMap.initialState.viewpoint"),l.initialViewProperties.viewpoint=M.toEsriApiViewpoint(e.$initialViewpoint);else{const e=function(i,e){let r;const o=i.initialViewProperties?.spatialReference,a=e?.extent||i.portalItem?.extent;o&&a&&(r=r=o.isWebMercator?t(a):a.clone());return r}(m,w);e&&(l.initialViewProperties.viewpoint=new i({targetGeometry:e}))}e.hasOwnProperty("mapFloorInfo")&&e.mapFloorInfo&&(l.floorInfo=P.toEsriApiFloorInfo(e.mapFloorInfo)),e.hasOwnProperty("tables")&&e.tables&&await u(l.tables,e.tables,{onNew:async(i,e)=>{l.tables.add(await p(i),e)},onMatch:async(i,e,r,o)=>{r!==o&&l.tables.reorder(i,o),await n(e,i)},onMissing:i=>{l.tables.remove(i)},equals:(i,e)=>i.id===e.id||i.title===e.title}),e.hasOwnProperty("version")&&null!=e.version&&m._set("sourceVersion",function(i){const e=i.split("."),r=e[1];return{major:parseInt(e[0],10),minor:parseInt(r,10)}}(e.version)),e.hasOwnProperty("widgets")&&null!=e.widgets&&(m.widgets=d(e.widgets,m.widgets)),e.hasOwnProperty("utilityNetworks")&&null!=e.utilityNetworks&&(m.utilityNetworks=m.utilityNetworks??new r,m.utilityNetworks.addMany(await Promise.all(e.utilityNetworks.map(v.toEsriApiUtilityNetwork))))}const c=w?w.portal:void 0;e.hasOwnProperty("baseMap")&&null!=e.baseMap&&(l.basemap&&m(l.basemap,e.baseMap)?await b.applyToEsriApiBasemap(e.baseMap,l.basemap,c):l.basemap=await b.toEsriApiBasemap(e.baseMap,c)),e.hasOwnProperty("operationalLayers")&&null!=e.operationalLayers&&await A.applyToEsriApiLayers(l.layers,e.operationalLayers,c)}O.toEsriApiWebMap=async function(i,r){f("json",i).isNotMissing();const o=new e,t={...i},a=[];let s;return t.version||(a.push("'version' -- assuming '2.8'"),t.version="2.8"),t.baseMap||(a.push("'baseMap' -- assuming 'topo-vector'"),t.baseMap=w[l.TOPO_VECTOR]),t.spatialReference||a.push("'spatialReference' -- assuming 'Web Mercator'"),a.length&&console.warn(`WebMap JSON is missing the following required properties: ${a.join(", ")}`),r&&(s=c(r)?r:h.toEsriApiPortalItem(r),await s.load()),await N(t,o,s),o},O.applyToEsriApiMap=N,O.fromEsriApiMap=function(i){f("map",i).isNotMissing();const e={};if(y(i)){const o=i;o.hasOwnProperty("authoringApp")&&null!=o.authoringApp&&(e.authoringApp=o.authoringApp),o.hasOwnProperty("authoringAppVersion")&&null!=o.authoringAppVersion&&(e.authoringAppVersion=o.authoringAppVersion),r.isCollection(o.bookmarks)&&(e.bookmarks=o.bookmarks.toArray().map((i=>({name:i.name,viewpoint:i.viewpoint?.toJSON(),thumbnail:i.thumbnail??void 0})))),o.hasOwnProperty("sourceVersion")&&o.sourceVersion&&(e.version=`${o.sourceVersion.major}.${o.sourceVersion.minor}`),o.initialViewProperties?.spatialReference&&(e.spatialReference=V.fromEsriApiSpatialReference(o.initialViewProperties.spatialReference)),o.initialViewProperties?.viewpoint&&(e.initialState={viewpoint:M.fromEsriApiViewpoint(o.initialViewProperties.viewpoint)}),o.hasOwnProperty("floorInfo")&&o.floorInfo&&(e.mapFloorInfo=P.fromEsriApiFloorInfo(o.floorInfo)),o.hasOwnProperty("tables")&&o.tables&&(e.tables=o.tables.toArray().map((i=>{const e=A.fromEsriApiLayer(i);return delete e.layerType,e}))),o.hasOwnProperty("widgets")&&(e.widgets=k(o.widgets??void 0,e.widgets)),r.isCollection(o.utilityNetworks)&&(e.utilityNetworks=o.utilityNetworks.map(v.fromEsriApiUtilityNetwork).toArray()),e.version=isNaN(o.version)?"2.6":o.version}return i.hasOwnProperty("basemap")&&i.basemap&&(e.baseMap=b.fromEsriApiBasemap(i.basemap)),function(i,e){e.operationalLayers=[];for(let r=0;r<i.length;r++)e.operationalLayers.push(A.fromEsriApiLayer(i.getItemAt(r)))}(i.layers,e),e}}(WebMap||(WebMap={}));
+import i from"@arcgis/core/Viewpoint";import e from"@arcgis/core/WebMap";import r from"@arcgis/core/core/Collection";import o from"@arcgis/core/geometry/SpatialReference";import{geographicToWebMercator as t}from"@arcgis/core/geometry/support/webMercatorUtils";import a from"@arcgis/core/webmap/Bookmark";import s from"@arcgis/core/webmap/InitialViewProperties";import{applyToEsriTable as n,toEsriApiTable as p}from"../data/Table.js";import{WellKnownBasemap as l}from"../support/esri.js";import{basemapsAreEquivalent as m,standardBasemaps as w}from"../utilities/_layers.js";import{checkArg as f}from"../utilities/checkArg.js";import{compareAsync as u}from"../utilities/collection.js";import{isPortalItem as c}from"../utilities/esri.js";import{isWebMap as y}from"../utilities/mapping.js";import{BaseMap as b}from"./BaseMap.js";import{toEsriApiGeometry as g}from"./Geometry.js";import{Item as h}from"./Item.js";import{LayerBase as A}from"./LayerBase.js";import{MapFloorInfo as P}from"./MapFloorInfo.js";import{SpatialReference as V}from"./SpatialReference.js";import{UtilityNetwork as v}from"./UtilityNetwork.js";import{Viewpoint as M}from"./Viewpoint.js";import{applyToEsriApiWidgetsObject as d,fromEsriApiWidgetsObject as k}from"./Widgets.js";export var WebMap;!function(O){async function N(e,l,w){if(f("json",e).isNotMissing(),f("map",l).isNotMissing(),y(l)){const m=l;if(e.hasOwnProperty("authoringApp")&&(m.authoringApp=e.authoringApp),e.hasOwnProperty("authoringAppVersion")&&(m.authoringAppVersion=e.authoringAppVersion),e.hasOwnProperty("bookmarks")&&(m.bookmarks.removeAll(),m.bookmarks.addMany((e.bookmarks??[]).map((e=>new a({name:e.name,thumbnail:e.thumbnail,viewpoint:(e.viewpoint&&i.fromJSON(e.viewpoint))??new i({targetGeometry:null==e.extent?void 0:g(e.extent)})}))))),e.hasOwnProperty("presentation"),l.initialViewProperties||(l.initialViewProperties=new s),e.hasOwnProperty("spatialReference")&&null!=e.spatialReference?l.initialViewProperties.spatialReference=V.toEsriApiSpatialReference(e.spatialReference):null===l.initialViewProperties.spatialReference&&(l.initialViewProperties.spatialReference=o.WebMercator),e.initialState?.viewpoint)l.initialViewProperties.viewpoint=M.toEsriApiViewpoint(e.initialState.viewpoint);else if(e.hasOwnProperty("$initialViewpoint"))console.warn("The '$initialViewpoint' property has been deprecated as of August 2020 and will be removed in a future release. Use WebMap.initialState.viewpoint"),l.initialViewProperties.viewpoint=M.toEsriApiViewpoint(e.$initialViewpoint);else{const e=function(i,e){let r;const o=i.initialViewProperties?.spatialReference,a=e?.extent||i.portalItem?.extent;o&&a&&(r=r=o.isWebMercator?t(a):a.clone());return r}(m,w);e&&(l.initialViewProperties.viewpoint=new i({targetGeometry:e}))}e.hasOwnProperty("mapFloorInfo")&&e.mapFloorInfo&&(l.floorInfo=P.toEsriApiFloorInfo(e.mapFloorInfo)),e.hasOwnProperty("tables")&&e.tables&&await u(l.tables,e.tables,{onNew:async(i,e)=>{l.tables.add(await p(i),e)},onMatch:async(i,e,r,o)=>{r!==o&&l.tables.reorder(i,o),await n(e,i)},onMissing:i=>{l.tables.remove(i)},equals:(i,e)=>i.id===e.id||i.title===e.title}),e.hasOwnProperty("version")&&null!=e.version&&m._set("sourceVersion",function(i){const e=i.split("."),r=e[1];return{major:parseInt(e[0],10),minor:parseInt(r,10)}}(e.version)),e.hasOwnProperty("widgets")&&null!=e.widgets&&(m.widgets=d(e.widgets,m.widgets)),e.hasOwnProperty("utilityNetworks")&&null!=e.utilityNetworks&&(m.utilityNetworks=m.utilityNetworks??new r,m.utilityNetworks.addMany(await Promise.all(e.utilityNetworks.map(v.toEsriApiUtilityNetwork))))}const c=w?w.portal:void 0;e.hasOwnProperty("baseMap")&&null!=e.baseMap&&(l.basemap&&m(l.basemap,e.baseMap)?await b.applyToEsriApiBasemap(e.baseMap,l.basemap,c):l.basemap=await b.toEsriApiBasemap(e.baseMap,c)),e.hasOwnProperty("operationalLayers")&&null!=e.operationalLayers&&await A.applyToEsriApiLayers(l.layers,e.operationalLayers,c)}O.toEsriApiWebMap=async function(i,r){f("json",i).isNotMissing();const o=new e,t={...i},a=[];let s;return t.version||(a.push("'version' -- assuming '2.8'"),t.version="2.8"),t.baseMap||(a.push("'baseMap' -- assuming 'topo-vector'"),t.baseMap=w[l.TOPO_VECTOR]),t.spatialReference||a.push("'spatialReference' -- assuming 'Web Mercator'"),a.length&&console.warn(`WebMap JSON is missing the following required properties: ${a.join(", ")}`),r&&(s=c(r)?r:h.toEsriApiPortalItem(r),await s.load()),await N(t,o,s),o},O.applyToEsriApiMap=N,O.fromEsriApiMap=function(i){f("map",i).isNotMissing();const e={};if(y(i)){const o=i;o.hasOwnProperty("authoringApp")&&null!=o.authoringApp&&(e.authoringApp=o.authoringApp),o.hasOwnProperty("authoringAppVersion")&&null!=o.authoringAppVersion&&(e.authoringAppVersion=o.authoringAppVersion),r.isCollection(o.bookmarks)&&(e.bookmarks=o.bookmarks.toArray().map((i=>({name:i.name,viewpoint:i.viewpoint?.toJSON(),thumbnail:i.thumbnail??void 0})))),o.hasOwnProperty("sourceVersion")&&o.sourceVersion&&(e.version=`${o.sourceVersion.major}.${o.sourceVersion.minor}`),o.initialViewProperties?.spatialReference&&(e.spatialReference=V.fromEsriApiSpatialReference(o.initialViewProperties.spatialReference)),o.initialViewProperties?.viewpoint&&(e.initialState={viewpoint:M.fromEsriApiViewpoint(o.initialViewProperties.viewpoint)}),o.hasOwnProperty("floorInfo")&&o.floorInfo&&(e.mapFloorInfo=P.fromEsriApiFloorInfo(o.floorInfo)),o.hasOwnProperty("tables")&&o.tables&&(e.tables=o.tables.toArray().map((i=>{const e=A.fromEsriApiLayer(i);return delete e.layerType,e}))),o.hasOwnProperty("widgets")&&(e.widgets=k(o.widgets??void 0,e.widgets)),r.isCollection(o.utilityNetworks)&&(e.utilityNetworks=o.utilityNetworks.map(((i,e)=>v.fromEsriApiUtilityNetwork(i))).toArray()),e.version=isNaN(o.version)?"2.6":o.version}return i.hasOwnProperty("basemap")&&i.basemap&&(e.baseMap=b.fromEsriApiBasemap(i.basemap)),function(i,e){e.operationalLayers=[];for(let r=0;r<i.length;r++)e.operationalLayers.push(A.fromEsriApiLayer(i.getItemAt(r)))}(i.layers,e),e}}(WebMap||(WebMap={}));

package/support/ArcGISRequestHelper.d.ts

@@ -1,4 +1,4 @@
-import type { RequestOptions } from "./esri.js";
+import type { RequestOptions, RequestResponse } from "./esri.js";
 /**
  * Options that can be passed into
  * {@link support/ArcGISRequestHelper!ArcGISRequestHelper.request}.
@@ -47,7 +47,7 @@ export interface ArcGISRequestOptions {
 /**
  * A response from calling `request()`.
  */
-export interface ArcGISRequestHelperResponse<T = unknown> extends Omit<__esri.RequestResponse, "data"> {
+export interface ArcGISRequestHelperResponse<T = unknown> extends Omit<RequestResponse, "data"> {
     /**
      * The response data.
      */

package/support/FormatSettings.d.ts

@@ -1,5 +1,5 @@
 import type { PropertyDefs } from "./Serializable.js";
-import { Settings } from "./Settings.js";
+import { Settings, type SettingsEvents } from "./Settings.js";
 /**
  * Properties that can be passed into the constructor for {@link FormatSettings}.
  */
@@ -51,6 +51,11 @@ export interface FormatSettingsProperties {
  * Settings that affect how values are formatted.
  */
 export declare class FormatSettings extends Settings<FormatSettingsProperties> {
+    /**
+     * @deprecated Do not directly reference this property. Use EventNames and
+     *   EventTypes helpers from @arcgis/core/Evented.
+     */
+    "@eventTypes": SettingsEvents<FormatSettings>;
     /**
      * The default format for date values. Either a
      * {@link utilities/format/formats!DateFormat} constant, a custom date format

package/support/InitializableBase.d.ts

@@ -58,11 +58,28 @@ export interface InitializableBaseProperties {
      */
     failureMode?: FailureMode;
 }
+/**
+ * A type that maps event names to their corresponding event object types for an
+ * instance of {@link InitializableBase}.
+ */
+export interface InitializableBaseEvents {
+    /**
+     * Fires when a setting is changed, either locally or by a parent settings
+     * instance. The event object contains the name of the setting that
+     * changed.
+     */
+    initializeWarning: InitializeWarningEvent;
+}
 declare const InitializableBase_base: (abstract new (_properties?: InitializableBaseProperties) => SerializableBase<InitializableBaseProperties>) & (abstract new (...args: any[]) => ObservableMixin);
 /**
  * A base class that contains logic for initializing items.
  */
 export declare abstract class InitializableBase<TProperties extends InitializableBaseProperties = InitializableBaseProperties> extends InitializableBase_base implements Initializable {
+    /**
+     * @deprecated Do not directly reference this property. Use EventNames and
+     *   EventTypes helpers from @arcgis/core/Evented.
+     */
+    "@eventTypes": InitializableBaseEvents;
     /**
      * See {@link support/InitializableBase!Initializable.isInitialized}.
      */
@@ -96,8 +113,6 @@ export declare abstract class InitializableBase<TProperties extends Initializabl
      * @inheritDoc
      */
     destroy(): Promise<void>;
-    on(name: string | string[], callback: EventCallback<any>): IHandle;
-    emit(name: string, event: unknown): boolean;
     toJSON(serializeMode?: SerializeMode): TProperties;
     assignProperties(properties: Partial<TProperties>): void;
     assignPropertiesAsync(properties: Partial<TProperties>): Promise<void>;

package/support/InitializableBase.js

@@ -1 +1 @@
-import{getLogger as i}from"../utilities/log.js";import{parallelEach as e}from"../utilities/promise.js";import{InitializeError as t}from"./InitializeError.js";import{SerializableBase as r}from"./Serializable.js";import{notifyChange as s,observable as a}from"./observableUtils.js";export class InitializableBase extends(a(r)){get isInitialized(){return this._isInitialized}get isDestroyed(){return this._isDestroyed}get failureMode(){return this._failureMode}set failureMode(i){this._failureMode=i}_isInitialized=!1;_isDestroyed=!1;_initializePromise;_destroyPromise;_failureMode="warn";async initialize(){return void 0===this._initializePromise&&(this._initializePromise=(async()=>{try{await this.finishAssignProperties(),await this._onInitialize(),await this._initializeChildren(),await this._postInitialize()}catch(i){throw i instanceof Error?(this._initializePromise=void 0,new t(this.failureMode,i,this)):i}this._isInitialized=!0,s(this,"isInitialized")})()),this._initializePromise}async destroy(){return void 0===this._destroyPromise&&(this._destroyPromise=(async()=>{try{await this._onDestroy()}catch(i){throw this._destroyPromise=void 0,i}this._isDestroyed=!0,s(this,"isDestroyed")})()),this._destroyPromise}on(i,e){return super.on(i,e)}emit(i,e){return super.emit(i,e)}toJSON(i="all"){return super.toJSON(i)}assignProperties(i){super.assignProperties(i)}assignPropertiesAsync(i){return super.assignPropertiesAsync(i)}getDefaults(){return super.getDefaults()}getDefault(i){return super.getDefault(i)}getSerializableProperties(i){return super.getSerializableProperties(i)}_getSerializableProperties(){return{...super._getSerializableProperties(),failureMode:{serializeModes:["initial"],default:"warn"}}}async _onInitialize(){}async _postInitialize(){}async _onDestroy(){}async _initializeChildren(){await e(this._initializableChildCollections(),(i=>initializeCollection(i,{target:this,onInitializeWarning:i=>this.emit("initializeWarning",i)})))}*_initializableChildCollections(){}}const n={onInitializeWarning:()=>{}};export async function initializeCollection(r,s=n){const{onInitializeWarning:a,target:o}=s;await e(r.toArray(),(async e=>{const r=e.on("initializeWarning",a);try{await e.initialize()}catch(r){const s=r instanceof t?r:new t(e.failureMode,r,e);if("error"===s.failureMode)throw s;"warn"===s.failureMode&&i("geocortex.api.support.InitializeBase").warn({message:"Error attempting to initialize child item: {0}.",error:s},s.error.message);a({error:s,target:o})}finally{r.remove()}}))}
+import{getLogger as i}from"../utilities/log.js";import{parallelEach as e}from"../utilities/promise.js";import{InitializeError as t}from"./InitializeError.js";import{SerializableBase as r}from"./Serializable.js";import{notifyChange as s,observable as a}from"./observableUtils.js";export class InitializableBase extends(a(r)){get isInitialized(){return this._isInitialized}get isDestroyed(){return this._isDestroyed}get failureMode(){return this._failureMode}set failureMode(i){this._failureMode=i}_isInitialized=!1;_isDestroyed=!1;_initializePromise;_destroyPromise;_failureMode="warn";async initialize(){return void 0===this._initializePromise&&(this._initializePromise=(async()=>{try{await this.finishAssignProperties(),await this._onInitialize(),await this._initializeChildren(),await this._postInitialize()}catch(i){throw i instanceof Error?(this._initializePromise=void 0,new t(this.failureMode,i,this)):i}this._isInitialized=!0,s(this,"isInitialized")})()),this._initializePromise}async destroy(){return void 0===this._destroyPromise&&(this._destroyPromise=(async()=>{try{await this._onDestroy()}catch(i){throw this._destroyPromise=void 0,i}this._isDestroyed=!0,s(this,"isDestroyed")})()),this._destroyPromise}toJSON(i="all"){return super.toJSON(i)}assignProperties(i){super.assignProperties(i)}assignPropertiesAsync(i){return super.assignPropertiesAsync(i)}getDefaults(){return super.getDefaults()}getDefault(i){return super.getDefault(i)}getSerializableProperties(i){return super.getSerializableProperties(i)}_getSerializableProperties(){return{...super._getSerializableProperties(),failureMode:{serializeModes:["initial"],default:"warn"}}}async _onInitialize(){}async _postInitialize(){}async _onDestroy(){}async _initializeChildren(){await e(this._initializableChildCollections(),(i=>initializeCollection(i,{target:this,onInitializeWarning:i=>this.emit("initializeWarning",i)})))}*_initializableChildCollections(){}}const o={onInitializeWarning:()=>{}};export async function initializeCollection(r,s=o){const{onInitializeWarning:a,target:n}=s;await e(r.toArray(),(async e=>{const r=e.on("initializeWarning",a);try{await e.initialize()}catch(r){const s=r instanceof t?r:new t(e.failureMode,r,e);if("error"===s.failureMode)throw s;"warn"===s.failureMode&&i("geocortex.api.support.InitializeBase").warn({message:"Error attempting to initialize child item: {0}.",error:s},s.error.message);a({error:s,target:n})}finally{r.remove()}}))}

package/support/Serializable.d.ts

@@ -1,4 +1,4 @@
-import Evented from "@arcgis/core/core/Evented.js";
+import { Evented } from "@arcgis/core/core/Evented.js";
 /**
  * A class that can take in initial property values in its constructor.
  */

package/support/Serializable.js

@@ -1 +1 @@
-import e from"@arcgis/core/core/Evented.js";import t from"safe-stable-stringify";import{filter as r,isPlainObject as i,map as s,objectKeys as o}from"../utilities/object.js";const n=new WeakSet;export class SerializableBase extends e{_assignPropertiesPromises=[];constructor(e){if(super(),!n.has(this.constructor))throw new Error(`Class "${this.constructor.name}" must be marked as "@serializable" since it extends ${SerializableBase.name} (make sure it is the _last_ decorator on the class).`)}toJSON(e="all"){return filterJSONProperties(this._getSerializableProperties(),this,e)}assignProperties(e){const t=a(this._getSerializableProperties(),this,e,!0);this._assignPropertiesPromises.push(t),(async()=>{try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}})()}async assignPropertiesAsync(e){await this.finishAssignProperties();const t=assignPropertiesAsync(this._getSerializableProperties(),this,e);this._assignPropertiesPromises.push(t);try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}}async finishAssignProperties(){await Promise.all(this._assignPropertiesPromises)}getSerializableProperties(e="all"){return getSerializableProperties(this._getSerializableProperties(),e)}getDefaults(){return getDefaults(this._getSerializableProperties())}getDefault(e){return this.getDefaults()[e]}_getSerializableProperties(){return{}}_toPropertyDef(e){return toPropertyDef(e)}}export function serializable(e){if(!isSerializable(e.prototype))throw new Error(`Class "${e.name}" is marked as @serializable but does not implement 'Serializable'.`);class t extends e{constructor(e,...r){super(e,...r),this.constructor===t&&this.assignProperties({...this.getDefaults(),...e})}}return n.add(t),t}export function shouldExcludeDefaults(e){return"initial"===e||"project"===e}export function filterJSONProperties(e,r,i){let s=i;"initial"!==s&&"initial-with-defaults"!==s&&"preferences"!==s&&"project"!==s&&(s="all");const n={},a=getSerializableProperties(e,s);for(const e of o(a)){const i=a[e],o=l(e,i,r,s);if(shouldExcludeDefaults(s)){let r=!1;r=i.hasOwnProperty("default")?t(o)===t(i.default):i.isDefault?i.isDefault(o,s):isDefault(o),r||(n[e]=o)}else n[e]=o}if(!shouldExcludeDefaults(s)&&"preferences"!==s||!isDefault(n))return n}export function assignProperties(e,t,r){r&&a(e,t,r,!0)}export function assignPropertiesAsync(e,t,r){return a(e,t,r)}function a(e,t,r,s=!1){if(!r)return Promise.resolve();const o=[];return Object.keys(e).forEach((n=>{const a=e[n];if(r.hasOwnProperty(n)&&(Array.isArray(e[n])||!1!==a.deserialize))try{const e=r[n]??void 0;if(a?.deserialize){const t=a.deserialize(e);t&&o.push(t)}else"object"!=typeof t[n]||!t[n]||!i(e)&&void 0!==e||s||"function"!=typeof t[n].assignPropertiesAsync?"object"==typeof t[n]&&t[n]&&(i(e)||void 0===e)&&"function"==typeof t[n].assignProperties?t[n].assignProperties(e):t[n]=e:o.push(t[n].assignPropertiesAsync(e))}catch(e){if(s)throw e;o.push(Promise.reject(e))}})),Promise.all(o).then()}export function getDefaults(e){const t={},r=o(e).filter((t=>"object"==typeof e[t]));for(const i of r){const r=e[i];r.hasOwnProperty("default")&&(t[i]=r.default)}return t}export function getDefault(e,t){return getDefaults(e)[t]}export function isDefault(e){if(null==e)return!0;if(e.constructor===Object){if(!Object.keys(e).length)return!0}return!(!Array.isArray(e)||e.length)}function l(e,t,r,i){const s=t?.serialize?t.serialize(i):r[e];if(s&&"function"==typeof s.toItemUri)return s.toItemUri();if(s&&"function"==typeof s.toJSON)return s.toJSON(i);if(Array.isArray(s))return s.map(((e,t)=>l(t,void 0,s,i)));if(s&&"function"==typeof s.toArray){const e=s.toArray();return e.map(((t,r)=>l(r,void 0,e,i)))}if(s&&"object"==typeof s){const e={};for(const t of Object.keys(s))e[t]=l(t,void 0,s,i);return e}return t?.serialize?s:r[e]}export function toPropertyDef(e){const t={serializeModes:[]};return"string"==typeof e?{...t,serializeModes:[e]}:Array.isArray(e)?{...t,serializeModes:e}:{...t,...e}}export function isSerializable(e){return["assignProperties","getDefaults","getSerializableProperties","toJSON"].every((t=>"function"==typeof e[t]))}export function getSerializableProperties(e,t="all"){const i=s(e,(e=>toPropertyDef(e))),o=r(i,(e=>function(e,t){if(!1===t.serialize)return!1;const r="initial-with-defaults"===e?"initial":e;return"all"===e||t.serializeModes?.includes(r)}(t,e)));return o}
+import{Evented as e}from"@arcgis/core/core/Evented.js";import t from"safe-stable-stringify";import{filter as r,isPlainObject as i,map as s,objectKeys as o}from"../utilities/object.js";const n=new WeakSet;export class SerializableBase extends e{_assignPropertiesPromises=[];constructor(e){if(super(),!n.has(this.constructor))throw new Error(`Class "${this.constructor.name}" must be marked as "@serializable" since it extends ${SerializableBase.name} (make sure it is the _last_ decorator on the class).`)}toJSON(e="all"){return filterJSONProperties(this._getSerializableProperties(),this,e)}assignProperties(e){const t=a(this._getSerializableProperties(),this,e,!0);this._assignPropertiesPromises.push(t),(async()=>{try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}})()}async assignPropertiesAsync(e){await this.finishAssignProperties();const t=assignPropertiesAsync(this._getSerializableProperties(),this,e);this._assignPropertiesPromises.push(t);try{await t}finally{this._assignPropertiesPromises.splice(this._assignPropertiesPromises.indexOf(t),1)}}async finishAssignProperties(){await Promise.all(this._assignPropertiesPromises)}getSerializableProperties(e="all"){return getSerializableProperties(this._getSerializableProperties(),e)}getDefaults(){return getDefaults(this._getSerializableProperties())}getDefault(e){return this.getDefaults()[e]}_getSerializableProperties(){return{}}_toPropertyDef(e){return toPropertyDef(e)}}export function serializable(e){if(!isSerializable(e.prototype))throw new Error(`Class "${e.name}" is marked as @serializable but does not implement 'Serializable'.`);class t extends e{constructor(e,...r){super(e,...r),this.constructor===t&&this.assignProperties({...this.getDefaults(),...e})}}return n.add(t),t}export function shouldExcludeDefaults(e){return"initial"===e||"project"===e}export function filterJSONProperties(e,r,i){let s=i;"initial"!==s&&"initial-with-defaults"!==s&&"preferences"!==s&&"project"!==s&&(s="all");const n={},a=getSerializableProperties(e,s);for(const e of o(a)){const i=a[e],o=l(e,i,r,s);if(shouldExcludeDefaults(s)){let r=!1;r=i.hasOwnProperty("default")?t(o)===t(i.default):i.isDefault?i.isDefault(o,s):isDefault(o),r||(n[e]=o)}else n[e]=o}if(!shouldExcludeDefaults(s)&&"preferences"!==s||!isDefault(n))return n}export function assignProperties(e,t,r){r&&a(e,t,r,!0)}export function assignPropertiesAsync(e,t,r){return a(e,t,r)}function a(e,t,r,s=!1){if(!r)return Promise.resolve();const o=[];return Object.keys(e).forEach((n=>{const a=e[n];if(r.hasOwnProperty(n)&&(Array.isArray(e[n])||!1!==a.deserialize))try{const e=r[n]??void 0;if(a?.deserialize){const t=a.deserialize(e);t&&o.push(t)}else"object"!=typeof t[n]||!t[n]||!i(e)&&void 0!==e||s||"function"!=typeof t[n].assignPropertiesAsync?"object"==typeof t[n]&&t[n]&&(i(e)||void 0===e)&&"function"==typeof t[n].assignProperties?t[n].assignProperties(e):t[n]=e:o.push(t[n].assignPropertiesAsync(e))}catch(e){if(s)throw e;o.push(Promise.reject(e))}})),Promise.all(o).then()}export function getDefaults(e){const t={},r=o(e).filter((t=>"object"==typeof e[t]));for(const i of r){const r=e[i];r.hasOwnProperty("default")&&(t[i]=r.default)}return t}export function getDefault(e,t){return getDefaults(e)[t]}export function isDefault(e){if(null==e)return!0;if(e.constructor===Object){if(!Object.keys(e).length)return!0}return!(!Array.isArray(e)||e.length)}function l(e,t,r,i){const s=t?.serialize?t.serialize(i):r[e];if(s&&"function"==typeof s.toItemUri)return s.toItemUri();if(s&&"function"==typeof s.toJSON)return s.toJSON(i);if(Array.isArray(s))return s.map(((e,t)=>l(t,void 0,s,i)));if(s&&"function"==typeof s.toArray){const e=s.toArray();return e.map(((t,r)=>l(r,void 0,e,i)))}if(s&&"object"==typeof s){const e={};for(const t of Object.keys(s))e[t]=l(t,void 0,s,i);return e}return t?.serialize?s:r[e]}export function toPropertyDef(e){const t={serializeModes:[]};return"string"==typeof e?{...t,serializeModes:[e]}:Array.isArray(e)?{...t,serializeModes:e}:{...t,...e}}export function isSerializable(e){return["assignProperties","getDefaults","getSerializableProperties","toJSON"].every((t=>"function"==typeof e[t]))}export function getSerializableProperties(e,t="all"){const i=s(e,(e=>toPropertyDef(e))),o=r(i,(e=>function(e,t){if(!1===t.serialize)return!1;const r="initial-with-defaults"===e?"initial":e;return"all"===e||t.serializeModes?.includes(r)}(t,e)));return o}

package/support/Settings.d.ts

@@ -1,6 +1,20 @@
 import Collection from "@arcgis/core/core/Collection";
 import type { SerializeMode } from "./Serializable.js";
 import { SerializableBase } from "./Serializable.js";
+/**
+ * A type that maps event names to their corresponding event object types for an
+ * instance of {@link Settings}.
+ */
+export interface SettingsEvents<T> {
+    /**
+     * Fires when a setting is changed, either locally or by a parent settings
+     * instance. The event object contains the name of the setting that
+     * changed.
+     */
+    "property-change": {
+        property: keyof T;
+    };
+}
 declare const Settings_base: (abstract new (_properties?: unknown) => SerializableBase<unknown>) & (abstract new (...args: any[]) => import("./observableUtils.js").ObservableMixin);
 /**
  * Helper class for implementing a collection of settings that can be inherited
@@ -8,6 +22,11 @@ declare const Settings_base: (abstract new (_properties?: unknown) => Serializab
  * override the inherited setting.
  */
 export declare abstract class Settings<TProperties> extends Settings_base {
+    /**
+     * @deprecated Do not directly reference this property. Use EventNames and
+     *   EventTypes helpers from @arcgis/core/Evented.
+     */
+    "@eventTypes": SettingsEvents<this>;
     private _parent;
     private _parentHandle;
     /**

package/support/_esriInternal.d.ts

@@ -1,4 +1,2 @@
 import Warning from "@arcgis/core/core/Warning";
-import { DataLayerSource } from "@arcgis/core/layers/support/source/DataLayerSource";
-import { MapLayerSource } from "@arcgis/core/layers/support/source/MapLayerSource";
-export { DataLayerSource, MapLayerSource, Warning };
+export { Warning };

package/support/_esriInternal.js

@@ -1 +1 @@
-import r from"@arcgis/core/core/Warning";import{DataLayerSource as o}from"@arcgis/core/layers/support/source/DataLayerSource";import{MapLayerSource as e}from"@arcgis/core/layers/support/source/MapLayerSource";export{o as DataLayerSource,e as MapLayerSource,r as Warning};
+import r from"@arcgis/core/core/Warning";export{r as Warning};