Get annotation checks working, plus some small fixes

makeNoticeList.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 import os
+import datetime
+
 
 noticeList = []
 
@@ -10,9 +12,10 @@
         and name.endswith('.js') or name.endswith('.ts'):
             # print("file", name, os.path.join(root, name))
             with open(os.path.join(root, name), 'rt') as sourceFile:
-                for line in sourceFile:
+                for n, line in enumerate(sourceFile, start=1):
                     if 'addNotice' in line and 'function addNotice' not in line \
-                    and 'console.assert' not in line and 'noticeEntry.priority' not in line \
+                    and 'console.log' not in line and 'console.assert' not in line \
+                    and 'noticeEntry' not in line \
                     and 'grammarCheckResult.error' not in line \
                     and '...' not in line:
                         strippedLine = line.strip()
@@ -22,7 +25,7 @@
                             cleanedLine = strippedLine.replace('addNoticePartial','') \
                                                 .replace('addNotice6to7','') \
                                                 .replace('addNotice5','').replace('addNotice6','').replace('addNotice8','').replace('addNotice9','') \
-                                                .replace('addNoticeCV8','').replace('addNotice10','') \
+                                                .replace('addNoticePartial','').replace('addNotice10','') \
                                                 .replace('addNotice','')
                             if cleanedLine.startswith('('): cleanedLine = cleanedLine[1:]
                             cleanedLine = cleanedLine.replace('{','').replace('}','')
@@ -33,10 +36,28 @@
                             adjustedLine = adjustedLine.strip().replace('  ',' ')
                             print("adjustedLine", adjustedLine)
                             if not adjustedLine: halt
-                            noticeList.append(adjustedLine)
+                            noticeList.append(f"{adjustedLine}\tfrom {name} line {n:,}")
     # for name in dirs:
     #     print("dir", name, os.path.join(root, name))
 
-print(f"\nGot {len(noticeList)} notices:")
-for notice in sorted(noticeList, reverse=True):
-    print(f"  {notice}")
+
+def makeKey(noticeLine):
+    # Gives proper sorting of 2-3 digit priority numbers
+    index = 0
+    string = ''
+    while noticeLine[index].isdigit():
+        string += noticeLine[index]
+        index += 1
+    if string: return int(string)
+    return 99999 # Return a big number for lines not starting with digits
+
+
+filename = 'noticeList.txt'
+with open(filename, 'wt') as outputFile:
+    print(f"\nGot {len(noticeList)} notices:")
+    outputFile.write(f"Last updated {datetime.datetime.now()} by makeNoticeList.py\n")
+    outputFile.write(f"Got {len(noticeList)} notices:\n")
+    for notice in sorted(noticeList, reverse=True, key=makeKey):
+        print(f"  {notice}")
+        outputFile.write(f"  {notice}\n")
+print(f"Wrote {len(noticeList)} sorted notices to {filename}.")

package.json

@@ -1,7 +1,7 @@
 {
   "name": "uw-content-validation",
   "description": "Functions for Checking Door43.org Scriptural Content/Resources.",
-  "version": "0.8.15",
+  "version": "0.8.16_alpha4",
   "private": false,
   "homepage": "https://unfoldingword.github.io/uw-content-validation/",
   "repository": {
@@ -90,4 +90,4 @@
       "<rootDir>/dist/"
     ]
   }
-}
+}