Merge pull request #971 from spencermountain/dev

Dev

.github/workflows/build-and-test.yml

@@ -12,15 +12,15 @@ jobs:
         os: [macos-latest, ubuntu-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}

.github/workflows/coverage.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/release.yml

@@ -14,14 +14,14 @@ jobs:
     # delegate to the build- and-test workflow, but I haven't found a way to do
     # that yet.
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
       - name: cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm-10.x-${{ hashFiles('package-lock.json') }}

changelog.md

@@ -6,9 +6,23 @@ compromise uses semver, and pushes to npm and github frequently
 
 While all _Major_ releases should be reviewed, our only _large_ releases are **v6** in 2016 **v12** in 2019 and **v14** in 2022. Others have been mostly incremental.
 
-<!-- #### 14.5.0 [Unreleased]
+<!-- #### 14.6.0 [Unreleased]
 -->
 
+#### 14.6.0 [Oct 2022]
+- **[change]** - move internal conjugation methods
+- **[update]** - github scripts
+- **[change]** - fixes to .clauses() parser
+- **[change]** - an astrix is not a word
+- **[new]** - @hasColon method
+- **[new]** - @hasDash supports two dashes
+- **[new]** - `#Passive` verb tag
+- **[new]** - existential `#There` tag
+- **[new]** - add tense info to sentence json
+- **[fix]** - verb tokenization issues
+- **[fix]** - .replace() issues
+- **[update]** - dependencies
+
 #### 14.5.2 [Oct 2022]
 - **[fix]** - runtime error #965
 - **[fix]** - misc possessive tagging issues

data/lexicon/adjectives/adjectives.js

@@ -641,5 +641,6 @@ export default [
 
   'renowned',
   'beside',
+  'alright',
 ]
 

data/lexicon/misc/expressions.js

@@ -43,7 +43,6 @@ export default [
   'hai',
   'hallelujah',
   'hee',
-  'hell',
   'hello',
   'hey',
   'hi',
@@ -120,4 +119,7 @@ export default [
   'yuck',
   'yup',
   `d'oh`,
+  'shoo',
+  'there now',
+  'aye'
 ]

data/lexicon/misc/prepositions.js

@@ -42,6 +42,7 @@ export default [
   'sans',
   'since',
   'so that',
+  'such as',
   'than',
   'through',
   'throughout',
@@ -58,9 +59,10 @@ export default [
   'w/o',
   'whereas',
   'with',
+  'with whom',
   'within',
   'without',
-  `'o`,
-  `a'`,
-  `o'`,
+  // `'o`,
+  // `a'`,
+  // `o'`,
 ]

data/lexicon/nouns/singulars.js

@@ -72,7 +72,6 @@ export default [
   'home',
   'someone',
   'headphone',
-  'there',
   'press release',
   'premise',
   'highrise',
@@ -403,6 +402,7 @@ export default [
   'man',
   'tributary',
   'flower',
+  'sandwich',
 ]
 
 

data/lexicon/nouns/uncountables.js

@@ -160,6 +160,7 @@ export default [
   'tennis',
   'thermodynamics',
   'thunder',
+  'there',
   'time',
   'toothpaste',
   'traffic',

data/lexicon/switches/adj-past.js

@@ -23,12 +23,14 @@ export default [
   'awarded',
   'balanced',
   'based',//modern slang
+  'baked', //baked goods
   'biased',
   'boiled',
   'bored',
   'bottled',
   'bound',
   'burned',
+  'broken',
   'calculated',
   'celebrated',
   'centralized',
@@ -70,13 +72,15 @@ export default [
   'disabled',
   'disciplined',
   'discounted',
+  'discouraged',
   'disgruntled',
   'distorted',
   'distressed',
   'disturbed',
   'educated',
   'enhanced',
   'ensured',
+  'embarrassed',
   'equipped',
   'established',
   'expanded',

data/lexicon/switches/adj-present.js

@@ -26,6 +26,7 @@ export default [
   'mature',
   'mean',
   'moderate',
+  // 'near',
   'narrow',
   'obscure',
   'open',

data/lexicon/switches/noun-verb.js

@@ -592,12 +592,14 @@ export default [
   'survey',
   'suspect',
   'swear',
+  'sweat',
   'switch',
   'tag',
   'talk',
   'tally',
   'target',
   'taste',
+  'tax',
   'tear',
   'tee',
   'test',

data/lexicon/verbs/infinitives.js

@@ -705,5 +705,15 @@ export default [
   'subside',
 
   'squish',
-  'vanish'
+  'vanish',
+
+  // present participles
+  'awaken',
+  'frighten',
+  'hasten',
+  'heighten',
+  'lengthen',
+  'lessen',
+  'worsen',
+  'sweeten',
 ]

data/lexicon/verbs/phrasals.js

@@ -122,6 +122,7 @@ export default [
   'carry away',
   'carry off',
   'carry on',
+  'carry out',
   'carve down',
   'carve in',
   'carve out',

package.json

@@ -2,7 +2,7 @@
   "author": "Spencer Kelly <spencermountain@gmail.com> (http://spencermounta.in)",
   "name": "compromise",
   "description": "modest natural language processing",
-  "version": "14.5.2",
+  "version": "14.6.0",
   "main": "./src/three.js",
   "unpkg": "./builds/compromise.js",
   "type": "module",
@@ -95,13 +95,12 @@
     "suffix-thumb": "4.0.2"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "4.0.0",
     "@rollup/plugin-node-resolve": "15.0.0",
     "amble": "1.3.0",
     "eslint": "8.25.0",
     "eslint-plugin-regexp": "1.9.0",
     "nlp-corpus": "4.4.0",
-    "rollup": "3.2.1",
+    "rollup": "3.2.3",
     "rollup-plugin-filesize-check": "0.0.1",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.5",