gd-sprest-def - npm Package Compare versions

Comparing version 0.2.9 to 0.3.0

base.d.ts

@@ -111,3 +111,3 @@ /**
  */
-export interface IBaseCollection<Type = any, Result = Type> extends IBaseQuery<IBaseResults<Type>, IBaseResults<Result>> { }
+export interface IBaseCollection<Type = any, Result = Type, Methods = void> extends IBaseQuery<IBaseResults<Type> & Methods, IBaseResults<Result> & Methods> { }
 
@@ -114,0 +114,0 @@ /**

lib/base.d.ts

@@ -111,3 +111,3 @@ /**
  */
-export interface IBaseCollection<Type = any, Result = Type> extends IBaseQuery<IBaseResults<Type>, IBaseResults<Result>> { }
+export interface IBaseCollection<Type = any, Result = Type, Methods = void> extends IBaseQuery<IBaseResults<Type> & Methods, IBaseResults<Result> & Methods> { }
 
@@ -114,0 +114,0 @@ /**

lib/Microsoft/Online/SharePoint/MultiGeo/Service/entitytypes.d.ts

@@ -34,3 +34,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface IAllowedDataLocationCollection extends IBaseResults<AllowedDataLocation> {
+export interface IAllowedDataLocationCollection extends IBaseResults<AllowedDataLocation>, AllowedDataLocationCollectionMethods {
 
@@ -42,3 +42,3 @@ }
 **********************************************/
-export interface IAllowedDataLocationQueryCollection extends IBaseResults<AllowedDataLocationQuery> {
+export interface IAllowedDataLocationQueryCollection extends IBaseResults<AllowedDataLocationQuery>, AllowedDataLocationCollectionMethods {
 
@@ -86,3 +86,3 @@ }
 export interface AllowedDataLocationCollectionMethods {
-	getByLocation(location?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation> & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationMethods;
+	getByLocation(location?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation> & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationCollections & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationMethods;
 }
@@ -186,3 +186,3 @@
 **********************************************/
-export interface ICrossFarmGroupMoveJobCollection extends IBaseResults<CrossFarmGroupMoveJob> {
+export interface ICrossFarmGroupMoveJobCollection extends IBaseResults<CrossFarmGroupMoveJob>, CrossFarmGroupMoveJobCollectionMethods {
 
@@ -194,3 +194,3 @@ }
 **********************************************/
-export interface ICrossFarmGroupMoveJobQueryCollection extends IBaseResults<CrossFarmGroupMoveJobQuery> {
+export interface ICrossFarmGroupMoveJobQueryCollection extends IBaseResults<CrossFarmGroupMoveJobQuery>, CrossFarmGroupMoveJobCollectionMethods {
 
@@ -241,3 +241,3 @@ }
 export interface CrossFarmGroupMoveJobCollectionMethods {
-	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJobMethods;
+	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJobMethods;
 }
@@ -299,3 +299,3 @@
 **********************************************/
-export interface ICrossFarmSiteMoveJobCollection extends IBaseResults<CrossFarmSiteMoveJob> {
+export interface ICrossFarmSiteMoveJobCollection extends IBaseResults<CrossFarmSiteMoveJob>, CrossFarmSiteMoveJobCollectionMethods {
 
@@ -307,3 +307,3 @@ }
 **********************************************/
-export interface ICrossFarmSiteMoveJobQueryCollection extends IBaseResults<CrossFarmSiteMoveJobQuery> {
+export interface ICrossFarmSiteMoveJobQueryCollection extends IBaseResults<CrossFarmSiteMoveJobQuery>, CrossFarmSiteMoveJobCollectionMethods {
 
@@ -354,3 +354,3 @@ }
 export interface CrossFarmSiteMoveJobCollectionMethods {
-	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobMethods;
+	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobMethods;
 }
@@ -413,3 +413,3 @@
 **********************************************/
-export interface ICrossFarmUserMoveJobCollection extends IBaseResults<CrossFarmUserMoveJob> {
+export interface ICrossFarmUserMoveJobCollection extends IBaseResults<CrossFarmUserMoveJob>, CrossFarmUserMoveJobCollectionMethods {
 
@@ -421,3 +421,3 @@ }
 **********************************************/
-export interface ICrossFarmUserMoveJobQueryCollection extends IBaseResults<CrossFarmUserMoveJobQuery> {
+export interface ICrossFarmUserMoveJobQueryCollection extends IBaseResults<CrossFarmUserMoveJobQuery>, CrossFarmUserMoveJobCollectionMethods {
 
@@ -468,3 +468,3 @@ }
 export interface CrossFarmUserMoveJobCollectionMethods {
-	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobMethods;
+	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobMethods;
 }
@@ -543,3 +543,3 @@
 **********************************************/
-export interface ICrossGeoTenantPropertyCollection extends IBaseResults<CrossGeoTenantProperty> {
+export interface ICrossGeoTenantPropertyCollection extends IBaseResults<CrossGeoTenantProperty>, CrossGeoTenantPropertyCollectionMethods {
 
@@ -551,3 +551,3 @@ }
 **********************************************/
-export interface ICrossGeoTenantPropertyQueryCollection extends IBaseResults<CrossGeoTenantPropertyQuery> {
+export interface ICrossGeoTenantPropertyQueryCollection extends IBaseResults<CrossGeoTenantPropertyQuery>, CrossGeoTenantPropertyCollectionMethods {
 
@@ -595,3 +595,3 @@ }
 export interface CrossGeoTenantPropertyCollectionMethods {
-	getByPropertyNameAndGeoLocation(propertyName?: string, geo?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyMethods;
+	getByPropertyNameAndGeoLocation(propertyName?: string, geo?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyMethods;
 	getChanges(startTimeInUtc?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty>>;
@@ -639,3 +639,3 @@ }
 **********************************************/
-export interface IGeoAdministratorCollection extends IBaseResults<GeoAdministrator> {
+export interface IGeoAdministratorCollection extends IBaseResults<GeoAdministrator>, GeoAdministratorCollectionMethods {
 
@@ -647,3 +647,3 @@ }
 **********************************************/
-export interface IGeoAdministratorQueryCollection extends IBaseResults<GeoAdministratorQuery> {
+export interface IGeoAdministratorQueryCollection extends IBaseResults<GeoAdministratorQuery>, GeoAdministratorCollectionMethods {
 
@@ -696,5 +696,5 @@ }
 	create(parameters?: Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorEntityData): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
-	getByLoginName(loginName?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
-	getByLoginNameAndType(loginName?: string, memberType?: number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
-	getByObjectId(objectId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
+	getByLoginName(loginName?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorCollections & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
+	getByLoginNameAndType(loginName?: string, memberType?: number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorCollections & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
+	getByObjectId(objectId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorCollections & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
 }
@@ -847,3 +847,3 @@
 export interface GeoTenantInstanceInformationCollectionMethods {
-	getByGeoLocation(geoLocation?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation>;
+	getByGeoLocation(geoLocation?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformationCollections;
 }
@@ -875,3 +875,3 @@
 **********************************************/
-export interface IGroupMoveJobCollection extends IBaseResults<GroupMoveJob> {
+export interface IGroupMoveJobCollection extends IBaseResults<GroupMoveJob>, GroupMoveJobCollectionMethods {
 
@@ -883,3 +883,3 @@ }
 **********************************************/
-export interface IGroupMoveJobQueryCollection extends IBaseResults<GroupMoveJobQuery> {
+export interface IGroupMoveJobQueryCollection extends IBaseResults<GroupMoveJobQuery>, GroupMoveJobCollectionMethods {
 
@@ -930,3 +930,3 @@ }
 export interface GroupMoveJobCollectionMethods {
-	getByGroupName(groupname?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobMethods;
+	getByGroupName(groupname?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobMethods;
 	getMoveReport(moveState?: number, moveDirection?: number, limit?: number, startTime?: any, endTime?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob>>;
@@ -1041,29 +1041,29 @@ }
 export interface MultiGeoServicesBetaCollections extends MultiGeoServicesBetaPropMethods {
-	AllowedDataLocations(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation> & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationCollectionMethods;
+	AllowedDataLocations(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation>;
 	AllowedDataLocations(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation> & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationCollections & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationMethods;
-	CrossFarmGroupMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJobCollectionMethods;
+	CrossFarmGroupMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob>;
 	CrossFarmGroupMoveJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJobMethods;
-	CrossFarmSiteMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobCollectionMethods;
+	CrossFarmSiteMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob>;
 	CrossFarmSiteMoveJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobMethods;
-	CrossFarmUserMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobCollectionMethods;
+	CrossFarmUserMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob>;
 	CrossFarmUserMoveJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobMethods;
-	CrossGeoTenantProperties(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyCollectionMethods;
+	CrossGeoTenantProperties(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty>;
 	CrossGeoTenantProperties(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyCollections & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyMethods;
-	GeoAdministrators(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorCollectionMethods;
+	GeoAdministrators(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
 	GeoAdministrators(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorCollections & Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorMethods;
-	GeoTenantInstanceInformationCollection(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformationCollectionMethods;
+	GeoTenantInstanceInformationCollection(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation>;
 	GeoTenantInstanceInformationCollection(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformationCollections;
-	GroupMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobCollectionMethods;
+	GroupMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob>;
 	GroupMoveJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobMethods;
-	SiteMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobCollectionMethods;
+	SiteMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob>;
 	SiteMoveJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobMethods;
-	SiteRenameJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJobCollectionMethods;
+	SiteRenameJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob>;
 	SiteRenameJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJobCollections;
-	StorageQuotas(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota> & Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuotaCollectionMethods;
+	StorageQuotas(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota>;
 	StorageQuotas(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota> & Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuotaCollections & Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuotaMethods;
 	TenantInformationCollection(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.TenantInformation>;
 	TenantInformationCollection(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.TenantInformation> & Microsoft.Online.SharePoint.MultiGeo.Service.TenantInformationCollections;
-	UnifiedGroups(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup> & Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroupCollectionMethods;
+	UnifiedGroups(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup>;
 	UnifiedGroups(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup> & Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroupCollections;
-	UserMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobCollectionMethods;
+	UserMoveJobs(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>;
 	UserMoveJobs(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobMethods;
@@ -1119,3 +1119,3 @@ }
 **********************************************/
-export interface ISiteMoveJobCollection extends IBaseResults<SiteMoveJob> {
+export interface ISiteMoveJobCollection extends IBaseResults<SiteMoveJob>, SiteMoveJobCollectionMethods {
 
@@ -1127,3 +1127,3 @@ }
 **********************************************/
-export interface ISiteMoveJobQueryCollection extends IBaseResults<SiteMoveJobQuery> {
+export interface ISiteMoveJobQueryCollection extends IBaseResults<SiteMoveJobQuery>, SiteMoveJobCollectionMethods {
 
@@ -1174,3 +1174,3 @@ }
 export interface SiteMoveJobCollectionMethods {
-	getByUrl(url?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobMethods;
+	getByUrl(url?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobMethods;
 	getMoveReport(moveState?: number, moveDirection?: number, limit?: number, startTime?: any, endTime?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob>>;
@@ -1232,3 +1232,3 @@ }
 export interface SiteRenameJobCollectionMethods {
-	getBySiteUrl(siteUrl?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob>;
+	getBySiteUrl(siteUrl?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob> & Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJobCollections;
 }
@@ -1246,3 +1246,3 @@
 **********************************************/
-export interface IStorageQuotaCollection extends IBaseResults<StorageQuota> {
+export interface IStorageQuotaCollection extends IBaseResults<StorageQuota>, StorageQuotaCollectionMethods {
 
@@ -1254,3 +1254,3 @@ }
 **********************************************/
-export interface IStorageQuotaQueryCollection extends IBaseResults<StorageQuotaQuery> {
+export interface IStorageQuotaQueryCollection extends IBaseResults<StorageQuotaQuery>, StorageQuotaCollectionMethods {
 
@@ -1303,3 +1303,3 @@ }
 export interface StorageQuotaCollectionMethods {
-	getByLocation(geoLocation?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota> & Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuotaMethods;
+	getByLocation(geoLocation?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota> & Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuotaCollections & Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuotaMethods;
 }
@@ -1435,3 +1435,3 @@
 export interface UnifiedGroupCollectionMethods {
-	getByAlias(alias?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup>;
+	getByAlias(alias?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup> & Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroupCollections;
 }
@@ -1449,3 +1449,3 @@
 **********************************************/
-export interface IUserMoveJobCollection extends IBaseResults<UserMoveJob> {
+export interface IUserMoveJobCollection extends IBaseResults<UserMoveJob>, UserMoveJobCollectionMethods {
 
@@ -1457,3 +1457,3 @@ }
 **********************************************/
-export interface IUserMoveJobQueryCollection extends IBaseResults<UserMoveJobQuery> {
+export interface IUserMoveJobQueryCollection extends IBaseResults<UserMoveJobQuery>, UserMoveJobCollectionMethods {
 
@@ -1504,6 +1504,6 @@ }
 export interface UserMoveJobCollectionMethods {
-	getByDirection(direction?: string): IBaseQuery<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
-	getByMoveId(odbMoveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobMethods;
-	getByUpn(upn?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobMethods;
-	getByValidPdl(validPdl?: boolean): IBaseQuery<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
+	getByDirection(direction?: string): IBaseQuery<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>> & Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>Collections;
+	getByMoveId(odbMoveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobMethods;
+	getByUpn(upn?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob> & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobCollections & Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobMethods;
+	getByValidPdl(validPdl?: boolean): IBaseQuery<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>> & Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>Collections;
 	getMoveReport(moveState?: number, moveDirection?: number, limit?: number, startTime?: any, endTime?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
@@ -1510,0 +1510,0 @@ }

lib/Microsoft/Online/SharePoint/TenantAdministration/entitytypes.d.ts

@@ -291,3 +291,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface ISitePropertiesCollection extends IBaseResults<SiteProperties> {
+export interface ISitePropertiesCollection extends IBaseResults<SiteProperties>, SitePropertiesCollectionMethods {
 
@@ -299,3 +299,3 @@ }
 **********************************************/
-export interface ISitePropertiesQueryCollection extends IBaseResults<SitePropertiesQuery> {
+export interface ISitePropertiesQueryCollection extends IBaseResults<SitePropertiesQuery>, SitePropertiesCollectionMethods {
 
@@ -392,3 +392,3 @@ }
 export interface SitePropertiesCollectionMethods {
-	getById(siteId?: any): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesMethods;
+	getById(siteId?: any): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesCollections & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesMethods;
 	getLockStateById(siteId?: any): IBaseExecution<number>;
@@ -720,3 +720,3 @@ }
 export interface TenantCollections extends TenantPropMethods {
-	Sites(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesCollectionMethods;
+	Sites(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties>;
 	Sites(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesCollections & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesMethods;
@@ -742,3 +742,3 @@ }
 	getSitePropertiesByUrl(url?: string, includeDetail?: boolean): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties>;
-	getSitePropertiesFromSharePointByFilters(speFilter?: Microsoft.Online.SharePoint.TenantAdministration.SPOSitePropertiesEnumerableFilter): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesCollectionMethods;
+	getSitePropertiesFromSharePointByFilters(speFilter?: Microsoft.Online.SharePoint.TenantAdministration.SPOSitePropertiesEnumerableFilter): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties>;
 	getSiteSecondaryAdministrators(secondaryAdministratorsFieldsData?: Microsoft.Online.SharePoint.TenantAdministration.SecondaryAdministratorsFieldsData): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.SecondaryAdministratorsInfo>;
@@ -745,0 +745,0 @@ getSPOTenantAllWebTemplates(): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.SPOTenantWebTemplateCollection>;

lib/Microsoft/Online/SharePoint/TenantAdministration/Internal/entitytypes.d.ts

@@ -17,3 +17,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface ISPOWebAppServicePrincipalPermissionGrantCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionGrant> {
+export interface ISPOWebAppServicePrincipalPermissionGrantCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionGrant>, SPOWebAppServicePrincipalPermissionGrantCollectionMethods {
 
@@ -25,3 +25,3 @@ }
 **********************************************/
-export interface ISPOWebAppServicePrincipalPermissionGrantQueryCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionGrantQuery> {
+export interface ISPOWebAppServicePrincipalPermissionGrantQueryCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionGrantQuery>, SPOWebAppServicePrincipalPermissionGrantCollectionMethods {
 
@@ -76,3 +76,3 @@ }
 export interface SPOWebAppServicePrincipalPermissionGrantCollectionMethods {
-	getByObjectId(objectId?: string): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantMethods;
+	getByObjectId(objectId?: string): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantCollections & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantMethods;
 }
@@ -104,3 +104,3 @@
 **********************************************/
-export interface ISPOWebAppServicePrincipalPermissionRequestCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionRequest> {
+export interface ISPOWebAppServicePrincipalPermissionRequestCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionRequest>, SPOWebAppServicePrincipalPermissionRequestCollectionMethods {
 
@@ -112,3 +112,3 @@ }
 **********************************************/
-export interface ISPOWebAppServicePrincipalPermissionRequestQueryCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionRequestQuery> {
+export interface ISPOWebAppServicePrincipalPermissionRequestQueryCollection extends IBaseResults<SPOWebAppServicePrincipalPermissionRequestQuery>, SPOWebAppServicePrincipalPermissionRequestCollectionMethods {
 
@@ -165,3 +165,3 @@ }
 	approve(resource?: string, scope?: string): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant>;
-	getById(id?: any): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequestMethods;
+	getById(id?: any): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequestCollections & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequestMethods;
 }
@@ -239,5 +239,5 @@
 export interface SPOWebAppServicePrincipalCollections extends SPOWebAppServicePrincipalPropMethods {
-	PermissionGrants(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantCollectionMethods;
+	PermissionGrants(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant>;
 	PermissionGrants(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantCollections & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantMethods;
-	PermissionRequests(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequestCollectionMethods;
+	PermissionRequests(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest>;
 	PermissionRequests(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequestCollections & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequestMethods;
@@ -244,0 +244,0 @@ }

lib/Microsoft/Online/SharePoint/TenantManagement/entitytypes.d.ts

@@ -32,3 +32,3 @@ import { IBaseExecution } from "../../../../";
 export interface ExternalUserCollectionMethods {
-	getById(uniqueId?: string): IBaseQuery<Microsoft.Online.SharePoint.TenantManagement.ExternalUser>;
+	getById(uniqueId?: string): IBaseQuery<Microsoft.Online.SharePoint.TenantManagement.ExternalUser> & Microsoft.Online.SharePoint.TenantManagement.ExternalUserCollections;
 }
@@ -90,3 +90,3 @@
 export interface GetExternalUsersResultsCollections extends GetExternalUsersResultsPropMethods {
-	ExternalUserCollection(): IBaseCollection<Microsoft.Online.SharePoint.TenantManagement.ExternalUser> & Microsoft.Online.SharePoint.TenantManagement.ExternalUserCollectionMethods;
+	ExternalUserCollection(): IBaseCollection<Microsoft.Online.SharePoint.TenantManagement.ExternalUser>;
 	ExternalUserCollection(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantManagement.ExternalUser> & Microsoft.Online.SharePoint.TenantManagement.ExternalUserCollections;
@@ -93,0 +93,0 @@ }

lib/Microsoft/SharePoint/Comments/entitytypes.d.ts

@@ -18,3 +18,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface IcommentCollection extends IBaseResults<comment> {
+export interface IcommentCollection extends IBaseResults<comment>, commentCollectionMethods {
 
@@ -26,3 +26,3 @@ }
 **********************************************/
-export interface IcommentQueryCollection extends IBaseResults<commentQuery> {
+export interface IcommentQueryCollection extends IBaseResults<commentQuery>, commentCollectionMethods {
 
@@ -77,3 +77,3 @@ }
 	likedBy(id: string | number): IBaseQuery<Microsoft.SharePoint.Likes.userEntity> & Microsoft.SharePoint.Likes.userEntityCollections;
-	replies(): IBaseCollection<Microsoft.SharePoint.Comments.comment, Microsoft.SharePoint.Comments.commentQuery> & Microsoft.SharePoint.Comments.commentCollectionMethods;
+	replies(): IBaseCollection<Microsoft.SharePoint.Comments.comment, Microsoft.SharePoint.Comments.commentQuery, Microsoft.SharePoint.Comments.commentCollectionMethods> & Microsoft.SharePoint.Comments.commentCollectionMethods;
 	replies(id: string | number): IBaseQuery<Microsoft.SharePoint.Comments.comment, Microsoft.SharePoint.Comments.commentQuery> & Microsoft.SharePoint.Comments.commentCollections & Microsoft.SharePoint.Comments.commentMethods;
@@ -80,0 +80,0 @@ }

lib/Microsoft/SharePoint/Marketplace/CorporateCuratedGallery/entitytypes.d.ts

@@ -60,3 +60,3 @@ import { IBaseExecution } from "../../../../";
 export interface SiteCollectionCorporateCatalogAccessorCollections extends SiteCollectionCorporateCatalogAccessorPropMethods {
-	AvailableApps(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollectionMethods;
+	AvailableApps(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata>;
 	AvailableApps(id: string | number): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollections & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataMethods;
@@ -89,3 +89,3 @@ }
 **********************************************/
-export interface ICorporateCatalogAppMetadataCollection extends IBaseResults<CorporateCatalogAppMetadata> {
+export interface ICorporateCatalogAppMetadataCollection extends IBaseResults<CorporateCatalogAppMetadata>, CorporateCatalogAppMetadataCollectionMethods {
 
@@ -97,3 +97,3 @@ }
 **********************************************/
-export interface ICorporateCatalogAppMetadataQueryCollection extends IBaseResults<CorporateCatalogAppMetadataQuery> {
+export interface ICorporateCatalogAppMetadataQueryCollection extends IBaseResults<CorporateCatalogAppMetadataQuery>, CorporateCatalogAppMetadataCollectionMethods {
 
@@ -148,3 +148,3 @@ }
 export interface CorporateCatalogAppMetadataCollectionMethods {
-	getById(id?: string): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataMethods;
+	getById(id?: string): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollections & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataMethods;
 }
@@ -224,5 +224,5 @@
 export interface TenantCorporateCatalogAccessorCollections extends TenantCorporateCatalogAccessorPropMethods {
-	AvailableApps(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollectionMethods;
+	AvailableApps(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata>;
 	AvailableApps(id: string | number): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollections & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataMethods;
-	SiteCollectionAppCatalogsSites(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItemCollectionMethods;
+	SiteCollectionAppCatalogsSites(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem>;
 	SiteCollectionAppCatalogsSites(id: string | number): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItemCollections;
@@ -266,3 +266,3 @@ }
 	add(absolutePath?: string): IBaseExecution<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem>;
-	getByAbsoluteUrl(absolutePath?: string): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem>;
+	getByAbsoluteUrl(absolutePath?: string): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItemCollections;
 	remove(absolutePath?: string): IBaseExecution<any>;
@@ -269,0 +269,0 @@ removeById(siteId?: any): IBaseExecution<any>;

lib/Microsoft/SharePoint/Portal/entitytypes.d.ts

@@ -435,3 +435,3 @@ import { IBaseExecution } from "../../../";
 export interface SPHubSitesUtilityMethods {
-	getHubSites(): IBaseCollection<SP.HubSite> & SP.HubSiteCollectionMethods;
+	getHubSites(): IBaseCollection<SP.HubSite>;
 }
@@ -438,0 +438,0 @@

lib/Microsoft/SharePoint/Webhooks/entitytypes.d.ts

@@ -15,3 +15,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface ISubscriptionCollection extends IBaseResults<Subscription> {
+export interface ISubscriptionCollection extends IBaseResults<Subscription>, SubscriptionCollectionMethods {
 
@@ -23,3 +23,3 @@ }
 **********************************************/
-export interface ISubscriptionQueryCollection extends IBaseResults<SubscriptionQuery> {
+export interface ISubscriptionQueryCollection extends IBaseResults<SubscriptionQuery>, SubscriptionCollectionMethods {
 
@@ -73,3 +73,3 @@ }
 	add(parameters?: Microsoft.SharePoint.Webhooks.SubscriptionInformation): IBaseExecution<Microsoft.SharePoint.Webhooks.Subscription>;
-	getById(id?: any): IBaseQuery<Microsoft.SharePoint.Webhooks.Subscription> & Microsoft.SharePoint.Webhooks.SubscriptionMethods;
+	getById(id?: any): IBaseQuery<Microsoft.SharePoint.Webhooks.Subscription> & Microsoft.SharePoint.Webhooks.SubscriptionCollections & Microsoft.SharePoint.Webhooks.SubscriptionMethods;
 	remove(subscriptionId?: any): IBaseExecution<any>;
@@ -76,0 +76,0 @@ }

lib/MS/FileServices/entitytypes.d.ts

@@ -34,3 +34,3 @@ import { IBaseExecution } from "../../";
 	add(name?: string, overwrite?: boolean, content?: any): IBaseExecution<MS.FileServices.File>;
-	getById(id?: string): IBaseQuery<MS.FileServices.FileSystemItem>;
+	getById(id?: string): IBaseQuery<MS.FileServices.FileSystemItem> & MS.FileServices.FileSystemItemCollections;
 }
@@ -179,3 +179,3 @@
 export interface FolderCollections extends FolderPropMethods {
-	Children(): IBaseCollection<MS.FileServices.FileSystemItem> & MS.FileServices.FileSystemItemCollectionMethods;
+	Children(): IBaseCollection<MS.FileServices.FileSystemItem>;
 	Children(id: string | number): IBaseQuery<MS.FileServices.FileSystemItem> & MS.FileServices.FileSystemItemCollections;
@@ -182,0 +182,0 @@ }

lib/SP/Directory/entitytypes.d.ts

@@ -93,3 +93,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface IGroupCollection extends IBaseResults<Group> {
+export interface IGroupCollection extends IBaseResults<Group>, GroupCollectionMethods {
 
@@ -101,3 +101,3 @@ }
 **********************************************/
-export interface IGroupQueryCollection extends IBaseResults<GroupQuery> {
+export interface IGroupQueryCollection extends IBaseResults<GroupQuery>, GroupCollectionMethods {
 
@@ -157,5 +157,5 @@ }
 export interface GroupCollections extends GroupPropMethods {
-	members(): IBaseCollection<SP.Directory.User, SP.Directory.UserQuery> & SP.Directory.UserCollectionMethods;
+	members(): IBaseCollection<SP.Directory.User, SP.Directory.UserQuery, SP.Directory.UserCollectionMethods> & SP.Directory.UserCollectionMethods;
 	members(id: string | number): IBaseQuery<SP.Directory.User, SP.Directory.UserQuery> & SP.Directory.UserCollections & SP.Directory.UserMethods;
-	owners(): IBaseCollection<SP.Directory.User, SP.Directory.UserQuery> & SP.Directory.UserCollectionMethods;
+	owners(): IBaseCollection<SP.Directory.User, SP.Directory.UserQuery, SP.Directory.UserCollectionMethods> & SP.Directory.UserCollectionMethods;
 	owners(id: string | number): IBaseQuery<SP.Directory.User, SP.Directory.UserQuery> & SP.Directory.UserCollections & SP.Directory.UserMethods;
@@ -197,3 +197,3 @@ }
 **********************************************/
-export interface IUserCollection extends IBaseResults<User> {
+export interface IUserCollection extends IBaseResults<User>, UserCollectionMethods {
 
@@ -205,3 +205,3 @@ }
 **********************************************/
-export interface IUserQueryCollection extends IBaseResults<UserQuery> {
+export interface IUserQueryCollection extends IBaseResults<UserQuery>, UserCollectionMethods {
 
@@ -281,7 +281,7 @@ }
 export interface UserCollections extends UserPropMethods {
-	membership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollectionMethods;
+	membership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery, SP.Directory.GroupCollectionMethods> & SP.Directory.GroupCollectionMethods;
 	membership(id: string | number): IBaseQuery<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollections & SP.Directory.GroupMethods;
-	ownership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollectionMethods;
+	ownership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery, SP.Directory.GroupCollectionMethods> & SP.Directory.GroupCollectionMethods;
 	ownership(id: string | number): IBaseQuery<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollections & SP.Directory.GroupMethods;
-	rankedMembership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollectionMethods;
+	rankedMembership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery, SP.Directory.GroupCollectionMethods> & SP.Directory.GroupCollectionMethods;
 	rankedMembership(id: string | number): IBaseQuery<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollections & SP.Directory.GroupMethods;
@@ -288,0 +288,0 @@ }

lib/SP/Microfeed/entitytypes.d.ts

@@ -163,3 +163,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface IMicrofeedDataCollection extends IBaseResults<MicrofeedData> {
+export interface IMicrofeedDataCollection extends IBaseResults<MicrofeedData>, MicrofeedDataCollectionMethods {
 
@@ -171,3 +171,3 @@ }
 **********************************************/
-export interface IMicrofeedDataQueryCollection extends IBaseResults<MicrofeedDataQuery> {
+export interface IMicrofeedDataQueryCollection extends IBaseResults<MicrofeedDataQuery>, MicrofeedDataCollectionMethods {
 
@@ -418,4 +418,4 @@ }
 	newItem(storeIdentifier?: string): IBaseExecution<SP.Microfeed.MicrofeedData>;
-	query(storeIdentifier?: string, query?: SP.Microfeed.MicrofeedDataQuery): IBaseCollection<SP.Microfeed.MicrofeedData> & SP.Microfeed.MicrofeedDataCollectionMethods;
+	query(storeIdentifier?: string, query?: SP.Microfeed.MicrofeedDataQuery): IBaseCollection<SP.Microfeed.MicrofeedData>;
 	setPostLikeStatus(accountName?: string, postId?: string, like?: boolean): IBaseExecution<any>;
 }

lib/SP/WebParts/entitytypes.d.ts

@@ -61,3 +61,3 @@ import { IBaseExecution } from "../../";
 export interface LimitedWebPartManagerCollections extends LimitedWebPartManagerPropMethods {
-	WebParts(): IBaseCollection<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery> & SP.WebParts.WebPartDefinitionCollectionMethods;
+	WebParts(): IBaseCollection<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery, SP.WebParts.WebPartDefinitionCollectionMethods> & SP.WebParts.WebPartDefinitionCollectionMethods;
 	WebParts(id: string | number): IBaseQuery<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery> & SP.WebParts.WebPartDefinitionCollections & SP.WebParts.WebPartDefinitionMethods;
@@ -91,3 +91,3 @@ }
 **********************************************/
-export interface IWebPartDefinitionCollection extends IBaseResults<WebPartDefinition> {
+export interface IWebPartDefinitionCollection extends IBaseResults<WebPartDefinition>, WebPartDefinitionCollectionMethods {
 
@@ -99,3 +99,3 @@ }
 **********************************************/
-export interface IWebPartDefinitionQueryCollection extends IBaseResults<WebPartDefinitionQuery> {
+export interface IWebPartDefinitionQueryCollection extends IBaseResults<WebPartDefinitionQuery>, WebPartDefinitionCollectionMethods {
 
@@ -102,0 +102,0 @@ }

lib/SP/Workflow/entitytypes.d.ts

@@ -15,3 +15,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface IWorkflowAssociationCollection extends IBaseResults<WorkflowAssociation> {
+export interface IWorkflowAssociationCollection extends IBaseResults<WorkflowAssociation>, WorkflowAssociationCollectionMethods {
 
@@ -23,3 +23,3 @@ }
 **********************************************/
-export interface IWorkflowAssociationQueryCollection extends IBaseResults<WorkflowAssociationQuery> {
+export interface IWorkflowAssociationQueryCollection extends IBaseResults<WorkflowAssociationQuery>, WorkflowAssociationCollectionMethods {
 
@@ -85,4 +85,4 @@ }
 	add(parameters?: SP.Workflow.WorkflowAssociationCreationInformation): IBaseExecution<SP.Workflow.WorkflowAssociation>;
-	getById(associationId?: any): IBaseQuery<SP.Workflow.WorkflowAssociation> & SP.Workflow.WorkflowAssociationMethods;
-	getByName(name?: string): IBaseQuery<SP.Workflow.WorkflowAssociation> & SP.Workflow.WorkflowAssociationMethods;
+	getById(associationId?: any): IBaseQuery<SP.Workflow.WorkflowAssociation> & SP.Workflow.WorkflowAssociationCollections & SP.Workflow.WorkflowAssociationMethods;
+	getByName(name?: string): IBaseQuery<SP.Workflow.WorkflowAssociation> & SP.Workflow.WorkflowAssociationCollections & SP.Workflow.WorkflowAssociationMethods;
 }
@@ -131,4 +131,4 @@
 export interface WorkflowTemplateCollectionMethods {
-	getById(templateId?: any): IBaseQuery<SP.Workflow.WorkflowTemplate>;
-	getByName(name?: string): IBaseQuery<SP.Workflow.WorkflowTemplate>;
+	getById(templateId?: any): IBaseQuery<SP.Workflow.WorkflowTemplate> & SP.Workflow.WorkflowTemplateCollections;
+	getByName(name?: string): IBaseQuery<SP.Workflow.WorkflowTemplate> & SP.Workflow.WorkflowTemplateCollections;
 }
@@ -135,0 +135,0 @@

lib/SP/WorkflowServices/entitytypes.d.ts

@@ -17,3 +17,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface IWorkflowDefinitionCollection extends IBaseResults<WorkflowDefinition> {
+export interface IWorkflowDefinitionCollection extends IBaseResults<WorkflowDefinition>, WorkflowDefinitionCollectionMethods {
 
@@ -25,3 +25,3 @@ }
 **********************************************/
-export interface IWorkflowDefinitionQueryCollection extends IBaseResults<WorkflowDefinitionQuery> {
+export interface IWorkflowDefinitionQueryCollection extends IBaseResults<WorkflowDefinitionQuery>, WorkflowDefinitionCollectionMethods {
 
@@ -169,3 +169,3 @@ }
 	deprecateDefinition(definitionId?: any): IBaseExecution<any>;
-	enumerateDefinitions(publishedOnly?: boolean): IBaseCollection<SP.WorkflowServices.WorkflowDefinition> & SP.WorkflowServices.WorkflowDefinitionCollectionMethods;
+	enumerateDefinitions(publishedOnly?: boolean): IBaseCollection<SP.WorkflowServices.WorkflowDefinition>;
 	enumerateIntegratedApps(): IBaseCollection<SP.AppInstance>;
@@ -438,3 +438,3 @@ getActivitySignatures(lastChanged?: any): IBaseCollection<SP.KeyValue>;
 **********************************************/
-export interface IWorkflowSubscriptionCollection extends IBaseResults<WorkflowSubscription> {
+export interface IWorkflowSubscriptionCollection extends IBaseResults<WorkflowSubscription>, WorkflowSubscriptionCollectionMethods {
 
@@ -446,3 +446,3 @@ }
 **********************************************/
-export interface IWorkflowSubscriptionQueryCollection extends IBaseResults<WorkflowSubscriptionQuery> {
+export interface IWorkflowSubscriptionQueryCollection extends IBaseResults<WorkflowSubscriptionQuery>, WorkflowSubscriptionCollectionMethods {
 
@@ -586,8 +586,8 @@ }
 	deleteSubscription(subscriptionId?: any): IBaseExecution<any>;
-	enumerateSubscriptions(): IBaseCollection<SP.WorkflowServices.WorkflowSubscription> & SP.WorkflowServices.WorkflowSubscriptionCollectionMethods;
-	enumerateSubscriptionsByDefinition(definitionId?: any): IBaseCollection<SP.WorkflowServices.WorkflowSubscription> & SP.WorkflowServices.WorkflowSubscriptionCollectionMethods;
-	enumerateSubscriptionsByEventSource(eventSourceId?: any): IBaseCollection<SP.WorkflowServices.WorkflowSubscription> & SP.WorkflowServices.WorkflowSubscriptionCollectionMethods;
-	enumerateSubscriptionsByList(listId?: any): IBaseCollection<SP.WorkflowServices.WorkflowSubscription> & SP.WorkflowServices.WorkflowSubscriptionCollectionMethods;
-	enumerateSubscriptionsByListAndParentContentType(listId?: any, parentContentTypeId?: SP.ContentTypeId, includeNoContentTypeSpecified?: boolean): IBaseCollection<SP.WorkflowServices.WorkflowSubscription> & SP.WorkflowServices.WorkflowSubscriptionCollectionMethods;
-	enumerateSubscriptionsByListWithContentType(listId?: any, includeContentTypeSpecified?: boolean): IBaseCollection<SP.WorkflowServices.WorkflowSubscription> & SP.WorkflowServices.WorkflowSubscriptionCollectionMethods;
+	enumerateSubscriptions(): IBaseCollection<SP.WorkflowServices.WorkflowSubscription>;
+	enumerateSubscriptionsByDefinition(definitionId?: any): IBaseCollection<SP.WorkflowServices.WorkflowSubscription>;
+	enumerateSubscriptionsByEventSource(eventSourceId?: any): IBaseCollection<SP.WorkflowServices.WorkflowSubscription>;
+	enumerateSubscriptionsByList(listId?: any): IBaseCollection<SP.WorkflowServices.WorkflowSubscription>;
+	enumerateSubscriptionsByListAndParentContentType(listId?: any, parentContentTypeId?: SP.ContentTypeId, includeNoContentTypeSpecified?: boolean): IBaseCollection<SP.WorkflowServices.WorkflowSubscription>;
+	enumerateSubscriptionsByListWithContentType(listId?: any, includeContentTypeSpecified?: boolean): IBaseCollection<SP.WorkflowServices.WorkflowSubscription>;
 	getSubscription(subscriptionId?: any): IBaseExecution<SP.WorkflowServices.WorkflowSubscription>;
@@ -594,0 +594,0 @@ registerInterestInHostWebList(listId?: any, eventName?: string): IBaseExecution<any>;

main.js

@@ -140,2 +140,46 @@ let fs = require("fs");
 
+// Generates the base collection interface
+function generateBaseCollection(methodType, hasCollections, hasCollectionMethods) {
+    // See if a collection exists
+    if (hasCollections[methodType]) {
+        // See if methods exist
+        if (hasCollectionMethods[methodType]) {
+            // Generate the interface
+            return 'IBaseCollection<' + methodType + ', ' + methodType + 'Query, ' + methodType + 'CollectionMethods> & ' + methodType + 'CollectionMethods';
+        } else {
+            // Generate the interface
+            return 'IBaseCollection<' + methodType + ', ' + methodType + 'Query>';
+        }
+    } else {
+        // Generate the interface
+        return 'IBaseCollection<' + methodType + '>';
+    }
+}
+
+// Generates the base query interface
+function generateBaseQuery(methodType, hasCollections, hasMethods) {
+    let baseQuery = null;
+
+    // See if a collection exists
+    if (hasCollections[methodType]) {
+        // Set the base query
+        baseQuery = 'IBaseQuery<' + methodType + ', ' + methodType + 'Query>';
+    } else {
+        // Set the base query
+        baseQuery = 'IBaseQuery<' + methodType + '>';
+    }
+
+    // Append the collection
+    baseQuery += ' & ' + methodType + 'Collections';
+
+    // See if methods exist
+    if (hasMethods[methodType]) {
+        // Append the methods
+        baseQuery += ' & ' + methodType + 'Methods';
+    }
+
+    // Return the query
+    return baseQuery;
+}
+
 // Recursively read and generate index files
@@ -453,4 +497,4 @@ function generateIndexFiles(path) {
                                         // Add the methods
-                                        collections.push('\t' + collection + '(): ' + 'IBaseCollection<' + methodType + (hasCollections[methodType] ? ', ' + methodType + 'Query' : '') + '>' + (hasCollectionMethods[methodType] ? ' & ' + methodType + 'CollectionMethods' : '') + ';');
-                                        collections.push('\t' + collection + '(id: string | number): ' + 'IBaseQuery<' + methodType + (hasCollections[methodType] ? ', ' + methodType + 'Query' : '') + '> & ' + methodType + 'Collections' + (hasMethods[methodType] ? ' & ' + methodType + 'Methods' : '') + ';');
+                                        collections.push('\t' + collection + '(): ' + generateBaseCollection(methodType, hasCollections, hasCollectionMethods) + ';');
+                                        collections.push('\t' + collection + '(id: string | number): ' + generateBaseQuery(methodType, hasCollections, hasMethods) + ';');
                                         query.push('\t' + collection + ': IBaseResults<' + methodType + '>;');
@@ -461,3 +505,3 @@ } else {
                                             // Add the method
-                                            props.push('\t' + collection + '(): ' + 'IBaseQuery<' + methodType + ', ' + methodType + 'Query> & ' + methodType + 'Collections' + (hasMethods[methodType] ? ' & ' + methodType + 'Methods' : '') + ';');
+                                            props.push('\t' + collection + '(): ' + generateBaseQuery(methodType, hasCollections, hasMethods) + ';');
                                         } else {
@@ -507,3 +551,3 @@ // Add the method
                                     // Set the type
-                                    methodType = 'IBaseQuery<' + methodType + (hasCollections[methodType] ? ", " + methodType + "Query" : "") + '>' + (hasCollections[methodType] ? " & " + methodType + "Collections" : "") + (hasMethods[methodType] ? " & " + methodType + "Methods" : "");
+                                    methodType = generateBaseQuery(methodType, hasCollections, hasMethods);
                                 } else {
@@ -557,3 +601,3 @@ // Set the type
                                         // Update the method type
-                                        methodType = 'IBaseQuery<' + methodType + (hasCollections[methodType] ? ', ' + methodType + 'Query' : '') + '> & ' + methodType + 'Collections' + (hasMethods[methodType] ? ' & ' + methodType + 'Methods' : '');
+                                        methodType = generateBaseQuery(methodType, hasCollections, hasMethods);
                                     } else {
@@ -569,3 +613,3 @@ // Get the type
                                             // Set the type
-                                            methodType = 'IBaseCollection<' + methodType + (hasCollections[methodType] ? ', ' + methodType + 'Query' : '') + '>' + (hasCollectionMethods[methodType] ? ' & ' + methodType + 'CollectionMethods' : '');
+                                            methodType = generateBaseCollection(methodType, hasCollections, hasCollectionMethods);
                                         } else {
@@ -611,4 +655,4 @@ // Set the type
                         content.push(createInterface("I" + name, [name + "Collections", name + "Methods", "IBaseQuery<I" + name + "Query>"]));
-                        content.push(createInterface("I" + name + "Collection", "IBaseResults<" + name + ">"));
-                        content.push(createInterface("I" + name + "QueryCollection", "IBaseResults<" + name + "Query>"));
+                        content.push(createInterface("I" + name + "Collection", "IBaseResults<" + name + ">" + (collectionMethods.length > 0 ? ", " + name + "CollectionMethods" : "")));
+                        content.push(createInterface("I" + name + "QueryCollection", "IBaseResults<" + name + "Query>" + (collectionMethods.length > 0 ? ", " + name + "CollectionMethods" : "")));
                         content.push(createInterface("I" + name + "Query", [name + "Query", name + "Methods"].join(', ')));
@@ -615,0 +659,0 @@ content.push(createInterface(name, baseTypes.join(", ")));

package.json

 {
   "name": "gd-sprest-def",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "description": "TypeScript definition files generated from the $metadata REST endpoint in SharePoint.",
@@ -5,0 +5,0 @@ "author": "Gunjan Datta <[e-mail]> (https://gunjandatta.github.io)",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3844494

increased by0.27%

Lines of code

36338

increased by0.12%

No dependency changes