better regex for years

Author: tefkah

libs/citations/parse-text-cite/src/lib/lexer.ts

@@ -3,7 +3,7 @@ console.log(moo)
 export const lexer = moo.compile({
   __: /[ \t ]+/u,
   //_: /[ \t]*/u,
-  Year: /(?:\d{4}|n\.d\.?)/u,
+  Year: /(?:\b\d{4}(?=[a-z]|\b)|n\.d\.?)/u,
   BCE: /B\.C\.E\.|B\.C\.|C\.E\.|A\.D\.|a\.d\.|b\.c\.e\.|b\.c\.|c\.e\./u,
   //maybename: /[A-Z]\w*['-]?\w*/u,
   Number: /\d+/u,

libs/citations/parse-text-cite/src/lib/parse-text-cite.ts

@@ -34,6 +34,13 @@ export const parser = new nearley.Parser(nearley.Grammar.fromCompiled(grammar))
 export const parseTextCite = (string: string, options?: Options) => {
   const parser = new nearley.Parser(nearley.Grammar.fromCompiled(grammar))
 
+  const splitCites = string
+    .split(')')
+    .map(
+      (c: string, idx, arr) =>
+        `${c}${arr.length > 1 && idx === arr.length - 1 ? '' : ')'}`
+    )
+
   try {
     parser.feed(string)
   } catch (err) {
@@ -71,7 +78,11 @@ function recoverOriginalCitation(cite: (string | Citation)[], ogText: string) {
   const originalCites = narrowString
     .split(')')
     .filter((c) => c)
-    .map((c: string) => c + ')')
+    .map(
+      (c: string, idx, arr) =>
+        `${c}${arr.length > 1 && idx === arr.length - 1 ? '' : ')'}`
+    )
+  console.log(originalCites)
 
   let stupidCounterYouShouldKnowBetter = 0
 

libs/citations/parse-text-cite/src/lib/testcites.ts

@@ -25,6 +25,38 @@ export const tests: TestData = {
         ],
         input: 'Wow (Bautista Perpinya, 2019).',
       },
+      {
+        input:
+          'We used Gorilla (Anwyl, 2019) to present the visual probe task online and the task is available on the open materials page to preview or clone (https://gorilla.sc/openmaterials/85021).',
+        description: 'Complex case with a URL',
+        result: [
+          'We used Gorilla ',
+          {
+            citationId: 'CITE-X',
+            citationItems: [
+              {
+                id: 'Anwyl2019',
+                itemData: {
+                  author: [
+                    {
+                      family: 'Anwyl',
+                    },
+                  ],
+                  issued: {
+                    'date-parts': [['2019']],
+                  },
+                },
+              },
+            ],
+            originalText: '(Anwyl, 2019)',
+            properties: {
+              noteIndex: 0,
+            },
+          },
+          ' to present the visual probe task online and the task is available on the open materials page to preview or clone ',
+          '(https://gorilla.sc/openmaterials/85021).',
+        ],
+      },
       {
         description: 'Can deal with NBSP',
         result: [