Merge pull request #6055 from qzoke:develop

[misc] Refactoring & Cleanup - aliases and priorities in src/lib/units/
moment · Dec 16, 2023 · d6d5df7 · d6d5df7
2 parents 386b57b + fcf8e4e
commit d6d5df7
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 133 deletions.
diff --git a/src/lib/units/aliases.js b/src/lib/units/aliases.js
@@ -1,11 +1,55 @@
 import hasOwnProp from '../utils/has-own-prop';
 
-var aliases = {};
-
-export function addUnitAlias(unit, shorthand) {
- var lowerCase = unit.toLowerCase();
- aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-}
+var aliases = {
+ D: 'date',
+ dates: 'date',
+ date: 'date',
+ d: 'day',
+ days: 'day',
+ day: 'day',
+ e: 'weekday',
+ weekdays: 'weekday',
+ weekday: 'weekday',
+ E: 'isoWeekday',
+ isoweekdays: 'isoWeekday',
+ isoweekday: 'isoWeekday',
+ DDD: 'dayOfYear',
+ dayofyears: 'dayOfYear',
+ dayofyear: 'dayOfYear',
+ h: 'hour',
+ hours: 'hour',
+ hour: 'hour',
+ ms: 'millisecond',
+ milliseconds: 'millisecond',
+ millisecond: 'millisecond',
+ m: 'minute',
+ minutes: 'minute',
+ minute: 'minute',
+ M: 'month',
+ months: 'month',
+ month: 'month',
+ Q: 'quarter',
+ quarters: 'quarter',
+ quarter: 'quarter',
+ s: 'second',
+ seconds: 'second',
+ second: 'second',
+ gg: 'weekYear',
+ weekyears: 'weekYear',
+ weekyear: 'weekYear',
+ GG: 'isoWeekYear',
+ isoweekyears: 'isoWeekYear',
+ isoweekyear: 'isoWeekYear',
+ w: 'week',
+ weeks: 'week',
+ week: 'week',
+ W: 'isoWeek',
+ isoweeks: 'isoWeek',
+ isoweek: 'isoWeek',
+ y: 'year',
+ years: 'year',
+ year: 'year',
+};
 
 export function normalizeUnits(units) {
  return typeof units === 'string'

diff --git a/src/lib/units/day-of-month.js b/src/lib/units/day-of-month.js
@@ -1,7 +1,5 @@
 import { makeGetSet } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import { addRegexToken, match1to2, match2 } from '../parse/regex';
 import { addParseToken } from '../parse/token';
 import { DATE } from './constants';
@@ -11,13 +9,6 @@ import toInt from '../utils/to-int';
 
 addFormatToken('D', ['DD', 2], 'Do', 'date');
 
-// ALIASES
-
-addUnitAlias('date', 'D');
-
-// PRIORITY
-addUnitPriority('date', 9);
-
 // PARSING
 
 addRegexToken('D', match1to2);

diff --git a/src/lib/units/day-of-week.js b/src/lib/units/day-of-week.js
@@ -1,6 +1,4 @@
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import {
  addRegexToken,
  match1to2,
@@ -34,17 +32,6 @@ addFormatToken('dddd', 0, 0, function (format) {
 addFormatToken('e', 0, 0, 'weekday');
 addFormatToken('E', 0, 0, 'isoWeekday');
 
-// ALIASES
-
-addUnitAlias('day', 'd');
-addUnitAlias('weekday', 'e');
-addUnitAlias('isoWeekday', 'E');
-
-// PRIORITY
-addUnitPriority('day', 11);
-addUnitPriority('weekday', 11);
-addUnitPriority('isoWeekday', 11);
-
 // PARSING
 
 addRegexToken('d', match1to2);

diff --git a/src/lib/units/day-of-year.js b/src/lib/units/day-of-year.js
@@ -1,6 +1,4 @@
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import { addRegexToken, match3, match1to3 } from '../parse/regex';
 import { addParseToken } from '../parse/token';
 import toInt from '../utils/to-int';
@@ -9,13 +7,6 @@ import toInt from '../utils/to-int';
 
 addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
 
-// ALIASES
-
-addUnitAlias('dayOfYear', 'DDD');
-
-// PRIORITY
-addUnitPriority('dayOfYear', 4);
-
 // PARSING
 
 addRegexToken('DDD', match1to3);

diff --git a/src/lib/units/hour.js b/src/lib/units/hour.js
@@ -1,7 +1,5 @@
 import { makeGetSet } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import {
  addRegexToken,
  match1to2,
@@ -68,13 +66,6 @@ function meridiem(token, lowercase) {
 meridiem('a', true);
 meridiem('A', false);
 
-// ALIASES
-
-addUnitAlias('hour', 'h');
-
-// PRIORITY
-addUnitPriority('hour', 13);
-
 // PARSING
 
 function matchMeridiem(isStrict, locale) {

diff --git a/src/lib/units/millisecond.js b/src/lib/units/millisecond.js
@@ -1,7 +1,5 @@
 import { makeGetSet } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import {
  addRegexToken,
  match1,
@@ -44,14 +42,6 @@ addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
  return this.millisecond() * 1000000;
 });
 
-// ALIASES
-
-addUnitAlias('millisecond', 'ms');
-
-// PRIORITY
-
-addUnitPriority('millisecond', 16);
-
 // PARSING
 
 addRegexToken('S', match1to3, match1);

diff --git a/src/lib/units/minute.js b/src/lib/units/minute.js
@@ -1,7 +1,5 @@
 import { makeGetSet } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import { addRegexToken, match1to2, match2 } from '../parse/regex';
 import { addParseToken } from '../parse/token';
 import { MINUTE } from './constants';
@@ -10,14 +8,6 @@ import { MINUTE } from './constants';
 
 addFormatToken('m', ['mm', 2], 0, 'minute');
 
-// ALIASES
-
-addUnitAlias('minute', 'm');
-
-// PRIORITY
-
-addUnitPriority('minute', 14);
-
 // PARSING
 
 addRegexToken('m', match1to2);

diff --git a/src/lib/units/month.js b/src/lib/units/month.js
@@ -1,8 +1,6 @@
 import { get } from '../moment/get-set';
 import hasOwnProp from '../utils/has-own-prop';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import {
  addRegexToken,
  match1to2,
@@ -49,14 +47,6 @@ addFormatToken('MMMM', 0, 0, function (format) {
  return this.localeData().months(this, format);
 });
 
-// ALIASES
-
-addUnitAlias('month', 'M');
-
-// PRIORITY
-
-addUnitPriority('month', 8);
-
 // PARSING
 
 addRegexToken('M', match1to2);

diff --git a/src/lib/units/priorities.js b/src/lib/units/priorities.js
@@ -1,10 +1,23 @@
 import hasOwnProp from '../utils/has-own-prop';
 
-var priorities = {};
-
-export function addUnitPriority(unit, priority) {
- priorities[unit] = priority;
-}
+var priorities = {
+ date: 9,
+ day: 11,
+ weekday: 11,
+ isoWeekday: 11,
+ dayOfYear: 4,
+ hour: 13,
+ millisecond: 16,
+ minute: 14,
+ month: 8,
+ quarter: 7,
+ second: 15,
+ weekYear: 1,
+ isoWeekYear: 1,
+ week: 5,
+ isoWeek: 5,
+ year: 1,
+};
 
 export function getPrioritizedUnits(unitsObj) {
  var units = [],

diff --git a/src/lib/units/quarter.js b/src/lib/units/quarter.js
@@ -1,6 +1,4 @@
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import { addRegexToken, match1 } from '../parse/regex';
 import { addParseToken } from '../parse/token';
 import { MONTH } from './constants';
@@ -10,14 +8,6 @@ import toInt from '../utils/to-int';
 
 addFormatToken('Q', 0, 'Qo', 'quarter');
 
-// ALIASES
-
-addUnitAlias('quarter', 'Q');
-
-// PRIORITY
-
-addUnitPriority('quarter', 7);
-
 // PARSING
 
 addRegexToken('Q', match1);

diff --git a/src/lib/units/second.js b/src/lib/units/second.js
@@ -1,7 +1,5 @@
 import { makeGetSet } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import { addRegexToken, match1to2, match2 } from '../parse/regex';
 import { addParseToken } from '../parse/token';
 import { SECOND } from './constants';
@@ -10,14 +8,6 @@ import { SECOND } from './constants';
 
 addFormatToken('s', ['ss', 2], 0, 'second');
 
-// ALIASES
-
-addUnitAlias('second', 's');
-
-// PRIORITY
-
-addUnitPriority('second', 15);
-
 // PARSING
 
 addRegexToken('s', match1to2);

diff --git a/src/lib/units/week-year.js b/src/lib/units/week-year.js
@@ -1,6 +1,4 @@
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import {
  addRegexToken,
  match1to2,
@@ -42,14 +40,6 @@ addWeekYearFormatToken('GGGGG', 'isoWeekYear');
 
 // ALIASES
 
-addUnitAlias('weekYear', 'gg');
-addUnitAlias('isoWeekYear', 'GG');
-
-// PRIORITY
-
-addUnitPriority('weekYear', 1);
-addUnitPriority('isoWeekYear', 1);
-
 // PARSING
 
 addRegexToken('G', matchSigned);

diff --git a/src/lib/units/week.js b/src/lib/units/week.js
@@ -1,6 +1,4 @@
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import { addRegexToken, match1to2, match2 } from '../parse/regex';
 import { addWeekParseToken } from '../parse/token';
 import toInt from '../utils/to-int';
@@ -11,16 +9,6 @@ import { weekOfYear } from './week-calendar-utils';
 addFormatToken('w', ['ww', 2], 'wo', 'week');
 addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
 
-// ALIASES
-
-addUnitAlias('week', 'w');
-addUnitAlias('isoWeek', 'W');
-
-// PRIORITIES
-
-addUnitPriority('week', 5);
-addUnitPriority('isoWeek', 5);
-
 // PARSING
 
 addRegexToken('w', match1to2);

diff --git a/src/lib/units/year.js b/src/lib/units/year.js
@@ -1,7 +1,5 @@
 import { makeGetSet } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
-import { addUnitAlias } from './aliases';
-import { addUnitPriority } from './priorities';
 import {
  addRegexToken,
  match1to2,
@@ -34,14 +32,6 @@ addFormatToken(0, ['YYYY', 4], 0, 'year');
 addFormatToken(0, ['YYYYY', 5], 0, 'year');
 addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
 
-// ALIASES
-
-addUnitAlias('year', 'y');
-
-// PRIORITIES
-
-addUnitPriority('year', 1);
-
 // PARSING
 
 addRegexToken('Y', matchSigned);