From 352f3693729105dc5d17ebf3e8d0007d96ba87e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Legan=C3=A9s-Combarro=20=27piranna?= Date: Sat, 21 Mar 2020 15:13:27 +0100 Subject: [PATCH 1/2] Throw exception for unknown canvas type instead create `Image` by default # Conflicts: # test/canvas.test.js --- src/Canvas.cc | 2 +- test/canvas.test.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Canvas.cc b/src/Canvas.cc index edeb2f4d6..80221d031 100644 --- a/src/Canvas.cc +++ b/src/Canvas.cc @@ -107,7 +107,7 @@ NAN_METHOD(Canvas::New) { else if (0 == strcmp("svg", *Nan::Utf8String(info[2]))) backend = new SvgBackend(width, height); else - backend = new ImageBackend(width, height); + return Nan::ThrowRangeError("Unknown canvas type"); } else backend = new ImageBackend(width, height); diff --git a/test/canvas.test.js b/test/canvas.test.js index b28a33990..2803f8841 100644 --- a/test/canvas.test.js +++ b/test/canvas.test.js @@ -256,9 +256,9 @@ describe('Canvas', function () { assert.equal(canvas.type, 'pdf'); var canvas = createCanvas(10, 10, 'svg'); assert.equal(canvas.type, 'svg'); - var canvas = createCanvas(10, 10, 'hey'); - assert.equal(canvas.type, 'image'); - }); + + assert.throws(function () { createCanvas(10, 10, 'hey'); }, /RangeError/); + }) it('Canvas#getContext("2d")', function () { var canvas = createCanvas(200, 300) From fcba4d1939b2f28ee12cd85714f511efb097610a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Legan=C3=A9s-Combarro=20=27piranna?= Date: Sat, 17 Oct 2020 19:24:29 +0200 Subject: [PATCH 2/2] Update `devDependencies` to fix linting errors --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 78b31f82b..cde80c41f 100644 --- a/package.json +++ b/package.json @@ -53,13 +53,14 @@ "simple-get": "^3.0.3" }, "devDependencies": { - "@types/node": "^10.12.18", + "@types/node": "^14.11.10", "assert-rejects": "^1.0.0", - "dtslint": "^0.5.3", + "dtslint": "^4.0.4", "express": "^4.16.3", "mocha": "^5.2.0", "pixelmatch": "^4.0.2", - "standard": "^12.0.1" + "standard": "^12.0.1", + "typescript": "^4.0.3" }, "engines": { "node": ">=6"