Continue lint fixes

Author: tolyo

@types/shared/common.d.ts

@@ -1,4 +1,4 @@
-export function equals(o1: any, o2: any): any;
+export function equals(o1: any, o2: any): boolean;
 /**
  * prototypal inheritance helper.
  * Creates a new object which has `parent` object as its prototype, and then copies the properties from `extra` onto it

eslint.config.js

@@ -97,7 +97,10 @@ export default defineConfig([
       "max-classes-per-file": ["error", 3],
       "consistent-return": "error",
       "dot-notation": "error",
-      "id-length": ["warn", { min: 2, exceptions: ["i", "j", "_", "__"] }],
+      "id-length": [
+        "warn",
+        { min: 2, exceptions: ["i", "j", "x", "y", "k", "v", "_", "__"] },
+      ],
       "sort-imports": [
         "error",
         {

src/core/compile/attributes.js

@@ -4,7 +4,6 @@ import {
   directiveNormalize,
   hasAnimate,
   hasOwn,
-  isProxy,
   isString,
   isUndefined,
   minErr,

src/router/hooks/redirect-to.js

@@ -18,17 +18,23 @@ export const registerRedirectToHook = (transitionService, stateService) => {
     function handleResult(result) {
       if (!result) return;
 
-      if (result instanceof TargetState) return result;
+      if (result instanceof TargetState) {
+        return result;
+      }
 
-      if (isString(result))
+      if (isString(result)) {
         return $state.target(result, trans.params(), trans.options());
+      }
 
-      if (result.state || result.params)
+      if (result.state || result.params) {
         return $state.target(
           result.state || trans.to(),
           result.params || trans.params(),
           trans.options(),
         );
+      }
+
+      return undefined;
     }
 
     if (isFunction(redirect)) {

src/router/state/state-builder.js

@@ -103,7 +103,7 @@ function getParamsBuilder(paramFactory) {
 
     return urlParams
       .concat(nonUrlParams)
-      .map((p) => [p.id, p])
+      .map((x) => [x.id, x])
       .reduce(applyPairs, {});
   };
 }
@@ -200,30 +200,30 @@ export function resolvablesBuilder(state) {
   const literal2Resolvable = pattern([
     [
       (x) => x.resolveFn,
-      (p) => new Resolvable(getToken(p), p.resolveFn, p.deps, p.policy),
+      (y) => new Resolvable(getToken(y), y.resolveFn, y.deps, y.policy),
     ],
     [
       (x) => x.useFactory,
-      (p) =>
+      (y) =>
         new Resolvable(
-          getToken(p),
-          p.useFactory,
-          p.deps || p.dependencies,
-          p.policy,
+          getToken(y),
+          y.useFactory,
+          y.deps || y.dependencies,
+          y.policy,
         ),
     ],
     [
       (x) => x.useClass,
-      (p) => new Resolvable(getToken(p), () => new p.useClass(), [], p.policy),
+      (y) => new Resolvable(getToken(y), () => new y.useClass(), [], y.policy),
     ],
     [
       (x) => x.useValue,
-      (p) =>
-        new Resolvable(getToken(p), () => p.useValue, [], p.policy, p.useValue),
+      (y) =>
+        new Resolvable(getToken(y), () => y.useValue, [], y.policy, y.useValue),
     ],
     [
       (x) => x.useExisting,
-      (p) => new Resolvable(getToken(p), (x) => x, [p.useExisting], p.policy),
+      (y) => new Resolvable(getToken(y), (x) => x, [y.useExisting], y.policy),
     ],
   ]);
 

src/services/cookie/cookie.js

@@ -124,8 +124,8 @@ export class CookieService {
         ...this.defaults,
         ...options,
       })}`;
-    } catch (e) {
-      this.$exceptionHandler(e);
+    } catch (err) {
+      this.$exceptionHandler(err);
     }
   }
 
@@ -271,12 +271,12 @@ function buildOptions(opts = {}) {
   if (isDefined(opts.samesite)) {
     if (!isString(opts.samesite))
       throw new TypeError(`${BADARG}:samesite ${opts.samesite}`);
-    const s = opts.samesite.toLowerCase();
+    const samesite = opts.samesite.toLowerCase();
 
-    if (!["lax", "strict", "none"].includes(s)) {
+    if (!["lax", "strict", "none"].includes(samesite)) {
       throw new TypeError(`${BADARG}:samesite ${opts.samesite}`);
     }
-    parts.push(`samesite=${s}`);
+    parts.push(`samesite=${samesite}`);
   }
 
   // Join all parts with semicolons

src/services/http/http.js

@@ -1070,8 +1070,8 @@ export function http(
   if (responseType) {
     try {
       xhr.responseType = responseType;
-    } catch (e) {
-      if (responseType !== "json") throw e;
+    } catch (err) {
+      if (responseType !== "json") throw err;
     }
   }
 

src/services/pubsub/pubsub.js

@@ -229,7 +229,9 @@ export class PubSub {
         // Defer removal until after publishing is complete, but replace the
         // function with a no-op so it isn't called.
         this.pendingKeys.push(key);
-        this.subscriptions[key + 1] = () => {};
+        this.subscriptions[key + 1] = () => {
+          /* empty */
+        };
       } else {
         if (keys) {
           this.topics[topic] = keys.filter((k) => k !== key);

src/services/rest/rfc.js

@@ -238,8 +238,8 @@ export function expandExpression(expression, vars) {
         // not exploded: join k,v pairs by ','
         const pairs = keys
           .map(
-            (k) =>
-              `${pctEncode(k, conf.allowReserved)},${pctEncode(value[k], conf.allowReserved)}`,
+            (key) =>
+              `${pctEncode(key, conf.allowReserved)},${pctEncode(value[key], conf.allowReserved)}`,
           )
           .join(",");
 

src/services/sce/sce.js

@@ -194,7 +194,7 @@ export class SceDelegateProvider {
      */
     this.trustedResourceUrlList = function (value) {
       if (arguments.length) {
-        trustedResourceUrlList = value.map((v) => adjustMatcher(v));
+        trustedResourceUrlList = value.map(adjustMatcher);
       }
 
       return trustedResourceUrlList;
@@ -224,7 +224,7 @@ export class SceDelegateProvider {
      */
     this.bannedResourceUrlList = function (value) {
       if (arguments.length) {
-        bannedResourceUrlList = value.map((v) => adjustMatcher(v));
+        bannedResourceUrlList = value.map(adjustMatcher);
       }
 
       return bannedResourceUrlList;
@@ -274,14 +274,12 @@ export class SceDelegateProvider {
         function isResourceUrlAllowedByPolicy(url) {
           const parsedUrl = urlResolve(url.toString());
 
-          let i;
-
-          let n;
-
-          let allowed = false;
+          let i,
+            j,
+            allowed = false;
 
           // Ensure that at least one item from the trusted resource URL list allows this url.
-          for (i = 0, n = trustedResourceUrlList.length; i < n; i++) {
+          for (i = 0, j = trustedResourceUrlList.length; i < j; i++) {
             if (matchUrl(trustedResourceUrlList[i], parsedUrl)) {
               allowed = true;
               break;
@@ -290,7 +288,7 @@ export class SceDelegateProvider {
 
           if (allowed) {
             // Ensure that no item from the banned resource URL list has blocked this url.
-            for (i = 0, n = bannedResourceUrlList.length; i < n; i++) {
+            for (i = 0, j = bannedResourceUrlList.length; i < j; i++) {
               if (matchUrl(bannedResourceUrlList[i], parsedUrl)) {
                 allowed = false;
                 break;
@@ -499,8 +497,9 @@ export class SceDelegateProvider {
             // htmlSanitizer throws its own error when no sanitizer is available.
             return htmlSanitizer();
           }
+
           // Default error when the $sce service has no way to make the input safe.
-          $exceptionHandler(
+          return $exceptionHandler(
             $sceMinErr(
               "unsafe",
               "Attempting to use an unsafe value in a safe context.",
@@ -562,9 +561,7 @@ export function SceProvider() {
         sce.trustAs = sce.getTrusted = function (type, value) {
           return value;
         };
-        sce.valueOf = function ($) {
-          return $;
-        };
+        sce.valueOf = (v) => v;
       }
 
       /**