@vueuse/shared 10.4.0 → 10.5.0

package/index.mjs

@@ -1,12 +1,13 @@
-import { shallowRef, watchEffect, readonly, ref, watch, customRef, getCurrentScope, onScopeDispose, effectScope, provide, inject, isVue3, version, isRef, unref, computed, reactive, toRefs as toRefs$1, toRef as toRef$1, isVue2, set as set$1, getCurrentInstance, onBeforeMount, nextTick, onBeforeUnmount, onMounted, onUnmounted, isReactive } from 'vue-demi';
+import { shallowRef, watchEffect, readonly, ref, watch, customRef, getCurrentScope, onScopeDispose, effectScope, getCurrentInstance, provide, inject, isVue3, version, isRef, unref, computed, reactive, toRefs as toRefs$1, toRef as toRef$1, isVue2, set as set$1, onBeforeMount, nextTick, onBeforeUnmount, onMounted, onUnmounted, isReactive } from 'vue-demi';
 
 function computedEager(fn, options) {
+  var _a;
   const result = shallowRef();
   watchEffect(() => {
     result.value = fn();
   }, {
     ...options,
-    flush: options?.flush ?? "sync"
+    flush: (_a = options == null ? void 0 : options.flush) != null ? _a : "sync"
   });
   return readonly(result);
 }
@@ -36,7 +37,7 @@ function computedWithControl(source, fn) {
         return v;
       },
       set(v2) {
-        set?.(v2);
+        set == null ? void 0 : set(v2);
       }
     };
   });
@@ -89,14 +90,39 @@ function createGlobalState(stateFactory) {
   };
 }
 
-function createInjectionState(composable) {
-  const key = Symbol("InjectionState");
+const localProvidedStateMap = /* @__PURE__ */ new WeakMap();
+
+const provideLocal = (key, value) => {
+  var _a;
+  const instance = (_a = getCurrentInstance()) == null ? void 0 : _a.proxy;
+  if (instance == null)
+    throw new Error("provideLocal must be called in setup");
+  if (!localProvidedStateMap.has(instance))
+    localProvidedStateMap.set(instance, /* @__PURE__ */ Object.create(null));
+  const localProvidedState = localProvidedStateMap.get(instance);
+  localProvidedState[key] = value;
+  provide(key, value);
+};
+
+const injectLocal = (...args) => {
+  var _a;
+  const key = args[0];
+  const instance = (_a = getCurrentInstance()) == null ? void 0 : _a.proxy;
+  if (instance == null)
+    throw new Error("injectLocal must be called in setup");
+  if (localProvidedStateMap.has(instance) && key in localProvidedStateMap.get(instance))
+    return localProvidedStateMap.get(instance)[key];
+  return inject(...args);
+};
+
+function createInjectionState(composable, options) {
+  const key = (options == null ? void 0 : options.injectionKey) || Symbol("InjectionState");
   const useProvidingState = (...args) => {
     const state = composable(...args);
-    provide(key, state);
+    provideLocal(key, state);
     return state;
   };
-  const useInjectedState = () => inject(key);
+  const useInjectedState = () => injectLocal(key);
   return [useProvidingState, useInjectedState];
 }
 
@@ -186,7 +212,7 @@ function toValue(r) {
 const resolveUnref = toValue;
 
 function reactify(fn, options) {
-  const unrefFn = options?.computedGetter === false ? unref : toValue;
+  const unrefFn = (options == null ? void 0 : options.computedGetter) === false ? unref : toValue;
   return function(...args) {
     return computed(() => fn.apply(this, args.map((i) => unrefFn(i))));
   };
@@ -255,9 +281,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(v), k))) : Object.fromEntries(Object.entries(toRefs$1(obj)).filter((e) => !flatKeys.includes(e[0]))));
 }
 
 const isClient = typeof window !== "undefined" && typeof document !== "undefined";
@@ -282,7 +306,8 @@ const rand = (min, max) => {
 const hasOwn = (val, key) => Object.prototype.hasOwnProperty.call(val, key);
 const isIOS = /* @__PURE__ */ getIsIOS();
 function getIsIOS() {
-  return isClient && window?.navigator?.userAgent && /* @__PURE__ */ /iP(ad|hone|od)/.test(window.navigator.userAgent);
+  var _a;
+  return isClient && ((_a = window == null ? void 0 : window.navigator) == null ? void 0 : _a.userAgent) && /* @__PURE__ */ /iP(ad|hone|od)/.test(window.navigator.userAgent);
 }
 
 function createFilterWrapper(filter, fn) {
@@ -412,9 +437,7 @@ function cacheStringFunction(fn) {
   };
 }
 const hyphenateRE = /\B([A-Z])/g;
-const hyphenate = cacheStringFunction(
-  (str) => str.replace(hyphenateRE, "-$1").toLowerCase()
-);
+const hyphenate = cacheStringFunction((str) => str.replace(hyphenateRE, "-$1").toLowerCase());
 const camelizeRE = /-(\w)/g;
 const camelize = cacheStringFunction((str) => {
   return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : "");
@@ -453,9 +476,10 @@ function containsProp(obj, ...props) {
   return props.some((k) => k in obj);
 }
 function increaseWithUnit(target, delta) {
+  var _a;
   if (typeof target === "number")
     return target + delta;
-  const value = target.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
+  const value = ((_a = target.match(/^-?[0-9]+\.?[0-9]*/)) == null ? void 0 : _a[0]) || "";
   const unit = target.slice(value.length);
   const result = Number.parseFloat(value) + delta;
   if (Number.isNaN(result))
@@ -539,7 +563,8 @@ function refDebounced(value, ms = 200, options = {}) {
 function refDefault(source, defaultValue) {
   return computed({
     get() {
-      return source.value ?? defaultValue;
+      var _a;
+      return (_a = source.value) != null ? _a : defaultValue;
     },
     set(value) {
       source.value = value;
@@ -587,13 +612,14 @@ function refWithControl(initial, options = {}) {
     return source;
   }
   function set(value, triggering = true) {
+    var _a, _b;
     if (value === source)
       return;
     const old = source;
-    if (options.onBeforeChange?.(value, old) === false)
+    if (((_a = options.onBeforeChange) == null ? void 0 : _a.call(options, value, old)) === false)
       return;
     source = value;
-    options.onChanged?.(value, old);
+    (_b = options.onChanged) == null ? void 0 : _b.call(options, value, old);
     if (triggering)
       trigger();
   }
@@ -664,6 +690,7 @@ function watchPausable(source, cb, options = {}) {
 }
 
 function syncRef(left, right, options = {}) {
+  var _a, _b;
   const {
     flush = "sync",
     deep = false,
@@ -672,8 +699,8 @@ function syncRef(left, right, options = {}) {
     transform = {}
   } = options;
   const watchers = [];
-  const transformLTR = transform.ltr ?? ((v) => v);
-  const transformRTL = transform.rtl ?? ((v) => v);
+  const transformLTR = (_a = transform.ltr) != null ? _a : (v) => v;
+  const transformRTL = (_b = transform.rtl) != null ? _b : (v) => v;
   if (direction === "both" || direction === "ltr") {
     watchers.push(watchPausable(
       left,
@@ -727,7 +754,8 @@ function toRefs(objectRef, options = {}) {
         return objectRef.value[key];
       },
       set(v) {
-        const replaceRef = toValue(options.replaceRef) ?? true;
+        var _a;
+        const replaceRef = (_a = toValue(options.replaceRef)) != null ? _a : true;
         if (replaceRef) {
           if (Array.isArray(objectRef.value)) {
             const copy = [...objectRef.value];
@@ -783,7 +811,7 @@ function createUntil(r, isNot = false) {
         r,
         (v) => {
           if (condition(v) !== isNot) {
-            stop?.();
+            stop == null ? void 0 : stop();
             resolve(v);
           }
         },
@@ -797,7 +825,7 @@ function createUntil(r, isNot = false) {
     const promises = [watcher];
     if (timeout != null) {
       promises.push(
-        promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => stop?.())
+        promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => stop == null ? void 0 : stop())
       );
     }
     return Promise.race(promises);
@@ -805,14 +833,14 @@ function createUntil(r, isNot = false) {
   function toBe(value, options) {
     if (!isRef(value))
       return toMatch((v) => v === value, options);
-    const { flush = "sync", deep = false, timeout, throwOnTimeout } = options ?? {};
+    const { flush = "sync", deep = false, timeout, throwOnTimeout } = options != null ? options : {};
     let stop = null;
     const watcher = new Promise((resolve) => {
       stop = watch(
         [r, value],
         ([v1, v2]) => {
           if (isNot !== (v1 === v2)) {
-            stop?.();
+            stop == null ? void 0 : stop();
             resolve(v1);
           }
         },
@@ -827,7 +855,7 @@ function createUntil(r, isNot = false) {
     if (timeout != null) {
       promises.push(
         promiseTimeout(timeout, throwOnTimeout).then(() => toValue(r)).finally(() => {
-          stop?.();
+          stop == null ? void 0 : stop();
           return toValue(r);
         })
       );
@@ -898,9 +926,10 @@ function defaultComparator(value, othVal) {
   return value === othVal;
 }
 function useArrayDifference(...args) {
+  var _a;
   const list = args[0];
   const values = args[1];
-  let compareFn = args[2] ?? defaultComparator;
+  let compareFn = (_a = args[2]) != null ? _a : defaultComparator;
   if (typeof compareFn === "string") {
     const key = compareFn;
     compareFn = (value, othVal) => value[key] === othVal[key];
@@ -917,11 +946,9 @@ function useArrayFilter(list, fn) {
 }
 
 function useArrayFind(list, fn) {
-  return computed(
-    () => toValue(
-      toValue(list).find((element, index, array) => fn(toValue(element), index, array))
-    )
-  );
+  return computed(() => toValue(
+    toValue(list).find((element, index, array) => fn(toValue(element), index, array))
+  ));
 }
 
 function useArrayFindIndex(list, fn) {
@@ -937,35 +964,35 @@ 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(
+    !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))
+  ));
 }
 
 function isArrayIncludesOptions(obj) {
   return isObject(obj) && containsProp(obj, "formIndex", "comparator");
 }
 function useArrayIncludes(...args) {
+  var _a;
   const list = args[0];
   const value = args[1];
   let comparator = args[2];
   let formIndex = 0;
   if (isArrayIncludesOptions(comparator)) {
-    formIndex = comparator.fromIndex ?? 0;
+    formIndex = (_a = comparator.fromIndex) != null ? _a : 0;
     comparator = comparator.comparator;
   }
   if (typeof comparator === "string") {
     const key = comparator;
     comparator = (element, value2) => element[key] === toValue(value2);
   }
-  comparator = comparator ?? ((element, value2) => element === toValue(value2));
-  return computed(
-    () => toValue(list).slice(formIndex).some(
-      (element, index, array) => comparator(toValue(element), toValue(value), index, toValue(array))
-    )
-  );
+  comparator = comparator != null ? comparator : (element, value2) => element === toValue(value2);
+  return computed(() => toValue(list).slice(formIndex).some((element, index, array) => comparator(
+    toValue(element),
+    toValue(value),
+    index,
+    toValue(array)
+  )));
 }
 
 function useArrayJoin(list, separator) {
@@ -1032,6 +1059,7 @@ function defaultMeridiem(hours, minutes, isLowercase, hasPeriod) {
   return isLowercase ? m.toLowerCase() : m;
 }
 function formatDate(date, formatStr, options = {}) {
+  var _a;
   const years = date.getFullYear();
   const month = date.getMonth();
   const days = date.getDate();
@@ -1040,7 +1068,7 @@ function formatDate(date, formatStr, options = {}) {
   const seconds = date.getSeconds();
   const milliseconds = date.getMilliseconds();
   const day = date.getDay();
-  const meridiem = options.customMeridiem ?? defaultMeridiem;
+  const meridiem = (_a = options.customMeridiem) != null ? _a : defaultMeridiem;
   const matches = {
     YY: () => String(years).slice(-2),
     YYYY: () => years,
@@ -1068,7 +1096,10 @@ function formatDate(date, formatStr, options = {}) {
     a: () => meridiem(hours, minutes, true),
     aa: () => meridiem(hours, minutes, true, true)
   };
-  return formatStr.replace(REGEX_FORMAT, (match, $1) => $1 ?? matches[match]?.() ?? match);
+  return formatStr.replace(REGEX_FORMAT, (match, $1) => {
+    var _a2, _b;
+    return (_b = $1 != null ? $1 : (_a2 = matches[match]) == null ? void 0 : _a2.call(matches)) != null ? _b : match;
+  });
 }
 function normalizeDate(date) {
   if (date === null)
@@ -1166,7 +1197,8 @@ function useInterval(interval = 1e3, options = {}) {
 }
 
 function useLastChanged(source, options = {}) {
-  const ms = ref(options.initialValue ?? null);
+  var _a;
+  const ms = ref((_a = options.initialValue) != null ? _a : null);
   watch(
     source,
     () => ms.value = timestamp(),
@@ -1219,7 +1251,7 @@ function useTimeout(interval = 1e3, options = {}) {
     callback
   } = options;
   const controls = useTimeoutFn(
-    callback ?? noop,
+    callback != null ? callback : noop,
     interval,
     options
   );
@@ -1278,9 +1310,7 @@ function useToggle(initialValue = false, options = {}) {
 }
 
 function watchArray(source, cb, options) {
-  let oldList = 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(source)];
   return watch(source, (newList, _, onCleanup) => {
     const oldListRemains = Array.from({ length: oldList.length });
     const added = [];
@@ -1506,4 +1536,4 @@ function whenever(source, cb, options) {
   );
 }
 
-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, directiveHooks, computedEager as eagerComputed, extendRef, formatDate, get, hasOwn, hyphenate, identity, watchIgnorable as ignorableWatch, increaseWithUnit, invoke, isClient, isDef, isDefined, isIOS, isObject, makeDestructurable, noop, normalizeDate, notNullish, now, objectEntries, objectOmit, 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, 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, directiveHooks, computedEager as eagerComputed, extendRef, formatDate, get, hasOwn, hyphenate, identity, watchIgnorable as ignorableWatch, increaseWithUnit, injectLocal, invoke, isClient, isDef, isDefined, isIOS, isObject, makeDestructurable, noop, normalizeDate, notNullish, now, objectEntries, objectOmit, objectPick, pausableFilter, watchPausable as pausableWatch, promiseTimeout, provideLocal, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vueuse/shared",
-  "version": "10.4.0",
+  "version": "10.5.0",
   "author": "Anthony Fu <https://github.com/antfu>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/antfu",
@@ -32,6 +32,6 @@
   "jsdelivr": "./index.iife.min.js",
   "types": "./index.d.cts",
   "dependencies": {
-    "vue-demi": ">=0.14.5"
+    "vue-demi": ">=0.14.6"
   }
 }