implement mutable ITopic protocol

Author: mlanza

src/core/core.js

@@ -455,6 +455,8 @@ export function either(memo, value){
 
 export const isIdentical = Object.is;
 
+export const looseEq = (a, b) => a == b;
+
 export function everyPred(...preds){
   return function(){
     return fold(function(memo, arg){

src/core/index.js

@@ -15,7 +15,7 @@ export * from "./core.js";
 export * from "./types.js";
 export * from "./protocols.js";
 export * from "./protocols/concrete.js";
-export {sequence, blot, blottable, reduceWith, reducekvWith} from "./shared.js";
+export {sequence, blot, blottable, itopic, reduceWith, reducekvWith} from "./shared.js";
 import * as p from "./protocols/concrete.js";
 import * as T from "./types.js";
 import {extend, forward} from "./types/protocol/concrete.js";

src/core/protocols/iassociative/concrete.js

@@ -93,10 +93,11 @@ function updateInN(self, keys, f) {
 export const updateIn = overload(null, null, null, updateIn3, updateIn4, updateIn5, updateIn6, updateInN);
 
 function contains3(self, key, value){
-  return IAssociative.contains(self, key) && equiv(get(self, key), value);
+  const equals = IAssociative.contains(self) || equiv;
+  return IAssociative.contains(self, key) && equals(get(self, key), value);
 }
 
-export const contains = overload(null, null, IAssociative.contains, contains3);
+export const contains = overload(null, IAssociative.contains, IAssociative.contains, contains3);
 export const rewrite = branch(IAssociative.contains, update, identity);
 export const prop = overload(null, function(key){
   return overload(null, v => get(v, key), v => assoc(v, key, v));

src/core/shared.js

@@ -4,14 +4,35 @@ import * as s from "./protocols/iseq/concrete.js"
 import {seq} from "./protocols/iseqable/concrete.js";
 import {compact} from "./protocols/icompactible/concrete.js";
 import {get} from "./protocols/ilookup/concrete.js";
+import {contains} from "./protocols/iassociative/concrete.js";
 import {equiv} from "./protocols/iequiv/concrete.js";
 import {keys, dissoc} from "./protocols/imap/concrete.js";
 import {lazySeq} from "./types/lazy-seq/construct.js";
-import {map, mapIndexed} from "./types/lazy-seq/concrete.js";
+import {map, mapcat, mapIndexed} from "./types/lazy-seq/concrete.js";
 import {cons} from "./types/list/construct.js";
 import {emptyList} from "./types/empty-list/construct.js";
 import {array} from "./types/array/construct.js";
 
+export function itopic(assoc, dissoc, {equals = equiv, assertArity1 = identity, assertArity2 = identity} = {}){
+  function assert2(self, key){
+    return contains(self, key) ? [[key, get(self, key)]] : null;
+  }
+
+  function assert1(self){
+    return seq(mapcat(assert2(self, ?), keys(self)));
+  }
+
+  const assert = overload(null, assertArity1(assert1), assertArity2(assert2), assoc);
+
+  function retract3(self, key, value){
+    return equals(get(self, key), value) ? dissoc(self, key) : self;
+  }
+
+  const retract = overload(null, null, dissoc, retract3);
+
+  return {assert, retract}
+}
+
 export function blot(self){
   return seq(compact(self)) ? self : null;
 }

src/core/types/object/behave.js

@@ -12,7 +12,7 @@ import {emptyObject} from "../object/construct.js";
 import {descriptive} from "../object/concrete.js";
 import {keying} from "../../protocols/imapentry/concrete.js";
 import {hashKeyed as hash} from "../../protocols/ihashable/hashers.js";
-import {reduceWith, reducekvWith} from "../../shared.js";
+import {reduceWith, reducekvWith, itopic} from "../../shared.js";
 import * as p from "./protocols.js";
 
 const keys = Object.keys;
@@ -101,28 +101,13 @@ function clone(self){
   return Object.assign({}, self);
 }
 
-function assert2(self, key){
-  return p.contains(self, key) ? [[key, p.get(self, key)]] : null;
-}
-
-function assert1(self){
-  return p.seq(mapcat(assert2(self, ?), p.keys(self)));
-}
-
-export const assert = overload(null, assert1, assert2, p.assoc);
-
-function retract3(self, key, value){
-  return p.equiv(p.get(self, key), value) ? p.dissoc(self, key) : self;
-}
-
-export const retract = overload(null, null, p.dissoc, retract3);
-
 const reduce = reduceWith(p.seq);
 const reducekv = reducekvWith(p.seq);
 const count = comp(p.count, p.keys);
 
 export default does(
   keying("Object"),
+  implement(ITopic, itopic(p.assoc, p.dissoc)),
   implement(IHashable, {hash}),
   implement(IMergable, {merge}),
   implement(ICompactible, {compact}),
@@ -138,7 +123,6 @@ export default does(
   implement(IFn, {invoke: lookup}),
   implement(ISeq, {first, rest}),
   implement(ILookup, {lookup}),
-  implement(ITopic, {assert, retract}),
   implement(IEmptyableCollection, {empty: emptyObject}),
   implement(IAssociative, {assoc, contains}),
   implement(ISeqable, {seq}),

src/dom/index.js

@@ -75,8 +75,8 @@ function attr2(self, key){
   if (_.isString(key)) {
     return self.getAttribute(key);
   } else {
-    const pairs = key;
-    $.eachkv(attr3(self, ?, ?), pairs);
+    const entries = key;
+    $.each(([key, value]) => attr3(self, key, value), entries);
   }
 }
 
@@ -95,7 +95,7 @@ function attrN(self, ...kvps){
   }
 }
 
-export const attr = _.overload(null, null, attr2, attr3, attrN);
+export const attr = _.overload(null, _.comp(_.into({}, ?), $.assert), attr2, attr3, attrN);
 
 function removeAttr2(self, key){
   self.removeAttribute(key);

src/dom/types/element/behave.js

@@ -134,10 +134,12 @@ function lookup(self, key){
   return self.getAttribute(key);
 }
 
-function contains(self, key){
+function contains2(self, key){
   return self.hasAttribute(key);
 }
 
+const contains = _.overload(null, _.constantly(_.looseEq), contains2);
+
 function parent(self){
   return self && self.parentNode;
 }
@@ -200,8 +202,7 @@ function omit2(self, node){
     $.each(self.removeAttribute.bind(self), keys);
   } else if (isAttrs(node)) {
     const attrs = node;
-    $.each(function(entry){
-      const key = entry[0], value = entry[1];
+    $.each(function([key, value]){
       let curr = lookup(self, key);
       if (_.isObject(curr)){
         curr = mapa(function(pair){
@@ -229,7 +230,7 @@ function includes(self, target){
     }, true, keys);
   } else if (isAttrs(target)) {
     return _.reducekv(function(memo, key, value){
-      return memo ? lookup(self, key) == value : reduced(memo);
+      return memo ? _.contains(self, key, value) : reduced(memo);
     }, true, target);
   } else {
     return _.detect(_.isString(target) ? function(node){
@@ -364,6 +365,7 @@ export default _.does(
   icontents,
   ievented,
   iselectable,
+  _.implement($.ITopic, _.itopic(assoc, dissoc, {equals: _.looseEq})),
   _.keying("Element"),
   _.implement(_.IReducible, {reduce}),
   _.implement(IValue, {value}),

src/dom/types/url-search-params/behave.js

@@ -79,12 +79,14 @@ function vals(self){
   return _.lazyIterable(self.values());
 }
 
-function contains(self, key){
+function contains2(self, key){
   return self.has(key);
 }
 
+const contains = _.overload(null, _.constantly(_.looseEq), contains2);
+
 function includes(self, [key, value]) {
-  return _.equiv(lookup(self, key), value);
+  return _.contains(self, key, value);
 }
 
 export default _.does(

src/shell/protocols.js

@@ -19,3 +19,4 @@ export * from "./protocols/iresettable/instance.js";
 export * from "./protocols/isend/instance.js";
 export * from "./protocols/iqueryable/instance.js";
 export * from "./protocols/ilogger/instance.js";
+export * from "./protocols/itopic/instance.js";

src/shell/protocols/concrete.js

@@ -19,3 +19,4 @@ export * from "./iresettable/concrete.js";
 export * from "./isend/concrete.js";
 export * from "./iqueryable/concrete.js";
 export * from "./ilogger/concrete.js";
+export * from "./itopic/concrete.js";