fix more tests

packages/builder/test/opaque-ref-schema.test.ts

@@ -1,20 +1,31 @@
 import { afterEach, beforeEach, describe, it } from "@std/testing/bdd";
 import { expect } from "@std/expect";
-import { recipe } from "../src/index.ts";
+import { createBuilder } from "../src/index.ts";
 import { popFrame, pushFrame } from "../src/recipe.ts";
-import { opaqueRef } from "../src/opaque-ref.ts";
 import type { Frame, JSONSchema } from "../src/types.ts";
+import { Runtime } from "@commontools/runner";
 
 describe("OpaqueRef Schema Support", () => {
   let frame: Frame;
+  let runtime: Runtime;
+  let recipe: ReturnType<typeof createBuilder>["recipe"];
+  let cell: ReturnType<typeof createBuilder>["cell"];
 
   beforeEach(() => {
     // Setup frame for the test
     frame = pushFrame();
+
+    // Set up runtime and builder
+    runtime = new Runtime({
+      storageUrl: "volatile://",
+    });
+    const builder = createBuilder(runtime);
+    ({ recipe, cell } = builder);
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     popFrame(frame);
+    await runtime?.dispose();
   });
 
   describe("Schema Setting and Retrieval", () => {
@@ -29,7 +40,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref
-      const ref = opaqueRef<{ name: string; age: number }>(undefined, schema);
+      const ref = cell<{ name: string; age: number }>(undefined, schema);
 
       // Export the ref and check the schema is included
       const exported = ref.export();
@@ -54,7 +65,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref
-      const ref = opaqueRef<{ name: string; details: { age: number } }>(
+      const ref = cell<{ name: string; details: { age: number } }>(
         undefined,
         rootSchema,
       ).key("details");
@@ -80,7 +91,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref
-      const ref = opaqueRef<{ name: string; age: number }>(undefined, schema);
+      const ref = cell<{ name: string; age: number }>(undefined, schema);
 
       // Get a child property
       const nameRef = ref.key("name");
@@ -111,7 +122,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref with an array
-      const ref = opaqueRef<{ items: Array<{ id: number; text: string }> }>(
+      const ref = cell<{ items: Array<{ id: number; text: string }> }>(
         undefined,
         schema,
       );
@@ -153,7 +164,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref with nested objects
-      const ref = opaqueRef<{
+      const ref = cell<{
         user: {
           profile: {
             name: string;
@@ -192,7 +203,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref with nested objects
-      const ref = opaqueRef<{
+      const ref = cell<{
         details: {
           name: string;
           age: number;
@@ -232,7 +243,7 @@ describe("OpaqueRef Schema Support", () => {
       } as const satisfies JSONSchema;
 
       // Create an opaque ref with nested objects, and a property that isn't in the schema
-      const ref = opaqueRef<{
+      const ref = cell<{
         details: {
           name: string;
           age: number;

packages/html/test/html-recipes.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, it, afterEach } from "@std/testing/bdd";
 import { h, render, VNode } from "../src/index.ts";
-import { lift, recipe, str, UI } from "@commontools/builder";
+import { createBuilder, UI } from "@commontools/builder";
 import { Runtime } from "@commontools/runner";
 import * as assert from "./assert.ts";
 import { JSDOM } from "jsdom";
@@ -9,6 +9,9 @@ describe("recipes with HTML", () => {
   let dom: JSDOM;
   let document: Document;
   let runtime: Runtime;
+  let lift: ReturnType<typeof createBuilder>["lift"];
+  let recipe: ReturnType<typeof createBuilder>["recipe"];
+  let str: ReturnType<typeof createBuilder>["str"];
 
   beforeEach(() => {
     // Set up a fresh JSDOM instance for each test
@@ -25,6 +28,9 @@ describe("recipes with HTML", () => {
     runtime = new Runtime({
       storageUrl: "volatile://"
     });
+
+    const builder = createBuilder(runtime);
+    ({ lift, recipe, str } = builder);
   });
 
   afterEach(async () => {
@@ -39,9 +45,11 @@ describe("recipes with HTML", () => {
       },
     );
 
-    const space = "test";
-    const resultCell = runtime.documentMap.getDoc(undefined, "simple-ui-result", space);
-    const result = runtime.runner.run(simpleRecipe, { value: 5 }, resultCell);
+    const result = runtime.run(
+      simpleRecipe,
+      { value: 5 },
+      runtime.documentMap.getDoc(undefined, "simple-ui-result", "test")
+    );
 
     await runtime.idle();
     const resultValue = result.get();
@@ -81,15 +89,17 @@ describe("recipes with HTML", () => {
       };
     });
 
-    const space = "test";
-    const resultCell = runtime.documentMap.getDoc(undefined, "todo-list-result", space);
-    const result = runtime.runner.run(todoList, {
-      title: "test",
-      items: [
-        { title: "item 1", done: false },
-        { title: "item 2", done: true },
-      ],
-    }, resultCell);
+    const result = runtime.run(
+      todoList,
+      {
+        title: "test",
+        items: [
+          { title: "item 1", done: false },
+          { title: "item 2", done: true },
+        ],
+      },
+      runtime.documentMap.getDoc(undefined, "todo-list-result", "test")
+    );
 
     await runtime.idle();
 
@@ -121,15 +131,17 @@ describe("recipes with HTML", () => {
       return { [UI]: h("div", null, summaryUI as any) };
     });
 
-    const space = "test";
-    const resultCell = runtime.documentMap.getDoc(undefined, "nested-todo-result", space);
-    const result = runtime.runner.run(todoList, {
-      title: { name: "test" },
-      items: [
-        { title: "item 1", done: false },
-        { title: "item 2", done: true },
-      ],
-    }, resultCell);
+    const result = runtime.run(
+      todoList,
+      {
+        title: { name: "test" },
+        items: [
+          { title: "item 1", done: false },
+          { title: "item 2", done: true },
+        ],
+      },
+      runtime.documentMap.getDoc(undefined, "nested-todo-result", "test")
+    );
 
     await runtime.idle();
 
@@ -146,9 +158,11 @@ describe("recipes with HTML", () => {
       return { [UI]: h("div", null, str`Hello, ${name}!`) };
     });
 
-    const space = "test";
-    const resultCell = runtime.documentMap.getDoc(undefined, "str-recipe-result", space);
-    const result = runtime.runner.run(strRecipe, { name: "world" }, resultCell);
+    const result = runtime.run(
+      strRecipe,
+      { name: "world" },
+      runtime.documentMap.getDoc(undefined, "str-recipe-result", "test")
+    );
 
     await runtime.idle();
 
@@ -185,9 +199,11 @@ describe("recipes with HTML", () => {
       ),
     }));
 
-    const space = "test";
-    const resultCell = runtime.documentMap.getDoc(undefined, "nested-map-result", space);
-    const result = runtime.runner.run(nestedMapRecipe, data, resultCell);
+    const result = runtime.run(
+      nestedMapRecipe,
+      data,
+      runtime.documentMap.getDoc(undefined, "nested-map-result", "test")
+    );
 
     await runtime.idle();