@fc3/grammar 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/bin/precompile +18 -2
  2. package/bin/remap-paths +54 -2
  3. package/dist/.last-compile-time +1 -1
  4. package/dist/.last-publish-time +1 -1
  5. package/dist/src/index.d.ts +2 -0
  6. package/dist/src/index.js +5 -1
  7. package/dist/src/index.js.map +1 -1
  8. package/dist/src/noun-inflector.js +6 -4
  9. package/dist/src/noun-inflector.js.map +1 -1
  10. package/dist/src/utility/get-name-for-number.d.ts +2 -0
  11. package/dist/src/utility/get-name-for-number.js +146 -0
  12. package/dist/src/utility/get-name-for-number.js.map +1 -0
  13. package/dist/src/utility/get-ordinal-name-for-number.d.ts +2 -0
  14. package/dist/src/utility/get-ordinal-name-for-number.js +69 -0
  15. package/dist/src/utility/get-ordinal-name-for-number.js.map +1 -0
  16. package/dist/src/verb-inflector.d.ts +4 -0
  17. package/dist/src/verb-inflector.js +59 -38
  18. package/dist/src/verb-inflector.js.map +1 -1
  19. package/dist/test/unit/get-name-for-number.d.ts +1 -0
  20. package/dist/test/unit/get-name-for-number.js +33 -0
  21. package/dist/test/unit/get-name-for-number.js.map +1 -0
  22. package/dist/test/unit/get-ordinal-name-for-number.d.ts +1 -0
  23. package/dist/test/unit/get-ordinal-name-for-number.js +29 -0
  24. package/dist/test/unit/get-ordinal-name-for-number.js.map +1 -0
  25. package/dist/test/unit/index.js +5 -53
  26. package/dist/test/unit/index.js.map +1 -1
  27. package/dist/test/unit/noun-inflector.d.ts +1 -0
  28. package/dist/test/unit/noun-inflector.js +72 -0
  29. package/dist/test/unit/noun-inflector.js.map +1 -0
  30. package/dist/test/unit/utility/get-words-from-identifier.d.ts +1 -0
  31. package/dist/test/unit/utility/get-words-from-identifier.js +26 -0
  32. package/dist/test/unit/utility/get-words-from-identifier.js.map +1 -0
  33. package/dist/test/unit/utility/pluralize.d.ts +1 -0
  34. package/dist/test/unit/utility/pluralize.js +35 -0
  35. package/dist/test/unit/utility/pluralize.js.map +1 -0
  36. package/dist/test/unit/utility/singularize-or-pluralize.d.ts +1 -0
  37. package/dist/test/unit/utility/singularize-or-pluralize.js +22 -0
  38. package/dist/test/unit/utility/singularize-or-pluralize.js.map +1 -0
  39. package/dist/test/unit/utility/singularize.d.ts +1 -0
  40. package/dist/test/unit/utility/singularize.js +27 -0
  41. package/dist/test/unit/utility/singularize.js.map +1 -0
  42. package/dist/test/unit/verb-inflector.d.ts +1 -0
  43. package/dist/test/unit/verb-inflector.js +179 -0
  44. package/dist/test/unit/verb-inflector.js.map +1 -0
  45. package/dist/tsconfig.tsbuildinfo +1 -1
  46. package/package.json +2 -1
package/bin/precompile CHANGED
@@ -25,11 +25,27 @@ if [ -f dist/.compile-lock ]; then
25
25
  done
26
26
  fi
27
27
 
28
- if [[ -f ./dist/.last-publish-time ]]; then
28
+ if [[ -f ./dist/.last-publish-time && ! -d src ]]; then
29
29
  echo "Found publication compile artifact; skipping recompilation."
30
30
  exit 3
31
31
  fi
32
32
 
33
+ missing_output=false
34
+
35
+ if [ -d src ] && [ ! -d dist/src ]; then
36
+ missing_output=true
37
+ fi
38
+
39
+ if [ -d test ] && [ ! -d dist/test ]; then
40
+ missing_output=true
41
+ fi
42
+
43
+ if [[ $missing_output == true ]]; then
44
+ # The incremental build cache would otherwise skip re-emitting files.
45
+ rm -f dist/tsconfig.tsbuildinfo
46
+ exit 0
47
+ fi
48
+
33
49
  if [ -f dist/.last-compile-time ]; then
34
50
  if [ ! -d src ]; then
35
51
  # TODO: Confirm we're within a deploy environment
@@ -38,7 +54,7 @@ if [ -f dist/.last-compile-time ]; then
38
54
  fi
39
55
 
40
56
  typeset -i last_modification_time=$(find src test -type f -print0 |
41
- xargs -0 stat -c "%X %N" |
57
+ xargs -0 stat -c "%Y %N" |
42
58
  sort -rn |
43
59
  head -1 |
44
60
  awk '{ print $1 }')
package/bin/remap-paths CHANGED
@@ -35,7 +35,7 @@ function processSourceFile(filePath) {
35
35
  const contents = FS.readFileSync(filePath, UTF8_ENCODING);
36
36
 
37
37
  const lines = contents.split('\n').map(function map(line) {
38
- return line.replace(/require\("([^"]+)/g, function replacer(match, path) {
38
+ return line.replace(/require\((["'])([^"']+)/g, function replacer(match, quote, path) {
39
39
  if (path[0] === '.') {
40
40
  return match;
41
41
  }
@@ -66,7 +66,7 @@ function processSourceFile(filePath) {
66
66
 
67
67
  const relativePath = relativeDirectory + '/' + parsedDependency.base;
68
68
 
69
- return 'require("' + relativePath;
69
+ return 'require(' + quote + relativePath;
70
70
  });
71
71
  });
72
72
 
@@ -117,4 +117,56 @@ function processDeclarationFile(filePath) {
117
117
  FS.writeFileSync(filePath, lines.join('\n'), UTF8_ENCODING);
118
118
  }
119
119
 
120
+ const OUTPUT_SUFFIXES = ['.d.ts', '.js.map', '.js'];
121
+ const SOURCE_EXTENSIONS = ['.ts', '.tsx'];
122
+
123
+ function getSourceStem(output_path) {
124
+ const suffix = OUTPUT_SUFFIXES.find(function find(candidate) {
125
+ return output_path.endsWith(candidate);
126
+ });
127
+
128
+ if (suffix === undefined) {
129
+ return null;
130
+ }
131
+
132
+ return output_path.slice(0, -suffix.length);
133
+ }
134
+
135
+ function hasSource(source_stem) {
136
+ return SOURCE_EXTENSIONS.some(function some(extension) {
137
+ return FS.existsSync(source_stem + extension);
138
+ });
139
+ }
140
+
141
+ function pruneOrphanedOutputs(output_directory, source_directory) {
142
+ if (!FS.existsSync(output_directory)) {
143
+ return;
144
+ }
145
+
146
+ FS.readdirSync(output_directory).forEach(function each(child) {
147
+ const output_path = Path.resolve(output_directory, child);
148
+ const source_path = Path.resolve(source_directory, child);
149
+
150
+ if (FS.statSync(output_path).isDirectory()) {
151
+ pruneOrphanedOutputs(output_path, source_path);
152
+ return;
153
+ }
154
+
155
+ const output_stem = getSourceStem(child);
156
+
157
+ if (output_stem === null) {
158
+ return;
159
+ }
160
+
161
+ const source_stem = Path.resolve(source_directory, output_stem);
162
+
163
+ if (!hasSource(source_stem)) {
164
+ FS.unlinkSync(output_path);
165
+ }
166
+ });
167
+ }
168
+
169
+ pruneOrphanedOutputs('./dist/src', './src');
170
+ pruneOrphanedOutputs('./dist/test', './test');
171
+
120
172
  processDirectory('./dist', 0);
@@ -1 +1 @@
1
- 1792409807
1
+ 1795093130
@@ -1 +1 @@
1
- 1792410762
1
+ 1795093137
@@ -4,3 +4,5 @@ export { default as getWordsFromIdentifier } from './utility/get-words-from-iden
4
4
  export { default as singularize } from './utility/singularize';
5
5
  export { default as pluralize } from './utility/pluralize';
6
6
  export { default as singularizeOrPluralize } from './utility/singularize-or-pluralize';
7
+ export { default as getNameForNumber } from './utility/get-name-for-number';
8
+ export { default as getOrdinalNameForNumber } from './utility/get-ordinal-name-for-number';
package/dist/src/index.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.singularizeOrPluralize = exports.pluralize = exports.singularize = exports.getWordsFromIdentifier = exports.VerbInflector = exports.NounInflector = void 0;
6
+ exports.getOrdinalNameForNumber = exports.getNameForNumber = exports.singularizeOrPluralize = exports.pluralize = exports.singularize = exports.getWordsFromIdentifier = exports.VerbInflector = exports.NounInflector = void 0;
7
7
  var noun_inflector_1 = require("./noun-inflector.js");
8
8
  Object.defineProperty(exports, "NounInflector", { enumerable: true, get: function () { return __importDefault(noun_inflector_1).default; } });
9
9
  var verb_inflector_1 = require("./verb-inflector.js");
@@ -16,4 +16,8 @@ var pluralize_1 = require("./utility/pluralize.js");
16
16
  Object.defineProperty(exports, "pluralize", { enumerable: true, get: function () { return __importDefault(pluralize_1).default; } });
17
17
  var singularize_or_pluralize_1 = require("./utility/singularize-or-pluralize.js");
18
18
  Object.defineProperty(exports, "singularizeOrPluralize", { enumerable: true, get: function () { return __importDefault(singularize_or_pluralize_1).default; } });
19
+ var get_name_for_number_1 = require("./utility/get-name-for-number.js");
20
+ Object.defineProperty(exports, "getNameForNumber", { enumerable: true, get: function () { return __importDefault(get_name_for_number_1).default; } });
21
+ var get_ordinal_name_for_number_1 = require("./utility/get-ordinal-name-for-number.js");
22
+ Object.defineProperty(exports, "getOrdinalNameForNumber", { enumerable: true, get: function () { return __importDefault(get_ordinal_name_for_number_1).default; } });
19
23
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAwD;AAAhD,gIAAA,OAAO,OAAiB;AAChC,iDAAwD;AAAhD,gIAAA,OAAO,OAAiB;AAChC,+EAAoF;AAA5E,oJAAA,OAAO,OAA0B;AACzC,mDAA2D;AAAnD,2HAAA,OAAO,OAAe;AAC9B,+CAAuD;AAA/C,uHAAA,OAAO,OAAa;AAC5B,6EAAmF;AAA3E,mJAAA,OAAO,OAA0B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAwD;AAAhD,gIAAA,OAAO,OAAiB;AAChC,iDAAwD;AAAhD,gIAAA,OAAO,OAAiB;AAChC,+EAAoF;AAA5E,oJAAA,OAAO,OAA0B;AACzC,mDAA2D;AAAnD,2HAAA,OAAO,OAAe;AAC9B,+CAAuD;AAA/C,uHAAA,OAAO,OAAa;AAC5B,6EAAmF;AAA3E,mJAAA,OAAO,OAA0B;AACzC,mEAAwE;AAAhE,wIAAA,OAAO,OAAoB;AACnC,mFAAuF;AAA/E,uJAAA,OAAO,OAA2B"}
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const SINGULAR_TO_PLURAL_MAP = {
4
4
  loot: 'loot'
5
5
  };
6
+ const SIBILANT_SINGULAR_REGEX = /(ch|sh|ss|x|z)$/;
7
+ const SIBILANT_PLURAL_REGEX = /(ch|sh|ss|x|z)es$/;
6
8
  class NounInflector {
7
9
  singularize(plural_form) {
8
10
  for (const singular_key in SINGULAR_TO_PLURAL_MAP) {
@@ -16,6 +18,9 @@ class NounInflector {
16
18
  if (plural_form.slice(-1) === 'i') {
17
19
  return plural_form.slice(0, -1) + 'us';
18
20
  }
21
+ if (SIBILANT_PLURAL_REGEX.test(plural_form)) {
22
+ return plural_form.slice(0, -2);
23
+ }
19
24
  if (plural_form.slice(-1) === 's') {
20
25
  return plural_form.slice(0, -1);
21
26
  }
@@ -30,13 +35,10 @@ class NounInflector {
30
35
  return singular_form.slice(0, -1) + 'ies';
31
36
  }
32
37
  }
33
- if (singular_form.slice(-2) === 'ch') {
34
- return singular_form + 'es';
35
- }
36
38
  if (singular_form.slice(-2) === 'us') {
37
39
  return singular_form.slice(0, -2) + 'i';
38
40
  }
39
- if (singular_form.slice(-2) === 'ss') {
41
+ if (SIBILANT_SINGULAR_REGEX.test(singular_form)) {
40
42
  return singular_form + 'es';
41
43
  }
42
44
  if (singular_form === 'life') {
@@ -1 +1 @@
1
- {"version":3,"file":"noun-inflector.js","sourceRoot":"","sources":["../../src/noun-inflector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"noun-inflector.js","sourceRoot":"","sources":["../../src/noun-inflector.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ declare function getNameForNumber(value: number): string;
2
+ export default getNameForNumber;
@@ -0,0 +1,146 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const errors_1 = require("@fc3/errors");
4
+ function getOnesNameForSegmentValue(value) {
5
+ const tens_place = Math.floor((value % 100) / 10);
6
+ if (tens_place === 1) {
7
+ return '';
8
+ }
9
+ const ones_place = value % 10;
10
+ switch (ones_place) {
11
+ case 0:
12
+ return '';
13
+ case 1:
14
+ return 'one';
15
+ case 2:
16
+ return 'two';
17
+ case 3:
18
+ return 'three';
19
+ case 4:
20
+ return 'four';
21
+ case 5:
22
+ return 'five';
23
+ case 6:
24
+ return 'six';
25
+ case 7:
26
+ return 'seven';
27
+ case 8:
28
+ return 'eight';
29
+ case 9:
30
+ return 'nine';
31
+ default:
32
+ throw new errors_1.InvalidError(`Invalid ones place segment value: "${value}"`);
33
+ }
34
+ }
35
+ function getTensNameForSegmentValue(value) {
36
+ const remainder = value % 100;
37
+ switch (remainder) {
38
+ case 10:
39
+ return 'ten';
40
+ case 11:
41
+ return 'eleven';
42
+ case 12:
43
+ return 'twelve';
44
+ case 13:
45
+ return 'thirteen';
46
+ case 14:
47
+ return 'fourteen';
48
+ case 15:
49
+ return 'fifteen';
50
+ case 16:
51
+ return 'sixteen';
52
+ case 17:
53
+ return 'seventeen';
54
+ case 18:
55
+ return 'eighteen';
56
+ case 19:
57
+ return 'nineteen';
58
+ }
59
+ const tens_place = Math.floor((value % 100) / 10);
60
+ switch (tens_place) {
61
+ case 0:
62
+ case 1:
63
+ return '';
64
+ case 2:
65
+ return 'twenty';
66
+ case 3:
67
+ return 'thirty';
68
+ case 4:
69
+ return 'forty';
70
+ case 5:
71
+ return 'fifty';
72
+ case 6:
73
+ return 'sixty';
74
+ case 7:
75
+ return 'seventy';
76
+ case 8:
77
+ return 'eighty';
78
+ case 9:
79
+ return 'ninety';
80
+ default:
81
+ throw new errors_1.InvariantViolation(`
82
+ Invalid tens place "${tens_place}" for value "${value}"
83
+ `);
84
+ }
85
+ }
86
+ function getHundredsNameForSegmentValue(value) {
87
+ const hundreds_place = Math.floor(value / 100);
88
+ if (hundreds_place === 0) {
89
+ return '';
90
+ }
91
+ const prefix = getOnesNameForSegmentValue(hundreds_place);
92
+ return `${prefix}-hundred`;
93
+ }
94
+ function getNameForSegmentValue(value) {
95
+ const hundreds_name = getHundredsNameForSegmentValue(value);
96
+ const tens_name = getTensNameForSegmentValue(value);
97
+ const ones_name = getOnesNameForSegmentValue(value);
98
+ const names = [hundreds_name, tens_name, ones_name];
99
+ const present_names = names.filter((name) => name !== '');
100
+ return present_names.join('-');
101
+ }
102
+ function getNameForThousandsPower(thousands_power) {
103
+ switch (thousands_power) {
104
+ case 0:
105
+ return '';
106
+ case 1:
107
+ return 'thousand';
108
+ case 2:
109
+ return 'million';
110
+ case 3:
111
+ return 'billion';
112
+ case 4:
113
+ return 'trillion';
114
+ case 5:
115
+ return 'quadrillion';
116
+ default:
117
+ throw new errors_1.InvalidError('Numbers this large are not supported');
118
+ }
119
+ }
120
+ function getNameForNumber(value) {
121
+ if (value === 0) {
122
+ return 'zero';
123
+ }
124
+ let decimal_string = value.toFixed(0);
125
+ let thousands_power = 0;
126
+ const names = [];
127
+ while (decimal_string.length) {
128
+ const segment = decimal_string.slice(-3);
129
+ const segment_value = parseInt(segment);
130
+ if (isNaN(segment_value)) {
131
+ throw new errors_1.InvalidError(`Invalid number segment: "${segment}"`);
132
+ }
133
+ const thousands_name = getNameForThousandsPower(thousands_power);
134
+ if (segment_value !== 0) {
135
+ const segment_name = getNameForSegmentValue(segment_value);
136
+ const segment_names = [segment_name, thousands_name];
137
+ const present_names = segment_names.filter((name) => name !== '');
138
+ names.unshift(...present_names);
139
+ }
140
+ decimal_string = decimal_string.slice(0, -3);
141
+ thousands_power++;
142
+ }
143
+ return names.join('-');
144
+ }
145
+ exports.default = getNameForNumber;
146
+ //# sourceMappingURL=get-name-for-number.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-name-for-number.js","sourceRoot":"","sources":["../../../src/utility/get-name-for-number.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ declare function getOrdinalNameForNumber(value: number): string;
2
+ export default getOrdinalNameForNumber;
@@ -0,0 +1,69 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const errors_1 = require("@fc3/errors");
7
+ const get_name_for_number_1 = __importDefault(require("./get-name-for-number.js"));
8
+ function getOrdinalSuffix(segment) {
9
+ switch (segment) {
10
+ case 'zero':
11
+ return 'zeroeth';
12
+ case 'one':
13
+ return 'first';
14
+ case 'two':
15
+ return 'second';
16
+ case 'three':
17
+ return 'third';
18
+ case 'four':
19
+ return 'fourth';
20
+ case 'five':
21
+ return 'fifth';
22
+ case 'six':
23
+ return 'sixth';
24
+ case 'seven':
25
+ return 'seventh';
26
+ case 'eight':
27
+ return 'eighth';
28
+ case 'nine':
29
+ return 'ninth';
30
+ case 'twelve':
31
+ return 'twelfth';
32
+ case 'ten':
33
+ case 'eleven':
34
+ case 'thirteen':
35
+ case 'fourteen':
36
+ case 'fifteen':
37
+ case 'sixteen':
38
+ case 'seventeen':
39
+ case 'eighteen':
40
+ case 'nineteen':
41
+ return segment + 'th';
42
+ case 'hundred':
43
+ return 'hundredth';
44
+ case 'thousand':
45
+ return 'thousandth';
46
+ }
47
+ if (segment.endsWith('ty')) {
48
+ return segment.slice(0, -1) + 'ieth';
49
+ }
50
+ if (segment.endsWith('illion')) {
51
+ return segment + 'th';
52
+ }
53
+ throw new errors_1.InvalidError(`
54
+ Unable to get ordinal suffix for number segment: ${segment}
55
+ `);
56
+ }
57
+ function getOrdinalNameForNumber(value) {
58
+ const name = (0, get_name_for_number_1.default)(value);
59
+ const segments = name.split('-');
60
+ const last_segment = segments.pop();
61
+ if (last_segment === undefined) {
62
+ throw new errors_1.InvariantViolation('Tried to read last segment but it was empty');
63
+ }
64
+ const suffix = getOrdinalSuffix(last_segment);
65
+ segments.push(suffix);
66
+ return segments.join('-');
67
+ }
68
+ exports.default = getOrdinalNameForNumber;
69
+ //# sourceMappingURL=get-ordinal-name-for-number.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-ordinal-name-for-number.js","sourceRoot":"","sources":["../../../src/utility/get-ordinal-name-for-number.ts"],"names":[],"mappings":";;;;;AAAA,wCAA6D;AAE7D,sFAA2D;AAE3D,SAAS,gBAAgB,CAAC,OAAe;IACxC,QAAQ,OAAO,EAAE,CAAC;QACjB,KAAK,MAAM;YACV,OAAO,SAAS,CAAC;QAClB,KAAK,KAAK;YACT,OAAO,OAAO,CAAC;QAChB,KAAK,KAAK;YACT,OAAO,QAAQ,CAAC;QACjB,KAAK,OAAO;YACX,OAAO,OAAO,CAAC;QAChB,KAAK,MAAM;YACV,OAAO,QAAQ,CAAC;QACjB,KAAK,MAAM;YACV,OAAO,OAAO,CAAC;QAChB,KAAK,KAAK;YACT,OAAO,OAAO,CAAC;QAChB,KAAK,OAAO;YACX,OAAO,SAAS,CAAC;QAClB,KAAK,OAAO;YACX,OAAO,QAAQ,CAAC;QACjB,KAAK,MAAM;YACV,OAAO,OAAO,CAAC;QAChB,KAAK,QAAQ;YACZ,OAAO,SAAS,CAAC;QAElB,KAAK,KAAK,CAAC;QACX,KAAK,QAAQ,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU;YACd,OAAO,OAAO,GAAG,IAAI,CAAC;QAEvB,KAAK,SAAS;YACb,OAAO,WAAW,CAAC;QAEpB,KAAK,UAAU;YACd,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;IACtC,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChC,OAAO,OAAO,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,qBAAY,CAAC;qDAC6B,OAAO;EAC1D,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa;IAC7C,MAAM,IAAI,GAAG,IAAA,6BAAgB,EAAC,KAAK,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC;IAEpC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,2BAAkB,CAAC,6CAA6C,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAE9C,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtB,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,kBAAe,uBAAuB,CAAC"}
@@ -17,6 +17,10 @@ declare class VerbInflector {
17
17
  toPluralNoun(): string;
18
18
  toSingularActor(): string;
19
19
  toPluralActor(): string;
20
+ private pluralizeHead;
21
+ private createBareInflector;
22
+ private shouldDoubleFinalConsonant;
23
+ private getDoubledStem;
20
24
  private finalize;
21
25
  }
22
26
  export default VerbInflector;
@@ -5,6 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const string_1 = require("@fc3/string");
7
7
  const noun_inflector_1 = __importDefault(require("./noun-inflector.js"));
8
+ const IRREGULAR_PAST_PARTICIPLES = {
9
+ be: 'been',
10
+ bear: 'borne',
11
+ build: 'built',
12
+ choose: 'chosen',
13
+ draw: 'drawn',
14
+ find: 'found',
15
+ get: 'gotten',
16
+ make: 'made',
17
+ read: 'read',
18
+ run: 'run',
19
+ write: 'written'
20
+ };
8
21
  class VerbInflector {
9
22
  constructor(value) {
10
23
  this.value = value;
@@ -26,13 +39,8 @@ class VerbInflector {
26
39
  if (this.verb === 'be') {
27
40
  return this.finalize('being');
28
41
  }
29
- // stop -> stopping
30
- if (/[aeiou]p$/.test(this.verb)) {
31
- return this.finalize(this.verb + 'ping');
32
- }
33
- // log -> logging
34
- if (/[aeiou]g$/.test(this.verb)) {
35
- return this.finalize(this.verb + 'ging');
42
+ if (this.shouldDoubleFinalConsonant()) {
43
+ return this.finalize(this.getDoubledStem() + 'ing');
36
44
  }
37
45
  // free -> freeing
38
46
  if (/ee$/.test(this.verb)) {
@@ -42,23 +50,14 @@ class VerbInflector {
42
50
  if (/e$/.test(this.verb)) {
43
51
  return this.finalize(this.verb.slice(0, -1) + 'ing');
44
52
  }
45
- // run -> running
46
- if (/[aeiou]n$/.test(this.verb)) {
47
- return this.finalize(this.verb + 'ning');
48
- }
49
- // pet -> petting
50
- if (/[aeiou]t$/.test(this.verb)) {
51
- return this.finalize(this.verb + 'ting');
52
- }
53
53
  return this.finalize(this.verb + 'ing');
54
54
  }
55
55
  toPastParticiple() {
56
- switch (this.verb) {
57
- case 'choose':
58
- return this.finalize('chosen');
59
- default:
60
- return this.toPastTense();
56
+ const irregular_participle = IRREGULAR_PAST_PARTICIPLES[this.verb];
57
+ if (irregular_participle !== undefined) {
58
+ return this.finalize(irregular_participle);
61
59
  }
60
+ return this.toPastTense();
62
61
  }
63
62
  toInfinitive() {
64
63
  return this.finalize(`to ${this.verb}`);
@@ -68,7 +67,7 @@ class VerbInflector {
68
67
  return this.value.slice(3);
69
68
  }
70
69
  else {
71
- return this.finalize(this.verb + 'y');
70
+ return this.toPastParticiple();
72
71
  }
73
72
  }
74
73
  toPresentTense() {
@@ -80,7 +79,8 @@ class VerbInflector {
80
79
  }
81
80
  }
82
81
  toImperfectTense() {
83
- const participle = this.toPresentParticiple();
82
+ const bare_inflector = this.createBareInflector();
83
+ const participle = bare_inflector.toPresentParticiple();
84
84
  return this.finalize(`was ${participle}`);
85
85
  }
86
86
  toPastTense() {
@@ -99,14 +99,13 @@ class VerbInflector {
99
99
  return this.finalize('chose');
100
100
  case 'build':
101
101
  return this.finalize('built');
102
+ case 'make':
103
+ return this.finalize('made');
104
+ case 'bear':
105
+ return this.finalize('bore');
102
106
  }
103
- // stop -> stopped
104
- if (/[aeiou]p$/.test(this.verb)) {
105
- return this.finalize(this.verb + 'ped');
106
- }
107
- // log -> logged
108
- if (/[aeiou]g$/.test(this.verb)) {
109
- return this.finalize(this.verb + 'ged');
107
+ if (this.shouldDoubleFinalConsonant()) {
108
+ return this.finalize(this.getDoubledStem() + 'ed');
110
109
  }
111
110
  if (this.verb === 'be') {
112
111
  return this.finalize('was');
@@ -141,8 +140,6 @@ class VerbInflector {
141
140
  return this.finalize('life');
142
141
  case 'change':
143
142
  return this.finalize('change');
144
- case 'make water':
145
- return this.finalize('water');
146
143
  case 'do':
147
144
  return this.finalize('action');
148
145
  case 'protect':
@@ -224,15 +221,16 @@ class VerbInflector {
224
221
  }
225
222
  }
226
223
  toGenericNoun() {
227
- if (this.verb.slice(-2) === 'te') {
228
- return this.finalize(this.verb.slice(0, -2) + 'tion');
224
+ if (this.verb.slice(-3) === 'ate') {
225
+ return this.finalize(this.verb.slice(0, -1) + 'ion');
229
226
  }
230
- return this.finalize(this.toPresentParticiple());
227
+ const bare_inflector = this.createBareInflector();
228
+ const participle = bare_inflector.toPresentParticiple();
229
+ return this.finalize(participle);
231
230
  }
232
231
  toPluralNoun() {
233
- const inflector = new noun_inflector_1.default();
234
- const singular = this.toSingularNoun();
235
- return this.finalize(inflector.pluralize(singular));
232
+ const singular_noun = this.toSingularNoun();
233
+ return this.pluralizeHead(singular_noun);
236
234
  }
237
235
  toSingularActor() {
238
236
  switch (this.verb) {
@@ -248,12 +246,35 @@ class VerbInflector {
248
246
  if (this.verb.endsWith('ct')) {
249
247
  return this.finalize(`${this.verb}or`);
250
248
  }
249
+ if (this.shouldDoubleFinalConsonant()) {
250
+ return this.finalize(`${this.getDoubledStem()}er`);
251
+ }
251
252
  return this.finalize(`${this.verb}er`);
252
253
  }
253
254
  toPluralActor() {
254
255
  const singular_actor = this.toSingularActor();
256
+ return this.pluralizeHead(singular_actor);
257
+ }
258
+ pluralizeHead(phrase) {
255
259
  const inflector = new noun_inflector_1.default();
256
- return this.finalize(inflector.pluralize(singular_actor));
260
+ const suffix = this.suffix;
261
+ const has_suffix = suffix !== '' && phrase.endsWith(suffix);
262
+ if (!has_suffix) {
263
+ return inflector.pluralize(phrase);
264
+ }
265
+ const head = phrase.slice(0, phrase.length - suffix.length);
266
+ const plural_head = inflector.pluralize(head);
267
+ return `${plural_head}${suffix}`;
268
+ }
269
+ createBareInflector() {
270
+ return new VerbInflector(this.verb);
271
+ }
272
+ shouldDoubleFinalConsonant() {
273
+ return /(^|[^aeiou])[aeiou][bdgmnpt]$/.test(this.verb);
274
+ }
275
+ getDoubledStem() {
276
+ const final_consonant = this.verb.slice(-1);
277
+ return `${this.verb}${final_consonant}`;
257
278
  }
258
279
  finalize(value) {
259
280
  value += this.suffix;