@carbonenginejs/runtime 0.1.0-alpha.0 → 0.1.0-alpha.2

package/dist/resource/CjsResMan.js

@@ -297,9 +297,9 @@ class CjsResMan {
           }
           const previousMotherLode = this.motherLode;
           this.#InvalidateMotherLodeOwnership(previousMotherLode);
-          previousMotherLode?.Shutdown?.();
+          previousMotherLode?.Shutdown();
           this.motherLode = nextMotherLode;
-          this.motherLode.Startup?.();
+          this.motherLode.Startup();
           this.#BindMotherLodeResources();
           this.#reloadGenerations.clear();
           this.#lastAutoPurgeTime = null;
@@ -692,7 +692,7 @@ class CjsResMan {
     const loaded = this.PumpBackgroundQueue(options.background || {});
     const prepared = this.PumpMainThreadQueue(options.prepare || options);
     const cacheOptions = options.cache === true || options.cache === undefined ? {} : options.cache;
-    const cacheResult = options.cache === false ? null : this.motherLode.TrimCache?.(cacheOptions);
+    const cacheResult = options.cache === false ? null : this.motherLode.TrimCache(cacheOptions);
     const trimmed = Boolean(cacheResult && cacheResult.evicted > 0);
     const purgeOptions = options.purge === true || options.purge === undefined ? {} : options.purge;
     const purgeResult = options.purge === false ? null : this.PumpAutoPurge(purgeOptions);
@@ -1058,7 +1058,7 @@ class CjsResMan {
     }
     if (existing && options.reload !== true) {
       this.#BindResourceLifecycle(cacheKey, existing);
-      this.motherLode.KeepAlive?.(cacheKey);
+      this.motherLode.KeepAlive(cacheKey);
       return existing;
     }
     if (!existing && options.reload === true) {
@@ -1070,7 +1070,7 @@ class CjsResMan {
     const resource = this.CreateResource(Constructor, key, ext, options, existing && options.reload === true ? existing : null, extensionRoute);
     if (existing && options.reload === true) {
       this.#BindResourceLifecycle(cacheKey, existing);
-      this.motherLode.KeepAlive?.(cacheKey);
+      this.motherLode.KeepAlive(cacheKey);
       const expectedOwnership = this.#RequireResourceOwnership(existing, "reload-candidate:create");
       const generation = this.#nextResourceReloadGeneration++;
       const loaderOptions = getResourceLoaderOptions(options, options.source || this.source);
@@ -1086,16 +1086,14 @@ class CjsResMan {
       };
       this.#reloadCandidates.set(resource, candidate);
       this.#reloadGenerations.set(cacheKey, generation);
-      if (typeof resource.SetObjectLoader === "function") {
-        const reloadOptions = {
-          ...loaderOptions,
-          reload: true
-        };
-        resource.SetObjectLoader(loadOptions => this.#GetReloadCandidateObject(resource, {
-          ...mergeResourceLoaderOptions(reloadOptions, loadOptions),
-          reload: true
-        }), reloadOptions);
-      }
+      const reloadOptions = {
+        ...loaderOptions,
+        reload: true
+      };
+      resource.SetObjectLoader(loadOptions => this.#GetReloadCandidateObject(resource, {
+        ...mergeResourceLoaderOptions(reloadOptions, loadOptions),
+        reload: true
+      }), reloadOptions);
       return resource;
     }
     const insertion = this.motherLode.Insert(cacheKey, resource, {
@@ -1108,7 +1106,7 @@ class CjsResMan {
       this.#InvalidateResourceOwnership(existing);
     }
     this.#BindResourceLifecycle(cacheKey, canonical);
-    this.motherLode.KeepAlive?.(cacheKey);
+    this.motherLode.KeepAlive(cacheKey);
     return canonical;
   }
 
@@ -1355,9 +1353,7 @@ class CjsResMan {
     this.#reloadCandidates.delete(candidate.resource);
     const errors = [];
     try {
-      if (typeof candidate.resource.SetObjectLoader === "function") {
-        candidate.resource.SetObjectLoader(loadOptions => this.GetObject(candidate.resource.GetPath(), mergeResourceLoaderOptions(candidate.loaderOptions, loadOptions)), candidate.loaderOptions);
-      }
+      candidate.resource.SetObjectLoader(loadOptions => this.GetObject(candidate.resource.GetPath(), mergeResourceLoaderOptions(candidate.loaderOptions, loadOptions)), candidate.loaderOptions);
     } catch (error) {
       errors.push(error);
     }
@@ -1367,7 +1363,7 @@ class CjsResMan {
       errors.push(error);
     }
     try {
-      candidate.owner.KeepAlive?.(candidate.key);
+      candidate.owner.KeepAlive(candidate.key);
     } catch (error) {
       errors.push(error);
     }
@@ -1951,7 +1947,7 @@ class CjsResMan {
     const resource = this.motherLode.Lookup(key);
     if (resource) {
       this.#BindResourceLifecycle(key, resource);
-      this.motherLode.KeepAlive?.(key);
+      this.motherLode.KeepAlive(key);
     }
     return resource;
   }
@@ -2393,10 +2389,8 @@ class CjsResMan {
       this.#resourceHandlerModes.set(resource, handlerMode);
     }
     resource.Initialize(path, ext, normalizeRequirement(options.requirement || options.payload || ""));
-    if (typeof resource.SetObjectLoader === "function") {
-      const loaderOptions = getResourceLoaderOptions(options, options.source || this.source);
-      resource.SetObjectLoader(loadOptions => this.GetObject(path, mergeResourceLoaderOptions(loaderOptions, loadOptions)), loaderOptions);
-    }
+    const loaderOptions = getResourceLoaderOptions(options, options.source || this.source);
+    resource.SetObjectLoader(loadOptions => this.GetObject(path, mergeResourceLoaderOptions(loaderOptions, loadOptions)), loaderOptions);
     return resource;
   }
 
@@ -2753,23 +2747,23 @@ class CjsResMan {
 
     // Bound outside the lifecycle controller, which is detached when canonical
     // ownership ends - which is precisely when a handle needs to come back.
-    resource?.SetReloadHook?.(() => this.#ReloadPurgedResource(key, resource));
-    if (typeof resource?.SetLifecycleController !== "function") return resource;
+    if (!resource) return resource;
+    resource.SetReloadHook(() => this.#ReloadPurgedResource(key, resource));
+
+    // No hedging on the owner's methods: `owner` is a CjsMotherLode and
+    // `resource` a CjsResource, both of which declare every method called here
+    // on their base. The former `KeepPayloadAlive`-or-`KeepAlive` fallback was
+    // therefore unreachable, and it silently downgraded a payload keep-alive to
+    // a handle keep-alive for anything that ever did reach it.
     resource.SetLifecycleController({
       isCurrent: () => this.#IsResourceOwnershipCurrent(ownership),
-      keepAlive: options => this.#IsResourceOwnershipCurrent(ownership) ? owner.KeepAlive?.(key, options) : null,
-      keepPayloadAlive: options => {
-        if (!this.#IsResourceOwnershipCurrent(ownership)) return null;
-        if (typeof owner.KeepPayloadAlive === "function") {
-          return owner.KeepPayloadAlive(key, options);
-        }
-        return owner.KeepAlive?.(key, options);
-      },
-      lock: () => this.#IsResourceOwnershipCurrent(ownership) ? owner.Lock?.(key) || 0 : 0,
-      unlock: () => this.#IsResourceOwnershipCurrent(ownership) ? owner.Unlock?.(key) || 0 : 0
+      keepAlive: options => this.#IsResourceOwnershipCurrent(ownership) ? owner.KeepAlive(key, options) : null,
+      keepPayloadAlive: options => this.#IsResourceOwnershipCurrent(ownership) ? owner.KeepPayloadAlive(key, options) : null,
+      lock: () => this.#IsResourceOwnershipCurrent(ownership) ? owner.Lock(key) || 0 : 0,
+      unlock: () => this.#IsResourceOwnershipCurrent(ownership) ? owner.Unlock(key) || 0 : 0
     });
-    if (resource.HasPayload?.() && this.#IsResourceOwnershipCurrent(ownership)) {
-      owner.KeepPayloadAlive?.(key);
+    if (resource.HasPayload() && this.#IsResourceOwnershipCurrent(ownership)) {
+      owner.KeepPayloadAlive(key);
     }
     return resource;
   }