fix: removes a few @ts-expect-errors now typescript has caught up wit…

…h some new features
sverweij · Aug 25, 2024 · 75f946f · 75f946f
1 parent b2cd13d
commit 75f946f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 13 deletions.
diff --git a/src/cache/cache.mjs b/src/cache/cache.mjs
@@ -9,9 +9,7 @@ import {
 import { optionsAreCompatible } from "./options-compatible.mjs";
 import MetadataStrategy from "./metadata-strategy.mjs";
 import ContentStrategy from "./content-strategy.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import { scannableExtensions } from "#extract/transpile/meta.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import { bus } from "#utl/bus.mjs";
 
 /**

diff --git a/src/cache/find-content-changes.mjs b/src/cache/find-content-changes.mjs
@@ -8,9 +8,7 @@ import {
  hasInterestingExtension,
  moduleIsInterestingForDiff,
 } from "./helpers.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import { bus } from "#utl/bus.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import findAllFiles from "#utl/find-all-files.mjs";
 
 /**

diff --git a/src/cache/metadata-strategy.mjs b/src/cache/metadata-strategy.mjs
@@ -9,7 +9,6 @@ import {
  includeOnlyFilter,
  changeHasInterestingExtension,
 } from "./helpers.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import { bus } from "#utl/bus.mjs";
 
 /**

diff --git a/src/cli/init-config/find-extensions.mjs b/src/cli/init-config/find-extensions.mjs
@@ -1,10 +1,7 @@
 // @ts-check
 /* eslint-disable security/detect-object-injection */
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import { scannableExtensions } from "#extract/transpile/meta.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import getExtension from "#utl/get-extension.mjs";
-// @ts-expect-error ts(2307) - the ts compiler is not privy to the existence of #imports in package.json
 import findAllFiles from "#utl/find-all-files.mjs";
 
 /**

diff --git a/src/validate/match-dependency-rule.mjs b/src/validate/match-dependency-rule.mjs
@@ -1,7 +1,6 @@
 // @ts-check
 import { isModuleOnlyRule, isFolderScope } from "./rule-classifiers.mjs";
 import matchers from "./matchers.mjs";
-// @ts-expect-error ts(2307) - apparently tsc doesn't understand subpath imports yet
 import { extractGroups } from "#utl/regex-util.mjs";
 
 /**

diff --git a/src/validate/match-module-rule.mjs b/src/validate/match-module-rule.mjs
@@ -13,7 +13,7 @@ import { extractGroups } from "#utl/regex-util.mjs";
 function matchesOrphanRule(pRule, pModule) {
  return (
  Object.hasOwn(pRule?.from ?? {}, "orphan") &&
- // @ts-expect-error the 'has' above guarantees there's a 'from.orphan' attribute
+ // @ts-expect-error the 'hasOwn' above guarantees there's a 'from.orphan' attribute
  pModule.orphan === pRule.from.orphan &&
  matchers.fromPath(pRule, pModule) &&
  matchers.fromPathNot(pRule, pModule)
@@ -34,11 +34,11 @@ function matchesReachableRule(pRule, pModule) {
  Object.hasOwn(pRule?.to ?? {}, "reachable") &&
  Object.hasOwn(pModule, "reachable")
  ) {
- // @ts-expect-error the 'has' above ensures the 'reachable' exists
+ // @ts-expect-error the 'hasOwn' above ensures the 'reachable' exists
  const lReachableRecord = pModule.reachable.find(
  (pReachable) =>
  pReachable.asDefinedInRule === pRule.name &&
- // @ts-expect-error the 'has' above ensures the 'to.reachable' exists
+ // @ts-expect-error the 'hasOwn' above ensures the 'to.reachable' exists
  pReachable.value === pRule.to.reachable,
  );
  if (lReachableRecord) {
@@ -66,7 +66,7 @@ function matchesReachesRule(pRule, pModule) {
  return (
  Object.hasOwn(pRule?.to ?? {}, "reachable") &&
  Object.hasOwn(pModule, "reaches") &&
- // @ts-expect-error the 'has' above guarantees the .reaches exists
+ // @ts-expect-error the 'hasOwn' above guarantees the .reaches exists
  pModule.reaches.some(
  (pReaches) =>
  pReaches.asDefinedInRule === pRule.name &&