From db9cb3d14c90dc2434251cf6d54445222825ec5a Mon Sep 17 00:00:00 2001 From: Jan Molak Date: Fri, 8 Feb 2019 17:08:28 +0000 Subject: [PATCH] chore(style): Updated ts-lint and applied its suggestions --- package-lock.json | 64 ++++++++++++++++------------------ package.json | 4 +-- src/TinyType.ts | 2 +- src/predicates/isInstanceOf.ts | 2 +- src/types/constructors.ts | 4 +-- 5 files changed, 35 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5ad793c..2d85286d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3107,9 +3107,9 @@ } }, "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", + "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", "dev": true }, "commitizen": { @@ -14062,9 +14062,9 @@ "dev": true }, "tslint": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", - "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz", + "integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -14091,9 +14091,9 @@ } }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -14101,45 +14101,41 @@ "supports-color": "^5.3.0" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" } - }, - "tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } } } }, "tslint-microsoft-contrib": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.2.0.tgz", - "integrity": "sha512-gHVEIkTcMB9lS6UPEgEznV5ZmyhDs/aHyBS9E89S8aJiK1qLv22DmfCcda53S024T+WQkGAhLHUQF4Qn4nzCAA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-6.0.0.tgz", + "integrity": "sha512-R//efwn+34IUjTJeYgNDAJdzG0jyLWIehygPt/PHuZAieTolFVS56FgeFW7DOLap9ghXzMiFPTmDgm54qaL7QA==", "dev": true, "requires": { - "tsutils": "^2.12.1 <2.29.0" + "tsutils": "^2.27.2 <2.29.0" + }, + "dependencies": { + "tsutils": { + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.28.0.tgz", + "integrity": "sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } } }, "tsutils": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.19.1.tgz", - "integrity": "sha512-1B3z4H4HddgzWptqLzwrJloDEsyBt8DvZhnFO14k7A4RsQL/UhEfQjD4hpcY5NpF3veBkjJhQJ8Bl7Xp96cN+A==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { "tslib": "^1.8.1" diff --git a/package.json b/package.json index 4e5201b2..79228495 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "sinon-chai": "3.3.0", "travis-deploy-once": "5.0.11", "ts-node": "7.0.1", - "tslint": "5.11.0", - "tslint-microsoft-contrib": "5.2.0", + "tslint": "5.12.1", + "tslint-microsoft-contrib": "6.0.0", "typescript": "3.0.1" }, "config": { diff --git a/src/TinyType.ts b/src/TinyType.ts index 63b939f5..43933077 100644 --- a/src/TinyType.ts +++ b/src/TinyType.ts @@ -19,7 +19,7 @@ import { JSONObject, JSONValue, NonNullJSONPrimitive, Serialisable, Serialised } * * @returns a dynamically created base class your tiny type can extend from */ -export function TinyTypeOf(): { new(_: T): { value: T } & TinyType } { +export function TinyTypeOf(): new(_: T) => { value: T } & TinyType { return class extends TinyType { constructor(public readonly value: T) { super(); diff --git a/src/predicates/isInstanceOf.ts b/src/predicates/isInstanceOf.ts index 4b293603..06c902d0 100644 --- a/src/predicates/isInstanceOf.ts +++ b/src/predicates/isInstanceOf.ts @@ -15,6 +15,6 @@ import { Predicate } from './Predicate'; * @param {Constructor} type * @returns {Predicate} */ -export function isInstanceOf(type: { new (...args: any[]): T }): Predicate { +export function isInstanceOf(type: new (...args: any[]) => T): Predicate { return Predicate.to(`be instance of ${type.name}`, (value: T) => value instanceof type); } diff --git a/src/types/constructors.ts b/src/types/constructors.ts index 51f7e20f..13eda980 100644 --- a/src/types/constructors.ts +++ b/src/types/constructors.ts @@ -1,5 +1,3 @@ -export interface Constructor { - new (...args: any[]): T; -} +export type Constructor = new (...args: any[]) => T; export type ConstructorOrAbstract = Function & { prototype: T }; // tslint:disable-line:ban-types export type ConstructorAbstractOrInstance = T | ConstructorOrAbstract; // tslint:disable-line:ban-types