@questwork/q-utilities 0.1.16 → 0.1.17

package/dist/index.min.cjs

@@ -379,6 +379,9 @@ function getValueByKeys_getValueByKeys(keys, data) {
     return getValueByKeys_getValueByKeys(_keys, _data[firstKey])
   }
   if (_data && firstKey) {
+    if (_keys.length > 0) {
+      return getValueByKeys_getValueByKeys(_keys, _data[firstKey])
+    }
     return _data[firstKey]
   }
   return _data
@@ -1432,19 +1435,6 @@ function concatStringByArray(arrTemplate, data) {
   return arrTemplate.reduce((acc, item) => {
     const { type, value = '', restriction, template, format, showMinutes } = item
     switch (type) {
-      case('label'): {
-        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          acc += (value.toString())
-        }
-        break
-      }
-      case('value'): {
-        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
-          acc += (_value.toString())
-        }
-        break 
-      }
       case('array'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
           const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || []
@@ -1454,6 +1444,13 @@ function concatStringByArray(arrTemplate, data) {
         }
         break 
       }
+      case ('date'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
+          acc += (formatDate(_value, format).toString())
+        }
+        break
+      }
       case('ellipsis'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
           const { maxLength } = item
@@ -1466,10 +1463,15 @@ function concatStringByArray(arrTemplate, data) {
         }
         break 
       }
-      case ('date'): {
+      case('group'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
-          acc += (formatDate(_value, format).toString())
+          return concatStringByArray(value, data)
+        }
+        break
+      }
+      case('label'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          acc += (value.toString())
         }
         break
       }
@@ -1480,6 +1482,13 @@ function concatStringByArray(arrTemplate, data) {
         }
         break
       }
+      case('value'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
+          acc += (_value.toString())
+        }
+        break 
+      }
     }
     return acc
   }, '')
@@ -2433,6 +2442,7 @@ function sanitizeText(input, options = {}) {
     normalizeWhitespace = true,
     removeNewlines = false,
     trim = true,
+    preserveBasicWhitespace = true, // new option to keep tabs, newlines if removeNewlines=false
   } = options
 
   if (typeof input !== 'string') {
@@ -2441,8 +2451,14 @@ function sanitizeText(input, options = {}) {
 
   let result = input
 
-  // Phase 1: Remove hidden/control characters
-  result = result.replace(/[\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  // Phase 1: Remove all control characters except basic whitespace if requested
+  if (preserveBasicWhitespace && !removeNewlines) {
+    // Keep tab (\t), newline (\n), carriage return (\r)
+    result = result.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  } else {
+    // Remove all control characters including basic whitespace
+    result = result.replace(/[\x00-\x1F\x7F-\x9F\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  }
 
   // Phase 2: Handle whitespace transformations
   if (removeNewlines) {

package/dist/q-utilities.esm.js

@@ -290,6 +290,9 @@ function getValueByKeys_getValueByKeys(keys, data) {
     return getValueByKeys_getValueByKeys(_keys, _data[firstKey])
   }
   if (_data && firstKey) {
+    if (_keys.length > 0) {
+      return getValueByKeys_getValueByKeys(_keys, _data[firstKey])
+    }
     return _data[firstKey]
   }
   return _data
@@ -1343,19 +1346,6 @@ function concatStringByArray(arrTemplate, data) {
   return arrTemplate.reduce((acc, item) => {
     const { type, value = '', restriction, template, format, showMinutes } = item
     switch (type) {
-      case('label'): {
-        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          acc += (value.toString())
-        }
-        break
-      }
-      case('value'): {
-        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
-          acc += (_value.toString())
-        }
-        break 
-      }
       case('array'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
           const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || []
@@ -1365,6 +1355,13 @@ function concatStringByArray(arrTemplate, data) {
         }
         break 
       }
+      case ('date'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
+          acc += (formatDate(_value, format).toString())
+        }
+        break
+      }
       case('ellipsis'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
           const { maxLength } = item
@@ -1377,10 +1374,15 @@ function concatStringByArray(arrTemplate, data) {
         }
         break 
       }
-      case ('date'): {
+      case('group'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
-          acc += (formatDate(_value, format).toString())
+          return concatStringByArray(value, data)
+        }
+        break
+      }
+      case('label'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          acc += (value.toString())
         }
         break
       }
@@ -1391,6 +1393,13 @@ function concatStringByArray(arrTemplate, data) {
         }
         break
       }
+      case('value'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
+          acc += (_value.toString())
+        }
+        break 
+      }
     }
     return acc
   }, '')
@@ -2344,6 +2353,7 @@ function sanitizeText(input, options = {}) {
     normalizeWhitespace = true,
     removeNewlines = false,
     trim = true,
+    preserveBasicWhitespace = true, // new option to keep tabs, newlines if removeNewlines=false
   } = options
 
   if (typeof input !== 'string') {
@@ -2352,8 +2362,14 @@ function sanitizeText(input, options = {}) {
 
   let result = input
 
-  // Phase 1: Remove hidden/control characters
-  result = result.replace(/[\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  // Phase 1: Remove all control characters except basic whitespace if requested
+  if (preserveBasicWhitespace && !removeNewlines) {
+    // Keep tab (\t), newline (\n), carriage return (\r)
+    result = result.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  } else {
+    // Remove all control characters including basic whitespace
+    result = result.replace(/[\x00-\x1F\x7F-\x9F\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  }
 
   // Phase 2: Handle whitespace transformations
   if (removeNewlines) {

package/dist/q-utilities.min.js

@@ -378,6 +378,9 @@ function getValueByKeys_getValueByKeys(keys, data) {
     return getValueByKeys_getValueByKeys(_keys, _data[firstKey])
   }
   if (_data && firstKey) {
+    if (_keys.length > 0) {
+      return getValueByKeys_getValueByKeys(_keys, _data[firstKey])
+    }
     return _data[firstKey]
   }
   return _data
@@ -1431,19 +1434,6 @@ function concatStringByArray(arrTemplate, data) {
   return arrTemplate.reduce((acc, item) => {
     const { type, value = '', restriction, template, format, showMinutes } = item
     switch (type) {
-      case('label'): {
-        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          acc += (value.toString())
-        }
-        break
-      }
-      case('value'): {
-        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
-          acc += (_value.toString())
-        }
-        break 
-      }
       case('array'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
           const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || []
@@ -1453,6 +1443,13 @@ function concatStringByArray(arrTemplate, data) {
         }
         break 
       }
+      case ('date'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
+          acc += (formatDate(_value, format).toString())
+        }
+        break
+      }
       case('ellipsis'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
           const { maxLength } = item
@@ -1465,10 +1462,15 @@ function concatStringByArray(arrTemplate, data) {
         }
         break 
       }
-      case ('date'): {
+      case('group'): {
         if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
-          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
-          acc += (formatDate(_value, format).toString())
+          return concatStringByArray(value, data)
+        }
+        break
+      }
+      case('label'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          acc += (value.toString())
         }
         break
       }
@@ -1479,6 +1481,13 @@ function concatStringByArray(arrTemplate, data) {
         }
         break
       }
+      case('value'): {
+        if (getValidation(restriction, data, getValueByKeys_getValueByKeys)) {
+          const _value = getValueByKeys_getValueByKeys(value.split('.'), data) || ''
+          acc += (_value.toString())
+        }
+        break 
+      }
     }
     return acc
   }, '')
@@ -2432,6 +2441,7 @@ function sanitizeText(input, options = {}) {
     normalizeWhitespace = true,
     removeNewlines = false,
     trim = true,
+    preserveBasicWhitespace = true, // new option to keep tabs, newlines if removeNewlines=false
   } = options
 
   if (typeof input !== 'string') {
@@ -2440,8 +2450,14 @@ function sanitizeText(input, options = {}) {
 
   let result = input
 
-  // Phase 1: Remove hidden/control characters
-  result = result.replace(/[\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  // Phase 1: Remove all control characters except basic whitespace if requested
+  if (preserveBasicWhitespace && !removeNewlines) {
+    // Keep tab (\t), newline (\n), carriage return (\r)
+    result = result.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  } else {
+    // Remove all control characters including basic whitespace
+    result = result.replace(/[\x00-\x1F\x7F-\x9F\u200B-\u200D\uFEFF\u202A-\u202E]/g, '')
+  }
 
   // Phase 2: Handle whitespace transformations
   if (removeNewlines) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-utilities",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Questwork QUtilities",
   "type": "module",
   "exports": {
@@ -10,12 +10,6 @@
       "default": "./dist/q-utilities.min.js"
     }
   },
-  "scripts": {
-    "build": "cross-env NODE_ENV=production minimize=false gulp",
-    "build:wp": "cross-env NODE_ENV=production minimize=false gulp wp",
-    "lint": "eslint .",
-    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
-  },
   "author": {
     "name": "Questwork Consulting Limited",
     "email": "info@questwork.com",
@@ -45,5 +39,11 @@
   },
   "engines": {
     "node": ">=10.0.0"
+  },
+  "scripts": {
+    "build": "cross-env NODE_ENV=production minimize=false gulp",
+    "build:wp": "cross-env NODE_ENV=production minimize=false gulp wp",
+    "lint": "eslint .",
+    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
   }
-}
+}