@ws-ui/formatter 0.1.18 → 0.1.20

package/dist/duration.d.ts

@@ -1,3 +1,2 @@
 export type Format = 'Simple' | 'Distance' | 'Distance With Suffix' | 'Strict Distance' | 'Strict Distance With Suffix';
-export declare function padNumber(value: number, isNegative: boolean, digits?: number): string;
 export declare function formatDuration(value: string | number | Date, format?: Format): string;

package/dist/duration.js

@@ -1,9 +1,14 @@
 import { formatDistance, formatDistanceStrict } from 'date-fns';
+import * as locale from 'date-fns/locale';
 const SECONDS = 1000;
 const MINUTES = SECONDS * 60;
 const HOURS = MINUTES * 60;
-export function padNumber(value, isNegative, digits = 2) {
-    return `${isNegative && value ? '-' : ''}${String(value).padStart(digits, '0')}`;
+function padNumber(value, digits = 2) {
+    return `${String(value).padStart(digits, '0')}`;
+}
+function sanitizeLocale(locale) {
+    const [language, region = ''] = locale.split('-');
+    return language.toLowerCase() + region.toUpperCase();
 }
 export function formatDuration(value, format = 'Simple') {
     if (format === 'Simple') {
@@ -16,22 +21,29 @@ export function formatDuration(value, format = 'Simple') {
         const hours = Math.floor(v / HOURS);
         const minutes = Math.floor(v % HOURS / MINUTES);
         const seconds = Math.floor(v % MINUTES / SECONDS);
-        return `${padNumber(hours, isNegative)}:${padNumber(minutes, isNegative)}:${padNumber(seconds, isNegative)}`;
+        return `${isNegative ? '-' : ''}${padNumber(hours)}:${padNumber(minutes)}:${padNumber(seconds)}`;
     }
     const d1 = new Date();
     const d2 = value instanceof Date ? value : new Date(d1.getTime() + +value);
+    const l = typeof navigator !== 'undefined' && locale[sanitizeLocale(navigator.language)] ? locale[sanitizeLocale(navigator.language)] : locale.enUS;
     switch(format){
         case 'Distance':
-            return formatDistance(d2, d1);
+            return formatDistance(d2, d1, {
+                locale: l
+            });
         case 'Distance With Suffix':
             return formatDistance(d2, d1, {
-                addSuffix: true
+                addSuffix: true,
+                locale: l
             });
         case 'Strict Distance':
-            return formatDistanceStrict(d2, d1);
+            return formatDistanceStrict(d2, d1, {
+                locale: l
+            });
         case 'Strict Distance With Suffix':
             return formatDistanceStrict(d2, d1, {
-                addSuffix: true
+                addSuffix: true,
+                locale: l
             });
     }
 }

package/dist/duration.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/duration.ts"],"sourcesContent":["import { formatDistance, formatDistanceStrict } from 'date-fns';\n\nexport type Format =\n  | 'Simple'\n  | 'Distance'\n  | 'Distance With Suffix'\n  | 'Strict Distance'\n  | 'Strict Distance With Suffix';\n\nconst SECONDS = 1000;\nconst MINUTES = SECONDS * 60;\nconst HOURS = MINUTES * 60;\n\nexport function padNumber(value: number, isNegative: boolean, digits: number = 2) {\n  return `${isNegative && value ? '-' : ''}${String(value).padStart(digits, '0')}`;\n}\n\nexport function formatDuration(value: string | number | Date, format: Format = 'Simple') {\n  if (format === 'Simple') {\n    let v = +value;\n    let isNegative = false;\n\n    if (v < 0) {\n      v = -v;\n      isNegative = true;\n    }\n\n    const hours = Math.floor(v / HOURS);\n    const minutes = Math.floor((v % HOURS) / MINUTES);\n    const seconds = Math.floor((v % MINUTES) / SECONDS);\n\n    return `${padNumber(hours, isNegative)}:${padNumber(minutes, isNegative)}:${padNumber(\n      seconds,\n      isNegative,\n    )}`;\n  }\n\n  const d1 = new Date();\n  const d2 = value instanceof Date ? value : new Date(d1.getTime() + +value);\n\n  switch (format) {\n    case 'Distance':\n      return formatDistance(d2, d1);\n    case 'Distance With Suffix':\n      return formatDistance(d2, d1, {\n        addSuffix: true,\n      });\n    case 'Strict Distance':\n      return formatDistanceStrict(d2, d1);\n    case 'Strict Distance With Suffix':\n      return formatDistanceStrict(d2, d1, {\n        addSuffix: true,\n      });\n  }\n}\n"],"names":["formatDistance","formatDistanceStrict","SECONDS","MINUTES","HOURS","padNumber","value","isNegative","digits","String","padStart","formatDuration","format","v","hours","Math","floor","minutes","seconds","d1","Date","d2","getTime","addSuffix"],"mappings":"AAAA,SAASA,cAAc,EAAEC,oBAAoB,QAAQ,WAAW;AAShE,MAAMC,UAAU;AAChB,MAAMC,UAAUD,UAAU;AAC1B,MAAME,QAAQD,UAAU;AAExB,OAAO,SAASE,UAAUC,KAAa,EAAEC,UAAmB,EAAEC,SAAiB,CAAC;IAC9E,OAAO,CAAC,EAAED,cAAcD,QAAQ,MAAM,GAAG,EAAEG,OAAOH,OAAOI,QAAQ,CAACF,QAAQ,KAAK,CAAC;AAClF;AAEA,OAAO,SAASG,eAAeL,KAA6B,EAAEM,SAAiB,QAAQ;IACrF,IAAIA,WAAW,UAAU;QACvB,IAAIC,IAAI,CAACP;QACT,IAAIC,aAAa;QAEjB,IAAIM,IAAI,GAAG;YACTA,IAAI,CAACA;YACLN,aAAa;QACf;QAEA,MAAMO,QAAQC,KAAKC,KAAK,CAACH,IAAIT;QAC7B,MAAMa,UAAUF,KAAKC,KAAK,CAAC,AAACH,IAAIT,QAASD;QACzC,MAAMe,UAAUH,KAAKC,KAAK,CAAC,AAACH,IAAIV,UAAWD;QAE3C,OAAO,CAAC,EAAEG,UAAUS,OAAOP,YAAY,CAAC,EAAEF,UAAUY,SAASV,YAAY,CAAC,EAAEF,UAC1Ea,SACAX,YACA,CAAC;IACL;IAEA,MAAMY,KAAK,IAAIC;IACf,MAAMC,KAAKf,iBAAiBc,OAAOd,QAAQ,IAAIc,KAAKD,GAAGG,OAAO,KAAK,CAAChB;IAEpE,OAAQM;QACN,KAAK;YACH,OAAOZ,eAAeqB,IAAIF;QAC5B,KAAK;YACH,OAAOnB,eAAeqB,IAAIF,IAAI;gBAC5BI,WAAW;YACb;QACF,KAAK;YACH,OAAOtB,qBAAqBoB,IAAIF;QAClC,KAAK;YACH,OAAOlB,qBAAqBoB,IAAIF,IAAI;gBAClCI,WAAW;YACb;IACJ;AACF"}
+{"version":3,"sources":["../src/duration.ts"],"sourcesContent":["import { formatDistance, formatDistanceStrict } from 'date-fns';\nimport * as locale from 'date-fns/locale';\n\nexport type Format =\n  | 'Simple'\n  | 'Distance'\n  | 'Distance With Suffix'\n  | 'Strict Distance'\n  | 'Strict Distance With Suffix';\n\nconst SECONDS = 1000;\nconst MINUTES = SECONDS * 60;\nconst HOURS = MINUTES * 60;\n\nfunction padNumber(value: number, digits: number = 2) {\n  return `${String(value).padStart(digits, '0')}`;\n}\n\nfunction sanitizeLocale(locale: string) {\n  const [language, region = ''] = locale.split('-');\n  return language.toLowerCase() + region.toUpperCase();\n}\n\nexport function formatDuration(value: string | number | Date, format: Format = 'Simple') {\n  if (format === 'Simple') {\n    let v = +value;\n    let isNegative = false;\n\n    if (v < 0) {\n      v = -v;\n      isNegative = true;\n    }\n\n    const hours = Math.floor(v / HOURS);\n    const minutes = Math.floor((v % HOURS) / MINUTES);\n    const seconds = Math.floor((v % MINUTES) / SECONDS);\n\n    return `${isNegative ? '-' : ''}${padNumber(hours)}:${padNumber(minutes)}:${padNumber(\n      seconds,\n    )}`;\n  }\n\n  const d1 = new Date();\n  const d2 = value instanceof Date ? value : new Date(d1.getTime() + +value);\n  const l =\n    typeof navigator !== 'undefined' && locale[sanitizeLocale(navigator.language)]\n      ? locale[sanitizeLocale(navigator.language)]\n      : locale.enUS;\n\n  switch (format) {\n    case 'Distance':\n      return formatDistance(d2, d1, {\n        locale: l,\n      });\n    case 'Distance With Suffix':\n      return formatDistance(d2, d1, {\n        addSuffix: true,\n        locale: l,\n      });\n    case 'Strict Distance':\n      return formatDistanceStrict(d2, d1, {\n        locale: l,\n      });\n    case 'Strict Distance With Suffix':\n      return formatDistanceStrict(d2, d1, {\n        addSuffix: true,\n        locale: l,\n      });\n  }\n}\n"],"names":["formatDistance","formatDistanceStrict","locale","SECONDS","MINUTES","HOURS","padNumber","value","digits","String","padStart","sanitizeLocale","language","region","split","toLowerCase","toUpperCase","formatDuration","format","v","isNegative","hours","Math","floor","minutes","seconds","d1","Date","d2","getTime","l","navigator","enUS","addSuffix"],"mappings":"AAAA,SAASA,cAAc,EAAEC,oBAAoB,QAAQ,WAAW;AAChE,YAAYC,YAAY,kBAAkB;AAS1C,MAAMC,UAAU;AAChB,MAAMC,UAAUD,UAAU;AAC1B,MAAME,QAAQD,UAAU;AAExB,SAASE,UAAUC,KAAa,EAAEC,SAAiB,CAAC;IAClD,OAAO,CAAC,EAAEC,OAAOF,OAAOG,QAAQ,CAACF,QAAQ,KAAK,CAAC;AACjD;AAEA,SAASG,eAAeT,MAAc;IACpC,MAAM,CAACU,UAAUC,SAAS,EAAE,CAAC,GAAGX,OAAOY,KAAK,CAAC;IAC7C,OAAOF,SAASG,WAAW,KAAKF,OAAOG,WAAW;AACpD;AAEA,OAAO,SAASC,eAAeV,KAA6B,EAAEW,SAAiB,QAAQ;IACrF,IAAIA,WAAW,UAAU;QACvB,IAAIC,IAAI,CAACZ;QACT,IAAIa,aAAa;QAEjB,IAAID,IAAI,GAAG;YACTA,IAAI,CAACA;YACLC,aAAa;QACf;QAEA,MAAMC,QAAQC,KAAKC,KAAK,CAACJ,IAAId;QAC7B,MAAMmB,UAAUF,KAAKC,KAAK,CAAC,AAACJ,IAAId,QAASD;QACzC,MAAMqB,UAAUH,KAAKC,KAAK,CAAC,AAACJ,IAAIf,UAAWD;QAE3C,OAAO,CAAC,EAAEiB,aAAa,MAAM,GAAG,EAAEd,UAAUe,OAAO,CAAC,EAAEf,UAAUkB,SAAS,CAAC,EAAElB,UAC1EmB,SACA,CAAC;IACL;IAEA,MAAMC,KAAK,IAAIC;IACf,MAAMC,KAAKrB,iBAAiBoB,OAAOpB,QAAQ,IAAIoB,KAAKD,GAAGG,OAAO,KAAK,CAACtB;IACpE,MAAMuB,IACJ,OAAOC,cAAc,eAAe7B,MAAM,CAACS,eAAeoB,UAAUnB,QAAQ,EAAE,GAC1EV,MAAM,CAACS,eAAeoB,UAAUnB,QAAQ,EAAE,GAC1CV,OAAO8B,IAAI;IAEjB,OAAQd;QACN,KAAK;YACH,OAAOlB,eAAe4B,IAAIF,IAAI;gBAC5BxB,QAAQ4B;YACV;QACF,KAAK;YACH,OAAO9B,eAAe4B,IAAIF,IAAI;gBAC5BO,WAAW;gBACX/B,QAAQ4B;YACV;QACF,KAAK;YACH,OAAO7B,qBAAqB2B,IAAIF,IAAI;gBAClCxB,QAAQ4B;YACV;QACF,KAAK;YACH,OAAO7B,qBAAqB2B,IAAIF,IAAI;gBAClCO,WAAW;gBACX/B,QAAQ4B;YACV;IACJ;AACF"}