cafe-utility 9.6.0 → 9.8.0

package/index.d.ts

@@ -160,6 +160,7 @@ declare function resolveVariableWithDefaultSyntax(string: string, key: string, v
 declare function resolveRemainingVariablesWithDefaults(string: string, prefix?: string, separator?: string): string;
 declare function resolveMarkdownLinks(string: string, transformer: (label: string, link: string) => string): string;
 declare function toQueryString(object: Record<string, any>, questionMark?: boolean): string;
+declare function buildUrl(baseUrl?: string | null, path?: string | null, query?: Record<string, any> | null): string;
 declare function parseCsv(string: string, delimiter?: string, quote?: string): string[];
 declare function humanizeProgress(state: Progress): string;
 declare function waitFor(predicate: () => Promise<boolean>, waitLength: number, maxWaits: number): Promise<boolean>;
@@ -224,6 +225,7 @@ declare function createOscillator<T>(values: T[]): {
     next: () => T;
 };
 declare function createStatefulToggle(desiredValue: unknown): (value: unknown) => boolean;
+declare function organiseWithLimits<T>(items: T[], limits: Record<string, number>, property: keyof T, defaultValue: string, sortFn?: (a: T, b: T) => number): Record<string, T[]>;
 declare function diffKeys(objectA: CafeObject, objectB: CafeObject): {
     uniqueToA: string[];
     uniqueToB: string[];
@@ -354,6 +356,7 @@ export declare const Arrays: {
     atRolling: typeof atRolling;
     group: typeof group;
     createOscillator: typeof createOscillator;
+    organiseWithLimits: typeof organiseWithLimits;
 };
 export declare const System: {
     sleepMillis: typeof sleepMillis;
@@ -543,6 +546,7 @@ export declare const Strings: {
     linesMatchInOrder: typeof linesMatchInOrder;
     represent: typeof represent;
     resolveMarkdownLinks: typeof resolveMarkdownLinks;
+    buildUrl: typeof buildUrl;
 };
 export declare const Assertions: {
     asEqual: typeof asEqual;

package/index.js

@@ -1140,6 +1140,10 @@ function toQueryString(object, questionMark = true) {
     return queryString ? (questionMark ? '?' : '') + queryString : ''
 }
 
+function buildUrl(baseUrl, path, query) {
+    return joinUrl(baseUrl, path) + toQueryString(query || {})
+}
+
 function parseCsv(string, delimiter = ',', quote = '"') {
     const items = []
     let buffer = ''
@@ -1465,6 +1469,28 @@ function createStatefulToggle(desiredValue) {
     }
 }
 
+function organiseWithLimits(items, limits, property, defaultValue, sortFn) {
+    const result = {}
+    for (const key of Object.keys(limits)) {
+        result[key] = []
+    }
+    result[defaultValue] = []
+    if (sortFn) {
+        items = items.sort(sortFn)
+    }
+    for (const item of items) {
+        const value = item[property]
+        const key = limits[value] ? value : defaultValue
+        const isFull = result[key].length >= limits[key]
+        if (isFull) {
+            result[defaultValue].push(item)
+        } else {
+            result[key].push(item)
+        }
+    }
+    return result
+}
+
 function diffKeys(objectA, objectB) {
     const keysA = Object.keys(objectA)
     const keysB = Object.keys(objectB)
@@ -2293,7 +2319,8 @@ exports.Arrays = {
     unshiftAndLimit,
     atRolling,
     group,
-    createOscillator
+    createOscillator,
+    organiseWithLimits
 }
 
 exports.System = {
@@ -2490,7 +2517,8 @@ exports.Strings = {
     lineMatches,
     linesMatchInOrder,
     represent,
-    resolveMarkdownLinks
+    resolveMarkdownLinks,
+    buildUrl
 }
 
 exports.Assertions = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "9.6.0",
+    "version": "9.8.0",
     "description": "",
     "main": "index.js",
     "exports": {