@sfirew/minecraft-motd-parser 1.1.5-dev.1 → 1.1.5

package/CHANGELOG.md

@@ -11,26 +11,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Comprehensive test coverage for hex color parsing, performance, security, and HTML cleaning
-- test(hex color parsing): add comprehensive tests for various hex color formats in JSON to HTML conversion
-- test(performance): implement performance and stress tests for large data handling capabilities
-- test(security): add security-focused test cases for robust input validation
-- test(coverage): add additional tests for JSON rendering and HTML cleaning functionality
+- Modern ESLint configuration with enhanced type safety and optional chaining
+- New test scripts for coverage, watch, performance, security, and comprehensive testing
 
 ### Changed
-- Major refactor of HTML string generation and formatting logic
-- Enhanced type checking throughout the codebase
-- Implemented secure HTML tag cleaning and sanitization
-- refactor(utils): enhance type checking, improve HTML string formatting, and implement secure HTML tag cleaning
-- update(jest.config): enhance test configuration with coverage options and performance settings
-- update(package.json): add new test scripts for coverage, watch, performance, security, and comprehensive testing
-- update(README): add spacing for better readability and remove hex color support example
-- update(README): restructure content for clarity, enhance features section, and add installation and usage examples
+- Major refactor of HTML string generation and formatting logic with secure tag cleaning
+- Enhanced type checking and consistency across JSON parsing functions
+- Streamlined text handling in textToHTML and parser functions
+- Standardized code style: enforced double quotes, updated ESLint rules, improved Jest configuration
+- Updated package.json: replaced `format` script with `lint` script, added ESLint dependencies
+- Improved variable management using `const` instead of `let` where appropriate
+- Enhanced README structure and clarity, removed hex color support example
 - Merge pull request #21 from AlexTMjugador/alex/upstream-hex-color-parser-fix
 
 ### Fixed
 - Parser behavior now precisely matches Minecraft game behavior
-- tweak(parser/JSONtoHTML): tailor behavior to precisely match the game
-- fix(parser): validate text component hex color values
+- Hex color value validation in text components
+- Code consistency issues with standardized formatting
 
 
 

package/coverage/coverage-summary.json

@@ -1,13 +1,13 @@
-{"total": {"lines":{"total":278,"covered":273,"skipped":0,"pct":98.2},"statements":{"total":288,"covered":281,"skipped":0,"pct":97.56},"functions":{"total":25,"covered":23,"skipped":0,"pct":92},"branches":{"total":206,"covered":189,"skipped":0,"pct":91.74},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/index.ts": {"lines":{"total":17,"covered":15,"skipped":0,"pct":88.23},"functions":{"total":4,"covered":2,"skipped":0,"pct":50},"statements":{"total":22,"covered":18,"skipped":0,"pct":81.81},"branches":{"total":24,"covered":18,"skipped":0,"pct":75}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/styleLibrary.ts": {"lines":{"total":12,"covered":12,"skipped":0,"pct":100},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":12,"covered":12,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/types.ts": {"lines":{"total":1,"covered":0,"skipped":0,"pct":0},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":1,"covered":0,"skipped":0,"pct":0},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/utils.ts": {"lines":{"total":72,"covered":72,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":73,"covered":73,"skipped":0,"pct":100},"branches":{"total":54,"covered":53,"skipped":0,"pct":98.14}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/JSONToCleanedText.ts": {"lines":{"total":19,"covered":18,"skipped":0,"pct":94.73},"functions":{"total":1,"covered":1,"skipped":0,"pct":100},"statements":{"total":19,"covered":18,"skipped":0,"pct":94.73},"branches":{"total":21,"covered":19,"skipped":0,"pct":90.47}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/JSONToHTML.ts": {"lines":{"total":45,"covered":44,"skipped":0,"pct":97.77},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":45,"covered":44,"skipped":0,"pct":97.77},"branches":{"total":48,"covered":44,"skipped":0,"pct":91.66}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/autoCleanToText.ts": {"lines":{"total":10,"covered":10,"skipped":0,"pct":100},"functions":{"total":1,"covered":1,"skipped":0,"pct":100},"statements":{"total":10,"covered":10,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/autoToHTML.ts": {"lines":{"total":11,"covered":11,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":11,"covered":11,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/index.ts": {"lines":{"total":17,"covered":17,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":19,"covered":19,"skipped":0,"pct":100},"branches":{"total":7,"covered":6,"skipped":0,"pct":85.71}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/textToHTML.ts": {"lines":{"total":32,"covered":32,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":33,"covered":33,"skipped":0,"pct":100},"branches":{"total":16,"covered":15,"skipped":0,"pct":93.75}}
-,"/Users/snow/projects/my/minecraft-motd-parser/src/parser/textToJSON.ts": {"lines":{"total":42,"covered":42,"skipped":0,"pct":100},"functions":{"total":4,"covered":4,"skipped":0,"pct":100},"statements":{"total":43,"covered":43,"skipped":0,"pct":100},"branches":{"total":28,"covered":26,"skipped":0,"pct":92.85}}
+{"total": {"lines":{"total":277,"covered":272,"skipped":0,"pct":98.19},"statements":{"total":287,"covered":280,"skipped":0,"pct":97.56},"functions":{"total":25,"covered":23,"skipped":0,"pct":92},"branches":{"total":206,"covered":190,"skipped":0,"pct":92.23},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/index.ts": {"lines":{"total":17,"covered":15,"skipped":0,"pct":88.23},"functions":{"total":4,"covered":2,"skipped":0,"pct":50},"statements":{"total":22,"covered":18,"skipped":0,"pct":81.81},"branches":{"total":24,"covered":18,"skipped":0,"pct":75}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/styleLibrary.ts": {"lines":{"total":12,"covered":12,"skipped":0,"pct":100},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":12,"covered":12,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/types.ts": {"lines":{"total":1,"covered":0,"skipped":0,"pct":0},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":1,"covered":0,"skipped":0,"pct":0},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/utils.ts": {"lines":{"total":72,"covered":72,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":73,"covered":73,"skipped":0,"pct":100},"branches":{"total":54,"covered":53,"skipped":0,"pct":98.14}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/JSONToCleanedText.ts": {"lines":{"total":19,"covered":18,"skipped":0,"pct":94.73},"functions":{"total":1,"covered":1,"skipped":0,"pct":100},"statements":{"total":19,"covered":18,"skipped":0,"pct":94.73},"branches":{"total":20,"covered":19,"skipped":0,"pct":95}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/JSONToHTML.ts": {"lines":{"total":45,"covered":44,"skipped":0,"pct":97.77},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":45,"covered":44,"skipped":0,"pct":97.77},"branches":{"total":47,"covered":44,"skipped":0,"pct":93.61}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/autoCleanToText.ts": {"lines":{"total":10,"covered":10,"skipped":0,"pct":100},"functions":{"total":1,"covered":1,"skipped":0,"pct":100},"statements":{"total":10,"covered":10,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/autoToHTML.ts": {"lines":{"total":11,"covered":11,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":11,"covered":11,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/index.ts": {"lines":{"total":17,"covered":17,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":19,"covered":19,"skipped":0,"pct":100},"branches":{"total":7,"covered":6,"skipped":0,"pct":85.71}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/textToHTML.ts": {"lines":{"total":31,"covered":31,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":32,"covered":32,"skipped":0,"pct":100},"branches":{"total":16,"covered":15,"skipped":0,"pct":93.75}}
+,"/media/snow/s-data/projects/my/minecraft-motd-parser/src/parser/textToJSON.ts": {"lines":{"total":42,"covered":42,"skipped":0,"pct":100},"functions":{"total":4,"covered":4,"skipped":0,"pct":100},"statements":{"total":43,"covered":43,"skipped":0,"pct":100},"branches":{"total":30,"covered":27,"skipped":0,"pct":90}}
 }

package/coverage/index.html

@@ -25,14 +25,14 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">97.56% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>281/288</span>
+                <span class='fraction'>280/287</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">91.74% </span>
+                <span class="strong">92.23% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>189/206</span>
+                <span class='fraction'>190/206</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">98.2% </span>
+                <span class="strong">98.19% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>273/278</span>
+                <span class='fraction'>272/277</span>
             </div>
         
             
@@ -99,13 +99,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 98%"></div><div class="cover-empty" style="width: 2%"></div></div>
 	</td>
 	<td data-value="98.88" class="pct high">98.88%</td>
-	<td data-value="180" class="abs high">178/180</td>
-	<td data-value="92.18" class="pct high">92.18%</td>
-	<td data-value="128" class="abs high">118/128</td>
+	<td data-value="179" class="abs high">177/179</td>
+	<td data-value="92.96" class="pct high">92.96%</td>
+	<td data-value="128" class="abs high">119/128</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="16" class="abs high">16/16</td>
-	<td data-value="98.86" class="pct high">98.86%</td>
-	<td data-value="176" class="abs high">174/176</td>
+	<td data-value="98.85" class="pct high">98.85%</td>
+	<td data-value="175" class="abs high">173/175</td>
 	</tr>
 
 </tbody>
@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2025-05-31T11:22:31.041Z
+                at 2025-05-31T14:05:59.962Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/coverage/lcov-report/index.html

@@ -25,14 +25,14 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">97.56% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>281/288</span>
+                <span class='fraction'>280/287</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">91.74% </span>
+                <span class="strong">92.23% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>189/206</span>
+                <span class='fraction'>190/206</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">98.2% </span>
+                <span class="strong">98.19% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>273/278</span>
+                <span class='fraction'>272/277</span>
             </div>
         
             
@@ -99,13 +99,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 98%"></div><div class="cover-empty" style="width: 2%"></div></div>
 	</td>
 	<td data-value="98.88" class="pct high">98.88%</td>
-	<td data-value="180" class="abs high">178/180</td>
-	<td data-value="92.18" class="pct high">92.18%</td>
-	<td data-value="128" class="abs high">118/128</td>
+	<td data-value="179" class="abs high">177/179</td>
+	<td data-value="92.96" class="pct high">92.96%</td>
+	<td data-value="128" class="abs high">119/128</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="16" class="abs high">16/16</td>
-	<td data-value="98.86" class="pct high">98.86%</td>
-	<td data-value="176" class="abs high">174/176</td>
+	<td data-value="98.85" class="pct high">98.85%</td>
+	<td data-value="175" class="abs high">173/175</td>
 	</tr>
 
 </tbody>
@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2025-05-31T11:22:31.027Z
+                at 2025-05-31T14:05:59.952Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -96,8 +96,8 @@ FN:73,(anonymous_3)
 FN:160,cleanCodes
 FNF:5
 FNH:5
-FNDA:15334,isMotdJSONType
-FNDA:133276,htmlStringFormatting
+FNDA:15910,isMotdJSONType
+FNDA:133851,htmlStringFormatting
 FNDA:44,cleanHtmlTags
 FNDA:38,(anonymous_3)
 FNDA:13679,cleanCodes
@@ -108,15 +108,15 @@ DA:10,5
 DA:11,5
 DA:12,5
 DA:16,5
-DA:20,15334
+DA:20,15910
 DA:21,5
-DA:24,15329
-DA:25,15329
-DA:26,15329
-DA:28,15329
-DA:35,133276
+DA:24,15905
+DA:25,15905
+DA:26,15905
+DA:28,15905
+DA:35,133851
 DA:36,6
-DA:38,133270
+DA:38,133845
 DA:61,44
 DA:62,6
 DA:64,38
@@ -176,19 +176,19 @@ DA:164,13679
 LF:72
 LH:72
 BRDA:20,0,0,5
-BRDA:20,0,1,15329
-BRDA:20,1,0,15334
-BRDA:20,1,1,15332
-BRDA:20,1,2,15330
-BRDA:26,2,0,15329
-BRDA:26,2,1,3744
-BRDA:28,3,0,15329
+BRDA:20,0,1,15905
+BRDA:20,1,0,15910
+BRDA:20,1,1,15908
+BRDA:20,1,2,15906
+BRDA:26,2,0,15905
+BRDA:26,2,1,4320
+BRDA:28,3,0,15905
 BRDA:28,3,1,6
 BRDA:28,3,2,5
 BRDA:35,4,0,6
-BRDA:35,4,1,133270
-BRDA:35,5,0,133276
-BRDA:35,5,1,133273
+BRDA:35,4,1,133845
+BRDA:35,5,0,133851
+BRDA:35,5,1,133848
 BRDA:61,6,0,6
 BRDA:61,6,1,38
 BRDA:61,7,0,44
@@ -246,17 +246,17 @@ DA:12,551
 DA:13,1094
 DA:15,1094
 DA:17,508
-DA:20,506
-DA:23,508
-DA:25,537
-DA:27,0
-DA:29,537
-DA:30,536
-DA:36,550
+DA:19,506
+DA:22,508
+DA:24,537
+DA:26,0
+DA:28,537
+DA:29,536
+DA:35,550
+DA:36,40
 DA:37,40
-DA:38,40
-DA:41,39
-DA:44,550
+DA:40,39
+DA:43,550
 LF:19
 LH:18
 BRDA:15,0,0,508
@@ -266,21 +266,20 @@ BRDA:15,1,1,509
 BRDA:17,2,0,506
 BRDA:17,2,1,2
 BRDA:17,3,0,508
-BRDA:17,3,1,506
-BRDA:17,3,2,0
-BRDA:25,4,0,0
-BRDA:25,4,1,537
-BRDA:29,5,0,536
-BRDA:29,5,1,1
-BRDA:36,6,0,40
-BRDA:36,6,1,510
-BRDA:36,7,0,550
-BRDA:36,7,1,42
-BRDA:38,8,0,39
-BRDA:38,8,1,1
-BRDA:38,9,0,40
-BRDA:38,9,1,2
-BRF:21
+BRDA:17,3,1,2
+BRDA:24,4,0,0
+BRDA:24,4,1,537
+BRDA:28,5,0,536
+BRDA:28,5,1,1
+BRDA:35,6,0,40
+BRDA:35,6,1,510
+BRDA:35,7,0,550
+BRDA:35,7,1,42
+BRDA:37,8,0,39
+BRDA:37,8,1,1
+BRDA:37,9,0,40
+BRDA:37,9,1,2
+BRF:20
 BRH:19
 end_of_record
 TN:
@@ -290,7 +289,7 @@ FN:15,parseJSONToHTML
 FNF:2
 FNH:2
 FNDA:5,(anonymous_0)
-FNDA:14832,parseJSONToHTML
+FNDA:15408,parseJSONToHTML
 DA:2,5
 DA:3,5
 DA:5,5
@@ -298,15 +297,15 @@ DA:6,5
 DA:7,5
 DA:8,5
 DA:9,5
-DA:16,14832
-DA:17,14832
-DA:18,14832
-DA:21,14832
-DA:23,30660
-DA:25,30660
+DA:16,15408
+DA:17,15408
+DA:18,15408
+DA:21,15408
+DA:23,31812
+DA:25,31812
 DA:26,1019
 DA:27,341
-DA:41,30660
+DA:41,31812
 DA:42,11556
 DA:43,11556
 DA:44,11556
@@ -319,23 +318,23 @@ DA:56,549
 DA:58,540
 DA:64,11556
 DA:65,11547
-DA:69,30660
-DA:71,3258
-DA:74,3256
-DA:77,3257
-DA:79,14789
-DA:81,2
-DA:83,14787
-DA:84,14786
-DA:90,12190
+DA:69,31812
+DA:71,3834
+DA:73,3832
+DA:76,3833
+DA:78,15365
+DA:80,2
+DA:82,15363
+DA:83,15362
+DA:89,12190
+DA:90,11568
 DA:91,11568
-DA:92,11568
-DA:95,11567
+DA:94,11567
+DA:97,12190
 DA:98,12190
-DA:99,12190
-DA:100,11550
-DA:103,640
-DA:105,12190
+DA:99,11550
+DA:102,640
+DA:104,12190
 LF:45
 LH:44
 BRDA:2,0,0,5
@@ -346,11 +345,11 @@ BRDA:3,1,1,0
 BRDA:3,2,0,5
 BRDA:3,2,1,5
 BRDA:25,3,0,1019
-BRDA:25,3,1,29641
+BRDA:25,3,1,30793
 BRDA:26,4,0,341
 BRDA:26,4,1,678
 BRDA:41,5,0,11556
-BRDA:41,5,1,19104
+BRDA:41,5,1,20256
 BRDA:44,6,0,11556
 BRDA:44,6,1,0
 BRDA:46,7,0,11007
@@ -361,32 +360,31 @@ BRDA:56,9,0,540
 BRDA:56,9,1,9
 BRDA:64,10,0,11547
 BRDA:64,10,1,9
-BRDA:69,11,0,3258
-BRDA:69,11,1,27402
-BRDA:69,12,0,30660
-BRDA:69,12,1,3259
-BRDA:71,13,0,3256
+BRDA:69,11,0,3834
+BRDA:69,11,1,27978
+BRDA:69,12,0,31812
+BRDA:69,12,1,3835
+BRDA:71,13,0,3832
 BRDA:71,13,1,2
-BRDA:71,14,0,3258
-BRDA:71,14,1,3256
-BRDA:71,14,2,0
-BRDA:79,15,0,2
-BRDA:79,15,1,14787
-BRDA:83,16,0,14786
-BRDA:83,16,1,1
-BRDA:90,17,0,11568
-BRDA:90,17,1,622
-BRDA:90,18,0,12190
-BRDA:90,18,1,11573
-BRDA:92,19,0,11567
-BRDA:92,19,1,1
-BRDA:92,20,0,11568
-BRDA:92,20,1,2
-BRDA:99,21,0,11550
-BRDA:99,21,1,640
-BRDA:99,22,0,12190
-BRDA:99,22,1,11850
-BRF:48
+BRDA:71,14,0,3834
+BRDA:71,14,1,2
+BRDA:78,15,0,2
+BRDA:78,15,1,15363
+BRDA:82,16,0,15362
+BRDA:82,16,1,1
+BRDA:89,17,0,11568
+BRDA:89,17,1,622
+BRDA:89,18,0,12190
+BRDA:89,18,1,11573
+BRDA:91,19,0,11567
+BRDA:91,19,1,1
+BRDA:91,20,0,11568
+BRDA:91,20,1,2
+BRDA:98,21,0,11550
+BRDA:98,21,1,640
+BRDA:98,22,0,12190
+BRDA:98,22,1,11850
+BRF:47
 BRH:44
 end_of_record
 TN:
@@ -484,63 +482,62 @@ end_of_record
 TN:
 SF:src/parser/textToHTML.ts
 FN:10,textToHTML
-FN:14,(anonymous_1)
-FN:18,(anonymous_2)
+FN:13,(anonymous_1)
+FN:17,(anonymous_2)
 FNF:3
 FNH:3
-FNDA:28035,textToHTML
-FNDA:517731,(anonymous_1)
-FNDA:378080,(anonymous_2)
+FNDA:28611,textToHTML
+FNDA:518306,(anonymous_1)
+FNDA:378655,(anonymous_2)
 DA:2,5
 DA:3,5
 DA:4,5
 DA:5,5
-DA:11,28035
-DA:12,28035
-DA:13,28035
-DA:14,517731
-DA:15,28035
-DA:16,28035
-DA:17,28035
-DA:18,28035
-DA:19,378080
-DA:22,378080
-DA:24,118142
-DA:26,118142
-DA:27,20152
-DA:31,259938
-DA:32,126706
+DA:11,28611
+DA:12,28611
+DA:13,518306
+DA:14,28610
+DA:15,28610
+DA:16,28610
+DA:17,28610
+DA:18,378655
+DA:21,378655
+DA:23,118142
+DA:25,118142
+DA:26,20152
+DA:30,260513
+DA:31,126706
+DA:32,3212
 DA:33,3212
-DA:34,3212
-DA:39,123494
-DA:46,133232
-DA:47,133232
-DA:50,133232
-DA:51,118348
-DA:53,133232
-DA:59,133232
-DA:60,133231
-DA:61,118354
-DA:64,14877
-DA:69,28034
-LF:32
-LH:32
-BRDA:22,0,0,118142
-BRDA:22,0,1,259938
-BRDA:26,1,0,20152
-BRDA:26,1,1,97990
-BRDA:31,2,0,126706
-BRDA:31,2,1,133232
-BRDA:32,3,0,3212
-BRDA:32,3,1,123494
-BRDA:50,4,0,118348
-BRDA:50,4,1,14884
-BRDA:53,5,0,133232
-BRDA:53,5,1,0
-BRDA:60,6,0,118354
-BRDA:60,6,1,14877
-BRDA:60,7,0,133231
-BRDA:60,7,1,14883
+DA:38,123494
+DA:45,133807
+DA:46,133807
+DA:49,133807
+DA:50,118348
+DA:52,133807
+DA:58,133807
+DA:59,133807
+DA:60,118354
+DA:63,15453
+DA:68,28610
+LF:31
+LH:31
+BRDA:21,0,0,118142
+BRDA:21,0,1,260513
+BRDA:25,1,0,20152
+BRDA:25,1,1,97990
+BRDA:30,2,0,126706
+BRDA:30,2,1,133807
+BRDA:31,3,0,3212
+BRDA:31,3,1,123494
+BRDA:49,4,0,118348
+BRDA:49,4,1,15459
+BRDA:52,5,0,133807
+BRDA:52,5,1,0
+BRDA:59,6,0,118354
+BRDA:59,6,1,15453
+BRDA:59,7,0,133807
+BRDA:59,7,1,15459
 BRF:16
 BRH:15
 end_of_record
@@ -590,10 +587,10 @@ DA:64,3121
 DA:66,3121
 DA:67,3121
 DA:69,3105
-DA:71,16727
-DA:72,9426
-DA:74,8423
-DA:78,7301
+DA:72,16727
+DA:73,9426
+DA:75,8423
+DA:79,7301
 DA:80,999
 DA:86,16
 DA:91,9438
@@ -618,16 +615,18 @@ BRDA:66,7,0,3121
 BRDA:66,7,1,0
 BRDA:67,8,0,3105
 BRDA:67,8,1,16
-BRDA:71,9,0,9426
-BRDA:71,9,1,7301
-BRDA:72,10,0,8423
-BRDA:72,10,1,1003
-BRDA:72,11,0,9426
-BRDA:72,11,1,9426
-BRDA:78,12,0,999
-BRDA:78,12,1,6302
-BRDA:78,13,0,7301
-BRDA:78,13,1,7301
-BRF:28
-BRH:26
+BRDA:72,9,0,9426
+BRDA:72,9,1,7301
+BRDA:73,10,0,8423
+BRDA:73,10,1,1003
+BRDA:73,11,0,9426
+BRDA:73,11,1,9426
+BRDA:79,12,0,999
+BRDA:79,12,1,6302
+BRDA:79,13,0,0
+BRDA:79,13,1,7301
+BRDA:79,14,0,7301
+BRDA:79,14,1,7301
+BRF:30
+BRH:27
 end_of_record