@reactive-vscode/vueuse 0.2.8 → 0.2.9

package/dist/index.cjs

@@ -569,10 +569,8 @@ function set(...args) {
     ref.value = value;
   }
   if (args.length === 3) {
-    {
-      const [target, key, value] = args;
-      target[key] = value;
-    }
+    const [target, key, value] = args;
+    target[key] = value;
   }
 }
 function watchWithFilter(source, cb, options = {}) {
@@ -893,7 +891,7 @@ function useArrayReduce(list, reducer, ...args) {
   const reduceCallback = (sum, value, index) => reducer(toValue(sum), toValue(value), index);
   return reactivity.computed(() => {
     const resolved = toValue(list);
-    return args.length ? resolved.reduce(reduceCallback, toValue(args[0])) : resolved.reduce(reduceCallback);
+    return args.length ? resolved.reduce(reduceCallback, typeof args[0] === "function" ? toValue(args[0]()) : toValue(args[0])) : resolved.reduce(reduceCallback);
   });
 }
 function useArraySome(list, fn) {
@@ -1040,7 +1038,8 @@ function useIntervalFn(cb, interval = 1e3, options = {}) {
     if (immediateCallback)
       cb();
     clean();
-    timer = setInterval(cb, intervalValue);
+    if (isActive.value)
+      timer = setInterval(cb, intervalValue);
   }
   if (immediate && isClient)
     resume();
@@ -2285,7 +2284,8 @@ function useFetch(url, ...args) {
     if (config.payload) {
       const headers = headersToObject(defaultFetchOptions.headers);
       const payload = toValue(config.payload);
-      if (!config.payloadType && payload && Object.getPrototypeOf(payload) === Object.prototype && !(payload instanceof FormData))
+      const proto = Object.getPrototypeOf(payload);
+      if (!config.payloadType && payload && (proto === Object.prototype || Array.isArray(proto)) && !(payload instanceof FormData))
         config.payloadType = "json";
       if (config.payloadType)
         headers["Content-Type"] = (_a2 = payloadMapping[config.payloadType]) != null ? _a2 : config.payloadType;
@@ -2428,7 +2428,7 @@ function useFetch(url, ...args) {
   }
   function waitUntilFinished() {
     return new Promise((resolve, reject) => {
-      until(isFinished).toBe(true).then(() => resolve(shell)).catch((error2) => reject(error2));
+      until(isFinished).toBe(true).then(() => resolve(shell)).catch(reject);
     });
   }
   function setType(type) {
@@ -2455,8 +2455,12 @@ function useFetch(url, ...args) {
   };
 }
 function joinPaths(start, end) {
-  if (!start.endsWith("/") && !end.startsWith("/"))
+  if (!start.endsWith("/") && !end.startsWith("/")) {
     return `${start}/${end}`;
+  }
+  if (start.endsWith("/") && end.startsWith("/")) {
+    return `${start.slice(0, -1)}${end}`;
+  }
   return `${start}${end}`;
 }
 const defaultEvents$1 = ["mousemove", "mousedown", "resize", "keydown", "touchstart", "wheel"];
@@ -2899,8 +2903,8 @@ function useUrlSearchParams(mode = "history", options = {}) {
     const hash = window2.location.hash || "#";
     const index = hash.indexOf("?");
     if (index > 0)
-      return `${hash.slice(0, index)}${stringified ? `?${stringified}` : ""}`;
-    return `${hash}${stringified ? `?${stringified}` : ""}`;
+      return `${window2.location.search || ""}${hash.slice(0, index)}${stringified ? `?${stringified}` : ""}`;
+    return `${window2.location.search || ""}${hash}${stringified ? `?${stringified}` : ""}`;
   }
   function read() {
     return new URLSearchParams(getRawParams());
@@ -3031,7 +3035,7 @@ function useWebSocket(url, options = {}) {
     ws.onclose = (ev) => {
       status.value = "CLOSED";
       onDisconnected == null ? void 0 : onDisconnected(ws, ev);
-      if (!explicitlyClosed && options.autoReconnect && ws === wsRef.value) {
+      if (!explicitlyClosed && options.autoReconnect && (wsRef.value == null || ws === wsRef.value)) {
         const {
           retries = -1,
           delay = 1e3,

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { ComputedGetter } from '@reactive-vscode/reactivity';
 import { ComputedRef } from '@reactive-vscode/reactivity';
+import { MaybeRef } from '@reactive-vscode/reactivity';
+import { MaybeRefOrGetter } from '@reactive-vscode/reactivity';
 import { Ref } from '@reactive-vscode/reactivity';
 import { ShallowRef } from '@reactive-vscode/reactivity';
 import { ShallowUnwrapRef as ShallowUnwrapRef_2 } from '@reactive-vscode/reactivity';
@@ -516,16 +518,6 @@ export declare type MapSources<T> = {
     [K in keyof T]: T[K] extends WatchSource<infer V> ? V : never;
 };
 
-/**
- * Maybe it's a ref, or a plain value.
- */
-declare type MaybeRef<T = any> = T | Ref<T> | ShallowRef<T> | WritableComputedRef<T>;
-
-/**
- * Maybe it's a ref, or a plain value, or a getter function.
- */
-declare type MaybeRefOrGetter<T = any> = MaybeRef<T> | ComputedRef<T> | (() => T);
-
 export declare type MultiWatchSources = (WatchSource<unknown> | object)[];
 
 export declare type Mutable<T> = {
@@ -1839,11 +1831,11 @@ export declare interface UseManualRefHistoryReturn<Raw, Serialized> {
     /**
      * A ref representing if undo is possible (non empty undoStack)
      */
-    canUndo: Ref<boolean>;
+    canUndo: ComputedRef<boolean>;
     /**
      * A ref representing if redo is possible (non empty redoStack)
      */
-    canRedo: Ref<boolean>;
+    canRedo: ComputedRef<boolean>;
     /**
      * Undo changes
      */

package/dist/index.js

@@ -567,10 +567,8 @@ function set(...args) {
     ref2.value = value;
   }
   if (args.length === 3) {
-    {
-      const [target, key, value] = args;
-      target[key] = value;
-    }
+    const [target, key, value] = args;
+    target[key] = value;
   }
 }
 function watchWithFilter(source, cb, options = {}) {
@@ -891,7 +889,7 @@ function useArrayReduce(list, reducer, ...args) {
   const reduceCallback = (sum, value, index) => reducer(toValue(sum), toValue(value), index);
   return computed(() => {
     const resolved = toValue(list);
-    return args.length ? resolved.reduce(reduceCallback, toValue(args[0])) : resolved.reduce(reduceCallback);
+    return args.length ? resolved.reduce(reduceCallback, typeof args[0] === "function" ? toValue(args[0]()) : toValue(args[0])) : resolved.reduce(reduceCallback);
   });
 }
 function useArraySome(list, fn) {
@@ -1038,7 +1036,8 @@ function useIntervalFn(cb, interval = 1e3, options = {}) {
     if (immediateCallback)
       cb();
     clean();
-    timer = setInterval(cb, intervalValue);
+    if (isActive.value)
+      timer = setInterval(cb, intervalValue);
   }
   if (immediate && isClient)
     resume();
@@ -2283,7 +2282,8 @@ function useFetch(url, ...args) {
     if (config.payload) {
       const headers = headersToObject(defaultFetchOptions.headers);
       const payload = toValue(config.payload);
-      if (!config.payloadType && payload && Object.getPrototypeOf(payload) === Object.prototype && !(payload instanceof FormData))
+      const proto = Object.getPrototypeOf(payload);
+      if (!config.payloadType && payload && (proto === Object.prototype || Array.isArray(proto)) && !(payload instanceof FormData))
         config.payloadType = "json";
       if (config.payloadType)
         headers["Content-Type"] = (_a2 = payloadMapping[config.payloadType]) != null ? _a2 : config.payloadType;
@@ -2426,7 +2426,7 @@ function useFetch(url, ...args) {
   }
   function waitUntilFinished() {
     return new Promise((resolve, reject) => {
-      until(isFinished).toBe(true).then(() => resolve(shell)).catch((error2) => reject(error2));
+      until(isFinished).toBe(true).then(() => resolve(shell)).catch(reject);
     });
   }
   function setType(type) {
@@ -2453,8 +2453,12 @@ function useFetch(url, ...args) {
   };
 }
 function joinPaths(start, end) {
-  if (!start.endsWith("/") && !end.startsWith("/"))
+  if (!start.endsWith("/") && !end.startsWith("/")) {
     return `${start}/${end}`;
+  }
+  if (start.endsWith("/") && end.startsWith("/")) {
+    return `${start.slice(0, -1)}${end}`;
+  }
   return `${start}${end}`;
 }
 const defaultEvents$1 = ["mousemove", "mousedown", "resize", "keydown", "touchstart", "wheel"];
@@ -2897,8 +2901,8 @@ function useUrlSearchParams(mode = "history", options = {}) {
     const hash = window2.location.hash || "#";
     const index = hash.indexOf("?");
     if (index > 0)
-      return `${hash.slice(0, index)}${stringified ? `?${stringified}` : ""}`;
-    return `${hash}${stringified ? `?${stringified}` : ""}`;
+      return `${window2.location.search || ""}${hash.slice(0, index)}${stringified ? `?${stringified}` : ""}`;
+    return `${window2.location.search || ""}${hash}${stringified ? `?${stringified}` : ""}`;
   }
   function read() {
     return new URLSearchParams(getRawParams());
@@ -3029,7 +3033,7 @@ function useWebSocket(url, options = {}) {
     ws.onclose = (ev) => {
       status.value = "CLOSED";
       onDisconnected == null ? void 0 : onDisconnected(ws, ev);
-      if (!explicitlyClosed && options.autoReconnect && ws === wsRef.value) {
+      if (!explicitlyClosed && options.autoReconnect && (wsRef.value == null || ws === wsRef.value)) {
         const {
           retries = -1,
           delay = 1e3,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@reactive-vscode/vueuse",
   "type": "module",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Useful VueUse utilities for VSCode extension development",
   "author": "_Kerman <kermanx@qq.com>",
   "license": "MIT",
@@ -33,13 +33,13 @@
     "tsconfig.json"
   ],
   "dependencies": {
-    "@reactive-vscode/reactivity": "0.2.8"
+    "@reactive-vscode/reactivity": "0.2.9"
   },
   "devDependencies": {
-    "@types/node": "^20.17.0",
-    "@vueuse/core": "^11.1.0",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.10",
+    "@types/node": "^20.17.7",
+    "@vueuse/core": "^12.0.0-beta.1",
+    "typescript": "^5.7.2",
+    "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0"
   },
   "scripts": {