@questwork/q-utilities 0.1.3 → 0.1.4

package/dist/index.min.cjs

@@ -415,107 +415,85 @@ class KeyValueObject {
   }
 
   static addItem(arr, key, value) {
-    arr.push(
-      { key, value }
-    )
+    arr.push(this.init({ key, value }))
   }
   static addRecord(arr = [], key, value) {
-    const self = this
     if (!this.hasKeyValue(arr, key, value)) {
-      arr.push(self.init({ key, value }))
+      arr.push(this.init({ key, value }))
     }
     return arr
   }
-
   static appendRecord(arr = [], key, value) {
     return arr.map((item) => {
-      if (item.key === key) {
+      if (this.sameKey(item, key)) {
         item.value = [...item.value, ...value]
       }
       return item
     })
   }
-
-  static fromObject(options = {}) {
-    const self = this
-    return Object.keys(options).reduce((acc, key) => {
-      acc.push(self.init({ key, value: options[key] }))
-      return acc
-    }, [])
-  }
-
-  static removeByKey(arr, key) {
-    return arr.reduce((acc, item) => {
-      if (item.key !== key) {
-        acc.push(item)
+  static appendValueArray(arr = [], key, value) {
+    return arr.map((item) => {
+      if (this.sameKey(item, key)) {
+        item.value = [...item.value, ...value]
       }
-      return acc
-    }, [])
+      return item
+    })
   }
-
   static foundByKey(arr = [], key) {
     const found = arr.find((m) => {
-      return m.key === key
+      return this.sameKey(m, key)
     })
     return found || null
   }
-
   static foundValueByKey(arr = [], key) {
     const found = this.foundByKey(arr, key)
     return found ? found.value : null
   }
-
+  static fromObject(options = {}) {
+    return Object.keys(options).reduce((acc, key) => {
+      acc.push(this.init({ key, value: options[key] }))
+      return acc
+    }, [])
+  }
   static getValueByKey(arr = [], key) {
-    const found = arr.find((i) => {
-      return i.key === key
-    })
-    if (found) {
-      return found.value
-    }
-    return null
+    return this.foundValueByKey(arr, key)
   }
-
   static getValueByKeyFromArray(arr = [], key) {
     if (arr.length === 0) {
       return null
     }
     const firstArr = arr.shift()
     const found = firstArr.find((i) => {
-      return i.key === key
+      return this.sameKey(i, key)
     })
     if (found && found.value) {
       return found.value
     }
     return this.getValueByKeyFromArray(arr, key)
   }
-
   static getValuesByKey(arr = [], key) {
     return arr.reduce((acc, item) => {
-      if (item.key === key) {
+      if (this.sameKey(item, key)) {
         acc.push(item.value)
       }
       return acc
     }, [])
   }
-
   static hasKeyValue(arr = [], key, value) {
     if (typeof value === 'undefined') {
-      return arr.filter((item) => item.key === key).length > 0
+      return arr.filter((item) => this.sameKey(item, key)).length > 0
     }
-    return arr.filter((item) => (item.key === key && item.value === value)).length > 0
+    return arr.filter((item) => (this.sameKey(item, key) && item.value === value)).length > 0
   }
-
   static insertOrUpdateRecord(arr = [], key, value) {
-    const self = this
     let copy = [...arr]
-    if (!self.hasKeyValue(arr, key)) {
-      copy.push(self.init({ key, value }))
+    if (!this.hasKeyValue(arr, key)) {
+      copy.push(this.init({ key, value }))
     } else {
-      copy = self.updateRecord(arr, key, value)
+      copy = this.updateRecord(arr, key, value)
     }
     return copy
   }
-
   static keys(arr = []) {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -525,7 +503,6 @@ class KeyValueObject {
     }
     return []
   }
-
   static merge(toArr, fromArr) {
     (fromArr || []).map((from) => {
       const found = toArr.find((to) => {
@@ -539,7 +516,17 @@ class KeyValueObject {
     })
     return toArr
   }
-
+  static removeByKey(arr, key) {
+    return arr.reduce((acc, item) => {
+      if (!this.sameKey(item, key)) {
+        acc.push(item)
+      }
+      return acc
+    }, [])
+  }
+  static sameKey(item, key) {
+    return item.key === key
+  }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -549,7 +536,6 @@ class KeyValueObject {
     }
     return {}
   }
-
   static toString(arr = [], delimiter = '; ') {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -559,10 +545,9 @@ class KeyValueObject {
     }
     return ''
   }
-
   static updateRecord(arr = [], key, value) {
     return arr.map((item) => {
-      if (item.key === key) {
+      if (this.sameKey(item, key)) {
         return {
           ...item,
           value
@@ -571,11 +556,9 @@ class KeyValueObject {
       return item
     })
   }
-
   static updateOrInsertRecord(arr = [], key, value) {
     return this.insertOrUpdateRecord(arr, key, value)
   }
-
   static updateRecordsFromArray(arr = [], updateArr = []) {
     if (Array.isArray(arr) && Array.isArray(updateArr)) {
       const obj1 = this.toObject(arr)
@@ -587,7 +570,6 @@ class KeyValueObject {
     }
     return []
   }
-
   static values(arr = []) {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -634,16 +616,25 @@ class Metadata extends KeyValueObject {
     })
     return instance.isValid ? instance : null
   }
+  static get _classname() {
+    return 'Metadata'
+  }
 
-  static foundByKey(arr = [], key) {
-    const found = (arr || []).find((m) => {
-      return m.key === stringFormatter(key)
+  static merge(toArr, fromArr) {
+    (fromArr || []).map((from) => {
+      const found = toArr.find((to) => {
+        return stringFormatter(to.key) === stringFormatter(from.key)
+      })
+      if (found) {
+        found.value = (found.value || []).concat(from.value)
+      } else {
+        toArr.push(from)
+      }
     })
-    return found || null
+    return toArr
   }
-
-  static get _classname() {
-    return 'Metadata'
+  static sameKey(item, key) {
+    return stringFormatter(item.key) === stringFormatter(key)
   }
 }
 

package/dist/index.min.js

@@ -390,107 +390,85 @@ class KeyValueObject {
   }
 
   static addItem(arr, key, value) {
-    arr.push(
-      { key, value }
-    )
+    arr.push(this.init({ key, value }))
   }
   static addRecord(arr = [], key, value) {
-    const self = this
     if (!this.hasKeyValue(arr, key, value)) {
-      arr.push(self.init({ key, value }))
+      arr.push(this.init({ key, value }))
     }
     return arr
   }
-
   static appendRecord(arr = [], key, value) {
     return arr.map((item) => {
-      if (item.key === key) {
+      if (this.sameKey(item, key)) {
         item.value = [...item.value, ...value]
       }
       return item
     })
   }
-
-  static fromObject(options = {}) {
-    const self = this
-    return Object.keys(options).reduce((acc, key) => {
-      acc.push(self.init({ key, value: options[key] }))
-      return acc
-    }, [])
-  }
-
-  static removeByKey(arr, key) {
-    return arr.reduce((acc, item) => {
-      if (item.key !== key) {
-        acc.push(item)
+  static appendValueArray(arr = [], key, value) {
+    return arr.map((item) => {
+      if (this.sameKey(item, key)) {
+        item.value = [...item.value, ...value]
       }
-      return acc
-    }, [])
+      return item
+    })
   }
-
   static foundByKey(arr = [], key) {
     const found = arr.find((m) => {
-      return m.key === key
+      return this.sameKey(m, key)
     })
     return found || null
   }
-
   static foundValueByKey(arr = [], key) {
     const found = this.foundByKey(arr, key)
     return found ? found.value : null
   }
-
+  static fromObject(options = {}) {
+    return Object.keys(options).reduce((acc, key) => {
+      acc.push(this.init({ key, value: options[key] }))
+      return acc
+    }, [])
+  }
   static getValueByKey(arr = [], key) {
-    const found = arr.find((i) => {
-      return i.key === key
-    })
-    if (found) {
-      return found.value
-    }
-    return null
+    return this.foundValueByKey(arr, key)
   }
-
   static getValueByKeyFromArray(arr = [], key) {
     if (arr.length === 0) {
       return null
     }
     const firstArr = arr.shift()
     const found = firstArr.find((i) => {
-      return i.key === key
+      return this.sameKey(i, key)
     })
     if (found && found.value) {
       return found.value
     }
     return this.getValueByKeyFromArray(arr, key)
   }
-
   static getValuesByKey(arr = [], key) {
     return arr.reduce((acc, item) => {
-      if (item.key === key) {
+      if (this.sameKey(item, key)) {
         acc.push(item.value)
       }
       return acc
     }, [])
   }
-
   static hasKeyValue(arr = [], key, value) {
     if (typeof value === 'undefined') {
-      return arr.filter((item) => item.key === key).length > 0
+      return arr.filter((item) => this.sameKey(item, key)).length > 0
     }
-    return arr.filter((item) => (item.key === key && item.value === value)).length > 0
+    return arr.filter((item) => (this.sameKey(item, key) && item.value === value)).length > 0
   }
-
   static insertOrUpdateRecord(arr = [], key, value) {
-    const self = this
     let copy = [...arr]
-    if (!self.hasKeyValue(arr, key)) {
-      copy.push(self.init({ key, value }))
+    if (!this.hasKeyValue(arr, key)) {
+      copy.push(this.init({ key, value }))
     } else {
-      copy = self.updateRecord(arr, key, value)
+      copy = this.updateRecord(arr, key, value)
     }
     return copy
   }
-
   static keys(arr = []) {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -500,7 +478,6 @@ class KeyValueObject {
     }
     return []
   }
-
   static merge(toArr, fromArr) {
     (fromArr || []).map((from) => {
       const found = toArr.find((to) => {
@@ -514,7 +491,17 @@ class KeyValueObject {
     })
     return toArr
   }
-
+  static removeByKey(arr, key) {
+    return arr.reduce((acc, item) => {
+      if (!this.sameKey(item, key)) {
+        acc.push(item)
+      }
+      return acc
+    }, [])
+  }
+  static sameKey(item, key) {
+    return item.key === key
+  }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -524,7 +511,6 @@ class KeyValueObject {
     }
     return {}
   }
-
   static toString(arr = [], delimiter = '; ') {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -534,10 +520,9 @@ class KeyValueObject {
     }
     return ''
   }
-
   static updateRecord(arr = [], key, value) {
     return arr.map((item) => {
-      if (item.key === key) {
+      if (this.sameKey(item, key)) {
         return {
           ...item,
           value
@@ -546,11 +531,9 @@ class KeyValueObject {
       return item
     })
   }
-
   static updateOrInsertRecord(arr = [], key, value) {
     return this.insertOrUpdateRecord(arr, key, value)
   }
-
   static updateRecordsFromArray(arr = [], updateArr = []) {
     if (Array.isArray(arr) && Array.isArray(updateArr)) {
       const obj1 = this.toObject(arr)
@@ -562,7 +545,6 @@ class KeyValueObject {
     }
     return []
   }
-
   static values(arr = []) {
     if (Array.isArray(arr)) {
       return arr.reduce((acc, item) => {
@@ -609,16 +591,25 @@ class Metadata extends KeyValueObject {
     })
     return instance.isValid ? instance : null
   }
+  static get _classname() {
+    return 'Metadata'
+  }
 
-  static foundByKey(arr = [], key) {
-    const found = (arr || []).find((m) => {
-      return m.key === stringFormatter(key)
+  static merge(toArr, fromArr) {
+    (fromArr || []).map((from) => {
+      const found = toArr.find((to) => {
+        return stringFormatter(to.key) === stringFormatter(from.key)
+      })
+      if (found) {
+        found.value = (found.value || []).concat(from.value)
+      } else {
+        toArr.push(from)
+      }
     })
-    return found || null
+    return toArr
   }
-
-  static get _classname() {
-    return 'Metadata'
+  static sameKey(item, key) {
+    return stringFormatter(item.key) === stringFormatter(key)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-utilities",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Questwork QUtilities",
   "main": "dist/index.min.js",
   "type": "module",