From 6a87ff901190c54bce7ec68649b727ba53a9bf0a Mon Sep 17 00:00:00 2001 From: Zachary Belford Date: Mon, 6 May 2019 12:19:58 -0700 Subject: [PATCH 1/6] fix: test also lints --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c6caa2c8..908bedd9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ ], "scripts": { "start": "./bin/cli.js", - "test": "jest --coverage", + "test": "npm run test:lint && npm run test:unit", + "test:unit": "jest --coverage", + "test:lint": "tslint -c tslint.json 'src/**/*.ts' --fix", "build": "tsc && cp -R templates build/. && chmod +x build/src/cli.js", "watch:build": "tsc --watch", "watch:test": "jest --watch" From 4747583c74dcefd375df91d6cb112a2da8ba3f0f Mon Sep 17 00:00:00 2001 From: Zachary Belford Date: Mon, 6 May 2019 12:20:31 -0700 Subject: [PATCH 2/6] fix: line length --- src/cli.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cli.ts b/src/cli.ts index bb084654..efd79d3b 100755 --- a/src/cli.ts +++ b/src/cli.ts @@ -6,7 +6,11 @@ import { parseOpenRPCDocument } from "@open-rpc/schema-utils-js"; program .version(require('../../package.json').version, '-v, --version') - .option("-d, --document [openrpcDocument]", "JSON string or a Path/Url pointing to an open rpc schema", "./openrpc.json") + .option( + "-d, --document [openrpcDocument]", + "JSON string or a Path/Url pointing to an open rpc schema", + "./openrpc.json" + ) .action(async () => { const openrpcDocument = await parseOpenRPCDocument(program.document); From c3208439d80d85f59d5d1a12ab9c206a9868f40d Mon Sep 17 00:00:00 2001 From: Zachary Belford Date: Mon, 6 May 2019 12:21:18 -0700 Subject: [PATCH 3/6] fix: dont lint console log in cli --- src/cli.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli.ts b/src/cli.ts index efd79d3b..74eeb1d4 100755 --- a/src/cli.ts +++ b/src/cli.ts @@ -16,6 +16,6 @@ program await orpcGenerator({ outDir: process.cwd(), openrpcDocument }); - console.log("Done!"); + console.log("Done!"); // tslint:disable-line }) .parse(process.argv); From b1e29d325a6f8583db582df96ac7e09522cd7b1c Mon Sep 17 00:00:00 2001 From: Zachary Belford Date: Mon, 6 May 2019 12:23:47 -0700 Subject: [PATCH 4/6] fix: npm install tslint --- package-lock.json | 149 +++++++++++++++++++++++++++++++++------------- package.json | 11 ++-- 2 files changed, 114 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7bc217af..d8031f98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -612,14 +612,14 @@ } }, "@types/node": { - "version": "11.13.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.4.tgz", - "integrity": "sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==" + "version": "11.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.10.tgz", + "integrity": "sha512-leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA==" }, "@types/prettier": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.16.2.tgz", - "integrity": "sha512-ASI5zoMgx4D2WxwtAfjoUGk2AHg7wthX5MHMxUuq9KpXh4n7yR17T4O7lN0kGFm48C1XBK8J2kJjrmCQsvr19A==" + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.16.3.tgz", + "integrity": "sha512-5Ksgx9H/Yjz6oamDbmDZstWlJGPTao7shNfambjf8o7OkHxDwAi0AJLQcFwS9pDKI4gQPdiKZXze3nT1eCOViQ==" }, "@types/stack-utils": { "version": "1.0.1", @@ -1110,6 +1110,12 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, "byline": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz", @@ -1492,6 +1498,12 @@ "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", "dev": true }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, "diff-sequences": { "version": "24.3.0", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.3.0.tgz", @@ -1585,9 +1597,9 @@ } }, "es5-ext": { - "version": "0.10.49", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz", - "integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==", + "version": "0.10.50", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", + "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", "requires": { "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", @@ -2022,7 +2034,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2043,12 +2056,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2063,17 +2078,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2190,7 +2208,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2202,6 +2221,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2216,6 +2236,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2223,12 +2244,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2247,6 +2270,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2327,7 +2351,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2339,6 +2364,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2424,7 +2450,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2460,6 +2487,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2479,6 +2507,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2522,12 +2551,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -4347,16 +4378,16 @@ } }, "mime-db": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", - "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==" + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" }, "mime-types": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", - "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "requires": { - "mime-db": "~1.38.0" + "mime-db": "1.40.0" } }, "mimic-fn": { @@ -4495,9 +4526,9 @@ "dev": true }, "node-fetch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", - "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz", + "integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw==" }, "node-int64": { "version": "0.4.0", @@ -4862,9 +4893,9 @@ } }, "pkg": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-4.3.7.tgz", - "integrity": "sha512-/BvtFft1nKKtnTuOm/0es0sk1cOs7ZtWgJpqdtszJ4348jYJ8owVyCB/iuGhI3YJFX/ZFIv4Rmra9ETUgpnnfA==", + "version": "4.3.8", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-4.3.8.tgz", + "integrity": "sha512-HhnMcHvGFf0VR4fJygqo1WTKztEK6m3UKS+O4NIM9tzbdgCfsAEpNncPlO9Gj6wAMbe9JC48UmzPBErpYSwckQ==", "requires": { "@babel/parser": "7.2.3", "babel-runtime": "6.26.0", @@ -5092,7 +5123,7 @@ "string-to-stream": "^1.1.0", "typescript": "~2.8.3", "typescript-json-schema": "github:quicktype/typescript-json-schema#d16083d29c8b6702c666a981fa6b21113300c059", - "unicode-properties": "github:quicktype/unicode-properties#d5fddfea1ef9d05c6479a979e225476063e13f52", + "unicode-properties": "github:quicktype/unicode-properties#dist", "universal-analytics": "^0.4.16", "urijs": "^1.19.1", "uuid": "^3.2.1" @@ -5115,12 +5146,12 @@ } }, "quicktype-core": { - "version": "6.0.33", - "resolved": "https://registry.npmjs.org/quicktype-core/-/quicktype-core-6.0.33.tgz", - "integrity": "sha512-+0zI8WWxaXzHzqOileyYdC6YRCv3MIetPsn6t4Vz8x+Zwc8d/oiWaPPZGtjPCy7lnVMaWTDTHmEPWyR6tc8nUg==", + "version": "6.0.37", + "resolved": "https://registry.npmjs.org/quicktype-core/-/quicktype-core-6.0.37.tgz", + "integrity": "sha512-aWoKL+mFAgV15KPf74Mdwx0Z6XKk8ZgWudRBXPSnXxdl7F453WDvjTmRxjAFVu0utDfr085oznXsg/cPuB9NVw==", "requires": { "@mark.probst/unicode-properties": "~1.1.0", - "@types/urijs": "github:quicktype/types-urijs#a23603a04e31e883a92244bff8515e3d841a8b98", + "@types/urijs": "github:quicktype/types-urijs", "collection-utils": "^1.0.1", "js-base64": "^2.4.3", "pako": "^1.0.6", @@ -6121,6 +6152,42 @@ } } }, + "tslib": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "dev": true + }, + "tslint": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.16.0.tgz", + "integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.13.0", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.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" + } + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -6176,9 +6243,9 @@ "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=" }, "uglify-js": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.4.tgz", - "integrity": "sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==", + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.11.tgz", + "integrity": "sha512-izPJg8RsSyqxbdnqX36ExpbH3K7tDBsAU/VfNv89VkMFy3z39zFjunQGsSHOlGlyIfGLGprGeosgQno3bo2/Kg==", "optional": true, "requires": { "commander": "~2.20.0", diff --git a/package.json b/package.json index 908bedd9..7a7c4924 100644 --- a/package.json +++ b/package.json @@ -33,13 +33,14 @@ "lodash": "^4.17.11" }, "devDependencies": { + "@open-rpc/examples": "^1.3.0", + "@open-rpc/meta-schema": "^1.3.1", "@types/fs-extra": "^5.0.5", - "@types/lodash": "^4.14.123", "@types/jest": "^24.0.11", - "@open-rpc/meta-schema": "^1.3.1", - "@open-rpc/examples": "^1.3.0", + "@types/lodash": "^4.14.123", "jest": "^24.5.0", - "typescript": "^3.3.3333", - "ts-jest": "^24.0.0" + "ts-jest": "^24.0.0", + "tslint": "^5.16.0", + "typescript": "^3.3.3333" } } From a044e1de74ea5efc8ef0777778da8d25d3b2f678 Mon Sep 17 00:00:00 2001 From: Zachary Belford Date: Mon, 6 May 2019 13:33:54 -0700 Subject: [PATCH 5/6] fix: linting issue with cli --- src/cli.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cli.ts b/src/cli.ts index 74eeb1d4..d71bfa4b 100755 --- a/src/cli.ts +++ b/src/cli.ts @@ -4,12 +4,14 @@ import program = require("commander"); import orpcGenerator from "./"; import { parseOpenRPCDocument } from "@open-rpc/schema-utils-js"; +const version = require("../../package.json").version; // tslint:disable-line + program - .version(require('../../package.json').version, '-v, --version') + .version(version, "-v, --version") .option( "-d, --document [openrpcDocument]", "JSON string or a Path/Url pointing to an open rpc schema", - "./openrpc.json" + "./openrpc.json", ) .action(async () => { const openrpcDocument = await parseOpenRPCDocument(program.document); From 6f7106fba7b13c788fc61927af6f021a7dad37b7 Mon Sep 17 00:00:00 2001 From: Zachary Belford Date: Mon, 6 May 2019 13:34:22 -0700 Subject: [PATCH 6/6] fix: remove deprecated rule --- tslint.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tslint.json b/tslint.json index 108b1a8d..0c18d59e 100644 --- a/tslint.json +++ b/tslint.json @@ -4,7 +4,6 @@ ], "rules": { "ordered-imports": false, - "indent": [true, "spaces", 2], - "no-unused-variable": true + "indent": [true, "spaces", 2] } }