@nascentdigital/funnel-editor 4.6.1 → 5.0.1

package/dist/core/domain/Block.d.ts

@@ -18,6 +18,7 @@ export declare class Block<TBlock extends Schema.Block = Schema.Block> extends I
     get identifier(): string;
     get name(): string;
     get state(): "undefined" | "invalid" | "valid";
+    get fieldChanged$(): import("rxjs").Observable<Field.Event>;
     get value(): Schema.Block.Data;
     get modified(): boolean;
     get changes(): Block.Changes;

package/dist/core/domain/Block.js

@@ -39,10 +39,7 @@ class Block extends ItemBase_1.ItemBase {
         this.listsFields = this.fields.filter(field => field.id === 'list');
         this.extendedFields = this.fields.filter(field => !messageKeys.includes(field.id) && field.id !== 'visual' && field.id !== 'list');
         // listen to field changes
-        this.eventBus.events$
-            .pipe((0, rxjs_1.filter)(funnel_core_1.Field.Event.filter), (0, rxjs_1.filter)(event => (event.type === 'changed' || event.type === 'reset')
-            && this.fields.includes(event.field)))
-            .subscribe(event => this.onFieldChange(event));
+        this.fieldChanged$.subscribe(event => this.onFieldChange(event));
     }
     get identifier() {
         return this.key;
@@ -57,6 +54,11 @@ class Block extends ItemBase_1.ItemBase {
                 : 'invalid'
             : 'undefined';
     }
+    get fieldChanged$() {
+        return this.eventBus.events$
+            .pipe((0, rxjs_1.filter)(funnel_core_1.Field.Event.filter), (0, rxjs_1.filter)(event => (event.type === 'changed' || event.type === 'reset')
+            && this.fields.includes(event.field)));
+    }
     get value() {
         const { schema, config, fields } = this;
         return {
@@ -117,7 +119,8 @@ class Block extends ItemBase_1.ItemBase {
         }
     }
     getConfiguration() {
-        return new BlockConfiguration_1.BlockConfiguration({ block: this, assetStore: this.root });
+        const { root } = this;
+        return new BlockConfiguration_1.BlockConfiguration({ block: this, assetStore: root, collectionStore: root });
     }
     getConfig(fieldId) {
         // get field (or throw)

package/dist/core/domain/BlockConfiguration.d.ts

@@ -2,10 +2,12 @@ import { BlockLayout, EventBus, Field, FieldModel, Schema } from '@nascentdigita
 import { ListPanel, MessagePanel, PanelLayout, SlotVariation, VisualPanel } from '@nascentdigital/funnel-ui';
 import { Block } from './Block';
 import { IAssetStore } from './IAssetStore';
+import { ICollectionStore } from './ICollectionStore';
 import { SectionBlock } from './SectionBlock';
 export declare class BlockConfiguration {
     readonly eventBus: EventBus;
     readonly assetStore: IAssetStore;
+    readonly collectionStore: ICollectionStore;
     readonly sectionBlock?: SectionBlock;
     readonly block: Block;
     private _fields;
@@ -15,7 +17,7 @@ export declare class BlockConfiguration {
     private _slotState;
     private _defaultConfig?;
     private _isConfigInDefault?;
-    constructor({ block: blockOrSectionBlock, assetStore }: BlockConfiguration.ConstructorArgs);
+    constructor({ block: blockOrSectionBlock, assetStore, collectionStore }: BlockConfiguration.ConstructorArgs);
     get fields(): ReadonlyArray<FieldModel.Config>;
     get editableFields(): ReadonlyArray<FieldModel.Config>;
     set editableFields(fields: ReadonlyArray<FieldModel.Config>);
@@ -60,6 +62,7 @@ export declare namespace BlockConfiguration {
     };
     type ConstructorArgs = {
         assetStore: IAssetStore;
+        collectionStore: ICollectionStore;
         block: Block | SectionBlock;
     };
     interface Event extends EventBus.Event<'BlockConfiguration', Event.Type> {

package/dist/core/domain/BlockConfiguration.js

@@ -7,10 +7,11 @@ const rxjs_1 = require("rxjs");
 const SectionBlock_1 = require("./SectionBlock");
 // model
 class BlockConfiguration {
-    constructor({ block: blockOrSectionBlock, assetStore }) {
+    constructor({ block: blockOrSectionBlock, assetStore, collectionStore }) {
         // initialize core fields
         this.eventBus = new funnel_core_1.EventBus();
         this.assetStore = assetStore;
+        this.collectionStore = collectionStore;
         const fields = [];
         this._fields = fields;
         this._editableFields = fields;
@@ -30,6 +31,9 @@ class BlockConfiguration {
         // sync
         this.reset();
         // force sync if a field is modified
+        this.block.fieldChanged$
+            .pipe((0, rxjs_1.debounceTime)(100))
+            .subscribe(() => this.sync());
         this.eventBus.events$
             .pipe((0, rxjs_1.filter)(event => funnel_core_1.Field.Event.filter(event) && event.type === 'changed'))
             .subscribe(() => this.sync());
@@ -63,8 +67,9 @@ class BlockConfiguration {
         ].filter(funnel_core_1.Value.isDefined);
     }
     get blockFieldData() {
-        const { assetStore, block } = this;
+        const { assetStore, collectionStore, block } = this;
         return block.fields.reduce((data, field) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
             // link assets
             const fieldValue = field.value;
             if ((fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.type) === 'asset') {
@@ -76,6 +81,56 @@ class BlockConfiguration {
                     ? funnel_core_1.Schema.AssetField.LinkedValue.toData(funnel_core_1.Schema.AssetField.Value.toLinked(assetData, asset))
                     : fieldValue;
             }
+            // link collections
+            else if ((fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.type) === 'collection') {
+                // resolve collection
+                const collection = funnel_core_1.Schema.CollectionField.Value.ForRef.filter(fieldValue.value)
+                    ? collectionStore.getCollection(fieldValue.value.id)
+                    : fieldValue.value;
+                // bind fields if it's media
+                if (funnel_ui_1.Media.LinkedValue.filter(collection)) {
+                    // clone (we need to deep clone or the linked collection/assets will get saved)
+                    const media = funnel_core_1.ObjectUtils.clone(collection);
+                    data[field.id] = funnel_core_1.Schema.CollectionField.Value.ForInline.toData(media);
+                    // link image
+                    if (funnel_ui_1.Media.LinkedValue.isImage(media)) {
+                        // link desktop
+                        const desktopAssetId = (_c = (_b = (_a = media.fields) === null || _a === void 0 ? void 0 : _a.image) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.id;
+                        const desktopAsset = desktopAssetId ? assetStore.getAsset(desktopAssetId) : undefined;
+                        if (desktopAsset) {
+                            media.fields.image = funnel_core_1.Schema.AssetField.LinkedValue.toData(desktopAsset.value);
+                        }
+                        // link mobile
+                        const mobileAssetId = (_f = (_e = (_d = media.fields) === null || _d === void 0 ? void 0 : _d.mobileImage) === null || _e === void 0 ? void 0 : _e.value) === null || _f === void 0 ? void 0 : _f.id;
+                        const mobileAsset = mobileAssetId ? assetStore.getAsset(mobileAssetId) : undefined;
+                        if (mobileAsset) {
+                            media.fields.mobileImage = funnel_core_1.Schema.AssetField.LinkedValue.toData(mobileAsset.value);
+                        }
+                    }
+                    // link video (if local)
+                    else if (funnel_ui_1.Media.LinkedValue.isVideo(media)) {
+                        // link video (if local)
+                        if ((_k = (_j = (_h = (_g = media.fields) === null || _g === void 0 ? void 0 : _g.video) === null || _h === void 0 ? void 0 : _h.value) === null || _j === void 0 ? void 0 : _j.local) === null || _k === void 0 ? void 0 : _k.value) {
+                            const videoAssetId = (_p = (_o = (_m = (_l = media.fields) === null || _l === void 0 ? void 0 : _l.video) === null || _m === void 0 ? void 0 : _m.value.local) === null || _o === void 0 ? void 0 : _o.value) === null || _p === void 0 ? void 0 : _p.id;
+                            const videoAsset = videoAssetId ? assetStore.getAsset(videoAssetId) : undefined;
+                            if (videoAsset) {
+                                media.fields.video.value.local = funnel_core_1.Schema.AssetField.LinkedValue.toData(videoAsset.value);
+                            }
+                        }
+                        // link cover
+                        const coverAssetId = (_s = (_r = (_q = media.fields) === null || _q === void 0 ? void 0 : _q.cover) === null || _r === void 0 ? void 0 : _r.value) === null || _s === void 0 ? void 0 : _s.id;
+                        const coverAsset = coverAssetId ? assetStore.getAsset(coverAssetId) : undefined;
+                        if (coverAsset) {
+                            media.fields.cover = funnel_core_1.Schema.AssetField.LinkedValue.toData(coverAsset.value);
+                        }
+                    }
+                }
+                // fields if it's media
+                else {
+                    data[field.id] = fieldValue;
+                }
+            }
+            // or use as-is
             else {
                 data[field.id] = field.value;
             }
@@ -87,6 +142,7 @@ class BlockConfiguration {
         return [
             ...Object.values(this.extendedFields),
             this.getEditableField('contentAlign'),
+            this.getEditableField('contentSplit')
         ].filter(funnel_core_1.Value.isDefined);
     }
     get mobileFields() {
@@ -173,7 +229,11 @@ class BlockConfiguration {
             aspect: this.getEditableField(keys.aspect),
             anchor: this.getEditableField(keys.anchor),
             width: this.getEditableField(keys.width),
-            horizontalAlign: this.getEditableField(keys.horizontalAlign)
+            horizontalAlign: this.getEditableField(keys.horizontalAlign),
+            controls: this.getEditableField(keys.controls),
+            autoPlay: this.getEditableField(keys.autoPlay),
+            loop: this.getEditableField(keys.loop),
+            mute: this.getEditableField(keys.mute)
         };
     }
     get extendedFields() {
@@ -185,6 +245,7 @@ class BlockConfiguration {
             'layout',
             'slotVariation',
             'contentAlign',
+            'contentSplit',
             ...Object.values(funnel_ui_1.MessagePanel.Config.getKeys('message')),
             ...Object.values(funnel_ui_1.ListPanel.Config.getKeys('list')),
             ...Object.values(funnel_ui_1.VisualPanel.Config.getKeys('visual'))

package/dist/core/domain/Collection.d.ts

@@ -1,13 +1,13 @@
 import { AssetClient, CollectionClient } from '@nascentdigital/funnel-cms';
-import { EventBus, Field, FieldList, FieldModel, Language, ObjectField, Schema } from '@nascentdigital/funnel-core';
+import { EventBus, Field, FieldModel, Language, Schema } from '@nascentdigital/funnel-core';
 import { Observable } from 'rxjs';
 import { Asset } from './Asset';
 import { IAssetStore } from './IAssetStore';
+import { ICollection } from './ICollection';
 import { ICollectionStore } from './ICollectionStore';
+import { IPage } from './IPage';
 import { IPageRefStore } from './IPageRefStore';
 import { ITagged } from './ITagged';
-import { Item } from './Item';
-import { Page } from './Page';
 export declare class Collection implements IAssetStore, ICollectionStore, IPageRefStore, ITagged {
     readonly template: Schema.Collection;
     readonly eventBus: EventBus;
@@ -37,10 +37,10 @@ export declare class Collection implements IAssetStore, ICollectionStore, IPageR
     private _modifiedOn?;
     private _savingOn?;
     constructor(args: Collection.ConstructorArgs);
-    get asRef(): Collection.Ref;
-    get events$(): Observable<Collection.Events>;
+    get asRef(): ICollection.Ref;
+    get events$(): Observable<ICollection.Events>;
     get stable$(): Observable<boolean>;
-    get state(): Schema.Page.State;
+    get state(): Schema.Collection.State;
     private set state(value);
     get assets(): ReadonlyArray<Asset>;
     get collections(): ReadonlyArray<Schema.Collection.Data.AsLink>;
@@ -60,9 +60,9 @@ export declare class Collection implements IAssetStore, ICollectionStore, IPageR
     get changeSetId(): Schema.ChangeSet.Id | undefined;
     get valid(): boolean;
     get modified(): boolean;
-    get changes(): Collection.Changes;
+    get changes(): ICollection.Changes;
     get initialErrors(): boolean;
-    get errors(): Collection.Errors;
+    get errors(): ICollection.Errors;
     getField(fieldId: string): FieldModel;
     getTextField(fieldId: string): Field<Schema.TextField> | undefined;
     getAssetScope(range: Schema.AssetScope.Range): Schema.AssetScope;
@@ -73,8 +73,8 @@ export declare class Collection implements IAssetStore, ICollectionStore, IPageR
     getCollection(collectionId: Schema.Collection.Id): Schema.Collection.Data.AsLink | undefined;
     addCollection(collection: Schema.Collection.Data.AsLink): void;
     removeCollection(collectionId: Schema.Collection.Id): boolean;
-    getPageRef(pageId: Schema.Page.Id | undefined): Page.Ref | undefined;
-    addPageRef(page: Page.Ref): void;
+    getPageRef(pageId: Schema.Page.Id | undefined): IPage.Ref | undefined;
+    addPageRef(page: IPage.Ref): void;
     removePageRef(pageId: string): boolean;
     onSaveStart(): void;
     onSaveComplete(updatedOn: number, changeSetId: Schema.ChangeSet.Id): void;
@@ -105,22 +105,4 @@ export declare namespace Collection {
         publishedOn?: number;
     };
     type Summary = CollectionClient.GetItems.Item;
-    type Ref = Pick<ConstructorArgs, 'id' | 'groupId' | 'brand' | 'template' | 'language' | 'version' | 'name' | 'tags' | 'state' | 'errors' | 'changeSetId' | 'snapshotId' | 'createdOn' | 'updatedOn' | 'publishedOn'>;
-    type Changes = {
-        collection: Collection;
-        fields: Array<FieldModel>;
-    };
-    type Errors = {
-        collection: Collection;
-        fields: Array<FieldModel>;
-    };
-    type Events = Event | Item.Event | Field.Event | ObjectField.Event | FieldList.Event;
-    interface Event extends EventBus.Event<'Collection', Event.Type> {
-        collection: Collection;
-    }
-    namespace Event {
-        type Type = 'changed' | 'modified';
-        function filter(event: EventBus.Event): event is Event;
-        function create(event: EventBus.Args<Event>): Event;
-    }
 }

package/dist/core/domain/Collection.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Collection = void 0;
 const funnel_core_1 = require("@nascentdigital/funnel-core");
 const rxjs_1 = require("rxjs");
+const ICollection_1 = require("./ICollection");
 const Item_1 = require("./Item");
 // model
 class Collection {
@@ -335,22 +336,7 @@ class Collection {
         delete this._savingOn;
     }
     raiseEvent(type) {
-        this.eventBus.publish(Collection.Event.create({ type, collection: this }));
+        this.eventBus.publish(ICollection_1.ICollection.Event.create({ type, collection: this }));
     }
 }
 exports.Collection = Collection;
-// extension
-(function (Collection) {
-    let Event;
-    (function (Event) {
-        // methods
-        function filter(event) {
-            return event.domain === 'Collection';
-        }
-        Event.filter = filter;
-        function create(event) {
-            return funnel_core_1.EventBus.createEvent(Object.assign({ domain: 'Collection' }, event));
-        }
-        Event.create = create;
-    })(Event = Collection.Event || (Collection.Event = {}));
-})(Collection || (exports.Collection = Collection = {}));

package/dist/core/domain/CollectionBrowser.d.ts

@@ -1,9 +1,10 @@
 import { EventBus, Schema } from '@nascentdigital/funnel-core';
 import { Observable } from 'rxjs';
 import { EditorApiClient } from '../client';
+import { ICollectionRepository } from '../repository';
 import { CollectionSummary } from './CollectionSummary';
 export declare class CollectionBrowser {
-    readonly editorApi: EditorApiClient;
+    readonly repository: ICollectionRepository;
     readonly overview: EditorApiClient.CollectionOverview;
     private readonly _eventBus;
     private _state;
@@ -26,7 +27,7 @@ export declare class CollectionBrowser {
 export declare namespace CollectionBrowser {
     type State = 'uninitialized' | 'initializing' | 'ready' | 'syncing' | 'error';
     type ConstructorArgs = {
-        editorApi: EditorApiClient;
+        repository: ICollectionRepository;
         overview: EditorApiClient.CollectionOverview;
     };
     interface Event extends EventBus.Event<'CollectionBrowser', Event.Type> {

package/dist/core/domain/CollectionBrowser.js

@@ -7,7 +7,7 @@ const CollectionSummary_1 = require("./CollectionSummary");
 class CollectionBrowser {
     constructor(args) {
         // initialize instance variables
-        this.editorApi = args.editorApi;
+        this.repository = args.repository;
         this.overview = args.overview;
         this._eventBus = new funnel_core_1.EventBus();
         this._state = 'uninitialized';
@@ -64,10 +64,10 @@ class CollectionBrowser {
                     ? 'initializing'
                     : 'syncing';
                 // load collections
-                const { editorApi, type, template, defaultLanguage } = this;
+                const { repository, type, template, defaultLanguage } = this;
                 const brand = funnel_core_1.AppConfig.brand();
                 const language = funnel_core_1.RegionsConfig.getDefaultLanguage(funnel_core_1.AppConfig.brandConfig().regionalization);
-                this._items = (await editorApi.getCollectionItems({ version: 'draft', type, language }))
+                this._items = (await repository.getItems({ version: 'draft', type, language }))
                     .filter(({ refs }) => Object.keys(refs).length > 0)
                     .map(({ groupId, name, refs }) => new CollectionSummary_1.CollectionSummary({
                     template,

package/dist/core/domain/CollectionFieldProxy.d.ts

@@ -1,18 +1,19 @@
 import { AssetClient } from '@nascentdigital/funnel-cms';
-import { EventBus, Field, FieldList, FieldModel, Language, ObjectField, Schema } from '@nascentdigital/funnel-core';
+import { EventBus, Field, FieldList, FieldModel, Language, ObjectField, Schema, SchemaToField } from '@nascentdigital/funnel-core';
 import { Observable } from 'rxjs';
-import { type CollectionRepository } from '../repository';
+import { StringKeyOf } from 'type-fest';
+import { ICollectionRepository } from '../repository';
 import { Asset } from './Asset';
 import { IAssetStore } from './IAssetStore';
 import { ICollectionStore } from './ICollectionStore';
 import { ITagged } from './ITagged';
 import { Item } from './Item';
-export declare class CollectionFieldProxy implements IAssetStore, ICollectionStore, ITagged {
-    readonly collectionRepository: CollectionRepository;
+export declare class CollectionFieldProxy<TCollection extends Schema.Collection = Schema.Collection> implements IAssetStore, ICollectionStore, ITagged {
+    readonly collectionRepository: ICollectionRepository;
     readonly collectionStore: ICollectionStore;
     readonly assetStore: IAssetStore;
-    readonly schema: Schema.CollectionField;
-    readonly collectionSchema: Schema.Collection;
+    readonly schema: Schema.CollectionField<TCollection>;
+    readonly collectionSchema: TCollection;
     readonly language: Language;
     readonly eventBus: EventBus;
     private _initialValue?;
@@ -49,6 +50,7 @@ export declare class CollectionFieldProxy implements IAssetStore, ICollectionSto
     get modified(): boolean;
     get value(): Schema.CollectionField.Value;
     getInlineData(): Schema.Collection.Data.AsInline;
+    getField<TFields extends CollectionFieldProxy.Fields<TCollection>, TFieldId extends StringKeyOf<TFields>>(fieldId: TFieldId): SchemaToField<TFields[TFieldId]>;
     getAssetScope(range: Schema.AssetScope.Range): Schema.AssetScope;
     getSearchScope(): AssetClient.GetAssets.Scope;
     getAsset(assetId: Asset.Id): Asset | undefined;
@@ -61,7 +63,7 @@ export declare class CollectionFieldProxy implements IAssetStore, ICollectionSto
     onSaveComplete(): void;
     save(shared?: boolean): Promise<void>;
     private raiseEvent;
-    static create(args: CollectionFieldProxy.CreateArgs): Promise<CollectionFieldProxy>;
+    static create<TCollection extends Schema.Collection = Schema.Collection>(args: CollectionFieldProxy.CreateArgs): Promise<CollectionFieldProxy<TCollection>>;
     /**
      * Data format could be either flattened data or inline data.
      * Either way get the underlying inline collection data.
@@ -69,8 +71,10 @@ export declare class CollectionFieldProxy implements IAssetStore, ICollectionSto
     private dataFrom;
 }
 export declare namespace CollectionFieldProxy {
+    type Fields<TCollection extends Schema.Collection> = Schema.Fields.UnwrapOptional<TCollection['fields']>;
+    type Keys<TCollection extends Schema.Collection> = StringKeyOf<Fields<TCollection>>;
     type ConstructorArgs = {
-        collectionRepository: CollectionRepository;
+        collectionRepository: ICollectionRepository;
         collectionStore: ICollectionStore;
         assetStore: IAssetStore;
         schema: Schema.CollectionField;

package/dist/core/domain/CollectionFieldProxy.js

@@ -150,8 +150,6 @@ class CollectionFieldProxy {
         this.raiseEvent('changed');
     }
     get valid() {
-        const valid = this.allFields.map(field => ({ id: field.id, valid: field.valid, field }));
-        console.debug('[CollectionFieldProxy/valid] validation: ', valid);
         return this.allFields.every(field => field.valid);
     }
     get initialErrors() {
@@ -189,6 +187,15 @@ class CollectionFieldProxy {
             }, {})
         };
     }
+    getField(fieldId) {
+        // find field (or throw)
+        const field = this.fields.find(field => field.id === fieldId);
+        if (!field) {
+            throw new funnel_core_1.IllegalStateError(`${this.schema.type} collection doesn't seem to have the ${fieldId} field`);
+        }
+        // return field
+        return field;
+    }
     getAssetScope(range) {
         switch (range) {
             case 'global':
@@ -307,9 +314,8 @@ class CollectionFieldProxy {
             if (!initialData) {
                 console.debug('[CollectionFieldProxy/save] creating remote instance');
                 // create item (fail if we don't get a collection - shouldn't happen)
-                const { collection: collectionData } = await collectionRepository.editorApi.createCollection({
-                    type: collectionSchema.type,
-                    version: collectionSchema.version,
+                const { collection: collectionData } = await collectionRepository.createRaw({
+                    template: collectionSchema,
                     language,
                     name,
                     tags: []
@@ -328,13 +334,13 @@ class CollectionFieldProxy {
             console.debug('[CollectionFieldProxy/save] updating remote instance', initialData);
             // create update
             const savables = [];
-            const update = collectionRepository.serializeCollectionUpdate(this, savables);
+            const update = collectionRepository.serializeUpdate(this, savables);
             console.debug('[CollectionFieldProxy/save] created update', update);
             // start all updates
             this.onSaveStart();
             savables.forEach(savable => savable.onSaveStart());
             // update page
-            const { collection } = await collectionRepository.editorApi.updateCollection(update);
+            const { collection } = await collectionRepository.update(update);
             // update collection in store and reset if updated
             if (collection) {
                 // add to collection store
@@ -384,7 +390,7 @@ class CollectionFieldProxy {
         let initialData;
         const { collectionRepository, initialValue } = args;
         if (funnel_core_1.Schema.CollectionField.Value.ForRef.filter(initialValue)) {
-            initialData = await collectionRepository.editorApi.getCollection({ id: initialValue.id, version: 'draft' });
+            initialData = await collectionRepository.get({ id: initialValue.id, version: 'draft' });
         }
         // or use initial value as data
         else {

package/dist/core/domain/CollectionGroup.d.ts

@@ -1,15 +1,11 @@
 import { Schema } from '@nascentdigital/funnel-core';
-import { Collection } from './Collection';
 export declare class CollectionGroup {
     readonly template: Schema.Collection;
     readonly groupId: Schema.Collection.GroupId;
     readonly brand?: string;
     readonly name: string;
     readonly collections: ReadonlyArray<CollectionGroup.CollectionRef>;
-    private _collection?;
     constructor(args: CollectionGroup.ConstructorArgs);
-    get collection(): Collection | undefined;
-    set collection(collection: Collection | undefined);
 }
 export declare namespace CollectionGroup {
     type ConstructorArgs = {
@@ -18,7 +14,6 @@ export declare namespace CollectionGroup {
         brand?: string;
         name: string;
         collections: CollectionRef[];
-        collection?: Collection;
     };
     type CollectionRef = Schema.Collection.Data.AsGroup.Instance;
 }

package/dist/core/domain/CollectionGroup.js

@@ -10,13 +10,6 @@ class CollectionGroup {
         this.brand = args.brand;
         this.name = args.name;
         this.collections = args.collections;
-        this._collection = args.collection;
-    }
-    get collection() {
-        return this._collection;
-    }
-    set collection(collection) {
-        this._collection = collection;
     }
 }
 exports.CollectionGroup = CollectionGroup;

package/dist/core/domain/CollectionSummary.d.ts

@@ -1,5 +1,5 @@
 import { Language, Schema } from '@nascentdigital/funnel-core';
-import { Collection } from './Collection';
+import { ICollection } from './ICollection';
 export declare class CollectionSummary {
     readonly template: Schema.Collection;
     readonly brand: string;
@@ -13,7 +13,7 @@ export declare class CollectionSummary {
     get type(): Schema.Collection.Type;
     hasLanguage(language: Language): boolean;
     findCollection({ language, fallbackLanguage }: CollectionSummary.GetClosestOptions): CollectionSummary.CollectionRef;
-    getClosestCollectionRef(language: Language, fallback?: Language): Collection.Ref | undefined;
+    getClosestCollectionRef(language: Language, fallback?: Language): ICollection.Ref | undefined;
 }
 export declare namespace CollectionSummary {
     type Status = 'draft' | 'ready' | 'live' | 'changed' | 'empty';

package/dist/core/domain/Collections.d.ts

@@ -1,11 +1,11 @@
 import { EventBus, Schema } from '@nascentdigital/funnel-core';
 import { Observable } from 'rxjs';
 import { AppState } from '../app';
-import { EditorApiClient } from '../client';
+import { ICollectionRepository } from '../repository';
 import { CollectionBrowser } from './CollectionBrowser';
 export declare class Collections {
     readonly appState: AppState;
-    readonly editorApi: EditorApiClient;
+    readonly repository: ICollectionRepository;
     readonly schemas: ReadonlyArray<Schema.Collection>;
     private readonly _eventBus;
     private _state;
@@ -27,7 +27,7 @@ export declare namespace Collections {
     type State = 'uninitialized' | 'initializing' | 'ready' | 'syncing' | 'error';
     type ConstructorArgs = {
         appState: AppState;
-        editorApi: EditorApiClient;
+        repository: ICollectionRepository;
     };
     interface Event extends EventBus.Event<'Collections', Event.Type> {
         collections: Collections;

package/dist/core/domain/Collections.js

@@ -8,7 +8,7 @@ class Collections {
     constructor(args) {
         // initialize instance variables
         this.appState = args.appState;
-        this.editorApi = args.editorApi;
+        this.repository = args.repository;
         this.schemas = funnel_core_1.Schema.Site.current().collections;
         this._eventBus = new funnel_core_1.EventBus();
         this._state = 'uninitialized';
@@ -60,9 +60,9 @@ class Collections {
                     ? 'initializing'
                     : 'syncing';
                 // load collections
-                const { editorApi } = this;
-                const overviews = await editorApi.getCollectionsOverview({ version: 'draft' });
-                this._collections = overviews.map(overview => new CollectionBrowser_1.CollectionBrowser({ editorApi, overview }));
+                const { repository } = this;
+                const overviews = await repository.getOverview({ version: 'draft' });
+                this._collections = overviews.map(overview => new CollectionBrowser_1.CollectionBrowser({ repository, overview }));
                 // mark as ready
                 this.state = 'ready';
             }

package/dist/core/domain/ICollection.d.ts

@@ -0,0 +1,71 @@
+import { EventBus, Field, FieldList, FieldModel, Language, ObjectField, Schema } from '@nascentdigital/funnel-core';
+import type { Observable } from 'rxjs';
+import type { Asset } from './Asset';
+import type { IAssetStore } from './IAssetStore';
+import type { ICollectionStore } from './ICollectionStore';
+import type { IPageRefStore } from './IPageRefStore';
+import type { ITagged } from './ITagged';
+import type { Item } from './Item';
+import type { CollectionGroup } from './CollectionGroup';
+export interface ICollection extends IAssetStore, ICollectionStore, IPageRefStore, ITagged {
+    readonly template: Schema.Collection;
+    readonly id: Schema.Collection.Id;
+    readonly type: Schema.Collection.Type;
+    readonly groupId: Schema.Collection.GroupId;
+    readonly events$: Observable<ICollection.Events>;
+    readonly name: string;
+    readonly nameField: Field<Schema.TextField>;
+    readonly fields: ReadonlyArray<FieldModel>;
+    readonly state: Schema.Collection.State;
+    readonly published: boolean;
+    readonly valid: boolean;
+    readonly errors: ICollection.Errors;
+    readonly changeSetId?: Schema.ChangeSet.Id;
+    readonly publishedOn?: number;
+    readonly createdOn: number;
+    readonly updatedOn: number;
+}
+export declare namespace ICollection {
+    type Ref = {
+        id: Schema.Collection.Id;
+        groupId: Schema.Collection.GroupId;
+        brand?: string;
+        template: Schema.Collection;
+        language: Language;
+        version: number;
+        name: string;
+        tags: Schema.Tag[];
+        state: Schema.Collection.State;
+        errors: boolean;
+        changeSetId?: Schema.ChangeSet.Id;
+        snapshotId?: Schema.CollectionSnapshot.Id;
+        createdOn: number;
+        updatedOn: number;
+        publishedOn?: number;
+    };
+    type References = {
+        collections: Schema.Collection.Data.AsLink[];
+        assets: Asset[];
+    };
+    type WithGroup = {
+        group: CollectionGroup;
+        collection?: ICollection;
+    };
+    type Changes = {
+        collection: ICollection;
+        fields: Array<FieldModel>;
+    };
+    type Errors = {
+        collection: ICollection;
+        fields: Array<FieldModel>;
+    };
+    type Events = Event | Item.Event | Field.Event | ObjectField.Event | FieldList.Event;
+    interface Event extends EventBus.Event<'Collection', Event.Type> {
+        collection: ICollection;
+    }
+    namespace Event {
+        type Type = 'changed' | 'modified';
+        function filter(event: EventBus.Event): event is Event;
+        function create(event: EventBus.Args<Event>): Event;
+    }
+}

package/dist/core/domain/ICollection.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ICollection = void 0;
+const funnel_core_1 = require("@nascentdigital/funnel-core");
+// extension
+var ICollection;
+(function (ICollection) {
+    let Event;
+    (function (Event) {
+        // methods
+        function filter(event) {
+            return event.domain === 'Collection';
+        }
+        Event.filter = filter;
+        function create(event) {
+            return funnel_core_1.EventBus.createEvent(Object.assign({ domain: 'Collection' }, event));
+        }
+        Event.create = create;
+    })(Event = ICollection.Event || (ICollection.Event = {}));
+})(ICollection || (exports.ICollection = ICollection = {}));