@luvio/environments 0.154.3 → 0.154.5

package/dist/environments.js

@@ -282,21 +282,27 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
     const durableRecords = create(null);
     const refreshedDurableRecords = create(null);
     const evictedRecords = create(null);
-    const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
+    const { visitedIds, refreshedIds } = store.fallbackStringKeyInMemoryStore;
     // TODO: W-8909393 Once metadata is stored in its own segment we need to
     // call setEntries for the visitedIds on default segment and call setEntries
     // on the metadata segment for the refreshedIds
     const keys$1 = keys({ ...visitedIds, ...refreshedIds });
     for (let i = 0, len = keys$1.length; i < len; i += 1) {
         const key = keys$1[i];
-        const record = records[key];
+        const canonicalKey = store.getCanonicalRecordId(key);
+        // this record has been redirected, evict the original
+        if (canonicalKey !== key) {
+            evictedRecords[key] = true;
+            continue;
+        }
+        const record = store.readEntry(key);
         const wasVisited = visitedIds[key] !== undefined;
         // this record has been evicted, evict from DS
         if (wasVisited && record === undefined) {
             evictedRecords[key] = true;
             continue;
         }
-        const metadata = storeMetadata[key];
+        const metadata = store.readMetadata(key);
         const entries = wasVisited === true || enableDurableMetadataRefresh === false
             ? durableRecords
             : refreshedDurableRecords;
@@ -730,17 +736,17 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
     };
     const getNode = function (key) {
         validateNotDisposed();
-        if (stagingStore === null) {
-            stagingStore = buildIngestStagingStore(environment);
+        if (stagingStore !== null) {
+            return environment.getNode(key, stagingStore);
         }
-        return environment.getNode(key, stagingStore);
+        return environment.getNode(key);
     };
     const wrapNormalizedGraphNode = function (normalized, key) {
         validateNotDisposed();
-        if (stagingStore === null) {
-            stagingStore = buildIngestStagingStore(environment);
+        if (stagingStore !== null) {
+            return environment.wrapNormalizedGraphNode(normalized, key, stagingStore);
         }
-        return environment.wrapNormalizedGraphNode(normalized, key, stagingStore);
+        return environment.wrapNormalizedGraphNode(normalized, key);
     };
     const rebuildSnapshot = function (snapshot, onRebuild) {
         validateNotDisposed();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.154.3",
+    "version": "0.154.5",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -27,7 +27,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "^0.154.3"
+        "@luvio/engine": "^0.154.5"
     },
     "volta": {
         "extends": "../../../package.json"