@zajno/common 1.5.4 → 1.5.5

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

@@ -274,7 +274,7 @@ export class FlagModel implements IFlagModel, IFlagModelReadonly {
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -220,7 +220,7 @@ export async function withLoading<T>(this: void, model: IValueModel<boo
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -598,7 +598,7 @@ export class MultiSelectString<T extends string = string> extends MultiSel
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -214,7 +214,7 @@ export default NumberModel;
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -520,7 +520,7 @@ export class SelectString<T extends string = string> extends Select<T&g
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -445,7 +445,7 @@ export class TextInputVM extends ValidatableModel<string> implements IValu
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -370,7 +370,7 @@ export abstract class ValidatableModel<T = string> {
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/src/viewModels/index.html

@@ -215,7 +215,7 @@
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -211,7 +211,7 @@ export function mixinLabel<T, TModel extends IValueModel<T>, TLabel = s
             <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 Jun 10 2022 06:23:59 GMT+0000 (Coordinated Universal Time)
+                at Sat Jun 18 2022 09:26:04 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov.info

@@ -2024,10 +2024,10 @@ FN:16,updateFieldExtended
 FN:25,(anonymous_4)
 FN:39,(anonymous_5)
 FN:40,(anonymous_6)
-FN:57,updateArray
-FN:80,(anonymous_8)
-FN:92,(anonymous_9)
-FN:93,(anonymous_10)
+FN:58,updateArray
+FN:81,(anonymous_8)
+FN:95,(anonymous_9)
+FN:96,(anonymous_10)
 FNF:11
 FNH:5
 FNDA:0,updateField
@@ -2054,41 +2054,44 @@ DA:32,0
 DA:35,0
 DA:39,38
 DA:40,1
-DA:57,1
-DA:62,6
-DA:63,1
-DA:66,5
+DA:58,1
+DA:63,6
+DA:64,1
 DA:67,5
-DA:71,5
+DA:68,5
 DA:72,5
 DA:73,5
 DA:74,5
 DA:75,5
-DA:78,5
+DA:76,5
 DA:79,5
-DA:80,31
-DA:82,10
+DA:80,5
+DA:81,31
 DA:83,10
-DA:85,10
+DA:84,10
 DA:86,10
+DA:87,10
 DA:92,5
-DA:93,15
-DA:94,12
-DA:95,12
-DA:96,7
-DA:97,7
-DA:98,7
-DA:99,5
-DA:100,1
-DA:101,1
-DA:102,1
-DA:103,0
-DA:108,5
-DA:109,5
-DA:110,4
-DA:113,5
-LF:46
-LH:37
+DA:95,5
+DA:96,15
+DA:97,12
+DA:98,12
+DA:99,7
+DA:100,0
+DA:102,7
+DA:104,7
+DA:105,7
+DA:106,5
+DA:107,1
+DA:108,1
+DA:109,1
+DA:110,0
+DA:115,5
+DA:116,5
+DA:117,4
+DA:120,5
+LF:49
+LH:39
 BRDA:12,0,0,0
 BRDA:22,1,0,0
 BRDA:25,2,0,0
@@ -2097,78 +2100,88 @@ BRDA:29,3,0,0
 BRDA:29,3,1,0
 BRDA:29,4,0,0
 BRDA:29,4,1,0
-BRDA:62,5,0,1
-BRDA:62,5,1,5
-BRDA:68,6,0,5
-BRDA:68,6,1,0
-BRDA:68,7,0,2
-BRDA:68,7,1,3
-BRDA:68,8,0,2
-BRDA:68,8,1,3
-BRDA:68,9,0,5
-BRDA:68,9,1,5
-BRDA:71,10,0,5
-BRDA:71,10,1,4
-BRDA:71,11,0,2
-BRDA:71,11,1,3
-BRDA:71,12,0,5
-BRDA:71,12,1,5
-BRDA:72,13,0,5
-BRDA:72,13,1,4
-BRDA:72,14,0,2
-BRDA:72,14,1,3
-BRDA:72,15,0,5
-BRDA:72,15,1,5
-BRDA:73,16,0,5
-BRDA:73,16,1,0
-BRDA:73,17,0,5
-BRDA:73,17,1,5
-BRDA:73,18,0,2
-BRDA:73,18,1,3
-BRDA:73,19,0,5
-BRDA:73,19,1,5
-BRDA:74,20,0,5
-BRDA:74,20,1,0
-BRDA:74,21,0,5
-BRDA:74,21,1,5
-BRDA:74,22,0,2
-BRDA:74,22,1,3
-BRDA:74,23,0,5
-BRDA:74,23,1,5
-BRDA:75,24,0,5
-BRDA:75,24,1,0
-BRDA:75,25,0,5
-BRDA:75,25,1,5
-BRDA:75,26,0,2
-BRDA:75,26,1,3
-BRDA:75,27,0,5
-BRDA:75,27,1,5
-BRDA:78,28,0,5
-BRDA:78,28,1,0
-BRDA:78,29,0,2
-BRDA:78,29,1,3
-BRDA:78,30,0,5
-BRDA:78,30,1,5
-BRDA:80,31,0,10
-BRDA:80,31,1,5
-BRDA:95,32,0,7
-BRDA:95,32,1,5
-BRDA:99,33,0,1
-BRDA:99,33,1,4
-BRDA:100,34,0,0
-BRDA:100,34,1,1
-BRDA:102,35,0,0
-BRDA:102,35,1,1
-BRDA:108,36,0,2
-BRDA:108,36,1,3
-BRDA:108,37,0,5
-BRDA:108,37,1,5
-BRDA:109,38,0,4
-BRDA:109,38,1,1
-BRDA:110,39,0,4
-BRDA:110,39,1,3
-BRF:78
-BRH:63
+BRDA:63,5,0,1
+BRDA:63,5,1,5
+BRDA:69,6,0,5
+BRDA:69,6,1,0
+BRDA:69,7,0,2
+BRDA:69,7,1,3
+BRDA:69,8,0,2
+BRDA:69,8,1,3
+BRDA:69,9,0,5
+BRDA:69,9,1,5
+BRDA:72,10,0,5
+BRDA:72,10,1,4
+BRDA:72,11,0,2
+BRDA:72,11,1,3
+BRDA:72,12,0,5
+BRDA:72,12,1,5
+BRDA:73,13,0,5
+BRDA:73,13,1,4
+BRDA:73,14,0,2
+BRDA:73,14,1,3
+BRDA:73,15,0,5
+BRDA:73,15,1,5
+BRDA:74,16,0,5
+BRDA:74,16,1,0
+BRDA:74,17,0,5
+BRDA:74,17,1,5
+BRDA:74,18,0,2
+BRDA:74,18,1,3
+BRDA:74,19,0,5
+BRDA:74,19,1,5
+BRDA:75,20,0,5
+BRDA:75,20,1,0
+BRDA:75,21,0,5
+BRDA:75,21,1,5
+BRDA:75,22,0,2
+BRDA:75,22,1,3
+BRDA:75,23,0,5
+BRDA:75,23,1,5
+BRDA:76,24,0,5
+BRDA:76,24,1,0
+BRDA:76,25,0,5
+BRDA:76,25,1,5
+BRDA:76,26,0,2
+BRDA:76,26,1,3
+BRDA:76,27,0,5
+BRDA:76,27,1,5
+BRDA:79,28,0,5
+BRDA:79,28,1,0
+BRDA:79,29,0,2
+BRDA:79,29,1,3
+BRDA:79,30,0,5
+BRDA:79,30,1,5
+BRDA:81,31,0,10
+BRDA:81,31,1,5
+BRDA:92,32,0,5
+BRDA:92,32,1,5
+BRDA:92,33,0,2
+BRDA:92,33,1,3
+BRDA:92,34,0,5
+BRDA:92,34,1,5
+BRDA:98,35,0,7
+BRDA:98,35,1,5
+BRDA:99,36,0,0
+BRDA:99,36,1,7
+BRDA:104,37,0,0
+BRDA:104,37,1,7
+BRDA:106,38,0,1
+BRDA:106,38,1,4
+BRDA:107,39,0,0
+BRDA:107,39,1,1
+BRDA:109,40,0,0
+BRDA:109,40,1,1
+BRDA:115,41,0,2
+BRDA:115,41,1,3
+BRDA:115,42,0,5
+BRDA:115,42,1,5
+BRDA:116,43,0,4
+BRDA:116,43,1,1
+BRDA:117,44,0,4
+BRDA:117,44,1,3
+BRF:88
+BRH:71
 end_of_record
 TN:
 SF:src/logger/batch.ts

package/lib/fields/update.d.ts

@@ -9,6 +9,7 @@ export declare function updateField<T>(target: T, source: Partial<T>, diff: Part
 export declare function updateFieldExtended<T>(target: T, source: Partial<T>, diff: Partial<T>, get: Fields.Getter<T>, set: Fields.Setter<T>, hasChanged?: null | Fields.Comparer<T>): boolean;
 export declare type UpdateArrayOptions<T> = {
     additive?: boolean;
+    unshift?: boolean;
     clone?: boolean;
     comparator?: Comparator<T>;
     updater?: Fields.Updater<T>;
@@ -16,11 +17,11 @@ export declare type UpdateArrayOptions<T> = {
     hooks?: UpdateArrayHooks<T>;
 };
 export declare type UpdateArrayHooks<T> = {
-    onAdded?: (item: T) => void;
-    onDeleted?: (item: T) => void;
-    onUpdated?: (previous: T, next: T) => void;
+    onAdded?: (item: T, index?: number) => void;
+    onDeleted?: (item: T, index?: number) => void;
+    onUpdated?: (previous: T, next: T, index?: number) => void;
 };
-export declare function updateArray<T>(target: T[] | null, source: T[], options?: UpdateArrayOptions<T>): {
+export declare function updateArray<T>(target: T[] | null, source: T[] | null, 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,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,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAQ,GAAG,OAAO,CAEnJ;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,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAQ,GAC7C,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;IAClD,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,oBAAY,gBAAgB,CAAC,CAAC,IAAI;IAC9B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;CAC9C,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,CAwDlC"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":"AACA,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,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAQ,GAAG,OAAO,CAEnJ;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,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAQ,GAC7C,OAAO,CAcT;AAKD,oBAAY,kBAAkB,CAAC,CAAC,IAAI;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,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;IAClD,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,oBAAY,gBAAgB,CAAC,CAAC,IAAI;IAC9B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9D,CAAC;AAEF,wBAAgB,WAAW,CAAC,CAAC,EACzB,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,EAClB,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,EAClB,OAAO,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAChC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,EAAE,CAAA;CAAE,CA8DlC"}

package/lib/fields/update.js

@@ -39,26 +39,32 @@ function updateArray(target, source, options) {
             if (source.find(item => comparator(item, result[i])) == null) {
                 // DELETE
                 const removed = result.splice(i, 1);
-                functions_1.safeCall(onDeleted, removed[0]);
+                functions_1.safeCall(onDeleted, removed[0], i);
                 ++changed;
                 --i;
             }
         }
     }
+    const unshift = (options === null || options === void 0 ? void 0 : options.unshift) || false;
     // add all new elements and update existing
-    source.forEach(i => {
-        const existingIndex = result.findIndex(item => comparator(i, item));
+    source.forEach(item => {
+        const existingIndex = result.findIndex(i => comparator(item, i));
         const existingItem = result[existingIndex];
         if (existingIndex < 0) {
-            result.push(i);
-            functions_1.safeCall(onAdded, i);
+            if (unshift) {
+                result.unshift(item);
+            }
+            else {
+                result.push(item);
+            }
+            functions_1.safeCall(onAdded, item, unshift ? 0 : result.length - 1);
             ++changed;
         }
         else if (typeof existingItem === 'object') {
             const before = onUpdate != null ? { ...existingItem } : undefined;
-            result[existingIndex] = updater(existingItem, i);
+            result[existingIndex] = updater(existingItem, item);
             if (onUpdate != null) {
-                onUpdate(before, result[existingIndex]);
+                onUpdate(before, result[existingIndex], existingIndex);
             }
         }
     });

package/lib/fields/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/fields/update.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/fields/update.ts

@@ -41,6 +41,7 @@ const DefaultUpdater: Fields.Updater<any> = (v1, v2) => Object.assign(v1, v2);
 
 export type UpdateArrayOptions<T> = {
     additive?: boolean,
+    unshift?: boolean,
     clone?: boolean,
     comparator?: Comparator<T>,
     updater?: Fields.Updater<T>,
@@ -49,14 +50,14 @@ export type UpdateArrayOptions<T> = {
 };
 
 export type UpdateArrayHooks<T> = {
-    onAdded?: (item: T) => void,
-    onDeleted?: (item: T) => void,
-    onUpdated?: (previous: T, next: T) => void,
+    onAdded?: (item: T, index?: number) => void,
+    onDeleted?: (item: T, index?: number) => void,
+    onUpdated?: (previous: T, next: T, index?: number) => void,
 };
 
 export function updateArray<T>(
     target: T[] | null,
-    source: T[],
+    source: T[] | null,
     options?: UpdateArrayOptions<T>,
 ): { changed: number, result: T[] } {
     if (!source) {
@@ -80,7 +81,7 @@ export function updateArray<T>(
             if (source.find(item => comparator(item, result[i])) == null) {
                 // DELETE
                 const removed = result.splice(i, 1);
-                safeCall(onDeleted, removed[0]);
+                safeCall(onDeleted, removed[0], i);
 
                 ++changed;
                 --i;
@@ -88,19 +89,25 @@ export function updateArray<T>(
         }
     }
 
+    const unshift = options?.unshift || false;
+
     // add all new elements and update existing
-    source.forEach(i => {
-        const existingIndex = result.findIndex(item => comparator(i, item));
+    source.forEach(item => {
+        const existingIndex = result.findIndex(i => comparator(item, i));
         const existingItem = result[existingIndex];
         if (existingIndex < 0) {
-            result.push(i);
-            safeCall(onAdded, i);
+            if (unshift) {
+                result.unshift(item);
+            } else {
+                result.push(item);
+            }
+            safeCall(onAdded, item, unshift ? 0 : result.length - 1);
             ++changed;
         } else if (typeof existingItem === 'object') {
             const before = onUpdate != null ? { ...existingItem } : undefined;
-            result[existingIndex] = updater(existingItem, i);
+            result[existingIndex] = updater(existingItem, item);
             if (onUpdate != null) {
-                onUpdate(before!, result[existingIndex]);
+                onUpdate(before!, result[existingIndex], existingIndex);
             }
         }
     });