[patch] make TS happy

ljharb · ljharb · commit 51d342ba350a · 2024-07-03T23:18:32.000-05:00
diff --git a/.eslintrc b/.eslintrc
@@ -22,61 +22,61 @@
 		"object-shorthand": [2, "always", {
 			"ignoreConstructors": false,
 			"avoidQuotes": false, // this is the override vs airbnb
-			}],
-			"max-len": [2, 120, {
-				"ignoreStrings": true,
-				"ignoreTemplateLiterals": true,
-				"ignoreComments": true,
-				}],
-				"consistent-return": 0,
+    }],
+    "max-len": [2, 140, {
+      "ignoreStrings": true,
+      "ignoreTemplateLiterals": true,
+      "ignoreComments": true,
+    }],
+    "consistent-return": 0,
 
-				"prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],
-				"prefer-object-spread": 0, // until node 8 is required
-				"prefer-rest-params": 0, // until node 6 is required
-				"prefer-spread": 0, // until node 6 is required
-				"function-call-argument-newline": 1, // TODO: enable
-				"function-paren-newline": 0,
-				"no-plusplus": [2, {"allowForLoopAfterthoughts": true}],
-				"no-param-reassign": 1,
-				"no-restricted-syntax": [2, {
-					"selector": "ObjectPattern",
-					"message": "Object destructuring is not compatible with Node v4"
-					}],
-					"strict": [2, "safe"],
-					"valid-jsdoc": [2, {
-						"requireReturn": false,
-						"requireParamDescription": false,
-						"requireReturnDescription": false,
-						}],
+    "prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],
+    "prefer-object-spread": 0, // until node 8 is required
+    "prefer-rest-params": 0, // until node 6 is required
+    "prefer-spread": 0, // until node 6 is required
+    "function-call-argument-newline": 1, // TODO: enable
+    "function-paren-newline": 0,
+    "no-plusplus": [2, {"allowForLoopAfterthoughts": true}],
+    "no-param-reassign": 1,
+    "no-restricted-syntax": [2, {
+      "selector": "ObjectPattern",
+      "message": "Object destructuring is not compatible with Node v4"
+    }],
+    "strict": [2, "safe"],
+    "valid-jsdoc": [2, {
+      "requireReturn": false,
+      "requireParamDescription": false,
+      "requireReturnDescription": false,
+    }],
 
-						"eslint-plugin/consistent-output": 0,
-						"eslint-plugin/require-meta-docs-description": [2, { "pattern": "^(Enforce|Require|Disallow)" }],
-						"eslint-plugin/require-meta-schema": 0,
-						"eslint-plugin/require-meta-type": 0
-					},
-					"overrides": [
-						{
-							"files": "tests/**",
-							"rules": {
-								"no-template-curly-in-string": 1,
-							},
-						},
-						{
-							"files": "markdown.config.js",
-							"rules": {
-								"no-console": 0,
-							},
-						},
-						{
-							"files": ".github/workflows/*.js",
-							"parserOptions": {
-								"ecmaVersion": 2019,
-							},
-							"rules": {
-								"camelcase": 0,
-								"no-console": 0,
-								"no-restricted-syntax": 0,
-							},
-						},
-					],
-				}
+    "eslint-plugin/consistent-output": 0,
+    "eslint-plugin/require-meta-docs-description": [2, { "pattern": "^(Enforce|Require|Disallow)" }],
+    "eslint-plugin/require-meta-schema": 0,
+    "eslint-plugin/require-meta-type": 0
+  },
+  "overrides": [
+    {
+      "files": "tests/**",
+      "rules": {
+        "no-template-curly-in-string": 1,
+      },
+    },
+    {
+      "files": "markdown.config.js",
+      "rules": {
+        "no-console": 0,
+      },
+    },
+    {
+      "files": ".github/workflows/*.js",
+      "parserOptions": {
+        "ecmaVersion": 2019,
+      },
+      "rules": {
+        "camelcase": 0,
+        "no-console": 0,
+        "no-restricted-syntax": 0,
+      },
+    },
+  ],
+}
diff --git a/lib/rules/forbid-elements.js b/lib/rules/forbid-elements.js
@@ -60,6 +60,7 @@ module.exports = {
     const configuration = context.options[0] || {};
     const forbidConfiguration = configuration.forbid || [];
 
+    /** @type {Record<string, { element: string, message?: string }>} */
     const indexedForbidConfigs = {};
 
     forbidConfiguration.forEach((item) => {
diff --git a/lib/rules/no-array-index-key.js b/lib/rules/no-array-index-key.js
@@ -117,6 +117,8 @@ module.exports = {
         return null;
       }
 
+      const name = /** @type {keyof iteratorFunctionsToIndexParamPosition} */ (callee.property.name);
+
       const callbackArg = isUsingReactChildren(node)
         ? node.arguments[1]
         : node.arguments[0];
@@ -131,7 +133,7 @@ module.exports = {
 
       const params = callbackArg.params;
 
-      const indexParamPosition = iteratorFunctionsToIndexParamPosition[callee.property.name];
+      const indexParamPosition = iteratorFunctionsToIndexParamPosition[name];
       if (params.length < indexParamPosition + 1) {
         return null;
       }
diff --git a/lib/rules/no-unknown-property.js b/lib/rules/no-unknown-property.js
@@ -491,10 +491,10 @@ function tagNameHasDot(node) {
  */
 function getStandardName(name, context) {
   if (has(DOM_ATTRIBUTE_NAMES, name)) {
-    return DOM_ATTRIBUTE_NAMES[name];
+    return DOM_ATTRIBUTE_NAMES[/** @type {keyof DOM_ATTRIBUTE_NAMES} */ (name)];
   }
   if (has(SVGDOM_ATTRIBUTE_NAMES, name)) {
-    return SVGDOM_ATTRIBUTE_NAMES[name];
+    return SVGDOM_ATTRIBUTE_NAMES[/** @type {keyof SVGDOM_ATTRIBUTE_NAMES} */ (name)];
   }
   const names = getDOMPropertyNames(context);
   // Let's find a possible attribute match with a case-insensitive search.
@@ -592,7 +592,7 @@ module.exports = {
         // Let's dive deeper into tags that are HTML/DOM elements (`<button>`), and not React components (`<Button />`)
 
         // Some attributes are allowed on some tags only
-        const allowedTags = has(ATTRIBUTE_TAGS_MAP, name) ? ATTRIBUTE_TAGS_MAP[name] : null;
+        const allowedTags = has(ATTRIBUTE_TAGS_MAP, name) ? ATTRIBUTE_TAGS_MAP[/** @type {keyof ATTRIBUTE_TAGS_MAP} */ (name)] : null;
         if (tagName && allowedTags) {
           // Scenario 1A: Allowed attribute found where not supposed to, report it
           if (allowedTags.indexOf(tagName) === -1) {

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ module.exports = {`
`117`	`117`	`return null;`
`118`	`118`	`}`
`119`	`119`
	`120`	`+ const name = /** @type {keyof iteratorFunctionsToIndexParamPosition} */ (callee.property.name);`
	`121`	`+`
`120`	`122`	`const callbackArg = isUsingReactChildren(node)`
`121`	`123`	`? node.arguments[1]`
`122`	`124`	`: node.arguments[0];`
`@@ -131,7 +133,7 @@ module.exports = {`
`131`	`133`
`132`	`134`	`const params = callbackArg.params;`
`133`	`135`
`134`		`- const indexParamPosition = iteratorFunctionsToIndexParamPosition[callee.property.name];`
	`136`	`+ const indexParamPosition = iteratorFunctionsToIndexParamPosition[name];`
`135`	`137`	`if (params.length < indexParamPosition + 1) {`
`136`	`138`	`return null;`
`137`	`139`	`}`