@nascentdigital/funnel-cms 6.1.2 → 6.1.3

package/dist/contentful/ContentfulAssetClient.d.ts

@@ -3,9 +3,9 @@ import { IContentfulContentClient } from './IContentfulContentClient';
 export declare class ContentfulAssetClient implements AssetClient {
     readonly cms: IContentfulContentClient;
     constructor(cms: IContentfulContentClient);
-    getAssets(args: AssetClient.GetAssets.Args): Promise<AssetClient.GetAssets.Result>;
-    getAsset(args: AssetClient.GetAsset.Args): Promise<AssetClient.GetAsset.Result>;
+    getAssets({ pagination, ...query }: AssetClient.GetAssets.Args): Promise<AssetClient.GetAssets.Result>;
+    getAsset(assetId: AssetClient.GetAsset.Args): Promise<AssetClient.GetAsset.Result>;
     createAsset(args: AssetClient.CreateAsset.Args): Promise<AssetClient.CreateAsset.Result>;
-    updateAsset(args: AssetClient.UpdateAsset.Args): Promise<AssetClient.UpdateAsset.Result>;
+    updateAsset({ id, ...updates }: AssetClient.UpdateAsset.Args): Promise<AssetClient.UpdateAsset.Result>;
     deleteAsset(args: AssetClient.DeleteAsset.Args): Promise<AssetClient.DeleteAsset.Result>;
 }

package/dist/contentful/ContentfulAssetClient.js

@@ -1,26 +1,88 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentfulAssetClient = void 0;
 const funnel_core_1 = require("@nascentdigital/funnel-core");
+const models_1 = require("./models");
 // class
 class ContentfulAssetClient {
     constructor(cms) {
         this.cms = cms;
     }
-    getAssets(args) {
-        throw new funnel_core_1.NotImplementedError();
+    async getAssets(_a) {
+        var { pagination } = _a, query = __rest(_a, ["pagination"]);
+        // fetch items
+        const { entries, page, pageCount, totalItemCount } = await this.cms.getEntries(Object.assign({ content_type: models_1.ContentfulAssetData.contentType, pagination }, getAssetQueryParams(query)));
+        // return entries
+        return {
+            items: entries.map(entry => models_1.ContentfulAssetData.deserialize(entry)),
+            page, pageCount, totalItemCount
+        };
     }
-    getAsset(args) {
-        throw new funnel_core_1.NotImplementedError();
+    async getAsset(assetId) {
+        // try to fetch entry
+        const { entry } = await this.cms.getEntry({
+            content_type: models_1.ContentfulAssetData.contentType,
+            entryId: assetId
+        });
+        // return undefined if no entry
+        if (!entry) {
+            return undefined;
+        }
+        // return
+        return models_1.ContentfulAssetData.deserialize(entry);
     }
     createAsset(args) {
         throw new funnel_core_1.NotImplementedError();
     }
-    updateAsset(args) {
-        throw new funnel_core_1.NotImplementedError();
+    async updateAsset(_a) {
+        var { id } = _a, updates = __rest(_a, ["id"]);
+        // fetch latest
+        const entry = await this.cms.getEntryData(id);
+        const update = Object.assign({ id: entry.id, __version: entry.__version }, funnel_core_1.ObjectUtils.dropUndefined(updates));
+        // update entry
+        const updatedEntry = await this.cms.updateEntry(update);
+        // return updated entry
+        return models_1.ContentfulAssetData.deserialize(updatedEntry);
     }
     deleteAsset(args) {
         throw new funnel_core_1.NotImplementedError();
     }
 }
 exports.ContentfulAssetClient = ContentfulAssetClient;
+// helpers
+function getAssetQueryParams(query) {
+    // build filters
+    const { brand, tags = [], scope, fileType } = query;
+    const filters = {};
+    // filter brand
+    if (brand) {
+        filters['fields.brand'] = brand;
+    }
+    // filter tags
+    if (tags.length > 0) {
+        filters['fields.tags[all]'] = tags
+            .filter((tag) => !!tag)
+            .join(',');
+    }
+    // filter scope
+    if (scope) {
+        filters['fields.scope'] = scope;
+    }
+    // filter file type
+    if (fileType) {
+        filters['fields.type'] = fileType;
+    }
+    // return filters
+    return filters;
+}

package/dist/contentful/ContentfulPageClient.d.ts

@@ -8,7 +8,7 @@ export declare class ContentfulPageClient implements PageClient {
     getOverview(args: PageClient.GetOverview.Args): Promise<PageClient.GetOverview.Result>;
     getSummaries(args: PageClient.GetSummaries.Args): Promise<PageClient.GetSummaries.Result>;
     getPreviews(args: PageClient.GetPreviews.Args): Promise<PageClient.GetPreviews.Result>;
-    search(args: PageClient.Search.Args): Promise<PageClient.Search.Result>;
+    search({ version, pagination, ...query }: PageClient.Search.Args): Promise<PageClient.Search.Result>;
     query(args: PageClient.Query.Args): Promise<PageClient.Query.Result>;
     find(args: PageClient.Find.Args): Promise<PageClient.Find.Result>;
     getGroup(args: PageClient.GetGroup.Args): Promise<ContentfulPageClient.GetGroup.Result>;

package/dist/contentful/ContentfulPageClient.js

@@ -72,10 +72,12 @@ class ContentfulPageClient {
     getPreviews(args) {
         throw new funnel_core_1.NotImplementedError();
     }
-    async search(args) {
+    async search(_a) {
+        var { version, pagination } = _a, query = __rest(_a, ["version", "pagination"]);
         // fetch items (bail if there are no instances)
         const { cms } = this;
-        const { entries, page, pageCount, totalItemCount } = await cms.getEntries(Object.assign({ content_type: models_1.ContentfulPageData.contentType, version: args.version, select: getPageSelect(funnel_core_1.Schema.Page.Data.AsLink.props) }, getPageQueryParams(args)));
+        const { entries, page, pageCount, totalItemCount } = await cms.getEntries(Object.assign({ content_type: models_1.ContentfulPageData.contentType, version,
+            pagination, select: getPageSelect(funnel_core_1.Schema.Page.Data.AsLink.props) }, getPageQueryParams(query)));
         // return entries
         return {
             items: entries.map(entry => models_1.ContentfulPageData.deserialize(entry, funnel_core_1.Schema.Page.Data.AsLink.props)),
@@ -388,7 +390,7 @@ exports.ContentfulPageClient = ContentfulPageClient;
 // helpers
 function getPageQueryParams(query) {
     // build filters
-    const { ids = [], groupId, brand, type, slug, region, language, name, tags = [], tagsMatch = 'any', version } = query;
+    const { ids = [], groupId, brand, type, slug, region, language, name, tags = [], tagsMatch = 'any' } = query;
     const filters = {};
     // filter id(s)
     if (ids.length === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-cms",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/cms"
@@ -48,5 +48,5 @@
     "ts-jest": "^29",
     "type-fest": "^4"
   },
-  "gitHead": "d72a93d505884f030d595ecf66c64351ebfc8ed1"
+  "gitHead": "f22371fb54de07cd115522c18e5c2c51ba72aa49"
 }