@nascentdigital/funnel-cms 6.1.5 → 6.1.6

package/dist/api/ContentClient.js

@@ -16,6 +16,7 @@ var ContentClient;
         }
         Factory.get = get;
         function set(factory) {
+            log.d('factor - registered', factory);
             _factory = factory;
         }
         Factory.set = set;
@@ -32,3 +33,4 @@ var ContentClient;
 })(ContentClient || (exports.ContentClient = ContentClient = {}));
 // storage
 let _factory = undefined;
+const log = funnel_core_1.Logger.get('cms');

package/dist/api/PageClient.d.ts

@@ -132,7 +132,7 @@ export declare namespace PageClient {
         };
         type StaticPage = {
             type: Schema.Page.Type;
-            refs: Record<Language, Schema.Page.Data.AsLink>;
+            refs: Schema.Page.Data.AsLink[];
         };
         type DynamicPage = {
             type: Schema.Page.Type;
@@ -179,19 +179,27 @@ export declare namespace PageClient {
         type Result = Schema.Page.Data.AsGroup;
     }
     namespace Duplicate {
-        type CurrentArgs = {
-            source: Schema.Page.Id;
-            targetPage: 'current';
-            targetLanguage: Language;
-            targetSlug?: string;
-        };
-        type NewArgs = {
-            source: Schema.Page.Id;
-            targetPage: 'new';
-            targetLanguage: Language;
-            targetSlug: string;
-        };
-        type Args = CurrentArgs | NewArgs;
+        type Args = Args.Extend | Args.Fork;
+        namespace Args {
+            type Source = {
+                groupId: Schema.Page.GroupId;
+                region: string;
+                language: Language;
+            };
+            type Extend = {
+                operation: 'extend';
+                region: string;
+                language: Language;
+                source: Source;
+            };
+            type Fork = {
+                operation: 'fork';
+                region: string;
+                language: Language;
+                slug: string;
+                source: Source;
+            };
+        }
         type Result = Schema.Page.Data.AsGroup;
     }
     namespace Touch {

package/dist/contentful/ContentfulCollectionClient.d.ts

@@ -41,3 +41,9 @@ export declare namespace ContentfulCollectionClient {
         };
     }
 }
+export type GetCollectionQueryParamsArgs = Omit<CollectionClient.Query.By<any>, 'version' | 'groupId'> & {
+    ids?: Schema.Collection.Id[];
+    groupId?: Schema.Collection.GroupId | ReadonlyArray<Schema.Collection.GroupId>;
+};
+export declare function getCollectionQueryParams(query: GetCollectionQueryParamsArgs): Record<string, any>;
+export declare function getCollectionSelect(props: ReadonlyArray<Schema.Collection.Data.Props.All>): string | undefined;

package/dist/contentful/ContentfulCollectionClient.js

@@ -12,6 +12,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentfulCollectionClient = void 0;
+exports.getCollectionQueryParams = getCollectionQueryParams;
+exports.getCollectionSelect = getCollectionSelect;
 const funnel_core_1 = require("@nascentdigital/funnel-core");
 const models_1 = require("./models");
 // class
@@ -251,6 +253,7 @@ class ContentfulCollectionClient {
             // always update
             name: data.name,
             errors: data.errors,
+            valid: data.errors ? null : true,
             references,
             // TODO: only update if changed
             // optional
@@ -278,7 +281,6 @@ class ContentfulCollectionClient {
     }
 }
 exports.ContentfulCollectionClient = ContentfulCollectionClient;
-// helpers
 function getCollectionQueryParams(query) {
     // build filters
     const { ids = [], groupId, brand, type, slug, language, name, tags = [], tagsMatch = 'any', version } = query;
@@ -292,7 +294,12 @@ function getCollectionQueryParams(query) {
     }
     // filter group
     if (groupId) {
-        filters['fields.groupId'] = groupId;
+        if (Array.isArray(groupId)) {
+            filters['fields.groupId[in]'] = groupId.join(',');
+        }
+        else {
+            filters['fields.groupId'] = groupId;
+        }
     }
     // filter brand
     if (brand) {

package/dist/contentful/ContentfulContentClient.d.ts

@@ -1,4 +1,5 @@
 import { CMAClient, KnownAppSDK } from '@contentful/app-sdk';
+import { Logger } from '@nascentdigital/funnel-core';
 import { PlainClientAPI } from 'contentful-management';
 import { AuthClient, ContentClient } from '../api';
 import { User } from '../models';
@@ -13,6 +14,7 @@ import { ContentfulUserClient } from './ContentfulUserClient';
 import { IContentfulContentClient } from './IContentfulContentClient';
 import { ContentfulData } from './models';
 export declare class ContentfulContentClient implements ContentClient, IContentfulContentClient {
+    readonly log: Logger;
     readonly user: User;
     readonly locale: string;
     readonly deliveryAccessToken: string;
@@ -38,6 +40,7 @@ export declare class ContentfulContentClient implements ContentClient, IContentf
     getEntries<TEntry extends ContentfulData>({ pagination, version, includeLinks, ...query }: IContentfulContentClient.GetEntries.Args<TEntry>): Promise<IContentfulContentClient.GetEntries.Result<TEntry>>;
     updateEntry<TEntry extends ContentfulData>(entry: ContentfulData.Update<TEntry>): Promise<TEntry>;
     uploadAsset(args: IContentfulContentClient.UploadAsset.Args): Promise<IContentfulContentClient.UploadAsset.Result>;
+    getTranslatedReferences({ to, pages, collections }: IContentfulContentClient.GetTranslatedReferences.Args): Promise<IContentfulContentClient.GetTranslatedReferences.Result>;
     static forEditor({ sdk, contentApiPath }: ContentfulContentClient.ForEditorArgs): Promise<ContentfulContentClient>;
 }
 export declare namespace ContentfulContentClient {

package/dist/contentful/ContentfulContentClient.js

@@ -30,7 +30,10 @@ class ContentfulContentClient {
     constructor(args) {
         var _a;
         // initialize instance variables
+        const log = funnel_core_1.Logger.get('cms:client');
+        this.log = log;
         if (ContentfulContentClient.ConstructorArgs.isForServer(args)) {
+            log.d('constructor - created for server (headless)');
             this.user = models_1.User.UNAUTHENTICATED;
             this.locale = args.locale;
             const options = { defaults: { spaceId: args.spaceId, environmentId: args.environment } };
@@ -52,6 +55,7 @@ class ContentfulContentClient {
                         .map(({ name }) => models_2.ContentfulUserData.parseRole(name))
                         .sort((lhs, rhs) => lhs.compareTo(rhs))[0].id
             });
+            log.d('constructor - created for user', this.user);
             this.locale = locales.default;
             this.cma = cma;
             const options = { defaults: { spaceId: ids.space, environmentId: (_a = ids.environmentAlias) !== null && _a !== void 0 ? _a : ids.environment } };
@@ -97,6 +101,7 @@ class ContentfulContentClient {
     async getEntry(_a) {
         var _b, _c;
         var { entryId, includeLinks = false, version = 'draft' } = _a, query = __rest(_a, ["entryId", "includeLinks", "version"]);
+        this.log.v('getEntry - fetching for', Object.assign({ entryId, version, includeLinks }, query));
         // get entry
         const client = version === 'published' ? this.cda : this.cpa;
         const result = await client.entry.getMany({
@@ -105,8 +110,7 @@ class ContentfulContentClient {
                     : includeLinks || undefined })
         });
         const { items: [item], includes } = result;
-        console.debug('[ContentfulContentClient/getEntry] fetched', result);
-        // skip
+        this.log.v('getEntry - fetched', result);
         // bind references
         const entry = item ? models_2.ContentfulData.fromCdaData(item) : undefined;
         const references = (_c = (_b = includes === null || includes === void 0 ? void 0 : includes.Entry) === null || _b === void 0 ? void 0 : _b.map(link => models_2.ContentfulData.fromCdaData(link))) !== null && _c !== void 0 ? _c : [];
@@ -116,6 +120,7 @@ class ContentfulContentClient {
     async getEntries(_a) {
         var _b, _c;
         var { pagination = 'all', version = 'draft', includeLinks = false } = _a, query = __rest(_a, ["pagination", "version", "includeLinks"]);
+        this.log.v('getEntries - fetching for', Object.assign({ version, includeLinks, pagination }, query));
         // setup pagination
         const itemsPerRequest = pagination === 'all' ? 1000 : Math.min(pagination.pageSize, 1000);
         const page = pagination === 'all' ? 1 : pagination.page;
@@ -134,7 +139,7 @@ class ContentfulContentClient {
                         ? 10
                         : includeLinks || undefined })
             }), { items } = _d, response = __rest(_d, ["items"]);
-            console.debug('[ContentfulContentClient/getEntries] fetched page', { query, items, response });
+            this.log.v('getEntries - fetching page', Object.assign({ items }, response));
             // add items
             items.forEach(item => entries.push(models_2.ContentfulData.fromCdaData(item)));
             includes.push(...((_c = (_b = response.includes) === null || _b === void 0 ? void 0 : _b.Entry) !== null && _c !== void 0 ? _c : []));
@@ -146,7 +151,7 @@ class ContentfulContentClient {
                 ? skip < totalItems
                 : totalItemFetched < pagination.pageSize && skip < totalItems;
         } while (hasMorePages);
-        console.debug('[ContentfulContentClient/getEntries] fetched entries', { entries, includes });
+        this.log.v('getEntries - fetched all', { entries, includes });
         // normalize references
         const references = includes.map(link => models_2.ContentfulData.fromCdaData(link));
         // return
@@ -235,8 +240,58 @@ class ContentfulContentClient {
         // return asset
         return models_2.ContentfulData.fromCmaData(entry, locale);
     }
+    async getTranslatedReferences({ to, pages, collections }) {
+        // lookup pages/collections
+        const [translatedPages, translatedCollections] = await Promise.all([
+            pages.length === 0
+                ? Promise.resolve([])
+                : this.getEntries(Object.assign({ content_type: models_2.ContentfulPageData.contentType, version: 'draft', select: (0, ContentfulPageClient_1.getPageSelect)(funnel_core_1.Schema.Page.Data.Props.id) }, (0, ContentfulPageClient_1.getPageQueryParams)({
+                    groupId: pages.map(page => page.groupId)
+                })))
+                    .then(({ entries }) => {
+                    return entries
+                        .filter(entry => entry.region === to.region && entry.language === to.language)
+                        .map(entry => {
+                        // lookup original
+                        const source = pages.find(page => page.groupId === entry.groupId);
+                        // return translation (or drop it)
+                        return source && {
+                            from: source.id,
+                            to: entry.id
+                        };
+                    })
+                        .filter(funnel_core_1.Value.isDefined);
+                }),
+            collections.length === 0
+                ? Promise.resolve([])
+                : this.getEntries(Object.assign({ content_type: models_2.ContentfulCollectionData.contentType, version: 'draft', select: (0, ContentfulCollectionClient_1.getCollectionSelect)(funnel_core_1.Schema.Collection.Data.Props.id) }, (0, ContentfulCollectionClient_1.getCollectionQueryParams)({
+                    groupId: collections.map(collection => collection.groupId)
+                })))
+                    .then(({ entries }) => {
+                    return entries
+                        .filter(entry => entry.language === to.language)
+                        .map(entry => {
+                        // lookup original
+                        const source = collections.find(collection => collection.groupId === entry.groupId);
+                        // return translation (or drop it)
+                        return source && {
+                            from: source.id,
+                            to: entry.id
+                        };
+                    })
+                        .filter(funnel_core_1.Value.isDefined);
+                })
+        ]);
+        // return translated references
+        return {
+            pages: translatedPages,
+            collections: translatedCollections
+        };
+    }
     static async forEditor({ sdk, contentApiPath }) {
         var _a;
+        const log = funnel_core_1.Logger.get('cms:client');
+        log.v('forEditor - creating for', { sdk, contentApiPath });
         // get current site config (throw if we can't)
         const { user, cma, locales: { default: locale } } = sdk;
         const userId = user.sys.id;
@@ -278,7 +333,7 @@ class ContentfulContentClient {
         if (!deliveryAccessToken || !previewAccessToken) {
             throw new funnel_core_1.IllegalStateError('Invalid data return from API');
         }
-        console.debug('[ContentfulContentClient/forEditor] creating with', { sdk, deliveryAccessToken, previewAccessToken });
+        log.v('forEditor - creating with', { sdk, deliveryAccessToken, previewAccessToken });
         // create + return new client
         return new ContentfulContentClient({ sdk, deliveryAccessToken, previewAccessToken });
     }

package/dist/contentful/ContentfulPageClient.d.ts

@@ -1,11 +1,12 @@
-import { Schema } from '@nascentdigital/funnel-core';
+import { Logger, Schema } from '@nascentdigital/funnel-core';
 import { PageClient } from '../api';
 import { IContentfulContentClient } from './IContentfulContentClient';
 import { ContentfulPageData } from './models';
 export declare class ContentfulPageClient implements PageClient {
     readonly cms: IContentfulContentClient;
+    readonly log: Logger;
     constructor(cms: IContentfulContentClient);
-    getOverview(args: PageClient.GetOverview.Args): Promise<PageClient.GetOverview.Result>;
+    getOverview({ version, region, ...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({ version, pagination, ...query }: PageClient.Search.Args): Promise<PageClient.Search.Result>;
@@ -14,7 +15,7 @@ export declare class ContentfulPageClient implements PageClient {
     getGroup(args: PageClient.GetGroup.Args): Promise<ContentfulPageClient.GetGroup.Result>;
     get(args: PageClient.Get.Args): Promise<ContentfulPageClient.Get.Result>;
     create(args: PageClient.Create.Args): Promise<PageClient.Create.Result>;
-    duplicate(args: PageClient.Duplicate.Args): Promise<PageClient.Duplicate.Result>;
+    duplicate({ source, ...target }: PageClient.Duplicate.Args): Promise<PageClient.Duplicate.Result>;
     update(args: PageClient.Update.Args): Promise<ContentfulPageClient.Update.Result>;
     replace(args: PageClient.Replace.Args): Promise<PageClient.Replace.Result>;
     touch(args: PageClient.Touch.Args): Promise<PageClient.Touch.Result>;
@@ -41,3 +42,9 @@ export declare namespace ContentfulPageClient {
         };
     }
 }
+export type GetPageQueryParamsArgs = Omit<PageClient.Query.By<any>, 'version' | 'groupId'> & {
+    ids?: Schema.Page.Id[];
+    groupId?: Schema.Page.GroupId | ReadonlyArray<Schema.Page.GroupId>;
+};
+export declare function getPageQueryParams(query: GetPageQueryParamsArgs): Record<string, any>;
+export declare function getPageSelect(props: ReadonlyArray<Schema.Page.Data.Props.All>): string | undefined;

package/dist/contentful/ContentfulPageClient.js

@@ -12,6 +12,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentfulPageClient = void 0;
+exports.getPageQueryParams = getPageQueryParams;
+exports.getPageSelect = getPageSelect;
 const funnel_core_1 = require("@nascentdigital/funnel-core");
 const errors_1 = require("../errors");
 const models_1 = require("./models");
@@ -19,11 +21,13 @@ const models_1 = require("./models");
 class ContentfulPageClient {
     constructor(cms) {
         this.cms = cms;
+        this.log = funnel_core_1.Logger.get('cms:page');
     }
-    async getOverview(args) {
+    async getOverview(_a) {
+        var { version, region } = _a, args = __rest(_a, ["version", "region"]);
         // fetch all pages
         const { cms } = this;
-        const { entries } = 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 } = await cms.getEntries(Object.assign({ content_type: models_1.ContentfulPageData.contentType, version, select: getPageSelect(funnel_core_1.Schema.Page.Data.AsLink.props) }, getPageQueryParams(args)));
         // convert entries to page data
         const pagesData = entries.map(entry => models_1.ContentfulPageData.deserialize(entry, funnel_core_1.Schema.Page.Data.AsLink.props));
         // setup maps
@@ -31,34 +35,38 @@ class ContentfulPageClient {
         const dynamicPages = new Map();
         // go over each page data
         for (const data of pagesData) {
-            // use appropriate map (determine if page is static/dynamic)
-            const pagesMap = data.slug === undefined
-                ? staticPages
-                : dynamicPages;
-            // get references by page type
-            let refs = pagesMap.get(data.type);
-            if (!refs) {
-                pagesMap.set(data.type, refs = []);
+            // add static page
+            if (data.slug === undefined) {
+                // get references (or create it)
+                let refs = staticPages.get(data.type);
+                if (!refs) {
+                    staticPages.set(data.type, refs = []);
+                }
+                // add page
+                refs.push(data);
+            }
+            // or dynamic
+            else {
+                // get references (or create it)
+                let refs = dynamicPages.get(data.type);
+                if (!refs) {
+                    dynamicPages.set(data.type, refs = new Set());
+                }
+                // add page
+                refs.add(data.groupId);
             }
-            // add to refs
-            refs.push(data);
         }
         // return
         return {
             // static pages
             static: staticPages.entries().map(([type, refs]) => ({
                 type,
-                refs: refs.reduce((refs, ref) => {
-                    // add page
-                    refs[ref.language] = ref;
-                    // keep reducing
-                    return refs;
-                }, {})
+                refs
             })).toArray(),
             // dynamic pages
             dynamic: dynamicPages.entries().map(([type, refs]) => ({
                 type,
-                count: refs.length
+                count: refs.size
             })).toArray()
         };
     }
@@ -93,27 +101,27 @@ class ContentfulPageClient {
     async getGroup(args) {
         // fetch items (bail if there are no instances
         const { language, region, version } = args, queryArgs = __rest(args, ["language", "region", "version"]);
-        const { cms } = this;
-        console.debug('[ContentfulPageClient/getGroup] query group entries for', JSON.stringify(queryArgs, undefined, '  '));
+        const { cms, log } = this;
+        log.v('getGroup - querying', args);
         const { entries } = await cms.getEntries(Object.assign({ content_type: models_1.ContentfulPageData.contentType, version, select: getPageSelect(funnel_core_1.Schema.Page.Data.Props.id) }, getPageQueryParams(queryArgs)));
         // bail if no items
         if (entries.length === 0) {
-            console.debug('[ContentfulPageClient/getGroup] no items in group', JSON.stringify(args, undefined, '  '));
+            log.v('getGroup - no items in group');
             const { brand, groupId: possibleGroupId, type, slug } = queryArgs;
             return {
                 group: { groupId: possibleGroupId !== null && possibleGroupId !== void 0 ? possibleGroupId : funnel_core_1.Schema.Page.GroupId.empty, brand, type, slug, instances: [] }
             };
         }
-        console.debug('[ContentfulPageClient/getGroup] processing group items', JSON.stringify(args, undefined, '  '));
         // collate the group ids into summaries (fetches full page if region/language match exists
         const instances = entries.map(entry => models_1.ContentfulPageData.deserialize(entry, funnel_core_1.Schema.Page.Data.AsGroup.Instance.props));
-        // bind page (if it exists)
         const pageInstance = instances
             .find(instance => instance.region === region && instance.language === language);
-        console.debug('[ContentfulPageClient/getGroup] getting page using this.get...', { id: pageInstance === null || pageInstance === void 0 ? void 0 : pageInstance.id, version });
+        log.v('getGroup - processing group items', { entries, instances, pageInstance });
+        // bind page (if it exists)
         const page = pageInstance
             ? await this.get({ id: pageInstance.id, version })
             : undefined;
+        log.v('getGroup - fetched page', page);
         // return group (and optional page)
         const { type, brand, groupId, slug } = entries[0];
         return {
@@ -122,8 +130,9 @@ class ContentfulPageClient {
         };
     }
     async get(args) {
+        const { log, cms } = this;
+        log.v('get - fetching page for', args);
         // fetch entries (should be one entry)
-        const { cms } = this;
         const [{ entries, references }, { entry: entrySnapshot }] = await Promise.all([
             // query target (could be published/draft)
             cms.getEntries(Object.assign({ content_type: models_1.ContentfulPageData.contentType, includeLinks: true, version: args.version, pagination: { page: 1, pageSize: 1 }, select: getPageSelect(args.select === 'content'
@@ -136,6 +145,7 @@ class ContentfulPageClient {
         ]);
         // skip if no entries
         if (entries.length === 0) {
+            log.v('get - nothing found');
             return undefined;
         }
         // stitch together snapshot with entry (if available
@@ -143,6 +153,7 @@ class ContentfulPageClient {
         const snapshot = entrySnapshot
             ? models_1.ContentfulPageData.Snapshot.deserialize(entrySnapshot)
             : undefined;
+        log.v('get - fetched page', { data, snapshot });
         // use first entry and deserialize
         return Object.assign({ data: Object.assign(Object.assign({}, data), { snapshotId: snapshot === null || snapshot === void 0 ? void 0 : snapshot.id, snapshot }) }, models_1.ContentfulPageData.deserializeRefs(references));
     }
@@ -343,8 +354,150 @@ class ContentfulPageClient {
             }
         }
     }
-    duplicate(args) {
-        throw new funnel_core_1.NotImplementedError();
+    async duplicate(_a) {
+        var _b, _c, _d;
+        var { source } = _a, target = __rest(_a, ["source"]);
+        console.debug('[ContentfulPageClient/duplicate] processing duplicate page request', target);
+        // get page by id
+        const { groupId, region: sourceRegion, language: sourceLanguage } = source;
+        const { items: sourceGroup } = await this.search({
+            groupId,
+            version: 'draft',
+            pagination: 'all'
+        });
+        // throw if there's no page
+        const sourceRef = sourceGroup.find(page => page.region === sourceRegion && page.language === sourceLanguage);
+        if (!sourceRef) {
+            throw new funnel_core_1.NotFoundError(`Unable to resolve page matching group "${groupId}" in ${sourceRegion}/${sourceLanguage}`);
+        }
+        // TODO: check schema to see if language is possible
+        // make sure target language doesn't already exist if we are targeting the current group
+        if (target.operation === 'extend') {
+            if (sourceGroup.some(page => page.region === target.region && page.language === target.language)) {
+                throw new funnel_core_1.InvalidOperationError(`There is already a page in group "${groupId}" created for ${target.region}/${target.language}`);
+            }
+        }
+        // make sure a static page isn't getting duplicated and that the slug is good
+        else {
+            // get source page's schema
+            const site = funnel_core_1.Schema.Site.current();
+            const schema = site.regions[sourceRef.region][sourceRef.type];
+            // cannot duplicate a static page
+            if (schema.variant === 'static') {
+                throw new funnel_core_1.InvalidOperationError(`cannot duplicate a static page "${sourceRef.name}"`);
+            }
+            // slug must be provided
+            if (target.slug === undefined) {
+                throw new funnel_core_1.ArgumentError('slug must be provided when duplicating a page');
+            }
+            // validate slug
+            const validateSlugResult = await this.validateSlug({
+                brand: sourceRef.brand,
+                type: sourceRef.type,
+                region: sourceRef.region,
+                slug: target.slug
+            });
+            if (validateSlugResult.status !== 'available') {
+                throw new errors_1.SlugValidationError({
+                    slug: target.slug,
+                    reason: validateSlugResult
+                });
+            }
+        }
+        // get full source with refs
+        const { cms } = this;
+        const { entries: [sourceEntry], references } = await cms.getEntries(Object.assign({ content_type: models_1.ContentfulPageData.contentType, includeLinks: true, version: 'draft', pagination: { page: 1, pageSize: 1 }, select: getPageSelect(funnel_core_1.Schema.Page.Data.AsContent.props) }, getPageQueryParams({ ids: [sourceRef.id] })));
+        if (!sourceEntry) {
+            throw new funnel_core_1.NotFoundError(`Unable to resolve page with id "${sourceRef.id}"`);
+        }
+        const sourcePage = models_1.ContentfulPageData.deserialize(sourceEntry);
+        console.debug('[ContentfulPageClient/duplicate] fetched source', { sourceEntry, sourcePage });
+        const sourceRefIds = ((_b = sourceEntry.references) !== null && _b !== void 0 ? _b : [])
+            .filter(link => link.sys.linkType === 'Entry')
+            .map(link => link.sys.id);
+        const sourceReferences = models_1.ContentfulPageData.deserializeRefs(references);
+        const sourcePageRefs = Object.values(sourceReferences.pages)
+            .filter(page => sourceRefIds.includes(page.id))
+            .map(page => ({
+            id: page.id,
+            groupId: page.groupId
+        }));
+        const sourceCollectionRefs = Object.values(sourceReferences.collections)
+            .filter(collection => sourceRefIds.includes(collection.id))
+            .map(collection => ({
+            id: collection.id,
+            groupId: collection.groupId
+        }));
+        console.debug('[ContentfulPageClient/duplicate] fetched source', sourcePage);
+        // translate references (falls back to default if there's no mapping
+        const { pages: translatedPageIds, collections: translatedCollectionIds } = await cms.getTranslatedReferences({
+            from: source,
+            to: target,
+            pages: sourcePageRefs,
+            collections: sourceCollectionRefs
+        });
+        const refIds = [...translatedPageIds, ...translatedCollectionIds].filter(funnel_core_1.Value.isDefined);
+        console.debug('[ContentfulPageClient/duplicate] found translated ids', refIds);
+        // update refs
+        const updateRefs = (source, mappings) => {
+            // skip if there's no json
+            if (!source) {
+                return source;
+            }
+            // or if there's no mappings
+            else if (mappings.length === 0) {
+                return source;
+            }
+            // serialize
+            let serialized = JSON.stringify(source);
+            // replace
+            for (const { from, to } of mappings) {
+                serialized = serialized.replaceAll(`"${from}"`, `"${to}"`);
+            }
+            // deserialize
+            return JSON.parse(serialized);
+        };
+        const targetBody = {
+            discover: updateRefs(sourcePage.discover, refIds),
+            preview: updateRefs(sourcePage.preview, refIds),
+            content: updateRefs(sourcePage.content, refIds)
+        };
+        // create duplicate page
+        try {
+            // setup data
+            const targetData = Object.assign({ groupId: target.operation === 'extend'
+                    ? sourcePage.groupId
+                    : funnel_core_1.Value.uuid(), type: sourcePage.type, brand: sourcePage.brand, region: target.region, language: target.language, slug: target.operation === 'extend'
+                    ? sourcePage.slug
+                    : target.slug, name: sourcePage.name, tags: sourcePage.tags, url: sourcePage.url, errors: true }, targetBody);
+            const targetModel = funnel_core_1.Schema.PageModel.from(targetData);
+            targetModel.sync();
+            console.debug('[ContentfulPageClient/duplicate] about to create page with data', targetData);
+            // create target page using content of source
+            const targetEntry = await cms.createEntry(models_1.ContentfulPageData.contentType, Object.assign(Object.assign({}, targetData), { references: ((_c = sourceEntry.references) !== null && _c !== void 0 ? _c : []).map(link => {
+                    var _a, _b;
+                    // replace entry ids if mapped
+                    if (link.sys.linkType === 'Entry') {
+                        link.sys.id = (_b = (_a = refIds.find(({ from }) => from === link.sys.id)) === null || _a === void 0 ? void 0 : _a.to) !== null && _b !== void 0 ? _b : link.sys.id;
+                    }
+                    // return link
+                    return link;
+                }) }));
+            // return group for duplicated page
+            return this.getGroup({
+                brand: targetEntry.brand,
+                groupId: targetEntry.groupId,
+                type: targetEntry.type,
+                slug: (_d = targetEntry.slug) !== null && _d !== void 0 ? _d : undefined,
+                region: targetEntry.region,
+                language: targetEntry.language,
+                version: 'draft'
+            });
+        }
+        // handle errors
+        catch (e) {
+            throw funnel_core_1.IsometricErrorUtils.coerceError(e);
+        }
     }
     update(args) {
         throw new funnel_core_1.NotImplementedError();
@@ -387,7 +540,6 @@ class ContentfulPageClient {
     }
 }
 exports.ContentfulPageClient = ContentfulPageClient;
-// helpers
 function getPageQueryParams(query) {
     // build filters
     const { ids = [], groupId, brand, type, slug, region, language, name, tags = [], tagsMatch = 'any' } = query;
@@ -401,7 +553,12 @@ function getPageQueryParams(query) {
     }
     // filter group
     if (groupId) {
-        filters['fields.groupId'] = groupId;
+        if (Array.isArray(groupId)) {
+            filters['fields.groupId[in]'] = groupId.join(',');
+        }
+        else {
+            filters['fields.groupId'] = groupId;
+        }
     }
     // filter brand
     if (brand) {

package/dist/contentful/IContentfulContentClient.d.ts

@@ -1,4 +1,5 @@
 import { CMAClient } from '@contentful/app-sdk';
+import { Locale, Schema } from '@nascentdigital/funnel-core';
 import { PlainClientAPI, QueryOptions } from 'contentful-management';
 import { AssetClient } from '../api';
 import { Environment, Pagination, User } from '../models';
@@ -35,6 +36,7 @@ export interface IContentfulContentClient {
     getEntries<TEntry extends ContentfulData>(args: IContentfulContentClient.GetEntries.Args<TEntry>): Promise<IContentfulContentClient.GetEntries.Result<TEntry>>;
     updateEntry<TEntry extends ContentfulData>(entry: ContentfulData.Update<TEntry>): Promise<TEntry>;
     uploadAsset(args: IContentfulContentClient.UploadAsset.Args): Promise<IContentfulContentClient.UploadAsset.Result>;
+    getTranslatedReferences(args: IContentfulContentClient.GetTranslatedReferences.Args): Promise<IContentfulContentClient.GetTranslatedReferences.Result>;
 }
 export declare namespace IContentfulContentClient {
     type EntryQueryOptions = {
@@ -60,6 +62,30 @@ export declare namespace IContentfulContentClient {
             references: ContentfulData[];
         };
     }
+    namespace GetTranslatedReferences {
+        type Args = {
+            from: Locale;
+            to: Locale;
+            pages: ReadonlyArray<PageRef>;
+            collections: ReadonlyArray<CollectionRef>;
+        };
+        type Result = {
+            pages: Translation<Schema.Page.Id>[];
+            collections: Translation<Schema.Collection.Id>[];
+        };
+        type PageRef = {
+            id: Schema.Page.Id;
+            groupId: Schema.Page.GroupId;
+        };
+        type CollectionRef = {
+            id: Schema.Collection.Id;
+            groupId: Schema.Collection.GroupId;
+        };
+        type Translation<TId> = {
+            from: TId;
+            to: TId;
+        };
+    }
     namespace UploadAsset {
         type Args = AssetClient.CreateAsset.Args & {
             file: Blob;

package/dist/contentful/models/ContentfulCollectionData.d.ts

@@ -1,7 +1,12 @@
 import { RequiredBy, Schema } from '@nascentdigital/funnel-core';
 import { ContentfulData } from './ContentfulData';
 export type ContentfulCollectionData = ContentfulData<ContentfulCollectionData.ContentType, Schema.Collection.Id, Schema.Collection.State> & Omit<Schema.Collection.Data, 'id' | 'changeSetId' | 'snapshotId' | 'snapshot'> & {
-    references: ContentfulData.References;
+    references?: ContentfulData.References;
+    /**
+     * Used specifically to prevent publishing in Contentful if the collection is not valid.
+     * The `valid` field is required so setting to null blocks publishing.
+     */
+    valid?: boolean;
 };
 export declare namespace ContentfulCollectionData {
     const contentType: "collection";

package/dist/contentful/models/ContentfulCollectionData.js

@@ -24,9 +24,7 @@ var ContentfulCollectionData;
         };
         // helper
         const bindProp = (prop, target, transform) => {
-            if (prop in data) {
-                collection[target] = transform(data[prop]);
-            }
+            collection[target] = transform(data[prop]);
         };
         // bind required props to page
         for (const prop of props) {
@@ -46,10 +44,12 @@ var ContentfulCollectionData;
                 case 'version':
                 case 'name':
                 case 'errors':
-                case 'pageIds':
-                case 'tags':
                     bindProp(prop, prop, value => value !== null && value !== void 0 ? value : undefined);
                     break;
+                // arrays
+                case 'tags':
+                    bindProp(prop, prop, value => value !== null && value !== void 0 ? value : []);
+                    break;
                 // content
                 case 'fields':
                     bindProp(prop, prop, value => value !== null && value !== void 0 ? value : {});
@@ -60,6 +60,7 @@ var ContentfulCollectionData;
                 case 'snapshot':
                 case 'snapshotId':
                 case 'changeSetId':
+                case 'pageIds':
                     break;
                 // unhandled
                 default:

package/dist/contentful/models/ContentfulData.d.ts

@@ -15,7 +15,9 @@ export declare namespace ContentfulData {
     type EntryId<T extends ContentfulData> = T['id'];
     type References = Array<Link.Entry | Link.Asset>;
     type Draft<T extends ContentfulData> = Omit<T, keyof ContentfulData | '__root'>;
-    type Update<T extends ContentfulData> = Pick<ContentfulData, 'id' | '__version'> & Partial<Draft<T>>;
+    type Update<T extends ContentfulData> = Pick<ContentfulData, 'id' | '__version'> & {
+        [TKey in keyof Draft<T>]?: Draft<T>[TKey] | null;
+    };
     type Link<TType extends Link.Type = Link.Type> = {
         sys: {
             type: 'Link';

package/dist/contentful/models/ContentfulPageData.d.ts

@@ -1,7 +1,12 @@
 import { RequiredBy, Schema } from '@nascentdigital/funnel-core';
 import { ContentfulData } from './ContentfulData';
 export type ContentfulPageData = ContentfulData<ContentfulPageData.ContentType, Schema.Page.Id, Schema.Page.State> & Omit<Schema.Page.Data, 'id' | 'changeSetId' | 'snapshotId' | 'snapshot'> & {
-    references: ContentfulData.References;
+    references?: ContentfulData.References;
+    /**
+     * Used specifically to prevent publishing in Contentful if the page is not valid.
+     * The `valid` field is required so setting to null blocks publishing.
+     */
+    valid?: boolean;
 };
 export declare namespace ContentfulPageData {
     const contentType: "page";

package/dist/contentful/models/ContentfulPageData.js

@@ -38,9 +38,7 @@ var ContentfulPageData;
         };
         // helper
         const bindProp = (prop, target, transform) => {
-            if (prop in data) {
-                page[target] = transform(data[prop]);
-            }
+            page[target] = transform(data[prop]);
         };
         // bind required props to page
         for (const prop of props) {
@@ -63,10 +61,13 @@ var ContentfulPageData;
                 case 'name':
                 case 'preview':
                 case 'errors':
-                case 'tags':
                 case 'publication':
                     bindProp(prop, prop, value => value !== null && value !== void 0 ? value : undefined);
                     break;
+                // arrays
+                case 'tags':
+                    bindProp(prop, prop, value => value !== null && value !== void 0 ? value : []);
+                    break;
                 // content
                 case 'discover':
                 case 'content':

package/dist/strapi/StrapiPageClient.d.ts

@@ -12,7 +12,7 @@ export declare class StrapiPageClient implements PageClient {
     getGroup({ brand, groupId, type, slug, region, language, version, select }: PageClient.GetGroup.Args): Promise<PageClient.GetGroup.Result>;
     get(args: PageClient.Get.Args): Promise<PageClient.Get.Result>;
     create(args: PageClient.Create.Args): Promise<PageClient.Create.Result>;
-    duplicate({ source: pageId, targetPage, targetLanguage, targetSlug }: PageClient.Duplicate.Args): Promise<PageClient.Duplicate.Result>;
+    duplicate(args: PageClient.Duplicate.Args): Promise<PageClient.Duplicate.Result>;
     touch({ id: pageId, version: status }: PageClient.Touch.Args): Promise<PageClient.Touch.Result>;
     update(args: PageClient.Update.Args): Promise<PageClient.Update.Result>;
     replace({ page, version, skipSync }: PageClient.Replace.Args): Promise<PageClient.Replace.Result>;

package/dist/strapi/StrapiPageClient.js

@@ -24,18 +24,13 @@ class StrapiPageClient {
     async getOverview({ brand, region, version }) {
         const { static: staticPages, dynamic } = await this.provider.customRequest({
             command: 'query/pages',
-            params: { brand, region, preview: version === 'draft' ? 'true' : 'false' }
+            params: { brand, preview: version === 'draft' ? 'true' : 'false' }
         });
         // transform static links
         return {
             static: staticPages.map(({ type, refs }) => ({
                 type,
-                refs: Object.entries(refs).reduce((refs, [language, ref]) => {
-                    // map page
-                    refs[language] = serialization_1.PageData.deserializeRef(ref);
-                    // keep reducing
-                    return refs;
-                }, {})
+                refs: Object.values(refs).map(serialization_1.PageData.deserializeRef)
             })),
             dynamic
         };
@@ -417,7 +412,7 @@ class StrapiPageClient {
             }
         }
     }
-    async duplicate({ source: pageId, targetPage, targetLanguage, targetSlug }) {
+    async duplicate(args) {
         var _a;
         // resolve current user (or throw)
         const { client, users } = this.provider;
@@ -427,64 +422,76 @@ class StrapiPageClient {
             throw new funnel_core_1.NotAuthenticatedError();
         }
         // get page by id
+        const { source } = args;
         const pageCollection = client.collection('pages');
-        const { data: sourceData } = await pageCollection.findOne(pageId, {
-            fields: serialization_1.PageData.getStrapiFilter(funnel_core_1.Schema.Page.Data.Props.all),
-            status: 'draft',
-            populate: serialization_1.PageData.Populate.full
-        });
-        const sourcePage = sourceData;
+        const { items: [sourceRef] } = await this.search(Object.assign(Object.assign({}, source), { version: 'draft', pagination: { page: 1, pageSize: 1 } }));
         // throw if there's no page
-        if (!sourcePage) {
-            throw new funnel_core_1.NotFoundError(`Unable to resolve page with id "${pageId}"`);
+        if (!sourceRef) {
+            throw new funnel_core_1.NotFoundError(`Unable to resolve page for group "${source.groupId}" in ${source.region}/${source.language}`);
         }
         // TODO: check schema to see if language is possible
         // make sure target language doesn't already exist if we are targeting the current group
-        if (targetPage === 'current') {
-            const { data: pagesWithTargetLanguage } = await pageCollection.find(Object.assign({ fields: ['documentId'] }, getPageQueryParams({ version: 'draft', groupId: sourcePage.groupId, language: targetLanguage })));
-            if (pagesWithTargetLanguage.length > 0) {
-                throw new funnel_core_1.InvalidOperationError(`There is already a page in group "${sourcePage.groupId}" with ${targetLanguage} language`);
+        if (args.operation === 'extend') {
+            const { region, language } = args;
+            const { data: duplicates } = await pageCollection.find(Object.assign({ fields: ['documentId'] }, getPageQueryParams({
+                version: 'draft',
+                groupId: sourceRef.groupId,
+                region: args.region,
+                language: args.language
+            })));
+            if (duplicates.length > 0) {
+                throw new funnel_core_1.InvalidOperationError(`There is already a page in group "${sourceRef.groupId}" in ${region}/${language}`);
             }
         }
         // make sure a static page isn't getting duplicated and that the slug is good
-        else if (targetPage === 'new') {
+        else {
             // get source page's schema
             const site = funnel_core_1.Schema.Site.current();
-            const schema = site.regions[sourcePage.region][sourcePage.type];
+            const schema = site.regions[sourceRef.region][sourceRef.type];
             // cannot duplicate a static page
             if (schema.variant === 'static') {
-                throw new funnel_core_1.InvalidOperationError(`cannot duplicate a static page "${sourcePage.name}"`);
+                throw new funnel_core_1.InvalidOperationError(`cannot duplicate a static page "${sourceRef.name}"`);
             }
             // slug must be provided
-            if (targetSlug === undefined) {
+            const { region, slug } = args;
+            if (slug === undefined) {
                 throw new funnel_core_1.ArgumentError('slug must be provided when duplicating a page');
             }
             // validate slug
             const validateSlugResult = await this.validateSlug({
-                brand: sourcePage.brand,
-                type: sourcePage.type,
-                region: sourcePage.region,
-                slug: targetSlug
+                brand: sourceRef.brand,
+                type: sourceRef.type,
+                region,
+                slug
             });
             if (validateSlugResult.status !== 'available') {
                 throw new errors_1.SlugValidationError({
-                    slug: targetSlug,
+                    slug,
                     reason: validateSlugResult
                 });
             }
         }
-        // get refs from source page
-        const { assetRefs, pageRefs, collectionRefs } = sourcePage;
+        // fetch the page for the source
+        const { data: sourceData } = await pageCollection.findOne(sourceRef.id, {
+            fields: serialization_1.PageData.getStrapiFilter(funnel_core_1.Schema.Page.Data.Props.all),
+            status: 'draft',
+            populate: serialization_1.PageData.Populate.full
+        });
+        const sourcePage = sourceData;
+        if (!sourcePage) {
+            throw new funnel_core_1.NotFoundError(`Unable to resolve page with id "${sourceRef.id}" in ${source.region}/${source.language}`);
+        }
+        const { pageRefs, collectionRefs, assetRefs } = sourcePage;
         // target refs and body
         let targetPageRefIds;
         let targetCollectionRefIds;
         let targetBody;
         // if we are targeting a different language then we need to "translate" the references
-        if (targetLanguage !== sourcePage.lang) {
+        if (args.language !== sourcePage.lang) {
             // fetch target language refs
             const { pageIdMappings, collectionIdMappings } = await Strapi_1.Strapi.translateReferences({
                 client,
-                targetLanguage,
+                targetLanguage: args.language,
                 pageRefs,
                 collectionRefs
             });
@@ -515,9 +522,11 @@ class StrapiPageClient {
         // create duplicate page
         try {
             // create target page using content of source
-            const { data: dupData } = await pageCollection.create(Object.assign({ groupId: targetPage === 'current'
+            const { data: dupData } = await pageCollection.create(Object.assign({ groupId: args.operation === 'extend'
                     ? sourcePage.groupId
-                    : funnel_core_1.Value.uuid(), type: sourcePage.type, brand: sourcePage.brand, region: sourcePage.region, lang: targetLanguage, slug: targetSlug !== null && targetSlug !== void 0 ? targetSlug : sourcePage.slug, name: sourcePage.name, tags: sourcePage.tags, url: sourcePage.url, state: 'draft', errors: sourcePage.errors, assetRefs: { set: assetRefs.map(ref => ref.documentId) }, pageRefs: { set: targetPageRefIds }, collectionRefs: { set: targetCollectionRefIds } }, targetBody), { status: 'draft', populate: serialization_1.PageData.Populate.full });
+                    : funnel_core_1.Value.uuid(), type: sourcePage.type, brand: sourcePage.brand, region: sourcePage.region, lang: args.language, slug: args.operation === 'extend'
+                    ? sourcePage.slug
+                    : args.slug, name: sourcePage.name, tags: sourcePage.tags, url: sourcePage.url, state: 'draft', errors: sourcePage.errors, assetRefs: { set: assetRefs.map(ref => ref.documentId) }, pageRefs: { set: targetPageRefIds }, collectionRefs: { set: targetCollectionRefIds } }, targetBody), { status: 'draft', populate: serialization_1.PageData.Populate.full });
             const dupPageData = dupData;
             console.debug('[StrapiPageClient] duplicate: created duplicate page', { dupPageData });
             // touch new duplicated page to update url/name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-cms",
-  "version": "6.1.5",
+  "version": "6.1.6",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/cms"
@@ -48,5 +48,5 @@
     "ts-jest": "^29",
     "type-fest": "^4"
   },
-  "gitHead": "567edc7796b910ef548506fd659f267b80187c29"
+  "gitHead": "63e7e3fa90a0d490576311a388e8a0d99bd4b5e4"
 }