diff --git a/angularjs/angular-resource-tests.ts b/angularjs/angular-resource-tests.ts index 327fcaba6..107d6b29e 100644 --- a/angularjs/angular-resource-tests.ts +++ b/angularjs/angular-resource-tests.ts @@ -79,45 +79,35 @@ promise = resource.$delete({ key: 'value' }); promise = resource.$delete({ key: 'value' }, function () { }); promise = resource.$delete(function () { }); promise = resource.$delete(function () { }, function () { }); -promise = resource.$delete({ key: 'value' }, { key: 'value' }); -promise = resource.$delete({ key: 'value' }, { key: 'value' }, function () { }); -promise = resource.$delete({ key: 'value' }, { key: 'value' }, function () { }, function () { }); +promise = resource.$delete({ key: 'value' }, function () { }, function () { }); promise = resource.$get(); promise = resource.$get({ key: 'value' }); promise = resource.$get({ key: 'value' }, function () { }); promise = resource.$get(function () { }); promise = resource.$get(function () { }, function () { }); -promise = resource.$get({ key: 'value' }, { key: 'value' }); -promise = resource.$get({ key: 'value' }, { key: 'value' }, function () { }); -promise = resource.$get({ key: 'value' }, { key: 'value' }, function () { }, function () { }); +promise = resource.$get({ key: 'value' }, function () { }, function () { }); arrayPromise = resourceArray[0].$query(); arrayPromise = resourceArray[0].$query({ key: 'value' }); arrayPromise = resourceArray[0].$query({ key: 'value' }, function () { }); arrayPromise = resourceArray[0].$query(function () { }); arrayPromise = resourceArray[0].$query(function () { }, function () { }); -arrayPromise = resourceArray[0].$query({ key: 'value' }, { key: 'value' }); -arrayPromise = resourceArray[0].$query({ key: 'value' }, { key: 'value' }, function () { }); -arrayPromise = resourceArray[0].$query({ key: 'value' }, { key: 'value' }, function () { }, function () { }); +arrayPromise = resourceArray[0].$query({ key: 'value' }, function () { }, function () { }); promise = resource.$remove(); promise = resource.$remove({ key: 'value' }); promise = resource.$remove({ key: 'value' }, function () { }); promise = resource.$remove(function () { }); promise = resource.$remove(function () { }, function () { }); -promise = resource.$remove({ key: 'value' }, { key: 'value' }); -promise = resource.$remove({ key: 'value' }, { key: 'value' }, function () { }); -promise = resource.$remove({ key: 'value' }, { key: 'value' }, function () { }, function () { }); +promise = resource.$remove({ key: 'value' }, function () { }, function () { }); promise = resource.$save(); promise = resource.$save({ key: 'value' }); promise = resource.$save({ key: 'value' }, function () { }); promise = resource.$save(function () { }); promise = resource.$save(function () { }, function () { }); -promise = resource.$save({ key: 'value' }, { key: 'value' }); -promise = resource.$save({ key: 'value' }, { key: 'value' }, function () { }); -promise = resource.$save({ key: 'value' }, { key: 'value' }, function () { }, function () { }); +promise = resource.$save({ key: 'value' }, function () { }, function () { }); /////////////////////////////////////// // IResourceService diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts index 52706d68d..393362a95 100644 --- a/angularjs/angular-resource.d.ts +++ b/angularjs/angular-resource.d.ts @@ -50,79 +50,69 @@ declare module ng.resource { // PATCH (in other words, methods with body). Otherwise, it's going // to be considered as parameters to the request. // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L461-L465 + // + // Only those methods with an HTTP body do have 'data' as first parameter: + // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L463 + // More specifically, those methods are POST, PUT and PATCH: + // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L432 + // + // Also, static calls always return the IResource (or IResourceArray) retrieved + // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L549 interface IResourceClass { new(dataOrParams? : any) : T; get(): T; get(params: Object): T; get(success: Function, error?: Function): T; get(params: Object, success: Function, error?: Function): T; - get(params: Object, data: Object, success?: Function): T; - get(params: Object, data: Object, success: Function, error?: Function): T; + get(params: Object, data: Object, success?: Function, error?: Function): T; query(): IResourceArray; query(params: Object): IResourceArray; query(success: Function, error?: Function): IResourceArray; query(params: Object, success: Function, error?: Function): IResourceArray; - query(params: Object, data: Object, success?: Function): IResourceArray; - query(params: Object, data: Object, success: Function, error?: Function): IResourceArray; + query(params: Object, data: Object, success?: Function, error?: Function): IResourceArray; save(): T; save(data: Object): T; save(success: Function, error?: Function): T; save(data: Object, success: Function, error?: Function): T; - save(params: Object, data: Object, success?: Function): T; - save(params: Object, data: Object, success: Function, error?: Function): T; + save(params: Object, data: Object, success?: Function, error?: Function): T; remove(): T; remove(params: Object): T; remove(success: Function, error?: Function): T; remove(params: Object, success: Function, error?: Function): T; - remove(params: Object, data: Object, success?: Function): T; - remove(params: Object, data: Object, success: Function, error?: Function): T; + remove(params: Object, data: Object, success?: Function, error?: Function): T; delete(): T; delete(params: Object): T; delete(success: Function, error?: Function): T; delete(params: Object, success: Function, error?: Function): T; - delete(params: Object, data: Object, success?: Function): T; - delete(params: Object, data: Object, success: Function, error?: Function): T; + delete(params: Object, data: Object, success?: Function, error?: Function): T; } + // Instance calls always return the the promise of the request which retrieved the object + // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L546 interface IResource { $get(): ng.IPromise; - $get(params: Object): ng.IPromise; + $get(params?: Object, success?: Function, error?: Function): ng.IPromise; $get(success: Function, error?: Function): ng.IPromise; - $get(params: Object, success: Function, error?: Function): ng.IPromise; - $get(params: Object, data: Object, success?: Function): ng.IPromise; - $get(params: Object, data: Object, success: Function, error?: Function): ng.IPromise; $query(): ng.IPromise; - $query(params: Object): ng.IPromise; + $query(params?: Object, success?: Function, error?: Function): ng.IPromise; $query(success: Function, error?: Function): ng.IPromise; - $query(params: Object, success: Function, error?: Function): ng.IPromise; - $query(params: Object, data: Object, success?: Function): ng.IPromise; - $query(params: Object, data: Object, success: Function, error?: Function): ng.IPromise; $save(): ng.IPromise; - $save(data: Object): ng.IPromise; + $save(params?: Object, success?: Function, error?: Function): ng.IPromise; $save(success: Function, error?: Function): ng.IPromise; - $save(data: Object, success: Function, error?: Function): ng.IPromise; - $save(params: Object, data: Object, success?: Function): ng.IPromise; - $save(params: Object, data: Object, success: Function, error?: Function): ng.IPromise; $remove(): ng.IPromise; - $remove(params: Object): ng.IPromise; + $remove(params?: Object, success?: Function, error?: Function): ng.IPromise; $remove(success: Function, error?: Function): ng.IPromise; - $remove(params: Object, success: Function, error?: Function): ng.IPromise; - $remove(params: Object, data: Object, success?: Function): ng.IPromise; - $remove(params: Object, data: Object, success: Function, error?: Function): ng.IPromise; $delete(): ng.IPromise; - $delete(params: Object): ng.IPromise; + $delete(params?: Object, success?: Function, error?: Function): ng.IPromise; $delete(success: Function, error?: Function): ng.IPromise; - $delete(params: Object, success: Function, error?: Function): ng.IPromise; - $delete(params: Object, data: Object, success?: Function): ng.IPromise; - $delete(params: Object, data: Object, success: Function, error?: Function): ng.IPromise; /** the promise of the original server interaction that created this instance. **/ $promise : ng.IPromise;