@vueuse/shared 10.0.0-beta.3 → 10.0.0-beta.4

package/index.cjs

@@ -59,9 +59,10 @@ const rand = (min, max) => {
 const hasOwn = (val, key) => Object.prototype.hasOwnProperty.call(val, key);
 const isIOS = isClient && ((_a = window == null ? void 0 : window.navigator) == null ? void 0 : _a.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
 
-function resolveUnref(r) {
+function toValue(r) {
   return typeof r === "function" ? r() : vueDemi.unref(r);
 }
+const resolveUnref = toValue;
 
 function createFilterWrapper(filter, fn) {
   function wrapper(...args) {
@@ -84,8 +85,8 @@ function debounceFilter(ms, options = {}) {
     lastRejector = noop;
   };
   const filter = (invoke) => {
-    const duration = resolveUnref(ms);
-    const maxDuration = resolveUnref(options.maxWait);
+    const duration = toValue(ms);
+    const maxDuration = toValue(options.maxWait);
     if (timer)
       _clearTimeout(timer);
     if (duration <= 0 || maxDuration !== void 0 && maxDuration <= 0) {
@@ -130,7 +131,7 @@ function throttleFilter(ms, trailing = true, leading = true, rejectOnCancel = fa
     }
   };
   const filter = (_invoke) => {
-    const duration = resolveUnref(ms);
+    const duration = toValue(ms);
     const elapsed = Date.now() - lastExec;
     const invoke = () => {
       return lastValue = _invoke();
@@ -244,6 +245,11 @@ function objectPick(obj, keys, omitUndefined = false) {
     return n;
   }, {});
 }
+function objectOmit(obj, keys, omitUndefined = false) {
+  return Object.fromEntries(Object.entries(obj).filter(([key, value]) => {
+    return (!omitUndefined || value !== void 0) && !keys.includes(key);
+  }));
+}
 function objectEntries(obj) {
   return Object.entries(obj);
 }
@@ -430,7 +436,7 @@ function makeDestructurable(obj, arr) {
 }
 
 function reactify(fn, options) {
-  const unrefFn = (options == null ? void 0 : options.computedGetter) === false ? vueDemi.unref : resolveUnref;
+  const unrefFn = (options == null ? void 0 : options.computedGetter) === false ? vueDemi.unref : toValue;
   return function(...args) {
     return vueDemi.computed(() => fn.apply(this, args.map((i) => unrefFn(i))));
   };
@@ -500,14 +506,22 @@ function reactiveOmit(obj, ...keys) {
   const flatKeys = keys.flat();
   const predicate = flatKeys[0];
   return reactiveComputed(
-    () => typeof predicate === "function" ? Object.fromEntries(Object.entries(vueDemi.toRefs(obj)).filter(([k, v]) => !predicate(resolveUnref(v), k))) : Object.fromEntries(Object.entries(vueDemi.toRefs(obj)).filter((e) => !flatKeys.includes(e[0])))
+    () => typeof predicate === "function" ? Object.fromEntries(Object.entries(vueDemi.toRefs(obj)).filter(([k, v]) => !predicate(toValue(v), k))) : Object.fromEntries(Object.entries(vueDemi.toRefs(obj)).filter((e) => !flatKeys.includes(e[0])))
   );
 }
 
+function toRef(...args) {
+  if (args.length !== 1)
+    return vueDemi.toRef(...args);
+  const r = args[0];
+  return typeof r === "function" ? vueDemi.readonly(vueDemi.customRef(() => ({ get: r, set: noop }))) : vueDemi.ref(r);
+}
+const resolveRef = toRef;
+
 function reactivePick(obj, ...keys) {
   const flatKeys = keys.flat();
   const predicate = flatKeys[0];
-  return reactiveComputed(() => typeof predicate === "function" ? Object.fromEntries(Object.entries(vueDemi.toRefs(obj)).filter(([k, v]) => predicate(resolveUnref(v), k))) : Object.fromEntries(flatKeys.map((k) => [k, vueDemi.toRef(obj, k)])));
+  return reactiveComputed(() => typeof predicate === "function" ? Object.fromEntries(Object.entries(vueDemi.toRefs(obj)).filter(([k, v]) => predicate(toValue(v), k))) : Object.fromEntries(flatKeys.map((k) => [k, toRef(obj, k)])));
 }
 
 function refAutoReset(defaultValue, afterMs = 1e4) {
@@ -517,7 +531,7 @@ function refAutoReset(defaultValue, afterMs = 1e4) {
     const resetAfter = () => setTimeout(() => {
       value = defaultValue;
       trigger();
-    }, resolveUnref(afterMs));
+    }, toValue(afterMs));
     tryOnScopeDispose(() => {
       clearTimeout(timer);
     });
@@ -634,10 +648,6 @@ function refWithControl(initial, options = {}) {
 }
 const controlledRef = refWithControl;
 
-function resolveRef(r) {
-  return typeof r === "function" ? vueDemi.computed(r) : vueDemi.ref(r);
-}
-
 function set(...args) {
   if (args.length === 2) {
     const [ref, value] = args;
@@ -795,7 +805,7 @@ function createUntil(r, isNot = false) {
     const promises = [watcher];
     if (timeout != null) {
       promises.push(
-        promiseTimeout(timeout, throwOnTimeout).then(() => resolveUnref(r)).finally(() => stop == null ? void 0 : stop())
+        promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => stop == null ? void 0 : stop())
       );
     }
     return Promise.race(promises);
@@ -824,9 +834,9 @@ function createUntil(r, isNot = false) {
     const promises = [watcher];
     if (timeout != null) {
       promises.push(
-        promiseTimeout(timeout, throwOnTimeout).then(() => resolveUnref(r)).finally(() => {
+        promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => {
           stop == null ? void 0 : stop();
-          return resolveUnref(r);
+          return toValue(r);
         })
       );
     }
@@ -847,7 +857,7 @@ function createUntil(r, isNot = false) {
   function toContains(value, options) {
     return toMatch((v) => {
       const array = Array.from(v);
-      return array.includes(value) || array.includes(resolveUnref(value));
+      return array.includes(value) || array.includes(toValue(value));
     }, options);
   }
   function changed(options) {
@@ -860,7 +870,7 @@ function createUntil(r, isNot = false) {
       return count >= n;
     }, options);
   }
-  if (Array.isArray(resolveUnref(r))) {
+  if (Array.isArray(toValue(r))) {
     const instance = {
       toMatch,
       toContains,
@@ -904,27 +914,27 @@ function useArrayDifference(...args) {
     const key = compareFn;
     compareFn = (value, othVal) => value[key] === othVal[key];
   }
-  return vueDemi.computed(() => resolveUnref(list).filter((x) => resolveUnref(values).findIndex((y) => compareFn(x, y)) === -1));
+  return vueDemi.computed(() => toValue(list).filter((x) => toValue(values).findIndex((y) => compareFn(x, y)) === -1));
 }
 
 function useArrayEvery(list, fn) {
-  return vueDemi.computed(() => resolveUnref(list).every((element, index, array) => fn(resolveUnref(element), index, array)));
+  return vueDemi.computed(() => toValue(list).every((element, index, array) => fn(toValue(element), index, array)));
 }
 
 function useArrayFilter(list, fn) {
-  return vueDemi.computed(() => resolveUnref(list).map((i) => resolveUnref(i)).filter(fn));
+  return vueDemi.computed(() => toValue(list).map((i) => toValue(i)).filter(fn));
 }
 
 function useArrayFind(list, fn) {
   return vueDemi.computed(
-    () => resolveUnref(
-      resolveUnref(list).find((element, index, array) => fn(resolveUnref(element), index, array))
+    () => toValue(
+      toValue(list).find((element, index, array) => fn(toValue(element), index, array))
     )
   );
 }
 
 function useArrayFindIndex(list, fn) {
-  return vueDemi.computed(() => resolveUnref(list).findIndex((element, index, array) => fn(resolveUnref(element), index, array)));
+  return vueDemi.computed(() => toValue(list).findIndex((element, index, array) => fn(toValue(element), index, array)));
 }
 
 function findLast(arr, cb) {
@@ -937,8 +947,8 @@ function findLast(arr, cb) {
 }
 function useArrayFindLast(list, fn) {
   return vueDemi.computed(
-    () => resolveUnref(
-      !Array.prototype.findLast ? findLast(resolveUnref(list), (element, index, array) => fn(resolveUnref(element), index, array)) : resolveUnref(list).findLast((element, index, array) => fn(resolveUnref(element), index, array))
+    () => toValue(
+      !Array.prototype.findLast ? findLast(toValue(list), (element, index, array) => fn(toValue(element), index, array)) : toValue(list).findLast((element, index, array) => fn(toValue(element), index, array))
     )
   );
 }
@@ -958,34 +968,34 @@ function useArrayIncludes(...args) {
   }
   if (typeof comparator === "string") {
     const key = comparator;
-    comparator = (element, value2) => element[key] === resolveUnref(value2);
+    comparator = (element, value2) => element[key] === toValue(value2);
   }
-  comparator = comparator != null ? comparator : (element, value2) => element === resolveUnref(value2);
+  comparator = comparator != null ? comparator : (element, value2) => element === toValue(value2);
   return vueDemi.computed(
-    () => resolveUnref(list).slice(formIndex).some(
-      (element, index, array) => comparator(resolveUnref(element), resolveUnref(value), index, resolveUnref(array))
+    () => toValue(list).slice(formIndex).some(
+      (element, index, array) => comparator(toValue(element), toValue(value), index, toValue(array))
     )
   );
 }
 
 function useArrayJoin(list, separator) {
-  return vueDemi.computed(() => resolveUnref(list).map((i) => resolveUnref(i)).join(resolveUnref(separator)));
+  return vueDemi.computed(() => toValue(list).map((i) => toValue(i)).join(toValue(separator)));
 }
 
 function useArrayMap(list, fn) {
-  return vueDemi.computed(() => resolveUnref(list).map((i) => resolveUnref(i)).map(fn));
+  return vueDemi.computed(() => toValue(list).map((i) => toValue(i)).map(fn));
 }
 
 function useArrayReduce(list, reducer, ...args) {
-  const reduceCallback = (sum, value, index) => reducer(resolveUnref(sum), resolveUnref(value), index);
+  const reduceCallback = (sum, value, index) => reducer(toValue(sum), toValue(value), index);
   return vueDemi.computed(() => {
-    const resolved = resolveUnref(list);
-    return args.length ? resolved.reduce(reduceCallback, resolveUnref(args[0])) : resolved.reduce(reduceCallback);
+    const resolved = toValue(list);
+    return args.length ? resolved.reduce(reduceCallback, toValue(args[0])) : resolved.reduce(reduceCallback);
   });
 }
 
 function useArraySome(list, fn) {
-  return vueDemi.computed(() => resolveUnref(list).some((element, index, array) => fn(resolveUnref(element), index, array)));
+  return vueDemi.computed(() => toValue(list).some((element, index, array) => fn(toValue(element), index, array)));
 }
 
 function uniq(array) {
@@ -1000,7 +1010,7 @@ function uniqueElementsBy(array, fn) {
 }
 function useArrayUnique(list, compareFn) {
   return vueDemi.computed(() => {
-    const resolvedList = resolveUnref(list).map((element) => resolveUnref(element));
+    const resolvedList = toValue(list).map((element) => toValue(element));
     return compareFn ? uniqueElementsBy(resolvedList, compareFn) : uniq(resolvedList);
   });
 }
@@ -1088,7 +1098,7 @@ function normalizeDate(date) {
   return new Date(date);
 }
 function useDateFormat(date, formatStr = "HH:mm:ss", options = {}) {
-  return vueDemi.computed(() => formatDate(normalizeDate(resolveUnref(date)), resolveUnref(formatStr), options));
+  return vueDemi.computed(() => formatDate(normalizeDate(toValue(date)), toValue(formatStr), options));
 }
 
 function useIntervalFn(cb, interval = 1e3, options = {}) {
@@ -1109,7 +1119,7 @@ function useIntervalFn(cb, interval = 1e3, options = {}) {
     clean();
   }
   function resume() {
-    const intervalValue = resolveUnref(interval);
+    const intervalValue = toValue(interval);
     if (intervalValue <= 0)
       return;
     isActive.value = true;
@@ -1214,7 +1224,7 @@ function useTimeoutFn(cb, interval, options = {}) {
       isPending.value = false;
       timer = null;
       cb(...args);
-    }, resolveUnref(interval));
+    }, toValue(interval));
   }
   if (immediate) {
     isPending.value = true;
@@ -1272,7 +1282,7 @@ function useToNumber(value, options = {}) {
     nanToZero
   } = options;
   return vueDemi.computed(() => {
-    let resolved = resolveUnref(value);
+    let resolved = toValue(value);
     if (typeof resolved === "string")
       resolved = Number[method](resolved, radix);
     if (nanToZero && isNaN(resolved))
@@ -1282,7 +1292,7 @@ function useToNumber(value, options = {}) {
 }
 
 function useToString(value) {
-  return vueDemi.computed(() => `${resolveUnref(value)}`);
+  return vueDemi.computed(() => `${toValue(value)}`);
 }
 
 function useToggle(initialValue = false, options = {}) {
@@ -1297,8 +1307,8 @@ function useToggle(initialValue = false, options = {}) {
       _value.value = value;
       return _value.value;
     } else {
-      const truthy = resolveUnref(truthyValue);
-      _value.value = _value.value === truthy ? resolveUnref(falsyValue) : truthy;
+      const truthy = toValue(truthyValue);
+      _value.value = _value.value === truthy ? toValue(falsyValue) : truthy;
       return _value.value;
     }
   }
@@ -1310,7 +1320,7 @@ function useToggle(initialValue = false, options = {}) {
 
 function watchArray(source, cb, options) {
   let oldList = (options == null ? void 0 : options.immediate) ? [] : [
-    ...source instanceof Function ? source() : Array.isArray(source) ? source : vueDemi.unref(source)
+    ...source instanceof Function ? source() : Array.isArray(source) ? source : toValue(source)
   ];
   return vueDemi.watch(source, (newList, _, onCleanup) => {
     const oldListRemains = new Array(oldList.length);
@@ -1390,7 +1400,7 @@ function watchAtMost(source, cb, options) {
     source,
     (...args) => {
       current.value += 1;
-      if (current.value >= resolveUnref(count))
+      if (current.value >= toValue(count))
         vueDemi.nextTick(() => stop());
       cb(...args);
     },
@@ -1765,11 +1775,8 @@ function getWatchSources(sources) {
   if (vueDemi.isReactive(sources))
     return sources;
   if (Array.isArray(sources))
-    return sources.map((item) => getOneWatchSource(item));
-  return getOneWatchSource(sources);
-}
-function getOneWatchSource(source) {
-  return typeof source === "function" ? source() : vueDemi.unref(source);
+    return sources.map((item) => toValue(item));
+  return toValue(sources);
 }
 function getOldValue(source) {
   return Array.isArray(source) ? source.map(() => void 0) : void 0;
@@ -1832,6 +1839,7 @@ exports.noop = noop;
 exports.normalizeDate = normalizeDate;
 exports.now = now;
 exports.objectEntries = objectEntries;
+exports.objectOmit = objectOmit;
 exports.objectPick = objectPick;
 exports.pausableFilter = pausableFilter;
 exports.pausableWatch = watchPausable;
@@ -1857,7 +1865,9 @@ exports.throttledRef = refThrottled;
 exports.throttledWatch = watchThrottled;
 exports.timestamp = timestamp;
 exports.toReactive = toReactive;
+exports.toRef = toRef;
 exports.toRefs = toRefs;
+exports.toValue = toValue;
 exports.tryOnBeforeMount = tryOnBeforeMount;
 exports.tryOnBeforeUnmount = tryOnBeforeUnmount;
 exports.tryOnMounted = tryOnMounted;