@sarj/eslint-plugin 16.38.50 → 16.38.52

package/dist/index.cjs

@@ -2573,16 +2573,68 @@ function typeBinding(source, identifier) {
   }
   return null;
 }
+var REFERENCE_INDEXES = /* @__PURE__ */ new WeakMap();
 function retainsNamedTypeUses(source, removed) {
   const manager = source.scopeManager;
   if (manager === null) return false;
-  const references = manager.scopes.flatMap((scope) => scope.references).filter((reference) => reference.isRead() && insideTypeRange(reference.identifier, removed));
-  return references.every((reference) => {
+  const index = referenceIndex(source, manager);
+  for (const reference of referencesWithin(index.references, removed)) {
+    if (!reference.isRead()) continue;
     const binding3 = reference.resolved;
     if (!binding3 || !reference.isTypeReference && !reference.isValueReference) return false;
-    if (binding3.defs.length === 0) return true;
-    return binding3.references.some((retained) => retained.isRead() && (!reference.isTypeReference || retained.isTypeReference) && (!reference.isValueReference || retained.isValueReference) && !insideTypeRange(retained.identifier, removed) && !binding3.defs.some((definition) => insideTypeRange(retained.identifier, definition.node)) && publicTypeUse(retained.identifier));
-  });
+    if (binding3.defs.length === 0) continue;
+    const reads = publicReadExtents(index, binding3);
+    const extent = reference.isTypeReference ? reference.isValueReference ? reads.both : reads.type : reads.value;
+    if (extent === null || extent.minStart >= removed.range[0] && extent.maxEnd <= removed.range[1]) return false;
+  }
+  return true;
+}
+function referenceIndex(source, manager) {
+  const cached = REFERENCE_INDEXES.get(source);
+  if (cached?.manager === manager) return cached;
+  const references = manager.scopes.flatMap((scope) => scope.references);
+  references.sort((left, right) => left.identifier.range[0] - right.identifier.range[0]);
+  const index = { manager, references, publicReads: /* @__PURE__ */ new Map() };
+  REFERENCE_INDEXES.set(source, index);
+  return index;
+}
+function* referencesWithin(references, removed) {
+  let low = 0;
+  let high = references.length;
+  while (low < high) {
+    const middle = low + Math.floor((high - low) / 2);
+    const reference = references[middle];
+    if (reference === void 0 || reference.identifier.range[0] >= removed.range[0]) high = middle;
+    else low = middle + 1;
+  }
+  for (let index = low; index < references.length; index++) {
+    const reference = references[index];
+    if (reference === void 0) continue;
+    if (reference.identifier.range[0] > removed.range[1]) break;
+    if (insideTypeRange(reference.identifier, removed)) yield reference;
+  }
+}
+function publicReadExtents(index, binding3) {
+  const cached = index.publicReads.get(binding3);
+  if (cached !== void 0) return cached;
+  let type = null;
+  let value = null;
+  let both = null;
+  for (const retained of binding3.references) {
+    if (!retained.isRead() || !retained.isTypeReference && !retained.isValueReference || binding3.defs.some((definition) => insideTypeRange(retained.identifier, definition.node)) || !publicTypeUse(retained.identifier)) continue;
+    if (retained.isTypeReference) type = extendExtent(type, retained.identifier);
+    if (retained.isValueReference) value = extendExtent(value, retained.identifier);
+    if (retained.isTypeReference && retained.isValueReference) both = extendExtent(both, retained.identifier);
+  }
+  const result = { type, value, both };
+  index.publicReads.set(binding3, result);
+  return result;
+}
+function extendExtent(extent, identifier) {
+  return {
+    minStart: Math.min(extent?.minStart ?? identifier.range[0], identifier.range[0]),
+    maxEnd: Math.max(extent?.maxEnd ?? identifier.range[1], identifier.range[1])
+  };
 }
 function publicTypeUse(identifier) {
   let node = identifier;
@@ -4209,7 +4261,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "16.38.50",
+  version: "16.38.52",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",

package/dist/index.js

@@ -2522,16 +2522,68 @@ function typeBinding(source, identifier) {
   }
   return null;
 }
+var REFERENCE_INDEXES = /* @__PURE__ */ new WeakMap();
 function retainsNamedTypeUses(source, removed) {
   const manager = source.scopeManager;
   if (manager === null) return false;
-  const references = manager.scopes.flatMap((scope) => scope.references).filter((reference) => reference.isRead() && insideTypeRange(reference.identifier, removed));
-  return references.every((reference) => {
+  const index = referenceIndex(source, manager);
+  for (const reference of referencesWithin(index.references, removed)) {
+    if (!reference.isRead()) continue;
     const binding3 = reference.resolved;
     if (!binding3 || !reference.isTypeReference && !reference.isValueReference) return false;
-    if (binding3.defs.length === 0) return true;
-    return binding3.references.some((retained) => retained.isRead() && (!reference.isTypeReference || retained.isTypeReference) && (!reference.isValueReference || retained.isValueReference) && !insideTypeRange(retained.identifier, removed) && !binding3.defs.some((definition) => insideTypeRange(retained.identifier, definition.node)) && publicTypeUse(retained.identifier));
-  });
+    if (binding3.defs.length === 0) continue;
+    const reads = publicReadExtents(index, binding3);
+    const extent = reference.isTypeReference ? reference.isValueReference ? reads.both : reads.type : reads.value;
+    if (extent === null || extent.minStart >= removed.range[0] && extent.maxEnd <= removed.range[1]) return false;
+  }
+  return true;
+}
+function referenceIndex(source, manager) {
+  const cached = REFERENCE_INDEXES.get(source);
+  if (cached?.manager === manager) return cached;
+  const references = manager.scopes.flatMap((scope) => scope.references);
+  references.sort((left, right) => left.identifier.range[0] - right.identifier.range[0]);
+  const index = { manager, references, publicReads: /* @__PURE__ */ new Map() };
+  REFERENCE_INDEXES.set(source, index);
+  return index;
+}
+function* referencesWithin(references, removed) {
+  let low = 0;
+  let high = references.length;
+  while (low < high) {
+    const middle = low + Math.floor((high - low) / 2);
+    const reference = references[middle];
+    if (reference === void 0 || reference.identifier.range[0] >= removed.range[0]) high = middle;
+    else low = middle + 1;
+  }
+  for (let index = low; index < references.length; index++) {
+    const reference = references[index];
+    if (reference === void 0) continue;
+    if (reference.identifier.range[0] > removed.range[1]) break;
+    if (insideTypeRange(reference.identifier, removed)) yield reference;
+  }
+}
+function publicReadExtents(index, binding3) {
+  const cached = index.publicReads.get(binding3);
+  if (cached !== void 0) return cached;
+  let type = null;
+  let value = null;
+  let both = null;
+  for (const retained of binding3.references) {
+    if (!retained.isRead() || !retained.isTypeReference && !retained.isValueReference || binding3.defs.some((definition) => insideTypeRange(retained.identifier, definition.node)) || !publicTypeUse(retained.identifier)) continue;
+    if (retained.isTypeReference) type = extendExtent(type, retained.identifier);
+    if (retained.isValueReference) value = extendExtent(value, retained.identifier);
+    if (retained.isTypeReference && retained.isValueReference) both = extendExtent(both, retained.identifier);
+  }
+  const result = { type, value, both };
+  index.publicReads.set(binding3, result);
+  return result;
+}
+function extendExtent(extent, identifier) {
+  return {
+    minStart: Math.min(extent?.minStart ?? identifier.range[0], identifier.range[0]),
+    maxEnd: Math.max(extent?.maxEnd ?? identifier.range[1], identifier.range[1])
+  };
 }
 function publicTypeUse(identifier) {
   let node = identifier;
@@ -4162,7 +4214,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "16.38.50",
+  version: "16.38.52",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarj/eslint-plugin",
-  "version": "16.38.50",
+  "version": "16.38.52",
   "packageManager": "npm@12.2.1",
   "description": "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   "type": "module",