@ditojs/utils 2.75.0 → 2.78.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "2.75.0",
+  "version": "2.78.0",
   "type": "module",
   "description": "Dito.js Utility Functions – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/utils",
@@ -39,5 +39,5 @@
   "devDependencies": {
     "typescript": "^5.9.3"
   },
-  "gitHead": "cfc4ee21dc3f5808b5a78a3b1fab83500c05907a"
+  "gitHead": "ede4c836e6b2bb5dfcc80e1614a3d85eb80b0efa"
 }

package/src/object/asCallback.js

@@ -0,0 +1,9 @@
+import { isString } from '../base/index.js'
+
+export function asCallback(callback) {
+  if (isString(callback)) {
+    const key = callback
+    return value => value[key]
+  }
+  return callback
+}

package/src/object/groupBy.js

@@ -1,9 +1,11 @@
 import { isArray } from '../base/index.js'
+import { asCallback } from './asCallback.js'
 
 export function groupBy(collection, callback) {
   const array = isArray(collection)
     ? collection
     : Object.values(collection)
+  callback = asCallback(callback)
   return array.reduce((groups, item) => {
     const key = callback(item)
     const group = groups[key] || (groups[key] = [])

package/src/object/groupBy.test.js

@@ -31,4 +31,40 @@ describe('groupBy()', () => {
     const actual = groupBy({ a: 6.1, b: 4.2, c: 6.3 }, Math.floor)
     expect(actual).toStrictEqual({ 4: [4.2], 6: [6.1, 6.3] })
   })
+
+  it('should support string property accessor', () => {
+    const array = [
+      { category: 'fruit', name: 'apple' },
+      { category: 'vegetable', name: 'carrot' },
+      { category: 'fruit', name: 'banana' }
+    ]
+    const actual = groupBy(array, 'category')
+    expect(actual).toStrictEqual({
+      fruit: [
+        { category: 'fruit', name: 'apple' },
+        { category: 'fruit', name: 'banana' }
+      ],
+      vegetable: [
+        { category: 'vegetable', name: 'carrot' }
+      ]
+    })
+  })
+
+  it('should group by string property with numbers', () => {
+    const array = [
+      { id: 1, value: 'a' },
+      { id: 2, value: 'b' },
+      { id: 1, value: 'c' }
+    ]
+    const actual = groupBy(array, 'id')
+    expect(actual).toStrictEqual({
+      1: [
+        { id: 1, value: 'a' },
+        { id: 1, value: 'c' }
+      ],
+      2: [
+        { id: 2, value: 'b' }
+      ]
+    })
+  })
 })

package/src/object/index.js

@@ -1,3 +1,4 @@
+export * from './asCallback.js'
 export * from './clone.js'
 export * from './equals.js'
 export * from './groupBy.js'

package/src/object/mapValues.js

@@ -1,4 +1,7 @@
+import { asCallback } from './asCallback.js'
+
 export function mapValues(object, callback) {
+  callback = asCallback(callback)
   return Object.keys(object).reduce((mapped, key) => {
     mapped[key] = callback(object[key], key, object)
     return mapped

package/src/object/mapValues.test.js

@@ -13,4 +13,26 @@ describe('mapValues()', () => {
     const actual = mapValues(array, String)
     expect(actual).toStrictEqual({ 0: '1', 1: '2' })
   })
+
+  it('should support string property accessor', () => {
+    const users = {
+      user1: { id: 1, name: 'Alice', email: 'alice@example.com' },
+      user2: { id: 2, name: 'Bob', email: 'bob@example.com' }
+    }
+    const actual = mapValues(users, 'email')
+    expect(actual).toStrictEqual({
+      user1: 'alice@example.com',
+      user2: 'bob@example.com'
+    })
+  })
+
+  it('should extract nested properties with string accessor', () => {
+    const data = {
+      a: { value: 10 },
+      b: { value: 20 },
+      c: { value: 30 }
+    }
+    const actual = mapValues(data, 'value')
+    expect(actual).toStrictEqual({ a: 10, b: 20, c: 30 })
+  })
 })

package/src/object/pickBy.js

@@ -1,4 +1,7 @@
+import { asCallback } from './asCallback.js'
+
 export function pickBy(object, callback) {
+  callback = asCallback(callback)
   return Object.entries(object).reduce((result, [key, value]) => {
     if (callback(value, key, object)) {
       result[key] = value

package/src/object/pickBy.test.js

@@ -6,4 +6,43 @@ describe('pickBy()', () => {
     const actual = pickBy(object, n => n === 1 || n === 3)
     expect(actual).toStrictEqual({ a: 1, c: 3 })
   })
+
+  it('should support string property accessor for truthy values', () => {
+    const users = {
+      user1: { name: 'Alice', active: true },
+      user2: { name: 'Bob', active: false },
+      user3: { name: 'Charlie', active: true }
+    }
+    const actual = pickBy(users, 'active')
+    expect(actual).toStrictEqual({
+      user1: { name: 'Alice', active: true },
+      user3: { name: 'Charlie', active: true }
+    })
+  })
+
+  it('should filter by numeric property with string accessor', () => {
+    const items = {
+      a: { score: 0 },
+      b: { score: 5 },
+      c: { score: 10 }
+    }
+    const actual = pickBy(items, 'score')
+    expect(actual).toStrictEqual({
+      b: { score: 5 },
+      c: { score: 10 }
+    })
+  })
+
+  it('should filter by string property with string accessor', () => {
+    const data = {
+      a: { label: '' },
+      b: { label: 'test' },
+      c: { label: 'value' }
+    }
+    const actual = pickBy(data, 'label')
+    expect(actual).toStrictEqual({
+      b: { label: 'test' },
+      c: { label: 'value' }
+    })
+  })
 })

package/src/string/decamelize.js

@@ -6,11 +6,13 @@ export function decamelize(str, sep = ' ') {
           // switch to better parsing that matches non-ASCII uppercase letters:
           // /([\p{Ll}\d])(\p{Lu})/gu
           // See: https://caniuse.com/?search=Unicode%20property%20escape
-          /([a-z\d])([A-Z])|(\S)(?:\s+)(\S)/g,
-          (all, lower, upper, beforeSpace, afterSpace) =>
-            upper
+          /(^\s+)|(\s+$)|([a-z\d])([A-Z])|(?<=\S)\s+(?=\S)/g,
+          (all, leading, trailing, lower, upper) =>
+            lower
               ? `${lower}${sep}${upper}`
-              : `${beforeSpace}${sep}${afterSpace}`
+              : leading || trailing
+                ? ''
+                : sep
         )
         .toLowerCase()
     : ''

package/src/string/decamelize.test.js

@@ -32,6 +32,26 @@ describe('hyphenate()', () => {
       })
     }
   )
+
+  it('should hyphenate single space between words', () => {
+    expect(hyphenate('Foo Bar')).toBe('foo-bar')
+  })
+
+  it('should hyphenate multiple spaces', () => {
+    expect(hyphenate('Foo  Bar')).toBe('foo-bar')
+  })
+
+  it('should trim leading whitespace', () => {
+    expect(hyphenate('  Foo Bar')).toBe('foo-bar')
+  })
+
+  it('should trim trailing whitespace', () => {
+    expect(hyphenate('Foo Bar  ')).toBe('foo-bar')
+  })
+
+  it('should hyphenate special characters correctly', () => {
+    expect(hyphenate('Foo & Bar')).toBe('foo-&-bar')
+  })
 })
 
 describe('underscore()', () => {
@@ -44,4 +64,20 @@ describe('underscore()', () => {
       })
     }
   )
+
+  it('should underscore multiple spaces', () => {
+    expect(underscore('Foo  Bar')).toBe('foo_bar')
+  })
+
+  it('should trim leading whitespace', () => {
+    expect(underscore('  Foo Bar')).toBe('foo_bar')
+  })
+
+  it('should trim trailing whitespace', () => {
+    expect(underscore('Foo Bar  ')).toBe('foo_bar')
+  })
+
+  it('should underscore special characters correctly', () => {
+    expect(underscore('Foo & Bar')).toBe('foo_&_bar')
+  })
 })

package/src/string/labelize.js

@@ -3,14 +3,15 @@ export function labelize(str) {
   // expand them to title cased labels.
   return str
     ? str.replace(
-        /([-_ ]|^)(\w)|([a-z])(?=[A-Z0-9])|(\d)([a-zA-Z])/g,
-        function (all, hyphen, hyphenated, camel, decimal, decimalNext) {
-          return hyphenated
-            ? `${hyphen ? ' ' : ''}${hyphenated.toUpperCase()}`
-            : camel
-              ? `${camel} `
-              : `${decimal} ${decimalNext.toUpperCase()}`
-        }
+        /[-_](?=\W)|([-_ ]|^)(\w)|([a-z])(?=[A-Z0-9])|(\d)([a-zA-Z])/g,
+        (all, hyphen, hyphenated, camel, decimal, decimalNext) =>
+          all === '-' || all === '_'
+            ? ' '
+            : hyphenated
+              ? `${hyphen ? ' ' : ''}${hyphenated.toUpperCase()}`
+              : camel
+                ? `${camel} `
+                : `${decimal} ${decimalNext.toUpperCase()}`
       )
     : ''
 }

package/src/string/labelize.test.js

@@ -3,6 +3,8 @@ import { labelize } from './labelize.js'
 describe('labelize()', () => {
   it('should labelize hyphenated text', () => {
     expect(labelize('some-hyphenated-text')).toBe('Some Hyphenated Text')
+    expect(labelize('one-&-two', true)).toBe('One & Two')
+    expect(labelize('one-2-three', true)).toBe('One 2 Three')
   })
 
   it('should labelize underscored text', () => {