tpmkms_4wp 9.3.0-beta.5 → 9.3.0-beta.50

package/common/dates.js

@@ -37,9 +37,12 @@ const template = {
         "([era_dates|])",
         "([date_dates|])",
         "([dateEra_dates] (date_dates/*) (era_dates/*))",
+        "([monthDay_dates] (month_dates/*) (dayNumber_dates/*))",
         "([monthYear_dates] (month_dates/*) (yearNumber_dates/*))",
         "([monthDayYear_dates] (month_dates/*) (dayNumber_dates/*) (yearNumber_dates/*))",
         "([monthDayYearWithSlashes_dates] (monthNumber_dates/*) (dateSeparator_dates/*) (dayNumber_dates/*) (dateSeparator_dates/*) (yearNumber_dates/*))",
+        "([onDate_dates|on] ([onDateValue_dates|]))",
+        "([afterDate_dates|after] ([afterDateValue_dates|]))",
       ],
       associations: {
         positive: [
@@ -50,6 +53,30 @@ const template = {
         ['monday_dates', 'distributable'],
       ],
       bridges: [
+        {
+          id: 'onDateValue_dates',
+          children: [
+            'day_dates',
+            'month_dates',
+          ],
+        },
+        {
+          id: 'onDate_dates',
+          isA: ['preposition'],
+          bridge: "{ ...next(operator), date: after[0], onDate: operator, interpolate: '${onDate} ${date}' }",
+        },
+        {
+          id: 'afterDateValue_dates',
+          children: [
+            'day_dates',
+            'month_dates',
+          ],
+        },
+        {
+          id: 'afterDate_dates',
+          isA: ['preposition'],
+          bridge: "{ ...next(operator), date: after[0], afterDate: operator, interpolate: '${afterDate} ${date}' }",
+        },
         { 
           id: 'era_dates', 
           words: ['era'],
@@ -58,6 +85,7 @@ const template = {
         { 
           id: 'date_dates', 
           words: ['date', 'distributable'],
+          isA: ['onDateValue_dates', 'afterDateValue_dates'],
           bridge: "{ ...next(operator) }" 
         },
         { 
@@ -74,6 +102,7 @@ const template = {
         { 
           id: 'monthDayYearWithSlashes_dates', 
           isA: ['date_dates'],
+          before: ['preposition'],
           convolution: true,
           bridge: "{ ...next(operator), day: after[2], month: after[0], year: after[4], interpolate: '${month}/${day}/${year}' }",
         },
@@ -93,15 +122,25 @@ const template = {
           isA: ['integer'],
           bridge: "{ ...next(operator) }" 
         },
+        { 
+          id: 'monthDay_dates', 
+          convolution: true,
+          localHierarchy: [['ordinal', 'dayNumber_dates']],
+          before: ['preposition'],
+          isA: ['date_dates'],
+          bridge: "{ ...next(operator), month: after[0], day: after[1], interpolate: '${month} ${day}' }"
+        },
         { 
           id: 'monthYear_dates', 
           convolution: true,
+          before: ['preposition'],
           isA: ['date_dates'],
           bridge: "{ ...next(operator), month: after[0], year: after[1], interpolate: '${month} ${year}' }"
         },
         { 
           id: 'monthDayYear_dates', 
           convolution: true,
+          before: ['preposition', 'monthDay_dates'],
           isA: ['date_dates'],
           localHierarchy: [
             ['ordinal', 'dayNumber_dates'],
@@ -132,8 +171,11 @@ const template = {
     (args) => {
       const as = ['jan', 'feb', 'mar', 'apr', 'jun', 'jul', 'aug', 'sept', 'oct', 'nov', 'dec']
       const ms = ['january', 'february', 'march', 'april', 'june', 'july', 'august', 'september', 'october', 'november', 'december']
+      // args.makeObject({...args, context: { word: as[i], value: `${ms[i]}_dates`}, types: [`${ms[i]}_dates`]})
       for (let i = 0; i < as.length; ++i) {
-        args.makeObject({...args, context: { word: as[i], value: `${as[i]}_dates`}, types: [`${ms[i]}_dates`]})
+        const word = as[i]
+        const id = `${ms[i]}_dates`
+        args.addWords(id, word, { value: id, abbreviation: word })
       }
 
       /*