cacheable-object: don't hit superclass finalized status

Also report errors finalizing properly

2 files changed, 5 insertions, 1 deletions

diff --git a/src/data/cacheable-object.js b/src/data/cacheable-object.js
index 4b354ef7..087f7825 100644
--- a/src/data/cacheable-object.js
+++ b/src/data/cacheable-object.js
@@ -37,7 +37,7 @@ export default class CacheableObject {
   }
 
   static finalizeCacheableObjectPrototype() {
-    if (this[CacheableObject.constructorFinalized]) {
+    if (Object.hasOwn(this, CacheableObject.constructorFinalized)) {
       throw new Error(`Constructor ${this.name} already finalized`);
     }
 
diff --git a/src/data/things/index.js b/src/data/things/index.js
index 309d0803..d0eb5aa7 100644
--- a/src/data/things/index.js
+++ b/src/data/things/index.js
@@ -186,6 +186,10 @@ function finalizeCacheableObjectPrototypes() {
     op(constructor) {
       constructor.finalizeCacheableObjectPrototype();
     },
+
+    showFailedClasses(failedClasses) {
+      logError`Failed to finalize cacheable object prototypes for classes: ${failedClasses.join(', ')}`;
+    },
   });
 }