Skip to content

Commit

Permalink
Update inheritance of JsonPatchError to TS>1.8
Browse files Browse the repository at this point in the history
Remove OriginalEvent global (#120)

Remove source map links from compiled js #117
  • Loading branch information
tomalec committed Sep 8, 2016
1 parent 4611c98 commit 481efa4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 45 deletions.
8 changes: 2 additions & 6 deletions src/json-patch-duplex.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var __extends = (this && this.__extends) || function (d, b) {
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var OriginalError = Error;
var jsonpatch;
(function (jsonpatch) {
var _objectKeys = function (obj) {
Expand Down Expand Up @@ -199,7 +198,7 @@ var jsonpatch;
}
var path = _getPathRecursive(root, obj);
if (path === '') {
throw new OriginalError("Object not found in root");
throw new Error("Object not found in root");
}
return '/' + path;
}
Expand Down Expand Up @@ -486,9 +485,8 @@ var jsonpatch;
this.tree = tree;
}
return JsonPatchError;
}(OriginalError));
}(Error));
jsonpatch.JsonPatchError = JsonPatchError;
jsonpatch.Error = JsonPatchError;
/**
* Recursively checks whether an object has any undefined values inside.
*/
Expand Down Expand Up @@ -596,6 +594,4 @@ if (typeof exports !== "undefined") {
exports.validate = jsonpatch.validate;
exports.validator = jsonpatch.validator;
exports.JsonPatchError = jsonpatch.JsonPatchError;
exports.Error = jsonpatch.Error;
}
//# sourceMappingURL=json-patch-duplex.js.map
19 changes: 3 additions & 16 deletions src/json-patch-duplex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ interface HTMLElement {
}


var OriginalError = Error;

module jsonpatch {
var _objectKeys = function (obj) {
if (_isArray(obj)) {
Expand Down Expand Up @@ -219,7 +217,7 @@ module jsonpatch {
}
var path = _getPathRecursive(root, obj);
if (path === '') {
throw new OriginalError("Object not found in root");
throw new Error("Object not found in root");
}
return '/' + path;
}
Expand Down Expand Up @@ -530,23 +528,13 @@ module jsonpatch {
_generate(tree1, tree2, patches, '');
return patches;
}
export class JsonPatchError extends Error {

export declare class OriginalError {
public name:string;
public message:string;
public stack:string;

constructor(message?:string);
}

export class JsonPatchError extends OriginalError {
constructor(public message:string, public name:string, public index?:number, public operation?:any, public tree?:any) {
constructor(public message: string, public name:string, public index?:number, public operation?:any, public tree?:any) {
super(message);
}
}

export var Error = JsonPatchError;

/**
* Recursively checks whether an object has any undefined values inside.
*/
Expand Down Expand Up @@ -666,5 +654,4 @@ if (typeof exports !== "undefined") {
exports.validate = jsonpatch.validate;
exports.validator = jsonpatch.validator;
exports.JsonPatchError = jsonpatch.JsonPatchError;
exports.Error = jsonpatch.Error;
}
6 changes: 1 addition & 5 deletions src/json-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var __extends = (this && this.__extends) || function (d, b) {
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var OriginalError = Error;
var jsonpatch;
(function (jsonpatch) {
var _objectKeys = function (obj) {
Expand Down Expand Up @@ -279,9 +278,8 @@ var jsonpatch;
this.tree = tree;
}
return JsonPatchError;
}(OriginalError));
}(Error));
jsonpatch.JsonPatchError = JsonPatchError;
jsonpatch.Error = JsonPatchError;
/**
* Recursively checks whether an object has any undefined values inside.
*/
Expand Down Expand Up @@ -385,6 +383,4 @@ if (typeof exports !== "undefined") {
exports.validate = jsonpatch.validate;
exports.validator = jsonpatch.validator;
exports.JsonPatchError = jsonpatch.JsonPatchError;
exports.Error = jsonpatch.Error;
}
//# sourceMappingURL=json-patch.js.map
18 changes: 3 additions & 15 deletions src/json-patch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* MIT license
*/

var OriginalError = Error;

module jsonpatch {
var _objectKeys = function (obj) {
Expand Down Expand Up @@ -210,7 +209,7 @@ module jsonpatch {
return true;
}

/**
/**
* Apply a json-patch operation on an object tree
* Returns an array of results of operations.
* Each element can either be a boolean (if op == 'test') or
Expand Down Expand Up @@ -289,23 +288,13 @@ module jsonpatch {
}
return results;
}
export class JsonPatchError extends Error {

export declare class OriginalError {
public name:string;
public message:string;
public stack:string;

constructor(message?:string);
}

export class JsonPatchError extends OriginalError {
constructor(public message:string, public name:string, public index?:number, public operation?:any, public tree?:any) {
constructor(public message: string, public name:string, public index?:number, public operation?:any, public tree?:any) {
super(message);
}
}

export var Error = JsonPatchError;

/**
* Recursively checks whether an object has any undefined values inside.
*/
Expand Down Expand Up @@ -421,5 +410,4 @@ if (typeof exports !== "undefined") {
exports.validate = jsonpatch.validate;
exports.validator = jsonpatch.validator;
exports.JsonPatchError = jsonpatch.JsonPatchError;
exports.Error = jsonpatch.Error;
}
5 changes: 2 additions & 3 deletions test/spec/validateSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ describe("validate", function() {
expect(error.name).toBe('OPERATION_NOT_AN_OBJECT');
});

it('should return an error which is instance of Error and jsonpatch.Error', function() {
it('should return an error which is instance of Error and jsonpatch.JsonPatchError', function() {
var error = jsonpatch.validate({});
expect(error instanceof jsonpatch.JsonPatchError).toBe(true);
expect(error instanceof Error).toBe(true);
expect(error instanceof jsonpatch.Error).toBe(true);
expect(error.name).toBe('SEQUENCE_NOT_AN_ARRAY');
});

Expand Down Expand Up @@ -325,4 +324,4 @@ describe("validate", function() {

expect(ex.name).toBe("OPERATION_VALUE_REQUIRED");
});
});
});

0 comments on commit 481efa4

Please sign in to comment.