Renaming internals

src/core/context.ts

@@ -15,7 +15,7 @@ export function getContext(): Context {
   return currentContext;
 }
 
-export function runWith<T>(context: Context, fn: () => T): T {
+export function runWithContext<T>(context: Context, fn: () => T): T {
   const oldContext = { ...currentContext };
 
   if ("reactionId" in context) currentContext.reactionId = context.reactionId;
@@ -35,7 +35,7 @@ export function runUpdate<T>(context: Context, fn: () => T): T {
   if (context.disposerId) flushDisposer(context.disposerId);
 
   try {
-    return runWith(context, fn);
+    return runWithContext(context, fn);
   } catch (error) {
     if (context.disposerId) flushDisposer(context.disposerId);
 

src/core/reactor.ts

@@ -15,12 +15,15 @@ const reactionsQueue = new Map<ReactionId, Task | number>();
 let taskPriority: Priority = Priority.NormalPriority;
 let scheduled = false;
 
-export function withPriority(priority: Priority, fn?: () => any) {
+export function runWithPriority<T>(
+  priority: Priority,
+  fn?: () => T
+): T | undefined {
   const prev = taskPriority;
 
   try {
     taskPriority = priority;
-    fn?.();
+    return fn?.();
   } finally {
     taskPriority = prev;
   }
@@ -64,7 +67,7 @@ export function scheduleReactions(reactionsIds: Array<ReactionId>): void {
         requestCallback(
           () => {
             reactionsQueue.delete(reactionId);
-            withPriority(task, getComputation(reactionId));
+            runWithPriority(task, getComputation(reactionId));
           },
           { timeout: LOW_PRIORITY_TIMEOUT }
         )

src/utils/concurrently.ts

@@ -1,5 +1,5 @@
-import { Priority, withPriority } from "../core/reactor";
+import { Priority, runWithPriority } from "../core/reactor";
 
 export function concurrently(fn: () => any) {
-  return withPriority(Priority.LowPriority, fn);
+  return runWithPriority(Priority.LowPriority, fn);
 }

src/utils/freeze.ts

@@ -1,5 +1,5 @@
-import { runWith } from "../core/context";
+import { runWithContext } from "../core/context";
 
 export function freeze<T>(fn: () => T): T {
-  return runWith({ reactionId: undefined }, fn);
+  return runWithContext({ reactionId: undefined }, fn);
 }

src/utils/root.ts

@@ -1,4 +1,4 @@
-import { runWith } from "../core/context";
+import { runWithContext } from "../core/context";
 import { createDisposer, flushDisposer } from "../core/disposer";
 
 import type { Disposable } from "../core/disposer";
@@ -7,5 +7,7 @@ export function root<T>(fn: (disposer: Disposable) => T): T {
   const disposerId = createDisposer();
   const disposer = () => flushDisposer(disposerId);
 
-  return runWith({ disposerId, reactionId: undefined }, () => fn(disposer));
+  return runWithContext({ disposerId, reactionId: undefined }, () =>
+    fn(disposer)
+  );
 }

tests/core/context.test.ts

@@ -1,5 +1,5 @@
 import { describe, test, vi, expect } from "vitest";
-import { runWith, getContext } from "../../src/core/context";
+import { runWithContext, getContext } from "../../src/core/context";
 import { createValue } from "../../src/reactive/value";
 import { reactive } from "../../src/utils/reactive";
 import { root } from "../../src/utils/root";
@@ -92,7 +92,7 @@ describe("freeze", () => {
 
     expect(getContext().reactionId).toBeUndefined();
 
-    runWith({ disposerId: undefined, reactionId }, () => {
+    runWithContext({ disposerId: undefined, reactionId }, () => {
       expect(getContext().reactionId).toBe(reactionId);
 
       freeze(() => {
@@ -111,7 +111,7 @@ describe("freeze", () => {
 
     expect(getContext().disposerId).toBeUndefined();
 
-    runWith({ disposerId, reactionId: undefined }, () => {
+    runWithContext({ disposerId, reactionId: undefined }, () => {
       freeze(() => {
         onCleanup(cleanupMock);
       });

tests/core/disposer.test.ts

@@ -4,7 +4,7 @@ import {
   flushDisposer,
   onCleanup,
 } from "../../src/core/disposer";
-import { runWith } from "../../src/core/context";
+import { runWithContext } from "../../src/core/context";
 import { root } from "../../src/utils/root";
 
 vi.useFakeTimers();
@@ -14,7 +14,7 @@ describe("onCleanup", () => {
     const disposerId = createDisposer();
     const cleanupMock = vi.fn();
 
-    runWith({ disposerId, reactionId: undefined }, () => {
+    runWithContext({ disposerId, reactionId: undefined }, () => {
       onCleanup(cleanupMock);
     });
 

tests/reactive/memo.test.ts

@@ -7,7 +7,7 @@ import {
   flushDisposer,
   onCleanup,
 } from "../../src/core/disposer";
-import { runWith } from "../../src/core/context";
+import { runWithContext } from "../../src/core/context";
 import { root } from "../../src";
 
 vi.useFakeTimers();
@@ -117,7 +117,7 @@ describe("createMemo", () => {
     const disposerId = createDisposer();
     const spy = vi.fn();
 
-    runWith({ disposerId, reactionId: undefined }, () => {
+    runWithContext({ disposerId, reactionId: undefined }, () => {
       expect(spy.mock.calls.length).toBe(0);
 
       const getMemo = createMemo(() => {
@@ -152,7 +152,7 @@ describe("createMemo", () => {
     const [getAtom] = createValue(1);
     const disposerId = createDisposer();
 
-    runWith({ disposerId, reactionId: undefined }, () => {
+    runWithContext({ disposerId, reactionId: undefined }, () => {
       const getMemo = createMemo(() => {
         onCleanup(spy);
         getAtom();

tests/reactive/value.test.ts

@@ -1,5 +1,5 @@
 import { describe, test, vi, expect } from "vitest";
-import { runWith } from "../../src/core/context";
+import { runWithContext } from "../../src/core/context";
 import { createValue } from "../../src/reactive/value";
 import { reactive } from "../../src/utils/reactive";
 import { root } from "../../src/utils/root";
@@ -29,7 +29,7 @@ describe("createValue", () => {
     const reactionId = createReaction(spy);
     const [getAtom, setAtom] = createValue(false);
 
-    runWith({ disposerId: undefined, reactionId }, () => getAtom());
+    runWithContext({ disposerId: undefined, reactionId }, () => getAtom());
 
     expect(spy.mock.calls.length).toBe(0);
     expect(getAtom()).toBe(false);
@@ -49,7 +49,7 @@ describe("createValue", () => {
     const reactionId = createReaction(spy);
     const [getAtom, setAtom] = createValue(true, false);
 
-    runWith({ disposerId: undefined, reactionId }, () => getAtom());
+    runWithContext({ disposerId: undefined, reactionId }, () => getAtom());
 
     expect(spy.mock.calls.length).toBe(0);
 
@@ -68,7 +68,7 @@ describe("createValue", () => {
     const [getAtom, setAtom] = createValue(false);
 
     root(() => {
-      runWith({ disposerId: undefined, reactionId }, () => getAtom());
+      runWithContext({ disposerId: undefined, reactionId }, () => getAtom());
 
       expect(spy.mock.calls.length).toBe(0);
       expect(getAtom()).toBe(false);
@@ -98,7 +98,7 @@ describe("createValue", () => {
     const [getAtom, setAtom] = createValue([1], (a, b) => a[0] === b[0]);
 
     root(() => {
-      runWith({ disposerId: undefined, reactionId }, () => getAtom());
+      runWithContext({ disposerId: undefined, reactionId }, () => getAtom());
 
       expect(spy.mock.calls.length).toBe(0);
 
@@ -122,7 +122,7 @@ describe("createValue", () => {
     const [getAtom, setAtom] = createValue(false);
     const disposerId = createDisposer();
 
-    runWith({ disposerId, reactionId }, () => getAtom());
+    runWithContext({ disposerId, reactionId }, () => getAtom());
 
     setAtom(true);
 
@@ -147,7 +147,7 @@ describe("createValue", () => {
     const [getAtom, setAtom] = createValue(0);
     const disposerId = createDisposer();
 
-    runWith({ disposerId, reactionId }, () => setAtom(getAtom() + 1));
+    runWithContext({ disposerId, reactionId }, () => setAtom(getAtom() + 1));
 
     expect(spy.mock.calls.length).toBe(0);
     expect(getAtom()).toBe(1);
@@ -227,7 +227,7 @@ describe("createValue", () => {
         spy();
       });
 
-      runWith({ disposerId, reactionId: undefined }, () => {
+      runWithContext({ disposerId, reactionId: undefined }, () => {
         reactive(() => {
           getData();
           spy2();

tests/utils/reactive.test.ts

@@ -5,7 +5,7 @@ import {
   onCleanup,
 } from "../../src/core/disposer";
 import { reactive } from "../../src/utils/reactive";
-import { runWith } from "../../src/core/context";
+import { runWithContext } from "../../src/core/context";
 import { createValue } from "../../src/reactive/value";
 
 vi.useFakeTimers();
@@ -17,7 +17,7 @@ describe("reactive", () => {
     const reactionSpy = vi.fn();
     const cleanupSpy = vi.fn();
 
-    runWith({ disposerId, reactionId: undefined }, () => {
+    runWithContext({ disposerId, reactionId: undefined }, () => {
       reactive(() => {
         onCleanup(cleanupSpy);
         reactionSpy();
@@ -126,7 +126,7 @@ describe("reactive", () => {
     const disposerId = createDisposer();
     const [getAtom, setAtom] = createValue(false);
 
-    runWith({ disposerId, reactionId: undefined }, () => {
+    runWithContext({ disposerId, reactionId: undefined }, () => {
       reactive(() => {
         getAtom();
         reactionSpy();