yaml, find-reverse: don't double-count inherited specs

2 files changed, 14 insertions, 0 deletions

diff --git a/src/data/yaml.js b/src/data/yaml.js
index ee65eb7f..69069d66 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -695,10 +695,17 @@ export function getAllDataSteps() {
 
   const steps = [];
 
+  const seenLoadingFns = new Set();
+
   for (const thingConstructor of Object.values(thingConstructors)) {
     const getSpecFn = thingConstructor[Thing.getYamlLoadingSpec];
     if (!getSpecFn) continue;
 
+    // Subclasses can expose literally the same static properties
+    // by inheritence. We don't want to double-count those!
+    if (seenLoadingFns.has(getSpecFn)) continue;
+    seenLoadingFns.add(getSpecFn);
+
     steps.push(getSpecFn({
       documentModes,
       thingConstructors,
diff --git a/src/find-reverse.js b/src/find-reverse.js
index f31d3c45..6a67ac0f 100644
--- a/src/find-reverse.js
+++ b/src/find-reverse.js
@@ -17,10 +17,17 @@ export function getAllSpecs({
 
   const specs = {...hardcodedSpecs};
 
+  const seenSpecs = new Set();
+
   for (const thingConstructor of Object.values(thingConstructors)) {
     const thingSpecs = thingConstructor[constructorKey];
     if (!thingSpecs) continue;
 
+    // Subclasses can expose literally the same static properties
+    // by inheritence. We don't want to double-count those!
+    if (seenSpecs.has(thingSpecs)) continue;
+    seenSpecs.add(thingSpecs);
+
     for (const [key, spec] of Object.entries(thingSpecs)) {
       specs[key] =
         postprocessSpec(spec, {