Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #978

Merged
merged 27 commits into from Nov 4, 2022
Merged

Dev #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
abc487e
update lockfiles for node 18
spencermountain Oct 21, 2022
ff93ea2
match term by id
spencermountain Oct 28, 2022
041c92a
fix for #977
spencermountain Oct 31, 2022
c374eef
more noun-verb words, 1x
spencermountain Oct 31, 2022
b6261f4
noun-gerund fixes - 0x
spencermountain Oct 31, 2022
f413d07
more noun-verb
spencermountain Oct 31, 2022
3b48d94
paragraph tests passing
spencermountain Oct 31, 2022
9f3519b
0.1.0rc
spencermountain Oct 31, 2022
5d47219
fix speed plugin deps
spencermountain Oct 31, 2022
a9a64d2
fix concat
spencermountain Nov 2, 2022
0172e72
crowd out phrasal
spencermountain Nov 2, 2022
6f1ae89
implement notIf sorta
spencermountain Nov 3, 2022
5d72376
more notIf matches, tests passing
spencermountain Nov 3, 2022
9ba6e0a
more notif checks
spencermountain Nov 3, 2022
6d54541
wrap punctuation fixes
spencermountain Nov 3, 2022
0664c17
move punctuation model
spencermountain Nov 3, 2022
1ab1e07
move punctuation model, test json
spencermountain Nov 3, 2022
373131b
toPlural fixes
spencermountain Nov 3, 2022
5977bfa
isfull method
spencermountain Nov 3, 2022
0784139
change text params - 1x
spencermountain Nov 3, 2022
d66c612
#977
spencermountain Nov 4, 2022
267ab25
tests passing
spencermountain Nov 4, 2022
83909df
punctuation tests
spencermountain Nov 4, 2022
e0a2361
new punctuation finally
spencermountain Nov 4, 2022
82ef25e
chillin still works
spencermountain Nov 4, 2022
4291520
all tests passing
spencermountain Nov 4, 2022
2a5fa40
14.7.0rc
spencermountain Nov 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -819,7 +819,7 @@ nlp.extend({
| [Whitespace](https://observablehq.com/@spencermountain/compromise-whitespace) | [Verbs](https://observablehq.com/@spencermountain/verbs) | [Typeahead](https://observablehq.com/@spencermountain/compromise/compromise-typeahead) |
| [World data](https://observablehq.com/@spencermountain/compromise-world) | [Normalization](https://observablehq.com/@spencermountain/compromise-normalization) | [Sweep](https://observablehq.com/@spencermountain/compromise-sweep) |
| [Fuzzy-matching](https://observablehq.com/@spencermountain/compromise-fuzzy-matching) | [Typescript](https://observablehq.com/@spencermountain/compromise-typescript) | [Mutation](https://observablehq.com/@spencermountain/compromise-mutation) |
| [Root-forms](https://observablehq.com/@spencermountain/compromise-root) | | |
| [Root-forms](https://observablehq.com/@spencermountain/compromise-root) | [Character Offsets](https://observablehq.com/@spencermountain/compromise-offsets) | |


<div >
Expand Down
2 changes: 1 addition & 1 deletion builds/compromise.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/one/compromise-one.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/one/compromise-one.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/three/compromise-three.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/three/compromise-three.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/two/compromise-two.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/two/compromise-two.mjs

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion changelog.md
Expand Up @@ -6,9 +6,26 @@ 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.6.0 [Unreleased]
<!-- #### [planned breaking]
- fix doc.json(0) inconsistency
- fix text() options
-->

<!-- #### 14.7.1 [Unreleased]
-->

#### 14.7.0
- **[new]** - match term id
- **[change]** - tag text by default on .concat('')
- **[change]** - allow modifying term prePunctuation
- **[new]** - .wrap() method
- **[new]** - .isFull() method
- **[fix]** - text params for #953
- **[fix]** - nouns().isSingular() missing
- **[change]** - one-character w/ dash tokenization #977
- **[change]** - allow setting `model.one.prePunctuation` + `postPunctuation`
- **[fix]** - compromise-paragraphs plugin

#### 14.6.0 [Oct 2022]
- **[change]** - move internal conjugation methods
- **[update]** - github scripts
Expand Down
2 changes: 2 additions & 0 deletions data/lexicon/adjectives/adjectives.js
Expand Up @@ -642,5 +642,7 @@ export default [
'renowned',
'beside',
'alright',
'top notch',
'self sufficient'
]

2 changes: 1 addition & 1 deletion data/lexicon/nouns/professions.js
Expand Up @@ -15,7 +15,7 @@ export default [
'clerk',
'deputy',
'dietician',
'engineer',
// 'engineer',
'farmer',
'firefighter',
'fireman',
Expand Down
1 change: 1 addition & 0 deletions data/lexicon/nouns/singulars.js
Expand Up @@ -403,6 +403,7 @@ export default [
'tributary',
'flower',
'sandwich',
'x ray',
]


35 changes: 19 additions & 16 deletions data/lexicon/nouns/uncountables.js
Expand Up @@ -9,7 +9,7 @@ export default [
'aeronautics',
'aircraft',
'amnesty',
'art',
// 'art',
'athletics',
'baggage',
'bass',
Expand All @@ -22,15 +22,15 @@ export default [
'butter',
'cad',
'cards',
'cash',
// 'cash',
'celcius',
'chaos',
'cheese',
'chewing',
'chicken',
'civics',
'classics',
'clothing',
// 'clothing',
'coal',
'cold war',
'confusion',
Expand All @@ -52,7 +52,7 @@ export default [
'everything',
'fahrenheit',
'fiction',
'flesh',
// 'flesh',
'flour',
'food',
'forgiveness',
Expand All @@ -62,10 +62,10 @@ export default [
'gene editing',
'gene pool',
'genetics',
'gold',
// 'gold',
'golf',
'grass',
'ground',
// 'ground',
'gum',
'gymnastics',
'hair',
Expand All @@ -85,8 +85,8 @@ export default [
'information',
'jazz',
'jewelry',
'justice',
'kelvin',
// 'justice',
// 'kelvin',
'knowledge',
'laughter',
'leather',
Expand All @@ -100,7 +100,7 @@ export default [
'luggage',
'machine learning',
'machinery',
'mail',
// 'mail',
'mathematics',
'measles',
'meat',
Expand All @@ -123,9 +123,9 @@ export default [
'politics',
'polygamy',
'pork',
'power',
// 'power',
'pressure',
'progress',
// 'progress',
'rabies',
'rain',
'recognition',
Expand All @@ -146,11 +146,11 @@ export default [
'silk',
'silver',
'skittles',
'snow',
// 'snow',
'soap',
'soccer',
'spacecraft',
'speed',
// 'speed',
'statistics',
'steam',
'steel',
Expand All @@ -161,7 +161,7 @@ export default [
'thermodynamics',
'thunder',
'there',
'time',
// 'time',
'toothpaste',
'traffic',
'trouble',
Expand Down Expand Up @@ -203,7 +203,7 @@ export default [
'debut',
'disrepute',
'couscous',
'vanilla',
// 'vanilla',

'honesty',
'dishonesty',
Expand All @@ -218,7 +218,7 @@ export default [
'aspirin',
'glycerin',

'spite',
// 'spite',
'overcrowding',
'troubleshooting',
'gore',
Expand All @@ -240,4 +240,7 @@ export default [
'arithmetic',
'static',
'logic',
'hunger',
'sushi',
'seating',
]
1 change: 1 addition & 0 deletions data/lexicon/places/places.js
Expand Up @@ -66,6 +66,7 @@ export default [
'bel air',
'malibu',
'gay village',
'orange county',
'sunderland',

// places with their own timezones
Expand Down
84 changes: 78 additions & 6 deletions data/lexicon/switches/noun-verb.js
Expand Up @@ -254,7 +254,6 @@ export default [
'goof',
'gossip',
'grade',
'grant',
'grasp',
'grind',
'grip',
Expand Down Expand Up @@ -685,18 +684,15 @@ export default [
// prefixes
'dispatch',
'remark',
'resort',
'detail',
'order',
'reorder',

// -ide
'divide',
'guide',
'pride',
'ride',
'side',

// -ate
'advocate',
'affiliate',
Expand All @@ -715,8 +711,84 @@ export default [
'duplicate',
'gate',
'graduate',

'relish',
'polish',
'stocking',
'practice',
'race',
// 'saw',//hmm
'format',
'position',
'cast',
'edge',
'hop',
'staple',
'top',
'swipe',
'vomit',
'matter',
'respect',
'circle',
'hedge',
'bind',
'crash',
'dab',
'duel',
'weed',
'loot',
'battle',
'fuss',
'zoom',
'leak',
'coach',
'drip',
'drop',
'struggle',
'canoe',
'blur',
'restart',
'leech',
'foil',
'eyeball',
'flock',
'worship',
'anger',
'interface',
'reference',
'trek',
'shuffle',
'whisk',
'print',
'route',
'transition',
'breed',
'glow',
'lap',
'bill',
'fragment',
'spot',
'conflict',
'scroll',
'consent',
'bond',
'foot',
'shore',
'fold',
'tour',
'sip',
'stroke',
'orbit',
'shave',
'cue',
'mold',
'snap',
'curve',
'brush',
'peer',
'text',
'rap',
'wick',
'interest',
'ask',
'drone',
'tangle',
]
6 changes: 0 additions & 6 deletions data/lexicon/verbs/infinitives.js
Expand Up @@ -82,7 +82,6 @@ export default [
'bestow',
'betray',
'bewilder',
'bind',
'bleed',
'blow',
'boil',
Expand All @@ -92,7 +91,6 @@ export default [
'bother',
'brake',
'breastfeed',
'breed',
'bring',
'broaden',
'build',
Expand Down Expand Up @@ -224,7 +222,6 @@ export default [
'do',
'draw',
'dredge',
'drop',
'drown',
'dwindle',
'earmark',
Expand Down Expand Up @@ -512,7 +509,6 @@ export default [
'resent',
'resign',
'resist',
'restart',
'restock',
'restrain',
'restrict',
Expand Down Expand Up @@ -547,7 +543,6 @@ export default [
'shake',
'sharpen',
'shatter',
'shave',
'shine',
'shoot',
'shorten',
Expand Down Expand Up @@ -697,7 +692,6 @@ export default [
'collide',
'confide',
'decide',
'divide',
'hide',
'provide',
'reside',
Expand Down
2 changes: 2 additions & 0 deletions data/lexicon/verbs/phrasals.js
Expand Up @@ -169,6 +169,7 @@ export default [
'creep out',
'creep up',
'cross in',
'crowd out',
'cross out',
'cut away',
'cut back',
Expand Down Expand Up @@ -853,4 +854,5 @@ export default [
'zip up',
'zone out',
'zonk out',
'grab hold'
]