npm - @zajno/common - Versions diffs - 1.5.9 → 1.6.0 - Mend

@zajno/common 1.5.9 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (136) hide show

package/coverage/clover.xml +182 -116
package/coverage/coverage-final.json +14 -10
package/coverage/lcov-report/index.html +44 -29
package/coverage/lcov-report/src/__tests__/helpers/expect.ts.html +94 -0
package/coverage/lcov-report/src/__tests__/helpers/index.html +18 -3
package/coverage/lcov-report/src/__tests__/helpers/main.ts.html +2 -2
package/coverage/lcov-report/src/async/arrays.ts.html +1 -1
package/coverage/lcov-report/src/async/index.html +1 -1
package/coverage/lcov-report/src/async/timeout.ts.html +13 -13
package/coverage/lcov-report/src/cache.ts.html +6 -6
package/coverage/lcov-report/src/dates/calc.ts.html +1 -1
package/coverage/lcov-report/src/dates/convert.ts.html +1 -1
package/coverage/lcov-report/src/dates/datex.ts.html +1 -1
package/coverage/lcov-report/src/dates/format.ts.html +1 -1
package/coverage/lcov-report/src/dates/index.html +1 -1
package/coverage/lcov-report/src/dates/index.ts.html +1 -1
package/coverage/lcov-report/src/dates/parse.ts.html +1 -1
package/coverage/lcov-report/src/dates/period.ts.html +1 -1
package/coverage/lcov-report/src/dates/shift.ts.html +1 -1
package/coverage/lcov-report/src/dates/types.ts.html +1 -1
package/coverage/lcov-report/src/dates/yearDate.ts.html +1 -1
package/coverage/lcov-report/src/disposer.ts.html +1 -1
package/coverage/lcov-report/src/enumHelper.ts.html +1 -1
package/coverage/lcov-report/src/event.ts.html +6 -6
package/coverage/lcov-report/src/fields/index.html +1 -1
package/coverage/lcov-report/src/fields/update.ts.html +1 -1
package/coverage/lcov-report/src/functions.ts.html +1 -1
package/coverage/lcov-report/src/index.html +11 -26
package/coverage/lcov-report/src/lazy/index.html +161 -0
package/coverage/lcov-report/src/lazy/lazy.ts.html +181 -0
package/coverage/lcov-report/src/lazy/light.ts.html +172 -0
package/coverage/lcov-report/src/lazy/observable.ts.html +184 -0
package/coverage/lcov-report/src/lazy/promise.ts.html +229 -0
package/coverage/lcov-report/src/lazy/singleton.ts.html +181 -0
package/coverage/lcov-report/src/lazy.light.ts.html +1 -1
package/coverage/lcov-report/src/logger/batch.ts.html +1 -1
package/coverage/lcov-report/src/logger/console.ts.html +1 -1
package/coverage/lcov-report/src/logger/index.html +1 -1
package/coverage/lcov-report/src/logger/index.ts.html +8 -8
package/coverage/lcov-report/src/logger/named.ts.html +12 -12
package/coverage/lcov-report/src/logger/proxy.ts.html +4 -4
package/coverage/lcov-report/src/math/arrays.ts.html +1 -1
package/coverage/lcov-report/src/math/calc.ts.html +1 -1
package/coverage/lcov-report/src/math/distribution.ts.html +1 -1
package/coverage/lcov-report/src/math/index.html +1 -1
package/coverage/lcov-report/src/math/index.ts.html +1 -1
package/coverage/lcov-report/src/observersMap.ts.html +1 -1
package/coverage/lcov-report/src/observingCache.ts.html +1 -1
package/coverage/lcov-report/src/queue/index.html +14 -14
package/coverage/lcov-report/src/queue/parallel.ts.html +20 -8
package/coverage/lcov-report/src/tempoCache.ts.html +1 -1
package/coverage/lcov-report/src/transitionObserver.ts.html +1 -1
package/coverage/lcov-report/src/types.ts.html +1 -1
package/coverage/lcov-report/src/validation/ValidationErrors.ts.html +1 -1
package/coverage/lcov-report/src/validation/creditCard.ts.html +1 -1
package/coverage/lcov-report/src/validation/helpers.ts.html +1 -1
package/coverage/lcov-report/src/validation/index.html +1 -1
package/coverage/lcov-report/src/validation/index.ts.html +1 -1
package/coverage/lcov-report/src/validation/types.ts.html +1 -1
package/coverage/lcov-report/src/validation/validators.ts.html +3 -3
package/coverage/lcov-report/src/validation/wrappers.ts.html +1 -1
package/coverage/lcov-report/src/viewModels/CommonModel.ts.html +1 -1
package/coverage/lcov-report/src/viewModels/FlagModel.ts.html +1 -1
package/coverage/lcov-report/src/viewModels/LoadingModel.ts.html +1 -1
package/coverage/lcov-report/src/viewModels/MultiSelectModel.ts.html +2 -2
package/coverage/lcov-report/src/viewModels/NumberModel.ts.html +1 -1
package/coverage/lcov-report/src/viewModels/SelectModel.ts.html +2 -2
package/coverage/lcov-report/src/viewModels/TextModel.ts.html +4 -4
package/coverage/lcov-report/src/viewModels/Validatable.ts.html +1 -1
package/coverage/lcov-report/src/viewModels/index.html +5 -5
package/coverage/lcov-report/src/viewModels/wrappers.ts.html +1 -1
package/coverage/lcov.info +358 -228
package/lib/cache.js.map +1 -1
package/lib/lazy/index.d.ts +10 -0
package/lib/lazy/index.d.ts.map +1 -0
package/lib/lazy/index.js +23 -0
package/lib/lazy/index.js.map +1 -0
package/lib/lazy/light.d.ts +8 -0
package/lib/lazy/light.d.ts.map +1 -0
package/lib/lazy/light.js +23 -0
package/lib/lazy/light.js.map +1 -0
package/lib/lazy/observable.d.ts +9 -0
package/lib/lazy/observable.d.ts.map +1 -0
package/lib/lazy/observable.js +30 -0
package/lib/lazy/observable.js.map +1 -0
package/lib/{lazy.d.ts → lazy/promise.d.ts} +4 -14
package/lib/lazy/promise.d.ts.map +1 -0
package/lib/lazy/promise.js +39 -0
package/lib/lazy/promise.js.map +1 -0
package/lib/lazy/singleton.d.ts +13 -0
package/lib/lazy/singleton.d.ts.map +1 -0
package/lib/lazy/singleton.js +29 -0
package/lib/lazy/singleton.js.map +1 -0
package/lib/lazy.light.d.ts +1 -7
package/lib/lazy.light.d.ts.map +1 -1
package/lib/lazy.light.js +5 -20
package/lib/lazy.light.js.map +1 -1
package/lib/queue/parallel.d.ts +2 -0
package/lib/queue/parallel.d.ts.map +1 -1
package/lib/queue/parallel.js +3 -0
package/lib/queue/parallel.js.map +1 -1
package/lib/services/localization/LocalaziedValidationErrors.js.map +1 -1
package/lib/services/localization/LocalizationManager.js.map +1 -1
package/lib/unsubscriber.d.ts.map +1 -1
package/lib/unsubscriber.js +1 -0
package/lib/unsubscriber.js.map +1 -1
package/lib/validation/validators.js +2 -2
package/lib/validation/validators.js.map +1 -1
package/lib/viewModels/MultiSelectModel.js +2 -2
package/lib/viewModels/MultiSelectModel.js.map +1 -1
package/lib/viewModels/PromptModal.js.map +1 -1
package/lib/viewModels/SelectModel.js +2 -2
package/lib/viewModels/SelectModel.js.map +1 -1
package/lib/viewModels/TextModel.js.map +1 -1
package/package.json +15 -16
package/src/__tests__/helpers/expect.ts +3 -0
package/src/__tests__/helpers/main.ts +1 -1
package/src/lazy/__tests__/lazy.test.ts +94 -0
package/src/lazy/index.ts +33 -0
package/src/lazy/light.ts +29 -0
package/src/lazy/observable.ts +33 -0
package/src/lazy/promise.ts +48 -0
package/src/lazy/singleton.ts +32 -0
package/src/lazy.light.ts +4 -25
package/src/logger/__tests__/logger.test.ts +7 -7
package/src/queue/parallel.ts +4 -0
package/src/unsubscriber.ts +3 -0
package/src/validation/__tests__/validator.test.ts +1 -1
package/src/validation/validators.ts +2 -2
package/src/viewModels/MultiSelectModel.ts +1 -1
package/src/viewModels/SelectModel.ts +1 -1
package/yarn.lock +585 -488
package/lib/lazy.d.ts.map +0 -1
package/lib/lazy.js +0 -87
package/lib/lazy.js.map +0 -1
package/src/lazy.ts +0 -86

package/coverage/lcov.info CHANGED Viewed

@@ -68,7 +68,9 @@ DA:14,0
 DA:15,0
 DA:16,0
 DA:21,1
+DA:23,1
 DA:24,2
+DA:26,1
 DA:27,2
 DA:29,2
 DA:31,2
@@ -140,15 +142,15 @@ DA:156,1
 DA:160,0
 DA:161,0
 DA:164,0
-DA:168,1
+DA:167,1
 DA:169,1
 DA:170,1
 DA:171,1
 DA:176,3
 DA:177,2
 DA:179,1
-LF:89
-LH:72
+LF:91
+LH:74
 BRDA:11,0,0,1
 BRDA:11,0,1,1
 BRDA:40,1,0,2
@@ -445,12 +447,12 @@ FN:84,(anonymous_12)
 FN:85,(anonymous_13)
 FNF:14
 FNH:11
-FNDA:13,(anonymous_0)
+FNDA:14,(anonymous_0)
 FNDA:5,(anonymous_1)
 FNDA:4,(anonymous_2)
 FNDA:4,(anonymous_3)
 FNDA:4,(anonymous_4)
-FNDA:29,(anonymous_5)
+FNDA:30,(anonymous_5)
 FNDA:16,(anonymous_6)
 FNDA:4,(anonymous_7)
 FNDA:0,(anonymous_8)
@@ -463,15 +465,15 @@ DA:2,3
 DA:3,3
 DA:4,3
 DA:13,3
-DA:14,13
-DA:15,13
-DA:22,13
+DA:14,14
+DA:15,14
+DA:22,14
 DA:28,5
 DA:29,5
 DA:30,4
 DA:35,4
-DA:39,29
-DA:40,13
+DA:39,30
+DA:40,14
 DA:43,16
 DA:44,16
 DA:45,16
@@ -497,13 +499,13 @@ DA:87,4
 DA:88,4
 LF:36
 LH:25
-BRDA:23,0,0,13
+BRDA:23,0,0,14
 BRDA:23,0,1,0
-BRDA:22,1,0,13
+BRDA:22,1,0,14
 BRDA:22,1,1,0
-BRDA:23,2,0,13
-BRDA:23,2,1,13
-BRDA:39,3,0,13
+BRDA:23,2,0,14
+BRDA:23,2,1,14
+BRDA:39,3,0,14
 BRDA:54,4,0,4
 BRDA:86,5,0,4
 BRDA:86,6,0,12
@@ -527,37 +529,6 @@ BRF:1
 BRH:0
 end_of_record
 TN:
-SF:src/lazy.light.ts
-FN:10,createLazy
-FN:15,(anonymous_1)
-FN:21,(anonymous_2)
-FN:22,(anonymous_3)
-FN:25,(anonymous_4)
-FNF:5
-FNH:3
-FNDA:12,createLazy
-FNDA:23,(anonymous_1)
-FNDA:31,(anonymous_2)
-FNDA:0,(anonymous_3)
-FNDA:0,(anonymous_4)
-DA:10,3
-DA:11,12
-DA:12,12
-DA:14,12
-DA:16,23
-DA:17,1
-DA:19,23
-DA:21,31
-DA:23,0
-DA:25,0
-DA:28,12
-LF:11
-LH:9
-BRDA:16,0,0,1
-BRF:1
-BRH:1
-end_of_record
-TN:
 SF:src/observersMap.ts
 FN:16,(anonymous_0)
 FN:20,(anonymous_1)
@@ -1043,6 +1014,17 @@ BRF:6
 BRH:6
 end_of_record
 TN:
+SF:src/__tests__/helpers/expect.ts
+FNF:0
+FNH:0
+DA:1,1
+DA:3,1
+LF:2
+LH:2
+BRF:0
+BRH:0
+end_of_record
+TN:
 SF:src/__tests__/helpers/main.ts
 FN:4,(anonymous_0)
 FN:8,(anonymous_1)
@@ -1119,9 +1101,9 @@ FN:75,(anonymous_12)
 FN:79,(anonymous_13)
 FNF:14
 FNH:10
-FNDA:16,setTimeoutAsync
-FNDA:16,(anonymous_1)
-FNDA:16,(anonymous_2)
+FNDA:18,setTimeoutAsync
+FNDA:18,(anonymous_1)
+FNDA:18,(anonymous_2)
 FNDA:0,(anonymous_3)
 FNDA:0,setTimeoutFramesAsync
 FNDA:0,(anonymous_5)
@@ -1133,23 +1115,23 @@ FNDA:4,(anonymous_10)
 FNDA:3,(anonymous_11)
 FNDA:1,(anonymous_12)
 FNDA:3,(anonymous_13)
-DA:2,5
-DA:3,16
-DA:6,16
-DA:7,16
-DA:8,16
-DA:9,16
-DA:10,16
-DA:11,16
-DA:16,16
+DA:2,6
+DA:3,18
+DA:6,18
+DA:7,18
+DA:8,18
+DA:9,18
+DA:10,18
+DA:11,18
+DA:16,18
 DA:17,0
 DA:18,0
 DA:19,0
 DA:20,0
 DA:21,0
 DA:24,0
-DA:27,16
-DA:32,5
+DA:27,18
+DA:32,6
 DA:33,0
 DA:34,0
 DA:37,0
@@ -1159,7 +1141,7 @@ DA:41,0
 DA:42,0
 DA:44,0
 DA:48,0
-DA:52,5
+DA:52,6
 DA:53,3
 DA:55,3
 DA:56,3
@@ -1180,8 +1162,8 @@ DA:80,3
 DA:81,3
 LF:45
 LH:30
-BRDA:2,0,0,16
-BRDA:10,1,0,16
+BRDA:2,0,0,18
+BRDA:10,1,0,18
 BRDA:16,2,0,0
 BRDA:20,3,0,0
 BRDA:33,4,0,0
@@ -2159,6 +2141,148 @@ BRF:81
 BRH:66
 end_of_record
 TN:
+SF:src/lazy/light.ts
+FN:10,createLazy
+FN:15,(anonymous_1)
+FN:21,(anonymous_2)
+FN:22,(anonymous_3)
+FN:25,(anonymous_4)
+FNF:5
+FNH:3
+FNDA:12,createLazy
+FNDA:23,(anonymous_1)
+FNDA:31,(anonymous_2)
+FNDA:0,(anonymous_3)
+FNDA:0,(anonymous_4)
+DA:10,3
+DA:11,12
+DA:12,12
+DA:14,12
+DA:16,23
+DA:17,1
+DA:19,23
+DA:21,31
+DA:23,0
+DA:25,0
+DA:28,12
+LF:11
+LH:9
+BRDA:16,0,0,1
+BRF:1
+BRH:1
+end_of_record
+TN:
+SF:src/lazy/observable.ts
+FN:7,(anonymous_0)
+FN:20,(anonymous_1)
+FNF:2
+FNH:2
+FNDA:1,(anonymous_0)
+FNDA:1,(anonymous_1)
+DA:1,1
+DA:2,1
+DA:3,1
+DA:5,1
+DA:8,1
+DA:10,1
+DA:18,1
+DA:24,1
+DA:26,1
+LF:9
+LH:9
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/lazy/promise.ts
+FN:10,(anonymous_0)
+FN:34,(anonymous_1)
+FN:47,(anonymous_2)
+FN:17,(anonymous_3)
+FN:18,(anonymous_4)
+FN:20,(anonymous_5)
+FN:24,(anonymous_6)
+FN:41,(anonymous_7)
+FNF:8
+FNH:8
+FNDA:2,(anonymous_0)
+FNDA:2,(anonymous_1)
+FNDA:1,(anonymous_2)
+FNDA:6,(anonymous_3)
+FNDA:5,(anonymous_4)
+FNDA:2,(anonymous_5)
+FNDA:6,(anonymous_6)
+FNDA:1,(anonymous_7)
+DA:3,1
+DA:5,2
+DA:6,2
+DA:8,2
+DA:11,2
+DA:12,2
+DA:14,2
+DA:17,6
+DA:18,5
+DA:21,2
+DA:25,6
+DA:26,2
+DA:27,2
+DA:28,2
+DA:31,6
+DA:34,2
+DA:35,2
+DA:36,2
+DA:42,1
+DA:43,1
+DA:44,1
+DA:47,2
+LF:22
+LH:22
+BRDA:12,0,0,2
+BRDA:36,1,0,2
+BRDA:36,1,1,0
+BRDA:17,2,0,6
+BRDA:17,2,1,4
+BRDA:25,3,0,2
+BRF:6
+BRH:5
+end_of_record
+TN:
+SF:src/lazy/singleton.ts
+FN:7,(anonymous_0)
+FN:9,(anonymous_1)
+FN:11,(anonymous_2)
+FN:16,(anonymous_3)
+FN:22,(anonymous_4)
+FN:27,(anonymous_5)
+FN:31,(anonymous_6)
+FNF:7
+FNH:6
+FNDA:2,(anonymous_0)
+FNDA:4,(anonymous_1)
+FNDA:5,(anonymous_2)
+FNDA:6,(anonymous_3)
+FNDA:1,(anonymous_4)
+FNDA:2,(anonymous_5)
+FNDA:0,(anonymous_6)
+DA:3,1
+DA:5,2
+DA:7,2
+DA:9,4
+DA:12,5
+DA:13,5
+DA:17,6
+DA:18,4
+DA:23,1
+DA:24,1
+DA:28,2
+DA:31,0
+LF:12
+LH:11
+BRDA:17,0,0,4
+BRF:1
+BRH:1
+end_of_record
+TN:
 SF:src/logger/batch.ts
 FN:3,batchLoggers
 FN:5,(anonymous_1)
@@ -2257,13 +2381,13 @@ FNH:7
 FNDA:0,(anonymous_0)
 FNDA:3,(anonymous_1)
 FNDA:0,(anonymous_2)
-FNDA:65,createLogger
+FNDA:66,createLogger
 FNDA:0,detachLogger
 FNDA:39,setMode
 FNDA:62,(anonymous_6)
 FNDA:106,(anonymous_7)
 FNDA:29,getMode
-FNDA:171,_createImplementation
+FNDA:172,_createImplementation
 DA:1,6
 DA:3,6
 DA:4,6
@@ -2274,10 +2398,10 @@ DA:9,9
 DA:14,6
 DA:16,6
 DA:18,6
-DA:19,65
-DA:20,65
-DA:21,65
-DA:22,65
+DA:19,66
+DA:20,66
+DA:21,66
+DA:22,66
 DA:25,6
 DA:26,0
 DA:27,0
@@ -2295,26 +2419,26 @@ DA:46,106
 DA:50,29
 DA:52,6
 DA:54,6
-DA:57,171
-DA:58,171
-DA:60,75
+DA:57,172
+DA:58,172
+DA:60,76
 DA:64,35
 DA:68,61
 LF:36
 LH:30
 BRDA:14,0,0,6
 BRDA:14,0,1,6
-BRDA:18,1,0,40
+BRDA:18,1,0,41
 BRDA:25,2,0,0
 BRDA:27,3,0,0
 BRDA:28,4,0,0
 BRDA:37,5,0,15
 BRDA:43,6,0,8
 BRDA:43,6,1,16
-BRDA:56,7,0,146
+BRDA:56,7,0,147
 BRDA:57,8,0,25
-BRDA:57,8,1,146
-BRDA:59,9,0,75
+BRDA:57,8,1,147
+BRDA:59,9,0,76
 BRDA:59,9,1,35
 BRDA:59,9,2,61
 BRF:15
@@ -2333,30 +2457,30 @@ FN:42,(anonymous_7)
 FNF:8
 FNH:7
 FNDA:56,(anonymous_0)
-FNDA:65,(anonymous_1)
+FNDA:66,(anonymous_1)
 FNDA:0,(anonymous_2)
-FNDA:130,(anonymous_3)
+FNDA:131,(anonymous_3)
 FNDA:10,(anonymous_4)
 FNDA:7,(anonymous_5)
 FNDA:7,(anonymous_6)
 FNDA:103,(anonymous_7)
 DA:3,6
 DA:5,6
-DA:6,65
-DA:7,65
-DA:8,65
-DA:10,65
+DA:6,66
+DA:7,66
+DA:8,66
+DA:10,66
 DA:12,0
-DA:17,65
-DA:19,65
-DA:20,24
+DA:17,66
+DA:19,66
+DA:20,25
 DA:22,41
-DA:27,130
-DA:29,130
+DA:27,131
+DA:29,131
 DA:30,10
-DA:33,130
+DA:33,131
 DA:34,7
-DA:37,130
+DA:37,131
 DA:38,7
 DA:43,103
 DA:44,103
@@ -2364,16 +2488,16 @@ DA:45,103
 LF:21
 LH:20
 BRDA:16,0,0,0
-BRDA:19,1,0,24
+BRDA:19,1,0,25
 BRDA:19,1,1,41
-BRDA:26,2,0,130
-BRDA:27,3,0,130
-BRDA:27,3,1,130
-BRDA:30,4,0,114
+BRDA:26,2,0,131
+BRDA:27,3,0,131
+BRDA:27,3,1,131
+BRDA:30,4,0,115
 BRDA:30,4,1,16
-BRDA:34,5,0,114
+BRDA:34,5,0,115
 BRDA:34,5,1,16
-BRDA:38,6,0,114
+BRDA:38,6,0,115
 BRDA:38,6,1,16
 BRF:12
 BRH:11
@@ -2385,16 +2509,16 @@ FN:12,(anonymous_1)
 FN:21,(anonymous_2)
 FNF:3
 FNH:3
-FNDA:65,(anonymous_0)
+FNDA:66,(anonymous_0)
 FNDA:72,(anonymous_1)
 FNDA:106,(anonymous_2)
 DA:2,6
 DA:4,6
 DA:10,6
 DA:12,72
-DA:14,65
-DA:17,65
-DA:18,65
+DA:14,66
+DA:17,66
+DA:18,66
 DA:22,106
 DA:23,106
 DA:24,106
@@ -2842,21 +2966,22 @@ end_of_record
 TN:
 SF:src/queue/parallel.ts
 FN:8,(anonymous_0)
-FN:130,(anonymous_1)
-FN:21,(anonymous_2)
-FN:22,(anonymous_3)
-FN:24,(anonymous_4)
-FN:25,(anonymous_5)
-FN:27,(anonymous_6)
-FN:33,(anonymous_7)
-FN:41,(anonymous_8)
-FN:50,(anonymous_9)
-FN:57,(anonymous_10)
-FN:67,(anonymous_11)
-FN:83,(anonymous_12)
-FN:93,(anonymous_13)
-FN:109,(anonymous_14)
-FNF:15
+FN:134,(anonymous_1)
+FN:22,(anonymous_2)
+FN:23,(anonymous_3)
+FN:25,(anonymous_4)
+FN:26,(anonymous_5)
+FN:28,(anonymous_6)
+FN:30,(anonymous_7)
+FN:36,(anonymous_8)
+FN:44,(anonymous_9)
+FN:53,(anonymous_10)
+FN:60,(anonymous_11)
+FN:70,(anonymous_12)
+FN:86,(anonymous_13)
+FN:96,(anonymous_14)
+FN:112,(anonymous_15)
+FNF:16
 FNH:10
 FNDA:1,(anonymous_0)
 FNDA:5,(anonymous_1)
@@ -2864,15 +2989,16 @@ FNDA:2,(anonymous_2)
 FNDA:3,(anonymous_3)
 FNDA:0,(anonymous_4)
 FNDA:0,(anonymous_5)
-FNDA:1,(anonymous_6)
-FNDA:5,(anonymous_7)
-FNDA:0,(anonymous_8)
+FNDA:0,(anonymous_6)
+FNDA:1,(anonymous_7)
+FNDA:5,(anonymous_8)
 FNDA:0,(anonymous_9)
 FNDA:0,(anonymous_10)
-FNDA:2,(anonymous_11)
-FNDA:4,(anonymous_12)
-FNDA:2,(anonymous_13)
-FNDA:4,(anonymous_14)
+FNDA:0,(anonymous_11)
+FNDA:2,(anonymous_12)
+FNDA:4,(anonymous_13)
+FNDA:2,(anonymous_14)
+FNDA:4,(anonymous_15)
 DA:1,1
 DA:2,1
 DA:8,1
@@ -2883,121 +3009,124 @@ DA:14,1
 DA:16,1
 DA:18,1
 DA:19,1
-DA:21,2
-DA:22,3
-DA:24,0
+DA:20,1
+DA:22,2
+DA:23,3
 DA:25,0
-DA:28,1
-DA:29,1
-DA:34,5
-DA:38,5
-DA:40,1
-DA:41,1
-DA:45,4
-DA:46,4
-DA:47,4
+DA:26,0
+DA:28,0
+DA:31,1
+DA:32,1
+DA:37,5
+DA:41,5
+DA:43,1
+DA:44,1
+DA:48,4
+DA:49,4
 DA:50,4
-DA:52,0
-DA:53,0
-DA:57,0
-DA:58,0
-DA:59,0
+DA:53,4
+DA:55,0
+DA:56,0
+DA:60,0
 DA:61,0
-DA:63,0
-DA:68,2
-DA:69,1
+DA:62,0
+DA:64,0
+DA:66,0
+DA:71,2
 DA:72,1
-DA:73,1
-DA:74,1
-DA:76,0
-DA:77,0
-DA:80,1
-DA:84,4
-DA:85,4
-DA:86,2
-DA:87,2
-DA:90,4
-DA:94,2
-DA:95,2
+DA:75,1
+DA:76,1
+DA:77,1
+DA:79,0
+DA:80,0
+DA:83,1
+DA:87,4
+DA:88,4
+DA:89,2
+DA:90,2
+DA:93,4
 DA:97,2
-DA:99,2
+DA:98,2
 DA:100,2
-DA:101,0
-DA:104,2
-DA:106,2
+DA:102,2
+DA:103,2
+DA:104,0
 DA:107,2
-DA:109,4
-DA:112,2
-DA:113,0
-DA:116,2
-DA:118,2
+DA:109,2
+DA:110,2
+DA:112,4
+DA:115,2
+DA:116,0
 DA:119,2
-DA:121,1
-DA:122,1
-DA:123,1
+DA:121,2
+DA:122,2
+DA:124,1
+DA:125,1
 DA:126,1
 DA:127,1
 DA:130,1
-DA:131,5
-DA:132,5
-DA:134,0
-DA:135,0
-LF:69
-LH:54
-BRDA:134,0,0,0
-BRDA:134,0,1,0
-BRDA:134,1,0,0
-BRDA:134,1,1,0
-BRDA:134,2,0,0
-BRDA:134,2,1,0
-BRDA:135,3,0,0
-BRDA:135,3,1,0
-BRDA:135,4,0,0
-BRDA:135,4,1,0
-BRDA:28,5,0,1
-BRDA:28,5,1,0
-BRDA:34,6,0,5
-BRDA:34,6,1,4
-BRDA:38,7,0,1
-BRDA:38,8,0,5
-BRDA:38,8,1,2
-BRDA:38,8,2,5
-BRDA:52,9,0,0
-BRDA:52,10,0,0
-BRDA:52,10,1,0
-BRDA:58,11,0,0
-BRDA:68,12,0,1
-BRDA:76,13,0,0
-BRDA:76,13,1,0
-BRDA:76,14,0,0
-BRDA:76,14,1,0
-BRDA:83,15,0,0
-BRDA:85,16,0,2
-BRDA:99,17,0,0
-BRDA:99,17,1,4
-BRDA:99,18,0,4
-BRDA:99,18,1,4
-BRDA:100,19,0,0
-BRDA:104,20,0,0
-BRDA:104,20,1,2
-BRDA:104,21,0,2
-BRDA:104,21,1,2
-BRDA:112,22,0,0
-BRDA:112,23,0,2
-BRDA:112,23,1,2
-BRDA:112,24,0,0
-BRDA:112,24,1,2
-BRDA:112,25,0,2
-BRDA:112,25,1,2
-BRDA:113,26,0,0
-BRDA:113,26,1,0
-BRDA:113,27,0,0
-BRDA:113,27,1,0
-BRDA:119,28,0,1
-BRDA:122,29,0,0
-BRDA:122,29,1,1
-BRDA:122,30,0,1
-BRDA:122,30,1,1
+DA:131,1
+DA:134,1
+DA:135,5
+DA:136,5
+DA:138,0
+DA:139,0
+LF:72
+LH:56
+BRDA:138,0,0,0
+BRDA:138,0,1,0
+BRDA:138,1,0,0
+BRDA:138,1,1,0
+BRDA:138,2,0,0
+BRDA:138,2,1,0
+BRDA:139,3,0,0
+BRDA:139,3,1,0
+BRDA:139,4,0,0
+BRDA:139,4,1,0
+BRDA:31,5,0,1
+BRDA:31,5,1,0
+BRDA:37,6,0,5
+BRDA:37,6,1,4
+BRDA:41,7,0,1
+BRDA:41,8,0,5
+BRDA:41,8,1,2
+BRDA:41,8,2,5
+BRDA:55,9,0,0
+BRDA:55,10,0,0
+BRDA:55,10,1,0
+BRDA:61,11,0,0
+BRDA:71,12,0,1
+BRDA:79,13,0,0
+BRDA:79,13,1,0
+BRDA:79,14,0,0
+BRDA:79,14,1,0
+BRDA:86,15,0,0
+BRDA:88,16,0,2
+BRDA:102,17,0,0
+BRDA:102,17,1,4
+BRDA:102,18,0,4
+BRDA:102,18,1,4
+BRDA:103,19,0,0
+BRDA:107,20,0,0
+BRDA:107,20,1,2
+BRDA:107,21,0,2
+BRDA:107,21,1,2
+BRDA:115,22,0,0
+BRDA:115,23,0,2
+BRDA:115,23,1,2
+BRDA:115,24,0,0
+BRDA:115,24,1,2
+BRDA:115,25,0,2
+BRDA:115,25,1,2
+BRDA:116,26,0,0
+BRDA:116,26,1,0
+BRDA:116,27,0,0
+BRDA:116,27,1,0
+BRDA:122,28,0,1
+BRDA:125,29,0,0
+BRDA:125,29,1,1
+BRDA:125,30,0,1
+BRDA:125,30,1,1
 BRF:54
 BRH:24
 end_of_record
@@ -3842,7 +3971,8 @@ DA:20,3
 DA:23,0
 DA:24,0
 DA:30,1
-DA:32,1
+DA:31,1
+DA:32,0
 DA:35,0
 DA:36,0
 DA:39,0
@@ -3884,7 +4014,7 @@ DA:121,1
 DA:122,0
 DA:123,0
 DA:124,0
-LF:52
+LF:53
 LH:25
 BRDA:17,0,0,0
 BRDA:17,1,0,3