@ditojs/utils 2.74.0 → 2.77.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "2.74.0",
+  "version": "2.77.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": "26c5b4bd33d1bc469c8b621a214ae3c8f0927c11"
+  "gitHead": "d2cff77924d989aad5ab601cf08433a4e683ac6d"
 }

package/src/html/stripHtml.js

@@ -4,8 +4,10 @@ export function stripHtml(html) {
   return html != null
     ? html
         .toString()
-        .replace(/<br\/?>/gi, '\n')
+        .replace(/<br\s*\/?>/gi, '\n')
+        .replace(/<\/p>/gi, '\n')
         .replace(/<[^>]+>/g, '')
+        .trim()
     : ''
 }
 

package/src/html/stripHtml.test.js

@@ -20,5 +20,18 @@ describe('stripHtml()', () => {
   it('should convert <br> tags to line-breaks', () => {
     expect(stripHtml('hello<br>world')).toBe('hello\nworld')
     expect(stripHtml('hello<br/>world')).toBe('hello\nworld')
+    expect(stripHtml('hello<br />world')).toBe('hello\nworld')
+  })
+
+  it('should convert <p> tags to line-breaks', () => {
+    expect(stripHtml('<p>First paragraph</p><p>Second paragraph</p>'))
+      .toBe('First paragraph\nSecond paragraph')
+    expect(stripHtml('<p>Only paragraph</p>'))
+      .toBe('Only paragraph')
+  })
+
+  it('should trim leading and trailing whitespace', () => {
+    expect(stripHtml('  <p>text</p>  ')).toBe('text')
+    expect(stripHtml('<p>  text  </p>')).toBe('text')
   })
 })

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', () => {