Merge pull request #790 from spencermountain/dev

Dev

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

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 13.x]
+        node-version: [10.x, 15.x]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/coverage.yml

@@ -3,10 +3,8 @@
 name: Coverage
 
 on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+  release:
+    types: [created]
 
 jobs:
   getCoverage:

.gitignore

@@ -4,4 +4,6 @@ coverage/
 .env
 .nyc_output/
 .vscode
-coverage.lcov
+coverage.lcov
+codecov.yml
+plugins/phrases/data/

changelog.md

@@ -10,6 +10,16 @@ While all _Major_ releases should be reviewed, our only two _large_ releases are
 
 <!-- #### [Unreleased] -->
 
+#### 13.7.0
+- **[change]** many misc tagging fixes
+  - 'if' is now a #Preposition
+  - possessive pronouns are #Pronoun and #Possessive
+  - more phrasal verbs
+  - make #Participle tag #PastTense
+  - favor #PastTense over #Participle interpretation in tagger
+- **[change]** `@hasHyphen` returns false for sentence dashes
+- a lot more testing
+
 #### 13.6.0
 
 - **[new]** first-attempt at `verbs().subject()` method

codecov.yml

@@ -0,0 +1,3 @@
+comment: false
+branches:
+  - 'master'

data/abbreviations/misc.js

@@ -41,7 +41,6 @@ module.exports = [
   'vet',
   // 'sing',//singular
   'ver', //version
-  'vs',
   'fem', //feminine
   'masc', //masculine
   'eng', //engineering/english

data/adjectives/adjectives.js

@@ -16,6 +16,7 @@ module.exports = [
   'assuring',
   'astonishing',
   'blinding',
+  'below',
   'boring',
   'confusing',
   'damaging',
@@ -498,6 +499,7 @@ module.exports = [
   'upside down',
   'upstairs',
   'uptight',
+  'up to date',
   'urban',
   'usual',
   'utter',

data/adjectives/comparables.js

@@ -79,7 +79,6 @@ module.exports = [
   'financial',
   'fine',
   'firm',
-  'fit',
   'foamy',
   'forgetful',
   'formal',

data/misc.js

@@ -14,7 +14,7 @@ module.exports = {
   am: 'Copula',
   are: 'Copula',
 
-  if: 'Condition',
+  if: ['Condition', 'Preposition'],
   unless: 'Condition',
   lest: 'Condition',
 
@@ -55,6 +55,7 @@ module.exports = {
   //misc
   records: 'Plural',
   '&': 'Conjunction',
+  vs: ['Conjunction', 'Abbreviation'],
 
   //pronouns
   i: ['Pronoun', 'Singular'],

data/misc/adverbs.js

@@ -15,6 +15,7 @@ module.exports = [
   'anyway',
   'apart',
   'aside',
+  'as soon',
   'at best',
   'at large',
   'at least',
@@ -28,6 +29,7 @@ module.exports = [
   'definitely',
   'directly',
   'en masse',
+  'enough',
   'ever',
   'for example',
   'for good',
@@ -81,7 +83,7 @@ module.exports = [
   'upwards of',
   'tiny bit',
   'very',
-  'way',
+  'well',
   'yep',
   'yes',
 ]

data/misc/determiners.js

@@ -7,7 +7,6 @@ module.exports = [
   'each',
   'either',
   'else',
-  'enough',
   'every',
   'few',
   'least',

data/misc/prepositions.js

@@ -15,7 +15,6 @@ module.exports = [
   'at',
   'atop',
   'barring',
-  'below',
   'besides',
   'between',
   'bout',

data/nouns/singulars.js

@@ -30,9 +30,11 @@ module.exports = [
   'grand slam',
   'head start',
   'home run',
+  'human right',
   'home',
   'house',
   'insect',
+  'line',
   'lunch',
   'meeting',
   'model',
@@ -43,8 +45,10 @@ module.exports = [
   'part',
   'patent',
   'plate',
+  'player',
   'problem',
   'purpose',
+  'question',
   'question mark',
   'room',
   'rose',
@@ -64,6 +68,7 @@ module.exports = [
   'tv show',
   'us dollar',
   'us state',
+  'way',
 
   //double-consonant rule
   'bottle',

data/verbs/infinitives.js

@@ -210,6 +210,7 @@ module.exports = [
   'favor',
   'fear',
   'feature',
+  'fit',
   'figure',
   'file',
   'fill',
@@ -293,7 +294,6 @@ module.exports = [
   'lift',
   'like',
   'limit',
-  'line',
   'link',
   'list',
   'listen',
@@ -320,6 +320,7 @@ module.exports = [
   'mingle',
   'minus',
   'mirror',
+  'misrepresent',
   'monitor',
   'move',
   'multiply',
@@ -381,7 +382,6 @@ module.exports = [
   'purchase',
   'pursue',
   'push',
-  'question',
   'raise',
   'range',
   'rank',

data/verbs/phrasals.js

@@ -96,6 +96,9 @@ module.exports = [
   'burn in',
   'burn off',
   'burn out',
+  'bust up',
+  'bust out',
+  'bust in',
   'butt in',
   'butt out',
   'buy out',
@@ -143,6 +146,7 @@ module.exports = [
   'come together',
   'come under',
   'cook up',
+  'cool down',
   'cool off',
   'count off',
   'count on',
@@ -154,6 +158,7 @@ module.exports = [
   'cut out',
   'cut up',
   'do over',
+  'double up',
   'dress down',
   'dress up',
   'drop away',
@@ -216,6 +221,7 @@ module.exports = [
   'flip out',
   'fold down',
   'fold up',
+  'follow up',
   'fool about',
   'fool around',
   'fool with',
@@ -322,6 +328,7 @@ module.exports = [
   'horse around',
   'hunker down',
   'hush up',
+  'hurry up',
   'iron out',
   'jack in',
   'jack off',
@@ -347,6 +354,7 @@ module.exports = [
   'knock down',
   'knock off',
   'knock out',
+  'lace up',
   'lap up',
   'lash into',
   'lash out',
@@ -496,6 +504,7 @@ module.exports = [
   'put together',
   'put up',
   'rat out',
+  'rack up',
   'reach in',
   'reach out',
   'read off',
@@ -530,6 +539,7 @@ module.exports = [
   'run through',
   'run under',
   'rustle up',
+  'quiet down',
   'sail off',
   'save up',
   'scale down',
@@ -601,6 +611,8 @@ module.exports = [
   'snow out',
   'sober up',
   'sort out',
+  'spin up',
+  'speed up',
   'spark up',
   'spell out',
   'spill over',
@@ -639,6 +651,7 @@ module.exports = [
   'strike out',
   'strike up',
   'string up',
+  'stuck up',
   'suck in',
   'suck up',
   'suit up',
@@ -697,6 +710,7 @@ module.exports = [
   'top out',
   'top up',
   'toss up',
+  'track down',
   'trade in',
   'trade up',
   'trickle down',

data/verbs/verbs.js

@@ -1,21 +1,22 @@
 //verbs we shouldn't conjugate
 module.exports = [
-  'awaken',
+  'has',
+  'keep tabs',
+  'known',
   'born',
   'cannot',
+  'awaken',
+  'gonna',
+  'msg',
+  'seen',
+  'shown',
+  'make sure',
+  //
   'frighten',
   'given',
-  'gonna',
-  'has',
   'hasten',
   'heighten',
-  'keep tabs',
-  'known',
   'lengthen',
   'lessen',
-  'make sure',
-  'msg',
-  'seen',
-  'shown',
   'worsen',
 ]