@nascentdigital/funnel-core 4.4.16 → 4.4.17

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/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.17",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/core"
@@ -64,5 +64,5 @@
     "jest-tsd": "^0.2.2",
     "ts-jest": "^29.3.2"
   },
-  "gitHead": "d1bfd4468426b7326bd9662cd169242867025f5e"
+  "gitHead": "f343d2af0dff3dd7e8ae12a9ab83bceb93381ec2"
 }