@aethervtt/shard-procgen 0.0.1 → 0.1.0

package/dist/runtime.d.ts

@@ -99,6 +99,8 @@ export declare class ProcgenRuntime {
     /** Imported dependencies' artifacts and hashes, by guid (valid while the version matches). */
     private readonly artifacts;
     private pendingDeps;
+    /** Regenerations under way, by guid: the code hash and dependency versions each started for. */
+    private readonly regenerating;
     constructor(world: World, options?: ProcgenOptions);
     configure(options: ProcgenOptions): this;
     /** The output entry of a request (label '' or a sub-asset like 'LOD1'), registered lazily. */
@@ -130,7 +132,7 @@ export declare class ProcgenRuntime {
     /**
      * Regenerates loaded outputs whose generator's code hash changed (or whose generator was
      * redefined) and those whose dependencies reloaded. They swap in place when ready; returns their
-     * paths.
+     * paths. One already regenerating for the current code and dependencies isn't stale.
      */
     regenerateStale(): string[];
     /** Jobs running now, for procgen.describe. */

package/dist/runtime.js

@@ -14,6 +14,7 @@ import { loadNoiseKernel } from "@aethervtt/shard-noise";
 import { LogResource } from "@aethervtt/shard-runtime";
 import {
   codeHashOf,
+  findGenerator,
   guidOf,
   identityOf,
   proceduralPath,
@@ -190,6 +191,8 @@ class ProcgenRuntime {
   /** Imported dependencies' artifacts and hashes, by guid (valid while the version matches). */
   artifacts = /* @__PURE__ */ new Map();
   pendingDeps = /* @__PURE__ */ new Set();
+  /** Regenerations under way, by guid: the code hash and dependency versions each started for. */
+  regenerating = /* @__PURE__ */ new Map();
   constructor(world, options = {}) {
     this.world = world;
     this.server = assetServer(world);
@@ -456,9 +459,19 @@ class ProcgenRuntime {
   regenerate(guid) {
     const entry = this.server.entry(guid);
     if (entry?.state !== "loaded") return;
-    this.server.updateVirtual(guid, entry.path, entry.type, () => this.produceLogged(guid), {
-      collectable: true
+    const live = this.live.get(guid);
+    let target;
+    const gen = live && findGenerator(live.request.generator);
+    if (live && gen) {
+      const deps = /* @__PURE__ */ new Map();
+      for (const dep of live.deps.keys()) deps.set(dep, this.server.entry(dep)?.version ?? -1);
+      target = { codeHash: codeHashOf(gen), deps };
+      this.regenerating.set(guid, target);
+    }
+    const produce = () => this.produceLogged(guid).finally(() => {
+      if (this.regenerating.get(guid) === target) this.regenerating.delete(guid);
     });
+    this.server.updateVirtual(guid, entry.path, entry.type, produce, { collectable: true });
   }
   regenerateForDeps() {
     const changed = this.pendingDeps;
@@ -471,20 +484,18 @@ class ProcgenRuntime {
   /**
    * Regenerates loaded outputs whose generator's code hash changed (or whose generator was
    * redefined) and those whose dependencies reloaded. They swap in place when ready; returns their
-   * paths.
+   * paths. One already regenerating for the current code and dependencies isn't stale.
    */
   regenerateStale() {
     const out = [];
     for (const [guid, live] of this.live) {
       const entry = this.server.entry(guid);
       if (entry?.state !== "loaded") continue;
-      let stale;
-      try {
-        stale = codeHashOf(requireGenerator(live.request.generator)) !== live.codeHash;
-      } catch {
-        continue;
-      }
-      for (const [dep, version] of live.deps) {
+      const gen = findGenerator(live.request.generator);
+      if (!gen) continue;
+      const made = this.regenerating.get(guid) ?? live;
+      let stale = codeHashOf(gen) !== made.codeHash;
+      for (const [dep, version] of made.deps) {
         if (this.server.entry(dep)?.version !== version) stale = true;
       }
       if (!stale) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aethervtt/shard-procgen",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -20,16 +20,16 @@
     "README.md"
   ],
   "dependencies": {
-    "@aethervtt/shard-assets": "0.0.1",
-    "@aethervtt/shard-core": "0.0.1",
-    "@aethervtt/shard-mesh": "0.0.1",
-    "@aethervtt/shard-noise": "0.0.1",
-    "@aethervtt/shard-platform": "0.0.1",
-    "@aethervtt/shard-protocol": "0.0.1",
-    "@aethervtt/shard-render": "0.0.1",
-    "@aethervtt/shard-runtime": "0.0.1",
-    "@aethervtt/shard-scene": "0.0.1",
-    "@aethervtt/shard-texture": "0.0.1"
+    "@aethervtt/shard-assets": "0.1.0",
+    "@aethervtt/shard-core": "0.1.0",
+    "@aethervtt/shard-mesh": "0.1.0",
+    "@aethervtt/shard-noise": "0.1.0",
+    "@aethervtt/shard-platform": "0.1.0",
+    "@aethervtt/shard-protocol": "0.1.0",
+    "@aethervtt/shard-render": "0.1.0",
+    "@aethervtt/shard-runtime": "0.1.0",
+    "@aethervtt/shard-scene": "0.1.0",
+    "@aethervtt/shard-texture": "0.1.0"
   },
   "repository": {
     "type": "git",
@@ -41,6 +41,6 @@
     "provenance": true
   },
   "shard": {
-    "buildSha": "d6c5c6aef4675575c878b02cf2c8f738b4190229"
+    "buildSha": "8e14c9896f82a3554b156f1ffdd68f2cc3e7d78a"
   }
 }