@contractkit/plugin-typescript 0.23.0 → 0.24.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 (22) hide show
  1. package/.turbo/turbo-build$colon$ci.log +6 -6
  2. package/.turbo/turbo-test$colon$ci.log +13 -13
  3. package/CHANGELOG.md +12 -0
  4. package/coverage/clover.xml +519 -514
  5. package/coverage/coverage-final.json +2 -2
  6. package/coverage/index.html +15 -15
  7. package/coverage/src/codegen-contract.ts.html +262 -214
  8. package/coverage/src/codegen-operation.ts.html +1 -1
  9. package/coverage/src/codegen-plain-types.ts.html +1 -1
  10. package/coverage/src/codegen-sdk.ts.html +1 -1
  11. package/coverage/src/index.html +14 -14
  12. package/coverage/src/index.ts.html +1 -1
  13. package/coverage/src/path-utils.ts.html +1 -1
  14. package/coverage/src/ts-render.ts.html +1 -1
  15. package/coverage/tests/helpers.ts.html +7 -7
  16. package/coverage/tests/index.html +1 -1
  17. package/dist/codegen-contract.d.ts.map +1 -1
  18. package/dist/index.js +14 -5
  19. package/dist/index.js.map +1 -1
  20. package/package.json +3 -3
  21. package/src/codegen-contract.ts +22 -6
  22. package/tests/codegen-contract.test.ts +51 -1
package/coverage/src/codegen-contract.ts.html CHANGED
@@ -23,16 +23,16 @@
23
23
  <div class='clearfix'>
24
24
 
25
25
  <div class='fl pad1y space-right2'>
26
- <span class="strong">87.83% </span>
26
+ <span class="strong">87.92% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>592/674</span>
28
+ <span class='fraction'>597/679</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">82.12% </span>
33
+ <span class="strong">82.7% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>386/470</span>
35
+ <span class='fraction'>392/474</span>
36
36
  </div>
37
37
 
38
38
 
@@ -44,9 +44,9 @@
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">88.96% </span>
47
+ <span class="strong">89.06% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>492/553</span>
49
+ <span class='fraction'>497/558</span>
50
50
  </div>
51
51
 
52
52
 
@@ -1239,7 +1239,23 @@
1239
1239
  <a name='L1174'></a><a href='#L1174'>1174</a>
1240
1240
  <a name='L1175'></a><a href='#L1175'>1175</a>
1241
1241
  <a name='L1176'></a><a href='#L1176'>1176</a>
1242
- <a name='L1177'></a><a href='#L1177'>1177</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1242
+ <a name='L1177'></a><a href='#L1177'>1177</a>
1243
+ <a name='L1178'></a><a href='#L1178'>1178</a>
1244
+ <a name='L1179'></a><a href='#L1179'>1179</a>
1245
+ <a name='L1180'></a><a href='#L1180'>1180</a>
1246
+ <a name='L1181'></a><a href='#L1181'>1181</a>
1247
+ <a name='L1182'></a><a href='#L1182'>1182</a>
1248
+ <a name='L1183'></a><a href='#L1183'>1183</a>
1249
+ <a name='L1184'></a><a href='#L1184'>1184</a>
1250
+ <a name='L1185'></a><a href='#L1185'>1185</a>
1251
+ <a name='L1186'></a><a href='#L1186'>1186</a>
1252
+ <a name='L1187'></a><a href='#L1187'>1187</a>
1253
+ <a name='L1188'></a><a href='#L1188'>1188</a>
1254
+ <a name='L1189'></a><a href='#L1189'>1189</a>
1255
+ <a name='L1190'></a><a href='#L1190'>1190</a>
1256
+ <a name='L1191'></a><a href='#L1191'>1191</a>
1257
+ <a name='L1192'></a><a href='#L1192'>1192</a>
1258
+ <a name='L1193'></a><a href='#L1193'>1193</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1243
1259
  <span class="cline-any cline-neutral">&nbsp;</span>
1244
1260
  <span class="cline-any cline-neutral">&nbsp;</span>
1245
1261
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1269,9 +1285,9 @@
1269
1285
  <span class="cline-any cline-neutral">&nbsp;</span>
1270
1286
  <span class="cline-any cline-neutral">&nbsp;</span>
1271
1287
  <span class="cline-any cline-neutral">&nbsp;</span>
1272
- <span class="cline-any cline-yes">126x</span>
1288
+ <span class="cline-any cline-yes">130x</span>
1273
1289
  <span class="cline-any cline-neutral">&nbsp;</span>
1274
- <span class="cline-any cline-yes">119x</span>
1290
+ <span class="cline-any cline-yes">123x</span>
1275
1291
  <span class="cline-any cline-neutral">&nbsp;</span>
1276
1292
  <span class="cline-any cline-yes">5x</span>
1277
1293
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1303,33 +1319,33 @@
1303
1319
  <span class="cline-any cline-neutral">&nbsp;</span>
1304
1320
  <span class="cline-any cline-neutral">&nbsp;</span>
1305
1321
  <span class="cline-any cline-neutral">&nbsp;</span>
1306
- <span class="cline-any cline-yes">143x</span>
1322
+ <span class="cline-any cline-yes">146x</span>
1307
1323
  <span class="cline-any cline-neutral">&nbsp;</span>
1308
1324
  <span class="cline-any cline-neutral">&nbsp;</span>
1309
- <span class="cline-any cline-yes">143x</span>
1310
- <span class="cline-any cline-yes">224x</span>
1325
+ <span class="cline-any cline-yes">146x</span>
1326
+ <span class="cline-any cline-yes">230x</span>
1311
1327
  <span class="cline-any cline-yes">30x</span>
1312
1328
  <span class="cline-any cline-neutral">&nbsp;</span>
1313
1329
  <span class="cline-any cline-neutral">&nbsp;</span>
1314
1330
  <span class="cline-any cline-neutral">&nbsp;</span>
1315
1331
  <span class="cline-any cline-neutral">&nbsp;</span>
1316
1332
  <span class="cline-any cline-neutral">&nbsp;</span>
1317
- <span class="cline-any cline-yes">143x</span>
1318
- <span class="cline-any cline-yes">143x</span>
1319
- <span class="cline-any cline-yes">162x</span>
1320
- <span class="cline-any cline-yes">162x</span>
1321
- <span class="cline-any cline-yes">221x</span>
1322
- <span class="cline-any cline-yes">155x</span>
1323
- <span class="cline-any cline-yes">155x</span>
1324
- <span class="cline-any cline-yes">192x</span>
1333
+ <span class="cline-any cline-yes">146x</span>
1334
+ <span class="cline-any cline-yes">146x</span>
1335
+ <span class="cline-any cline-yes">165x</span>
1336
+ <span class="cline-any cline-yes">165x</span>
1337
+ <span class="cline-any cline-yes">224x</span>
1338
+ <span class="cline-any cline-yes">158x</span>
1339
+ <span class="cline-any cline-yes">158x</span>
1340
+ <span class="cline-any cline-yes">198x</span>
1325
1341
  <span class="cline-any cline-neutral">&nbsp;</span>
1326
1342
  <span class="cline-any cline-neutral">&nbsp;</span>
1327
1343
  <span class="cline-any cline-neutral">&nbsp;</span>
1328
- <span class="cline-any cline-yes">155x</span>
1344
+ <span class="cline-any cline-yes">158x</span>
1329
1345
  <span class="cline-any cline-neutral">&nbsp;</span>
1330
1346
  <span class="cline-any cline-neutral">&nbsp;</span>
1331
- <span class="cline-any cline-yes">155x</span>
1332
- <span class="cline-any cline-yes">155x</span>
1347
+ <span class="cline-any cline-yes">158x</span>
1348
+ <span class="cline-any cline-yes">158x</span>
1333
1349
  <span class="cline-any cline-yes">71x</span>
1334
1350
  <span class="cline-any cline-yes">21x</span>
1335
1351
  <span class="cline-any cline-yes">21x</span>
@@ -1339,23 +1355,23 @@
1339
1355
  <span class="cline-any cline-neutral">&nbsp;</span>
1340
1356
  <span class="cline-any cline-neutral">&nbsp;</span>
1341
1357
  <span class="cline-any cline-neutral">&nbsp;</span>
1342
- <span class="cline-any cline-yes">143x</span>
1358
+ <span class="cline-any cline-yes">146x</span>
1343
1359
  <span class="cline-any cline-neutral">&nbsp;</span>
1344
1360
  <span class="cline-any cline-neutral">&nbsp;</span>
1345
1361
  <span class="cline-any cline-neutral">&nbsp;</span>
1346
- <span class="cline-any cline-yes">105x</span>
1347
- <span class="cline-any cline-yes">105x</span>
1348
- <span class="cline-any cline-yes">105x</span>
1362
+ <span class="cline-any cline-yes">108x</span>
1363
+ <span class="cline-any cline-yes">108x</span>
1364
+ <span class="cline-any cline-yes">108x</span>
1349
1365
  <span class="cline-any cline-no">&nbsp;</span>
1350
1366
  <span class="cline-any cline-neutral">&nbsp;</span>
1351
- <span class="cline-any cline-yes">105x</span>
1367
+ <span class="cline-any cline-yes">108x</span>
1352
1368
  <span class="cline-any cline-yes">1x</span>
1353
1369
  <span class="cline-any cline-neutral">&nbsp;</span>
1354
1370
  <span class="cline-any cline-neutral">&nbsp;</span>
1355
- <span class="cline-any cline-yes">105x</span>
1356
- <span class="cline-any cline-yes">105x</span>
1357
- <span class="cline-any cline-yes">105x</span>
1358
- <span class="cline-any cline-yes">105x</span>
1371
+ <span class="cline-any cline-yes">108x</span>
1372
+ <span class="cline-any cline-yes">108x</span>
1373
+ <span class="cline-any cline-yes">108x</span>
1374
+ <span class="cline-any cline-yes">108x</span>
1359
1375
  <span class="cline-any cline-neutral">&nbsp;</span>
1360
1376
  <span class="cline-any cline-neutral">&nbsp;</span>
1361
1377
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1369,71 +1385,71 @@
1369
1385
  <span class="cline-any cline-neutral">&nbsp;</span>
1370
1386
  <span class="cline-any cline-neutral">&nbsp;</span>
1371
1387
  <span class="cline-any cline-neutral">&nbsp;</span>
1372
- <span class="cline-any cline-yes">80x</span>
1373
- <span class="cline-any cline-yes">80x</span>
1374
- <span class="cline-any cline-yes">80x</span>
1375
- <span class="cline-any cline-yes">80x</span>
1376
- <span class="cline-any cline-yes">80x</span>
1377
- <span class="cline-any cline-yes">80x</span>
1378
- <span class="cline-any cline-yes">80x</span>
1379
- <span class="cline-any cline-yes">80x</span>
1388
+ <span class="cline-any cline-yes">83x</span>
1389
+ <span class="cline-any cline-yes">83x</span>
1390
+ <span class="cline-any cline-yes">83x</span>
1391
+ <span class="cline-any cline-yes">83x</span>
1392
+ <span class="cline-any cline-yes">83x</span>
1393
+ <span class="cline-any cline-yes">83x</span>
1394
+ <span class="cline-any cline-yes">83x</span>
1395
+ <span class="cline-any cline-yes">83x</span>
1380
1396
  <span class="cline-any cline-neutral">&nbsp;</span>
1381
1397
  <span class="cline-any cline-neutral">&nbsp;</span>
1382
- <span class="cline-any cline-yes">80x</span>
1383
- <span class="cline-any cline-yes">80x</span>
1384
- <span class="cline-any cline-yes">80x</span>
1398
+ <span class="cline-any cline-yes">83x</span>
1399
+ <span class="cline-any cline-yes">83x</span>
1400
+ <span class="cline-any cline-yes">83x</span>
1385
1401
  <span class="cline-any cline-neutral">&nbsp;</span>
1386
1402
  <span class="cline-any cline-neutral">&nbsp;</span>
1387
- <span class="cline-any cline-yes">80x</span>
1388
- <span class="cline-any cline-yes">80x</span>
1389
- <span class="cline-any cline-yes">80x</span>
1403
+ <span class="cline-any cline-yes">83x</span>
1404
+ <span class="cline-any cline-yes">83x</span>
1405
+ <span class="cline-any cline-yes">83x</span>
1390
1406
  <span class="cline-any cline-neutral">&nbsp;</span>
1391
1407
  <span class="cline-any cline-neutral">&nbsp;</span>
1392
- <span class="cline-any cline-yes">80x</span>
1393
- <span class="cline-any cline-yes">80x</span>
1394
- <span class="cline-any cline-yes">80x</span>
1408
+ <span class="cline-any cline-yes">83x</span>
1409
+ <span class="cline-any cline-yes">83x</span>
1410
+ <span class="cline-any cline-yes">83x</span>
1395
1411
  <span class="cline-any cline-neutral">&nbsp;</span>
1396
- <span class="cline-any cline-yes">80x</span>
1397
- <span class="cline-any cline-yes">80x</span>
1398
- <span class="cline-any cline-yes">80x</span>
1399
- <span class="cline-any cline-yes">80x</span>
1400
- <span class="cline-any cline-yes">80x</span>
1401
- <span class="cline-any cline-yes">80x</span>
1402
- <span class="cline-any cline-yes">80x</span>
1412
+ <span class="cline-any cline-yes">83x</span>
1413
+ <span class="cline-any cline-yes">83x</span>
1414
+ <span class="cline-any cline-yes">83x</span>
1415
+ <span class="cline-any cline-yes">83x</span>
1416
+ <span class="cline-any cline-yes">83x</span>
1417
+ <span class="cline-any cline-yes">83x</span>
1418
+ <span class="cline-any cline-yes">83x</span>
1403
1419
  <span class="cline-any cline-yes">19x</span>
1404
1420
  <span class="cline-any cline-yes">19x</span>
1405
1421
  <span class="cline-any cline-neutral">&nbsp;</span>
1406
- <span class="cline-any cline-yes">80x</span>
1407
- <span class="cline-any cline-yes">80x</span>
1422
+ <span class="cline-any cline-yes">83x</span>
1423
+ <span class="cline-any cline-yes">83x</span>
1408
1424
  <span class="cline-any cline-yes">1x</span>
1409
1425
  <span class="cline-any cline-neutral">&nbsp;</span>
1410
- <span class="cline-any cline-yes">80x</span>
1426
+ <span class="cline-any cline-yes">83x</span>
1411
1427
  <span class="cline-any cline-yes">5x</span>
1412
1428
  <span class="cline-any cline-neutral">&nbsp;</span>
1413
1429
  <span class="cline-any cline-neutral">&nbsp;</span>
1414
1430
  <span class="cline-any cline-neutral">&nbsp;</span>
1415
- <span class="cline-any cline-yes">80x</span>
1431
+ <span class="cline-any cline-yes">83x</span>
1416
1432
  <span class="cline-any cline-yes">3x</span>
1417
1433
  <span class="cline-any cline-neutral">&nbsp;</span>
1418
1434
  <span class="cline-any cline-neutral">&nbsp;</span>
1419
1435
  <span class="cline-any cline-neutral">&nbsp;</span>
1420
- <span class="cline-any cline-yes">80x</span>
1436
+ <span class="cline-any cline-yes">83x</span>
1421
1437
  <span class="cline-any cline-yes">1x</span>
1422
1438
  <span class="cline-any cline-yes">1x</span>
1423
1439
  <span class="cline-any cline-neutral">&nbsp;</span>
1424
1440
  <span class="cline-any cline-neutral">&nbsp;</span>
1425
1441
  <span class="cline-any cline-neutral">&nbsp;</span>
1426
- <span class="cline-any cline-yes">80x</span>
1442
+ <span class="cline-any cline-yes">83x</span>
1427
1443
  <span class="cline-any cline-neutral">&nbsp;</span>
1428
- <span class="cline-any cline-yes">143x</span>
1429
- <span class="cline-any cline-yes">105x</span>
1444
+ <span class="cline-any cline-yes">149x</span>
1445
+ <span class="cline-any cline-yes">108x</span>
1430
1446
  <span class="cline-any cline-neutral">&nbsp;</span>
1431
- <span class="cline-any cline-yes">80x</span>
1432
- <span class="cline-any cline-yes">105x</span>
1433
- <span class="cline-any cline-yes">105x</span>
1447
+ <span class="cline-any cline-yes">83x</span>
1448
+ <span class="cline-any cline-yes">108x</span>
1449
+ <span class="cline-any cline-yes">108x</span>
1434
1450
  <span class="cline-any cline-neutral">&nbsp;</span>
1435
1451
  <span class="cline-any cline-neutral">&nbsp;</span>
1436
- <span class="cline-any cline-yes">80x</span>
1452
+ <span class="cline-any cline-yes">83x</span>
1437
1453
  <span class="cline-any cline-neutral">&nbsp;</span>
1438
1454
  <span class="cline-any cline-neutral">&nbsp;</span>
1439
1455
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1446,7 +1462,7 @@
1446
1462
  <span class="cline-any cline-neutral">&nbsp;</span>
1447
1463
  <span class="cline-any cline-neutral">&nbsp;</span>
1448
1464
  <span class="cline-any cline-neutral">&nbsp;</span>
1449
- <span class="cline-any cline-yes">111x</span>
1465
+ <span class="cline-any cline-yes">114x</span>
1450
1466
  <span class="cline-any cline-neutral">&nbsp;</span>
1451
1467
  <span class="cline-any cline-neutral">&nbsp;</span>
1452
1468
  <span class="cline-any cline-yes">15x</span>
@@ -1456,7 +1472,7 @@
1456
1472
  <span class="cline-any cline-neutral">&nbsp;</span>
1457
1473
  <span class="cline-any cline-yes">11x</span>
1458
1474
  <span class="cline-any cline-neutral">&nbsp;</span>
1459
- <span class="cline-any cline-yes">111x</span>
1475
+ <span class="cline-any cline-yes">114x</span>
1460
1476
  <span class="cline-any cline-neutral">&nbsp;</span>
1461
1477
  <span class="cline-any cline-yes">1x</span>
1462
1478
  <span class="cline-any cline-yes">2x</span>
@@ -1481,26 +1497,26 @@
1481
1497
  <span class="cline-any cline-neutral">&nbsp;</span>
1482
1498
  <span class="cline-any cline-neutral">&nbsp;</span>
1483
1499
  <span class="cline-any cline-neutral">&nbsp;</span>
1484
- <span class="cline-any cline-yes">105x</span>
1500
+ <span class="cline-any cline-yes">108x</span>
1485
1501
  <span class="cline-any cline-yes">5x</span>
1486
1502
  <span class="cline-any cline-neutral">&nbsp;</span>
1487
1503
  <span class="cline-any cline-neutral">&nbsp;</span>
1488
- <span class="cline-any cline-yes">100x</span>
1504
+ <span class="cline-any cline-yes">103x</span>
1489
1505
  <span class="cline-any cline-neutral">&nbsp;</span>
1490
1506
  <span class="cline-any cline-neutral">&nbsp;</span>
1491
1507
  <span class="cline-any cline-neutral">&nbsp;</span>
1492
- <span class="cline-any cline-yes">127x</span>
1508
+ <span class="cline-any cline-yes">133x</span>
1493
1509
  <span class="cline-any cline-neutral">&nbsp;</span>
1494
- <span class="cline-any cline-yes">105x</span>
1510
+ <span class="cline-any cline-yes">108x</span>
1495
1511
  <span class="cline-any cline-neutral">&nbsp;</span>
1496
1512
  <span class="cline-any cline-neutral">&nbsp;</span>
1497
1513
  <span class="cline-any cline-neutral">&nbsp;</span>
1498
1514
  <span class="cline-any cline-neutral">&nbsp;</span>
1499
- <span class="cline-any cline-yes">105x</span>
1500
- <span class="cline-any cline-yes">3x</span>
1515
+ <span class="cline-any cline-yes">108x</span>
1516
+ <span class="cline-any cline-yes">4x</span>
1501
1517
  <span class="cline-any cline-neutral">&nbsp;</span>
1502
1518
  <span class="cline-any cline-neutral">&nbsp;</span>
1503
- <span class="cline-any cline-yes">100x</span>
1519
+ <span class="cline-any cline-yes">103x</span>
1504
1520
  <span class="cline-any cline-neutral">&nbsp;</span>
1505
1521
  <span class="cline-any cline-neutral">&nbsp;</span>
1506
1522
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1519,42 +1535,52 @@
1519
1535
  <span class="cline-any cline-neutral">&nbsp;</span>
1520
1536
  <span class="cline-any cline-neutral">&nbsp;</span>
1521
1537
  <span class="cline-any cline-neutral">&nbsp;</span>
1522
- <span class="cline-any cline-yes">72x</span>
1523
- <span class="cline-any cline-yes">72x</span>
1538
+ <span class="cline-any cline-yes">75x</span>
1539
+ <span class="cline-any cline-yes">75x</span>
1524
1540
  <span class="cline-any cline-neutral">&nbsp;</span>
1525
- <span class="cline-any cline-yes">72x</span>
1541
+ <span class="cline-any cline-yes">75x</span>
1526
1542
  <span class="cline-any cline-neutral">&nbsp;</span>
1527
- <span class="cline-any cline-yes">72x</span>
1528
- <span class="cline-any cline-yes">72x</span>
1529
- <span class="cline-any cline-yes">72x</span>
1543
+ <span class="cline-any cline-yes">75x</span>
1544
+ <span class="cline-any cline-yes">75x</span>
1545
+ <span class="cline-any cline-yes">75x</span>
1530
1546
  <span class="cline-any cline-neutral">&nbsp;</span>
1531
- <span class="cline-any cline-yes">72x</span>
1547
+ <span class="cline-any cline-yes">75x</span>
1532
1548
  <span class="cline-any cline-neutral">&nbsp;</span>
1533
- <span class="cline-any cline-yes">8x</span>
1549
+ <span class="cline-any cline-yes">11x</span>
1534
1550
  <span class="cline-any cline-neutral">&nbsp;</span>
1535
1551
  <span class="cline-any cline-neutral">&nbsp;</span>
1536
1552
  <span class="cline-any cline-neutral">&nbsp;</span>
1537
1553
  <span class="cline-any cline-neutral">&nbsp;</span>
1538
- <span class="cline-any cline-yes">8x</span>
1539
- <span class="cline-any cline-yes">17x</span>
1540
- <span class="cline-any cline-yes">8x</span>
1541
- <span class="cline-any cline-yes">8x</span>
1542
- <span class="cline-any cline-yes">17x</span>
1543
- <span class="cline-any cline-yes">17x</span>
1544
- <span class="cline-any cline-yes">17x</span>
1554
+ <span class="cline-any cline-yes">11x</span>
1555
+ <span class="cline-any cline-yes">23x</span>
1556
+ <span class="cline-any cline-yes">11x</span>
1557
+ <span class="cline-any cline-yes">11x</span>
1558
+ <span class="cline-any cline-yes">23x</span>
1559
+ <span class="cline-any cline-yes">23x</span>
1560
+ <span class="cline-any cline-yes">23x</span>
1545
1561
  <span class="cline-any cline-neutral">&nbsp;</span>
1546
- <span class="cline-any cline-yes">8x</span>
1547
1562
  <span class="cline-any cline-neutral">&nbsp;</span>
1548
1563
  <span class="cline-any cline-neutral">&nbsp;</span>
1549
1564
  <span class="cline-any cline-neutral">&nbsp;</span>
1550
- <span class="cline-any cline-yes">8x</span>
1551
- <span class="cline-any cline-yes">8x</span>
1552
- <span class="cline-any cline-yes">8x</span>
1565
+ <span class="cline-any cline-neutral">&nbsp;</span>
1566
+ <span class="cline-any cline-yes">3x</span>
1567
+ <span class="cline-any cline-yes">3x</span>
1568
+ <span class="cline-any cline-neutral">&nbsp;</span>
1569
+ <span class="cline-any cline-yes">20x</span>
1570
+ <span class="cline-any cline-neutral">&nbsp;</span>
1571
+ <span class="cline-any cline-neutral">&nbsp;</span>
1572
+ <span class="cline-any cline-yes">11x</span>
1573
+ <span class="cline-any cline-neutral">&nbsp;</span>
1574
+ <span class="cline-any cline-neutral">&nbsp;</span>
1575
+ <span class="cline-any cline-neutral">&nbsp;</span>
1576
+ <span class="cline-any cline-yes">11x</span>
1577
+ <span class="cline-any cline-yes">11x</span>
1578
+ <span class="cline-any cline-yes">11x</span>
1553
1579
  <span class="cline-any cline-neutral">&nbsp;</span>
1554
1580
  <span class="cline-any cline-neutral">&nbsp;</span>
1555
1581
  <span class="cline-any cline-yes">64x</span>
1556
1582
  <span class="cline-any cline-yes">64x</span>
1557
- <span class="cline-any cline-yes">72x</span>
1583
+ <span class="cline-any cline-yes">75x</span>
1558
1584
  <span class="cline-any cline-yes">6x</span>
1559
1585
  <span class="cline-any cline-yes">6x</span>
1560
1586
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1685,77 +1711,77 @@
1685
1711
  <span class="cline-any cline-neutral">&nbsp;</span>
1686
1712
  <span class="cline-any cline-neutral">&nbsp;</span>
1687
1713
  <span class="cline-any cline-neutral">&nbsp;</span>
1688
- <span class="cline-any cline-yes">20x</span>
1714
+ <span class="cline-any cline-yes">26x</span>
1689
1715
  <span class="cline-any cline-neutral">&nbsp;</span>
1690
1716
  <span class="cline-any cline-neutral">&nbsp;</span>
1691
1717
  <span class="cline-any cline-neutral">&nbsp;</span>
1692
- <span class="cline-any cline-yes">16x</span>
1718
+ <span class="cline-any cline-yes">24x</span>
1693
1719
  <span class="cline-any cline-neutral">&nbsp;</span>
1694
1720
  <span class="cline-any cline-neutral">&nbsp;</span>
1695
1721
  <span class="cline-any cline-neutral">&nbsp;</span>
1696
- <span class="cline-any cline-yes">34x</span>
1697
- <span class="cline-any cline-yes">19x</span>
1698
- <span class="cline-any cline-yes">6x</span>
1722
+ <span class="cline-any cline-yes">46x</span>
1723
+ <span class="cline-any cline-yes">25x</span>
1724
+ <span class="cline-any cline-yes">8x</span>
1699
1725
  <span class="cline-any cline-neutral">&nbsp;</span>
1700
1726
  <span class="cline-any cline-neutral">&nbsp;</span>
1701
1727
  <span class="cline-any cline-neutral">&nbsp;</span>
1702
- <span class="cline-any cline-yes">137x</span>
1728
+ <span class="cline-any cline-yes">139x</span>
1703
1729
  <span class="cline-any cline-neutral">&nbsp;</span>
1704
1730
  <span class="cline-any cline-neutral">&nbsp;</span>
1705
1731
  <span class="cline-any cline-neutral">&nbsp;</span>
1706
- <span class="cline-any cline-yes">4x</span>
1707
- <span class="cline-any cline-yes">8x</span>
1708
- <span class="cline-any cline-yes">8x</span>
1709
- <span class="cline-any cline-yes">8x</span>
1710
- <span class="cline-any cline-no">&nbsp;</span>
1732
+ <span class="cline-any cline-yes">6x</span>
1733
+ <span class="cline-any cline-yes">12x</span>
1734
+ <span class="cline-any cline-yes">12x</span>
1735
+ <span class="cline-any cline-yes">12x</span>
1711
1736
  <span class="cline-any cline-no">&nbsp;</span>
1712
1737
  <span class="cline-any cline-no">&nbsp;</span>
1713
- <span class="cline-any cline-yes">8x</span>
1714
1738
  <span class="cline-any cline-no">&nbsp;</span>
1715
- <span class="cline-any cline-yes">8x</span>
1739
+ <span class="cline-any cline-yes">12x</span>
1740
+ <span class="cline-any cline-yes">1x</span>
1741
+ <span class="cline-any cline-yes">11x</span>
1716
1742
  <span class="cline-any cline-no">&nbsp;</span>
1717
1743
  <span class="cline-any cline-neutral">&nbsp;</span>
1718
- <span class="cline-any cline-yes">8x</span>
1719
- <span class="cline-any cline-yes">8x</span>
1744
+ <span class="cline-any cline-yes">12x</span>
1745
+ <span class="cline-any cline-yes">12x</span>
1720
1746
  <span class="cline-any cline-neutral">&nbsp;</span>
1721
1747
  <span class="cline-any cline-neutral">&nbsp;</span>
1722
1748
  <span class="cline-any cline-neutral">&nbsp;</span>
1723
1749
  <span class="cline-any cline-neutral">&nbsp;</span>
1724
- <span class="cline-any cline-yes">3x</span>
1725
- <span class="cline-any cline-yes">7x</span>
1726
- <span class="cline-any cline-yes">7x</span>
1727
- <span class="cline-any cline-yes">7x</span>
1750
+ <span class="cline-any cline-yes">4x</span>
1751
+ <span class="cline-any cline-yes">9x</span>
1752
+ <span class="cline-any cline-yes">9x</span>
1753
+ <span class="cline-any cline-yes">9x</span>
1728
1754
  <span class="cline-any cline-no">&nbsp;</span>
1729
1755
  <span class="cline-any cline-no">&nbsp;</span>
1730
1756
  <span class="cline-any cline-no">&nbsp;</span>
1731
- <span class="cline-any cline-yes">7x</span>
1757
+ <span class="cline-any cline-yes">9x</span>
1732
1758
  <span class="cline-any cline-neutral">&nbsp;</span>
1733
- <span class="cline-any cline-yes">1x</span>
1734
- <span class="cline-any cline-yes">6x</span>
1759
+ <span class="cline-any cline-yes">2x</span>
1760
+ <span class="cline-any cline-yes">7x</span>
1735
1761
  <span class="cline-any cline-no">&nbsp;</span>
1736
1762
  <span class="cline-any cline-neutral">&nbsp;</span>
1737
- <span class="cline-any cline-yes">7x</span>
1738
- <span class="cline-any cline-yes">7x</span>
1763
+ <span class="cline-any cline-yes">9x</span>
1764
+ <span class="cline-any cline-yes">9x</span>
1739
1765
  <span class="cline-any cline-neutral">&nbsp;</span>
1740
1766
  <span class="cline-any cline-neutral">&nbsp;</span>
1741
1767
  <span class="cline-any cline-neutral">&nbsp;</span>
1742
1768
  <span class="cline-any cline-neutral">&nbsp;</span>
1743
- <span class="cline-any cline-yes">143x</span>
1744
- <span class="cline-any cline-yes">143x</span>
1769
+ <span class="cline-any cline-yes">145x</span>
1770
+ <span class="cline-any cline-yes">145x</span>
1745
1771
  <span class="cline-any cline-neutral">&nbsp;</span>
1746
- <span class="cline-any cline-yes">143x</span>
1772
+ <span class="cline-any cline-yes">145x</span>
1747
1773
  <span class="cline-any cline-neutral">&nbsp;</span>
1748
- <span class="cline-any cline-yes">143x</span>
1749
- <span class="cline-any cline-yes">143x</span>
1774
+ <span class="cline-any cline-yes">145x</span>
1775
+ <span class="cline-any cline-yes">145x</span>
1750
1776
  <span class="cline-any cline-yes">6x</span>
1751
1777
  <span class="cline-any cline-yes">6x</span>
1752
- <span class="cline-any cline-yes">137x</span>
1753
- <span class="cline-any cline-yes">6x</span>
1778
+ <span class="cline-any cline-yes">139x</span>
1779
+ <span class="cline-any cline-yes">7x</span>
1754
1780
  <span class="cline-any cline-neutral">&nbsp;</span>
1755
- <span class="cline-any cline-yes">143x</span>
1781
+ <span class="cline-any cline-yes">145x</span>
1756
1782
  <span class="cline-any cline-neutral">&nbsp;</span>
1757
- <span class="cline-any cline-yes">143x</span>
1758
- <span class="cline-any cline-yes">143x</span>
1783
+ <span class="cline-any cline-yes">145x</span>
1784
+ <span class="cline-any cline-yes">145x</span>
1759
1785
  <span class="cline-any cline-neutral">&nbsp;</span>
1760
1786
  <span class="cline-any cline-neutral">&nbsp;</span>
1761
1787
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1769,9 +1795,9 @@
1769
1795
  <span class="cline-any cline-neutral">&nbsp;</span>
1770
1796
  <span class="cline-any cline-neutral">&nbsp;</span>
1771
1797
  <span class="cline-any cline-neutral">&nbsp;</span>
1772
- <span class="cline-any cline-yes">274x</span>
1798
+ <span class="cline-any cline-yes">282x</span>
1773
1799
  <span class="cline-any cline-neutral">&nbsp;</span>
1774
- <span class="cline-any cline-yes">210x</span>
1800
+ <span class="cline-any cline-yes">217x</span>
1775
1801
  <span class="cline-any cline-neutral">&nbsp;</span>
1776
1802
  <span class="cline-any cline-yes">12x</span>
1777
1803
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1793,7 +1819,7 @@
1793
1819
  <span class="cline-any cline-neutral">&nbsp;</span>
1794
1820
  <span class="cline-any cline-yes">2x</span>
1795
1821
  <span class="cline-any cline-neutral">&nbsp;</span>
1796
- <span class="cline-any cline-yes">3x</span>
1822
+ <span class="cline-any cline-yes">4x</span>
1797
1823
  <span class="cline-any cline-neutral">&nbsp;</span>
1798
1824
  <span class="cline-any cline-no">&nbsp;</span>
1799
1825
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1826,21 +1852,21 @@
1826
1852
  <span class="cline-any cline-neutral">&nbsp;</span>
1827
1853
  <span class="cline-any cline-neutral">&nbsp;</span>
1828
1854
  <span class="cline-any cline-neutral">&nbsp;</span>
1829
- <span class="cline-any cline-yes">239x</span>
1855
+ <span class="cline-any cline-yes">246x</span>
1830
1856
  <span class="cline-any cline-neutral">&nbsp;</span>
1831
- <span class="cline-any cline-yes">118x</span>
1832
- <span class="cline-any cline-yes">118x</span>
1833
- <span class="cline-any cline-yes">117x</span>
1834
- <span class="cline-any cline-yes">116x</span>
1835
- <span class="cline-any cline-yes">118x</span>
1836
- <span class="cline-any cline-yes">118x</span>
1837
- <span class="cline-any cline-yes">118x</span>
1857
+ <span class="cline-any cline-yes">122x</span>
1858
+ <span class="cline-any cline-yes">122x</span>
1859
+ <span class="cline-any cline-yes">121x</span>
1860
+ <span class="cline-any cline-yes">120x</span>
1861
+ <span class="cline-any cline-yes">122x</span>
1862
+ <span class="cline-any cline-yes">122x</span>
1863
+ <span class="cline-any cline-yes">122x</span>
1838
1864
  <span class="cline-any cline-neutral">&nbsp;</span>
1839
1865
  <span class="cline-any cline-neutral">&nbsp;</span>
1840
- <span class="cline-any cline-yes">16x</span>
1841
- <span class="cline-any cline-yes">16x</span>
1842
- <span class="cline-any cline-yes">16x</span>
1843
- <span class="cline-any cline-yes">16x</span>
1866
+ <span class="cline-any cline-yes">17x</span>
1867
+ <span class="cline-any cline-yes">17x</span>
1868
+ <span class="cline-any cline-yes">17x</span>
1869
+ <span class="cline-any cline-yes">17x</span>
1844
1870
  <span class="cline-any cline-neutral">&nbsp;</span>
1845
1871
  <span class="cline-any cline-neutral">&nbsp;</span>
1846
1872
  <span class="cline-any cline-yes">16x</span>
@@ -1884,7 +1910,7 @@
1884
1910
  <span class="cline-any cline-neutral">&nbsp;</span>
1885
1911
  <span class="cline-any cline-yes">1x</span>
1886
1912
  <span class="cline-any cline-neutral">&nbsp;</span>
1887
- <span class="cline-any cline-yes">38x</span>
1913
+ <span class="cline-any cline-yes">40x</span>
1888
1914
  <span class="cline-any cline-neutral">&nbsp;</span>
1889
1915
  <span class="cline-any cline-yes">2x</span>
1890
1916
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1972,31 +1998,37 @@
1972
1998
  <span class="cline-any cline-neutral">&nbsp;</span>
1973
1999
  <span class="cline-any cline-neutral">&nbsp;</span>
1974
2000
  <span class="cline-any cline-neutral">&nbsp;</span>
1975
- <span class="cline-any cline-yes">3x</span>
1976
- <span class="cline-any cline-yes">3x</span>
2001
+ <span class="cline-any cline-yes">4x</span>
2002
+ <span class="cline-any cline-yes">4x</span>
1977
2003
  <span class="cline-any cline-no">&nbsp;</span>
1978
2004
  <span class="cline-any cline-no">&nbsp;</span>
1979
2005
  <span class="cline-any cline-no">&nbsp;</span>
1980
2006
  <span class="cline-any cline-neutral">&nbsp;</span>
1981
2007
  <span class="cline-any cline-no">&nbsp;</span>
1982
2008
  <span class="cline-any cline-neutral">&nbsp;</span>
2009
+ <span class="cline-any cline-neutral">&nbsp;</span>
2010
+ <span class="cline-any cline-neutral">&nbsp;</span>
2011
+ <span class="cline-any cline-no">&nbsp;</span>
1983
2012
  <span class="cline-any cline-no">&nbsp;</span>
2013
+ <span class="cline-any cline-neutral">&nbsp;</span>
1984
2014
  <span class="cline-any cline-no">&nbsp;</span>
1985
2015
  <span class="cline-any cline-neutral">&nbsp;</span>
1986
2016
  <span class="cline-any cline-neutral">&nbsp;</span>
1987
2017
  <span class="cline-any cline-no">&nbsp;</span>
1988
2018
  <span class="cline-any cline-neutral">&nbsp;</span>
1989
- <span class="cline-any cline-yes">3x</span>
1990
- <span class="cline-any cline-yes">1x</span>
2019
+ <span class="cline-any cline-yes">4x</span>
2020
+ <span class="cline-any cline-yes">2x</span>
2021
+ <span class="cline-any cline-yes">4x</span>
1991
2022
  <span class="cline-any cline-yes">2x</span>
2023
+ <span class="cline-any cline-neutral">&nbsp;</span>
2024
+ <span class="cline-any cline-yes">4x</span>
2025
+ <span class="cline-any cline-yes">4x</span>
1992
2026
  <span class="cline-any cline-yes">1x</span>
1993
2027
  <span class="cline-any cline-neutral">&nbsp;</span>
1994
- <span class="cline-any cline-yes">2x</span>
1995
- <span class="cline-any cline-yes">2x</span>
1996
- <span class="cline-any cline-yes">2x</span>
2028
+ <span class="cline-any cline-yes">3x</span>
1997
2029
  <span class="cline-any cline-neutral">&nbsp;</span>
1998
2030
  <span class="cline-any cline-neutral">&nbsp;</span>
1999
- <span class="cline-any cline-yes">1x</span>
2031
+ <span class="cline-any cline-yes">2x</span>
2000
2032
  <span class="cline-any cline-neutral">&nbsp;</span>
2001
2033
  <span class="cline-any cline-yes">2x</span>
2002
2034
  <span class="cline-any cline-yes">4x</span>
@@ -2169,11 +2201,11 @@
2169
2201
  <span class="cline-any cline-neutral">&nbsp;</span>
2170
2202
  <span class="cline-any cline-neutral">&nbsp;</span>
2171
2203
  <span class="cline-any cline-neutral">&nbsp;</span>
2172
- <span class="cline-any cline-yes">214x</span>
2204
+ <span class="cline-any cline-yes">230x</span>
2173
2205
  <span class="cline-any cline-neutral">&nbsp;</span>
2174
2206
  <span class="cline-any cline-neutral">&nbsp;</span>
2175
2207
  <span class="cline-any cline-neutral">&nbsp;</span>
2176
- <span class="cline-any cline-yes">214x</span>
2208
+ <span class="cline-any cline-yes">230x</span>
2177
2209
  <span class="cline-any cline-neutral">&nbsp;</span>
2178
2210
  <span class="cline-any cline-neutral">&nbsp;</span>
2179
2211
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2185,14 +2217,14 @@
2185
2217
  <span class="cline-any cline-neutral">&nbsp;</span>
2186
2218
  <span class="cline-any cline-neutral">&nbsp;</span>
2187
2219
  <span class="cline-any cline-neutral">&nbsp;</span>
2188
- <span class="cline-any cline-yes">140x</span>
2220
+ <span class="cline-any cline-yes">146x</span>
2189
2221
  <span class="cline-any cline-neutral">&nbsp;</span>
2190
2222
  <span class="cline-any cline-neutral">&nbsp;</span>
2191
2223
  <span class="cline-any cline-neutral">&nbsp;</span>
2192
2224
  <span class="cline-any cline-neutral">&nbsp;</span>
2193
- <span class="cline-any cline-yes">1459x</span>
2225
+ <span class="cline-any cline-yes">1499x</span>
2194
2226
  <span class="cline-any cline-neutral">&nbsp;</span>
2195
- <span class="cline-any cline-yes">852x</span>
2227
+ <span class="cline-any cline-yes">887x</span>
2196
2228
  <span class="cline-any cline-neutral">&nbsp;</span>
2197
2229
  <span class="cline-any cline-yes">76x</span>
2198
2230
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2208,7 +2240,7 @@
2208
2240
  <span class="cline-any cline-neutral">&nbsp;</span>
2209
2241
  <span class="cline-any cline-yes">6x</span>
2210
2242
  <span class="cline-any cline-neutral">&nbsp;</span>
2211
- <span class="cline-any cline-yes">46x</span>
2243
+ <span class="cline-any cline-yes">56x</span>
2212
2244
  <span class="cline-any cline-neutral">&nbsp;</span>
2213
2245
  <span class="cline-any cline-yes">433x</span>
2214
2246
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2216,14 +2248,14 @@
2216
2248
  <span class="cline-any cline-neutral">&nbsp;</span>
2217
2249
  <span class="cline-any cline-neutral">&nbsp;</span>
2218
2250
  <span class="cline-any cline-neutral">&nbsp;</span>
2219
- <span class="cline-any cline-yes">825x</span>
2251
+ <span class="cline-any cline-yes">855x</span>
2220
2252
  <span class="cline-any cline-neutral">&nbsp;</span>
2221
2253
  <span class="cline-any cline-neutral">&nbsp;</span>
2222
2254
  <span class="cline-any cline-neutral">&nbsp;</span>
2223
2255
  <span class="cline-any cline-neutral">&nbsp;</span>
2224
- <span class="cline-any cline-yes">263x</span>
2256
+ <span class="cline-any cline-yes">271x</span>
2225
2257
  <span class="cline-any cline-neutral">&nbsp;</span>
2226
- <span class="cline-any cline-yes">149x</span>
2258
+ <span class="cline-any cline-yes">156x</span>
2227
2259
  <span class="cline-any cline-neutral">&nbsp;</span>
2228
2260
  <span class="cline-any cline-yes">14x</span>
2229
2261
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2233,7 +2265,7 @@
2233
2265
  <span class="cline-any cline-neutral">&nbsp;</span>
2234
2266
  <span class="cline-any cline-yes">8x</span>
2235
2267
  <span class="cline-any cline-neutral">&nbsp;</span>
2236
- <span class="cline-any cline-yes">8x</span>
2268
+ <span class="cline-any cline-yes">10x</span>
2237
2269
  <span class="cline-any cline-neutral">&nbsp;</span>
2238
2270
  <span class="cline-any cline-yes">84x</span>
2239
2271
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2241,19 +2273,19 @@
2241
2273
  <span class="cline-any cline-neutral">&nbsp;</span>
2242
2274
  <span class="cline-any cline-neutral">&nbsp;</span>
2243
2275
  <span class="cline-any cline-neutral">&nbsp;</span>
2244
- <span class="cline-any cline-yes">183x</span>
2245
- <span class="cline-any cline-yes">143x</span>
2276
+ <span class="cline-any cline-yes">186x</span>
2277
+ <span class="cline-any cline-yes">146x</span>
2246
2278
  <span class="cline-any cline-neutral">&nbsp;</span>
2247
- <span class="cline-any cline-yes">143x</span>
2248
- <span class="cline-any cline-yes">183x</span>
2249
- <span class="cline-any cline-yes">183x</span>
2250
- <span class="cline-any cline-yes">183x</span>
2251
- <span class="cline-any cline-yes">253x</span>
2279
+ <span class="cline-any cline-yes">146x</span>
2280
+ <span class="cline-any cline-yes">186x</span>
2281
+ <span class="cline-any cline-yes">186x</span>
2282
+ <span class="cline-any cline-yes">186x</span>
2283
+ <span class="cline-any cline-yes">259x</span>
2252
2284
  <span class="cline-any cline-neutral">&nbsp;</span>
2253
2285
  <span class="cline-any cline-neutral">&nbsp;</span>
2254
2286
  <span class="cline-any cline-neutral">&nbsp;</span>
2255
- <span class="cline-any cline-yes">183x</span>
2256
- <span class="cline-any cline-yes">143x</span>
2287
+ <span class="cline-any cline-yes">186x</span>
2288
+ <span class="cline-any cline-yes">146x</span>
2257
2289
  <span class="cline-any cline-neutral">&nbsp;</span>
2258
2290
  <span class="cline-any cline-neutral">&nbsp;</span>
2259
2291
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2325,31 +2357,31 @@
2325
2357
  <span class="cline-any cline-neutral">&nbsp;</span>
2326
2358
  <span class="cline-any cline-neutral">&nbsp;</span>
2327
2359
  <span class="cline-any cline-neutral">&nbsp;</span>
2328
- <span class="cline-any cline-yes">183x</span>
2329
- <span class="cline-any cline-yes">183x</span>
2360
+ <span class="cline-any cline-yes">186x</span>
2361
+ <span class="cline-any cline-yes">186x</span>
2330
2362
  <span class="cline-any cline-neutral">&nbsp;</span>
2331
2363
  <span class="cline-any cline-neutral">&nbsp;</span>
2332
- <span class="cline-any cline-yes">143x</span>
2333
- <span class="cline-any cline-yes">143x</span>
2334
- <span class="cline-any cline-yes">183x</span>
2335
- <span class="cline-any cline-yes">183x</span>
2336
- <span class="cline-any cline-yes">183x</span>
2337
- <span class="cline-any cline-yes">183x</span>
2338
- <span class="cline-any cline-yes">253x</span>
2364
+ <span class="cline-any cline-yes">146x</span>
2365
+ <span class="cline-any cline-yes">146x</span>
2366
+ <span class="cline-any cline-yes">186x</span>
2367
+ <span class="cline-any cline-yes">186x</span>
2368
+ <span class="cline-any cline-yes">186x</span>
2369
+ <span class="cline-any cline-yes">186x</span>
2370
+ <span class="cline-any cline-yes">259x</span>
2339
2371
  <span class="cline-any cline-neutral">&nbsp;</span>
2340
2372
  <span class="cline-any cline-neutral">&nbsp;</span>
2341
- <span class="cline-any cline-yes">183x</span>
2342
- <span class="cline-any cline-yes">183x</span>
2373
+ <span class="cline-any cline-yes">186x</span>
2374
+ <span class="cline-any cline-yes">186x</span>
2343
2375
  <span class="cline-any cline-yes">60x</span>
2344
2376
  <span class="cline-any cline-neutral">&nbsp;</span>
2345
- <span class="cline-any cline-yes">183x</span>
2377
+ <span class="cline-any cline-yes">186x</span>
2346
2378
  <span class="cline-any cline-neutral">&nbsp;</span>
2347
2379
  <span class="cline-any cline-neutral">&nbsp;</span>
2348
2380
  <span class="cline-any cline-neutral">&nbsp;</span>
2349
- <span class="cline-any cline-yes">143x</span>
2350
- <span class="cline-any cline-yes">183x</span>
2351
- <span class="cline-any cline-yes">143x</span>
2352
- <span class="cline-any cline-yes">183x</span>
2381
+ <span class="cline-any cline-yes">146x</span>
2382
+ <span class="cline-any cline-yes">186x</span>
2383
+ <span class="cline-any cline-yes">146x</span>
2384
+ <span class="cline-any cline-yes">186x</span>
2353
2385
  <span class="cline-any cline-yes">37x</span>
2354
2386
  <span class="cline-any cline-neutral">&nbsp;</span>
2355
2387
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2357,34 +2389,34 @@
2357
2389
  <span class="cline-any cline-neutral">&nbsp;</span>
2358
2390
  <span class="cline-any cline-neutral">&nbsp;</span>
2359
2391
  <span class="cline-any cline-neutral">&nbsp;</span>
2360
- <span class="cline-any cline-yes">143x</span>
2361
- <span class="cline-any cline-yes">143x</span>
2362
- <span class="cline-any cline-yes">183x</span>
2392
+ <span class="cline-any cline-yes">146x</span>
2393
+ <span class="cline-any cline-yes">146x</span>
2394
+ <span class="cline-any cline-yes">186x</span>
2363
2395
  <span class="cline-any cline-neutral">&nbsp;</span>
2364
2396
  <span class="cline-any cline-neutral">&nbsp;</span>
2365
- <span class="cline-any cline-yes">143x</span>
2366
- <span class="cline-any cline-yes">143x</span>
2367
- <span class="cline-any cline-yes">183x</span>
2397
+ <span class="cline-any cline-yes">146x</span>
2398
+ <span class="cline-any cline-yes">146x</span>
2399
+ <span class="cline-any cline-yes">186x</span>
2368
2400
  <span class="cline-any cline-neutral">&nbsp;</span>
2369
2401
  <span class="cline-any cline-neutral">&nbsp;</span>
2370
- <span class="cline-any cline-yes">143x</span>
2371
- <span class="cline-any cline-yes">143x</span>
2372
- <span class="cline-any cline-yes">183x</span>
2373
- <span class="cline-any cline-yes">183x</span>
2402
+ <span class="cline-any cline-yes">146x</span>
2403
+ <span class="cline-any cline-yes">146x</span>
2404
+ <span class="cline-any cline-yes">186x</span>
2405
+ <span class="cline-any cline-yes">186x</span>
2374
2406
  <span class="cline-any cline-neutral">&nbsp;</span>
2375
- <span class="cline-any cline-yes">183x</span>
2376
- <span class="cline-any cline-yes">291x</span>
2407
+ <span class="cline-any cline-yes">186x</span>
2408
+ <span class="cline-any cline-yes">294x</span>
2377
2409
  <span class="cline-any cline-yes">35x</span>
2378
2410
  <span class="cline-any cline-neutral">&nbsp;</span>
2379
2411
  <span class="cline-any cline-neutral">&nbsp;</span>
2380
2412
  <span class="cline-any cline-neutral">&nbsp;</span>
2381
2413
  <span class="cline-any cline-neutral">&nbsp;</span>
2382
2414
  <span class="cline-any cline-neutral">&nbsp;</span>
2383
- <span class="cline-any cline-yes">143x</span>
2384
- <span class="cline-any cline-yes">183x</span>
2415
+ <span class="cline-any cline-yes">146x</span>
2416
+ <span class="cline-any cline-yes">186x</span>
2385
2417
  <span class="cline-any cline-neutral">&nbsp;</span>
2386
2418
  <span class="cline-any cline-neutral">&nbsp;</span>
2387
- <span class="cline-any cline-yes">143x</span>
2419
+ <span class="cline-any cline-yes">146x</span>
2388
2420
  <span class="cline-any cline-neutral">&nbsp;</span>
2389
2421
  <span class="cline-any cline-neutral">&nbsp;</span>
2390
2422
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2717,7 +2749,17 @@ function generateSimpleModel(model: ModelNode, outPath?: string): string[] {
2717
2749
  for (const field of model.fields) {
2718
2750
  const inputKey = applyCase(field.name, inputCase);
2719
2751
  const outputKey = applyCase(field.name, outputCase);
2720
- lines.push(` ${quoteKey(outputKey)}: data.${inputKey},`);
2752
+ if (field.optional) {
2753
+ // Conditional spread keeps the field optional (`k?: T`) in the inferred
2754
+ // z.output / z.input type, instead of widening to required-nullable (`k: T | undefined`).
2755
+ // Consumer code built with `...(x ? { k: x } : {})` is only assignable to the optional form.
2756
+ // When inputCase is set, the input schema uses `.nullish()` so the guard must reject both
2757
+ // null and undefined; otherwise `.optional()` only allows undefined.
2758
+ const guard = hasInputTransform ? `data.${inputKey} != null` : `data.${inputKey} !== undefined`;
2759
+ lines.push(` ...(${guard} ? { ${quoteKey(outputKey)}: data.${inputKey} } : {}),`);
2760
+ } else {
2761
+ lines.push(` ${quoteKey(outputKey)}: data.${inputKey},`);
2762
+ }
2721
2763
  }
2722
2764
  lines.push(`}));`);
2723
2765
  // When only outputCase is set, the developer-facing type is the schema's
@@ -2886,8 +2928,8 @@ function renderFieldsAsPascalCase(fields: FieldNode[], defaultMode?: ObjectMode)
2886
2928
  <span class="cstat-no" title="statement not covered" > if (f.nullable) <span class="cstat-no" title="statement not covered" >expr += '.nullable()';</span></span>
2887
2929
  const dv = <span class="cstat-no" title="statement not covered" >typeof f.default === 'string' ? `"${escapeString(f.default)}"` : String(f.default);</span>
2888
2930
  <span class="cstat-no" title="statement not covered" > expr += `.default(${dv})`;</span>
2889
- } else <span class="missing-if-branch" title="if path not taken" >I</span>if (f.optional) {
2890
- <span class="cstat-no" title="statement not covered" > expr += '.nullish()';</span>
2931
+ } else if (f.optional) {
2932
+ expr += '.nullish()';
2891
2933
  } else <span class="missing-if-branch" title="if path not taken" >I</span>if (f.nullable) {
2892
2934
  <span class="cstat-no" title="statement not covered" > expr += '.nullable()';</span>
2893
2935
  }
@@ -3155,9 +3197,13 @@ function renderInlineObject(o: InlineObjectTypeNode, parseCaseTransform?: 'snake
3155
3197
  const transformEntries = <span class="cstat-no" title="statement not covered" >o.fields</span>
3156
3198
  .map(<span class="fstat-no" title="function not covered" >f =&gt; {</span>
3157
3199
  const snakeKey = <span class="cstat-no" title="statement not covered" >camelToSnake(f.name);</span>
3158
- // Optional fields use .nullish() on input; coerce null → undefined in output
3159
- const val = <span class="cstat-no" title="statement not covered" >f.optional ? `data.${snakeKey} ?? undefined` : `data.${snakeKey}`;</span>
3160
- <span class="cstat-no" title="statement not covered" > return ` ${quoteKey(f.name)}: ${val},`;</span>
3200
+ // Optional fields use .nullish() on input. Conditional spread (instead of `?? undefined`)
3201
+ // keeps the key optional in the inferred output type (`k?: T`) rather than widening to
3202
+ // required-nullable (`k: T | undefined`).
3203
+ <span class="cstat-no" title="statement not covered" > if (f.optional) {</span>
3204
+ <span class="cstat-no" title="statement not covered" > return ` ...(data.${snakeKey} != null ? { ${quoteKey(f.name)}: data.${snakeKey} } : {}),`;</span>
3205
+ }
3206
+ <span class="cstat-no" title="statement not covered" > return ` ${quoteKey(f.name)}: data.${snakeKey},`;</span>
3161
3207
  })
3162
3208
  .join('\n');
3163
3209
  <span class="cstat-no" title="statement not covered" > return `${wrapper}({\n${joined}\n}).transform(data =&gt; ({\n${transformEntries}\n}))`;</span>
@@ -3168,8 +3214,10 @@ function renderInlineObject(o: InlineObjectTypeNode, parseCaseTransform?: 'snake
3168
3214
  const transformEntries = o.fields
3169
3215
  .map(f =&gt; {
3170
3216
  const pascalKey = camelToPascal(f.name);
3171
- const val = f.optional ? <span class="branch-0 cbranch-no" title="branch not covered" >`data.${pascalKey} ?? undefined` </span>: `data.${pascalKey}`;
3172
- return ` ${quoteKey(f.name)}: ${val},`;
3217
+ if (f.optional) {
3218
+ return ` ...(data.${pascalKey} != null ? { ${quoteKey(f.name)}: data.${pascalKey} } : {}),`;
3219
+ }
3220
+ return ` ${quoteKey(f.name)}: data.${pascalKey},`;
3173
3221
  })
3174
3222
  .join('\n');
3175
3223
  return `${wrapper}({\n${joined}\n}).transform(data =&gt; ({\n${transformEntries}\n}))`;
@@ -3598,7 +3646,7 @@ export function pascalToDotCase(name: string): string {
3598
3646
  <div class='footer quiet pad2 space-top1 center small'>
3599
3647
  Code coverage generated by
3600
3648
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
3601
- at 2026-05-12T12:06:55.452Z
3649
+ at 2026-05-12T15:00:24.685Z
3602
3650
  </div>
3603
3651
  <script src="../prettify.js"></script>
3604
3652
  <script>