@vueuse/shared 8.9.3 → 9.0.0-beta.1

package/index.mjs

@@ -1,4 +1,5 @@
-import { shallowRef, watchEffect, readonly, ref, unref, isVue3, watch, customRef, effectScope, provide, inject, getCurrentScope, onScopeDispose, isRef, computed, reactive, toRefs as toRefs$1, toRef, isVue2, set as set$1, getCurrentInstance, onBeforeMount, nextTick, onBeforeUnmount, onMounted, onUnmounted, isReactive } from 'vue-demi';
+import { shallowRef, watchEffect, readonly, unref, ref, isVue3, watch, customRef, effectScope, provide, inject, getCurrentScope, onScopeDispose, isRef, computed, reactive, toRefs as toRefs$1, toRef, isVue2, set as set$1, getCurrentInstance, onBeforeMount, nextTick, onBeforeUnmount, onMounted, onUnmounted, isReactive } from 'vue-demi';
+import { resolveUnref as resolveUnref$1 } from '@vueuse/shared';
 
 var __defProp$9 = Object.defineProperty;
 var __defProps$6 = Object.defineProperties;
@@ -56,6 +57,10 @@ const rand = (min, max) => {
 };
 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) {
+  return typeof r === "function" ? r() : unref(r);
+}
+
 function createFilterWrapper(filter, fn) {
   function wrapper(...args) {
     filter(() => fn.apply(this, args), { fn, thisArg: this, args });
@@ -69,8 +74,8 @@ function debounceFilter(ms, options = {}) {
   let timer;
   let maxTimer;
   const filter = (invoke) => {
-    const duration = unref(ms);
-    const maxDuration = unref(options.maxWait);
+    const duration = resolveUnref(ms);
+    const maxDuration = resolveUnref(options.maxWait);
     if (timer)
       clearTimeout(timer);
     if (duration <= 0 || maxDuration !== void 0 && maxDuration <= 0) {
@@ -108,7 +113,7 @@ function throttleFilter(ms, trailing = true, leading = true) {
     }
   };
   const filter = (invoke) => {
-    const duration = unref(ms);
+    const duration = resolveUnref(ms);
     const elapsed = Date.now() - lastExec;
     clear();
     if (duration <= 0) {
@@ -353,18 +358,6 @@ function isDefined(v) {
   return unref(v) != null;
 }
 
-function logicAnd(...args) {
-  return computed(() => args.every((i) => unref(i)));
-}
-
-function logicNot(v) {
-  return computed(() => !unref(v));
-}
-
-function logicOr(...args) {
-  return computed(() => args.some((i) => unref(i)));
-}
-
 var __defProp$8 = Object.defineProperty;
 var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
 var __hasOwnProp$a = Object.prototype.hasOwnProperty;
@@ -402,17 +395,20 @@ function makeDestructurable(obj, arr) {
   }
 }
 
-function reactify(fn) {
+function reactify(fn, options) {
+  const unrefFn = (options == null ? void 0 : options.computedGetter) === false ? unref : resolveUnref;
   return function(...args) {
-    return computed(() => fn.apply(this, args.map((i) => unref(i))));
+    return computed(() => fn.apply(this, args.map((i) => unrefFn(i))));
   };
 }
 
 function reactifyObject(obj, optionsOrKeys = {}) {
   let keys = [];
+  let options;
   if (Array.isArray(optionsOrKeys)) {
     keys = optionsOrKeys;
   } else {
+    options = optionsOrKeys;
     const { includeOwnProperties = true } = optionsOrKeys;
     keys.push(...Object.keys(obj));
     if (includeOwnProperties)
@@ -422,7 +418,7 @@ function reactifyObject(obj, optionsOrKeys = {}) {
     const value = obj[key];
     return [
       key,
-      typeof value === "function" ? reactify(value.bind(obj)) : value
+      typeof value === "function" ? reactify(value.bind(obj), options) : value
     ];
   }));
 }
@@ -481,7 +477,7 @@ function refAutoReset(defaultValue, afterMs = 1e4) {
     const resetAfter = () => setTimeout(() => {
       value = defaultValue;
       trigger();
-    }, unref(afterMs));
+    }, resolveUnref$1(afterMs));
     tryOnScopeDispose(() => {
       clearTimeout(timer);
     });
@@ -527,7 +523,7 @@ function refDefault(source, defaultValue) {
   });
 }
 
-function useThrottleFn(fn, ms = 200, trailing = true, leading = true) {
+function useThrottleFn(fn, ms = 200, trailing = false, leading = true) {
   return createFilterWrapper(throttleFilter(ms, trailing, leading), fn);
 }
 
@@ -594,10 +590,6 @@ function resolveRef(r) {
   return typeof r === "function" ? computed(r) : ref(r);
 }
 
-function resolveUnref(r) {
-  return typeof r === "function" ? r() : unref(r);
-}
-
 function set(...args) {
   if (args.length === 2) {
     const [ref, value] = args;
@@ -734,7 +726,7 @@ function until(r) {
     });
     const promises = [watcher];
     if (timeout != null) {
-      promises.push(promiseTimeout(timeout, throwOnTimeout).then(() => unref(r)).finally(() => stop == null ? void 0 : stop()));
+      promises.push(promiseTimeout(timeout, throwOnTimeout).then(() => resolveUnref(r)).finally(() => stop == null ? void 0 : stop()));
     }
     return Promise.race(promises);
   }
@@ -757,9 +749,9 @@ function until(r) {
     });
     const promises = [watcher];
     if (timeout != null) {
-      promises.push(promiseTimeout(timeout, throwOnTimeout).then(() => unref(r)).finally(() => {
+      promises.push(promiseTimeout(timeout, throwOnTimeout).then(() => resolveUnref(r)).finally(() => {
         stop == null ? void 0 : stop();
-        return unref(r);
+        return resolveUnref(r);
       }));
     }
     return Promise.race(promises);
@@ -779,7 +771,7 @@ function until(r) {
   function toContains(value, options) {
     return toMatch((v) => {
       const array = Array.from(v);
-      return array.includes(value) || array.includes(unref(value));
+      return array.includes(value) || array.includes(resolveUnref(value));
     }, options);
   }
   function changed(options) {
@@ -792,7 +784,7 @@ function until(r) {
       return count >= n;
     }, options);
   }
-  if (Array.isArray(unref(r))) {
+  if (Array.isArray(resolveUnref(r))) {
     const instance = {
       toMatch,
       toContains,
@@ -823,6 +815,38 @@ function until(r) {
   }
 }
 
+function useArrayEvery(list, fn) {
+  return computed(() => resolveUnref$1(list).every((element, index, array) => fn(resolveUnref$1(element), index, array)));
+}
+
+function useArrayFilter(list, fn) {
+  return computed(() => resolveUnref$1(list).map((i) => resolveUnref$1(i)).filter(fn));
+}
+
+function useArrayFind(list, fn) {
+  return computed(() => resolveUnref$1(resolveUnref$1(list).find((element, index, array) => fn(resolveUnref$1(element), index, array))));
+}
+
+function useArrayJoin(list, separator) {
+  return computed(() => resolveUnref$1(list).map((i) => resolveUnref$1(i)).join(resolveUnref$1(separator)));
+}
+
+function useArrayMap(list, fn) {
+  return computed(() => resolveUnref$1(list).map((i) => resolveUnref$1(i)).map(fn));
+}
+
+function useArrayReduce(list, reducer, ...args) {
+  const reduceCallback = (sum, value, index) => reducer(resolveUnref$1(sum), resolveUnref$1(value), index);
+  return computed(() => {
+    const resolved = resolveUnref$1(list);
+    return args.length ? resolved.reduce(reduceCallback, resolveUnref$1(args[0])) : resolved.reduce(reduceCallback);
+  });
+}
+
+function useArraySome(list, fn) {
+  return computed(() => resolveUnref$1(list).some((element, index, array) => fn(resolveUnref$1(element), index, array)));
+}
+
 function useCounter(initialValue = 0, options = {}) {
   const count = ref(initialValue);
   const {
@@ -889,7 +913,7 @@ const normalizeDate = (date) => {
   return new Date(date);
 };
 function useDateFormat(date, formatStr = "HH:mm:ss") {
-  return computed(() => formatDate(normalizeDate(unref(date)), unref(formatStr)));
+  return computed(() => formatDate(normalizeDate(resolveUnref$1(date)), resolveUnref$1(formatStr)));
 }
 
 function useIntervalFn(cb, interval = 1e3, options = {}) {
@@ -916,7 +940,7 @@ function useIntervalFn(cb, interval = 1e3, options = {}) {
     if (immediateCallback)
       cb();
     clean();
-    timer = setInterval(cb, unref(interval));
+    timer = setInterval(cb, resolveUnref(interval));
   }
   if (immediate && isClient)
     resume();
@@ -997,7 +1021,7 @@ function useTimeoutFn(cb, interval, options = {}) {
       isPending.value = false;
       timer = null;
       cb(...args);
-    }, unref(interval));
+    }, resolveUnref$1(interval));
   }
   if (immediate) {
     isPending.value = true;
@@ -1049,20 +1073,21 @@ function useToggle(initialValue = false, options = {}) {
     falsyValue = false
   } = options;
   const valueIsRef = isRef(initialValue);
-  const innerValue = ref(initialValue);
+  const _value = ref(initialValue);
   function toggle(value) {
     if (arguments.length) {
-      innerValue.value = value;
-      return innerValue.value;
+      _value.value = value;
+      return _value.value;
     } else {
-      innerValue.value = innerValue.value === unref(truthyValue) ? unref(falsyValue) : unref(truthyValue);
-      return innerValue.value;
+      const truthy = resolveUnref(truthyValue);
+      _value.value = _value.value === truthy ? resolveUnref(falsyValue) : truthy;
+      return _value.value;
     }
   }
   if (valueIsRef)
     return toggle;
   else
-    return [innerValue, toggle];
+    return [_value, toggle];
 }
 
 function watchArray(source, cb, options) {
@@ -1138,7 +1163,7 @@ function watchAtMost(source, cb, options) {
   const current = ref(0);
   const stop = watchWithFilter(source, (...args) => {
     current.value += 1;
-    if (current.value >= unref(count))
+    if (current.value >= resolveUnref(count))
       nextTick(() => stop());
     cb(...args);
   }, watchOptions);
@@ -1439,4 +1464,4 @@ function whenever(source, cb, options) {
   }, options);
 }
 
-export { __onlyVue3, logicAnd as and, assert, refAutoReset as autoResetRef, bypassFilter, clamp, computedEager, computedWithControl, containsProp, computedWithControl as controlledComputed, controlledRef, createEventHook, createFilterWrapper, createGlobalState, createInjectionState, reactify as createReactiveFn, createSharedComposable, createSingletonPromise, debounceFilter, refDebounced as debouncedRef, watchDebounced as debouncedWatch, directiveHooks, computedEager as eagerComputed, extendRef, formatDate, get, identity, watchIgnorable as ignorableWatch, increaseWithUnit, invoke, isBoolean, isClient, isDef, isDefined, isFunction, isIOS, isNumber, isObject, isString, isWindow, logicAnd, logicNot, logicOr, makeDestructurable, noop, normalizeDate, logicNot as not, now, objectPick, logicOr as or, pausableFilter, watchPausable as pausableWatch, promiseTimeout, 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, toRefs, tryOnBeforeMount, tryOnBeforeUnmount, tryOnMounted, tryOnScopeDispose, tryOnUnmounted, until, useCounter, useDateFormat, refDebounced as useDebounce, useDebounceFn, useInterval, useIntervalFn, useLastChanged, refThrottled as useThrottle, useThrottleFn, useTimeout, useTimeoutFn, useToggle, watchArray, watchAtMost, watchDebounced, watchIgnorable, watchOnce, watchPausable, watchThrottled, watchTriggerable, watchWithFilter, whenever };
+export { __onlyVue3, assert, refAutoReset as autoResetRef, bypassFilter, clamp, computedEager, computedWithControl, containsProp, computedWithControl as controlledComputed, controlledRef, createEventHook, createFilterWrapper, createGlobalState, createInjectionState, reactify as createReactiveFn, createSharedComposable, createSingletonPromise, debounceFilter, refDebounced as debouncedRef, watchDebounced as debouncedWatch, directiveHooks, computedEager as eagerComputed, extendRef, formatDate, get, identity, watchIgnorable as ignorableWatch, increaseWithUnit, invoke, isBoolean, isClient, isDef, isDefined, isFunction, isIOS, isNumber, isObject, isString, isWindow, makeDestructurable, noop, normalizeDate, now, objectPick, pausableFilter, watchPausable as pausableWatch, promiseTimeout, 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, toRefs, tryOnBeforeMount, tryOnBeforeUnmount, tryOnMounted, tryOnScopeDispose, tryOnUnmounted, until, useArrayEvery, useArrayFilter, useArrayFind, useArrayJoin, useArrayMap, useArrayReduce, useArraySome, useCounter, useDateFormat, refDebounced as useDebounce, useDebounceFn, useInterval, useIntervalFn, useLastChanged, refThrottled as useThrottle, useThrottleFn, useTimeout, useTimeoutFn, useToggle, watchArray, watchAtMost, watchDebounced, watchIgnorable, watchOnce, watchPausable, watchThrottled, watchTriggerable, watchWithFilter, whenever };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vueuse/shared",
-  "version": "8.9.3",
+  "version": "9.0.0-beta.1",
   "author": "Anthony Fu <https://github.com/antfu>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/antfu",
@@ -32,18 +32,6 @@
   "unpkg": "./index.iife.min.js",
   "jsdelivr": "./index.iife.min.js",
   "types": "./index.d.ts",
-  "peerDependencies": {
-    "@vue/composition-api": "^1.1.0",
-    "vue": "^2.6.0 || ^3.2.0"
-  },
-  "peerDependenciesMeta": {
-    "vue": {
-      "optional": true
-    },
-    "@vue/composition-api": {
-      "optional": true
-    }
-  },
   "dependencies": {
     "vue-demi": "*"
   }