gd-sprest-def - npm Package Compare versions

Comparing version 0.2.1 to 0.2.2

custom.js

@@ -35,11 +35,2 @@ /**
 
-    // Features
-    "Collection(SP.Feature)": [
-        {
-            name: "getByName",
-            returnType: "IBaseResults<SP.Feature>",
-            params: [{ $: { Name: "name", Type: "string" } }]
-        }
-    ],
-
     // Field
@@ -208,7 +199,2 @@ "SP.Field": [
         {
-            name: "getByUrl",
-            returnType: "any",
-            params: [{ $: { Name: "serverRelativeUrl", Type: "string" } }]
-        },
-        {
             name: "update",
@@ -345,3 +331,4 @@ returnType: "any",
             name: "getCatalog",
-            returnType: "SP.IList",
+            overwrite: true,
+            returnType: "IBaseQuery<SP.List, SP.ListQuery> & SP.ListCollections",
             params: [
@@ -348,0 +335,0 @@ { $: { Name: "listTemplateType", Type: "number" } }

lib/Microsoft/AppServices/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface AppCollection extends AppCollectionCollections, AppCollectionMethods {
+export interface AppCollection extends AppCollectionProps, AppCollectionCollections, AppCollectionMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface AppCollectionCollections extends AppCollectionProps, AppCollectionPropMethods {
+export interface AppCollectionCollections extends AppCollectionPropMethods {
 
@@ -46,0 +46,0 @@ }

lib/Microsoft/Office/Server/Search/REST/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface SearchService extends SearchServiceCollections, SearchServiceMethods {
+export interface SearchService extends SearchServiceProps, SearchServiceCollections, SearchServiceMethods {
 
@@ -44,3 +44,3 @@ }
 **********************************************/
-export interface SearchServiceCollections extends SearchServiceProps, SearchServicePropMethods {
+export interface SearchServiceCollections extends SearchServicePropMethods {
 
@@ -88,3 +88,3 @@ }
 **********************************************/
-export interface SearchSetting extends SearchSettingCollections, SearchSettingMethods {
+export interface SearchSetting extends SearchSettingProps, SearchSettingCollections, SearchSettingMethods {
 
@@ -110,3 +110,3 @@ }
 **********************************************/
-export interface SearchSettingCollections extends SearchSettingProps, SearchSettingPropMethods {
+export interface SearchSettingCollections extends SearchSettingPropMethods {
 
@@ -113,0 +113,0 @@ }

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface AppLauncher extends AppLauncherCollections, AppLauncherMethods {
+export interface AppLauncher extends AppLauncherProps, AppLauncherCollections, AppLauncherMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface AppLauncherCollections extends AppLauncherProps, AppLauncherPropMethods {
+export interface AppLauncherCollections extends AppLauncherPropMethods {
 
@@ -46,0 +46,0 @@ }

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

@@ -41,3 +41,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface AllowedDataLocation extends Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationEntityData, AllowedDataLocationCollections, AllowedDataLocationMethods {
+export interface AllowedDataLocation extends Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationEntityData, AllowedDataLocationProps, AllowedDataLocationCollections, AllowedDataLocationMethods {
 
@@ -63,3 +63,3 @@ }
 **********************************************/
-export interface AllowedDataLocationCollections extends AllowedDataLocationProps, AllowedDataLocationPropMethods {
+export interface AllowedDataLocationCollections extends AllowedDataLocationPropMethods {
 
@@ -72,3 +72,3 @@ }
 export interface AllowedDataLocationCollectionMethods {
-	getByLocation(location?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation>;
+	getByLocation(location?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation>;
 }
@@ -179,3 +179,3 @@
 **********************************************/
-export interface CrossFarmGroupMoveJob extends CrossFarmGroupMoveJobCollections, CrossFarmGroupMoveJobMethods {
+export interface CrossFarmGroupMoveJob extends CrossFarmGroupMoveJobProps, CrossFarmGroupMoveJobCollections, CrossFarmGroupMoveJobMethods {
 
@@ -204,3 +204,3 @@ }
 **********************************************/
-export interface CrossFarmGroupMoveJobCollections extends CrossFarmGroupMoveJobProps, CrossFarmGroupMoveJobPropMethods {
+export interface CrossFarmGroupMoveJobCollections extends CrossFarmGroupMoveJobPropMethods {
 
@@ -213,3 +213,3 @@ }
 export interface CrossFarmGroupMoveJobCollectionMethods {
-	getByMoveId(moveId?: any): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob>;
+	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob>;
 }
@@ -278,3 +278,3 @@
 **********************************************/
-export interface CrossFarmSiteMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobEntityData, CrossFarmSiteMoveJobCollections, CrossFarmSiteMoveJobMethods {
+export interface CrossFarmSiteMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJobEntityData, CrossFarmSiteMoveJobProps, CrossFarmSiteMoveJobCollections, CrossFarmSiteMoveJobMethods {
 
@@ -303,3 +303,3 @@ }
 **********************************************/
-export interface CrossFarmSiteMoveJobCollections extends CrossFarmSiteMoveJobProps, CrossFarmSiteMoveJobPropMethods {
+export interface CrossFarmSiteMoveJobCollections extends CrossFarmSiteMoveJobPropMethods {
 
@@ -312,3 +312,3 @@ }
 export interface CrossFarmSiteMoveJobCollectionMethods {
-	getByMoveId(moveId?: any): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob>;
+	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob>;
 }
@@ -378,3 +378,3 @@
 **********************************************/
-export interface CrossFarmUserMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobEntityData, CrossFarmUserMoveJobCollections, CrossFarmUserMoveJobMethods {
+export interface CrossFarmUserMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJobEntityData, CrossFarmUserMoveJobProps, CrossFarmUserMoveJobCollections, CrossFarmUserMoveJobMethods {
 
@@ -403,3 +403,3 @@ }
 **********************************************/
-export interface CrossFarmUserMoveJobCollections extends CrossFarmUserMoveJobProps, CrossFarmUserMoveJobPropMethods {
+export interface CrossFarmUserMoveJobCollections extends CrossFarmUserMoveJobPropMethods {
 
@@ -412,3 +412,3 @@ }
 export interface CrossFarmUserMoveJobCollectionMethods {
-	getByMoveId(moveId?: any): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob>;
+	getByMoveId(moveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob>;
 }
@@ -494,3 +494,3 @@
 **********************************************/
-export interface CrossGeoTenantProperty extends Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyEntityData, CrossGeoTenantPropertyCollections, CrossGeoTenantPropertyMethods {
+export interface CrossGeoTenantProperty extends Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantPropertyEntityData, CrossGeoTenantPropertyProps, CrossGeoTenantPropertyCollections, CrossGeoTenantPropertyMethods {
 
@@ -516,3 +516,3 @@ }
 **********************************************/
-export interface CrossGeoTenantPropertyCollections extends CrossGeoTenantPropertyProps, CrossGeoTenantPropertyPropMethods {
+export interface CrossGeoTenantPropertyCollections extends CrossGeoTenantPropertyPropMethods {
 
@@ -525,3 +525,3 @@ }
 export interface CrossGeoTenantPropertyCollectionMethods {
-	getByPropertyNameAndGeoLocation(propertyName?: string, geo?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty>;
+	getByPropertyNameAndGeoLocation(propertyName?: string, geo?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty>;
 	getChanges(startTimeInUtc?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty>>;
@@ -576,3 +576,3 @@ }
 **********************************************/
-export interface GeoAdministrator extends GeoAdministratorCollections, GeoAdministratorMethods {
+export interface GeoAdministrator extends GeoAdministratorProps, GeoAdministratorCollections, GeoAdministratorMethods {
 
@@ -602,3 +602,3 @@ }
 **********************************************/
-export interface GeoAdministratorCollections extends GeoAdministratorProps, GeoAdministratorPropMethods {
+export interface GeoAdministratorCollections extends GeoAdministratorPropMethods {
 
@@ -612,5 +612,5 @@ }
 	create(parameters?: Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministratorEntityData): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
-	getByLoginName(loginName?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
-	getByLoginNameAndType(loginName?: string, memberType?: number): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
-	getByObjectId(objectId?: any): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
+	getByLoginName(loginName?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
+	getByLoginNameAndType(loginName?: string, memberType?: number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
+	getByObjectId(objectId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
 }
@@ -649,3 +649,3 @@
 **********************************************/
-export interface GeoExperience extends GeoExperienceCollections, GeoExperienceMethods {
+export interface GeoExperience extends GeoExperienceProps, GeoExperienceCollections, GeoExperienceMethods {
 
@@ -672,3 +672,3 @@ }
 **********************************************/
-export interface GeoExperienceCollections extends GeoExperienceProps, GeoExperiencePropMethods {
+export interface GeoExperienceCollections extends GeoExperiencePropMethods {
 
@@ -751,3 +751,3 @@ }
 export interface GeoTenantInstanceInformationCollectionMethods {
-	getByGeoLocation(geoLocation?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation>;
+	getByGeoLocation(geoLocation?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation>;
 }
@@ -786,3 +786,3 @@
 **********************************************/
-export interface GroupMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobEntityData, GroupMoveJobCollections, GroupMoveJobMethods {
+export interface GroupMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJobEntityData, GroupMoveJobProps, GroupMoveJobCollections, GroupMoveJobMethods {
 
@@ -811,3 +811,3 @@ }
 **********************************************/
-export interface GroupMoveJobCollections extends GroupMoveJobProps, GroupMoveJobPropMethods {
+export interface GroupMoveJobCollections extends GroupMoveJobPropMethods {
 
@@ -820,3 +820,3 @@ }
 export interface GroupMoveJobCollectionMethods {
-	getByGroupName(groupname?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob>;
+	getByGroupName(groupname?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob>;
 	getMoveReport(moveState?: number, moveDirection?: number, limit?: number, startTime?: any, endTime?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob>>;
@@ -890,3 +890,3 @@ }
 **********************************************/
-export interface MultiGeoServicesBeta extends MultiGeoServicesBetaCollections, MultiGeoServicesBetaMethods {
+export interface MultiGeoServicesBeta extends MultiGeoServicesBetaProps, MultiGeoServicesBetaCollections, MultiGeoServicesBetaMethods {
 
@@ -906,8 +906,8 @@ }
 export interface MultiGeoServicesBetaPropMethods {
-	ContentDbSchemaVersion(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.ContentDbSchemaVersion>;
-	CrossGeoTenantBYOK(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantBYOK>;
-	CrossGeoTenantCompatibility(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantCompatibility>;
-	GeoExperience(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoExperience>;
-	GlobalAdminCheck(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GlobalAdminCheck>;
-	TaxonomyReplicationParameters(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.TaxonomyReplicationParameters>;
+	ContentDbSchemaVersion(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.ContentDbSchemaVersion> & Microsoft.Online.SharePoint.MultiGeo.Service.ContentDbSchemaVersionCollections;
+	CrossGeoTenantBYOK(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantBYOK> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantBYOKCollections;
+	CrossGeoTenantCompatibility(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantCompatibility> & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantCompatibilityCollections;
+	GeoExperience(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GeoExperience> & Microsoft.Online.SharePoint.MultiGeo.Service.GeoExperienceCollections;
+	GlobalAdminCheck(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.GlobalAdminCheck> & Microsoft.Online.SharePoint.MultiGeo.Service.GlobalAdminCheckCollections;
+	TaxonomyReplicationParameters(): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.TaxonomyReplicationParameters> & Microsoft.Online.SharePoint.MultiGeo.Service.TaxonomyReplicationParametersCollections;
 }
@@ -918,3 +918,3 @@
 **********************************************/
-export interface MultiGeoServicesBetaCollections extends MultiGeoServicesBetaProps, MultiGeoServicesBetaPropMethods {
+export interface MultiGeoServicesBetaCollections extends MultiGeoServicesBetaPropMethods {
 	AllowedDataLocations(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation> & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationCollectionMethods;
@@ -943,3 +943,3 @@ AllowedDataLocations(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation> & Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocationCollections;
 	TenantInformationCollection(): IBaseCollection<Microsoft.Online.SharePoint.MultiGeo.Service.TenantInformation>;
-	TenantInformationCollection(id: string | number): IBaseQuery<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;
@@ -956,13 +956,13 @@ UnifiedGroups(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup> & Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroupCollections;
 	AllowedDataLocations: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.AllowedDataLocation>;
-	ContentDbSchemaVersion: Microsoft.Online.SharePoint.MultiGeo.Service.ContentDbSchemaVersion;
+	ContentDbSchemaVersion: Microsoft.Online.SharePoint.MultiGeo.Service.ContentDbSchemaVersion & Microsoft.Online.SharePoint.MultiGeo.Service.ContentDbSchemaVersionCollections;
 	CrossFarmGroupMoveJobs: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmGroupMoveJob>;
 	CrossFarmSiteMoveJobs: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmSiteMoveJob>;
 	CrossFarmUserMoveJobs: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.CrossFarmUserMoveJob>;
-	CrossGeoTenantBYOK: Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantBYOK;
-	CrossGeoTenantCompatibility: Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantCompatibility;
+	CrossGeoTenantBYOK: Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantBYOK & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantBYOKCollections;
+	CrossGeoTenantCompatibility: Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantCompatibility & Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantCompatibilityCollections;
 	CrossGeoTenantProperties: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.CrossGeoTenantProperty>;
 	GeoAdministrators: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.GeoAdministrator>;
-	GeoExperience: Microsoft.Online.SharePoint.MultiGeo.Service.GeoExperience;
+	GeoExperience: Microsoft.Online.SharePoint.MultiGeo.Service.GeoExperience & Microsoft.Online.SharePoint.MultiGeo.Service.GeoExperienceCollections;
 	GeoTenantInstanceInformationCollection: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.GeoTenantInstanceInformation>;
-	GlobalAdminCheck: Microsoft.Online.SharePoint.MultiGeo.Service.GlobalAdminCheck;
+	GlobalAdminCheck: Microsoft.Online.SharePoint.MultiGeo.Service.GlobalAdminCheck & Microsoft.Online.SharePoint.MultiGeo.Service.GlobalAdminCheckCollections;
 	GroupMoveJobs: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.GroupMoveJob>;
@@ -972,3 +972,3 @@ SiteMoveJobs: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob>;
 	StorageQuotas: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota>;
-	TaxonomyReplicationParameters: Microsoft.Online.SharePoint.MultiGeo.Service.TaxonomyReplicationParameters;
+	TaxonomyReplicationParameters: Microsoft.Online.SharePoint.MultiGeo.Service.TaxonomyReplicationParameters & Microsoft.Online.SharePoint.MultiGeo.Service.TaxonomyReplicationParametersCollections;
 	TenantInformationCollection: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.TenantInformation>;
@@ -1007,3 +1007,3 @@ UnifiedGroups: IBaseResults<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup>;
 **********************************************/
-export interface SiteMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobEntityData, SiteMoveJobCollections, SiteMoveJobMethods {
+export interface SiteMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJobEntityData, SiteMoveJobProps, SiteMoveJobCollections, SiteMoveJobMethods {
 
@@ -1032,3 +1032,3 @@ }
 **********************************************/
-export interface SiteMoveJobCollections extends SiteMoveJobProps, SiteMoveJobPropMethods {
+export interface SiteMoveJobCollections extends SiteMoveJobPropMethods {
 
@@ -1041,3 +1041,3 @@ }
 export interface SiteMoveJobCollectionMethods {
-	getByUrl(url?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob>;
+	getByUrl(url?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob>;
 	getMoveReport(moveState?: number, moveDirection?: number, limit?: number, startTime?: any, endTime?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.SiteMoveJob>>;
@@ -1099,3 +1099,3 @@ }
 export interface SiteRenameJobCollectionMethods {
-	getBySiteUrl(siteUrl?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob>;
+	getBySiteUrl(siteUrl?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.SiteRenameJob>;
 }
@@ -1120,3 +1120,3 @@
 **********************************************/
-export interface StorageQuota extends StorageQuotaCollections, StorageQuotaMethods {
+export interface StorageQuota extends StorageQuotaProps, StorageQuotaCollections, StorageQuotaMethods {
 
@@ -1147,3 +1147,3 @@ }
 **********************************************/
-export interface StorageQuotaCollections extends StorageQuotaProps, StorageQuotaPropMethods {
+export interface StorageQuotaCollections extends StorageQuotaPropMethods {
 
@@ -1156,3 +1156,3 @@ }
 export interface StorageQuotaCollectionMethods {
-	getByLocation(geoLocation?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota>;
+	getByLocation(geoLocation?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.StorageQuota>;
 }
@@ -1191,3 +1191,3 @@
 **********************************************/
-export interface TaxonomyReplicationParameters extends TaxonomyReplicationParametersCollections, TaxonomyReplicationParametersMethods {
+export interface TaxonomyReplicationParameters extends TaxonomyReplicationParametersProps, TaxonomyReplicationParametersCollections, TaxonomyReplicationParametersMethods {
 
@@ -1216,3 +1216,3 @@ }
 **********************************************/
-export interface TaxonomyReplicationParametersCollections extends TaxonomyReplicationParametersProps, TaxonomyReplicationParametersPropMethods {
+export interface TaxonomyReplicationParametersCollections extends TaxonomyReplicationParametersPropMethods {
 
@@ -1276,3 +1276,3 @@ }
 export interface UnifiedGroupCollectionMethods {
-	getByAlias(alias?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup>;
+	getByAlias(alias?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UnifiedGroup>;
 }
@@ -1297,3 +1297,3 @@
 **********************************************/
-export interface UserMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobEntityData, UserMoveJobCollections, UserMoveJobMethods {
+export interface UserMoveJob extends Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJobEntityData, UserMoveJobProps, UserMoveJobCollections, UserMoveJobMethods {
 
@@ -1322,3 +1322,3 @@ }
 **********************************************/
-export interface UserMoveJobCollections extends UserMoveJobProps, UserMoveJobPropMethods {
+export interface UserMoveJobCollections extends UserMoveJobPropMethods {
 
@@ -1331,6 +1331,6 @@ }
 export interface UserMoveJobCollectionMethods {
-	getByDirection(direction?: string): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
-	getByMoveId(odbMoveId?: any): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>;
-	getByUpn(upn?: string): IBaseExecution<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>;
-	getByValidPdl(validPdl?: boolean): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
+	getByDirection(direction?: string): IBaseQuery<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
+	getByMoveId(odbMoveId?: any): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>;
+	getByUpn(upn?: string): IBaseQuery<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>;
+	getByValidPdl(validPdl?: boolean): IBaseQuery<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
 	getMoveReport(moveState?: number, moveDirection?: number, limit?: number, startTime?: any, endTime?: any): IBaseExecution<Array<Microsoft.Online.SharePoint.MultiGeo.Service.UserMoveJob>>;
@@ -1337,0 +1337,0 @@ }

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface PointPublishingAdmin extends PointPublishingAdminCollections, PointPublishingAdminMethods {
+export interface PointPublishingAdmin extends PointPublishingAdminProps, PointPublishingAdminCollections, PointPublishingAdminMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface PointPublishingAdminCollections extends PointPublishingAdminProps, PointPublishingAdminPropMethods {
+export interface PointPublishingAdminCollections extends PointPublishingAdminPropMethods {
 
@@ -46,0 +46,0 @@ }

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface LogExport extends LogExportCollections, LogExportMethods {
+export interface LogExport extends LogExportProps, LogExportCollections, LogExportMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface LogExportCollections extends LogExportProps, LogExportPropMethods {
+export interface LogExportCollections extends LogExportPropMethods {
 
@@ -46,0 +46,0 @@ }

lib/Microsoft/Online/SharePoint/TenantAdmin/MiddleTier/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface DDIAdapter extends DDIAdapterCollections, DDIAdapterMethods {
+export interface DDIAdapter extends DDIAdapterProps, DDIAdapterCollections, DDIAdapterMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface DDIAdapterCollections extends DDIAdapterProps, DDIAdapterPropMethods {
+export interface DDIAdapterCollections extends DDIAdapterPropMethods {
 
@@ -46,0 +46,0 @@ }

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

@@ -40,3 +40,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface HubSiteProperties extends HubSitePropertiesCollections, HubSitePropertiesMethods {
+export interface HubSiteProperties extends HubSitePropertiesProps, HubSitePropertiesCollections, HubSitePropertiesMethods {
 
@@ -70,3 +70,3 @@ }
 **********************************************/
-export interface HubSitePropertiesCollections extends HubSitePropertiesProps, HubSitePropertiesPropMethods {
+export interface HubSitePropertiesCollections extends HubSitePropertiesPropMethods {
 
@@ -106,3 +106,3 @@ }
 **********************************************/
-export interface Office365CommsMessagesServiceProxy extends Office365CommsMessagesServiceProxyCollections, Office365CommsMessagesServiceProxyMethods {
+export interface Office365CommsMessagesServiceProxy extends Office365CommsMessagesServiceProxyProps, Office365CommsMessagesServiceProxyCollections, Office365CommsMessagesServiceProxyMethods {
 
@@ -128,3 +128,3 @@ }
 **********************************************/
-export interface Office365CommsMessagesServiceProxyCollections extends Office365CommsMessagesServiceProxyProps, Office365CommsMessagesServiceProxyPropMethods {
+export interface Office365CommsMessagesServiceProxyCollections extends Office365CommsMessagesServiceProxyPropMethods {
 
@@ -199,3 +199,3 @@ }
 **********************************************/
-export interface SiteCollectionManagementService extends SiteCollectionManagementServiceCollections, SiteCollectionManagementServiceMethods {
+export interface SiteCollectionManagementService extends SiteCollectionManagementServiceProps, SiteCollectionManagementServiceCollections, SiteCollectionManagementServiceMethods {
 
@@ -221,3 +221,3 @@ }
 **********************************************/
-export interface SiteCollectionManagementServiceCollections extends SiteCollectionManagementServiceProps, SiteCollectionManagementServicePropMethods {
+export interface SiteCollectionManagementServiceCollections extends SiteCollectionManagementServicePropMethods {
 
@@ -262,3 +262,3 @@ }
 **********************************************/
-export interface SiteProperties extends SitePropertiesCollections, SitePropertiesMethods {
+export interface SiteProperties extends SitePropertiesProps, SitePropertiesCollections, SitePropertiesMethods {
 
@@ -333,3 +333,3 @@ }
 **********************************************/
-export interface SitePropertiesCollections extends SitePropertiesProps, SitePropertiesPropMethods {
+export interface SitePropertiesCollections extends SitePropertiesPropMethods {
 
@@ -342,3 +342,3 @@ }
 export interface SitePropertiesCollectionMethods {
-	getById(siteId?: any): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties>;
+	getById(siteId?: any): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties>;
 	getLockStateById(siteId?: any): IBaseExecution<number>;
@@ -442,3 +442,3 @@ }
 **********************************************/
-export interface TenantAdminSettingsService extends TenantAdminSettingsServiceCollections, TenantAdminSettingsServiceMethods {
+export interface TenantAdminSettingsService extends TenantAdminSettingsServiceProps, TenantAdminSettingsServiceCollections, TenantAdminSettingsServiceMethods {
 
@@ -485,3 +485,3 @@ }
 **********************************************/
-export interface TenantAdminSettingsServiceCollections extends TenantAdminSettingsServiceProps, TenantAdminSettingsServicePropMethods {
+export interface TenantAdminSettingsServiceCollections extends TenantAdminSettingsServicePropMethods {
 
@@ -522,3 +522,3 @@ }
 **********************************************/
-export interface Tenant extends TenantCollections, TenantMethods {
+export interface Tenant extends TenantProps, TenantCollections, TenantMethods {
 
@@ -644,3 +644,3 @@ }
 **********************************************/
-export interface TenantCollections extends TenantProps, TenantPropMethods {
+export interface TenantCollections extends TenantPropMethods {
 	Sites(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesCollectionMethods;
@@ -647,0 +647,0 @@ Sites(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.SiteProperties> & Microsoft.Online.SharePoint.TenantAdministration.SitePropertiesCollections;

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

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface SPOWebAppServicePrincipalPermissionGrant extends SPOWebAppServicePrincipalPermissionGrantCollections, SPOWebAppServicePrincipalPermissionGrantMethods {
+export interface SPOWebAppServicePrincipalPermissionGrant extends SPOWebAppServicePrincipalPermissionGrantProps, SPOWebAppServicePrincipalPermissionGrantCollections, SPOWebAppServicePrincipalPermissionGrantMethods {
 
@@ -53,3 +53,3 @@ }
 **********************************************/
-export interface SPOWebAppServicePrincipalPermissionGrantCollections extends SPOWebAppServicePrincipalPermissionGrantProps, SPOWebAppServicePrincipalPermissionGrantPropMethods {
+export interface SPOWebAppServicePrincipalPermissionGrantCollections extends SPOWebAppServicePrincipalPermissionGrantPropMethods {
 
@@ -62,3 +62,3 @@ }
 export interface SPOWebAppServicePrincipalPermissionGrantCollectionMethods {
-	getByObjectId(objectId?: string): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant>;
+	getByObjectId(objectId?: string): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant>;
 }
@@ -97,3 +97,3 @@
 **********************************************/
-export interface SPOWebAppServicePrincipalPermissionRequest extends SPOWebAppServicePrincipalPermissionRequestCollections, SPOWebAppServicePrincipalPermissionRequestMethods {
+export interface SPOWebAppServicePrincipalPermissionRequest extends SPOWebAppServicePrincipalPermissionRequestProps, SPOWebAppServicePrincipalPermissionRequestCollections, SPOWebAppServicePrincipalPermissionRequestMethods {
 
@@ -127,3 +127,3 @@ }
 **********************************************/
-export interface SPOWebAppServicePrincipalPermissionRequestCollections extends SPOWebAppServicePrincipalPermissionRequestProps, SPOWebAppServicePrincipalPermissionRequestPropMethods {
+export interface SPOWebAppServicePrincipalPermissionRequestCollections extends SPOWebAppServicePrincipalPermissionRequestPropMethods {
 
@@ -137,3 +137,3 @@ }
 	approve(resource?: string, scope?: string): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant>;
-	getById(id?: any): IBaseExecution<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest>;
+	getById(id?: any): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionRequest>;
 }
@@ -173,3 +173,3 @@
 **********************************************/
-export interface SPOWebAppServicePrincipal extends SPOWebAppServicePrincipalCollections, SPOWebAppServicePrincipalMethods {
+export interface SPOWebAppServicePrincipal extends SPOWebAppServicePrincipalProps, SPOWebAppServicePrincipalCollections, SPOWebAppServicePrincipalMethods {
 
@@ -197,3 +197,3 @@ }
 **********************************************/
-export interface SPOWebAppServicePrincipalCollections extends SPOWebAppServicePrincipalProps, SPOWebAppServicePrincipalPropMethods {
+export interface SPOWebAppServicePrincipalCollections extends SPOWebAppServicePrincipalPropMethods {
 	PermissionGrants(): IBaseCollection<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantCollectionMethods;
@@ -200,0 +200,0 @@ PermissionGrants(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrant> & Microsoft.Online.SharePoint.TenantAdministration.Internal.SPOWebAppServicePrincipalPermissionGrantCollections;

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

@@ -32,3 +32,3 @@ import { IBaseExecution } from "../../../../";
 export interface ExternalUserCollectionMethods {
-	getById(uniqueId?: string): IBaseExecution<Microsoft.Online.SharePoint.TenantManagement.ExternalUser>;
+	getById(uniqueId?: string): IBaseQuery<Microsoft.Online.SharePoint.TenantManagement.ExternalUser>;
 }
@@ -53,3 +53,3 @@
 **********************************************/
-export interface GetExternalUsersResults extends GetExternalUsersResultsCollections, GetExternalUsersResultsMethods {
+export interface GetExternalUsersResults extends GetExternalUsersResultsProps, GetExternalUsersResultsCollections, GetExternalUsersResultsMethods {
 
@@ -76,3 +76,3 @@ }
 **********************************************/
-export interface GetExternalUsersResultsCollections extends GetExternalUsersResultsProps, GetExternalUsersResultsPropMethods {
+export interface GetExternalUsersResultsCollections extends GetExternalUsersResultsPropMethods {
 	ExternalUserCollection(): IBaseCollection<Microsoft.Online.SharePoint.TenantManagement.ExternalUser> & Microsoft.Online.SharePoint.TenantManagement.ExternalUserCollectionMethods;
@@ -149,3 +149,3 @@ ExternalUserCollection(id: string | number): IBaseQuery<Microsoft.Online.SharePoint.TenantManagement.ExternalUser> & Microsoft.Online.SharePoint.TenantManagement.ExternalUserCollections;
 **********************************************/
-export interface Office365Tenant extends Office365TenantCollections, Office365TenantMethods {
+export interface Office365Tenant extends Office365TenantProps, Office365TenantCollections, Office365TenantMethods {
 
@@ -248,3 +248,3 @@ }
 **********************************************/
-export interface Office365TenantCollections extends Office365TenantProps, Office365TenantPropMethods {
+export interface Office365TenantCollections extends Office365TenantPropMethods {
 
@@ -251,0 +251,0 @@ }

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

@@ -25,3 +25,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface SPAppStateQueryJobDefinition extends SPAppStateQueryJobDefinitionCollections, SPAppStateQueryJobDefinitionMethods {
+export interface SPAppStateQueryJobDefinition extends SPAppStateQueryJobDefinitionProps, SPAppStateQueryJobDefinitionCollections, SPAppStateQueryJobDefinitionMethods {
 
@@ -47,3 +47,3 @@ }
 **********************************************/
-export interface SPAppStateQueryJobDefinitionCollections extends SPAppStateQueryJobDefinitionProps, SPAppStateQueryJobDefinitionPropMethods {
+export interface SPAppStateQueryJobDefinitionCollections extends SPAppStateQueryJobDefinitionPropMethods {
 
@@ -84,3 +84,3 @@ }
 export interface SPFarmQuery extends SPFarm {
-	Local: Microsoft.SharePoint.Administration.SPFarm;
+	Local: Microsoft.SharePoint.Administration.SPFarm & Microsoft.SharePoint.Administration.SPFarmCollections;
 }
@@ -141,3 +141,3 @@
 **********************************************/
-export interface SPWebApplication extends SPWebApplicationCollections, SPWebApplicationMethods {
+export interface SPWebApplication extends SPWebApplicationProps, SPWebApplicationCollections, SPWebApplicationMethods {
 
@@ -167,5 +167,5 @@ }
 **********************************************/
-export interface SPWebApplicationCollections extends SPWebApplicationProps, SPWebApplicationPropMethods {
+export interface SPWebApplicationCollections extends SPWebApplicationPropMethods {
 	Sites(): IBaseCollection<SP.Site, SP.SiteQuery>;
-	Sites(id: string | number): IBaseQuery<SP.Site, SP.SiteQuery>;
+	Sites(id: string | number): IBaseQuery<SP.Site, SP.SiteQuery> & SP.SiteCollections;
 }
@@ -204,3 +204,3 @@
 **********************************************/
-export interface SPWebService extends SPWebServiceCollections, SPWebServiceMethods {
+export interface SPWebService extends SPWebServiceProps, SPWebServiceCollections, SPWebServiceMethods {
 
@@ -220,3 +220,3 @@ }
 export interface SPWebServicePropMethods {
-	ContentService(): IBaseExecution<Microsoft.SharePoint.Administration.SPWebService>;
+	ContentService(): IBaseExecution<Microsoft.SharePoint.Administration.SPWebService> & Microsoft.SharePoint.Administration.SPWebServiceCollections;
 }
@@ -227,5 +227,5 @@
 **********************************************/
-export interface SPWebServiceCollections extends SPWebServiceProps, SPWebServicePropMethods {
-	WebApplications(): IBaseCollection<Microsoft.SharePoint.Administration.SPWebApplication, Microsoft.SharePoint.Administration.SPWebApplicationQuery>;
-	WebApplications(id: string | number): IBaseQuery<Microsoft.SharePoint.Administration.SPWebApplication, Microsoft.SharePoint.Administration.SPWebApplicationQuery>;
+export interface SPWebServiceCollections extends SPWebServicePropMethods {
+	WebApplications(): IBaseCollection<Microsoft.SharePoint.Administration.SPWebApplication>;
+	WebApplications(id: string | number): IBaseQuery<Microsoft.SharePoint.Administration.SPWebApplication> & Microsoft.SharePoint.Administration.SPWebApplicationCollections;
 }
@@ -237,3 +237,3 @@
 export interface SPWebServiceQuery extends SPWebServiceProps,SPWebServiceMethods {
-	ContentService: Microsoft.SharePoint.Administration.SPWebService;
+	ContentService: Microsoft.SharePoint.Administration.SPWebService & Microsoft.SharePoint.Administration.SPWebServiceCollections;
 	WebApplications: IBaseResults<Microsoft.SharePoint.Administration.SPWebApplication>;
@@ -266,3 +266,3 @@ }
 **********************************************/
-export interface SPAnalyticsUsageService extends SPAnalyticsUsageServiceCollections, SPAnalyticsUsageServiceMethods {
+export interface SPAnalyticsUsageService extends SPAnalyticsUsageServiceProps, SPAnalyticsUsageServiceCollections, SPAnalyticsUsageServiceMethods {
 
@@ -288,3 +288,3 @@ }
 **********************************************/
-export interface SPAnalyticsUsageServiceCollections extends SPAnalyticsUsageServiceProps, SPAnalyticsUsageServicePropMethods {
+export interface SPAnalyticsUsageServiceCollections extends SPAnalyticsUsageServicePropMethods {
 
@@ -291,0 +291,0 @@ }

lib/Microsoft/SharePoint/Client/Search/Administration/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface DocumentCrawlLog extends DocumentCrawlLogCollections, DocumentCrawlLogMethods {
+export interface DocumentCrawlLog extends DocumentCrawlLogProps, DocumentCrawlLogCollections, DocumentCrawlLogMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface DocumentCrawlLogCollections extends DocumentCrawlLogProps, DocumentCrawlLogPropMethods {
+export interface DocumentCrawlLogCollections extends DocumentCrawlLogPropMethods {
 
@@ -46,0 +46,0 @@ }

lib/Microsoft/SharePoint/Client/Search/Analytics/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface SignalStore extends SignalStoreCollections, SignalStoreMethods {
+export interface SignalStore extends SignalStoreProps, SignalStoreCollections, SignalStoreMethods {
 
@@ -44,3 +44,3 @@ }
 **********************************************/
-export interface SignalStoreCollections extends SignalStoreProps, SignalStorePropMethods {
+export interface SignalStoreCollections extends SignalStorePropMethods {
 
@@ -47,0 +47,0 @@ }

lib/Microsoft/SharePoint/Client/Search/Query/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../../../../";
 **********************************************/
-export interface StringCollection extends StringCollectionCollections, StringCollectionMethods {
+export interface StringCollection extends StringCollectionProps, StringCollectionCollections, StringCollectionMethods {
 
@@ -45,3 +45,3 @@ }
 **********************************************/
-export interface StringCollectionCollections extends StringCollectionProps, StringCollectionPropMethods {
+export interface StringCollectionCollections extends StringCollectionPropMethods {
 
@@ -96,3 +96,3 @@ }
 **********************************************/
-export interface RankingLabeling extends RankingLabelingCollections, RankingLabelingMethods {
+export interface RankingLabeling extends RankingLabelingProps, RankingLabelingCollections, RankingLabelingMethods {
 
@@ -118,3 +118,3 @@ }
 **********************************************/
-export interface RankingLabelingCollections extends RankingLabelingProps, RankingLabelingPropMethods {
+export interface RankingLabelingCollections extends RankingLabelingPropMethods {
 
@@ -156,3 +156,3 @@ }
 **********************************************/
-export interface ReorderingRuleCollection extends ReorderingRuleCollectionCollections, ReorderingRuleCollectionMethods {
+export interface ReorderingRuleCollection extends ReorderingRuleCollectionProps, ReorderingRuleCollectionCollections, ReorderingRuleCollectionMethods {
 
@@ -179,3 +179,3 @@ }
 **********************************************/
-export interface ReorderingRuleCollectionCollections extends ReorderingRuleCollectionProps, ReorderingRuleCollectionPropMethods {
+export interface ReorderingRuleCollectionCollections extends ReorderingRuleCollectionPropMethods {
 
@@ -216,3 +216,3 @@ }
 **********************************************/
-export interface SortCollection extends SortCollectionCollections, SortCollectionMethods {
+export interface SortCollection extends SortCollectionProps, SortCollectionCollections, SortCollectionMethods {
 
@@ -239,3 +239,3 @@ }
 **********************************************/
-export interface SortCollectionCollections extends SortCollectionProps, SortCollectionPropMethods {
+export interface SortCollectionCollections extends SortCollectionPropMethods {
 
@@ -242,0 +242,0 @@ }

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface HostedAppsManager extends HostedAppsManagerCollections, HostedAppsManagerMethods {
+export interface HostedAppsManager extends HostedAppsManagerProps, HostedAppsManagerCollections, HostedAppsManagerMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface HostedAppsManagerCollections extends HostedAppsManagerProps, HostedAppsManagerPropMethods {
+export interface HostedAppsManagerCollections extends HostedAppsManagerPropMethods {
 
@@ -80,3 +80,3 @@ }
 **********************************************/
-export interface HostedApp extends HostedAppCollections, HostedAppMethods {
+export interface HostedApp extends HostedAppProps, HostedAppCollections, HostedAppMethods {
 
@@ -102,3 +102,3 @@ }
 **********************************************/
-export interface HostedAppCollections extends HostedAppProps, HostedAppPropMethods {
+export interface HostedAppCollections extends HostedAppPropMethods {
 
@@ -105,0 +105,0 @@ }

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

@@ -25,3 +25,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface comment extends commentCollections, commentMethods {
+export interface comment extends commentProps, commentCollections, commentMethods {
 
@@ -59,5 +59,5 @@ }
 **********************************************/
-export interface commentCollections extends commentProps, commentPropMethods {
+export interface commentCollections extends commentPropMethods {
 	likedBy(): IBaseCollection<Microsoft.SharePoint.Likes.userEntity>;
-	likedBy(id: string | number): IBaseQuery<Microsoft.SharePoint.Likes.userEntity>;
+	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;
@@ -64,0 +64,0 @@ replies(id: string | number): IBaseQuery<Microsoft.SharePoint.Comments.comment, Microsoft.SharePoint.Comments.commentQuery> & Microsoft.SharePoint.Comments.commentCollections;

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface ActivityLogger extends ActivityLoggerCollections, ActivityLoggerMethods {
+export interface ActivityLogger extends ActivityLoggerProps, ActivityLoggerCollections, ActivityLoggerMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface ActivityLoggerCollections extends ActivityLoggerProps, ActivityLoggerPropMethods {
+export interface ActivityLoggerCollections extends ActivityLoggerPropMethods {
 
@@ -46,0 +46,0 @@ }

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

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface likedByInformation extends likedByInformationCollections, likedByInformationMethods {
+export interface likedByInformation extends likedByInformationProps, likedByInformationCollections, likedByInformationMethods {
 
@@ -47,5 +47,5 @@ }
 **********************************************/
-export interface likedByInformationCollections extends likedByInformationProps, likedByInformationPropMethods {
+export interface likedByInformationCollections extends likedByInformationPropMethods {
 	likedBy(): IBaseCollection<Microsoft.SharePoint.Likes.userEntity>;
-	likedBy(id: string | number): IBaseQuery<Microsoft.SharePoint.Likes.userEntity>;
+	likedBy(id: string | number): IBaseQuery<Microsoft.SharePoint.Likes.userEntity> & Microsoft.SharePoint.Likes.userEntityCollections;
 }
@@ -52,0 +52,0 @@

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

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface SiteCollectionCorporateCatalogAccessor extends SiteCollectionCorporateCatalogAccessorCollections, SiteCollectionCorporateCatalogAccessorMethods {
+export interface SiteCollectionCorporateCatalogAccessor extends SiteCollectionCorporateCatalogAccessorProps, SiteCollectionCorporateCatalogAccessorCollections, SiteCollectionCorporateCatalogAccessorMethods {
 
@@ -46,3 +46,3 @@ }
 **********************************************/
-export interface SiteCollectionCorporateCatalogAccessorCollections extends SiteCollectionCorporateCatalogAccessorProps, SiteCollectionCorporateCatalogAccessorPropMethods {
+export interface SiteCollectionCorporateCatalogAccessorCollections extends SiteCollectionCorporateCatalogAccessorPropMethods {
 	AvailableApps(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollectionMethods;
@@ -83,3 +83,3 @@ AvailableApps(id: string | number): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollections;
 **********************************************/
-export interface CorporateCatalogAppMetadata extends CorporateCatalogAppMetadataCollections, CorporateCatalogAppMetadataMethods {
+export interface CorporateCatalogAppMetadata extends CorporateCatalogAppMetadataProps, CorporateCatalogAppMetadataCollections, CorporateCatalogAppMetadataMethods {
 
@@ -112,3 +112,3 @@ }
 **********************************************/
-export interface CorporateCatalogAppMetadataCollections extends CorporateCatalogAppMetadataProps, CorporateCatalogAppMetadataPropMethods {
+export interface CorporateCatalogAppMetadataCollections extends CorporateCatalogAppMetadataPropMethods {
 
@@ -121,3 +121,3 @@ }
 export interface CorporateCatalogAppMetadataCollectionMethods {
-	getById(id?: string): IBaseExecution<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata>;
+	getById(id?: string): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata>;
 }
@@ -161,3 +161,3 @@
 **********************************************/
-export interface TenantCorporateCatalogAccessor extends TenantCorporateCatalogAccessorCollections, TenantCorporateCatalogAccessorMethods {
+export interface TenantCorporateCatalogAccessor extends TenantCorporateCatalogAccessorProps, TenantCorporateCatalogAccessorCollections, TenantCorporateCatalogAccessorMethods {
 
@@ -183,3 +183,3 @@ }
 **********************************************/
-export interface TenantCorporateCatalogAccessorCollections extends TenantCorporateCatalogAccessorProps, TenantCorporateCatalogAccessorPropMethods {
+export interface TenantCorporateCatalogAccessorCollections extends TenantCorporateCatalogAccessorPropMethods {
 	AvailableApps(): IBaseCollection<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollectionMethods;
@@ -226,3 +226,3 @@ AvailableApps(id: string | number): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadata> & Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.CorporateCatalogAppMetadataCollections;
 	add(absolutePath?: string): IBaseExecution<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem>;
-	getByAbsoluteUrl(absolutePath?: string): IBaseExecution<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem>;
+	getByAbsoluteUrl(absolutePath?: string): IBaseQuery<Microsoft.SharePoint.Marketplace.CorporateCuratedGallery.SiteCollectionAppCatalogAllowedItem>;
 	remove(absolutePath?: string): IBaseExecution<any>;
@@ -229,0 +229,0 @@ removeById(siteId?: any): IBaseExecution<any>;

lib/Microsoft/SharePoint/Navigation/REST/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../../../";
 **********************************************/
-export interface NavigationServiceRest extends NavigationServiceRestCollections, NavigationServiceRestMethods {
+export interface NavigationServiceRest extends NavigationServiceRestProps, NavigationServiceRestCollections, NavigationServiceRestMethods {
 
@@ -44,3 +44,3 @@ }
 **********************************************/
-export interface NavigationServiceRestCollections extends NavigationServiceRestProps, NavigationServiceRestPropMethods {
+export interface NavigationServiceRestCollections extends NavigationServiceRestPropMethods {
 
@@ -47,0 +47,0 @@ }

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface OrgNewsSiteApi extends OrgNewsSiteApiCollections, OrgNewsSiteApiMethods {
+export interface OrgNewsSiteApi extends OrgNewsSiteApiProps, OrgNewsSiteApiCollections, OrgNewsSiteApiMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface OrgNewsSiteApiCollections extends OrgNewsSiteApiProps, OrgNewsSiteApiPropMethods {
+export interface OrgNewsSiteApiCollections extends OrgNewsSiteApiPropMethods {
 
@@ -46,0 +46,0 @@ }

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

@@ -39,3 +39,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface GroupService extends GroupServiceCollections, GroupServiceMethods {
+export interface GroupService extends GroupServiceProps, GroupServiceCollections, GroupServiceMethods {
 
@@ -61,3 +61,3 @@ }
 **********************************************/
-export interface GroupServiceCollections extends GroupServiceProps, GroupServicePropMethods {
+export interface GroupServiceCollections extends GroupServicePropMethods {
 
@@ -99,3 +99,3 @@ }
 **********************************************/
-export interface GroupSiteManager extends GroupSiteManagerCollections, GroupSiteManagerMethods {
+export interface GroupSiteManager extends GroupSiteManagerProps, GroupSiteManagerCollections, GroupSiteManagerMethods {
 
@@ -121,3 +121,3 @@ }
 **********************************************/
-export interface GroupSiteManagerCollections extends GroupSiteManagerProps, GroupSiteManagerPropMethods {
+export interface GroupSiteManagerCollections extends GroupSiteManagerPropMethods {
 
@@ -166,3 +166,3 @@ }
 **********************************************/
-export interface SiteLinkingManager extends SiteLinkingManagerCollections, SiteLinkingManagerMethods {
+export interface SiteLinkingManager extends SiteLinkingManagerProps, SiteLinkingManagerCollections, SiteLinkingManagerMethods {
 
@@ -188,3 +188,3 @@ }
 **********************************************/
-export interface SiteLinkingManagerCollections extends SiteLinkingManagerProps, SiteLinkingManagerPropMethods {
+export interface SiteLinkingManagerCollections extends SiteLinkingManagerPropMethods {
 
@@ -254,3 +254,3 @@ }
 **********************************************/
-export interface SharePointHomeServiceContextBuilder extends SharePointHomeServiceContextBuilderCollections, SharePointHomeServiceContextBuilderMethods {
+export interface SharePointHomeServiceContextBuilder extends SharePointHomeServiceContextBuilderProps, SharePointHomeServiceContextBuilderCollections, SharePointHomeServiceContextBuilderMethods {
 
@@ -276,3 +276,3 @@ }
 **********************************************/
-export interface SharePointHomeServiceContextBuilderCollections extends SharePointHomeServiceContextBuilderProps, SharePointHomeServiceContextBuilderPropMethods {
+export interface SharePointHomeServiceContextBuilderCollections extends SharePointHomeServiceContextBuilderPropMethods {
 
@@ -317,3 +317,3 @@ }
 export interface SharePointHomeServiceContextQuery extends SharePointHomeServiceContext {
-	Token: SP.OAuth.TokenResponse;
+	Token: SP.OAuth.TokenResponse & SP.OAuth.TokenResponseCollections;
 }
@@ -338,3 +338,3 @@
 **********************************************/
-export interface SPHubSitesUtility extends SPHubSitesUtilityCollections, SPHubSitesUtilityMethods {
+export interface SPHubSitesUtility extends SPHubSitesUtilityProps, SPHubSitesUtilityCollections, SPHubSitesUtilityMethods {
 
@@ -360,3 +360,3 @@ }
 **********************************************/
-export interface SPHubSitesUtilityCollections extends SPHubSitesUtilityProps, SPHubSitesUtilityPropMethods {
+export interface SPHubSitesUtilityCollections extends SPHubSitesUtilityPropMethods {
 
@@ -396,3 +396,3 @@ }
 **********************************************/
-export interface SPSiteManager extends SPSiteManagerCollections, SPSiteManagerMethods {
+export interface SPSiteManager extends SPSiteManagerProps, SPSiteManagerCollections, SPSiteManagerMethods {
 
@@ -418,3 +418,3 @@ }
 **********************************************/
-export interface SPSiteManagerCollections extends SPSiteManagerProps, SPSiteManagerPropMethods {
+export interface SPSiteManagerCollections extends SPSiteManagerPropMethods {
 
@@ -421,0 +421,0 @@ }

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

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface TenantCdnApi extends TenantCdnApiCollections, TenantCdnApiMethods {
+export interface TenantCdnApi extends TenantCdnApiProps, TenantCdnApiCollections, TenantCdnApiMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface TenantCdnApiCollections extends TenantCdnApiProps, TenantCdnApiPropMethods {
+export interface TenantCdnApiCollections extends TenantCdnApiPropMethods {
 
@@ -46,0 +46,0 @@ }

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

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface Subscription extends SubscriptionCollections, SubscriptionMethods {
+export interface Subscription extends SubscriptionProps, SubscriptionCollections, SubscriptionMethods {
 
@@ -49,3 +49,3 @@ }
 **********************************************/
-export interface SubscriptionCollections extends SubscriptionProps, SubscriptionPropMethods {
+export interface SubscriptionCollections extends SubscriptionPropMethods {
 
@@ -59,3 +59,3 @@ }
 	add(parameters?: Microsoft.SharePoint.Webhooks.SubscriptionInformation): IBaseExecution<Microsoft.SharePoint.Webhooks.Subscription>;
-	getById(id?: any): IBaseExecution<Microsoft.SharePoint.Webhooks.Subscription>;
+	getById(id?: any): IBaseQuery<Microsoft.SharePoint.Webhooks.Subscription>;
 	remove(subscriptionId?: any): IBaseExecution<any>;
@@ -62,0 +62,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): IBaseExecution<MS.FileServices.FileSystemItem>;
+	getById(id?: string): IBaseQuery<MS.FileServices.FileSystemItem>;
 }
@@ -55,3 +55,3 @@
 **********************************************/
-export interface File extends MS.FileServices.FileSystemItem, FileCollections, FileMethods {
+export interface File extends MS.FileServices.FileSystemItem, FileProps, FileCollections, FileMethods {
 
@@ -77,3 +77,3 @@ }
 **********************************************/
-export interface FileCollections extends FileProps, FilePropMethods {
+export interface FileCollections extends FilePropMethods {
 
@@ -131,3 +131,3 @@ }
 **********************************************/
-export interface Folder extends MS.FileServices.FileSystemItem, FolderCollections, FolderMethods {
+export interface Folder extends MS.FileServices.FileSystemItem, FolderProps, FolderCollections, FolderMethods {
 
@@ -153,3 +153,3 @@ }
 **********************************************/
-export interface FolderCollections extends FolderProps, FolderPropMethods {
+export interface FolderCollections extends FolderPropMethods {
 	Children(): IBaseCollection<MS.FileServices.FileSystemItem> & MS.FileServices.FileSystemItemCollectionMethods;
@@ -156,0 +156,0 @@ Children(id: string | number): IBaseQuery<MS.FileServices.FileSystemItem> & MS.FileServices.FileSystemItemCollections;

lib/OBA/Server/ServerWrapper/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface Diagnostics extends DiagnosticsCollections, DiagnosticsMethods {
+export interface Diagnostics extends DiagnosticsProps, DiagnosticsCollections, DiagnosticsMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface DiagnosticsCollections extends DiagnosticsProps, DiagnosticsPropMethods {
+export interface DiagnosticsCollections extends DiagnosticsPropMethods {
 
@@ -79,3 +79,3 @@ }
 **********************************************/
-export interface Reporting extends ReportingCollections, ReportingMethods {
+export interface Reporting extends ReportingProps, ReportingCollections, ReportingMethods {
 
@@ -101,3 +101,3 @@ }
 **********************************************/
-export interface ReportingCollections extends ReportingProps, ReportingPropMethods {
+export interface ReportingCollections extends ReportingPropMethods {
 
@@ -137,3 +137,3 @@ }
 **********************************************/
-export interface Taskflow extends TaskflowCollections, TaskflowMethods {
+export interface Taskflow extends TaskflowProps, TaskflowCollections, TaskflowMethods {
 
@@ -159,3 +159,3 @@ }
 **********************************************/
-export interface TaskflowCollections extends TaskflowProps, TaskflowPropMethods {
+export interface TaskflowCollections extends TaskflowPropMethods {
 
@@ -162,0 +162,0 @@ }

lib/SP/BusinessData/entitytypes.d.ts

@@ -60,3 +60,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface EntityIdentifier extends EntityIdentifierCollections, EntityIdentifierMethods {
+export interface EntityIdentifier extends EntityIdentifierProps, EntityIdentifierCollections, EntityIdentifierMethods {
 
@@ -83,3 +83,3 @@ }
 **********************************************/
-export interface EntityIdentifierCollections extends EntityIdentifierProps, EntityIdentifierPropMethods {
+export interface EntityIdentifierCollections extends EntityIdentifierPropMethods {
 
@@ -135,3 +135,3 @@ }
 **********************************************/
-export interface TypeDescriptor extends TypeDescriptorCollections, TypeDescriptorMethods {
+export interface TypeDescriptor extends TypeDescriptorProps, TypeDescriptorCollections, TypeDescriptorMethods {
 
@@ -161,3 +161,3 @@ }
 **********************************************/
-export interface TypeDescriptorCollections extends TypeDescriptorProps, TypeDescriptorPropMethods {
+export interface TypeDescriptorCollections extends TypeDescriptorPropMethods {
 
@@ -203,3 +203,3 @@ }
 **********************************************/
-export interface Entity extends EntityCollections, EntityMethods {
+export interface Entity extends EntityProps, EntityCollections, EntityMethods {
 
@@ -227,3 +227,3 @@ }
 **********************************************/
-export interface EntityCollections extends EntityProps, EntityPropMethods {
+export interface EntityCollections extends EntityPropMethods {
 
@@ -272,3 +272,3 @@ }
 **********************************************/
-export interface LobSystem extends LobSystemCollections, LobSystemMethods {
+export interface LobSystem extends LobSystemProps, LobSystemCollections, LobSystemMethods {
 
@@ -294,3 +294,3 @@ }
 **********************************************/
-export interface LobSystemCollections extends LobSystemProps, LobSystemPropMethods {
+export interface LobSystemCollections extends LobSystemPropMethods {
 
@@ -330,3 +330,3 @@ }
 **********************************************/
-export interface MethodExecutionResult extends MethodExecutionResultCollections, MethodExecutionResultMethods {
+export interface MethodExecutionResult extends MethodExecutionResultProps, MethodExecutionResultCollections, MethodExecutionResultMethods {
 
@@ -352,5 +352,5 @@ }
 **********************************************/
-export interface MethodExecutionResultCollections extends MethodExecutionResultProps, MethodExecutionResultPropMethods {
+export interface MethodExecutionResultCollections extends MethodExecutionResultPropMethods {
 	ReturnParameterCollection(): IBaseCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary>;
-	ReturnParameterCollection(id: string | number): IBaseQuery<SP.BusinessData.Runtime.EntityFieldValueDictionary>;
+	ReturnParameterCollection(id: string | number): IBaseQuery<SP.BusinessData.Runtime.EntityFieldValueDictionary> & SP.BusinessData.Runtime.EntityFieldValueDictionaryCollections;
 }
@@ -389,3 +389,3 @@
 **********************************************/
-export interface EntityView extends EntityViewCollections, EntityViewMethods {
+export interface EntityView extends EntityViewProps, EntityViewCollections, EntityViewMethods {
 
@@ -412,5 +412,5 @@ }
 **********************************************/
-export interface EntityViewCollections extends EntityViewProps, EntityViewPropMethods {
+export interface EntityViewCollections extends EntityViewPropMethods {
 	Fields(): IBaseCollection<SP.BusinessData.EntityField>;
-	Fields(id: string | number): IBaseQuery<SP.BusinessData.EntityField>;
+	Fields(id: string | number): IBaseQuery<SP.BusinessData.EntityField> & SP.BusinessData.EntityFieldCollections;
 }
@@ -452,3 +452,3 @@
 **********************************************/
-export interface AppBdcCatalog extends AppBdcCatalogCollections, AppBdcCatalogMethods {
+export interface AppBdcCatalog extends AppBdcCatalogProps, AppBdcCatalogCollections, AppBdcCatalogMethods {
 
@@ -474,3 +474,3 @@ }
 **********************************************/
-export interface AppBdcCatalogCollections extends AppBdcCatalogProps, AppBdcCatalogPropMethods {
+export interface AppBdcCatalogCollections extends AppBdcCatalogPropMethods {
 
@@ -477,0 +477,0 @@ }

lib/SP/BusinessData/Infrastructure/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface ExternalSubscriptionStore extends ExternalSubscriptionStoreCollections, ExternalSubscriptionStoreMethods {
+export interface ExternalSubscriptionStore extends ExternalSubscriptionStoreProps, ExternalSubscriptionStoreCollections, ExternalSubscriptionStoreMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface ExternalSubscriptionStoreCollections extends ExternalSubscriptionStoreProps, ExternalSubscriptionStorePropMethods {
+export interface ExternalSubscriptionStoreCollections extends ExternalSubscriptionStorePropMethods {
 
@@ -46,0 +46,0 @@ }

lib/SP/BusinessData/Runtime/entitytypes.d.ts

@@ -67,3 +67,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface EntityInstance extends EntityInstanceCollections, EntityInstanceMethods {
+export interface EntityInstance extends EntityInstanceProps, EntityInstanceCollections, EntityInstanceMethods {
 
@@ -89,3 +89,3 @@ }
 **********************************************/
-export interface EntityInstanceCollections extends EntityInstanceProps, EntityInstancePropMethods {
+export interface EntityInstanceCollections extends EntityInstancePropMethods {
 
@@ -131,3 +131,3 @@ }
 **********************************************/
-export interface EntityFieldValueDictionary extends EntityFieldValueDictionaryCollections, EntityFieldValueDictionaryMethods {
+export interface EntityFieldValueDictionary extends EntityFieldValueDictionaryProps, EntityFieldValueDictionaryCollections, EntityFieldValueDictionaryMethods {
 
@@ -153,3 +153,3 @@ }
 **********************************************/
-export interface EntityFieldValueDictionaryCollections extends EntityFieldValueDictionaryProps, EntityFieldValueDictionaryPropMethods {
+export interface EntityFieldValueDictionaryCollections extends EntityFieldValueDictionaryPropMethods {
 
@@ -156,0 +156,0 @@ }

lib/SP/CompliancePolicy/entitytypes.d.ts

@@ -38,3 +38,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface SPPolicyStoreProxy extends SPPolicyStoreProxyCollections, SPPolicyStoreProxyMethods {
+export interface SPPolicyStoreProxy extends SPPolicyStoreProxyProps, SPPolicyStoreProxyCollections, SPPolicyStoreProxyMethods {
 
@@ -62,3 +62,3 @@ }
 **********************************************/
-export interface SPPolicyStoreProxyCollections extends SPPolicyStoreProxyProps, SPPolicyStoreProxyPropMethods {
+export interface SPPolicyStoreProxyCollections extends SPPolicyStoreProxyPropMethods {
 
@@ -65,0 +65,0 @@ }

lib/SP/Directory/entitytypes.d.ts

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface DirectorySession extends DirectorySessionCollections, DirectorySessionMethods {
+export interface DirectorySession extends DirectorySessionProps, DirectorySessionCollections, DirectorySessionMethods {
 
@@ -46,3 +46,3 @@ }
 **********************************************/
-export interface DirectorySessionCollections extends DirectorySessionProps, DirectorySessionPropMethods {
+export interface DirectorySessionCollections extends DirectorySessionPropMethods {
 
@@ -88,3 +88,3 @@ }
 **********************************************/
-export interface Group extends GroupCollections, GroupMethods {
+export interface Group extends GroupProps, GroupCollections, GroupMethods {
 
@@ -129,3 +129,3 @@ }
 **********************************************/
-export interface GroupCollections extends GroupProps, GroupPropMethods {
+export interface GroupCollections extends GroupPropMethods {
 	members(): IBaseCollection<SP.Directory.User, SP.Directory.UserQuery> & SP.Directory.UserCollectionMethods;
@@ -177,3 +177,3 @@ members(id: string | number): IBaseQuery<SP.Directory.User, SP.Directory.UserQuery> & SP.Directory.UserCollections;
 **********************************************/
-export interface User extends UserCollections, UserMethods {
+export interface User extends UserProps, UserCollections, UserMethods {
 
@@ -238,3 +238,3 @@ }
 **********************************************/
-export interface UserCollections extends UserProps, UserPropMethods {
+export interface UserCollections extends UserPropMethods {
 	membership(): IBaseCollection<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollectionMethods;
@@ -241,0 +241,0 @@ membership(id: string | number): IBaseQuery<SP.Directory.Group, SP.Directory.GroupQuery> & SP.Directory.GroupCollections;

lib/SP/Directory/Provider/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface DirectoryNotification extends DirectoryNotificationCollections, DirectoryNotificationMethods {
+export interface DirectoryNotification extends DirectoryNotificationProps, DirectoryNotificationCollections, DirectoryNotificationMethods {
 
@@ -44,3 +44,3 @@ }
 **********************************************/
-export interface DirectoryNotificationCollections extends DirectoryNotificationProps, DirectoryNotificationPropMethods {
+export interface DirectoryNotificationCollections extends DirectoryNotificationPropMethods {
 
@@ -80,3 +80,3 @@ }
 **********************************************/
-export interface SharePointDirectoryProvider extends SharePointDirectoryProviderCollections, SharePointDirectoryProviderMethods {
+export interface SharePointDirectoryProvider extends SharePointDirectoryProviderProps, SharePointDirectoryProviderCollections, SharePointDirectoryProviderMethods {
 
@@ -102,3 +102,3 @@ }
 **********************************************/
-export interface SharePointDirectoryProviderCollections extends SharePointDirectoryProviderProps, SharePointDirectoryProviderPropMethods {
+export interface SharePointDirectoryProviderCollections extends SharePointDirectoryProviderPropMethods {
 
@@ -105,0 +105,0 @@ }

lib/SP/DocumentManagement/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface DocumentId extends DocumentIdCollections, DocumentIdMethods {
+export interface DocumentId extends DocumentIdProps, DocumentIdCollections, DocumentIdMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface DocumentIdCollections extends DocumentIdProps, DocumentIdPropMethods {
+export interface DocumentIdCollections extends DocumentIdPropMethods {
 
@@ -46,0 +46,0 @@ }

lib/SP/Microfeed/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface MicrofeedPostDefinitionManager extends MicrofeedPostDefinitionManagerCollections, MicrofeedPostDefinitionManagerMethods {
+export interface MicrofeedPostDefinitionManager extends MicrofeedPostDefinitionManagerProps, MicrofeedPostDefinitionManagerCollections, MicrofeedPostDefinitionManagerMethods {
 
@@ -44,3 +44,3 @@ }
 **********************************************/
-export interface MicrofeedPostDefinitionManagerCollections extends MicrofeedPostDefinitionManagerProps, MicrofeedPostDefinitionManagerPropMethods {
+export interface MicrofeedPostDefinitionManagerCollections extends MicrofeedPostDefinitionManagerPropMethods {
 
@@ -84,3 +84,3 @@ }
 **********************************************/
-export interface MicrofeedAttachmentStore extends MicrofeedAttachmentStoreCollections, MicrofeedAttachmentStoreMethods {
+export interface MicrofeedAttachmentStore extends MicrofeedAttachmentStoreProps, MicrofeedAttachmentStoreCollections, MicrofeedAttachmentStoreMethods {
 
@@ -106,3 +106,3 @@ }
 **********************************************/
-export interface MicrofeedAttachmentStoreCollections extends MicrofeedAttachmentStoreProps, MicrofeedAttachmentStorePropMethods {
+export interface MicrofeedAttachmentStoreCollections extends MicrofeedAttachmentStorePropMethods {
 
@@ -146,3 +146,3 @@ }
 **********************************************/
-export interface MicrofeedData extends MicrofeedDataCollections, MicrofeedDataMethods {
+export interface MicrofeedData extends MicrofeedDataProps, MicrofeedDataCollections, MicrofeedDataMethods {
 
@@ -174,3 +174,3 @@ }
 **********************************************/
-export interface MicrofeedDataCollections extends MicrofeedDataProps, MicrofeedDataPropMethods {
+export interface MicrofeedDataCollections extends MicrofeedDataPropMethods {
 
@@ -219,3 +219,3 @@ }
 **********************************************/
-export interface MicrofeedManager extends MicrofeedManagerCollections, MicrofeedManagerMethods {
+export interface MicrofeedManager extends MicrofeedManagerProps, MicrofeedManagerCollections, MicrofeedManagerMethods {
 
@@ -243,3 +243,3 @@ }
 **********************************************/
-export interface MicrofeedManagerCollections extends MicrofeedManagerProps, MicrofeedManagerPropMethods {
+export interface MicrofeedManagerCollections extends MicrofeedManagerPropMethods {
 
@@ -311,3 +311,3 @@ }
 **********************************************/
-export interface MicrofeedStore extends MicrofeedStoreCollections, MicrofeedStoreMethods {
+export interface MicrofeedStore extends MicrofeedStoreProps, MicrofeedStoreCollections, MicrofeedStoreMethods {
 
@@ -333,3 +333,3 @@ }
 **********************************************/
-export interface MicrofeedStoreCollections extends MicrofeedStoreProps, MicrofeedStorePropMethods {
+export interface MicrofeedStoreCollections extends MicrofeedStorePropMethods {
 
@@ -336,0 +336,0 @@ }

lib/SP/MicroService/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface MicroServiceManager extends MicroServiceManagerCollections, MicroServiceManagerMethods {
+export interface MicroServiceManager extends MicroServiceManagerProps, MicroServiceManagerCollections, MicroServiceManagerMethods {
 
@@ -44,3 +44,3 @@ }
 **********************************************/
-export interface MicroServiceManagerCollections extends MicroServiceManagerProps, MicroServiceManagerPropMethods {
+export interface MicroServiceManagerCollections extends MicroServiceManagerPropMethods {
 
@@ -47,0 +47,0 @@ }

lib/SP/OAuth/entitytypes.d.ts

@@ -40,3 +40,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface NativeClient extends NativeClientCollections, NativeClientMethods {
+export interface NativeClient extends NativeClientProps, NativeClientCollections, NativeClientMethods {
 
@@ -62,3 +62,3 @@ }
 **********************************************/
-export interface NativeClientCollections extends NativeClientProps, NativeClientPropMethods {
+export interface NativeClientCollections extends NativeClientPropMethods {
 
@@ -98,3 +98,3 @@ }
 **********************************************/
-export interface Token extends TokenCollections, TokenMethods {
+export interface Token extends TokenProps, TokenCollections, TokenMethods {
 
@@ -120,3 +120,3 @@ }
 **********************************************/
-export interface TokenCollections extends TokenProps, TokenPropMethods {
+export interface TokenCollections extends TokenPropMethods {
 
@@ -123,0 +123,0 @@ }

lib/SP/Publishing/entitytypes.d.ts

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface CommunicationSite extends CommunicationSiteCollections, CommunicationSiteMethods {
+export interface CommunicationSite extends CommunicationSiteProps, CommunicationSiteCollections, CommunicationSiteMethods {
 
@@ -46,3 +46,3 @@ }
 **********************************************/
-export interface CommunicationSiteCollections extends CommunicationSiteProps, CommunicationSitePropMethods {
+export interface CommunicationSiteCollections extends CommunicationSitePropMethods {
 
@@ -114,3 +114,3 @@ }
 **********************************************/
-export interface EmbedService extends EmbedServiceCollections, EmbedServiceMethods {
+export interface EmbedService extends EmbedServiceProps, EmbedServiceCollections, EmbedServiceMethods {
 
@@ -136,3 +136,3 @@ }
 **********************************************/
-export interface EmbedServiceCollections extends EmbedServiceProps, EmbedServicePropMethods {
+export interface EmbedServiceCollections extends EmbedServicePropMethods {
 
@@ -172,3 +172,3 @@ }
 **********************************************/
-export interface VideoItem extends VideoItemCollections, VideoItemMethods {
+export interface VideoItem extends VideoItemProps, VideoItemCollections, VideoItemMethods {
 
@@ -213,3 +213,3 @@ }
 **********************************************/
-export interface VideoItemCollections extends VideoItemProps, VideoItemPropMethods {
+export interface VideoItemCollections extends VideoItemPropMethods {
 	PeopleInMedia(): IBaseCollection<SP.User, SP.UserQuery> & SP.UserCollectionMethods;
@@ -223,3 +223,3 @@ PeopleInMedia(id: string | number): IBaseQuery<SP.User, SP.UserQuery> & SP.UserCollections;
 export interface VideoItemCollectionMethods {
-	getById(id?: any): IBaseExecution<SP.Publishing.VideoItem>;
+	getById(id?: any): IBaseQuery<SP.Publishing.VideoItem, SP.Publishing.VideoItemQuery> & SP.Publishing.VideoItemCollections;
 }
@@ -339,3 +339,3 @@
 **********************************************/
-export interface PointPublishingPost extends PointPublishingPostCollections, PointPublishingPostMethods {
+export interface PointPublishingPost extends PointPublishingPostProps, PointPublishingPostCollections, PointPublishingPostMethods {
 
@@ -370,3 +370,3 @@ }
 **********************************************/
-export interface PointPublishingPostCollections extends PointPublishingPostProps, PointPublishingPostPropMethods {
+export interface PointPublishingPostCollections extends PointPublishingPostPropMethods {
 	images(): IBaseCollection<SP.File, SP.FileQuery> & SP.FileCollectionMethods;
@@ -380,4 +380,4 @@ images(id: string | number): IBaseQuery<SP.File, SP.FileQuery> & SP.FileCollections;
 export interface PointPublishingPostCollectionMethods {
-	getById(id?: number, publishedOnly?: boolean): IBaseExecution<SP.Publishing.PointPublishingPost>;
-	getByName(name?: string, publishedOnly?: boolean): IBaseExecution<SP.Publishing.PointPublishingPost>;
+	getById(id?: number, publishedOnly?: boolean): IBaseQuery<SP.Publishing.PointPublishingPost, SP.Publishing.PointPublishingPostQuery> & SP.Publishing.PointPublishingPostCollections;
+	getByName(name?: string, publishedOnly?: boolean): IBaseQuery<SP.Publishing.PointPublishingPost, SP.Publishing.PointPublishingPostQuery> & SP.Publishing.PointPublishingPostCollections;
 }
@@ -417,3 +417,3 @@
 **********************************************/
-export interface PointPublishingPostServiceManager extends PointPublishingPostServiceManagerCollections, PointPublishingPostServiceManagerMethods {
+export interface PointPublishingPostServiceManager extends PointPublishingPostServiceManagerProps, PointPublishingPostServiceManagerCollections, PointPublishingPostServiceManagerMethods {
 
@@ -433,3 +433,3 @@ }
 export interface PointPublishingPostServiceManagerPropMethods {
-	magazineprops(): IBaseExecution<SP.Publishing.PointPublishingMagazineProps>;
+	magazineprops(): IBaseExecution<SP.Publishing.PointPublishingMagazineProps> & SP.Publishing.PointPublishingMagazinePropsCollections;
 }
@@ -440,3 +440,3 @@
 **********************************************/
-export interface PointPublishingPostServiceManagerCollections extends PointPublishingPostServiceManagerProps, PointPublishingPostServiceManagerPropMethods {
+export interface PointPublishingPostServiceManagerCollections extends PointPublishingPostServiceManagerPropMethods {
 	bannerimages(): IBaseCollection<SP.File, SP.FileQuery> & SP.FileCollectionMethods;
@@ -461,3 +461,3 @@ bannerimages(id: string | number): IBaseQuery<SP.File, SP.FileQuery> & SP.FileCollections;
 	creators: IBaseResults<SP.Publishing.PointPublishingUser>;
-	magazineprops: SP.Publishing.PointPublishingMagazineProps;
+	magazineprops: SP.Publishing.PointPublishingMagazineProps & SP.Publishing.PointPublishingMagazinePropsCollections;
 	posts: IBaseResults<SP.Publishing.PointPublishingPost>;
@@ -497,3 +497,3 @@ viewers: IBaseResults<SP.Publishing.PointPublishingUser>;
 **********************************************/
-export interface PointPublishingUser extends PointPublishingUserCollections, PointPublishingUserMethods {
+export interface PointPublishingUser extends PointPublishingUserProps, PointPublishingUserCollections, PointPublishingUserMethods {
 
@@ -529,3 +529,3 @@ }
 **********************************************/
-export interface PointPublishingUserCollections extends PointPublishingUserProps, PointPublishingUserPropMethods {
+export interface PointPublishingUserCollections extends PointPublishingUserPropMethods {
 
@@ -539,3 +539,3 @@ }
 	addOrUpdateUser(loginName?: string, isOwner?: boolean): IBaseExecution<SP.Publishing.PointPublishingUser>;
-	getById(userId?: number): IBaseExecution<SP.Publishing.PointPublishingUser>;
+	getById(userId?: number): IBaseQuery<SP.Publishing.PointPublishingUser>;
 }
@@ -574,3 +574,3 @@
 **********************************************/
-export interface PointPublishingSiteManager extends PointPublishingSiteManagerCollections, PointPublishingSiteManagerMethods {
+export interface PointPublishingSiteManager extends PointPublishingSiteManagerProps, PointPublishingSiteManagerCollections, PointPublishingSiteManagerMethods {
 
@@ -596,3 +596,3 @@ }
 **********************************************/
-export interface PointPublishingSiteManagerCollections extends PointPublishingSiteManagerProps, PointPublishingSiteManagerPropMethods {
+export interface PointPublishingSiteManagerCollections extends PointPublishingSiteManagerPropMethods {
 
@@ -650,3 +650,3 @@ }
 **********************************************/
-export interface PointPublishingTenantManager extends PointPublishingTenantManagerCollections, PointPublishingTenantManagerMethods {
+export interface PointPublishingTenantManager extends PointPublishingTenantManagerProps, PointPublishingTenantManagerCollections, PointPublishingTenantManagerMethods {
 
@@ -672,3 +672,3 @@ }
 **********************************************/
-export interface PointPublishingTenantManagerCollections extends PointPublishingTenantManagerProps, PointPublishingTenantManagerPropMethods {
+export interface PointPublishingTenantManagerCollections extends PointPublishingTenantManagerPropMethods {
 
@@ -752,4 +752,4 @@ }
 export interface SitePageMetadataQuery extends SitePageMetadata {
-	CreatedBy: SP.Publishing.UserInfo;
-	LastModifiedBy: SP.Publishing.UserInfo;
+	CreatedBy: SP.Publishing.UserInfo & SP.Publishing.UserInfoCollections;
+	LastModifiedBy: SP.Publishing.UserInfo & SP.Publishing.UserInfoCollections;
 }
@@ -761,3 +761,3 @@
 export interface SitePageMetadataCollectionMethods {
-	getById(id?: number): IBaseExecution<SP.Publishing.SitePageMetadata>;
+	getById(id?: number): IBaseQuery<SP.Publishing.SitePageMetadata>;
 }
@@ -799,3 +799,3 @@
 **********************************************/
-export interface SitePage extends SP.Publishing.SitePageMetadata, SitePageCollections, SitePageMethods {
+export interface SitePage extends SP.Publishing.SitePageMetadata, SitePageProps, SitePageCollections, SitePageMethods {
 
@@ -826,3 +826,3 @@ }
 **********************************************/
-export interface SitePageCollections extends SitePageProps, SitePagePropMethods {
+export interface SitePageCollections extends SitePagePropMethods {
 
@@ -838,4 +838,4 @@ }
 	feedTargeted(promotedState?: number, published?: boolean, metadataFilter?: string): IBaseExecution<Array<SP.Publishing.SitePageMetadata>>;
-	getById(id?: number): IBaseExecution<SP.Publishing.SitePage>;
-	getByUrl(url?: string): IBaseExecution<SP.Publishing.SitePage>;
+	getById(id?: number): IBaseQuery<SP.Publishing.SitePage>;
+	getByUrl(url?: string): IBaseQuery<SP.Publishing.SitePage>;
 	getPageColumnState(url?: string): IBaseExecution<number>;
@@ -890,3 +890,3 @@ isSitePage(url?: string): IBaseExecution<boolean>;
 **********************************************/
-export interface RepostPage extends SP.Publishing.SitePage, RepostPageCollections, RepostPageMethods {
+export interface RepostPage extends SP.Publishing.SitePage, RepostPageProps, RepostPageCollections, RepostPageMethods {
 
@@ -918,3 +918,3 @@ }
 **********************************************/
-export interface RepostPageCollections extends RepostPageProps, RepostPagePropMethods {
+export interface RepostPageCollections extends RepostPagePropMethods {
 
@@ -992,3 +992,3 @@ }
 **********************************************/
-export interface RichSharing extends RichSharingCollections, RichSharingMethods {
+export interface RichSharing extends RichSharingProps, RichSharingCollections, RichSharingMethods {
 
@@ -1014,3 +1014,3 @@ }
 **********************************************/
-export interface RichSharingCollections extends RichSharingProps, RichSharingPropMethods {
+export interface RichSharingCollections extends RichSharingPropMethods {
 
@@ -1051,3 +1051,3 @@ }
 **********************************************/
-export interface SharePointHomeServiceManager extends SharePointHomeServiceManagerCollections, SharePointHomeServiceManagerMethods {
+export interface SharePointHomeServiceManager extends SharePointHomeServiceManagerProps, SharePointHomeServiceManagerCollections, SharePointHomeServiceManagerMethods {
 
@@ -1073,3 +1073,3 @@ }
 **********************************************/
-export interface SharePointHomeServiceManagerCollections extends SharePointHomeServiceManagerProps, SharePointHomeServiceManagerPropMethods {
+export interface SharePointHomeServiceManagerCollections extends SharePointHomeServiceManagerPropMethods {
 
@@ -1109,3 +1109,3 @@ }
 **********************************************/
-export interface SitePageService extends SitePageServiceCollections, SitePageServiceMethods {
+export interface SitePageService extends SitePageServiceProps, SitePageServiceCollections, SitePageServiceMethods {
 
@@ -1125,3 +1125,3 @@ }
 export interface SitePageServicePropMethods {
-	CommunicationSite(): IBaseExecution<SP.Publishing.CommunicationSite>;
+	CommunicationSite(): IBaseExecution<SP.Publishing.CommunicationSite> & SP.Publishing.CommunicationSiteCollections;
 }
@@ -1132,3 +1132,3 @@
 **********************************************/
-export interface SitePageServiceCollections extends SitePageServiceProps, SitePageServicePropMethods {
+export interface SitePageServiceCollections extends SitePageServicePropMethods {
 	Pages(): IBaseCollection<SP.Publishing.SitePage> & SP.Publishing.SitePageCollectionMethods;
@@ -1142,3 +1142,3 @@ Pages(id: string | number): IBaseQuery<SP.Publishing.SitePage> & SP.Publishing.SitePageCollections;
 export interface SitePageServiceQuery extends SitePageServiceProps,SitePageServiceMethods {
-	CommunicationSite: SP.Publishing.CommunicationSite;
+	CommunicationSite: SP.Publishing.CommunicationSite & SP.Publishing.CommunicationSiteCollections;
 	Pages: IBaseResults<SP.Publishing.SitePage>;
@@ -1174,3 +1174,3 @@ }
 **********************************************/
-export interface SpotlightChannel extends SpotlightChannelCollections, SpotlightChannelMethods {
+export interface SpotlightChannel extends SpotlightChannelProps, SpotlightChannelCollections, SpotlightChannelMethods {
 
@@ -1200,3 +1200,3 @@ }
 **********************************************/
-export interface SpotlightChannelCollections extends SpotlightChannelProps, SpotlightChannelPropMethods {
+export interface SpotlightChannelCollections extends SpotlightChannelPropMethods {
 
@@ -1209,3 +1209,3 @@ }
 export interface SpotlightChannelCollectionMethods {
-	getById(id?: number): IBaseExecution<SP.Publishing.SpotlightChannel>;
+	getById(id?: number): IBaseQuery<SP.Publishing.SpotlightChannel, SP.Publishing.SpotlightChannelQuery> & SP.Publishing.SpotlightChannelCollections;
 }
@@ -1245,3 +1245,3 @@
 **********************************************/
-export interface VideoChannel extends VideoChannelCollections, VideoChannelMethods {
+export interface VideoChannel extends VideoChannelProps, VideoChannelCollections, VideoChannelMethods {
 
@@ -1274,3 +1274,3 @@ }
 export interface VideoChannelPropMethods {
-	Search(): IBaseExecution<SP.Publishing.Search>;
+	Search(): IBaseExecution<SP.Publishing.Search> & SP.Publishing.SearchCollections;
 }
@@ -1281,3 +1281,3 @@
 **********************************************/
-export interface VideoChannelCollections extends VideoChannelProps, VideoChannelPropMethods {
+export interface VideoChannelCollections extends VideoChannelPropMethods {
 	SpotlightVideos(): IBaseCollection<SP.Publishing.SpotlightVideo, SP.Publishing.SpotlightVideoQuery> & SP.Publishing.SpotlightVideoCollectionMethods;
@@ -1293,3 +1293,3 @@ SpotlightVideos(id: string | number): IBaseQuery<SP.Publishing.SpotlightVideo, SP.Publishing.SpotlightVideoQuery> & SP.Publishing.SpotlightVideoCollections;
 export interface VideoChannelCollectionMethods {
-	getById(id?: any): IBaseExecution<SP.Publishing.VideoChannel>;
+	getById(id?: any): IBaseQuery<SP.Publishing.VideoChannel, SP.Publishing.VideoChannelQuery> & SP.Publishing.VideoChannelCollections;
 }
@@ -1301,3 +1301,3 @@
 export interface VideoChannelQuery extends VideoChannelProps,VideoChannelMethods {
-	Search: SP.Publishing.Search;
+	Search: SP.Publishing.Search & SP.Publishing.SearchCollections;
 	SpotlightVideos: IBaseResults<SP.Publishing.SpotlightVideo>;
@@ -1336,3 +1336,3 @@ Videos: IBaseResults<SP.Publishing.VideoItem>;
 **********************************************/
-export interface Search extends SearchCollections, SearchMethods {
+export interface Search extends SearchProps, SearchCollections, SearchMethods {
 
@@ -1359,3 +1359,3 @@ }
 **********************************************/
-export interface SearchCollections extends SearchProps, SearchPropMethods {
+export interface SearchCollections extends SearchPropMethods {
 
@@ -1399,3 +1399,3 @@ }
 **********************************************/
-export interface SpotlightVideo extends SpotlightVideoCollections, SpotlightVideoMethods {
+export interface SpotlightVideo extends SpotlightVideoProps, SpotlightVideoCollections, SpotlightVideoMethods {
 
@@ -1423,3 +1423,3 @@ }
 **********************************************/
-export interface SpotlightVideoCollections extends SpotlightVideoProps, SpotlightVideoPropMethods {
+export interface SpotlightVideoCollections extends SpotlightVideoPropMethods {
 
@@ -1432,3 +1432,3 @@ }
 export interface SpotlightVideoCollectionMethods {
-	getById(id?: number): IBaseExecution<SP.Publishing.SpotlightVideo>;
+	getById(id?: number): IBaseQuery<SP.Publishing.SpotlightVideo, SP.Publishing.SpotlightVideoQuery> & SP.Publishing.SpotlightVideoCollections;
 }
@@ -1493,3 +1493,3 @@
 **********************************************/
-export interface VideoPermissionGroup extends VideoPermissionGroupCollections, VideoPermissionGroupMethods {
+export interface VideoPermissionGroup extends VideoPermissionGroupProps, VideoPermissionGroupCollections, VideoPermissionGroupMethods {
 
@@ -1515,3 +1515,3 @@ }
 **********************************************/
-export interface VideoPermissionGroupCollections extends VideoPermissionGroupProps, VideoPermissionGroupPropMethods {
+export interface VideoPermissionGroupCollections extends VideoPermissionGroupPropMethods {
 	Users(): IBaseCollection<SP.User, SP.UserQuery> & SP.UserCollectionMethods;
@@ -1592,3 +1592,3 @@ Users(id: string | number): IBaseQuery<SP.User, SP.UserQuery> & SP.UserCollections;
 **********************************************/
-export interface VideoServiceManager extends VideoServiceManagerCollections, VideoServiceManagerMethods {
+export interface VideoServiceManager extends VideoServiceManagerProps, VideoServiceManagerCollections, VideoServiceManagerMethods {
 
@@ -1612,3 +1612,3 @@ }
 export interface VideoServiceManagerPropMethods {
-	Search(): IBaseExecution<SP.Publishing.Search>;
+	Search(): IBaseExecution<SP.Publishing.Search> & SP.Publishing.SearchCollections;
 }
@@ -1619,3 +1619,3 @@
 **********************************************/
-export interface VideoServiceManagerCollections extends VideoServiceManagerProps, VideoServiceManagerPropMethods {
+export interface VideoServiceManagerCollections extends VideoServiceManagerPropMethods {
 	CanEditChannels(): IBaseCollection<SP.Publishing.VideoChannel, SP.Publishing.VideoChannelQuery> & SP.Publishing.VideoChannelCollectionMethods;
@@ -1637,3 +1637,3 @@ CanEditChannels(id: string | number): IBaseQuery<SP.Publishing.VideoChannel, SP.Publishing.VideoChannelQuery> & SP.Publishing.VideoChannelCollections;
 	Channels: IBaseResults<SP.Publishing.VideoChannel>;
-	Search: SP.Publishing.Search;
+	Search: SP.Publishing.Search & SP.Publishing.SearchCollections;
 	SpotlightChannels: IBaseResults<SP.Publishing.SpotlightChannel>;
@@ -1671,3 +1671,3 @@ SpotlightVideos: IBaseResults<SP.Publishing.SpotlightVideo>;
 export interface VideoThumbnailCollectionMethods {
-	getByIndex(choice?: number): IBaseExecution<SP.Publishing.VideoThumbnail>;
+	getByIndex(choice?: number): IBaseQuery<SP.Publishing.VideoThumbnail>;
 }

lib/SP/Sharing/entitytypes.d.ts

@@ -109,3 +109,3 @@ import { IBaseExecution } from "../../";
 export interface SharingInformationQuery extends SharingInformation {
-	pickerSettings: SP.PickerSettings;
+	pickerSettings: SP.PickerSettings & SP.PickerSettingsCollections;
 }
@@ -112,0 +112,0 @@

lib/SP/Social/entitytypes.d.ts

@@ -36,3 +36,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface SocialFeedManager extends SocialFeedManagerCollections, SocialFeedManagerMethods {
+export interface SocialFeedManager extends SocialFeedManagerProps, SocialFeedManagerCollections, SocialFeedManagerMethods {
 
@@ -59,3 +59,3 @@ }
 **********************************************/
-export interface SocialFeedManagerCollections extends SocialFeedManagerProps, SocialFeedManagerPropMethods {
+export interface SocialFeedManagerCollections extends SocialFeedManagerPropMethods {
 
@@ -111,3 +111,3 @@ }
 **********************************************/
-export interface SocialFollowingManager extends SocialFollowingManagerCollections, SocialFollowingManagerMethods {
+export interface SocialFollowingManager extends SocialFollowingManagerProps, SocialFollowingManagerCollections, SocialFollowingManagerMethods {
 
@@ -134,3 +134,3 @@ }
 **********************************************/
-export interface SocialFollowingManagerCollections extends SocialFollowingManagerProps, SocialFollowingManagerPropMethods {
+export interface SocialFollowingManagerCollections extends SocialFollowingManagerPropMethods {
 
@@ -176,3 +176,3 @@ }
 **********************************************/
-export interface SocialRestActor extends SocialRestActorCollections, SocialRestActorMethods {
+export interface SocialRestActor extends SocialRestActorProps, SocialRestActorCollections, SocialRestActorMethods {
 
@@ -200,3 +200,3 @@ }
 **********************************************/
-export interface SocialRestActorCollections extends SocialRestActorProps, SocialRestActorPropMethods {
+export interface SocialRestActorCollections extends SocialRestActorPropMethods {
 
@@ -242,3 +242,3 @@ }
 **********************************************/
-export interface SocialRestFeedManager extends SocialRestFeedManagerCollections, SocialRestFeedManagerMethods {
+export interface SocialRestFeedManager extends SocialRestFeedManagerProps, SocialRestFeedManagerCollections, SocialRestFeedManagerMethods {
 
@@ -264,3 +264,3 @@ }
 **********************************************/
-export interface SocialRestFeedManagerCollections extends SocialRestFeedManagerProps, SocialRestFeedManagerPropMethods {
+export interface SocialRestFeedManagerCollections extends SocialRestFeedManagerPropMethods {
 
@@ -302,3 +302,3 @@ }
 **********************************************/
-export interface SocialRestFeed extends SocialRestFeedCollections, SocialRestFeedMethods {
+export interface SocialRestFeed extends SocialRestFeedProps, SocialRestFeedCollections, SocialRestFeedMethods {
 
@@ -325,3 +325,3 @@ }
 **********************************************/
-export interface SocialRestFeedCollections extends SocialRestFeedProps, SocialRestFeedPropMethods {
+export interface SocialRestFeedCollections extends SocialRestFeedPropMethods {
 
@@ -362,3 +362,3 @@ }
 **********************************************/
-export interface SocialRestFollowingManager extends SocialRestFollowingManagerCollections, SocialRestFollowingManagerMethods {
+export interface SocialRestFollowingManager extends SocialRestFollowingManagerProps, SocialRestFollowingManagerCollections, SocialRestFollowingManagerMethods {
 
@@ -388,3 +388,3 @@ }
 **********************************************/
-export interface SocialRestFollowingManagerCollections extends SocialRestFollowingManagerProps, SocialRestFollowingManagerPropMethods {
+export interface SocialRestFollowingManagerCollections extends SocialRestFollowingManagerPropMethods {
 
@@ -431,3 +431,3 @@ }
 **********************************************/
-export interface SocialRestThread extends SocialRestThreadCollections, SocialRestThreadMethods {
+export interface SocialRestThread extends SocialRestThreadProps, SocialRestThreadCollections, SocialRestThreadMethods {
 
@@ -454,3 +454,3 @@ }
 **********************************************/
-export interface SocialRestThreadCollections extends SocialRestThreadProps, SocialRestThreadPropMethods {
+export interface SocialRestThreadCollections extends SocialRestThreadPropMethods {
 
@@ -457,0 +457,0 @@ }

lib/SP/Taxonomy/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface TaxonomyField extends SP.FieldLookup, TaxonomyFieldCollections, TaxonomyFieldMethods {
+export interface TaxonomyField extends SP.FieldLookup, TaxonomyFieldProps, TaxonomyFieldCollections, TaxonomyFieldMethods {
 
@@ -55,3 +55,3 @@ }
 **********************************************/
-export interface TaxonomyFieldCollections extends TaxonomyFieldProps, TaxonomyFieldPropMethods {
+export interface TaxonomyFieldCollections extends TaxonomyFieldPropMethods {
 
@@ -58,0 +58,0 @@ }

lib/SP/Translation/entitytypes.d.ts

@@ -21,3 +21,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface SyncTranslator extends SyncTranslatorCollections, SyncTranslatorMethods {
+export interface SyncTranslator extends SyncTranslatorProps, SyncTranslatorCollections, SyncTranslatorMethods {
 
@@ -43,3 +43,3 @@ }
 **********************************************/
-export interface SyncTranslatorCollections extends SyncTranslatorProps, SyncTranslatorPropMethods {
+export interface SyncTranslatorCollections extends SyncTranslatorPropMethods {
 
@@ -80,3 +80,3 @@ }
 **********************************************/
-export interface TranslationJob extends TranslationJobCollections, TranslationJobMethods {
+export interface TranslationJob extends TranslationJobProps, TranslationJobCollections, TranslationJobMethods {
 
@@ -104,3 +104,3 @@ }
 **********************************************/
-export interface TranslationJobCollections extends TranslationJobProps, TranslationJobPropMethods {
+export interface TranslationJobCollections extends TranslationJobPropMethods {
 
@@ -142,3 +142,3 @@ }
 **********************************************/
-export interface TranslationJobStatus extends TranslationJobStatusCollections, TranslationJobStatusMethods {
+export interface TranslationJobStatus extends TranslationJobStatusProps, TranslationJobStatusCollections, TranslationJobStatusMethods {
 
@@ -170,3 +170,3 @@ }
 **********************************************/
-export interface TranslationJobStatusCollections extends TranslationJobStatusProps, TranslationJobStatusPropMethods {
+export interface TranslationJobStatusCollections extends TranslationJobStatusPropMethods {
 
@@ -173,0 +173,0 @@ }

lib/SP/UserProfiles/entitytypes.d.ts

@@ -38,3 +38,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface FollowedContent extends FollowedContentCollections, FollowedContentMethods {
+export interface FollowedContent extends FollowedContentProps, FollowedContentCollections, FollowedContentMethods {
 
@@ -61,3 +61,3 @@ }
 **********************************************/
-export interface FollowedContentCollections extends FollowedContentProps, FollowedContentPropMethods {
+export interface FollowedContentCollections extends FollowedContentPropMethods {
 
@@ -139,3 +139,3 @@ }
 **********************************************/
-export interface PeopleManager extends PeopleManagerCollections, PeopleManagerMethods {
+export interface PeopleManager extends PeopleManagerProps, PeopleManagerCollections, PeopleManagerMethods {
 
@@ -162,3 +162,3 @@ }
 **********************************************/
-export interface PeopleManagerCollections extends PeopleManagerProps, PeopleManagerPropMethods {
+export interface PeopleManagerCollections extends PeopleManagerPropMethods {
 
@@ -221,3 +221,3 @@ }
 **********************************************/
-export interface PersonalCache extends PersonalCacheCollections, PersonalCacheMethods {
+export interface PersonalCache extends PersonalCacheProps, PersonalCacheCollections, PersonalCacheMethods {
 
@@ -243,3 +243,3 @@ }
 **********************************************/
-export interface PersonalCacheCollections extends PersonalCacheProps, PersonalCachePropMethods {
+export interface PersonalCacheCollections extends PersonalCachePropMethods {
 
@@ -312,3 +312,3 @@ }
 **********************************************/
-export interface ProfileImageStore extends ProfileImageStoreCollections, ProfileImageStoreMethods {
+export interface ProfileImageStore extends ProfileImageStoreProps, ProfileImageStoreCollections, ProfileImageStoreMethods {
 
@@ -334,3 +334,3 @@ }
 **********************************************/
-export interface ProfileImageStoreCollections extends ProfileImageStoreProps, ProfileImageStorePropMethods {
+export interface ProfileImageStoreCollections extends ProfileImageStorePropMethods {
 
@@ -370,3 +370,3 @@ }
 **********************************************/
-export interface ProfileLoader extends ProfileLoaderCollections, ProfileLoaderMethods {
+export interface ProfileLoader extends ProfileLoaderProps, ProfileLoaderCollections, ProfileLoaderMethods {
 
@@ -392,3 +392,3 @@ }
 **********************************************/
-export interface ProfileLoaderCollections extends ProfileLoaderProps, ProfileLoaderPropMethods {
+export interface ProfileLoaderCollections extends ProfileLoaderPropMethods {
 
@@ -429,3 +429,3 @@ }
 **********************************************/
-export interface UserProfilePropertiesForUser extends UserProfilePropertiesForUserCollections, UserProfilePropertiesForUserMethods {
+export interface UserProfilePropertiesForUser extends UserProfilePropertiesForUserProps, UserProfilePropertiesForUserCollections, UserProfilePropertiesForUserMethods {
 
@@ -451,3 +451,3 @@ }
 **********************************************/
-export interface UserProfilePropertiesForUserCollections extends UserProfilePropertiesForUserProps, UserProfilePropertiesForUserPropMethods {
+export interface UserProfilePropertiesForUserCollections extends UserProfilePropertiesForUserPropMethods {
 
@@ -487,3 +487,3 @@ }
 **********************************************/
-export interface UserProfile extends UserProfileCollections, UserProfileMethods {
+export interface UserProfile extends UserProfileProps, UserProfileCollections, UserProfileMethods {
 
@@ -524,4 +524,4 @@ }
 export interface UserProfilePropMethods {
-	FollowedContent(): IBaseExecution<SP.UserProfiles.FollowedContent>;
-	PersonalSite(): IBaseExecution<SP.Site>;
+	FollowedContent(): IBaseExecution<SP.UserProfiles.FollowedContent> & SP.UserProfiles.FollowedContentCollections;
+	PersonalSite(): IBaseExecution<SP.Site> & SP.SiteCollections;
 }
@@ -532,3 +532,3 @@
 **********************************************/
-export interface UserProfileCollections extends UserProfileProps, UserProfilePropMethods {
+export interface UserProfileCollections extends UserProfilePropMethods {
 
@@ -541,4 +541,4 @@ }
 export interface UserProfileQuery extends UserProfileProps,UserProfileMethods {
-	FollowedContent: SP.UserProfiles.FollowedContent;
-	PersonalSite: SP.Site;
+	FollowedContent: SP.UserProfiles.FollowedContent & SP.UserProfiles.FollowedContentCollections;
+	PersonalSite: SP.Site & SP.SiteCollections;
 }
@@ -545,0 +545,0 @@

lib/SP/Utilities/entitytypes.d.ts

@@ -129,3 +129,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface ThemeManager extends ThemeManagerCollections, ThemeManagerMethods {
+export interface ThemeManager extends ThemeManagerProps, ThemeManagerCollections, ThemeManagerMethods {
 
@@ -145,3 +145,3 @@ }
 export interface ThemeManagerPropMethods {
-	ContextThemeManager(): IBaseExecution<SP.Utilities.ThemeManager>;
+	ContextThemeManager(): IBaseExecution<SP.Utilities.ThemeManager> & SP.Utilities.ThemeManagerCollections;
 }
@@ -152,3 +152,3 @@
 **********************************************/
-export interface ThemeManagerCollections extends ThemeManagerProps, ThemeManagerPropMethods {
+export interface ThemeManagerCollections extends ThemeManagerPropMethods {
 
@@ -161,3 +161,3 @@ }
 export interface ThemeManagerQuery extends ThemeManagerProps,ThemeManagerMethods {
-	ContextThemeManager: SP.Utilities.ThemeManager;
+	ContextThemeManager: SP.Utilities.ThemeManager & SP.Utilities.ThemeManagerCollections;
 }
@@ -164,0 +164,0 @@

lib/SP/WebParts/entitytypes.d.ts

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface LimitedWebPartManager extends LimitedWebPartManagerCollections, LimitedWebPartManagerMethods {
+export interface LimitedWebPartManager extends LimitedWebPartManagerProps, LimitedWebPartManagerCollections, LimitedWebPartManagerMethods {
 
@@ -47,3 +47,3 @@ }
 **********************************************/
-export interface LimitedWebPartManagerCollections extends LimitedWebPartManagerProps, LimitedWebPartManagerPropMethods {
+export interface LimitedWebPartManagerCollections extends LimitedWebPartManagerPropMethods {
 	WebParts(): IBaseCollection<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery> & SP.WebParts.WebPartDefinitionCollectionMethods;
@@ -85,3 +85,3 @@ WebParts(id: string | number): IBaseQuery<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery> & SP.WebParts.WebPartDefinitionCollections;
 **********************************************/
-export interface WebPartDefinition extends WebPartDefinitionCollections, WebPartDefinitionMethods {
+export interface WebPartDefinition extends WebPartDefinitionProps, WebPartDefinitionCollections, WebPartDefinitionMethods {
 
@@ -102,3 +102,3 @@ }
 export interface WebPartDefinitionPropMethods {
-	WebPart(): IBaseExecution<SP.WebParts.WebPart>;
+	WebPart(): IBaseExecution<SP.WebParts.WebPart> & SP.WebParts.WebPartCollections;
 }
@@ -109,3 +109,3 @@
 **********************************************/
-export interface WebPartDefinitionCollections extends WebPartDefinitionProps, WebPartDefinitionPropMethods {
+export interface WebPartDefinitionCollections extends WebPartDefinitionPropMethods {
 
@@ -118,4 +118,4 @@ }
 export interface WebPartDefinitionCollectionMethods {
-	getByControlId(controlId?: string): IBaseExecution<SP.WebParts.WebPartDefinition>;
-	getById(id?: any): IBaseExecution<SP.WebParts.WebPartDefinition>;
+	getByControlId(controlId?: string): IBaseQuery<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery> & SP.WebParts.WebPartDefinitionCollections;
+	getById(id?: any): IBaseQuery<SP.WebParts.WebPartDefinition, SP.WebParts.WebPartDefinitionQuery> & SP.WebParts.WebPartDefinitionCollections;
 }
@@ -127,3 +127,3 @@
 export interface WebPartDefinitionQuery extends WebPartDefinitionProps,WebPartDefinitionMethods {
-	WebPart: SP.WebParts.WebPart;
+	WebPart: SP.WebParts.WebPart & SP.WebParts.WebPartCollections;
 }
@@ -166,3 +166,3 @@
 export interface WebPartQuery extends WebPart {
-	Properties: SP.PropertyValues;
+	Properties: SP.PropertyValues & SP.PropertyValuesCollections;
 }

lib/SP/Workflow/entitytypes.d.ts

@@ -22,3 +22,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface WorkflowAssociation extends WorkflowAssociationCollections, WorkflowAssociationMethods {
+export interface WorkflowAssociation extends WorkflowAssociationProps, WorkflowAssociationCollections, WorkflowAssociationMethods {
 
@@ -61,3 +61,3 @@ }
 **********************************************/
-export interface WorkflowAssociationCollections extends WorkflowAssociationProps, WorkflowAssociationPropMethods {
+export interface WorkflowAssociationCollections extends WorkflowAssociationPropMethods {
 
@@ -71,4 +71,4 @@ }
 	add(parameters?: SP.Workflow.WorkflowAssociationCreationInformation): IBaseExecution<SP.Workflow.WorkflowAssociation>;
-	getById(associationId?: any): IBaseExecution<SP.Workflow.WorkflowAssociation>;
-	getByName(name?: string): IBaseExecution<SP.Workflow.WorkflowAssociation>;
+	getById(associationId?: any): IBaseQuery<SP.Workflow.WorkflowAssociation>;
+	getByName(name?: string): IBaseQuery<SP.Workflow.WorkflowAssociation>;
 }
@@ -117,4 +117,4 @@
 export interface WorkflowTemplateCollectionMethods {
-	getById(templateId?: any): IBaseExecution<SP.Workflow.WorkflowTemplate>;
-	getByName(name?: string): IBaseExecution<SP.Workflow.WorkflowTemplate>;
+	getById(templateId?: any): IBaseQuery<SP.Workflow.WorkflowTemplate>;
+	getByName(name?: string): IBaseQuery<SP.Workflow.WorkflowTemplate>;
 }
@@ -170,3 +170,3 @@
 **********************************************/
-export interface SPWorkflowTask extends SP.ListItem, SPWorkflowTaskCollections, SPWorkflowTaskMethods {
+export interface SPWorkflowTask extends SP.ListItem, SPWorkflowTaskProps, SPWorkflowTaskCollections, SPWorkflowTaskMethods {
 
@@ -192,3 +192,3 @@ }
 **********************************************/
-export interface SPWorkflowTaskCollections extends SPWorkflowTaskProps, SPWorkflowTaskPropMethods {
+export interface SPWorkflowTaskCollections extends SPWorkflowTaskPropMethods {
 
@@ -228,3 +228,3 @@ }
 	systemUpdate(): IBaseExecution<any>;
-	update(): IBaseExecution<any>;
+	// update(): IBaseExecution<any>;
 	updateEx(parameters?: SP.ListItemUpdateParameters): IBaseExecution<any>;
@@ -231,0 +231,0 @@ updateHashtags(hashtagsToAdd?: Array<SP.Hashtag>, hashtagsToRemove?: Array<SP.Hashtag>): IBaseExecution<Array<SP.Hashtag>>;

lib/SP/WorkflowServices/entitytypes.d.ts

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../";
 **********************************************/
-export interface WorkflowDefinition extends WorkflowDefinitionCollections, WorkflowDefinitionMethods {
+export interface WorkflowDefinition extends WorkflowDefinitionProps, WorkflowDefinitionCollections, WorkflowDefinitionMethods {
 
@@ -59,3 +59,3 @@ }
 **********************************************/
-export interface WorkflowDefinitionCollections extends WorkflowDefinitionProps, WorkflowDefinitionPropMethods {
+export interface WorkflowDefinitionCollections extends WorkflowDefinitionPropMethods {
 
@@ -102,3 +102,3 @@ }
 **********************************************/
-export interface WorkflowDeploymentService extends WorkflowDeploymentServiceCollections, WorkflowDeploymentServiceMethods {
+export interface WorkflowDeploymentService extends WorkflowDeploymentServiceProps, WorkflowDeploymentServiceCollections, WorkflowDeploymentServiceMethods {
 
@@ -124,3 +124,3 @@ }
 **********************************************/
-export interface WorkflowDeploymentServiceCollections extends WorkflowDeploymentServiceProps, WorkflowDeploymentServicePropMethods {
+export interface WorkflowDeploymentServiceCollections extends WorkflowDeploymentServicePropMethods {
 
@@ -193,3 +193,3 @@ }
 **********************************************/
-export interface WorkflowInstanceService extends WorkflowInstanceServiceCollections, WorkflowInstanceServiceMethods {
+export interface WorkflowInstanceService extends WorkflowInstanceServiceProps, WorkflowInstanceServiceCollections, WorkflowInstanceServiceMethods {
 
@@ -209,3 +209,3 @@ }
 export interface WorkflowInstanceServicePropMethods {
-	Current(): IBaseExecution<SP.WorkflowServices.WorkflowInstanceService>;
+	Current(): IBaseExecution<SP.WorkflowServices.WorkflowInstanceService> & SP.WorkflowServices.WorkflowInstanceServiceCollections;
 }
@@ -216,3 +216,3 @@
 **********************************************/
-export interface WorkflowInstanceServiceCollections extends WorkflowInstanceServiceProps, WorkflowInstanceServicePropMethods {
+export interface WorkflowInstanceServiceCollections extends WorkflowInstanceServicePropMethods {
 
@@ -225,3 +225,3 @@ }
 export interface WorkflowInstanceServiceQuery extends WorkflowInstanceServiceProps,WorkflowInstanceServiceMethods {
-	Current: SP.WorkflowServices.WorkflowInstanceService;
+	Current: SP.WorkflowServices.WorkflowInstanceService & SP.WorkflowServices.WorkflowInstanceServiceCollections;
 }
@@ -258,3 +258,3 @@
 **********************************************/
-export interface InteropService extends InteropServiceCollections, InteropServiceMethods {
+export interface InteropService extends InteropServiceProps, InteropServiceCollections, InteropServiceMethods {
 
@@ -274,3 +274,3 @@ }
 export interface InteropServicePropMethods {
-	Current(): IBaseExecution<SP.WorkflowServices.InteropService>;
+	Current(): IBaseExecution<SP.WorkflowServices.InteropService> & SP.WorkflowServices.InteropServiceCollections;
 }
@@ -281,3 +281,3 @@
 **********************************************/
-export interface InteropServiceCollections extends InteropServiceProps, InteropServicePropMethods {
+export interface InteropServiceCollections extends InteropServicePropMethods {
 
@@ -290,3 +290,3 @@ }
 export interface InteropServiceQuery extends InteropServiceProps,InteropServiceMethods {
-	Current: SP.WorkflowServices.InteropService;
+	Current: SP.WorkflowServices.InteropService & SP.WorkflowServices.InteropServiceCollections;
 }
@@ -321,3 +321,3 @@
 **********************************************/
-export interface WorkflowServicesManager extends WorkflowServicesManagerCollections, WorkflowServicesManagerMethods {
+export interface WorkflowServicesManager extends WorkflowServicesManagerProps, WorkflowServicesManagerCollections, WorkflowServicesManagerMethods {
 
@@ -340,3 +340,3 @@ }
 export interface WorkflowServicesManagerPropMethods {
-	Current(): IBaseExecution<SP.WorkflowServices.WorkflowServicesManager>;
+	Current(): IBaseExecution<SP.WorkflowServices.WorkflowServicesManager> & SP.WorkflowServices.WorkflowServicesManagerCollections;
 }
@@ -347,3 +347,3 @@
 **********************************************/
-export interface WorkflowServicesManagerCollections extends WorkflowServicesManagerProps, WorkflowServicesManagerPropMethods {
+export interface WorkflowServicesManagerCollections extends WorkflowServicesManagerPropMethods {
 
@@ -356,3 +356,3 @@ }
 export interface WorkflowServicesManagerQuery extends WorkflowServicesManagerProps,WorkflowServicesManagerMethods {
-	Current: SP.WorkflowServices.WorkflowServicesManager;
+	Current: SP.WorkflowServices.WorkflowServicesManager & SP.WorkflowServices.WorkflowServicesManagerCollections;
 }
@@ -388,3 +388,3 @@
 **********************************************/
-export interface WorkflowSubscription extends WorkflowSubscriptionCollections, WorkflowSubscriptionMethods {
+export interface WorkflowSubscription extends WorkflowSubscriptionProps, WorkflowSubscriptionCollections, WorkflowSubscriptionMethods {
 
@@ -419,3 +419,3 @@ }
 **********************************************/
-export interface WorkflowSubscriptionCollections extends WorkflowSubscriptionProps, WorkflowSubscriptionPropMethods {
+export interface WorkflowSubscriptionCollections extends WorkflowSubscriptionPropMethods {
 
@@ -464,3 +464,3 @@ }
 **********************************************/
-export interface WorkflowSubscriptionService extends WorkflowSubscriptionServiceCollections, WorkflowSubscriptionServiceMethods {
+export interface WorkflowSubscriptionService extends WorkflowSubscriptionServiceProps, WorkflowSubscriptionServiceCollections, WorkflowSubscriptionServiceMethods {
 
@@ -480,3 +480,3 @@ }
 export interface WorkflowSubscriptionServicePropMethods {
-	Current(): IBaseExecution<SP.WorkflowServices.WorkflowSubscriptionService>;
+	Current(): IBaseExecution<SP.WorkflowServices.WorkflowSubscriptionService> & SP.WorkflowServices.WorkflowSubscriptionServiceCollections;
 }
@@ -487,3 +487,3 @@
 **********************************************/
-export interface WorkflowSubscriptionServiceCollections extends WorkflowSubscriptionServiceProps, WorkflowSubscriptionServicePropMethods {
+export interface WorkflowSubscriptionServiceCollections extends WorkflowSubscriptionServicePropMethods {
 
@@ -496,3 +496,3 @@ }
 export interface WorkflowSubscriptionServiceQuery extends WorkflowSubscriptionServiceProps,WorkflowSubscriptionServiceMethods {
-	Current: SP.WorkflowServices.WorkflowSubscriptionService;
+	Current: SP.WorkflowServices.WorkflowSubscriptionService & SP.WorkflowServices.WorkflowSubscriptionServiceCollections;
 }
@@ -535,3 +535,3 @@
 **********************************************/
-export interface WorkflowMessagingService extends WorkflowMessagingServiceCollections, WorkflowMessagingServiceMethods {
+export interface WorkflowMessagingService extends WorkflowMessagingServiceProps, WorkflowMessagingServiceCollections, WorkflowMessagingServiceMethods {
 
@@ -557,3 +557,3 @@ }
 **********************************************/
-export interface WorkflowMessagingServiceCollections extends WorkflowMessagingServiceProps, WorkflowMessagingServicePropMethods {
+export interface WorkflowMessagingServiceCollections extends WorkflowMessagingServicePropMethods {
 
@@ -560,0 +560,0 @@ }

lib/SP/WorkManagement/OM/entitytypes.d.ts

@@ -24,3 +24,3 @@ import { IBaseExecution } from "../../../";
 **********************************************/
-export interface BaseSession extends BaseSessionCollections, BaseSessionMethods {
+export interface BaseSession extends BaseSessionProps, BaseSessionCollections, BaseSessionMethods {
 
@@ -46,3 +46,3 @@ }
 **********************************************/
-export interface BaseSessionCollections extends BaseSessionProps, BaseSessionPropMethods {
+export interface BaseSessionCollections extends BaseSessionPropMethods {
 
@@ -290,3 +290,3 @@ }
 **********************************************/
-export interface LocationOrientedSortableSession extends SP.WorkManagement.OM.BaseSession, LocationOrientedSortableSessionCollections, LocationOrientedSortableSessionMethods {
+export interface LocationOrientedSortableSession extends SP.WorkManagement.OM.BaseSession, LocationOrientedSortableSessionProps, LocationOrientedSortableSessionCollections, LocationOrientedSortableSessionMethods {
 
@@ -312,3 +312,3 @@ }
 **********************************************/
-export interface LocationOrientedSortableSessionCollections extends LocationOrientedSortableSessionProps, LocationOrientedSortableSessionPropMethods {
+export interface LocationOrientedSortableSessionCollections extends LocationOrientedSortableSessionPropMethods {
 
@@ -366,3 +366,3 @@ }
 **********************************************/
-export interface LocationOrientedUserOrderedSession extends SP.WorkManagement.OM.BaseSession, LocationOrientedUserOrderedSessionCollections, LocationOrientedUserOrderedSessionMethods {
+export interface LocationOrientedUserOrderedSession extends SP.WorkManagement.OM.BaseSession, LocationOrientedUserOrderedSessionProps, LocationOrientedUserOrderedSessionCollections, LocationOrientedUserOrderedSessionMethods {
 
@@ -388,3 +388,3 @@ }
 **********************************************/
-export interface LocationOrientedUserOrderedSessionCollections extends LocationOrientedUserOrderedSessionProps, LocationOrientedUserOrderedSessionPropMethods {
+export interface LocationOrientedUserOrderedSessionCollections extends LocationOrientedUserOrderedSessionPropMethods {
 
@@ -476,3 +476,3 @@ }
 **********************************************/
-export interface NonTaskDataReadResult extends NonTaskDataReadResultCollections, NonTaskDataReadResultMethods {
+export interface NonTaskDataReadResult extends NonTaskDataReadResultProps, NonTaskDataReadResultCollections, NonTaskDataReadResultMethods {
 
@@ -492,5 +492,5 @@ }
 export interface NonTaskDataReadResultPropMethods {
-	PersistedProperties(): IBaseExecution<SP.WorkManagement.OM.PersistedProperties>;
-	RefreshHistory(): IBaseExecution<SP.WorkManagement.OM.RefreshHistory>;
-	UserSettings(): IBaseExecution<SP.WorkManagement.OM.UserSettings>;
+	PersistedProperties(): IBaseExecution<SP.WorkManagement.OM.PersistedProperties> & SP.WorkManagement.OM.PersistedPropertiesCollections;
+	RefreshHistory(): IBaseExecution<SP.WorkManagement.OM.RefreshHistory> & SP.WorkManagement.OM.RefreshHistoryCollections;
+	UserSettings(): IBaseExecution<SP.WorkManagement.OM.UserSettings> & SP.WorkManagement.OM.UserSettingsCollections;
 }
@@ -501,7 +501,7 @@
 **********************************************/
-export interface NonTaskDataReadResultCollections extends NonTaskDataReadResultProps, NonTaskDataReadResultPropMethods {
+export interface NonTaskDataReadResultCollections extends NonTaskDataReadResultPropMethods {
 	AllLocatons(): IBaseCollection<SP.WorkManagement.OM.Location>;
-	AllLocatons(id: string | number): IBaseQuery<SP.WorkManagement.OM.Location>;
+	AllLocatons(id: string | number): IBaseQuery<SP.WorkManagement.OM.Location> & SP.WorkManagement.OM.LocationCollections;
 	ScriptExtensions(): IBaseCollection<SP.WorkManagement.OM.DashboardScriptExtensionInfo>;
-	ScriptExtensions(id: string | number): IBaseQuery<SP.WorkManagement.OM.DashboardScriptExtensionInfo>;
+	ScriptExtensions(id: string | number): IBaseQuery<SP.WorkManagement.OM.DashboardScriptExtensionInfo> & SP.WorkManagement.OM.DashboardScriptExtensionInfoCollections;
 }
@@ -514,6 +514,6 @@
 	AllLocatons: IBaseResults<SP.WorkManagement.OM.Location>;
-	PersistedProperties: SP.WorkManagement.OM.PersistedProperties;
-	RefreshHistory: SP.WorkManagement.OM.RefreshHistory;
+	PersistedProperties: SP.WorkManagement.OM.PersistedProperties & SP.WorkManagement.OM.PersistedPropertiesCollections;
+	RefreshHistory: SP.WorkManagement.OM.RefreshHistory & SP.WorkManagement.OM.RefreshHistoryCollections;
 	ScriptExtensions: IBaseResults<SP.WorkManagement.OM.DashboardScriptExtensionInfo>;
-	UserSettings: SP.WorkManagement.OM.UserSettings;
+	UserSettings: SP.WorkManagement.OM.UserSettings & SP.WorkManagement.OM.UserSettingsCollections;
 }
@@ -563,3 +563,3 @@
 **********************************************/
-export interface RefreshHistory extends RefreshHistoryCollections, RefreshHistoryMethods {
+export interface RefreshHistory extends RefreshHistoryProps, RefreshHistoryCollections, RefreshHistoryMethods {
 
@@ -585,5 +585,5 @@ }
 **********************************************/
-export interface RefreshHistoryCollections extends RefreshHistoryProps, RefreshHistoryPropMethods {
-	Refreshes(): IBaseCollection<SP.WorkManagement.OM.RefreshResult, SP.WorkManagement.OM.RefreshResultQuery>;
-	Refreshes(id: string | number): IBaseQuery<SP.WorkManagement.OM.RefreshResult, SP.WorkManagement.OM.RefreshResultQuery>;
+export interface RefreshHistoryCollections extends RefreshHistoryPropMethods {
+	Refreshes(): IBaseCollection<SP.WorkManagement.OM.RefreshResult>;
+	Refreshes(id: string | number): IBaseQuery<SP.WorkManagement.OM.RefreshResult> & SP.WorkManagement.OM.RefreshResultCollections;
 }
@@ -622,3 +622,3 @@
 **********************************************/
-export interface RefreshResult extends RefreshResultCollections, RefreshResultMethods {
+export interface RefreshResult extends RefreshResultProps, RefreshResultCollections, RefreshResultMethods {
 
@@ -647,7 +647,7 @@ }
 **********************************************/
-export interface RefreshResultCollections extends RefreshResultProps, RefreshResultPropMethods {
+export interface RefreshResultCollections extends RefreshResultPropMethods {
 	ProviderStatuses(): IBaseCollection<SP.WorkManagement.OM.ProviderRefreshStatus>;
-	ProviderStatuses(id: string | number): IBaseQuery<SP.WorkManagement.OM.ProviderRefreshStatus>;
+	ProviderStatuses(id: string | number): IBaseQuery<SP.WorkManagement.OM.ProviderRefreshStatus> & SP.WorkManagement.OM.ProviderRefreshStatusCollections;
 	TaskChangesByLocation(): IBaseCollection<SP.WorkManagement.OM.LocationUpdateResult>;
-	TaskChangesByLocation(id: string | number): IBaseQuery<SP.WorkManagement.OM.LocationUpdateResult>;
+	TaskChangesByLocation(id: string | number): IBaseQuery<SP.WorkManagement.OM.LocationUpdateResult> & SP.WorkManagement.OM.LocationUpdateResultCollections;
 }
@@ -758,3 +758,3 @@
 **********************************************/
-export interface RefreshHealthInfo extends RefreshHealthInfoCollections, RefreshHealthInfoMethods {
+export interface RefreshHealthInfo extends RefreshHealthInfoProps, RefreshHealthInfoCollections, RefreshHealthInfoMethods {
 
@@ -782,5 +782,5 @@ }
 **********************************************/
-export interface RefreshHealthInfoCollections extends RefreshHealthInfoProps, RefreshHealthInfoPropMethods {
+export interface RefreshHealthInfoCollections extends RefreshHealthInfoPropMethods {
 	ProviderErrors(): IBaseCollection<SP.WorkManagement.OM.ProviderErrorInfo>;
-	ProviderErrors(id: string | number): IBaseQuery<SP.WorkManagement.OM.ProviderErrorInfo>;
+	ProviderErrors(id: string | number): IBaseQuery<SP.WorkManagement.OM.ProviderErrorInfo> & SP.WorkManagement.OM.ProviderErrorInfoCollections;
 }
@@ -819,3 +819,3 @@
 **********************************************/
-export interface SortableSessionManager extends SortableSessionManagerCollections, SortableSessionManagerMethods {
+export interface SortableSessionManager extends SortableSessionManagerProps, SortableSessionManagerCollections, SortableSessionManagerMethods {
 
@@ -841,3 +841,3 @@ }
 **********************************************/
-export interface SortableSessionManagerCollections extends SortableSessionManagerProps, SortableSessionManagerPropMethods {
+export interface SortableSessionManagerCollections extends SortableSessionManagerPropMethods {
 
@@ -878,3 +878,3 @@ }
 **********************************************/
-export interface SortableSession extends SP.WorkManagement.OM.BaseSession, SortableSessionCollections, SortableSessionMethods {
+export interface SortableSession extends SP.WorkManagement.OM.BaseSession, SortableSessionProps, SortableSessionCollections, SortableSessionMethods {
 
@@ -900,3 +900,3 @@ }
 **********************************************/
-export interface SortableSessionCollections extends SortableSessionProps, SortableSessionPropMethods {
+export interface SortableSessionCollections extends SortableSessionPropMethods {
 
@@ -954,4 +954,4 @@ }
 export interface SortableTaskQueryQuery extends SortableTaskQuery {
-	CoreQuery: SP.WorkManagement.OM.TaskQuery;
-	Order: SP.WorkManagement.OM.OrderInfo;
+	CoreQuery: SP.WorkManagement.OM.TaskQuery & SP.WorkManagement.OM.TaskQueryCollections;
+	Order: SP.WorkManagement.OM.OrderInfo & SP.WorkManagement.OM.OrderInfoCollections;
 }
@@ -979,6 +979,6 @@
 export interface TaskQueryQuery extends TaskQuery {
-	CustomAttributeFilter: SP.WorkManagement.OM.CustomAttributeFilter;
-	FieldFilter: SP.WorkManagement.OM.TaskFilter;
-	LastModifiedDateRangeFilter: SP.WorkManagement.OM.DateRangeCriterion;
-	LocationFilter: SP.WorkManagement.OM.LocationFilter;
+	CustomAttributeFilter: SP.WorkManagement.OM.CustomAttributeFilter & SP.WorkManagement.OM.CustomAttributeFilterCollections;
+	FieldFilter: SP.WorkManagement.OM.TaskFilter & SP.WorkManagement.OM.TaskFilterCollections;
+	LastModifiedDateRangeFilter: SP.WorkManagement.OM.DateRangeCriterion & SP.WorkManagement.OM.DateRangeCriterionCollections;
+	LocationFilter: SP.WorkManagement.OM.LocationFilter & SP.WorkManagement.OM.LocationFilterCollections;
 }
@@ -1005,7 +1005,7 @@
 export interface TaskFilterQuery extends TaskFilter {
-	CompletedCriterion: SP.WorkManagement.OM.BooleanCriterion;
-	DueDateRangeCriterion: SP.WorkManagement.OM.DateRangeCriterion;
-	IsNewCriterion: SP.WorkManagement.OM.BooleanCriterion;
-	NameCriterion: SP.WorkManagement.OM.NameCriterion;
-	StartDateRangeCriterion: SP.WorkManagement.OM.DateRangeCriterion;
+	CompletedCriterion: SP.WorkManagement.OM.BooleanCriterion & SP.WorkManagement.OM.BooleanCriterionCollections;
+	DueDateRangeCriterion: SP.WorkManagement.OM.DateRangeCriterion & SP.WorkManagement.OM.DateRangeCriterionCollections;
+	IsNewCriterion: SP.WorkManagement.OM.BooleanCriterion & SP.WorkManagement.OM.BooleanCriterionCollections;
+	NameCriterion: SP.WorkManagement.OM.NameCriterion & SP.WorkManagement.OM.NameCriterionCollections;
+	StartDateRangeCriterion: SP.WorkManagement.OM.DateRangeCriterion & SP.WorkManagement.OM.DateRangeCriterionCollections;
 }
@@ -1030,3 +1030,3 @@
 **********************************************/
-export interface TaskQueryByLocationResult extends TaskQueryByLocationResultCollections, TaskQueryByLocationResultMethods {
+export interface TaskQueryByLocationResult extends TaskQueryByLocationResultProps, TaskQueryByLocationResultCollections, TaskQueryByLocationResultMethods {
 
@@ -1053,5 +1053,5 @@ }
 **********************************************/
-export interface TaskQueryByLocationResultCollections extends TaskQueryByLocationResultProps, TaskQueryByLocationResultPropMethods {
+export interface TaskQueryByLocationResultCollections extends TaskQueryByLocationResultPropMethods {
 	Results(): IBaseCollection<SP.WorkManagement.OM.Task>;
-	Results(id: string | number): IBaseQuery<SP.WorkManagement.OM.Task>;
+	Results(id: string | number): IBaseQuery<SP.WorkManagement.OM.Task> & SP.WorkManagement.OM.TaskCollections;
 }
@@ -1090,3 +1090,3 @@
 **********************************************/
-export interface TaskQueryResult extends TaskQueryResultCollections, TaskQueryResultMethods {
+export interface TaskQueryResult extends TaskQueryResultProps, TaskQueryResultCollections, TaskQueryResultMethods {
 
@@ -1113,5 +1113,5 @@ }
 **********************************************/
-export interface TaskQueryResultCollections extends TaskQueryResultProps, TaskQueryResultPropMethods {
+export interface TaskQueryResultCollections extends TaskQueryResultPropMethods {
 	Results(): IBaseCollection<SP.WorkManagement.OM.Task>;
-	Results(id: string | number): IBaseQuery<SP.WorkManagement.OM.Task>;
+	Results(id: string | number): IBaseQuery<SP.WorkManagement.OM.Task> & SP.WorkManagement.OM.TaskCollections;
 }
@@ -1152,3 +1152,3 @@
 export interface TaskRefreshResultQuery extends TaskRefreshResult {
-	Result: SP.WorkManagement.OM.Task;
+	Result: SP.WorkManagement.OM.Task & SP.WorkManagement.OM.TaskCollections;
 }
@@ -1175,3 +1175,3 @@
 export interface TaskWriteResultQuery extends TaskWriteResult {
-	Result: SP.WorkManagement.OM.Task;
+	Result: SP.WorkManagement.OM.Task & SP.WorkManagement.OM.TaskCollections;
 }
@@ -1196,3 +1196,3 @@
 **********************************************/
-export interface UserOrderedSessionManager extends UserOrderedSessionManagerCollections, UserOrderedSessionManagerMethods {
+export interface UserOrderedSessionManager extends UserOrderedSessionManagerProps, UserOrderedSessionManagerCollections, UserOrderedSessionManagerMethods {
 
@@ -1218,3 +1218,3 @@ }
 **********************************************/
-export interface UserOrderedSessionManagerCollections extends UserOrderedSessionManagerProps, UserOrderedSessionManagerPropMethods {
+export interface UserOrderedSessionManagerCollections extends UserOrderedSessionManagerPropMethods {
 
@@ -1255,3 +1255,3 @@ }
 **********************************************/
-export interface UserOrderedSession extends SP.WorkManagement.OM.BaseSession, UserOrderedSessionCollections, UserOrderedSessionMethods {
+export interface UserOrderedSession extends SP.WorkManagement.OM.BaseSession, UserOrderedSessionProps, UserOrderedSessionCollections, UserOrderedSessionMethods {
 
@@ -1277,3 +1277,3 @@ }
 **********************************************/
-export interface UserOrderedSessionCollections extends UserOrderedSessionProps, UserOrderedSessionPropMethods {
+export interface UserOrderedSessionCollections extends UserOrderedSessionPropMethods {
 
@@ -1331,3 +1331,3 @@ }
 **********************************************/
-export interface UserSettingsManager extends UserSettingsManagerCollections, UserSettingsManagerMethods {
+export interface UserSettingsManager extends UserSettingsManagerProps, UserSettingsManagerCollections, UserSettingsManagerMethods {
 
@@ -1353,3 +1353,3 @@ }
 **********************************************/
-export interface UserSettingsManagerCollections extends UserSettingsManagerProps, UserSettingsManagerPropMethods {
+export interface UserSettingsManagerCollections extends UserSettingsManagerPropMethods {
 
@@ -1356,0 +1356,0 @@ }

main.js

@@ -6,5 +6,25 @@ let fs = require("fs");
 
-let hasCollections = {};
-let hasMethods = {};
+function analyzeCollections(directories) {
+    let hasCollections = {};
+    let hasCollectionMethods = {};
 
+    // Parse the directories
+    for (let dirName in directories) {
+        // Parse the filenames
+        for (let filename in directories[dirName]) {
+            // Parse the interfaces
+            for (let name in directories[dirName][filename]) {
+                let interface = directories[dirName][filename][name];
+
+                // Set the flags
+                hasCollections[dirName + "." + name] = interface._Collections && interface._Methods ? true : false;
+                hasCollectionMethods[dirName + "." + name] = interface._CollectionMethods ? true : false;
+            }
+        }
+    }
+
+    // Return the data
+    return { hasCollections, hasCollectionMethods };
+}
+
 function createInterface(name, baseType, variables) {
@@ -26,4 +46,23 @@ return [
     for (let name in custom) {
+        // Get the methods
+        let oldMethods = methods[name] || [];
+
+        // Parse the custom methods
+        for (let i = 0; i < custom[name].length; i++) {
+            let methodInfo = custom[name][i];
+
+            // Parse the old methods
+            for (let i = 0; i < oldMethods.length; i++) {
+                let oldMethod = oldMethods[i];
+
+                // See the method name exists
+                if (oldMethod.name == methodInfo.name) {
+                    // Comment out the method
+                    oldMethod.name = "// " + oldMethod.name;
+                }
+            }
+        }
+
         // Add the methods
-        methods[name] = (methods[name] || []).concat(custom[name]);
+        methods[name] = oldMethods.concat(custom[name]);
     }
@@ -43,3 +82,2 @@
             isCollection = true;
-            hasMethods[name] = true;
         }
@@ -293,5 +331,2 @@
                                         directories[ns][collection][name]._Collections[methodName][methodRole] = methodType;
-
-                                        // Set the flag
-                                        hasCollections[ns + "." + name] = true;
                                     } else { continue; }
@@ -355,2 +390,5 @@ }
 
+        // Determine the collections
+        let { hasCollections, hasCollectionMethods } = analyzeCollections(directories);
+
         // Parse the directories
@@ -417,9 +455,9 @@ // NameSpace -> Collection -> Interface -> Properties
                                         // Add the methods
-                                        collections.push('\t' + collection + '(): ' + 'IBaseCollection<' + methodType + (hasCollections[methodType] ? ', ' + methodType + 'Query' : '') + '>' + (hasMethods[methodType] ? ' & ' + methodType + 'CollectionMethods' : '') + ';');
-                                        collections.push('\t' + collection + '(id: string | number): ' + 'IBaseQuery<' + methodType + (hasCollections[methodType] ? ', ' + methodType + 'Query' : '') + '>' + (hasMethods[methodType] ? ' & ' + methodType + 'Collections' : '') + ';');
+                                        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;');
                                         query.push('\t' + collection + ': IBaseResults<' + methodType + '>;');
                                     } else {
                                         // Add the method
-                                        props.push('\t' + collection + '(): ' + 'IBaseExecution<' + methodType + '>' + (hasMethods[methodType] ? " & " + methodType + "Collections" : "") + ';');
-                                        query.push('\t' + collection + ': ' + methodType + (hasMethods[methodType] ? " & " + methodType + "Collections" : "") + ';');
+                                        props.push('\t' + collection + '(): ' + 'IBaseExecution<' + methodType + '> & ' + methodType + 'Collections;');
+                                        query.push('\t' + collection + ': ' + methodType + ' & ' + methodType + 'Collections;');
                                     }
@@ -451,4 +489,21 @@
 
+                                // Set the method type
+                                let methodType = getType(methodInfo.returnType)
+
+                                // See if we are overwriting the type
+                                if (methodInfo.overwrite) {
+                                    // Set the type
+                                    methodType = methodInfo.returnType;
+                                }
+                                // Else, see if this is a "getBy" method
+                                else if (/^getBy/.test(methodInfo.name)) {
+                                    // Set the type
+                                    methodType = 'IBaseQuery<' + methodType + (hasCollections[methodType] ? ", " + methodType + "Query" : "") + '>' + (hasCollections[methodType] ? " & " + methodType + "Collections" : "");
+                                } else {
+                                    // Set the type
+                                    methodType = 'IBaseExecution<' + methodType + '>';
+                                }
+
                                 // Add the method
-                                collectionMethods.push('\t' + methodInfo.name + '(' + params.join(', ') + '): IBaseExecution<' + getType(methodInfo.returnType) + '>;');
+                                collectionMethods.push('\t' + methodInfo.name + '(' + params.join(', ') + '): ' + methodType + ';');
                             }
@@ -485,4 +540,7 @@
 
+                                // Set the method type
+                                let methodType = methodInfo.overwrite ? methodInfo.returnType : 'IBaseExecution<' + getType(methodInfo.returnType) + '>';
+
                                 // Add the method
-                                methods.push('\t' + methodName + '(' + params.join(', ') + '): IBaseExecution<' + getType(methodInfo.returnType) + '>;');
+                                methods.push('\t' + methodName + '(' + params.join(', ') + '): ' + methodType + ';');
                             }
@@ -513,2 +571,3 @@
                         let baseTypes = interface._BaseType ? [interface._BaseType] : [];
+                        baseTypes.push(name + "Props");
                         baseTypes.push(name + "Collections");
@@ -523,3 +582,3 @@ baseTypes.push(name + "Methods");
                         content.push(createInterface(name + "PropMethods", null, props.join('\n')));
-                        content.push(createInterface(name + "Collections", name + "Props, " + name + "PropMethods", collections.join('\n')));
+                        content.push(createInterface(name + "Collections", name + "PropMethods", collections.join('\n')));
                         collectionMethods.length > 0 ? content.push(createInterface(name + "CollectionMethods", null, collectionMethods.join('\n'))) : null;
@@ -526,0 +585,0 @@ content.push(createInterface(name + "Query", [name + "Props", name + "Methods"], query.join('\n')));

package.json

 {
   "name": "gd-sprest-def",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "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

3672446

increased by0.54%

Lines of code

33411

increased by0.1%

No dependency changes