@nascentdigital/funnel-core 4.4.4 → 4.4.13

package/dist/schema/ChangeSet.d.ts

@@ -105,4 +105,10 @@ export declare namespace ChangeSet {
         };
     }
     type ConstructorArgs = Omit<Data, 'errors'>;
+    type AddChangeArgs<TChange extends Change> = {
+        changes: TChange[];
+        change: Omit<TChange, 'attribution'>;
+        userId: string;
+    };
+    function addChange<TChange extends Change>({ changes, change, userId }: AddChangeArgs<TChange>): void;
 }

package/dist/schema/ChangeSet.js

@@ -81,7 +81,7 @@ class ChangeSet {
     }
     addPageChange(userId, change) {
         // apply change
-        addChange({
+        ChangeSet.addChange({
             changes: this._changes,
             change,
             userId
@@ -98,7 +98,7 @@ class ChangeSet {
     }
     addCollectionChange(userId, change) {
         // apply change
-        addChange({
+        ChangeSet.addChange({
             changes: this._changes,
             change,
             userId
@@ -115,7 +115,7 @@ class ChangeSet {
     }
     addAssetChange(userId, change) {
         // apply change
-        addChange({
+        ChangeSet.addChange({
             changes: this._changes,
             change,
             userId
@@ -162,26 +162,27 @@ exports.ChangeSet = ChangeSet;
             New.filter = filter;
         })(New = Data.New || (Data.New = {}));
     })(Data = ChangeSet.Data || (ChangeSet.Data = {}));
-})(ChangeSet || (exports.ChangeSet = ChangeSet = {}));
-function addChange({ changes, change, userId }) {
-    // update existing page
-    const updatedOn = Date.now();
-    const changeIndex = changes.findIndex(({ id }) => change.id === id);
-    if (changeIndex >= 0) {
-        // update attribution (skip if it's the same change by the same user)
-        const _a = changes[changeIndex], { type, attribution } = _a, existingChange = __rest(_a, ["type", "attribution"]);
-        const lastAttribution = attribution.length > 0
-            ? attribution[attribution.length - 1]
-            : undefined;
-        if ((lastAttribution === null || lastAttribution === void 0 ? void 0 : lastAttribution.userId) !== userId || change.type !== type) {
-            attribution.push({ userId, updatedOn });
+    function addChange({ changes, change, userId }) {
+        // update existing page
+        const updatedOn = Date.now();
+        const changeIndex = changes.findIndex(({ id }) => change.id === id);
+        if (changeIndex >= 0) {
+            // update attribution (skip if it's the same change by the same user)
+            const _a = changes[changeIndex], { type, attribution } = _a, existingChange = __rest(_a, ["type", "attribution"]);
+            const lastAttribution = attribution.length > 0
+                ? attribution[attribution.length - 1]
+                : undefined;
+            if ((lastAttribution === null || lastAttribution === void 0 ? void 0 : lastAttribution.userId) !== userId || change.type !== type) {
+                attribution.push({ userId, updatedOn });
+            }
+            // update change
+            changes[changeIndex] = Object.assign(Object.assign(Object.assign({}, existingChange), change), { type,
+                attribution });
+        }
+        // or add a new one
+        else {
+            changes.push(Object.assign(Object.assign({}, change), { attribution: [{ userId, updatedOn }] }));
         }
-        // update change
-        changes[changeIndex] = Object.assign(Object.assign(Object.assign({}, existingChange), change), { type,
-            attribution });
-    }
-    // or add a new one
-    else {
-        changes.push(Object.assign(Object.assign({}, change), { attribution: [{ userId, updatedOn }] }));
     }
-}
+    ChangeSet.addChange = addChange;
+})(ChangeSet || (exports.ChangeSet = ChangeSet = {}));

package/dist/schema/PageModel.d.ts

@@ -15,7 +15,7 @@ export declare class PageModel<TPage extends Page = Page> {
      *
      * @param updates - a collection of updates to be applied to this page.
      */
-    update(updates: ReadonlyArray<Page.Update>): void;
+    update(updates: ReadonlyArray<Page.Update>, skipSync?: boolean): void;
     private updateTags;
     private updateBlockCreate;
     private updateBlockDelete;

package/dist/schema/PageModel.js

@@ -54,7 +54,7 @@ class PageModel {
      *
      * @param updates - a collection of updates to be applied to this page.
      */
-    update(updates) {
+    update(updates, skipSync = false) {
         // apply updates
         updates.forEach(update => {
             switch (update.type) {
@@ -97,7 +97,9 @@ class PageModel {
             }
         });
         // finally, sync the model
-        this.sync();
+        if (!skipSync) {
+            this.sync();
+        }
     }
     updateTags(update) {
         // replace slug

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

@@ -11,6 +11,8 @@ export declare class Field<TSchema extends Schema.Field.Type = Schema.Field.Type
     private readonly publishedValue;
     private _initialValue;
     private _value;
+    private _modifiedOn?;
+    private _savingOn?;
     private _editing;
     private _sandboxed;
     private _sandboxedValue;
@@ -48,6 +50,8 @@ export declare class Field<TSchema extends Schema.Field.Type = Schema.Field.Type
     didFocus(): void;
     validate(silent?: boolean): ReadonlyArray<FieldValidator.Error>;
     migrate(previous: Field<TSchema>): void;
+    onSaveStart(): void;
+    onSaveComplete(): void;
     reset(initialValue?: Schema.Field.Data<TSchema> | null): void;
     clone({ schema, eventBus, name, required }?: Field.CloneArgs<TSchema>): Field<TSchema>;
     private raiseEvent;

package/dist/ui/fields/Field.js

@@ -122,6 +122,7 @@ class Field {
         }
         // update value
         this._value = value;
+        this._modifiedOn = Date.now();
         // raise change event
         this.raiseEvent('changed');
         // raise error (if any)
@@ -134,6 +135,7 @@ class Field {
         }
         // update value
         this._value = value;
+        this._modifiedOn = Date.now();
         // raise error (if any)
         this.validate(true);
     }
@@ -189,6 +191,7 @@ class Field {
         }
         // rollback sandbox
         this._value = this._sandboxedValue;
+        this._modifiedOn = Date.now();
         this._sandboxed = false;
         // raise event
         this.raiseEvent('changed');
@@ -244,10 +247,25 @@ class Field {
     }
     migrate(previous) {
         this._value = previous.value;
+        this._modifiedOn = previous._modifiedOn;
         this._editing = true;
         this._sandboxed = previous._sandboxed;
         this._sandboxedValue = previous._sandboxedValue;
     }
+    onSaveStart() {
+        this._savingOn = Date.now();
+    }
+    onSaveComplete() {
+        // reset to initial value if not modified or if save is newer
+        const { _modifiedOn, _savingOn } = this;
+        if (_savingOn && (!_modifiedOn || _savingOn >= _modifiedOn)) {
+            this._initialValue = this._value;
+            delete this._optIn;
+            delete this._optOut;
+        }
+        // clear saving flag
+        delete this._savingOn;
+    }
     reset(initialValue) {
         // reset initial value if it's set
         if (initialValue !== undefined) {

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

@@ -8,11 +8,13 @@ export declare class FieldList {
     readonly schema: FieldList.ListSchema;
     readonly composition: FieldList.ListComposition;
     private _items;
+    private _modifiedOn?;
+    private _savingOn?;
     readonly id: string;
     readonly name: string;
     readonly required: boolean;
     private readonly eventBus;
-    readonly initialValue: FieldList.ListValue | undefined;
+    private _initialValue;
     readonly publishedValue: FieldList.ListValue | undefined;
     private readonly _validator;
     private _errors;
@@ -20,6 +22,7 @@ export declare class FieldList {
     private _optOut?;
     constructor(args: FieldList.ConstructorArgs);
     get events$(): Observable<FieldList.Event>;
+    get initialValue(): Schema.Field.Data.ForCompositeType<FieldList.ListSchema> | undefined;
     get items(): ReadonlyArray<FieldList.Item>;
     get isNew(): boolean;
     get exists(): boolean;
@@ -45,6 +48,8 @@ export declare class FieldList {
     removeItem(itemId: string): void;
     removeField(field: Field | ObjectField): void;
     moveItem(fromIndex: number, toIndex: number): void;
+    onSaveStart(): void;
+    onSaveComplete(): void;
     reset(initialValue?: FieldList.ListValue | null): void;
     clone(): FieldList;
     private raiseEvent;

package/dist/ui/fields/FieldList.js

@@ -70,7 +70,7 @@ class FieldList {
         this.id = args.id;
         this.name = args.name;
         this.required = args.required;
-        this.initialValue = args.initialValue;
+        this._initialValue = args.initialValue;
         this.publishedValue = args.publishedValue;
         this._validator = new FieldListValidator_1.FieldListValidator(this.schema);
         // validate
@@ -79,6 +79,9 @@ class FieldList {
     get events$() {
         return this.eventBus.events$.pipe((0, rxjs_1.filter)(FieldList.Event.filter), (0, rxjs_1.filter)(e => e.field === this));
     }
+    get initialValue() {
+        return this._initialValue;
+    }
     get items() {
         return this._items;
     }
@@ -127,6 +130,7 @@ class FieldList {
             value,
             publishedValue
         });
+        this._modifiedOn = Date.now();
         // revalidate
         this.validate();
         // raise event
@@ -221,6 +225,7 @@ class FieldList {
         };
         // add to list
         this._items = [...this._items, item];
+        this._modifiedOn = Date.now();
         // revalidate
         this.validate();
         // raise event
@@ -234,6 +239,8 @@ class FieldList {
         this._items = this._items.filter(({ id }) => !itemIds.includes(id));
         // raise event (if there are changes)
         if (this._items.length !== itemCount) {
+            // update modified
+            this._modifiedOn = Date.now();
             // revalidate
             this.validate();
             // raise change
@@ -268,11 +275,26 @@ class FieldList {
         items.splice(toIndex, 0, item);
         // update items
         this._items = items;
+        this._modifiedOn = Date.now();
         // revalidate
         this.validate();
         // raise change
         this.raiseEvent('changed');
     }
+    onSaveStart() {
+        this._savingOn = Date.now();
+    }
+    onSaveComplete() {
+        // reset to initial value if not modified or if save is newer
+        const { _modifiedOn, _savingOn } = this;
+        if (_savingOn && (!_modifiedOn || _savingOn >= _modifiedOn)) {
+            this._initialValue = this.value;
+            delete this._optIn;
+            delete this._optOut;
+        }
+        // clear saving flag
+        delete this._savingOn;
+    }
     reset(initialValue) {
         // re-bind new initial values
         if (initialValue || initialValue === null) {
@@ -287,6 +309,8 @@ class FieldList {
         else {
             this._items.forEach(({ field }) => field.reset());
         }
+        // mark modified
+        this._modifiedOn = Date.now();
         // revalidate
         this.validate();
         // raise final change

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

@@ -15,6 +15,8 @@ export declare class ObjectField {
     private readonly _content;
     private readonly _fields;
     private _initialValue;
+    private _modifiedOn?;
+    private _savingOn?;
     private _optIn?;
     private _optOut?;
     constructor(args: ObjectField.ConstructorArgs);
@@ -40,6 +42,8 @@ export declare class ObjectField {
     get shouldFocus(): boolean;
     didFocus(): boolean;
     getString(key: string | undefined): string | undefined;
+    onSaveStart(): void;
+    onSaveComplete(): void;
     reset(initialValue?: ObjectField.Value | null): void;
     clone(): ObjectField;
     private raiseEvent;

package/dist/ui/fields/ObjectField.js

@@ -93,6 +93,8 @@ class ObjectField {
                 field.value = values[key];
             }
         });
+        // mark modified
+        this._modifiedOn = Date.now();
     }
     get modified() {
         // modified if opted in/our
@@ -179,9 +181,25 @@ class ObjectField {
                 return undefined;
         }
     }
+    onSaveStart() {
+        this._savingOn = Date.now();
+    }
+    onSaveComplete() {
+        // reset to initial value if not modified or if save is newer
+        const { _modifiedOn, _savingOn } = this;
+        if (_savingOn && (!_modifiedOn || _savingOn >= _modifiedOn)) {
+            this._initialValue = this.value;
+            delete this._optIn;
+            delete this._optOut;
+        }
+        // clear saving flag
+        delete this._savingOn;
+    }
     reset(initialValue) {
         var _a;
+        // reset fields using specified value
         if (initialValue !== undefined) {
+            // update initial value
             this._initialValue = initialValue !== null && initialValue !== void 0 ? initialValue : undefined;
             // re-bind new initial values
             const values = (_a = initialValue === null || initialValue === void 0 ? void 0 : initialValue.value) !== null && _a !== void 0 ? _a : {};
@@ -198,10 +216,12 @@ class ObjectField {
                 }
             });
         }
-        //  reset each field if there's no initial value
+        // or reset each field if there's no initial value
         else {
             this._fields.forEach(field => field.reset());
         }
+        // track modified
+        this._modifiedOn = Date.now();
         // raise final change
         this.raiseEvent('changed');
     }

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@nascentdigital/funnel-core",
-  "version": "4.4.4",
+  "version": "4.4.13",
   "repository": {
-    "url": "https://github.com/nascentdigital/funnel.git",
+    "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/core"
   },
+  "publishConfig": {
+    "registry": "https://npmjs.org"
+  },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -60,5 +63,5 @@
     "jest-tsd": "^0.2.2",
     "ts-jest": "^29.3.2"
   },
-  "gitHead": "debc0f359106c88e8444638236f7ed7a4f77ec5a"
+  "gitHead": "af6ff70daf556e824442ce09959ecff07b43c47c"
 }