@vueuse/shared 12.2.0 → 12.3.0

package/index.mjs

@@ -1,4 +1,4 @@
-import { shallowRef, watchEffect, readonly, ref, watch, customRef, getCurrentScope, onScopeDispose, effectScope, getCurrentInstance, hasInjectionContext, inject, provide, isRef, unref, computed, reactive, toRefs as toRefs$1, toRef as toRef$1, onBeforeMount, nextTick, onBeforeUnmount, onMounted, onUnmounted, isReactive } from 'vue';
+import { shallowRef, watchEffect, readonly, ref, watch, customRef, getCurrentScope, onScopeDispose, effectScope, getCurrentInstance, hasInjectionContext, inject, provide, isRef, unref, toValue as toValue$1, computed, reactive, toRefs as toRefs$1, toRef as toRef$1, onBeforeMount, nextTick, onBeforeUnmount, onMounted, onUnmounted, isReactive } from 'vue';
 
 function computedEager(fn, options) {
   var _a;
@@ -206,13 +206,8 @@ function makeDestructurable(obj, arr) {
   }
 }
 
-function toValue(r) {
-  return typeof r === "function" ? r() : unref(r);
-}
-const resolveUnref = toValue;
-
 function reactify(fn, options) {
-  const unrefFn = (options == null ? void 0 : options.computedGetter) === false ? unref : toValue;
+  const unrefFn = (options == null ? void 0 : options.computedGetter) === false ? unref : toValue$1;
   return function(...args) {
     return computed(() => fn.apply(this, args.map((i) => unrefFn(i))));
   };
@@ -281,7 +276,7 @@ function reactiveComputed(fn) {
 function reactiveOmit(obj, ...keys) {
   const flatKeys = keys.flat();
   const predicate = flatKeys[0];
-  return reactiveComputed(() => typeof predicate === "function" ? Object.fromEntries(Object.entries(toRefs$1(obj)).filter(([k, v]) => !predicate(toValue(v), k))) : Object.fromEntries(Object.entries(toRefs$1(obj)).filter((e) => !flatKeys.includes(e[0]))));
+  return reactiveComputed(() => typeof predicate === "function" ? Object.fromEntries(Object.entries(toRefs$1(obj)).filter(([k, v]) => !predicate(toValue$1(v), k))) : Object.fromEntries(Object.entries(toRefs$1(obj)).filter((e) => !flatKeys.includes(e[0]))));
 }
 
 const isClient = typeof window !== "undefined" && typeof document !== "undefined";
@@ -332,8 +327,8 @@ function debounceFilter(ms, options = {}) {
     lastRejector = noop;
   };
   const filter = (invoke) => {
-    const duration = toValue(ms);
-    const maxDuration = toValue(options.maxWait);
+    const duration = toValue$1(ms);
+    const maxDuration = toValue$1(options.maxWait);
     if (timer)
       _clearTimeout(timer);
     if (duration <= 0 || maxDuration !== void 0 && maxDuration <= 0) {
@@ -386,7 +381,7 @@ function throttleFilter(...args) {
     }
   };
   const filter = (_invoke) => {
-    const duration = toValue(ms);
+    const duration = toValue$1(ms);
     const elapsed = Date.now() - lastExec;
     const invoke = () => {
       return lastValue = _invoke();
@@ -512,6 +507,9 @@ function objectEntries(obj) {
 function getLifeCycleTarget(target) {
   return target || getCurrentInstance();
 }
+function toArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
 
 function toRef(...args) {
   if (args.length !== 1)
@@ -524,17 +522,17 @@ const resolveRef = toRef;
 function reactivePick(obj, ...keys) {
   const flatKeys = keys.flat();
   const predicate = flatKeys[0];
-  return reactiveComputed(() => typeof predicate === "function" ? Object.fromEntries(Object.entries(toRefs$1(obj)).filter(([k, v]) => predicate(toValue(v), k))) : Object.fromEntries(flatKeys.map((k) => [k, toRef(obj, k)])));
+  return reactiveComputed(() => typeof predicate === "function" ? Object.fromEntries(Object.entries(toRefs$1(obj)).filter(([k, v]) => predicate(toValue$1(v), k))) : Object.fromEntries(flatKeys.map((k) => [k, toRef(obj, k)])));
 }
 
 function refAutoReset(defaultValue, afterMs = 1e4) {
   return customRef((track, trigger) => {
-    let value = toValue(defaultValue);
+    let value = toValue$1(defaultValue);
     let timer;
     const resetAfter = () => setTimeout(() => {
-      value = toValue(defaultValue);
+      value = toValue$1(defaultValue);
       trigger();
-    }, toValue(afterMs));
+    }, toValue$1(afterMs));
     tryOnScopeDispose(() => {
       clearTimeout(timer);
     });
@@ -739,8 +737,7 @@ function syncRefs(source, targets, options = {}) {
     deep = false,
     immediate = true
   } = options;
-  if (!Array.isArray(targets))
-    targets = [targets];
+  targets = toArray(targets);
   return watch(
     source,
     (newValue) => targets.forEach((target) => target.value = newValue),
@@ -759,7 +756,7 @@ function toRefs(objectRef, options = {}) {
       },
       set(v) {
         var _a;
-        const replaceRef = (_a = toValue(options.replaceRef)) != null ? _a : true;
+        const replaceRef = (_a = toValue$1(options.replaceRef)) != null ? _a : true;
         if (replaceRef) {
           if (Array.isArray(objectRef.value)) {
             const copy = [...objectRef.value];
@@ -779,6 +776,9 @@ function toRefs(objectRef, options = {}) {
   return result;
 }
 
+const toValue = toValue$1;
+const resolveUnref = toValue$1;
+
 function tryOnBeforeMount(fn, sync = true, target) {
   const instance = getLifeCycleTarget(target);
   if (instance)
@@ -836,7 +836,7 @@ function createUntil(r, isNot = false) {
     const promises = [watcher];
     if (timeout != null) {
       promises.push(
-        promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => stop == null ? void 0 : stop())
+        promiseTimeout(timeout, throwOnTimeout).then(() => toValue$1(r)).finally(() => stop == null ? void 0 : stop())
       );
     }
     return Promise.race(promises);
@@ -868,9 +868,9 @@ function createUntil(r, isNot = false) {
     const promises = [watcher];
     if (timeout != null) {
       promises.push(
-        promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => {
+        promiseTimeout(timeout, throwOnTimeout).then(() => toValue$1(r)).finally(() => {
           stop == null ? void 0 : stop();
-          return toValue(r);
+          return toValue$1(r);
         })
       );
     }
@@ -891,7 +891,7 @@ function createUntil(r, isNot = false) {
   function toContains(value, options) {
     return toMatch((v) => {
       const array = Array.from(v);
-      return array.includes(value) || array.includes(toValue(value));
+      return array.includes(value) || array.includes(toValue$1(value));
     }, options);
   }
   function changed(options) {
@@ -904,7 +904,7 @@ function createUntil(r, isNot = false) {
       return count >= n;
     }, options);
   }
-  if (Array.isArray(toValue(r))) {
+  if (Array.isArray(toValue$1(r))) {
     const instance = {
       toMatch,
       toContains,
@@ -951,31 +951,31 @@ function useArrayDifference(...args) {
     const key = compareFn;
     compareFn = (value, othVal) => value[key] === othVal[key];
   }
-  const diff1 = computed(() => toValue(list).filter((x) => toValue(values).findIndex((y) => compareFn(x, y)) === -1));
+  const diff1 = computed(() => toValue$1(list).filter((x) => toValue$1(values).findIndex((y) => compareFn(x, y)) === -1));
   if (symmetric) {
-    const diff2 = computed(() => toValue(values).filter((x) => toValue(list).findIndex((y) => compareFn(x, y)) === -1));
-    return computed(() => symmetric ? [...toValue(diff1), ...toValue(diff2)] : toValue(diff1));
+    const diff2 = computed(() => toValue$1(values).filter((x) => toValue$1(list).findIndex((y) => compareFn(x, y)) === -1));
+    return computed(() => symmetric ? [...toValue$1(diff1), ...toValue$1(diff2)] : toValue$1(diff1));
   } else {
     return diff1;
   }
 }
 
 function useArrayEvery(list, fn) {
-  return computed(() => toValue(list).every((element, index, array) => fn(toValue(element), index, array)));
+  return computed(() => toValue$1(list).every((element, index, array) => fn(toValue$1(element), index, array)));
 }
 
 function useArrayFilter(list, fn) {
-  return computed(() => toValue(list).map((i) => toValue(i)).filter(fn));
+  return computed(() => toValue$1(list).map((i) => toValue$1(i)).filter(fn));
 }
 
 function useArrayFind(list, fn) {
-  return computed(() => toValue(
-    toValue(list).find((element, index, array) => fn(toValue(element), index, array))
+  return computed(() => toValue$1(
+    toValue$1(list).find((element, index, array) => fn(toValue$1(element), index, array))
   ));
 }
 
 function useArrayFindIndex(list, fn) {
-  return computed(() => toValue(list).findIndex((element, index, array) => fn(toValue(element), index, array)));
+  return computed(() => toValue$1(list).findIndex((element, index, array) => fn(toValue$1(element), index, array)));
 }
 
 function findLast(arr, cb) {
@@ -987,8 +987,8 @@ function findLast(arr, cb) {
   return void 0;
 }
 function useArrayFindLast(list, fn) {
-  return computed(() => 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))
+  return computed(() => toValue$1(
+    !Array.prototype.findLast ? findLast(toValue$1(list), (element, index, array) => fn(toValue$1(element), index, array)) : toValue$1(list).findLast((element, index, array) => fn(toValue$1(element), index, array))
   ));
 }
 
@@ -1007,35 +1007,35 @@ function useArrayIncludes(...args) {
   }
   if (typeof comparator === "string") {
     const key = comparator;
-    comparator = (element, value2) => element[key] === toValue(value2);
+    comparator = (element, value2) => element[key] === toValue$1(value2);
   }
-  comparator = comparator != null ? comparator : (element, value2) => element === toValue(value2);
-  return computed(() => toValue(list).slice(formIndex).some((element, index, array) => comparator(
-    toValue(element),
-    toValue(value),
+  comparator = comparator != null ? comparator : (element, value2) => element === toValue$1(value2);
+  return computed(() => toValue$1(list).slice(formIndex).some((element, index, array) => comparator(
+    toValue$1(element),
+    toValue$1(value),
     index,
-    toValue(array)
+    toValue$1(array)
   )));
 }
 
 function useArrayJoin(list, separator) {
-  return computed(() => toValue(list).map((i) => toValue(i)).join(toValue(separator)));
+  return computed(() => toValue$1(list).map((i) => toValue$1(i)).join(toValue$1(separator)));
 }
 
 function useArrayMap(list, fn) {
-  return computed(() => toValue(list).map((i) => toValue(i)).map(fn));
+  return computed(() => toValue$1(list).map((i) => toValue$1(i)).map(fn));
 }
 
 function useArrayReduce(list, reducer, ...args) {
-  const reduceCallback = (sum, value, index) => reducer(toValue(sum), toValue(value), index);
+  const reduceCallback = (sum, value, index) => reducer(toValue$1(sum), toValue$1(value), index);
   return computed(() => {
-    const resolved = toValue(list);
-    return args.length ? resolved.reduce(reduceCallback, typeof args[0] === "function" ? toValue(args[0]()) : toValue(args[0])) : resolved.reduce(reduceCallback);
+    const resolved = toValue$1(list);
+    return args.length ? resolved.reduce(reduceCallback, typeof args[0] === "function" ? toValue$1(args[0]()) : toValue$1(args[0])) : resolved.reduce(reduceCallback);
   });
 }
 
 function useArraySome(list, fn) {
-  return computed(() => toValue(list).some((element, index, array) => fn(toValue(element), index, array)));
+  return computed(() => toValue$1(list).some((element, index, array) => fn(toValue$1(element), index, array)));
 }
 
 function uniq(array) {
@@ -1050,7 +1050,7 @@ function uniqueElementsBy(array, fn) {
 }
 function useArrayUnique(list, compareFn) {
   return computed(() => {
-    const resolvedList = toValue(list).map((element) => toValue(element));
+    const resolvedList = toValue$1(list).map((element) => toValue$1(element));
     return compareFn ? uniqueElementsBy(resolvedList, compareFn) : uniq(resolvedList);
   });
 }
@@ -1104,8 +1104,8 @@ function formatDate(date, formatStr, options = {}) {
     M: () => month + 1,
     Mo: () => formatOrdinal(month + 1),
     MM: () => `${month + 1}`.padStart(2, "0"),
-    MMM: () => date.toLocaleDateString(toValue(options.locales), { month: "short" }),
-    MMMM: () => date.toLocaleDateString(toValue(options.locales), { month: "long" }),
+    MMM: () => date.toLocaleDateString(toValue$1(options.locales), { month: "short" }),
+    MMMM: () => date.toLocaleDateString(toValue$1(options.locales), { month: "long" }),
     D: () => String(days),
     Do: () => formatOrdinal(days),
     DD: () => `${days}`.padStart(2, "0"),
@@ -1123,9 +1123,9 @@ function formatDate(date, formatStr, options = {}) {
     ss: () => `${seconds}`.padStart(2, "0"),
     SSS: () => `${milliseconds}`.padStart(3, "0"),
     d: () => day,
-    dd: () => date.toLocaleDateString(toValue(options.locales), { weekday: "narrow" }),
-    ddd: () => date.toLocaleDateString(toValue(options.locales), { weekday: "short" }),
-    dddd: () => date.toLocaleDateString(toValue(options.locales), { weekday: "long" }),
+    dd: () => date.toLocaleDateString(toValue$1(options.locales), { weekday: "narrow" }),
+    ddd: () => date.toLocaleDateString(toValue$1(options.locales), { weekday: "short" }),
+    dddd: () => date.toLocaleDateString(toValue$1(options.locales), { weekday: "long" }),
     A: () => meridiem(hours, minutes),
     AA: () => meridiem(hours, minutes, false, true),
     a: () => meridiem(hours, minutes, true),
@@ -1154,7 +1154,7 @@ function normalizeDate(date) {
   return new Date(date);
 }
 function useDateFormat(date, formatStr = "HH:mm:ss", options = {}) {
-  return computed(() => formatDate(normalizeDate(toValue(date)), toValue(formatStr), options));
+  return computed(() => formatDate(normalizeDate(toValue$1(date)), toValue$1(formatStr), options));
 }
 
 function useIntervalFn(cb, interval = 1e3, options = {}) {
@@ -1175,7 +1175,7 @@ function useIntervalFn(cb, interval = 1e3, options = {}) {
     clean();
   }
   function resume() {
-    const intervalValue = toValue(interval);
+    const intervalValue = toValue$1(interval);
     if (intervalValue <= 0)
       return;
     isActive.value = true;
@@ -1266,7 +1266,7 @@ function useTimeoutFn(cb, interval, options = {}) {
       isPending.value = false;
       timer = null;
       cb(...args);
-    }, toValue(interval));
+    }, toValue$1(interval));
   }
   if (immediate) {
     isPending.value = true;
@@ -1309,8 +1309,10 @@ function useToNumber(value, options = {}) {
     nanToZero
   } = options;
   return computed(() => {
-    let resolved = toValue(value);
-    if (typeof resolved === "string")
+    let resolved = toValue$1(value);
+    if (typeof method === "function")
+      resolved = method(resolved);
+    else if (typeof resolved === "string")
       resolved = Number[method](resolved, radix);
     if (nanToZero && Number.isNaN(resolved))
       resolved = 0;
@@ -1319,7 +1321,7 @@ function useToNumber(value, options = {}) {
 }
 
 function useToString(value) {
-  return computed(() => `${toValue(value)}`);
+  return computed(() => `${toValue$1(value)}`);
 }
 
 function useToggle(initialValue = false, options = {}) {
@@ -1334,8 +1336,8 @@ function useToggle(initialValue = false, options = {}) {
       _value.value = value;
       return _value.value;
     } else {
-      const truthy = toValue(truthyValue);
-      _value.value = _value.value === truthy ? toValue(falsyValue) : truthy;
+      const truthy = toValue$1(truthyValue);
+      _value.value = _value.value === truthy ? toValue$1(falsyValue) : truthy;
       return _value.value;
     }
   }
@@ -1346,7 +1348,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 : toValue(source)];
+  let oldList = (options == null ? void 0 : options.immediate) ? [] : [...source instanceof Function ? source() : Array.isArray(source) ? source : toValue$1(source)];
   return watch(source, (newList, _, onCleanup) => {
     const oldListRemains = Array.from({ length: oldList.length });
     const added = [];
@@ -1378,7 +1380,7 @@ function watchAtMost(source, cb, options) {
     source,
     (...args) => {
       current.value += 1;
-      if (current.value >= toValue(count))
+      if (current.value >= toValue$1(count))
         nextTick(() => stop());
       cb(...args);
     },
@@ -1555,8 +1557,8 @@ function getWatchSources(sources) {
   if (isReactive(sources))
     return sources;
   if (Array.isArray(sources))
-    return sources.map((item) => toValue(item));
-  return toValue(sources);
+    return sources.map((item) => toValue$1(item));
+  return toValue$1(sources);
 }
 function getOldValue(source) {
   return Array.isArray(source) ? source.map(() => void 0) : void 0;
@@ -1580,4 +1582,4 @@ function whenever(source, cb, options) {
   return stop;
 }
 
-export { assert, refAutoReset as autoResetRef, bypassFilter, camelize, clamp, computedEager, computedWithControl, containsProp, computedWithControl as controlledComputed, controlledRef, createEventHook, createFilterWrapper, createGlobalState, createInjectionState, reactify as createReactiveFn, createSharedComposable, createSingletonPromise, debounceFilter, refDebounced as debouncedRef, watchDebounced as debouncedWatch, computedEager as eagerComputed, extendRef, formatDate, get, getLifeCycleTarget, hasOwn, hyphenate, identity, watchIgnorable as ignorableWatch, increaseWithUnit, injectLocal, invoke, isClient, isDef, isDefined, isIOS, isObject, isWorker, makeDestructurable, noop, normalizeDate, notNullish, now, objectEntries, objectOmit, objectPick, pausableFilter, watchPausable as pausableWatch, promiseTimeout, provideLocal, pxValue, rand, reactify, reactifyObject, reactiveComputed, reactiveOmit, reactivePick, refAutoReset, refDebounced, refDefault, refThrottled, refWithControl, resolveRef, resolveUnref, set, syncRef, syncRefs, throttleFilter, refThrottled as throttledRef, watchThrottled as throttledWatch, timestamp, toReactive, toRef, toRefs, toValue, tryOnBeforeMount, tryOnBeforeUnmount, tryOnMounted, tryOnScopeDispose, tryOnUnmounted, until, useArrayDifference, useArrayEvery, useArrayFilter, useArrayFind, useArrayFindIndex, useArrayFindLast, useArrayIncludes, useArrayJoin, useArrayMap, useArrayReduce, useArraySome, useArrayUnique, useCounter, useDateFormat, refDebounced as useDebounce, useDebounceFn, useInterval, useIntervalFn, useLastChanged, refThrottled as useThrottle, useThrottleFn, useTimeout, useTimeoutFn, useToNumber, useToString, useToggle, watchArray, watchAtMost, watchDebounced, watchDeep, watchIgnorable, watchImmediate, watchOnce, watchPausable, watchThrottled, watchTriggerable, watchWithFilter, whenever };
+export { assert, refAutoReset as autoResetRef, bypassFilter, camelize, clamp, computedEager, computedWithControl, containsProp, computedWithControl as controlledComputed, controlledRef, createEventHook, createFilterWrapper, createGlobalState, createInjectionState, reactify as createReactiveFn, createSharedComposable, createSingletonPromise, debounceFilter, refDebounced as debouncedRef, watchDebounced as debouncedWatch, computedEager as eagerComputed, extendRef, formatDate, get, getLifeCycleTarget, hasOwn, hyphenate, identity, watchIgnorable as ignorableWatch, increaseWithUnit, injectLocal, invoke, isClient, isDef, isDefined, isIOS, isObject, isWorker, makeDestructurable, noop, normalizeDate, notNullish, now, objectEntries, objectOmit, objectPick, pausableFilter, watchPausable as pausableWatch, promiseTimeout, provideLocal, pxValue, rand, reactify, reactifyObject, reactiveComputed, reactiveOmit, reactivePick, refAutoReset, refDebounced, refDefault, refThrottled, refWithControl, resolveRef, resolveUnref, set, syncRef, syncRefs, throttleFilter, refThrottled as throttledRef, watchThrottled as throttledWatch, timestamp, toArray, toReactive, toRef, toRefs, toValue, tryOnBeforeMount, tryOnBeforeUnmount, tryOnMounted, tryOnScopeDispose, tryOnUnmounted, until, useArrayDifference, useArrayEvery, useArrayFilter, useArrayFind, useArrayFindIndex, useArrayFindLast, useArrayIncludes, useArrayJoin, useArrayMap, useArrayReduce, useArraySome, useArrayUnique, useCounter, useDateFormat, refDebounced as useDebounce, useDebounceFn, useInterval, useIntervalFn, useLastChanged, refThrottled as useThrottle, useThrottleFn, useTimeout, useTimeoutFn, useToNumber, useToString, useToggle, watchArray, watchAtMost, watchDebounced, watchDeep, watchIgnorable, watchImmediate, watchOnce, watchPausable, watchThrottled, watchTriggerable, watchWithFilter, whenever };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vueuse/shared",
   "type": "module",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "author": "Anthony Fu <https://github.com/antfu>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/antfu",