oberknecht-utils - npm Package Compare versions

Comparing version 1.8.9 to 1.9.0

lib-js/types/extendedTypes.d.ts

@@ -1,1 +0,1 @@
-export type extendedTypes = "array" | "json" | "null" | "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export declare type extendedTypes = "array" | "json" | "null" | "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";

lib-js/types/getKeyArraysFromObject.d.ts

@@ -1,5 +0,5 @@
-export type getKeyArraysFromObjectEntry = {
+export declare type getKeyArraysFromObjectEntry = {
     path: string[];
     value: any;
 };
-export type getKeyArraysFromObjectReturn = getKeyArraysFromObjectEntry[];
+export declare type getKeyArraysFromObjectReturn = getKeyArraysFromObjectEntry[];

lib-js/types/log.d.ts

@@ -27,4 +27,4 @@ export declare const logColors: {
 export declare const logColorValues: ("0" | "1" | "2" | "4" | "5" | "7" | "8" | "33" | "34" | "35" | "36" | "37" | "40" | "41" | "42" | "43" | "44" | "45" | "46" | "47" | "30" | "31" | "32")[];
-type logColorValueType = typeof logColorValues[number];
-export type logOptConfigType = {
+declare type logColorValueType = typeof logColorValues[number];
+export declare type logOptConfigType = {
     option?: number;
@@ -31,0 +31,0 @@ logColorFG?: logColorValueType;

lib-js/types/regexGenerator.d.ts

@@ -1,3 +0,3 @@
-export type regexGeneratorOptions = {
+export declare type regexGeneratorOptions = {
     charGroupReplacement?: string;
 };

lib-js/utils/arrayModifiers/dissolveArray.d.ts

@@ -1,3 +0,3 @@
-type arrTypeReturn<T> = T extends any[] ? any : T;
+declare type arrTypeReturn<T> = T extends any[] ? any : T;
 export declare function dissolveArray<arrType extends Array<string | number | any>>(...arr: arrType): arrTypeReturn<arrType>[];
 export {};

lib-js/utils/index.d.ts

@@ -70,2 +70,3 @@ export * from "./cleanChannelName";
 export * from "./getVariableName";
+export * from "./joinValues";
 export * from "../variables/regex";

lib-js/utils/index.js

@@ -86,2 +86,3 @@ "use strict";
 __exportStar(require("./getVariableName"), exports);
+__exportStar(require("./joinValues"), exports);
 __exportStar(require("../variables/regex"), exports);

lib-js/utils/isConstructor.d.ts

@@ -1,2 +0,2 @@
-export type errorMsgChecker = (cb: string) => {};
+export declare type errorMsgChecker = (cb: string) => {};
 export declare function isConstructor(f: any, errorMsgChecker?: errorMsgChecker): boolean;

lib-js/utils/jsonModifiers/addAppendKeysToObject.js

@@ -10,21 +10,3 @@ "use strict";
     let newvalue = oldvalue ?? value;
-    switch ((0, __1.extendedTypeof)(oldvalue)) {
-        case "json": {
-            let jsonpaths = (0, __1.getKeyArraysFromObject)(value);
-            jsonpaths.forEach((a) => {
-                (0, __1.addKeysToObject)(newvalue, a.path, a.value);
-            });
-            break;
-        }
-        case "array": {
-            newvalue.push(...(0, __1.convertToArray)(value, false));
-            break;
-        }
-        case "string":
-        case "number":
-        case "bigint": {
-            newvalue += value;
-            break;
-        }
-    }
+    newvalue = (0, __1.joinValues)([newvalue, value], true);
     (0, __1.addKeysToObject)(object_, keys_, newvalue);
@@ -31,0 +13,0 @@ return object_;

lib-js/utils/jsonModifiers/concatJSON.d.ts

@@ -1,1 +0,2 @@
-export declare function concatJSON(arr: Record<string, any>[]): {};
+import { extendedTypes } from "../../types/extendedTypes";
+export declare function concatJSON(arr: Record<string, any>[], addAppendTypes?: true | extendedTypes | extendedTypes[], typesOverride?: boolean): {};

lib-js/utils/jsonModifiers/concatJSON.js

@@ -5,12 +5,17 @@ "use strict";
 const __1 = require("..");
-function concatJSON(arr) {
+function concatJSON(arr, addAppendTypes, typesOverride) {
     let arr_ = (0, __1.convertToArray)(arr);
     let r = {};
+    let addAppendTypes_ = (0, __1.convertToArray)(addAppendTypes);
     arr_.forEach((a) => {
         function appendObj(obj, obj2) {
             Object.keys(obj2).forEach((b) => {
-                if (obj[b] &&
-                    (0, __1.extendedTypeof)(obj[b]) === "json" &&
+                if ((0, __1.extendedTypeof)(obj[b]) === "json" &&
                     (0, __1.extendedTypeof)(obj2[b]) === "json")
                     return appendObj(obj[b], obj2[b]);
+                if (!(0, __1.isNullUndefined)(addAppendTypes) &&
+                    (0, __1.extendedTypeof)(obj[b]) === (0, __1.extendedTypeof)(obj2[b]) &&
+                    (addAppendTypes === true ||
+                        addAppendTypes_.includes((0, __1.extendedTypeof)(obj[b]))))
+                    return (obj[b] = (0, __1.joinValues)([obj[b], obj2[b]], typesOverride));
                 obj[b] = obj2[b];
@@ -17,0 +22,0 @@ });

lib-js/utils/log.d.ts

 import { logOptConfigType } from "../types/log";
 declare const logOpts: number[];
-type logOptsType = typeof logOpts[number];
+declare type logOptsType = typeof logOpts[number];
 export declare function log(logOpt: logOptConfigType | logOptsType | any, ...logMsg: any): void;
 export {};

lib-js/utils/message.Badges.d.ts

@@ -1,2 +0,2 @@
-export type BadgesMap = Record<string, string>;
+export declare type BadgesMap = Record<string, string>;
 export declare function messageBadges(badges: string): BadgesMap;

lib-js/utils/message.Emotes.d.ts

@@ -1,2 +0,2 @@
-export type messageEmote = {
+export declare type messageEmote = {
     id: string;
@@ -6,3 +6,3 @@ start: number;
 };
-export type messageEmotesReturn = Array<messageEmote>;
+export declare type messageEmotesReturn = Array<messageEmote>;
 export declare function messageEmotes(rawEmotes: string): messageEmotesReturn;

lib-js/utils/parseProcessArgs.d.ts

@@ -1,2 +0,2 @@
-type processArgEntry = {
+declare type processArgEntry = {
     keys: string[];
@@ -7,4 +7,4 @@ allowArgs?: boolean;
 };
-type processArgsType = Record<string, processArgEntry>;
+declare type processArgsType = Record<string, processArgEntry>;
 export declare function parseProcessArgs(args: typeof process.argv, processArgs?: processArgsType): processArgsType;
 export {};

lib-js/utils/stackName.d.ts

@@ -1,2 +0,2 @@
-export type stackNameReturnType = [string, string[], string[], string];
+export declare type stackNameReturnType = [string, string[], string[], string];
 export declare function stackName(): stackNameReturnType;

lib-ts/utils/index.ts

@@ -73,3 +73,4 @@ export * from "./cleanChannelName";
 export * from "./getVariableName";
+export * from "./joinValues";
 
 export * from "../variables/regex";

lib-ts/utils/jsonModifiers/addAppendKeysToObject.ts

 import {
   addKeysToObject,
   convertToArray,
-  extendedTypeof,
-  getKeyArraysFromObject,
   getKeyFromObject,
-  recreate,
+  joinValues,
 } from "..";
@@ -20,25 +18,5 @@
   let newvalue = oldvalue ?? value;
-  switch (extendedTypeof(oldvalue)) {
-    case "json": {
-      let jsonpaths = getKeyArraysFromObject(value);
-      jsonpaths.forEach((a) => {
-        addKeysToObject(newvalue, a.path, a.value);
-      });
 
-      break;
-    }
+  newvalue = joinValues([newvalue, value], true);
 
-    case "array": {
-      newvalue.push(...convertToArray(value, false));
-      break;
-    }
-
-    case "string":
-    case "number":
-    case "bigint": {
-      newvalue += value;
-      break;
-    }
-  }
-
   addKeysToObject(object_, keys_, newvalue);
@@ -45,0 +23,0 @@

lib-ts/utils/jsonModifiers/concatJSON.ts

@@ -1,6 +0,17 @@
-import { addKeysToObject, convertToArray, extendedTypeof } from "..";
+import {
+  convertToArray,
+  extendedTypeof,
+  isNullUndefined,
+  joinValues,
+} from "..";
+import { extendedTypes } from "../../types/extendedTypes";
 
-export function concatJSON(arr: Record<string, any>[]) {
+export function concatJSON(
+  arr: Record<string, any>[],
+  addAppendTypes?: true | extendedTypes | extendedTypes[],
+  typesOverride?: boolean
+) {
   let arr_ = convertToArray(arr);
   let r = {};
+  let addAppendTypes_ = convertToArray(addAppendTypes);
   arr_.forEach((a) => {
@@ -10,3 +21,2 @@ function appendObj(obj, obj2) {
         if (
-          obj[b] &&
           extendedTypeof(obj[b]) === "json" &&
@@ -16,2 +26,11 @@ extendedTypeof(obj2[b]) === "json"
           return appendObj(obj[b], obj2[b]);
+
+        if (
+          !isNullUndefined(addAppendTypes) &&
+          extendedTypeof(obj[b]) === extendedTypeof(obj2[b]) &&
+          (addAppendTypes === true ||
+            addAppendTypes_.includes(extendedTypeof(obj[b])))
+        )
+          return (obj[b] = joinValues([obj[b], obj2[b]], typesOverride));
+
         obj[b] = obj2[b];
@@ -18,0 +37,0 @@ });

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

167422

increased by1.55%

Number of package files

264

increased by1.15%

Lines of code

4562

increased by1.29%

No dependency changes