Skip to content

fix: singularize/pluralize regular -s nouns like gas/lens (fixes #123) #127

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.

Sign up for GitHub

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

Open
youdie006 wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Open

fix: singularize/pluralize regular -s nouns like gas/lens (fixes #123) #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/inflection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ const regex = {
genera: new RegExp('^genera$', 'gi'),
nuclei: new RegExp('^(nucle)i$', 'gi'),
nucleuses: new RegExp('^(nucle)uses$', 'gi'),
gases: new RegExp('^(gas|lens|bias|atlas|iris)es$', 'gi'),
ss: new RegExp('ss$', 'gi'),
s: new RegExp('s$', 'gi'),
},
Expand Down Expand Up @@ -412,6 +413,7 @@ const regex = {
criterion: new RegExp('^(criteri)on$', 'gi'),
genus: new RegExp('^genus$', 'gi'),
nucleus: new RegExp('^(nucle)us$', 'gi'),
gas: new RegExp('^(gas|lens|bias|atlas|iris)$', 'gi'),
s: new RegExp('s$', 'gi'),
common: new RegExp('$', 'gi'),
},
Expand Down Expand Up @@ -453,6 +455,7 @@ const pluralRules: [RegExp, string?][] = [
[regex.plural.genera],
[regex.plural.nuclei],
[regex.plural.nucleuses],
[regex.plural.gases],

// original rule
[regex.singular.man, '$1en'],
Expand Down Expand Up @@ -484,6 +487,7 @@ const pluralRules: [RegExp, string?][] = [
[regex.singular.criterion, '$1a'],
[regex.singular.genus, 'genera'],
[regex.singular.nucleus, '$1i'],
[regex.singular.gas, '$1es'],

[regex.singular.s, 's'],
[regex.singular.common, 's'],
Expand Down Expand Up @@ -522,6 +526,7 @@ const singularRules: [RegExp, string?][] = [
[regex.singular.criterion],
[regex.singular.genus],
[regex.singular.nucleus],
[regex.singular.gas],

// original rule
[regex.plural.men, '$1an'],
Expand Down Expand Up @@ -560,6 +565,7 @@ const singularRules: [RegExp, string?][] = [
[regex.plural.geese, 'goose'],
[regex.plural.quizzes, '$1'],
[regex.plural.whereases, '$1'],
[regex.plural.gases, '$1'],

[regex.plural.ss, 'ss'],
[regex.plural.s, ''],
Expand Down
19 changes: 19 additions & 0 deletions test/inflection.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ describe('test .pluralize', function () {
expect(inflection.pluralize('nucleus')).toEqual('nuclei');
expect(inflection.pluralize('nuclei')).toEqual('nuclei');
expect(inflection.pluralize('nucleuses')).toEqual('nucleuses');
expect(inflection.pluralize('gas')).toEqual('gases');
expect(inflection.pluralize('gases')).toEqual('gases');
expect(inflection.pluralize('lens')).toEqual('lenses');
expect(inflection.pluralize('lenses')).toEqual('lenses');
});
});

Expand Down Expand Up @@ -114,6 +118,21 @@ describe('test .singularize', function () {
expect(inflection.singularize('analyses')).toEqual('analysis');
expect(inflection.singularize('bases')).toEqual('basis');
expect(inflection.singularize('diagnoses')).toEqual('diagnosis');
// regular -s nouns whose plural ends in -ses (issue #123)
expect(inflection.singularize('gases')).toEqual('gas');
expect(inflection.singularize('lenses')).toEqual('lens');
expect(inflection.singularize('gas')).toEqual('gas');
expect(inflection.singularize('lens')).toEqual('lens');
// singularize(pluralize(x)) === x round-trip
expect(inflection.singularize(inflection.pluralize('gas'))).toEqual('gas');
expect(inflection.singularize(inflection.pluralize('lens'))).toEqual('lens');
// must not regress: -ses plurals that are not the anchored class
expect(inflection.singularize('houses')).toEqual('house');
expect(inflection.singularize('buses')).toEqual('bus');
// must not over-protect: bare -gas/-s words that merely end in the stem
expect(inflection.singularize('sagas')).toEqual('saga');
expect(inflection.singularize('omegas')).toEqual('omega');
expect(inflection.singularize('cameras')).toEqual('camera');
});
});

Expand Down