@txnlab/use-wallet-solid 3.2.0 → 3.2.1

package/dist/index.jsx

@@ -2,11 +2,23 @@
 import { useStore } from "@tanstack/solid-store";
 import algosdk from "algosdk";
 
-// ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
+// ../../node_modules/.pnpm/solid-js@1.8.22/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
   context: void 0,
-  registry: void 0
+  registry: void 0,
+  effects: void 0,
+  done: false,
+  getContextId() {
+    return getContextId(this.context.count);
+  },
+  getNextContextId() {
+    return getContextId(this.context.count++);
+  }
 };
+function getContextId(count) {
+  const num = String(count), len = num.length - 1;
+  return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
+}
 function setHydrateContext(context) {
   sharedConfig.context = context;
 }
@@ -45,10 +57,8 @@ function createSignal(value, options) {
   };
   const setter = (value2) => {
     if (typeof value2 === "function") {
-      if (Transition && Transition.running && Transition.sources.has(s))
-        value2 = value2(s.tValue);
-      else
-        value2 = value2(s.value);
+      if (Transition && Transition.running && Transition.sources.has(s)) value2 = value2(s.tValue);
+      else value2 = value2(s.value);
     }
     return writeSignal(s, value2);
   };
@@ -56,18 +66,14 @@ function createSignal(value, options) {
 }
 function createRenderEffect(fn, value, options) {
   const c = createComputation(fn, value, false, STALE);
-  if (Scheduler && Transition && Transition.running)
-    Updates.push(c);
-  else
-    updateComputation(c);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);
+  else updateComputation(c);
 }
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE), s = SuspenseContext && useContext(SuspenseContext);
-  if (s)
-    c.suspense = s;
-  if (!options || !options.render)
-    c.user = true;
+  if (s) c.suspense = s;
+  if (!options || !options.render) c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
 }
 function createMemo(fn, value, options) {
@@ -79,18 +85,15 @@ function createMemo(fn, value, options) {
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
     Updates.push(c);
-  } else
-    updateComputation(c);
+  } else updateComputation(c);
   return readSignal.bind(c);
 }
 function untrack(fn) {
-  if (!ExternalSourceConfig && Listener === null)
-    return fn();
+  if (!ExternalSourceConfig && Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
-    if (ExternalSourceConfig)
-      return ExternalSourceConfig.untrack(fn);
+    if (ExternalSourceConfig) return ExternalSourceConfig.untrack(fn);
     return fn();
   } finally {
     Listener = listener;
@@ -100,12 +103,9 @@ function onMount(fn) {
   createEffect(() => untrack(fn));
 }
 function onCleanup(fn) {
-  if (Owner === null)
-    ;
-  else if (Owner.cleanups === null)
-    Owner.cleanups = [fn];
-  else
-    Owner.cleanups.push(fn);
+  if (Owner === null) ;
+  else if (Owner.cleanups === null) Owner.cleanups = [fn];
+  else Owner.cleanups.push(fn);
   return fn;
 }
 function startTransition(fn) {
@@ -146,7 +146,8 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  return Owner && Owner.context && Owner.context[context.id] !== void 0 ? Owner.context[context.id] : context.defaultValue;
+  let value;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
 }
 function children(fn) {
   const children2 = createMemo(fn);
@@ -161,8 +162,7 @@ var SuspenseContext;
 function readSignal() {
   const runningTransition = Transition && Transition.running;
   if (this.sources && (runningTransition ? this.tState : this.state)) {
-    if ((runningTransition ? this.tState : this.state) === STALE)
-      updateComputation(this);
+    if ((runningTransition ? this.tState : this.state) === STALE) updateComputation(this);
     else {
       const updates = Updates;
       Updates = null;
@@ -187,8 +187,7 @@ function readSignal() {
       this.observerSlots.push(Listener.sources.length - 1);
     }
   }
-  if (runningTransition && Transition.sources.has(this))
-    return this.tValue;
+  if (runningTransition && Transition.sources.has(this)) return this.tValue;
   return this.value;
 }
 function writeSignal(node, value, isComp) {
@@ -200,34 +199,25 @@ function writeSignal(node, value, isComp) {
         Transition.sources.add(node);
         node.tValue = value;
       }
-      if (!TransitionRunning)
-        node.value = value;
-    } else
-      node.value = value;
+      if (!TransitionRunning) node.value = value;
+    } else node.value = value;
     if (node.observers && node.observers.length) {
       runUpdates(() => {
         for (let i = 0; i < node.observers.length; i += 1) {
           const o = node.observers[i];
           const TransitionRunning = Transition && Transition.running;
-          if (TransitionRunning && Transition.disposed.has(o))
-            continue;
+          if (TransitionRunning && Transition.disposed.has(o)) continue;
           if (TransitionRunning ? !o.tState : !o.state) {
-            if (o.pure)
-              Updates.push(o);
-            else
-              Effects.push(o);
-            if (o.observers)
-              markDownstream(o);
+            if (o.pure) Updates.push(o);
+            else Effects.push(o);
+            if (o.observers) markDownstream(o);
           }
-          if (!TransitionRunning)
-            o.state = STALE;
-          else
-            o.tState = STALE;
+          if (!TransitionRunning) o.state = STALE;
+          else o.tState = STALE;
         }
         if (Updates.length > 1e6) {
           Updates = [];
-          if (false)
-            ;
+          if (false) ;
           throw new Error();
         }
       }, false);
@@ -236,15 +226,10 @@ function writeSignal(node, value, isComp) {
   return value;
 }
 function updateComputation(node) {
-  if (!node.fn)
-    return;
+  if (!node.fn) return;
   cleanNode(node);
   const time = ExecCount;
-  runComputation(
-    node,
-    Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value,
-    time
-  );
+  runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
     queueMicrotask(() => {
       runUpdates(() => {
@@ -286,8 +271,7 @@ function runComputation(node, value, time) {
     } else if (Transition && Transition.running && node.pure) {
       Transition.sources.add(node);
       node.tValue = nextValue;
-    } else
-      node.value = nextValue;
+    } else node.value = nextValue;
     node.updatedAt = time;
   }
 }
@@ -309,19 +293,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
     c.state = 0;
     c.tState = state;
   }
-  if (Owner === null)
-    ;
+  if (Owner === null) ;
   else if (Owner !== UNOWNED) {
     if (Transition && Transition.running && Owner.pure) {
-      if (!Owner.tOwned)
-        Owner.tOwned = [c];
-      else
-        Owner.tOwned.push(c);
+      if (!Owner.tOwned) Owner.tOwned = [c];
+      else Owner.tOwned.push(c);
     } else {
-      if (!Owner.owned)
-        Owner.owned = [c];
-      else
-        Owner.owned.push(c);
+      if (!Owner.owned) Owner.owned = [c];
+      else Owner.owned.push(c);
     }
   }
   if (ExternalSourceConfig && c.fn) {
@@ -341,26 +320,20 @@ function createComputation(fn, init, pure, state = STALE, options) {
 }
 function runTop(node) {
   const runningTransition = Transition && Transition.running;
-  if ((runningTransition ? node.tState : node.state) === 0)
-    return;
-  if ((runningTransition ? node.tState : node.state) === PENDING)
-    return lookUpstream(node);
-  if (node.suspense && untrack(node.suspense.inFallback))
-    return node.suspense.effects.push(node);
+  if ((runningTransition ? node.tState : node.state) === 0) return;
+  if ((runningTransition ? node.tState : node.state) === PENDING) return lookUpstream(node);
+  if (node.suspense && untrack(node.suspense.inFallback)) return node.suspense.effects.push(node);
   const ancestors = [node];
   while ((node = node.owner) && (!node.updatedAt || node.updatedAt < ExecCount)) {
-    if (runningTransition && Transition.disposed.has(node))
-      return;
-    if (runningTransition ? node.tState : node.state)
-      ancestors.push(node);
+    if (runningTransition && Transition.disposed.has(node)) return;
+    if (runningTransition ? node.tState : node.state) ancestors.push(node);
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
     node = ancestors[i];
     if (runningTransition) {
       let top = node, prev = ancestors[i + 1];
       while ((top = top.owner) && top !== prev) {
-        if (Transition.disposed.has(top))
-          return;
+        if (Transition.disposed.has(top)) return;
       }
     }
     if ((runningTransition ? node.tState : node.state) === STALE) {
@@ -374,37 +347,29 @@ function runTop(node) {
   }
 }
 function runUpdates(fn, init) {
-  if (Updates)
-    return fn();
+  if (Updates) return fn();
   let wait = false;
-  if (!init)
-    Updates = [];
-  if (Effects)
-    wait = true;
-  else
-    Effects = [];
+  if (!init) Updates = [];
+  if (Effects) wait = true;
+  else Effects = [];
   ExecCount++;
   try {
     const res = fn();
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!wait)
-      Effects = null;
+    if (!wait) Effects = null;
     Updates = null;
     handleError(err);
   }
 }
 function completeUpdates(wait) {
   if (Updates) {
-    if (Scheduler && Transition && Transition.running)
-      scheduleQueue(Updates);
-    else
-      runQueue(Updates);
+    if (Scheduler && Transition && Transition.running) scheduleQueue(Updates);
+    else runQueue(Updates);
     Updates = null;
   }
-  if (wait)
-    return;
+  if (wait) return;
   let res;
   if (Transition) {
     if (!Transition.promises.size && !Transition.queue.size) {
@@ -418,16 +383,13 @@ function completeUpdates(wait) {
       }
       Transition = null;
       runUpdates(() => {
-        for (const d of disposed)
-          cleanNode(d);
+        for (const d of disposed) cleanNode(d);
         for (const v of sources) {
           v.value = v.tValue;
           if (v.owned) {
-            for (let i = 0, len = v.owned.length; i < len; i++)
-              cleanNode(v.owned[i]);
+            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
           }
-          if (v.tOwned)
-            v.owned = v.tOwned;
+          if (v.tOwned) v.owned = v.tOwned;
           delete v.tValue;
           delete v.tOwned;
           v.tState = 0;
@@ -444,14 +406,11 @@ function completeUpdates(wait) {
   }
   const e = Effects;
   Effects = null;
-  if (e.length)
-    runUpdates(() => runEffects(e), false);
-  if (res)
-    res();
+  if (e.length) runUpdates(() => runEffects(e), false);
+  if (res) res();
 }
 function runQueue(queue) {
-  for (let i = 0; i < queue.length; i++)
-    runTop(queue[i]);
+  for (let i = 0; i < queue.length; i++) runTop(queue[i]);
 }
 function scheduleQueue(queue) {
   for (let i = 0; i < queue.length; i++) {
@@ -474,41 +433,35 @@ function runUserEffects(queue) {
   let i, userLength = 0;
   for (i = 0; i < queue.length; i++) {
     const e = queue[i];
-    if (!e.user)
-      runTop(e);
-    else
-      queue[userLength++] = e;
+    if (!e.user) runTop(e);
+    else queue[userLength++] = e;
   }
   if (sharedConfig.context) {
     if (sharedConfig.count) {
       sharedConfig.effects || (sharedConfig.effects = []);
       sharedConfig.effects.push(...queue.slice(0, userLength));
       return;
-    } else if (sharedConfig.effects) {
-      queue = [...sharedConfig.effects, ...queue];
-      userLength += sharedConfig.effects.length;
-      delete sharedConfig.effects;
     }
     setHydrateContext();
   }
-  for (i = 0; i < userLength; i++)
-    runTop(queue[i]);
+  if (sharedConfig.effects && (sharedConfig.done || !sharedConfig.count)) {
+    queue = [...sharedConfig.effects, ...queue];
+    userLength += sharedConfig.effects.length;
+    delete sharedConfig.effects;
+  }
+  for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
-  if (runningTransition)
-    node.tState = 0;
-  else
-    node.state = 0;
+  if (runningTransition) node.tState = 0;
+  else node.state = 0;
   for (let i = 0; i < node.sources.length; i += 1) {
     const source = node.sources[i];
     if (source.sources) {
       const state = runningTransition ? source.tState : source.state;
       if (state === STALE) {
-        if (source !== ignore && (!source.updatedAt || source.updatedAt < ExecCount))
-          runTop(source);
-      } else if (state === PENDING)
-        lookUpstream(source, ignore);
+        if (source !== ignore && (!source.updatedAt || source.updatedAt < ExecCount)) runTop(source);
+      } else if (state === PENDING) lookUpstream(source, ignore);
     }
   }
 }
@@ -517,14 +470,10 @@ function markDownstream(node) {
   for (let i = 0; i < node.observers.length; i += 1) {
     const o = node.observers[i];
     if (runningTransition ? !o.tState : !o.state) {
-      if (runningTransition)
-        o.tState = PENDING;
-      else
-        o.state = PENDING;
-      if (o.pure)
-        Updates.push(o);
-      else
-        Effects.push(o);
+      if (runningTransition) o.tState = PENDING;
+      else o.state = PENDING;
+      if (o.pure) Updates.push(o);
+      else Effects.push(o);
       o.observers && markDownstream(o);
     }
   }
@@ -546,25 +495,20 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running && node.pure) {
     if (node.tOwned) {
-      for (i = node.tOwned.length - 1; i >= 0; i--)
-        cleanNode(node.tOwned[i]);
+      for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
       delete node.tOwned;
     }
     reset(node, true);
   } else if (node.owned) {
-    for (i = node.owned.length - 1; i >= 0; i--)
-      cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = node.cleanups.length - 1; i >= 0; i--)
-      node.cleanups[i]();
+    for (i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
     node.cleanups = null;
   }
-  if (Transition && Transition.running)
-    node.tState = 0;
-  else
-    node.state = 0;
+  if (Transition && Transition.running) node.tState = 0;
+  else node.state = 0;
 }
 function reset(node, top) {
   if (!top) {
@@ -572,21 +516,18 @@ function reset(node, top) {
     Transition.disposed.add(node);
   }
   if (node.owned) {
-    for (let i = 0; i < node.owned.length; i++)
-      reset(node.owned[i]);
+    for (let i = 0; i < node.owned.length; i++) reset(node.owned[i]);
   }
 }
 function castError(err) {
-  if (err instanceof Error)
-    return err;
+  if (err instanceof Error) return err;
   return new Error(typeof err === "string" ? err : "Unknown error", {
     cause: err
   });
 }
 function runErrors(err, fns, owner) {
   try {
-    for (const f of fns)
-      f(err);
+    for (const f of fns) f(err);
   } catch (e) {
     handleError(e, owner && owner.owner || null);
   }
@@ -594,21 +535,17 @@ function runErrors(err, fns, owner) {
 function handleError(err, owner = Owner) {
   const fns = ERROR && owner && owner.context && owner.context[ERROR];
   const error = castError(err);
-  if (!fns)
-    throw error;
-  if (Effects)
-    Effects.push({
-      fn() {
-        runErrors(error, fns, owner);
-      },
-      state: STALE
-    });
-  else
-    runErrors(error, fns, owner);
+  if (!fns) throw error;
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(error, fns, owner);
+    },
+    state: STALE
+  });
+  else runErrors(error, fns, owner);
 }
 function resolveChildren(children2) {
-  if (typeof children2 === "function" && !children2.length)
-    return resolveChildren(children2());
+  if (typeof children2 === "function" && !children2.length) return resolveChildren(children2());
   if (Array.isArray(children2)) {
     const results = [];
     for (let i = 0; i < children2.length; i++) {
@@ -622,21 +559,17 @@ function resolveChildren(children2) {
 function createProvider(id, options) {
   return function provider(props) {
     let res;
-    createRenderEffect(
-      () => res = untrack(() => {
-        Owner.context = {
-          ...Owner.context,
-          [id]: props.value
-        };
-        return children(() => props.children);
-      }),
-      void 0
-    );
+    createRenderEffect(() => res = untrack(() => {
+      Owner.context = {
+        ...Owner.context,
+        [id]: props.value
+      };
+      return children(() => props.children);
+    }), void 0);
     return res;
   };
 }
 var FALLBACK = Symbol("fallback");
-var SuspenseListContext = createContext();
 
 // src/index.tsx
 export * from "@txnlab/use-wallet";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@txnlab/use-wallet-solid",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Solid.js library for integrating Algorand wallets into decentralized applications",
   "author": "Doug Richar <drichar@gmail.com>",
   "license": "MIT",
@@ -53,27 +53,27 @@
     "dist"
   ],
   "dependencies": {
-    "@tanstack/solid-store": "0.4.1",
-    "@txnlab/use-wallet": "3.2.0"
+    "@tanstack/solid-store": "0.5.5",
+    "@txnlab/use-wallet": "3.2.1"
   },
   "devDependencies": {
-    "@solidjs/testing-library": "0.8.7",
-    "algosdk": "2.8.0",
-    "solid-js": "1.8.16",
-    "tsup": "8.0.2",
+    "@solidjs/testing-library": "0.8.9",
+    "algosdk": "2.9.0",
+    "solid-js": "1.8.22",
+    "tsup": "8.2.4",
     "tsup-preset-solid": "2.2.0",
-    "typescript": "5.4.3"
+    "typescript": "5.5.4"
   },
   "peerDependencies": {
     "@blockshake/defly-connect": "^1.1.6",
-    "@magic-ext/algorand": "^23.0.2",
+    "@magic-ext/algorand": "^23.5.0",
     "@perawallet/connect": "^1.3.4",
-    "@perawallet/connect-beta": "^2.0.11",
+    "@perawallet/connect-beta": "^2.0.14",
     "@walletconnect/modal": "^2.6.2",
-    "@walletconnect/sign-client": "^2.10.2",
+    "@walletconnect/sign-client": "^2.15.2",
     "algosdk": "^2.7.0",
     "lute-connect": "^1.3.0",
-    "magic-sdk": "^28.0.3"
+    "magic-sdk": "^28.5.0"
   },
   "peerDependenciesMeta": {
     "@blockshake/defly-connect": {
@@ -105,7 +105,7 @@
   "typesVersions": {},
   "scripts": {
     "build": "tsup",
-    "start": "tsup src/index.ts --watch",
+    "start": "tsup src/index.tsx --watch",
     "test": "vitest",
     "test:watch": "vitest --watch",
     "lint": "eslint -c '../../.eslintrc.json' '**/*.{js,ts}'",