diff --git a/src/json-patch-duplex.js b/src/json-patch-duplex.js index 3d0f592a..e5a2b45c 100644 --- a/src/json-patch-duplex.js +++ b/src/json-patch-duplex.js @@ -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) { @@ -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; } @@ -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. */ @@ -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 \ No newline at end of file diff --git a/src/json-patch-duplex.ts b/src/json-patch-duplex.ts index 07a3ae27..1b561fc9 100644 --- a/src/json-patch-duplex.ts +++ b/src/json-patch-duplex.ts @@ -11,8 +11,6 @@ interface HTMLElement { } -var OriginalError = Error; - module jsonpatch { var _objectKeys = function (obj) { if (_isArray(obj)) { @@ -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; } @@ -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. */ @@ -666,5 +654,4 @@ if (typeof exports !== "undefined") { exports.validate = jsonpatch.validate; exports.validator = jsonpatch.validator; exports.JsonPatchError = jsonpatch.JsonPatchError; - exports.Error = jsonpatch.Error; } diff --git a/src/json-patch.js b/src/json-patch.js index 58314093..9d869446 100644 --- a/src/json-patch.js +++ b/src/json-patch.js @@ -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) { @@ -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. */ @@ -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 \ No newline at end of file diff --git a/src/json-patch.ts b/src/json-patch.ts index fc04aad0..ec0adbbd 100644 --- a/src/json-patch.ts +++ b/src/json-patch.ts @@ -5,7 +5,6 @@ * MIT license */ -var OriginalError = Error; module jsonpatch { var _objectKeys = function (obj) { @@ -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 @@ -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. */ @@ -421,5 +410,4 @@ if (typeof exports !== "undefined") { exports.validate = jsonpatch.validate; exports.validator = jsonpatch.validator; exports.JsonPatchError = jsonpatch.JsonPatchError; - exports.Error = jsonpatch.Error; } diff --git a/test/spec/validateSpec.js b/test/spec/validateSpec.js index f5bfc06f..a470ecc2 100644 --- a/test/spec/validateSpec.js +++ b/test/spec/validateSpec.js @@ -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'); }); @@ -325,4 +324,4 @@ describe("validate", function() { expect(ex.name).toBe("OPERATION_VALUE_REQUIRED"); }); -}); \ No newline at end of file +});