fix(time): allow dash instead of space for qualified grain

ClaudiuCeia · Jul 21, 2022 · eeae3b4 · eeae3b4
1 parent f70d6ad
commit eeae3b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/Time.ts b/src/Time.ts
@@ -353,12 +353,13 @@ export const Time = createLanguage<TimeEntityLanguage>({
       __(
         seq(
           Quantity.NonFractional,
-          __(any(str("st"), str("nd"), str("rd"), str("th"))),
+          any(str("st"), str("nd"), str("rd"), str("th")),
+          either(str("-"), space()),
           s.Grain,
           optional(s.Era)
         )
       ),
-      ([quantity, qualifier, grain, maybeEra], b, a) =>
+      ([quantity, qualifier, ,grain, maybeEra], b, a) =>
         time(
           {
             when: `${quantity.value.amount}${qualifier} ${grain} ${

diff --git a/tests/Institution.test.ts b/tests/Institution.test.ts
@@ -88,23 +88,14 @@ Deno.test("Fordwich Town Hall", () => {
   if (res.success) {
     assertEquals(res.value, [
       {
-        end: 2,
-        kind: "quantity",
-        start: 0,
-        text: "16",
-        value: {
-          amount: 16,
-        },
-      },
-      {
-        end: 12,
+        end: 13,
         kind: "time",
-        start: 5,
-        text: "century",
+        start: 0,
+        text: "16th-century ",
         value: {
           era: "CE",
           grain: "century",
-          when: "century",
+          when: "16th century ",
         },
       },
       {