| 20 | - | - | function member(opts) { | +1 | +member.errors = { |
| 21 | - | 10 | -const seneca = this | ++ | invalid_as: |
| 22 | - | + | 'Invalid member `as` value (<%=as%>), should be one of: child, parent, child-id, parent-id, member, member-id.' | ||
| 23 | - | function define_patterns() { | +} | ||
| 24 | - | 10 | -seneca | ++ | |
| 25 | - | .message('role:member,add:kinds', add_kinds) | +function member(options) { | ||
| 26 | - | - | .message('role:member,get:kinds', get_kinds) | +10 | +const seneca = this |
| 27 | - | .message('role:member,add:member', intern.make_multi(add_member)) | +|||
| 28 | - | .message( | +function define_patterns() { | ||
| 29 | - | - | 'role:member,is:member', | +10 | +seneca |
| 30 | - | intern.make_multi(is_member, intern.is_single_member) | +.message('role:member,add:kinds', add_kinds) | ||
| 31 | - | ) | +.message('role:member,get:kinds', get_kinds) | ||
| 32 | - | .message( | +.message('role:member,add:member', intern.make_multi(add_member)) | ||
| 33 | - | 'role:member,remove:member', | +.message('role:member,is:member', is_member) | ||
| 34 | - | intern.make_multi(remove_member, intern.is_single_remove) | +.message( | ||
| 35 | - | ) | +'role:member,remove:member', | ||
| 36 | - | .message('role:member,update:member', update_member) | +intern.make_multi(remove_member, intern.is_single_remove) | ||
| 37 | - | .message('role:member,list:children', list_children) | +) | ||
| 38 | - | .message('role:member,list:parents', list_parents) | +.message('role:member,update:member', update_member) | ||
| 39 | - | } | +.message('role:member,list:children', list_children) | ||
| 40 | - | + | .message('role:member,list:parents', list_parents) | ||
| 41 | - | 10 | -const validate_member = { | ++ | } |
| 42 | - | parent: Joi.string(), | +|||
| 43 | - | - | child: Joi.string(), | +10 | +const validate_member = { |
| 44 | - | kind: Joi.string(), | +parent: Joi.string(), | ||
| 45 | - | code: Joi.string(), | +child: Joi.string(), | ||
| 46 | - | tags: Joi.array().items(Joi.string()) | +kind: Joi.string(), | ||
| 47 | - | } | +code: Joi.string(), | ||
| 48 | - | + | tags: Joi.array().items(Joi.string()) | ||
| 49 | - | async function add_kinds(msg) { | +} | ||
| 50 | - | 1 | -opts.kinds = Object.assign(opts.kinds, msg.kinds) | ++ | |
| 51 | - | 1 | -return { kinds: opts.kinds } | ++ | async function add_kinds(msg) { |
| 52 | - | - | } | +1 | +options.kinds = Object.assign(options.kinds, msg.kinds) |
| 53 | - | - | + | 1 | +return { kinds: options.kinds } |
| 54 | - | async function get_kinds(msg) { | +} | ||
| 55 | - | 1 | -return { kinds: opts.kinds } | ++ | |
| 56 | - | } | +async function get_kinds(msg) { | ||
| 57 | - | - | + | 1 | +return { kinds: options.kinds } |
| 58 | - | /* | +} | ||
| 59 | - | async function add_member(msg, meta, ...rest) { | +|||
| 60 | - | if(msg.child) { | +// idemptotent | ||
| 61 | - | return add_member_single.call(this, msg, meta, ...rest) | +async function add_member(msg) { | ||
| 62 | - | - | } | +37 | +const member_ent = this.entity('sys/member') |
| 63 | - | else if(msg.children) { | +|||
| 64 | - | - | var members = [] | +37 | +const q = { |
| 65 | - | for(var cI = 0; cI < msg.children.length; cI++) { | +p: msg.parent, | ||
| 66 | - | var child_msg = {...msg, child:msg.children[cI], children: null} | +c: msg.child, | ||
| 67 | - | members.push(await add_member_single.call(this, child_msg, meta, ...rest)) | +k: msg.kind, | ||
| 68 | - | } | +d: msg.code | ||
| 69 | - | return members | +} | ||
| 70 | - | - | } | +37 | +const prev = await member_ent.make$().load$(q) |
| 71 | - | // else no action no result | +|||
| 72 | - | - | else { | +37 | +var member |
| 73 | - | return null | +|||
| 74 | - | - | } | +37 | +if (prev) { |
| 75 | - | - | } | +1 | +member = await prev |
| 76 | - | */ | +.data$({ | ||
| 77 | - | + | t: msg.tags | ||
| 78 | - | // idemptotent | +}) | ||
| 79 | - | async function add_member(msg) { | +.save$() | ||
| 80 | - | 36 | -const member_ent = this.entity('sys/member') | ++ | } else { |
| 81 | - | - | + | 36 | +const data = { |
| 82 | - | 36 | -const q = { | ++ | p: msg.parent, |
| 83 | - | p: msg.parent, | +c: msg.child, | ||
| 84 | - | c: msg.child, | +k: msg.kind, | ||
| 85 | - | k: msg.kind, | +d: msg.code, | ||
| 86 | - | d: msg.code | +t: msg.tags, | ||
| 87 | - | } | +sv: SYS_MEMBER_SV | ||
| 88 | - | 36 | -const prev = await member_ent.make$().load$(q) | ++ | } |
| 89 | - | - | + | 36 | +if (msg.id) { |
| 90 | - | 36 | -var member | +27 | +data.id$ = msg.id |
| 91 | - | + | } | ||
| 92 | - | 36 | -if (prev) { | ++ | |
| 93 | - | 1 | -member = await prev | +36 | +member = await member_ent |
| 94 | - | .data$({ | +.make$() | ||
| 95 | - | t: msg.tags | +.data$(data) | ||
| 96 | - | }) | +.save$() | ||
| 97 | - | .save$() | +} | ||
| 98 | - | } else { | +|||
| 99 | - | 35 | -const data = { | +37 | +return member |
| 100 | - | p: msg.parent, | +} | ||
| 101 | - | c: msg.child, | +|||
| 102 | - | k: msg.kind, | +async function is_member(msg) { | ||
| 103 | - | - | d: msg.code, | +7 | +const member_ent = this.entity('sys/member') |
| 104 | - | t: msg.tags, | +|||
| 105 | - | sv: SYS_MEMBER_SV | +// required | ||
| 106 | - | - | } | +7 | +const q = { |
| 107 | - | 35 | -if (msg.id) { | ++ | p: msg.parent |
| 108 | - | 26 | -data.id$ = msg.id | ++ | } |
| 109 | - | } | +|||
| 110 | - | - | + | 7 | +var msg_children = intern.resolve_children(msg) |
| 111 | - | 35 | -member = await member_ent | +7 | +if (msg_children) { |
| 112 | - | - | .make$() | +5 | +q.c = msg_children |
| 113 | - | .data$(data) | +} | ||
| 114 | - | .save$() | +|||
| 115 | - | - | } | +7 | +if (msg.kind) { |
| 116 | - | - | + | 2 | +q.k = msg.kind |
| 117 | - | 36 | -return member | ++ | } |
| 118 | - | } | +|||
| 119 | - | - | + | 7 | +if (msg.code) { |
| 120 | - | - | /* | +2 | +q.d = msg.code |
| 121 | - | async function is_member(msg, meta, ...rest) { | +} | ||
| 122 | - | // NOTE: code could be a unique child for parent | +|||
| 123 | - | - | if(msg.child || msg.code) { | +7 | +var valid_query = null != q.c || null != q.d |
| 124 | - | return is_member_single.call(this, msg, meta, ...rest) | +|||
| 125 | - | - | } | +7 | +const members = valid_query ? await member_ent.list$(q) : [] |
| 126 | - | - | else if(msg.children) { | +7 | +var children = [] |
| 127 | - | var members = [] | +|||
| 128 | - | - | for(var cI = 0; cI < msg.children.length; cI++) { | +7 | +var membership = {} |
| 129 | - | - | var child_msg = {...msg, child:msg.children[cI], children: null} | +7 | +for (var mI = 0; mI < members.length; mI++) { |
| 130 | - | - | members.push(await is_member_single.call(this, child_msg, meta, ...rest)) | +8 | +membership[members[mI].c] = true |
| 131 | - | } | +} | ||
| 132 | - | return members | +|||
| 133 | - | - | } | +7 | +if (0 < members.length && 'child' === msg.as) { |
| 134 | - | - | // else no action no result | +3 | +children = await intern.load_items(seneca, options, members, msg, 'c') |
| 135 | - | else { | +} | ||
| 136 | - | return null | +|||
| 137 | - | - | } | +7 | +var out = { |
| 138 | - | } | +q: q, | ||
| 139 | - | */ | +member: members[0], | ||
| 140 | - | + | child: children[0], | ||
| 141 | - | async function is_member(msg) { | +members: members, | ||
| 142 | - | 8 | -const member_ent = this.entity('sys/member') | ++ | children: children, |
| 143 | - | + | membership: membership | ||
| 144 | - | // required | +} | ||
| 145 | - | 8 | -const q = { | ++ | |
| 146 | - | - | p: msg.parent | +7 | +return out |
| 147 | - | } | +} | ||
| 148 | @@ -2009,20 +2009,20 @@|||||
| 149 | - | 8 | -if (msg.child) { | ++ | async function remove_member(msg) { |
| 150 | 7 | -q.c = msg.child | +const member_ent = this.entity('sys/member') | ||
| 151 | - | - | } | +7 | +var list = [] |
| 152 | @@ -2033,158 +2033,158 @@|||||
| 153 | - | 8 | -if (msg.kind) { | +7 | +if (null != msg.id) { |
| 154 | 2 | -q.k = msg.kind | +const item = await member_ent.load$(msg.id) | ||
| 155 | - | - | } | +2 | +if (item) { |
| 156 | - | - | + | 1 | +list.push(item) |
| 157 | - | 8 | -if (msg.code) { | ++ | } |
| 158 | 2 | -q.d = msg.code | +await member_ent.make$().remove$(msg.id) | ||
| 159 | - | - | } | +5 | +} else if (null != msg.child && null != msg.kind) { |
| 160 | - | + | // required | ||
| 161 | - | 8 | -const member = await member_ent.load$(q) | +3 | +const q = { |
| 162 | - | 8 | -var child = [] | ++ | c: msg.child, |
| 163 | - | + | k: msg.kind | ||
| 164 | - | 8 | -if (member && 'child' === msg.as) { | ++ | } |
| 165 | - | 3 | -child = await load_items(seneca, [member], msg, 'c') | ++ | |
| 166 | - | - | } | +3 | +if (msg.parent) { |
| 167 | - | - | + | 1 | +q.p = msg.parent |
| 168 | - | 8 | -return { member: member, child: child[0], q: q } | ++ | } |
| 169 | - | } | +|||
| 170 | - | - | + | 3 | +if (msg.code) { |
| 171 | - | - | async function remove_member(msg) { | +2 | +q.d = msg.code |
| 172 | - | 5 | -const member_ent = this.entity('sys/member') | ++ | } |
| 173 | - | 5 | -var list = [] | ++ | |
| 174 | - | - | + | 3 | +const found = await member_ent.list$(q) |
| 175 | - | 5 | -if (null != msg.id) { | ++ | |
| 176 | - | 2 | -const item = await member_ent.load$(msg.id) | +3 | +for (var i = 0; i < found.length; i++) { |
| 177 | - | 2 | -if (item) { | +3 | +list.push(found) |
| 178 | - | 1 | -list.push(item) | +3 | +await found[i].remove$() |
| 179 | @@ -2195,44 +2195,44 @@|||||
| 180 | - | 2 | -await member_ent.make$().remove$(msg.id) | ++ | } | -
| 181 | - | } else if ( null != msg.child && null != msg.kind) { |
+ |||
| 182 | - | - | // required | +7 | +return { items: list } |
| 183 | - | 2 | -const q = { | ++ | } |
| 184 | - | c: msg.child, | +|||
| 185 | - | k: msg.kind | +async function update_member(msg) { | ||
| 186 | - | - | } | +3 | +const member_ent = this.entity('sys/member') |
| 187 | @@ -2240,59 +2240,59 @@- | ||||
| 188 | - | if ( msg.parent ) { |
+ // TODO: support list of ids - need seneca-entity to support this | -||
| 189 | - | - | q.p = msg.parent | +3 | +var member = await member_ent.make$().load$(msg.id) |
| 190 | - | } | +|||
| 191 | - | - | + | 3 | +if (member) { |
| 192 | 2 | -if (msg.code) { | +member.p = null == msg.parent ? member.p : msg.parent | ||
| 193 | - | 1 | -q.d = msg.code | +2 | +member.c = null == msg.child ? member.c : msg.child |
| 194 | - | - | } | +2 | +member.k = null == msg.kind ? member.k : msg.kind |
| 195 | - | - | + | 2 | +member.d = null == msg.code ? member.d : msg.code |
| 196 | 2 | -const found = await member_ent.list$(q) | +member.t = null == msg.tags ? member.t : msg.tags | ||
| 197 | @@ -2304,31 +2304,31 @@198 | 2 | -for (var i = 0; i < found.length; i++) { | +member = await member.save$() | |
| 199 | - | 3 | -list.push(found) | ++ | } |
| 200 | - | 3 | -await found[i].remove$() | ++ | |
| 201 | - | - | } | +3 | +return member |
| 202 | - | } | +} | ||
| 203 | @@ -2339,32 +2339,32 @@|||||
| 204 | - | 5 | -return { items: list } | +10 | +list_children.validate = Object.assign({}, validate_member, {}) |
| 205 | - | } | +|||
| 206 | - | + | async function list_children(msg) { | ||
| 207 | - | - | async function update_member(msg) { | +22 | +return build_list(this, msg, 'c') |
| 208 | - | 3 | -const member_ent = this.entity('sys/member') | ++ | } |
| 209 | @@ -2375,272 +2375,272 @@|||||
| 210 | - | - | // TODO: support list of ids - need seneca-entity to support this | +10 | +list_parents.validate = Object.assign({}, validate_member, {}) |
| 211 | - | 3 | -var member = await member_ent.make$().load$(msg.id) | ++ | |
| 212 | - | + | async function list_parents(msg) { | ||
| 213 | - | 3 | -if (member) { | +11 | +return build_list(this, msg, 'p') |
| 214 | - | 2 | -member.p = null == msg.parent ? member.p : msg.parent | ++ | } |
| 215 | - | 2 | -member.c = null == msg.child ? member.c : msg.child | ++ | |
| 216 | - | 2 | -member.k = null == msg.kind ? member.k : msg.kind | ++ | async function build_list(seneca, msg, type) { |
| 217 | - | 2 | -member.d = null == msg.code ? member.d : msg.code | +33 | +const member_ent = seneca.entity('sys/member') |
| 218 | - | 2 | -member.t = null == msg.tags ? member.t : msg.tags | ++ | |
| 219 | - | + | // const fields = [] | ||
| 220 | - | 2 | -member = await member.save$() | +33 | +const q = {} |
| 221 | - | } | +|||
| 222 | - | - | + | 33 | +if ('c' === type && null != msg.parent) { |
| 223 | - | 3 | -return member | +21 | +q.p = msg.parent |
| 224 | - | } | +} | ||
| 225 | - | - | + | 33 | +if ('p' === type && null != msg.child) { |
| 226 | 10 | -list_children.validate = Object.assign({}, validate_member, {}) | +q.c = msg.child | ||
| 227 | - | + | } | ||
| 228 | - | - | async function list_children(msg) { | +33 | +if (null != msg.kind) { |
| 229 | - | 17 | -return build_list(this, msg, 'c') | +19 | +q.k = msg.kind |
| 230 | - | } | +} | ||
| 231 | - | - | + | 33 | +if (null != msg.code) { |
| 232 | - | 10 | -list_parents.validate = Object.assign({}, validate_member, {}) | +16 | +q.d = msg.code |
| 233 | - | + | } | ||
| 234 | - | async function list_parents(msg) { | +|||
| 235 | - | 11 | -return build_list(this, msg, 'p') | +33 | +var list = await member_ent.list$(q) |
| 236 | - | } | +|||
| 237 | - | - | + | 33 | +var seen = {} |
| 238 | - | - | async function build_list(seneca, msg, type) { | +33 | +list = list.filter(x => (seen[x[type]] ? false : (seen[x[type]] = true))) |
| 239 | - | 28 | -const member_ent = seneca.entity('sys/member') | ++ | |
| 240 | - | - | + | 33 | +const prefix = 'c' === type ? 'child' : 'parent' |
| 241 | - | // const fields = [] | +|||
| 242 | - | 28 | -const q = {} | ++ | // Return referenced entity ids |
| 243 | - | - | + | 33 | +if (null == msg.as || prefix + '-id' == msg.as) { |
| 244 | - | 28 | -if ('c' === type && null != msg.parent) { | +24 | +list = list.map(x => x[type]) |
| 245 | - | 16 | -q.p = msg.parent | ++ | } |
| 246 | - | } | +|||
| 247 | - | 28 | -if ('p' === type && null != msg.child) { | ++ | // Return sys/member ids |
| 248 | - | 10 | -q.c = msg.child | +9 | +else if ('member-id' == msg.as) { |
| 249 | - | - | } | +2 | +list = list.map(x => x.id) |
| 250 | - | 28 | -if (null != msg.kind) { | ++ | } |
| 251 | - | 17 | -q.k = msg.kind | ++ | |
| 252 | - | } | +// Return sys/member ents | ||
| 253 | - | 28 | -if (null != msg.code) { | +7 | +else if ('member' == msg.as) { |
| 254 | - | 14 | -q.d = msg.code | ++ | // use list as is |
| 255 | @@ -2657,38 +2657,38 @@|||||
| 257 | - | 28 | -var list = await member_ent.list$(q) | ++ | // Return referenced entities |
| 258 | - | - | + | 5 | +else if (prefix == msg.as) { |
| 259 | - | 28 | -var seen = {} | +4 | +list = await intern.load_items(seneca, options, list, msg, type) |
| 260 | - | 28 | -list = list.filter(x => (seen[x[type]] ? false : (seen[x[type]] = true))) | ++ | } else { |
| 261 | - | - | + | 1 | +seneca.fail('invalid_as', { as: msg.as }) |
| 262 | - | 28 | -const prefix = 'c' === type ? 'child' : 'parent' | ++ | } |
| 263 | @@ -2699,56 +2699,56 @@|||||
| 264 | - | - | // Return referenced entity ids | +32 | +return { items: list } |
| 265 | - | 28 | -if (null == msg.as || prefix + '-id' == msg.as) { | ++ | } |
| 266 | - | 20 | -list = list.map(x => x[type]) | ++ | |
| 267 | - | - | } | +10 | +return define_patterns() |
| 268 | - | + | } | ||
| 269 | - | // Return sys/member ids | +|||
| 270 | - | 8 | -else if ('member-id' == msg.as) { | +1 | +const intern = (module.exports.intern = { |
| 271 | - | 2 | -list = list.map(x => x.id) | ++ | load_items: async function(seneca, options, list, msg, type) { |
| 272 | - | } | +var out = [] | ||
| 273 | @@ -2759,158 +2759,158 @@|||||
| 274 | - | - | // Return sys/member ents | +8 | +if (0 < list.length) { |
| 275 | - | 6 | -else if ('member' == msg.as) { | ++ | // assume list is all of same kind |
| 276 | - | - | // use list as is | +7 | +var kind = list[0].k |
| 277 | - | - | } | +7 | +var canon = options.kinds[kind][type] |
| 278 | - | - | + | 7 | +var ent = seneca.entity(canon) |
| 279 | - | // Return referenced entities | +- | ||
| 280 | - | - | else if ( prefix == msg.as ) { |
+ 7 | +var q = { id: list.map(x => x[type]) } |
| 281 | - | 4 | -list = await load_items(seneca, list, msg, type) | +7 | +if (msg.fields) { |
| 282 | - | - | } | +5 | +q.fields$ = msg.fields |
| 283 | - | + | } | ||
| 284 | - | 28 | -return { items: list } | ++ | |
| 285 | - | - | } | +7 | +out = await ent.list$(q) |
| 286 | - | + | } | ||
| 287 | - | async function load_items(seneca, list, msg, type) { | +|||
| 288 | - | 7 | -const out = [] | +8 | +return out |
| 289 | - | + | }, | ||
| 290 | - | 7 | -for (var i = 0; i < list.length; i++) { | ++ | |
| 291 | - | 11 | -var kind = list[i].k | ++ | resolve_children: function(msg) { |
| 292 | - | 11 | -var canon = opts.kinds[kind][type] | ++ | var children = null |
| 293 | - | 11 | -var ent = seneca.entity(canon) | ++ | |
| 294 | - | 11 | -var entid = list[i][type] | ++ | // children has precedence |
| 295 | - | - | + | 7 | +if (msg.children) { |
| 296 | - | 11 | -var q = { id: entid } | +1 | +children = msg.children |
| 297 | - | 11 | -if (msg.fields) { | +6 | +} else if (msg.child) { |
| 298 | - | 7 | -q.fields$ = msg.fields | +4 | +children = msg.child |
| 299 | - | } | +} | ||
| 300 | @@ -2921,188 +2921,188 @@|||||
| 301 | - | 11 | -var found = (await ent.list$(q))[0] | ++ | // always convert to list |
| 302 | - | - | //var found = await ent.load$(q) | +7 | +if (null != children && !Array.isArray(children)) { | -
| 303 | - | - | if ( found ) { |
+ 4 | +children = [children] |
| 304 | - | 11 | -out.push(found) | ++ | } |
| 305 | - | } | +|||
| 306 | - | - | } | +7 | +return children |
| 307 | - | + | }, | ||
| 308 | - | 7 | -return out | ++ | |
| 309 | - | } | +make_multi: function(single_action, is_single) { | ||
| 310 | - | + | var func = async function(msg, meta, ...rest) { | ||
| 311 | - | 10 | -return define_patterns() | ++ | if (msg.child || (is_single && is_single(msg))) { |
| 312 | - | - | } | +38 | +return single_action.call(this, msg, meta, ...rest) |
| 313 | - | - | + | 7 | +} else if (msg.children) { |
| 314 | - | 1 | -const intern = (module.exports.intern = { | +3 | +var out = [] |
| 315 | - | - | make_multi: function(single_action, is_single) { | +3 | +for (var cI = 0; cI < msg.children.length; cI++) { |
| 316 | - | - | var func = async function(msg, meta, ...rest) { | +6 | +var child_msg = { ...msg, child: msg.children[cI], children: null } |
| 317 | - | - | if (msg.child || (is_single && is_single(msg))) { | +6 | +out.push(await single_action.call(this, child_msg, meta, ...rest)) |
| 318 | - | 40 | -return single_action.call(this, msg, meta, ...rest) | ++ | } |
| 319 | - | 9 | -} else if (msg.children) { | +3 | +return out |
| 320 | - | 4 | -var out = [] | ++ | } |
| 321 | - | 4 | -for (var cI = 0; cI < msg.children.length; cI++) { | ++ | // else no action no result |
| 322 | - | 9 | -var child_msg = { ...msg, child: msg.children[cI], children: null } | ++ | else { |
| 323 | - | 9 | -out.push(await single_action.call(this, child_msg, meta, ...rest)) | +4 | +return null |
| 324 | - | } | +} | ||
| 325 | - | 4 | -return out | ++ | } |
| 326 | - | } | +|||
| 327 | - | - | // else no action no result | +20 | +Object.defineProperty(func, 'name', { |
| 328 | - | else { | +value: single_action.name + '_multi' | ||
| 329 | - | 5 | -return null | ++ | }) |
| 330 | - | - | } | +20 | +return func |
| 331 | - | } | +}, | ||
| 332 | @@ -3113,97 +3113,61 @@|||||
| 333 | - | 30 | -Object.defineProperty(func, 'name', { | ++ | // The code could be a unique child for the parent. |
| 334 | - | value: single_action.name + '_multi' | +is_single_member: function(msg) { | ||
| 335 | - | }) | +return !msg.children && !!(msg.child || msg.code) | ||
| 336 | - | 30 | -return func | ++ | }, |
| 337 | - | }, | +|||
| 338 | - | + | is_single_remove: function(msg) { | ||
| 339 | - | // The code could be a unique child for the parent. | +return !msg.children && !!(msg.id || msg.child || msg.code) | ||
| 340 | - | is_single_member: function(msg) { | +} | ||
| 341 | - | return !msg.children && !!(msg.child || msg.code) | +}) | ||
| 342 | - | }, | - -|||
| 343 | -- | - | - - | ||
| 344 | -- | - | is_single_remove: function(msg) { | - -||
| 345 | -- | - | return !msg.children && !!(msg.id || msg.child || msg.code) |
-
- ||
| 346 | -- | - | } | - -||
| 347 | -- | - | }) | - -||
| 348 | -- |