@ws-ui/formatter 0.1.25 → 0.1.26

package/dist/date.d.ts

@@ -1,4 +1,4 @@
 export declare const INVALID_DATE: string;
-export declare function parseDateFormat(format: string): string;
+export declare function parseDateFormat(format: string, locale?: string): any;
 export declare function isValidDate(value: Date | number): boolean;
 export declare function formatDate(value: Date | number, format: string): string;

package/dist/date.js

@@ -1,30 +1,22 @@
 import formatFn from 'date-fns/format';
-import Intl from '@ws-ui/intl';
 import * as locales from 'date-fns/locale';
 import { sanitizeLocale } from './duration';
-import(`@ws-ui/intl/locale-data/jsonp/${typeof navigator !== 'undefined' ? navigator.language : 'en'}`);
-function getDateFormat(options) {
-    return new Intl.DateTimeFormat(undefined, options).resolvedOptions().resolvedFormat;
+import { formats } from './locales';
+const language = typeof navigator !== 'undefined' ? navigator.language : 'en';
+function getDateFormat(format, locale) {
+    return formats[locale] ? formats[locale][format] : formats[locale.split('-')[0]][format];
 }
 export const INVALID_DATE = new Date('').toString();
-export function parseDateFormat(format) {
+export function parseDateFormat(format, locale = language) {
     switch(format){
         case 'Date short':
-            return getDateFormat();
         case 'Date long':
-            return getDateFormat({
-                weekday: 'long',
-                year: 'numeric',
-                month: 'long',
-                day: 'numeric'
-            });
         case 'Date abbreviated':
-            return getDateFormat({
-                weekday: 'short',
-                year: 'numeric',
-                month: 'short',
-                day: 'numeric'
-            });
+            try {
+                return getDateFormat(format, locale);
+            } catch (ex) {
+                return format;
+            }
         default:
             return format;
     }
@@ -36,7 +28,7 @@ export function formatDate(value, format) {
     if (!isValidDate(value)) return INVALID_DATE;
     const parsedFormat = parseDateFormat(format);
     return formatFn(value, parsedFormat, {
-        locale: locales[sanitizeLocale(navigator.language)]
+        locale: locales[sanitizeLocale(language)]
     });
 }
 

package/dist/date.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/date.ts"],"sourcesContent":["import formatFn from 'date-fns/format';\nimport Intl from '@ws-ui/intl';\nimport * as locales from 'date-fns/locale';\nimport { sanitizeLocale } from './duration';\nimport(\n  `@ws-ui/intl/locale-data/jsonp/${typeof navigator !== 'undefined' ? navigator.language : 'en'}`\n);\n\ntype ResolvedDateTimeFormatOptions = Intl.ResolvedDateTimeFormatOptions & {\n  pattern?: string;\n  resolvedFormat: string;\n};\n\nfunction getDateFormat(options?: Intl.DateTimeFormatOptions) {\n  return (\n    new Intl.DateTimeFormat(undefined, options).resolvedOptions() as ResolvedDateTimeFormatOptions\n  ).resolvedFormat;\n}\n\nexport const INVALID_DATE = new Date('').toString();\n\nexport function parseDateFormat(format: string) {\n  switch (format) {\n    case 'Date short':\n      return getDateFormat();\n    case 'Date long':\n      return getDateFormat({\n        weekday: 'long',\n        year: 'numeric',\n        month: 'long',\n        day: 'numeric',\n      });\n    case 'Date abbreviated':\n      return getDateFormat({\n        weekday: 'short',\n        year: 'numeric',\n        month: 'short',\n        day: 'numeric',\n      });\n    default:\n      return format;\n  }\n}\n\nexport function isValidDate(value: Date | number) {\n  return value instanceof Date && value.toString() !== INVALID_DATE;\n}\n\nexport function formatDate(value: Date | number, format: string) {\n  if (!isValidDate(value)) return INVALID_DATE;\n  const parsedFormat = parseDateFormat(format);\n  return formatFn(value, parsedFormat, { locale: locales[sanitizeLocale(navigator.language)] });\n}\n"],"names":["formatFn","Intl","locales","sanitizeLocale","navigator","language","getDateFormat","options","DateTimeFormat","undefined","resolvedOptions","resolvedFormat","INVALID_DATE","Date","toString","parseDateFormat","format","weekday","year","month","day","isValidDate","value","formatDate","parsedFormat","locale"],"mappings":"AAAA,OAAOA,cAAc,kBAAkB;AACvC,OAAOC,UAAU,cAAc;AAC/B,YAAYC,aAAa,kBAAkB;AAC3C,SAASC,cAAc,QAAQ,aAAa;AAC5C,MAAM,CACJ,CAAC,8BAA8B,EAAE,OAAOC,cAAc,cAAcA,UAAUC,QAAQ,GAAG,KAAK,CAAC;AAQjG,SAASC,cAAcC,OAAoC;IACzD,OAAO,AACL,IAAIN,KAAKO,cAAc,CAACC,WAAWF,SAASG,eAAe,GAC3DC,cAAc;AAClB;AAEA,OAAO,MAAMC,eAAe,IAAIC,KAAK,IAAIC,QAAQ,GAAG;AAEpD,OAAO,SAASC,gBAAgBC,MAAc;IAC5C,OAAQA;QACN,KAAK;YACH,OAAOV;QACT,KAAK;YACH,OAAOA,cAAc;gBACnBW,SAAS;gBACTC,MAAM;gBACNC,OAAO;gBACPC,KAAK;YACP;QACF,KAAK;YACH,OAAOd,cAAc;gBACnBW,SAAS;gBACTC,MAAM;gBACNC,OAAO;gBACPC,KAAK;YACP;QACF;YACE,OAAOJ;IACX;AACF;AAEA,OAAO,SAASK,YAAYC,KAAoB;IAC9C,OAAOA,iBAAiBT,QAAQS,MAAMR,QAAQ,OAAOF;AACvD;AAEA,OAAO,SAASW,WAAWD,KAAoB,EAAEN,MAAc;IAC7D,IAAI,CAACK,YAAYC,QAAQ,OAAOV;IAChC,MAAMY,eAAeT,gBAAgBC;IACrC,OAAOhB,SAASsB,OAAOE,cAAc;QAAEC,QAAQvB,OAAO,CAACC,eAAeC,UAAUC,QAAQ,EAAE;IAAC;AAC7F"}
+{"version":3,"sources":["../src/date.ts"],"sourcesContent":["import formatFn from 'date-fns/format';\nimport * as locales from 'date-fns/locale';\nimport { sanitizeLocale } from './duration';\nimport { formats } from './locales';\n\nconst language = typeof navigator !== 'undefined' ? navigator.language : 'en';\n\nfunction getDateFormat(format: string, locale: string) {\n  return formats[locale] ? formats[locale][format] : formats[locale.split('-')[0]][format];\n}\n\nexport const INVALID_DATE = new Date('').toString();\n\nexport function parseDateFormat(format: string, locale: string = language) {\n  switch (format) {\n    case 'Date short':\n    case 'Date long':\n    case 'Date abbreviated':\n      try {\n        return getDateFormat(format, locale);\n      } catch (ex) {\n        return format;\n      }\n    default:\n      return format;\n  }\n}\n\nexport function isValidDate(value: Date | number) {\n  return value instanceof Date && value.toString() !== INVALID_DATE;\n}\n\nexport function formatDate(value: Date | number, format: string) {\n  if (!isValidDate(value)) return INVALID_DATE;\n  const parsedFormat = parseDateFormat(format);\n  return formatFn(value, parsedFormat, { locale: locales[sanitizeLocale(language)] });\n}\n"],"names":["formatFn","locales","sanitizeLocale","formats","language","navigator","getDateFormat","format","locale","split","INVALID_DATE","Date","toString","parseDateFormat","ex","isValidDate","value","formatDate","parsedFormat"],"mappings":"AAAA,OAAOA,cAAc,kBAAkB;AACvC,YAAYC,aAAa,kBAAkB;AAC3C,SAASC,cAAc,QAAQ,aAAa;AAC5C,SAASC,OAAO,QAAQ,YAAY;AAEpC,MAAMC,WAAW,OAAOC,cAAc,cAAcA,UAAUD,QAAQ,GAAG;AAEzE,SAASE,cAAcC,MAAc,EAAEC,MAAc;IACnD,OAAOL,OAAO,CAACK,OAAO,GAAGL,OAAO,CAACK,OAAO,CAACD,OAAO,GAAGJ,OAAO,CAACK,OAAOC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAACF,OAAO;AAC1F;AAEA,OAAO,MAAMG,eAAe,IAAIC,KAAK,IAAIC,QAAQ,GAAG;AAEpD,OAAO,SAASC,gBAAgBN,MAAc,EAAEC,SAAiBJ,QAAQ;IACvE,OAAQG;QACN,KAAK;QACL,KAAK;QACL,KAAK;YACH,IAAI;gBACF,OAAOD,cAAcC,QAAQC;YAC/B,EAAE,OAAOM,IAAI;gBACX,OAAOP;YACT;QACF;YACE,OAAOA;IACX;AACF;AAEA,OAAO,SAASQ,YAAYC,KAAoB;IAC9C,OAAOA,iBAAiBL,QAAQK,MAAMJ,QAAQ,OAAOF;AACvD;AAEA,OAAO,SAASO,WAAWD,KAAoB,EAAET,MAAc;IAC7D,IAAI,CAACQ,YAAYC,QAAQ,OAAON;IAChC,MAAMQ,eAAeL,gBAAgBN;IACrC,OAAOP,SAASgB,OAAOE,cAAc;QAAEV,QAAQP,OAAO,CAACC,eAAeE,UAAU;IAAC;AACnF"}