@ws-ui/formatter 0.1.13 → 0.1.15

package/dist/date.d.ts

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

package/dist/date.js

@@ -4,7 +4,7 @@ import(`@ws-ui/intl/locale-data/jsonp/${typeof navigator !== 'undefined' ? navig
 function getDateFormat(options) {
     return new Intl.DateTimeFormat(undefined, options).resolvedOptions().resolvedFormat;
 }
-const INVALID_DATE = new Date('').toString();
+export const INVALID_DATE = new Date('').toString();
 export function parseDateFormat(format) {
     switch(format){
         case 'Date short':
@@ -27,8 +27,11 @@ export function parseDateFormat(format) {
             return format;
     }
 }
+export function isValidDate(value) {
+    return value instanceof Date && value.toString() !== INVALID_DATE;
+}
 export function formatDate(value, format) {
-    if (value instanceof Date && value.toString() === INVALID_DATE) return INVALID_DATE;
+    if (!isValidDate(value)) return INVALID_DATE;
     const parsedFormat = parseDateFormat(format);
     return formatFn(value, parsedFormat);
 }

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(\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\nconst 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 formatDate(value: Date | number, format: string) {\n  if (value instanceof Date && value.toString() === INVALID_DATE) return INVALID_DATE;\n  const parsedFormat = parseDateFormat(format);\n  return formatFn(value, parsedFormat);\n}\n"],"names":["formatFn","Intl","navigator","language","getDateFormat","options","DateTimeFormat","undefined","resolvedOptions","resolvedFormat","INVALID_DATE","Date","toString","parseDateFormat","format","weekday","year","month","day","formatDate","value","parsedFormat"],"mappings":"AAAA,OAAOA,cAAc,kBAAkB;AACvC,OAAOC,UAAU,cAAc;AAC/B,MAAM,CACJ,CAAC,8BAA8B,EAAE,OAAOC,cAAc,cAAcA,UAAUC,QAAQ,GAAG,KAAK,CAAC;AAQjG,SAASC,cAAcC,OAAoC;IACzD,OAAO,AACL,IAAIJ,KAAKK,cAAc,CAACC,WAAWF,SAASG,eAAe,GAC3DC,cAAc;AAClB;AAEA,MAAMC,eAAe,IAAIC,KAAK,IAAIC,QAAQ;AAE1C,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,WAAWC,KAAoB,EAAEN,MAAc;IAC7D,IAAIM,iBAAiBT,QAAQS,MAAMR,QAAQ,OAAOF,cAAc,OAAOA;IACvE,MAAMW,eAAeR,gBAAgBC;IACrC,OAAOd,SAASoB,OAAOC;AACzB"}
+{"version":3,"sources":["../src/date.ts"],"sourcesContent":["import formatFn from 'date-fns/format';\nimport Intl from '@ws-ui/intl';\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);\n}\n"],"names":["formatFn","Intl","navigator","language","getDateFormat","options","DateTimeFormat","undefined","resolvedOptions","resolvedFormat","INVALID_DATE","Date","toString","parseDateFormat","format","weekday","year","month","day","isValidDate","value","formatDate","parsedFormat"],"mappings":"AAAA,OAAOA,cAAc,kBAAkB;AACvC,OAAOC,UAAU,cAAc;AAC/B,MAAM,CACJ,CAAC,8BAA8B,EAAE,OAAOC,cAAc,cAAcA,UAAUC,QAAQ,GAAG,KAAK,CAAC;AAQjG,SAASC,cAAcC,OAAoC;IACzD,OAAO,AACL,IAAIJ,KAAKK,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,OAAOd,SAASoB,OAAOE;AACzB"}

package/dist/duration.d.ts

@@ -0,0 +1,2 @@
+export type Format = 'Simple' | 'Distance' | 'Strict Distance';
+export declare function formatDuration(value: string | number | Date, format?: Format): string;

package/dist/duration.js

@@ -0,0 +1,23 @@
+import { formatDistance, formatDistanceStrict } from 'date-fns';
+const SECONDS = 1000;
+const MINUTES = SECONDS * 60;
+const HOURS = MINUTES * 60;
+export function formatDuration(value, format = 'Simple') {
+    if (format === 'Simple') {
+        const v = +value;
+        const hours = Math.floor(v / HOURS);
+        const minutes = Math.floor(v % HOURS / MINUTES);
+        const seconds = Math.floor(v % MINUTES / SECONDS);
+        return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+    }
+    const d1 = new Date();
+    const d2 = value instanceof Date ? value : new Date(d1.getTime() + +value * SECONDS);
+    switch(format){
+        case 'Distance':
+            return formatDistance(d2, d1);
+        case 'Strict Distance':
+            return formatDistanceStrict(d2, d1);
+    }
+}
+
+//# sourceMappingURL=duration.js.map

package/dist/duration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/duration.ts"],"sourcesContent":["import { formatDistance, formatDistanceStrict } from 'date-fns';\n\nexport type Format = 'Simple' | 'Distance' | 'Strict Distance';\n\nconst SECONDS = 1000;\nconst MINUTES = SECONDS * 60;\nconst HOURS = MINUTES * 60;\n\nexport function formatDuration(value: string | number | Date, format: Format = 'Simple') {\n  if (format === 'Simple') {\n    const v = +value;\n    const hours = Math.floor(v / HOURS);\n    const minutes = Math.floor((v % HOURS) / MINUTES);\n    const seconds = Math.floor((v % MINUTES) / SECONDS);\n    return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds\n      .toString()\n      .padStart(2, '0')}`;\n  }\n\n  const d1 = new Date();\n  const d2 = value instanceof Date ? value : new Date(d1.getTime() + +value * SECONDS);\n\n  switch (format) {\n    case 'Distance':\n      return formatDistance(d2, d1);\n    case 'Strict Distance':\n      return formatDistanceStrict(d2, d1);\n  }\n}\n"],"names":["formatDistance","formatDistanceStrict","SECONDS","MINUTES","HOURS","formatDuration","value","format","v","hours","Math","floor","minutes","seconds","toString","padStart","d1","Date","d2","getTime"],"mappings":"AAAA,SAASA,cAAc,EAAEC,oBAAoB,QAAQ,WAAW;AAIhE,MAAMC,UAAU;AAChB,MAAMC,UAAUD,UAAU;AAC1B,MAAME,QAAQD,UAAU;AAExB,OAAO,SAASE,eAAeC,KAA6B,EAAEC,SAAiB,QAAQ;IACrF,IAAIA,WAAW,UAAU;QACvB,MAAMC,IAAI,CAACF;QACX,MAAMG,QAAQC,KAAKC,KAAK,CAACH,IAAIJ;QAC7B,MAAMQ,UAAUF,KAAKC,KAAK,CAAC,AAACH,IAAIJ,QAASD;QACzC,MAAMU,UAAUH,KAAKC,KAAK,CAAC,AAACH,IAAIL,UAAWD;QAC3C,OAAO,CAAC,EAAEO,MAAMK,QAAQ,GAAGC,QAAQ,CAAC,GAAG,KAAK,CAAC,EAAEH,QAAQE,QAAQ,GAAGC,QAAQ,CAAC,GAAG,KAAK,CAAC,EAAEF,QACnFC,QAAQ,GACRC,QAAQ,CAAC,GAAG,KAAK,CAAC;IACvB;IAEA,MAAMC,KAAK,IAAIC;IACf,MAAMC,KAAKZ,iBAAiBW,OAAOX,QAAQ,IAAIW,KAAKD,GAAGG,OAAO,KAAK,CAACb,QAAQJ;IAE5E,OAAQK;QACN,KAAK;YACH,OAAOP,eAAekB,IAAIF;QAC5B,KAAK;YACH,OAAOf,qBAAqBiB,IAAIF;IACpC;AACF"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Format } from './string';
-import { parseDateFormat } from './date';
+import { parseDateFormat, isValidDate, INVALID_DATE } from './date';
 export type DataType = 'string' | 'date' | 'number' | 'duration';
 declare function format(rawValue: unknown, dataType: DataType, format?: string | Format): string;
 declare function getStyle(dataType: DataType, format: string | Format, value: unknown): {
@@ -7,4 +7,4 @@ declare function getStyle(dataType: DataType, format: string | Format, value: un
 } | {
     color: any;
 };
-export { format, parseDateFormat, getStyle };
+export { format, parseDateFormat, isValidDate, INVALID_DATE, getStyle };

package/dist/index.js

@@ -1,6 +1,7 @@
 import numfmt from 'numfmt';
 import { formatString } from './string';
-import { formatDate, parseDateFormat } from './date';
+import { formatDate, parseDateFormat, isValidDate, INVALID_DATE } from './date';
+import { formatDuration } from './duration';
 function format(rawValue, dataType, format) {
     switch(dataType){
         // string formatting
@@ -14,9 +15,10 @@ function format(rawValue, dataType, format) {
             return numfmt(format)(isNaN(rawValue) ? rawValue : +rawValue);
         // duration formatting
         case 'duration':
-            return formatDate(+rawValue, format || 'HH:mm:ss');
+            return formatDuration(+rawValue, format);
+        default:
+            return rawValue;
     }
-    return rawValue;
 }
 function getStyle(dataType, format, value) {
     switch(dataType){
@@ -32,6 +34,6 @@ function getStyle(dataType, format, value) {
             return {};
     }
 }
-export { format, parseDateFormat, getStyle };
+export { format, parseDateFormat, isValidDate, INVALID_DATE, getStyle };
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import numfmt from 'numfmt';\nimport { Format, formatString } from './string';\nimport { formatDate, parseDateFormat } from './date';\n\nexport type DataType = 'string' | 'date' | 'number' | 'duration';\n\nfunction format(rawValue: unknown, dataType: DataType, format?: string | Format): string {\n  switch (dataType) {\n    // string formatting\n    case 'string':\n      return formatString(rawValue as string, format as Format) as string;\n    // date formatting\n    case 'date':\n      return formatDate(rawValue instanceof Date ? rawValue : new Date(rawValue as string), format);\n    // number formatting\n    case 'number':\n      return numfmt(format)(isNaN(rawValue as number) ? rawValue : +rawValue);\n    // duration formatting\n    case 'duration':\n      return formatDate(+rawValue, format || 'HH:mm:ss');\n  }\n\n  return rawValue as string;\n}\n\nfunction getStyle(dataType: DataType, format: string | Format, value: unknown) {\n  switch (dataType) {\n    case 'number': {\n      const color = numfmt(format).color(isNaN(value as number) ? value : +value);\n      if (color === 'black' && !format.toLowerCase().includes('[black]')) return {};\n      return { color };\n    }\n    default:\n      return {};\n  }\n}\n\nexport { format, parseDateFormat, getStyle };\n"],"names":["numfmt","formatString","formatDate","parseDateFormat","format","rawValue","dataType","Date","isNaN","getStyle","value","color","toLowerCase","includes"],"mappings":"AAAA,OAAOA,YAAY,SAAS;AAC5B,SAAiBC,YAAY,QAAQ,WAAW;AAChD,SAASC,UAAU,EAAEC,eAAe,QAAQ,SAAS;AAIrD,SAASC,OAAOC,QAAiB,EAAEC,QAAkB,EAAEF,MAAwB;IAC7E,OAAQE;QACN,oBAAoB;QACpB,KAAK;YACH,OAAOL,aAAaI,UAAoBD;QAC1C,kBAAkB;QAClB,KAAK;YACH,OAAOF,WAAWG,oBAAoBE,OAAOF,WAAW,IAAIE,KAAKF,WAAqBD;QACxF,oBAAoB;QACpB,KAAK;YACH,OAAOJ,OAAOI,QAAQI,MAAMH,YAAsBA,WAAW,CAACA;QAChE,sBAAsB;QACtB,KAAK;YACH,OAAOH,WAAW,CAACG,UAAUD,UAAU;IAC3C;IAEA,OAAOC;AACT;AAEA,SAASI,SAASH,QAAkB,EAAEF,MAAuB,EAAEM,KAAc;IAC3E,OAAQJ;QACN,KAAK;YAAU;gBACb,MAAMK,QAAQX,OAAOI,QAAQO,KAAK,CAACH,MAAME,SAAmBA,QAAQ,CAACA;gBACrE,IAAIC,UAAU,WAAW,CAACP,OAAOQ,WAAW,GAAGC,QAAQ,CAAC,YAAY,OAAO,CAAC;gBAC5E,OAAO;oBAAEF;gBAAM;YACjB;QACA;YACE,OAAO,CAAC;IACZ;AACF;AAEA,SAASP,MAAM,EAAED,eAAe,EAAEM,QAAQ,GAAG"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import numfmt from 'numfmt';\nimport { Format, formatString } from './string';\nimport { formatDate, parseDateFormat, isValidDate, INVALID_DATE } from './date';\nimport { formatDuration, Format as DurationFormat } from './duration';\n\nexport type DataType = 'string' | 'date' | 'number' | 'duration';\n\nfunction format(rawValue: unknown, dataType: DataType, format?: string | Format): string {\n  switch (dataType) {\n    // string formatting\n    case 'string':\n      return formatString(rawValue as string, format as Format) as string;\n    // date formatting\n    case 'date':\n      return formatDate(rawValue instanceof Date ? rawValue : new Date(rawValue as string), format);\n    // number formatting\n    case 'number':\n      return numfmt(format)(isNaN(rawValue as number) ? rawValue : +rawValue);\n    // duration formatting\n    case 'duration':\n      return formatDuration(+rawValue, format as DurationFormat);\n    default:\n      return rawValue as string;\n  }\n}\n\nfunction getStyle(dataType: DataType, format: string | Format, value: unknown) {\n  switch (dataType) {\n    case 'number': {\n      const color = numfmt(format).color(isNaN(value as number) ? value : +value);\n      if (color === 'black' && !format.toLowerCase().includes('[black]')) return {};\n      return { color };\n    }\n    default:\n      return {};\n  }\n}\n\nexport { format, parseDateFormat, isValidDate, INVALID_DATE, getStyle };\n"],"names":["numfmt","formatString","formatDate","parseDateFormat","isValidDate","INVALID_DATE","formatDuration","format","rawValue","dataType","Date","isNaN","getStyle","value","color","toLowerCase","includes"],"mappings":"AAAA,OAAOA,YAAY,SAAS;AAC5B,SAAiBC,YAAY,QAAQ,WAAW;AAChD,SAASC,UAAU,EAAEC,eAAe,EAAEC,WAAW,EAAEC,YAAY,QAAQ,SAAS;AAChF,SAASC,cAAc,QAAkC,aAAa;AAItE,SAASC,OAAOC,QAAiB,EAAEC,QAAkB,EAAEF,MAAwB;IAC7E,OAAQE;QACN,oBAAoB;QACpB,KAAK;YACH,OAAOR,aAAaO,UAAoBD;QAC1C,kBAAkB;QAClB,KAAK;YACH,OAAOL,WAAWM,oBAAoBE,OAAOF,WAAW,IAAIE,KAAKF,WAAqBD;QACxF,oBAAoB;QACpB,KAAK;YACH,OAAOP,OAAOO,QAAQI,MAAMH,YAAsBA,WAAW,CAACA;QAChE,sBAAsB;QACtB,KAAK;YACH,OAAOF,eAAe,CAACE,UAAUD;QACnC;YACE,OAAOC;IACX;AACF;AAEA,SAASI,SAASH,QAAkB,EAAEF,MAAuB,EAAEM,KAAc;IAC3E,OAAQJ;QACN,KAAK;YAAU;gBACb,MAAMK,QAAQd,OAAOO,QAAQO,KAAK,CAACH,MAAME,SAAmBA,QAAQ,CAACA;gBACrE,IAAIC,UAAU,WAAW,CAACP,OAAOQ,WAAW,GAAGC,QAAQ,CAAC,YAAY,OAAO,CAAC;gBAC5E,OAAO;oBAAEF;gBAAM;YACjB;QACA;YACE,OAAO,CAAC;IACZ;AACF;AAEA,SAASP,MAAM,EAAEJ,eAAe,EAAEC,WAAW,EAAEC,YAAY,EAAEO,QAAQ,GAAG"}

package/dist/waiter.js

@@ -0,0 +1,27 @@
+export class Mutex {
+    current = Promise.resolve();
+    lock() {
+        let _resolve;
+        const p = new Promise((resolve)=>{
+            _resolve = ()=>resolve();
+        });
+        // Caller gets a promise that resolves when the current outstanding
+        // lock resolves
+        const rv = this.current.then(()=>_resolve);
+        // Don't allow the next request until the new promise is done
+        this.current = p;
+        // Return the new promise
+        return rv;
+    }
+}
+export function queue() {
+    const mutex = new Mutex();
+    return async (fn)=>{
+        const unlock = await mutex.lock();
+        const value = await fn();
+        unlock();
+        return value;
+    };
+}
+
+//# sourceMappingURL=waiter.js.map

package/dist/waiter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/waiter.ts"],"sourcesContent":["export class Mutex {\n  current: Promise<unknown> = Promise.resolve();\n  lock() {\n    let _resolve;\n    const p = new Promise<void>((resolve) => {\n      _resolve = () => resolve();\n    });\n    // Caller gets a promise that resolves when the current outstanding\n    // lock resolves\n    const rv = this.current.then(() => _resolve);\n    // Don't allow the next request until the new promise is done\n    this.current = p;\n    // Return the new promise\n    return rv;\n  }\n}\n\nexport function queue() {\n  const mutex = new Mutex();\n  return async <T>(fn: () => T): Promise<T> => {\n    const unlock = await mutex.lock();\n    const value = await fn();\n    unlock();\n    return value;\n  };\n}\n"],"names":["Mutex","current","Promise","resolve","lock","_resolve","p","rv","then","queue","mutex","fn","unlock","value"],"mappings":"AAAA,OAAO,MAAMA;IACXC,UAA4BC,QAAQC,OAAO,GAAG;IAC9CC,OAAO;QACL,IAAIC;QACJ,MAAMC,IAAI,IAAIJ,QAAc,CAACC;YAC3BE,WAAW,IAAMF;QACnB;QACA,mEAAmE;QACnE,gBAAgB;QAChB,MAAMI,KAAK,IAAI,CAACN,OAAO,CAACO,IAAI,CAAC,IAAMH;QACnC,6DAA6D;QAC7D,IAAI,CAACJ,OAAO,GAAGK;QACf,yBAAyB;QACzB,OAAOC;IACT;AACF;AAEA,OAAO,SAASE;IACd,MAAMC,QAAQ,IAAIV;IAClB,OAAO,OAAUW;QACf,MAAMC,SAAS,MAAMF,MAAMN,IAAI;QAC/B,MAAMS,QAAQ,MAAMF;QACpBC;QACA,OAAOC;IACT;AACF"}