@questwork/q-utilities 0.1.5 → 0.1.7

package/dist/index.min.cjs

@@ -587,7 +587,7 @@ class KeyValueObject {
     if (typeof value === 'undefined') {
       return arr.filter((item) => this.sameKey(item, key)).length > 0
     }
-    return arr.filter((item) => (this.sameKey(item, key) && item.value === value)).length > 0
+    return arr.filter((item) => (this.sameKey(item, key) && _isSame(item.value, value))).length > 0
   }
   static insertOrUpdateRecord(arr = [], key, value) {
     let copy = [...arr]
@@ -629,7 +629,7 @@ class KeyValueObject {
     }, [])
   }
   static sameKey(item, key) {
-    return item.key === key
+    return _isSame(item.key, key)
   }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
@@ -698,6 +698,10 @@ class KeyValueObject {
   }
 }
 
+function _isSame(key1, key2) {
+  return key1 === key2
+}
+
 
 
 ;// ./lib/models/keyValueObject/index.js
@@ -706,8 +710,15 @@ class KeyValueObject {
 
 
 ;// ./lib/helpers/stringFormatter/stringFormatter.js
-function stringFormatter(str) {
-  return (str || '').toUpperCase().replace('-', '_').replace(' ', '_')
+function stringFormatter(str, delimiter = '_') {
+  if (str === null || typeof str === 'undefined' || typeof str.toString === 'undefined') {
+    return null
+  }
+  return str.toString()
+    .trim()
+    .toUpperCase()
+    .replace('-', delimiter)
+    .replace(' ', delimiter)
 }
 
 
@@ -716,6 +727,8 @@ function stringFormatter(str) {
 
 
 
+const DELIMITER = '_'
+
 class Metadata extends KeyValueObject {
   static init(options = {}) {
     if (options instanceof this) {
@@ -723,7 +736,7 @@ class Metadata extends KeyValueObject {
     }
     const instance = new this({
       ...options,
-      key: stringFormatter(options.key),
+      key: stringFormatter(options.key, DELIMITER),
     })
     return instance.isValid ? instance : null
   }
@@ -734,7 +747,7 @@ class Metadata extends KeyValueObject {
   static merge(toArr, fromArr) {
     (fromArr || []).map((from) => {
       const found = toArr.find((to) => {
-        return stringFormatter(to.key) === stringFormatter(from.key)
+        return metadata_isSame(to.key, from.key)
       })
       if (found) {
         found.value = (found.value || []).concat(from.value)
@@ -745,10 +758,14 @@ class Metadata extends KeyValueObject {
     return toArr
   }
   static sameKey(item, key) {
-    return stringFormatter(item.key) === stringFormatter(key)
+    return metadata_isSame(item.key, key)
   }
 }
 
+function metadata_isSame(key1, key2) {
+  return stringFormatter(key1, DELIMITER) === stringFormatter(key2, DELIMITER)
+}
+
 
 
 ;// ./lib/models/metadata/index.js
@@ -1074,7 +1091,13 @@ class Service {
     return this.repo.init(options)
   }
   initFromArray(arr = []) {
-    return arr.map((i) => this.init(i))
+    if (Array.isArray(arr)) {
+      return arr.map((a) => this.init(a))
+    }
+    return []
+  }
+  initOnlyValidFromArray(arr = []) {
+    return this.initFromArray(arr).filter((i) => i)
   }
 
   async saveAll({ docs = [], systemLog } = {}) {

package/dist/index.min.js

@@ -562,7 +562,7 @@ class KeyValueObject {
     if (typeof value === 'undefined') {
       return arr.filter((item) => this.sameKey(item, key)).length > 0
     }
-    return arr.filter((item) => (this.sameKey(item, key) && item.value === value)).length > 0
+    return arr.filter((item) => (this.sameKey(item, key) && _isSame(item.value, value))).length > 0
   }
   static insertOrUpdateRecord(arr = [], key, value) {
     let copy = [...arr]
@@ -604,7 +604,7 @@ class KeyValueObject {
     }, [])
   }
   static sameKey(item, key) {
-    return item.key === key
+    return _isSame(item.key, key)
   }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
@@ -673,6 +673,10 @@ class KeyValueObject {
   }
 }
 
+function _isSame(key1, key2) {
+  return key1 === key2
+}
+
 
 
 ;// ./lib/models/keyValueObject/index.js
@@ -681,8 +685,15 @@ class KeyValueObject {
 
 
 ;// ./lib/helpers/stringFormatter/stringFormatter.js
-function stringFormatter(str) {
-  return (str || '').toUpperCase().replace('-', '_').replace(' ', '_')
+function stringFormatter(str, delimiter = '_') {
+  if (str === null || typeof str === 'undefined' || typeof str.toString === 'undefined') {
+    return null
+  }
+  return str.toString()
+    .trim()
+    .toUpperCase()
+    .replace('-', delimiter)
+    .replace(' ', delimiter)
 }
 
 
@@ -691,6 +702,8 @@ function stringFormatter(str) {
 
 
 
+const DELIMITER = '_'
+
 class Metadata extends KeyValueObject {
   static init(options = {}) {
     if (options instanceof this) {
@@ -698,7 +711,7 @@ class Metadata extends KeyValueObject {
     }
     const instance = new this({
       ...options,
-      key: stringFormatter(options.key),
+      key: stringFormatter(options.key, DELIMITER),
     })
     return instance.isValid ? instance : null
   }
@@ -709,7 +722,7 @@ class Metadata extends KeyValueObject {
   static merge(toArr, fromArr) {
     (fromArr || []).map((from) => {
       const found = toArr.find((to) => {
-        return stringFormatter(to.key) === stringFormatter(from.key)
+        return metadata_isSame(to.key, from.key)
       })
       if (found) {
         found.value = (found.value || []).concat(from.value)
@@ -720,10 +733,14 @@ class Metadata extends KeyValueObject {
     return toArr
   }
   static sameKey(item, key) {
-    return stringFormatter(item.key) === stringFormatter(key)
+    return metadata_isSame(item.key, key)
   }
 }
 
+function metadata_isSame(key1, key2) {
+  return stringFormatter(key1, DELIMITER) === stringFormatter(key2, DELIMITER)
+}
+
 
 
 ;// ./lib/models/metadata/index.js
@@ -1049,7 +1066,13 @@ class Service {
     return this.repo.init(options)
   }
   initFromArray(arr = []) {
-    return arr.map((i) => this.init(i))
+    if (Array.isArray(arr)) {
+      return arr.map((a) => this.init(a))
+    }
+    return []
+  }
+  initOnlyValidFromArray(arr = []) {
+    return this.initFromArray(arr).filter((i) => i)
   }
 
   async saveAll({ docs = [], systemLog } = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-utilities",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Questwork QUtilities",
   "main": "dist/index.min.js",
   "type": "module",
@@ -10,11 +10,6 @@
       "default": "./dist/index.min.js"
     }
   },
-  "scripts": {
-    "build": "cross-env NODE_ENV=production minimize=false gulp",
-    "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 +40,10 @@
   },
   "engines": {
     "node": ">=10.0.0"
+  },
+  "scripts": {
+    "build": "cross-env NODE_ENV=production minimize=false gulp",
+    "lint": "eslint .",
+    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
   }
-}
+}