aberdeen 1.0.12 → 1.0.13

package/dist/aberdeen.js

@@ -731,27 +731,66 @@ var arrayHandler = {
     return arraySet(target, prop, undefined);
   }
 };
+function wrapIteratorSingle(iterator) {
+  return {
+    [Symbol.iterator]() {
+      return this;
+    },
+    next() {
+      const result = iterator.next();
+      if (result.done)
+        return result;
+      return {
+        done: false,
+        value: optProxy(result.value)
+      };
+    }
+  };
+}
+function wrapIteratorPair(iterator) {
+  return {
+    [Symbol.iterator]() {
+      return this;
+    },
+    next() {
+      const result = iterator.next();
+      if (result.done)
+        return result;
+      return {
+        done: false,
+        value: [optProxy(result.value[0]), optProxy(result.value[1])]
+      };
+    }
+  };
+}
 var mapMethodHandlers = {
   get(key) {
     const target = this[TARGET_SYMBOL];
+    if (typeof key === "object" && key)
+      key = key[TARGET_SYMBOL] || key;
     subscribe(target, key);
     return optProxy(target.get(key));
   },
   set(key, newData) {
     const target = this[TARGET_SYMBOL];
+    if (typeof key === "object" && key)
+      key = key[TARGET_SYMBOL] || key;
     if (typeof newData === "object" && newData)
       newData = newData[TARGET_SYMBOL] || newData;
     const oldData = target.get(key);
     if (newData !== oldData) {
+      const oldSize = target.size;
       target.set(key, newData);
       emit(target, key, newData, oldData);
-      emit(target, MAP_SIZE_SYMBOL, target.size, target.size - (oldData === undefined ? 1 : 0));
+      emit(target, MAP_SIZE_SYMBOL, target.size, oldSize);
       runImmediateQueue();
     }
     return this;
   },
   delete(key) {
     const target = this[TARGET_SYMBOL];
+    if (typeof key === "object" && key)
+      key = key[TARGET_SYMBOL] || key;
     const oldData = target.get(key);
     const result = target.delete(key);
     if (result) {
@@ -774,28 +813,30 @@ var mapMethodHandlers = {
   },
   has(key) {
     const target = this[TARGET_SYMBOL];
+    if (typeof key === "object" && key)
+      key = key[TARGET_SYMBOL] || key;
     subscribe(target, key);
     return target.has(key);
   },
   keys() {
     const target = this[TARGET_SYMBOL];
     subscribe(target, ANY_SYMBOL);
-    return target.keys();
+    return wrapIteratorSingle(target.keys());
   },
   values() {
     const target = this[TARGET_SYMBOL];
     subscribe(target, ANY_SYMBOL);
-    return target.values();
+    return wrapIteratorSingle(target.values());
   },
   entries() {
     const target = this[TARGET_SYMBOL];
     subscribe(target, ANY_SYMBOL);
-    return target.entries();
+    return wrapIteratorPair(target.entries());
   },
   [Symbol.iterator]() {
     const target = this[TARGET_SYMBOL];
     subscribe(target, ANY_SYMBOL);
-    return target[Symbol.iterator]();
+    return wrapIteratorPair(target[Symbol.iterator]());
   }
 };
 var mapHandler = {
@@ -1397,5 +1438,5 @@ export {
   $
 };
 
-//# debugId=273356BBA2542BE564756E2164756E21
+//# debugId=8143A247906C19B564756E2164756E21
 //# sourceMappingURL=aberdeen.js.map