Merge pull request #1082 from spencermountain/dev

Dev

README.md

@@ -494,6 +494,8 @@ _(match methods use the [match-syntax](https://docs.compromise.cool/compromise-m
 - **[.splitOn('')](https://observablehq.com/@spencermountain/compromise-split)** - return a Document with three parts for every match ('splitOn')
 - **[.splitBefore('')](https://observablehq.com/@spencermountain/compromise-split)** - partition a phrase before each matching segment
 - **[.splitAfter('')](https://observablehq.com/@spencermountain/compromise-split)** - partition a phrase after each matching segment
+- **[.join()](https://observablehq.com/@spencermountain/compromise-split)** - merge any neighbouring terms in each match
+- **[.joinIf(leftMatch, rightMatch)](https://observablehq.com/@spencermountain/compromise-split)** - merge any neighbouring terms under given conditions
 - **[.lookup([])](https://observablehq.com/@spencermountain/compromise-match)** - quick find for an array of string matches
 - **[.autoFill()](https://observablehq.com/@spencermountain/compromise-typeahead)** - create type-ahead assumptions on the document
 

changelog.md

@@ -20,6 +20,17 @@ While all _Major_ releases should be reviewed, our only _large_ releases are **v
 
 -->
 
+#### 14.11.2 [Jan 2024]
+
+- **[new]** - support for frozen lex in plugin object #1080
+- **[fix]** - toggling options in .json()
+- **[new]** - .join() and .joinIf() methods
+- **[new]** - support freeze in sweep
+- **[change]** - internal typescript improvements
+- **[fix]** - tagging issues
+- **[change]** - @hasEllipses must be following the word
+- **[update]** - dependencies
+
 #### 14.11.1 [Jan 2024]
 
 - **[fix]** - missing words in html output (thanks ryan!)

data/lexicon/nouns/organizations.js

@@ -315,7 +315,7 @@ export default [
   'the carpenters',
   'the guess who',
   'the hollies',
-  'the rolling stones',
+  // 'the rolling stones',
   'the smashing pumpkins',
   'the supremes',
   'the who',

data/lexicon/nouns/singulars.js

@@ -3,8 +3,6 @@
 // they are all inflected to add their plural form
 
 export default [
-  'light bulb',
-
   // -ic
   'medic',
   'ethic',
@@ -367,7 +365,7 @@ export default [
   'row',
   'drive thru',
   'hash brown',
-  'living room',
+  // 'living room',
   'seminar',
   'variety',
   'laboratory',
@@ -432,4 +430,5 @@ export default [
   'brick',
   'cannibal',
   'video game',
+  'layer',
 ]

data/lexicon/numbers/units.js

@@ -31,8 +31,8 @@ export default [
   'quart',
   'quarts',
   'fl oz',
-  'fluid ounce',
-  'fluid ounces',
+  // 'fluid ounce',
+  // 'fluid ounces',
   'kilometer',
   'kilometers',
   'meter',

data/lexicon/switches/adj-gerund.js

@@ -1,7 +1,6 @@
 // rallying the troops
 // her rallying cry
 export default [
-
   'absorbing',
   'accelerating',
   'accompanying',
@@ -291,7 +290,6 @@ export default [
   'yielding',
   'accommodating',
   'trifling',
-
+  'endearing',
   // prefixes
 ]
-

data/lexicon/switches/adj-noun.js

@@ -6,7 +6,6 @@ export default [
   'adult',
   'alert',
   'alternative',
-  'animal',
   'antarctic',
   'arab',
   'arctic',

data/lexicon/switches/noun-verb.js

@@ -925,6 +925,7 @@ export default [
   'zip',
   'zone',
   'zoom',
+  'lie',
   // 'average',
   // 'fast',
   // 'try',

data/lexicon/verbs/infinitives.js

@@ -1,5 +1,4 @@
 export default [
-
   'abandon',
   'abet',
   'abide',
@@ -462,7 +461,6 @@ export default [
   'lend',
   'lengthen',
   'lessen',
-  'lie',
   'like',
   'linger',
   'liquefy',
@@ -626,7 +624,7 @@ export default [
   'retire',
   'retrieve',
   'retrofit',
-  'reup',//'re-up'
+  'reup', //'re-up'
   'revamp',
   'revel',
   'revere',
@@ -790,5 +788,5 @@ export default [
   'attain',
   'pound',
   'consume',
-  'befriend'
+  'befriend',
 ]

data/lexicon/verbs/participles.js

@@ -17,7 +17,7 @@ export default [
   'drawn',
   'dreamt',
   'driven',
-  'drunk',
+  // 'drunk',
   'eaten',
   'fallen',
   'flown',
@@ -75,4 +75,4 @@ export default [
   'woven',
   'written',
   'wrung',
-]
+]

data/pairs/Comparative.js

@@ -1,5 +1,4 @@
 export default [
-
   ['angry', 'angrier'],
   ['bad', 'worse'],
   ['bald', 'balder'],
@@ -134,7 +133,6 @@ export default [
   ['lame', 'lamer'],
   ['large', 'larger'],
   ['late', 'later'],
-  ['lay', 'layer'],
   ['lean', 'leaner'],
   ['lengthy', 'lengthier'],
   ['lesser', 'lesser'],
@@ -308,6 +306,4 @@ export default [
   ['dim', 'dimmer'],
   ['', ''],
   ['', ''],
-
-
-]
+]

package.json

@@ -2,7 +2,7 @@
   "author": "Spencer Kelly <spencermountain@gmail.com> (http://spencermounta.in)",
   "name": "compromise",
   "description": "modest natural language processing",
-  "version": "14.11.1",
+  "version": "14.11.2",
   "module": "./src/three.js",
   "main": "./src/three.js",
   "unpkg": "./builds/compromise.js",
@@ -102,7 +102,7 @@
     "suffix-thumb": "5.0.2"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "15.1.0",
+    "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-terser": "0.4.4",
     "amble": "1.3.0",
     "cross-env": "^7.0.3",

plugins/dates/src/api/dates.js

@@ -2,9 +2,7 @@ import find from './find/index.js'
 import parseDates from './parse/index.js'
 import toJSON from './toJSON.js'
 
-
 const api = function (View) {
-
   class Dates extends View {
     constructor(document, pointer, groups, opts = {}) {
       super(document, pointer, groups)
@@ -14,7 +12,7 @@ const api = function (View) {
 
     get(n) {
       let all = []
-      this.forEach((m) => {
+      this.forEach(m => {
         parseDates(m, this.opts).forEach(res => {
           all.push(toJSON(res))
         })
@@ -28,7 +26,7 @@ const api = function (View) {
     json(opts = {}) {
       return this.map(m => {
         let json = m.toView().json(opts)[0] || {}
-        if (opts && opts.dates !== true) {
+        if (opts && opts.dates !== false) {
           let parsed = parseDates(m, this.opts)
           json.dates = toJSON(parsed[0])
         }
@@ -63,4 +61,4 @@ const api = function (View) {
   }
 }
 
-export default api
+export default api

plugins/dates/src/api/durations/index.js

@@ -1,6 +1,5 @@
 import parse from './parse.js'
 
-
 const addDurations = function (View) {
   /** phrases like '2 months', or '2mins' */
   class Durations extends View {
@@ -12,7 +11,7 @@ const addDurations = function (View) {
     json(opts = {}) {
       return this.map(m => {
         let json = m.toView().json(opts)[0] || {}
-        if (opts && opts.times !== true) {
+        if (opts && opts.duration !== false) {
           json.duration = parse(m)
         }
         return json
@@ -21,7 +20,7 @@ const addDurations = function (View) {
     /** easy getter for the time */
     get(options) {
       let arr = []
-      this.forEach((doc) => {
+      this.forEach(doc => {
         let res = parse(doc)
         arr.push(res)
       })