@zajno/common 1.3.5 → 1.3.6

package/coverage/lcov.info

@@ -1340,6 +1340,124 @@ BRF:53
 BRH:51
 end_of_record
 TN:
+SF:src/fields/update.ts
+FN:11,updateField
+FN:12,(anonymous_1)
+FN:12,(anonymous_2)
+FN:15,updateFieldExtended
+FN:24,(anonymous_4)
+FN:38,(anonymous_5)
+FN:39,(anonymous_6)
+FN:49,updateArray
+FN:69,(anonymous_8)
+FN:78,(anonymous_9)
+FN:79,(anonymous_10)
+FNF:11
+FNH:5
+FNDA:0,updateField
+FNDA:0,(anonymous_1)
+FNDA:0,(anonymous_2)
+FNDA:0,updateFieldExtended
+FNDA:0,(anonymous_4)
+FNDA:38,(anonymous_5)
+FNDA:0,(anonymous_6)
+FNDA:6,updateArray
+FNDA:31,(anonymous_8)
+FNDA:12,(anonymous_9)
+FNDA:15,(anonymous_10)
+DA:11,1
+DA:12,0
+DA:15,1
+DA:24,0
+DA:26,0
+DA:28,0
+DA:29,0
+DA:30,0
+DA:31,0
+DA:34,0
+DA:38,38
+DA:39,1
+DA:49,1
+DA:54,6
+DA:55,1
+DA:58,5
+DA:59,5
+DA:63,5
+DA:64,5
+DA:67,5
+DA:68,5
+DA:69,31
+DA:70,10
+DA:71,10
+DA:72,10
+DA:78,5
+DA:79,15
+DA:80,12
+DA:81,12
+DA:82,7
+DA:83,7
+DA:84,5
+DA:85,1
+DA:89,5
+DA:90,5
+DA:91,4
+DA:94,5
+LF:37
+LH:29
+BRDA:11,0,0,0
+BRDA:21,1,0,0
+BRDA:24,2,0,0
+BRDA:24,2,1,0
+BRDA:28,3,0,0
+BRDA:28,3,1,0
+BRDA:28,4,0,0
+BRDA:28,4,1,0
+BRDA:54,5,0,1
+BRDA:54,5,1,5
+BRDA:60,6,0,5
+BRDA:60,6,1,0
+BRDA:60,7,0,2
+BRDA:60,7,1,3
+BRDA:60,8,0,2
+BRDA:60,8,1,3
+BRDA:60,9,0,5
+BRDA:60,9,1,5
+BRDA:63,10,0,5
+BRDA:63,10,1,4
+BRDA:63,11,0,2
+BRDA:63,11,1,3
+BRDA:63,12,0,5
+BRDA:63,12,1,5
+BRDA:64,13,0,5
+BRDA:64,13,1,4
+BRDA:64,14,0,2
+BRDA:64,14,1,3
+BRDA:64,15,0,5
+BRDA:64,15,1,5
+BRDA:67,16,0,5
+BRDA:67,16,1,0
+BRDA:67,17,0,2
+BRDA:67,17,1,3
+BRDA:67,18,0,5
+BRDA:67,18,1,5
+BRDA:69,19,0,10
+BRDA:69,19,1,5
+BRDA:81,20,0,7
+BRDA:81,20,1,5
+BRDA:84,21,0,1
+BRDA:84,21,1,4
+BRDA:89,22,0,2
+BRDA:89,22,1,3
+BRDA:89,23,0,5
+BRDA:89,23,1,5
+BRDA:90,24,0,4
+BRDA:90,24,1,1
+BRDA:91,25,0,4
+BRDA:91,25,1,3
+BRF:50
+BRH:40
+end_of_record
+TN:
 SF:src/logger/batch.ts
 FN:3,batchLoggers
 FN:5,(anonymous_1)

package/lib/fields/update.d.ts

@@ -1,9 +1,20 @@
-export declare type Getter<T> = (obj: Partial<T>) => T[keyof T];
-export declare type Setter<T> = (obj: Partial<T>, val: T[keyof T]) => void;
-export declare type Comparer<T> = (source: Partial<T>, target: Partial<T>) => boolean;
-export declare function updateField<T>(target: T, source: Partial<T>, diff: Partial<T>, key: keyof T, hasChanged?: Comparer<T>): boolean;
-export declare function updateFieldExtended<T>(target: T, source: Partial<T>, diff: Partial<T>, get: Getter<T>, set: Setter<T>, hasChanged?: Comparer<T>): boolean;
-export declare function updateArray<T extends string>(current: T[] | null, updated: T[]): {
+import { Comparator } from '../types';
+export declare namespace Fields {
+    type Getter<T> = (obj: Partial<T>) => T[keyof T];
+    type Setter<T> = (obj: Partial<T>, val: T[keyof T]) => void;
+    type Comparer<T> = (source: Partial<T>, target: Partial<T>) => boolean;
+    type Updater<T> = (target: T, source: T) => T;
+}
+export declare function updateField<T>(target: T, source: Partial<T>, diff: Partial<T>, key: keyof T, hasChanged?: Fields.Comparer<T>): boolean;
+export declare function updateFieldExtended<T>(target: T, source: Partial<T>, diff: Partial<T>, get: Fields.Getter<T>, set: Fields.Setter<T>, hasChanged?: Fields.Comparer<T>): boolean;
+export declare type UpdateArrayOptions<T> = {
+    additive?: boolean;
+    clone?: boolean;
+    comparator?: Comparator<T>;
+    updater?: Fields.Updater<T>;
+    sorter?: Comparator<T, number> | null | undefined;
+};
+export declare function updateArray<T>(target: T[] | null, source: T[], options?: UpdateArrayOptions<T>): {
     changed: number;
     result: T[];
 };

package/lib/fields/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":"AACA,oBAAY,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AACxD,oBAAY,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC;AACnE,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;AAE9E,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,UAAU,GAAE,QAAQ,CAAC,CAAC,CAAQ,GAAG,OAAO,CAErI;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACjC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAChB,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EACd,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EACd,UAAU,GAAE,QAAQ,CAAC,CAAC,CAAQ,GAC/B,OAAO,CAcT;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,EAAE,CAAA;CAAE,CA+BjH"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,yBAAiB,MAAM,CAAC;IACpB,KAAY,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,KAAY,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC;IACnE,KAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;IAC9E,KAAY,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;CACxD;AAGD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,UAAU,GAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAQ,GAAG,OAAO,CAE5I;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACjC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACrB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACrB,UAAU,GAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAQ,GACtC,OAAO,CAcT;AAKD,oBAAY,kBAAkB,CAAC,CAAC,IAAI;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;CACrD,CAAC;AAEF,wBAAgB,WAAW,CAAC,CAAC,EACzB,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,EAClB,MAAM,EAAE,CAAC,EAAE,EACX,OAAO,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAChC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,EAAE,CAAA;CAAE,CA6ClC"}

package/lib/fields/update.js

@@ -16,28 +16,44 @@ function updateFieldExtended(target, source, diff, get, set, hasChanged = null)
     return changed;
 }
 exports.updateFieldExtended = updateFieldExtended;
-function updateArray(current, updated) {
-    if (!updated) {
-        return { changed: 0, result: current };
+const DefaultComparator = (v1, v2) => v1 === v2;
+const DefaultUpdater = (v1, v2) => Object.assign(v1, v2);
+function updateArray(target, source, options) {
+    if (!source) {
+        return { changed: 0, result: target };
     }
     let changed = 0;
-    const result = current || [];
+    const result = Array.isArray(target)
+        ? ((options === null || options === void 0 ? void 0 : options.clone) ? target.slice() : target)
+        : [];
+    const comparator = (options === null || options === void 0 ? void 0 : options.comparator) || DefaultComparator;
+    const updater = (options === null || options === void 0 ? void 0 : options.updater) || DefaultUpdater;
     // remove all missing elements
-    for (let i = 0; i < result.length; ++i) {
-        if (!updated.includes(result[i])) {
-            result.splice(i, 1);
-            ++changed;
-            --i;
+    if (!(options === null || options === void 0 ? void 0 : options.additive)) {
+        for (let i = 0; i < result.length; ++i) {
+            if (source.find(item => comparator(item, result[i])) == null) {
+                result.splice(i, 1);
+                ++changed;
+                --i;
+            }
         }
     }
-    // add all new elements
-    updated.forEach(i => {
-        if (!result.includes(i)) {
+    // add all new elements and update existing
+    source.forEach(i => {
+        const existingIndex = result.findIndex(item => comparator(i, item));
+        const existingItem = result[existingIndex];
+        if (existingIndex < 0) {
             result.push(i);
             ++changed;
         }
+        else if (typeof existingItem === 'object') {
+            result[existingIndex] = updater(existingItem, i);
+        }
     });
-    result.sort();
+    const sorter = options === null || options === void 0 ? void 0 : options.sorter;
+    if (sorter !== null) {
+        result.sort(sorter || undefined);
+    }
     return {
         result,
         changed,

package/lib/fields/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":";;;AAKA,SAAgB,WAAW,CAAI,MAAS,EAAE,MAAkB,EAAE,IAAgB,EAAE,GAAY,EAAE,aAA0B,IAAI;IACxH,OAAO,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;AACpG,CAAC;AAFD,kCAEC;AAED,SAAgB,mBAAmB,CAC/B,MAAS,EACT,MAAkB,EAClB,IAAgB,EAChB,GAAc,EACd,GAAc,EACd,aAA0B,IAAI;IAG9B,UAAU,GAAG,UAAU,IAAI,CAAC,CAAC,EAAK,EAAE,EAAK,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAErE,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACzD,OAAO,GAAG,IAAI,CAAC;QACf,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACvB,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;KAC5B;IAED,OAAO,OAAO,CAAC;AAEnB,CAAC;AArBD,kDAqBC;AAED,SAAgB,WAAW,CAAmB,OAAmB,EAAE,OAAY;IAC3E,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;KAC1C;IAED,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,MAAM,MAAM,GAAG,OAAO,IAAI,EAAE,CAAC;IAE7B,8BAA8B;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACpC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;YAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpB,EAAE,OAAO,CAAC;YACV,EAAE,CAAC,CAAC;SACP;KACJ;IAED,uBAAuB;IACvB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAChB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,EAAE,OAAO,CAAC;SACb;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,EAAE,CAAC;IAEd,OAAO;QACH,MAAM;QACN,OAAO;KACV,CAAC;AACN,CAAC;AA/BD,kCA+BC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":"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"}

package/lib/ident.d.ts

@@ -0,0 +1,6 @@
+export declare type Ident<T, K extends keyof any = string> = T & {
+    id: K;
+};
+export declare type IdentAny = Ident<{}>;
+export default Ident;
+//# sourceMappingURL=ident.d.ts.map

package/lib/ident.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ident.d.ts","sourceRoot":"","sources":["../src/ident.ts"],"names":[],"mappings":"AACA,oBAAY,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG;IACrD,EAAE,EAAE,CAAC,CAAC;CACT,CAAC;AAEF,oBAAY,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;AAEjC,eAAe,KAAK,CAAC"}

package/lib/ident.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ident.js.map

package/lib/ident.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ident.js","sourceRoot":"","sources":["../src/ident.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",

package/src/fields/__tests__/fields.update.test.ts

@@ -0,0 +1,73 @@
+import { updateArray } from '../update';
+
+describe('fields/update', () => {
+    it('empty input', () => {
+        expect(updateArray(null, null)).toStrictEqual({ changed: 0, result: null });
+    });
+
+    it('updates primitives | numbers', () => {
+        const target = [1, 5, 3];
+        const source = [4, 3, 2];
+
+        const results1 = updateArray(target, source, { clone: true });
+        expect(results1.changed).toBe(4);
+        expect(results1.result).toStrictEqual([2, 3, 4]);
+
+        const results2 = updateArray(target, source, { sorter: null });
+        expect(results2.changed).toBe(4);
+        expect(results2.result).toStrictEqual([3, 4, 2]);
+    });
+
+    it('updates primitives | strings', () => {
+        const target = ['a', 'b', 'c'];
+        const source = ['b', 'c', 'd'];
+
+        const results = updateArray(target, source);
+
+        expect(results.changed).toBe(2);
+        expect(results.result).toStrictEqual(source);
+    });
+
+    describe('updates objects', () => {
+        it('no options', () => {
+            const res = updateArray([
+                { id: 1, v: 'a' },
+                { id: 5, v: 'e' },
+                { id: 3, v: 'c' },
+            ], [
+                { id: 2, v: 'b' },
+            ]);
+
+            expect(res.changed).toBe(4);
+            expect(res.result).toStrictEqual([
+                { id: 2, v: 'b' },
+            ]);
+        });
+
+        // eslint-disable-next-line jest/expect-expect
+        it('full options', () => {
+            const res = updateArray([
+                { id: 1, v: 'a' },
+                { id: 5, v: 'e' },
+                { id: 3, v: 'c' },
+            ], [
+                { id: 2, v: 'b' },
+                { id: 1, v: '1K' },
+            ], {
+                clone: true,
+                comparator: (v1, v2) => v1.id === v2.id,
+                updater: (t, s) => {
+                    t.v = s.v + '_' + t.id;
+                    return t;
+                },
+                sorter: (v1, v2) => v1.id - v2.id,
+            });
+
+            expect(res.changed).toBe(3);
+            expect(res.result).toStrictEqual([
+                { id: 1, v: '1K_1' },
+                { id: 2, v: 'b' },
+            ]);
+        });
+    });
+});

package/src/fields/update.ts

@@ -1,9 +1,14 @@
+import { Comparator } from '../types';
+
+export namespace Fields {
+    export type Getter<T> = (obj: Partial<T>) => T[keyof T];
+    export type Setter<T> = (obj: Partial<T>, val: T[keyof T]) => void;
+    export type Comparer<T> = (source: Partial<T>, target: Partial<T>) => boolean;
+    export type Updater<T> = (target: T, source: T) => T;
+}
 
-export type Getter<T> = (obj: Partial<T>) => T[keyof T];
-export type Setter<T> = (obj: Partial<T>, val: T[keyof T]) => void;
-export type Comparer<T> = (source: Partial<T>, target: Partial<T>) => boolean;
 
-export function updateField<T>(target: T, source: Partial<T>, diff: Partial<T>, key: keyof T, hasChanged: Comparer<T> = null): boolean {
+export function updateField<T>(target: T, source: Partial<T>, diff: Partial<T>, key: keyof T, hasChanged: Fields.Comparer<T> = null): boolean {
     return updateFieldExtended(target, source, diff, t => t[key], (t, v) => t[key] = v, hasChanged);
 }
 
@@ -11,9 +16,9 @@ export function updateFieldExtended<T>(
     target: T,
     source: Partial<T>,
     diff: Partial<T>,
-    get: Getter<T>,
-    set: Setter<T>,
-    hasChanged: Comparer<T> = null,
+    get: Fields.Getter<T>,
+    set: Fields.Setter<T>,
+    hasChanged: Fields.Comparer<T> = null,
 ): boolean {
 
     hasChanged = hasChanged || ((v1: T, v2: T) => (get(v1) !== get(v2)));
@@ -30,32 +35,61 @@ export function updateFieldExtended<T>(
 
 }
 
-export function updateArray<T extends string>(current: T[] | null, updated: T[]): { changed: number, result: T[] } {
-    if (!updated) {
-        return { changed: 0, result: current };
+const DefaultComparator: Comparator<any> = (v1, v2) => v1 === v2;
+const DefaultUpdater: Fields.Updater<any> = (v1, v2) => Object.assign(v1, v2);
+
+export type UpdateArrayOptions<T> = {
+    additive?: boolean,
+    clone?: boolean,
+    comparator?: Comparator<T>,
+    updater?: Fields.Updater<T>,
+    sorter?: Comparator<T, number> | null | undefined,
+};
+
+export function updateArray<T>(
+    target: T[] | null,
+    source: T[],
+    options?: UpdateArrayOptions<T>,
+): { changed: number, result: T[] } {
+    if (!source) {
+        return { changed: 0, result: target };
     }
 
     let changed = 0;
-    const result = current || [];
+    const result = Array.isArray(target)
+        ? (options?.clone ? target.slice() : target)
+        : [];
+
+    const comparator = options?.comparator || DefaultComparator;
+    const updater = options?.updater || DefaultUpdater;
 
     // remove all missing elements
-    for (let i = 0; i < result.length; ++i) {
-        if (!updated.includes(result[i])) {
-            result.splice(i, 1);
-            ++changed;
-            --i;
+    if (!options?.additive) {
+        for (let i = 0; i < result.length; ++i) {
+            if (source.find(item => comparator(item, result[i])) == null) {
+                result.splice(i, 1);
+                ++changed;
+                --i;
+            }
         }
     }
 
-    // add all new elements
-    updated.forEach(i => {
-        if (!result.includes(i)) {
+    // add all new elements and update existing
+    source.forEach(i => {
+        const existingIndex = result.findIndex(item => comparator(i, item));
+        const existingItem = result[existingIndex];
+        if (existingIndex < 0) {
             result.push(i);
             ++changed;
+        } else if (typeof existingItem === 'object') {
+            result[existingIndex] = updater(existingItem, i);
         }
     });
 
-    result.sort();
+    const sorter = options?.sorter;
+    if (sorter !== null) {
+        result.sort(sorter || undefined);
+    }
 
     return {
         result,

package/src/ident.ts

@@ -0,0 +1,8 @@
+
+export type Ident<T, K extends keyof any = string> = T & {
+    id: K;
+};
+
+export type IdentAny = Ident<{}>;
+
+export default Ident;

package/coverage/lcov-report/src/viewModels/LabeledFlagModel.ts.html

@@ -1,146 +0,0 @@
-
-<!doctype html>
-<html lang="en">
-
-<head>
-    <title>Code coverage report for src/viewModels/LabeledFlagModel.ts</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-    
-<body>
-<div class='wrapper'>
-    <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> / <a href="index.html">src/viewModels</a> LabeledFlagModel.ts</h1>
-        <div class='clearfix'>
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>5/5</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Branches</span>
-                <span class='fraction'>0/0</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Functions</span>
-                <span class='fraction'>2/2</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>5/5</span>
-            </div>
-        
-            
-        </div>
-        <p class="quiet">
-            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
-        </p>
-    </div>
-    <div class='status-line high'></div>
-    <pre><table class="coverage">
-<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
-<a name='L2'></a><a href='#L2'>2</a>
-<a name='L3'></a><a href='#L3'>3</a>
-<a name='L4'></a><a href='#L4'>4</a>
-<a name='L5'></a><a href='#L5'>5</a>
-<a name='L6'></a><a href='#L6'>6</a>
-<a name='L7'></a><a href='#L7'>7</a>
-<a name='L8'></a><a href='#L8'>8</a>
-<a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a>
-<a name='L11'></a><a href='#L11'>11</a>
-<a name='L12'></a><a href='#L12'>12</a>
-<a name='L13'></a><a href='#L13'>13</a>
-<a name='L14'></a><a href='#L14'>14</a>
-<a name='L15'></a><a href='#L15'>15</a>
-<a name='L16'></a><a href='#L16'>16</a>
-<a name='L17'></a><a href='#L17'>17</a>
-<a name='L18'></a><a href='#L18'>18</a>
-<a name='L19'></a><a href='#L19'>19</a>
-<a name='L20'></a><a href='#L20'>20</a>
-<a name='L21'></a><a href='#L21'>21</a>
-<a name='L22'></a><a href='#L22'>22</a>
-<a name='L23'></a><a href='#L23'>23</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { FlagModel, IFlagModel, IFlagModelReadonly } from './FlagModel';
-&nbsp;
-export interface ILabeledFlagModelReadonly&lt;T = string&gt; extends IFlagModelReadonly {
-    readonly label: T;
-}
-&nbsp;
-export interface ILabeledFlagModel&lt;T = string&gt; extends IFlagModel {
-    readonly label: T;
-}
-&nbsp;
-export class LabeledFlagModel&lt;T = string&gt; extends FlagModel implements ILabeledFlagModelReadonly&lt;T&gt;, ILabeledFlagModel&lt;T&gt; {
-    private _label: T;
-&nbsp;
-    constructor(label: T) {
-        super();
-        this._label = label;
-    }
-&nbsp;
-    get label() {
-        return this._label;
-    }
-}
-&nbsp;</pre></td></tr></table></pre>
-
-                <div class='push'></div><!-- for sticky footer -->
-            </div><!-- /wrapper -->
-            <div class='footer quiet pad2 space-top1 center small'>
-                Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Nov 19 2021 19:36:26 GMT+0000 (Coordinated Universal Time)
-            </div>
-        </div>
-        <script src="../../prettify.js"></script>
-        <script>
-            window.onload = function () {
-                prettyPrint();
-            };
-        </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
-    </body>
-</html>
-