diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Dutch/Extractors/DutchDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Dutch/Extractors/DutchDateTimeAltExtractorConfiguration.cs index 359ec742b7..b66d3669b8 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Dutch/Extractors/DutchDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Dutch/Extractors/DutchDateTimeAltExtractorConfiguration.cs @@ -1,66 +1,68 @@ -using System.Collections.Generic; -using System.Text.RegularExpressions; -using Microsoft.Recognizers.Definitions.Dutch; - -namespace Microsoft.Recognizers.Text.DateTime.Dutch -{ - public class DutchDateTimeAltExtractorConfiguration : BaseDateTimeOptionsConfiguration, IDateTimeAltExtractorConfiguration - { - public static readonly Regex ThisPrefixRegex = - new Regex(DateTimeDefinitions.ThisPrefixRegex, RegexFlags); - - public static readonly Regex PreviousPrefixRegex = - new Regex(DateTimeDefinitions.PreviousPrefixRegex, RegexFlags); - - public static readonly Regex NextPrefixRegex = - new Regex(DateTimeDefinitions.NextPrefixRegex, RegexFlags); - - public static readonly Regex AmRegex = - new Regex(DateTimeDefinitions.AmRegex, RegexFlags); - - public static readonly Regex PmRegex = - new Regex(DateTimeDefinitions.PmRegex, RegexFlags); - - public static readonly Regex RangePrefixRegex = - new Regex(DateTimeDefinitions.RangePrefixRegex, RegexFlags); - - public static readonly Regex[] RelativePrefixList = - { - ThisPrefixRegex, PreviousPrefixRegex, NextPrefixRegex, - }; - - public static readonly Regex[] AmPmRegexList = - { - AmRegex, PmRegex, - }; - +using System.Collections.Generic; +using System.Text.RegularExpressions; +using Microsoft.Recognizers.Definitions.Dutch; + +namespace Microsoft.Recognizers.Text.DateTime.Dutch +{ + public class DutchDateTimeAltExtractorConfiguration : BaseDateTimeOptionsConfiguration, IDateTimeAltExtractorConfiguration + { + public static readonly Regex ThisPrefixRegex = + new Regex(DateTimeDefinitions.ThisPrefixRegex, RegexFlags); + + public static readonly Regex PreviousPrefixRegex = + new Regex(DateTimeDefinitions.PreviousPrefixRegex, RegexFlags); + + public static readonly Regex NextPrefixRegex = + new Regex(DateTimeDefinitions.NextPrefixRegex, RegexFlags); + + public static readonly Regex AmRegex = + new Regex(DateTimeDefinitions.AmRegex, RegexFlags); + + public static readonly Regex PmRegex = + new Regex(DateTimeDefinitions.PmRegex, RegexFlags); + + public static readonly Regex RangePrefixRegex = + new Regex(DateTimeDefinitions.RangePrefixRegex, RegexFlags); + + public static readonly Regex[] RelativePrefixList = + { + ThisPrefixRegex, PreviousPrefixRegex, NextPrefixRegex, + }; + + public static readonly Regex[] AmPmRegexList = + { + AmRegex, PmRegex, + }; + private const RegexOptions RegexFlags = RegexOptions.Singleline | RegexOptions.ExplicitCapture; private static readonly Regex OrRegex = - new Regex(DateTimeDefinitions.OrRegex, RegexFlags); - - private static readonly Regex DayRegex = + new Regex(DateTimeDefinitions.OrRegex, RegexFlags); + + private static readonly Regex DayRegex = new Regex(DateTimeDefinitions.DayRegex, RegexFlags); public DutchDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration config) - : base(config) - { - DateExtractor = new BaseDateExtractor(new DutchDateExtractorConfiguration(this)); - DatePeriodExtractor = new BaseDatePeriodExtractor(new DutchDatePeriodExtractorConfiguration(this)); + : base(config) + { + DateExtractor = new BaseDateExtractor(new DutchDateExtractorConfiguration(this)); + DatePeriodExtractor = new BaseDatePeriodExtractor(new DutchDatePeriodExtractorConfiguration(this)); } public IDateExtractor DateExtractor { get; } - public IDateTimeExtractor DatePeriodExtractor { get; } - - IEnumerable IDateTimeAltExtractorConfiguration.RelativePrefixList => RelativePrefixList; - - IEnumerable IDateTimeAltExtractorConfiguration.AmPmRegexList => AmPmRegexList; - - Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; - - Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; - - Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; - } + public IDateTimeExtractor DatePeriodExtractor { get; } + + IEnumerable IDateTimeAltExtractorConfiguration.RelativePrefixList => RelativePrefixList; + + IEnumerable IDateTimeAltExtractorConfiguration.AmPmRegexList => AmPmRegexList; + + Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; + + Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; + } } \ No newline at end of file diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/English/Extractors/EnglishDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/English/Extractors/EnglishDateTimeAltExtractorConfiguration.cs index a936db754d..899358f88f 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/English/Extractors/EnglishDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/English/Extractors/EnglishDateTimeAltExtractorConfiguration.cs @@ -55,6 +55,8 @@ public EnglishDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration co Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/BaseDateTimeAltExtractor.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/BaseDateTimeAltExtractor.cs index e1a58ac634..30becaf94b 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/BaseDateTimeAltExtractor.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/BaseDateTimeAltExtractor.cs @@ -383,6 +383,12 @@ private void ResolveImplicitRelativeDatePeriod(List ers, string t relativeTermsMatches.AddRange(regex.Matches(text).Cast()); } + // Filtered out if there is no relative term or the only one found is "this". Like "3 this" + if (relativeTermsMatches.Count == 0 || (relativeTermsMatches.Count == 1 && config.ThisPrefixRegex.IsMatch(relativeTermsMatches[0].Value))) + { + return; + } + // Remove overlapping matches relativeTermsMatches.RemoveAll(m => ers.Any(e => e.Start <= m.Index && e.Start + e.Length >= m.Index + m.Length)); diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/IDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/IDateTimeAltExtractorConfiguration.cs index 3569f22428..274fbaa0be 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/IDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Extractors/IDateTimeAltExtractorConfiguration.cs @@ -15,6 +15,8 @@ public interface IDateTimeAltExtractorConfiguration Regex OrRegex { get; } + Regex ThisPrefixRegex { get; } + Regex DayRegex { get; } Regex RangePrefixRegex { get; } diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/French/Extractors/FrenchDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/French/Extractors/FrenchDateTimeAltExtractorConfiguration.cs index 1dd4b3fcd0..dd89ddcc5d 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/French/Extractors/FrenchDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/French/Extractors/FrenchDateTimeAltExtractorConfiguration.cs @@ -49,6 +49,8 @@ public FrenchDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration con Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/German/Extractors/GermanDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/German/Extractors/GermanDateTimeAltExtractorConfiguration.cs index 2cfd7c4beb..d8b8999d41 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/German/Extractors/GermanDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/German/Extractors/GermanDateTimeAltExtractorConfiguration.cs @@ -59,6 +59,8 @@ public GermanDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration con Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Italian/Extractors/ItalianDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Italian/Extractors/ItalianDateTimeAltExtractorConfiguration.cs index 51c78aec76..3b7e8913d3 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Italian/Extractors/ItalianDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Italian/Extractors/ItalianDateTimeAltExtractorConfiguration.cs @@ -53,6 +53,8 @@ public ItalianDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration co Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Portuguese/Extractors/PortugueseDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Portuguese/Extractors/PortugueseDateTimeAltExtractorConfiguration.cs index 81eb376fb8..a3dbb11e0f 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Portuguese/Extractors/PortugueseDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Portuguese/Extractors/PortugueseDateTimeAltExtractorConfiguration.cs @@ -59,6 +59,8 @@ public PortugueseDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Spanish/Extractors/SpanishDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Spanish/Extractors/SpanishDateTimeAltExtractorConfiguration.cs index 030036f3af..f0b71d78c2 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Spanish/Extractors/SpanishDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Spanish/Extractors/SpanishDateTimeAltExtractorConfiguration.cs @@ -59,6 +59,8 @@ public SpanishDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration co Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Turkish/Extractors/TurkishDateTimeAltExtractorConfiguration.cs b/.NET/Microsoft.Recognizers.Text.DateTime/Turkish/Extractors/TurkishDateTimeAltExtractorConfiguration.cs index 2083fc17f5..d723fcb999 100644 --- a/.NET/Microsoft.Recognizers.Text.DateTime/Turkish/Extractors/TurkishDateTimeAltExtractorConfiguration.cs +++ b/.NET/Microsoft.Recognizers.Text.DateTime/Turkish/Extractors/TurkishDateTimeAltExtractorConfiguration.cs @@ -55,6 +55,8 @@ public TurkishDateTimeAltExtractorConfiguration(IDateTimeOptionsConfiguration co Regex IDateTimeAltExtractorConfiguration.OrRegex => OrRegex; + Regex IDateTimeAltExtractorConfiguration.ThisPrefixRegex => ThisPrefixRegex; + Regex IDateTimeAltExtractorConfiguration.DayRegex => DayRegex; Regex IDateTimeAltExtractorConfiguration.RangePrefixRegex => RangePrefixRegex; diff --git a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/english/extractors/EnglishDateTimeAltExtractorConfiguration.java b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/english/extractors/EnglishDateTimeAltExtractorConfiguration.java index dea0d36777..75c75d11e4 100644 --- a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/english/extractors/EnglishDateTimeAltExtractorConfiguration.java +++ b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/english/extractors/EnglishDateTimeAltExtractorConfiguration.java @@ -74,6 +74,11 @@ public Pattern getOrRegex() { return OrRegex; } + @Override + public Pattern getThisPrefixRegex() { + return ThisPrefixRegex; + } + @Override public Pattern getDayRegex() { return DayRegex; diff --git a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/BaseDateTimeAltExtractor.java b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/BaseDateTimeAltExtractor.java index a24d8d85a5..b5006eb4d0 100644 --- a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/BaseDateTimeAltExtractor.java +++ b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/BaseDateTimeAltExtractor.java @@ -197,6 +197,15 @@ private List resolveImplicitRelativeDatePeriod(List results = new ArrayList<>(); + + // Filtered out if there is no relative term or the only one found is "this". Like "3 this" + if (relativeTermsMatches.size() == 0 || (relativeTermsMatches.size() == 1 && + RegExpUtility.getMatches(config.getOrRegex(), relativeTermsMatches.get(0).value).length > 0)) { + results.addAll(ers); + return results; + } + List relativeDatePeriodErs = new ArrayList<>(); int i = 0; for (ExtractResult result : ers.toArray(new ExtractResult[0])) { @@ -255,12 +264,11 @@ private List resolveImplicitRelativeDatePeriod(List result = new ArrayList<>(); - result.addAll(ers); - result.addAll(relativeDatePeriodErs); - result.sort(Comparator.comparingInt(er -> er.getStart())); + results.addAll(ers); + results.addAll(relativeDatePeriodErs); + results.sort(Comparator.comparingInt(er -> er.getStart())); - return result; + return results; } private boolean isConnectorOrWhiteSpace(int start, int end, String text) { diff --git a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/config/IDateTimeAltExtractorConfiguration.java b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/config/IDateTimeAltExtractorConfiguration.java index a411b96276..8bddc53212 100644 --- a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/config/IDateTimeAltExtractorConfiguration.java +++ b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/extractors/config/IDateTimeAltExtractorConfiguration.java @@ -16,6 +16,8 @@ public interface IDateTimeAltExtractorConfiguration { Pattern getOrRegex(); + Pattern getThisPrefixRegex(); + Pattern getDayRegex(); Pattern getRangePrefixRegex(); diff --git a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/spanish/extractors/SpanishDateTimeAltExtractorConfiguration.java b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/spanish/extractors/SpanishDateTimeAltExtractorConfiguration.java index d156cfe4fb..36ba13b3c6 100644 --- a/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/spanish/extractors/SpanishDateTimeAltExtractorConfiguration.java +++ b/Java/libraries/recognizers-text-date-time/src/main/java/com/microsoft/recognizers/text/datetime/spanish/extractors/SpanishDateTimeAltExtractorConfiguration.java @@ -74,6 +74,11 @@ public Pattern getOrRegex() { return OrRegex; } + @Override + public Pattern getThisPrefixRegex() { + return ThisPrefixRegex; + } + @Override public Pattern getDayRegex() { return DayRegex; diff --git a/Specs/DateTime/English/DateTimeModel.json b/Specs/DateTime/English/DateTimeModel.json index a0e0f68042..dc74482d6f 100644 --- a/Specs/DateTime/English/DateTimeModel.json +++ b/Specs/DateTime/English/DateTimeModel.json @@ -13851,5 +13851,56 @@ }, "NotSupported": "javascript, python", "Results": [] + }, + { + "Input": "ABC-12345-A1B2C3 this is yet to be submitted", + "Context": { + "ReferenceDateTime": "2019-08-08T00:00:00" + }, + "Results": [] + }, + { + "Input": "mar3 this week or next", + "Context": { + "ReferenceDateTime": "2019-08-08T00:00:00" + }, + "Results": [ + { + "Text": "mar3", + "Start": 0, + "End": 3, + "TypeName": "datetimeV2.date", + "Resolution": { + "values": [ + { + "timex": "XXXX-03-03", + "type": "date", + "value": "2019-03-03" + }, + { + "timex": "XXXX-03-03", + "type": "date", + "value": "2020-03-03" + } + ] + } + }, + { + "Text": "this week", + "Start": 5, + "End": 13, + "TypeName": "datetimeV2.daterange", + "Resolution": { + "values": [ + { + "timex": "2019-W32", + "type": "daterange", + "start": "2019-08-05", + "end": "2019-08-12" + } + ] + } + } + ] } ] \ No newline at end of file diff --git a/Specs/DateTime/English/DateTimeModelComplexCalendar.json b/Specs/DateTime/English/DateTimeModelComplexCalendar.json index a23fa84e10..8f1e3e7d7b 100644 --- a/Specs/DateTime/English/DateTimeModelComplexCalendar.json +++ b/Specs/DateTime/English/DateTimeModelComplexCalendar.json @@ -11824,5 +11824,75 @@ }, "NotSupported": "javascript, python", "Results": [] + }, + { + "Input": "ABC-12345-A1B2C3 this is yet to be submitted", + "Context": { + "ReferenceDateTime": "2019-08-08T00:00:00" + }, + "Results": [] + }, + { + "Input": "mar3 this week or next", + "Context": { + "ReferenceDateTime": "2019-08-08T00:00:00" + }, + "NotSupported": "javascript, python", + "Results": [ + { + "Text": "mar3", + "Start": 0, + "End": 3, + "TypeName": "datetimeV2.date", + "Resolution": { + "values": [ + { + "timex": "XXXX-03-03", + "type": "date", + "value": "2019-03-03" + }, + { + "timex": "XXXX-03-03", + "type": "date", + "value": "2020-03-03" + } + ] + } + }, + { + "ParentText": "this week or next", + "Text": "this week", + "Start": 5, + "End": 13, + "TypeName": "datetimeV2.datetimealt", + "Resolution": { + "values": [ + { + "timex": "2019-W32", + "type": "daterange", + "start": "2019-08-05", + "end": "2019-08-12" + } + ] + } + }, + { + "ParentText": "this week or next", + "Text": "next", + "Start": 18, + "End": 21, + "TypeName": "datetimeV2.datetimealt", + "Resolution": { + "values": [ + { + "timex": "2019-W33", + "type": "daterange", + "start": "2019-08-12", + "end": "2019-08-19" + } + ] + } + } + ] } ] diff --git a/Specs/DateTime/English/DateTimeModelExtendedTypes.json b/Specs/DateTime/English/DateTimeModelExtendedTypes.json index 858ddab5d4..1855deab6d 100644 --- a/Specs/DateTime/English/DateTimeModelExtendedTypes.json +++ b/Specs/DateTime/English/DateTimeModelExtendedTypes.json @@ -1728,5 +1728,75 @@ } } ] + }, + { + "Input": "ABC-12345-A1B2C3 this is yet to be submitted", + "Context": { + "ReferenceDateTime": "2019-08-08T00:00:00" + }, + "Results": [] + }, + { + "Input": "mar3 this week or next", + "Context": { + "ReferenceDateTime": "2019-08-08T00:00:00" + }, + "NotSupported": "javascript, python", + "Results": [ + { + "Text": "mar3", + "Start": 0, + "End": 3, + "TypeName": "datetimeV2.date", + "Resolution": { + "values": [ + { + "timex": "XXXX-03-03", + "type": "date", + "value": "2019-03-03" + }, + { + "timex": "XXXX-03-03", + "type": "date", + "value": "2020-03-03" + } + ] + } + }, + { + "ParentText": "this week or next", + "Text": "this week", + "Start": 5, + "End": 13, + "TypeName": "datetimeV2.datetimealt", + "Resolution": { + "values": [ + { + "timex": "2019-W32", + "type": "daterange", + "start": "2019-08-05", + "end": "2019-08-12" + } + ] + } + }, + { + "ParentText": "this week or next", + "Text": "next", + "Start": 18, + "End": 21, + "TypeName": "datetimeV2.datetimealt", + "Resolution": { + "values": [ + { + "timex": "2019-W33", + "type": "daterange", + "start": "2019-08-12", + "end": "2019-08-19" + } + ] + } + } + ] } ] \ No newline at end of file