@ws-ui/formatter 0.1.16 → 0.1.18

package/dist/duration.d.ts

@@ -1,2 +1,3 @@
-export type Format = 'Simple' | 'Distance' | 'Strict Distance';
+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

@@ -2,21 +2,37 @@ import { formatDistance, formatDistanceStrict } from 'date-fns';
 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')}`;
+}
 export function formatDuration(value, format = 'Simple') {
     if (format === 'Simple') {
-        const v = +value;
+        let v = +value;
+        let isNegative = false;
+        if (v < 0) {
+            v = -v;
+            isNegative = true;
+        }
         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')}`;
+        return `${padNumber(hours, isNegative)}:${padNumber(minutes, isNegative)}:${padNumber(seconds, isNegative)}`;
     }
     const d1 = new Date();
     const d2 = value instanceof Date ? value : new Date(d1.getTime() + +value);
     switch(format){
         case 'Distance':
             return formatDistance(d2, d1);
+        case 'Distance With Suffix':
+            return formatDistance(d2, d1, {
+                addSuffix: true
+            });
         case 'Strict Distance':
             return formatDistanceStrict(d2, d1);
+        case 'Strict Distance With Suffix':
+            return formatDistanceStrict(d2, d1, {
+                addSuffix: true
+            });
     }
 }
 

package/dist/duration.js.map

@@ -1 +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);\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;IAEpE,OAAQC;QACN,KAAK;YACH,OAAOP,eAAekB,IAAIF;QAC5B,KAAK;YACH,OAAOf,qBAAqBiB,IAAIF;IACpC;AACF"}
+{"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"}

package/dist/index.js

@@ -15,7 +15,7 @@ function format(rawValue, dataType, format) {
             return numfmt(format)(isNaN(rawValue) ? rawValue : +rawValue);
         // duration formatting
         case 'duration':
-            return formatDuration(+rawValue, format);
+            return formatDuration(rawValue, format);
         default:
             return rawValue;
     }

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, 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"}
+{"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 as string | number | Date, 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,eAAeE,UAAoCD;QAC5D;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"}