@nascentdigital/funnel-core 4.4.17 → 4.4.19

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/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/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@nascentdigital/funnel-core",
-  "version": "4.4.17",
+  "version": "4.4.19",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/core"
   },
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -64,5 +65,5 @@
     "jest-tsd": "^0.2.2",
     "ts-jest": "^29.3.2"
   },
-  "gitHead": "f343d2af0dff3dd7e8ae12a9ab83bceb93381ec2"
+  "gitHead": "d4ab7346c7b2e39897e5eb6be0a64e2f0278d51b"
 }