Skip to content

Commit

Permalink
Tooling: dt-header fast follow fixes (DefinitelyTyped#61805)
Browse files Browse the repository at this point in the history
* Tooling: dt-header fast follow fixes

* Enable JSDoc, jakebailey is right

* Improve type annotations slightly

A little less precision globally, a little more where it's useful.

Co-authored-by: Nathan Shively-Sanders <[email protected]>
  • Loading branch information
JoshuaKGoldberg and sandersn authored Aug 19, 2022
1 parent 0a4b8f5 commit c9e4975
Show file tree
Hide file tree
Showing 151 changed files with 371 additions and 102 deletions.
2 changes: 1 addition & 1 deletion scripts/jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"exclude": ["close-old-issues.js", "fix-tslint.js", "tslint-rule-to-eslint.js"],
"exclude": ["close-old-issues.js", "fix-tslint.js"],
"compilerOptions": {
"noUnusedLocals": true,
"target": "es6",
Expand Down
18 changes: 17 additions & 1 deletion scripts/tslint-rule-to-eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ import { promises as fs } from 'fs';
import { format } from 'prettier';
import * as path from 'path';

/** @type {any} */
const emptyObject = {};

/**
* @param {string} filePath
* @returns {Promise<any>}
*/
const parseAndReadFileContents = async filePath => {
try {
return parse((await fs.readFile(filePath)).toString());
Expand All @@ -16,6 +21,10 @@ const parseAndReadFileContents = async filePath => {
(async () => {
const prettierConfig = await parseAndReadFileContents('.prettierrc.json');

/**
* @param {string} filePath
* @param {unknown} contents
*/
const writeFileFormatted = async (filePath, contents) => {
await fs.writeFile(
filePath,
Expand All @@ -32,7 +41,14 @@ const parseAndReadFileContents = async filePath => {
for (const typeName of typeNames) {
const typeDirectory = path.join('types', typeName);

typeNames.push(
...(await fs.readdir(typeDirectory))
.filter(childDirectory => /^(ts|v)(\d+|\.)+$/.test(childDirectory))
.map(childDirectory => path.join(typeName, childDirectory)),
);

const tslintFilePath = path.join(typeDirectory, 'tslint.json');
/** @type {{ rules?: { [s:string]: boolean }}} */
const tslintData = await parseAndReadFileContents(tslintFilePath);
if (tslintData?.rules?.[tslintRuleName] !== false) {
continue;
Expand All @@ -43,7 +59,7 @@ const parseAndReadFileContents = async filePath => {
delete tslintData.rules[tslintRuleName];
if (Object.keys(tslintData.rules).length === 0) {
console.log(`\t${tslintFilePath} has no remaining rules; deleting rules property.`);
delete tslintFilePath.rules;
delete tslintData.rules;
} else {
console.log(`\t${tslintFilePath} has remaining rules.`);
}
Expand Down
5 changes: 5 additions & 0 deletions types/amplitude-js/v4/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/amplitude-js/v4/tslint.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"dt-header": false,
"no-boolean-literal-compare": false,
"no-consecutive-blank-lines": false,
"no-internal-module": false,
Expand Down
3 changes: 1 addition & 2 deletions types/bitcore-lib-cash/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {}
"extends": "@definitelytyped/dtslint/dt.json"
}
3 changes: 1 addition & 2 deletions types/bitcore-lib/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {}
"extends": "@definitelytyped/dtslint/dt.json"
}
5 changes: 5 additions & 0 deletions types/bluebird/v1/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/bluebird/v1/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"array-type": false,
"ban-types": false,
"comment-format": false,
"dt-header": false,
"jsdoc-format": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
Expand Down
5 changes: 5 additions & 0 deletions types/bluebird/v2/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/bluebird/v2/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"array-type": false,
"ban-types": false,
"comment-format": false,
"dt-header": false,
"jsdoc-format": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
Expand Down
5 changes: 5 additions & 0 deletions types/bull/v2/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/bull/v2/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"arrow-return-shorthand": false,
"ban-types": false,
"dt-header": false,
"jsdoc-format": false,
"no-consecutive-blank-lines": false,
"no-padding": false,
Expand Down
5 changes: 5 additions & 0 deletions types/chai/v2/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/chai/v2/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"ban-types": false,
"comment-format": false,
"dt-header": false,
"no-empty-interface": false,
"no-padding": false,
"no-single-declare-module": false,
Expand Down
5 changes: 5 additions & 0 deletions types/chroma-js/v0/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/chroma-js/v0/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"comment-format": false,
"dt-header": false,
"no-duplicate-variable": false,
"no-misused-new": false,
"no-padding": false,
Expand Down
5 changes: 5 additions & 0 deletions types/clean-css/v3/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/clean-css/v3/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"array-type": false,
"ban-types": false,
"dt-header": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
"no-duplicate-variable": false,
Expand Down
5 changes: 5 additions & 0 deletions types/color/v0/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/color/v0/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"array-type": false,
"dt-header": false,
"no-duplicate-variable": false,
"no-padding": false,
"no-var-keyword": false,
Expand Down
5 changes: 5 additions & 0 deletions types/d3-dsv/v0/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
5 changes: 1 addition & 4 deletions types/d3-dsv/v0/tslint.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"dt-header": false
}
"extends": "@definitelytyped/dtslint/dt.json"
}
5 changes: 5 additions & 0 deletions types/d3kit/v1/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/d3kit/v1/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"array-type": false,
"ban-types": false,
"dt-header": false,
"export-just-namespace": false,
"no-any-union": false,
"no-consecutive-blank-lines": false,
Expand Down
3 changes: 1 addition & 2 deletions types/deasync/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {}
"extends": "@definitelytyped/dtslint/dt.json"
}
5 changes: 5 additions & 0 deletions types/devexpress-web/v161/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v161/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"adjacent-overload-signatures": false,
"ban-types": false,
"dt-header": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
"no-duplicate-variable": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v162/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v162/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"adjacent-overload-signatures": false,
"ban-types": false,
"dt-header": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
"no-duplicate-variable": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v171/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v171/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"adjacent-overload-signatures": false,
"ban-types": false,
"dt-header": false,
"interface-name": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v172/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v172/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"adjacent-overload-signatures": false,
"ban-types": false,
"dt-header": false,
"interface-name": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v181/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v181/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"adjacent-overload-signatures": false,
"ban-types": false,
"dt-header": false,
"interface-name": false,
"max-line-length": false,
"no-consecutive-blank-lines": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v182/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v182/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rules": {
"adjacent-overload-signatures": false,
"ban-types": false,
"dt-header": false,
"max-line-length": false,
"no-duplicate-variable": false,
"no-empty-interface": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v191/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v191/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"ban-types": false,
"dt-header": false,
"interface-name": false,
"jsdoc-format": false,
"max-line-length": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v192/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v192/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"ban-types": false,
"dt-header": false,
"interface-name": false,
"jsdoc-format": false,
"max-line-length": false,
Expand Down
5 changes: 5 additions & 0 deletions types/devexpress-web/v201/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/devexpress-web/v201/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"ban-types": false,
"dt-header": false,
"interface-name": false,
"jsdoc-format": false,
"max-line-length": false,
Expand Down
3 changes: 1 addition & 2 deletions types/digibyte/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {}
"extends": "@definitelytyped/dtslint/dt.json"
}
5 changes: 5 additions & 0 deletions types/dragula/v2/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/dragula/v2/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"ban-types": false,
"dt-header": false,
"no-var-keyword": false,
"object-literal-shorthand": false,
"only-arrow-functions": false,
Expand Down
5 changes: 5 additions & 0 deletions types/dropzone/v4/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/dropzone/v4/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"adjacent-overload-signatures": false,
"array-type": false,
"ban-types": false,
"dt-header": false,
"max-line-length": false,
"no-padding": false,
"no-reference-import": false,
Expand Down
5 changes: 5 additions & 0 deletions types/durandal/v1/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
1 change: 0 additions & 1 deletion types/durandal/v1/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@definitelytyped/dtslint/dt.json",
"rules": {
"ban-types": false,
"dt-header": false,
"interface-name": false,
"jsdoc-format": false,
"max-line-length": false,
Expand Down
5 changes: 5 additions & 0 deletions types/ember/v1/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"dt-header": "off"
}
}
Loading

0 comments on commit c9e4975

Please sign in to comment.