@featurevisor/core 2.26.1 → 3.0.1
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.
- package/CHANGELOG.md +8 -0
- package/coverage/clover.xml +4991 -3130
- package/coverage/coverage-final.json +63 -39
- package/coverage/lcov-report/block-navigation.js +1 -1
- package/coverage/lcov-report/index.html +248 -98
- package/coverage/lcov-report/sorter.js +21 -7
- package/coverage/lcov-report/src/assess-distribution/index.html +116 -0
- package/coverage/lcov-report/src/assess-distribution/index.ts.html +754 -0
- package/coverage/lcov-report/{list → src/benchmark}/index.html +30 -30
- package/coverage/lcov-report/src/benchmark/index.ts.html +793 -0
- package/coverage/lcov-report/{builder → src/builder}/allocator.ts.html +38 -38
- package/coverage/lcov-report/{builder/buildScopedConditions.ts.html → src/builder/applyContextToConditions.ts.html} +80 -65
- package/coverage/lcov-report/{builder/buildScopedDatafile.ts.html → src/builder/applyContextToDatafile.ts.html} +92 -92
- package/coverage/lcov-report/{builder/buildScopedSegments.ts.html → src/builder/applyContextToSegments.ts.html} +103 -67
- package/coverage/lcov-report/{builder → src/builder}/buildDatafile.ts.html +336 -306
- package/coverage/lcov-report/src/builder/buildProject.ts.html +1117 -0
- package/coverage/lcov-report/src/builder/buildRuntimeDatafiles.ts.html +256 -0
- package/coverage/lcov-report/{builder → src/builder}/getFeatureRanges.ts.html +22 -22
- package/coverage/lcov-report/{builder → src/builder}/hashes.ts.html +50 -50
- package/coverage/lcov-report/{builder → src/builder}/index.html +114 -84
- package/coverage/lcov-report/{tester/cliFormat.ts.html → src/builder/index.ts.html} +17 -29
- package/coverage/lcov-report/{builder → src/builder}/mutateVariables.ts.html +55 -55
- package/coverage/lcov-report/{builder → src/builder}/mutator.ts.html +118 -118
- package/coverage/lcov-report/{builder → src/builder}/revision.ts.html +15 -15
- package/coverage/lcov-report/{builder → src/builder}/traffic.ts.html +86 -86
- package/coverage/lcov-report/src/cli/cli.ts.html +400 -0
- package/coverage/lcov-report/{tester → src/cli}/index.html +41 -41
- package/coverage/lcov-report/src/cli/plugins.ts.html +214 -0
- package/coverage/lcov-report/{config → src/config}/index.html +31 -31
- package/coverage/lcov-report/{config → src/config}/index.ts.html +12 -12
- package/coverage/lcov-report/{config → src/config}/projectConfig.ts.html +312 -96
- package/coverage/lcov-report/{datasource → src/datasource}/adapter.ts.html +28 -73
- package/coverage/lcov-report/{datasource → src/datasource}/datasource.ts.html +191 -104
- package/coverage/lcov-report/{datasource → src/datasource}/filesystemAdapter.ts.html +233 -635
- package/coverage/lcov-report/{datasource → src/datasource}/index.html +48 -48
- package/coverage/lcov-report/{datasource → src/datasource}/index.ts.html +14 -14
- package/coverage/lcov-report/src/evaluate/index.html +116 -0
- package/coverage/lcov-report/src/evaluate/index.ts.html +814 -0
- package/coverage/lcov-report/src/find-duplicate-segments/findDuplicateSegments.ts.html +313 -0
- package/coverage/lcov-report/src/find-duplicate-segments/index.html +131 -0
- package/coverage/lcov-report/src/find-duplicate-segments/index.ts.html +307 -0
- package/coverage/lcov-report/src/find-usage/index.html +116 -0
- package/coverage/lcov-report/src/find-usage/index.ts.html +1780 -0
- package/coverage/lcov-report/src/generate-code/index.html +131 -0
- package/coverage/lcov-report/src/generate-code/index.ts.html +403 -0
- package/coverage/lcov-report/{generate-code → src/generate-code}/typescript.ts.html +266 -1361
- package/coverage/lcov-report/{generate-code → src}/index.html +38 -23
- package/coverage/lcov-report/src/info/index.html +116 -0
- package/coverage/lcov-report/src/info/index.ts.html +472 -0
- package/coverage/lcov-report/src/init/index.html +116 -0
- package/coverage/lcov-report/src/init/index.ts.html +280 -0
- package/coverage/lcov-report/{linter → src/linter}/attributeSchema.ts.html +160 -157
- package/coverage/lcov-report/{linter → src/linter}/checkCircularDependency.ts.html +25 -25
- package/coverage/lcov-report/{linter → src/linter}/checkPercentageExceedingSlot.ts.html +42 -42
- package/coverage/lcov-report/{linter → src/linter}/conditionSchema.ts.html +207 -207
- package/coverage/lcov-report/{linter → src/linter}/featureSchema.ts.html +462 -471
- package/coverage/lcov-report/{linter → src/linter}/groupSchema.ts.html +25 -22
- package/coverage/lcov-report/{linter → src/linter}/index.html +129 -99
- package/coverage/lcov-report/src/linter/index.ts.html +88 -0
- package/coverage/lcov-report/{linter → src/linter}/lintProject.ts.html +740 -332
- package/coverage/lcov-report/{linter → src/linter}/mutationNotation.ts.html +130 -130
- package/coverage/lcov-report/{linter → src/linter}/printError.ts.html +27 -27
- package/coverage/lcov-report/{linter → src/linter}/schema.ts.html +153 -150
- package/coverage/lcov-report/{linter → src/linter}/segmentSchema.ts.html +18 -15
- package/coverage/lcov-report/src/linter/targetSchema.ts.html +223 -0
- package/coverage/lcov-report/{linter → src/linter}/testSchema.ts.html +54 -48
- package/coverage/lcov-report/{linter → src/linter}/zodHelpers.ts.html +17 -17
- package/coverage/lcov-report/src/list/index.html +131 -0
- package/coverage/lcov-report/src/list/index.ts.html +2065 -0
- package/coverage/lcov-report/{list → src/list}/matrix.ts.html +43 -58
- package/coverage/lcov-report/src/promoter/index.html +116 -0
- package/coverage/lcov-report/src/promoter/index.ts.html +3883 -0
- package/coverage/lcov-report/src/sets.ts.html +313 -0
- package/coverage/lcov-report/src/targeting.ts.html +403 -0
- package/coverage/lcov-report/src/tester/cliFormat.ts.html +133 -0
- package/coverage/lcov-report/{tester → src/tester}/helpers.ts.html +15 -15
- package/coverage/lcov-report/src/tester/index.html +206 -0
- package/coverage/lcov-report/src/tester/prettyDuration.ts.html +187 -0
- package/coverage/lcov-report/src/tester/printTestResult.ts.html +337 -0
- package/coverage/lcov-report/src/tester/testFeature.ts.html +1186 -0
- package/coverage/lcov-report/src/tester/testProject.ts.html +1018 -0
- package/coverage/lcov-report/src/tester/testSegment.ts.html +316 -0
- package/coverage/lcov-report/{utils → src/utils}/extractKeys.ts.html +68 -68
- package/coverage/lcov-report/{utils → src/utils}/git.ts.html +44 -68
- package/coverage/lcov-report/{utils → src/utils}/index.html +44 -44
- package/coverage/lcov-report/{utils → src/utils}/index.ts.html +14 -14
- package/coverage/lcov-report/{utils → src/utils}/pretty.ts.html +20 -20
- package/coverage/lcov.info +10121 -5723
- package/jest.config.js +13 -4
- package/lib/assess-distribution/index.d.ts +1 -1
- package/lib/assess-distribution/index.js +59 -40
- package/lib/assess-distribution/index.js.map +1 -1
- package/lib/benchmark/index.d.ts +8 -5
- package/lib/benchmark/index.js +82 -65
- package/lib/benchmark/index.js.map +1 -1
- package/lib/builder/applyContextToConditions.d.ts +5 -0
- package/lib/builder/{buildScopedConditions.js → applyContextToConditions.js} +19 -14
- package/lib/builder/applyContextToConditions.js.map +1 -0
- package/lib/builder/applyContextToDatafile.d.ts +2 -0
- package/lib/builder/{buildScopedDatafile.js → applyContextToDatafile.js} +26 -26
- package/lib/builder/applyContextToDatafile.js.map +1 -0
- package/lib/builder/applyContextToSegments.d.ts +5 -0
- package/lib/builder/{buildScopedSegments.js → applyContextToSegments.js} +19 -14
- package/lib/builder/applyContextToSegments.js.map +1 -0
- package/lib/builder/buildDatafile.d.ts +9 -6
- package/lib/builder/buildDatafile.js +86 -51
- package/lib/builder/buildDatafile.js.map +1 -1
- package/lib/builder/buildProject.d.ts +17 -3
- package/lib/builder/buildProject.js +151 -59
- package/lib/builder/buildProject.js.map +1 -1
- package/lib/builder/buildRuntimeDatafiles.d.ts +12 -0
- package/lib/builder/buildRuntimeDatafiles.js +35 -0
- package/lib/builder/buildRuntimeDatafiles.js.map +1 -0
- package/lib/builder/getFeatureRanges.js +34 -1
- package/lib/builder/getFeatureRanges.js.map +1 -1
- package/lib/builder/hashes.js +34 -1
- package/lib/builder/hashes.js.map +1 -1
- package/lib/builder/index.d.ts +0 -1
- package/lib/builder/index.js +0 -1
- package/lib/builder/index.js.map +1 -1
- package/lib/cli/cli.js +0 -4
- package/lib/cli/cli.js.map +1 -1
- package/lib/cli/plugins.js +7 -2
- package/lib/cli/plugins.js.map +1 -1
- package/lib/config/projectConfig.d.ts +17 -17
- package/lib/config/projectConfig.js +101 -15
- package/lib/config/projectConfig.js.map +1 -1
- package/lib/datasource/adapter.d.ts +7 -9
- package/lib/datasource/adapter.js +0 -7
- package/lib/datasource/adapter.js.map +1 -1
- package/lib/datasource/datasource.d.ts +15 -5
- package/lib/datasource/datasource.js +37 -9
- package/lib/datasource/datasource.js.map +1 -1
- package/lib/datasource/filesystemAdapter.d.ts +4 -10
- package/lib/datasource/filesystemAdapter.js +111 -149
- package/lib/datasource/filesystemAdapter.js.map +1 -1
- package/lib/evaluate/index.d.ts +1 -7
- package/lib/evaluate/index.js +81 -67
- package/lib/evaluate/index.js.map +1 -1
- package/lib/find-duplicate-segments/findDuplicateSegments.js +34 -1
- package/lib/find-duplicate-segments/findDuplicateSegments.js.map +1 -1
- package/lib/find-duplicate-segments/index.js +21 -13
- package/lib/find-duplicate-segments/index.js.map +1 -1
- package/lib/find-usage/index.js +57 -41
- package/lib/find-usage/index.js.map +1 -1
- package/lib/generate-code/index.d.ts +1 -1
- package/lib/generate-code/index.js +64 -21
- package/lib/generate-code/index.js.map +1 -1
- package/lib/generate-code/typescript.d.ts +1 -1
- package/lib/generate-code/typescript.js +59 -333
- package/lib/generate-code/typescript.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/info/index.js +57 -16
- package/lib/info/index.js.map +1 -1
- package/lib/init/index.d.ts +2 -2
- package/lib/init/index.js +39 -3
- package/lib/init/index.js.map +1 -1
- package/lib/linter/attributeSchema.d.ts +1 -0
- package/lib/linter/attributeSchema.js +1 -0
- package/lib/linter/attributeSchema.js.map +1 -1
- package/lib/linter/conditionSchema.js +5 -5
- package/lib/linter/conditionSchema.js.map +1 -1
- package/lib/linter/featureSchema.d.ts +4 -1
- package/lib/linter/featureSchema.js +15 -13
- package/lib/linter/featureSchema.js.map +1 -1
- package/lib/linter/groupSchema.d.ts +1 -0
- package/lib/linter/groupSchema.js +1 -0
- package/lib/linter/groupSchema.js.map +1 -1
- package/lib/linter/lintProject.d.ts +1 -3
- package/lib/linter/lintProject.js +198 -68
- package/lib/linter/lintProject.js.map +1 -1
- package/lib/linter/schema.js +1 -0
- package/lib/linter/schema.js.map +1 -1
- package/lib/linter/segmentSchema.d.ts +1 -0
- package/lib/linter/segmentSchema.js +1 -0
- package/lib/linter/segmentSchema.js.map +1 -1
- package/lib/linter/targetSchema.d.ts +16 -0
- package/lib/linter/targetSchema.js +40 -0
- package/lib/linter/targetSchema.js.map +1 -0
- package/lib/linter/testSchema.d.ts +4 -3
- package/lib/linter/testSchema.js +9 -4
- package/lib/linter/testSchema.js.map +1 -1
- package/lib/list/index.d.ts +1 -0
- package/lib/list/index.js +131 -12
- package/lib/list/index.js.map +1 -1
- package/lib/list/matrix.js +3 -7
- package/lib/list/matrix.js.map +1 -1
- package/lib/promoter/index.d.ts +50 -0
- package/lib/promoter/index.js +880 -0
- package/lib/promoter/index.js.map +1 -0
- package/lib/sets.d.ts +11 -0
- package/lib/sets.js +81 -0
- package/lib/sets.js.map +1 -0
- package/lib/targeting.d.ts +14 -0
- package/lib/targeting.js +82 -0
- package/lib/targeting.js.map +1 -0
- package/lib/tester/cliFormat.d.ts +7 -1
- package/lib/tester/cliFormat.js +11 -2
- package/lib/tester/cliFormat.js.map +1 -1
- package/lib/tester/printTestResult.js +2 -2
- package/lib/tester/printTestResult.js.map +1 -1
- package/lib/tester/testFeature.d.ts +0 -1
- package/lib/tester/testFeature.js +8 -25
- package/lib/tester/testFeature.js.map +1 -1
- package/lib/tester/testProject.d.ts +2 -3
- package/lib/tester/testProject.js +93 -86
- package/lib/tester/testProject.js.map +1 -1
- package/lib/tester/testSegment.d.ts +1 -1
- package/lib/tester/testSegment.js +3 -21
- package/lib/tester/testSegment.js.map +1 -1
- package/lib/utils/git.js +45 -19
- package/lib/utils/git.js.map +1 -1
- package/package.json +12 -12
- package/src/assess-distribution/index.ts +72 -52
- package/src/benchmark/index.ts +124 -91
- package/src/builder/{buildScopedConditions.spec.ts → applyContextToConditions.spec.ts} +160 -142
- package/src/builder/{buildScopedConditions.ts → applyContextToConditions.ts} +19 -14
- package/src/builder/{buildScopedDatafile.spec.ts → applyContextToDatafile.spec.ts} +141 -81
- package/src/builder/{buildScopedDatafile.ts → applyContextToDatafile.ts} +33 -33
- package/src/builder/{buildScopedSegments.spec.ts → applyContextToSegments.spec.ts} +171 -151
- package/src/builder/{buildScopedSegments.ts → applyContextToSegments.ts} +26 -14
- package/src/builder/buildDatafile.spec.ts +192 -14
- package/src/builder/buildDatafile.ts +74 -64
- package/src/builder/buildProject.ts +171 -86
- package/src/builder/buildRuntimeDatafiles.ts +57 -0
- package/src/builder/index.ts +0 -1
- package/src/cli/cli.ts +0 -5
- package/src/cli/plugins.ts +7 -2
- package/src/config/projectConfig.spec.ts +171 -8
- package/src/config/projectConfig.ts +100 -28
- package/src/datasource/adapter.ts +8 -23
- package/src/datasource/datasource.ts +50 -21
- package/src/datasource/filesystemAdapter.spec.ts +133 -74
- package/src/datasource/filesystemAdapter.ts +93 -227
- package/src/evaluate/index.ts +109 -97
- package/src/find-duplicate-segments/index.ts +34 -16
- package/src/find-usage/index.ts +89 -44
- package/src/generate-code/index.ts +36 -24
- package/src/generate-code/typescript.spec.ts +106 -0
- package/src/generate-code/typescript.ts +33 -398
- package/src/index.ts +2 -1
- package/src/info/index.ts +72 -16
- package/src/init/index.ts +1 -1
- package/src/linter/attributeSchema.ts +1 -0
- package/src/linter/conditionSchema.spec.ts +23 -3
- package/src/linter/conditionSchema.ts +5 -5
- package/src/linter/featureSchema.spec.ts +107 -18
- package/src/linter/featureSchema.ts +25 -28
- package/src/linter/groupSchema.ts +1 -0
- package/src/linter/lintProject.spec.ts +131 -92
- package/src/linter/lintProject.ts +233 -97
- package/src/linter/schema.ts +1 -0
- package/src/linter/segmentSchema.spec.ts +5 -3
- package/src/linter/segmentSchema.ts +1 -0
- package/src/linter/targetSchema.spec.ts +159 -0
- package/src/linter/targetSchema.ts +46 -0
- package/src/linter/testSchema.spec.ts +70 -5
- package/src/linter/testSchema.ts +12 -10
- package/src/list/index.spec.ts +135 -0
- package/src/list/index.ts +188 -12
- package/src/list/matrix.ts +3 -8
- package/src/promoter/index.spec.ts +617 -0
- package/src/promoter/index.ts +1266 -0
- package/src/sets.ts +76 -0
- package/src/targeting.spec.ts +74 -0
- package/src/targeting.ts +106 -0
- package/src/tester/cliFormat.ts +11 -1
- package/src/tester/printTestResult.ts +12 -3
- package/src/tester/testFeature.ts +10 -36
- package/src/tester/testProject.spec.ts +50 -0
- package/src/tester/testProject.ts +89 -140
- package/src/tester/testSegment.ts +5 -22
- package/src/utils/git.ts +13 -21
- package/tsconfig.cjs.json +5 -1
- package/tsconfig.typecheck.json +9 -0
- package/coverage/lcov-report/builder/convertToV1.ts.html +0 -583
- package/lib/builder/allocator.spec.d.ts +0 -1
- package/lib/builder/allocator.spec.js +0 -85
- package/lib/builder/allocator.spec.js.map +0 -1
- package/lib/builder/buildDatafile.spec.d.ts +0 -1
- package/lib/builder/buildDatafile.spec.js +0 -233
- package/lib/builder/buildDatafile.spec.js.map +0 -1
- package/lib/builder/buildScopedConditions.d.ts +0 -5
- package/lib/builder/buildScopedConditions.js.map +0 -1
- package/lib/builder/buildScopedConditions.spec.d.ts +0 -1
- package/lib/builder/buildScopedConditions.spec.js +0 -2167
- package/lib/builder/buildScopedConditions.spec.js.map +0 -1
- package/lib/builder/buildScopedDatafile.d.ts +0 -2
- package/lib/builder/buildScopedDatafile.js.map +0 -1
- package/lib/builder/buildScopedDatafile.spec.d.ts +0 -1
- package/lib/builder/buildScopedDatafile.spec.js +0 -2277
- package/lib/builder/buildScopedDatafile.spec.js.map +0 -1
- package/lib/builder/buildScopedSegments.d.ts +0 -5
- package/lib/builder/buildScopedSegments.js.map +0 -1
- package/lib/builder/buildScopedSegments.spec.d.ts +0 -1
- package/lib/builder/buildScopedSegments.spec.js +0 -1062
- package/lib/builder/buildScopedSegments.spec.js.map +0 -1
- package/lib/builder/convertToV1.d.ts +0 -10
- package/lib/builder/convertToV1.js +0 -119
- package/lib/builder/convertToV1.js.map +0 -1
- package/lib/builder/mutateVariables.spec.d.ts +0 -1
- package/lib/builder/mutateVariables.spec.js +0 -1074
- package/lib/builder/mutateVariables.spec.js.map +0 -1
- package/lib/builder/mutator.spec.d.ts +0 -1
- package/lib/builder/mutator.spec.js +0 -368
- package/lib/builder/mutator.spec.js.map +0 -1
- package/lib/builder/revision.spec.d.ts +0 -1
- package/lib/builder/revision.spec.js +0 -21
- package/lib/builder/revision.spec.js.map +0 -1
- package/lib/builder/traffic.spec.d.ts +0 -1
- package/lib/builder/traffic.spec.js +0 -872
- package/lib/builder/traffic.spec.js.map +0 -1
- package/lib/config/projectConfig.spec.d.ts +0 -1
- package/lib/config/projectConfig.spec.js +0 -24
- package/lib/config/projectConfig.spec.js.map +0 -1
- package/lib/datasource/filesystemAdapter.spec.d.ts +0 -1
- package/lib/datasource/filesystemAdapter.spec.js +0 -88
- package/lib/datasource/filesystemAdapter.spec.js.map +0 -1
- package/lib/generate-code/typescript.spec.d.ts +0 -1
- package/lib/generate-code/typescript.spec.js +0 -78
- package/lib/generate-code/typescript.spec.js.map +0 -1
- package/lib/linter/attributeSchema.spec.d.ts +0 -1
- package/lib/linter/attributeSchema.spec.js +0 -266
- package/lib/linter/attributeSchema.spec.js.map +0 -1
- package/lib/linter/conditionSchema.spec.d.ts +0 -1
- package/lib/linter/conditionSchema.spec.js +0 -380
- package/lib/linter/conditionSchema.spec.js.map +0 -1
- package/lib/linter/featureSchema.spec.d.ts +0 -1
- package/lib/linter/featureSchema.spec.js +0 -1552
- package/lib/linter/featureSchema.spec.js.map +0 -1
- package/lib/linter/lintProject.spec.d.ts +0 -1
- package/lib/linter/lintProject.spec.js +0 -211
- package/lib/linter/lintProject.spec.js.map +0 -1
- package/lib/linter/mutationNotation.spec.d.ts +0 -1
- package/lib/linter/mutationNotation.spec.js +0 -598
- package/lib/linter/mutationNotation.spec.js.map +0 -1
- package/lib/linter/schema.spec.d.ts +0 -1
- package/lib/linter/schema.spec.js +0 -535
- package/lib/linter/schema.spec.js.map +0 -1
- package/lib/linter/segmentSchema.spec.d.ts +0 -1
- package/lib/linter/segmentSchema.spec.js +0 -303
- package/lib/linter/segmentSchema.spec.js.map +0 -1
- package/lib/linter/testSchema.spec.d.ts +0 -1
- package/lib/linter/testSchema.spec.js +0 -162
- package/lib/linter/testSchema.spec.js.map +0 -1
- package/lib/list/matrix.spec.d.ts +0 -1
- package/lib/list/matrix.spec.js +0 -42
- package/lib/list/matrix.spec.js.map +0 -1
- package/lib/site/exportSite.d.ts +0 -2
- package/lib/site/exportSite.js +0 -30
- package/lib/site/exportSite.js.map +0 -1
- package/lib/site/generateHistory.d.ts +0 -3
- package/lib/site/generateHistory.js +0 -31
- package/lib/site/generateHistory.js.map +0 -1
- package/lib/site/generateSiteSearchIndex.d.ts +0 -4
- package/lib/site/generateSiteSearchIndex.js +0 -195
- package/lib/site/generateSiteSearchIndex.js.map +0 -1
- package/lib/site/getLastModifiedFromHistory.d.ts +0 -2
- package/lib/site/getLastModifiedFromHistory.js +0 -18
- package/lib/site/getLastModifiedFromHistory.js.map +0 -1
- package/lib/site/getOwnerAndRepoFromUrl.d.ts +0 -4
- package/lib/site/getOwnerAndRepoFromUrl.js +0 -20
- package/lib/site/getOwnerAndRepoFromUrl.js.map +0 -1
- package/lib/site/getRelativePaths.d.ts +0 -6
- package/lib/site/getRelativePaths.js +0 -15
- package/lib/site/getRelativePaths.js.map +0 -1
- package/lib/site/getRepoDetails.d.ts +0 -8
- package/lib/site/getRepoDetails.js +0 -48
- package/lib/site/getRepoDetails.js.map +0 -1
- package/lib/site/index.d.ts +0 -2
- package/lib/site/index.js +0 -43
- package/lib/site/index.js.map +0 -1
- package/lib/site/serveSite.d.ts +0 -2
- package/lib/site/serveSite.js +0 -54
- package/lib/site/serveSite.js.map +0 -1
- package/lib/tester/helpers.spec.d.ts +0 -1
- package/lib/tester/helpers.spec.js +0 -115
- package/lib/tester/helpers.spec.js.map +0 -1
- package/src/builder/convertToV1.ts +0 -166
- package/src/site/exportSite.ts +0 -42
- package/src/site/generateHistory.ts +0 -40
- package/src/site/generateSiteSearchIndex.ts +0 -258
- package/src/site/getLastModifiedFromHistory.ts +0 -21
- package/src/site/getOwnerAndRepoFromUrl.ts +0 -17
- package/src/site/getRelativePaths.ts +0 -24
- package/src/site/getRepoDetails.ts +0 -62
- package/src/site/index.ts +0 -46
- package/src/site/serveSite.ts +0 -58
|
@@ -3,15 +3,15 @@
|
|
|
3
3
|
<html lang="en">
|
|
4
4
|
|
|
5
5
|
<head>
|
|
6
|
-
<title>Code coverage report for linter/featureSchema.ts</title>
|
|
6
|
+
<title>Code coverage report for src/linter/featureSchema.ts</title>
|
|
7
7
|
<meta charset="utf-8" />
|
|
8
|
-
<link rel="stylesheet" href="
|
|
9
|
-
<link rel="stylesheet" href="
|
|
10
|
-
<link rel="shortcut icon" type="image/x-icon" href="
|
|
8
|
+
<link rel="stylesheet" href="../../prettify.css" />
|
|
9
|
+
<link rel="stylesheet" href="../../base.css" />
|
|
10
|
+
<link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
|
|
11
11
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
12
12
|
<style type='text/css'>
|
|
13
13
|
.coverage-summary .sorter {
|
|
14
|
-
background-image: url(
|
|
14
|
+
background-image: url(../../sort-arrow-sprite.png);
|
|
15
15
|
}
|
|
16
16
|
</style>
|
|
17
17
|
</head>
|
|
@@ -19,20 +19,20 @@
|
|
|
19
19
|
<body>
|
|
20
20
|
<div class='wrapper'>
|
|
21
21
|
<div class='pad1'>
|
|
22
|
-
<h1><a href="
|
|
22
|
+
<h1><a href="../../index.html">All files</a> / <a href="index.html">src/linter</a> featureSchema.ts</h1>
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">73% </span>
|
|
26
|
+
<span class="strong">73.86% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>407/551</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">70.49% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>399/566</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">
|
|
47
|
+
<span class="strong">77.51% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>393/507</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -57,11 +57,11 @@
|
|
|
57
57
|
<template id="filterTemplate">
|
|
58
58
|
<div class="quiet">
|
|
59
59
|
Filter:
|
|
60
|
-
<input
|
|
60
|
+
<input type="search" id="fileSearch">
|
|
61
61
|
</div>
|
|
62
62
|
</template>
|
|
63
63
|
</div>
|
|
64
|
-
<div class='status-line
|
|
64
|
+
<div class='status-line high'></div>
|
|
65
65
|
<pre><table class="coverage">
|
|
66
66
|
<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
|
|
67
67
|
<a name='L2'></a><a href='#L2'>2</a>
|
|
@@ -1985,15 +1985,11 @@
|
|
|
1985
1985
|
<a name='L1920'></a><a href='#L1920'>1920</a>
|
|
1986
1986
|
<a name='L1921'></a><a href='#L1921'>1921</a>
|
|
1987
1987
|
<a name='L1922'></a><a href='#L1922'>1922</a>
|
|
1988
|
-
<a name='L1923'></a><a href='#L1923'>1923</a>
|
|
1989
|
-
<
|
|
1990
|
-
<a name='L1925'></a><a href='#L1925'>1925</a>
|
|
1991
|
-
<a name='L1926'></a><a href='#L1926'>1926</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
1992
|
-
<span class="cline-any cline-yes">2x</span>
|
|
1988
|
+
<a name='L1923'></a><a href='#L1923'>1923</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
1989
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1993
1990
|
<span class="cline-any cline-neutral"> </span>
|
|
1994
1991
|
<span class="cline-any cline-neutral"> </span>
|
|
1995
|
-
<span class="cline-any cline-yes">
|
|
1996
|
-
<span class="cline-any cline-yes">2x</span>
|
|
1992
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1997
1993
|
<span class="cline-any cline-neutral"> </span>
|
|
1998
1994
|
<span class="cline-any cline-neutral"> </span>
|
|
1999
1995
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2002,16 +1998,15 @@
|
|
|
2002
1998
|
<span class="cline-any cline-neutral"> </span>
|
|
2003
1999
|
<span class="cline-any cline-neutral"> </span>
|
|
2004
2000
|
<span class="cline-any cline-neutral"> </span>
|
|
2005
|
-
<span class="cline-any cline-yes">
|
|
2006
|
-
<span class="cline-any cline-
|
|
2007
|
-
<span class="cline-any cline-yes">2x</span>
|
|
2001
|
+
<span class="cline-any cline-yes">3x</span>
|
|
2002
|
+
<span class="cline-any cline-yes">3x</span>
|
|
2008
2003
|
<span class="cline-any cline-neutral"> </span>
|
|
2009
2004
|
<span class="cline-any cline-neutral"> </span>
|
|
2010
|
-
<span class="cline-any cline-yes">
|
|
2005
|
+
<span class="cline-any cline-yes">161x</span>
|
|
2011
2006
|
<span class="cline-any cline-neutral"> </span>
|
|
2012
2007
|
<span class="cline-any cline-neutral"> </span>
|
|
2013
2008
|
<span class="cline-any cline-neutral"> </span>
|
|
2014
|
-
<span class="cline-any cline-yes">
|
|
2009
|
+
<span class="cline-any cline-yes">91x</span>
|
|
2015
2010
|
<span class="cline-any cline-neutral"> </span>
|
|
2016
2011
|
<span class="cline-any cline-neutral"> </span>
|
|
2017
2012
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2020,7 +2015,7 @@
|
|
|
2020
2015
|
<span class="cline-any cline-neutral"> </span>
|
|
2021
2016
|
<span class="cline-any cline-neutral"> </span>
|
|
2022
2017
|
<span class="cline-any cline-neutral"> </span>
|
|
2023
|
-
<span class="cline-any cline-yes">
|
|
2018
|
+
<span class="cline-any cline-yes">11332x</span>
|
|
2024
2019
|
<span class="cline-any cline-neutral"> </span>
|
|
2025
2020
|
<span class="cline-any cline-neutral"> </span>
|
|
2026
2021
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2070,10 +2065,10 @@
|
|
|
2070
2065
|
<span class="cline-any cline-neutral"> </span>
|
|
2071
2066
|
<span class="cline-any cline-neutral"> </span>
|
|
2072
2067
|
<span class="cline-any cline-neutral"> </span>
|
|
2073
|
-
<span class="cline-any cline-yes">
|
|
2074
|
-
<span class="cline-any cline-yes">
|
|
2068
|
+
<span class="cline-any cline-yes">9925x</span>
|
|
2069
|
+
<span class="cline-any cline-yes">1825x</span>
|
|
2075
2070
|
<span class="cline-any cline-neutral"> </span>
|
|
2076
|
-
<span class="cline-any cline-yes">
|
|
2071
|
+
<span class="cline-any cline-yes">8100x</span>
|
|
2077
2072
|
<span class="cline-any cline-neutral"> </span>
|
|
2078
2073
|
<span class="cline-any cline-neutral"> </span>
|
|
2079
2074
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2098,13 +2093,13 @@
|
|
|
2098
2093
|
<span class="cline-any cline-neutral"> </span>
|
|
2099
2094
|
<span class="cline-any cline-neutral"> </span>
|
|
2100
2095
|
<span class="cline-any cline-neutral"> </span>
|
|
2101
|
-
<span class="cline-any cline-yes">
|
|
2102
|
-
<span class="cline-any cline-yes">
|
|
2096
|
+
<span class="cline-any cline-yes">436x</span>
|
|
2097
|
+
<span class="cline-any cline-yes">32x</span>
|
|
2103
2098
|
<span class="cline-any cline-neutral"> </span>
|
|
2104
2099
|
<span class="cline-any cline-neutral"> </span>
|
|
2105
2100
|
<span class="cline-any cline-neutral"> </span>
|
|
2106
2101
|
<span class="cline-any cline-neutral"> </span>
|
|
2107
|
-
<span class="cline-any cline-yes">
|
|
2102
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2108
2103
|
<span class="cline-any cline-neutral"> </span>
|
|
2109
2104
|
<span class="cline-any cline-neutral"> </span>
|
|
2110
2105
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2116,7 +2111,7 @@
|
|
|
2116
2111
|
<span class="cline-any cline-neutral"> </span>
|
|
2117
2112
|
<span class="cline-any cline-neutral"> </span>
|
|
2118
2113
|
<span class="cline-any cline-neutral"> </span>
|
|
2119
|
-
<span class="cline-any cline-yes">
|
|
2114
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2120
2115
|
<span class="cline-any cline-neutral"> </span>
|
|
2121
2116
|
<span class="cline-any cline-neutral"> </span>
|
|
2122
2117
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2135,76 +2130,76 @@
|
|
|
2135
2130
|
<span class="cline-any cline-neutral"> </span>
|
|
2136
2131
|
<span class="cline-any cline-neutral"> </span>
|
|
2137
2132
|
<span class="cline-any cline-neutral"> </span>
|
|
2138
|
-
<span class="cline-any cline-yes">
|
|
2133
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2139
2134
|
<span class="cline-any cline-no"> </span>
|
|
2140
2135
|
<span class="cline-any cline-no"> </span>
|
|
2141
2136
|
<span class="cline-any cline-neutral"> </span>
|
|
2142
2137
|
<span class="cline-any cline-no"> </span>
|
|
2143
2138
|
<span class="cline-any cline-neutral"> </span>
|
|
2144
2139
|
<span class="cline-any cline-neutral"> </span>
|
|
2145
|
-
<span class="cline-any cline-yes">
|
|
2140
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2146
2141
|
<span class="cline-any cline-no"> </span>
|
|
2147
2142
|
<span class="cline-any cline-neutral"> </span>
|
|
2148
2143
|
<span class="cline-any cline-neutral"> </span>
|
|
2149
|
-
<span class="cline-any cline-yes">
|
|
2144
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2150
2145
|
<span class="cline-any cline-no"> </span>
|
|
2151
2146
|
<span class="cline-any cline-neutral"> </span>
|
|
2152
2147
|
<span class="cline-any cline-neutral"> </span>
|
|
2153
|
-
<span class="cline-any cline-yes">
|
|
2154
|
-
<span class="cline-any cline-yes">
|
|
2148
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2149
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2155
2150
|
<span class="cline-any cline-neutral"> </span>
|
|
2156
|
-
<span class="cline-any cline-yes">
|
|
2157
|
-
<span class="cline-any cline-yes">
|
|
2158
|
-
<span class="cline-any cline-yes">
|
|
2159
|
-
<span class="cline-any cline-yes">
|
|
2160
|
-
<span class="cline-any cline-yes">
|
|
2161
|
-
<span class="cline-any cline-yes">
|
|
2151
|
+
<span class="cline-any cline-yes">404x</span>
|
|
2152
|
+
<span class="cline-any cline-yes">246x</span>
|
|
2153
|
+
<span class="cline-any cline-yes">153x</span>
|
|
2154
|
+
<span class="cline-any cline-yes">153x</span>
|
|
2155
|
+
<span class="cline-any cline-yes">153x</span>
|
|
2156
|
+
<span class="cline-any cline-yes">153x</span>
|
|
2162
2157
|
<span class="cline-any cline-no"> </span>
|
|
2163
2158
|
<span class="cline-any cline-no"> </span>
|
|
2164
2159
|
<span class="cline-any cline-neutral"> </span>
|
|
2165
2160
|
<span class="cline-any cline-no"> </span>
|
|
2166
2161
|
<span class="cline-any cline-neutral"> </span>
|
|
2167
2162
|
<span class="cline-any cline-neutral"> </span>
|
|
2168
|
-
<span class="cline-any cline-yes">
|
|
2163
|
+
<span class="cline-any cline-yes">153x</span>
|
|
2169
2164
|
<span class="cline-any cline-neutral"> </span>
|
|
2165
|
+
<span class="cline-any cline-yes">158x</span>
|
|
2166
|
+
<span class="cline-any cline-yes">158x</span>
|
|
2167
|
+
<span class="cline-any cline-yes">126x</span>
|
|
2168
|
+
<span class="cline-any cline-yes">70x</span>
|
|
2170
2169
|
<span class="cline-any cline-yes">70x</span>
|
|
2171
2170
|
<span class="cline-any cline-yes">70x</span>
|
|
2172
|
-
<span class="cline-any cline-yes">54x</span>
|
|
2173
|
-
<span class="cline-any cline-yes">30x</span>
|
|
2174
|
-
<span class="cline-any cline-yes">30x</span>
|
|
2175
|
-
<span class="cline-any cline-yes">30x</span>
|
|
2176
2171
|
<span class="cline-any cline-neutral"> </span>
|
|
2177
|
-
<span class="cline-any cline-yes">
|
|
2172
|
+
<span class="cline-any cline-yes">32x</span>
|
|
2178
2173
|
<span class="cline-any cline-no"> </span>
|
|
2179
2174
|
<span class="cline-any cline-no"> </span>
|
|
2180
2175
|
<span class="cline-any cline-no"> </span>
|
|
2181
2176
|
<span class="cline-any cline-no"> </span>
|
|
2182
2177
|
<span class="cline-any cline-neutral"> </span>
|
|
2183
|
-
<span class="cline-any cline-yes">
|
|
2178
|
+
<span class="cline-any cline-yes">32x</span>
|
|
2184
2179
|
<span class="cline-any cline-neutral"> </span>
|
|
2185
|
-
<span class="cline-any cline-yes">
|
|
2186
|
-
<span class="cline-any cline-yes">
|
|
2187
|
-
<span class="cline-any cline-yes">
|
|
2188
|
-
<span class="cline-any cline-yes">
|
|
2189
|
-
<span class="cline-any cline-yes">
|
|
2190
|
-
<span class="cline-any cline-yes">
|
|
2180
|
+
<span class="cline-any cline-yes">32x</span>
|
|
2181
|
+
<span class="cline-any cline-yes">32x</span>
|
|
2182
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2183
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2184
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2185
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2191
2186
|
<span class="cline-any cline-no"> </span>
|
|
2192
2187
|
<span class="cline-any cline-neutral"> </span>
|
|
2193
|
-
<span class="cline-any cline-yes">
|
|
2188
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2194
2189
|
<span class="cline-any cline-no"> </span>
|
|
2195
2190
|
<span class="cline-any cline-no"> </span>
|
|
2196
2191
|
<span class="cline-any cline-neutral"> </span>
|
|
2197
2192
|
<span class="cline-any cline-neutral"> </span>
|
|
2198
|
-
<span class="cline-any cline-yes">
|
|
2199
|
-
<span class="cline-any cline-yes">
|
|
2200
|
-
<span class="cline-any cline-yes">
|
|
2201
|
-
<span class="cline-any cline-yes">
|
|
2193
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2194
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2195
|
+
<span class="cline-any cline-yes">44x</span>
|
|
2196
|
+
<span class="cline-any cline-yes">44x</span>
|
|
2202
2197
|
<span class="cline-any cline-no"> </span>
|
|
2203
2198
|
<span class="cline-any cline-neutral"> </span>
|
|
2204
|
-
<span class="cline-any cline-yes">
|
|
2205
|
-
<span class="cline-any cline-yes">
|
|
2206
|
-
<span class="cline-any cline-yes">
|
|
2207
|
-
<span class="cline-any cline-yes">
|
|
2199
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2200
|
+
<span class="cline-any cline-yes">44x</span>
|
|
2201
|
+
<span class="cline-any cline-yes">44x</span>
|
|
2202
|
+
<span class="cline-any cline-yes">44x</span>
|
|
2208
2203
|
<span class="cline-any cline-no"> </span>
|
|
2209
2204
|
<span class="cline-any cline-no"> </span>
|
|
2210
2205
|
<span class="cline-any cline-no"> </span>
|
|
@@ -2213,7 +2208,7 @@
|
|
|
2213
2208
|
<span class="cline-any cline-no"> </span>
|
|
2214
2209
|
<span class="cline-any cline-neutral"> </span>
|
|
2215
2210
|
<span class="cline-any cline-neutral"> </span>
|
|
2216
|
-
<span class="cline-any cline-yes">
|
|
2211
|
+
<span class="cline-any cline-yes">22x</span>
|
|
2217
2212
|
<span class="cline-any cline-neutral"> </span>
|
|
2218
2213
|
<span class="cline-any cline-neutral"> </span>
|
|
2219
2214
|
<span class="cline-any cline-no"> </span>
|
|
@@ -2241,10 +2236,10 @@
|
|
|
2241
2236
|
<span class="cline-any cline-neutral"> </span>
|
|
2242
2237
|
<span class="cline-any cline-neutral"> </span>
|
|
2243
2238
|
<span class="cline-any cline-neutral"> </span>
|
|
2244
|
-
<span class="cline-any cline-yes">
|
|
2245
|
-
<span class="cline-any cline-yes">
|
|
2246
|
-
<span class="cline-any cline-yes">
|
|
2247
|
-
<span class="cline-any cline-yes">
|
|
2239
|
+
<span class="cline-any cline-yes">333x</span>
|
|
2240
|
+
<span class="cline-any cline-yes">134x</span>
|
|
2241
|
+
<span class="cline-any cline-yes">134x</span>
|
|
2242
|
+
<span class="cline-any cline-yes">134x</span>
|
|
2248
2243
|
<span class="cline-any cline-no"> </span>
|
|
2249
2244
|
<span class="cline-any cline-no"> </span>
|
|
2250
2245
|
<span class="cline-any cline-no"> </span>
|
|
@@ -2257,7 +2252,7 @@
|
|
|
2257
2252
|
<span class="cline-any cline-no"> </span>
|
|
2258
2253
|
<span class="cline-any cline-neutral"> </span>
|
|
2259
2254
|
<span class="cline-any cline-neutral"> </span>
|
|
2260
|
-
<span class="cline-any cline-yes">
|
|
2255
|
+
<span class="cline-any cline-yes">134x</span>
|
|
2261
2256
|
<span class="cline-any cline-neutral"> </span>
|
|
2262
2257
|
<span class="cline-any cline-neutral"> </span>
|
|
2263
2258
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2283,31 +2278,31 @@
|
|
|
2283
2278
|
<span class="cline-any cline-neutral"> </span>
|
|
2284
2279
|
<span class="cline-any cline-neutral"> </span>
|
|
2285
2280
|
<span class="cline-any cline-neutral"> </span>
|
|
2286
|
-
<span class="cline-any cline-yes">
|
|
2281
|
+
<span class="cline-any cline-yes">2287x</span>
|
|
2287
2282
|
<span class="cline-any cline-neutral"> </span>
|
|
2288
2283
|
<span class="cline-any cline-neutral"> </span>
|
|
2289
|
-
<span class="cline-any cline-yes">
|
|
2290
|
-
<span class="cline-any cline-yes">
|
|
2291
|
-
<span class="cline-any cline-yes">
|
|
2292
|
-
<span class="cline-any cline-yes">
|
|
2293
|
-
<span class="cline-any cline-yes">
|
|
2284
|
+
<span class="cline-any cline-yes">2287x</span>
|
|
2285
|
+
<span class="cline-any cline-yes">2287x</span>
|
|
2286
|
+
<span class="cline-any cline-yes">85x</span>
|
|
2287
|
+
<span class="cline-any cline-yes">85x</span>
|
|
2288
|
+
<span class="cline-any cline-yes">85x</span>
|
|
2294
2289
|
<span class="cline-any cline-neutral"> </span>
|
|
2295
2290
|
<span class="cline-any cline-neutral"> </span>
|
|
2296
|
-
<span class="cline-any cline-yes">
|
|
2297
|
-
<span class="cline-any cline-yes">
|
|
2298
|
-
<span class="cline-any cline-yes">
|
|
2299
|
-
<span class="cline-any cline-yes">
|
|
2291
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2292
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2293
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2294
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2300
2295
|
<span class="cline-any cline-neutral"> </span>
|
|
2301
|
-
<span class="cline-any cline-yes">
|
|
2296
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2302
2297
|
<span class="cline-any cline-neutral"> </span>
|
|
2303
2298
|
<span class="cline-any cline-neutral"> </span>
|
|
2304
2299
|
<span class="cline-any cline-neutral"> </span>
|
|
2305
2300
|
<span class="cline-any cline-neutral"> </span>
|
|
2306
2301
|
<span class="cline-any cline-neutral"> </span>
|
|
2307
2302
|
<span class="cline-any cline-neutral"> </span>
|
|
2308
|
-
<span class="cline-any cline-yes">
|
|
2309
|
-
<span class="cline-any cline-yes">
|
|
2310
|
-
<span class="cline-any cline-yes">
|
|
2303
|
+
<span class="cline-any cline-yes">220x</span>
|
|
2304
|
+
<span class="cline-any cline-yes">220x</span>
|
|
2305
|
+
<span class="cline-any cline-yes">408x</span>
|
|
2311
2306
|
<span class="cline-any cline-no"> </span>
|
|
2312
2307
|
<span class="cline-any cline-neutral"> </span>
|
|
2313
2308
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2317,11 +2312,11 @@
|
|
|
2317
2312
|
<span class="cline-any cline-neutral"> </span>
|
|
2318
2313
|
<span class="cline-any cline-neutral"> </span>
|
|
2319
2314
|
<span class="cline-any cline-neutral"> </span>
|
|
2320
|
-
<span class="cline-any cline-yes">
|
|
2321
|
-
<span class="cline-any cline-yes">
|
|
2322
|
-
<span class="cline-any cline-yes">
|
|
2323
|
-
<span class="cline-any cline-yes">
|
|
2324
|
-
<span class="cline-any cline-yes">
|
|
2315
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2316
|
+
<span class="cline-any cline-yes">524x</span>
|
|
2317
|
+
<span class="cline-any cline-yes">1069x</span>
|
|
2318
|
+
<span class="cline-any cline-yes">1069x</span>
|
|
2319
|
+
<span class="cline-any cline-yes">1069x</span>
|
|
2325
2320
|
<span class="cline-any cline-neutral"> </span>
|
|
2326
2321
|
<span class="cline-any cline-neutral"> </span>
|
|
2327
2322
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2330,13 +2325,13 @@
|
|
|
2330
2325
|
<span class="cline-any cline-neutral"> </span>
|
|
2331
2326
|
<span class="cline-any cline-neutral"> </span>
|
|
2332
2327
|
<span class="cline-any cline-neutral"> </span>
|
|
2333
|
-
<span class="cline-any cline-yes">
|
|
2334
|
-
<span class="cline-any cline-yes">
|
|
2328
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2329
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2335
2330
|
<span class="cline-any cline-neutral"> </span>
|
|
2336
2331
|
<span class="cline-any cline-neutral"> </span>
|
|
2337
2332
|
<span class="cline-any cline-neutral"> </span>
|
|
2338
2333
|
<span class="cline-any cline-neutral"> </span>
|
|
2339
|
-
<span class="cline-any cline-yes">
|
|
2334
|
+
<span class="cline-any cline-yes">19x</span>
|
|
2340
2335
|
<span class="cline-any cline-neutral"> </span>
|
|
2341
2336
|
<span class="cline-any cline-neutral"> </span>
|
|
2342
2337
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2344,8 +2339,8 @@
|
|
|
2344
2339
|
<span class="cline-any cline-neutral"> </span>
|
|
2345
2340
|
<span class="cline-any cline-neutral"> </span>
|
|
2346
2341
|
<span class="cline-any cline-neutral"> </span>
|
|
2347
|
-
<span class="cline-any cline-yes">
|
|
2348
|
-
<span class="cline-any cline-yes">
|
|
2342
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2343
|
+
<span class="cline-any cline-yes">181x</span>
|
|
2349
2344
|
<span class="cline-any cline-neutral"> </span>
|
|
2350
2345
|
<span class="cline-any cline-neutral"> </span>
|
|
2351
2346
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2353,11 +2348,11 @@
|
|
|
2353
2348
|
<span class="cline-any cline-neutral"> </span>
|
|
2354
2349
|
<span class="cline-any cline-neutral"> </span>
|
|
2355
2350
|
<span class="cline-any cline-neutral"> </span>
|
|
2356
|
-
<span class="cline-any cline-yes">
|
|
2357
|
-
<span class="cline-any cline-yes">
|
|
2358
|
-
<span class="cline-any cline-yes">16x</span>
|
|
2359
|
-
<span class="cline-any cline-yes">32x</span>
|
|
2351
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2352
|
+
<span class="cline-any cline-yes">2202x</span>
|
|
2360
2353
|
<span class="cline-any cline-yes">32x</span>
|
|
2354
|
+
<span class="cline-any cline-yes">64x</span>
|
|
2355
|
+
<span class="cline-any cline-yes">64x</span>
|
|
2361
2356
|
<span class="cline-any cline-neutral"> </span>
|
|
2362
2357
|
<span class="cline-any cline-neutral"> </span>
|
|
2363
2358
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2369,10 +2364,10 @@
|
|
|
2369
2364
|
<span class="cline-any cline-neutral"> </span>
|
|
2370
2365
|
<span class="cline-any cline-neutral"> </span>
|
|
2371
2366
|
<span class="cline-any cline-neutral"> </span>
|
|
2372
|
-
<span class="cline-any cline-yes">
|
|
2373
|
-
<span class="cline-any cline-yes">
|
|
2374
|
-
<span class="cline-any cline-yes">
|
|
2375
|
-
<span class="cline-any cline-yes">
|
|
2367
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2368
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2369
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2370
|
+
<span class="cline-any cline-yes">7556x</span>
|
|
2376
2371
|
<span class="cline-any cline-neutral"> </span>
|
|
2377
2372
|
<span class="cline-any cline-neutral"> </span>
|
|
2378
2373
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2395,28 +2390,28 @@
|
|
|
2395
2390
|
<span class="cline-any cline-neutral"> </span>
|
|
2396
2391
|
<span class="cline-any cline-neutral"> </span>
|
|
2397
2392
|
<span class="cline-any cline-neutral"> </span>
|
|
2398
|
-
<span class="cline-any cline-yes">
|
|
2399
|
-
<span class="cline-any cline-yes">
|
|
2400
|
-
<span class="cline-any cline-yes">
|
|
2401
|
-
<span class="cline-any cline-yes">
|
|
2402
|
-
<span class="cline-any cline-yes">
|
|
2393
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2394
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2395
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2396
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2397
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2403
2398
|
<span class="cline-any cline-yes">1x</span>
|
|
2404
2399
|
<span class="cline-any cline-neutral"> </span>
|
|
2405
2400
|
<span class="cline-any cline-neutral"> </span>
|
|
2406
2401
|
<span class="cline-any cline-neutral"> </span>
|
|
2407
2402
|
<span class="cline-any cline-neutral"> </span>
|
|
2408
2403
|
<span class="cline-any cline-neutral"> </span>
|
|
2409
|
-
<span class="cline-any cline-yes">
|
|
2404
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2410
2405
|
<span class="cline-any cline-yes">1x</span>
|
|
2411
2406
|
<span class="cline-any cline-neutral"> </span>
|
|
2412
2407
|
<span class="cline-any cline-neutral"> </span>
|
|
2413
2408
|
<span class="cline-any cline-neutral"> </span>
|
|
2414
2409
|
<span class="cline-any cline-neutral"> </span>
|
|
2415
2410
|
<span class="cline-any cline-neutral"> </span>
|
|
2416
|
-
<span class="cline-any cline-yes">
|
|
2417
|
-
<span class="cline-any cline-yes">
|
|
2418
|
-
<span class="cline-any cline-yes">
|
|
2419
|
-
<span class="cline-any cline-yes">
|
|
2411
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2412
|
+
<span class="cline-any cline-yes">141x</span>
|
|
2413
|
+
<span class="cline-any cline-yes">198x</span>
|
|
2414
|
+
<span class="cline-any cline-yes">92x</span>
|
|
2420
2415
|
<span class="cline-any cline-yes">1x</span>
|
|
2421
2416
|
<span class="cline-any cline-neutral"> </span>
|
|
2422
2417
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2427,11 +2422,11 @@
|
|
|
2427
2422
|
<span class="cline-any cline-neutral"> </span>
|
|
2428
2423
|
<span class="cline-any cline-neutral"> </span>
|
|
2429
2424
|
<span class="cline-any cline-neutral"> </span>
|
|
2430
|
-
<span class="cline-any cline-yes">
|
|
2425
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2431
2426
|
<span class="cline-any cline-neutral"> </span>
|
|
2432
|
-
<span class="cline-any cline-yes">
|
|
2433
|
-
<span class="cline-any cline-yes">
|
|
2434
|
-
<span class="cline-any cline-yes">
|
|
2427
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2428
|
+
<span class="cline-any cline-yes">685x</span>
|
|
2429
|
+
<span class="cline-any cline-yes">1215x</span>
|
|
2435
2430
|
<span class="cline-any cline-neutral"> </span>
|
|
2436
2431
|
<span class="cline-any cline-neutral"> </span>
|
|
2437
2432
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2442,7 +2437,7 @@
|
|
|
2442
2437
|
<span class="cline-any cline-neutral"> </span>
|
|
2443
2438
|
<span class="cline-any cline-neutral"> </span>
|
|
2444
2439
|
<span class="cline-any cline-neutral"> </span>
|
|
2445
|
-
<span class="cline-any cline-yes">
|
|
2440
|
+
<span class="cline-any cline-yes">63x</span>
|
|
2446
2441
|
<span class="cline-any cline-no"> </span>
|
|
2447
2442
|
<span class="cline-any cline-neutral"> </span>
|
|
2448
2443
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2451,7 +2446,7 @@
|
|
|
2451
2446
|
<span class="cline-any cline-neutral"> </span>
|
|
2452
2447
|
<span class="cline-any cline-neutral"> </span>
|
|
2453
2448
|
<span class="cline-any cline-neutral"> </span>
|
|
2454
|
-
<span class="cline-any cline-yes">
|
|
2449
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2455
2450
|
<span class="cline-any cline-no"> </span>
|
|
2456
2451
|
<span class="cline-any cline-no"> </span>
|
|
2457
2452
|
<span class="cline-any cline-no"> </span>
|
|
@@ -2481,20 +2476,20 @@
|
|
|
2481
2476
|
<span class="cline-any cline-neutral"> </span>
|
|
2482
2477
|
<span class="cline-any cline-neutral"> </span>
|
|
2483
2478
|
<span class="cline-any cline-neutral"> </span>
|
|
2484
|
-
<span class="cline-any cline-yes">
|
|
2485
|
-
<span class="cline-any cline-yes">
|
|
2486
|
-
<span class="cline-any cline-yes">
|
|
2479
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2480
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2481
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2487
2482
|
<span class="cline-any cline-neutral"> </span>
|
|
2488
|
-
<span class="cline-any cline-yes">
|
|
2483
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2489
2484
|
<span class="cline-any cline-neutral"> </span>
|
|
2490
|
-
<span class="cline-any cline-yes">
|
|
2485
|
+
<span class="cline-any cline-yes">1791x</span>
|
|
2491
2486
|
<span class="cline-any cline-neutral"> </span>
|
|
2492
|
-
<span class="cline-any cline-yes">
|
|
2487
|
+
<span class="cline-any cline-yes">1549x</span>
|
|
2493
2488
|
<span class="cline-any cline-neutral"> </span>
|
|
2494
2489
|
<span class="cline-any cline-neutral"> </span>
|
|
2495
2490
|
<span class="cline-any cline-neutral"> </span>
|
|
2496
|
-
<span class="cline-any cline-yes">
|
|
2497
|
-
<span class="cline-any cline-yes">
|
|
2491
|
+
<span class="cline-any cline-yes">1791x</span>
|
|
2492
|
+
<span class="cline-any cline-yes">3488x</span>
|
|
2498
2493
|
<span class="cline-any cline-yes">6x</span>
|
|
2499
2494
|
<span class="cline-any cline-neutral"> </span>
|
|
2500
2495
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2503,9 +2498,9 @@
|
|
|
2503
2498
|
<span class="cline-any cline-neutral"> </span>
|
|
2504
2499
|
<span class="cline-any cline-neutral"> </span>
|
|
2505
2500
|
<span class="cline-any cline-neutral"> </span>
|
|
2506
|
-
<span class="cline-any cline-yes">
|
|
2507
|
-
<span class="cline-any cline-yes">
|
|
2508
|
-
<span class="cline-any cline-yes">
|
|
2501
|
+
<span class="cline-any cline-yes">1791x</span>
|
|
2502
|
+
<span class="cline-any cline-yes">3662x</span>
|
|
2503
|
+
<span class="cline-any cline-yes">3662x</span>
|
|
2509
2504
|
<span class="cline-any cline-yes">1x</span>
|
|
2510
2505
|
<span class="cline-any cline-neutral"> </span>
|
|
2511
2506
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2515,14 +2510,14 @@
|
|
|
2515
2510
|
<span class="cline-any cline-neutral"> </span>
|
|
2516
2511
|
<span class="cline-any cline-neutral"> </span>
|
|
2517
2512
|
<span class="cline-any cline-neutral"> </span>
|
|
2518
|
-
<span class="cline-any cline-yes">
|
|
2513
|
+
<span class="cline-any cline-yes">3661x</span>
|
|
2519
2514
|
<span class="cline-any cline-yes">1x</span>
|
|
2520
2515
|
<span class="cline-any cline-neutral"> </span>
|
|
2521
2516
|
<span class="cline-any cline-neutral"> </span>
|
|
2522
2517
|
<span class="cline-any cline-neutral"> </span>
|
|
2523
2518
|
<span class="cline-any cline-neutral"> </span>
|
|
2524
2519
|
<span class="cline-any cline-neutral"> </span>
|
|
2525
|
-
<span class="cline-any cline-yes">
|
|
2520
|
+
<span class="cline-any cline-yes">3660x</span>
|
|
2526
2521
|
<span class="cline-any cline-neutral"> </span>
|
|
2527
2522
|
<span class="cline-any cline-neutral"> </span>
|
|
2528
2523
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2533,9 +2528,9 @@
|
|
|
2533
2528
|
<span class="cline-any cline-neutral"> </span>
|
|
2534
2529
|
<span class="cline-any cline-neutral"> </span>
|
|
2535
2530
|
<span class="cline-any cline-neutral"> </span>
|
|
2536
|
-
<span class="cline-any cline-yes">
|
|
2537
|
-
<span class="cline-any cline-yes">
|
|
2538
|
-
<span class="cline-any cline-yes">
|
|
2531
|
+
<span class="cline-any cline-yes">125x</span>
|
|
2532
|
+
<span class="cline-any cline-yes">60x</span>
|
|
2533
|
+
<span class="cline-any cline-yes">118x</span>
|
|
2539
2534
|
<span class="cline-any cline-neutral"> </span>
|
|
2540
2535
|
<span class="cline-any cline-neutral"> </span>
|
|
2541
2536
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2546,9 +2541,9 @@
|
|
|
2546
2541
|
<span class="cline-any cline-neutral"> </span>
|
|
2547
2542
|
<span class="cline-any cline-neutral"> </span>
|
|
2548
2543
|
<span class="cline-any cline-neutral"> </span>
|
|
2549
|
-
<span class="cline-any cline-yes">
|
|
2550
|
-
<span class="cline-any cline-yes">
|
|
2551
|
-
<span class="cline-any cline-yes">
|
|
2544
|
+
<span class="cline-any cline-yes">65x</span>
|
|
2545
|
+
<span class="cline-any cline-yes">91x</span>
|
|
2546
|
+
<span class="cline-any cline-yes">91x</span>
|
|
2552
2547
|
<span class="cline-any cline-no"> </span>
|
|
2553
2548
|
<span class="cline-any cline-neutral"> </span>
|
|
2554
2549
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2558,7 +2553,7 @@
|
|
|
2558
2553
|
<span class="cline-any cline-neutral"> </span>
|
|
2559
2554
|
<span class="cline-any cline-neutral"> </span>
|
|
2560
2555
|
<span class="cline-any cline-neutral"> </span>
|
|
2561
|
-
<span class="cline-any cline-yes">
|
|
2556
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2562
2557
|
<span class="cline-any cline-no"> </span>
|
|
2563
2558
|
<span class="cline-any cline-no"> </span>
|
|
2564
2559
|
<span class="cline-any cline-no"> </span>
|
|
@@ -2585,9 +2580,9 @@
|
|
|
2585
2580
|
<span class="cline-any cline-neutral"> </span>
|
|
2586
2581
|
<span class="cline-any cline-neutral"> </span>
|
|
2587
2582
|
<span class="cline-any cline-neutral"> </span>
|
|
2588
|
-
<span class="cline-any cline-yes">
|
|
2583
|
+
<span class="cline-any cline-yes">8668x</span>
|
|
2589
2584
|
<span class="cline-any cline-neutral"> </span>
|
|
2590
|
-
<span class="cline-any cline-yes">
|
|
2585
|
+
<span class="cline-any cline-yes">8668x</span>
|
|
2591
2586
|
<span class="cline-any cline-neutral"> </span>
|
|
2592
2587
|
<span class="cline-any cline-no"> </span>
|
|
2593
2588
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2603,8 +2598,8 @@
|
|
|
2603
2598
|
<span class="cline-any cline-no"> </span>
|
|
2604
2599
|
<span class="cline-any cline-neutral"> </span>
|
|
2605
2600
|
<span class="cline-any cline-neutral"> </span>
|
|
2606
|
-
<span class="cline-any cline-yes">
|
|
2607
|
-
<span class="cline-any cline-yes">
|
|
2601
|
+
<span class="cline-any cline-yes">8668x</span>
|
|
2602
|
+
<span class="cline-any cline-yes">8668x</span>
|
|
2608
2603
|
<span class="cline-any cline-yes">3x</span>
|
|
2609
2604
|
<span class="cline-any cline-neutral"> </span>
|
|
2610
2605
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2613,58 +2608,58 @@
|
|
|
2613
2608
|
<span class="cline-any cline-yes">3x</span>
|
|
2614
2609
|
<span class="cline-any cline-neutral"> </span>
|
|
2615
2610
|
<span class="cline-any cline-neutral"> </span>
|
|
2616
|
-
<span class="cline-any cline-yes">
|
|
2611
|
+
<span class="cline-any cline-yes">8665x</span>
|
|
2617
2612
|
<span class="cline-any cline-no"> </span>
|
|
2618
2613
|
<span class="cline-any cline-neutral"> </span>
|
|
2619
2614
|
<span class="cline-any cline-neutral"> </span>
|
|
2620
|
-
<span class="cline-any cline-yes">
|
|
2621
|
-
<span class="cline-any cline-yes">
|
|
2622
|
-
<span class="cline-any cline-yes">
|
|
2623
|
-
<span class="cline-any cline-yes">
|
|
2615
|
+
<span class="cline-any cline-yes">8665x</span>
|
|
2616
|
+
<span class="cline-any cline-yes">8665x</span>
|
|
2617
|
+
<span class="cline-any cline-yes">158x</span>
|
|
2618
|
+
<span class="cline-any cline-yes">316x</span>
|
|
2624
2619
|
<span class="cline-any cline-neutral"> </span>
|
|
2625
|
-
<span class="cline-any cline-yes">
|
|
2620
|
+
<span class="cline-any cline-yes">158x</span>
|
|
2626
2621
|
<span class="cline-any cline-yes">1x</span>
|
|
2627
2622
|
<span class="cline-any cline-neutral"> </span>
|
|
2628
2623
|
<span class="cline-any cline-neutral"> </span>
|
|
2629
2624
|
<span class="cline-any cline-neutral"> </span>
|
|
2630
2625
|
<span class="cline-any cline-neutral"> </span>
|
|
2631
|
-
<span class="cline-any cline-yes">
|
|
2626
|
+
<span class="cline-any cline-yes">157x</span>
|
|
2632
2627
|
<span class="cline-any cline-no"> </span>
|
|
2633
2628
|
<span class="cline-any cline-neutral"> </span>
|
|
2634
2629
|
<span class="cline-any cline-neutral"> </span>
|
|
2635
2630
|
<span class="cline-any cline-neutral"> </span>
|
|
2636
2631
|
<span class="cline-any cline-neutral"> </span>
|
|
2637
2632
|
<span class="cline-any cline-neutral"> </span>
|
|
2638
|
-
<span class="cline-any cline-yes">
|
|
2633
|
+
<span class="cline-any cline-yes">158x</span>
|
|
2639
2634
|
<span class="cline-any cline-neutral"> </span>
|
|
2640
2635
|
<span class="cline-any cline-neutral"> </span>
|
|
2641
|
-
<span class="cline-any cline-yes">
|
|
2642
|
-
<span class="cline-any cline-yes">
|
|
2643
|
-
<span class="cline-any cline-yes">
|
|
2636
|
+
<span class="cline-any cline-yes">8507x</span>
|
|
2637
|
+
<span class="cline-any cline-yes">8507x</span>
|
|
2638
|
+
<span class="cline-any cline-yes">116x</span>
|
|
2644
2639
|
<span class="cline-any cline-yes">3x</span>
|
|
2645
2640
|
<span class="cline-any cline-neutral"> </span>
|
|
2646
2641
|
<span class="cline-any cline-neutral"> </span>
|
|
2647
2642
|
<span class="cline-any cline-neutral"> </span>
|
|
2648
2643
|
<span class="cline-any cline-neutral"> </span>
|
|
2649
2644
|
<span class="cline-any cline-neutral"> </span>
|
|
2650
|
-
<span class="cline-any cline-yes">
|
|
2645
|
+
<span class="cline-any cline-yes">116x</span>
|
|
2651
2646
|
<span class="cline-any cline-neutral"> </span>
|
|
2652
2647
|
<span class="cline-any cline-neutral"> </span>
|
|
2653
|
-
<span class="cline-any cline-yes">
|
|
2654
|
-
<span class="cline-any cline-yes">
|
|
2655
|
-
<span class="cline-any cline-yes">
|
|
2656
|
-
<span class="cline-any cline-yes">
|
|
2648
|
+
<span class="cline-any cline-yes">8391x</span>
|
|
2649
|
+
<span class="cline-any cline-yes">8391x</span>
|
|
2650
|
+
<span class="cline-any cline-yes">125x</span>
|
|
2651
|
+
<span class="cline-any cline-yes">87x</span>
|
|
2657
2652
|
<span class="cline-any cline-yes">2x</span>
|
|
2658
2653
|
<span class="cline-any cline-neutral"> </span>
|
|
2659
2654
|
<span class="cline-any cline-neutral"> </span>
|
|
2660
2655
|
<span class="cline-any cline-neutral"> </span>
|
|
2661
2656
|
<span class="cline-any cline-neutral"> </span>
|
|
2662
2657
|
<span class="cline-any cline-neutral"> </span>
|
|
2663
|
-
<span class="cline-any cline-yes">
|
|
2658
|
+
<span class="cline-any cline-yes">87x</span>
|
|
2664
2659
|
<span class="cline-any cline-neutral"> </span>
|
|
2665
2660
|
<span class="cline-any cline-neutral"> </span>
|
|
2666
2661
|
<span class="cline-any cline-neutral"> </span>
|
|
2667
|
-
<span class="cline-any cline-yes">
|
|
2662
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2668
2663
|
<span class="cline-any cline-no"> </span>
|
|
2669
2664
|
<span class="cline-any cline-neutral"> </span>
|
|
2670
2665
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2673,12 +2668,12 @@
|
|
|
2673
2668
|
<span class="cline-any cline-no"> </span>
|
|
2674
2669
|
<span class="cline-any cline-neutral"> </span>
|
|
2675
2670
|
<span class="cline-any cline-neutral"> </span>
|
|
2676
|
-
<span class="cline-any cline-yes">
|
|
2677
|
-
<span class="cline-any cline-yes">
|
|
2671
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2672
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2678
2673
|
<span class="cline-any cline-neutral"> </span>
|
|
2679
2674
|
<span class="cline-any cline-neutral"> </span>
|
|
2680
|
-
<span class="cline-any cline-yes">
|
|
2681
|
-
<span class="cline-any cline-yes">
|
|
2675
|
+
<span class="cline-any cline-yes">8304x</span>
|
|
2676
|
+
<span class="cline-any cline-yes">3941x</span>
|
|
2682
2677
|
<span class="cline-any cline-yes">2x</span>
|
|
2683
2678
|
<span class="cline-any cline-neutral"> </span>
|
|
2684
2679
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2687,26 +2682,26 @@
|
|
|
2687
2682
|
<span class="cline-any cline-yes">2x</span>
|
|
2688
2683
|
<span class="cline-any cline-neutral"> </span>
|
|
2689
2684
|
<span class="cline-any cline-neutral"> </span>
|
|
2690
|
-
<span class="cline-any cline-yes">
|
|
2691
|
-
<span class="cline-any cline-yes">
|
|
2692
|
-
<span class="cline-any cline-yes">
|
|
2693
|
-
<span class="cline-any cline-yes">
|
|
2685
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2686
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2687
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2688
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2694
2689
|
<span class="cline-any cline-yes">1x</span>
|
|
2695
2690
|
<span class="cline-any cline-neutral"> </span>
|
|
2696
2691
|
<span class="cline-any cline-neutral"> </span>
|
|
2697
2692
|
<span class="cline-any cline-neutral"> </span>
|
|
2698
2693
|
<span class="cline-any cline-neutral"> </span>
|
|
2699
2694
|
<span class="cline-any cline-neutral"> </span>
|
|
2700
|
-
<span class="cline-any cline-yes">
|
|
2695
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2701
2696
|
<span class="cline-any cline-yes">2x</span>
|
|
2702
2697
|
<span class="cline-any cline-neutral"> </span>
|
|
2703
2698
|
<span class="cline-any cline-neutral"> </span>
|
|
2704
2699
|
<span class="cline-any cline-neutral"> </span>
|
|
2705
2700
|
<span class="cline-any cline-neutral"> </span>
|
|
2706
2701
|
<span class="cline-any cline-neutral"> </span>
|
|
2707
|
-
<span class="cline-any cline-yes">
|
|
2708
|
-
<span class="cline-any cline-yes">
|
|
2709
|
-
<span class="cline-any cline-yes">
|
|
2702
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2703
|
+
<span class="cline-any cline-yes">228x</span>
|
|
2704
|
+
<span class="cline-any cline-yes">228x</span>
|
|
2710
2705
|
<span class="cline-any cline-yes">4x</span>
|
|
2711
2706
|
<span class="cline-any cline-neutral"> </span>
|
|
2712
2707
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2718,7 +2713,7 @@
|
|
|
2718
2713
|
<span class="cline-any cline-neutral"> </span>
|
|
2719
2714
|
<span class="cline-any cline-neutral"> </span>
|
|
2720
2715
|
<span class="cline-any cline-neutral"> </span>
|
|
2721
|
-
<span class="cline-any cline-yes">
|
|
2716
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2722
2717
|
<span class="cline-any cline-neutral"> </span>
|
|
2723
2718
|
<span class="cline-any cline-neutral"> </span>
|
|
2724
2719
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2729,12 +2724,12 @@
|
|
|
2729
2724
|
<span class="cline-any cline-neutral"> </span>
|
|
2730
2725
|
<span class="cline-any cline-neutral"> </span>
|
|
2731
2726
|
<span class="cline-any cline-neutral"> </span>
|
|
2732
|
-
<span class="cline-any cline-yes">
|
|
2727
|
+
<span class="cline-any cline-yes">3939x</span>
|
|
2733
2728
|
<span class="cline-any cline-neutral"> </span>
|
|
2734
2729
|
<span class="cline-any cline-neutral"> </span>
|
|
2735
2730
|
<span class="cline-any cline-neutral"> </span>
|
|
2736
|
-
<span class="cline-any cline-yes">
|
|
2737
|
-
<span class="cline-any cline-yes">
|
|
2731
|
+
<span class="cline-any cline-yes">4363x</span>
|
|
2732
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2738
2733
|
<span class="cline-any cline-no"> </span>
|
|
2739
2734
|
<span class="cline-any cline-neutral"> </span>
|
|
2740
2735
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2742,7 +2737,7 @@
|
|
|
2742
2737
|
<span class="cline-any cline-neutral"> </span>
|
|
2743
2738
|
<span class="cline-any cline-no"> </span>
|
|
2744
2739
|
<span class="cline-any cline-neutral"> </span>
|
|
2745
|
-
<span class="cline-any cline-yes">
|
|
2740
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2746
2741
|
<span class="cline-any cline-no"> </span>
|
|
2747
2742
|
<span class="cline-any cline-neutral"> </span>
|
|
2748
2743
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2750,7 +2745,7 @@
|
|
|
2750
2745
|
<span class="cline-any cline-neutral"> </span>
|
|
2751
2746
|
<span class="cline-any cline-no"> </span>
|
|
2752
2747
|
<span class="cline-any cline-neutral"> </span>
|
|
2753
|
-
<span class="cline-any cline-yes">
|
|
2748
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2754
2749
|
<span class="cline-any cline-no"> </span>
|
|
2755
2750
|
<span class="cline-any cline-neutral"> </span>
|
|
2756
2751
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2758,28 +2753,28 @@
|
|
|
2758
2753
|
<span class="cline-any cline-neutral"> </span>
|
|
2759
2754
|
<span class="cline-any cline-no"> </span>
|
|
2760
2755
|
<span class="cline-any cline-neutral"> </span>
|
|
2761
|
-
<span class="cline-any cline-yes">
|
|
2762
|
-
<span class="cline-any cline-yes">
|
|
2763
|
-
<span class="cline-any cline-yes">
|
|
2756
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2757
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2758
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2764
2759
|
<span class="cline-any cline-yes">2x</span>
|
|
2765
2760
|
<span class="cline-any cline-neutral"> </span>
|
|
2766
2761
|
<span class="cline-any cline-neutral"> </span>
|
|
2767
2762
|
<span class="cline-any cline-neutral"> </span>
|
|
2768
2763
|
<span class="cline-any cline-neutral"> </span>
|
|
2769
2764
|
<span class="cline-any cline-neutral"> </span>
|
|
2770
|
-
<span class="cline-any cline-yes">
|
|
2765
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2771
2766
|
<span class="cline-any cline-yes">8x</span>
|
|
2772
2767
|
<span class="cline-any cline-neutral"> </span>
|
|
2773
2768
|
<span class="cline-any cline-neutral"> </span>
|
|
2774
2769
|
<span class="cline-any cline-neutral"> </span>
|
|
2775
2770
|
<span class="cline-any cline-neutral"> </span>
|
|
2776
2771
|
<span class="cline-any cline-neutral"> </span>
|
|
2777
|
-
<span class="cline-any cline-yes">
|
|
2772
|
+
<span class="cline-any cline-yes">785x</span>
|
|
2778
2773
|
<span class="cline-any cline-neutral"> </span>
|
|
2779
2774
|
<span class="cline-any cline-neutral"> </span>
|
|
2780
2775
|
<span class="cline-any cline-neutral"> </span>
|
|
2781
|
-
<span class="cline-any cline-yes">
|
|
2782
|
-
<span class="cline-any cline-yes">
|
|
2776
|
+
<span class="cline-any cline-yes">3578x</span>
|
|
2777
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2783
2778
|
<span class="cline-any cline-no"> </span>
|
|
2784
2779
|
<span class="cline-any cline-neutral"> </span>
|
|
2785
2780
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2787,7 +2782,7 @@
|
|
|
2787
2782
|
<span class="cline-any cline-neutral"> </span>
|
|
2788
2783
|
<span class="cline-any cline-no"> </span>
|
|
2789
2784
|
<span class="cline-any cline-neutral"> </span>
|
|
2790
|
-
<span class="cline-any cline-yes">
|
|
2785
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2791
2786
|
<span class="cline-any cline-no"> </span>
|
|
2792
2787
|
<span class="cline-any cline-neutral"> </span>
|
|
2793
2788
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2795,40 +2790,40 @@
|
|
|
2795
2790
|
<span class="cline-any cline-neutral"> </span>
|
|
2796
2791
|
<span class="cline-any cline-no"> </span>
|
|
2797
2792
|
<span class="cline-any cline-neutral"> </span>
|
|
2798
|
-
<span class="cline-any cline-yes">
|
|
2799
|
-
<span class="cline-any cline-yes">
|
|
2800
|
-
<span class="cline-any cline-yes">
|
|
2793
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2794
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2795
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2801
2796
|
<span class="cline-any cline-no"> </span>
|
|
2802
2797
|
<span class="cline-any cline-neutral"> </span>
|
|
2803
2798
|
<span class="cline-any cline-neutral"> </span>
|
|
2804
2799
|
<span class="cline-any cline-neutral"> </span>
|
|
2805
2800
|
<span class="cline-any cline-neutral"> </span>
|
|
2806
2801
|
<span class="cline-any cline-neutral"> </span>
|
|
2807
|
-
<span class="cline-any cline-yes">
|
|
2802
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2808
2803
|
<span class="cline-any cline-no"> </span>
|
|
2809
2804
|
<span class="cline-any cline-neutral"> </span>
|
|
2810
2805
|
<span class="cline-any cline-neutral"> </span>
|
|
2811
2806
|
<span class="cline-any cline-neutral"> </span>
|
|
2812
2807
|
<span class="cline-any cline-neutral"> </span>
|
|
2813
2808
|
<span class="cline-any cline-neutral"> </span>
|
|
2814
|
-
<span class="cline-any cline-yes">
|
|
2809
|
+
<span class="cline-any cline-yes">441x</span>
|
|
2815
2810
|
<span class="cline-any cline-neutral"> </span>
|
|
2816
2811
|
<span class="cline-any cline-neutral"> </span>
|
|
2817
2812
|
<span class="cline-any cline-neutral"> </span>
|
|
2818
|
-
<span class="cline-any cline-yes">
|
|
2819
|
-
<span class="cline-any cline-yes">
|
|
2813
|
+
<span class="cline-any cline-yes">3137x</span>
|
|
2814
|
+
<span class="cline-any cline-yes">459x</span>
|
|
2820
2815
|
<span class="cline-any cline-no"> </span>
|
|
2821
2816
|
<span class="cline-any cline-neutral"> </span>
|
|
2822
2817
|
<span class="cline-any cline-neutral"> </span>
|
|
2823
2818
|
<span class="cline-any cline-neutral"> </span>
|
|
2824
2819
|
<span class="cline-any cline-neutral"> </span>
|
|
2825
2820
|
<span class="cline-any cline-neutral"> </span>
|
|
2826
|
-
<span class="cline-any cline-yes">
|
|
2821
|
+
<span class="cline-any cline-yes">459x</span>
|
|
2827
2822
|
<span class="cline-any cline-neutral"> </span>
|
|
2828
2823
|
<span class="cline-any cline-neutral"> </span>
|
|
2829
2824
|
<span class="cline-any cline-neutral"> </span>
|
|
2830
|
-
<span class="cline-any cline-yes">
|
|
2831
|
-
<span class="cline-any cline-yes">
|
|
2825
|
+
<span class="cline-any cline-yes">2678x</span>
|
|
2826
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2832
2827
|
<span class="cline-any cline-no"> </span>
|
|
2833
2828
|
<span class="cline-any cline-neutral"> </span>
|
|
2834
2829
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2836,7 +2831,7 @@
|
|
|
2836
2831
|
<span class="cline-any cline-neutral"> </span>
|
|
2837
2832
|
<span class="cline-any cline-no"> </span>
|
|
2838
2833
|
<span class="cline-any cline-neutral"> </span>
|
|
2839
|
-
<span class="cline-any cline-yes">
|
|
2834
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2840
2835
|
<span class="cline-any cline-neutral"> </span>
|
|
2841
2836
|
<span class="cline-any cline-neutral"> </span>
|
|
2842
2837
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2851,12 +2846,12 @@
|
|
|
2851
2846
|
<span class="cline-any cline-neutral"> </span>
|
|
2852
2847
|
<span class="cline-any cline-neutral"> </span>
|
|
2853
2848
|
<span class="cline-any cline-neutral"> </span>
|
|
2854
|
-
<span class="cline-any cline-yes">
|
|
2849
|
+
<span class="cline-any cline-yes">748x</span>
|
|
2855
2850
|
<span class="cline-any cline-neutral"> </span>
|
|
2856
2851
|
<span class="cline-any cline-neutral"> </span>
|
|
2857
2852
|
<span class="cline-any cline-neutral"> </span>
|
|
2858
|
-
<span class="cline-any cline-yes">
|
|
2859
|
-
<span class="cline-any cline-yes">
|
|
2853
|
+
<span class="cline-any cline-yes">1930x</span>
|
|
2854
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2860
2855
|
<span class="cline-any cline-neutral"> </span>
|
|
2861
2856
|
<span class="cline-any cline-neutral"> </span>
|
|
2862
2857
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2868,7 +2863,7 @@
|
|
|
2868
2863
|
<span class="cline-any cline-neutral"> </span>
|
|
2869
2864
|
<span class="cline-any cline-no"> </span>
|
|
2870
2865
|
<span class="cline-any cline-neutral"> </span>
|
|
2871
|
-
<span class="cline-any cline-yes">
|
|
2866
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2872
2867
|
<span class="cline-any cline-neutral"> </span>
|
|
2873
2868
|
<span class="cline-any cline-neutral"> </span>
|
|
2874
2869
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2881,12 +2876,12 @@
|
|
|
2881
2876
|
<span class="cline-any cline-neutral"> </span>
|
|
2882
2877
|
<span class="cline-any cline-neutral"> </span>
|
|
2883
2878
|
<span class="cline-any cline-neutral"> </span>
|
|
2884
|
-
<span class="cline-any cline-yes">
|
|
2879
|
+
<span class="cline-any cline-yes">1916x</span>
|
|
2885
2880
|
<span class="cline-any cline-neutral"> </span>
|
|
2886
2881
|
<span class="cline-any cline-neutral"> </span>
|
|
2887
2882
|
<span class="cline-any cline-neutral"> </span>
|
|
2888
|
-
<span class="cline-any cline-yes">
|
|
2889
|
-
<span class="cline-any cline-yes">
|
|
2883
|
+
<span class="cline-any cline-yes">14x</span>
|
|
2884
|
+
<span class="cline-any cline-yes">14x</span>
|
|
2890
2885
|
<span class="cline-any cline-no"> </span>
|
|
2891
2886
|
<span class="cline-any cline-neutral"> </span>
|
|
2892
2887
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2894,10 +2889,10 @@
|
|
|
2894
2889
|
<span class="cline-any cline-neutral"> </span>
|
|
2895
2890
|
<span class="cline-any cline-no"> </span>
|
|
2896
2891
|
<span class="cline-any cline-neutral"> </span>
|
|
2897
|
-
<span class="cline-any cline-yes">
|
|
2898
|
-
<span class="cline-any cline-yes">
|
|
2892
|
+
<span class="cline-any cline-yes">14x</span>
|
|
2893
|
+
<span class="cline-any cline-yes">14x</span>
|
|
2899
2894
|
<span class="cline-any cline-neutral"> </span>
|
|
2900
|
-
<span class="cline-any cline-yes">
|
|
2895
|
+
<span class="cline-any cline-yes">14x</span>
|
|
2901
2896
|
<span class="cline-any cline-no"> </span>
|
|
2902
2897
|
<span class="cline-any cline-no"> </span>
|
|
2903
2898
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2915,7 +2910,7 @@
|
|
|
2915
2910
|
<span class="cline-any cline-neutral"> </span>
|
|
2916
2911
|
<span class="cline-any cline-neutral"> </span>
|
|
2917
2912
|
<span class="cline-any cline-neutral"> </span>
|
|
2918
|
-
<span class="cline-any cline-yes">
|
|
2913
|
+
<span class="cline-any cline-yes">14x</span>
|
|
2919
2914
|
<span class="cline-any cline-neutral"> </span>
|
|
2920
2915
|
<span class="cline-any cline-neutral"> </span>
|
|
2921
2916
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2939,13 +2934,13 @@
|
|
|
2939
2934
|
<span class="cline-any cline-neutral"> </span>
|
|
2940
2935
|
<span class="cline-any cline-neutral"> </span>
|
|
2941
2936
|
<span class="cline-any cline-neutral"> </span>
|
|
2942
|
-
<span class="cline-any cline-yes">
|
|
2943
|
-
<span class="cline-any cline-yes">
|
|
2937
|
+
<span class="cline-any cline-yes">2431x</span>
|
|
2938
|
+
<span class="cline-any cline-yes">287x</span>
|
|
2944
2939
|
<span class="cline-any cline-neutral"> </span>
|
|
2945
2940
|
<span class="cline-any cline-neutral"> </span>
|
|
2946
2941
|
<span class="cline-any cline-neutral"> </span>
|
|
2947
2942
|
<span class="cline-any cline-neutral"> </span>
|
|
2948
|
-
<span class="cline-any cline-yes">
|
|
2943
|
+
<span class="cline-any cline-yes">287x</span>
|
|
2949
2944
|
<span class="cline-any cline-yes">4x</span>
|
|
2950
2945
|
<span class="cline-any cline-neutral"> </span>
|
|
2951
2946
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2953,8 +2948,8 @@
|
|
|
2953
2948
|
<span class="cline-any cline-neutral"> </span>
|
|
2954
2949
|
<span class="cline-any cline-yes">4x</span>
|
|
2955
2950
|
<span class="cline-any cline-neutral"> </span>
|
|
2956
|
-
<span class="cline-any cline-yes">
|
|
2957
|
-
<span class="cline-any cline-yes">
|
|
2951
|
+
<span class="cline-any cline-yes">283x</span>
|
|
2952
|
+
<span class="cline-any cline-yes">276x</span>
|
|
2958
2953
|
<span class="cline-any cline-neutral"> </span>
|
|
2959
2954
|
<span class="cline-any cline-neutral"> </span>
|
|
2960
2955
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2964,10 +2959,10 @@
|
|
|
2964
2959
|
<span class="cline-any cline-neutral"> </span>
|
|
2965
2960
|
<span class="cline-any cline-neutral"> </span>
|
|
2966
2961
|
<span class="cline-any cline-neutral"> </span>
|
|
2967
|
-
<span class="cline-any cline-yes">
|
|
2962
|
+
<span class="cline-any cline-yes">283x</span>
|
|
2968
2963
|
<span class="cline-any cline-neutral"> </span>
|
|
2969
|
-
<span class="cline-any cline-yes">
|
|
2970
|
-
<span class="cline-any cline-yes">
|
|
2964
|
+
<span class="cline-any cline-yes">2144x</span>
|
|
2965
|
+
<span class="cline-any cline-yes">2144x</span>
|
|
2971
2966
|
<span class="cline-any cline-yes">6x</span>
|
|
2972
2967
|
<span class="cline-any cline-neutral"> </span>
|
|
2973
2968
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -2975,7 +2970,7 @@
|
|
|
2975
2970
|
<span class="cline-any cline-neutral"> </span>
|
|
2976
2971
|
<span class="cline-any cline-yes">6x</span>
|
|
2977
2972
|
<span class="cline-any cline-neutral"> </span>
|
|
2978
|
-
<span class="cline-any cline-yes">
|
|
2973
|
+
<span class="cline-any cline-yes">2138x</span>
|
|
2979
2974
|
<span class="cline-any cline-neutral"> </span>
|
|
2980
2975
|
<span class="cline-any cline-neutral"> </span>
|
|
2981
2976
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3001,8 +2996,8 @@
|
|
|
3001
2996
|
<span class="cline-any cline-neutral"> </span>
|
|
3002
2997
|
<span class="cline-any cline-neutral"> </span>
|
|
3003
2998
|
<span class="cline-any cline-neutral"> </span>
|
|
3004
|
-
<span class="cline-any cline-yes">
|
|
3005
|
-
<span class="cline-any cline-yes">
|
|
2999
|
+
<span class="cline-any cline-yes">74x</span>
|
|
3000
|
+
<span class="cline-any cline-yes">179x</span>
|
|
3006
3001
|
<span class="cline-any cline-yes">1x</span>
|
|
3007
3002
|
<span class="cline-any cline-neutral"> </span>
|
|
3008
3003
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3013,8 +3008,8 @@
|
|
|
3013
3008
|
<span class="cline-any cline-yes">1x</span>
|
|
3014
3009
|
<span class="cline-any cline-neutral"> </span>
|
|
3015
3010
|
<span class="cline-any cline-neutral"> </span>
|
|
3016
|
-
<span class="cline-any cline-yes">
|
|
3017
|
-
<span class="cline-any cline-yes">
|
|
3011
|
+
<span class="cline-any cline-yes">178x</span>
|
|
3012
|
+
<span class="cline-any cline-yes">178x</span>
|
|
3018
3013
|
<span class="cline-any cline-yes">2x</span>
|
|
3019
3014
|
<span class="cline-any cline-neutral"> </span>
|
|
3020
3015
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3023,13 +3018,13 @@
|
|
|
3023
3018
|
<span class="cline-any cline-yes">2x</span>
|
|
3024
3019
|
<span class="cline-any cline-neutral"> </span>
|
|
3025
3020
|
<span class="cline-any cline-neutral"> </span>
|
|
3026
|
-
<span class="cline-any cline-yes">
|
|
3027
|
-
<span class="cline-any cline-yes">
|
|
3021
|
+
<span class="cline-any cline-yes">176x</span>
|
|
3022
|
+
<span class="cline-any cline-yes">176x</span>
|
|
3028
3023
|
<span class="cline-any cline-neutral"> </span>
|
|
3029
3024
|
<span class="cline-any cline-neutral"> </span>
|
|
3030
3025
|
<span class="cline-any cline-neutral"> </span>
|
|
3031
|
-
<span class="cline-any cline-yes">
|
|
3032
|
-
<span class="cline-any cline-yes">
|
|
3026
|
+
<span class="cline-any cline-yes">176x</span>
|
|
3027
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3033
3028
|
<span class="cline-any cline-no"> </span>
|
|
3034
3029
|
<span class="cline-any cline-neutral"> </span>
|
|
3035
3030
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3039,40 +3034,40 @@
|
|
|
3039
3034
|
<span class="cline-any cline-neutral"> </span>
|
|
3040
3035
|
<span class="cline-any cline-neutral"> </span>
|
|
3041
3036
|
<span class="cline-any cline-neutral"> </span>
|
|
3042
|
-
<span class="cline-any cline-yes">
|
|
3043
|
-
<span class="cline-any cline-yes">
|
|
3037
|
+
<span class="cline-any cline-yes">176x</span>
|
|
3038
|
+
<span class="cline-any cline-yes">176x</span>
|
|
3044
3039
|
<span class="cline-any cline-no"> </span>
|
|
3045
3040
|
<span class="cline-any cline-neutral"> </span>
|
|
3046
3041
|
<span class="cline-any cline-neutral"> </span>
|
|
3047
|
-
<span class="cline-any cline-yes">
|
|
3048
|
-
<span class="cline-any cline-yes">
|
|
3049
|
-
<span class="cline-any cline-yes">
|
|
3042
|
+
<span class="cline-any cline-yes">176x</span>
|
|
3043
|
+
<span class="cline-any cline-yes">261x</span>
|
|
3044
|
+
<span class="cline-any cline-yes">261x</span>
|
|
3050
3045
|
<span class="cline-any cline-neutral"> </span>
|
|
3051
|
-
<span class="cline-any cline-yes">
|
|
3046
|
+
<span class="cline-any cline-yes">261x</span>
|
|
3052
3047
|
<span class="cline-any cline-neutral"> </span>
|
|
3053
3048
|
<span class="cline-any cline-neutral"> </span>
|
|
3054
3049
|
<span class="cline-any cline-neutral"> </span>
|
|
3055
3050
|
<span class="cline-any cline-neutral"> </span>
|
|
3056
|
-
<span class="cline-any cline-yes">
|
|
3057
|
-
<span class="cline-any cline-yes">
|
|
3051
|
+
<span class="cline-any cline-yes">165x</span>
|
|
3052
|
+
<span class="cline-any cline-yes">165x</span>
|
|
3058
3053
|
<span class="cline-any cline-neutral"> </span>
|
|
3059
|
-
<span class="cline-any cline-yes">
|
|
3054
|
+
<span class="cline-any cline-yes">165x</span>
|
|
3060
3055
|
<span class="cline-any cline-neutral"> </span>
|
|
3061
3056
|
<span class="cline-any cline-neutral"> </span>
|
|
3062
3057
|
<span class="cline-any cline-neutral"> </span>
|
|
3063
|
-
<span class="cline-any cline-yes">
|
|
3058
|
+
<span class="cline-any cline-yes">228x</span>
|
|
3064
3059
|
<span class="cline-any cline-neutral"> </span>
|
|
3065
3060
|
<span class="cline-any cline-neutral"> </span>
|
|
3066
|
-
<span class="cline-any cline-yes">
|
|
3067
|
-
<span class="cline-any cline-yes">
|
|
3068
|
-
<span class="cline-any cline-yes">
|
|
3069
|
-
<span class="cline-any cline-yes">
|
|
3061
|
+
<span class="cline-any cline-yes">165x</span>
|
|
3062
|
+
<span class="cline-any cline-yes">158x</span>
|
|
3063
|
+
<span class="cline-any cline-yes">284x</span>
|
|
3064
|
+
<span class="cline-any cline-yes">284x</span>
|
|
3070
3065
|
<span class="cline-any cline-neutral"> </span>
|
|
3071
3066
|
<span class="cline-any cline-neutral"> </span>
|
|
3072
3067
|
<span class="cline-any cline-neutral"> </span>
|
|
3073
3068
|
<span class="cline-any cline-neutral"> </span>
|
|
3074
3069
|
<span class="cline-any cline-neutral"> </span>
|
|
3075
|
-
<span class="cline-any cline-yes">
|
|
3070
|
+
<span class="cline-any cline-yes">284x</span>
|
|
3076
3071
|
<span class="cline-any cline-yes">1x</span>
|
|
3077
3072
|
<span class="cline-any cline-neutral"> </span>
|
|
3078
3073
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3083,30 +3078,30 @@
|
|
|
3083
3078
|
<span class="cline-any cline-yes">1x</span>
|
|
3084
3079
|
<span class="cline-any cline-neutral"> </span>
|
|
3085
3080
|
<span class="cline-any cline-neutral"> </span>
|
|
3086
|
-
<span class="cline-any cline-yes">
|
|
3087
|
-
<span class="cline-any cline-yes">
|
|
3081
|
+
<span class="cline-any cline-yes">283x</span>
|
|
3082
|
+
<span class="cline-any cline-yes">8x</span>
|
|
3088
3083
|
<span class="cline-any cline-yes">1x</span>
|
|
3089
3084
|
<span class="cline-any cline-neutral"> </span>
|
|
3090
3085
|
<span class="cline-any cline-neutral"> </span>
|
|
3091
3086
|
<span class="cline-any cline-neutral"> </span>
|
|
3092
3087
|
<span class="cline-any cline-neutral"> </span>
|
|
3093
3088
|
<span class="cline-any cline-neutral"> </span>
|
|
3094
|
-
<span class="cline-any cline-yes">
|
|
3089
|
+
<span class="cline-any cline-yes">8x</span>
|
|
3095
3090
|
<span class="cline-any cline-neutral"> </span>
|
|
3096
3091
|
<span class="cline-any cline-neutral"> </span>
|
|
3097
3092
|
<span class="cline-any cline-neutral"> </span>
|
|
3098
|
-
<span class="cline-any cline-yes">
|
|
3093
|
+
<span class="cline-any cline-yes">275x</span>
|
|
3099
3094
|
<span class="cline-any cline-neutral"> </span>
|
|
3100
3095
|
<span class="cline-any cline-neutral"> </span>
|
|
3101
3096
|
<span class="cline-any cline-neutral"> </span>
|
|
3102
3097
|
<span class="cline-any cline-neutral"> </span>
|
|
3103
3098
|
<span class="cline-any cline-neutral"> </span>
|
|
3104
|
-
<span class="cline-any cline-yes">
|
|
3105
|
-
<span class="cline-any cline-yes">
|
|
3099
|
+
<span class="cline-any cline-yes">275x</span>
|
|
3100
|
+
<span class="cline-any cline-yes">275x</span>
|
|
3106
3101
|
<span class="cline-any cline-no"> </span>
|
|
3107
3102
|
<span class="cline-any cline-neutral"> </span>
|
|
3108
3103
|
<span class="cline-any cline-neutral"> </span>
|
|
3109
|
-
<span class="cline-any cline-yes">
|
|
3104
|
+
<span class="cline-any cline-yes">275x</span>
|
|
3110
3105
|
<span class="cline-any cline-neutral"> </span>
|
|
3111
3106
|
<span class="cline-any cline-neutral"> </span>
|
|
3112
3107
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3117,7 +3112,7 @@
|
|
|
3117
3112
|
<span class="cline-any cline-neutral"> </span>
|
|
3118
3113
|
<span class="cline-any cline-neutral"> </span>
|
|
3119
3114
|
<span class="cline-any cline-neutral"> </span>
|
|
3120
|
-
<span class="cline-any cline-yes">
|
|
3115
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3121
3116
|
<span class="cline-any cline-neutral"> </span>
|
|
3122
3117
|
<span class="cline-any cline-neutral"> </span>
|
|
3123
3118
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3128,7 +3123,7 @@
|
|
|
3128
3123
|
<span class="cline-any cline-neutral"> </span>
|
|
3129
3124
|
<span class="cline-any cline-neutral"> </span>
|
|
3130
3125
|
<span class="cline-any cline-neutral"> </span>
|
|
3131
|
-
<span class="cline-any cline-yes">
|
|
3126
|
+
<span class="cline-any cline-yes">96x</span>
|
|
3132
3127
|
<span class="cline-any cline-neutral"> </span>
|
|
3133
3128
|
<span class="cline-any cline-neutral"> </span>
|
|
3134
3129
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3152,10 +3147,10 @@
|
|
|
3152
3147
|
<span class="cline-any cline-neutral"> </span>
|
|
3153
3148
|
<span class="cline-any cline-neutral"> </span>
|
|
3154
3149
|
<span class="cline-any cline-neutral"> </span>
|
|
3155
|
-
<span class="cline-any cline-yes">
|
|
3150
|
+
<span class="cline-any cline-yes">53x</span>
|
|
3156
3151
|
<span class="cline-any cline-neutral"> </span>
|
|
3157
|
-
<span class="cline-any cline-yes">
|
|
3158
|
-
<span class="cline-any cline-yes">
|
|
3152
|
+
<span class="cline-any cline-yes">59x</span>
|
|
3153
|
+
<span class="cline-any cline-yes">31x</span>
|
|
3159
3154
|
<span class="cline-any cline-no"> </span>
|
|
3160
3155
|
<span class="cline-any cline-neutral"> </span>
|
|
3161
3156
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3165,9 +3160,9 @@
|
|
|
3165
3160
|
<span class="cline-any cline-neutral"> </span>
|
|
3166
3161
|
<span class="cline-any cline-neutral"> </span>
|
|
3167
3162
|
<span class="cline-any cline-neutral"> </span>
|
|
3168
|
-
<span class="cline-any cline-yes">
|
|
3169
|
-
<span class="cline-any cline-yes">
|
|
3170
|
-
<span class="cline-any cline-yes">
|
|
3163
|
+
<span class="cline-any cline-yes">59x</span>
|
|
3164
|
+
<span class="cline-any cline-yes">11x</span>
|
|
3165
|
+
<span class="cline-any cline-yes">11x</span>
|
|
3171
3166
|
<span class="cline-any cline-neutral"> </span>
|
|
3172
3167
|
<span class="cline-any cline-neutral"> </span>
|
|
3173
3168
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3191,11 +3186,11 @@
|
|
|
3191
3186
|
<span class="cline-any cline-neutral"> </span>
|
|
3192
3187
|
<span class="cline-any cline-neutral"> </span>
|
|
3193
3188
|
<span class="cline-any cline-neutral"> </span>
|
|
3194
|
-
<span class="cline-any cline-yes">
|
|
3189
|
+
<span class="cline-any cline-yes">669x</span>
|
|
3195
3190
|
<span class="cline-any cline-neutral"> </span>
|
|
3196
|
-
<span class="cline-any cline-yes">
|
|
3197
|
-
<span class="cline-any cline-yes">
|
|
3198
|
-
<span class="cline-any cline-yes">
|
|
3191
|
+
<span class="cline-any cline-yes">890x</span>
|
|
3192
|
+
<span class="cline-any cline-yes">146x</span>
|
|
3193
|
+
<span class="cline-any cline-yes">1540x</span>
|
|
3199
3194
|
<span class="cline-any cline-neutral"> </span>
|
|
3200
3195
|
<span class="cline-any cline-neutral"> </span>
|
|
3201
3196
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3208,8 +3203,8 @@
|
|
|
3208
3203
|
<span class="cline-any cline-neutral"> </span>
|
|
3209
3204
|
<span class="cline-any cline-neutral"> </span>
|
|
3210
3205
|
<span class="cline-any cline-neutral"> </span>
|
|
3211
|
-
<span class="cline-any cline-yes">
|
|
3212
|
-
<span class="cline-any cline-yes">
|
|
3206
|
+
<span class="cline-any cline-yes">890x</span>
|
|
3207
|
+
<span class="cline-any cline-yes">19x</span>
|
|
3213
3208
|
<span class="cline-any cline-neutral"> </span>
|
|
3214
3209
|
<span class="cline-any cline-neutral"> </span>
|
|
3215
3210
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3220,8 +3215,8 @@
|
|
|
3220
3215
|
<span class="cline-any cline-neutral"> </span>
|
|
3221
3216
|
<span class="cline-any cline-neutral"> </span>
|
|
3222
3217
|
<span class="cline-any cline-neutral"> </span>
|
|
3223
|
-
<span class="cline-any cline-yes">
|
|
3224
|
-
<span class="cline-any cline-yes">
|
|
3218
|
+
<span class="cline-any cline-yes">890x</span>
|
|
3219
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3225
3220
|
<span class="cline-any cline-no"> </span>
|
|
3226
3221
|
<span class="cline-any cline-neutral"> </span>
|
|
3227
3222
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3229,11 +3224,11 @@
|
|
|
3229
3224
|
<span class="cline-any cline-neutral"> </span>
|
|
3230
3225
|
<span class="cline-any cline-neutral"> </span>
|
|
3231
3226
|
<span class="cline-any cline-neutral"> </span>
|
|
3232
|
-
<span class="cline-any cline-yes">
|
|
3233
|
-
<span class="cline-any cline-yes">
|
|
3227
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3228
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3234
3229
|
<span class="cline-any cline-neutral"> </span>
|
|
3235
3230
|
<span class="cline-any cline-neutral"> </span>
|
|
3236
|
-
<span class="cline-any cline-yes">
|
|
3231
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3237
3232
|
<span class="cline-any cline-no"> </span>
|
|
3238
3233
|
<span class="cline-any cline-neutral"> </span>
|
|
3239
3234
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3244,11 +3239,11 @@
|
|
|
3244
3239
|
<span class="cline-any cline-neutral"> </span>
|
|
3245
3240
|
<span class="cline-any cline-neutral"> </span>
|
|
3246
3241
|
<span class="cline-any cline-neutral"> </span>
|
|
3247
|
-
<span class="cline-any cline-yes">
|
|
3248
|
-
<span class="cline-any cline-yes">
|
|
3242
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3243
|
+
<span class="cline-any cline-yes">14x</span>
|
|
3249
3244
|
<span class="cline-any cline-neutral"> </span>
|
|
3250
3245
|
<span class="cline-any cline-neutral"> </span>
|
|
3251
|
-
<span class="cline-any cline-yes">
|
|
3246
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3252
3247
|
<span class="cline-any cline-no"> </span>
|
|
3253
3248
|
<span class="cline-any cline-neutral"> </span>
|
|
3254
3249
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3257,11 +3252,11 @@
|
|
|
3257
3252
|
<span class="cline-any cline-neutral"> </span>
|
|
3258
3253
|
<span class="cline-any cline-neutral"> </span>
|
|
3259
3254
|
<span class="cline-any cline-neutral"> </span>
|
|
3260
|
-
<span class="cline-any cline-yes">
|
|
3261
|
-
<span class="cline-any cline-yes">
|
|
3255
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3256
|
+
<span class="cline-any cline-yes">14x</span>
|
|
3262
3257
|
<span class="cline-any cline-neutral"> </span>
|
|
3263
3258
|
<span class="cline-any cline-neutral"> </span>
|
|
3264
|
-
<span class="cline-any cline-yes">
|
|
3259
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3265
3260
|
<span class="cline-any cline-no"> </span>
|
|
3266
3261
|
<span class="cline-any cline-neutral"> </span>
|
|
3267
3262
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3271,9 +3266,9 @@
|
|
|
3271
3266
|
<span class="cline-any cline-neutral"> </span>
|
|
3272
3267
|
<span class="cline-any cline-neutral"> </span>
|
|
3273
3268
|
<span class="cline-any cline-neutral"> </span>
|
|
3274
|
-
<span class="cline-any cline-yes">
|
|
3269
|
+
<span class="cline-any cline-yes">14x</span>
|
|
3275
3270
|
<span class="cline-any cline-neutral"> </span>
|
|
3276
|
-
<span class="cline-any cline-yes">
|
|
3271
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3277
3272
|
<span class="cline-any cline-no"> </span>
|
|
3278
3273
|
<span class="cline-any cline-neutral"> </span>
|
|
3279
3274
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3285,7 +3280,7 @@
|
|
|
3285
3280
|
<span class="cline-any cline-neutral"> </span>
|
|
3286
3281
|
<span class="cline-any cline-neutral"> </span>
|
|
3287
3282
|
<span class="cline-any cline-neutral"> </span>
|
|
3288
|
-
<span class="cline-any cline-yes">
|
|
3283
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3289
3284
|
<span class="cline-any cline-neutral"> </span>
|
|
3290
3285
|
<span class="cline-any cline-neutral"> </span>
|
|
3291
3286
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3294,50 +3289,51 @@
|
|
|
3294
3289
|
<span class="cline-any cline-neutral"> </span>
|
|
3295
3290
|
<span class="cline-any cline-neutral"> </span>
|
|
3296
3291
|
<span class="cline-any cline-neutral"> </span>
|
|
3297
|
-
<span class="cline-any cline-yes">
|
|
3298
|
-
<span class="cline-any cline-yes">
|
|
3299
|
-
<span class="cline-any cline-yes">
|
|
3300
|
-
<span class="cline-any cline-yes">
|
|
3301
|
-
<span class="cline-any cline-yes">
|
|
3292
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3293
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3294
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3295
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3296
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3302
3297
|
<span class="cline-any cline-neutral"> </span>
|
|
3303
3298
|
<span class="cline-any cline-neutral"> </span>
|
|
3304
3299
|
<span class="cline-any cline-neutral"> </span>
|
|
3305
3300
|
<span class="cline-any cline-neutral"> </span>
|
|
3306
|
-
<span class="cline-any cline-yes">
|
|
3301
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3307
3302
|
<span class="cline-any cline-neutral"> </span>
|
|
3308
|
-
<span class="cline-any cline-yes">
|
|
3303
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3309
3304
|
<span class="cline-any cline-neutral"> </span>
|
|
3310
|
-
<span class="cline-any cline-yes">
|
|
3305
|
+
<span class="cline-any cline-yes">1233x</span>
|
|
3311
3306
|
<span class="cline-any cline-no"> </span>
|
|
3312
3307
|
<span class="cline-any cline-neutral"> </span>
|
|
3313
3308
|
<span class="cline-any cline-neutral"> </span>
|
|
3314
|
-
<span class="cline-any cline-yes">
|
|
3309
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3315
3310
|
<span class="cline-any cline-neutral"> </span>
|
|
3316
3311
|
<span class="cline-any cline-neutral"> </span>
|
|
3317
|
-
<span class="cline-any cline-yes">
|
|
3312
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3318
3313
|
<span class="cline-any cline-neutral"> </span>
|
|
3319
3314
|
<span class="cline-any cline-neutral"> </span>
|
|
3320
3315
|
<span class="cline-any cline-neutral"> </span>
|
|
3321
3316
|
<span class="cline-any cline-neutral"> </span>
|
|
3322
|
-
<span class="cline-any cline-yes">
|
|
3317
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3323
3318
|
<span class="cline-any cline-neutral"> </span>
|
|
3324
3319
|
<span class="cline-any cline-neutral"> </span>
|
|
3325
3320
|
<span class="cline-any cline-neutral"> </span>
|
|
3326
3321
|
<span class="cline-any cline-neutral"> </span>
|
|
3327
|
-
<span class="cline-any cline-yes">
|
|
3322
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3328
3323
|
<span class="cline-any cline-neutral"> </span>
|
|
3329
3324
|
<span class="cline-any cline-neutral"> </span>
|
|
3330
3325
|
<span class="cline-any cline-neutral"> </span>
|
|
3331
3326
|
<span class="cline-any cline-neutral"> </span>
|
|
3332
|
-
<span class="cline-any cline-yes">
|
|
3327
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3333
3328
|
<span class="cline-any cline-neutral"> </span>
|
|
3334
|
-
<span class="cline-any cline-yes">
|
|
3329
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3335
3330
|
<span class="cline-any cline-neutral"> </span>
|
|
3336
|
-
<span class="cline-any cline-yes">
|
|
3337
|
-
<span class="cline-any cline-yes">
|
|
3331
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3332
|
+
<span class="cline-any cline-yes">14x</span>
|
|
3338
3333
|
<span class="cline-any cline-neutral"> </span>
|
|
3339
3334
|
<span class="cline-any cline-neutral"> </span>
|
|
3340
|
-
<span class="cline-any cline-yes">
|
|
3335
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3336
|
+
<span class="cline-any cline-neutral"> </span>
|
|
3341
3337
|
<span class="cline-any cline-neutral"> </span>
|
|
3342
3338
|
<span class="cline-any cline-neutral"> </span>
|
|
3343
3339
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3377,7 +3373,7 @@
|
|
|
3377
3373
|
<span class="cline-any cline-neutral"> </span>
|
|
3378
3374
|
<span class="cline-any cline-neutral"> </span>
|
|
3379
3375
|
<span class="cline-any cline-neutral"> </span>
|
|
3380
|
-
<span class="cline-any cline-yes">
|
|
3376
|
+
<span class="cline-any cline-yes">670x</span>
|
|
3381
3377
|
<span class="cline-any cline-no"> </span>
|
|
3382
3378
|
<span class="cline-any cline-neutral"> </span>
|
|
3383
3379
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3387,8 +3383,8 @@
|
|
|
3387
3383
|
<span class="cline-any cline-neutral"> </span>
|
|
3388
3384
|
<span class="cline-any cline-neutral"> </span>
|
|
3389
3385
|
<span class="cline-any cline-neutral"> </span>
|
|
3390
|
-
<span class="cline-any cline-yes">
|
|
3391
|
-
<span class="cline-any cline-yes">
|
|
3386
|
+
<span class="cline-any cline-yes">893x</span>
|
|
3387
|
+
<span class="cline-any cline-yes">670x</span>
|
|
3392
3388
|
<span class="cline-any cline-no"> </span>
|
|
3393
3389
|
<span class="cline-any cline-neutral"> </span>
|
|
3394
3390
|
<span class="cline-any cline-no"> </span>
|
|
@@ -3398,8 +3394,8 @@
|
|
|
3398
3394
|
<span class="cline-any cline-neutral"> </span>
|
|
3399
3395
|
<span class="cline-any cline-neutral"> </span>
|
|
3400
3396
|
<span class="cline-any cline-neutral"> </span>
|
|
3401
|
-
<span class="cline-any cline-yes">
|
|
3402
|
-
<span class="cline-any cline-yes">
|
|
3397
|
+
<span class="cline-any cline-yes">670x</span>
|
|
3398
|
+
<span class="cline-any cline-yes">670x</span>
|
|
3403
3399
|
<span class="cline-any cline-neutral"> </span>
|
|
3404
3400
|
<span class="cline-any cline-neutral"> </span>
|
|
3405
3401
|
<span class="cline-any cline-no"> </span>
|
|
@@ -3411,7 +3407,7 @@
|
|
|
3411
3407
|
<span class="cline-any cline-neutral"> </span>
|
|
3412
3408
|
<span class="cline-any cline-neutral"> </span>
|
|
3413
3409
|
<span class="cline-any cline-neutral"> </span>
|
|
3414
|
-
<span class="cline-any cline-yes">
|
|
3410
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3415
3411
|
<span class="cline-any cline-neutral"> </span>
|
|
3416
3412
|
<span class="cline-any cline-neutral"> </span>
|
|
3417
3413
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3434,23 +3430,23 @@
|
|
|
3434
3430
|
<span class="cline-any cline-neutral"> </span>
|
|
3435
3431
|
<span class="cline-any cline-neutral"> </span>
|
|
3436
3432
|
<span class="cline-any cline-neutral"> </span>
|
|
3437
|
-
<span class="cline-any cline-yes">
|
|
3433
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3438
3434
|
<span class="cline-any cline-neutral"> </span>
|
|
3439
|
-
<span class="cline-any cline-yes">
|
|
3440
|
-
<span class="cline-any cline-
|
|
3435
|
+
<span class="cline-any cline-yes">407x</span>
|
|
3436
|
+
<span class="cline-any cline-no"> </span>
|
|
3441
3437
|
<span class="cline-any cline-neutral"> </span>
|
|
3442
3438
|
<span class="cline-any cline-neutral"> </span>
|
|
3443
|
-
<span class="cline-any cline-yes">
|
|
3439
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3444
3440
|
<span class="cline-any cline-neutral"> </span>
|
|
3445
|
-
<span class="cline-any cline-yes">
|
|
3441
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3446
3442
|
<span class="cline-any cline-no"> </span>
|
|
3447
3443
|
<span class="cline-any cline-neutral"> </span>
|
|
3448
3444
|
<span class="cline-any cline-neutral"> </span>
|
|
3449
|
-
<span class="cline-any cline-yes">
|
|
3445
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3450
3446
|
<span class="cline-any cline-neutral"> </span>
|
|
3451
|
-
<span class="cline-any cline-yes">93x</span>
|
|
3452
3447
|
<span class="cline-any cline-neutral"> </span>
|
|
3453
3448
|
<span class="cline-any cline-neutral"> </span>
|
|
3449
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3454
3450
|
<span class="cline-any cline-neutral"> </span>
|
|
3455
3451
|
<span class="cline-any cline-neutral"> </span>
|
|
3456
3452
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3458,14 +3454,17 @@
|
|
|
3458
3454
|
<span class="cline-any cline-neutral"> </span>
|
|
3459
3455
|
<span class="cline-any cline-neutral"> </span>
|
|
3460
3456
|
<span class="cline-any cline-neutral"> </span>
|
|
3461
|
-
<span class="cline-any cline-yes">183x</span>
|
|
3462
3457
|
<span class="cline-any cline-neutral"> </span>
|
|
3463
|
-
<span class="cline-any cline-no"> </span>
|
|
3464
3458
|
<span class="cline-any cline-neutral"> </span>
|
|
3465
3459
|
<span class="cline-any cline-neutral"> </span>
|
|
3460
|
+
<span class="cline-any cline-yes">396x</span>
|
|
3461
|
+
<span class="cline-any cline-yes">1x</span>
|
|
3462
|
+
<span class="cline-any cline-neutral"> </span>
|
|
3463
|
+
<span class="cline-any cline-neutral"> </span>
|
|
3464
|
+
<span class="cline-any cline-neutral"> </span>
|
|
3465
|
+
<span class="cline-any cline-yes">357x</span>
|
|
3466
|
+
<span class="cline-any cline-yes">1x</span>
|
|
3466
3467
|
<span class="cline-any cline-neutral"> </span>
|
|
3467
|
-
<span class="cline-any cline-yes">168x</span>
|
|
3468
|
-
<span class="cline-any cline-no"> </span>
|
|
3469
3468
|
<span class="cline-any cline-neutral"> </span>
|
|
3470
3469
|
<span class="cline-any cline-neutral"> </span>
|
|
3471
3470
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3506,7 +3505,7 @@
|
|
|
3506
3505
|
<span class="cline-any cline-neutral"> </span>
|
|
3507
3506
|
<span class="cline-any cline-neutral"> </span>
|
|
3508
3507
|
<span class="cline-any cline-neutral"> </span>
|
|
3509
|
-
<span class="cline-any cline-yes">
|
|
3508
|
+
<span class="cline-any cline-yes">209x</span>
|
|
3510
3509
|
<span class="cline-any cline-yes">2x</span>
|
|
3511
3510
|
<span class="cline-any cline-neutral"> </span>
|
|
3512
3511
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3537,16 +3536,16 @@
|
|
|
3537
3536
|
<span class="cline-any cline-neutral"> </span>
|
|
3538
3537
|
<span class="cline-any cline-neutral"> </span>
|
|
3539
3538
|
<span class="cline-any cline-neutral"> </span>
|
|
3540
|
-
<span class="cline-any cline-yes">
|
|
3539
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3541
3540
|
<span class="cline-any cline-neutral"> </span>
|
|
3542
|
-
<span class="cline-any cline-yes">
|
|
3541
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3543
3542
|
<span class="cline-any cline-neutral"> </span>
|
|
3544
3543
|
<span class="cline-any cline-neutral"> </span>
|
|
3545
3544
|
<span class="cline-any cline-neutral"> </span>
|
|
3546
|
-
<span class="cline-any cline-yes">
|
|
3545
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3547
3546
|
<span class="cline-any cline-neutral"> </span>
|
|
3548
3547
|
<span class="cline-any cline-neutral"> </span>
|
|
3549
|
-
<span class="cline-any cline-yes">
|
|
3548
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3550
3549
|
<span class="cline-any cline-yes">1x</span>
|
|
3551
3550
|
<span class="cline-any cline-neutral"> </span>
|
|
3552
3551
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3555,9 +3554,9 @@
|
|
|
3555
3554
|
<span class="cline-any cline-neutral"> </span>
|
|
3556
3555
|
<span class="cline-any cline-yes">1x</span>
|
|
3557
3556
|
<span class="cline-any cline-neutral"> </span>
|
|
3558
|
-
<span class="cline-any cline-yes">
|
|
3557
|
+
<span class="cline-any cline-yes">871x</span>
|
|
3559
3558
|
<span class="cline-any cline-neutral"> </span>
|
|
3560
|
-
<span class="cline-any cline-yes">
|
|
3559
|
+
<span class="cline-any cline-yes">208x</span>
|
|
3561
3560
|
<span class="cline-any cline-neutral"> </span>
|
|
3562
3561
|
<span class="cline-any cline-neutral"> </span>
|
|
3563
3562
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3565,7 +3564,7 @@
|
|
|
3565
3564
|
<span class="cline-any cline-neutral"> </span>
|
|
3566
3565
|
<span class="cline-any cline-neutral"> </span>
|
|
3567
3566
|
<span class="cline-any cline-neutral"> </span>
|
|
3568
|
-
<span class="cline-any cline-yes">
|
|
3567
|
+
<span class="cline-any cline-yes">208x</span>
|
|
3569
3568
|
<span class="cline-any cline-neutral"> </span>
|
|
3570
3569
|
<span class="cline-any cline-neutral"> </span>
|
|
3571
3570
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3573,7 +3572,7 @@
|
|
|
3573
3572
|
<span class="cline-any cline-neutral"> </span>
|
|
3574
3573
|
<span class="cline-any cline-neutral"> </span>
|
|
3575
3574
|
<span class="cline-any cline-neutral"> </span>
|
|
3576
|
-
<span class="cline-any cline-yes">
|
|
3575
|
+
<span class="cline-any cline-yes">208x</span>
|
|
3577
3576
|
<span class="cline-any cline-yes">1x</span>
|
|
3578
3577
|
<span class="cline-any cline-neutral"> </span>
|
|
3579
3578
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3581,7 +3580,7 @@
|
|
|
3581
3580
|
<span class="cline-any cline-neutral"> </span>
|
|
3582
3581
|
<span class="cline-any cline-neutral"> </span>
|
|
3583
3582
|
<span class="cline-any cline-neutral"> </span>
|
|
3584
|
-
<span class="cline-any cline-yes">
|
|
3583
|
+
<span class="cline-any cline-yes">208x</span>
|
|
3585
3584
|
<span class="cline-any cline-no"> </span>
|
|
3586
3585
|
<span class="cline-any cline-neutral"> </span>
|
|
3587
3586
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3589,9 +3588,9 @@
|
|
|
3589
3588
|
<span class="cline-any cline-neutral"> </span>
|
|
3590
3589
|
<span class="cline-any cline-neutral"> </span>
|
|
3591
3590
|
<span class="cline-any cline-neutral"> </span>
|
|
3592
|
-
<span class="cline-any cline-yes">
|
|
3591
|
+
<span class="cline-any cline-yes">208x</span>
|
|
3593
3592
|
<span class="cline-any cline-neutral"> </span>
|
|
3594
|
-
<span class="cline-any cline-yes">
|
|
3593
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3595
3594
|
<span class="cline-any cline-no"> </span>
|
|
3596
3595
|
<span class="cline-any cline-neutral"> </span>
|
|
3597
3596
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3600,7 +3599,7 @@
|
|
|
3600
3599
|
<span class="cline-any cline-neutral"> </span>
|
|
3601
3600
|
<span class="cline-any cline-no"> </span>
|
|
3602
3601
|
<span class="cline-any cline-neutral"> </span>
|
|
3603
|
-
<span class="cline-any cline-yes">
|
|
3602
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3604
3603
|
<span class="cline-any cline-no"> </span>
|
|
3605
3604
|
<span class="cline-any cline-neutral"> </span>
|
|
3606
3605
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3610,7 +3609,7 @@
|
|
|
3610
3609
|
<span class="cline-any cline-no"> </span>
|
|
3611
3610
|
<span class="cline-any cline-neutral"> </span>
|
|
3612
3611
|
<span class="cline-any cline-neutral"> </span>
|
|
3613
|
-
<span class="cline-any cline-yes">
|
|
3612
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3614
3613
|
<span class="cline-any cline-neutral"> </span>
|
|
3615
3614
|
<span class="cline-any cline-neutral"> </span>
|
|
3616
3615
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3655,8 +3654,8 @@
|
|
|
3655
3654
|
<span class="cline-any cline-neutral"> </span>
|
|
3656
3655
|
<span class="cline-any cline-neutral"> </span>
|
|
3657
3656
|
<span class="cline-any cline-neutral"> </span>
|
|
3658
|
-
<span class="cline-any cline-yes">
|
|
3659
|
-
<span class="cline-any cline-yes">
|
|
3657
|
+
<span class="cline-any cline-yes">222x</span>
|
|
3658
|
+
<span class="cline-any cline-yes">104x</span>
|
|
3660
3659
|
<span class="cline-any cline-no"> </span>
|
|
3661
3660
|
<span class="cline-any cline-neutral"> </span>
|
|
3662
3661
|
<span class="cline-any cline-no"> </span>
|
|
@@ -3682,22 +3681,17 @@
|
|
|
3682
3681
|
<span class="cline-any cline-neutral"> </span>
|
|
3683
3682
|
<span class="cline-any cline-neutral"> </span>
|
|
3684
3683
|
<span class="cline-any cline-neutral"> </span>
|
|
3685
|
-
<span class="cline-any cline-
|
|
3686
|
-
<span class="cline-any cline-
|
|
3687
|
-
<span class="cline-any cline-neutral"> </span>
|
|
3688
|
-
<span class="cline-any cline-neutral"> </span>
|
|
3689
|
-
<span class="cline-any cline-neutral"> </span>
|
|
3690
|
-
<span class="cline-any cline-yes">166x</span>
|
|
3691
|
-
<span class="cline-any cline-yes">3x</span>
|
|
3684
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3685
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3692
3686
|
<span class="cline-any cline-no"> </span>
|
|
3693
3687
|
<span class="cline-any cline-neutral"> </span>
|
|
3694
3688
|
<span class="cline-any cline-neutral"> </span>
|
|
3695
3689
|
<span class="cline-any cline-neutral"> </span>
|
|
3696
3690
|
<span class="cline-any cline-neutral"> </span>
|
|
3697
3691
|
<span class="cline-any cline-neutral"> </span>
|
|
3698
|
-
<span class="cline-any cline-yes">
|
|
3692
|
+
<span class="cline-any cline-yes">14x</span>
|
|
3699
3693
|
<span class="cline-any cline-neutral"> </span>
|
|
3700
|
-
<span class="cline-any cline-yes">
|
|
3694
|
+
<span class="cline-any cline-yes">7x</span>
|
|
3701
3695
|
<span class="cline-any cline-no"> </span>
|
|
3702
3696
|
<span class="cline-any cline-neutral"> </span>
|
|
3703
3697
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3709,35 +3703,35 @@
|
|
|
3709
3703
|
<span class="cline-any cline-neutral"> </span>
|
|
3710
3704
|
<span class="cline-any cline-neutral"> </span>
|
|
3711
3705
|
<span class="cline-any cline-neutral"> </span>
|
|
3712
|
-
<span class="cline-any cline-yes">
|
|
3713
|
-
<span class="cline-any cline-yes">
|
|
3706
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3707
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3714
3708
|
<span class="cline-any cline-neutral"> </span>
|
|
3715
|
-
<span class="cline-any cline-yes">
|
|
3716
|
-
<span class="cline-any cline-yes">
|
|
3717
|
-
<span class="cline-any cline-yes">
|
|
3709
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3710
|
+
<span class="cline-any cline-yes">104x</span>
|
|
3711
|
+
<span class="cline-any cline-yes">222x</span>
|
|
3718
3712
|
<span class="cline-any cline-neutral"> </span>
|
|
3719
3713
|
<span class="cline-any cline-neutral"> </span>
|
|
3720
3714
|
<span class="cline-any cline-neutral"> </span>
|
|
3721
3715
|
<span class="cline-any cline-neutral"> </span>
|
|
3722
|
-
<span class="cline-any cline-yes">
|
|
3723
|
-
<span class="cline-any cline-yes">
|
|
3724
|
-
<span class="cline-any cline-yes">
|
|
3725
|
-
<span class="cline-any cline-yes">
|
|
3716
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3717
|
+
<span class="cline-any cline-yes">207x</span>
|
|
3718
|
+
<span class="cline-any cline-yes">207x</span>
|
|
3719
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3726
3720
|
<span class="cline-any cline-neutral"> </span>
|
|
3727
3721
|
<span class="cline-any cline-neutral"> </span>
|
|
3728
|
-
<span class="cline-any cline-yes">
|
|
3729
|
-
<span class="cline-any cline-yes">
|
|
3722
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3723
|
+
<span class="cline-any cline-yes">209x</span>
|
|
3730
3724
|
<span class="cline-any cline-neutral"> </span>
|
|
3731
3725
|
<span class="cline-any cline-neutral"> </span>
|
|
3732
3726
|
<span class="cline-any cline-neutral"> </span>
|
|
3733
|
-
<span class="cline-any cline-yes">
|
|
3727
|
+
<span class="cline-any cline-yes">209x</span>
|
|
3734
3728
|
<span class="cline-any cline-yes">3x</span>
|
|
3735
3729
|
<span class="cline-any cline-neutral"> </span>
|
|
3736
3730
|
<span class="cline-any cline-neutral"> </span>
|
|
3737
3731
|
<span class="cline-any cline-neutral"> </span>
|
|
3738
3732
|
<span class="cline-any cline-neutral"> </span>
|
|
3739
3733
|
<span class="cline-any cline-neutral"> </span>
|
|
3740
|
-
<span class="cline-any cline-yes">
|
|
3734
|
+
<span class="cline-any cline-yes">206x</span>
|
|
3741
3735
|
<span class="cline-any cline-neutral"> </span>
|
|
3742
3736
|
<span class="cline-any cline-neutral"> </span>
|
|
3743
3737
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3747,14 +3741,14 @@
|
|
|
3747
3741
|
<span class="cline-any cline-neutral"> </span>
|
|
3748
3742
|
<span class="cline-any cline-neutral"> </span>
|
|
3749
3743
|
<span class="cline-any cline-neutral"> </span>
|
|
3750
|
-
<span class="cline-any cline-yes">
|
|
3751
|
-
<span class="cline-any cline-yes">
|
|
3744
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3745
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3752
3746
|
<span class="cline-any cline-neutral"> </span>
|
|
3753
3747
|
<span class="cline-any cline-neutral"> </span>
|
|
3754
3748
|
<span class="cline-any cline-neutral"> </span>
|
|
3755
3749
|
<span class="cline-any cline-neutral"> </span>
|
|
3756
3750
|
<span class="cline-any cline-neutral"> </span>
|
|
3757
|
-
<span class="cline-any cline-yes">
|
|
3751
|
+
<span class="cline-any cline-yes">15x</span>
|
|
3758
3752
|
<span class="cline-any cline-neutral"> </span>
|
|
3759
3753
|
<span class="cline-any cline-neutral"> </span>
|
|
3760
3754
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3762,26 +3756,26 @@
|
|
|
3762
3756
|
<span class="cline-any cline-neutral"> </span>
|
|
3763
3757
|
<span class="cline-any cline-neutral"> </span>
|
|
3764
3758
|
<span class="cline-any cline-neutral"> </span>
|
|
3765
|
-
<span class="cline-any cline-yes">
|
|
3766
|
-
<span class="cline-any cline-yes">
|
|
3767
|
-
<span class="cline-any cline-yes">
|
|
3759
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3760
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3761
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3768
3762
|
<span class="cline-any cline-neutral"> </span>
|
|
3769
3763
|
<span class="cline-any cline-neutral"> </span>
|
|
3770
3764
|
<span class="cline-any cline-neutral"> </span>
|
|
3771
3765
|
<span class="cline-any cline-neutral"> </span>
|
|
3772
|
-
<span class="cline-any cline-yes">
|
|
3766
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3773
3767
|
<span class="cline-any cline-neutral"> </span>
|
|
3774
3768
|
<span class="cline-any cline-neutral"> </span>
|
|
3775
3769
|
<span class="cline-any cline-neutral"> </span>
|
|
3776
3770
|
<span class="cline-any cline-neutral"> </span>
|
|
3777
|
-
<span class="cline-any cline-yes">
|
|
3771
|
+
<span class="cline-any cline-yes">663x</span>
|
|
3778
3772
|
<span class="cline-any cline-neutral"> </span>
|
|
3779
3773
|
<span class="cline-any cline-neutral"> </span>
|
|
3780
3774
|
<span class="cline-any cline-neutral"> </span>
|
|
3781
3775
|
<span class="cline-any cline-neutral"> </span>
|
|
3782
3776
|
<span class="cline-any cline-neutral"> </span>
|
|
3783
3777
|
<span class="cline-any cline-neutral"> </span>
|
|
3784
|
-
<span class="cline-any cline-yes">
|
|
3778
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3785
3779
|
<span class="cline-any cline-yes">2x</span>
|
|
3786
3780
|
<span class="cline-any cline-neutral"> </span>
|
|
3787
3781
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3790,7 +3784,7 @@
|
|
|
3790
3784
|
<span class="cline-any cline-neutral"> </span>
|
|
3791
3785
|
<span class="cline-any cline-neutral"> </span>
|
|
3792
3786
|
<span class="cline-any cline-neutral"> </span>
|
|
3793
|
-
<span class="cline-any cline-yes">
|
|
3787
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3794
3788
|
<span class="cline-any cline-neutral"> </span>
|
|
3795
3789
|
<span class="cline-any cline-neutral"> </span>
|
|
3796
3790
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3801,8 +3795,8 @@
|
|
|
3801
3795
|
<span class="cline-any cline-neutral"> </span>
|
|
3802
3796
|
<span class="cline-any cline-neutral"> </span>
|
|
3803
3797
|
<span class="cline-any cline-neutral"> </span>
|
|
3804
|
-
<span class="cline-any cline-yes">
|
|
3805
|
-
<span class="cline-any cline-yes">
|
|
3798
|
+
<span class="cline-any cline-yes">872x</span>
|
|
3799
|
+
<span class="cline-any cline-yes">10x</span>
|
|
3806
3800
|
<span class="cline-any cline-neutral"> </span>
|
|
3807
3801
|
<span class="cline-any cline-neutral"> </span>
|
|
3808
3802
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3816,12 +3810,12 @@
|
|
|
3816
3810
|
<span class="cline-any cline-neutral"> </span>
|
|
3817
3811
|
<span class="cline-any cline-neutral"> </span>
|
|
3818
3812
|
<span class="cline-any cline-neutral"> </span>
|
|
3819
|
-
<span class="cline-any cline-yes">
|
|
3820
|
-
<span class="cline-any cline-yes">
|
|
3813
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3814
|
+
<span class="cline-any cline-yes">104x</span>
|
|
3821
3815
|
<span class="cline-any cline-neutral"> </span>
|
|
3822
|
-
<span class="cline-any cline-yes">
|
|
3823
|
-
<span class="cline-any cline-yes">
|
|
3824
|
-
<span class="cline-any cline-yes">
|
|
3816
|
+
<span class="cline-any cline-yes">222x</span>
|
|
3817
|
+
<span class="cline-any cline-yes">96x</span>
|
|
3818
|
+
<span class="cline-any cline-yes">880x</span>
|
|
3825
3819
|
<span class="cline-any cline-neutral"> </span>
|
|
3826
3820
|
<span class="cline-any cline-neutral"> </span>
|
|
3827
3821
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3834,8 +3828,8 @@
|
|
|
3834
3828
|
<span class="cline-any cline-neutral"> </span>
|
|
3835
3829
|
<span class="cline-any cline-neutral"> </span>
|
|
3836
3830
|
<span class="cline-any cline-neutral"> </span>
|
|
3837
|
-
<span class="cline-any cline-yes">
|
|
3838
|
-
<span class="cline-any cline-yes">
|
|
3831
|
+
<span class="cline-any cline-yes">222x</span>
|
|
3832
|
+
<span class="cline-any cline-yes">55x</span>
|
|
3839
3833
|
<span class="cline-any cline-neutral"> </span>
|
|
3840
3834
|
<span class="cline-any cline-neutral"> </span>
|
|
3841
3835
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3847,12 +3841,12 @@
|
|
|
3847
3841
|
<span class="cline-any cline-neutral"> </span>
|
|
3848
3842
|
<span class="cline-any cline-neutral"> </span>
|
|
3849
3843
|
<span class="cline-any cline-neutral"> </span>
|
|
3850
|
-
<span class="cline-any cline-yes">
|
|
3844
|
+
<span class="cline-any cline-yes">355x</span>
|
|
3851
3845
|
<span class="cline-any cline-neutral"> </span>
|
|
3852
|
-
<span class="cline-any cline-yes">
|
|
3846
|
+
<span class="cline-any cline-yes">315x</span>
|
|
3853
3847
|
<span class="cline-any cline-neutral"> </span>
|
|
3854
|
-
<span class="cline-any cline-yes">
|
|
3855
|
-
<span class="cline-any cline-yes">
|
|
3848
|
+
<span class="cline-any cline-yes">630x</span>
|
|
3849
|
+
<span class="cline-any cline-yes">629x</span>
|
|
3856
3850
|
<span class="cline-any cline-neutral"> </span>
|
|
3857
3851
|
<span class="cline-any cline-neutral"> </span>
|
|
3858
3852
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3865,8 +3859,8 @@
|
|
|
3865
3859
|
<span class="cline-any cline-neutral"> </span>
|
|
3866
3860
|
<span class="cline-any cline-neutral"> </span>
|
|
3867
3861
|
<span class="cline-any cline-neutral"> </span>
|
|
3868
|
-
<span class="cline-any cline-yes">
|
|
3869
|
-
<span class="cline-any cline-yes">
|
|
3862
|
+
<span class="cline-any cline-yes">630x</span>
|
|
3863
|
+
<span class="cline-any cline-yes">52x</span>
|
|
3870
3864
|
<span class="cline-any cline-neutral"> </span>
|
|
3871
3865
|
<span class="cline-any cline-neutral"> </span>
|
|
3872
3866
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3882,8 +3876,8 @@
|
|
|
3882
3876
|
<span class="cline-any cline-neutral"> </span>
|
|
3883
3877
|
<span class="cline-any cline-neutral"> </span>
|
|
3884
3878
|
<span class="cline-any cline-neutral"> </span>
|
|
3885
|
-
<span class="cline-any cline-
|
|
3886
|
-
<span class="cline-any cline-
|
|
3879
|
+
<span class="cline-any cline-yes">40x</span>
|
|
3880
|
+
<span class="cline-any cline-yes">40x</span>
|
|
3887
3881
|
<span class="cline-any cline-neutral"> </span>
|
|
3888
3882
|
<span class="cline-any cline-neutral"> </span>
|
|
3889
3883
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3896,8 +3890,8 @@
|
|
|
3896
3890
|
<span class="cline-any cline-neutral"> </span>
|
|
3897
3891
|
<span class="cline-any cline-neutral"> </span>
|
|
3898
3892
|
<span class="cline-any cline-neutral"> </span>
|
|
3899
|
-
<span class="cline-any cline-
|
|
3900
|
-
<span class="cline-any cline-
|
|
3893
|
+
<span class="cline-any cline-yes">40x</span>
|
|
3894
|
+
<span class="cline-any cline-yes">1x</span>
|
|
3901
3895
|
<span class="cline-any cline-neutral"> </span>
|
|
3902
3896
|
<span class="cline-any cline-neutral"> </span>
|
|
3903
3897
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -3911,7 +3905,7 @@
|
|
|
3911
3905
|
<span class="cline-any cline-neutral"> </span>
|
|
3912
3906
|
<span class="cline-any cline-neutral"> </span>
|
|
3913
3907
|
<span class="cline-any cline-neutral"> </span>
|
|
3914
|
-
<span class="cline-any cline-yes">
|
|
3908
|
+
<span class="cline-any cline-yes">140x</span>
|
|
3915
3909
|
<span class="cline-any cline-neutral"> </span>
|
|
3916
3910
|
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import type { Schema, SchemaType } from "@featurevisor/types";
|
|
3917
3911
|
import { z } from "zod";
|
|
@@ -3929,8 +3923,6 @@ import {
|
|
|
3929
3923
|
} from "./schema";
|
|
3930
3924
|
import { refineWithMessage } from "./zodHelpers";
|
|
3931
3925
|
|
|
3932
|
-
const tagRegex = /^[a-z0-9-]+$/;
|
|
3933
|
-
|
|
3934
3926
|
function isArrayOfStrings(value: unknown): value is string[] {
|
|
3935
3927
|
return Array.isArray(value) && value.every((v) => typeof v === "string");
|
|
3936
3928
|
}
|
|
@@ -3947,8 +3939,8 @@ function isFlatObjectValue(value: unknown): boolean {
|
|
|
3947
3939
|
function getVariableLabel(variableSchema, variableKey, path) {
|
|
3948
3940
|
return (
|
|
3949
3941
|
variableKey ??
|
|
3950
|
-
<span class="branch-1 cbranch-no" title="branch not covered" > variableSchema?.key
|
|
3951
|
-
(<span class="branch-2 cbranch-no" title="branch not covered" >path.length > 0 ? String(path[path.length - 1]) : "variable"
|
|
3942
|
+
<span class="branch-1 cbranch-no" title="branch not covered" > variableSchema?.key ??</span>
|
|
3943
|
+
(<span class="branch-2 cbranch-no" title="branch not covered" >path.length > 0 ? String(path[path.length - 1]) : "variable"</span>)
|
|
3952
3944
|
);
|
|
3953
3945
|
}
|
|
3954
3946
|
|
|
@@ -4060,7 +4052,7 @@ function valueMatchesSchema(
|
|
|
4060
4052
|
uniqueItems?: boolean;
|
|
4061
4053
|
};
|
|
4062
4054
|
|
|
4063
|
-
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.oneOf && <span class="branch-1 cbranch-no" title="branch not covered" >Array.isArray(resolved.oneOf)
|
|
4055
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.oneOf && <span class="branch-1 cbranch-no" title="branch not covered" >Array.isArray(resolved.oneOf) && <span class="branch-2 cbranch-no" title="branch not covered" >r</span>esolved.oneOf.length > 0) {</span>
|
|
4064
4056
|
const matchCount = <span class="cstat-no" title="statement not covered" >resolved.oneOf.filter(<span class="fstat-no" title="function not covered" >(b</span>ranch) =></span>
|
|
4065
4057
|
<span class="cstat-no" title="statement not covered" > valueMatchesSchema(branch as { [k: string]: unknown }, value, schemasByKey),</span>
|
|
4066
4058
|
).length;
|
|
@@ -4071,8 +4063,8 @@ function valueMatchesSchema(
|
|
|
4071
4063
|
<span class="cstat-no" title="statement not covered" > return valueDeepEqual(value, resolved.const);</span>
|
|
4072
4064
|
}
|
|
4073
4065
|
|
|
4074
|
-
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.enum !== undefined && <span class="branch-1 cbranch-no" title="branch not covered" >Array.isArray(resolved.enum))</span>
|
|
4075
|
-
<span class="cstat-no" title="statement not covered" > return resolved.enum.some(<span class="fstat-no" title="function not covered" >(e</span>) => <span class="cstat-no" title="statement not covered" >valueDeepEqual(value, e))
|
|
4066
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.enum !== undefined && <span class="branch-1 cbranch-no" title="branch not covered" >Array.isArray(resolved.enum)) {</span>
|
|
4067
|
+
<span class="cstat-no" title="statement not covered" > return resolved.enum.some(<span class="fstat-no" title="function not covered" >(e</span>) => <span class="cstat-no" title="statement not covered" >valueDeepEqual(value, e));</span></span>
|
|
4076
4068
|
}
|
|
4077
4069
|
|
|
4078
4070
|
const type = resolved.type;
|
|
@@ -4085,7 +4077,7 @@ function valueMatchesSchema(
|
|
|
4085
4077
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.maxLength !== undefined && <span class="branch-1 cbranch-no" title="branch not covered" >s.length > resolved.maxLength)</span> <span class="cstat-no" title="statement not covered" >return false;</span>
|
|
4086
4078
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.pattern !== undefined) {
|
|
4087
4079
|
<span class="cstat-no" title="statement not covered" > try {</span>
|
|
4088
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4080
|
+
<span class="cstat-no" title="statement not covered" > if (!new RegExp(resolved.pattern).test(s)) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4089
4081
|
} catch {
|
|
4090
4082
|
<span class="cstat-no" title="statement not covered" > return true;</span>
|
|
4091
4083
|
}
|
|
@@ -4095,24 +4087,24 @@ function valueMatchesSchema(
|
|
|
4095
4087
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (type === "boolean") <span class="cstat-no" title="statement not covered" >return typeof value === "boolean";</span>
|
|
4096
4088
|
if (type === "integer") {
|
|
4097
4089
|
if (typeof value !== "number" || !Number.isInteger(value)) return false;
|
|
4098
|
-
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.minimum !== undefined &&
|
|
4099
|
-
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.maximum !== undefined &&
|
|
4090
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.minimum !== undefined && <span class="branch-1 cbranch-no" title="branch not covered" >(value as number) < resolved.minimum)</span> <span class="cstat-no" title="statement not covered" >return false;</span>
|
|
4091
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (resolved.maximum !== undefined && <span class="branch-1 cbranch-no" title="branch not covered" >(value as number) > resolved.maximum)</span> <span class="cstat-no" title="statement not covered" >return false;</span>
|
|
4100
4092
|
return true;
|
|
4101
4093
|
}
|
|
4102
4094
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (type === "double") {
|
|
4103
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4104
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4105
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4095
|
+
<span class="cstat-no" title="statement not covered" > if (typeof value !== "number") <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4096
|
+
<span class="cstat-no" title="statement not covered" > if (resolved.minimum !== undefined && (value as number) < resolved.minimum) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4097
|
+
<span class="cstat-no" title="statement not covered" > if (resolved.maximum !== undefined && (value as number) > resolved.maximum) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4106
4098
|
<span class="cstat-no" title="statement not covered" > return true;</span>
|
|
4107
4099
|
}
|
|
4108
4100
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (type === "json") <span class="cstat-no" title="statement not covered" >return typeof value === "string";</span>
|
|
4109
4101
|
|
|
4110
|
-
if (type === "object") {
|
|
4102
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (type === "object") {
|
|
4111
4103
|
if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
|
|
4112
4104
|
const props = resolved.properties;
|
|
4113
4105
|
const additional = resolved.additionalProperties;
|
|
4114
4106
|
const obj = value as Record<string, unknown>;
|
|
4115
|
-
<span class="missing-if-branch" title="if path not taken" >I</span>if ((!props || typeof props !== "object") && (<span class="branch-2 cbranch-no" title="branch not covered" >!additional
|
|
4107
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if ((!props || typeof props !== "object") && (<span class="branch-2 cbranch-no" title="branch not covered" >!additional || <span class="branch-3 cbranch-no" title="branch not covered" >t</span>ypeof additional !== "object"</span>)) {
|
|
4116
4108
|
<span class="cstat-no" title="statement not covered" > return true;</span>
|
|
4117
4109
|
}
|
|
4118
4110
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (!props || typeof props !== "object") {
|
|
@@ -4132,7 +4124,7 @@ function valueMatchesSchema(
|
|
|
4132
4124
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (!valueMatchesSchema(propSchema as { [k: string]: unknown }, obj[key], schemasByKey))
|
|
4133
4125
|
<span class="cstat-no" title="statement not covered" > return false;</span>
|
|
4134
4126
|
} else <span class="cstat-no" title="statement not covered" ><span class="missing-if-branch" title="else path not taken" >E</span>if (additional && typeof additional === "object") {</span>
|
|
4135
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4127
|
+
<span class="cstat-no" title="statement not covered" > if (!valueMatchesSchema(additional as { [k: string]: unknown }, obj[key], schemasByKey))</span>
|
|
4136
4128
|
<span class="cstat-no" title="statement not covered" > return false;</span>
|
|
4137
4129
|
} else {
|
|
4138
4130
|
<span class="cstat-no" title="statement not covered" > return false;</span>
|
|
@@ -4141,21 +4133,21 @@ function valueMatchesSchema(
|
|
|
4141
4133
|
return true;
|
|
4142
4134
|
}
|
|
4143
4135
|
|
|
4144
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4145
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4136
|
+
<span class="cstat-no" title="statement not covered" > if (type === "array") {</span>
|
|
4137
|
+
<span class="cstat-no" title="statement not covered" > if (!Array.isArray(value)) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4146
4138
|
const arr = <span class="cstat-no" title="statement not covered" >value as unknown[];</span>
|
|
4147
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4148
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4149
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4150
|
-
<span class="cstat-no" title="statement not covered" > for (let i = <span class="cstat-no" title="statement not covered" >0
|
|
4151
|
-
<span class="cstat-no" title="statement not covered" > for (let j = <span class="cstat-no" title="statement not covered" >i + 1
|
|
4152
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4139
|
+
<span class="cstat-no" title="statement not covered" > if (resolved.minItems !== undefined && arr.length < resolved.minItems) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4140
|
+
<span class="cstat-no" title="statement not covered" > if (resolved.maxItems !== undefined && arr.length > resolved.maxItems) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4141
|
+
<span class="cstat-no" title="statement not covered" > if (resolved.uniqueItems) {</span>
|
|
4142
|
+
<span class="cstat-no" title="statement not covered" > for (let i = <span class="cstat-no" title="statement not covered" >0; i</span> < arr.length; i++) {</span>
|
|
4143
|
+
<span class="cstat-no" title="statement not covered" > for (let j = <span class="cstat-no" title="statement not covered" >i + 1; j</span> < arr.length; j++) {</span>
|
|
4144
|
+
<span class="cstat-no" title="statement not covered" > if (valueDeepEqual(arr[i], arr[j])) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4153
4145
|
}
|
|
4154
4146
|
}
|
|
4155
4147
|
}
|
|
4156
4148
|
const itemSchema = <span class="cstat-no" title="statement not covered" >resolved.items;</span>
|
|
4157
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4158
|
-
<span class="cstat-no" title="statement not covered" > return arr.every(<span class="fstat-no" title="function not covered" >(v</span>) => <span class="cstat-no" title="statement not covered" >typeof v === "string")
|
|
4149
|
+
<span class="cstat-no" title="statement not covered" > if (!itemSchema || typeof itemSchema !== "object")</span>
|
|
4150
|
+
<span class="cstat-no" title="statement not covered" > return arr.every(<span class="fstat-no" title="function not covered" >(v</span>) => <span class="cstat-no" title="statement not covered" >typeof v === "string");</span></span>
|
|
4159
4151
|
<span class="cstat-no" title="statement not covered" > return arr.every(<span class="fstat-no" title="function not covered" >(i</span>tem) =></span>
|
|
4160
4152
|
<span class="cstat-no" title="statement not covered" > valueMatchesSchema(itemSchema as { [k: string]: unknown }, item, schemasByKey),</span>
|
|
4161
4153
|
);
|
|
@@ -4169,15 +4161,15 @@ function valueDeepEqual(a: unknown, b: unknown): boolean {
|
|
|
4169
4161
|
if (a === b) return true;
|
|
4170
4162
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof a !== typeof b) <span class="cstat-no" title="statement not covered" >return false;</span>
|
|
4171
4163
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (a === null || b === null) <span class="cstat-no" title="statement not covered" >return a === b;</span>
|
|
4172
|
-
<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof a === "object" && <span class="branch-1 cbranch-no" title="branch not covered" >typeof b === "object")</span>
|
|
4173
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4174
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4175
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4176
|
-
<span class="cstat-no" title="statement not covered" > return a.every(<span class="fstat-no" title="function not covered" >(v</span>, i) => <span class="cstat-no" title="statement not covered" >valueDeepEqual(v, b[i]))
|
|
4164
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof a === "object" && <span class="branch-1 cbranch-no" title="branch not covered" >typeof b === "object") {</span>
|
|
4165
|
+
<span class="cstat-no" title="statement not covered" > if (Array.isArray(a) !== Array.isArray(b)) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4166
|
+
<span class="cstat-no" title="statement not covered" > if (Array.isArray(a) && Array.isArray(b)) {</span>
|
|
4167
|
+
<span class="cstat-no" title="statement not covered" > if (a.length !== b.length) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4168
|
+
<span class="cstat-no" title="statement not covered" > return a.every(<span class="fstat-no" title="function not covered" >(v</span>, i) => <span class="cstat-no" title="statement not covered" >valueDeepEqual(v, b[i]));</span></span>
|
|
4177
4169
|
}
|
|
4178
4170
|
const keysA = <span class="cstat-no" title="statement not covered" >Object.keys(a as object).sort();</span>
|
|
4179
4171
|
const keysB = <span class="cstat-no" title="statement not covered" >Object.keys(b as object).sort();</span>
|
|
4180
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4172
|
+
<span class="cstat-no" title="statement not covered" > if (keysA.length !== keysB.length || keysA.some(<span class="fstat-no" title="function not covered" >(k</span>, i) => <span class="cstat-no" title="statement not covered" >k !== keysB[i])</span>) <span class="cstat-no" title="statement not covered" >return false;</span></span>
|
|
4181
4173
|
<span class="cstat-no" title="statement not covered" > return keysA.every(<span class="fstat-no" title="function not covered" >(k</span>) =></span>
|
|
4182
4174
|
<span class="cstat-no" title="statement not covered" > valueDeepEqual((a as Record<string, unknown>)[k], (b as Record<string, unknown>)[k]),</span>
|
|
4183
4175
|
);
|
|
@@ -4245,7 +4237,7 @@ function refineRequiredKeysInSchema(
|
|
|
4245
4237
|
if (properties && typeof properties === "object") {
|
|
4246
4238
|
for (const key of Object.keys(properties)) {
|
|
4247
4239
|
const nested = properties[key];
|
|
4248
|
-
if (nested && typeof nested === "object") {
|
|
4240
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (nested && typeof nested === "object") {
|
|
4249
4241
|
refineRequiredKeysInSchema(
|
|
4250
4242
|
nested as SchemaLikeForRequired,
|
|
4251
4243
|
[...pathPrefix, "properties", key],
|
|
@@ -4281,7 +4273,7 @@ function refineRequiredKeysInSchema(
|
|
|
4281
4273
|
const oneOf = (current as { oneOf?: unknown[] }).oneOf;
|
|
4282
4274
|
if (oneOf && Array.isArray(oneOf)) {
|
|
4283
4275
|
oneOf.forEach((branch, i) => {
|
|
4284
|
-
if (branch && typeof branch === "object") {
|
|
4276
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (branch && typeof branch === "object") {
|
|
4285
4277
|
refineRequiredKeysInSchema(
|
|
4286
4278
|
branch as SchemaLikeForRequired,
|
|
4287
4279
|
[...pathPrefix, "oneOf", i],
|
|
@@ -4378,7 +4370,7 @@ function refineVariableValueArray(
|
|
|
4378
4370
|
|
|
4379
4371
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (projectConfig.maxVariableArrayStringifiedLength) {
|
|
4380
4372
|
const stringified = <span class="cstat-no" title="statement not covered" >JSON.stringify(variableValue);</span>
|
|
4381
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4373
|
+
<span class="cstat-no" title="statement not covered" > if (stringified.length > projectConfig.maxVariableArrayStringifiedLength) {</span>
|
|
4382
4374
|
<span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
|
|
4383
4375
|
code: z.ZodIssueCode.custom,
|
|
4384
4376
|
message: `Variable "${label}" array is too long (${stringified.length} characters), max length is ${projectConfig.maxVariableArrayStringifiedLength}`,
|
|
@@ -4485,7 +4477,7 @@ function refineVariableValueObject(
|
|
|
4485
4477
|
|
|
4486
4478
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (projectConfig.maxVariableObjectStringifiedLength) {
|
|
4487
4479
|
const stringified = <span class="cstat-no" title="statement not covered" >JSON.stringify(variableValue);</span>
|
|
4488
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4480
|
+
<span class="cstat-no" title="statement not covered" > if (stringified.length > projectConfig.maxVariableObjectStringifiedLength) {</span>
|
|
4489
4481
|
<span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
|
|
4490
4482
|
code: z.ZodIssueCode.custom,
|
|
4491
4483
|
message: `Variable "${label}" object is too long (${stringified.length} characters), max length is ${projectConfig.maxVariableObjectStringifiedLength}`,
|
|
@@ -4810,7 +4802,7 @@ function superRefineVariableValue(
|
|
|
4810
4802
|
}
|
|
4811
4803
|
|
|
4812
4804
|
// json — only string containing valid JSON allowed
|
|
4813
|
-
if (expectedType === "json") {
|
|
4805
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (expectedType === "json") {
|
|
4814
4806
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof variableValue !== "string") {
|
|
4815
4807
|
<span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
|
|
4816
4808
|
code: z.ZodIssueCode.custom,
|
|
@@ -4823,7 +4815,7 @@ function superRefineVariableValue(
|
|
|
4823
4815
|
JSON.parse(variableValue);
|
|
4824
4816
|
|
|
4825
4817
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (projectConfig.maxVariableJSONStringifiedLength) {
|
|
4826
|
-
<span class="cstat-no" title="statement not covered" >
|
|
4818
|
+
<span class="cstat-no" title="statement not covered" > if (variableValue.length > projectConfig.maxVariableJSONStringifiedLength) {</span>
|
|
4827
4819
|
<span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
|
|
4828
4820
|
code: z.ZodIssueCode.custom,
|
|
4829
4821
|
message: `Variable "${label}" JSON is too long (${variableValue.length} characters), max length is ${projectConfig.maxVariableJSONStringifiedLength}`,
|
|
@@ -5239,17 +5231,17 @@ export function getFeatureZodSchema(
|
|
|
5239
5231
|
const andOrNotGroupSegment = z.union([
|
|
5240
5232
|
z
|
|
5241
5233
|
.object({
|
|
5242
|
-
and: z.array(z.lazy(() => groupSegmentZodSchema)),
|
|
5234
|
+
and: z.array(z.lazy(() => groupSegmentZodSchema)).min(1),
|
|
5243
5235
|
})
|
|
5244
5236
|
.strict(),
|
|
5245
5237
|
z
|
|
5246
5238
|
.object({
|
|
5247
|
-
or: z.array(z.lazy(() => groupSegmentZodSchema)),
|
|
5239
|
+
or: z.array(z.lazy(() => groupSegmentZodSchema)).min(1),
|
|
5248
5240
|
})
|
|
5249
5241
|
.strict(),
|
|
5250
5242
|
z
|
|
5251
5243
|
.object({
|
|
5252
|
-
not: z.array(z.lazy(() => groupSegmentZodSchema)),
|
|
5244
|
+
not: z.array(z.lazy(() => groupSegmentZodSchema)).min(1),
|
|
5253
5245
|
})
|
|
5254
5246
|
.strict(),
|
|
5255
5247
|
]);
|
|
@@ -5268,6 +5260,7 @@ export function getFeatureZodSchema(
|
|
|
5268
5260
|
.object({
|
|
5269
5261
|
key: z.string(),
|
|
5270
5262
|
description: z.string().optional(),
|
|
5263
|
+
promotable: z.boolean().optional(),
|
|
5271
5264
|
segments: groupSegmentsZodSchema,
|
|
5272
5265
|
percentage: z.number().min(0).max(100),
|
|
5273
5266
|
|
|
@@ -5323,12 +5316,12 @@ export function getFeatureZodSchema(
|
|
|
5323
5316
|
|
|
5324
5317
|
// enforce catch-all rule
|
|
5325
5318
|
.superRefine((value, ctx) => {
|
|
5326
|
-
if (!projectConfig.enforceCatchAllRule) {
|
|
5319
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (!projectConfig.enforceCatchAllRule) {
|
|
5327
5320
|
return;
|
|
5328
5321
|
}
|
|
5329
5322
|
|
|
5330
5323
|
const hasCatchAllAsLastRule = <span class="cstat-no" title="statement not covered" >value[value.length - 1].segments === "*";</span>
|
|
5331
|
-
<span class="cstat-no" title="statement not covered" >
|
|
5324
|
+
<span class="cstat-no" title="statement not covered" > if (!hasCatchAllAsLastRule) {</span>
|
|
5332
5325
|
<span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
|
|
5333
5326
|
code: z.ZodIssueCode.custom,
|
|
5334
5327
|
message: `Missing catch-all rule with \`segments: "*"\` at the end`,
|
|
@@ -5362,7 +5355,7 @@ export function getFeatureZodSchema(
|
|
|
5362
5355
|
const attributeKeyZodSchema = refineWithMessage(
|
|
5363
5356
|
z.string(),
|
|
5364
5357
|
(value) => value === "*" || availableAttributeKeys.includes(value),
|
|
5365
|
-
(
|
|
5358
|
+
<span class="fstat-no" title="function not covered" > (v</span>alue) => <span class="cstat-no" title="statement not covered" >`Unknown attribute "${value}"`,</span>
|
|
5366
5359
|
);
|
|
5367
5360
|
|
|
5368
5361
|
const featureKeyZodSchema = refineWithMessage(
|
|
@@ -5371,31 +5364,34 @@ export function getFeatureZodSchema(
|
|
|
5371
5364
|
<span class="fstat-no" title="function not covered" > (v</span>alue) => <span class="cstat-no" title="statement not covered" >`Unknown feature "${value}"`,</span>
|
|
5372
5365
|
);
|
|
5373
5366
|
|
|
5374
|
-
const environmentKeys = projectConfig.environments
|
|
5367
|
+
const environmentKeys = Array.isArray(projectConfig.environments)
|
|
5368
|
+
? projectConfig.environments
|
|
5369
|
+
: [];
|
|
5375
5370
|
|
|
5376
5371
|
const featureZodSchema = z
|
|
5377
5372
|
.object({
|
|
5378
5373
|
archived: z.boolean().optional(),
|
|
5379
5374
|
deprecated: z.boolean().optional(),
|
|
5375
|
+
promotable: z.boolean().optional(),
|
|
5380
5376
|
description: z.string(),
|
|
5381
5377
|
|
|
5382
5378
|
tags: z
|
|
5383
5379
|
.array(
|
|
5384
5380
|
refineWithMessage(
|
|
5385
5381
|
z.string(),
|
|
5386
|
-
(value) =>
|
|
5387
|
-
|
|
5388
|
-
<span class="cstat-no" title="statement not covered" > `Tag "${value}" must be lower cased and alphanumeric, and may contain hyphens.`,</span>
|
|
5382
|
+
(value) => projectConfig.tags.includes(value),
|
|
5383
|
+
(value) => `Unknown tag "${value}"`,
|
|
5389
5384
|
),
|
|
5390
5385
|
)
|
|
5391
5386
|
.superRefine((value, ctx) => {
|
|
5392
|
-
|
|
5393
|
-
|
|
5387
|
+
if (value.length !== new Set(value).size) {
|
|
5388
|
+
ctx.addIssue({
|
|
5394
5389
|
code: z.ZodIssueCode.custom,
|
|
5395
5390
|
message: "Duplicate tags found: " + value.join(", "),
|
|
5396
5391
|
});
|
|
5397
5392
|
}
|
|
5398
|
-
})
|
|
5393
|
+
})
|
|
5394
|
+
.optional(),
|
|
5399
5395
|
|
|
5400
5396
|
required: z
|
|
5401
5397
|
.array(
|
|
@@ -5482,22 +5478,22 @@ export function getFeatureZodSchema(
|
|
|
5482
5478
|
}
|
|
5483
5479
|
if (hasRef) {
|
|
5484
5480
|
const hasInlineStructure =
|
|
5485
|
-
("type" in variableSchema && <span class="branch-1 cbranch-no" title="branch not covered" >variableSchema.type != null)
|
|
5486
|
-
("properties" in variableSchema && <span class="branch-3 cbranch-no" title="branch not covered" >variableSchema.properties != null)
|
|
5481
|
+
("type" in variableSchema && <span class="branch-1 cbranch-no" title="branch not covered" >variableSchema.type != null) ||</span>
|
|
5482
|
+
("properties" in variableSchema && <span class="branch-3 cbranch-no" title="branch not covered" >variableSchema.properties != null) ||</span>
|
|
5487
5483
|
("additionalProperties" in variableSchema &&
|
|
5488
5484
|
variableSchema.additionalProperties != null) ||
|
|
5489
|
-
("required" in variableSchema && <span class="branch-7 cbranch-no" title="branch not covered" >variableSchema.required != null)
|
|
5490
|
-
("items" in variableSchema && <span class="branch-9 cbranch-no" title="branch not covered" >variableSchema.items != null)
|
|
5491
|
-
("oneOf" in variableSchema && <span class="branch-11 cbranch-no" title="branch not covered" >variableSchema.oneOf != null)
|
|
5485
|
+
("required" in variableSchema && <span class="branch-7 cbranch-no" title="branch not covered" >variableSchema.required != null) ||</span>
|
|
5486
|
+
("items" in variableSchema && <span class="branch-9 cbranch-no" title="branch not covered" >variableSchema.items != null) ||</span>
|
|
5487
|
+
("oneOf" in variableSchema && <span class="branch-11 cbranch-no" title="branch not covered" >variableSchema.oneOf != null);</span>
|
|
5492
5488
|
const hasInlineValidation =
|
|
5493
|
-
("minimum" in variableSchema && <span class="branch-1 cbranch-no" title="branch not covered" >variableSchema.minimum !== undefined)
|
|
5494
|
-
("maximum" in variableSchema && <span class="branch-3 cbranch-no" title="branch not covered" >variableSchema.maximum !== undefined)
|
|
5495
|
-
("minLength" in variableSchema && <span class="branch-5 cbranch-no" title="branch not covered" >variableSchema.minLength !== undefined)
|
|
5496
|
-
("maxLength" in variableSchema && <span class="branch-7 cbranch-no" title="branch not covered" >variableSchema.maxLength !== undefined)
|
|
5497
|
-
("pattern" in variableSchema && <span class="branch-9 cbranch-no" title="branch not covered" >variableSchema.pattern !== undefined)
|
|
5498
|
-
("minItems" in variableSchema && <span class="branch-11 cbranch-no" title="branch not covered" >variableSchema.minItems !== undefined)
|
|
5499
|
-
("maxItems" in variableSchema && <span class="branch-13 cbranch-no" title="branch not covered" >variableSchema.maxItems !== undefined)
|
|
5500
|
-
("uniqueItems" in variableSchema && <span class="branch-15 cbranch-no" title="branch not covered" >variableSchema.uniqueItems !== undefined)
|
|
5489
|
+
("minimum" in variableSchema && <span class="branch-1 cbranch-no" title="branch not covered" >variableSchema.minimum !== undefined) ||</span>
|
|
5490
|
+
("maximum" in variableSchema && <span class="branch-3 cbranch-no" title="branch not covered" >variableSchema.maximum !== undefined) ||</span>
|
|
5491
|
+
("minLength" in variableSchema && <span class="branch-5 cbranch-no" title="branch not covered" >variableSchema.minLength !== undefined) ||</span>
|
|
5492
|
+
("maxLength" in variableSchema && <span class="branch-7 cbranch-no" title="branch not covered" >variableSchema.maxLength !== undefined) ||</span>
|
|
5493
|
+
("pattern" in variableSchema && <span class="branch-9 cbranch-no" title="branch not covered" >variableSchema.pattern !== undefined) ||</span>
|
|
5494
|
+
("minItems" in variableSchema && <span class="branch-11 cbranch-no" title="branch not covered" >variableSchema.minItems !== undefined) ||</span>
|
|
5495
|
+
("maxItems" in variableSchema && <span class="branch-13 cbranch-no" title="branch not covered" >variableSchema.maxItems !== undefined) ||</span>
|
|
5496
|
+
("uniqueItems" in variableSchema && <span class="branch-15 cbranch-no" title="branch not covered" >variableSchema.uniqueItems !== undefined);</span>
|
|
5501
5497
|
if (hasInlineStructure) {
|
|
5502
5498
|
ctx.addIssue({
|
|
5503
5499
|
code: z.ZodIssueCode.custom,
|
|
@@ -5590,24 +5586,19 @@ export function getFeatureZodSchema(
|
|
|
5590
5586
|
})
|
|
5591
5587
|
.optional(),
|
|
5592
5588
|
|
|
5593
|
-
expose:
|
|
5594
|
-
|
|
5595
|
-
|
|
5596
|
-
|
|
5597
|
-
|
|
5598
|
-
|
|
5599
|
-
|
|
5600
|
-
|
|
5601
|
-
|
|
5602
|
-
|
|
5603
|
-
|
|
5604
|
-
|
|
5605
|
-
|
|
5606
|
-
|
|
5607
|
-
rules:
|
|
5608
|
-
projectConfig.environments === false
|
|
5609
|
-
? <span class="branch-0 cbranch-no" title="branch not covered" >rulesSchema</span>
|
|
5610
|
-
: z.partialRecord(z.enum(environmentKeys as [string, ...string[]]), rulesSchema),
|
|
5589
|
+
expose: !Array.isArray(projectConfig.environments)
|
|
5590
|
+
? exposeSchema.optional()
|
|
5591
|
+
: z
|
|
5592
|
+
.partialRecord(z.enum(environmentKeys as [string, ...string[]]), exposeSchema)
|
|
5593
|
+
.optional(),
|
|
5594
|
+
|
|
5595
|
+
force: !Array.isArray(projectConfig.environments)
|
|
5596
|
+
? forceSchema
|
|
5597
|
+
: z.partialRecord(z.enum(environmentKeys as [string, ...string[]]), forceSchema).optional(),
|
|
5598
|
+
|
|
5599
|
+
rules: !Array.isArray(projectConfig.environments)
|
|
5600
|
+
? rulesSchema
|
|
5601
|
+
: z.partialRecord(z.enum(environmentKeys as [string, ...string[]]), rulesSchema),
|
|
5611
5602
|
})
|
|
5612
5603
|
.strict()
|
|
5613
5604
|
.superRefine((value, ctx) => {
|
|
@@ -5803,12 +5794,12 @@ export function getFeatureZodSchema(
|
|
|
5803
5794
|
});
|
|
5804
5795
|
}
|
|
5805
5796
|
}
|
|
5806
|
-
} else
|
|
5797
|
+
} else {
|
|
5807
5798
|
// no environments
|
|
5808
5799
|
|
|
5809
5800
|
// rules
|
|
5810
|
-
|
|
5811
|
-
|
|
5801
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (value.rules) {
|
|
5802
|
+
refineRules({
|
|
5812
5803
|
parsedFeature: value,
|
|
5813
5804
|
variableSchemaByKey,
|
|
5814
5805
|
variationValues,
|
|
@@ -5821,8 +5812,8 @@ export function getFeatureZodSchema(
|
|
|
5821
5812
|
}
|
|
5822
5813
|
|
|
5823
5814
|
// force
|
|
5824
|
-
|
|
5825
|
-
|
|
5815
|
+
if (value.force) {
|
|
5816
|
+
refineForce({
|
|
5826
5817
|
parsedFeature: value,
|
|
5827
5818
|
variableSchemaByKey,
|
|
5828
5819
|
variationValues,
|
|
@@ -5845,16 +5836,16 @@ export function getFeatureZodSchema(
|
|
|
5845
5836
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
5846
5837
|
Code coverage generated by
|
|
5847
5838
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
5848
|
-
at 2026-
|
|
5839
|
+
at 2026-07-12T20:35:50.655Z
|
|
5849
5840
|
</div>
|
|
5850
|
-
<script src="
|
|
5841
|
+
<script src="../../prettify.js"></script>
|
|
5851
5842
|
<script>
|
|
5852
5843
|
window.onload = function () {
|
|
5853
5844
|
prettyPrint();
|
|
5854
5845
|
};
|
|
5855
5846
|
</script>
|
|
5856
|
-
<script src="
|
|
5857
|
-
<script src="
|
|
5847
|
+
<script src="../../sorter.js"></script>
|
|
5848
|
+
<script src="../../block-navigation.js"></script>
|
|
5858
5849
|
</body>
|
|
5859
5850
|
</html>
|
|
5860
5851
|
|