diff --git a/noticeList.txt b/noticeList.txt
index 955c8bec..0538e216 100644
--- a/noticeList.txt
+++ b/noticeList.txt
@@ -1,46 +1,46 @@
-Last updated 2021-02-01 22:04:58.532820 by makeNoticeList.py
-Got 355 notices:
+Last updated 2021-02-06 09:28:25.706367 by makeNoticeList.py
+Got 357 notices:
checkRepoResult.noticeList.push( 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: givenLocation, extra: repoCode from checkRepo.js line 259
languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, extract: rest, C, V, location: lineLocation from usfm-text-check.js line 927
marker === 's5' ? 111 : 809, `$marker === 's5' ? 'Deprecated' : 'Unexpected' '\\$marker' marker at start of line`, C, V, lineNumber, characterIndex: 1, location: lineLocation from usfm-text-check.js line 955
`"`.indexOf(line[0]) < 0 ? 880 : 180, C, V, "Expected line to start with backslash", lineNumber: n, characterIndex: 0, extract: line[0], location: ourLocation from usfm-text-check.js line 1,034
C === '1' ? 657 : 457, C, V, "Paragraph marker expected before first verse", lineNumber: n, characterIndex: 1, details: `'\\$marker' after '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,127
- const notice = 95, "Unexpected trailing space(s)", extract, location: ourLocation ; from field-text-check.js line 185
- notice from field-text-check.js line 188
- notice = 124, "Unexpected double spaces", extract, location: ourLocation ; from field-text-check.js line 219
- notice = 224, "Multiple unexpected double spaces", details: `$doubleCount occurrences—only first is displayed`, extract, location: ourLocation ; from field-text-check.js line 221
- notice from field-text-check.js line 225
- const notice = 580, "Unexpected narrow non-break space character", extract, location: ourLocation ; from field-text-check.js line 249
- notice from field-text-check.js line 252
- const notice = 177, `Unexpected doubled $punctChar characters`, extract, location: ourLocation ; from field-text-check.js line 284
- notice from field-text-check.js line 287
- const notice = 191, `Unexpected $punctChar character after space`, extract, location: ourLocation ; from field-text-check.js line 303
- notice from field-text-check.js line 306
- const notice = 192, `Unexpected space after $punctChar character`, extract, location: ourLocation ; from field-text-check.js line 332
- notice from field-text-check.js line 335
- const notice = 193, `Unexpected $punctChar character at end of line`, extract, location: ourLocation ; from field-text-check.js line 350
- notice from field-text-check.js line 353
- thisPriority, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from field-text-check.js line 394
- thisPriority, thisMessage, extract: regexResultArray[0], location: ourLocation from field-text-check.js line 407
+ const notice = 95, "Unexpected trailing space(s)", extract, location: ourLocation ; from field-text-check.js line 186
+ notice from field-text-check.js line 189
+ notice = 124, "Unexpected double spaces", extract, location: ourLocation ; from field-text-check.js line 220
+ notice = 224, "Multiple unexpected double spaces", details: `$doubleCount occurrences—only first is displayed`, extract, location: ourLocation ; from field-text-check.js line 222
+ notice from field-text-check.js line 226
+ const notice = 580, "Unexpected narrow non-break space character", extract, location: ourLocation ; from field-text-check.js line 250
+ notice from field-text-check.js line 253
+ const notice = 177, `Unexpected doubled $punctChar characters`, extract, location: ourLocation ; from field-text-check.js line 285
+ notice from field-text-check.js line 288
+ const notice = 191, `Unexpected $punctChar character after space`, extract, location: ourLocation ; from field-text-check.js line 304
+ notice from field-text-check.js line 307
+ const notice = 192, `Unexpected space after $punctChar character`, extract, location: ourLocation ; from field-text-check.js line 333
+ notice from field-text-check.js line 336
+ const notice = 193, `Unexpected $punctChar character at end of line`, extract, location: ourLocation ; from field-text-check.js line 351
+ notice from field-text-check.js line 354
+ thisPriority, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from field-text-check.js line 395
+ thisPriority, thisMessage, extract: regexResultArray[0], location: ourLocation from field-text-check.js line 408
leftChar === '“' ? 162 : 462, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from plain-text-check.js line 235
999, "checkRepo function FAILED", repoName, extract: checkRepoError, location: repoName from RepoCheck.js line 106
997, "Repository doesn’t exist", details, username, repoCode, repoName, location: manifestLocation, extra: repoCode from checkBookPackage.js line 174
- 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: manifestLocation, extra: repoCode from checkBookPackage.js line 235
- 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: repoLocation, extra: repoCode from checkBookPackage.js line 374
- 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: generalLocation, extra: repoCode from checkBookPackage.js line 537
- 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: generalLocation, extra: repoCode from checkBookPackage.js line 563
+ 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: markdownLocation, extra: repoCode from checkBookPackage.js line 235
+ 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: repoLocation, extra: repoCode from checkBookPackage.js line 383
+ 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: generalLocation, extra: repoCode from checkBookPackage.js line 576
+ 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: generalLocation, extra: repoCode from checkBookPackage.js line 602
996, "Unable to load", details: `username=$username error=$cBPgfError`, repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: repoCode from checkBookPackage.js line 178
- 996, "Unable to load", details: `username=$username error=$cBPgfError`, repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: repoCode from checkBookPackage.js line 239
- 996, "Unable to load", details, repoCode, repoName, filename, location: repoLocation, extra: repoCode from checkBookPackage.js line 378
- 996, "Unable to load", details, bookID, location: generalLocation, extra: repoCode from checkBookPackage.js line 539
- 996, "Unable to load", details, bookID, C, V, filename: thisPath, location: `$generalLocation $thisPath`, extra: repoCode from checkBookPackage.js line 567
+ 996, "Unable to load", details: `username=$username error=$cBPgfError`, repoName, filename, location: markdownLocation, extra: repoCode from checkBookPackage.js line 239
+ 996, "Unable to load", details, repoCode, repoName, filename, location: repoLocation, extra: repoCode from checkBookPackage.js line 387
+ 996, "Unable to load", details, bookID, location: generalLocation, extra: repoCode from checkBookPackage.js line 578
+ 996, "Unable to load", details, bookID, C, V, filename: thisPath, location: `$generalLocation $thisPath`, extra: repoCode from checkBookPackage.js line 606
996, "Unable to load", details: `username=$username error=$cRgfError`, bookID: ourBookID, filename: thisFilename, location: `$givenLocation $thisFilepath`, extra: repoName from checkRepo.js line 263
995, "File extension is not recognized, so treated as plain text.", filename, location: filename from checkFileContents.js line 88
- 993, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from field-text-check.js line 112
+ 993, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from field-text-check.js line 113
993, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from plain-text-check.js line 131
- 992, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from field-text-check.js line 118
+ 992, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from field-text-check.js line 119
992, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from plain-text-check.js line 135
- 991, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from field-text-check.js line 124
+ 991, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from field-text-check.js line 125
991, "Unresolved GIT conflict", characterIndex, extract, location: ourLocation from plain-text-check.js line 139
990, "Unable to load file", details: `username=$username`, repoName, filename ], elapsedSeconds: 0 ; from FileCheck.js line 63
989, "Unable to find/load repository", location: ourLocation from checkRepo.js line 186
@@ -49,8 +49,8 @@ Got 355 notices:
987, C, V, "Expected \\id line to start with book identifier", lineNumber: n, characterIndex: 4, extract, location: ourLocation from usfm-text-check.js line 1,111
986, "Repository doesn’t seem to exist", details: `username=$username`, location: givenLocation, extra: repoName from checkRepo.js line 166
985, `Field does not match schema $errorObject.keyword`, details: errorObject.message, fieldName: errorObject.dataPath, location: ourLocation from manifest-text-check.js line 676
- 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_TN_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from tn-table-row-check.js line 553
- 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_ANNOTATION_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from annotation-row-check.js line 528
+ 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_TN_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from tn-table-row-check.js line 559
+ 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_ANNOTATION_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from annotation-row-check.js line 533
979, "Invalid book identifier passed to checkTN_TSVDataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from tn-table-row-check.js line 357
979, "Invalid book identifier passed to checkAnnotationTSVDataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from annotation-row-check.js line 339
978, "Wrong book identifier", details: `expected '$bookID'`, fieldName: 'Book', rowID, extract: B, location: ourRowLocation from tn-table-row-check.js line 372
@@ -60,7 +60,7 @@ Got 355 notices:
975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Verse', extract: V, location: ourRowLocation from tn-table-row-check.js line 412
975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Reference', extract: V, location: ourRowLocation from annotation-row-check.js line 393
956, "Got empty manifest file", repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: `$repoCode MANIFEST` from checkBookPackage.js line 199
- 956, "Got empty manifest file", repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: `$repoCode MANIFEST` from checkBookPackage.js line 260
+ 956, "Got empty markdown file", repoName, filename, location: markdownLocation, extra: repoCode from checkBookPackage.js line 269
950, "tC cannot yet process '*' language code", characterIndex, extract, location: ourLocation from tn-links-check.js line 226
947, "Missing manifest.yaml", location: ourLocation, extra: `$repoName MANIFEST` from checkRepo.js line 288
946, "Missing LICENSE.md", location: ourLocation, extra: `$repoName LICENSE` from checkRepo.js line 286
@@ -74,8 +74,8 @@ Got 355 notices:
929, "'projects' key is missing", location: ourLocation from manifest-text-check.js line 641
928, "'dublin_core' key is missing", location: ourLocation from manifest-text-check.js line 639
920, yamlError.message, location: ourLocation ) from yaml-text-check.js line 163
- 919, "Missing OrigQuote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-table-row-check.js line 484
- 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from annotation-row-check.js line 470
+ 919, "Missing OrigQuote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-table-row-check.js line 486
+ 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from annotation-row-check.js line 473
917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString, passage ►$verseText◄`, extract, location: ourLocation from orig-quote-check.js line 332
916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), extract, location: ourLocation from orig-quote-check.js line 374
916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), extract, location: ourLocation from orig-quote-check.js line 377
@@ -93,9 +93,9 @@ Got 355 notices:
909, "Seems original language quote might not start at the beginning of a word", details: `passage ►$verseText◄`, characterIndex: 0, extract, location: ourLocation from orig-quote-check.js line 354
908, "Seems original language quote might not finish at the end of a word", details: `passage ►$verseText◄`, characterIndex: fieldText.length, extract, location: ourLocation from orig-quote-check.js line 363
903, "Bad function call: should be given a valid book abbreviation", extract: bookID, location: ` (not '$bookID')$ourLocation` from usfm-text-check.js line 976
- 902, "Bad function call: should be given a valid book abbreviation", extract: bookID, location: ` (not '$bookID')$generalLocation` ); return checkBookPackageResult; from checkBookPackage.js line 284
+ 902, "Bad function call: should be given a valid book abbreviation", extract: bookID, location: ` (not '$bookID')$generalLocation` ); return checkBookPackageResult; from checkBookPackage.js line 293
900, "Bad parameter: should be given a valid book abbreviation", extract: bookIDList, location: ` (not '$bookIDList')` from checkBookPackages.js line 66
- 895, "Field contains zero-width space(s)", characterIndex, extract, location: ourLocation from field-text-check.js line 97
+ 895, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1?'':'s' found`, characterIndex, extract, location: ourLocation from field-text-check.js line 98
889, `Unable to find TA link`, extract: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 109
888, `Error loading TA link`, extract: fieldText, location: `$ourLocation $filepath: $trcGCerror` from ta-reference-check.js line 114
887, `Linked TA article seems empty`, extract: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 111
@@ -121,7 +121,7 @@ Got 355 notices:
853, "Unexpected extra original \\w attribute", details, lineNumber, C, V, extract: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 825
852, "Unexpected original \\w x-morph language prefix", details:"Expected 'He,' 'Ar,' or 'Gr,'", lineNumber, C, V, extract: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 829
851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 288
- 849, `Unexpected '$badCharCombination' character combination`, characterIndex, extract, location: ourLocation from field-text-check.js line 363
+ 849, `Unexpected '$badCharCombination' character combination`, characterIndex, extract, location: ourLocation from field-text-check.js line 364
848, "Unexpected first translation \\w attribute", details: "expected 'x-occurrence'", lineNumber, C, V, extract: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 833
847, "Unexpected second translation \\w attribute", details: "expected 'x-occurrences'", lineNumber, C, V, extract: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 836
846, "Unexpected extra translation \\w attribute", details, lineNumber, C, V, extract: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 838
@@ -164,18 +164,18 @@ Got 355 notices:
811, "Bad verse number", rowID, fieldName: 'Reference', location: ` '$V'$ourRowLocation` from annotation-row-check.js line 408
810, "Missing verse number", rowID, fieldName: 'Verse', location: ` after $C:?$ourRowLocation` from tn-table-row-check.js line 430
810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from annotation-row-check.js line 411
- 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from tn-table-row-check.js line 498
- 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from annotation-row-check.js line 484
- 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-table-row-check.js line 503
- 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from annotation-row-check.js line 489
+ 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from tn-table-row-check.js line 500
+ 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from annotation-row-check.js line 487
+ 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-table-row-check.js line 505
+ 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from annotation-row-check.js line 492
790, C, V, "Missing verse number", rowID, lineNumber: n + 1, location: ` after $C:$lastV$ourLocation` from tn-table-text-check.js line 227
790, C, V, "Missing verse number", rowID, lineNumber: n + 1, location: ` after $C:$lastV$ourLocation` from annotation-table-check.js line 208
788, "Only 'Just-In-Time Training' TA articles allowed here", fieldName: 'SupportReference', extract: supportReference, rowID, location: ourRowLocation from tn-table-row-check.js line 461
788, "Only 'Just-In-Time Training' TA articles allowed here", fieldName: 'SupportReference', extract: supportReference, rowID, location: ourRowLocation from annotation-row-check.js line 447
787, "Link to TA should also be in OccurrenceNote", fieldName: 'SupportReference', extract: supportReference, rowID, location: ourRowLocation from tn-table-row-check.js line 466
787, "Link to TA should also be in Annotation", fieldName: 'SupportReference', extract: supportReference, rowID, location: ourRowLocation from annotation-row-check.js line 452
- 786, "Should have a SupportReference when OccurrenceNote has a TA link", details, rowID, fieldName: 'OccurrenceNote', extract: regexResultArray[1], location: ourRowLocation from tn-table-row-check.js line 533
- 786, "Should have a SupportReference when OccurrenceNote has a TA link", details, rowID, fieldName: 'Annotation', extract: adjustedLink, location: ourRowLocation from annotation-row-check.js line 507
+ 786, "Should have a SupportReference when OccurrenceNote has a TA link", details, rowID, fieldName: 'OccurrenceNote', extract: regexResultArray[1], location: ourRowLocation from tn-table-row-check.js line 539
+ 786, "Should have a SupportReference when OccurrenceNote has a TA link", details, rowID, fieldName: 'Annotation', extract: adjustedLink, location: ourRowLocation from annotation-row-check.js line 512
779, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-table-row-check.js line 433
779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from annotation-row-check.js line 414
778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from tn-table-row-check.js line 436
@@ -184,24 +184,24 @@ Got 355 notices:
776, 'Unexpected " straight quote character', details, lineNumber, C, V, extract, location: lineLocation from usfm-text-check.js line 750
775, "Unexpected ' straight quote character", details, lineNumber, C, V, extract, location: lineLocation from usfm-text-check.js line 755
774, `Unexpected $char closing character (no matching opener)`, lineNumber: n, characterIndex, extract, location: ourLocation from plain-text-check.js line 202
- 773, `Unexpected trailing zero-width joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 163
- 772, `Unexpected trailing word-joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 158
- 771, `Unexpected leading zero-width joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 141
- 770, `Unexpected leading word-joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 137
+ 773, `Unexpected trailing zero-width joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 164
+ 772, `Unexpected trailing word-joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 159
+ 771, `Unexpected leading zero-width joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 142
+ 770, `Unexpected leading word-joiner`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 138
769, C, V, "Verse bridge numbers not in ascending order", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, Math.max(9, extractLength))$rest.length > extractLength ? '…' : '' ($firstV → $secondV)`, location: ourLocation from usfm-text-check.js line 1,087
768, `At end of text with unclosed $char opening character`, details, lineNumber: n, characterIndex: x, extract, location: ourLocation from plain-text-check.js line 220
766, C, V, "Bridged verse numbers didn’t increment correctly", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, Math.max(9, extractLength))$rest.length > extractLength ? '…' : '' ($lastV → $firstV)`, location: ourLocation from usfm-text-check.js line 1,089
- 765, "Unexpected link", characterIndex, extract, location: ourLocation from field-text-check.js line 434
+ 765, "Unexpected link", characterIndex, extract, location: ourLocation from field-text-check.js line 435
764, C, V, "Chapter number didn’t increment correctly", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, halfLength)$rest.length > halfLength ? '…' : '' ($lastC ? lastC : '0' → $C)`, location: ourLocation from usfm-text-check.js line 1,060
763, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, halfLength)$rest.length > halfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,073
762, "Unable to convert verse bridge numbers to integers", C: chapterNumberString, V: verseNumberString, characterIndex: 3, extract: verseNumberString, location: `$CVlocation with $usfmVIerror` from usfm-text-check.js line 444
762, C, V, "Unable to convert verse bridge numbers to integers", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, Math.max(9, extractLength))$rest.length > extractLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,083
761, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, extract: `$restRest.substring(0, halfLength)$restRest.length > halfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,104
752, "Verse numbers of markdown TN link don’t match", details: `$V1 vs $linkVerseInt`, extract: totalLink, location: ourLocation from tn-links-check.js line 702
- 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from tn-table-row-check.js line 489
- 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from annotation-row-check.js line 475
- 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-table-row-check.js line 480
- 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from annotation-row-check.js line 466
+ 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from tn-table-row-check.js line 491
+ 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, extract: occurrence, location: ourRowLocation from annotation-row-check.js line 478
+ 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-table-row-check.js line 482
+ 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from annotation-row-check.js line 469
749, "Markdown image link seems faulty", lineNumber, extract: fetchLink, location: lineLocation from markdown-text-check.js line 139
748, "Error fetching markdown image link", lineNumber, extract: fetchLink, location: lineLocation from markdown-text-check.js line 148
747, "Bad function call: should be given a valid book abbreviation", extract: bookID, location: ` (not '$bookID')$ourLocation` from tn-table-text-check.js line 107
@@ -248,7 +248,7 @@ Got 355 notices:
724, C, V, "Unable to convert chapter number to integer", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, halfLength)$rest.length > halfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,056
723, C, V, "Unable to convert verse number to integer", lineNumber: n, characterIndex: 3, extract: `$rest.substring(0, halfLength)$rest.length > halfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,069
720, C, V, "Unable to convert internal verse number to integer", lineNumber: n, characterIndex: 3, extract: `$restRest.substring(0, halfLength)$restRest.length > halfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,100
- 716, `Misplaced $rightChar character`, extract: regexResultArray[0], location: ourLocation from field-text-check.js line 415
+ 716, `Misplaced $rightChar character`, extract: regexResultArray[0], location: ourLocation from field-text-check.js line 416
711, "Expected compulsory content", C, V, lineNumber, characterIndex: marker.length, location: ` after \\$marker marker$lineLocation` from usfm-text-check.js line 952
703, C, V, "Unexpected CarriageReturn character", lineNumber: n, characterIndex, extract, location: ourLocation from usfm-text-check.js line 1,020
656, "Bad chapter number in markdown TN link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, extract: totalLink, location: ourLocation from tn-links-check.js line 718
@@ -266,19 +266,19 @@ Got 355 notices:
653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, extract: totalLink, location: ourLocation from tn-links-check.js line 565
653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenC:$linkVerseInt vs $numVersesThisChapter verses`, extract: totalLink, location: ourLocation from tn-links-check.js line 615
653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, extract: totalLink, location: ourLocation from tn-links-check.js line 667
- 649, "Unusual [[ ]] link(s)—not normal TA or TW links", details: `need to carefully check $JSON.stringify(leftoverLinksList2)`, location: ourLocation from tn-links-check.js line 737
- 648, "Unusual [ ]( ) link(s)—not normal Bible or TN links", details: `need to carefully check $JSON.stringify(leftoverLinksList1)`, location: ourLocation from tn-links-check.js line 731
+ 649, "Unusual [[ ]] link(s)—not normal TA or TW links", details: `need to carefully check $leftoverLinksList2.length === 1 ? '"'+leftoverLinksList2[0]+'"' : JSON.stringify(leftoverLinksList2)`, location: ourLocation from tn-links-check.js line 737
+ 648, "Unusual [ ]( ) link(s)—not normal Bible or TN links", details: `need to carefully check $leftoverLinksList1.length === 1 ? '"'+leftoverLinksList1[0]+'"' : JSON.stringify(leftoverLinksList1)`, location: ourLocation from tn-links-check.js line 731
644, "USFM3 Grammar Check (relaxed mode) doesn’t pass either", location: fileLocation from usfm-text-check.js line 254
- 638, "Only found whitespace", location: ourLocation from field-text-check.js line 103
+ 638, "Only found whitespace", location: ourLocation from field-text-check.js line 104
638, "Only found whitespace", location: ourLocation from plain-text-check.js line 123
603, "USFM marker doesn’t end with space", C, V, lineNumber, characterIndex, extract, location: ourLocation from usfm-text-check.js line 990
601, "Unable to load", details: `username=$username error=$gcUHBerror`, OBSPathname, location: ourLocation, extra: OBSRepoName from orig-quote-check.js line 111
601, "Unable to load", details: `username=$username error=$gcUHBerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 143
601, "Unable to load", details: `username=$username error=$gcUGNTerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 151
600, `$regexResultsArray.length link target$regexResultsArray.length === 1 ? ' is' : 's are' still being checked…`, location: ourLocation from field-link-check.js line 152
- 583, "Unexpected newLine character", characterIndex, extract, location: ourLocation from field-text-check.js line 231
- 582, "Unexpected carriageReturn character", characterIndex, extract, location: ourLocation from field-text-check.js line 237
- 581, "Unexpected non-break space character", characterIndex, extract, location: ourLocation from field-text-check.js line 243
+ 583, "Unexpected newLine character", characterIndex, extract, location: ourLocation from field-text-check.js line 232
+ 582, "Unexpected carriageReturn character", characterIndex, extract, location: ourLocation from field-text-check.js line 238
+ 581, "Unexpected non-break space character", characterIndex, extract, location: ourLocation from field-text-check.js line 244
555, "Possible missing chapter number in markdown Bible link", extract: totalLink, location: ourLocation from tn-links-check.js line 347
552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, extract: V, location: ourLocation from tn-table-text-check.js line 211
552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, extract: V, location: ourLocation from annotation-table-check.js line 192
@@ -289,37 +289,39 @@ Got 355 notices:
519, "Missing expected USFM line", extract: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 601
518, "Missing expected USFM line", extract: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 609
517, "Missing expected USFM line", extract: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 605
- 472, "Nesting of header levels seems confused", lineNumber: n, characterIndex: 0, location: ourLocation from markdown-text-check.js line 214
450, "Resource container link should have '*' language code", details: `not '$languageCode'`, characterIndex, extract, location: ourLocation from tn-links-check.js line 222
441, `Unknown linkType parameter`, extract: linkType from field-link-check.js line 134
439, "Error fetching link", location: ` $fetchLink` from field-link-check.js line 44
438, `Blank field / missing link (expected $linkOptions.expectedCount link$linkOptions.expectedCount === 1 ? "" : "s")`, location: ourLocation from field-link-check.js line 106
401, `Unexpected content after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, extract: rest, location: lineLocation from usfm-text-check.js line 950
399, C, V, "Useless paragraph marker", lineNumber: n, characterIndex: 1, details: `'\\$lastMarker' before '\\$marker'`, location: ourLocation from usfm-text-check.js line 1,124
+ 378, `Possible mismatched '$thisField' markdown formatting pairs`, details: `$count.toLocaleString() total occurrence$count === 1 ? '' : 's'`, characterIndex, extract, location: ourLocation from markdown-text-check.js line 246
375, "Ellipsis without surrounding snippet", location: ourLocation from orig-quote-check.js line 325
- 374, "Field contains zero-width space(s)", fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-table-row-check.js line 469
- 374, "Field contains zero-width space(s)", fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-table-row-check.js line 509
- 374, "Field contains zero-width space(s)", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-table-row-check.js line 522
- 374, "Field contains zero-width space(s)", fieldName: 'SupportReference', rowID, location: ourRowLocation from annotation-row-check.js line 455
- 374, "Field contains zero-width space(s)", fieldName: 'Annotation', rowID, location: ourRowLocation from annotation-row-check.js line 495
+ 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1?'':'s' found`, fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-table-row-check.js line 470
+ 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1?'':'s' found`, fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-table-row-check.js line 512
+ 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1?'':'s' found`, fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-table-row-check.js line 527
+ 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1?'':'s' found`, fieldName: 'SupportReference', characterIndex, rowID, location: ourRowLocation from annotation-row-check.js line 457
+ 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1?'':'s' found`, fieldName: 'Annotation', rowID, location: ourRowLocation from annotation-row-check.js line 499
373, "Field is only whitespace", fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-table-row-check.js line 454
- 373, "Field is only whitespace", fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-table-row-check.js line 511
- 373, "Field is only whitespace", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-table-row-check.js line 524
+ 373, "Field is only whitespace", fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-table-row-check.js line 515
+ 373, "Field is only whitespace", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-table-row-check.js line 530
373, "Field is only whitespace", fieldName: 'SupportReference', rowID, location: ourRowLocation from annotation-row-check.js line 438
- 373, "Field is only whitespace", fieldName: 'Annotation', rowID, location: ourRowLocation from annotation-row-check.js line 497
+ 373, "Field is only whitespace", fieldName: 'Annotation', rowID, location: ourRowLocation from annotation-row-check.js line 502
312, 'Possible unclosed footnote', details, lineNumber, C, V, location: lineLocation from usfm-text-check.js line 684
301, `Unexpected whitespace after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, extract: rest, location: lineLocation from usfm-text-check.js line 948
287, `Not enough links (expected $linkOptions.expectedCount link$linkOptions.expectedCount === 1 ? "" : "s")`, location: ` (only found $regexResultsArray.length)$ourLocation` from field-link-check.js line 148
- 274, "Missing OccurrenceNote field", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-table-row-check.js line 539
- 274, "Missing Annotation field", fieldName: 'Annotation', rowID, location: ourRowLocation from annotation-row-check.js line 514
+ 282, "Nesting of header levels seems confused", lineNumber: n, characterIndex: 0, location: ourLocation from markdown-text-check.js line 214
+ 274, "Missing OccurrenceNote field", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-table-row-check.js line 545
+ 274, "Missing Annotation field", fieldName: 'Annotation', rowID, location: ourRowLocation from annotation-row-check.js line 519
+ 256, "Possibly missing current copyright year", details: fullYearString, repoName, filename, location: markdownLocation, extra: repoCode from checkBookPackage.js line 262
218, "Using deprecated USFM marker", extract: `\\$deprecatedMarker`, location: fileLocation from usfm-text-check.js line 612
- 195, `Unexpected $punctChar character at start of line`, characterIndex, extract, location: ourLocation from field-text-check.js line 314
- 179, "Unexpected space before ellipse character", characterIndex, extract, location: ourLocation from field-text-check.js line 259
- 178, "Unexpected space after ellipse character", characterIndex, extract, location: ourLocation from field-text-check.js line 265
+ 195, `Unexpected $punctChar character at start of line`, characterIndex, extract, location: ourLocation from field-text-check.js line 315
+ 179, "Unexpected space before ellipse character", characterIndex, extract, location: ourLocation from field-text-check.js line 260
+ 178, "Unexpected space after ellipse character", characterIndex, extract, location: ourLocation from field-text-check.js line 266
176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from tn-table-row-check.js line 443
176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from annotation-row-check.js line 424
- 175, "Row ID should end with a lowercase letter or digit", characterIndeX: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from tn-table-row-check.js line 445
- 175, "Row ID should end with a lowercase letter or digit", characterIndeX: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from annotation-row-check.js line 426
+ 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from tn-table-row-check.js line 445
+ 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation from annotation-row-check.js line 426
174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, extract: rowID, location: ourRowLocation from tn-table-row-check.js line 447
174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, extract: rowID, location: ourRowLocation from annotation-row-check.js line 428
173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, extract: rowID, location: ourRowLocation from tn-table-row-check.js line 449
@@ -338,20 +340,20 @@ Got 355 notices:
143, "Unknown Bible book name in link", details: totalLink, extract: optionalB1, location: ourLocation from tn-links-check.js line 634
138, "File ends with additional blank line(s)", characterIndex, extract, location: ourLocation from plain-text-check.js line 155
111, `Bad options for checkFieldLinks: expectedCount=$linkOptions.expectedCount but allowedCount=$linkOptions.allowedCount` from field-link-check.js line 116
- 110, `Unexpected leading spaces`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 132
- 109, `Unexpected leading space`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 134
- 107, "Unexpected leading line break", characterIndex: 0, extract, location: ourLocation from field-text-check.js line 173
- 104, "Unexpected trailing line break", characterIndex: fieldText.length - 1, extract, location: ourLocation from field-text-check.js line 206
+ 110, `Unexpected leading spaces`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 133
+ 109, `Unexpected leading space`, characterIndex: 0, extract, location: ourLocation from field-text-check.js line 135
+ 107, "Unexpected leading line break", characterIndex: 0, extract, location: ourLocation from field-text-check.js line 174
+ 104, "Unexpected trailing line break", characterIndex: fieldText.length - 1, extract, location: ourLocation from field-text-check.js line 207
103, `USFMGrammar: $warningString.trim()`, location from usfm-text-check.js line 1,165
102, `USFMGrammar: $warningString`, location: fileLocation from usfm-text-check.js line 248
101, `USFMGrammar: $warningString`, filename, location: ourLocation from BCS-usfm-grammar-check.js line 186
- 94, "Unexpected trailing space(s) before break", characterIndex, extract, location: ourLocation from field-text-check.js line 193
- 93, "Unexpected trailing space(s) before line break", characterIndex, extract, location: ourLocation from field-text-check.js line 198
+ 94, "Unexpected trailing space(s) before break", characterIndex, extract, location: ourLocation from field-text-check.js line 194
+ 93, "Unexpected trailing space(s) before line break", characterIndex, extract, location: ourLocation from field-text-check.js line 199
87, C, V, "Expected \\toc2 line to follow \\toc1", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,117
87, C, V, "Expected \\toc3 line to follow \\toc2", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,119
67, C: chapterNumberString, V: `$v`, "Verse appears to be left out", location: CVlocation from usfm-text-check.js line 468
- 64, "Unexpected leading space(s) after break", characterIndex, extract, location: ourLocation from field-text-check.js line 147
- 63, "Unexpected leading space(s) after line break", characterIndex, extract, location: ourLocation from field-text-check.js line 152
+ 64, "Unexpected leading space(s) after break", characterIndex, extract, location: ourLocation from field-text-check.js line 148
+ 63, "Unexpected leading space(s) after line break", characterIndex, extract, location: ourLocation from field-text-check.js line 153
50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, extract: fieldText, location: ourLocation from orig-quote-check.js line 298
20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from tn-table-text-check.js line 260
20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from annotation-table-check.js line 241
diff --git a/package.json b/package.json
index 1fb83b75..3c1f94a5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "uw-content-validation",
"description": "Functions for Checking Door43.org Scriptural Content/Resources.",
- "version": "1.1.1",
+ "version": "1.1.2",
"private": false,
"homepage": "https://unfoldingword.github.io/uw-content-validation/",
"repository": {
diff --git a/src/__tests__/__snapshots__/book-package-check.test.js.snap b/src/__tests__/__snapshots__/book-package-check.test.js.snap
index 44431a9e..0453daec 100644
--- a/src/__tests__/__snapshots__/book-package-check.test.js.snap
+++ b/src/__tests__/__snapshots__/book-package-check.test.js.snap
@@ -4176,7 +4176,7 @@ Object {
"C": "2",
"V": "12",
"bookID": "RUT",
- "details": "need to carefully check [\\"[Doublet](../figs-doublet/01.md)\\"]",
+ "details": "need to carefully check \\"[Doublet](../figs-doublet/01.md)\\"",
"extra": "TN",
"fieldName": "OccurrenceNote",
"filename": "en_tn_08-RUT.tsv",
diff --git a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap
index ad6c621c..007b0396 100644
--- a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap
+++ b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap
@@ -823,7 +823,7 @@ Object {
"C": "1",
"V": "6",
"bookID": "GEN",
- "details": "need to carefully check [\\"[[rc://*/ta/man/figs-parallelism]]\\"]",
+ "details": "need to carefully check \\"[[rc://*/ta/man/figs-parallelism]]\\"",
"fieldName": "OccurrenceNote",
"location": " that was supplied",
"message": "Unusual [[ ]] link(s)—not normal TA or TW links",
@@ -853,7 +853,7 @@ Object {
"C": "2",
"V": "12",
"bookID": "RUT",
- "details": "need to carefully check [\\"[Doublet](../figs-doublet/01.md)\\"]",
+ "details": "need to carefully check \\"[Doublet](../figs-doublet/01.md)\\"",
"fieldName": "OccurrenceNote",
"location": " that was supplied",
"message": "Unusual [ ]( ) link(s)—not normal Bible or TN links",
@@ -937,7 +937,7 @@ Object {
"C": "1",
"V": "7",
"bookID": "GEN",
- "details": "need to carefully check [\\"[[rc://*/ta/woman/figs-imperative]]\\"]",
+ "details": "need to carefully check \\"[[rc://*/ta/woman/figs-imperative]]\\"",
"fieldName": "OccurrenceNote",
"location": " that was supplied",
"message": "Unusual [[ ]] link(s)—not normal TA or TW links",
@@ -1009,7 +1009,7 @@ Object {
"C": "1",
"V": "9",
"bookID": "GEN",
- "details": "need to carefully check [\\"[Genesis 1:7](../01/zzz.md)\\"]",
+ "details": "need to carefully check \\"[Genesis 1:7](../01/zzz.md)\\"",
"fieldName": "OccurrenceNote",
"location": " that was supplied",
"message": "Unusual [ ]( ) link(s)—not normal Bible or TN links",
diff --git a/src/core/BCS-usfm-grammar-check.js b/src/core/BCS-usfm-grammar-check.js
index 2bd31961..d4b8ba9b 100644
--- a/src/core/BCS-usfm-grammar-check.js
+++ b/src/core/BCS-usfm-grammar-check.js
@@ -4,7 +4,7 @@ import { DEFAULT_EXTRACT_LENGTH } from './text-handling-functions'
import { userLog, parameterAssert } from './utilities';
-// const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.3.2';
+// const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.3.3';
export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLocation, checkingOptions) {
@@ -83,7 +83,7 @@ export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLo
// Save our line number
if (lineNumberString && lineNumberString.length) {
- /*
+ // ourErrorObject.lineNumber = Number(lineNumberString);
// but we need a temporary fix for the BCS bug which doesn’t include blank lines in the count
let lineNumber = Number(lineNumberString)
let notified = false;
@@ -99,8 +99,6 @@ export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLo
}
}
ourErrorObject.lineNumber = lineNumber;
- */
- ourErrorObject.lineNumber = Number(lineNumberString);
}
}
@@ -140,19 +138,19 @@ export function checkUSFMGrammar(bookID, strictnessString, filename, givenText,
const cugResult = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkUSFMGrammar success: ${successString}`);
+ // functionLog(`checkUSFMGrammar success: ${successString}`);
cugResult.successList.push(successString);
}
function addNotice6to7(noticeObject) {
/**
* @description - adds a new notice entry, adding bookID,C,V to the given fields
* @param {Number} priority - notice priority from 1 (lowest) to 999 (highest)
- * @param {String} message - the text of the notice message
+ * @param {string} message - the text of the notice message
* @param {Number} characterIndex - where the issue occurs in the line
- * @param {String} extract - short extract from the line centred on the problem (if available)
- * @param {String} location - description of where the issue is located
+ * @param {string} extract - short extract from the line centred on the problem (if available)
+ * @param {string} location - description of where the issue is located
*/
- // debugLog(`checkUSFMGrammar notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkUSFMGrammar notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cUSFMgr addNotice6to7: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cUSFMgr addNotice6to7: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cUSFMgr addNotice6to7: 'message' parameter should be defined");
@@ -187,7 +185,7 @@ export function checkUSFMGrammar(bookID, strictnessString, filename, givenText,
addSuccessMessage(`Checked USFM Grammar (${strictnessString} mode) ${grammarCheckResult.isValidUSFM ? "without errors" : " (but the USFM DIDN’T validate)"}`);
// debugLog(` checkUSFMGrammar returning with ${result.successList.length.toLocaleString()} success(es) and ${result.noticeList.length.toLocaleString()} notice(s).`);
- // debugLog(`checkUSFMGrammar result is ${JSON.stringify(result)}`);
+ // functionLog(`checkUSFMGrammar result is ${JSON.stringify(result)}`);
return cugResult;
}
// end of checkUSFMGrammar function
diff --git a/src/core/annotation-row-check.js b/src/core/annotation-row-check.js
index ce8bbd15..29b642cc 100644
--- a/src/core/annotation-row-check.js
+++ b/src/core/annotation-row-check.js
@@ -1,4 +1,4 @@
-import { DEFAULT_EXTRACT_LENGTH, isWhitespace } from './text-handling-functions'
+import { DEFAULT_EXTRACT_LENGTH, isWhitespace, countOccurrences } from './text-handling-functions'
import * as books from './books/books';
import { checkTextField } from './field-text-check';
import { checkMarkdownText } from './markdown-text-check';
@@ -23,13 +23,13 @@ const TA_REGEX = new RegExp('\\[\\[rc://[^ /]+?/ta/man/[^ /]+?/([^ \\]]+?)\\]\\]
/**
*
* @description - Checks one TSV data row of translation notes (TN2)
- * @param {String} languageCode - the language code, e.g., 'en'
- * @param {String} annotationType - TN2, TQ2, TWL, SN, or SQ -- allows more specific checks
- * @param {String} line - the TSV line to be checked
- * @param {String} bookID - 3-character UPPERCASE USFM book identifier or 'OBS'
- * @param {String} givenC - chapter number or (for OBS) story number string
- * @param {String} givenV - verse number or (for OBS) frame number string
- * @param {String} givenRowLocation - description of where the line is located
+ * @param {string} languageCode - the language code, e.g., 'en'
+ * @param {string} annotationType - TN2, TQ2, TWL, SN, or SQ -- allows more specific checks
+ * @param {string} line - the TSV line to be checked
+ * @param {string} bookID - 3-character UPPERCASE USFM book identifier or 'OBS'
+ * @param {string} givenC - chapter number or (for OBS) story number string
+ * @param {string} givenV - verse number or (for OBS) frame number string
+ * @param {string} givenRowLocation - description of where the line is located
* @param {Object} checkingOptions - may contain extractLength parameter
* @return {Object} - containing noticeList
*/
@@ -48,7 +48,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
Returns an object containing the noticeList.
*/
- // debugLog(`checkAnnotationTSVDataRow(${languageCode}, ${annotationType}, ${line}, ${bookID}, ${givenRowLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkAnnotationTSVDataRow(${languageCode}, ${annotationType}, ${line}, ${bookID}, ${givenRowLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(languageCode !== undefined, "checkAnnotationTSVDataRow: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkAnnotationTSVDataRow: 'languageCode' parameter should be a string not a '${typeof languageCode}'`);
parameterAssert(line !== undefined, "checkAnnotationTSVDataRow: 'line' parameter should be defined");
@@ -78,14 +78,14 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
/**
* @description - adds a new notice entry, adding bookID,C,V to the given fields
* @param {Number} priority - notice priority from 1 (lowest) to 999 (highest)
- * @param {String} message - the text of the notice message
- * @param {String} rowID - 4-character row ID field
+ * @param {string} message - the text of the notice message
+ * @param {string} rowID - 4-character row ID field
* @param {Number} lineNumber - one-based line number
* @param {Number} characterIndex - zero-based index of where the issue occurs in the line
- * @param {String} extract - short extract from the line centred on the problem (if available)
- * @param {String} location - description of where the issue is located
+ * @param {string} extract - short extract from the line centred on the problem (if available)
+ * @param {string} location - description of where the issue is located
*/
- // debugLog(`checkAnnotationTSVDataRow addNoticePartial(priority=${noticeObject.priority}) ${noticeObject.message}, ${noticeObject.characterIndex}, ${noticeObject.extract}, ${noticeObject.location}`);
+ // functionLog(`checkAnnotationTSVDataRow addNoticePartial(priority=${noticeObject.priority}) ${noticeObject.message}, ${noticeObject.characterIndex}, ${noticeObject.extract}, ${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "checkAnnotationTSVDataRow addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `checkAnnotationTSVDataRow addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "checkAnnotationTSVDataRow addNoticePartial: 'message' parameter should be defined");
@@ -107,11 +107,11 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
async function ourMarkdownTextChecks(rowID, fieldName, fieldText, allowedLinks, rowLocation, checkingOptions) {
/**
* @description - checks the given markdown field and processes the returned results
- * @param {String} rowID - 4-character row ID field
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} rowID - 4-character row ID field
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} rowLocation - description of where the line is located
+ * @param {string} rowLocation - description of where the line is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
// Does markdown checks for small errors like leading/trailing spaces, etc.
@@ -122,7 +122,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
// We don’t currently use the allowedLinks parameter
- // debugLog(`checkAnnotationTSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
+ // functionLog(`checkAnnotationTSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkAnnotationTSVDataRow ourMarkdownTextChecks: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkAnnotationTSVDataRow ourMarkdownTextChecks: 'rowID' parameter should be a string not a '${typeof rowID}'`);
// parameterAssert(fieldName !== undefined, "checkAnnotationTSVDataRow ourMarkdownTextChecks: 'fieldName' parameter should be defined");
@@ -158,11 +158,11 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
function ourCheckTextField(rowID, fieldName, fieldText, allowedLinks, rowLocation, checkingOptions) {
/**
* @description - checks the given text field and processes the returned results
- * @param {String} rowID - 4-character row ID field
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} rowID - 4-character row ID field
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} rowLocation - description of where the line is located
+ * @param {string} rowLocation - description of where the line is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
// Does basic checks for small errors like leading/trailing spaces, etc.
@@ -171,7 +171,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
// Updates the global list of notices
- // debugLog(`checkAnnotationTSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
+ // functionLog(`checkAnnotationTSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkAnnotationTSVDataRow ourCheckTextField: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkAnnotationTSVDataRow ourCheckTextField: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkAnnotationTSVDataRow ourCheckTextField: 'fieldName' parameter should be defined");
@@ -204,7 +204,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
// Updates the global list of notices
- // debugLog(`checkAnnotationTSVDataRow ourCheckSupportReferenceInTA(${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
+ // functionLog(`checkAnnotationTSVDataRow ourCheckSupportReferenceInTA(${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkAnnotationTSVDataRow ourCheckSupportReferenceInTA: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkAnnotationTSVDataRow ourCheckSupportReferenceInTA: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkAnnotationTSVDataRow ourCheckSupportReferenceInTA: 'fieldName' parameter should be defined");
@@ -235,7 +235,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
// Updates the global list of notices
- // debugLog(`checkAnnotationTSVDataRow ourCheckTNOriginalLanguageQuote(${fieldName}, (${fieldText.length}) '${fieldText}', ${rowLocation}, …)`);
+ // functionLog(`checkAnnotationTSVDataRow ourCheckTNOriginalLanguageQuote(${fieldName}, (${fieldText.length}) '${fieldText}', ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkAnnotationTSVDataRow ourCheckTNOriginalLanguageQuote: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkAnnotationTSVDataRow ourCheckTNOriginalLanguageQuote: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkAnnotationTSVDataRow ourCheckTNOriginalLanguageQuote: 'fieldName' parameter should be defined");
@@ -266,7 +266,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
// Updates the global list of notices
- // debugLog(`checkAnnotationTSVDataRow ourCheckTNLinksToOutside(${rowID}, ${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
+ // functionLog(`checkAnnotationTSVDataRow ourCheckTNLinksToOutside(${rowID}, ${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkAnnotationTSVDataRow ourCheckTNLinksToOutside: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkAnnotationTSVDataRow ourCheckTNLinksToOutside: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkAnnotationTSVDataRow ourCheckTNLinksToOutside: 'fieldName' parameter should be defined");
@@ -391,10 +391,10 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
if (V.length) {
if (V !== givenV)
addNoticePartial({ priority: 975, message: "Wrong verse number", details: `expected '${givenV}'`, rowID, fieldName: 'Reference', extract: V, location: ourRowLocation });
- if (V === 'intro') { }
+ if (bookID === 'OBS' || V === 'intro') { }
else if (/^\d+$/.test(V)) {
let intV = Number(V);
- if (intV === 0)
+ if (intV === 0 && bookID !== 'PSA') // Psalms have \d as verse zero
addNoticePartial({ priority: 814, message: "Invalid zero verse number", rowID, fieldName: 'Reference', extract: V, location: ourRowLocation });
else {
if (haveGoodChapterNumber) {
@@ -423,7 +423,7 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
} else if (LC_ALPHABET.indexOf(rowID[0]) < 0)
addNoticePartial({ priority: 176, message: "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation });
else if (LC_ALPHABET_PLUS_DIGITS.indexOf(rowID[3]) < 0)
- addNoticePartial({ priority: 175, message: "Row ID should end with a lowercase letter or digit", characterIndeX: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation });
+ addNoticePartial({ priority: 175, message: "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation });
else if (LC_ALPHABET_PLUS_DIGITS_PLUS_HYPHEN.indexOf(rowID[1]) < 0)
addNoticePartial({ priority: 174, message: "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, extract: rowID, location: ourRowLocation });
else if (LC_ALPHABET_PLUS_DIGITS_PLUS_HYPHEN.indexOf(rowID[2]) < 0)
@@ -451,8 +451,11 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
if (annotation.indexOf(supportReference) < 0)
addNoticePartial({ priority: 787, message: "Link to TA should also be in Annotation", fieldName: 'SupportReference', extract: supportReference, rowID, location: ourRowLocation });
}
- if (supportReference.indexOf('\u200B') >= 0)
- addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", fieldName: 'SupportReference', rowID, location: ourRowLocation });
+ let characterIndex;
+ if ((characterIndex = supportReference.indexOf('\u200B') !== -1)) {
+ const charCount = countOccurrences(supportReference, '\u200B');
+ addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", details: `${charCount} occurrence${charCount === 1 ? '' : 's'} found`, fieldName: 'SupportReference', characterIndex, rowID, location: ourRowLocation });
+ }
}
// // TODO: Check if this is really required????
// else if (/^\d+$/.test(C) && /^\d+$/.test(V)) // C:V are both digits
@@ -491,8 +494,10 @@ export async function checkAnnotationTSVDataRow(languageCode, annotationType, li
}
if (annotation.length) {
- if (annotation.indexOf('\u200B') >= 0)
- addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", fieldName: 'Annotation', rowID, location: ourRowLocation });
+ if (annotation.indexOf('\u200B') >= 0) {
+ const charCount = countOccurrences(supportReference, '\u200B');
+ addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", details: `${charCount} occurrence${charCount === 1 ? '' : 's'} found`, fieldName: 'Annotation', rowID, location: ourRowLocation });
+ }
if (isWhitespace(annotation))
addNoticePartial({ priority: 373, message: "Field is only whitespace", fieldName: 'Annotation', rowID, location: ourRowLocation });
else { // More than just whitespace
diff --git a/src/core/annotation-table-check.js b/src/core/annotation-table-check.js
index 241acd97..da5a1b08 100644
--- a/src/core/annotation-table-check.js
+++ b/src/core/annotation-table-check.js
@@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices';
import { parameterAssert } from './utilities';
-const ANNOTATION_TABLE_VALIDATOR_VERSION_STRING = '0.3.0';
+const ANNOTATION_TABLE_VALIDATOR_VERSION_STRING = '0.3.1';
const NUM_EXPECTED_ANNOTATION_TSV_FIELDS = 7; // so expects 6 tabs per line
const EXPECTED_TN_HEADING_LINE = 'Reference\tID\tTags\tSupportReference\tQuote\tOccurrence\tAnnotation';
@@ -20,7 +20,7 @@ export async function checkAnnotationRows(languageCode, annotationType, bookID,
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkAnnotationRows(${languageCode}, ${annotationType}, ${bookID}, ${tableText.length}, ${givenLocation},${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkAnnotationRows(${languageCode}, ${annotationType}, ${bookID}, ${tableText.length}, ${givenLocation},${JSON.stringify(checkingOptions)})…`);
parameterAssert(languageCode !== undefined, "checkAnnotationRows: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkAnnotationRows: 'languageCode' parameter should be a string not a '${typeof languageCode}'`);
parameterAssert(bookID !== undefined, "checkAnnotationRows: 'bookID' parameter should be defined");
@@ -37,11 +37,11 @@ export async function checkAnnotationRows(languageCode, annotationType, bookID,
const carResult = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkAnnotationRows success: ${successString}`);
+ // functionLog(`checkAnnotationRows success: ${successString}`);
carResult.successList.push(successString);
}
function addNoticePartial(noticeObject) {
- // debugLog(`checkAnnotationRows notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkAnnotationRows notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "ATSV addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `TSV addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "ATSV addNoticePartial: 'message' parameter should be defined");
@@ -98,7 +98,7 @@ export async function checkAnnotationRows(languageCode, annotationType, bookID,
let rowIDList = [], uniqueRowList = [];
let numVersesThisChapter = 0;
for (let n = 0; n < lines.length; n++) {
- // debugLog(`checkAnnotationRows checking line ${n}: ${JSON.stringify(lines[n])}`);
+ // functionLog(`checkAnnotationRows checking line ${n}: ${JSON.stringify(lines[n])}`);
if (n === 0) {
if (lines[0] === EXPECTED_TN_HEADING_LINE)
addSuccessMessage(`Checked TSV header ${ourLocation}`);
@@ -188,7 +188,7 @@ export async function checkAnnotationRows(languageCode, annotationType, bookID,
if (V === 'intro') { }
else if (/^\d+$/.test(V)) {
let intV = Number(V);
- if (intV === 0)
+ if (intV === 0 && bookID !== 'PSA') // Psalms have \d titles
addNoticePartial({ priority: 552, C, V, message: "Invalid zero verse number", details: `for chapter ${C}`, rowID, lineNumber: n + 1, extract: V, location: ourLocation });
if (intV > numVersesThisChapter)
addNoticePartial({ priority: 734, C, V, message: "Invalid large verse number", details: `for chapter ${C}`, rowID, lineNumber: n + 1, extract: V, location: ourLocation });
@@ -232,7 +232,7 @@ export async function checkAnnotationRows(languageCode, annotationType, bookID,
}
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkAnnotationRows: calling removeDisabledNotices(${carResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkAnnotationRows: calling removeDisabledNotices(${carResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
carResult.noticeList = removeDisabledNotices(carResult.noticeList);
}
diff --git a/src/core/field-text-check.js b/src/core/field-text-check.js
index 19b53eb5..d28d236c 100644
--- a/src/core/field-text-check.js
+++ b/src/core/field-text-check.js
@@ -1,4 +1,4 @@
-import { DEFAULT_EXTRACT_LENGTH, MATCHED_PUNCTUATION_PAIRS, BAD_CHARACTER_COMBINATIONS, isWhitespace, countOccurrences } from './text-handling-functions'
+import { DEFAULT_EXTRACT_LENGTH, OPEN_CLOSE_PUNCTUATION_PAIRS, BAD_CHARACTER_COMBINATIONS, isWhitespace, countOccurrences } from './text-handling-functions'
import { parameterAssert } from './utilities';
@@ -21,11 +21,11 @@ export function checkTextField(fieldType, fieldName, fieldText, allowedLinks, op
// The list contains objects with the following fields:
// priority (compulsory): the priority number 0..999 (usually 800+ are errors, lower are warnings)
// message (compulsory): the error description string
- // characterIndeX: the 0-based index for the position in the string
+ // characterIndex: the 0-based index for the position in the string
// extract: a short extract of the string containing the error (or empty-string if irrelevant)
// location: the detailed location string
// (Returned in this way for more intelligent processing at a higher level)
- // debugLog(`checkTextField(${fieldName}, ${fieldText.length.toLocaleString()} chars, ${allowedLinks}, '${optionalFieldLocation}')…`);
+ // functionLog(`checkTextField(${fieldName}, ${fieldText.length.toLocaleString()} chars, ${allowedLinks}, '${optionalFieldLocation}')…`);
parameterAssert(fieldType !== undefined, "checkTextField: 'fieldType' parameter should be defined");
parameterAssert(typeof fieldType === 'string', `checkTextField: 'fieldType' parameter should be a string not a '${typeof fieldType}': ${fieldType}`);
parameterAssert(fieldType !== '', `checkTextField: 'fieldType' ${fieldType} parameter should be not be an empty string`);
@@ -93,8 +93,9 @@ export function checkTextField(fieldType, fieldName, fieldText, allowedLinks, op
let characterIndex;
if ((!checkingOptions?.cutoffPriorityLevel || checkingOptions?.cutoffPriorityLevel < 895)
&& (characterIndex = fieldText.indexOf('\u200B')) >= 0) {
- const extract = (characterIndex > halfLength ? '…' : '') + fieldText.substring(characterIndex - halfLength, characterIndex + halfLengthPlus).replace(/\u200B/g, '‼') + (characterIndex + halfLengthPlus < fieldText.length ? '…' : '')
- addNoticePartial({ priority: 895, message: "Field contains zero-width space(s)", characterIndex, extract, location: ourLocation });
+ const charCount = countOccurrences(fieldText,'\u200B');
+ const extract = (characterIndex > halfLength ? '…' : '') + fieldText.substring(characterIndex - halfLength, characterIndex + halfLengthPlus).replace(/\u200B/g, '‼') + (characterIndex + halfLengthPlus < fieldText.length ? '…' : '')
+ addNoticePartial({ priority: 895, message: "Field contains zero-width space(s)", details: `${charCount} occurrence${charCount === 1?'':'s'} found`, characterIndex, extract, location: ourLocation });
suggestion = suggestion.replace(/\u200B/g, ''); // Or should it be space ???
}
@@ -376,7 +377,7 @@ export function checkTextField(fieldType, fieldName, fieldText, allowedLinks, op
// addNoticePartial({ priority: 1, message: `Mismatched ( ) characters`, details: `left=${countOccurrences(fieldText, '(').toLocaleString()}, right=${countOccurrences(fieldText, ')').toLocaleString()}`, location: ourLocation });
// }
// Check matched pairs in the field
- for (const punctSet of MATCHED_PUNCTUATION_PAIRS) {
+ for (const punctSet of OPEN_CLOSE_PUNCTUATION_PAIRS) {
// Can’t check '‘’' coz they might be used as apostrophe
const leftChar = punctSet[0], rightChar = punctSet[1];
// if (fieldType === 'markdown' && leftChar === '<') continue; // markdown uses this for block quote
diff --git a/src/core/file-text-check.js b/src/core/file-text-check.js
index 3e6a5958..fa884702 100644
--- a/src/core/file-text-check.js
+++ b/src/core/file-text-check.js
@@ -18,10 +18,10 @@ export function checkTextfileContents(languageCode, fileType, filename, fileText
// The list contains objects with the following fields:
// priority (compulsory): the priority number 0..999 (usually 800+ are errors, lower are warnings)
// message (compulsory): the error description string
- // characterIndeX: the 0-based index for the position in the string
+ // characterIndex: the 0-based index for the position in the string
// extract: a short extract of the string containing the error (or empty-string if irrelevant)
// (Returned in this way for more intelligent processing at a higher level)
- // debugLog(`checkTextfileContents(${filename}, ${fileText.length.toLocaleString()} chars, '${optionalFileLocation}')…`);
+ // functionLog(`checkTextfileContents(${filename}, ${fileText.length.toLocaleString()} chars, '${optionalFileLocation}')…`);
parameterAssert(languageCode !== undefined, "checkTextfileContents: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkTextfileContents: 'languageCode' parameter should be a string not a '${typeof languageCode}': ${languageCode}`);
parameterAssert(fileType !== undefined, "checkTextfileContents: 'fileType' parameter should be defined");
@@ -55,8 +55,8 @@ export function checkTextfileContents(languageCode, fileType, filename, fileText
function ourCheckPlainText(textType, textFilename, plainText, givenLocation, checkingOptions) {
/**
* @description - checks the given text field and processes the returned results
- * @param {String} plainText - the actual text of the field being checked
- * @param {String} givenLocation - description of where the field is located
+ * @param {string} plainText - the actual text of the field being checked
+ * @param {string} givenLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
// Does basic checks for small errors like leading/trailing spaces, etc.
diff --git a/src/core/getApi.js b/src/core/getApi.js
index c0d97c6d..154bece8 100644
--- a/src/core/getApi.js
+++ b/src/core/getApi.js
@@ -78,8 +78,8 @@ export async function clearCaches() {
/**
* @description - Forms and returns a Door43 repoName string
- * @param {String} languageCode - the language code, e.g., 'en'
- * @param {String} repoCode - the repo code, e.g., 'TQ2'
+ * @param {string} languageCode - the language code, e.g., 'en'
+ * @param {string} repoCode - the repo code, e.g., 'TQ2'
* @return {String} - the Door43 repoName string
*/
export function formRepoName(languageCode, repoCode) {
@@ -132,10 +132,10 @@ async function getUnZippedFile(path) {
* searches for files in this order:
* - cache of uncompressed files (unzipStore)
* - cache of zipped repos (zipStore)
- * - and finally calls cachedFetchFileFromServer() which first checks in cacheStore to see if already fetched. * @param {String} username
- * @param {String} repository
- * @param {String} path
- * @param {String} branch
+ * - and finally calls cachedFetchFileFromServer() which first checks in cacheStore to see if already fetched. * @param {string} username
+ * @param {string} repository
+ * @param {string} path
+ * @param {string} branch
* @return {Promise<*>}
*/
// This is the function that we call the most from the outside
diff --git a/src/core/manifest-text-check.js b/src/core/manifest-text-check.js
index 049d9f48..62d2ee2f 100644
--- a/src/core/manifest-text-check.js
+++ b/src/core/manifest-text-check.js
@@ -547,7 +547,7 @@ export async function checkManifestText(username, repoName, repoBranch, manifest
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkManifestText(${username}, ${repoName}, ${repoBranch}, ${manifestText.length} chars, ${givenLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkManifestText(${username}, ${repoName}, ${repoBranch}, ${manifestText.length} chars, ${givenLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(username !== undefined, "checkManifestText: 'username' parameter should be defined");
parameterAssert(typeof username === 'string', `checkManifestText: 'username' parameter should be a string not a '${typeof username}': ${username}`);
parameterAssert(repoName !== undefined, "checkManifestText: 'repoName' parameter should be defined");
@@ -583,11 +583,11 @@ export async function checkManifestText(username, repoName, repoBranch, manifest
const cmtResult = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkManifestText success: ${successString}`);
+ // functionLog(`checkManifestText success: ${successString}`);
cmtResult.successList.push(successString);
}
function addNotice(noticeObject) {
- // debugLog(`checkManifestText Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkManifestText Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cManT addNotice: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cManT addNotice: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cManT addNotice: 'message' parameter should be defined");
@@ -714,7 +714,7 @@ export async function checkManifestText(username, repoName, repoBranch, manifest
}
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkManifestText: calling removeDisabledNotices(${cmtResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkManifestText: calling removeDisabledNotices(${cmtResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
cmtResult.noticeList = removeDisabledNotices(cmtResult.noticeList);
}
diff --git a/src/core/manifest-text-check.md b/src/core/manifest-text-check.md
index 63dcd40c..b080e92c 100644
--- a/src/core/manifest-text-check.md
+++ b/src/core/manifest-text-check.md
@@ -242,7 +242,7 @@ function CheckManifestText(props) {
setResults(
Check {chosenTextName}: "{chosenText.substr(0,256)}…"
- // Manifest contents:
+ Manifest contents:
);
diff --git a/src/core/markdown-file-contents-check.js b/src/core/markdown-file-contents-check.js
index 29ab0801..cad325f1 100644
--- a/src/core/markdown-file-contents-check.js
+++ b/src/core/markdown-file-contents-check.js
@@ -22,7 +22,7 @@ export function checkMarkdownFileContents(languageCode, markdownFilename, markdo
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkMarkdownFileContents(${languageCode}, ${markdownFilename}, ${markdownText.length}, ${givenLocation})…`);
+ // functionLog(`checkMarkdownFileContents(${languageCode}, ${markdownFilename}, ${markdownText.length}, ${givenLocation})…`);
parameterAssert(languageCode !== undefined, "checkMarkdownFileContents: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkMarkdownFileContents: 'languageCode' parameter should be a string not a '${typeof languageCode}': ${languageCode}`);
parameterAssert(markdownFilename !== undefined, "checkMarkdownFileContents: 'markdownFilename' parameter should be defined");
@@ -59,7 +59,7 @@ export function checkMarkdownFileContents(languageCode, markdownFilename, markdo
result.successList.push(successString);
}
function addNoticePartial(noticeObject) {
- // debugLog(`checkMarkdownFileContents addNoticePartial: (priority=${noticeObject.priority}) ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? " " + extract : ""}${noticeObject.location}`);
+ // functionLog(`checkMarkdownFileContents addNoticePartial: (priority=${noticeObject.priority}) ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? " " + extract : ""}${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "cMdT addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cMdT addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cMdT addNoticePartial: 'message' parameter should be defined");
@@ -78,9 +78,9 @@ export function checkMarkdownFileContents(languageCode, markdownFilename, markdo
/**
* @description - checks the given text field and processes the returned results
- * @param {String} markdownText - the actual text of the file being checked
+ * @param {string} markdownText - the actual text of the file being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} optionalFieldLocation - description of where the field is located
+ * @param {string} optionalFieldLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
async function ourCheckMarkdownText(markdownText, optionalFieldLocation, checkingOptions) {
@@ -107,8 +107,8 @@ export function checkMarkdownFileContents(languageCode, markdownFilename, markdo
/**
* @description - checks the given text field and processes the returned results
- * @param {String} markdownText - the actual text of the file being checked
- * @param {String} optionalFieldLocation - description of where the field is located
+ * @param {string} markdownText - the actual text of the file being checked
+ * @param {string} optionalFieldLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
function ourFileTextCheck(markdownText, optionalFieldLocation, checkingOptions) {
diff --git a/src/core/markdown-text-check.js b/src/core/markdown-text-check.js
index 2c7bd4ba..7715c3e4 100644
--- a/src/core/markdown-text-check.js
+++ b/src/core/markdown-text-check.js
@@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices';
import { userLog, parameterAssert } from './utilities';
-const MARKDOWN_TEXT_VALIDATOR_VERSION_STRING = '0.4.4';
+const MARKDOWN_TEXT_VALIDATOR_VERSION_STRING = '0.4.5';
const IMAGE_REGEX = new RegExp('!\\[([^\\]]+?)\\]\\(([^ \\]]+?)\\)', 'g');
@@ -27,7 +27,7 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkMarkdownText(${textName}, ${markdownText.length}, ${givenLocation})…`);
+ // functionLog(`checkMarkdownText(${textName}, ${markdownText.length}, ${givenLocation})…`);
parameterAssert(languageCode !== undefined, "checkMarkdownText: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkMarkdownText: 'languageCode' parameter should be a string not a '${typeof languageCode}': ${languageCode}`);
parameterAssert(textOrFileName !== undefined, "checkMarkdownText: 'textOrFileName' parameter should be defined");
@@ -54,8 +54,8 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
}
// else
// debugLog("Using supplied extractLength=" + extractLength, `cf. default=${DEFAULT_EXTRACT_LENGTH}`);
- // const halfLength = Math.floor(extractLength / 2); // rounded down
- // const halfLengthPlus = Math.floor((extractLength + 1) / 2); // rounded up
+ const halfLength = Math.floor(extractLength / 2); // rounded down
+ const halfLengthPlus = Math.floor((extractLength + 1) / 2); // rounded up
// debugLog("Using halfLength=" + halfLength, `halfLengthPlus=${halfLengthPlus}`);
const result = { successList: [], noticeList: [] };
@@ -65,7 +65,7 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
result.successList.push(successString);
}
function addNotice(noticeObject) {
- // debugLog(`checkMarkdownText addNotice: (priority=${noticeObject.priority}) ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? " " + extract : ""}${noticeObject.location}`);
+ // functionLog(`checkMarkdownText addNotice: (priority=${noticeObject.priority}) ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? " " + extract : ""}${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "cMdT addNotice: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cMdT addNotice: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cMdT addNotice: 'message' parameter should be defined");
@@ -85,10 +85,10 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
function ourCheckTextField(fieldName, lineNumber, fieldText, allowedLinks, optionalFieldLocation, checkingOptions) {
/**
* @description - checks the given text field and processes the returned results
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} optionalFieldLocation - description of where the field is located
+ * @param {string} optionalFieldLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
// Does basic checks for small errors like leading/trailing spaces, etc.
@@ -127,7 +127,7 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
*/
async function checkMarkdownLineContents(lineNumber, lineText, lineLocation) {
- // debugLog(`checkMarkdownLineContents for ${lineNumber} '${lineText}' at${lineLocation}`);
+ // functionLog(`checkMarkdownLineContents for ${lineNumber} '${lineText}' at${lineLocation}`);
// Check for image links
let regexResultArray;
@@ -211,7 +211,7 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
numLeadingSpaces = line.match(/^ */)[0].length;
// debugLog(`Got numLeadingSpaces=${numLeadingSpaces} for ${line}${atString}`);
if (numLeadingSpaces && lastNumLeadingSpaces && numLeadingSpaces !== lastNumLeadingSpaces)
- addNotice({ priority: 472, message: "Nesting of header levels seems confused", lineNumber: n, characterIndex: 0, location: ourLocation });
+ addNotice({ priority: 282, message: "Nesting of header levels seems confused", lineNumber: n, characterIndex: 0, location: ourLocation });
const suggestedLine = await checkMarkdownLineContents(n, line, ourLocation);
suggestedLines.push(suggestedLine === undefined ? line : suggestedLine);
@@ -225,6 +225,29 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
lastNumLeadingSpaces = numLeadingSpaces;
}
+ // Check for an uneven number of sets of symmetrical (i.e., opener == closer) multicharacter markdown formatting sequences
+ for (const thisSet of [ // Put longest ones first
+ // Seems that the fancy ones (commented out) don't find occurrences at the start (or end?) of the text
+ ['___', /___/g],
+ // ['___', r'[^_]___[^_]'], // three underlines
+ ['***', /\*\*\*/g],
+ // ['***', r'[^\*]\*\*\*[^\*]'], // three asterisks
+ ['__', /__/g],
+ // ['__', r'[^_]__[^_]'], // two underlines
+ ['**', /\*\*/g],
+ // ['**', r'[^\*]\*\*[^\*]'], // two asterisks
+ ]) {
+ const thisField = thisSet[0], thisRegex = thisSet[1];
+ const count = ((markdownText || '').match(thisRegex) || []).length; // Finds only NON-OVERLAPPING matches hopefully
+ if (count && (count % 2) !== 0) {
+ const characterIndex = markdownText.indexOf(thisField);
+ const iy = characterIndex + halfLength; // Want extract to focus more on what follows
+ const extract = /*(iy > halfLength ? '…' : '') +*/ markdownText.substring(iy - halfLength, iy + halfLengthPlus) + (iy + halfLengthPlus < markdownText.length ? '…' : '')
+ addNotice({ priority: 378, message: `Possible mismatched '${thisField}' markdown formatting pairs`, details: `${count.toLocaleString()} total occurrence${count === 1 ? '' : 's'}`, characterIndex, extract, location: ourLocation });
+ break; // Only want one warning per text
+ }
+ }
+
const suggestion = suggestedLines.join('\n');
if (suggestion !== markdownText) {
// debugLog(`Had markdown ${markdownText}`);
@@ -233,7 +256,7 @@ export async function checkMarkdownText(languageCode, textOrFileName, markdownTe
}
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkMarkdownText: calling removeDisabledNotices(${result.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkMarkdownText: calling removeDisabledNotices(${result.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
result.noticeList = removeDisabledNotices(result.noticeList);
}
diff --git a/src/core/orig-quote-check.js b/src/core/orig-quote-check.js
index bc67cdd2..9f77866c 100644
--- a/src/core/orig-quote-check.js
+++ b/src/core/orig-quote-check.js
@@ -31,7 +31,7 @@ export async function checkOriginalLanguageQuote(languageCode, fieldName, fieldT
// (UHB or UGNT will be used for the repo name)
// checkingOptions?.originalLanguageRepoBranch (or tag)
- // debugLog(`checkOriginalLanguageQuote v${QUOTE_VALIDATOR_VERSION_STRING} (${fieldName}, (${fieldText.length}) '${fieldText}', ${occurrenceString}, ${bookID} ${C}:${V} ${givenLocation}, …)…`);
+ // functionLog(`checkOriginalLanguageQuote v${QUOTE_VALIDATOR_VERSION_STRING} (${fieldName}, (${fieldText.length}) '${fieldText}', ${occurrenceString}, ${bookID} ${C}:${V} ${givenLocation}, …)…`);
parameterAssert(languageCode !== undefined, "checkOriginalLanguageQuote: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkOriginalLanguageQuote: 'languageCode' parameter should be a string not a '${typeof languageCode}'`);
parameterAssert(fieldName !== undefined, "checkOriginalLanguageQuote: 'fieldName' parameter should be defined");
@@ -59,7 +59,7 @@ export async function checkOriginalLanguageQuote(languageCode, fieldName, fieldT
const colqResult = { noticeList: [] };
function addNotice(noticeObject) {
- // debugLog(`checkOriginalLanguageQuote Notice: (priority=${noticeObject.priority}) ${noticeObject.message}${characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
+ // functionLog(`checkOriginalLanguageQuote Notice: (priority=${noticeObject.priority}) ${noticeObject.message}${characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "cOLQ addNotice: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cOLQ addNotice: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cOLQ addNotice: 'message' parameter should be defined");
@@ -326,7 +326,7 @@ export async function checkOriginalLanguageQuote(languageCode, fieldName, fieldT
} else { // Only a single quote (no ellipsis)
if (verseText.indexOf(fieldText) >= 0) {
if (occurrence > 1) {
- // debugLog(`checkOriginalLanguageQuote is checking for ${occurrence} occurrences of ${fieldText}`);
+ // functionLog(`checkOriginalLanguageQuote is checking for ${occurrence} occurrences of ${fieldText}`);
if (verseText.split(fieldText).length <= occurrence) { // There's not enough of them
const extract = fieldText.substring(0, halfLength) + (fieldText.length > 2 * halfLength ? '…' : '') + fieldText.substring(fieldText.length - halfLength, fieldText.length);
addNotice({ priority: 917, message: "Unable to find duplicate original language quote in verse text", details: `occurrence=${occurrenceString}, passage ►${verseText}◄`, extract, location: ourLocation });
@@ -400,7 +400,7 @@ export async function checkOriginalLanguageQuote(languageCode, fieldName, fieldT
}
}
- // debugLog(`checkOriginalLanguageQuote is returning ${ JSON.stringify(colqResult) }`);
+ // functionLog(`checkOriginalLanguageQuote is returning ${ JSON.stringify(colqResult) }`);
return colqResult;
}
// end of checkOriginalLanguageQuote function
diff --git a/src/core/plain-text-check.js b/src/core/plain-text-check.js
index 6b6cd9d0..56ec66c1 100644
--- a/src/core/plain-text-check.js
+++ b/src/core/plain-text-check.js
@@ -1,4 +1,4 @@
-import { DEFAULT_EXTRACT_LENGTH, MATCHED_PUNCTUATION_PAIRS, PAIRED_PUNCTUATION_OPENERS, PAIRED_PUNCTUATION_CLOSERS, isWhitespace, countOccurrences } from './text-handling-functions'
+import { DEFAULT_EXTRACT_LENGTH, OPEN_CLOSE_PUNCTUATION_PAIRS, PAIRED_PUNCTUATION_OPENERS, PAIRED_PUNCTUATION_CLOSERS, isWhitespace, countOccurrences } from './text-handling-functions'
import { checkTextField } from './field-text-check';
import { removeDisabledNotices } from './disabled-notices';
import { parameterAssert } from './utilities';
@@ -21,7 +21,7 @@ export function checkPlainText(textType, textName, plainText, givenLocation, che
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkPlainText(${textName}, (${plainText.length} chars), ${givenLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkPlainText(${textName}, (${plainText.length} chars), ${givenLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(textType !== undefined, "checkPlainText: 'textType' parameter should be defined");
parameterAssert(typeof textType === 'string', `checkPlainText: 'textType' parameter should be a string not a '${typeof textType}': ${textType}`);
parameterAssert(textType === 'markdown' || textType === 'USFM' || textType === 'YAML' || textType === 'text' || textType === 'raw', `checkPlainText: unrecognised 'textType' parameter: '${textType}'`);
@@ -51,12 +51,12 @@ export function checkPlainText(textType, textName, plainText, givenLocation, che
const cptResult = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkPlainText success: ${successString}`);
+ // functionLog(`checkPlainText success: ${successString}`);
cptResult.successList.push(successString);
}
function addNotice(noticeObject) {
// bookID is a three-character UPPERCASE USFM book identifier or 'OBS'.
- // debugLog(`checkPlainText notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkPlainText notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cPT addNotice: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cPT addNotice: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cPT addNotice: 'message' parameter should be defined");
@@ -74,10 +74,10 @@ export function checkPlainText(textType, textName, plainText, givenLocation, che
function ourCheckTextField(lineNumber, fieldText, allowedLinks, optionalFieldLocation, checkingOptions) {
/**
* @description - checks the given text field and processes the returned results
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} optionalFieldLocation - description of where the field is located
+ * @param {string} optionalFieldLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
// Does basic checks for small errors like leading/trailing spaces, etc.
@@ -108,7 +108,7 @@ export function checkPlainText(textType, textName, plainText, givenLocation, che
function checkPlainLineContents(lineNumber, lineText, lineLocation) {
- // debugLog(`checkPlainLineContents for '${lineName}', '${lineText}' at${lineLocation}`);
+ // functionLog(`checkPlainLineContents for '${lineName}', '${lineText}' at${lineLocation}`);
let thisText = lineText.trimStart(); // So we don’t get "leading space" AND "doubled spaces" errors
if (thisText)
@@ -222,7 +222,7 @@ export function checkPlainText(textType, textName, plainText, givenLocation, che
// TODO: Is this a duplicate of the above section about nesting?
// Check matched pairs in the entire file
- for (const punctSet of MATCHED_PUNCTUATION_PAIRS) {
+ for (const punctSet of OPEN_CLOSE_PUNCTUATION_PAIRS) {
// Can’t check '‘’' coz they might be used as apostrophe
const leftChar = punctSet[0], rightChar = punctSet[1];
const leftCount = countOccurrences(plainText, leftChar),
@@ -236,7 +236,7 @@ export function checkPlainText(textType, textName, plainText, givenLocation, che
}
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkPlainText: calling removeDisabledNotices(${cptResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkPlainText: calling removeDisabledNotices(${cptResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
cptResult.noticeList = removeDisabledNotices(cptResult.noticeList);
}
diff --git a/src/core/ta-reference-check.js b/src/core/ta-reference-check.js
index 97e9a02d..0afd73e4 100644
--- a/src/core/ta-reference-check.js
+++ b/src/core/ta-reference-check.js
@@ -18,7 +18,7 @@ export async function checkSupportReferenceInTA(fieldName, fieldText, givenLocat
// checkingOptions?.taRepoSectionName
// checkingOptions?.expectFullLink (bool)
- // debugLog(`checkSupportReferenceInTA v${TA_REFERENCE_VALIDATOR_VERSION_STRING} (${fieldName}, (${fieldText.length}) '${fieldText}', ${givenLocation}, …)`);
+ // functionLog(`checkSupportReferenceInTA v${TA_REFERENCE_VALIDATOR_VERSION_STRING} (${fieldName}, (${fieldText.length}) '${fieldText}', ${givenLocation}, …)`);
parameterAssert(fieldName !== undefined, "checkSupportReferenceInTA: 'fieldText' parameter should be defined");
parameterAssert(typeof fieldName === 'string', `checkSupportReferenceInTA: 'fieldText' parameter should be a string not a '${typeof fieldName}'`);
parameterAssert(fieldText !== undefined, "checkSupportReferenceInTA: 'fieldText' parameter should be defined");
@@ -36,7 +36,7 @@ export async function checkSupportReferenceInTA(fieldName, fieldText, givenLocat
const ctarResult = { noticeList: [] };
function addNoticePartial(noticeObject) {
- // debugLog(`checkSupportReferenceInTA Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkSupportReferenceInTA Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cTAref addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cTAref addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cTAref addNoticePartial: 'message' parameter should be defined");
@@ -114,7 +114,7 @@ export async function checkSupportReferenceInTA(fieldName, fieldText, givenLocat
addNoticePartial({ priority: 888, message: `Error loading TA link`, extract: fieldText, location: `${ourLocation} ${filepath}: ${trcGCerror}` });
}
- // debugLog(`checkSupportReferenceInTA is returning ${JSON.stringify(ctarResult)}`);
+ // functionLog(`checkSupportReferenceInTA is returning ${JSON.stringify(ctarResult)}`);
return ctarResult;
}
// end of checkSupportReferenceInTA function
diff --git a/src/core/text-handling-functions.js b/src/core/text-handling-functions.js
index 5ae088a4..6c6c062e 100644
--- a/src/core/text-handling-functions.js
+++ b/src/core/text-handling-functions.js
@@ -3,16 +3,17 @@ export const DEFAULT_EXTRACT_LENGTH = 15;
// See http://xahlee.info/comp/unicode_matching_brackets.html for a more complete list
// Also see https://unicode-table.com/en/sets/quotation-marks/
-export const PAIRED_PUNCTUATION_OPENERS = '[({<⟨“‘«‹《〈⸢⸤';
+export const PAIRED_PUNCTUATION_OPENERS = '[({<⟨“‘«‹《〈⸢⸤'; // These are just single/individual characters
export const PAIRED_PUNCTUATION_CLOSERS = '])}>⟩”’»›》〉⸣⸥';
-export const MATCHED_PUNCTUATION_PAIRS = [
+export const OPEN_CLOSE_PUNCTUATION_PAIRS = [
+ // These can be multiple character sequences (as long as opener and closer are different/distinguishable)
['[', ']'], ['(', ')'], ['{', '}'],
['“', '”'], ['‘', '’'],
['<', '>'], ['⟨', '⟩'],
['«', '»'], ['‹', '›'],
['《', '》'], ['〈', '〉'],
['⸢', '⸣'], ['⸤', '⸥'],
- ['**_', '_**']
+ ['**_', '_**'] // TODO: Does this markdown belong here???
];
export const BAD_CHARACTER_COMBINATIONS = [
'\\[\\[', '\\]\\]', // These were introduced by a tC Create bug (NOTE: \[ or \] is quite legal)
diff --git a/src/core/tn-links-check.js b/src/core/tn-links-check.js
index c0f5b3ac..cabed462 100644
--- a/src/core/tn-links-check.js
+++ b/src/core/tn-links-check.js
@@ -7,7 +7,7 @@ import { userLog, debugLog, parameterAssert, logicAssert, ourParseInt } from './
// import { consoleLogObject } from '../core/utilities';
-// const TN_LINKS_VALIDATOR_VERSION_STRING = '0.7.4';
+// const TN_LINKS_VALIDATOR_VERSION_STRING = '0.7.5';
const DEFAULT_LANGUAGE_CODE = 'en';
const DEFAULT_BRANCH = 'master';
@@ -108,7 +108,7 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
// checkingOptions.checkLinkedTWArticleFlag
*/
- // debugLog(`checkTNLinksToOutside v${TN_LINKS_VALIDATOR_VERSION_STRING} ${bookID} (${fieldName}, (${fieldText.length}) '${fieldText}', ${givenLocation}, …)…`);
+ // functionLog(`checkTNLinksToOutside v${TN_LINKS_VALIDATOR_VERSION_STRING} ${bookID} (${fieldName}, (${fieldText.length}) '${fieldText}', ${givenLocation}, …)…`);
parameterAssert(bookID !== undefined, "checkTNLinksToOutside: 'bookID' parameter should be defined");
parameterAssert(typeof bookID === 'string', `checkTNLinksToOutside: 'bookID' parameter should be a string not a '${typeof bookID}'`);
parameterAssert(bookID.length === 3, `checkTNLinksToOutside: 'bookID' parameter should be three characters long not ${bookID.length}`);
@@ -131,7 +131,7 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
const ctarResult = { noticeList: [], checkedFileCount: 0, checkedFilenames: [], checkedRepoNames: [] };
function addNoticePartial(noticeObject) {
- // debugLog(`checkTNLinksToOutside Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkTNLinksToOutside Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cTNlnk addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cTNlnk addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cTNlnk addNoticePartial: 'message' parameter should be defined");
@@ -232,7 +232,7 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
// debugLog(`Got tA filepath=${filepath}`);
if (!checkingOptions?.disableAllLinkFetchingFlag) {
- // debugLog(`checkTNLinksToOutside: need to check against ${taRepoName}`);
+ // functionLog(`checkTNLinksToOutside: need to check against ${taRepoName}`);
const taPathParameters = { username: taRepoUsername, repository: taRepoName, path: filepath, branch: taRepoBranch };
let taFileContent, alreadyGaveError = false;
try {
@@ -249,9 +249,9 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
else if (taFileContent.length < 10)
addNoticePartial({ priority: 884, message: `Linked ${fieldName} TA article seems empty`, extract: regexResultArray[0], location: `${ourLocation} ${filepath}` });
else if (checkingOptions?.checkLinkedTAArticleFlag === true) {
- // debugLog(`checkTNLinksToOutside got ${checkingOptions?.checkLinkedTAArticleFlag} so checking TA article: ${filepath}`);
+ // functionLog(`checkTNLinksToOutside got ${checkingOptions?.checkLinkedTAArticleFlag} so checking TA article: ${filepath}`);
if (await alreadyChecked(taPathParameters) !== true) {
- // debugLog(`checkTNLinksToOutside needs to check TA article: ${filepath}`);
+ // functionLog(`checkTNLinksToOutside needs to check TA article: ${filepath}`);
const checkTAFileResult = await checkMarkdownText(languageCode, `TA ${regexResultArray[3]}.md`, taFileContent, ourLocation, checkingOptions);
for (const noticeObject of checkTAFileResult.noticeList)
ctarResult.noticeList.push({ ...noticeObject, username: taRepoUsername, repoCode: 'TA', repoName: taRepoName, filename: filepath, location: ` linked to${ourLocation}`, extra: 'TA' });
@@ -299,9 +299,9 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
if (twFileContent.length < 10)
addNoticePartial({ priority: 881, message: `Linked ${fieldName} TW article seems empty`, extract: regexResultArray[0], location: `${ourLocation} ${filepath}` });
else if (checkingOptions?.checkLinkedTWArticleFlag === true) {
- // debugLog(`checkTNLinksToOutside got ${checkingOptions?.checkLinkedTWArticleFlag} so checking TW article: ${filepath}`);
+ // functionLog(`checkTNLinksToOutside got ${checkingOptions?.checkLinkedTWArticleFlag} so checking TW article: ${filepath}`);
if (await alreadyChecked(twPathParameters) !== true) {
- // debugLog(`checkTNLinksToOutside needs to check TW article: ${filepath}`);
+ // functionLog(`checkTNLinksToOutside needs to check TW article: ${filepath}`);
const checkTWFileResult = await checkMarkdownText(languageCode, `TW ${regexResultArray[3]}.md`, twFileContent, ourLocation, checkingOptions);
for (const noticeObject of checkTWFileResult.noticeList)
ctarResult.noticeList.push({ ...noticeObject, username: twRepoUsername, repoCode: 'TW', repoName: twRepoName, filename: filepath, location: ` linked to${ourLocation}`, extra: 'TW' });
@@ -728,13 +728,13 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
if (totalLinks1 > BibleLinkCount) {
const leftoverLinksList1 = linksList1.filter(x => !processedLinkList.includes(x)); // Delete links that we processed above
// if (leftoverLinksList1.length > 0) debugLog(`processedLinkList (${processedLinkList.length})=${JSON.stringify(processedLinkList)}\n linksList1(${linksList1.length})=${JSON.stringify(linksList1)}\nleftoverLinksList1(${leftoverLinksList1.length})=${JSON.stringify(leftoverLinksList1)}`);
- addNoticePartial({ priority: 648, message: "Unusual [ ]( ) link(s)—not normal Bible or TN links", details: `need to carefully check ${JSON.stringify(leftoverLinksList1)}`, location: ourLocation });
+ addNoticePartial({ priority: 648, message: "Unusual [ ]( ) link(s)—not normal Bible or TN links", details: `need to carefully check ${leftoverLinksList1.length === 1 ? '"'+leftoverLinksList1[0]+'"' : JSON.stringify(leftoverLinksList1)}`, location: ourLocation });
}
const twaLinkCount = twLinkCount + taLinkCount;
if (totalLinks2 > twaLinkCount) {
const leftoverLinksList2 = linksList2.filter(x => !processedLinkList.includes(x)); // Delete links that we processed above
// if (leftoverLinksList2.length > 0) debugLog(`processedLinkList (${processedLinkList.length})=${JSON.stringify(processedLinkList)}\n linksList2(${linksList2.length})=${JSON.stringify(linksList2)}\nleftoverLinksList2(${leftoverLinksList2.length})=${JSON.stringify(leftoverLinksList2)}`);
- addNoticePartial({ priority: 649, message: "Unusual [[ ]] link(s)—not normal TA or TW links", details: `need to carefully check ${JSON.stringify(leftoverLinksList2)}`, location: ourLocation });
+ addNoticePartial({ priority: 649, message: "Unusual [[ ]] link(s)—not normal TA or TW links", details: `need to carefully check ${leftoverLinksList2.length === 1 ? '"'+leftoverLinksList2[0]+'"' : JSON.stringify(leftoverLinksList2)}`, location: ourLocation });
}
// Check for badly formed links (not processed by the above code)
@@ -756,7 +756,7 @@ export async function checkTNLinksToOutside(bookID, givenC, givenV, fieldName, f
addNoticePartial({ priority: 843, message: `Mismatched [ ]( ) link characters`, details: `left=${leftCount.toLocaleString()}, middle=${middleCount.toLocaleString()}, right=${rightCount.toLocaleString()}`, location: ourLocation });
- // debugLog(`checkTNLinksToOutside is returning ${JSON.stringify(ctarResult)}`);
+ // functionLog(`checkTNLinksToOutside is returning ${JSON.stringify(ctarResult)}`);
return ctarResult;
}
// end of checkTNLinksToOutside function
diff --git a/src/core/tn-table-row-check.js b/src/core/tn-table-row-check.js
index 0c8506b4..9c282fdc 100644
--- a/src/core/tn-table-row-check.js
+++ b/src/core/tn-table-row-check.js
@@ -1,4 +1,4 @@
-import { DEFAULT_EXTRACT_LENGTH, isWhitespace } from './text-handling-functions'
+import { DEFAULT_EXTRACT_LENGTH, isWhitespace, countOccurrences } from './text-handling-functions'
import * as books from './books/books';
import { checkTextField } from './field-text-check';
import { checkMarkdownText } from './markdown-text-check';
@@ -23,13 +23,13 @@ const TA_REGEX = new RegExp('\\[\\[rc://[^ /]+?/ta/man/[^ /]+?/([^ \\]]+?)\\]\\]
/**
*
* @description - Checks one TSV data row of translation notes (TN2)
- * @param {String} languageCode - the language code, e.g., 'en'
- * @param {String} annotationType - TN2, TQ2, TWL, SN, or SQ -- allows more specific checks
- * @param {String} line - the TSV line to be checked
- * @param {String} bookID - 3-character UPPERCASE USFM book identifier or 'OBS'
- * @param {String} givenC - chapter number or (for OBS) story number string
- * @param {String} givenV - verse number or (for OBS) frame number string
- * @param {String} givenRowLocation - description of where the line is located
+ * @param {string} languageCode - the language code, e.g., 'en'
+ * @param {string} annotationType - TN2, TQ2, TWL, SN, or SQ -- allows more specific checks
+ * @param {string} line - the TSV line to be checked
+ * @param {string} bookID - 3-character UPPERCASE USFM book identifier or 'OBS'
+ * @param {string} givenC - chapter number or (for OBS) story number string
+ * @param {string} givenV - verse number or (for OBS) frame number string
+ * @param {string} givenRowLocation - description of where the line is located
* @param {Object} checkingOptions - may contain extractLength, twRepoUsername, twRepoBranch (or tag), checkLinkedTWArticleFlag parameters
* @return {Object} - containing noticeList
*/
@@ -41,7 +41,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
Returns an object containing the noticeList.
*/
- // debugLog(`checkTN_TSVDataRow(${languageCode}, ${line}, ${bookID}, ${givenRowLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkTN_TSVDataRow(${languageCode}, ${line}, ${bookID}, ${givenRowLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(languageCode !== undefined, "checkTN_TSVDataRow: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkTN_TSVDataRow: 'languageCode' parameter should be a string not a '${typeof languageCode}'`);
parameterAssert(line !== undefined, "checkTN_TSVDataRow: 'line' parameter should be defined");
@@ -69,15 +69,15 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
/**
* @description - adds a new notice entry, adding bookID,C,V to the given fields
* @param {Number} priority - notice priority from 1 (lowest) to 999 (highest)
- * @param {String} message - the text of the notice message
- * @param {String} rowID - 4-character row ID field
+ * @param {string} message - the text of the notice message
+ * @param {string} rowID - 4-character row ID field
* @param {Number} lineNumber - one-based line number
* @param {Number} characterIndex - zero-based index of where the issue occurs in the line
- * @param {String} extract - short extract from the line centred on the problem (if available)
- * @param {String} location - description of where the issue is located
+ * @param {string} extract - short extract from the line centred on the problem (if available)
+ * @param {string} location - description of where the issue is located
*/
function addNoticePartial(noticeObject) {
- // debugLog(`checkTN_TSVDataRow addNoticePartial(priority=${noticeObject.priority}) ${noticeObject.message}, ${noticeObject.characterIndex}, ${noticeObject.extract}, ${noticeObject.location}`);
+ // functionLog(`checkTN_TSVDataRow addNoticePartial(priority=${noticeObject.priority}) ${noticeObject.message}, ${noticeObject.characterIndex}, ${noticeObject.extract}, ${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "checkTN_TSVDataRow addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `checkTN_TSVDataRow addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "checkTN_TSVDataRow addNoticePartial: 'message' parameter should be defined");
@@ -97,11 +97,11 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
/**
* @description - checks the given markdown field and processes the returned results
- * @param {String} rowID - 4-character row ID field
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} rowID - 4-character row ID field
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} rowLocation - description of where the line is located
+ * @param {string} rowLocation - description of where the line is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
async function ourMarkdownTextChecks(rowID, fieldName, fieldText, allowedLinks, rowLocation, checkingOptions) {
@@ -113,7 +113,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
// We don’t currently use the allowedLinks parameter
- // debugLog(`checkTN_TSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
+ // functionLog(`checkTN_TSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkTN_TSVDataRow ourMarkdownTextChecks: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkTN_TSVDataRow ourMarkdownTextChecks: 'rowID' parameter should be a string not a '${typeof rowID}'`);
// parameterAssert(fieldName !== undefined, "checkTN_TSVDataRow ourMarkdownTextChecks: 'fieldName' parameter should be defined");
@@ -148,11 +148,11 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
/**
* @description - checks the given text field and processes the returned results
- * @param {String} rowID - 4-character row ID field
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} rowID - 4-character row ID field
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} rowLocation - description of where the line is located
+ * @param {string} rowLocation - description of where the line is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
function ourCheckTextField(rowID, fieldName, fieldText, allowedLinks, rowLocation, checkingOptions) {
@@ -162,7 +162,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
// Updates the global list of notices
- // debugLog(`checkTN_TSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
+ // functionLog(`checkTN_TSVDataRow ourCheckTextField(${fieldName}, (${fieldText.length}), ${allowedLinks}, ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkTN_TSVDataRow ourCheckTextField: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkTN_TSVDataRow ourCheckTextField: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkTN_TSVDataRow ourCheckTextField: 'fieldName' parameter should be defined");
@@ -203,7 +203,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
// Updates the global list of notices
- // debugLog(`checkTN_TSVDataRow ourCheckSupportReferenceInTA(${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
+ // functionLog(`checkTN_TSVDataRow ourCheckSupportReferenceInTA(${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkTN_TSVDataRow ourCheckSupportReferenceInTA: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkTN_TSVDataRow ourCheckSupportReferenceInTA: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkTN_TSVDataRow ourCheckSupportReferenceInTA: 'fieldName' parameter should be defined");
@@ -243,7 +243,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
// Updates the global list of notices
- // debugLog(`checkTN_TSVDataRow ourCheckTNOriginalLanguageQuote(${fieldName}, (${fieldText.length}) '${fieldText}', ${rowLocation}, …)`);
+ // functionLog(`checkTN_TSVDataRow ourCheckTNOriginalLanguageQuote(${fieldName}, (${fieldText.length}) '${fieldText}', ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkTN_TSVDataRow ourCheckTNOriginalLanguageQuote: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkTN_TSVDataRow ourCheckTNOriginalLanguageQuote: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkTN_TSVDataRow ourCheckTNOriginalLanguageQuote: 'fieldName' parameter should be defined");
@@ -287,7 +287,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
// Updates the global list of notices
- // debugLog(`checkTN_TSVDataRow ourCheckTNLinksToOutside(${rowID}, ${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
+ // functionLog(`checkTN_TSVDataRow ourCheckTNLinksToOutside(${rowID}, ${fieldName}, (${taLinkText.length}) '${taLinkText}', ${rowLocation}, …)`);
parameterAssert(rowID !== undefined, "checkTN_TSVDataRow ourCheckTNLinksToOutside: 'rowID' parameter should be defined");
parameterAssert(typeof rowID === 'string', `checkTN_TSVDataRow ourCheckTNLinksToOutside: 'rowID' parameter should be a string not a '${typeof rowID}'`);
parameterAssert(fieldName !== undefined, "checkTN_TSVDataRow ourCheckTNLinksToOutside: 'fieldName' parameter should be defined");
@@ -410,10 +410,10 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
if (V.length) {
if (V !== givenV)
addNoticePartial({ priority: 975, message: "Wrong verse number", details: `expected '${givenV}'`, rowID, fieldName: 'Verse', extract: V, location: ourRowLocation });
- if (V === 'intro') { }
+ if (bookID === 'OBS' || V === 'intro') { }
else if (/^\d+$/.test(V)) {
let intV = Number(V);
- if (intV === 0)
+ if (intV === 0 && bookID !== 'PSA') // Psalms have \d as verse zero
addNoticePartial({ priority: 814, message: "Invalid zero verse number", rowID, fieldName: 'Verse', extract: V, location: ourRowLocation });
else {
if (haveGoodChapterNumber) {
@@ -442,7 +442,7 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
} else if (LC_ALPHABET.indexOf(rowID[0]) < 0)
addNoticePartial({ priority: 176, message: "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation });
else if (LC_ALPHABET_PLUS_DIGITS.indexOf(rowID[3]) < 0)
- addNoticePartial({ priority: 175, message: "Row ID should end with a lowercase letter or digit", characterIndeX: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation });
+ addNoticePartial({ priority: 175, message: "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', extract: rowID, location: ourRowLocation });
else if (LC_ALPHABET_PLUS_DIGITS_PLUS_HYPHEN.indexOf(rowID[1]) < 0)
addNoticePartial({ priority: 174, message: "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, extract: rowID, location: ourRowLocation });
else if (LC_ALPHABET_PLUS_DIGITS_PLUS_HYPHEN.indexOf(rowID[2]) < 0)
@@ -465,8 +465,10 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
if (occurrenceNote.indexOf(supportReference) < 0) // The full link is NOT in the note!
addNoticePartial({ priority: 787, message: "Link to TA should also be in OccurrenceNote", fieldName: 'SupportReference', extract: supportReference, rowID, location: ourRowLocation });
}
- if (supportReference.indexOf('\u200B') >= 0)
- addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", fieldName: 'SupportReference', rowID, location: ourRowLocation });
+ if (supportReference.indexOf('\u200B') >= 0) {
+ const charCount = countOccurrences(supportReference, '\u200B');
+ addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", details: `${charCount} occurrence${charCount === 1 ? '' : 's'} found`, fieldName: 'SupportReference', rowID, location: ourRowLocation });
+ }
}
// // TODO: Check if this is really required????
// else if (/^\d+$/.test(C) && /^\d+$/.test(V)) // C:V are both digits
@@ -505,8 +507,10 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
}
if (GLQuote.length) { // TODO: need to check UTN against ULT
- if (GLQuote.indexOf('\u200B') >= 0)
- addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", fieldName: 'GLQuote', rowID, location: ourRowLocation });
+ if (GLQuote.indexOf('\u200B') >= 0) {
+ const charCount = countOccurrences(GLQuote, '\u200B');
+ addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", details: `${charCount} occurrence${charCount === 1 ? '' : 's'} found`, fieldName: 'GLQuote', rowID, location: ourRowLocation });
+ }
if (isWhitespace(GLQuote))
addNoticePartial({ priority: 373, message: "Field is only whitespace", fieldName: 'GLQuote', rowID, location: ourRowLocation });
else // More than just whitespace
@@ -518,8 +522,10 @@ export async function checkTN_TSVDataRow(languageCode, line, bookID, givenC, giv
// addNoticePartial({ priority: 275, message: "Missing GLQuote field", rowID, location: ourRowLocation });
if (occurrenceNote.length) {
- if (occurrenceNote.indexOf('\u200B') >= 0)
- addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation });
+ if (occurrenceNote.indexOf('\u200B') >= 0) {
+ const charCount = countOccurrences(occurrenceNote, '\u200B');
+ addNoticePartial({ priority: 374, message: "Field contains zero-width space(s)", details: `${charCount} occurrence${charCount === 1 ? '' : 's'} found`, fieldName: 'OccurrenceNote', rowID, location: ourRowLocation });
+ }
if (isWhitespace(occurrenceNote))
addNoticePartial({ priority: 373, message: "Field is only whitespace", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation });
else { // More than just whitespace
diff --git a/src/core/tn-table-text-check.js b/src/core/tn-table-text-check.js
index ec2d4cbd..497b60f1 100644
--- a/src/core/tn-table-text-check.js
+++ b/src/core/tn-table-text-check.js
@@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices';
import { debugLog, parameterAssert } from './utilities';
-const TN_TABLE_TEXT_VALIDATOR_VERSION_STRING = '0.3.2';
+const TN_TABLE_TEXT_VALIDATOR_VERSION_STRING = '0.3.3';
const NUM_EXPECTED_TN_TSV_FIELDS = 9; // so expects 8 tabs per line
const EXPECTED_TN_HEADING_LINE = 'Book\tChapter\tVerse\tID\tSupportReference\tOrigQuote\tOccurrence\tGLQuote\tOccurrenceNote';
@@ -29,7 +29,7 @@ export async function checkTN_TSVText(languageCode, bookID, filename, tableText,
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkTN_TSVText(${languageCode}, ${bookID}, ${filename}, ${tableText.length}, ${givenLocation},${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkTN_TSVText(${languageCode}, ${bookID}, ${filename}, ${tableText.length}, ${givenLocation},${JSON.stringify(checkingOptions)})…`);
parameterAssert(languageCode !== undefined, "checkTN_TSVText: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkTN_TSVText: 'languageCode' parameter should be a string not a '${typeof languageCode}'`);
parameterAssert(bookID !== undefined, "checkTN_TSVText: 'bookID' parameter should be defined");
@@ -51,7 +51,7 @@ export async function checkTN_TSVText(languageCode, bookID, filename, tableText,
* @param {string} successString
*/
function addSuccessMessage(successString) {
- // debugLog(`checkTN_TSVText success: ${successString}`);
+ // functionLog(`checkTN_TSVText success: ${successString}`);
ttResult.successList.push(successString);
}
/**
@@ -59,7 +59,7 @@ export async function checkTN_TSVText(languageCode, bookID, filename, tableText,
* @param {Object} noticeObject
*/
function addNoticePartial(noticeObject) {
- // debugLog(`checkTN_TSVText notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkTN_TSVText notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "TSV addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `TSV addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "TSV addNoticePartial: 'message' parameter should be defined");
@@ -114,7 +114,7 @@ export async function checkTN_TSVText(languageCode, bookID, filename, tableText,
let rowIDList = [], uniqueRowList = [];
let numVersesThisChapter = 0;
for (let n = 0; n < lines.length; n++) {
- // debugLog(`checkTN_TSVText checking line ${n}: ${JSON.stringify(lines[n])}`);
+ // functionLog(`checkTN_TSVText checking line ${n}: ${JSON.stringify(lines[n])}`);
if (n === 0) {
if (lines[0] === EXPECTED_TN_HEADING_LINE)
addSuccessMessage(`Checked TSV header ${ourLocation}`);
@@ -207,7 +207,7 @@ export async function checkTN_TSVText(languageCode, bookID, filename, tableText,
if (V === 'intro') { }
else if (/^\d+$/.test(V)) {
let intV = Number(V);
- if (intV === 0)
+ if (intV === 0 && bookID !== 'PSA') // Psalms have \d titles
addNoticePartial({ priority: 552, C, V, message: "Invalid zero verse number", details: `for chapter ${C}`, rowID, lineNumber: n + 1, extract: V, location: ourLocation });
if (intV > numVersesThisChapter)
addNoticePartial({ priority: 734, C, V, message: "Invalid large verse number", details: `for chapter ${C}`, rowID, lineNumber: n + 1, extract: V, location: ourLocation });
@@ -251,7 +251,7 @@ export async function checkTN_TSVText(languageCode, bookID, filename, tableText,
}
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkTN_TSVText: calling removeDisabledNotices(${ttResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkTN_TSVText: calling removeDisabledNotices(${ttResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
ttResult.noticeList = removeDisabledNotices(ttResult.noticeList);
}
diff --git a/src/core/usfm-js-check.js b/src/core/usfm-js-check.js
index 9e6ddd26..ecaec781 100644
--- a/src/core/usfm-js-check.js
+++ b/src/core/usfm-js-check.js
@@ -30,7 +30,7 @@ export function checkUSFMToJSON(bookID, filename, givenText, givenLocation, chec
Returns a result object containing a successList and a noticeList
*/
- // debugLog(`checkUSFMToJSON(${givenText.length.toLocaleString()} chars, '${givenLocation}')…`);
+ // functionLog(`checkUSFMToJSON(${givenText.length.toLocaleString()} chars, '${givenLocation}')…`);
parameterAssert(bookID !== undefined, "checkUSFMToJSON: 'bookID' parameter should be defined");
parameterAssert(typeof bookID === 'string', `checkUSFMToJSON: 'bookID' parameter should be a string not a '${typeof bookID}': ${bookID}`);
parameterAssert(bookID.length === 3, `checkUSFMToJSON: 'bookID' parameter should be three characters long not ${bookID.length}`);
@@ -51,19 +51,19 @@ export function checkUSFMToJSON(bookID, filename, givenText, givenLocation, chec
const result = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkUSFMToJSON success: ${successString}`);
+ // functionLog(`checkUSFMToJSON success: ${successString}`);
result.successList.push(successString);
}
function addNotice6to7({ priority, message, lineNumber, characterIndex, extract, location }) {
/**
* @description - adds a new notice entry, adding bookID,C,V to the given fields
* @param {Number} priority - notice priority from 1 (lowest) to 999 (highest)
- * @param {String} message - the text of the notice message
+ * @param {string} message - the text of the notice message
* @param {Number} characterIndex - where the issue occurs in the line
- * @param {String} extract - short extract from the line centred on the problem (if available)
- * @param {String} location - description of where the issue is located
+ * @param {string} extract - short extract from the line centred on the problem (if available)
+ * @param {string} location - description of where the issue is located
*/
- // debugLog(`checkUSFMToJSON notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkUSFMToJSON notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(priority !== undefined, "cUSFMjs addNotice6to7: 'priority' parameter should be defined");
parameterAssert(typeof priority === 'number', `cUSFMjs addNotice6to7: 'priority' parameter should be a number not a '${typeof priority}': ${priority}`);
parameterAssert(message !== undefined, "cUSFMjs addNotice6to7: 'message' parameter should be defined");
@@ -92,7 +92,7 @@ export function checkUSFMToJSON(bookID, filename, givenText, givenLocation, chec
addSuccessMessage(`Checked USFM-JS`);
// debugLog(` checkUSFMToJSON returning with ${result.successList.length.toLocaleString()} success(es) and ${result.noticeList.length.toLocaleString()} notice(s).`);
- // debugLog(`checkUSFMToJSON result is ${JSON.stringify(result)}`);
+ // functionLog(`checkUSFMToJSON result is ${JSON.stringify(result)}`);
return result;
}
// end of checkUSFMToJSON function
diff --git a/src/core/usfm-text-check.js b/src/core/usfm-text-check.js
index ccfdb6cc..b004eca4 100644
--- a/src/core/usfm-text-check.js
+++ b/src/core/usfm-text-check.js
@@ -186,12 +186,12 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
const result = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkUSFMText success: ${successString}`);
+ // functionLog(`checkUSFMText success: ${successString}`);
result.successList.push(successString);
}
function addNoticePartial(noticeObject) {
// debugLog("checkUSFMText addNoticePartial:", JSON.stringify(noticeObject));
- // debugLog(`checkUSFMText addNoticePartial: (priority=${noticeObject.priority}) ${noticeObject.C}:${noticeObject.V} ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
+ // functionLog(`checkUSFMText addNoticePartial: (priority=${noticeObject.priority}) ${noticeObject.C}:${noticeObject.V} ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "cUSFM addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cUSFM addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cUSFM addNoticePartial: 'message' parameter should be defined");
@@ -485,13 +485,13 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
/**
* @description - checks the given text field and processes the returned results
* @param {number} lineNumber -- 1-based integer
- * @param {String} C - chapter number of the text being checked
- * @param {String} V - verse number of the text being checked
- * @param {String} fieldType - If 'USFM', fieldName will be the line marker, and fieldText will be the line text; If 'raw', fieldName will be 'from {marker}' and fieldText will have internal USFM markers removed
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} C - chapter number of the text being checked
+ * @param {string} V - verse number of the text being checked
+ * @param {string} fieldType - If 'USFM', fieldName will be the line marker, and fieldText will be the line text; If 'raw', fieldName will be 'from {marker}' and fieldText will have internal USFM markers removed
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} fieldLocation - description of where the field is located
+ * @param {string} fieldLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
function ourCheckTextField(lineNumber, C, V, fieldType, fieldName, fieldText, allowedLinks, fieldLocation, checkingOptions) {
@@ -626,8 +626,8 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
*/
function checkUSFMLineText(lineNumber, C, V, marker, rest, lineLocation, checkingOptions) {
// Removes character formatting within the line contents and checks the remaining text
- // debugLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
- // debugLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}=${rest.length} chars, ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}=${rest.length} chars, ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
const details = `(line marker=\\${marker})`
@@ -694,7 +694,7 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
// if (adjustedRest.indexOf('\\z') >= 0) userLog(`checkUSFMLineText here first at ${lineNumber} ${C}:${V} with ${marker}='${adjustedRest}'`);
let nextZIndex;
while ((nextZIndex = adjustedRest.indexOf('\\zaln-s ')) >= 0) {
- // debugLog(`checkUSFMLineText here with ${marker}='${adjustedRest}'`);
+ // functionLog(`checkUSFMLineText here with ${marker}='${adjustedRest}'`);
const ixZEnd = adjustedRest.indexOf('\\*');
// debugLog(` ${nextZIndex} and ${ixZEnd}`);
if (ixZEnd >= 0) {
@@ -735,7 +735,7 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
if (ixFEnd >= 0) {
parameterAssert(ixFEnd > nextWIndex, `Exected closure at ${ixFEnd} to be AFTER \\w (${nextFIndex})`);
adjustedRest = adjustedRest.substring(0, nextFIndex) + adjustedRest.substring(nextFIndex + 5, ixFEnd) + adjustedRest.substring(ixFEnd + 3, adjustedRest.length);
- // debugLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
// debugLog(`After removing footnote: '${adjustedRest}'`);
} else {
userLog(`\\f seems unclosed: 'adjustedRest' from '${rest}'`);
@@ -756,7 +756,7 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
// debugLog(`ERROR 775: in ${marker} '${adjustedRest}' from '${rest}'`);
}
if (adjustedRest.indexOf('\\') >= 0 || adjustedRest.indexOf('|') >= 0) {
- // debugLog(`checkUSFMLineText ${languageCode} ${filename} ${lineNumber} ${C}:${V} somehow ended up with ${marker}='${adjustedRest}'`);
+ // functionLog(`checkUSFMLineText ${languageCode} ${filename} ${lineNumber} ${C}:${V} somehow ended up with ${marker}='${adjustedRest}'`);
characterIndex = adjustedRest.indexOf('\\');
if (characterIndex === -1) characterIndex = adjustedRest.indexOf('|');
const extract = (characterIndex > halfLength ? '…' : '') + adjustedRest.substring(characterIndex - halfLength, characterIndex + halfLengthPlus).replace(/ /g, '␣') + (characterIndex + halfLengthPlus < adjustedRest.length ? '…' : '')
@@ -913,7 +913,7 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
function checkUSFMLineInternals(lineNumber, C, V, marker, rest, lineLocation, checkingOptions) {
// Handles character formatting within the line contents
- // debugLog(`checkUSFMLineInternals(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkUSFMLineInternals(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`);
if (marker === 'c' && isNaN(rest))
addNoticePartial({ priority: 822, message: "Expected field to contain an integer", lineNumber, characterIndex: 3, extract: `\\c ${rest}`, C, V, location: lineLocation });
@@ -1182,12 +1182,12 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex
// addNoticePartial({priority:103, `USFMGrammar: ${warningString.trim()}`, location});
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkUSFMText: calling removeDisabledNotices(${result.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkUSFMText: calling removeDisabledNotices(${result.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
result.noticeList = removeDisabledNotices(result.noticeList);
}
// debugLog(` checkUSFMText returning with ${result.successList.length.toLocaleString()} success(es) and ${result.noticeList.length.toLocaleString()} notice(s).`);
- // debugLog(`checkUSFMText result is ${JSON.stringify(result)}`);
+ // functionLog(`checkUSFMText result is ${JSON.stringify(result)}`);
return result;
}
// end of checkUSFMText function
diff --git a/src/core/yaml-text-check.js b/src/core/yaml-text-check.js
index 793e1a7c..61cf1fab 100644
--- a/src/core/yaml-text-check.js
+++ b/src/core/yaml-text-check.js
@@ -16,7 +16,7 @@ export function checkYAMLText(languageCode, textName, YAMLText, givenLocation, c
as well as the parsed YAML for further checking.
*/
- // debugLog(`checkYAMLText(${textName}, ${YAMLText.length}, ${givenLocation})…`);
+ // functionLog(`checkYAMLText(${textName}, ${YAMLText.length}, ${givenLocation})…`);
parameterAssert(languageCode !== undefined, "checkYAMLText: 'languageCode' parameter should be defined");
parameterAssert(typeof languageCode === 'string', `checkYAMLText: 'languageCode' parameter should be a string not a '${typeof languageCode}': ${languageCode}`);
parameterAssert(textName !== undefined, "checkYAMLText: 'textName' parameter should be defined");
@@ -51,11 +51,11 @@ export function checkYAMLText(languageCode, textName, YAMLText, givenLocation, c
const cytResult = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkYAMLText success: ${successString}`);
+ // functionLog(`checkYAMLText success: ${successString}`);
cytResult.successList.push(successString);
}
function addNotice(noticeObject) {
- // debugLog(`checkYAMLText Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkYAMLText Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cYt addNotice: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cManT addNotice: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cYt addNotice: 'message' parameter should be defined");
@@ -73,10 +73,10 @@ export function checkYAMLText(languageCode, textName, YAMLText, givenLocation, c
function ourCheckTextField(lineNumber, fieldText, allowedLinks, optionalFieldLocation, checkingOptions) {
/**
* @description - checks the given text field and processes the returned results
- * @param {String} fieldName - name of the field being checked
- * @param {String} fieldText - the actual text of the field being checked
+ * @param {string} fieldName - name of the field being checked
+ * @param {string} fieldText - the actual text of the field being checked
* @param {boolean} allowedLinks - true if links are allowed in the field, otherwise false
- * @param {String} optionalFieldLocation - description of where the field is located
+ * @param {string} optionalFieldLocation - description of where the field is located
* @param {Object} checkingOptions - parameters that might affect the check
*/
// Does basic checks for small errors like leading/trailing spaces, etc.
@@ -104,7 +104,7 @@ export function checkYAMLText(languageCode, textName, YAMLText, givenLocation, c
function checkYAMLLineContents(lineNumber, lineText, lineLocation) {
- // debugLog(`checkYAMLLineContents for '${lineNumber} ${lineText}' at${lineLocation}`);
+ // functionLog(`checkYAMLLineContents for '${lineNumber} ${lineText}' at${lineLocation}`);
let thisText = lineText
// Remove leading spaces
@@ -191,7 +191,7 @@ export function checkYAMLText(languageCode, textName, YAMLText, givenLocation, c
ourBasicFileChecks(textName, YAMLText, givenLocation, checkingOptions);
if (!checkingOptions?.suppressNoticeDisablingFlag) {
- // debugLog(`checkYAMLText: calling removeDisabledNotices(${cytResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
+ // functionLog(`checkYAMLText: calling removeDisabledNotices(${cytResult.noticeList.length}) having ${JSON.stringify(checkingOptions)}`);
cytResult.noticeList = removeDisabledNotices(cytResult.noticeList);
}
diff --git a/src/demos/RenderProcessedResults.js b/src/demos/RenderProcessedResults.js
index 42c6940c..6ac2bdb6 100644
--- a/src/demos/RenderProcessedResults.js
+++ b/src/demos/RenderProcessedResults.js
@@ -70,7 +70,7 @@ export function RenderTotals({ rawNoticeListLength, results }) {
/**
* @description - Displays a given piece of text (which can include newline characters)
-* @param {String} text - text to render as numbered lines
+* @param {string} text - text to render as numbered lines
* @return {String} - rendered HTML for the numbered list of lines
*/
export function RenderLines({ text }) {
@@ -208,9 +208,9 @@ export function RenderRawResults({ results }) {
/**
* @description - Displays the message plus details if specified
-* @param {String} color - color field for the message style
-* @param {String} message - notice text
-* @param {String} details - (optional) extra notice text
+* @param {string} color - color field for the message style
+* @param {string} message - notice text
+* @param {string} details - (optional) extra notice text
* @return {String} - rendered HTML for the given reference
*/
function RenderMessage({ color, message, details }) {
@@ -223,9 +223,9 @@ function RenderMessage({ color, message, details }) {
/**
* @description - Displays the bookcode and chapter/verse details if specified
-* @param {String} bookID - (optional) 3-character UPPERCASE USFM bookcode or 'OBS'.
-* @param {String} C - (optional) chapter info
-* @param {String} V - (optional) verse info
+* @param {string} bookID - (optional) 3-character UPPERCASE USFM bookcode or 'OBS'.
+* @param {string} C - (optional) chapter info
+* @param {string} V - (optional) verse info
* @return {String} - rendered HTML for the given reference
*/
function RenderBCV({ bookID, C, V }) {
@@ -244,12 +244,12 @@ function RenderBCV({ bookID, C, V }) {
/**
* @description - Displays the repoName and filename/lineNumber details if specified
-* @param {String} username - (optional) username/orgName string
-* @param {String} repoName - (optional) repo name string
-* @param {String} filename - (optional) filename string
+* @param {string} username - (optional) username/orgName string
+* @param {string} repoName - (optional) repo name string
+* @param {string} filename - (optional) filename string
* @param {Number} lineNumber - (optional) line number integer (1-based)
-* @param {String} rowID - (optional) 4-character ID field
-* @param {String} fieldName - (optional) name of field
+* @param {string} rowID - (optional) 4-character ID field
+* @param {string} fieldName - (optional) name of field
* @return {String} - rendered HTML for the given reference
*/
function RenderFileDetails({ username, repoName, filename, lineNumber, rowID, fieldName }) {
diff --git a/src/demos/book-package-check/BookPackageCheck.js b/src/demos/book-package-check/BookPackageCheck.js
index 8f012872..8c883fa5 100644
--- a/src/demos/book-package-check/BookPackageCheck.js
+++ b/src/demos/book-package-check/BookPackageCheck.js
@@ -47,8 +47,8 @@ function BookPackageCheck(/*username, languageCode, bookID,*/ props) {
if (props.disableAllLinkFetchingFlag) checkingOptions.disableAllLinkFetchingFlag = props.disableAllLinkFetchingFlag.toLowerCase() === 'true';
if (props.checkLinkedTAArticleFlag) checkingOptions.checkLinkedTAArticleFlag = props.checkLinkedTAArticleFlag.toLowerCase() === 'true';
if (props.checkLinkedTWArticleFlag) checkingOptions.checkLinkedTWArticleFlag = props.checkLinkedTWArticleFlag.toLowerCase() === 'true';
- // debugLog(`checkingOptions.checkLinkedTAArticleFlag ${checkingOptions.checkLinkedTAArticleFlag} from '${props.checkLinkedTAArticleFlag}'`);
- // debugLog(`checkingOptions.checkLinkedTWArticleFlag ${checkingOptions.checkLinkedTWArticleFlag} from '${props.checkLinkedTWArticleFlag}'`);
+ // functionLog(`checkingOptions.checkLinkedTAArticleFlag ${checkingOptions.checkLinkedTAArticleFlag} from '${props.checkLinkedTAArticleFlag}'`);
+ // functionLog(`checkingOptions.checkLinkedTWArticleFlag ${checkingOptions.checkLinkedTWArticleFlag} from '${props.checkLinkedTWArticleFlag}'`);
useEffect(() => {
// const newProps = { bookID, branch, checkingOptions, languageCode, cutoffPriorityLevel: props.cutoffPriorityLevel, displayType: props.displayType, errorPriorityLevel: props.errorPriorityLevel, maximumSimilarMessages: props.maximumSimilarMessages, sortBy: props.sortBy, username};
diff --git a/src/demos/book-package-check/checkBookPackage.js b/src/demos/book-package-check/checkBookPackage.js
index f101b636..43829a05 100644
--- a/src/demos/book-package-check/checkBookPackage.js
+++ b/src/demos/book-package-check/checkBookPackage.js
@@ -1,7 +1,7 @@
import React from 'react';
import { userLog, parameterAssert } from '../../core/utilities';
import * as books from '../../core/books/books';
-import { formRepoName, repositoryExistsOnDoor43, getFileListFromZip, cachedGetFile, cachedGetBookFilenameFromManifest, checkManifestText } from '../../core';
+import { formRepoName, repositoryExistsOnDoor43, getFileListFromZip, cachedGetFile, cachedGetBookFilenameFromManifest, checkManifestText, checkMarkdownText } from '../../core';
import { checkFileContents } from '../file-check/checkFileContents';
import { checkRepo } from '../repo-check/checkRepo';
@@ -29,7 +29,7 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
Note that bookID here can also be the 'OBS' pseudo bookID.
*/
- // debugLog(`checkBookPackage(${username}, ${languageCode}, ${bookID}, (fn), ${JSON.stringify(checkingOptions)})…`)
+ // functionLog(`checkBookPackage(${username}, ${languageCode}, ${bookID}, (fn), ${JSON.stringify(checkingOptions)})…`)
parameterAssert(username !== undefined, "checkBookPackage: 'username' parameter should be defined");
parameterAssert(typeof username === 'string', `checkBookPackage: 'username' parameter should be a string not a '${typeof username}': ${username}`);
parameterAssert(languageCode !== undefined, "checkBookPackage: 'languageCode' parameter should be defined");
@@ -64,14 +64,14 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
function addSuccessMessage(successString) {
- // debugLog(`checkBookPackage success: ${successString}`);
+ // functionLog(`checkBookPackage success: ${successString}`);
checkBookPackageResult.successList.push(successString);
}
function addNoticePartial(noticeObject) {
// bookID is a three-character UPPERCASE USFM book identifier or 'OBS'.
- // debugLog(`checkBookPackage addNoticePartial: (priority=${noticeObject.priority}) ${noticeObject.bookID} ${noticeObject.C}:${noticeObject.V} ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
+ // functionLog(`checkBookPackage addNoticePartial: (priority=${noticeObject.priority}) ${noticeObject.bookID} ${noticeObject.C}:${noticeObject.V} ${noticeObject.message}${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${extract ? ` ${extract}` : ""}${location}`);
parameterAssert(noticeObject.priority !== undefined, "cBP addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cBP addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`);
parameterAssert(noticeObject.message !== undefined, "cBP addNoticePartial: 'message' parameter should be defined");
@@ -100,7 +100,7 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
async function ourCheckBPFileContents(repoCode, repoName, cfFilename, fileContent, fileLocation, checkingOptions) {
- // debugLog(`checkBookPackage ourCheckBPFileContents(${repoCode}, ${cfFilename}, ${fileContent.length}, ${fileLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkBookPackage ourCheckBPFileContents(${repoCode}, ${cfFilename}, ${fileContent.length}, ${fileLocation}, ${JSON.stringify(checkingOptions)})…`);
// Updates the global list of notices
parameterAssert(repoCode !== undefined, "cBP ourCheckBPFileContents: 'repoCode' parameter should be defined");
@@ -151,7 +151,7 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
*/
async function ourCheckManifest(repoCode, repoName, repoBranch, manifestLocation, checkingOptions) {
// Updates the global list of notices
- // debugLog(`checkBookPackage ourCheckManifest(${repoCode}, ${repoName}, ${repoBranch}, ${manifestLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkBookPackage ourCheckManifest(${repoCode}, ${repoName}, ${repoBranch}, ${manifestLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(repoCode !== undefined, "cBP ourCheckManifest: 'repoCode' parameter should be defined");
parameterAssert(typeof repoCode === 'string', `cBP ourCheckManifest: 'repoCode' parameter should be a string not a '${typeof repoCode}' : ${repoCode}`);
parameterAssert(repoName !== undefined, "cBP ourCheckManifest: 'repoName' parameter should be defined");
@@ -207,42 +207,42 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
* @param {string} repoCode, e.g., TA
* @param {string} repoName, e.g., en_ta
* @param {string} filename, e.g., README.md
- * @param {string} manifestLocation
+ * @param {string} markdownLocation
* @param {Object} checkingOptions
*/
- async function ourCheckMarkdown(repoCode, repoName, repoBranch, filename, manifestLocation, checkingOptions) {
+ async function ourCheckMarkdown(repoCode, repoName, repoBranch, filename, markdownLocation, checkingOptions) {
// Updates the global list of notices
- // debugLog(`checkBookPackage ourCheckMarkdown(${repoCode}, ${repoName}, #{repoBranch}, ${manifestLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkBookPackage ourCheckMarkdown(${repoCode}, ${repoName}, #{repoBranch}, ${markdownLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(repoCode !== undefined, "cBP ourCheckMarkdown: 'repoCode' parameter should be defined");
parameterAssert(typeof repoCode === 'string', `cBP ourCheckMarkdown: 'repoCode' parameter should be a string not a '${typeof repoCode}'`);
parameterAssert(repoName !== undefined, "cBP ourCheckMarkdown: 'repoName' parameter should be defined");
parameterAssert(typeof repoName === 'string', `cBP ourCheckMarkdown: 'repoName' parameter should be a string not a '${typeof repoName}'`);
parameterAssert(repoBranch !== undefined, "cBP ourCheckMarkdown: 'repoBranch' parameter should be defined");
parameterAssert(typeof repoBranch === 'string', `cBP ourCheckMarkdown: 'repoBranch' parameter should be a string not a '${typeof repoBranch}'`);
- parameterAssert(manifestLocation !== undefined, "cBP ourCheckMarkdown: 'manifestLocation' parameter should be defined");
- parameterAssert(typeof manifestLocation === 'string', `cBP ourCheckMarkdown: 'manifestLocation' parameter should be a string not a '${typeof manifestLocation}'`);
+ parameterAssert(markdownLocation !== undefined, "cBP ourCheckMarkdown: 'markdownLocation' parameter should be defined");
+ parameterAssert(typeof markdownLocation === 'string', `cBP ourCheckMarkdown: 'markdownLocation' parameter should be a string not a '${typeof markdownLocation}'`);
- let manifestFileContent;
+ let markdownFileContent;
try {
- // debugLog("checkBookPackage ourCheckMarkdown about to fetch manifest", username, repoName, repoBranch);
- manifestFileContent = await getFile_({ username, repository: repoName, path: filename, branch: repoBranch });
- // debugLog("checkBookPackage ourCheckMarkdown fetched content for manifest", username, repoName, repoBranch, typeof manifestFileContent, manifestFileContent.length);
- // debugLog(manifestFileContent);
+ // debugLog("checkBookPackage ourCheckMarkdown about to fetch markdown file", username, repoName, repoBranch, filename);
+ markdownFileContent = await getFile_({ username, repository: repoName, path: filename, branch: repoBranch });
+ // debugLog("checkBookPackage ourCheckMarkdown fetched markdown content", username, repoName, repoBranch, filename, typeof markdownFileContent, markdownFileContent.length);
+ // debugLog(markdownFileContent);
} catch (cBPgfError) {
- console.error(`checkBookPackage ourCheckMarkdown(${username}, ${languageCode}, ${bookID}, (fn), ${JSON.stringify(checkingOptions)}) failed to load manifest`, username, repoName, originalBranch, cBPgfError + '');
+ console.error(`checkBookPackage ourCheckMarkdown(${username}, ${languageCode}, ${bookID}, (fn), ${JSON.stringify(checkingOptions)}) failed to load markdown`, username, repoName, filename, originalBranch, cBPgfError + '');
let details = `username=${username}`;
if (! await repositoryExistsOnDoor43({ username, repository: repoName }))
- checkBookPackageResult.noticeList.push({ priority: 997, message: "Repository doesn’t exist", details, username, repoCode, repoName, location: manifestLocation, extra: repoCode });
+ checkBookPackageResult.noticeList.push({ priority: 997, message: "Repository doesn’t exist", details, username, repoCode, repoName, location: markdownLocation, extra: repoCode });
else {
// eslint-disable-next-line eqeqeq
if (cBPgfError != 'TypeError: repoFileContent is null') details += ` error=${cBPgfError}`;
- addNoticePartial({ priority: 996, message: "Unable to load", details: `username=${username} error=${cBPgfError}`, repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: repoCode });
+ addNoticePartial({ priority: 996, message: "Unable to load", details: `username=${username} error=${cBPgfError}`, repoName, filename, location: markdownLocation, extra: repoCode });
}
}
- if (manifestFileContent) {
- const cmtResultObject = await checkManifestText(username, repoName, manifestFileContent, manifestLocation, checkingOptions);
- // debugLog(`ourCheckMarkdown checkManifestText(${repoName}) returned ${cmtResultObject.successList.length} success message(s) and ${cmtResultObject.noticeList.length} notice(s)`);
- // debugLog(`ourCheckMarkdown checkManifestText(${repoName}) returned ${JSON.stringify(cmtResultObject)}`);
+ if (markdownFileContent) {
+ const cmtResultObject = await checkMarkdownText(username, repoName, markdownFileContent, markdownLocation, checkingOptions);
+ // debugLog(`ourCheckMarkdown checkMarkdownText(${repoName}) returned ${cmtResultObject.successList.length} success message(s) and ${cmtResultObject.noticeList.length} notice(s)`);
+ // debugLog(`ourCheckMarkdown checkMarkdownText(${repoName}) returned ${JSON.stringify(cmtResultObject)}`);
// NOTE: We ignore the returned success messages here
// for (const successEntry of cfResultObject.successList) userLog(" ourCheckBPFileContents:", successEntry);
// debugLog("cfcResultObject", JSON.stringify(cfcResultObject));
@@ -250,14 +250,23 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
// Process noticeList line by line, appending the repoCode as an extra field as we go
for (const cfcNoticeEntry of cmtResultObject.noticeList) {
// NOTE: We don’t use addNoticePartial, because it adds a misleading BookID
- // addNoticePartial({ ...cfcNoticeEntry, filename: MANIFEST_FILENAME, extra: `${repoCode} MANIFEST` });
- checkBookPackageResult.noticeList.push({ ...cfcNoticeEntry, username, repoCode, repoName, filename: MANIFEST_FILENAME, extra: `${repoCode} MANIFEST` });
+ // addNoticePartial({ ...cfcNoticeEntry, filename, extra: `${repoCode} markdown` });
+ checkBookPackageResult.noticeList.push({ ...cfcNoticeEntry, username, repoCode, repoName, filename, extra: repoCode });
}
- return manifestFileContent.length;
+
+ if (filename === 'LICENSE.md') {
+ const fullYearString = `${(new Date()).getFullYear()}`;
+ // debugLog(`Year ${fullYearString} is ${typeof fullYearString}`);
+ if (markdownFileContent.indexOf(fullYearString) === -1) // Can't find this year string in file
+ // NOTE: We don’t use addNoticePartial, because it adds a misleading BookID
+ checkBookPackageResult.noticeList.push({ priority: 256, message: "Possibly missing current copyright year", details: fullYearString, repoName, filename, location: markdownLocation, extra: repoCode });
+ }
+
+ return markdownFileContent.length;
}
// NOTE: We don’t use addNoticePartial, because it adds a misleading BookID
- // addNoticePartial({ priority: 956, message: "Got empty manifest file", repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: `${repoCode} MANIFEST` });
- checkBookPackageResult.noticeList.push({ priority: 956, message: "Got empty manifest file", repoName, filename: MANIFEST_FILENAME, location: manifestLocation, extra: `${repoCode} MANIFEST` });
+ // addNoticePartial({ priority: 956, message: "Got empty markdown file", repoName, filename, location: markdownLocation, extra: `${repoCode} markdown` });
+ checkBookPackageResult.noticeList.push({ priority: 956, message: "Got empty markdown file", repoName, filename, location: markdownLocation, extra: repoCode });
return 0;
}
// end of ourCheckMarkdown function
@@ -284,7 +293,7 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
addNoticePartial({ priority: 902, message: "Bad function call: should be given a valid book abbreviation", extract: bookID, location: ` (not '${bookID}')${generalLocation}` }); return checkBookPackageResult;
}
}
- // debugLog(`checkBookPackage: bookNumberAndName='${bookNumberAndName}' (${whichTestament} testament)`);
+ // functionLog(`checkBookPackage: bookNumberAndName='${bookNumberAndName}' (${whichTestament} testament)`);
// So now we want to work through checking this one specified Bible book in various repos
const origLangRepoCode = whichTestament === 'old' ? 'UHB' : 'UGNT';
@@ -341,7 +350,7 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
if (repoCode === 'OBS') {
// debugLog("Calling OBS checkRepo()…");
checkBookPackageResult = await checkRepo(username, `${languageCode}_obs`, originalBranch, generalLocation, setResultValue, newCheckingOptions); // Adds the notices to checkBookPackageResult
- // debugLog(`checkRepo() returned ${checkBookPackageResult.successList.length} success message(s) and ${checkBookPackageResult.noticeList.length} notice(s)`);
+ // functionLog(`checkRepo() returned ${checkBookPackageResult.successList.length} success message(s) and ${checkBookPackageResult.noticeList.length} notice(s)`);
// debugLog("crResultObject keys", JSON.stringify(Object.keys(checkBookPackageResult)));
addSuccessMessage(`Checked ${languageCode} OBS repo from ${username}`);
} else if (repoCode === 'TQ') {
@@ -386,47 +395,66 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
checkedFilenameExtensions.add(filename.split('.').pop());
addSuccessMessage(`Checked ${repoCode.toUpperCase()} file: ${filename}`);
}
-
- if (!newCheckingOptions.disableAllLinkFetchingFlag) {
- // We also check the manifest file for each repo if requested
- // because a faulty manifest might also stop a BP from working correctly in various programs
- if (checkingOptions.checkManifestFlag) {
- if (!checkedManifestDetails.includes(repoName)) { // Don’t want to check more than once, esp. for annotations repos
- checkedManifestDetails.push(repoName); // Remember that we checked this one
- // debugLog("BEFORE", checkBookPackageResult.noticeList.length);
- const numCheckedCharacters = await ourCheckManifest(repoCode, repoName, adjustedBranch, generalLocation, newCheckingOptions);
- // debugLog("AFTER", checkBookPackageResult.noticeList.length);
- if (numCheckedCharacters > 0) {
- checkedFileCount += 1;
- checkedFilenames.push('manifest.yaml');
- checkedFilenameExtensions.add('yaml');
- totalCheckedSize += numCheckedCharacters;
- addSuccessMessage(`Checked ${repoName} manifest file`);
- }
+ } // end of repo that's not OBS or TQ
+
+ if (!newCheckingOptions?.disableAllLinkFetchingFlag) {
+ // We also check the manifest file for each repo if requested
+ // because a faulty manifest might also stop a BP from working correctly in various programs
+ if (!checkedManifestDetails.includes(repoName)) { // Don’t want to check more than once, esp. for annotations repos
+ checkedManifestDetails.push(repoName); // Remember that we checked this one
+ // debugLog(`Maybe checking MANIFEST etc. for ${repoName}`);
+
+ if (newCheckingOptions?.checkManifestFlag) {
+ // debugLog(`Checking MANIFEST for ${repoName}`);
+ const numCheckedCharacters = await ourCheckManifest(repoCode, repoName, adjustedBranch, generalLocation, newCheckingOptions);
+ if (numCheckedCharacters > 0) {
+ checkedFileCount += 1;
+ checkedFilenames.push('manifest.yaml');
+ checkedFilenameExtensions.add('yaml');
+ totalCheckedSize += numCheckedCharacters;
+ addSuccessMessage(`Checked ${repoName} manifest file`);
}
}
+ // else debugLog(`NOT checking MANIFEST for ${repoName}`);
+
// We can also check the README file for each repo if requested
- if (checkingOptions.checkReadmeFlag) {
- if (!checkedManifestDetails.includes(repoName)) { // Don’t want to check more than once, esp. for annotations repos
- checkedManifestDetails.push(repoName); // Remember that we checked this one
- // debugLog("BEFORE", checkBookPackageResult.noticeList.length);
- const filename = 'README.md';
- const numCheckedCharacters = await ourCheckMarkdown(repoCode, repoName, adjustedBranch, filename, generalLocation, newCheckingOptions);
- // debugLog("AFTER", checkBookPackageResult.noticeList.length);
- if (numCheckedCharacters > 0) {
- checkedFileCount += 1;
- checkedFilenames.push(filename);
- checkedFilenameExtensions.add('md');
- totalCheckedSize += numCheckedCharacters;
- addSuccessMessage(`Checked ${repoName} README file`);
- }
+ if (newCheckingOptions?.checkReadmeFlag) {
+ // debugLog(`Checking README for ${repoName}`);
+ const filename = 'README.md';
+ const numCheckedCharacters = await ourCheckMarkdown(repoCode, repoName, adjustedBranch, filename, generalLocation, newCheckingOptions);
+ if (numCheckedCharacters > 0) {
+ checkedFileCount += 1;
+ checkedFilenames.push(filename);
+ checkedFilenameExtensions.add('md');
+ totalCheckedSize += numCheckedCharacters;
+ addSuccessMessage(`Checked ${repoName} README file`);
}
}
+ // else debugLog(`NOT checking README for ${repoName}`);
+
+ // We can also check the LICENSE file for each repo if requested
+ if (newCheckingOptions?.checkLicenseFlag) {
+ // debugLog(`Checking LICENSE for ${repoName}`);
+ const filename = 'LICENSE.md';
+ const numCheckedCharacters = await ourCheckMarkdown(repoCode, repoName, adjustedBranch, filename, generalLocation, newCheckingOptions);
+ if (numCheckedCharacters > 0) {
+ checkedFileCount += 1;
+ checkedFilenames.push(filename);
+ checkedFilenameExtensions.add('md');
+ totalCheckedSize += numCheckedCharacters;
+ addSuccessMessage(`Checked ${repoName} LICENSE file`);
+ }
+ }
+ // else debugLog(`NOT checking LICENSE for ${repoName}`);
}
- }
+ // else debugLog(`ALREADY checked MANIFEST, etc. for ${repoName}`);
+ } // end of linkFetching not disabled
+ // else debugLog(`NOT fetching MANIFEST, etc. for ${repoName}`);
+
numCheckedRepos += 1;
} // end of repo loop
+
// Add some extra fields to our checkFileResult object
// in case we need this information again later
checkBookPackageResult.checkedFileCount = checkedFileCount;
@@ -438,7 +466,7 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
checkBookPackageResult.elapsedSeconds = (new Date() - startTime) / 1000; // seconds
// debugLog("checkBookPackageResult:", JSON.stringify(checkBookPackageResult));
- // debugLog(`checkBookPackageResult(${bookID}): elapsedSeconds = ${checkBookPackageResult.elapsedSeconds}, notices count = ${checkBookPackageResult.noticeList.length}`);
+ // functionLog(`checkBookPackageResult(${bookID}): elapsedSeconds = ${checkBookPackageResult.elapsedSeconds}, notices count = ${checkBookPackageResult.noticeList.length}`);
return checkBookPackageResult;
};
// end of checkBookPackage()
@@ -458,20 +486,20 @@ export async function checkBookPackage(username, languageCode, bookID, setResult
* @return {Object} - containing successList and noticeList
*/
async function checkTQMarkdownBook(username, languageCode, repoName, branch, bookID, checkingOptions) {
- // debugLog(`checkTQMarkdownBook(${username}, ${repoName}, ${branch}, ${bookID}, ${JSON.stringify(checkingOptions)})…`)
+ // functionLog(`checkTQMarkdownBook(${username}, ${repoName}, ${branch}, ${bookID}, ${JSON.stringify(checkingOptions)})…`)
const repoCode = 'TQ';
const generalLocation = ` in ${username} (${branch})`;
const ctqResult = { successList: [], noticeList: [] };
function addSuccessMessage(successString) {
- // debugLog(`checkBookPackage success: ${successString}`);
+ // functionLog(`checkBookPackage success: ${successString}`);
ctqResult.successList.push(successString);
}
function addNoticePartial(noticeObject) {
// bookID is a three-character UPPERCASE USFM book identifier or 'OBS'.
- // debugLog(`checkTQMarkdownBook addNoticePartial: ${noticeObject.priority}:${noticeObject.message} ${noticeObject.bookID} ${noticeObject.C}:${noticeObject.V} ${noticeObject.filename}:${noticeObject.lineNumber} ${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
+ // functionLog(`checkTQMarkdownBook addNoticePartial: ${noticeObject.priority}:${noticeObject.message} ${noticeObject.bookID} ${noticeObject.C}:${noticeObject.V} ${noticeObject.filename}:${noticeObject.lineNumber} ${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "cTQ addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cTQ addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}'`);
parameterAssert(noticeObject.message !== undefined, "cTQ addNoticePartial: 'message' parameter should be defined");
@@ -496,8 +524,19 @@ async function checkTQMarkdownBook(username, languageCode, repoName, branch, boo
}
+ /**
+ *
+ * @param {string} repoCode
+ * @param {string} bookID
+ * @param {string} C
+ * @param {string} V
+ * @param {string} cfFilename
+ * @param {string} fileContent
+ * @param {string} fileLocation
+ * @param {Object} checkingOptions
+ */
async function ourCheckTQFileContents(repoCode, bookID, C, V, cfFilename, fileContent, fileLocation, checkingOptions) {
- // debugLog(`checkBookPackage ourCheckTQFileContents(${cfFilename})`);
+ // functionLog(`checkBookPackage ourCheckTQFileContents(${cfFilename})`);
// Updates the global list of notices
parameterAssert(repoCode !== undefined, "cTQ ourCheckTQFileContents: 'repoCode' parameter should be defined");
diff --git a/src/demos/book-packages-check/checkBookPackages.js b/src/demos/book-packages-check/checkBookPackages.js
index e8181529..3dbd9d5a 100644
--- a/src/demos/book-packages-check/checkBookPackages.js
+++ b/src/demos/book-packages-check/checkBookPackages.js
@@ -15,7 +15,7 @@ export async function checkBookPackages(username, languageCode, bookIDList, setR
const checkBookPackagesResult = { successList: [], noticeList: [] };
// function addSuccessMessage(successString) {
- // // debugLog(`checkBookPackages success: ${successString}`);
+ // // functionLog(`checkBookPackages success: ${successString}`);
// checkBookPackagesResult.successList.push(successString);
// }
@@ -52,7 +52,7 @@ export async function checkBookPackages(username, languageCode, bookIDList, setR
let checkedFileCount = 0, checkedFilenames = [], checkedFilenameExtensions = new Set(), totalCheckedSize = 0, checkedRepoNames = new Set();
let checkedBibleBPManifestFlag = false;
for (const bookID of bookIDList) {
- // debugLog(`checkBookPackages bookID: ${bookID}`);
+ // functionLog(`checkBookPackages bookID: ${bookID}`);
if (abortFlag) break;
// const generalLocation = ` ${languageCode} ${bookID} book packages from ${username}`;
@@ -85,7 +85,7 @@ export async function checkBookPackages(username, languageCode, bookIDList, setR
// We use the generalLocation here (does not include repo name)
// so that we can adjust the returned strings ourselves
const cbpResultObject = await checkBookPackage(username, languageCode, bookID, setResultValue, checkingOptions);
- // debugLog(`checkBookPackage() returned ${cbpResultObject.successList.length} success message(s) and ${cbpResultObject.noticeList.length} notice(s)`);
+ // functionLog(`checkBookPackage() returned ${cbpResultObject.successList.length} success message(s) and ${cbpResultObject.noticeList.length} notice(s)`);
// Concat is faster if we don’t need to process each success message individually
checkBookPackagesResult.successList = checkBookPackagesResult.successList.concat(cbpResultObject.successList);
diff --git a/src/demos/file-check/checkFileContents.js b/src/demos/file-check/checkFileContents.js
index f5e95a9f..6f22ec87 100644
--- a/src/demos/file-check/checkFileContents.js
+++ b/src/demos/file-check/checkFileContents.js
@@ -23,7 +23,7 @@ import {
export async function checkFileContents(username, languageCode, repoCode, branch, filename, fileContent, givenLocation, checkingOptions) {
// Determine the file type from the filename extension
// and return the results of checking that kind of file text
- // debugLog(`checkFileContents(${username}, ${languageCode}, ${filename}, ${fileContent.length} chars, ${givenLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkFileContents(${username}, ${languageCode}, ${filename}, ${fileContent.length} chars, ${givenLocation}, ${JSON.stringify(checkingOptions)})…`);
parameterAssert(username !== undefined, "checkFileContents: 'username' parameter should be defined");
parameterAssert(typeof username === 'string', `checkFileContents: 'username' parameter should be a string not a '${typeof username}': ${username}`);
parameterAssert(languageCode !== undefined, "checkFileContents: 'languageCode' parameter should be defined");
@@ -50,9 +50,9 @@ export async function checkFileContents(username, languageCode, repoCode, branch
let checkFileResult = { checkedFileCount: 0 };
if (filenameLower.endsWith('.tsv')) {
const filenameMain = filename.substring(0, filename.length - 4); // drop .tsv
- // debugLog(`checkFileContents have TSV filenameMain=${filenameMain}`);
+ // functionLog(`checkFileContents have TSV filenameMain=${filenameMain}`);
const bookID = filenameMain.startsWith(`${languageCode}_`) || filenameMain.startsWith('en_') ? filenameMain.substring(filenameMain.length - 3) : filenameMain.substring(0, 3).toUpperCase();
- // debugLog(`checkFileContents have TSV bookID=${bookID}`);
+ // functionLog(`checkFileContents have TSV bookID=${bookID}`);
parameterAssert(bookID === 'OBS' || books.isValidBookID(bookID), `checkFileContents: '${bookID}' is not a valid USFM book identifier`);
if (filename.startsWith(`${languageCode}_`) || filenameMain.startsWith('en_'))
checkFileResult = await checkTN_TSVText(languageCode, bookID, filename, fileContent, ourCFLocation, checkingOptions);
@@ -87,7 +87,7 @@ export async function checkFileContents(username, languageCode, repoCode, branch
checkFileResult = checkPlainText('raw', filename, fileContent, ourCFLocation, checkingOptions);
checkFileResult.noticeList.unshift({ priority: 995, message: "File extension is not recognized, so treated as plain text.", filename, location: filename });
}
- // debugLog(`checkFileContents got initial results with ${checkFileResult.successList.length} success message(s) and ${checkFileResult.noticeList.length} notice(s)`);
+ // functionLog(`checkFileContents got initial results with ${checkFileResult.successList.length} success message(s) and ${checkFileResult.noticeList.length} notice(s)`);
// Make sure that we have the filename in all of our notices (in case other files are being checked as well)
function addFilenameField(noticeObject) {
@@ -105,7 +105,7 @@ export async function checkFileContents(username, languageCode, repoCode, branch
checkFileResult.checkedOptions = checkingOptions;
checkFileResult.elapsedSeconds = (new Date() - startTime) / 1000; // seconds
- // debugLog(`checkFileContents() returning ${JSON.stringify(checkFileResult)}`);
+ // functionLog(`checkFileContents() returning ${JSON.stringify(checkFileResult)}`);
return checkFileResult;
};
// end of checkFileContents()
diff --git a/src/demos/notice-processing-functions.js b/src/demos/notice-processing-functions.js
index f35f6c4e..0c1877c9 100644
--- a/src/demos/notice-processing-functions.js
+++ b/src/demos/notice-processing-functions.js
@@ -2,7 +2,7 @@ import { userLog, parameterAssert } from '../core/utilities';
import { isDisabledNotice } from '../core/disabled-notices';
-// const NOTICE_PROCESSOR_VERSION_STRING = '0.9.7';
+// const NOTICE_PROCESSOR_VERSION_STRING = '0.9.9';
// All of the following can be overriden with optionalProcessingOptions
const DEFAULT_MAXIMUM_SIMILAR_MESSAGES = 3; // Zero means no suppression of similar messages
@@ -164,13 +164,14 @@ function processNoticesCommon(givenNoticeObject, optionalProcessingOptions) {
&& !thisMsg.startsWith('USFMGrammar: ')
&& !thisMsg.startsWith('Bad punctuation nesting: ')
&& !thisMsg.startsWith('At end of text with unclosed ')
+ && !thisMsg.startsWith('Possible mismatched ')
&& !thisMsg.endsWith(' character combination')
&& !thisMsg.endsWith(' character after space')
&& !thisMsg.endsWith(' character at start of line')
&& !thisMsg.endsWith(' character at end of line')
&& !thisMsg.endsWith(' marker at start of line')
&& !thisMsg.endsWith(' closing character (no matching opener)')
- && !thisMsg.endsWith(' closing character doesn\'t match')
+ && !thisMsg.endsWith(' closing character doesn’t match')
) {
console.error(`POSSIBLE PROGRAMMING ERROR: priority ${thisPriority} has at least two different messages: '${oldMsg}' and '${thisMsg}'`);
duplicatePriorityList.push(thisPriority); // so that we only give the error once
@@ -275,9 +276,11 @@ function processNoticesCommon(givenNoticeObject, optionalProcessingOptions) {
const BibleRegex = /\d\d-(\w\w\w).usfm/; // "Checked JUD file: 66-JUD.usfm"
const NotesRegex = /\d\d-(\w\w\w).tsv/; // "Checked EN_TN_01-GEN.TSV file: en_tn_01-GEN.tsv"
const manifestRegex = /Checked ([\w\-_]{2,25}) manifest file/;
+ const READMEregex = /Checked ([\w\-_]{2,25}) README file/;
+ const LICENSEregex = /Checked ([\w\-_]{2,25}) LICENSE file/;
resultObject.successList = [];
const UHBBookList = [], UGNTBookList = [], LTBookList = [], STBookList = [], TNBookList = [], TN2BookList = [], TQ2BookList = [];
- const USFMBookList = [], TSVNotesList = [], manifestsList = [];
+ const USFMBookList = [], TSVNotesList = [], manifestsList = [], READMEsList = [], LICENSEsList = [];
const TNList = [], TQList = [], TWLList = [];
for (const thisParticularSuccessMsg of givenNoticeObject.successList) {
// debugLog("thisParticularSuccessMsg", thisParticularSuccessMsg);
@@ -312,6 +315,10 @@ function processNoticesCommon(givenNoticeObject, optionalProcessingOptions) {
TSVNotesList.push(regexResult[1]);
else if ((regexResult = manifestRegex.exec(thisParticularSuccessMsg)) !== null)
manifestsList.push(regexResult[1]);
+ else if ((regexResult = READMEregex.exec(thisParticularSuccessMsg)) !== null)
+ READMEsList.push(regexResult[1]);
+ else if ((regexResult = LICENSEregex.exec(thisParticularSuccessMsg)) !== null)
+ LICENSEsList.push(regexResult[1]);
else // Just copy it across
resultObject.successList.push(thisParticularSuccessMsg);
}
@@ -342,8 +349,16 @@ function processNoticesCommon(givenNoticeObject, optionalProcessingOptions) {
resultObject.successList.push(`Checked TWL file: ${TWLList[0]}`);
if (manifestsList.length === 1)
resultObject.successList.push(`Checked ${manifestsList[0]} manifest file`);
+ if (READMEsList.length === 1)
+ resultObject.successList.push(`Checked ${READMEsList[0]} README file`);
+ if (LICENSEsList.length === 1)
+ resultObject.successList.push(`Checked ${LICENSEsList[0]} LICENSE file`);
// Put summary messages at the beginning of the list if more than one found
// Process these messages in the opposite order than we want them to display (since we push to beginning of list each time)
+ if (LICENSEsList.length > 1)
+ resultObject.successList.unshift(`Checked ${LICENSEsList.length} LICENSE files: ${LICENSEsList.join(', ')}`);
+ if (READMEsList.length > 1)
+ resultObject.successList.unshift(`Checked ${READMEsList.length} README files: ${READMEsList.join(', ')}`);
if (manifestsList.length > 1)
resultObject.successList.unshift(`Checked ${manifestsList.length} manifest files: ${manifestsList.join(', ')}`);
if (TSVNotesList.length > 1)
diff --git a/src/demos/repo-check/RepoCheck.js b/src/demos/repo-check/RepoCheck.js
index 0aa358a2..69658a6d 100644
--- a/src/demos/repo-check/RepoCheck.js
+++ b/src/demos/repo-check/RepoCheck.js
@@ -7,7 +7,7 @@ import { checkRepo } from './checkRepo';
import { userLog } from '../../core/utilities';
-// const REPO_VALIDATOR_VERSION_STRING = '0.2.1';
+// const REPO_VALIDATOR_VERSION_STRING = '0.2.2';
function RepoCheck(/*username, languageCode,*/ props) {
@@ -88,6 +88,7 @@ function RepoCheck(/*username, languageCode,*/ props) {
const repoPreloadList = ['TW'];
if (repoCode !== 'UHB' && repoCode !== 'UGNT') repoPreloadList.push('TA'); // Original languages only have TW links
if (repoCode !== 'TA' && repoCode !== 'TW') repoPreloadList.push(repoCode);
+ if (repoCode === 'TWL') { repoPreloadList.unshift('UGNT'); repoPreloadList.unshift('UHB'); repoPreloadList.push('OBS'); }
setResultValue(Preloading {repoPreloadList.length} repos for {username} {languageCode} ready for {repoName} repo check…
);
const successFlag = await preloadReposIfNecessary(username, languageCode, [], branch, repoPreloadList);
if (!successFlag)
diff --git a/src/demos/repo-check/checkRepo.js b/src/demos/repo-check/checkRepo.js
index 53773f45..1db18bc5 100644
--- a/src/demos/repo-check/checkRepo.js
+++ b/src/demos/repo-check/checkRepo.js
@@ -1,18 +1,18 @@
import React from 'react';
import * as books from '../../core/books/books';
-import { parameterAssert, repositoryExistsOnDoor43, getFileListFromZip, cachedGetFile, cachedGetRepositoryZipFile } from '../../core';
import { checkFileContents } from '../file-check/checkFileContents';
+import { logicAssert, parameterAssert, repositoryExistsOnDoor43, getFileListFromZip, cachedGetFile, cachedGetRepositoryZipFile } from '../../core';
-// const REPO_VALIDATOR_VERSION_STRING = '0.4.4';
+// const REPO_VALIDATOR_VERSION_STRING = '0.4.5';
/**
*
- * @param {String} username
- * @param {String} repoName
- * @param {String} branch
- * @param {String} givenLocation
+ * @param {string} username
+ * @param {string} repoName
+ * @param {string} branch
+ * @param {string} givenLocation
* @param {*} setResultValue
* @param {Object} checkingOptions
*/
@@ -22,7 +22,7 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
successList: an array of strings to tell the use exactly what has been checked
noticeList: an array of 9 (i.e., with extra bookOrFileCode parameter at end) notice components
*/
- // debugLog(`checkRepo(${username}, ${repoName}, ${branch}, ${givenLocation}, (fn), ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkRepo(${username}, ${repoName}, ${branch}, ${givenLocation}, (fn), ${JSON.stringify(checkingOptions)})…`);
parameterAssert(username !== undefined, "checkRepo: 'username' parameter should be defined");
parameterAssert(typeof username === 'string', `checkRepo: 'username' parameter should be a string not a '${typeof username}'`);
parameterAssert(repoName !== undefined, "checkRepo: 'repoName' parameter should be defined");
@@ -51,14 +51,14 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
function addSuccessMessage(successString) {
// Adds the message to the result that we will later return
- // debugLog(`checkRepo success: ${successString}`);
+ // functionLog(`checkRepo success: ${successString}`);
checkRepoResult.successList.push(successString);
}
function addNoticePartial(noticeObject) {
// Adds the notices to the result that we will later return
// bookID is a three-character UPPERCASE USFM book identifier or 'OBS'.
// Note that bookID,C,V might all be empty strings (as some repos don’t have BCV)
- // debugLog(`checkRepo addNoticePartial: ${noticeObject.priority}:${noticeObject.message} ${noticeObject.bookID} ${noticeObject.C}:${noticeObject.V} ${noticeObject.filename}:${noticeObject.lineNumber} ${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
+ // functionLog(`checkRepo addNoticePartial: ${noticeObject.priority}:${noticeObject.message} bookID=${noticeObject.bookID} ${noticeObject.C}:${noticeObject.V} ${noticeObject.filename}:${noticeObject.lineNumber} ${noticeObject.characterIndex > 0 ? ` (at character ${noticeObject.characterIndex})` : ""}${noticeObject.extract ? ` ${noticeObject.extract}` : ""}${noticeObject.location}`);
parameterAssert(noticeObject.priority !== undefined, "cR addNoticePartial: 'priority' parameter should be defined");
parameterAssert(typeof noticeObject.priority === 'number', `cR addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}'`);
parameterAssert(noticeObject.message !== undefined, "cR addNoticePartial: 'message' parameter should be defined");
@@ -89,16 +89,16 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
/**
*
- * @param {String} bookOrFileCode
- * @param {String} cfBookID
- * @param {String} filename
- * @param {String} fileContent
- * @param {String} fileLocation
+ * @param {string} bookOrFileCode
+ * @param {string} cfBookID
+ * @param {string} filename
+ * @param {string} fileContent
+ * @param {string} fileLocation
* @param {Object} checkingOptions
*/
async function ourCheckRepoFileContents(bookOrFileCode, cfBookID, filename, fileContent, fileLocation, checkingOptions) {
// We assume that checking for compulsory fields is done elsewhere
- // debugLog(`checkRepo ourCheckRepoFileContents(${bookOrFileCode}, ${cfBookID}, ${filename}, ${fileContent.length}, ${fileLocation}, ${JSON.stringify(checkingOptions)})…`);
+ // functionLog(`checkRepo ourCheckRepoFileContents(${bookOrFileCode}, ${cfBookID}, ${filename}, ${fileContent.length}, ${fileLocation}, ${JSON.stringify(checkingOptions)})…`);
// Updates the global list of notices
parameterAssert(bookOrFileCode !== undefined, "ourCheckRepoFileContents: 'bookOrFileCode' parameter should be defined");
@@ -177,7 +177,7 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
setResultValue(Fetching zipped files from {username}/{repoName} repository…
);
// Let’s fetch the zipped repo since it should be much more efficient than individual fetches
- // debugLog(`checkRepo: fetch zip file for ${repoName}…`);
+ // functionLog(`checkRepo: fetch zip file for ${repoName}…`);
const fetchRepositoryZipFile_ = (checkingOptions && checkingOptions.fetchRepositoryZipFile) ? checkingOptions.fetchRepositoryZipFile : cachedGetRepositoryZipFile;
const zipFetchSucceeded = await fetchRepositoryZipFile_({ username, repository: repoName, branch });
if (!zipFetchSucceeded) {
@@ -211,13 +211,13 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
const thisFilenameExtension = thisFilename.split('.').pop();
// debugLog(`thisFilenameExtension=${thisFilenameExtension}`);
- // Default to the main filename without the extensions
+ // Default to the main filename without the extension
let bookOrFileCode = thisFilename.substring(0, thisFilename.length - thisFilenameExtension.length - 1);
let ourBookID = '';
if (repoName === 'en_translation-annotations' && thisFilenameExtension === 'tsv') {
- // debugLog(`checkRepo have en_translation-annotations bookOrFileCode=${bookOrFileCode}`);
+ // functionLog(`checkRepo have en_translation-annotations bookOrFileCode=${bookOrFileCode}`);
const bookID = bookOrFileCode.substring(0, 3).toUpperCase();
- // debugLog(`checkRepo have bookID=${bookID}`);
+ // functionLog(`checkRepo have bookID=${bookID}`);
parameterAssert(bookID === 'OBS' || books.isValidBookID(bookID), `checkRepo: '${bookID}' is not a valid USFM book identifier (for Annotations)`);
bookOrFileCode = `${bookOrFileCode.substring(4).toUpperCase()} ${bookID}`;
ourBookID = bookID;
@@ -232,12 +232,17 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
ourBookID = bookID;
}
else if (thisFilenameExtension === 'tsv') {
- // const filenameMain = thisFilename.substring(0, thisFilename.length - 4); // drop .tsv
- // debugLog(`Have TSV filenameMain=${bookOrFileCode}`);
+ // debugLog(`Have TSV thisFilename(${thisFilename.length})='${thisFilename}'`);
+ // debugLog(`Have TSV bookOrFileCode(${bookOrFileCode.length})='${bookOrFileCode}'`);
let bookID;
- bookID = bookOrFileCode.length === 6 ? bookOrFileCode.substring(0, 3) : bookOrFileCode.slice(-3).toUpperCase();
- // debugLog(`Have TSV bookcode=${bookID}`);
- parameterAssert(bookID !== 'OBS' && books.isValidBookID(bookID), `checkRepo: '${bookID}' is not a valid USFM book identifier (for TSV)`);
+ // bookOrFileCode could be something like 'en_tn_09-1SA.tsv ' or '2CO_tn' or '1CH_twl'
+ bookID = (bookOrFileCode.length === 6 || bookOrFileCode.length === 7) ? bookOrFileCode.substring(0, 3) : bookOrFileCode.slice(-3).toUpperCase();
+ logicAssert(bookID !== 'twl' && bookID !== 'TWL', `Should get a valid bookID here, not '${bookID}'`)
+ // debugLog(`Have TSV bookcode(${bookID.length})='${bookID}'`);
+ if (repoCode === 'TWL')
+ parameterAssert(bookID === 'OBS' || books.isValidBookID(bookID), `checkRepo: '${bookID}' is not a valid USFM book identifier (for TSV)`);
+ else
+ parameterAssert(bookID !== 'OBS' && books.isValidBookID(bookID), `checkRepo: '${bookID}' is not a valid USFM book identifier (for TSV)`);
bookOrFileCode = bookID;
ourBookID = bookID;
}
@@ -265,7 +270,7 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
return;
}
if (repoFileContent) {
- // debugLog(`checkRepo for ${repoName} checking ${thisFilename}`);
+ // functionLog(`checkRepo for ${repoName} checking ${thisFilename}`);
await ourCheckRepoFileContents(bookOrFileCode, ourBookID,
// OBS has many files with the same name, so we have to give some of the path as well
// repoName.endsWith('_obs') ? thisFilepath.replace('content/', '') : thisFilename,
@@ -275,7 +280,7 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
checkedFilenames.push(thisFilename);
checkedFilenameExtensions.add(thisFilenameExtension);
totalCheckedSize += repoFileContent.length;
- // debugLog(`checkRepo checked ${thisFilename}`);
+ // functionLog(`checkRepo checked ${thisFilename}`);
if (thisFilenameExtension !== 'md') // There's often far, far too many of these
addSuccessMessage(`Checked ${repoName} ${bookOrFileCode.toUpperCase()} file: ${thisFilename}`);
}
@@ -297,7 +302,7 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
// checkRepoResult.checkedOptions = checkingOptions; // This is done at the caller level
addSuccessMessage(`Checked ${username} repo: ${repoName}`);
- // debugLog(`checkRepo() is returning ${checkRepoResult.successList.length.toLocaleString()} success message(s) and ${checkRepoResult.noticeList.length.toLocaleString()} notice(s)`);
+ // functionLog(`checkRepo() is returning ${checkRepoResult.successList.length.toLocaleString()} success message(s) and ${checkRepoResult.noticeList.length.toLocaleString()} notice(s)`);
} catch (cRerror) {
console.error(`checkRepo main code block got error: ${cRerror.message}`);
setResultValue(<>
@@ -307,7 +312,7 @@ export async function checkRepo(username, repoName, branch, givenLocation, setRe
}
}
checkRepoResult.elapsedSeconds = (new Date() - startTime) / 1000; // seconds
- // debugLog(`checkRepo() returning ${JSON.stringify(checkRepoResult)}`);
+ // functionLog(`checkRepo() returning ${JSON.stringify(checkRepoResult)}`);
return checkRepoResult;
};
// end of checkRepo()
diff --git a/yarn.lock b/yarn.lock
index 485de514..d0462acb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
"@babel/cli@^7.12.1":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.10.tgz#67a1015b1cd505bde1696196febf910c4c339a48"
- integrity sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.13.tgz#ae2c6a75fa43f3db4bca0659799b0dfca3f5212b"
+ integrity sha512-Zto3HPeE0GRmaxobUl7NvFTo97NKe1zdAuWqTO8oka7nE0IIqZ4CFvuRZe1qf+ZMd7eHMhwqrecjwc10mjXo/g==
dependencies:
commander "^4.0.1"
convert-source-map "^1.1.0"
@@ -33,17 +33,17 @@
dependencies:
"@babel/highlight" "^7.8.3"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11", "@babel/code-frame@^7.8.3":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
- integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+ integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
dependencies:
- "@babel/highlight" "^7.10.4"
+ "@babel/highlight" "^7.12.13"
-"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.9.0":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
- integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
+"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8"
+ integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg==
"@babel/core@7.9.0":
version "7.9.0"
@@ -68,18 +68,18 @@
source-map "^0.5.0"
"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
- integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
- dependencies:
- "@babel/code-frame" "^7.10.4"
- "@babel/generator" "^7.12.10"
- "@babel/helper-module-transforms" "^7.12.1"
- "@babel/helpers" "^7.12.5"
- "@babel/parser" "^7.12.10"
- "@babel/template" "^7.12.7"
- "@babel/traverse" "^7.12.10"
- "@babel/types" "^7.12.10"
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.13.tgz#b73a87a3a3e7d142a66248bf6ad88b9ceb093425"
+ integrity sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw==
+ dependencies:
+ "@babel/code-frame" "^7.12.13"
+ "@babel/generator" "^7.12.13"
+ "@babel/helper-module-transforms" "^7.12.13"
+ "@babel/helpers" "^7.12.13"
+ "@babel/parser" "^7.12.13"
+ "@babel/template" "^7.12.13"
+ "@babel/traverse" "^7.12.13"
+ "@babel/types" "^7.12.13"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.1"
@@ -88,164 +88,155 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.12.10", "@babel/generator@^7.12.11", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
- integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
+"@babel/generator@^7.12.13", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
+ version "7.12.15"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f"
+ integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==
dependencies:
- "@babel/types" "^7.12.11"
+ "@babel/types" "^7.12.13"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
- integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
+"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+ integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
dependencies:
- "@babel/types" "^7.12.10"
+ "@babel/types" "^7.12.13"
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
- integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+ integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.10.4"
- "@babel/types" "^7.10.4"
+ "@babel/helper-explode-assignable-expression" "^7.12.13"
+ "@babel/types" "^7.12.13"
-"@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7":
- version "7.12.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
- integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
+"@babel/helper-compilation-targets@^7.12.13", "@babel/helper-compilation-targets@^7.8.7":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.13.tgz#d689cdef88810aa74e15a7a94186f26a3d773c98"
+ integrity sha512-dXof20y/6wB5HnLOGyLh/gobsMvDNoekcC+8MCV2iaTd5JemhFkPD73QB+tK3iFC9P0xJC73B6MvKkyUfS9cCw==
dependencies:
- "@babel/compat-data" "^7.12.5"
- "@babel/helper-validator-option" "^7.12.1"
+ "@babel/compat-data" "^7.12.13"
+ "@babel/helper-validator-option" "^7.12.11"
browserslist "^4.14.5"
semver "^5.5.0"
-"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
- integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
+"@babel/helper-create-class-features-plugin@^7.12.13", "@babel/helper-create-class-features-plugin@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz#0f1707c2eec1a4604f2a22a6fb209854ef2a399a"
+ integrity sha512-Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q==
dependencies:
- "@babel/helper-function-name" "^7.10.4"
- "@babel/helper-member-expression-to-functions" "^7.12.1"
- "@babel/helper-optimise-call-expression" "^7.10.4"
- "@babel/helper-replace-supers" "^7.12.1"
- "@babel/helper-split-export-declaration" "^7.10.4"
+ "@babel/helper-function-name" "^7.12.13"
+ "@babel/helper-member-expression-to-functions" "^7.12.13"
+ "@babel/helper-optimise-call-expression" "^7.12.13"
+ "@babel/helper-replace-supers" "^7.12.13"
+ "@babel/helper-split-export-declaration" "^7.12.13"
-"@babel/helper-create-regexp-features-plugin@^7.12.1":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
- integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz#0996d370a92896c612ae41a4215544bd152579c0"
+ integrity sha512-XC+kiA0J3at6E85dL5UnCYfVOcIZ834QcAY0TIpgUVnz0zDzg+0TtvZTnJ4g9L1dPRGe30Qi03XCIS4tYCLtqw==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.10.4"
+ "@babel/helper-annotate-as-pure" "^7.12.13"
regexpu-core "^4.7.1"
-"@babel/helper-define-map@^7.10.4":
- version "7.10.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
- integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
+"@babel/helper-explode-assignable-expression@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a"
+ integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw==
dependencies:
- "@babel/helper-function-name" "^7.10.4"
- "@babel/types" "^7.10.5"
- lodash "^4.17.19"
+ "@babel/types" "^7.12.13"
-"@babel/helper-explode-assignable-expression@^7.10.4":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
- integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
+"@babel/helper-function-name@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+ integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
dependencies:
- "@babel/types" "^7.12.1"
+ "@babel/helper-get-function-arity" "^7.12.13"
+ "@babel/template" "^7.12.13"
+ "@babel/types" "^7.12.13"
-"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
- integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
+"@babel/helper-get-function-arity@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+ integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
dependencies:
- "@babel/helper-get-function-arity" "^7.12.10"
- "@babel/template" "^7.12.7"
- "@babel/types" "^7.12.11"
+ "@babel/types" "^7.12.13"
-"@babel/helper-get-function-arity@^7.12.10":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
- integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
+"@babel/helper-hoist-variables@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz#13aba58b7480b502362316ea02f52cca0e9796cd"
+ integrity sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw==
dependencies:
- "@babel/types" "^7.12.10"
+ "@babel/types" "^7.12.13"
-"@babel/helper-hoist-variables@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
- integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
+"@babel/helper-member-expression-to-functions@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz#c5715695b4f8bab32660dbdcdc2341dec7e3df40"
+ integrity sha512-B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ==
dependencies:
- "@babel/types" "^7.10.4"
+ "@babel/types" "^7.12.13"
-"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
- integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
+ integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
dependencies:
- "@babel/types" "^7.12.7"
+ "@babel/types" "^7.12.13"
-"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3":
- version "7.12.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
- integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+"@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea"
+ integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA==
dependencies:
- "@babel/types" "^7.12.5"
-
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
- integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
- dependencies:
- "@babel/helper-module-imports" "^7.12.1"
- "@babel/helper-replace-supers" "^7.12.1"
- "@babel/helper-simple-access" "^7.12.1"
- "@babel/helper-split-export-declaration" "^7.11.0"
- "@babel/helper-validator-identifier" "^7.10.4"
- "@babel/template" "^7.10.4"
- "@babel/traverse" "^7.12.1"
- "@babel/types" "^7.12.1"
+ "@babel/helper-module-imports" "^7.12.13"
+ "@babel/helper-replace-supers" "^7.12.13"
+ "@babel/helper-simple-access" "^7.12.13"
+ "@babel/helper-split-export-declaration" "^7.12.13"
+ "@babel/helper-validator-identifier" "^7.12.11"
+ "@babel/template" "^7.12.13"
+ "@babel/traverse" "^7.12.13"
+ "@babel/types" "^7.12.13"
lodash "^4.17.19"
-"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
- integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
+"@babel/helper-optimise-call-expression@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+ integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
dependencies:
- "@babel/types" "^7.12.10"
+ "@babel/types" "^7.12.13"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
- integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb"
+ integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==
-"@babel/helper-remap-async-to-generator@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
- integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
+"@babel/helper-remap-async-to-generator@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878"
+ integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.10.4"
- "@babel/helper-wrap-function" "^7.10.4"
- "@babel/types" "^7.12.1"
+ "@babel/helper-annotate-as-pure" "^7.12.13"
+ "@babel/helper-wrap-function" "^7.12.13"
+ "@babel/types" "^7.12.13"
-"@babel/helper-replace-supers@^7.12.1":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
- integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
+"@babel/helper-replace-supers@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121"
+ integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.12.7"
- "@babel/helper-optimise-call-expression" "^7.12.10"
- "@babel/traverse" "^7.12.10"
- "@babel/types" "^7.12.11"
+ "@babel/helper-member-expression-to-functions" "^7.12.13"
+ "@babel/helper-optimise-call-expression" "^7.12.13"
+ "@babel/traverse" "^7.12.13"
+ "@babel/types" "^7.12.13"
-"@babel/helper-simple-access@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
- integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
+"@babel/helper-simple-access@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
+ integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
dependencies:
- "@babel/types" "^7.12.1"
+ "@babel/types" "^7.12.13"
"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
version "7.12.1"
@@ -254,63 +245,63 @@
dependencies:
"@babel/types" "^7.12.1"
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
- integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
+"@babel/helper-split-export-declaration@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+ integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
dependencies:
- "@babel/types" "^7.12.11"
+ "@babel/types" "^7.12.13"
-"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
+"@babel/helper-validator-identifier@^7.12.11":
version "7.12.11"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
+"@babel/helper-validator-option@^7.12.11":
version "7.12.11"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
-"@babel/helper-wrap-function@^7.10.4":
- version "7.12.3"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
- integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
+"@babel/helper-wrap-function@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz#e3ea8cb3ee0a16911f9c1b50d9e99fe8fe30f9ff"
+ integrity sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw==
dependencies:
- "@babel/helper-function-name" "^7.10.4"
- "@babel/template" "^7.10.4"
- "@babel/traverse" "^7.10.4"
- "@babel/types" "^7.10.4"
+ "@babel/helper-function-name" "^7.12.13"
+ "@babel/template" "^7.12.13"
+ "@babel/traverse" "^7.12.13"
+ "@babel/types" "^7.12.13"
-"@babel/helpers@^7.12.5", "@babel/helpers@^7.9.0":
- version "7.12.5"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
- integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
+"@babel/helpers@^7.12.13", "@babel/helpers@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47"
+ integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ==
dependencies:
- "@babel/template" "^7.10.4"
- "@babel/traverse" "^7.12.5"
- "@babel/types" "^7.12.5"
+ "@babel/template" "^7.12.13"
+ "@babel/traverse" "^7.12.13"
+ "@babel/types" "^7.12.13"
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4", "@babel/highlight@^7.8.3":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
- integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.12.13", "@babel/highlight@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
+ integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
dependencies:
- "@babel/helper-validator-identifier" "^7.10.4"
+ "@babel/helper-validator-identifier" "^7.12.11"
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
- integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
+ version "7.12.15"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.15.tgz#2b20de7f0b4b332d9b119dd9c33409c538b8aacf"
+ integrity sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
- version "7.12.12"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566"
- integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==
+"@babel/plugin-proposal-async-generator-functions@^7.12.13", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz#d1c6d841802ffb88c64a2413e311f7345b9e66b5"
+ integrity sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/helper-remap-async-to-generator" "^7.12.1"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-remap-async-to-generator" "^7.12.13"
"@babel/plugin-syntax-async-generators" "^7.8.0"
"@babel/plugin-proposal-class-properties@7.8.3":
@@ -321,13 +312,13 @@
"@babel/helper-create-class-features-plugin" "^7.8.3"
"@babel/helper-plugin-utils" "^7.8.3"
-"@babel/plugin-proposal-class-properties@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
- integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
+"@babel/plugin-proposal-class-properties@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz#3d2ce350367058033c93c098e348161d6dc0d8c8"
+ integrity sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-create-class-features-plugin" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-proposal-decorators@7.8.3":
version "7.8.3"
@@ -346,28 +337,28 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-dynamic-import" "^7.8.0"
-"@babel/plugin-proposal-export-namespace-from@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
- integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
+ integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
- integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
+"@babel/plugin-proposal-json-strings@^7.12.13", "@babel/plugin-proposal-json-strings@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz#ced7888a2db92a3d520a2e35eb421fdb7fcc9b5d"
+ integrity sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-json-strings" "^7.8.0"
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
- integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
+"@babel/plugin-proposal-logical-assignment-operators@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz#575b5d9a08d8299eeb4db6430da6e16e5cf14350"
+ integrity sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
"@babel/plugin-proposal-nullish-coalescing-operator@7.8.3":
@@ -378,12 +369,12 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
- integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.13", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz#24867307285cee4e1031170efd8a7ac807deefde"
+ integrity sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
"@babel/plugin-proposal-numeric-separator@7.8.3":
@@ -394,29 +385,29 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-numeric-separator" "^7.8.3"
-"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.8.3":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
- integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
+"@babel/plugin-proposal-numeric-separator@^7.12.13", "@babel/plugin-proposal-numeric-separator@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
+ integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
- integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
+"@babel/plugin-proposal-object-rest-spread@^7.12.13", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz#f93f3116381ff94bc676fdcb29d71045cd1ec011"
+ integrity sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-object-rest-spread" "^7.8.0"
- "@babel/plugin-transform-parameters" "^7.12.1"
+ "@babel/plugin-transform-parameters" "^7.12.13"
-"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
- integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
+"@babel/plugin-proposal-optional-catch-binding@^7.12.13", "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz#4640520afe57728af14b4d1574ba844f263bcae5"
+ integrity sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
"@babel/plugin-proposal-optional-chaining@7.9.0":
@@ -427,30 +418,30 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
-"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.9.0":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
- integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
+"@babel/plugin-proposal-optional-chaining@^7.12.13", "@babel/plugin-proposal-optional-chaining@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.13.tgz#63a7d805bc8ce626f3234ee5421a2a7fb23f66d9"
+ integrity sha512-0ZwjGfTcnZqyV3y9DSD1Yk3ebp+sIUpT2YDqP8hovzaNZnQq2Kd7PEqa6iOIUDBXBt7Jl3P7YAcEIL5Pz8u09Q==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
-"@babel/plugin-proposal-private-methods@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
- integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
+"@babel/plugin-proposal-private-methods@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz#ea78a12554d784ecf7fc55950b752d469d9c4a71"
+ integrity sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-create-class-features-plugin" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
- integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+ integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
@@ -466,19 +457,19 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
- integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
+"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+ integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-decorators@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
- integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
+ integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-dynamic-import@^7.8.0":
version "7.8.3"
@@ -495,11 +486,11 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-flow@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz#a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"
- integrity sha512-1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz#5df9962503c0a9c918381c929d51d4d6949e7e86"
+ integrity sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-import-meta@^7.8.3":
version "7.10.4"
@@ -515,12 +506,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-jsx@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
- integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
+"@babel/plugin-syntax-jsx@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15"
+ integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
version "7.10.4"
@@ -564,100 +555,99 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
- integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
+"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+ integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-syntax-typescript@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
- integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
+"@babel/plugin-syntax-typescript@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
+ integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
- integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
+"@babel/plugin-transform-arrow-functions@^7.12.13", "@babel/plugin-transform-arrow-functions@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz#eda5670b282952100c229f8a3bd49e0f6a72e9fe"
+ integrity sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
- integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
+"@babel/plugin-transform-async-to-generator@^7.12.13", "@babel/plugin-transform-async-to-generator@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae"
+ integrity sha512-psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A==
dependencies:
- "@babel/helper-module-imports" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/helper-remap-async-to-generator" "^7.12.1"
+ "@babel/helper-module-imports" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-remap-async-to-generator" "^7.12.13"
-"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
- integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
+"@babel/plugin-transform-block-scoped-functions@^7.12.13", "@babel/plugin-transform-block-scoped-functions@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+ integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3":
- version "7.12.12"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca"
- integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==
+"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
+ integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
- integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
+"@babel/plugin-transform-classes@^7.12.13", "@babel/plugin-transform-classes@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz#9728edc1838b5d62fc93ad830bd523b1fcb0e1f6"
+ integrity sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.10.4"
- "@babel/helper-define-map" "^7.10.4"
- "@babel/helper-function-name" "^7.10.4"
- "@babel/helper-optimise-call-expression" "^7.10.4"
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/helper-replace-supers" "^7.12.1"
- "@babel/helper-split-export-declaration" "^7.10.4"
+ "@babel/helper-annotate-as-pure" "^7.12.13"
+ "@babel/helper-function-name" "^7.12.13"
+ "@babel/helper-optimise-call-expression" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-replace-supers" "^7.12.13"
+ "@babel/helper-split-export-declaration" "^7.12.13"
globals "^11.1.0"
-"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
- integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
+"@babel/plugin-transform-computed-properties@^7.12.13", "@babel/plugin-transform-computed-properties@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz#6a210647a3d67f21f699cfd2a01333803b27339d"
+ integrity sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
- integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
+"@babel/plugin-transform-destructuring@^7.12.13", "@babel/plugin-transform-destructuring@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz#fc56c5176940c5b41735c677124d1d20cecc9aeb"
+ integrity sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
- integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
+"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+ integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
- integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
+"@babel/plugin-transform-duplicate-keys@^7.12.13", "@babel/plugin-transform-duplicate-keys@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+ integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
- integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
+"@babel/plugin-transform-exponentiation-operator@^7.12.13", "@babel/plugin-transform-exponentiation-operator@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+ integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-flow-strip-types@7.9.0":
version "7.9.0"
@@ -667,115 +657,115 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-flow" "^7.8.3"
-"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
- integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
+"@babel/plugin-transform-for-of@^7.12.13", "@babel/plugin-transform-for-of@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz#561ff6d74d9e1c8879cb12dbaf4a14cd29d15cf6"
+ integrity sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
- integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
+"@babel/plugin-transform-function-name@^7.12.13", "@babel/plugin-transform-function-name@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+ integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
dependencies:
- "@babel/helper-function-name" "^7.10.4"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-function-name" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
- integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
+"@babel/plugin-transform-literals@^7.12.13", "@babel/plugin-transform-literals@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+ integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
- integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
+"@babel/plugin-transform-member-expression-literals@^7.12.13", "@babel/plugin-transform-member-expression-literals@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+ integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
- integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
+"@babel/plugin-transform-modules-amd@^7.12.13", "@babel/plugin-transform-modules-amd@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz#43db16249b274ee2e551e2422090aa1c47692d56"
+ integrity sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA==
dependencies:
- "@babel/helper-module-transforms" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-module-transforms" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
- integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
+"@babel/plugin-transform-modules-commonjs@^7.12.13", "@babel/plugin-transform-modules-commonjs@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz#5043b870a784a8421fa1fd9136a24f294da13e50"
+ integrity sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ==
dependencies:
- "@babel/helper-module-transforms" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/helper-simple-access" "^7.12.1"
+ "@babel/helper-module-transforms" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-simple-access" "^7.12.13"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
- integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
+"@babel/plugin-transform-modules-systemjs@^7.12.13", "@babel/plugin-transform-modules-systemjs@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz#351937f392c7f07493fc79b2118201d50404a3c5"
+ integrity sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA==
dependencies:
- "@babel/helper-hoist-variables" "^7.10.4"
- "@babel/helper-module-transforms" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/helper-validator-identifier" "^7.10.4"
+ "@babel/helper-hoist-variables" "^7.12.13"
+ "@babel/helper-module-transforms" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-validator-identifier" "^7.12.11"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
- integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
+"@babel/plugin-transform-modules-umd@^7.12.13", "@babel/plugin-transform-modules-umd@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz#26c66f161d3456674e344b4b1255de4d530cfb37"
+ integrity sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w==
dependencies:
- "@babel/helper-module-transforms" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-module-transforms" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
- integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+ integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+ "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-"@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
- integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
+"@babel/plugin-transform-new-target@^7.12.13", "@babel/plugin-transform-new-target@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+ integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
- integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
+"@babel/plugin-transform-object-super@^7.12.13", "@babel/plugin-transform-object-super@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+ integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/helper-replace-supers" "^7.12.1"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-replace-supers" "^7.12.13"
-"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.8.7":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
- integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
+"@babel/plugin-transform-parameters@^7.12.13", "@babel/plugin-transform-parameters@^7.8.7":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz#461e76dfb63c2dfd327b8a008a9e802818ce9853"
+ integrity sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
- integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
+"@babel/plugin-transform-property-literals@^7.12.13", "@babel/plugin-transform-property-literals@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+ integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-react-constant-elements@^7.0.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz#4471f0851feec3231cc9aaa0dccde39947c1ac1e"
- integrity sha512-KOHd0tIRLoER+J+8f9DblZDa1fLGPwaaN1DI1TVHuQFOpjHV22C3CUB3obeC4fexHY9nx+fH0hQNvLFFfA1mxA==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.13.tgz#f8ee56888545d53d80f766b3cc1563ab2c241f92"
+ integrity sha512-qmzKVTn46Upvtxv8LQoQ8mTCdUC83AOVQIQm57e9oekLT5cmK9GOMOfcWhe8jMNx4UJXn/UDhVZ/7lGofVNeDQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-react-display-name@7.8.3":
version "7.8.3"
@@ -784,14 +774,14 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.3"
-"@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"
- integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==
+"@babel/plugin-transform-react-display-name@^7.12.13", "@babel/plugin-transform-react-display-name@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd"
+ integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0":
+"@babel/plugin-transform-react-jsx-development@^7.12.12", "@babel/plugin-transform-react-jsx-development@^7.9.0":
version "7.12.12"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7"
integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg==
@@ -799,29 +789,29 @@
"@babel/plugin-transform-react-jsx" "^7.12.12"
"@babel/plugin-transform-react-jsx-self@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28"
- integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz#422d99d122d592acab9c35ea22a6cfd9bf189f60"
+ integrity sha512-FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-react-jsx-source@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b"
- integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz#051d76126bee5c9a6aa3ba37be2f6c1698856bcb"
+ integrity sha512-O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.9.1":
- version "7.12.12"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e"
- integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw==
+"@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.9.1":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.13.tgz#6c9f993b9f6fb6f0e32a4821ed59349748576a3e"
+ integrity sha512-hhXZMYR8t9RvduN2uW4sjl6MRtUhzNE726JvoJhpjhxKgRUVkZqTsA0xc49ALZxQM7H26pZ/lLvB2Yrea9dllA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.10"
- "@babel/helper-module-imports" "^7.12.5"
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/plugin-syntax-jsx" "^7.12.1"
- "@babel/types" "^7.12.12"
+ "@babel/helper-annotate-as-pure" "^7.12.13"
+ "@babel/helper-module-imports" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/plugin-syntax-jsx" "^7.12.13"
+ "@babel/types" "^7.12.13"
"@babel/plugin-transform-react-pure-annotations@^7.12.1":
version "7.12.1"
@@ -831,19 +821,19 @@
"@babel/helper-annotate-as-pure" "^7.10.4"
"@babel/helper-plugin-utils" "^7.10.4"
-"@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.8.7":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
- integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
+"@babel/plugin-transform-regenerator@^7.12.13", "@babel/plugin-transform-regenerator@^7.8.7":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5"
+ integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==
dependencies:
regenerator-transform "^0.14.2"
-"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
- integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
+"@babel/plugin-transform-reserved-words@^7.12.13", "@babel/plugin-transform-reserved-words@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+ integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-runtime@7.9.0":
version "7.9.0"
@@ -856,73 +846,73 @@
semver "^5.5.1"
"@babel/plugin-transform-runtime@^7.12.1":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
- integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
+ version "7.12.15"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz#4337b2507288007c2b197059301aa0af8d90c085"
+ integrity sha512-OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow==
dependencies:
- "@babel/helper-module-imports" "^7.12.5"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-module-imports" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
semver "^5.5.1"
-"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
- integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
+"@babel/plugin-transform-shorthand-properties@^7.12.13", "@babel/plugin-transform-shorthand-properties@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+ integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
- integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
+"@babel/plugin-transform-spread@^7.12.13", "@babel/plugin-transform-spread@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz#ca0d5645abbd560719c354451b849f14df4a7949"
+ integrity sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.8.3":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
- integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
+"@babel/plugin-transform-sticky-regex@^7.12.13", "@babel/plugin-transform-sticky-regex@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+ integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
- integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
+"@babel/plugin-transform-template-literals@^7.12.13", "@babel/plugin-transform-template-literals@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz#655037b07ebbddaf3b7752f55d15c2fd6f5aa865"
+ integrity sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-typeof-symbol@^7.12.10", "@babel/plugin-transform-typeof-symbol@^7.8.4":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
- integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
+"@babel/plugin-transform-typeof-symbol@^7.12.13", "@babel/plugin-transform-typeof-symbol@^7.8.4":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+ integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-typescript@^7.9.0":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
- integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.13.tgz#8bcb5dd79cb8bba690d6920e19992d9228dfed48"
+ integrity sha512-z1VWskPJxK9tfxoYvePWvzSJC+4pxXr8ArmRm5ofqgi+mwpKg6lvtomkIngBYMJVnKhsFYVysCQLDn//v2RHcg==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/plugin-syntax-typescript" "^7.12.1"
+ "@babel/helper-create-class-features-plugin" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/plugin-syntax-typescript" "^7.12.13"
-"@babel/plugin-transform-unicode-escapes@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
- integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
+ integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.8.3":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
- integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
+"@babel/plugin-transform-unicode-regex@^7.12.13", "@babel/plugin-transform-unicode-regex@^7.8.3":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+ integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.1"
- "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/preset-env@7.9.0":
version "7.9.0"
@@ -991,30 +981,30 @@
semver "^5.5.0"
"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.4.5":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
- integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
- dependencies:
- "@babel/compat-data" "^7.12.7"
- "@babel/helper-compilation-targets" "^7.12.5"
- "@babel/helper-module-imports" "^7.12.5"
- "@babel/helper-plugin-utils" "^7.10.4"
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.13.tgz#3aa2d09cf7d255177538dff292ac9af29ad46525"
+ integrity sha512-JUVlizG8SoFTz4LmVUL8++aVwzwxcvey3N0j1tRbMAXVEy95uQ/cnEkmEKHN00Bwq4voAV3imQGnQvpkLAxsrw==
+ dependencies:
+ "@babel/compat-data" "^7.12.13"
+ "@babel/helper-compilation-targets" "^7.12.13"
+ "@babel/helper-module-imports" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.12.13"
"@babel/helper-validator-option" "^7.12.11"
- "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
- "@babel/plugin-proposal-class-properties" "^7.12.1"
+ "@babel/plugin-proposal-async-generator-functions" "^7.12.13"
+ "@babel/plugin-proposal-class-properties" "^7.12.13"
"@babel/plugin-proposal-dynamic-import" "^7.12.1"
- "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
- "@babel/plugin-proposal-json-strings" "^7.12.1"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
- "@babel/plugin-proposal-numeric-separator" "^7.12.7"
- "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
- "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
- "@babel/plugin-proposal-optional-chaining" "^7.12.7"
- "@babel/plugin-proposal-private-methods" "^7.12.1"
- "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
+ "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+ "@babel/plugin-proposal-json-strings" "^7.12.13"
+ "@babel/plugin-proposal-logical-assignment-operators" "^7.12.13"
+ "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.13"
+ "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+ "@babel/plugin-proposal-object-rest-spread" "^7.12.13"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.12.13"
+ "@babel/plugin-proposal-optional-chaining" "^7.12.13"
+ "@babel/plugin-proposal-private-methods" "^7.12.13"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
"@babel/plugin-syntax-async-generators" "^7.8.0"
- "@babel/plugin-syntax-class-properties" "^7.12.1"
+ "@babel/plugin-syntax-class-properties" "^7.12.13"
"@babel/plugin-syntax-dynamic-import" "^7.8.0"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
"@babel/plugin-syntax-json-strings" "^7.8.0"
@@ -1024,41 +1014,41 @@
"@babel/plugin-syntax-object-rest-spread" "^7.8.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
- "@babel/plugin-syntax-top-level-await" "^7.12.1"
- "@babel/plugin-transform-arrow-functions" "^7.12.1"
- "@babel/plugin-transform-async-to-generator" "^7.12.1"
- "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
- "@babel/plugin-transform-block-scoping" "^7.12.11"
- "@babel/plugin-transform-classes" "^7.12.1"
- "@babel/plugin-transform-computed-properties" "^7.12.1"
- "@babel/plugin-transform-destructuring" "^7.12.1"
- "@babel/plugin-transform-dotall-regex" "^7.12.1"
- "@babel/plugin-transform-duplicate-keys" "^7.12.1"
- "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
- "@babel/plugin-transform-for-of" "^7.12.1"
- "@babel/plugin-transform-function-name" "^7.12.1"
- "@babel/plugin-transform-literals" "^7.12.1"
- "@babel/plugin-transform-member-expression-literals" "^7.12.1"
- "@babel/plugin-transform-modules-amd" "^7.12.1"
- "@babel/plugin-transform-modules-commonjs" "^7.12.1"
- "@babel/plugin-transform-modules-systemjs" "^7.12.1"
- "@babel/plugin-transform-modules-umd" "^7.12.1"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
- "@babel/plugin-transform-new-target" "^7.12.1"
- "@babel/plugin-transform-object-super" "^7.12.1"
- "@babel/plugin-transform-parameters" "^7.12.1"
- "@babel/plugin-transform-property-literals" "^7.12.1"
- "@babel/plugin-transform-regenerator" "^7.12.1"
- "@babel/plugin-transform-reserved-words" "^7.12.1"
- "@babel/plugin-transform-shorthand-properties" "^7.12.1"
- "@babel/plugin-transform-spread" "^7.12.1"
- "@babel/plugin-transform-sticky-regex" "^7.12.7"
- "@babel/plugin-transform-template-literals" "^7.12.1"
- "@babel/plugin-transform-typeof-symbol" "^7.12.10"
- "@babel/plugin-transform-unicode-escapes" "^7.12.1"
- "@babel/plugin-transform-unicode-regex" "^7.12.1"
+ "@babel/plugin-syntax-top-level-await" "^7.12.13"
+ "@babel/plugin-transform-arrow-functions" "^7.12.13"
+ "@babel/plugin-transform-async-to-generator" "^7.12.13"
+ "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+ "@babel/plugin-transform-block-scoping" "^7.12.13"
+ "@babel/plugin-transform-classes" "^7.12.13"
+ "@babel/plugin-transform-computed-properties" "^7.12.13"
+ "@babel/plugin-transform-destructuring" "^7.12.13"
+ "@babel/plugin-transform-dotall-regex" "^7.12.13"
+ "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+ "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+ "@babel/plugin-transform-for-of" "^7.12.13"
+ "@babel/plugin-transform-function-name" "^7.12.13"
+ "@babel/plugin-transform-literals" "^7.12.13"
+ "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+ "@babel/plugin-transform-modules-amd" "^7.12.13"
+ "@babel/plugin-transform-modules-commonjs" "^7.12.13"
+ "@babel/plugin-transform-modules-systemjs" "^7.12.13"
+ "@babel/plugin-transform-modules-umd" "^7.12.13"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+ "@babel/plugin-transform-new-target" "^7.12.13"
+ "@babel/plugin-transform-object-super" "^7.12.13"
+ "@babel/plugin-transform-parameters" "^7.12.13"
+ "@babel/plugin-transform-property-literals" "^7.12.13"
+ "@babel/plugin-transform-regenerator" "^7.12.13"
+ "@babel/plugin-transform-reserved-words" "^7.12.13"
+ "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+ "@babel/plugin-transform-spread" "^7.12.13"
+ "@babel/plugin-transform-sticky-regex" "^7.12.13"
+ "@babel/plugin-transform-template-literals" "^7.12.13"
+ "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+ "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+ "@babel/plugin-transform-unicode-regex" "^7.12.13"
"@babel/preset-modules" "^0.1.3"
- "@babel/types" "^7.12.11"
+ "@babel/types" "^7.12.13"
core-js-compat "^3.8.0"
semver "^5.5.0"
@@ -1086,14 +1076,14 @@
"@babel/plugin-transform-react-jsx-source" "^7.9.0"
"@babel/preset-react@^7.0.0", "@babel/preset-react@^7.12.5":
- version "7.12.10"
- resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
- integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.10.4"
- "@babel/plugin-transform-react-display-name" "^7.12.1"
- "@babel/plugin-transform-react-jsx" "^7.12.10"
- "@babel/plugin-transform-react-jsx-development" "^7.12.7"
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a"
+ integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/plugin-transform-react-display-name" "^7.12.13"
+ "@babel/plugin-transform-react-jsx" "^7.12.13"
+ "@babel/plugin-transform-react-jsx-development" "^7.12.12"
"@babel/plugin-transform-react-pure-annotations" "^7.12.1"
"@babel/preset-typescript@7.9.0":
@@ -1105,9 +1095,9 @@
"@babel/plugin-transform-typescript" "^7.9.0"
"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.12.1", "@babel/runtime-corejs3@^7.9.6":
- version "7.12.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4"
- integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.13.tgz#53d09813b7c20d616caf258e9325550ff701c039"
+ integrity sha512-8fSpqYRETHATtNitsCXq8QQbKJP31/KnDl2Wz2Vtui9nKzjss2ysuZtyVsWjBtvkeEFo346gkwjYPab1hvrXkQ==
dependencies:
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
@@ -1120,40 +1110,40 @@
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
- version "7.12.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
- integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d"
+ integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
- version "7.12.7"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
- integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
- dependencies:
- "@babel/code-frame" "^7.10.4"
- "@babel/parser" "^7.12.7"
- "@babel/types" "^7.12.7"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
- version "7.12.12"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
- integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==
- dependencies:
- "@babel/code-frame" "^7.12.11"
- "@babel/generator" "^7.12.11"
- "@babel/helper-function-name" "^7.12.11"
- "@babel/helper-split-export-declaration" "^7.12.11"
- "@babel/parser" "^7.12.11"
- "@babel/types" "^7.12.12"
+"@babel/template@^7.12.13", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+ integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+ dependencies:
+ "@babel/code-frame" "^7.12.13"
+ "@babel/parser" "^7.12.13"
+ "@babel/types" "^7.12.13"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.13", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0"
+ integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==
+ dependencies:
+ "@babel/code-frame" "^7.12.13"
+ "@babel/generator" "^7.12.13"
+ "@babel/helper-function-name" "^7.12.13"
+ "@babel/helper-split-export-declaration" "^7.12.13"
+ "@babel/parser" "^7.12.13"
+ "@babel/types" "^7.12.13"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.19"
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
- version "7.12.12"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
- integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
+ version "7.12.13"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611"
+ integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==
dependencies:
"@babel/helper-validator-identifier" "^7.12.11"
lodash "^4.17.19"
@@ -1911,9 +1901,9 @@
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
"@types/node@*":
- version "14.14.22"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
- integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
+ version "14.14.25"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.25.tgz#15967a7b577ff81383f9b888aa6705d43fbbae93"
+ integrity sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -1926,9 +1916,9 @@
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
"@types/prettier@^2.0.0":
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03"
- integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.0.tgz#a4e8205a4955690eef712a6d0394a1d2e121e721"
+ integrity sha512-O3SQC6+6AySHwrspYn2UvC6tjo6jCTMMmylxZUFhE1CulVu5l3AxU6ca9lrJDTQDVllF62LIxVSx5fuYL6LiZg==
"@types/prop-types@*":
version "15.7.3"
@@ -1953,9 +1943,9 @@
"@types/react" "*"
"@types/react@*":
- version "17.0.0"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8"
- integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==
+ version "17.0.1"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.1.tgz#eb1f1407dea8da3bc741879c1192aa703ab9975b"
+ integrity sha512-w8t9f53B2ei4jeOqf/gxtc2Sswnc3LBK5s0DyJcg5xd10tMHXts2N31cKjWfH9IC/JvEPa/YF1U4YeP1t4R6HQ==
dependencies:
"@types/prop-types" "*"
csstype "^3.0.2"
@@ -2803,17 +2793,17 @@ aws4@^1.8.0:
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
axe-core@^4.0.2:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.1.tgz#70a7855888e287f7add66002211a423937063eaf"
- integrity sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ==
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.2.tgz#7cf783331320098bfbef620df3b3c770147bc224"
+ integrity sha512-V+Nq70NxKhYt89ArVcaNL9FDryB3vQOd+BFXZIfO3RP6rwtj+2yqqqdHEkacutglPaZLkJeuXKCjCJDMGPtPqg==
axios-cache-adapter@^2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/axios-cache-adapter/-/axios-cache-adapter-2.5.0.tgz#e68be61e8c1cd7f31e4e7cfcbfd0435404ae67ef"
- integrity sha512-YcMPdMoqmSLoZx7A5YD/PdYGuX6/Y9M2tHBhaIXvXrPeGgNnbW7nb3+uArWlT53WGHLfclnu2voMmS7jGXVg6A==
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/axios-cache-adapter/-/axios-cache-adapter-2.7.0.tgz#3da2871840634457cd449d485a781aecc630a035"
+ integrity sha512-itggIo9i8tnsBFnniNh8+7RxXfdCKZT+cEvyjzBdU8IIyudpj4WyrY7288KE8MICs6+u7YFRVlLZi3vvXufz8w==
dependencies:
cache-control-esm "1.0.0"
- lodash "^4.17.11"
+ md5 "^2.2.1"
axios@^0.21.0:
version "0.21.1"
@@ -3110,7 +3100,7 @@ bluebird@^3.5.1, bluebird@^3.5.5:
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
version "4.11.9"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
@@ -3184,7 +3174,7 @@ braces@^3.0.1, braces@~3.0.2:
dependencies:
fill-range "^7.0.1"
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -3507,9 +3497,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
- version "1.0.30001181"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001181.tgz#4f0e5184e1ea7c3bf2727e735cbe7ca9a451d673"
- integrity sha512-m5ul/ARCX50JB8BSNM+oiPmQrR5UmngaQ3QThTTp5HcIIQGP/nPBs82BYLE+tigzm3VW+F4BJIhUyaVtEweelQ==
+ version "1.0.30001185"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz#3482a407d261da04393e2f0d61eefbc53be43b95"
+ integrity sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg==
canvg@^3.0.6:
version "3.0.7"
@@ -3603,6 +3593,11 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+charenc@0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+ integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+
chokidar@^2.0.4, chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -4175,6 +4170,11 @@ cross-spawn@^7.0.0:
shebang-command "^2.0.0"
which "^2.0.1"
+crypt@0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+ integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+
crypto-browserify@^3.11.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -4895,22 +4895,22 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.649:
- version "1.3.649"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.649.tgz#3aa8be052d4d268ede45d8e98d0cd60ffefad607"
- integrity sha512-ojGDupQ3UMkvPWcTICe4JYe17+o9OLiFMPoduoR72Zp2ILt1mRVeqnxBEd6s/ptekrnsFU+0A4lStfBe/wyG/A==
+ version "1.3.662"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.662.tgz#43305bcf88a3340feb553b815d6fd7466659d5ee"
+ integrity sha512-IGBXmTGwdVGUVTnZ8ISEvkhDfhhD+CDFndG4//BhvDcEtPYiVrzoB+rzT/Y12OQCf5bvRCrVmrUbGrS9P7a6FQ==
elliptic@^6.5.3:
- version "6.5.3"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
- integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+ version "6.5.4"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+ integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
dependencies:
- bn.js "^4.4.0"
- brorand "^1.0.1"
+ bn.js "^4.11.9"
+ brorand "^1.1.0"
hash.js "^1.0.0"
- hmac-drbg "^1.0.0"
- inherits "^2.0.1"
- minimalistic-assert "^1.0.0"
- minimalistic-crypto-utils "^1.0.0"
+ hmac-drbg "^1.0.1"
+ inherits "^2.0.4"
+ minimalistic-assert "^1.0.1"
+ minimalistic-crypto-utils "^1.0.1"
email-addresses@^3.0.1:
version "3.1.0"
@@ -5384,9 +5384,9 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
esquery@^1.0.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
- integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+ integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
dependencies:
estraverse "^5.1.0"
@@ -6042,9 +6042,9 @@ fsevents@^1.2.7:
nan "^2.12.1"
fsevents@^2.1.2, fsevents@~2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
- integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+ integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
function-bind@^1.1.1:
version "1.1.1"
@@ -6072,9 +6072,9 @@ get-caller-file@^2.0.1:
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.0.tgz#892e62931e6938c8a23ea5aaebcfb67bd97da97e"
- integrity sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+ integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
dependencies:
function-bind "^1.1.1"
has "^1.0.3"
@@ -6247,9 +6247,9 @@ good-listener@^1.2.2:
delegate "^3.1.2"
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
- version "4.2.4"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
- integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+ version "4.2.6"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+ integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
growly@^1.3.0:
version "1.3.0"
@@ -6374,7 +6374,7 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -6922,7 +6922,7 @@ is-binary-path@~2.1.0:
dependencies:
binary-extensions "^2.0.0"
-is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5:
+is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5, is-buffer@~1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -7135,10 +7135,11 @@ is-potential-custom-element-name@^1.0.0:
integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
is-regex@^1.0.4, is-regex@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
- integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
+ integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
dependencies:
+ call-bind "^1.0.2"
has-symbols "^1.0.1"
is-regexp@^1.0.0:
@@ -8458,9 +8459,9 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
object.assign "^4.1.2"
jszip@^3.5.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6"
- integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
+ integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
dependencies:
lie "~3.3.0"
pako "~1.0.2"
@@ -8903,6 +8904,15 @@ md5.js@^1.3.4:
inherits "^2.0.1"
safe-buffer "^5.1.2"
+md5@^2.2.1:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
+ integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
+ dependencies:
+ charenc "0.0.2"
+ crypt "0.0.2"
+ is-buffer "~1.1.6"
+
mdast-add-list-metadata@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mdast-add-list-metadata/-/mdast-add-list-metadata-1.0.1.tgz#95e73640ce2fc1fa2dcb7ec443d09e2bfe7db4cf"
@@ -9076,7 +9086,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -9604,9 +9614,9 @@ open@^6.3.0:
is-wsl "^1.1.0"
open@^7.0.2:
- version "7.3.1"
- resolved "https://registry.yarnpkg.com/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356"
- integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==
+ version "7.4.0"
+ resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b"
+ integrity sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==
dependencies:
is-docker "^2.0.0"
is-wsl "^2.1.1"
@@ -11141,9 +11151,9 @@ react-double-scrollbar@0.0.15:
integrity sha1-6RWrjLO5WYdwdfSUNt6/2wQoj+Q=
react-error-overlay@^6.0.3, react-error-overlay@^6.0.7:
- version "6.0.8"
- resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz#474ed11d04fc6bda3af643447d85e9127ed6b5de"
- integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw==
+ version "6.0.9"
+ resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
+ integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
react-group@^3.0.0:
version "3.0.2"
@@ -12372,9 +12382,9 @@ source-map-support@^0.5.6, source-map-support@~0.5.12:
source-map "^0.6.0"
source-map-url@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
- integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+ integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
version "0.6.1"
@@ -14189,9 +14199,9 @@ ws@^6.1.2, ws@^6.2.1:
async-limiter "~1.0.0"
ws@^7.2.3:
- version "7.4.2"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
- integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
+ version "7.4.3"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd"
+ integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==
x-is-string@^0.1.0:
version "0.1.0"