fix(built-in): always return wished cell, even if value isn't defined yet (commontoolsinc#2073)

fix(built-in): always return wished cell, even if value isn't defined yet

Author: seefeldb

packages/api/index.ts

@@ -1228,13 +1228,9 @@ export type CompileAndRunFunction = <T = any, S = any>(
 ) => OpaqueRef<BuiltInCompileAndRunState<S>>;
 
 export type NavigateToFunction = (cell: OpaqueRef<any>) => OpaqueRef<string>;
-export type WishFunction = {
-  <T = unknown>(target: Opaque<string>): OpaqueRef<T | undefined>;
-  <T = unknown>(
-    target: Opaque<string>,
-    defaultValue: Opaque<T>,
-  ): OpaqueRef<T>;
-};
+export type WishFunction = <T = unknown>(
+  target: Opaque<string>,
+) => OpaqueRef<T>;
 
 export type CreateNodeFactoryFunction = <T = any, R = any>(
   moduleSpec: Module,

packages/patterns/chatbot-list-view.tsx

@@ -2,6 +2,7 @@
 import {
   Cell,
   Default,
+  derive,
   handler,
   ID,
   ifElse,
@@ -236,7 +237,10 @@ const extractLocalMentionable = lift<
 export default recipe<Input, Output>(
   "Launcher",
   ({ selectedCharm, charmsList, theme }) => {
-    const allCharms = wish<MentionableCharm[]>("#allCharms", []);
+    const allCharms = derive<MentionableCharm[], MentionableCharm[]>(
+      wish<MentionableCharm[]>("#allCharms"),
+      (c) => c ?? [],
+    );
     logCharmsList({ charmsList: charmsList as unknown as Cell<CharmEntry[]> });
 
     populateChatList({

packages/patterns/chatbot-note-composed.tsx

@@ -8,7 +8,6 @@ import {
   handler,
   NAME,
   navigateTo,
-  Opaque,
   OpaqueRef,
   recipe,
   wish,
@@ -27,8 +26,8 @@ import {
 
 import { type MentionableCharm } from "./backlinks-index.tsx";
 
-function schemaifyWish<T>(path: string, def: Opaque<T>) {
-  return derive<T, T>(wish<T>(path, def), (i) => i);
+function schemaifyWish<T>(path: string, def: T) {
+  return derive(wish<T>(path) as T, (i) => i ?? def);
 }
 
 type ChatbotNoteInput = {

packages/patterns/note.tsx

@@ -8,7 +8,6 @@ import {
   handler,
   NAME,
   navigateTo,
-  type Opaque,
   type OpaqueRef,
   patternTool,
   recipe,
@@ -100,8 +99,8 @@ const handleCharmLinkClicked = handler<void, { charm: Cell<MentionableCharm> }>(
   },
 );
 
-function schemaifyWish<T>(path: string, def: T | Opaque<T>) {
-  return derive<T, T>(wish<T>(path, def as Opaque<T>), (i) => i);
+function schemaifyWish<T>(path: string, def: T) {
+  return derive(wish<T>(path) as T, (i) => i ?? def);
 }
 
 const Note = recipe<Input, Output>(

packages/runner/src/builtins/wish.ts

@@ -201,10 +201,6 @@ export function wish(
       : parsed.path;
     const resolvedCell = resolvePath(baseResolution.cell, combinedPath);
 
-    if (resolvedCell.get() !== undefined) {
-      sendResult(tx, resolvedCell);
-    } else {
-      sendResult(tx, hasDefault ? defaultCell : undefined);
-    }
+    sendResult(tx, resolvedCell);
   };
 }

packages/runner/test/wish.test.ts

@@ -402,40 +402,4 @@ describe("wish built-in", () => {
       console.error = originalError;
     }
   });
-
-  it("uses provided default when target is missing", async () => {
-    const fallback = [{ name: "Fallback" }];
-
-    // Set up space cell with an empty default pattern
-    const spaceCell = runtime.getCell(space, space).withTx(tx);
-    const defaultPatternCell = runtime.getCell(space, "default-pattern").withTx(
-      tx,
-    );
-    defaultPatternCell.set({}); // Empty default pattern
-    (spaceCell as any).key("defaultPattern").set(defaultPatternCell);
-
-    await tx.commit();
-    await runtime.idle();
-    tx = runtime.edit();
-
-    const wishRecipe = recipe("wish default", () => {
-      const missing = wish("/missing", fallback);
-      return { missing };
-    });
-
-    const resultCell = runtime.getCell<{ missing?: unknown }>(
-      space,
-      "wish built-in default",
-      undefined,
-      tx,
-    );
-    const result = runtime.run(tx, wishRecipe, {}, resultCell);
-    await tx.commit();
-    await runtime.idle();
-    tx = runtime.edit();
-
-    await runtime.idle();
-
-    expect(result.key("missing").get()).toEqual(fallback);
-  });
 });