feat: improve project registry invalidation logic (#290)

lifeart · May 27, 2021 · be54957 · be54957
1 parent 450415e
commit be54957
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/project.ts b/src/project.ts
@@ -1,4 +1,12 @@
-import { addToRegistry, removeFromRegistry, normalizeMatchNaming, NormalizedRegistryItem, IRegistry, getRegistryForRoots } from './utils/registry-api';
+import {
+  addToRegistry,
+  removeFromRegistry,
+  normalizeMatchNaming,
+  NormalizedRegistryItem,
+  IRegistry,
+  getRegistryForRoots,
+  existsInRegistry,
+} from './utils/registry-api';
 import { ProjectProviders, collectProjectProviders, AddonMeta, DependencyMeta } from './utils/addon-api';
 import {
   findTestsForProject,
@@ -95,11 +103,15 @@ export class Project extends BaseProject {
       }
     } else {
       if (normalizedItem) {
+        if (!existsInRegistry(normalizedItem.name, normalizedItem.type, filePath)) {
+          this.registryVersion++;
+        }
+
+        // we still call it, because for template case, we have to update it's tokens
         addToRegistry(normalizedItem.name, normalizedItem.type, [filePath]);
       }
 
       if (!this.files.has(filePath)) {
-        this.registryVersion++;
         this.files.set(filePath, { version: 0 });
       }
 

diff --git a/src/utils/registry-api.ts b/src/utils/registry-api.ts
@@ -155,6 +155,20 @@ export function getRegistryForRoot(rawRoot: string): IRegistry {
   return _getRegistryForRoots([rawRoot]);
 }
 
+export function existsInRegistry(name: string, kind: REGISTRY_KIND, file: string) {
+  const regItem = GLOBAL_REGISTRY[kind];
+
+  if (!regItem) {
+    return false;
+  }
+
+  if (!regItem.has(name)) {
+    return false;
+  }
+
+  return regItem.get(name)?.has(path.resolve(file));
+}
+
 export function addToRegistry(normalizedName: string, kind: REGISTRY_KIND, files: string[]) {
   if (!(kind in GLOBAL_REGISTRY)) {
     return;