aberdeen 1.10.2 → 1.11.1

package/dist/src/aberdeen.d.ts

@@ -59,12 +59,13 @@ export declare function runQueue(): void;
  */
 export declare function invertString(input: string): string;
 export declare function onEach<K, T>(target: Map<K, undefined | T>, render: (value: T, key: K) => void, makeKey?: (value: T, key: K) => SortKeyType): void;
+export declare function onEach<T>(target: Set<T>, render: (value: T) => void, makeKey?: (value: T) => SortKeyType): void;
 export declare function onEach<T>(target: ReadonlyArray<undefined | T>, render: (value: T, index: number) => void, makeKey?: (value: T, index: number) => SortKeyType): void;
 export declare function onEach<K extends string | number | symbol, T>(target: Record<K, undefined | T>, render: (value: T, index: KeyToString<K>) => void, makeKey?: (value: T, index: KeyToString<K>) => SortKeyType): void;
 /** @private */
 export declare const EMPTY: unique symbol;
 /**
- * Reactively checks if an observable array or object is empty.
+ * Reactively checks if an observable array, object, Map, or Set is empty.
  *
  * This function not only returns the current emptiness state but also establishes
  * a reactive dependency. If the emptiness state of the `proxied` object or array
@@ -72,8 +73,8 @@ export declare const EMPTY: unique symbol;
  * is deleted from an object), the scope that called `isEmpty` will be automatically
  * scheduled for re-evaluation.
  *
- * @param proxied The observable array or object to check.
- * @returns `true` if the array has length 0 or the object has no own enumerable properties, `false` otherwise.
+ * @param proxied The observable array, object, Map, or Set to check.
+ * @returns `true` if the array has length 0, the Map/Set has size 0, or the object has no own enumerable properties, `false` otherwise.
  *
  * @example
  * ```typescript
@@ -101,10 +102,10 @@ export interface ValueRef<T> {
     value: T;
 }
 /**
- * Reactively counts the number of properties in an objects.
+ * Reactively counts the number of properties in an object.
  *
- * @param proxied The observable object to count. In case an `array` is passed in, a {@link ref} to its `.length` will be returned.
- * @returns an observable object for which the `value` property reflects the number of properties in `proxied` with a value other than `undefined`.
+ * @param proxied The observable object to count. In case an `array`, `Map`, or `Set` is passed in, a {@link ref} to its `.length` or `.size` will be returned.
+ * @returns an observable object for which the `value` property reflects the number of properties in `proxied` with a value other than `undefined`, or the collection size for arrays, Maps, and Sets.
  *
  * @example
  * ```typescript

package/dist/src/aberdeen.js

@@ -130,18 +130,26 @@ function runQueue() {
   if (time > 9)
     console.debug(`Aberdeen queue took ${time}ms`);
 }
-function partToStr(part) {
-  if (typeof part === "string") {
-    return `${part}\x01`;
-  }
+function arrayToStr(parts) {
   let result = "";
-  let num = Math.abs(Math.round(part));
-  const negative = part < 0;
-  while (num > 0) {
-    result = String.fromCharCode(negative ? 65534 - num % 65533 : 2 + num % 65533) + result;
-    num = Math.floor(num / 65533);
+  for (const part of parts) {
+    if (typeof part === "string") {
+      result += `${part}\x01`;
+      continue;
+    }
+    if (typeof part !== "number") {
+      throw new Error("onEach() sort key must be a string, number or an array of such");
+    }
+    let digits = "";
+    let num = Math.abs(Math.round(part));
+    const negative = part < 0;
+    while (num > 0) {
+      digits = String.fromCharCode(negative ? 65534 - num % 65533 : 2 + num % 65533) + digits;
+      num = Math.floor(num / 65533);
+    }
+    result += String.fromCharCode(128 + (negative ? -digits.length : digits.length)) + digits;
   }
-  return String.fromCharCode(128 + (negative ? -result.length : result.length)) + result;
+  return result;
 }
 function invertString(input) {
   let result = "";
@@ -403,7 +411,7 @@ class OnEachScope extends Scope {
         new OnEachItemScope(this, i, false);
       }
     } else {
-      for (const key of target instanceof Map ? target.keys() : Object.keys(target)) {
+      for (const key of target instanceof Map ? target.keys() : target instanceof Set ? target.values() : Object.keys(target)) {
         new OnEachItemScope(this, key, false);
       }
     }
@@ -430,7 +438,7 @@ class OnEachScope extends Scope {
       const oldScope = this.byIndex.get(index);
       if (oldScope)
         oldScope.remove();
-      if (this.target instanceof Map ? this.target.has(index) : (index in this.target)) {
+      if (this.target instanceof Set || this.target instanceof Map ? this.target.has(index) : (index in this.target)) {
         new OnEachItemScope(this, index, true);
       } else {
         this.byIndex.delete(index);
@@ -516,7 +524,9 @@ class OnEachItemScope extends ContentScope {
     let value;
     const target = this.parent.target;
     let itemIndex = this.itemIndex;
-    if (target instanceof Map) {
+    if (target instanceof Set) {
+      value = itemIndex = optProxy(itemIndex);
+    } else if (target instanceof Map) {
       value = optProxy(target.get(itemIndex));
       itemIndex = optProxy(itemIndex);
     } else {
@@ -527,14 +537,14 @@ class OnEachItemScope extends ContentScope {
     let sortKey;
     try {
       if (this.parent.makeSortKey) {
-        const rawSortKey = this.parent.makeSortKey(value, itemIndex);
-        if (rawSortKey != null)
-          sortKey = rawSortKey instanceof Array ? rawSortKey.map(partToStr).join("") : rawSortKey;
+        sortKey = this.parent.makeSortKey(value, itemIndex);
       } else {
         sortKey = itemIndex;
       }
-      if (typeof sortKey === "number")
-        sortKey = partToStr(sortKey);
+      if (sortKey instanceof Array)
+        sortKey = arrayToStr(sortKey);
+      else if (typeof sortKey !== "string" && sortKey != null)
+        sortKey = arrayToStr([sortKey]);
       if (this.sortKey !== sortKey) {
         this.parent.sortedSet.remove(this);
         this.sortKey = sortKey;
@@ -632,7 +642,7 @@ function isEmpty(proxied) {
     });
     return !target.length;
   }
-  if (target instanceof Map) {
+  if (target instanceof Map || target instanceof Set) {
     subscribe(target, MAP_SIZE_SYMBOL, (index, newData, oldData) => {
       if (!newData !== !oldData)
         scope.onChange(target, EMPTY, !newData, !oldData);
@@ -652,7 +662,7 @@ function isEmpty(proxied) {
 function count(proxied) {
   if (proxied instanceof Array)
     return ref(proxied, "length");
-  if (proxied instanceof Map)
+  if (proxied instanceof Map || proxied instanceof Set)
     return ref(proxied, "size");
   const target = proxied[TARGET_SYMBOL] || proxied;
   let cnt = 0;
@@ -807,22 +817,20 @@ function wrapIteratorPair(iterator) {
     }
   };
 }
+function unproxyCollectionValue(value) {
+  return typeof value === "object" && value ? value[TARGET_SYMBOL] || value : value;
+}
 var mapMethodHandlers = {
   get(key) {
     const target = this[TARGET_SYMBOL];
-    if (typeof key === "object" && key)
-      key = key[TARGET_SYMBOL] || key;
+    key = unproxyCollectionValue(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;
-    }
+    key = unproxyCollectionValue(key);
+    newData = unproxyCollectionValue(newData);
     let oldData = target.get(key);
     if (oldData === undefined && !target.has(key))
       oldData = EMPTY;
@@ -836,9 +844,7 @@ var mapMethodHandlers = {
   },
   delete(key) {
     const target = this[TARGET_SYMBOL];
-    if (typeof key === "object" && key) {
-      key = key[TARGET_SYMBOL] || key;
-    }
+    key = unproxyCollectionValue(key);
     let oldData = target.get(key);
     if (oldData === undefined && !target.has(key))
       oldData = EMPTY;
@@ -860,9 +866,7 @@ var mapMethodHandlers = {
   },
   has(key) {
     const target = this[TARGET_SYMBOL];
-    if (typeof key === "object" && key) {
-      key = key[TARGET_SYMBOL] || key;
-    }
+    key = unproxyCollectionValue(key);
     subscribe(target, key);
     return target.has(key);
   },
@@ -887,6 +891,66 @@ var mapMethodHandlers = {
     return wrapIteratorPair(target[Symbol.iterator]());
   }
 };
+var setMethodHandlers = {
+  add(value) {
+    const target = this[TARGET_SYMBOL];
+    value = unproxyCollectionValue(value);
+    if (!target.has(value)) {
+      const oldSize = target.size;
+      target.add(value);
+      emit(target, value, value, EMPTY);
+      emit(target, MAP_SIZE_SYMBOL, target.size, oldSize);
+    }
+    return this;
+  },
+  delete(value) {
+    const target = this[TARGET_SYMBOL];
+    value = unproxyCollectionValue(value);
+    if (!target.has(value))
+      return false;
+    const oldSize = target.size;
+    target.delete(value);
+    emit(target, value, EMPTY, value);
+    emit(target, MAP_SIZE_SYMBOL, target.size, oldSize);
+    return true;
+  },
+  clear() {
+    const target = this[TARGET_SYMBOL];
+    const oldSize = target.size;
+    if (!oldSize)
+      return;
+    for (const value of target.values())
+      emit(target, value, EMPTY, value);
+    target.clear();
+    emit(target, MAP_SIZE_SYMBOL, 0, oldSize);
+  },
+  has(value) {
+    const target = this[TARGET_SYMBOL];
+    value = unproxyCollectionValue(value);
+    subscribe(target, value);
+    return target.has(value);
+  },
+  keys() {
+    const target = this[TARGET_SYMBOL];
+    subscribe(target, ANY_SYMBOL);
+    return wrapIteratorSingle(target.keys());
+  },
+  values() {
+    const target = this[TARGET_SYMBOL];
+    subscribe(target, ANY_SYMBOL);
+    return wrapIteratorSingle(target.values());
+  },
+  entries() {
+    const target = this[TARGET_SYMBOL];
+    subscribe(target, ANY_SYMBOL);
+    return wrapIteratorPair(target.entries());
+  },
+  [Symbol.iterator]() {
+    const target = this[TARGET_SYMBOL];
+    subscribe(target, ANY_SYMBOL);
+    return wrapIteratorSingle(target[Symbol.iterator]());
+  }
+};
 var mapHandler = {
   get(target, prop) {
     if (prop === TARGET_SYMBOL)
@@ -901,6 +965,20 @@ var mapHandler = {
     return target[prop];
   }
 };
+var setHandler = {
+  get(target, prop) {
+    if (prop === TARGET_SYMBOL)
+      return target;
+    if (setMethodHandlers.hasOwnProperty(prop)) {
+      return setMethodHandlers[prop];
+    }
+    if (prop === "size") {
+      subscribe(target, MAP_SIZE_SYMBOL);
+      return target.size;
+    }
+    return target[prop];
+  }
+};
 var proxyMap = new WeakMap;
 function optProxy(value) {
   if (typeof value !== "object" || !value || value[TARGET_SYMBOL] !== undefined || NO_COPY in value) {
@@ -914,6 +992,8 @@ function optProxy(value) {
     handler = arrayHandler;
   } else if (value instanceof Map) {
     handler = mapHandler;
+  } else if (value instanceof Set) {
+    handler = setHandler;
   } else {
     handler = objectHandler;
   }
@@ -1107,7 +1187,7 @@ function setSpacingCssVars(base = 1, unit = "rem") {
     cssVars[i] = 2 ** (i - 3) * base + unit;
   }
 }
-var CSS_VAR_PATTERN = /(\burl\([^)]*\))|("[^"]*")|(^| )\$(\w+)/g;
+var CSS_VAR_PATTERN = /(\burl\([^)]*\))|("[^"]*")|(^| )\$([\w-]+)/g;
 var DIGIT_FIRST = /^\d/;
 function cssVarRef(value) {
   if (value.indexOf("$") < 0)
@@ -1788,5 +1868,5 @@ export {
   A
 };
 
-//# debugId=3B0B71E6E017014564756E2164756E21
+//# debugId=CEB17464CFEBA2F464756E2164756E21
 //# sourceMappingURL=aberdeen.js.map