wsemi 1.7.21 → 1.7.22

package/src/attstr.mjs

@@ -5,340 +5,15 @@ import size from 'lodash/size'
 import each from 'lodash/each'
 import filter from 'lodash/filter'
 import join from 'lodash/join'
+import drop from 'lodash/drop'
 import sep from './sep.mjs'
+import isarr from './isarr.mjs'
 import isearr from './isearr.mjs'
+import isstr from './isstr.mjs'
 import isestr from './isestr.mjs'
 import arrHas from './arrHas.mjs'
 
 
-function sepItems(composItems) {
-
-    //check
-    if (!isestr(composItems)) {
-        return []
-    }
-
-    //arrItems
-    let arrItems = sep(composItems, ';')
-
-    //uniq
-    arrItems = uniq(arrItems)
-
-    return arrItems
-}
-
-
-function joinItems(arrItems) {
-
-    //check
-    if (!isearr(arrItems)) {
-        return ''
-    }
-
-    //uniq
-    arrItems = uniq(arrItems)
-
-    //str
-    let str = join(arrItems, ';')
-
-    return str
-}
-
-
-function atItemsMergeS1(its) {
-
-    //filter
-    its = filter(its, isestr)
-
-    //uniq
-    its = uniq(its)
-
-    return joinItems(its)
-}
-
-
-function atItemsMergeS2(its) {
-
-    //itsTemp
-    let itsTemp = []
-    each(its, (v) => {
-        let table = get(v, 'table', '')
-        let id = get(v, 'id', '')
-        if (trim(table) === '') {
-            console.log('atItemsMergeS2: invalid table in its', v, its)
-        }
-        else if (trim(id) === '') {
-            console.log('atItemsMergeS2: invalid id in its', v, its)
-        }
-        else {
-            itsTemp.push(`${table}@${id}`)
-        }
-    })
-
-    //itsTemp
-    its = joinItems(itsTemp)
-
-    return its
-}
-
-
-function atJoin(its) {
-
-    //check
-    if (!isearr(its)) {
-        return ''
-    }
-
-    //it0
-    let it0 = get(its, 0)
-
-    //mode
-    let table = trim(get(it0, 'table', ''))
-    let id = trim(get(it0, 'id', ''))
-    let mode = '1p'
-    if (isestr(table) && isestr(id)) {
-        mode = '2p'
-    }
-
-    if (mode === '1p') {
-        return atItemsMergeS1(its)
-    }
-    else if (mode === '2p') {
-        return atItemsMergeS2(its)
-    }
-    return ''
-}
-
-
-function atParseS1(composItems) {
-
-    //check
-    if (!isestr(composItems)) {
-        return []
-    }
-
-    //arrItems
-    let arrItems = sepItems(composItems)
-
-    //ids
-    let ids = filter(arrItems, isestr)
-
-    return ids
-}
-
-
-function atParseS2(composItems) {
-
-    //check
-    if (!isestr(composItems)) {
-        return []
-    }
-
-    //arrItems
-    let arrItems = sepItems(composItems)
-
-    //ids
-    let ids = []
-    each(arrItems, (v) => {
-        let s = sep(v, '@')
-        let table = get(s, 0, '')
-        let id = get(s, 1, '')
-        if (table === '') {
-            console.log('atParseS2: invalid table in composItems', v, composItems)
-        }
-        else if (id === '') {
-            console.log('atParseS2: invalid id in composItems', v, composItems)
-        }
-        else {
-            ids.push({
-                item: v,
-                table,
-                id,
-            })
-        }
-    })
-
-    return ids
-}
-
-
-function atParse(composItems, opt = {}) {
-
-    //check
-    if (!isestr(composItems)) {
-        return []
-    }
-
-    //mode
-    let mode = get(opt, 'mode')
-    if (mode !== '1p' && mode !== '2p') {
-        mode = 'auto'
-    }
-
-    //mode
-    if (mode === '1p') {
-        return atParseS1(composItems)
-    }
-    else if (mode === '2p') {
-        return atParseS2(composItems)
-    }
-
-    //indexOf
-    let bc = composItems.indexOf('@') >= 0
-
-    if (bc) {
-        return atParseS2(composItems)
-    }
-    return atParseS1(composItems)
-}
-
-
-function atAddS1(composItems1, composItems2) {
-
-    //atParseS1
-    let itp1 = atParseS1(composItems1)
-    let itp2 = atParseS1(composItems2)
-
-    //its
-    let its = [...itp1, ...itp2]
-
-    //check
-    if (size(its) === 0) {
-        return ''
-    }
-
-    return atItemsMergeS1(its)
-}
-
-
-function atAddS2(composItems1, composItems2) {
-
-    //atParseS2
-    let itp1 = atParseS2(composItems1)
-    let itp2 = atParseS2(composItems2)
-
-    //its
-    let its = [...itp1, ...itp2]
-
-    //check
-    if (size(its) === 0) {
-        return ''
-    }
-
-    return atItemsMergeS2(its)
-}
-
-
-function atAdd(composItems1, composItems2, opt = {}) {
-
-    //mode
-    let mode = get(opt, 'mode')
-    if (mode !== '1p' && mode !== '2p') {
-        mode = 'auto'
-    }
-
-    //mode
-    if (mode === '1p') {
-        atAddS1(composItems1, composItems2)
-    }
-    else if (mode === '2p') {
-        return atAddS2(composItems1, composItems2)
-    }
-
-    //indexOf
-    let bc1 = composItems1.indexOf('@') >= 0
-    let bc2 = composItems2.indexOf('@') >= 0
-
-    if (bc1 || bc2) {
-        return atAddS2(composItems1, composItems2)
-    }
-    return atAddS1(composItems1, composItems2)
-}
-
-
-function atRemoveS1(composItems1, composItems2) {
-
-    //atParseS1
-    let itp1 = atParseS1(composItems1)
-    let itp2 = atParseS1(composItems2)
-
-    //its
-    let its = []
-    each(itp1, (v) => {
-        if (!arrHas(v, itp2)) {
-            its.push(v)
-        }
-    })
-
-    //check
-    if (size(its) === 0) {
-        return ''
-    }
-
-    return atItemsMergeS1(its)
-}
-
-
-function atRemoveS2(composItems1, composItems2) {
-
-    //atParseS2
-    let itp1 = atParseS2(composItems1)
-    let itp2 = atParseS2(composItems2)
-
-    //its
-    let its = []
-    each(itp1, (v) => {
-        if (!arrHas(v, itp2)) {
-            its.push(v)
-        }
-    })
-
-    //check
-    if (size(its) === 0) {
-        return ''
-    }
-
-    return atItemsMergeS2(its)
-}
-
-
-function atRemove(composItems, removeItemOrId, opt = {}) {
-
-    //check composItems
-    if (!isestr(composItems)) {
-        return ''
-    }
-
-    //check removeItemOrId
-    if (!isestr(removeItemOrId)) {
-        return composItems
-    }
-
-    //mode
-    let mode = get(opt, 'mode')
-    if (mode !== '1p' && mode !== '2p') {
-        mode = 'auto'
-    }
-
-    //mode
-    if (mode === '1p') {
-        return atRemoveS1(composItems, removeItemOrId)
-    }
-    else if (mode === '2p') {
-        return atRemoveS2(composItems, removeItemOrId)
-    }
-
-    //indexOf
-    // let bc = composItems.indexOf('@') >= 0
-    let bt = removeItemOrId.indexOf('@') >= 0
-
-    if (bt) { //bc可為空字串故不一定有@
-        return atRemoveS2(composItems, removeItemOrId)
-    }
-    return atRemoveS1(composItems, removeItemOrId)
-}
-
-
 /**
  * 屬性字串處理
  *
@@ -613,15 +288,401 @@ function atRemove(composItems, removeItemOrId, opt = {}) {
  * // => ''
  *
  */
-function attstr() {
+function attstr(opt = {}) {
+    let dlmItem = ';'
+    let dlmSep = '@'
+    let keyTable = 'table'
+    let keyId = 'id'
+
+
+    //dlmItem
+    let _dlmItem = get(opt, 'dlmItem', '')
+    if (isestr(_dlmItem)) {
+        dlmItem = _dlmItem
+    }
+
+
+    //dlmSep
+    let _dlmSep = get(opt, 'dlmSep', '')
+    if (isestr(_dlmSep)) {
+        dlmSep = _dlmSep
+    }
+
+
+    //keyTable
+    let _keyTable = get(opt, 'keyTable', '')
+    if (isestr(_keyTable)) {
+        keyTable = _keyTable
+    }
+
+
+    //keyId
+    let _keyId = get(opt, 'keyId', '')
+    if (isestr(_keyId)) {
+        keyId = _keyId
+    }
+
+
+    function sepItems(composItems) {
+
+        //check
+        if (!isestr(composItems)) {
+            return []
+        }
+
+        //arrItems
+        let arrItems = sep(composItems, dlmItem)
+
+        //uniq
+        arrItems = uniq(arrItems)
+
+        return arrItems
+    }
+
+
+    function joinItems(arrItems) {
+
+        //check
+        if (!isearr(arrItems)) {
+            return ''
+        }
+
+        //uniq
+        arrItems = uniq(arrItems)
+
+        //str
+        let str = join(arrItems, dlmItem)
+
+        return str
+    }
+
+
+    function atItemsMergeS1(its) {
+
+        //filter
+        its = filter(its, isestr)
+
+        //uniq
+        its = uniq(its)
+
+        return joinItems(its)
+    }
+
+
+    function atItemsMergeS2(its) {
+
+        //itsTemp
+        let itsTemp = []
+        each(its, (v) => {
+            let table = get(v, keyTable, '')
+            console.log('table', table)
+            let id = get(v, keyId, '')
+            console.log('id', id)
+            if (!isestr(table)) {
+                console.log(`atItemsMergeS2: invalid keyTable[${keyTable}] in its`, v, its)
+            }
+            if (isstr(id)) {
+                if (id === '') {
+                    console.log(`atItemsMergeS2: invalid keyId[${keyId}] in its`, v, its)
+                }
+            }
+            else if (isarr(id)) {
+                if (size(id) === 0) {
+                    console.log(`atItemsMergeS2: invalid keyId[${keyId}] in its`, v, its)
+                }
+            }
+            else {
+                console.log(`atItemsMergeS2: keyId[${keyId}] is not a string or an array in its`, v, its)
+            }
+            if (isstr(id)) {
+                itsTemp.push(`${table}${dlmSep}${id}`)
+            }
+            else if (isarr(id)) {
+                let ids = join(id, dlmSep)
+                itsTemp.push(`${table}${dlmSep}${ids}`)
+            }
+        })
+
+        //itsTemp
+        its = joinItems(itsTemp)
+
+        return its
+    }
+
+
+    function atJoin(its) {
+
+        //check
+        if (!isearr(its)) {
+            return ''
+        }
+
+        //it0
+        let it0 = get(its, 0)
+
+        //mode
+        let table = trim(get(it0, keyTable, ''))
+        let id = trim(get(it0, keyId, ''))
+        let mode = '1p'
+        if (isestr(table) && isestr(id)) {
+            mode = '2p'
+        }
+
+        if (mode === '1p') {
+            return atItemsMergeS1(its)
+        }
+        else if (mode === '2p') {
+            return atItemsMergeS2(its)
+        }
+        return ''
+    }
+
+
+    function atParseS1(composItems) {
+
+        //check
+        if (!isestr(composItems)) {
+            return []
+        }
+
+        //arrItems
+        let arrItems = sepItems(composItems)
+
+        //ids
+        let ids = filter(arrItems, isestr)
+
+        return ids
+    }
+
+
+    function atParseS2(composItems) {
+
+        //check
+        if (!isestr(composItems)) {
+            return []
+        }
+
+        //arrItems
+        let arrItems = sepItems(composItems)
+
+        //ids
+        let ids = []
+        each(arrItems, (v) => {
+            let s = sep(v, dlmSep)
+            let table = get(s, 0, '')
+            table = trim(table)
+            let id = get(s, 1, '')
+            id = trim(id)
+            if (table === '') {
+                console.log(`atParseS2: invalid keyTable[${keyTable}] in composItems`, v, composItems)
+            }
+            else if (id === '') {
+                console.log(`atParseS2: invalid keyId[${keyId}] in composItems`, v, composItems)
+            }
+            if (size(s) > 2) {
+                //有2個以上id
+                s = drop(s)
+                id = s //改儲存為陣列
+            }
+            else {
+                ids.push({
+                    item: v,
+                    [keyTable]: table,
+                    [keyId]: id,
+                })
+            }
+        })
+
+        return ids
+    }
+
+
+    function atParse(composItems, opt = {}) {
+
+        //check
+        if (!isestr(composItems)) {
+            return []
+        }
+
+        //mode
+        let mode = get(opt, 'mode')
+        if (mode !== '1p' && mode !== '2p') {
+            mode = 'auto'
+        }
+
+        //mode
+        if (mode === '1p') {
+            return atParseS1(composItems)
+        }
+        else if (mode === '2p') {
+            return atParseS2(composItems)
+        }
+
+        //indexOf
+        let bc = composItems.indexOf(dlmSep) >= 0
+
+        if (bc) {
+            return atParseS2(composItems)
+        }
+        return atParseS1(composItems)
+    }
+
+
+    function atAddS1(composItems1, composItems2) {
+
+        //atParseS1
+        let itp1 = atParseS1(composItems1)
+        let itp2 = atParseS1(composItems2)
+
+        //its
+        let its = [...itp1, ...itp2]
+
+        //check
+        if (size(its) === 0) {
+            return ''
+        }
+
+        return atItemsMergeS1(its)
+    }
+
+
+    function atAddS2(composItems1, composItems2) {
+
+        //atParseS2
+        let itp1 = atParseS2(composItems1)
+        let itp2 = atParseS2(composItems2)
+
+        //its
+        let its = [...itp1, ...itp2]
+
+        //check
+        if (size(its) === 0) {
+            return ''
+        }
+
+        return atItemsMergeS2(its)
+    }
+
+
+    function atAdd(composItems1, composItems2, opt = {}) {
+
+        //mode
+        let mode = get(opt, 'mode')
+        if (mode !== '1p' && mode !== '2p') {
+            mode = 'auto'
+        }
+
+        //mode
+        if (mode === '1p') {
+            atAddS1(composItems1, composItems2)
+        }
+        else if (mode === '2p') {
+            return atAddS2(composItems1, composItems2)
+        }
+
+        //indexOf
+        let bc1 = composItems1.indexOf(dlmSep) >= 0
+        let bc2 = composItems2.indexOf(dlmSep) >= 0
+
+        if (bc1 || bc2) {
+            return atAddS2(composItems1, composItems2)
+        }
+        return atAddS1(composItems1, composItems2)
+    }
+
+
+    function atRemoveS1(composItems1, composItems2) {
+
+        //atParseS1
+        let itp1 = atParseS1(composItems1)
+        let itp2 = atParseS1(composItems2)
+
+        //its
+        let its = []
+        each(itp1, (v) => {
+            if (!arrHas(v, itp2)) {
+                its.push(v)
+            }
+        })
+
+        //check
+        if (size(its) === 0) {
+            return ''
+        }
+
+        return atItemsMergeS1(its)
+    }
+
+
+    function atRemoveS2(composItems1, composItems2) {
+
+        //atParseS2
+        let itp1 = atParseS2(composItems1)
+        let itp2 = atParseS2(composItems2)
+
+        //its
+        let its = []
+        each(itp1, (v) => {
+            if (!arrHas(v, itp2)) {
+                its.push(v)
+            }
+        })
+
+        //check
+        if (size(its) === 0) {
+            return ''
+        }
+
+        return atItemsMergeS2(its)
+    }
+
+
+    function atRemove(composItems, removeItemOrId, opt = {}) {
+
+        //check composItems
+        if (!isestr(composItems)) {
+            return ''
+        }
+
+        //check removeItemOrId
+        if (!isestr(removeItemOrId)) {
+            return composItems
+        }
+
+        //mode
+        let mode = get(opt, 'mode')
+        if (mode !== '1p' && mode !== '2p') {
+            mode = 'auto'
+        }
+
+        //mode
+        if (mode === '1p') {
+            return atRemoveS1(composItems, removeItemOrId)
+        }
+        else if (mode === '2p') {
+            return atRemoveS2(composItems, removeItemOrId)
+        }
+
+        //indexOf
+        // let bc = composItems.indexOf(dlmSep) >= 0
+        let bt = removeItemOrId.indexOf(dlmSep) >= 0
+
+        if (bt) { //bc可為空字串故不一定有dlmSep
+            return atRemoveS2(composItems, removeItemOrId)
+        }
+        return atRemoveS1(composItems, removeItemOrId)
+    }
+
+    //at
     let at = {
         parse: atParse,
         join: atJoin,
         remove: atRemove,
         add: atAdd,
     }
+
     return at
 }
 
 
-export default attstr()
+export default attstr