Skip to content

Commit 5d826b9

Browse files
gavinrpatrickarlt
andauthored
moved common types to arcgis-rest-request package (#926)
* moved common types to arcgis-rest-request package * export types * Update README.md Co-authored-by: Patrick Arlt <[email protected]> * package-lock - remove types * move item types to portal * fix test * fix test types * fix tests * removed IEnvelope * moved ILayer type to arcgis-rest-service-admin package and removed portions of the webmap types that are not used elsewhere * remove unused types * moved and removed types - moved IPagingParams and IPagedResponse from to the `arcgis-rest-portal` package - moved ITable and ILayerDefinition from webmap.ts (to service.ts) - moved IField from webmap.ts (to feature.ts) - removed other unused types in webmap.ts * moved IServiceInfo ... into arcgis-rest-service-admin package * moved IViewServiceSources ... into arcgis-rest-service-admin package * Moved `IServiceNameAvailable` to `argis-rest-portal` * cleanup types changes * updated ts-node to fix errors in node v16 Co-authored-by: Patrick Arlt <[email protected]>
1 parent 305d5fc commit 5d826b9

File tree

101 files changed

+1004
-2161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1004
-2161
lines changed

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,12 @@ For a specific package
7575

7676
### Packages
7777

78-
- [`@esri/arcgis-rest-request`](./packages/arcgis-rest-request/) - Underpins other packages and supports making low-level requests.
78+
- [`@esri/arcgis-rest-request`](./packages/arcgis-rest-request/) - Core module implementing basic request code, shared TypeScript types and common utilities.
7979
- [`@esri/arcgis-rest-portal`](./packages/arcgis-rest-portal) - Methods for working with ArcGIS Online/Enterprise content and users.
8080
- [`@esri/arcgis-rest-feature-layer`](./packages/arcgis-rest-feature-layer) - Functions for querying and editing features inside of hosted feature layers.
8181
- [`@esri/arcgis-rest-service-admin`](./packages/arcgis-rest-service-admin) - Functions for administering hosted feature services.
8282
- [`@esri/arcgis-rest-geocoding`](./packages/arcgis-rest-geocoding) - Geocoding wrapper for `@esri/arcgis-rest-js`
8383
- [`@esri/arcgis-rest-routing`](./packages/arcgis-rest-routing) - Routing and directions wrapper for `@esri/arcgis-rest-js`.
84-
- [`@esri/arcgis-rest-types`](./packages/arcgis-rest-types/) - Common Typings for TypeScript developers.
8584

8685
### Frequently Asked Questions
8786

package-lock.json

+18-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"slug": "^0.9.1",
123123
"sri-toolbox": "0.2.0",
124124
"trash-cli": "^4.0.0",
125-
"ts-node": "^10.2.1",
125+
"ts-node": "^10.3.1",
126126
"typedoc": "^0.21.0",
127127
"typescript": "^4.0.0",
128128
"ultra-runner": "^3.10.5"
@@ -158,7 +158,6 @@
158158
"url": "https://github.com/Esri/arcgis-rest-js/issues"
159159
},
160160
"workspaces": [
161-
"./packages/arcgis-rest-types",
162161
"./packages/arcgis-rest-request",
163162
"./packages/arcgis-rest-auth",
164163
"./packages/arcgis-rest-demographics",

packages/arcgis-rest-auth/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
},
4141
"dependencies": {
4242
"@esri/arcgis-rest-request": "^3.3.0",
43-
"@esri/arcgis-rest-types": "^3.3.0",
4443
"tslib": "^2.3.0"
4544
},
4645
"contributors": [

packages/arcgis-rest-auth/src/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ export {
2626
IUserRequestOptions,
2727
IFetchTokenResponse,
2828
IGenerateTokenResponse,
29-
IAppAccess
29+
IAppAccess,
30+
IUser
3031
} from "@esri/arcgis-rest-request";

packages/arcgis-rest-demographics/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"node": ">=12.20.0"
4343
},
4444
"dependencies": {
45-
"@esri/arcgis-rest-types": "^3.3.0",
4645
"tslib": "^2.3.0"
4746
},
4847
"peerDependencies": {

packages/arcgis-rest-demographics/src/getAvailableCountries.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import {
55
request,
66
cleanUrl,
7-
appendCustomParams
7+
appendCustomParams,
8+
IExtent
89
} from "@esri/arcgis-rest-request";
9-
import { IEnvelope } from "@esri/arcgis-rest-types";
10+
1011

1112
import {
1213
ARCGIS_ONLINE_GEOENRICHMENT_URL,
@@ -33,7 +34,7 @@ export interface ICountry {
3334
continent: string;
3435
distanceUnits: string;
3536
esriUnits: string;
36-
defaultExtent: IEnvelope;
37+
defaultExtent: IExtent;
3738
defaultDatasetID: string;
3839
datasets?: string[];
3940
hierarchies?: IHierarchy[];

packages/arcgis-rest-demographics/src/helpers.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
* Apache-2.0 */
33

44
import {
5-
IRequestOptions
5+
IRequestOptions,
6+
IFeatureSet
67
} from "@esri/arcgis-rest-request";
78

8-
import { IFeatureSet } from "@esri/arcgis-rest-types";
9-
109
const ARCGIS_ONLINE_GEOENRICHMENTSERVER_URL = "https://geoenrich.arcgis.com/arcgis/rest/services/World/geoenrichmentserver"
1110
export const ARCGIS_ONLINE_GEOENRICHMENT_URL = `${ARCGIS_ONLINE_GEOENRICHMENTSERVER_URL}/Geoenrichment`;
1211
export const ARCGIS_ONLINE_STANDARD_GEOGRAPHY_QUERY_URL = `${ARCGIS_ONLINE_GEOENRICHMENTSERVER_URL}/StandardGeographyQuery`;

packages/arcgis-rest-demographics/src/index.ts

+8
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@ export * from "./getAvailableDataCollections.js";
66
export * from "./getAvailableGeographyLevels.js";
77
export * from "./getGeography.js";
88
export * from "./queryDemographicData.js";
9+
10+
// Types that are used in this package are re-exported for convenience and
11+
// to make the links work correctly in the documentation pages.
12+
export type {
13+
IRequestOptions,
14+
IFeatureSet,
15+
IExtent
16+
} from "@esri/arcgis-rest-request";

packages/arcgis-rest-feature-layer/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"node": ">=12.20.0"
4242
},
4343
"dependencies": {
44-
"@esri/arcgis-rest-types": "^3.3.0",
4544
"tslib": "^2.3.0"
4645
},
4746
"peerDependencies": {

packages/arcgis-rest-feature-layer/src/add.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import {
55
request,
66
cleanUrl,
7-
appendCustomParams
7+
appendCustomParams,
8+
IFeature
89
} from "@esri/arcgis-rest-request";
910

10-
import type { IFeature } from "@esri/arcgis-rest-types";
11-
1211
import { ISharedEditOptions, IEditFeatureResult } from "./helpers.js";
1312

1413
/**

packages/arcgis-rest-feature-layer/src/applyEdits.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import {
55
request,
66
cleanUrl,
7-
appendCustomParams
7+
appendCustomParams,
8+
IFeature
89
} from "@esri/arcgis-rest-request";
910

10-
import type { IFeature } from "@esri/arcgis-rest-types";
11-
1211
import { ISharedEditOptions, IApplyEditsResult } from "./helpers.js";
1312

1413
/**

0 commit comments

Comments
 (0)