Merge pull request #1166 from spencermountain/dev

Dev

changelog.md

@@ -20,6 +20,9 @@ While all _Major_ releases should be reviewed, our only _large_ releases are **v
 - **[fix]** - .before() .after()
 -->
 
+#### 14.14.4 [Jan 2025]
+- **[fix]** - TypeScript & esm resolution #1165
+
 #### 14.14.3 [Dec 2024]
 - **[fix]** - another runtime error in punctuation replace #1150
 - **[update]** - dependencies

one/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "compromise-one",
-	"version": "14.14.3",
+	"version": "14.14.4",
 	"description": "",
 	"type": "module",
 	"module": "./../src/one.js",
@@ -22,4 +22,4 @@
 	"author": "Spencer Kelly <[email protected]> (http://spencermounta.in)",
 	"license": "MIT",
 	"sideEffects": true
-}
+}

package.json

@@ -2,7 +2,7 @@
   "author": "Spencer Kelly <[email protected]> (http://spencermounta.in)",
   "name": "compromise",
   "description": "modest natural language processing",
-  "version": "14.14.3",
+  "version": "14.14.4",
   "module": "./src/three.js",
   "main": "./src/three.js",
   "unpkg": "./builds/compromise.js",
@@ -136,4 +136,4 @@
     "_tests/**"
   ],
   "license": "MIT"
-}
+}

plugins/dates/builds/compromise-dates.cjs

@@ -320,11 +320,11 @@
   var data = {
     "9|s": "2/dili,2/jayapura",
     "9|n": "2/chita,2/khandyga,2/pyongyang,2/seoul,2/tokyo,2/yakutsk,11/palau,japan,rok",
-    "9.5|s|04/07:03->10/06:04": "4/adelaide,4/broken_hill,4/south,4/yancowinna",
+    "9.5|s|04/06:03->10/05:04": "4/adelaide,4/broken_hill,4/south,4/yancowinna",
     "9.5|s": "4/darwin,4/north",
     "8|s|03/13:01->10/02:00": "12/casey",
     "8|s": "2/kuala_lumpur,2/makassar,2/singapore,4/perth,2/ujung_pandang,4/west,singapore",
-    "8|n": "2/brunei,2/choibalsan,2/hong_kong,2/irkutsk,2/kuching,2/macau,2/manila,2/shanghai,2/taipei,2/ulaanbaatar,2/chongqing,2/chungking,2/harbin,2/macao,2/ulan_bator,hongkong,prc,roc",
+    "8|n": "2/brunei,2/hong_kong,2/irkutsk,2/kuching,2/macau,2/manila,2/shanghai,2/taipei,2/ulaanbaatar,2/chongqing,2/chungking,2/harbin,2/macao,2/ulan_bator,2/choibalsan,hongkong,prc,roc",
     "8.75|s": "4/eucla",
     "7|s": "12/davis,2/jakarta,9/christmas",
     "7|n": "2/bangkok,2/barnaul,2/hovd,2/krasnoyarsk,2/novokuznetsk,2/novosibirsk,2/phnom_penh,2/pontianak,2/ho_chi_minh,2/tomsk,2/vientiane,2/saigon",
@@ -339,67 +339,67 @@
     "4|n": "2/baku,2/dubai,2/muscat,2/tbilisi,2/yerevan,8/astrakhan,8/samara,8/saratov,8/ulyanovsk,8/volgograd,9/mahe,9/mauritius,2/volgograd",
     "4.5|n": "2/kabul",
     "3|s": "12/syowa,9/antananarivo",
-    "3|n|04/26:02->10/31:24": "0/cairo,egypt",
-    "3|n|04/20:04->10/26:02": "2/gaza,2/hebron",
-    "3|n|03/31:05->10/27:04": "2/famagusta,2/nicosia,8/athens,8/bucharest,8/helsinki,8/kyiv,8/mariehamn,8/riga,8/sofia,8/tallinn,8/uzhgorod,8/vilnius,8/zaporozhye,8/nicosia,8/kiev,eet",
-    "3|n|03/31:04->10/27:03": "8/chisinau,8/tiraspol",
-    "3|n|03/31:02->10/26:24": "2/beirut",
-    "3|n|03/29:04->10/27:02": "2/jerusalem,2/tel_aviv,israel",
+    "3|n|04/25:02->10/30:24": "0/cairo,egypt",
+    "3|n|04/12:04->10/25:02": "2/gaza,2/hebron",
+    "3|n|03/30:05->10/26:04": "2/famagusta,2/nicosia,8/athens,8/bucharest,8/helsinki,8/kyiv,8/mariehamn,8/riga,8/sofia,8/tallinn,8/uzhgorod,8/vilnius,8/zaporozhye,8/nicosia,8/kiev,eet",
+    "3|n|03/30:04->10/26:03": "8/chisinau,8/tiraspol",
+    "3|n|03/30:02->10/25:24": "2/beirut",
+    "3|n|03/28:04->10/26:02": "2/jerusalem,2/tel_aviv,israel",
     "3|n": "0/addis_ababa,0/asmara,0/asmera,0/dar_es_salaam,0/djibouti,0/juba,0/kampala,0/mogadishu,0/nairobi,2/aden,2/amman,2/baghdad,2/bahrain,2/damascus,2/kuwait,2/qatar,2/riyadh,8/istanbul,8/kirov,8/minsk,8/moscow,8/simferopol,9/comoro,9/mayotte,2/istanbul,turkey,w-su",
     "3.5|n": "2/tehran,iran",
-    "2|s|03/31:04->10/27:02": "12/troll",
+    "2|s|03/30:04->10/26:02": "12/troll",
     "2|s": "0/gaborone,0/harare,0/johannesburg,0/lubumbashi,0/lusaka,0/maputo,0/maseru,0/mbabane",
-    "2|n|03/31:04->10/27:03": "0/ceuta,arctic/longyearbyen,8/amsterdam,8/andorra,8/belgrade,8/berlin,8/bratislava,8/brussels,8/budapest,8/busingen,8/copenhagen,8/gibraltar,8/ljubljana,8/luxembourg,8/madrid,8/malta,8/monaco,8/oslo,8/paris,8/podgorica,8/prague,8/rome,8/san_marino,8/sarajevo,8/skopje,8/stockholm,8/tirane,8/vaduz,8/vatican,8/vienna,8/warsaw,8/zagreb,8/zurich,3/jan_mayen,poland,cet,met",
+    "2|n|03/30:04->10/26:03": "0/ceuta,arctic/longyearbyen,8/amsterdam,8/andorra,8/belgrade,8/berlin,8/bratislava,8/brussels,8/budapest,8/busingen,8/copenhagen,8/gibraltar,8/ljubljana,8/luxembourg,8/madrid,8/malta,8/monaco,8/oslo,8/paris,8/podgorica,8/prague,8/rome,8/san_marino,8/sarajevo,8/skopje,8/stockholm,8/tirane,8/vaduz,8/vatican,8/vienna,8/warsaw,8/zagreb,8/zurich,3/jan_mayen,poland,cet,met",
     "2|n": "0/blantyre,0/bujumbura,0/khartoum,0/kigali,0/tripoli,8/kaliningrad,libya",
     "1|s": "0/brazzaville,0/kinshasa,0/luanda,0/windhoek",
-    "1|n|03/31:03->10/27:02": "3/canary,3/faroe,3/madeira,8/dublin,8/guernsey,8/isle_of_man,8/jersey,8/lisbon,8/london,3/faeroe,eire,8/belfast,gb-eire,gb,portugal,wet",
+    "1|n|03/30:03->10/26:02": "3/canary,3/faroe,3/madeira,8/dublin,8/guernsey,8/isle_of_man,8/jersey,8/lisbon,8/london,3/faeroe,eire,8/belfast,gb-eire,gb,portugal,wet",
     "1|n": "0/algiers,0/bangui,0/douala,0/lagos,0/libreville,0/malabo,0/ndjamena,0/niamey,0/porto-novo,0/tunis",
     "14|n": "11/kiritimati",
     "13|s": "11/apia,11/tongatapu",
     "13|n": "11/enderbury,11/kanton,11/fakaofo",
-    "12|s|04/07:03->09/29:04": "12/mcmurdo,11/auckland,12/south_pole,nz",
+    "12|s|04/06:03->09/28:04": "12/mcmurdo,11/auckland,12/south_pole,nz",
     "12|s": "11/fiji",
     "12|n": "2/anadyr,2/kamchatka,2/srednekolymsk,11/funafuti,11/kwajalein,11/majuro,11/nauru,11/tarawa,11/wake,11/wallis,kwajalein",
-    "12.75|s|04/07:03->04/07:02": "11/chatham,nz-chat",
-    "11|s|04/07:03->10/06:04": "12/macquarie",
+    "12.75|s|04/06:03->04/06:02": "11/chatham,nz-chat",
+    "11|s|04/06:03->10/05:04": "12/macquarie",
     "11|s": "11/bougainville",
     "11|n": "2/magadan,2/sakhalin,11/efate,11/guadalcanal,11/kosrae,11/noumea,11/pohnpei,11/ponape",
-    "11.5|n|04/07:03->10/06:04": "11/norfolk",
-    "10|s|04/07:03->10/06:04": "4/currie,4/hobart,4/melbourne,4/sydney,4/act,4/canberra,4/nsw,4/tasmania,4/victoria",
+    "11.5|n|04/06:03->10/05:04": "11/norfolk",
+    "10|s|04/06:03->10/05:04": "4/currie,4/hobart,4/melbourne,4/sydney,4/act,4/canberra,4/nsw,4/tasmania,4/victoria",
     "10|s": "12/dumontdurville,4/brisbane,4/lindeman,11/port_moresby,4/queensland",
     "10|n": "2/ust-nera,2/vladivostok,11/guam,11/saipan,11/chuuk,11/truk,11/yap",
-    "10.5|s|04/07:01->10/06:02": "4/lord_howe,4/lhi",
-    "0|s|03/10:03->04/14:04": "0/casablanca,0/el_aaiun",
-    "0|n|03/31:02->10/27:01": "3/azores",
-    "0|n|03/31:01->10/26:24": "1/scoresbysund",
+    "10.5|s|04/06:01->10/05:02": "4/lord_howe,4/lhi",
+    "0|s|02/23:03->04/06:04": "0/casablanca,0/el_aaiun",
+    "0|n|03/30:02->10/26:01": "3/azores",
+    "0|n|03/30:01->10/25:24": "1/scoresbysund",
     "0|n": "0/abidjan,0/accra,0/bamako,0/banjul,0/bissau,0/conakry,0/dakar,0/freetown,0/lome,0/monrovia,0/nouakchott,0/ouagadougou,0/sao_tome,1/danmarkshavn,3/reykjavik,3/st_helena,13/gmt,13/utc,0/timbuktu,13/greenwich,13/uct,13/universal,13/zulu,gmt-0,gmt+0,gmt0,greenwich,iceland,uct,universal,utc,zulu,13/unknown,factory",
-    "-9|n|03/10:04->11/03:02": "1/adak,1/atka,us/aleutian",
+    "-9|n|03/09:04->11/02:02": "1/adak,1/atka,us/aleutian",
     "-9|n": "11/gambier",
     "-9.5|n": "11/marquesas",
-    "-8|n|03/10:04->11/03:02": "1/anchorage,1/juneau,1/metlakatla,1/nome,1/sitka,1/yakutat,us/alaska",
+    "-8|n|03/09:04->11/02:02": "1/anchorage,1/juneau,1/metlakatla,1/nome,1/sitka,1/yakutat,us/alaska",
     "-8|n": "11/pitcairn",
-    "-7|n|03/10:04->11/03:02": "1/los_angeles,1/santa_isabel,1/tijuana,1/vancouver,1/ensenada,6/pacific,10/bajanorte,us/pacific-new,us/pacific",
+    "-7|n|03/09:04->11/02:02": "1/los_angeles,1/santa_isabel,1/tijuana,1/vancouver,1/ensenada,6/pacific,10/bajanorte,us/pacific-new,us/pacific",
     "-7|n": "1/creston,1/dawson,1/dawson_creek,1/fort_nelson,1/hermosillo,1/mazatlan,1/phoenix,1/whitehorse,6/yukon,10/bajasur,us/arizona,mst",
-    "-6|s|04/06:22->09/07:24": "11/easter,7/easterisland",
+    "-6|s|04/05:22->09/06:24": "11/easter,7/easterisland",
     "-6|n|04/07:02->10/27:02": "1/merida",
-    "-6|n|03/10:04->11/03:02": "1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/north_dakota,1/ojinaga,1/ciudad_juarez,1/yellowknife,1/shiprock,6/mountain,navajo,us/mountain",
+    "-6|n|03/09:04->11/02:02": "1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/north_dakota,1/ojinaga,1/ciudad_juarez,1/yellowknife,1/shiprock,6/mountain,navajo,us/mountain",
     "-6|n": "1/bahia_banderas,1/belize,1/chihuahua,1/costa_rica,1/el_salvador,1/guatemala,1/managua,1/mexico_city,1/monterrey,1/regina,1/swift_current,1/tegucigalpa,11/galapagos,6/east-saskatchewan,6/saskatchewan,10/general",
     "-5|s": "1/lima,1/rio_branco,1/porto_acre,5/acre",
-    "-5|n|03/10:04->11/03:02": "1/chicago,1/matamoros,1/menominee,1/rainy_river,1/rankin_inlet,1/resolute,1/winnipeg,1/indiana/knox,1/indiana/tell_city,1/north_dakota/beulah,1/north_dakota/center,1/north_dakota/new_salem,1/knox_in,6/central,us/central,us/indiana-starke",
+    "-5|n|03/09:04->11/02:02": "1/chicago,1/matamoros,1/menominee,1/rainy_river,1/rankin_inlet,1/resolute,1/winnipeg,1/indiana/knox,1/indiana/tell_city,1/north_dakota/beulah,1/north_dakota/center,1/north_dakota/new_salem,1/knox_in,6/central,us/central,us/indiana-starke",
     "-5|n": "1/bogota,1/cancun,1/cayman,1/coral_harbour,1/eirunepe,1/guayaquil,1/jamaica,1/panama,1/atikokan,jamaica,est",
-    "-4|s|04/06:24->09/08:02": "1/santiago,7/continental",
-    "-4|s|03/23:24->10/06:02": "1/asuncion",
+    "-4|s|04/05:24->09/07:02": "1/santiago,7/continental",
+    "-4|s|03/22:24->10/05:02": "1/asuncion",
     "-4|s": "1/campo_grande,1/cuiaba,1/la_paz,1/manaus,5/west",
-    "-4|n|03/10:04->11/03:02": "1/detroit,1/grand_turk,1/indiana,1/indianapolis,1/iqaluit,1/kentucky,1/louisville,1/montreal,1/nassau,1/new_york,1/nipigon,1/pangnirtung,1/port-au-prince,1/thunder_bay,1/toronto,1/indiana/marengo,1/indiana/petersburg,1/indiana/vevay,1/indiana/vincennes,1/indiana/winamac,1/kentucky/monticello,1/fort_wayne,1/indiana/indianapolis,1/kentucky/louisville,6/eastern,us/east-indiana,us/eastern,us/michigan",
-    "-4|n|03/10:02->11/03:01": "1/havana,cuba",
+    "-4|n|03/09:04->11/02:02": "1/detroit,1/grand_turk,1/indiana,1/indianapolis,1/iqaluit,1/kentucky,1/louisville,1/montreal,1/nassau,1/new_york,1/nipigon,1/pangnirtung,1/port-au-prince,1/thunder_bay,1/toronto,1/indiana/marengo,1/indiana/petersburg,1/indiana/vevay,1/indiana/vincennes,1/indiana/winamac,1/kentucky/monticello,1/fort_wayne,1/indiana/indianapolis,1/kentucky/louisville,6/eastern,us/east-indiana,us/eastern,us/michigan",
+    "-4|n|03/09:02->11/02:01": "1/havana,cuba",
     "-4|n": "1/anguilla,1/antigua,1/aruba,1/barbados,1/blanc-sablon,1/boa_vista,1/caracas,1/curacao,1/dominica,1/grenada,1/guadeloupe,1/guyana,1/kralendijk,1/lower_princes,1/marigot,1/martinique,1/montserrat,1/port_of_spain,1/porto_velho,1/puerto_rico,1/santo_domingo,1/st_barthelemy,1/st_kitts,1/st_lucia,1/st_thomas,1/st_vincent,1/tortola,1/virgin",
     "-3|s": "1/argentina,1/buenos_aires,1/catamarca,1/cordoba,1/fortaleza,1/jujuy,1/mendoza,1/montevideo,1/punta_arenas,1/sao_paulo,12/palmer,12/rothera,3/stanley,1/argentina/la_rioja,1/argentina/rio_gallegos,1/argentina/salta,1/argentina/san_juan,1/argentina/san_luis,1/argentina/tucuman,1/argentina/ushuaia,1/argentina/comodrivadavia,1/argentina/buenos_aires,1/argentina/catamarca,1/argentina/cordoba,1/argentina/jujuy,1/argentina/mendoza,1/argentina/rosario,1/rosario,5/east",
-    "-3|n|03/10:04->11/03:02": "1/glace_bay,1/goose_bay,1/halifax,1/moncton,1/thule,3/bermuda,6/atlantic",
+    "-3|n|03/09:04->11/02:02": "1/glace_bay,1/goose_bay,1/halifax,1/moncton,1/thule,3/bermuda,6/atlantic",
     "-3|n": "1/araguaina,1/bahia,1/belem,1/cayenne,1/maceio,1/paramaribo,1/recife,1/santarem",
-    "-2|n|03/31:01->10/26:24": "1/nuuk,1/godthab",
-    "-2|n|03/10:04->11/03:02": "1/miquelon",
+    "-2|n|03/09:04->11/02:02": "1/miquelon",
     "-2|n": "1/noronha,3/south_georgia,5/denoronha",
-    "-2.5|n|03/10:04->11/03:02": "1/st_johns,6/newfoundland",
+    "-2.5|n|03/09:04->11/02:02": "1/st_johns,6/newfoundland",
+    "-1|n|03/30:01->10/25:24": "1/nuuk,1/godthab",
     "-1|n": "3/cape_verde",
     "-11|n": "11/midway,11/niue,11/pago_pago,11/samoa,us/samoa",
     "-10|n": "11/honolulu,11/johnston,11/rarotonga,11/tahiti,us/hawaii,hst"
@@ -671,7 +671,8 @@
     if (isDate(tmp)) {
       return tmp.getTime()
     }
-    if (tmp.epoch) {
+    // support spacetime objects
+    if (tmp.epoch || tmp.epoch === 0) {
       return tmp.epoch
     }
     return null
@@ -1877,7 +1878,10 @@
     if (str.indexOf('{') !== -1) {
       let sections = /\{(.+?)\}/g;
       str = str.replace(sections, (_, fmt) => {
-        fmt = fmt.toLowerCase().trim();
+        fmt = fmt.trim();
+        if (fmt !== 'AMPM') {
+          fmt = fmt.toLowerCase();
+        }
         if (format.hasOwnProperty(fmt)) {
           let out = String(format[fmt](s));
           if (fmt.toLowerCase() !== 'ampm') {
@@ -3579,7 +3583,7 @@
       if (tmp.date() === 1) {
         toAdd = 0;
       }
-      tmp = tmp.minus(1, 'second');
+      tmp = tmp.minus(2, 'hours');
       const thisOne = this.epoch;
       //if the week technically hasn't started yet
       if (tmp.epoch > thisOne) {
@@ -3588,7 +3592,6 @@
       //speed it up, if we can
       let i = 0;
       let skipWeeks = this.month() * 4;
-      // console.log(ms.week+ " "+ skipWeeks);
       tmp.epoch += o.week * skipWeeks;
       i += skipWeeks;
       for (; i <= 52; i++) {
@@ -4345,7 +4348,7 @@
     return tzs
   };
 
-  var version$1 = '7.6.1';
+  var version$1 = '7.7.0';
 
   const main = (input, tz, options) => new SpaceTime(input, tz, options);
 
@@ -6315,6 +6318,13 @@
         date: m.groups('date').numbers(0).get()[0],
         year,
       };
+      if (obj.date === undefined) {
+        obj.date = 1;
+        let unit = new Month(obj, null, context);
+        if (unit.d.isValid() === true) {
+          return unit
+        }
+      }
       let unit = new CalendarDate(obj, null, context);
       if (unit.d.isValid() === true) {
         return unit
@@ -8941,7 +8951,7 @@
 
   ];
 
-  var version = '3.7.0';
+  var version = '3.7.1';
 
   /* eslint-disable no-console */
 

plugins/dates/changelog.md

@@ -2,6 +2,10 @@
 - **[breaking]** - return array in .json().dates
 -->
 
+### 3.7.1 [Jan 2025]
+* * fix `#Month (next|last|this) year` #1162
+- **[update]** - dependencies
+
 ### 3.7.0 [July 2024]
 - **[new]** - date features:
 * * `'until christmas'`

plugins/dates/package.json

@@ -1,7 +1,7 @@
 {
   "name": "compromise-dates",
   "description": "plugin for nlp-compromise",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "author": "Spencer Kelly <[email protected]> (http://spencermounta.in)",
   "main": "./src/plugin.js",
   "unpkg": "./builds/compromise-dates.min.js",
@@ -38,7 +38,7 @@
     "compromise": ">=14.2.0"
   },
   "dependencies": {
-    "spacetime": "7.6.1",
+    "spacetime": "7.7.0",
     "spacetime-holiday": "0.3.0"
   },
   "license": "MIT"

plugins/dates/scratch.js

@@ -20,9 +20,9 @@ process.env.DEBUG_DATE = true
 // now
 
 const context = {
-  // today: '1999-04-17',
+  today: '1999-04-17',
   // today: [2006, 8, 24],
-  timezone: 'Asia/Shanghai',
+  // timezone: 'Asia/Shanghai',
   // dayStart: '8:00am',
   // dayEnd: '8:00pm',
 }
@@ -38,6 +38,7 @@ txt = `5th day of q1 2002`
 txt = 'in basically one week from now'
 txt = 'go shopping with april'
 txt = 'between Oct and Sept 2008'
+txt = '6:30pm'
 // txt = 'sept 2008 to oct 2008'
 // txt = 'only in 2018 and 2020'
 // txt = '2024/02/05 and 2024/03/09'

plugins/dates/src/_version.js

@@ -1 +1 @@
-export default '3.7.0'
+export default '3.7.1'

plugins/dates/src/api/parse/one/02-parse/05-explicit.js

@@ -50,6 +50,13 @@ const parseExplicit = function (doc, context) {
       date: m.groups('date').numbers(0).get()[0],
       year,
     }
+    if (obj.date === undefined) {
+      obj.date = 1
+      let unit = new Month(obj, null, context)
+      if (unit.d.isValid() === true) {
+        return unit
+      }
+    }
     let unit = new CalendarDate(obj, null, context)
     if (unit.d.isValid() === true) {
       return unit

plugins/dates/tests/duration-range.test.js

@@ -34,6 +34,16 @@ let arr = [
   { str: '2 to 4 years ago', start: '2020-09-24', end: '2022-09-24' },
   { str: '2-4 years ago', start: '2020-09-24', end: '2022-09-24' },
   { str: 'two to four years ago', start: '2020-09-24', end: '2022-09-24' },
+  { str: 'in 3 to 6 days', start: '2024-09-27', end: '2024-09-30' },
+  { str: 'in 3-6 days', start: '2024-09-27', end: '2024-09-30' },
+  { str: 'in three to six days', start: '2024-09-27', end: '2024-09-30' },
+  { str: '3 to 6 days ago', start: '2024-09-18', end: '2024-09-21' },
+  { str: '3-6 days ago', start: '2024-09-18', end: '2024-09-21' },
+  { str: 'three to six days ago', start: '2024-09-18', end: '2024-09-21' },
+  { str: 'in 3-5 years', start: '2027-09-24', end: '2029-09-24' },
+  { str: 'in three to five years', start: '2027-09-24', end: '2029-09-24' },
+  { str: '3 to 5 years ago', start: '2019-09-24', end: '2021-09-24' },
+  { str: 'three to five years ago', start: '2019-09-24', end: '2021-09-24' },
 ]