Merge branch 'release/0.4.1'

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## 0.4.1 (2020-04-13)
+
+### Bug Fixes
+
+* Changes to fix issues with Asset-related errors raised on [#11](https://github.com/CMeeg/gridsome-source-kentico-kontent/issues/11) and [#12](https://github.com/CMeeg/gridsome-source-kentico-kontent/issues/12)
+  * Do not add url field resolver if Assets collection is empty ([9900350](https://github.com/CMeeg/gridsome-source-kentico-kontent/commit/9900350))
+  * Resolver for Asset.url must have a "type" property ([4e322c9](https://github.com/CMeeg/gridsome-source-kentico-kontent/commit/4e322c9))
+
 ## 0.4.0 (2019-11-17)
 
 ### ⚠ BREAKING CHANGES

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meeg/gridsome-source-kentico-kontent",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Kentico Kontent data source plugin for Gridsome.",
   "author": "Chris Meagher",
   "license": "MIT",

src/KenticoKontentSource.js

@@ -275,20 +275,37 @@ class KenticoKontentSource {
   }
 
   addSchemaResolvers(store) {
+    this.addAssetSchemaResolvers(store);
+  }
+
+  addAssetSchemaResolvers(store) {
+    const typeName = this.contentItemFactory.getAssetTypeName();
+
+    const assetCollection = this.getCollection(store, typeName);
+
+    if (assetCollection.collection.data.length === 0) {
+      // There are no assets so no need for resolvers
+
+      return;
+    }
+
+    // Get and add asset resolvers
+
     const { addSchemaResolvers } = store;
+    const assetResolvers = this.getAssetSchemaResolvers(typeName);
 
-    addSchemaResolvers(this.getAssetSchemaResolvers());
+    addSchemaResolvers(assetResolvers);
   }
 
-  getAssetSchemaResolvers() {
+  getAssetSchemaResolvers(typeName) {
     // TODO: This doesn't feel like the right place to do this
 
-    const typeName = this.contentItemFactory.getAssetTypeName();
-
     const resolvers = {};
 
     resolvers[typeName] = {
       url: {
+        type: 'String',
+        defaultValue: null,
         args: {
           width: {
             type: 'Int',