cafe-utility 9.3.0 → 9.4.0

package/index.d.ts

@@ -124,7 +124,7 @@ interface ParsedFilename {
 }
 declare function parseFilename(string: string): ParsedFilename;
 declare function randomize(string: string): string;
-declare function expand(string: string): string[];
+declare function expand(input: string): string[];
 declare function shrinkTrim(string: string): string;
 declare function capitalize(string: string): string;
 declare function decapitalize(string: string): string;
@@ -229,6 +229,7 @@ declare function diffKeys(objectA: CafeObject, objectB: CafeObject): {
 };
 declare function pickRandomKey(object: CafeObject): string;
 declare function mapRandomKey<T>(object: CafeObject<T>, mapFunction: (value: T) => T): string;
+declare function fromObjectString<T>(string: string): T;
 interface NumberFormatOptions {
     precision?: number;
     longForm?: boolean;
@@ -450,6 +451,7 @@ export declare const Objects: {
     diffKeys: typeof diffKeys;
     pickRandomKey: typeof pickRandomKey;
     mapRandomKey: typeof mapRandomKey;
+    fromObjectString: typeof fromObjectString;
 };
 export declare const Pagination: {
     asPageNumber: typeof asPageNumber;

package/index.js

@@ -868,17 +868,19 @@ function randomize(string) {
     return string.replace(/\{(.+?)\}/g, (_, group) => pick(group.split('|')))
 }
 
-function expand(string) {
-    const matches = string.match(/\{(.+?)\}/g)
-    if (!matches) {
-        return [string]
-    }
-    const result = []
-    for (const match of matches) {
-        const group = match.slice(1, match.length - 1)
-        for (const option of group.split(',')) {
-            result.push(string.replace(match, option))
-        }
+function expand(input) {
+    const regex = /\{(.+?)\}/
+    const match = input.match(regex)
+    if (!match || !match.index) {
+        return [input]
+    }
+    const group = match[1].split(',')
+    const prefix = input.slice(0, match.index)
+    const suffix = input.slice(match.index + match[0].length)
+    let result = []
+    for (const option of group) {
+        const expanded = expand(prefix + option + suffix)
+        result = result.concat(expanded)
     }
     return result
 }
@@ -1483,6 +1485,25 @@ function mapRandomKey(object, mapFunction) {
     return key
 }
 
+function fromObjectString(string) {
+    string = string.replace(/(\w+)\((.+)\)/g, (match, $1, $2) => {
+        return `${$1}(${$2.replaceAll(',', ',')})`
+    })
+    string = string.replace(/(,)(\s+})/g, '$2')
+    string = string.replace(/\.\.\..+?,/g, '')
+    string = string.replace(/(,\s+)([a-zA-Z]\w+),/g, "$1$2: '$2',")
+    string = string.replace(/:(.+)\?(.+):/g, (match, $1, $2) => {
+        return `: (${$1.trim()} && ${$2.trim()}) ||`
+    })
+    string = string.replace(/([a-zA-Z0-9]+)( ?: ?{)/g, '"$1"$2')
+    string = string.replace(/([a-zA-Z0-9]+) ?: ?(.+?)(,|\n|})/g, (match, $1, $2, $3) => {
+        return `"${$1}":"${$2.trim()}"${$3}`
+    })
+    string = string.replace(/("'|'")/g, '"')
+    string = string.replaceAll(',', ',')
+    return JSON.parse(string)
+}
+
 const thresholds = [1e3, 1e6, 1e9, 1e12, 1e15, 1e18, 1e21, 1e24, 1e27, 1e30, 1e33]
 const longNumberUnits = [
     'thousand',
@@ -2372,7 +2393,8 @@ exports.Objects = {
     createStatefulToggle,
     diffKeys,
     pickRandomKey,
-    mapRandomKey
+    mapRandomKey,
+    fromObjectString
 }
 
 exports.Pagination = {

package/package.json

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