oberknecht-utils - npm Package Compare versions

Comparing version 1.6.9 to 1.7.0

lib-js/utils/cleanTime.d.ts

@@ -1,1 +0,1 @@
-export declare function cleanTime(time: number /** time in ms */, timeopt: number, timedigits: number | "all" | "auto", noMs: boolean): {};
+export declare function cleanTime(time: number /** time in ms */, timeopt?: number, timedigits?: number | "all" | "auto", noMS?: boolean, noSpace?: boolean): {};

lib-js/utils/cleanTime.js

@@ -7,3 +7,3 @@ "use strict";
 const recreate_1 = require("./recreate");
-function cleanTime(time /** time in ms */, timeopt, timedigits, noMs) {
+function cleanTime(time /** time in ms */, timeopt, timedigits, noMS, noSpace) {
     let timedigits_ = (0, recreate_1.recreate)(timedigits);
@@ -17,3 +17,4 @@ if (!(timedigits_ ?? undefined) ||
         years: {
-            tag_: "yr",
+            tag3: "yr",
+            tag2: "yr",
             tag: "year",
@@ -24,3 +25,4 @@ conversion: 365 * 24 * 60 * 60 * 1000,
         weeks: {
-            tag_: "wk",
+            tag3: "wk",
+            tag2: "wk",
             tag: "week",
@@ -31,3 +33,4 @@ conversion: 7 * 24 * 60 * 60 * 1000,
         days: {
-            tag_: "day",
+            tag3: "d",
+            tag2: "day",
             tag: "day",
@@ -37,6 +40,30 @@ conversion: 24 * 60 * 60 * 1000,
         },
-        hours: { tag_: "hr", tag: "hour", conversion: 60 * 60 * 1000, time: 0 },
-        minutes: { tag_: "min", tag: "minute", conversion: 60 * 1000, time: 0 },
-        seconds: { tag_: "sec", tag: "second", conversion: 1000, time: 0 },
-        milliseconds: { tag_: "ms", tag: "millisecond", conversion: 1, time: 0 },
+        hours: {
+            tag3: "h",
+            tag2: "hr",
+            tag: "hour",
+            conversion: 60 * 60 * 1000,
+            time: 0,
+        },
+        minutes: {
+            tag3: "m",
+            tag2: "min",
+            tag: "minute",
+            conversion: 60 * 1000,
+            time: 0,
+        },
+        seconds: {
+            tag3: "s",
+            tag2: "sec",
+            tag: "second",
+            conversion: 1000,
+            time: 0,
+        },
+        milliseconds: {
+            tag3: "ms",
+            tag2: "ms",
+            tag: "millisecond",
+            conversion: 1,
+            time: 0,
+        },
     };
@@ -56,3 +83,3 @@ t.milliseconds.time = time;
         let cte = tco.time;
-        if (((i !== Object.keys(t).length - 1 || !noMs) &&
+        if (((i !== Object.keys(t).length - 1 || !noMS) &&
             ["auto"].includes(timedigits_) &&
@@ -74,7 +101,10 @@ u < autonum) ||
                     case 4:
-                    case 5: {
+                    case 5:
+                    case 6: {
                         if (cte > 0) {
-                            r["time"].push(`${cte} ${tco[["tag", "tag_"][timeopt - 4]] !== "ms"
-                                ? tco[["tag", "tag_"][timeopt - 4]] + (cte > 1 ? "s" : "")
-                                : tco[["tag", "tag_"][timeopt - 4]]}`);
+                            r["time"].push(`${cte} ${tco[["tag", "tag2", "tag3"][timeopt - 4]] !== "ms" &&
+                                timeopt - 4 !== 2
+                                ? tco[["tag", "tag2", "tag3"][timeopt - 4]] +
+                                    (cte > 1 ? "s" : "")
+                                : tco[["tag", "tag2", "tag3"][timeopt - 4]]}`);
                             r["order"].push(tc);
@@ -95,4 +125,6 @@ }
     }
+    if (r.time)
+        r.time = r.time.map((a) => (noSpace ? a.replace(/\s/g, "") : a));
     return r;
 }
 exports.cleanTime = cleanTime;

lib-ts/utils/cleanTime.ts

@@ -7,5 +7,6 @@ import { extendedTypeof } from "./extendedTypeof";
   time: number /** time in ms */,
-  timeopt: number,
-  timedigits: number | "all" | "auto",
-  noMs: boolean
+  timeopt?: number,
+  timedigits?: number | "all" | "auto",
+  noMS?: boolean,
+  noSpace?: boolean
 ): {} {
@@ -19,6 +20,7 @@ let timedigits_ = recreate(timedigits);
     timedigits_ = "auto";
-  let r: {} = { time: [], order: [], tag: "" };
+  let r: Record<string, any> = { time: [], order: [], tag: "" };
   let t = {
     years: {
-      tag_: "yr",
+      tag3: "yr",
+      tag2: "yr",
       tag: "year",
@@ -29,3 +31,4 @@ conversion: 365 * 24 * 60 * 60 * 1000,
     weeks: {
-      tag_: "wk",
+      tag3: "wk",
+      tag2: "wk",
       tag: "week",
@@ -36,3 +39,4 @@ conversion: 7 * 24 * 60 * 60 * 1000,
     days: {
-      tag_: "day",
+      tag3: "d",
+      tag2: "day",
       tag: "day",
@@ -42,6 +46,30 @@ conversion: 24 * 60 * 60 * 1000,
     },
-    hours: { tag_: "hr", tag: "hour", conversion: 60 * 60 * 1000, time: 0 },
-    minutes: { tag_: "min", tag: "minute", conversion: 60 * 1000, time: 0 },
-    seconds: { tag_: "sec", tag: "second", conversion: 1000, time: 0 },
-    milliseconds: { tag_: "ms", tag: "millisecond", conversion: 1, time: 0 },
+    hours: {
+      tag3: "h",
+      tag2: "hr",
+      tag: "hour",
+      conversion: 60 * 60 * 1000,
+      time: 0,
+    },
+    minutes: {
+      tag3: "m",
+      tag2: "min",
+      tag: "minute",
+      conversion: 60 * 1000,
+      time: 0,
+    },
+    seconds: {
+      tag3: "s",
+      tag2: "sec",
+      tag: "second",
+      conversion: 1000,
+      time: 0,
+    },
+    milliseconds: {
+      tag3: "ms",
+      tag2: "ms",
+      tag: "millisecond",
+      conversion: 1,
+      time: 0,
+    },
   };
@@ -66,3 +94,3 @@ t.milliseconds.time = time;
     if (
-      ((i !== Object.keys(t).length - 1 || !noMs) &&
+      ((i !== Object.keys(t).length - 1 || !noMS) &&
         ["auto"].includes(timedigits_) &&
@@ -86,9 +114,12 @@ u < autonum) ||
           case 4:
-          case 5: {
+          case 5:
+          case 6: {
             if (cte > 0) {
               r["time"].push(
                 `${cte} ${
-                  tco[["tag", "tag_"][timeopt - 4]] !== "ms"
-                    ? tco[["tag", "tag_"][timeopt - 4]] + (cte > 1 ? "s" : "")
-                    : tco[["tag", "tag_"][timeopt - 4]]
+                  tco[["tag", "tag2", "tag3"][timeopt - 4]] !== "ms" &&
+                  timeopt - 4 !== 2
+                    ? tco[["tag", "tag2", "tag3"][timeopt - 4]] +
+                      (cte > 1 ? "s" : "")
+                    : tco[["tag", "tag2", "tag3"][timeopt - 4]]
                 }`
@@ -111,3 +142,5 @@ );
 
+  if (r.time) r.time = r.time.map((a) => (noSpace ? a.replace(/\s/g, "") : a));
+
   return r;
 }

package.json

 {
   "name": "oberknecht-utils",
-  "version": "1.6.9",
+  "version": "1.7.0",
   "description": "Utils for oberknecht packages",
@@ -5,0 +5,0 @@ "main": "./lib-ts/utils/index",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

151126

increased by0.74%

Lines of code

4191

increased by1.55%

No dependency changes