reactive-vscode 0.2.0-beta.6 → 0.2.0-beta.7

package/dist/index.d.ts

@@ -46,6 +46,7 @@ import { TreeDataProvider } from 'vscode';
 import { TreeItem } from 'vscode';
 import { TreeView } from 'vscode';
 import { TreeViewOptions } from 'vscode';
+import { UnwrapNestedRefs } from '@reactive-vscode/reactivity';
 import { Uri } from 'vscode';
 import { ViewBadge } from 'vscode';
 import { ViewColumn } from 'vscode';
@@ -61,7 +62,7 @@ export declare interface Commands extends Record<string, (...args: any[]) => any
     'vscode.open': (uri: Uri) => void;
 }
 
-export declare type ConfigObject<C extends object> = ShallowReactive<C & {
+export declare type ConfigObject<C extends object> = UnwrapNestedRefs<C> & {
     /**
      * Write the configuration value to the workspace.
      *
@@ -72,7 +73,7 @@ export declare type ConfigObject<C extends object> = ShallowReactive<C & {
      * Set the value without updating the workspace.
      */
     $set: (key: keyof C, value: C[keyof C]) => void;
-}>;
+};
 
 export declare interface ConfigRef<T> extends WritableComputedRef<T> {
     /**

package/dist/index.js

@@ -1,10 +1,10 @@
-import { getCurrentScope as L, onScopeDispose as W, shallowRef as l, effectScope as J, computed as f, shallowReactive as F, toValue as a, watchEffect as m, watch as b, ref as E, toRaw as K, isRef as z } from "@reactive-vscode/reactivity";
+import { getCurrentScope as L, onScopeDispose as W, shallowRef as l, effectScope as q, computed as f, reactive as J, toValue as a, watchEffect as m, watch as b, ref as E, shallowReactive as K, toRaw as z, isRef as Y } from "@reactive-vscode/reactivity";
 export * from "@reactive-vscode/reactivity";
-import { workspace as C, commands as k, window as c, debug as V, extensions as R, comments as Y, env as T, EventEmitter as O, tasks as D, Uri as G, languages as Q, ColorThemeKind as A, l10n as N } from "vscode";
-function X(e) {
+import { workspace as C, commands as k, window as c, debug as V, extensions as R, comments as G, env as T, EventEmitter as F, tasks as D, Uri as Q, languages as X, ColorThemeKind as A, l10n as N } from "vscode";
+function Z(e) {
   return L() ? (W(e), !0) : !1;
 }
-function $(e, t) {
+function O(e, t) {
   const n = /* @__PURE__ */ new Map();
   return (...r) => {
     const i = t(...r);
@@ -12,7 +12,7 @@ function $(e, t) {
     return o ? o.refCount++ : (o = {
       data: e(...r),
       refCount: 1
-    }, n.set(i, o)), X(() => {
+    }, n.set(i, o)), Z(() => {
       --o.refCount === 0 && n.delete(i);
     }), o.data;
   };
@@ -21,24 +21,24 @@ function h(e) {
   let t;
   return () => t ?? (t = e());
 }
-const I = [];
-function ve(e) {
-  I.push(e);
-}
-const x = l(null), y = J();
+const $ = [];
 function ge(e) {
+  $.push(e);
+}
+const x = l(null), y = q();
+function he(e) {
   return {
-    activate: (t) => (x.value = t, y.run(() => (P.map((n) => n(t)), e()))),
+    activate: (t) => (x.value = t, y.run(() => (I.map((n) => n(t)), e()))),
     deactivate: () => {
-      I.map((t) => t()), y.stop();
+      $.map((t) => t()), y.stop();
     }
   };
 }
-const P = [];
-function M(e) {
-  x.value ? e(x.value) : P.push(e);
+const I = [];
+function P(e) {
+  x.value ? e(x.value) : I.push(e);
 }
-function Z(e, t, n) {
+function _(e, t, n) {
   const r = !e, i = C.getConfiguration(r ? void 0 : e, n);
   function o(d, v) {
     const g = l(v), S = f({
@@ -47,8 +47,8 @@ function Z(e, t, n) {
         g.value = w, i.update(d, w);
       }
     });
-    return S.update = async (w, U, q) => {
-      await i.update(d, w, U, q), S.value = w;
+    return S.update = async (w, H, U) => {
+      await i.update(d, w, H, U), S.value = w;
     }, S.set = (w) => {
       g.value = w;
     }, S;
@@ -56,7 +56,7 @@ function Z(e, t, n) {
   const s = Object.fromEntries(
     Object.keys(t).map((d) => [d, o(d, i.get(d))])
   );
-  return M(() => {
+  return P(() => {
     u(C.onDidChangeConfiguration(
       r ? (d) => {
         const v = C.getConfiguration();
@@ -72,9 +72,9 @@ function Z(e, t, n) {
     ));
   }), s;
 }
-function he(e, t, n) {
-  const r = Z(e, t, n);
-  return F({
+function me(e, t, n) {
+  const r = _(e, t, n);
+  return J({
     ...r,
     $update(i, o, s, d) {
       return r[i].update(o, s, d);
@@ -84,10 +84,10 @@ function he(e, t, n) {
     }
   });
 }
-function me(e, t) {
+function Ce(e, t) {
   const n = l(null), r = [], i = (o) => (...s) => n.value ? n.value[o](...s) : (r.push([o, s]), null);
-  return M(() => {
-    n.value = ue(e, t);
+  return P(() => {
+    n.value = se(e, t);
     for (const [o, s] of r)
       n.value[o](...s);
   }), {
@@ -107,75 +107,75 @@ function me(e, t) {
     hide: i("hide")
   };
 }
-function Ce(e, ...t) {
+function be(e, ...t) {
   return k.executeCommand(e, ...t);
 }
-function _(e, t = !1) {
+function ee(e, t = !1) {
   const n = x.value;
   if (!n && !t)
     throw new Error("Cannot get absolute path because the extension is not activated yet");
   return n == null ? void 0 : n.asAbsolutePath(e);
 }
-function be(e, t = !1) {
-  return f(() => _(a(e), t));
+function we(e, t = !1) {
+  return f(() => ee(a(e), t));
 }
 function u(e) {
   return (L() ?? y).cleanups.push(e.dispose.bind(e)), e;
 }
-const ee = h(() => {
+const te = h(() => {
   const e = l(c.activeColorTheme);
   return u(c.onDidChangeActiveColorTheme((t) => {
     e.value = t;
   })), e;
-}), we = h(() => {
+}), Te = h(() => {
   const e = l(V.activeDebugSession);
   return u(V.onDidChangeActiveDebugSession((t) => {
     e.value = t;
   })), f(() => e.value);
-}), te = h(() => {
+}), ne = h(() => {
   const e = l(c.activeTextEditor);
   return u(c.onDidChangeActiveTextEditor((t) => {
     e.value = t;
   })), e;
 });
-function ne(e, t, n) {
+function re(e, t, n) {
   const r = "key" in t ? t : c.createTextEditorDecorationType(t);
   m(() => {
     var i;
     (i = a(e)) == null || i.setDecorations(r, a(n));
   });
 }
-function Te(e, t) {
-  const n = te();
-  ne(n, e, t);
+function De(e, t) {
+  const n = ne();
+  re(n, e, t);
 }
-const De = h(() => {
+const Se = h(() => {
   const e = l(c.activeNotebookEditor);
   return u(c.onDidChangeActiveNotebookEditor((t) => {
     e.value = t;
   })), e;
-}), Se = h(() => {
+}), pe = h(() => {
   const e = l(c.activeTerminal);
   return u(c.onDidChangeActiveTerminal((t) => {
     e.value = t;
   })), e;
-}), pe = h(() => {
+}), xe = h(() => {
   const e = l(R.all);
   return u(R.onDidChange(() => {
     e.value = R.all;
   })), f(() => e.value);
 });
-function re(e, t) {
+function ie(e, t) {
   u(k.registerCommand(e, t));
 }
-function xe(e) {
+function Ee(e) {
   for (const [t, n] of Object.entries(e))
-    n && re(t, n);
+    n && ie(t, n);
 }
-function Ee(e, t) {
-  return u(Y.createCommentController(e, t));
+function ke(e, t) {
+  return u(G.createCommentController(e, t));
 }
-function j(e) {
+function M(e) {
   var n;
   const t = l((n = a(e)) == null ? void 0 : n.state);
   return b(e, () => {
@@ -185,7 +185,7 @@ function j(e) {
     r === a(e) && (t.value = r.state);
   })), f(() => t.value);
 }
-function ke(...e) {
+function Re(...e) {
   const t = E(null);
   function n() {
     return !!t.value && t.value.exitStatus == null;
@@ -208,16 +208,16 @@ function ke(...e) {
     show: o,
     sendText: i,
     close: s,
-    state: j(t)
+    state: M(t)
   };
 }
-const Re = h(() => {
+const ye = h(() => {
   const e = l(T.shell);
   return u(T.onDidChangeShell((t) => {
     e.value = t;
   })), f(() => e.value);
 });
-function ye(e) {
+function Ve(e) {
   var n;
   const t = l((n = a(e)) == null ? void 0 : n.getText());
   return m(() => {
@@ -233,8 +233,8 @@ function p(e, t = []) {
     n(r);
   return n;
 }
-function ie(e, t = []) {
-  const n = Array.isArray(e) ? e : t ?? [], r = u(Array.isArray(e) || e == null ? new O() : e), i = p(r.event, n);
+function ae(e, t = []) {
+  const n = Array.isArray(e) ? e : t ?? [], r = u(Array.isArray(e) || e == null ? new F() : e), i = p(r.event, n);
   for (const o of n)
     i(o);
   return {
@@ -243,11 +243,11 @@ function ie(e, t = []) {
     addListener: i
   };
 }
-function Ve(e) {
+function Ae(e) {
   return f(() => D.fetchTasks(a(e)));
 }
-function ae(e) {
-  return F({
+function oe(e) {
+  return K({
     get scheme() {
       return a(e).scheme;
     },
@@ -277,14 +277,14 @@ function ae(e) {
     }
   });
 }
-function Ae(e) {
-  return ae(() => G.file(a(e)));
+function Ne(e) {
+  return oe(() => Q.file(a(e)));
 }
-function Ne(e, t) {
-  const n = new O(), r = l();
+function Le(e, t) {
+  const n = new F(), r = l();
   m(() => {
     r.value && n.fire(), r.value = a(t);
-  }), u(Q.registerFoldingRangeProvider(
+  }), u(X.registerFoldingRangeProvider(
     e,
     {
       onDidChangeFoldingRanges: n.event,
@@ -295,7 +295,7 @@ function Ne(e, t) {
     }
   ));
 }
-function Le(e, t, n, r) {
+function We(e, t, n, r) {
   const i = u(C.createFileSystemWatcher(e, t, n, r));
   return {
     ...i,
@@ -304,33 +304,33 @@ function Le(e, t, n, r) {
     onDidDelete: p(i.onDidDelete)
   };
 }
-const We = h(() => {
-  const e = ee();
+const Fe = h(() => {
+  const e = te();
   return f(() => e.value.kind === A.Dark || e.value.kind === A.HighContrast);
-}), Fe = h(() => {
+}), Oe = h(() => {
   const e = l(T.isTelemetryEnabled);
   return u(T.onDidChangeTelemetryEnabled((t) => {
     e.value = t;
   })), f(() => e.value);
 });
-function Oe(e, ...t) {
-  return f(() => typeof t[0] == "object" ? N.t(a(e), K(t[0])) : N.t(a(e), ...t.map(a)));
+function $e(e, ...t) {
+  return f(() => typeof t[0] == "object" ? N.t(a(e), z(t[0])) : N.t(a(e), ...t.map(a)));
 }
-const $e = h(() => {
+const Ie = h(() => {
   const e = l(T.logLevel);
   return u(T.onDidChangeLogLevel((t) => {
     e.value = t;
   })), f(() => e.value);
 });
-function oe(e, t) {
+function ue(e, t) {
   return u(c.createOutputChannel(e, t));
 }
-function Ie(e) {
+function Pe(e) {
   const t = /* @__PURE__ */ new Date(), n = String(t.getFullYear()).padStart(4, "0"), r = String(t.getMonth() + 1).padStart(2, "0"), i = String(t.getDate()).padStart(2, "0"), o = String(t.getHours()).padStart(2, "0"), s = String(t.getMinutes()).padStart(2, "0"), d = String(t.getSeconds()).padStart(2, "0"), v = String(t.getMilliseconds()).padStart(3, "0");
   return `${n}-${r}-${i} ${o}:${s}:${d}.${v} [${e}] `;
 }
-function ue(e, t = {}) {
-  const n = t.outputChannel ?? oe(e), r = (i) => (...o) => {
+function se(e, t = {}) {
+  const n = t.outputChannel ?? ue(e), r = (i) => (...o) => {
     var s;
     n.appendLine((((s = t.getPrefix) == null ? void 0 : s.call(t, i)) ?? "") + o.join(" "));
   };
@@ -348,7 +348,7 @@ function ue(e, t = {}) {
     hide: n.hide.bind(n)
   };
 }
-function se(e) {
+function ce(e) {
   var n;
   const t = l(((n = a(e)) == null ? void 0 : n.selections) ?? []);
   return b(e, () => {
@@ -367,8 +367,8 @@ function se(e) {
     }
   });
 }
-function Pe(e) {
-  const t = se(e);
+function Me(e) {
+  const t = ce(e);
   return f({
     get() {
       return t.value[0];
@@ -378,7 +378,7 @@ function Pe(e) {
     }
   });
 }
-function Me(e) {
+function je(e) {
   var n;
   const t = l(((n = a(e)) == null ? void 0 : n.visibleRanges) ?? []);
   return b(e, () => {
@@ -388,14 +388,14 @@ function Me(e) {
     r.notebookEditor === a(e) && (t.value = r.visibleRanges);
   })), f(() => t.value);
 }
-const je = h(() => {
+const Be = h(() => {
   const e = l(c.terminals);
   function t() {
     e.value = c.terminals;
   }
   return u(c.onDidOpenTerminal(t)), u(c.onDidCloseTerminal(t)), e;
 });
-function Be(e) {
+function He(e) {
   const t = u(e.id ? c.createStatusBarItem(e.id, e.alignment, e.priority) : c.createStatusBarItem(e.alignment, e.priority));
   function n(r) {
     const i = e[r];
@@ -411,14 +411,14 @@ function Be(e) {
     "accessibilityInformation"
   ].forEach(n), t;
 }
-const He = h(() => {
+const Ue = h(() => {
   const e = l(D.taskExecutions);
   function t() {
     e.value = D.taskExecutions;
   }
   return u(D.onDidStartTask(t)), u(D.onDidEndTask(t)), f(() => e.value);
 });
-function Ue(...e) {
+function qe(...e) {
   const t = u(c.createTerminal(...e));
   return {
     terminal: t,
@@ -437,17 +437,17 @@ function Ue(...e) {
     sendText: t.sendText.bind(t),
     show: t.show.bind(t),
     hide: t.hide.bind(t),
-    state: j(t)
+    state: M(t)
   };
 }
-function ce(e, t) {
+function le(e, t) {
   u(k.registerTextEditorCommand(e, t));
 }
-function qe(e) {
+function Je(e) {
   for (const [t, n] of Object.entries(e))
-    ce(t, n);
+    le(t, n);
 }
-function le(e, t) {
+function de(e, t) {
   var r;
   const n = l(((r = a(e)) == null ? void 0 : r.selections) ?? []);
   return b(e, () => {
@@ -467,8 +467,8 @@ function le(e, t) {
     }
   });
 }
-function Je(e, t) {
-  const n = le(e, t);
+function Ke(e, t) {
+  const n = de(e, t);
   return f({
     get() {
       return n.value[0];
@@ -478,7 +478,7 @@ function Je(e, t) {
     }
   });
 }
-function Ke(e) {
+function ze(e) {
   var n;
   const t = l((n = a(e)) == null ? void 0 : n.viewColumn);
   return b(e, () => {
@@ -488,7 +488,7 @@ function Ke(e) {
     r.textEditor === a(e) && (t.value = r.viewColumn);
   })), f(() => t.value);
 }
-function ze(e) {
+function Ye(e) {
   var n;
   const t = l(((n = a(e)) == null ? void 0 : n.visibleRanges) ?? []);
   return b(e, () => {
@@ -498,21 +498,21 @@ function ze(e) {
     r.textEditor === a(e) && (t.value = r.visibleRanges);
   })), f(() => t.value);
 }
-function B(e, t) {
+function j(e, t) {
   m(() => {
     const n = a(e);
     n && (n.badge = a(t));
   });
 }
-function H(e, t) {
+function B(e, t) {
   m(() => {
     const n = a(e);
     n && (n.title = a(t));
   });
 }
-const Ye = $(
+const Ge = O(
   (e, t, n) => {
-    const r = ie();
+    const r = ae();
     b(t, () => r.fire()), n != null && n.watchSource && b(n.watchSource, () => r.fire());
     const i = /* @__PURE__ */ new WeakMap(), o = u(c.createTreeView(e, {
       ...n,
@@ -531,11 +531,11 @@ const Ye = $(
         }
       }
     }));
-    return n != null && n.title && H(o, n.title), n != null && n.badge && B(o, n.badge), o;
+    return n != null && n.title && B(o, n.title), n != null && n.badge && j(o, n.badge), o;
   },
   (e) => e
 );
-function Ge(e) {
+function Qe(e) {
   var r;
   const t = E((r = a(e)) == null ? void 0 : r.visible);
   function n() {
@@ -550,24 +550,24 @@ function Ge(e) {
     }
   }), m(n), f(() => !!t.value);
 }
-const Qe = h(() => {
+const Xe = h(() => {
   const e = l(c.visibleNotebookEditors);
   return u(c.onDidChangeVisibleNotebookEditors((t) => {
     e.value = t;
   })), e;
-}), Xe = h(() => {
+}), Ze = h(() => {
   const e = l(c.visibleTextEditors);
   return u(c.onDidChangeVisibleTextEditors((t) => {
     e.value = t;
   })), e;
 });
-function Ze(e, t, n = !0) {
-  const r = z(t) ? t : typeof t == "function" ? f(t) : E(t);
+function _e(e, t, n = !0) {
+  const r = Y(t) ? t : typeof t == "function" ? f(t) : E(t);
   return m(() => {
     a(n) && k.executeCommand("setContext", e, r.value);
   }), r;
 }
-const _e = $(
+const et = O(
   (e, t, n) => {
     const r = l(), i = l();
     u(c.registerWebviewViewProvider(
@@ -595,7 +595,7 @@ const _e = $(
         r.value && (r.value.webview.options = a(v));
       });
     }
-    n != null && n.title && H(r, n.title), n != null && n.badge && B(r, n.badge);
+    n != null && n.title && B(r, n.title), n != null && n.badge && j(r, n.badge);
     function d(v) {
       var g;
       return (g = r.value) == null ? void 0 : g.webview.postMessage(v);
@@ -603,7 +603,7 @@ const _e = $(
     return { view: r, context: i, postMessage: d, forceRefresh: s };
   },
   (e) => e
-), et = h(() => {
+), tt = h(() => {
   const e = l(c.state);
   return u(c.onDidChangeWindowState((t) => {
     e.value = t;
@@ -611,79 +611,79 @@ const _e = $(
     focused: f(() => e.value.focused),
     active: f(() => e.value.active)
   };
-}), tt = h(() => {
+}), nt = h(() => {
   const e = l(C.workspaceFolders);
   return u(C.onDidChangeWorkspaceFolders(() => {
     e.value = C.workspaceFolders;
   })), f(() => e.value);
 });
 export {
-  P as activateCbs,
-  $ as createKeyedComposable,
+  I as activateCbs,
+  O as createKeyedComposable,
   h as createSingletonComposable,
-  I as deactivateCbs,
-  he as defineConfigObject,
-  Z as defineConfigs,
-  ge as defineExtension,
-  me as defineLogger,
-  Ce as executeCommand,
+  $ as deactivateCbs,
+  me as defineConfigObject,
+  _ as defineConfigs,
+  he as defineExtension,
+  Ce as defineLogger,
+  be as executeCommand,
   x as extensionContext,
   y as extensionScope,
-  Ie as getDefaultLoggerPrefix,
-  M as onActivate,
-  ve as onDeactivate,
-  X as tryOnScopeDispose,
-  be as useAbsolutePath,
-  ee as useActiveColorTheme,
-  we as useActiveDebugSession,
-  Te as useActiveEditorDecorations,
-  De as useActiveNotebookEditor,
-  Se as useActiveTerminal,
-  te as useActiveTextEditor,
-  pe as useAllExtensions,
-  re as useCommand,
-  xe as useCommands,
-  Ee as useCommentController,
-  ke as useControlledTerminal,
-  Re as useDefaultShell,
+  Pe as getDefaultLoggerPrefix,
+  P as onActivate,
+  ge as onDeactivate,
+  Z as tryOnScopeDispose,
+  we as useAbsolutePath,
+  te as useActiveColorTheme,
+  Te as useActiveDebugSession,
+  De as useActiveEditorDecorations,
+  Se as useActiveNotebookEditor,
+  pe as useActiveTerminal,
+  ne as useActiveTextEditor,
+  xe as useAllExtensions,
+  ie as useCommand,
+  Ee as useCommands,
+  ke as useCommentController,
+  Re as useControlledTerminal,
+  ye as useDefaultShell,
   u as useDisposable,
-  ye as useDocumentText,
-  ne as useEditorDecorations,
+  Ve as useDocumentText,
+  re as useEditorDecorations,
   p as useEvent,
-  ie as useEventEmitter,
-  Ve as useFetchTasks,
-  Ae as useFileUri,
-  Ne as useFoldingRangeProvider,
-  Le as useFsWatcher,
-  We as useIsDarkTheme,
-  Fe as useIsTelemetryEnabled,
-  Oe as useL10nText,
-  $e as useLogLevel,
-  ue as useLogger,
-  Pe as useNotebookEditorSelection,
-  se as useNotebookEditorSelections,
-  Me as useNotebookEditorVisibleRanges,
-  je as useOpenedTerminals,
-  oe as useOutputChannel,
-  Be as useStatusBarItem,
-  He as useTaskExecutions,
-  Ue as useTerminal,
-  j as useTerminalState,
-  ce as useTextEditorCommand,
-  qe as useTextEditorCommands,
-  Je as useTextEditorSelection,
-  le as useTextEditorSelections,
-  Ke as useTextEditorViewColumn,
-  ze as useTextEditorVisibleRanges,
-  Ye as useTreeView,
-  ae as useUri,
-  B as useViewBadge,
-  H as useViewTitle,
-  Ge as useViewVisibility,
-  Qe as useVisibleNotebookEditors,
-  Xe as useVisibleTextEditors,
-  Ze as useVscodeContext,
-  _e as useWebviewView,
-  et as useWindowState,
-  tt as useWorkspaceFolders
+  ae as useEventEmitter,
+  Ae as useFetchTasks,
+  Ne as useFileUri,
+  Le as useFoldingRangeProvider,
+  We as useFsWatcher,
+  Fe as useIsDarkTheme,
+  Oe as useIsTelemetryEnabled,
+  $e as useL10nText,
+  Ie as useLogLevel,
+  se as useLogger,
+  Me as useNotebookEditorSelection,
+  ce as useNotebookEditorSelections,
+  je as useNotebookEditorVisibleRanges,
+  Be as useOpenedTerminals,
+  ue as useOutputChannel,
+  He as useStatusBarItem,
+  Ue as useTaskExecutions,
+  qe as useTerminal,
+  M as useTerminalState,
+  le as useTextEditorCommand,
+  Je as useTextEditorCommands,
+  Ke as useTextEditorSelection,
+  de as useTextEditorSelections,
+  ze as useTextEditorViewColumn,
+  Ye as useTextEditorVisibleRanges,
+  Ge as useTreeView,
+  oe as useUri,
+  j as useViewBadge,
+  B as useViewTitle,
+  Qe as useViewVisibility,
+  Xe as useVisibleNotebookEditors,
+  Ze as useVisibleTextEditors,
+  _e as useVscodeContext,
+  et as useWebviewView,
+  tt as useWindowState,
+  nt as useWorkspaceFolders
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactive-vscode",
   "type": "module",
-  "version": "0.2.0-beta.6",
+  "version": "0.2.0-beta.7",
   "description": "Develop VSCode extension with Vue Reactivity API",
   "author": "_Kerman <kermanx@qq.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "@types/vscode": "^1.89.0"
   },
   "dependencies": {
-    "@reactive-vscode/reactivity": "0.2.0-beta.6"
+    "@reactive-vscode/reactivity": "0.2.0-beta.7"
   },
   "devDependencies": {
     "@types/node": "^20.14.2",