@conterra/ct-mapapps-typings 4.20.1 → 4.20.2-RC-1

package/result-api/api/index.d.ts

@@ -1,8 +1,9 @@
-export { ArcadeFormatOptions, CollectionChangedEvent, Column, ColumnAlign, ColumnProvider, ColumnProviderFactory, DataSource, DataTable, DataTableCollection, DataTableCollectionEvents, DataTableEvents, DataTableId, DataTableWatchProperties, Dataset, DatasetCapabilities, DatasetEvents, DatasetField, DatasetItem, DatasetItemId, DatasetItemIdsProvider, DatasetState, DatasetWatchProperties, DateTimeFormat, DateTimeFormatOptions, FORMATTER_COMBINED_IDENTIFIER, FORMATTER_DOMAIN_VALUE_IDENTIFIER, FORMATTER_ID_IDENTIFIER, Filter, FocusChangedEvent, Formatter, FormatterFacade, FormatterOptions, FormattingInfo, FormattingInfoProvider, ItemCount, NumberFormatOptions, QueryDefinition, QueryResult, RowEvent, RowItem, SELECTION_COLUMN_NAME, Selection, SelectionEvents, SortSpecifier, SuggestFilter, TableItem, TableModel, TableModelEvents, TableModelState, TableModelWatchProperties, WellKnownFormatterOptions } from '../__internal__/Bnw4PH_u.js';
+export { ArcadeFormatOptions, CollectionChangedEvent, Column, ColumnAlign, ColumnProvider, ColumnProviderFactory, DataSource, DataTable, DataTableCollection, DataTableCollectionEvents, DataTableEvents, DataTableId, DataTableWatchProperties, Dataset, DatasetCapabilities, DatasetEvents, DatasetField, DatasetItem, DatasetItemId, DatasetItemIdsProvider, DatasetState, DatasetWatchProperties, DateTimeFormat, DateTimeFormatOptions, FORMATTER_COMBINED_IDENTIFIER, FORMATTER_DOMAIN_VALUE_IDENTIFIER, FORMATTER_ID_IDENTIFIER, Filter, FocusChangedEvent, Formatter, FormatterFacade, FormatterOptions, FormattingInfo, FormattingInfoProvider, ItemCount, NumberFormatOptions, QueryDefinition, QueryResult, RowEvent, RowItem, SELECTION_COLUMN_NAME, Selection, SelectionEvents, SortSpecifier, SuggestFilter, TableItem, TableModel, TableModelEvents, TableModelState, TableModelWatchProperties, WellKnownFormatterOptions } from '../__internal__/BGEg3fBn.js';
 export { DataTableFactory, ResultViewerService, ResultViewerServiceEvents, ResultViewerServiceOpenOptions } from './service.js';
 export { DataTableUi, DataTableUiConfig, DataTableUiEvents, DataTableUiFactory } from './ui.js';
 export { BulkActionContext, BulkButtonTableAction, BulkTableAction, RowActionContext, RowButtonTableAction, RowTableAction, TableAction, TableActionDisplayState, TableActionDisplayStateProvider, TableActionItem, TableActionResolver, TableActionResolverContext, TableActionResolverContextEvents, TableActionResolverContextOptions, TableActionUIType } from './actions.js';
 import 'apprt-core/Types';
-import 'esri/geometry';
+import '@arcgis/core/geometry';
+import '@arcgis/core/geometry/SpatialReference';
 import 'store-api/api';
 import 'apprt-core/Events';

package/result-api/api/model.d.ts

@@ -1,4 +1,5 @@
 import 'apprt-core/Types';
-import 'esri/geometry';
+import '@arcgis/core/geometry';
+import '@arcgis/core/geometry/SpatialReference';
 import 'store-api/api';
-export { CollectionChangedEvent, Column, ColumnAlign, ColumnProvider, ColumnProviderFactory, DataSource, DataTable, DataTableCollection, DataTableCollectionEvents, DataTableEvents, DataTableId, DataTableWatchProperties, Dataset, DatasetCapabilities, DatasetEvents, DatasetField, DatasetItem, DatasetItemId, DatasetItemIdsProvider, DatasetState, DatasetWatchProperties, Filter, FocusChangedEvent, ItemCount, QueryDefinition, QueryResult, RowEvent, RowItem, SELECTION_COLUMN_NAME, Selection, SelectionEvents, SortSpecifier, SuggestFilter, TableItem, TableModel, TableModelEvents, TableModelState, TableModelWatchProperties } from '../__internal__/Bnw4PH_u.js';
+export { CollectionChangedEvent, Column, ColumnAlign, ColumnProvider, ColumnProviderFactory, DataSource, DataTable, DataTableCollection, DataTableCollectionEvents, DataTableEvents, DataTableId, DataTableWatchProperties, Dataset, DatasetCapabilities, DatasetEvents, DatasetField, DatasetItem, DatasetItemId, DatasetItemIdsProvider, DatasetState, DatasetWatchProperties, Filter, FocusChangedEvent, ItemCount, QueryDefinition, QueryResult, RowEvent, RowItem, SELECTION_COLUMN_NAME, Selection, SelectionEvents, SortSpecifier, SuggestFilter, TableItem, TableModel, TableModelEvents, TableModelState, TableModelWatchProperties } from '../__internal__/BGEg3fBn.js';

package/result-api/api/service.d.ts

@@ -1,7 +1,8 @@
 import { Store, ComplexQueryExpression, QueryOptions } from 'store-api/api';
-import { DataTableCollection, DataTable, DatasetItemIdsProvider } from '../__internal__/Bnw4PH_u.js';
+import { DataTableCollection, DataTable, DatasetItemIdsProvider } from '../__internal__/BGEg3fBn.js';
 import { EventSource, Handle } from 'apprt-core/Types';
-import 'esri/geometry';
+import '@arcgis/core/geometry';
+import '@arcgis/core/geometry/SpatialReference';
 
 /** Events fired by the data table service */
 interface ResultViewerServiceEvents {
@@ -82,6 +83,12 @@ interface ResultViewerService extends EventSource<ResultViewerServiceEvents> {
      * Provides access to a factory to assemble DataTables.
      */
     readonly dataTableFactory: DataTableFactory;
+    /**
+     * Controls whether results are visualized and interactive on the map.
+     * When enabled, result features are highlighted on the map and selecting
+     * a data table will automatically zoom to its features.
+     */
+    enableMapInteraction: boolean;
 }
 /**
  * Factory for data tables.

package/result-api/api/ui.d.ts

@@ -1,6 +1,7 @@
-import { DataTableCollection } from '../__internal__/Bnw4PH_u.js';
+import { DataTableCollection } from '../__internal__/BGEg3fBn.js';
 import { EventSource } from 'apprt-core/Types';
-import 'esri/geometry';
+import '@arcgis/core/geometry';
+import '@arcgis/core/geometry/SpatialReference';
 import 'store-api/api';
 
 /**

package/result-api/package.json

@@ -1,5 +1,5 @@
 {
     "name": "result-api",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/search-api/api.d.ts

@@ -50,6 +50,15 @@ interface SearchOptions {
      * The default value is `15`.
      */
     count?: number;
+    /**
+     * Whether to request the number of total results from the queries stores.
+     *
+     * This is true by default for backwards compatibility reasons.
+     * Set this to `false` to skip requesting the total result count.
+     *
+     * See also {@link ResultSet.total}.
+     */
+    queryTotal?: boolean;
     /**
      * An optional array of map action IDs.
      * The associated map actions are triggered when an item is selected (see {@link ResultItem.select}).
@@ -113,8 +122,13 @@ interface ResultGroup {
 interface ResultSet {
     /** Result items, up to the requested amount. */
     readonly items: ResultItem[];
-    /** Total number of available results */
-    readonly total: number;
+    /**
+     * Total number of available results.
+     *
+     * This is present if the `queryTotal` option is set to `true` (the default).
+     * This is always undefined if `queryTotal` is set to `false`.
+     */
+    readonly total: number | undefined;
     /**
      * Selects multiple items at once.
      * The items must belong to this result set (from `this.items`).

package/search-api/package.json

@@ -1,5 +1,5 @@
 {
     "name": "search-api",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/search-ui/api.d.ts

@@ -53,7 +53,8 @@ interface SearchUiService extends EventSource<SearchUiServiceEvents> {
 }
 /**
  * Interface to react on the 'Enter' key pressed event of the search-ui input field. It will provide the
- * current text from the input field to another component. This interface is used by the product `smart.finder`
+ * current text from the input field to another component.
+ *
  * Only one action is allowed. It must be registered as a service which provides `search-ui.EnterKeyAction`.
  */
 interface SearchUiEnterKeyAction {

package/search-ui/package.json

@@ -1,5 +1,5 @@
 {
     "name": "search-ui",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/selection-services/DrawingSpatialInputAction.d.ts

@@ -1,7 +1,7 @@
 import CancelablePromise from 'apprt-core/CancelablePromise';
 import SpatialInputActionImpl, { CommonSpatialInputActionOptions } from './SpatialInputAction.js';
 import { MapWidgetModel } from 'map-widget/api';
-import { Geometry } from 'esri/geometry';
+import { Geometry } from '@arcgis/core/geometry';
 import { DrawingFactory, Drawing } from 'mapdraw-api/api';
 import './api/index.js';
 import 'store-api/QueryExecutions';
@@ -26,4 +26,5 @@ declare class DrawingSpatialInputAction extends SpatialInputActionImpl {
     _intercept(geometry: Geometry, options: Record<string, any>): Geometry;
 }
 
-export { type DrawingSpatialInputActionOptions, DrawingSpatialInputAction as default };
+export { DrawingSpatialInputAction as default };
+export type { DrawingSpatialInputActionOptions };

package/selection-services/SearchSource.d.ts

@@ -1,8 +1,8 @@
-import { SpatialQueryModifier, SearchSource } from './api/index.js';
-import { Store } from 'store-api/api';
 import { ServiceProperties } from 'apprt/api';
+import { Store } from 'store-api/api';
+import { SpatialQueryModifier, SearchSource } from './api/index.js';
 import 'apprt-core/CancelablePromise';
-import 'esri/geometry';
+import '@arcgis/core/geometry';
 import 'store-api/QueryExecutions';
 import 'apprt-core/Types';
 
@@ -42,4 +42,5 @@ interface SearchSourceConstructor {
 }
 declare const _default: SearchSourceConstructor;
 
-export { type SearchSourceConstructor, type SearchSourceConstructorOptions, _default as default };
+export { _default as default };
+export type { SearchSourceConstructor, SearchSourceConstructorOptions };

package/selection-services/SpatialInputAction.d.ts

@@ -1,6 +1,6 @@
 import CancelablePromise from 'apprt-core/CancelablePromise';
 import { SpatialInputAction } from './api/index.js';
-import { Geometry } from 'esri/geometry';
+import { Geometry } from '@arcgis/core/geometry';
 import 'store-api/QueryExecutions';
 import 'store-api/api';
 import 'apprt-core/Types';
@@ -31,4 +31,5 @@ declare class SpatialInputActionImpl implements SpatialInputAction {
     trigger(options: Record<string, any>): CancelablePromise<Geometry>;
 }
 
-export { type CommonSpatialInputActionOptions, SpatialInputActionImpl as default };
+export { SpatialInputActionImpl as default };
+export type { CommonSpatialInputActionOptions };

package/selection-services/TolerancePointDrawingInputAction.d.ts

@@ -1,4 +1,4 @@
-import { Geometry } from 'esri/geometry';
+import { Geometry } from '@arcgis/core/geometry';
 import DrawingSpatialInputAction, { DrawingSpatialInputActionOptions } from './DrawingSpatialInputAction.js';
 import 'apprt-core/CancelablePromise';
 import './SpatialInputAction.js';

package/selection-services/api/index.d.ts

@@ -1,5 +1,5 @@
 import CancelablePromise from 'apprt-core/CancelablePromise';
-import { Geometry } from 'esri/geometry';
+import { Geometry } from '@arcgis/core/geometry';
 import { QueryExecutions } from 'store-api/QueryExecutions';
 import { Store, QueryOptions, IndexableThing } from 'store-api/api';
 import { Watchable } from 'apprt-core/Types';

package/selection-services/package.json

@@ -1,5 +1,5 @@
 {
     "name": "selection-services",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/store-api/ComplexQuery.d.ts

@@ -1,5 +1,5 @@
 import { ComplexQueryExpression } from './api/ComplexQueryLang.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * Callback method that is triggered while walking over an AST.
@@ -292,4 +292,5 @@ declare class ComplexQuery {
  */
 declare function encodePostOrder<T>(encoder: Encoder<T>, walkerOrAst: Walker | AST): any;
 
-export { type AST, type ASTNode, type ChildVisitCallback, ComplexQuery, type ComplexQueryOptions, type Encoder, type OperatorChain, type OperatorImpl, type VisitCallback, type Walker, ComplexQuery as default, encodePostOrder, walkerForASTNode };
+export { ComplexQuery, ComplexQuery as default, encodePostOrder, walkerForASTNode };
+export type { AST, ASTNode, ChildVisitCallback, ComplexQueryOptions, Encoder, OperatorChain, OperatorImpl, VisitCallback, Walker };

package/store-api/InMemoryStore.d.ts

@@ -1,7 +1,7 @@
-import { Evented } from 'apprt-core/Events';
+import { Evented, EventSource, EventedOn } from 'apprt-core/Events';
 import { Metadata, StoreEvents, SyncStore, QueryOptions, ResultItems, SyncWritableStore, CreateOptions, AsyncStore, AsyncQueryResult, GetOptions, AsyncWritableStore } from './api/Store.js';
 import { ComplexQueryExpression } from './api/ComplexQueryLang.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * Constructor options of all in-memory store variants.
@@ -57,9 +57,9 @@ declare class SyncWritableInMemoryStore<ItemType extends Record<string, any>, ID
 /**
  * A readonly asynchronous store.
  */
-declare class AsyncInMemoryStore<ItemType extends Record<string, any>, IDType extends string | number> implements AsyncStore<ItemType, IDType> {
+declare class AsyncInMemoryStore<ItemType extends Record<string, any>, IDType extends string | number> implements AsyncStore<ItemType, IDType>, EventSource<StoreEvents<IDType>> {
     protected _mem: SyncWritableStore<ItemType, IDType>;
-    readonly on: AsyncStore<ItemType, IDType>["on"];
+    readonly on: EventedOn<StoreEvents<IDType>>;
     constructor(opts?: ConstructorOptions<ItemType>);
     get id(): string | undefined;
     get idProperty(): string | undefined;
@@ -77,4 +77,5 @@ declare class AsyncWritableInMemoryStore<ItemType extends Record<string, any>, I
     remove(id: IDType): Promise<void>;
 }
 
-export { AsyncInMemoryStore, AsyncWritableInMemoryStore, type ConstructorOptions, SyncInMemoryStore, SyncWritableInMemoryStore };
+export { AsyncInMemoryStore, AsyncWritableInMemoryStore, SyncInMemoryStore, SyncWritableInMemoryStore };
+export type { ConstructorOptions };

package/store-api/QueryExecution.d.ts

@@ -93,4 +93,5 @@ type QueryExecutionConstructor<T> = new (options?: QueryExecutionConstructorOpti
 /** Creates a QueryExecution */
 declare const _default: QueryExecutionConstructor<unknown>;
 
-export { type DataSource, type QueryExecution, type QueryExecutionConstructor, type QueryResult, type ResultItems, type Watchable, _default as default };
+export { _default as default };
+export type { DataSource, QueryExecution, QueryExecutionConstructor, QueryResult, ResultItems, Watchable };

package/store-api/QueryExecutions.d.ts

@@ -1,4 +1,4 @@
-import { QueryExecution, Watchable } from './QueryExecution.js';
+import { Watchable, QueryExecution } from './QueryExecution.js';
 import 'apprt-core/Mutable';
 
 type QueryExecutionsConstructorOptions = Partial<Pick<QueryExecutions, "executions">>;
@@ -47,4 +47,5 @@ type QueryExecutionsConstructor = new (options?: QueryExecutionsConstructorOptio
  */
 declare const _default: QueryExecutionsConstructor;
 
-export { type QueryExecutionStrategy, type QueryExecutions, type QueryExecutionsConstructor, _default as default };
+export { _default as default };
+export type { QueryExecutionStrategy, QueryExecutions, QueryExecutionsConstructor };

package/store-api/QueryResults.d.ts

@@ -1,9 +1,7 @@
 import { toQueryResult } from './utils.js';
-import 'apprt-core/CancelablePromise';
-import 'apprt-core/Promise';
 import './ComplexQuery.js';
 import './api/ComplexQueryLang.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 import './api/Store.js';
 import 'apprt-core/Events';
 

package/store-api/SpatialQuery.d.ts

@@ -1,6 +1,6 @@
 import ComplexQuery, { ComplexQueryOptions } from './ComplexQuery.js';
 import './api/ComplexQueryLang.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * SpatialQuery registers and implements all SpatialOperators using the geometry engine of the esri js api.
@@ -31,4 +31,5 @@ interface SpatialQueryExtension {
 /** reexports ComplexQuery with spatial operators */
 declare const SpatialQuery: SpatialQueryType;
 
-export { SpatialQuery, type SpatialQueryExtension, type SpatialQueryType, SpatialQuery as default };
+export { SpatialQuery, SpatialQuery as default };
+export type { SpatialQueryExtension, SpatialQueryType };

package/store-api/api/ComplexQueryLang.d.ts

@@ -1,4 +1,4 @@
-import Geometry from 'esri/geometry/Geometry';
+import Geometry from '@arcgis/core/geometry/Geometry';
 
 /**
  * Language specification of a ComplexQuery.

package/store-api/api/Store.d.ts

@@ -1,6 +1,6 @@
 import { ComplexQueryExpression } from './ComplexQueryLang.js';
 import { EventSource } from 'apprt-core/Events';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * An object that allows index based access.
@@ -17,10 +17,6 @@ interface ResultItems<ItemType extends IndexableThing> extends ReadonlyArray<Ite
      * The client may query again with an appropriate `start` value.
      */
     readonly hasMore?: boolean;
-    /** Function to cancel the query. It is always 'undefined' in synchronous responses.
-     * @deprecated Use AbortOptions (AbortSignal)
-     */
-    readonly cancel?: undefined;
     /** Function to react on the provided result. It is always 'undefined' in synchronous responses. */
     readonly then?: undefined;
 }
@@ -33,10 +29,6 @@ interface AsyncQueryResult<ItemType extends IndexableThing> extends Promise<Resu
      * @deprecated transport the 'total' value on the result array.
      */
     readonly total?: Promise<number>;
-    /** Function to cancel the query.
-     * @deprecated Use AbortOptions (AbortSignal)
-     */
-    cancel?(msg?: string): void;
 }
 type QueryResult<ItemType extends IndexableThing> = ResultItems<ItemType> | AsyncQueryResult<ItemType>;
 /** Options to specify the results for queries. */
@@ -334,7 +326,7 @@ interface Metadata {
     readonly supportsGeometryGeneralization?: boolean;
     /**
      * Flag to indicate, if the store can react to the 'sort' option in queries.
-     * If this flag ommited, the default value is 'true'.
+     * If this flag omitted, the default value is 'true'.
      */
     readonly supportsSorting?: boolean;
     /**

package/store-api/api/index.d.ts

@@ -1,4 +1,4 @@
 export { AbortOptions, AllowedIdTypes, AsyncQueryResult, AsyncStore, AsyncWritableStore, CreateOptions, FieldData, GeometryOptions, GetOptions, IndexableThing, Metadata, PaginationOptions, QueryInterpretationOptions, QueryOptions, QueryResult, ResultItems, RetrievalOptions, SortItem, SortOptions, Store, StoreChangedEvent, StoreEvents, SyncStore, SyncWritableStore, WellKnownFieldTypes, WritableStore } from './Store.js';
 export { AndExpression, ComplexQueryExpression, ElementMatchExpression, EqualsExpression, EqualsWildCardExpression, ExistsExpression, GreaterExpression, GreaterOrEqual, InExpression, LesserExpression, LesserOrEqualExpression, LogicExpression, NOrExpression, NotEqualExpression, NotExpression, NotInExpression, OrExpression, ShortAndExpression, SpatialContainsExpression, SpatialCrossesExpression, SpatialEnvelopeIntersectsExpression, SpatialIntersectsExpression, SpatialOperatorExpression, SpatialOverlapsExpression, SpatialTouchesExpression, SpatialWithinExpression, SuggestExpression, ValueOperatorExpression } from './ComplexQueryLang.js';
 import 'apprt-core/Events';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';

package/store-api/package.json

@@ -1,5 +1,5 @@
 {
     "name": "store-api",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/store-api/rest/BaseRestStore.d.ts

@@ -2,7 +2,7 @@ import { ApprtRequestInit, ApprtRequestTarget, CustomFetch } from 'apprt-fetch';
 import { IndexableThing, AsyncStore, Metadata, GetOptions, QueryOptions, AsyncQueryResult, ResultItems } from '../api/Store.js';
 import { ComplexQueryExpression } from '../api/ComplexQueryLang.js';
 import 'apprt-core/Events';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * Additional request options.
@@ -180,4 +180,5 @@ declare class BaseRestStore<ItemType extends IndexableThing, IDType extends stri
     private _fetchMetadata;
 }
 
-export { BaseRestStore, type InternalRequestOptions, type MethodParameters, type RequestOptions };
+export { BaseRestStore };
+export type { InternalRequestOptions, MethodParameters, RequestOptions };

package/store-api/rest/BaseWriteableRestStore.d.ts

@@ -2,7 +2,7 @@ import { BaseRestStore, RequestOptions } from './BaseRestStore.js';
 import { IndexableThing, AsyncWritableStore, CreateOptions } from '../api/Store.js';
 import 'apprt-fetch';
 import '../api/ComplexQueryLang.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 import 'apprt-core/Events';
 
 /**

package/store-api/rest/ComplexQueryToSQL.d.ts

@@ -1,6 +1,6 @@
 import { AST, Walker, ComplexQueryOptions, ASTNode } from '../ComplexQuery.js';
 import { ComplexQueryExpression } from '../api/ComplexQueryLang.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 type Transformer = (node: ASTNode, queryOptions: ComplexQueryOptions, subResults?: string[]) => string;
 /**

package/store-api/rest/ComplexQueryToSolrQL.d.ts

@@ -1,6 +1,6 @@
 import { ComplexQueryExpression } from '../api/ComplexQueryLang.js';
 import { ComplexQueryOptions, ASTNode, AST, Walker } from '../ComplexQuery.js';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * Options extended by a 'geometryField'.
@@ -67,4 +67,5 @@ declare const toSolrQL: (query?: ComplexQueryExpression | undefined, options?: C
 declare const astToSolrQL: (astOrWalker: Walker | AST) => string;
 declare const _operatorMapping: Record<string, Transformer>;
 
-export { type ComplexQueryToSolrQLOptions, type CustomTransformer, type Transformer, _operatorMapping, astToSolrQL, overload, toSolrQL };
+export { _operatorMapping, astToSolrQL, overload, toSolrQL };
+export type { ComplexQueryToSolrQLOptions, CustomTransformer, Transformer };

package/store-api/rest/RQLStore.d.ts

@@ -3,7 +3,7 @@ import { ComplexQueryExpression } from '../api/ComplexQueryLang.js';
 import { BaseWriteableRestStore } from './BaseWriteableRestStore.js';
 import { ComplexQueryOptions, ASTNode } from '../ComplexQuery.js';
 import 'apprt-core/Events';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 import './BaseRestStore.js';
 import 'apprt-fetch';
 

package/store-api/rest/SQLStore.d.ts

@@ -2,7 +2,7 @@ import { QueryOptions } from '../api/Store.js';
 import { ComplexQueryExpression } from '../api/ComplexQueryLang.js';
 import { BaseWriteableRestStore } from './BaseWriteableRestStore.js';
 import 'apprt-core/Events';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 import './BaseRestStore.js';
 import 'apprt-fetch';
 

package/store-api/utils.d.ts

@@ -1,10 +1,8 @@
-import CancelablePromise from 'apprt-core/CancelablePromise';
-import CPromise from 'apprt-core/Promise';
 import { ComplexQueryOptions } from './ComplexQuery.js';
-import { IndexableThing, ResultItems, SortOptions, PaginationOptions, AsyncQueryResult, Metadata } from './api/Store.js';
+import { ResultItems, AsyncQueryResult, IndexableThing, SortOptions, PaginationOptions, Metadata } from './api/Store.js';
 import { ComplexQueryExpression } from './api/ComplexQueryLang.js';
 import 'apprt-core/Events';
-import 'esri/geometry/Geometry';
+import '@arcgis/core/geometry/Geometry';
 
 /**
  * Sorts the given {@link ResultItems} by the rules specified in "options.sort".
@@ -60,8 +58,6 @@ declare function buildResult<T extends {}>(items: ReadonlyArray<T>, total?: numb
  * @returns A QueryResult object.
  */
 declare function toQueryResult<T extends {}>(result: T[]): ResultItems<T>;
-declare function toQueryResult<T extends {}>(result: CPromise<ResultItems<T>>): AsyncQueryResult<T>;
-declare function toQueryResult<T extends {}>(result: CancelablePromise<T>): AsyncQueryResult<T>;
 declare function toQueryResult<T extends {}>(result: Promise<ResultItems<T>>): AsyncQueryResult<T>;
 declare function toQueryResult<T extends {}>(result: undefined): ResultItems<T>;
 /**

package/system/api/internal.d.ts

@@ -1,5 +1,5 @@
 import CancelablePromise from 'apprt-core/CancelablePromise';
-import { ComponentContext, Bundle, ComponentProperties, BundleContext, ServiceReference, ServiceInstance, BundleId, ServiceEvent, AnyPropertyValue, ConfigurationStore, ConfigAdminService, ConfigurationStoreEntry, Configuration, AppConfigJson } from 'apprt/api';
+import { ServiceInstance, ComponentContext, ComponentProperties, Bundle, BundleContext, ServiceReference, BundleId, ServiceEvent, AnyPropertyValue, ConfigurationStore, ConfigAdminService, ConfigurationStoreEntry, Configuration, AppConfigJson } from 'apprt/api';
 
 interface InternalComponentContext<ExpectedServiceType extends ComponentServiceInstance> extends ComponentContext<ExpectedServiceType> {
     dispose(): void;

package/system/package.json

@@ -1,5 +1,5 @@
 {
     "name": "system",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/system/user/Authentication.d.ts

@@ -1,4 +1,4 @@
-import { UserAdminService, Authentication, User } from 'apprt/api';
+import { Authentication, UserAdminService, User } from 'apprt/api';
 
 interface AuthenticationOptions {
     name?: string;
@@ -21,4 +21,5 @@ declare class AuthenticationImpl implements Authentication {
     logout(): boolean | Promise<boolean>;
 }
 
-export { type AuthenticationOptions, AuthenticationImpl as default };
+export { AuthenticationImpl as default };
+export type { AuthenticationOptions };

package/system/user/Authorization.d.ts

@@ -15,4 +15,5 @@ declare class AuthorizationImpl implements Authorization {
     getRoles(): string[];
 }
 
-export { type AuthorizationOptions, AuthorizationImpl as default };
+export { AuthorizationImpl as default };
+export type { AuthorizationOptions };

package/system/user/User.d.ts

@@ -12,4 +12,5 @@ declare class UserImpl implements User {
     get(key: string): any;
 }
 
-export { type UserOptions, UserImpl as default };
+export { UserImpl as default };
+export type { UserOptions };

package/templatelayout/package.json

@@ -1,5 +1,5 @@
 {
     "name": "templatelayout",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/test-utils/package.json

@@ -1,5 +1,5 @@
 {
     "name": "test-utils",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/test-utils/waitFor.d.ts

@@ -49,4 +49,5 @@ declare function waitUntil<T>(resolver: () => Promise<T> | T, options?: WaitOpti
  */
 declare function sleep(timeout?: number): Promise<void>;
 
-export { type WaitOptions, sleep, waitFor, waitUntil };
+export { sleep, waitFor, waitUntil };
+export type { WaitOptions };

package/theme-tester/package.json

@@ -1,5 +1,5 @@
 {
     "name": "theme-tester",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/toc/api/Action.d.ts

@@ -1,8 +1,8 @@
 import { TocItem } from './Item.js';
-import 'esri/layers/Layer';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/support/WMSSublayer';
-import 'esri/Map';
+import '@arcgis/core/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/support/WMSSublayer';
+import '@arcgis/core/Map';
 
 /**
  * Provides additional action definitions to the TOC.

package/toc/api/Item.d.ts

@@ -1,7 +1,7 @@
-import Layer from 'esri/layers/Layer';
-import Sublayer from 'esri/layers/support/Sublayer';
-import WMSSublayer from 'esri/layers/support/WMSSublayer';
-import EsriMap from 'esri/Map';
+import Layer from '@arcgis/core/layers/Layer';
+import Sublayer from '@arcgis/core/layers/support/Sublayer';
+import WMSSublayer from '@arcgis/core/layers/support/WMSSublayer';
+import EsriMap from '@arcgis/core/Map';
 
 type SublayerType = Sublayer | WMSSublayer;
 type RefType = EsriMap | Layer | SublayerType;
@@ -89,7 +89,7 @@ type ChildrenToggleMode = "independent" | "exclusive" | "inherited";
 /**
  * The type of the toc item.
  * Well-known types are:
- *    * `layer`    - item represents an layer (in the sense of a `esri/layer/Layer` instance)
+ *    * `layer`    - item represents an layer (in the sense of a `@arcgis/core/layer/Layer` instance)
  *    * `sublayer` - item represents a sub layer (e.g. `wms` or `map-image` sublayer)
  *    * `root`     - item is the root of the layer tree
  * The list may be extended in the future.

package/toc/api/StateChecker.d.ts

@@ -1,9 +1,9 @@
 import { MapWidgetModel } from 'map-widget/api';
 import { TocItem } from './Item.js';
-import 'esri/layers/Layer';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/support/WMSSublayer';
-import 'esri/Map';
+import '@arcgis/core/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/support/WMSSublayer';
+import '@arcgis/core/Map';
 
 /**
  * A state checker can add additional messages (such as warnings)

package/toc/api/index.d.ts

@@ -1,8 +1,8 @@
 export { ActionDefinition, ActionDefinitionFactory, ActionType, BaseActionDefinition, ButtonActionDefinition, ButtonRowActionDefinition, SliderActionDefinition, TextLabelActionDefinition } from './Action.js';
 export { BaseTocItem, ChildrenToggleMode, ListMode, RefType, SublayerType, TocItem, TocItemLayer, TocItemRoot, TocItemSublayer, TocItemType } from './Item.js';
 export { CheckStateMessages, CheckStateOptions, CheckStateResult, StateChecker } from './StateChecker.js';
-import 'esri/layers/Layer';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/support/WMSSublayer';
-import 'esri/Map';
+import '@arcgis/core/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/support/WMSSublayer';
+import '@arcgis/core/Map';
 import 'map-widget/api';

package/toc/package.json

@@ -1,5 +1,5 @@
 {
     "name": "toc",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }

package/toolrules/package.json

@@ -1,5 +1,5 @@
 {
     "name": "toolrules",
-    "version": "4.20.1",
+    "version": "4.20.2-RC-1",
     "types": ""
 }