@contractkit/plugin-typescript 0.17.1 → 0.17.3

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 (23) 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 +13 -0
  4. package/coverage/clover.xml +541 -522
  5. package/coverage/coverage-final.json +2 -2
  6. package/coverage/index.html +18 -18
  7. package/coverage/src/codegen-contract.ts.html +350 -218
  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 +18 -18
  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 +6 -6
  16. package/coverage/tests/index.html +1 -1
  17. package/dist/codegen-contract.d.ts +5 -0
  18. package/dist/codegen-contract.d.ts.map +1 -1
  19. package/dist/index.js +33 -3
  20. package/dist/index.js.map +1 -1
  21. package/package.json +4 -4
  22. package/src/codegen-contract.ts +47 -3
  23. package/tests/codegen-contract.test.ts +26 -0
package/coverage/src/codegen-contract.ts.html CHANGED
@@ -23,30 +23,30 @@
23
23
  <div class='clearfix'>
24
24
 
25
25
  <div class='fl pad1y space-right2'>
26
- <span class="strong">87.57% </span>
26
+ <span class="strong">87.83% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>571/652</span>
28
+ <span class='fraction'>592/674</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">81.63% </span>
33
+ <span class="strong">82.12% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>369/452</span>
35
+ <span class='fraction'>386/470</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">89.91% </span>
40
+ <span class="strong">90.08% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>107/119</span>
42
+ <span class='fraction'>109/121</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">88.57% </span>
47
+ <span class="strong">88.96% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>473/534</span>
49
+ <span class='fraction'>492/553</span>
50
50
  </div>
51
51
 
52
52
 
@@ -1195,7 +1195,51 @@
1195
1195
  <a name='L1130'></a><a href='#L1130'>1130</a>
1196
1196
  <a name='L1131'></a><a href='#L1131'>1131</a>
1197
1197
  <a name='L1132'></a><a href='#L1132'>1132</a>
1198
- <a name='L1133'></a><a href='#L1133'>1133</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1198
+ <a name='L1133'></a><a href='#L1133'>1133</a>
1199
+ <a name='L1134'></a><a href='#L1134'>1134</a>
1200
+ <a name='L1135'></a><a href='#L1135'>1135</a>
1201
+ <a name='L1136'></a><a href='#L1136'>1136</a>
1202
+ <a name='L1137'></a><a href='#L1137'>1137</a>
1203
+ <a name='L1138'></a><a href='#L1138'>1138</a>
1204
+ <a name='L1139'></a><a href='#L1139'>1139</a>
1205
+ <a name='L1140'></a><a href='#L1140'>1140</a>
1206
+ <a name='L1141'></a><a href='#L1141'>1141</a>
1207
+ <a name='L1142'></a><a href='#L1142'>1142</a>
1208
+ <a name='L1143'></a><a href='#L1143'>1143</a>
1209
+ <a name='L1144'></a><a href='#L1144'>1144</a>
1210
+ <a name='L1145'></a><a href='#L1145'>1145</a>
1211
+ <a name='L1146'></a><a href='#L1146'>1146</a>
1212
+ <a name='L1147'></a><a href='#L1147'>1147</a>
1213
+ <a name='L1148'></a><a href='#L1148'>1148</a>
1214
+ <a name='L1149'></a><a href='#L1149'>1149</a>
1215
+ <a name='L1150'></a><a href='#L1150'>1150</a>
1216
+ <a name='L1151'></a><a href='#L1151'>1151</a>
1217
+ <a name='L1152'></a><a href='#L1152'>1152</a>
1218
+ <a name='L1153'></a><a href='#L1153'>1153</a>
1219
+ <a name='L1154'></a><a href='#L1154'>1154</a>
1220
+ <a name='L1155'></a><a href='#L1155'>1155</a>
1221
+ <a name='L1156'></a><a href='#L1156'>1156</a>
1222
+ <a name='L1157'></a><a href='#L1157'>1157</a>
1223
+ <a name='L1158'></a><a href='#L1158'>1158</a>
1224
+ <a name='L1159'></a><a href='#L1159'>1159</a>
1225
+ <a name='L1160'></a><a href='#L1160'>1160</a>
1226
+ <a name='L1161'></a><a href='#L1161'>1161</a>
1227
+ <a name='L1162'></a><a href='#L1162'>1162</a>
1228
+ <a name='L1163'></a><a href='#L1163'>1163</a>
1229
+ <a name='L1164'></a><a href='#L1164'>1164</a>
1230
+ <a name='L1165'></a><a href='#L1165'>1165</a>
1231
+ <a name='L1166'></a><a href='#L1166'>1166</a>
1232
+ <a name='L1167'></a><a href='#L1167'>1167</a>
1233
+ <a name='L1168'></a><a href='#L1168'>1168</a>
1234
+ <a name='L1169'></a><a href='#L1169'>1169</a>
1235
+ <a name='L1170'></a><a href='#L1170'>1170</a>
1236
+ <a name='L1171'></a><a href='#L1171'>1171</a>
1237
+ <a name='L1172'></a><a href='#L1172'>1172</a>
1238
+ <a name='L1173'></a><a href='#L1173'>1173</a>
1239
+ <a name='L1174'></a><a href='#L1174'>1174</a>
1240
+ <a name='L1175'></a><a href='#L1175'>1175</a>
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>
1199
1243
  <span class="cline-any cline-neutral">&nbsp;</span>
1200
1244
  <span class="cline-any cline-neutral">&nbsp;</span>
1201
1245
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1225,9 +1269,9 @@
1225
1269
  <span class="cline-any cline-neutral">&nbsp;</span>
1226
1270
  <span class="cline-any cline-neutral">&nbsp;</span>
1227
1271
  <span class="cline-any cline-neutral">&nbsp;</span>
1228
- <span class="cline-any cline-yes">121x</span>
1272
+ <span class="cline-any cline-yes">126x</span>
1229
1273
  <span class="cline-any cline-neutral">&nbsp;</span>
1230
- <span class="cline-any cline-yes">114x</span>
1274
+ <span class="cline-any cline-yes">119x</span>
1231
1275
  <span class="cline-any cline-neutral">&nbsp;</span>
1232
1276
  <span class="cline-any cline-yes">5x</span>
1233
1277
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1258,34 +1302,35 @@
1258
1302
  <span class="cline-any cline-neutral">&nbsp;</span>
1259
1303
  <span class="cline-any cline-neutral">&nbsp;</span>
1260
1304
  <span class="cline-any cline-neutral">&nbsp;</span>
1261
- <span class="cline-any cline-yes">138x</span>
1262
1305
  <span class="cline-any cline-neutral">&nbsp;</span>
1306
+ <span class="cline-any cline-yes">140x</span>
1263
1307
  <span class="cline-any cline-neutral">&nbsp;</span>
1264
- <span class="cline-any cline-yes">138x</span>
1265
- <span class="cline-any cline-yes">210x</span>
1266
- <span class="cline-any cline-yes">27x</span>
1308
+ <span class="cline-any cline-neutral">&nbsp;</span>
1309
+ <span class="cline-any cline-yes">140x</span>
1310
+ <span class="cline-any cline-yes">215x</span>
1311
+ <span class="cline-any cline-yes">29x</span>
1267
1312
  <span class="cline-any cline-neutral">&nbsp;</span>
1268
1313
  <span class="cline-any cline-neutral">&nbsp;</span>
1269
1314
  <span class="cline-any cline-neutral">&nbsp;</span>
1270
1315
  <span class="cline-any cline-neutral">&nbsp;</span>
1271
1316
  <span class="cline-any cline-neutral">&nbsp;</span>
1272
- <span class="cline-any cline-yes">138x</span>
1273
- <span class="cline-any cline-yes">138x</span>
1274
- <span class="cline-any cline-yes">156x</span>
1275
- <span class="cline-any cline-yes">156x</span>
1276
- <span class="cline-any cline-yes">207x</span>
1277
- <span class="cline-any cline-yes">146x</span>
1278
- <span class="cline-any cline-yes">146x</span>
1279
- <span class="cline-any cline-yes">181x</span>
1317
+ <span class="cline-any cline-yes">140x</span>
1318
+ <span class="cline-any cline-yes">140x</span>
1319
+ <span class="cline-any cline-yes">158x</span>
1320
+ <span class="cline-any cline-yes">158x</span>
1321
+ <span class="cline-any cline-yes">212x</span>
1322
+ <span class="cline-any cline-yes">149x</span>
1323
+ <span class="cline-any cline-yes">149x</span>
1324
+ <span class="cline-any cline-yes">184x</span>
1280
1325
  <span class="cline-any cline-neutral">&nbsp;</span>
1281
1326
  <span class="cline-any cline-neutral">&nbsp;</span>
1282
1327
  <span class="cline-any cline-neutral">&nbsp;</span>
1283
- <span class="cline-any cline-yes">146x</span>
1328
+ <span class="cline-any cline-yes">149x</span>
1284
1329
  <span class="cline-any cline-neutral">&nbsp;</span>
1285
1330
  <span class="cline-any cline-neutral">&nbsp;</span>
1286
- <span class="cline-any cline-yes">146x</span>
1287
- <span class="cline-any cline-yes">146x</span>
1288
- <span class="cline-any cline-yes">66x</span>
1331
+ <span class="cline-any cline-yes">149x</span>
1332
+ <span class="cline-any cline-yes">149x</span>
1333
+ <span class="cline-any cline-yes">67x</span>
1289
1334
  <span class="cline-any cline-yes">20x</span>
1290
1335
  <span class="cline-any cline-yes">20x</span>
1291
1336
  <span class="cline-any cline-yes">20x</span>
@@ -1294,23 +1339,23 @@
1294
1339
  <span class="cline-any cline-neutral">&nbsp;</span>
1295
1340
  <span class="cline-any cline-neutral">&nbsp;</span>
1296
1341
  <span class="cline-any cline-neutral">&nbsp;</span>
1297
- <span class="cline-any cline-yes">138x</span>
1342
+ <span class="cline-any cline-yes">140x</span>
1298
1343
  <span class="cline-any cline-neutral">&nbsp;</span>
1299
1344
  <span class="cline-any cline-neutral">&nbsp;</span>
1300
1345
  <span class="cline-any cline-neutral">&nbsp;</span>
1301
- <span class="cline-any cline-yes">100x</span>
1302
- <span class="cline-any cline-yes">100x</span>
1303
- <span class="cline-any cline-yes">100x</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>
1304
1349
  <span class="cline-any cline-no">&nbsp;</span>
1305
1350
  <span class="cline-any cline-neutral">&nbsp;</span>
1306
- <span class="cline-any cline-yes">100x</span>
1351
+ <span class="cline-any cline-yes">105x</span>
1307
1352
  <span class="cline-any cline-yes">1x</span>
1308
1353
  <span class="cline-any cline-neutral">&nbsp;</span>
1309
1354
  <span class="cline-any cline-neutral">&nbsp;</span>
1310
- <span class="cline-any cline-yes">100x</span>
1311
- <span class="cline-any cline-yes">100x</span>
1312
- <span class="cline-any cline-yes">100x</span>
1313
- <span class="cline-any cline-yes">100x</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>
1314
1359
  <span class="cline-any cline-neutral">&nbsp;</span>
1315
1360
  <span class="cline-any cline-neutral">&nbsp;</span>
1316
1361
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1324,71 +1369,71 @@
1324
1369
  <span class="cline-any cline-neutral">&nbsp;</span>
1325
1370
  <span class="cline-any cline-neutral">&nbsp;</span>
1326
1371
  <span class="cline-any cline-neutral">&nbsp;</span>
1327
- <span class="cline-any cline-yes">78x</span>
1328
- <span class="cline-any cline-yes">78x</span>
1329
- <span class="cline-any cline-yes">78x</span>
1330
- <span class="cline-any cline-yes">78x</span>
1331
- <span class="cline-any cline-yes">78x</span>
1332
- <span class="cline-any cline-yes">78x</span>
1333
- <span class="cline-any cline-yes">78x</span>
1334
- <span class="cline-any cline-yes">78x</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>
1335
1380
  <span class="cline-any cline-neutral">&nbsp;</span>
1336
1381
  <span class="cline-any cline-neutral">&nbsp;</span>
1337
- <span class="cline-any cline-yes">78x</span>
1338
- <span class="cline-any cline-yes">78x</span>
1339
- <span class="cline-any cline-yes">78x</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>
1340
1385
  <span class="cline-any cline-neutral">&nbsp;</span>
1341
1386
  <span class="cline-any cline-neutral">&nbsp;</span>
1342
- <span class="cline-any cline-yes">78x</span>
1343
- <span class="cline-any cline-yes">78x</span>
1344
- <span class="cline-any cline-yes">78x</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>
1345
1390
  <span class="cline-any cline-neutral">&nbsp;</span>
1346
1391
  <span class="cline-any cline-neutral">&nbsp;</span>
1347
- <span class="cline-any cline-yes">78x</span>
1348
- <span class="cline-any cline-yes">78x</span>
1349
- <span class="cline-any cline-yes">78x</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>
1350
1395
  <span class="cline-any cline-neutral">&nbsp;</span>
1351
- <span class="cline-any cline-yes">78x</span>
1352
- <span class="cline-any cline-yes">78x</span>
1353
- <span class="cline-any cline-yes">78x</span>
1354
- <span class="cline-any cline-yes">78x</span>
1355
- <span class="cline-any cline-yes">78x</span>
1356
- <span class="cline-any cline-yes">78x</span>
1357
- <span class="cline-any cline-yes">78x</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>
1358
1403
  <span class="cline-any cline-yes">19x</span>
1359
1404
  <span class="cline-any cline-yes">19x</span>
1360
1405
  <span class="cline-any cline-neutral">&nbsp;</span>
1361
- <span class="cline-any cline-yes">78x</span>
1362
- <span class="cline-any cline-yes">78x</span>
1406
+ <span class="cline-any cline-yes">80x</span>
1407
+ <span class="cline-any cline-yes">80x</span>
1363
1408
  <span class="cline-any cline-yes">1x</span>
1364
1409
  <span class="cline-any cline-neutral">&nbsp;</span>
1365
- <span class="cline-any cline-yes">78x</span>
1410
+ <span class="cline-any cline-yes">80x</span>
1366
1411
  <span class="cline-any cline-yes">5x</span>
1367
1412
  <span class="cline-any cline-neutral">&nbsp;</span>
1368
1413
  <span class="cline-any cline-neutral">&nbsp;</span>
1369
1414
  <span class="cline-any cline-neutral">&nbsp;</span>
1370
- <span class="cline-any cline-yes">78x</span>
1415
+ <span class="cline-any cline-yes">80x</span>
1371
1416
  <span class="cline-any cline-yes">3x</span>
1372
1417
  <span class="cline-any cline-neutral">&nbsp;</span>
1373
1418
  <span class="cline-any cline-neutral">&nbsp;</span>
1374
1419
  <span class="cline-any cline-neutral">&nbsp;</span>
1375
- <span class="cline-any cline-yes">78x</span>
1420
+ <span class="cline-any cline-yes">80x</span>
1376
1421
  <span class="cline-any cline-yes">1x</span>
1377
1422
  <span class="cline-any cline-yes">1x</span>
1378
1423
  <span class="cline-any cline-neutral">&nbsp;</span>
1379
1424
  <span class="cline-any cline-neutral">&nbsp;</span>
1380
1425
  <span class="cline-any cline-neutral">&nbsp;</span>
1381
- <span class="cline-any cline-yes">78x</span>
1426
+ <span class="cline-any cline-yes">80x</span>
1382
1427
  <span class="cline-any cline-neutral">&nbsp;</span>
1383
- <span class="cline-any cline-yes">138x</span>
1384
- <span class="cline-any cline-yes">100x</span>
1428
+ <span class="cline-any cline-yes">143x</span>
1429
+ <span class="cline-any cline-yes">105x</span>
1385
1430
  <span class="cline-any cline-neutral">&nbsp;</span>
1386
- <span class="cline-any cline-yes">78x</span>
1387
- <span class="cline-any cline-yes">100x</span>
1388
- <span class="cline-any cline-yes">100x</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>
1389
1434
  <span class="cline-any cline-neutral">&nbsp;</span>
1390
1435
  <span class="cline-any cline-neutral">&nbsp;</span>
1391
- <span class="cline-any cline-yes">78x</span>
1436
+ <span class="cline-any cline-yes">80x</span>
1392
1437
  <span class="cline-any cline-neutral">&nbsp;</span>
1393
1438
  <span class="cline-any cline-neutral">&nbsp;</span>
1394
1439
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1401,17 +1446,17 @@
1401
1446
  <span class="cline-any cline-neutral">&nbsp;</span>
1402
1447
  <span class="cline-any cline-neutral">&nbsp;</span>
1403
1448
  <span class="cline-any cline-neutral">&nbsp;</span>
1404
- <span class="cline-any cline-yes">102x</span>
1449
+ <span class="cline-any cline-yes">111x</span>
1405
1450
  <span class="cline-any cline-neutral">&nbsp;</span>
1406
1451
  <span class="cline-any cline-neutral">&nbsp;</span>
1452
+ <span class="cline-any cline-yes">15x</span>
1453
+ <span class="cline-any cline-yes">15x</span>
1454
+ <span class="cline-any cline-yes">15x</span>
1407
1455
  <span class="cline-any cline-yes">11x</span>
1408
- <span class="cline-any cline-yes">11x</span>
1409
- <span class="cline-any cline-yes">11x</span>
1410
- <span class="cline-any cline-yes">7x</span>
1411
1456
  <span class="cline-any cline-neutral">&nbsp;</span>
1412
- <span class="cline-any cline-yes">7x</span>
1457
+ <span class="cline-any cline-yes">11x</span>
1413
1458
  <span class="cline-any cline-neutral">&nbsp;</span>
1414
- <span class="cline-any cline-yes">102x</span>
1459
+ <span class="cline-any cline-yes">111x</span>
1415
1460
  <span class="cline-any cline-neutral">&nbsp;</span>
1416
1461
  <span class="cline-any cline-yes">1x</span>
1417
1462
  <span class="cline-any cline-yes">2x</span>
@@ -1436,26 +1481,26 @@
1436
1481
  <span class="cline-any cline-neutral">&nbsp;</span>
1437
1482
  <span class="cline-any cline-neutral">&nbsp;</span>
1438
1483
  <span class="cline-any cline-neutral">&nbsp;</span>
1439
- <span class="cline-any cline-yes">100x</span>
1484
+ <span class="cline-any cline-yes">105x</span>
1440
1485
  <span class="cline-any cline-yes">5x</span>
1441
1486
  <span class="cline-any cline-neutral">&nbsp;</span>
1442
1487
  <span class="cline-any cline-neutral">&nbsp;</span>
1443
- <span class="cline-any cline-yes">95x</span>
1488
+ <span class="cline-any cline-yes">100x</span>
1444
1489
  <span class="cline-any cline-neutral">&nbsp;</span>
1445
1490
  <span class="cline-any cline-neutral">&nbsp;</span>
1446
1491
  <span class="cline-any cline-neutral">&nbsp;</span>
1447
- <span class="cline-any cline-yes">122x</span>
1492
+ <span class="cline-any cline-yes">127x</span>
1448
1493
  <span class="cline-any cline-neutral">&nbsp;</span>
1449
- <span class="cline-any cline-yes">100x</span>
1494
+ <span class="cline-any cline-yes">105x</span>
1450
1495
  <span class="cline-any cline-neutral">&nbsp;</span>
1451
1496
  <span class="cline-any cline-neutral">&nbsp;</span>
1452
1497
  <span class="cline-any cline-neutral">&nbsp;</span>
1453
1498
  <span class="cline-any cline-neutral">&nbsp;</span>
1454
- <span class="cline-any cline-yes">100x</span>
1499
+ <span class="cline-any cline-yes">105x</span>
1455
1500
  <span class="cline-any cline-yes">3x</span>
1456
1501
  <span class="cline-any cline-neutral">&nbsp;</span>
1457
1502
  <span class="cline-any cline-neutral">&nbsp;</span>
1458
- <span class="cline-any cline-yes">95x</span>
1503
+ <span class="cline-any cline-yes">100x</span>
1459
1504
  <span class="cline-any cline-neutral">&nbsp;</span>
1460
1505
  <span class="cline-any cline-neutral">&nbsp;</span>
1461
1506
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1474,16 +1519,16 @@
1474
1519
  <span class="cline-any cline-neutral">&nbsp;</span>
1475
1520
  <span class="cline-any cline-neutral">&nbsp;</span>
1476
1521
  <span class="cline-any cline-neutral">&nbsp;</span>
1477
- <span class="cline-any cline-yes">69x</span>
1478
- <span class="cline-any cline-yes">69x</span>
1522
+ <span class="cline-any cline-yes">72x</span>
1523
+ <span class="cline-any cline-yes">72x</span>
1479
1524
  <span class="cline-any cline-neutral">&nbsp;</span>
1480
- <span class="cline-any cline-yes">69x</span>
1525
+ <span class="cline-any cline-yes">72x</span>
1481
1526
  <span class="cline-any cline-neutral">&nbsp;</span>
1482
- <span class="cline-any cline-yes">69x</span>
1483
- <span class="cline-any cline-yes">69x</span>
1484
- <span class="cline-any cline-yes">69x</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>
1485
1530
  <span class="cline-any cline-neutral">&nbsp;</span>
1486
- <span class="cline-any cline-yes">69x</span>
1531
+ <span class="cline-any cline-yes">72x</span>
1487
1532
  <span class="cline-any cline-neutral">&nbsp;</span>
1488
1533
  <span class="cline-any cline-yes">8x</span>
1489
1534
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1507,54 +1552,74 @@
1507
1552
  <span class="cline-any cline-yes">8x</span>
1508
1553
  <span class="cline-any cline-neutral">&nbsp;</span>
1509
1554
  <span class="cline-any cline-neutral">&nbsp;</span>
1510
- <span class="cline-any cline-yes">61x</span>
1511
- <span class="cline-any cline-yes">61x</span>
1512
- <span class="cline-any cline-yes">69x</span>
1513
- <span class="cline-any cline-yes">5x</span>
1514
- <span class="cline-any cline-yes">5x</span>
1555
+ <span class="cline-any cline-yes">64x</span>
1556
+ <span class="cline-any cline-yes">64x</span>
1557
+ <span class="cline-any cline-yes">72x</span>
1558
+ <span class="cline-any cline-yes">6x</span>
1559
+ <span class="cline-any cline-yes">6x</span>
1515
1560
  <span class="cline-any cline-neutral">&nbsp;</span>
1516
1561
  <span class="cline-any cline-yes">3x</span>
1517
1562
  <span class="cline-any cline-neutral">&nbsp;</span>
1518
- <span class="cline-any cline-yes">5x</span>
1519
- <span class="cline-any cline-yes">5x</span>
1520
- <span class="cline-any cline-yes">5x</span>
1563
+ <span class="cline-any cline-yes">6x</span>
1564
+ <span class="cline-any cline-yes">6x</span>
1565
+ <span class="cline-any cline-yes">6x</span>
1521
1566
  <span class="cline-any cline-neutral">&nbsp;</span>
1522
- <span class="cline-any cline-yes">56x</span>
1523
- <span class="cline-any cline-yes">71x</span>
1524
- <span class="cline-any cline-yes">56x</span>
1567
+ <span class="cline-any cline-yes">58x</span>
1568
+ <span class="cline-any cline-yes">74x</span>
1569
+ <span class="cline-any cline-yes">58x</span>
1525
1570
  <span class="cline-any cline-neutral">&nbsp;</span>
1526
1571
  <span class="cline-any cline-neutral">&nbsp;</span>
1527
- <span class="cline-any cline-yes">61x</span>
1528
- <span class="cline-any cline-yes">61x</span>
1572
+ <span class="cline-any cline-yes">64x</span>
1573
+ <span class="cline-any cline-yes">64x</span>
1529
1574
  <span class="cline-any cline-neutral">&nbsp;</span>
1530
1575
  <span class="cline-any cline-neutral">&nbsp;</span>
1531
1576
  <span class="cline-any cline-neutral">&nbsp;</span>
1532
1577
  <span class="cline-any cline-neutral">&nbsp;</span>
1533
1578
  <span class="cline-any cline-neutral">&nbsp;</span>
1534
- <span class="cline-any cline-yes">10x</span>
1535
- <span class="cline-any cline-yes">10x</span>
1579
+ <span class="cline-any cline-yes">14x</span>
1580
+ <span class="cline-any cline-yes">14x</span>
1536
1581
  <span class="cline-any cline-neutral">&nbsp;</span>
1537
1582
  <span class="cline-any cline-yes">2x</span>
1538
1583
  <span class="cline-any cline-neutral">&nbsp;</span>
1539
- <span class="cline-any cline-yes">10x</span>
1584
+ <span class="cline-any cline-yes">14x</span>
1540
1585
  <span class="cline-any cline-neutral">&nbsp;</span>
1541
1586
  <span class="cline-any cline-neutral">&nbsp;</span>
1542
1587
  <span class="cline-any cline-neutral">&nbsp;</span>
1543
- <span class="cline-any cline-yes">26x</span>
1544
- <span class="cline-any cline-yes">26x</span>
1588
+ <span class="cline-any cline-yes">5x</span>
1589
+ <span class="cline-any cline-yes">5x</span>
1590
+ <span class="cline-any cline-yes">4x</span>
1591
+ <span class="cline-any cline-yes">4x</span>
1592
+ <span class="cline-any cline-yes">1x</span>
1545
1593
  <span class="cline-any cline-neutral">&nbsp;</span>
1546
- <span class="cline-any cline-yes">26x</span>
1594
+ <span class="cline-any cline-yes">4x</span>
1595
+ <span class="cline-any cline-yes">4x</span>
1596
+ <span class="cline-any cline-yes">4x</span>
1547
1597
  <span class="cline-any cline-neutral">&nbsp;</span>
1548
- <span class="cline-any cline-yes">26x</span>
1598
+ <span class="cline-any cline-yes">4x</span>
1549
1599
  <span class="cline-any cline-neutral">&nbsp;</span>
1550
- <span class="cline-any cline-yes">26x</span>
1551
- <span class="cline-any cline-yes">45x</span>
1552
1600
  <span class="cline-any cline-neutral">&nbsp;</span>
1553
- <span class="cline-any cline-yes">26x</span>
1554
1601
  <span class="cline-any cline-neutral">&nbsp;</span>
1555
1602
  <span class="cline-any cline-neutral">&nbsp;</span>
1556
1603
  <span class="cline-any cline-neutral">&nbsp;</span>
1557
- <span class="cline-any cline-yes">26x</span>
1604
+ <span class="cline-any cline-neutral">&nbsp;</span>
1605
+ <span class="cline-any cline-neutral">&nbsp;</span>
1606
+ <span class="cline-any cline-neutral">&nbsp;</span>
1607
+ <span class="cline-any cline-neutral">&nbsp;</span>
1608
+ <span class="cline-any cline-yes">28x</span>
1609
+ <span class="cline-any cline-yes">28x</span>
1610
+ <span class="cline-any cline-neutral">&nbsp;</span>
1611
+ <span class="cline-any cline-yes">28x</span>
1612
+ <span class="cline-any cline-neutral">&nbsp;</span>
1613
+ <span class="cline-any cline-yes">28x</span>
1614
+ <span class="cline-any cline-neutral">&nbsp;</span>
1615
+ <span class="cline-any cline-yes">28x</span>
1616
+ <span class="cline-any cline-yes">47x</span>
1617
+ <span class="cline-any cline-neutral">&nbsp;</span>
1618
+ <span class="cline-any cline-yes">28x</span>
1619
+ <span class="cline-any cline-neutral">&nbsp;</span>
1620
+ <span class="cline-any cline-neutral">&nbsp;</span>
1621
+ <span class="cline-any cline-neutral">&nbsp;</span>
1622
+ <span class="cline-any cline-yes">28x</span>
1558
1623
  <span class="cline-any cline-yes">4x</span>
1559
1624
  <span class="cline-any cline-yes">4x</span>
1560
1625
  <span class="cline-any cline-no">&nbsp;</span>
@@ -1568,34 +1633,53 @@
1568
1633
  <span class="cline-any cline-neutral">&nbsp;</span>
1569
1634
  <span class="cline-any cline-neutral">&nbsp;</span>
1570
1635
  <span class="cline-any cline-neutral">&nbsp;</span>
1571
- <span class="cline-any cline-yes">46x</span>
1572
- <span class="cline-any cline-yes">26x</span>
1573
- <span class="cline-any cline-yes">26x</span>
1574
- <span class="cline-any cline-yes">6x</span>
1575
- <span class="cline-any cline-yes">5x</span>
1636
+ <span class="cline-any cline-yes">48x</span>
1637
+ <span class="cline-any cline-yes">28x</span>
1638
+ <span class="cline-any cline-yes">28x</span>
1639
+ <span class="cline-any cline-yes">8x</span>
1640
+ <span class="cline-any cline-yes">7x</span>
1576
1641
  <span class="cline-any cline-neutral">&nbsp;</span>
1577
1642
  <span class="cline-any cline-yes">21x</span>
1578
1643
  <span class="cline-any cline-neutral">&nbsp;</span>
1579
- <span class="cline-any cline-yes">42x</span>
1580
- <span class="cline-any cline-yes">26x</span>
1581
- <span class="cline-any cline-yes">26x</span>
1582
- <span class="cline-any cline-yes">26x</span>
1644
+ <span class="cline-any cline-yes">44x</span>
1645
+ <span class="cline-any cline-yes">28x</span>
1646
+ <span class="cline-any cline-yes">28x</span>
1647
+ <span class="cline-any cline-yes">28x</span>
1583
1648
  <span class="cline-any cline-neutral">&nbsp;</span>
1584
1649
  <span class="cline-any cline-neutral">&nbsp;</span>
1585
1650
  <span class="cline-any cline-neutral">&nbsp;</span>
1586
- <span class="cline-any cline-yes">46x</span>
1587
- <span class="cline-any cline-yes">26x</span>
1588
- <span class="cline-any cline-yes">26x</span>
1589
- <span class="cline-any cline-yes">6x</span>
1590
- <span class="cline-any cline-yes">5x</span>
1651
+ <span class="cline-any cline-yes">48x</span>
1652
+ <span class="cline-any cline-yes">28x</span>
1653
+ <span class="cline-any cline-neutral">&nbsp;</span>
1654
+ <span class="cline-any cline-neutral">&nbsp;</span>
1655
+ <span class="cline-any cline-yes">28x</span>
1656
+ <span class="cline-any cline-yes">28x</span>
1657
+ <span class="cline-any cline-yes">7x</span>
1658
+ <span class="cline-any cline-yes">9x</span>
1659
+ <span class="cline-any cline-yes">4x</span>
1660
+ <span class="cline-any cline-yes">4x</span>
1661
+ <span class="cline-any cline-yes">2x</span>
1662
+ <span class="cline-any cline-yes">2x</span>
1663
+ <span class="cline-any cline-neutral">&nbsp;</span>
1664
+ <span class="cline-any cline-neutral">&nbsp;</span>
1665
+ <span class="cline-any cline-neutral">&nbsp;</span>
1666
+ <span class="cline-any cline-neutral">&nbsp;</span>
1667
+ <span class="cline-any cline-neutral">&nbsp;</span>
1668
+ <span class="cline-any cline-neutral">&nbsp;</span>
1669
+ <span class="cline-any cline-yes">28x</span>
1670
+ <span class="cline-any cline-yes">2x</span>
1671
+ <span class="cline-any cline-neutral">&nbsp;</span>
1672
+ <span class="cline-any cline-yes">28x</span>
1673
+ <span class="cline-any cline-yes">8x</span>
1674
+ <span class="cline-any cline-yes">7x</span>
1591
1675
  <span class="cline-any cline-neutral">&nbsp;</span>
1592
1676
  <span class="cline-any cline-yes">21x</span>
1593
1677
  <span class="cline-any cline-neutral">&nbsp;</span>
1594
1678
  <span class="cline-any cline-yes">31x</span>
1595
- <span class="cline-any cline-yes">26x</span>
1596
- <span class="cline-any cline-yes">26x</span>
1679
+ <span class="cline-any cline-yes">28x</span>
1680
+ <span class="cline-any cline-yes">28x</span>
1597
1681
  <span class="cline-any cline-neutral">&nbsp;</span>
1598
- <span class="cline-any cline-yes">26x</span>
1682
+ <span class="cline-any cline-yes">28x</span>
1599
1683
  <span class="cline-any cline-neutral">&nbsp;</span>
1600
1684
  <span class="cline-any cline-neutral">&nbsp;</span>
1601
1685
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1615,7 +1699,7 @@
1615
1699
  <span class="cline-any cline-neutral">&nbsp;</span>
1616
1700
  <span class="cline-any cline-neutral">&nbsp;</span>
1617
1701
  <span class="cline-any cline-neutral">&nbsp;</span>
1618
- <span class="cline-any cline-yes">132x</span>
1702
+ <span class="cline-any cline-yes">137x</span>
1619
1703
  <span class="cline-any cline-neutral">&nbsp;</span>
1620
1704
  <span class="cline-any cline-neutral">&nbsp;</span>
1621
1705
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1656,22 +1740,22 @@
1656
1740
  <span class="cline-any cline-neutral">&nbsp;</span>
1657
1741
  <span class="cline-any cline-neutral">&nbsp;</span>
1658
1742
  <span class="cline-any cline-neutral">&nbsp;</span>
1659
- <span class="cline-any cline-yes">138x</span>
1660
- <span class="cline-any cline-yes">138x</span>
1743
+ <span class="cline-any cline-yes">143x</span>
1744
+ <span class="cline-any cline-yes">143x</span>
1661
1745
  <span class="cline-any cline-neutral">&nbsp;</span>
1662
- <span class="cline-any cline-yes">138x</span>
1746
+ <span class="cline-any cline-yes">143x</span>
1663
1747
  <span class="cline-any cline-neutral">&nbsp;</span>
1664
- <span class="cline-any cline-yes">138x</span>
1665
- <span class="cline-any cline-yes">138x</span>
1748
+ <span class="cline-any cline-yes">143x</span>
1749
+ <span class="cline-any cline-yes">143x</span>
1666
1750
  <span class="cline-any cline-yes">6x</span>
1667
1751
  <span class="cline-any cline-yes">6x</span>
1668
- <span class="cline-any cline-yes">132x</span>
1752
+ <span class="cline-any cline-yes">137x</span>
1669
1753
  <span class="cline-any cline-yes">6x</span>
1670
1754
  <span class="cline-any cline-neutral">&nbsp;</span>
1671
- <span class="cline-any cline-yes">138x</span>
1755
+ <span class="cline-any cline-yes">143x</span>
1672
1756
  <span class="cline-any cline-neutral">&nbsp;</span>
1673
- <span class="cline-any cline-yes">138x</span>
1674
- <span class="cline-any cline-yes">138x</span>
1757
+ <span class="cline-any cline-yes">143x</span>
1758
+ <span class="cline-any cline-yes">143x</span>
1675
1759
  <span class="cline-any cline-neutral">&nbsp;</span>
1676
1760
  <span class="cline-any cline-neutral">&nbsp;</span>
1677
1761
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1685,9 +1769,9 @@
1685
1769
  <span class="cline-any cline-neutral">&nbsp;</span>
1686
1770
  <span class="cline-any cline-neutral">&nbsp;</span>
1687
1771
  <span class="cline-any cline-neutral">&nbsp;</span>
1688
- <span class="cline-any cline-yes">269x</span>
1772
+ <span class="cline-any cline-yes">274x</span>
1689
1773
  <span class="cline-any cline-neutral">&nbsp;</span>
1690
- <span class="cline-any cline-yes">205x</span>
1774
+ <span class="cline-any cline-yes">210x</span>
1691
1775
  <span class="cline-any cline-neutral">&nbsp;</span>
1692
1776
  <span class="cline-any cline-yes">12x</span>
1693
1777
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1742,15 +1826,15 @@
1742
1826
  <span class="cline-any cline-neutral">&nbsp;</span>
1743
1827
  <span class="cline-any cline-neutral">&nbsp;</span>
1744
1828
  <span class="cline-any cline-neutral">&nbsp;</span>
1745
- <span class="cline-any cline-yes">234x</span>
1829
+ <span class="cline-any cline-yes">239x</span>
1746
1830
  <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>
1747
1834
  <span class="cline-any cline-yes">116x</span>
1748
- <span class="cline-any cline-yes">116x</span>
1749
- <span class="cline-any cline-yes">115x</span>
1750
- <span class="cline-any cline-yes">114x</span>
1751
- <span class="cline-any cline-yes">116x</span>
1752
- <span class="cline-any cline-yes">116x</span>
1753
- <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>
1754
1838
  <span class="cline-any cline-neutral">&nbsp;</span>
1755
1839
  <span class="cline-any cline-neutral">&nbsp;</span>
1756
1840
  <span class="cline-any cline-yes">16x</span>
@@ -1800,7 +1884,7 @@
1800
1884
  <span class="cline-any cline-neutral">&nbsp;</span>
1801
1885
  <span class="cline-any cline-yes">1x</span>
1802
1886
  <span class="cline-any cline-neutral">&nbsp;</span>
1803
- <span class="cline-any cline-yes">35x</span>
1887
+ <span class="cline-any cline-yes">38x</span>
1804
1888
  <span class="cline-any cline-neutral">&nbsp;</span>
1805
1889
  <span class="cline-any cline-yes">2x</span>
1806
1890
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2085,11 +2169,11 @@
2085
2169
  <span class="cline-any cline-neutral">&nbsp;</span>
2086
2170
  <span class="cline-any cline-neutral">&nbsp;</span>
2087
2171
  <span class="cline-any cline-neutral">&nbsp;</span>
2088
- <span class="cline-any cline-yes">207x</span>
2172
+ <span class="cline-any cline-yes">214x</span>
2089
2173
  <span class="cline-any cline-neutral">&nbsp;</span>
2090
2174
  <span class="cline-any cline-neutral">&nbsp;</span>
2091
2175
  <span class="cline-any cline-neutral">&nbsp;</span>
2092
- <span class="cline-any cline-yes">207x</span>
2176
+ <span class="cline-any cline-yes">214x</span>
2093
2177
  <span class="cline-any cline-neutral">&nbsp;</span>
2094
2178
  <span class="cline-any cline-neutral">&nbsp;</span>
2095
2179
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2101,13 +2185,14 @@
2101
2185
  <span class="cline-any cline-neutral">&nbsp;</span>
2102
2186
  <span class="cline-any cline-neutral">&nbsp;</span>
2103
2187
  <span class="cline-any cline-neutral">&nbsp;</span>
2104
- <span class="cline-any cline-yes">135x</span>
2188
+ <span class="cline-any cline-yes">140x</span>
2189
+ <span class="cline-any cline-neutral">&nbsp;</span>
2105
2190
  <span class="cline-any cline-neutral">&nbsp;</span>
2106
2191
  <span class="cline-any cline-neutral">&nbsp;</span>
2107
2192
  <span class="cline-any cline-neutral">&nbsp;</span>
2108
- <span class="cline-any cline-yes">1421x</span>
2193
+ <span class="cline-any cline-yes">1446x</span>
2109
2194
  <span class="cline-any cline-neutral">&nbsp;</span>
2110
- <span class="cline-any cline-yes">822x</span>
2195
+ <span class="cline-any cline-yes">847x</span>
2111
2196
  <span class="cline-any cline-neutral">&nbsp;</span>
2112
2197
  <span class="cline-any cline-yes">76x</span>
2113
2198
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2130,13 +2215,15 @@
2130
2215
  <span class="cline-any cline-neutral">&nbsp;</span>
2131
2216
  <span class="cline-any cline-neutral">&nbsp;</span>
2132
2217
  <span class="cline-any cline-neutral">&nbsp;</span>
2133
- <span class="cline-any cline-yes">790x</span>
2218
+ <span class="cline-any cline-neutral">&nbsp;</span>
2219
+ <span class="cline-any cline-yes">815x</span>
2134
2220
  <span class="cline-any cline-neutral">&nbsp;</span>
2135
2221
  <span class="cline-any cline-neutral">&nbsp;</span>
2136
2222
  <span class="cline-any cline-neutral">&nbsp;</span>
2137
- <span class="cline-any cline-yes">258x</span>
2138
2223
  <span class="cline-any cline-neutral">&nbsp;</span>
2139
- <span class="cline-any cline-yes">144x</span>
2224
+ <span class="cline-any cline-yes">263x</span>
2225
+ <span class="cline-any cline-neutral">&nbsp;</span>
2226
+ <span class="cline-any cline-yes">149x</span>
2140
2227
  <span class="cline-any cline-neutral">&nbsp;</span>
2141
2228
  <span class="cline-any cline-yes">14x</span>
2142
2229
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2153,50 +2240,51 @@
2153
2240
  <span class="cline-any cline-neutral">&nbsp;</span>
2154
2241
  <span class="cline-any cline-neutral">&nbsp;</span>
2155
2242
  <span class="cline-any cline-neutral">&nbsp;</span>
2156
- <span class="cline-any cline-yes">171x</span>
2157
- <span class="cline-any cline-yes">138x</span>
2158
2243
  <span class="cline-any cline-neutral">&nbsp;</span>
2159
- <span class="cline-any cline-yes">138x</span>
2160
- <span class="cline-any cline-yes">171x</span>
2161
- <span class="cline-any cline-yes">171x</span>
2162
- <span class="cline-any cline-yes">171x</span>
2163
- <span class="cline-any cline-yes">238x</span>
2244
+ <span class="cline-any cline-yes">176x</span>
2245
+ <span class="cline-any cline-yes">140x</span>
2164
2246
  <span class="cline-any cline-neutral">&nbsp;</span>
2247
+ <span class="cline-any cline-yes">140x</span>
2248
+ <span class="cline-any cline-yes">176x</span>
2249
+ <span class="cline-any cline-yes">176x</span>
2250
+ <span class="cline-any cline-yes">176x</span>
2251
+ <span class="cline-any cline-yes">243x</span>
2165
2252
  <span class="cline-any cline-neutral">&nbsp;</span>
2166
2253
  <span class="cline-any cline-neutral">&nbsp;</span>
2167
- <span class="cline-any cline-yes">171x</span>
2168
- <span class="cline-any cline-yes">138x</span>
2169
2254
  <span class="cline-any cline-neutral">&nbsp;</span>
2255
+ <span class="cline-any cline-yes">176x</span>
2256
+ <span class="cline-any cline-yes">140x</span>
2170
2257
  <span class="cline-any cline-neutral">&nbsp;</span>
2171
2258
  <span class="cline-any cline-neutral">&nbsp;</span>
2172
2259
  <span class="cline-any cline-neutral">&nbsp;</span>
2173
- <span class="cline-any cline-yes">50x</span>
2174
- <span class="cline-any cline-yes">31x</span>
2175
2260
  <span class="cline-any cline-neutral">&nbsp;</span>
2176
- <span class="cline-any cline-yes">31x</span>
2177
- <span class="cline-any cline-yes">50x</span>
2261
+ <span class="cline-any cline-yes">55x</span>
2262
+ <span class="cline-any cline-yes">33x</span>
2178
2263
  <span class="cline-any cline-neutral">&nbsp;</span>
2179
- <span class="cline-any cline-yes">47x</span>
2264
+ <span class="cline-any cline-yes">33x</span>
2265
+ <span class="cline-any cline-yes">55x</span>
2266
+ <span class="cline-any cline-neutral">&nbsp;</span>
2267
+ <span class="cline-any cline-yes">49x</span>
2180
2268
  <span class="cline-any cline-yes">5x</span>
2181
2269
  <span class="cline-any cline-yes">5x</span>
2182
2270
  <span class="cline-any cline-neutral">&nbsp;</span>
2183
2271
  <span class="cline-any cline-neutral">&nbsp;</span>
2184
2272
  <span class="cline-any cline-neutral">&nbsp;</span>
2185
- <span class="cline-any cline-yes">42x</span>
2273
+ <span class="cline-any cline-yes">44x</span>
2186
2274
  <span class="cline-any cline-yes">2x</span>
2187
2275
  <span class="cline-any cline-neutral">&nbsp;</span>
2188
- <span class="cline-any cline-yes">74x</span>
2189
- <span class="cline-any cline-yes">42x</span>
2276
+ <span class="cline-any cline-yes">76x</span>
2277
+ <span class="cline-any cline-yes">44x</span>
2190
2278
  <span class="cline-any cline-yes">49x</span>
2191
2279
  <span class="cline-any cline-neutral">&nbsp;</span>
2192
2280
  <span class="cline-any cline-neutral">&nbsp;</span>
2193
2281
  <span class="cline-any cline-neutral">&nbsp;</span>
2194
2282
  <span class="cline-any cline-neutral">&nbsp;</span>
2195
- <span class="cline-any cline-yes">31x</span>
2196
- <span class="cline-any cline-yes">50x</span>
2283
+ <span class="cline-any cline-yes">33x</span>
2284
+ <span class="cline-any cline-yes">55x</span>
2197
2285
  <span class="cline-any cline-neutral">&nbsp;</span>
2198
2286
  <span class="cline-any cline-neutral">&nbsp;</span>
2199
- <span class="cline-any cline-yes">31x</span>
2287
+ <span class="cline-any cline-yes">33x</span>
2200
2288
  <span class="cline-any cline-neutral">&nbsp;</span>
2201
2289
  <span class="cline-any cline-neutral">&nbsp;</span>
2202
2290
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2237,66 +2325,66 @@
2237
2325
  <span class="cline-any cline-neutral">&nbsp;</span>
2238
2326
  <span class="cline-any cline-neutral">&nbsp;</span>
2239
2327
  <span class="cline-any cline-neutral">&nbsp;</span>
2240
- <span class="cline-any cline-yes">171x</span>
2241
- <span class="cline-any cline-yes">171x</span>
2328
+ <span class="cline-any cline-yes">176x</span>
2329
+ <span class="cline-any cline-yes">176x</span>
2242
2330
  <span class="cline-any cline-neutral">&nbsp;</span>
2243
2331
  <span class="cline-any cline-neutral">&nbsp;</span>
2244
- <span class="cline-any cline-yes">138x</span>
2245
- <span class="cline-any cline-yes">138x</span>
2246
- <span class="cline-any cline-yes">171x</span>
2247
- <span class="cline-any cline-yes">171x</span>
2248
- <span class="cline-any cline-yes">171x</span>
2249
- <span class="cline-any cline-yes">171x</span>
2250
- <span class="cline-any cline-yes">238x</span>
2332
+ <span class="cline-any cline-yes">140x</span>
2333
+ <span class="cline-any cline-yes">140x</span>
2334
+ <span class="cline-any cline-yes">176x</span>
2335
+ <span class="cline-any cline-yes">176x</span>
2336
+ <span class="cline-any cline-yes">176x</span>
2337
+ <span class="cline-any cline-yes">176x</span>
2338
+ <span class="cline-any cline-yes">243x</span>
2251
2339
  <span class="cline-any cline-neutral">&nbsp;</span>
2252
2340
  <span class="cline-any cline-neutral">&nbsp;</span>
2253
- <span class="cline-any cline-yes">171x</span>
2254
- <span class="cline-any cline-yes">171x</span>
2255
- <span class="cline-any cline-yes">53x</span>
2341
+ <span class="cline-any cline-yes">176x</span>
2342
+ <span class="cline-any cline-yes">176x</span>
2343
+ <span class="cline-any cline-yes">56x</span>
2256
2344
  <span class="cline-any cline-neutral">&nbsp;</span>
2257
- <span class="cline-any cline-yes">171x</span>
2345
+ <span class="cline-any cline-yes">176x</span>
2258
2346
  <span class="cline-any cline-neutral">&nbsp;</span>
2259
2347
  <span class="cline-any cline-neutral">&nbsp;</span>
2260
2348
  <span class="cline-any cline-neutral">&nbsp;</span>
2261
- <span class="cline-any cline-yes">138x</span>
2262
- <span class="cline-any cline-yes">171x</span>
2263
- <span class="cline-any cline-yes">138x</span>
2264
- <span class="cline-any cline-yes">171x</span>
2265
- <span class="cline-any cline-yes">30x</span>
2349
+ <span class="cline-any cline-yes">140x</span>
2350
+ <span class="cline-any cline-yes">176x</span>
2351
+ <span class="cline-any cline-yes">140x</span>
2352
+ <span class="cline-any cline-yes">176x</span>
2353
+ <span class="cline-any cline-yes">33x</span>
2266
2354
  <span class="cline-any cline-neutral">&nbsp;</span>
2267
2355
  <span class="cline-any cline-neutral">&nbsp;</span>
2268
2356
  <span class="cline-any cline-neutral">&nbsp;</span>
2269
2357
  <span class="cline-any cline-neutral">&nbsp;</span>
2270
2358
  <span class="cline-any cline-neutral">&nbsp;</span>
2271
2359
  <span class="cline-any cline-neutral">&nbsp;</span>
2272
- <span class="cline-any cline-yes">138x</span>
2273
- <span class="cline-any cline-yes">138x</span>
2274
- <span class="cline-any cline-yes">171x</span>
2360
+ <span class="cline-any cline-yes">140x</span>
2361
+ <span class="cline-any cline-yes">140x</span>
2362
+ <span class="cline-any cline-yes">176x</span>
2275
2363
  <span class="cline-any cline-neutral">&nbsp;</span>
2276
2364
  <span class="cline-any cline-neutral">&nbsp;</span>
2277
- <span class="cline-any cline-yes">138x</span>
2278
- <span class="cline-any cline-yes">138x</span>
2279
- <span class="cline-any cline-yes">171x</span>
2365
+ <span class="cline-any cline-yes">140x</span>
2366
+ <span class="cline-any cline-yes">140x</span>
2367
+ <span class="cline-any cline-yes">176x</span>
2280
2368
  <span class="cline-any cline-neutral">&nbsp;</span>
2281
2369
  <span class="cline-any cline-neutral">&nbsp;</span>
2282
- <span class="cline-any cline-yes">138x</span>
2283
- <span class="cline-any cline-yes">138x</span>
2284
- <span class="cline-any cline-yes">171x</span>
2285
- <span class="cline-any cline-yes">171x</span>
2370
+ <span class="cline-any cline-yes">140x</span>
2371
+ <span class="cline-any cline-yes">140x</span>
2372
+ <span class="cline-any cline-yes">176x</span>
2373
+ <span class="cline-any cline-yes">176x</span>
2286
2374
  <span class="cline-any cline-neutral">&nbsp;</span>
2287
- <span class="cline-any cline-yes">171x</span>
2288
- <span class="cline-any cline-yes">261x</span>
2289
- <span class="cline-any cline-yes">28x</span>
2375
+ <span class="cline-any cline-yes">176x</span>
2376
+ <span class="cline-any cline-yes">274x</span>
2377
+ <span class="cline-any cline-yes">31x</span>
2290
2378
  <span class="cline-any cline-neutral">&nbsp;</span>
2291
2379
  <span class="cline-any cline-neutral">&nbsp;</span>
2292
2380
  <span class="cline-any cline-neutral">&nbsp;</span>
2293
2381
  <span class="cline-any cline-neutral">&nbsp;</span>
2294
2382
  <span class="cline-any cline-neutral">&nbsp;</span>
2295
- <span class="cline-any cline-yes">138x</span>
2296
- <span class="cline-any cline-yes">171x</span>
2383
+ <span class="cline-any cline-yes">140x</span>
2384
+ <span class="cline-any cline-yes">176x</span>
2297
2385
  <span class="cline-any cline-neutral">&nbsp;</span>
2298
2386
  <span class="cline-any cline-neutral">&nbsp;</span>
2299
- <span class="cline-any cline-yes">138x</span>
2387
+ <span class="cline-any cline-yes">140x</span>
2300
2388
  <span class="cline-any cline-neutral">&nbsp;</span>
2301
2389
  <span class="cline-any cline-neutral">&nbsp;</span>
2302
2390
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2369,6 +2457,7 @@ export function modeToWrapper(mode: ObjectMode): string {
2369
2457
  &nbsp;
2370
2458
  // ─── Cross-file import resolution ─────────────────────────────────────────
2371
2459
  &nbsp;
2460
+ /** Cross-file context passed to `generateContract` to wire up imports and Input/Output variant tracking. */
2372
2461
  export interface ContractCodegenContext {
2373
2462
  /** Map from model name → absolute output file path */
2374
2463
  modelOutPaths: Map&lt;string, string&gt;;
@@ -2579,7 +2668,7 @@ function generateModel(
2579
2668
  const needsInputSplit = effective.fields.some(f =&gt; f.visibility !== 'normal') || (modelsWithInput?.has(effective.name) ?? <span class="branch-2 cbranch-no" title="branch not covered" >false</span>);
2580
2669
  &nbsp;
2581
2670
  const lines = needsInputSplit
2582
- ? generateThreeSchemaModel(effective, outPath, modelsWithInput, modelsWithWriteonly)
2671
+ ? generateThreeSchemaModel(effective, outPath, modelsWithInput, modelsWithWriteonly, modelMap)
2583
2672
  : generateSimpleModel(effective, outPath);
2584
2673
  &nbsp;
2585
2674
  // Emit Output type alias when this model (transitively) has format(output=...)
@@ -2671,7 +2760,27 @@ function buildExtendChain(bases: string[], resolveName: (b: string) =&gt; string
2671
2760
  return { head, tail };
2672
2761
  }
2673
2762
  &nbsp;
2674
- function generateThreeSchemaModel(model: ModelNode, outPath?: string, modelsWithInput?: Set&lt;string&gt;, modelsWithWriteonly?: Set&lt;string&gt;): string[] {
2763
+ function collectEffectiveWritableFieldNames(modelName: string, modelMap: Map&lt;string, ModelNode&gt;): Set&lt;string&gt; {
2764
+ const model = modelMap.get(modelName);
2765
+ if (!model || model.type) return new Set();
2766
+ const result = new Set&lt;string&gt;();
2767
+ for (const base of model.bases ?? []) {
2768
+ for (const f of collectEffectiveWritableFieldNames(base, modelMap)) result.add(f);
2769
+ }
2770
+ for (const field of model.fields) {
2771
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (field.visibility === 'readonly') <span class="cstat-no" title="statement not covered" >result.delete(field.name);</span>
2772
+ else result.add(field.name);
2773
+ }
2774
+ return result;
2775
+ }
2776
+ &nbsp;
2777
+ function generateThreeSchemaModel(
2778
+ model: ModelNode,
2779
+ outPath?: string,
2780
+ modelsWithInput?: Set&lt;string&gt;,
2781
+ modelsWithWriteonly?: Set&lt;string&gt;,
2782
+ modelMap?: Map&lt;string, ModelNode&gt;,
2783
+ ): string[] {
2675
2784
  const lines: string[] = [];
2676
2785
  const name = model.name;
2677
2786
  &nbsp;
@@ -2717,9 +2826,28 @@ function generateThreeSchemaModel(model: ModelNode, outPath?: string, modelsWith
2717
2826
  // extends ParentInput if parent has an Input variant, else extends parent read schema
2718
2827
  const writeFields = allFields.filter(f =&gt; f.visibility !== 'readonly');
2719
2828
  const writeBody = modelsWithInput ? renderInputFields(writeFields, modelsWithInput, model.mode) : <span class="branch-1 cbranch-no" title="branch not covered" >renderFields(writeFields, model.mode);</span>
2829
+ // Fields that become readonly in this model but were writable in a base must be omitted from
2830
+ // the base Input schema — Zod's .extend() cannot remove inherited fields.
2831
+ const fieldsToOmit = new Set&lt;string&gt;();
2832
+ if (bases.length &gt; 0 &amp;&amp; modelMap) {
2833
+ for (const field of allFields) {
2834
+ if (field.visibility === 'readonly') {
2835
+ for (const base of bases) {
2836
+ if (collectEffectiveWritableFieldNames(base, modelMap).has(field.name)) {
2837
+ fieldsToOmit.add(field.name);
2838
+ break;
2839
+ }
2840
+ }
2841
+ }
2842
+ }
2843
+ }
2844
+ const omitClause =
2845
+ fieldsToOmit.size &gt; 0
2846
+ ? `.omit({ ${[...fieldsToOmit].map(f =&gt; `${quoteKey(f)}: true`).join(', ')} })`
2847
+ : '';
2720
2848
  if (bases.length &gt; 0) {
2721
2849
  const { head, tail } = buildExtendChain(bases, b =&gt; (modelsWithInput?.has(b) ? `${b}Input` : b));
2722
- lines.push(`export const ${name}Input = ${head}${tail}.extend({`);
2850
+ lines.push(`export const ${name}Input = ${head}${tail}${omitClause}.extend({`);
2723
2851
  } else {
2724
2852
  lines.push(`export const ${name}Input = ${wrapper}({`);
2725
2853
  }
@@ -3236,6 +3364,7 @@ function rootNeedsDateTime(root: ContractRootNode): boolean {
3236
3364
  return root.models.some(m =&gt; (m.type &amp;&amp; typeNeedsDateTime(m.type)) || m.fields.some(f =&gt; typeNeedsDateTime(f.type)));
3237
3365
  }
3238
3366
  &nbsp;
3367
+ /** Returns true if `type` (recursively) contains a scalar with the given `name`. */
3239
3368
  export function typeNeedsScalar(type: ContractTypeNode, name: string): boolean {
3240
3369
  switch (type.kind) {
3241
3370
  case 'scalar':
@@ -3261,10 +3390,12 @@ export function typeNeedsScalar(type: ContractTypeNode, name: string): boolean {
3261
3390
  }
3262
3391
  }
3263
3392
  &nbsp;
3393
+ /** Returns true if any model in `root` uses a scalar with the given `name`. */
3264
3394
  export function rootNeedsScalar(root: ContractRootNode, name: string): boolean {
3265
3395
  return root.models.some(m =&gt; (m.type &amp;&amp; typeNeedsScalar(m.type, name)) || m.fields.some(f =&gt; typeNeedsScalar(f.type, name)));
3266
3396
  }
3267
3397
  &nbsp;
3398
+ /** Returns true if `type` (recursively) contains a `date`, `time`, or `datetime` scalar. */
3268
3399
  export function typeNeedsDateTime(type: ContractTypeNode): boolean {
3269
3400
  switch (type.kind) {
3270
3401
  case 'scalar':
@@ -3284,6 +3415,7 @@ export function typeNeedsDateTime(type: ContractTypeNode): boolean {
3284
3415
  }
3285
3416
  }
3286
3417
  &nbsp;
3418
+ /** Collect model names referenced in `root` that are not defined locally (need to be imported). */
3287
3419
  export function collectExternalRefs(root: ContractRootNode): string[] {
3288
3420
  const localNames = new Set(root.models.map(m =&gt; m.name));
3289
3421
  const refs = new Set&lt;string&gt;();
@@ -3466,7 +3598,7 @@ export function pascalToDotCase(name: string): string {
3466
3598
  <div class='footer quiet pad2 space-top1 center small'>
3467
3599
  Code coverage generated by
3468
3600
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
3469
- at 2026-05-01T17:30:37.719Z
3601
+ at 2026-05-05T15:36:48.642Z
3470
3602
  </div>
3471
3603
  <script src="../prettify.js"></script>
3472
3604
  <script>