druxt 0.25.0-dev.20260927110413 → 0.25.0-dev.20260927224155

package/dist/druxt.esm.js

@@ -400,7 +400,7 @@ class DruxtClient {
 }
 
 var name = "druxt";
-var version = "0.25.0-dev.20260927110413";
+var version = "0.25.0-dev.20260927224155";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -459,7 +459,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@storybook/addon-docs": "^6.5.16",
-	"druxt-test-utils": "1.0.0-dev.20260927110413"
+	"druxt-test-utils": "1.0.0-dev.20260927224155"
 };
 var peerDependencies = {
 	axios: "0.28.0",
@@ -636,16 +636,45 @@ const dehydrateResources = ({ commit, queryObject, resources, prefix }) => {
     return { id: data.id, type: data.type };
   });
 };
+const collectionHash = (query) => {
+  if (!query)
+    return "_default";
+  const queryObject = getDrupalJsonApiParams(query).getQueryObject();
+  return md5(JSON.stringify({ ...queryObject, fields: {}, include: [] }));
+};
+const flush = (tree, key, keys, leaf) => {
+  const byKey = tree[key];
+  if (!byKey)
+    return;
+  if (!keys.length && leaf === void 0)
+    return Vue.delete(tree, key);
+  for (const k of keys.length ? keys : Object.keys(byKey)) {
+    if (!byKey[k])
+      continue;
+    if (leaf !== void 0)
+      Vue.delete(byKey[k], leaf);
+    else
+      Vue.delete(byKey, k);
+  }
+};
 const DruxtStore = ({ store }) => {
   if (typeof store === "undefined") {
     throw new TypeError("Vuex store not found.");
   }
   const namespace = "druxt";
   const inFlight = new Map();
+  const generation = { value: 0 };
+  const flushInFlight = () => {
+    inFlight.clear();
+    generation.value += 1;
+  };
   const share = (key, request) => {
     if (!inFlight.has(key)) {
-      const clear = () => inFlight.delete(key);
       const promise = request();
+      const clear = () => {
+        if (inFlight.get(key) === promise)
+          inFlight.delete(key);
+      };
       inFlight.set(key, promise);
       promise.then(clear, clear);
     }
@@ -700,31 +729,23 @@ const DruxtStore = ({ store }) => {
         resource = merge(state.resources[type][id][prefix] || {}, resource, { arrayMerge: (dst, src) => src });
         Vue.set(state.resources[type][id], prefix, resource);
       },
-      flushCollection(state, { type, hash, prefix }) {
+      flushCollection(state, { type, hash, query, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue.set(state, "collections", {});
-        else if (type && !hash && !prefix)
-          Vue.set(state.collections, type, {});
-        else if (type && hash && !prefix)
-          Vue.set(state.collections[type], hash, {});
-        else if (type && hash && prefix)
-          Vue.set(state.collections[type][hash], prefix, {});
+          return Vue.set(state, "collections", {});
+        const key = hash !== void 0 ? hash : query !== void 0 ? collectionHash(query) : void 0;
+        flush(state.collections, type, key !== void 0 ? [key] : [], prefix);
       },
-      flushResource(state, { type, id, prefix }) {
+      flushResource(state, { type, id, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue.set(state, "resources", {});
-        else if (type && !id && !prefix)
-          Vue.set(state.resources, type, {});
-        else if (type && id && !prefix)
-          Vue.set(state.resources[type], id, {});
-        else if (type && id && prefix)
-          Vue.set(state.resources[type][id], prefix, {});
+          return Vue.set(state, "resources", {});
+        flush(state.resources, type, id !== void 0 ? [id] : [], prefix);
       }
     },
     actions: {
       async getCollection({ commit, state }, { type, query, prefix, bypassCache = false }) {
-        const queryObject = getDrupalJsonApiParams(query).getQueryObject();
-        const hash = query ? md5(JSON.stringify({ ...queryObject, fields: {}, include: [] })) : "_default";
+        const hash = collectionHash(query);
         if (!bypassCache && ((state.collections[type] || {})[hash] || {})[prefix]) {
           const cached = state.collections[type][hash][prefix];
           const hydrate = (o) => (((state.resources[o.type] || {})[o.id] || {})[prefix] || {}).data;
@@ -738,10 +759,12 @@ const DruxtStore = ({ store }) => {
             };
           }
         }
-        const key = JSON.stringify(["collection", prefix, type, hash, queryObject]);
+        const key = JSON.stringify(["collection", prefix, type, hash, getDrupalJsonApiParams(query).getQueryObject()]);
         return share(key, async () => {
+          const since = generation.value;
           const collection = await this.$druxt.getCollection(type, query, prefix);
-          commit("addCollection", { collection: { ...collection }, type, hash, prefix });
+          if (since === generation.value)
+            commit("addCollection", { collection: { ...collection }, type, hash, prefix });
           return collection;
         });
       },
@@ -755,7 +778,7 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = Array.from(new Set([...fields2, ...includes])).filter((s) => s).join(",");
         }
         let included = [];
-        if (queryObject.include && storedResource) {
+        if (queryObject.include && storedResource && !bypassCache) {
           const resources = await Promise.all(queryObject.include.split(",").filter((s) => Object.keys(storedResource.data.relationships || {}).includes(s)).map((key) => {
             let { data } = storedResource.data.relationships[key];
             data = Array.isArray(data) ? data : [data];
@@ -779,7 +802,7 @@ const DruxtStore = ({ store }) => {
         }
         const isFull = typeof (queryObject.fields || {})[type] !== "string";
         let fields = isFull ? true : (queryObject.fields || {})[type];
-        if (storedResource && !isFull && fields) {
+        if (storedResource && !isFull && fields && !bypassCache) {
           const queryFields = fields.split(",");
           const resourceFields = [
             ...Object.keys(((storedResource || {}).data || {}).attributes || {}),
@@ -790,18 +813,22 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = (missingFields || []).join(",") || void 0;
         }
         let resource;
+        const since = generation.value;
         if (bypassCache || !storedResource || fields) {
           try {
             const key = JSON.stringify(["resource", prefix, type, id, queryObject]);
             resource = await share(key, async () => {
+              const started = generation.value;
               const response = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-              commit("addResource", { prefix, resource: { ...response } });
+              if (started === generation.value)
+                commit("addResource", { prefix, resource: { ...response } });
               return response;
             });
           } catch (e) {
           }
         }
-        const result = { ...((state.resources[type] || {})[id] || {})[prefix] };
+        const stored = ((state.resources[type] || {})[id] || {})[prefix];
+        const result = { ...since === generation.value && stored ? stored : resource || stored };
         if (queryObject.include && ((resource || {}).included || (storedResource || {}).included)) {
           included = [
             ...(resource || {}).included || [],

package/dist/druxt.ssr.js

@@ -413,7 +413,7 @@ class DruxtClient {
 }
 
 var name = "druxt";
-var version = "0.25.0-dev.20260927110413";
+var version = "0.25.0-dev.20260927224155";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -472,7 +472,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@storybook/addon-docs": "^6.5.16",
-	"druxt-test-utils": "1.0.0-dev.20260927110413"
+	"druxt-test-utils": "1.0.0-dev.20260927224155"
 };
 var peerDependencies = {
 	axios: "0.28.0",
@@ -649,16 +649,45 @@ const dehydrateResources = ({ commit, queryObject, resources, prefix }) => {
     return { id: data.id, type: data.type };
   });
 };
+const collectionHash = (query) => {
+  if (!query)
+    return "_default";
+  const queryObject = getDrupalJsonApiParams(query).getQueryObject();
+  return md5__default["default"](JSON.stringify({ ...queryObject, fields: {}, include: [] }));
+};
+const flush = (tree, key, keys, leaf) => {
+  const byKey = tree[key];
+  if (!byKey)
+    return;
+  if (!keys.length && leaf === void 0)
+    return Vue__default["default"].delete(tree, key);
+  for (const k of keys.length ? keys : Object.keys(byKey)) {
+    if (!byKey[k])
+      continue;
+    if (leaf !== void 0)
+      Vue__default["default"].delete(byKey[k], leaf);
+    else
+      Vue__default["default"].delete(byKey, k);
+  }
+};
 const DruxtStore = ({ store }) => {
   if (typeof store === "undefined") {
     throw new TypeError("Vuex store not found.");
   }
   const namespace = "druxt";
   const inFlight = new Map();
+  const generation = { value: 0 };
+  const flushInFlight = () => {
+    inFlight.clear();
+    generation.value += 1;
+  };
   const share = (key, request) => {
     if (!inFlight.has(key)) {
-      const clear = () => inFlight.delete(key);
       const promise = request();
+      const clear = () => {
+        if (inFlight.get(key) === promise)
+          inFlight.delete(key);
+      };
       inFlight.set(key, promise);
       promise.then(clear, clear);
     }
@@ -713,31 +742,23 @@ const DruxtStore = ({ store }) => {
         resource = merge__default["default"](state.resources[type][id][prefix] || {}, resource, { arrayMerge: (dst, src) => src });
         Vue__default["default"].set(state.resources[type][id], prefix, resource);
       },
-      flushCollection(state, { type, hash, prefix }) {
+      flushCollection(state, { type, hash, query, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue__default["default"].set(state, "collections", {});
-        else if (type && !hash && !prefix)
-          Vue__default["default"].set(state.collections, type, {});
-        else if (type && hash && !prefix)
-          Vue__default["default"].set(state.collections[type], hash, {});
-        else if (type && hash && prefix)
-          Vue__default["default"].set(state.collections[type][hash], prefix, {});
+          return Vue__default["default"].set(state, "collections", {});
+        const key = hash !== void 0 ? hash : query !== void 0 ? collectionHash(query) : void 0;
+        flush(state.collections, type, key !== void 0 ? [key] : [], prefix);
       },
-      flushResource(state, { type, id, prefix }) {
+      flushResource(state, { type, id, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue__default["default"].set(state, "resources", {});
-        else if (type && !id && !prefix)
-          Vue__default["default"].set(state.resources, type, {});
-        else if (type && id && !prefix)
-          Vue__default["default"].set(state.resources[type], id, {});
-        else if (type && id && prefix)
-          Vue__default["default"].set(state.resources[type][id], prefix, {});
+          return Vue__default["default"].set(state, "resources", {});
+        flush(state.resources, type, id !== void 0 ? [id] : [], prefix);
       }
     },
     actions: {
       async getCollection({ commit, state }, { type, query, prefix, bypassCache = false }) {
-        const queryObject = getDrupalJsonApiParams(query).getQueryObject();
-        const hash = query ? md5__default["default"](JSON.stringify({ ...queryObject, fields: {}, include: [] })) : "_default";
+        const hash = collectionHash(query);
         if (!bypassCache && ((state.collections[type] || {})[hash] || {})[prefix]) {
           const cached = state.collections[type][hash][prefix];
           const hydrate = (o) => (((state.resources[o.type] || {})[o.id] || {})[prefix] || {}).data;
@@ -751,10 +772,12 @@ const DruxtStore = ({ store }) => {
             };
           }
         }
-        const key = JSON.stringify(["collection", prefix, type, hash, queryObject]);
+        const key = JSON.stringify(["collection", prefix, type, hash, getDrupalJsonApiParams(query).getQueryObject()]);
         return share(key, async () => {
+          const since = generation.value;
           const collection = await this.$druxt.getCollection(type, query, prefix);
-          commit("addCollection", { collection: { ...collection }, type, hash, prefix });
+          if (since === generation.value)
+            commit("addCollection", { collection: { ...collection }, type, hash, prefix });
           return collection;
         });
       },
@@ -768,7 +791,7 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = Array.from(new Set([...fields2, ...includes])).filter((s) => s).join(",");
         }
         let included = [];
-        if (queryObject.include && storedResource) {
+        if (queryObject.include && storedResource && !bypassCache) {
           const resources = await Promise.all(queryObject.include.split(",").filter((s) => Object.keys(storedResource.data.relationships || {}).includes(s)).map((key) => {
             let { data } = storedResource.data.relationships[key];
             data = Array.isArray(data) ? data : [data];
@@ -792,7 +815,7 @@ const DruxtStore = ({ store }) => {
         }
         const isFull = typeof (queryObject.fields || {})[type] !== "string";
         let fields = isFull ? true : (queryObject.fields || {})[type];
-        if (storedResource && !isFull && fields) {
+        if (storedResource && !isFull && fields && !bypassCache) {
           const queryFields = fields.split(",");
           const resourceFields = [
             ...Object.keys(((storedResource || {}).data || {}).attributes || {}),
@@ -803,18 +826,22 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = (missingFields || []).join(",") || void 0;
         }
         let resource;
+        const since = generation.value;
         if (bypassCache || !storedResource || fields) {
           try {
             const key = JSON.stringify(["resource", prefix, type, id, queryObject]);
             resource = await share(key, async () => {
+              const started = generation.value;
               const response = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-              commit("addResource", { prefix, resource: { ...response } });
+              if (started === generation.value)
+                commit("addResource", { prefix, resource: { ...response } });
               return response;
             });
           } catch (e) {
           }
         }
-        const result = { ...((state.resources[type] || {})[id] || {})[prefix] };
+        const stored = ((state.resources[type] || {})[id] || {})[prefix];
+        const result = { ...since === generation.value && stored ? stored : resource || stored };
         if (queryObject.include && ((resource || {}).included || (storedResource || {}).included)) {
           included = [
             ...(resource || {}).included || [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt",
-  "version": "0.25.0-dev.20260927110413",
+  "version": "0.25.0-dev.20260927224155",
   "description": "The Fully Decoupled Drupal Framework for Nuxt.js.",
   "keywords": [
     "cms",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@storybook/addon-docs": "^6.5.16",
-    "druxt-test-utils": "1.0.0-dev.20260927110413"
+    "druxt-test-utils": "1.0.0-dev.20260927224155"
   },
   "peerDependencies": {
     "axios": "0.28.0",