patch(context): simplify context by removing the ancestry registration

ealush · Jul 27, 2022 · 7a17ef0 · 7a17ef0 · vercel · Jul 27, 2022
1 parent 147c906
commit 7a17ef0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/packages/context/src/__tests__/context.spec.ts b/packages/context/src/__tests__/context.spec.ts
@@ -64,7 +64,7 @@ describe('Context', () => {
           expect(ctx.use()).toMatchSnapshot();
         });
       });
-      expect(ctx.use()).toBeNull();
+      expect(ctx.use()).toBeUndefined();
     });
 
     describe('Context nesting', () => {
@@ -213,7 +213,7 @@ describe('Context', () => {
       describe('When after closing the context', () => {
         it('Should return undefined', () => {
           ctx.run({}, () => {});
-          expect(ctx.use()).toBeNull();
+          expect(ctx.use()).toBeUndefined();
         });
       });
     });

diff --git a/packages/context/src/context.ts b/packages/context/src/context.ts
@@ -15,7 +15,7 @@ export function createContext<T extends Record<string, unknown>>(
   use: () => T | undefined;
   useX: (errorMessage?: string) => T;
 } {
-  const storage: { ctx?: T; ancestry: T[] } = { ancestry: [] };
+  const storage: { ctx?: T } = {};
 
   return {
     bind,
@@ -43,10 +43,9 @@ export function createContext<T extends Record<string, unknown>>(
     ) as T;
 
     const ctx = set(Object.freeze(out));
-    storage.ancestry.unshift(ctx);
     const res = fn(ctx);
 
-    clear();
+    storage.ctx = parentContext;
     return res;
   }
 
@@ -69,9 +68,4 @@ export function createContext<T extends Record<string, unknown>>(
   function set(value: T): T {
     return (storage.ctx = value);
   }
-
-  function clear() {
-    storage.ancestry.shift();
-    set(storage.ancestry[0] ?? null);
-  }
 }