@nascentdigital/funnel-core 4.4.16 → 4.4.18

package/dist/schema/Collection.d.ts

@@ -1,5 +1,6 @@
 import { Tagged } from 'type-fest';
 import { Language } from '../regionalization';
+import { UndefinedToNull } from '../types';
 import { Asset } from './Asset';
 import type { ChangeSet } from './ChangeSet';
 import type { CollectionSnapshot } from './CollectionSnapshot';
@@ -31,16 +32,20 @@ export declare namespace Collection {
     type GroupId = Tagged<string, 'funnel.Collection.GroupId'>;
     type Type = Tagged<string, 'funnel.Collection.Type'>;
     type State = 'draft' | 'published' | 'unpublished';
-    type Update = Update.Name | Update.Tag | Update.ObjectInsert | Update.ArrayInsert | Update.ArrayDelete | Update.ArrayReorder | Update.Value;
+    type Update = Update.Collection | Update.ObjectInsert | Update.ArrayInsert | Update.ArrayDelete | Update.ArrayReorder | Update.Value;
     namespace Update {
-        type Name = {
-            type: 'name';
-            name: string;
-        };
-        type Tag = {
-            type: 'tags';
-            tags: TagGroup.Data;
-        };
+        type Collection = Collection.Name | Collection.Tags | Collection.Errors;
+        namespace Collection {
+            type Factory<TProp extends keyof Data> = {
+                type: 'collection';
+                property: TProp;
+                value: UndefinedToNull<Data[TProp]>;
+            };
+            export type Name = Factory<'name'>;
+            export type Tags = Factory<'tags'>;
+            export type Errors = Factory<'errors'>;
+            export {};
+        }
         type Value = {
             type: 'value';
             path: string[];

package/dist/schema/CollectionModel.d.ts

@@ -12,8 +12,7 @@ export declare class CollectionModel {
      * @param updates - a collection of updates to be applied to this collection.
      */
     update(updates: ReadonlyArray<Collection.Update>): void;
-    private updateName;
-    private updateTags;
+    private updateCollection;
     private updateObjectInsert;
     private updateArrayInsert;
     private updateArrayDelete;

package/dist/schema/CollectionModel.js

@@ -34,11 +34,8 @@ class CollectionModel {
         // apply updates
         updates.forEach(update => {
             switch (update.type) {
-                case 'name':
-                    this.updateName(update);
-                    break;
-                case 'tags':
-                    this.updateTags(update);
+                case 'collection':
+                    this.updateCollection(update);
                     break;
                 case 'object.insert':
                     this.updateObjectInsert(update);
@@ -57,18 +54,15 @@ class CollectionModel {
                     break;
             }
         });
-        // finally, sync the model
-        this.sync();
-    }
-    updateName(update) {
-        // replace name
-        const { data: collection } = this;
-        collection.name = update.name;
     }
-    updateTags(update) {
-        // replace tags
-        const { data: collection } = this;
-        collection.tags = update.tags;
+    updateCollection(update) {
+        // clear value if updated value is null
+        const collection = this.data;
+        // if (update.value === null) {
+        //   delete collection[update.property]
+        // }
+        // update value
+        collection[update.property] = update.value;
     }
     updateObjectInsert(_a) {
         var { value } = _a, update = __rest(_a, ["value"]);

package/dist/schema/Page.d.ts

@@ -1,6 +1,6 @@
 import { StringKeyOf, Tagged } from 'type-fest';
 import { Language, Localized } from '../regionalization';
-import { PartialBy } from '../types';
+import { PartialBy, UndefinedToNull } from '../types';
 import { Asset } from './Asset';
 import { Block } from './Block';
 import type { ChangeSet } from './ChangeSet';
@@ -50,7 +50,6 @@ export declare namespace Page {
     namespace Update {
         type Page = Page.Name | Page.Tags | Page.Slug | Page.Url | Page.Preview | Page.Errors | Page.Publication;
         namespace Page {
-            type UndefinedToNull<T> = T extends undefined ? null : T;
             type Factory<TProp extends keyof Data> = {
                 type: 'page';
                 property: TProp;

package/dist/schema/PageModel.js

@@ -98,12 +98,12 @@ class PageModel {
         });
     }
     updatePage(update) {
-        // clear value
+        // clear value if updated value is null
         const page = this.data;
         if (update.value === null) {
             delete page[update.property];
         }
-        // update value
+        // otherwise update value
         else {
             page[update.property] = update.value;
         }

package/dist/schema/PageSnapshot.d.ts

@@ -1,7 +1,7 @@
 import { Tagged } from 'type-fest';
 import { RequiredBy } from '../types';
 import type { Page } from './Page';
-export type PageSnapshot = RequiredBy<Pick<Page.Data, Exclude<Page.Data.Props.Id, 'id'> | Page.Data.Props.Content | 'createdOn' | 'updatedOn' | 'changeSetId' | 'publication'>, 'changeSetId'> & {
+export type PageSnapshot = RequiredBy<Pick<Page.Data<any>, Exclude<Page.Data.Props.Id, 'id'> | Page.Data.Props.Content | 'createdOn' | 'updatedOn' | 'changeSetId' | 'publication'>, 'changeSetId'> & {
     id: PageSnapshot.Id;
 };
 export declare namespace PageSnapshot {

package/dist/types/UndefinedToNull.d.ts

@@ -0,0 +1 @@
+export type UndefinedToNull<T> = T extends undefined ? null : T;

package/dist/types/UndefinedToNull.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/index.d.ts

@@ -12,3 +12,4 @@ export * from './RequiredBy';
 export * from './Result';
 export * from './Timestamp';
 export * from './Transform';
+export * from './UndefinedToNull';

package/dist/types/index.js

@@ -28,3 +28,4 @@ __exportStar(require("./RequiredBy"), exports);
 __exportStar(require("./Result"), exports);
 __exportStar(require("./Timestamp"), exports);
 __exportStar(require("./Transform"), exports);
+__exportStar(require("./UndefinedToNull"), exports);

package/dist/ui/block-layout/BlockLayout.d.ts

@@ -85,7 +85,7 @@ export declare namespace BlockLayout {
     namespace FullBleed {
         function parse(value: string, fallback?: boolean): boolean;
     }
-    type MobileOrder = 'first' | 'last';
+    type MobileOrder = 'first' | 'last' | 'auto';
     namespace MobileOrder {
         const values: ReadonlyArray<MobileOrder>;
         function parse(value: string, fallback?: MobileOrder): MobileOrder | undefined;

package/dist/ui/block-layout/BlockLayout.js

@@ -216,14 +216,19 @@ var BlockLayout;
     (function (ResponsiveValue) {
         function parse({ element, property, parser, fallback: fallbackRaw }) {
             var _a, _b;
+            // capture base
+            const { attributes } = element;
+            const fallbackBase = typeof fallbackRaw === 'string' || typeof fallbackRaw === 'boolean'
+                ? fallbackRaw
+                : fallbackRaw.base;
+            const base = parser(attributes[property], fallbackBase);
             // normalize the fallback
             const fallback = typeof fallbackRaw === 'string' || typeof fallbackRaw === 'boolean'
-                ? { base: fallbackRaw, mobile: fallbackRaw, desktop: fallbackRaw }
-                : { base: fallbackRaw.base, mobile: (_a = fallbackRaw.mobile) !== null && _a !== void 0 ? _a : fallbackRaw.base, desktop: (_b = fallbackRaw.desktop) !== null && _b !== void 0 ? _b : fallbackRaw.base };
+                ? { base, mobile: base, desktop: base }
+                : { base, mobile: (_a = fallbackRaw.mobile) !== null && _a !== void 0 ? _a : base, desktop: (_b = fallbackRaw.desktop) !== null && _b !== void 0 ? _b : base };
             // fetch the values from the element
-            const { attributes } = element;
             return {
-                base: parser(attributes[property], fallback.base),
+                base,
                 mobile: parser(attributes[`${property}Mobile`], fallback.mobile),
                 desktop: parser(attributes[`${property}Desktop`], fallback.desktop)
             };
@@ -375,7 +380,7 @@ function parsePanel(element) {
 }
 function parseItemAttributes(attributes) {
     return {
-        mobileOrder: BlockLayout.MobileOrder.parse(attributes['mobileOrder']),
+        mobileOrder: BlockLayout.MobileOrder.parse(attributes['mobileOrder'], 'auto'),
         alignX: BlockLayout.Alignment.parse(attributes['alignX'], 'start'),
         alignY: BlockLayout.Alignment.parse(attributes['alignY'], 'start'),
         size: BlockLayout.Size.parse(attributes['size'], 'full')

package/dist/ui/fields/Field.d.ts

@@ -17,6 +17,7 @@ export declare class Field<TSchema extends Schema.Field.Type = Schema.Field.Type
     private _sandboxed;
     private _sandboxedValue;
     private readonly _validator;
+    private _customValidator?;
     private _errors;
     private _optIn?;
     private _optOut?;
@@ -29,6 +30,8 @@ export declare class Field<TSchema extends Schema.Field.Type = Schema.Field.Type
     get error(): FieldValidator.Error | undefined;
     getErrors(level: FieldValidator.Error.Level): readonly FieldValidator.Error[];
     get errors(): ReadonlyArray<FieldValidator.Error>;
+    get customValidator(): FieldValidator | undefined;
+    set customValidator(validator: FieldValidator | undefined);
     get defaultValue(): Field.Value<TSchema> | undefined;
     get initialValue(): Field.Value<TSchema> | undefined;
     get hasValue(): boolean;
@@ -71,6 +74,7 @@ export declare namespace Field {
         publishedValue?: Value<TSchema>;
         initialValue?: Value<TSchema>;
         required: boolean;
+        customValidator?: FieldValidator;
     };
     type Value<TSchema extends Schema.Field.Type = Schema.Field.Type> = Schema.Field.Data<TSchema>;
     interface Event extends EventBus.Event<'Field', Event.Type> {

package/dist/ui/fields/Field.js

@@ -56,8 +56,12 @@ class Field {
         this._editing = false;
         this._sandboxed = false;
         this._validator = FieldValidator_1.FieldValidator.create(this);
+        this._customValidator = args.customValidator;
         // validate
         this._errors = this._validator.validate(this, this._initialValue);
+        if (this._customValidator) {
+            this._errors = [...this._errors, ...this._customValidator.validate(this, this._initialValue)];
+        }
     }
     get events$() {
         return this.eventBus.events$.pipe((0, rxjs_1.filter)(Field.Event.filter), (0, rxjs_1.filter)(e => e.field === this));
@@ -82,11 +86,32 @@ class Field {
         return FieldValidator_1.FieldValidator.Error.mostRelevant(this._errors);
     }
     getErrors(level) {
-        return this._validator.filter(this._errors, level);
+        // filter with fixed validator
+        const { _errors, _validator, _customValidator } = this;
+        let errors = _validator.filter(_errors, level);
+        // then with custom (if available)
+        if (_customValidator) {
+            errors = _customValidator.filter(errors, level);
+        }
+        // return errors
+        return errors;
     }
     get errors() {
         return this._errors;
     }
+    get customValidator() {
+        return this._customValidator;
+    }
+    set customValidator(validator) {
+        // ignore if unchanged
+        if (this._customValidator === validator) {
+            return;
+        }
+        // update validator
+        this._customValidator = validator;
+        // revalidate
+        this.validate();
+    }
     get defaultValue() {
         // no default if it's not required
         const { schema } = this;
@@ -231,8 +256,13 @@ class Field {
         delete this._shouldFocus;
     }
     validate(silent = false) {
-        // validate (skip if nothing has changed
-        const errors = this._validator.validate(this, this._value);
+        // validate (use custom if available)
+        const { _value, _validator, customValidator } = this;
+        let errors = _validator.validate(this, _value);
+        if (customValidator) {
+            errors = [...errors, ...customValidator.validate(this, _value)];
+        }
+        // skip if nothing has changed
         if (utils_1.Value.equals(errors, this._errors)) {
             return this._errors;
         }

package/dist/ui/fields/errors.json

@@ -18,7 +18,8 @@
         "date.maxDate": "${label} cannot be after ${maxDate}",
         "timestamp": "${label} is not a valid date/time",
         "timestamp.minTime": "${label} cannot be before ${minTime}",
-        "timestamp.maxTime": "${label} cannot be after ${maxTime}"
+        "timestamp.maxTime": "${label} cannot be after ${maxTime}",
+        "duplicate": "${label} is already in use"
     },
     "fr": {
         "required": "${label} is required",
@@ -39,6 +40,7 @@
         "date.maxDate": "${label} cannot be after ${maxDate}",
         "timestamp": "${label} is not a valid date/time",
         "timestamp.minTime": "${label} cannot be before ${minTime}",
-        "timestamp.maxTime": "${label} cannot be after ${maxTime}"
+        "timestamp.maxTime": "${label} cannot be after ${maxTime}",
+        "duplicate": "${label} est déjà utilisé"
     }
 }

package/dist/ui/fields/index.d.ts

@@ -5,3 +5,4 @@ export * from './FieldModel';
 export * from './FieldSerializer';
 export * from './FieldValidator';
 export * from './ObjectField';
+export * from './validators/ValidatorHelper';

package/dist/ui/fields/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./FieldModel"), exports);
 __exportStar(require("./FieldSerializer"), exports);
 __exportStar(require("./FieldValidator"), exports);
 __exportStar(require("./ObjectField"), exports);
+__exportStar(require("./validators/ValidatorHelper"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-core",
-  "version": "4.4.16",
+  "version": "4.4.18",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/core"