oberknecht-utils - npm Package Compare versions

Comparing version 1.0.7 to 1.0.8

lib-js/utils/cleanTime.js

 "use strict";
 exports.__esModule = true;
 exports.cleanTime = void 0;
+var extendedTypeof_1 = require("./extendedTypeof");
 var pad2_1 = require("./pad2");
 var recreate_1 = require("./recreate");
-/** @param {number} time time: time in ms @param {number} timeopt @param {number} timedigits @returns {time} Parsed time */
-function cleanTime(time /** time in ms */, timeopt, timedigits) {
+function cleanTime(time /** time in ms */, timeopt, timedigits, noMs) {
     var timedigits_ = (0, recreate_1.recreate)(timedigits);
-    if (!(timedigits_ !== null && timedigits_ !== void 0 ? timedigits_ : undefined) || typeof timedigits_ !== "number" || timedigits <= 0)
+    // @ts-ignore
+    if (!(timedigits_ !== null && timedigits_ !== void 0 ? timedigits_ : undefined) || (typeof timedigits_ !== "number" && timedigits_ !== "all") || timedigits <= 0)
         timedigits_ = "auto";
@@ -38,2 +39,4 @@ var r = { time: [], order: [], tag: "" };
     var ctlast;
+    var u = 0;
+    var autonum = 2;
     for (var i = 0; i < Object.keys(t).length; i++) {
@@ -43,4 +46,4 @@ var tc = Object.keys(t)[i];
         var cte = tco.time;
-        if ((["auto"].includes(timedigits_) && ((i < ((Object.keys(t).length > 0) ? Object.keys(t).length - 1 : Object.keys(t).length)) || i === 0)) || timedigits_ > 0) {
-            if (cte > 0 || ctlast) {
+        if (((i !== (Object.keys(t).length - 1)) || !noMs) && (["auto"].includes(timedigits_) && (u < autonum)) || timedigits_ === "all" || timedigits_ > 0) {
+            if (cte > 0) {
                 if (!(ctlast !== null && ctlast !== void 0 ? ctlast : undefined))
@@ -71,4 +74,6 @@ r["tag"] = "".concat(tco["tag"]).concat(cte > 1 ? "s" : "");
                 ;
-                timedigits_--;
+                if ((0, extendedTypeof_1.extendedTypeof)(timedigits_) === "number")
+                    timedigits_--;
                 ctlast = cte;
+                u++;
             }
@@ -75,0 +80,0 @@ ;

lib-ts/utils/cleanTime.ts

@@ -0,8 +1,9 @@
+import { extendedTypeof } from "./extendedTypeof";
 import { pad2 } from "./pad2";
 import { recreate } from "./recreate";
 
-/** @param {number} time time: time in ms @param {number} timeopt @param {number} timedigits @returns {time} Parsed time */
-export function cleanTime(time: number /** time in ms */, timeopt: number, timedigits: number): {} {
+export function cleanTime(time: number /** time in ms */, timeopt: number, timedigits: number | "all" | "auto", noMs: boolean): {} {
     let timedigits_ = recreate(timedigits);
-    if (!(timedigits_ ?? undefined) || typeof timedigits_ !== "number" || timedigits <= 0) timedigits_ = "auto";
+    // @ts-ignore
+    if (!(timedigits_ ?? undefined) || (typeof timedigits_ !== "number" && timedigits_ !== "all") || timedigits <= 0) timedigits_ = "auto";
     let r: {} = { time: [], order: [], tag: "" };
@@ -35,2 +36,4 @@ let t = {
     let ctlast;
+    let u = 0;
+    let autonum = 2;
     for (let i = 0; i < Object.keys(t).length; i++) {
@@ -40,4 +43,4 @@ let tc = Object.keys(t)[i];
         let cte: number = tco.time;
-        if ((["auto"].includes(timedigits_) && ((i < ((Object.keys(t).length > 0) ? Object.keys(t).length - 1 : Object.keys(t).length)) || i === 0)) || timedigits_ > 0) {
-            if (cte > 0 || ctlast) {
+        if (((i !== (Object.keys(t).length - 1)) || !noMs) && (["auto"].includes(timedigits_) && (u < autonum)) || timedigits_ === "all" || timedigits_ > 0) {
+            if (cte > 0) {
                 if (!(ctlast ?? undefined)) r["tag"] = `${tco["tag"]}${cte > 1 ? "s" : ""}`;
@@ -63,4 +66,5 @@ switch (timeopt) {
 
-                timedigits_--;
+                if (extendedTypeof(timedigits_) === "number") timedigits_--;
                 ctlast = cte;
+                u++;
             };
@@ -67,0 +71,0 @@ } else {

package.json

 {
   "name": "oberknecht-utils",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "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

80659

increased by0.23%

Lines of code

1382

increased by0.66%

No dependency changes