Merge pull request #508 from Esri/composition-and-defaults

Draft: composition and defaults
Esri · Apr 16, 2019 · a871246 · a871246
2 parents 18b3967 + a579715
commit a871246
Show file tree

Hide file tree

Showing 53 changed files with 573 additions and 297 deletions.
diff --git a/packages/arcgis-rest-auth/test/UserSession.test.ts b/packages/arcgis-rest-auth/test/UserSession.test.ts
@@ -9,7 +9,7 @@ import {
   ArcGISRequestError,
   ArcGISAuthError,
   ErrorTypes
-} from "@esri/arcgis-rest-request/src";
+} from "@esri/arcgis-rest-request";
 import * as fetchMock from "fetch-mock";
 import { YESTERDAY, TOMORROW } from "./utils";
 

diff --git a/packages/arcgis-rest-feature-service-admin/test/addTo.test.ts b/packages/arcgis-rest-feature-service-admin/test/addTo.test.ts
@@ -3,14 +3,14 @@
 
 import * as fetchMock from "fetch-mock";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 import {
   encodeParam,
   ErrorTypes,
   ILayer,
   ITable
-} from "@esri/arcgis-rest-request/src";
+} from "@esri/arcgis-rest-request";
 
 import { addToServiceDefinition } from "../src/addTo";
 import {

diff --git a/packages/arcgis-rest-feature-service-admin/test/create.test.ts b/packages/arcgis-rest-feature-service-admin/test/create.test.ts
@@ -8,9 +8,9 @@ import { createFeatureService } from "../src/create";
 import { FeatureServiceResponse } from "./mocks/service";
 import { MoveToFolderResponse } from "./mocks/move";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
 
 describe("create feature service", () => {
   afterEach(fetchMock.restore);

diff --git a/packages/arcgis-rest-feature-service-admin/test/mocks/layerDefinition.ts b/packages/arcgis-rest-feature-service-admin/test/mocks/layerDefinition.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { ILayerDefinition, IExtent } from "@esri/arcgis-rest-request/src";
+import { ILayerDefinition, IExtent } from "@esri/arcgis-rest-request";
 
 const defaultExtent: IExtent = {
   xmin: -180,

diff --git a/packages/arcgis-rest-feature-service-admin/test/mocks/move.ts b/packages/arcgis-rest-feature-service-admin/test/mocks/move.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { IItemMoveResponse } from "@esri/arcgis-rest-portal/src";
+import { IItemMoveResponse } from "@esri/arcgis-rest-portal";
 
 export const MoveToFolderResponse: IItemMoveResponse = {
   folder: "83216cba44bf4357bf06687ec88a847b",

diff --git a/packages/arcgis-rest-feature-service/test/mocks/cvdQueryResponse.ts b/packages/arcgis-rest-feature-service/test/mocks/cvdQueryResponse.ts
@@ -2,7 +2,7 @@
  * Apache-2.0 */
 
 import { IQueryFeaturesResponse } from "../../src/query";
-import { IFeature, IGeometry } from "@esri/arcgis-rest-request/src";
+import { IFeature, IGeometry } from "@esri/arcgis-rest-request";
 
 export const cvdQueryResponse: IQueryFeaturesResponse = {
   objectIdFieldName: "objectid",

diff --git a/packages/arcgis-rest-feature-service/test/mocks/fields.ts b/packages/arcgis-rest-feature-service/test/mocks/fields.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { IField } from "@esri/arcgis-rest-request/src";
+import { IField } from "@esri/arcgis-rest-request";
 
 export const cvdServiceFields: IField[] = [
   {

diff --git a/packages/arcgis-rest-feature-service/test/mocks/service.ts b/packages/arcgis-rest-feature-service/test/mocks/service.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { ILayerDefinition } from "@esri/arcgis-rest-request/src";
+import { ILayerDefinition } from "@esri/arcgis-rest-request";
 import { cvdServiceFields } from "./fields";
 
 export const getFeatureServiceResponse: ILayerDefinition = {

diff --git a/packages/arcgis-rest-portal/src/items/SearchQueryBuilder.ts b/packages/arcgis-rest-portal/src/items/SearchQueryBuilder.ts
@@ -1,4 +1,4 @@
-import { IParamBuilder, warn } from "@esri/arcgis-rest-request";
+import { IParamBuilder, warn } from "@esri/arcgis-rest-request/src";
 
 export class SearchQueryBuilder implements IParamBuilder {
   private termStack: any[] = [];

diff --git a/packages/arcgis-rest-portal/src/items/search.ts b/packages/arcgis-rest-portal/src/items/search.ts
@@ -7,7 +7,7 @@ import {
   appendCustomParams,
   IPagingParams,
   IItem
-} from "@esri/arcgis-rest-request";
+} from "@esri/arcgis-rest-request/src";
 
 import { getPortalUrl } from "../util/get-portal-url";
 import { SearchQueryBuilder } from "./SearchQueryBuilder";

diff --git a/packages/arcgis-rest-portal/src/util/get-portal-url.ts b/packages/arcgis-rest-portal/src/util/get-portal-url.ts
@@ -1,5 +1,6 @@
 /* Copyright (c) 2017 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
+
 import { IRequestOptions, cleanUrl } from "@esri/arcgis-rest-request";
 
 /**

diff --git a/packages/arcgis-rest-portal/test/groups/crud.test.ts b/packages/arcgis-rest-portal/test/groups/crud.test.ts
@@ -7,8 +7,8 @@ import { removeGroup } from "../../src/groups/remove";
 
 import { GroupEditResponse } from "../mocks/groups/responses";
 
-import { encodeParam, IGroupAdd } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam, IGroupAdd } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 import * as fetchMock from "fetch-mock";
 

diff --git a/packages/arcgis-rest-portal/test/groups/join.test.ts b/packages/arcgis-rest-portal/test/groups/join.test.ts
@@ -5,8 +5,8 @@ import { joinGroup, leaveGroup } from "../../src/groups/join";
 
 import { GroupEditResponse } from "../mocks/groups/responses";
 
-import { encodeParam } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 import * as fetchMock from "fetch-mock";

diff --git a/packages/arcgis-rest-portal/test/groups/notification.test.ts b/packages/arcgis-rest-portal/test/groups/notification.test.ts
@@ -1,5 +1,5 @@
-import { encodeParam } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 import * as fetchMock from "fetch-mock";

diff --git a/packages/arcgis-rest-portal/test/groups/protect.test.ts b/packages/arcgis-rest-portal/test/groups/protect.test.ts
@@ -5,8 +5,8 @@ import { protectGroup, unprotectGroup } from "../../src/groups/protect";
 
 import { GroupEditResponse } from "../mocks/groups/responses";
 
-import { encodeParam } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 import * as fetchMock from "fetch-mock";

diff --git a/packages/arcgis-rest-portal/test/items/add.test.ts b/packages/arcgis-rest-portal/test/items/add.test.ts
@@ -14,9 +14,9 @@ import {
 
 import { ItemSuccessResponse } from "../mocks/items/item";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
 
 describe("search", () => {
   afterEach(fetchMock.restore);

diff --git a/packages/arcgis-rest-portal/test/items/create.test.ts b/packages/arcgis-rest-portal/test/items/create.test.ts
@@ -11,9 +11,9 @@ import {
 
 import { ItemSuccessResponse } from "../mocks/items/item";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
 
 describe("search", () => {
   afterEach(fetchMock.restore);

diff --git a/packages/arcgis-rest-portal/test/items/get.test.ts b/packages/arcgis-rest-portal/test/items/get.test.ts
@@ -20,7 +20,7 @@ import {
 
 import { GetItemResourcesResponse } from "../mocks/items/resources";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 describe("get", () => {

diff --git a/packages/arcgis-rest-portal/test/items/protect.test.ts b/packages/arcgis-rest-portal/test/items/protect.test.ts
@@ -7,9 +7,9 @@ import { protectItem, unprotectItem } from "../../src/items/protect";
 
 import { ItemSuccessResponse } from "../mocks/items/item";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
 
 describe("search", () => {
   afterEach(fetchMock.restore);

diff --git a/packages/arcgis-rest-portal/test/items/remove.test.ts b/packages/arcgis-rest-portal/test/items/remove.test.ts
@@ -14,9 +14,9 @@ import { ItemSuccessResponse } from "../mocks/items/item";
 
 import { RemoveItemResourceResponse } from "../mocks/items/resources";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
 
 describe("search", () => {
   afterEach(fetchMock.restore);

diff --git a/packages/arcgis-rest-portal/test/items/search.test.ts b/packages/arcgis-rest-portal/test/items/search.test.ts
@@ -6,7 +6,7 @@ import * as fetchMock from "fetch-mock";
 import { searchItems } from "../../src/items/search";
 
 import { SearchResponse, BigSearchResponse } from "../mocks/items/search";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 import { SearchQueryBuilder } from "../../src/items/SearchQueryBuilder";
 

diff --git a/packages/arcgis-rest-portal/test/items/update.test.ts b/packages/arcgis-rest-portal/test/items/update.test.ts
@@ -15,9 +15,9 @@ import { ItemSuccessResponse } from "../mocks/items/item";
 
 import { UpdateItemResourceResponse } from "../mocks/items/resources";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
 
 describe("search", () => {
   afterEach(fetchMock.restore);

diff --git a/packages/arcgis-rest-portal/test/mocks/groups/responses.ts b/packages/arcgis-rest-portal/test/mocks/groups/responses.ts
@@ -7,7 +7,7 @@ import {
   IGroupUsersResult
 } from "../../../src/groups/get";
 
-import { IGroup } from "@esri/arcgis-rest-request/src";
+import { IGroup } from "@esri/arcgis-rest-request";
 
 export const GroupSearchResponse: IGroupSearchResult = {
   query: "* AND owner:dcadmin",

diff --git a/packages/arcgis-rest-portal/test/mocks/items/item.ts b/packages/arcgis-rest-portal/test/mocks/items/item.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { IItem } from "@esri/arcgis-rest-request/src";
+import { IItem } from "@esri/arcgis-rest-request";
 import {
   IGetRelatedItemsResponse,
   IItemGroupResponse

diff --git a/packages/arcgis-rest-portal/test/mocks/sharing/sharing.ts b/packages/arcgis-rest-portal/test/mocks/sharing/sharing.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 export const MOCK_USER_SESSION = new UserSession({

diff --git a/packages/arcgis-rest-portal/test/mocks/users/user.ts b/packages/arcgis-rest-portal/test/mocks/users/user.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { IUser } from "@esri/arcgis-rest-request/src";
+import { IUser } from "@esri/arcgis-rest-request";
 
 export const AnonUserResponse: IUser = {
   username: "jsmith",

diff --git a/packages/arcgis-rest-portal/test/users/get-user-url.test.ts b/packages/arcgis-rest-portal/test/users/get-user-url.test.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 
 import { getUserUrl } from "../../src/users/get-user-url";
 

diff --git a/packages/arcgis-rest-portal/test/users/get-user.test.ts b/packages/arcgis-rest-portal/test/users/get-user.test.ts
@@ -9,7 +9,7 @@ import {
   GroupAdminUserResponse
 } from "../mocks/users/user";
 
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import * as fetchMock from "fetch-mock";
 
 const TOMORROW = (function() {

diff --git a/packages/arcgis-rest-portal/test/users/invitation.test.ts b/packages/arcgis-rest-portal/test/users/invitation.test.ts
@@ -13,8 +13,8 @@ import {
   UserInvitationResponse
 } from "../mocks/users/invitation";
 
-import { encodeParam } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import * as fetchMock from "fetch-mock";
 
 const TOMORROW = (function() {

diff --git a/packages/arcgis-rest-portal/test/users/notification.test.ts b/packages/arcgis-rest-portal/test/users/notification.test.ts
@@ -11,8 +11,8 @@ import {
   IDeleteSuccessResponse
 } from "../mocks/users/notification";
 
-import { encodeParam } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import * as fetchMock from "fetch-mock";
 
 const TOMORROW = (function() {

diff --git a/packages/arcgis-rest-portal/test/users/update.test.ts b/packages/arcgis-rest-portal/test/users/update.test.ts
@@ -2,8 +2,8 @@
  * Apache-2.0 */
 
 import { updateUser, IUpdateUserResponse } from "../../src/users/update";
-import { encodeParam } from "@esri/arcgis-rest-request/src";
-import { UserSession } from "@esri/arcgis-rest-auth/src";
+import { encodeParam } from "@esri/arcgis-rest-request";
+import { UserSession } from "@esri/arcgis-rest-auth";
 import * as fetchMock from "fetch-mock";
 
 const TOMORROW = (function() {

diff --git a/packages/arcgis-rest-request/src/index.ts b/packages/arcgis-rest-request/src/index.ts
@@ -2,19 +2,28 @@
  * Apache-2.0 */
 
 export * from "./request";
-
+export * from "./utils/append-custom-params";
+export * from "./utils/ArcGISRequestError";
+export * from "./utils/ArcGISAuthError";
+export * from "./utils/check-for-errors";
+export * from "./utils/clean-url";
 export * from "./utils/encode-form-data";
 export * from "./utils/encode-query-string";
-export * from "./utils/warn";
-export * from "./utils/ArcGISRequestError";
-export * from "./utils/retryAuthError";
 export * from "./utils/ErrorTypes";
-export * from "./utils/params";
+export * from "./utils/GrantTypes";
+export * from "./utils/HTTPMethods";
+export * from "./utils/IAuthenticationManager";
+export * from "./utils/IFetchTokenParams";
+export * from "./utils/IGenerateTokenParams";
+export * from "./utils/IParams";
 export * from "./utils/IParamBuilder";
 export * from "./utils/IParamsBuilder";
+export * from "./utils/IRequestOptions";
+export * from "./utils/ITokenRequestOptions";
 export * from "./utils/process-params";
-export * from "./utils/clean-url";
-export * from "./utils/append-custom-params";
+export * from "./utils/ResponseFormats";
+export * from "./utils/retryAuthError";
+export * from "./utils/warn";
 
 export * from "./types/feature";
 export * from "./types/geometry";