druxt 0.21.1 → 0.23.0

package/dist/components/DruxtWrapper.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <slot />
+    <slot v-bind="{ ...$parent.$attrs }" />
   </div>
 </template>
 

package/dist/druxt.esm.js

@@ -250,7 +250,7 @@ class DruxtClient {
 }
 
 var name = "druxt";
-var version = "0.21.1";
+var version = "0.22.0";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -292,26 +292,26 @@ var files = [
 var dependencies = {
 	"@nuxtjs/axios": "^5.13.6",
 	"@nuxtjs/proxy": "^2.1.0",
-	"@vue/devtools-api": "^6.4.5",
+	"@vue/devtools-api": "^6.5.0",
 	chalk: "^4.1.2",
-	deepmerge: "^4.2.2",
-	"drupal-jsonapi-params": "^2.1.0",
-	"express-rate-limit": "^6.6.0",
+	deepmerge: "^4.3.1",
+	"drupal-jsonapi-params": "^2.2.0",
+	"express-rate-limit": "^6.7.0",
 	"launch-editor": "^2.6.0",
 	md5: "^2.3.0",
 	querystring: "^0.2.1",
 	scule: "^0.3.2"
 };
 var devDependencies = {
-	"@storybook/addon-docs": "^6.5.10"
+	"@storybook/addon-docs": "^6.5.16"
 };
 var peerDependencies = {
 	axios: "*",
 	consola: "*"
 };
 var optionalDependencies = {
-	"core-js": "^3.25.1",
-	vue: "^2.7.10",
+	"core-js": "^3.31.0",
+	vue: "^2.7.14",
 	vuex: "^3.6.2"
 };
 var publishConfig = {
@@ -521,13 +521,33 @@ 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 }) {
+        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, {});
+      },
+      flushResource(state, { type, id, prefix }) {
+        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, {});
       }
     },
     actions: {
-      async getCollection({ commit, state }, { type, query, prefix }) {
+      async getCollection({ commit, state }, { type, query, prefix, bypassCache = false }) {
         const queryObject = getDrupalJsonApiParams(query).getQueryObject();
         const hash = query ? md5(JSON.stringify({ ...queryObject, fields: {}, include: [] })) : "_default";
-        if (((state.collections[type] || {})[hash] || {})[prefix]) {
+        if (!bypassCache && ((state.collections[type] || {})[hash] || {})[prefix]) {
           return {
             ...state.collections[type][hash][prefix],
             data: state.collections[type][hash][prefix].data.map((o) => ((state.resources[o.type][o.id] || {})[prefix] || {}).data)
@@ -537,7 +557,7 @@ const DruxtStore = ({ store }) => {
         commit("addCollection", { collection: { ...collection }, type, hash, prefix });
         return collection;
       },
-      async getResource({ commit, dispatch, state }, { type, id, query, prefix }) {
+      async getResource({ commit, dispatch, state }, { type, id, query, prefix, bypassCache = false }) {
         const storedResource = ((state.resources[type] || {})[id] || {})[prefix] ? { ...state.resources[type][id][prefix] } : null;
         const queryObject = getDrupalJsonApiParams(query).getQueryObject();
         queryObject.include = Array.isArray(queryObject.include) ? queryObject.include.join(",") : queryObject.include;
@@ -566,7 +586,7 @@ const DruxtStore = ({ store }) => {
           }
           storedResource.included = included;
         }
-        if ((storedResource || {})._druxt_full) {
+        if (!bypassCache && (storedResource || {})._druxt_full) {
           return storedResource;
         }
         const isFull = typeof (queryObject.fields || {})[type] !== "string";
@@ -582,9 +602,12 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = (missingFields || []).join(",") || void 0;
         }
         let resource;
-        if (!storedResource || fields) {
-          resource = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-          commit("addResource", { prefix, resource: { ...resource } });
+        if (bypassCache || !storedResource || fields) {
+          try {
+            resource = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
+            commit("addResource", { prefix, resource: { ...resource } });
+          } catch (e) {
+          }
         }
         const result = { ...((state.resources[type] || {})[id] || {})[prefix] };
         if (queryObject.include && ((resource || {}).included || (storedResource || {}).included)) {

package/dist/druxt.ssr.js

@@ -263,7 +263,7 @@ class DruxtClient {
 }
 
 var name = "druxt";
-var version = "0.21.1";
+var version = "0.22.0";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -305,26 +305,26 @@ var files = [
 var dependencies = {
 	"@nuxtjs/axios": "^5.13.6",
 	"@nuxtjs/proxy": "^2.1.0",
-	"@vue/devtools-api": "^6.4.5",
+	"@vue/devtools-api": "^6.5.0",
 	chalk: "^4.1.2",
-	deepmerge: "^4.2.2",
-	"drupal-jsonapi-params": "^2.1.0",
-	"express-rate-limit": "^6.6.0",
+	deepmerge: "^4.3.1",
+	"drupal-jsonapi-params": "^2.2.0",
+	"express-rate-limit": "^6.7.0",
 	"launch-editor": "^2.6.0",
 	md5: "^2.3.0",
 	querystring: "^0.2.1",
 	scule: "^0.3.2"
 };
 var devDependencies = {
-	"@storybook/addon-docs": "^6.5.10"
+	"@storybook/addon-docs": "^6.5.16"
 };
 var peerDependencies = {
 	axios: "*",
 	consola: "*"
 };
 var optionalDependencies = {
-	"core-js": "^3.25.1",
-	vue: "^2.7.10",
+	"core-js": "^3.31.0",
+	vue: "^2.7.14",
 	vuex: "^3.6.2"
 };
 var publishConfig = {
@@ -534,13 +534,33 @@ 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 }) {
+        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, {});
+      },
+      flushResource(state, { type, id, prefix }) {
+        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, {});
       }
     },
     actions: {
-      async getCollection({ commit, state }, { type, query, prefix }) {
+      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";
-        if (((state.collections[type] || {})[hash] || {})[prefix]) {
+        if (!bypassCache && ((state.collections[type] || {})[hash] || {})[prefix]) {
           return {
             ...state.collections[type][hash][prefix],
             data: state.collections[type][hash][prefix].data.map((o) => ((state.resources[o.type][o.id] || {})[prefix] || {}).data)
@@ -550,7 +570,7 @@ const DruxtStore = ({ store }) => {
         commit("addCollection", { collection: { ...collection }, type, hash, prefix });
         return collection;
       },
-      async getResource({ commit, dispatch, state }, { type, id, query, prefix }) {
+      async getResource({ commit, dispatch, state }, { type, id, query, prefix, bypassCache = false }) {
         const storedResource = ((state.resources[type] || {})[id] || {})[prefix] ? { ...state.resources[type][id][prefix] } : null;
         const queryObject = getDrupalJsonApiParams(query).getQueryObject();
         queryObject.include = Array.isArray(queryObject.include) ? queryObject.include.join(",") : queryObject.include;
@@ -579,7 +599,7 @@ const DruxtStore = ({ store }) => {
           }
           storedResource.included = included;
         }
-        if ((storedResource || {})._druxt_full) {
+        if (!bypassCache && (storedResource || {})._druxt_full) {
           return storedResource;
         }
         const isFull = typeof (queryObject.fields || {})[type] !== "string";
@@ -595,9 +615,12 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = (missingFields || []).join(",") || void 0;
         }
         let resource;
-        if (!storedResource || fields) {
-          resource = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-          commit("addResource", { prefix, resource: { ...resource } });
+        if (bypassCache || !storedResource || fields) {
+          try {
+            resource = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
+            commit("addResource", { prefix, resource: { ...resource } });
+          } catch (e) {
+          }
         }
         const result = { ...((state.resources[type] || {})[id] || {})[prefix] };
         if (queryObject.include && ((resource || {}).included || (storedResource || {}).included)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt",
-  "version": "0.21.1",
+  "version": "0.23.0",
   "description": "The Fully Decoupled Drupal Framework for Nuxt.js.",
   "keywords": [
     "cms",
@@ -42,26 +42,26 @@
   "dependencies": {
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/proxy": "^2.1.0",
-    "@vue/devtools-api": "^6.4.5",
+    "@vue/devtools-api": "^6.5.0",
     "chalk": "^4.1.2",
-    "deepmerge": "^4.2.2",
-    "drupal-jsonapi-params": "^2.1.0",
-    "express-rate-limit": "^6.6.0",
+    "deepmerge": "^4.3.1",
+    "drupal-jsonapi-params": "^2.2.0",
+    "express-rate-limit": "^6.7.0",
     "launch-editor": "^2.6.0",
     "md5": "^2.3.0",
     "querystring": "^0.2.1",
     "scule": "^0.3.2"
   },
   "devDependencies": {
-    "@storybook/addon-docs": "^6.5.10"
+    "@storybook/addon-docs": "^6.5.16"
   },
   "peerDependencies": {
     "axios": "*",
     "consola": "*"
   },
   "optionalDependencies": {
-    "core-js": "^3.25.1",
-    "vue": "^2.7.10",
+    "core-js": "^3.31.0",
+    "vue": "^2.7.14",
     "vuex": "^3.6.2"
   },
   "publishConfig": {