waygraph 0.15.54 → 0.16.0

package/templates/scaffold/src/map/(app_base)/home/_methods/assert-item-added.method.block.ts

@@ -1,5 +1,5 @@
 import { defineAssertBlock, Trait, type Trait as TraitType } from "waygraph";
-import type { ItemInCart } from "../../../../states/demo.states.js";
+import { ItemInCart } from "../../../../states/demo.states.js";
 import { SelectedItem } from "../../../../states/demo.mem-keys.js";
 import { DemoSel } from "../_sel.js";
 
@@ -13,9 +13,9 @@ const removeButtonVisibleForSelectedItem: TraitType = {
 };
 
 /** The mem-selected item's own Remove button appeared and the cart count reflects it. */
-export const AssertItemAddedBlock = defineAssertBlock<ItemInCart>({
+export const AssertItemAddedBlock = defineAssertBlock({
   name: "assert-item-added",
   description: "Confirms the mem-selected item's own Remove button appeared and the cart count reflects it.",
-  checkpoint: "ItemInCart",
+  checkpoint: ItemInCart,
   verify: [removeButtonVisibleForSelectedItem, Trait.text(DemoSel.cartCount, "1")],
 });

package/templates/scaffold/src/map/(app_base)/home/_methods/clear-cart.method.block.ts

@@ -1,15 +1,16 @@
-import { defineMethodBlock, checkpoint, Trait } from "waygraph";
-import type { ItemInCart, CartEmpty } from "../../../../states/demo.states.js";
+import { defineMethodBlock, Trait } from "waygraph";
+import { ItemInCart, CartEmpty } from "../../../../states/demo.states.js";
 import { DemoSel } from "../_sel.js";
 
-export const ClearCartBlock = defineMethodBlock<ItemInCart, CartEmpty>({
+export const ClearCartBlock = defineMethodBlock({
   name: "clear-cart",
   description: "Clears every item via the Clear cart control.",
+  from: ItemInCart,
+  to: CartEmpty,
   instruction: {
     async act(page) {
       await page.locator(DemoSel.clear).click();
     },
-    resolve: () => checkpoint("CartEmpty"),
     verify: [Trait.text(DemoSel.cartCount, "0")],
   },
 });

package/templates/scaffold/src/map/(app_base)/home/_methods/remove-item.effect.block.ts

@@ -1,22 +1,22 @@
 import {
   defineEffectBlock,
-  checkpoint,
   type WaygraphInstanceOption,
 } from "waygraph";
-import type { CartEmpty, ItemInCart } from "../../../../states/demo.states.js";
+import { CartEmpty, ItemInCart } from "../../../../states/demo.states.js";
 import { SelectedItem } from "../../../../states/demo.mem-keys.js";
 import { DemoSel } from "../_sel.js";
 
-export const RemoveItemBlock = defineEffectBlock<ItemInCart, CartEmpty>({
+export const RemoveItemBlock = defineEffectBlock({
   name: "remove-item",
   description: "Removes the mem-selected catalog item from the cart.",
+  from: ItemInCart,
+  to: CartEmpty,
   requires: [SelectedItem.key],
   instruction: {
     async act(page, _input, mem) {
       const { id } = mem.get(SelectedItem.key);
       await page.locator(DemoSel.removeBtn(id)).click();
     },
-    resolve: () => checkpoint("CartEmpty"),
     verify: [
       {
         name: "item-removed",

package/templates/scaffold/src/map/(app_base)/home/_nav.block.ts

@@ -1,11 +1,11 @@
 import { defineNavBlock, Trait } from "waygraph";
-import type { Home } from "../../../states/demo.states.js";
+import { Home } from "../../../states/demo.states.js";
 import { DemoSel, HOME_URL } from "./_sel.js";
 
-export const NavHomeBlock = defineNavBlock<Home>({
+export const NavHomeBlock = defineNavBlock({
   name: "nav-home",
   description: "Opens the offline catalog page (file://, no server).",
-  checkpoint: "Home",
+  checkpoint: Home,
   url: HOME_URL,
   verify: [Trait.text(DemoSel.title, "Hello Waygraph"), Trait.visible(DemoSel.catalog)],
 });

package/templates/scaffold/src/map/(app_base)/home/_page.block.ts

@@ -1,15 +1,15 @@
 import { definePageBlock, Trait } from "waygraph";
-import type { Home } from "../../../states/demo.states.js";
+import { Home } from "../../../states/demo.states.js";
 import { DemoSel } from "./_sel.js";
 import { AddItemBlock } from "./_methods/add-item.effect.block.js";
 import { RemoveItemBlock } from "./_methods/remove-item.effect.block.js";
 import { ClearCartBlock } from "./_methods/clear-cart.method.block.js";
 import { AssertHelloBlock } from "./_methods/assert-hello.method.block.js";
 
-export const HomePageBlock = definePageBlock<Home>({
+export const HomePageBlock = definePageBlock({
   name: "page-home",
   description: "Offline home hub - add/remove effects, clear, assert-hello.",
-  checkpoint: "Home",
+  checkpoint: Home,
   verify: [Trait.visible(DemoSel.catalog)],
   methods: {
     addItem: () => AddItemBlock,

package/templates/scaffold/src/map/(app_base)/home/nav-verification-link.block.ts

@@ -1,12 +1,12 @@
 import { defineNavBlock, Trait } from "waygraph";
-import type { HomeVerified } from "../../../states/demo.states.js";
-import { EmailLink } from "../../../states/demo.mem-keys.js";
+import { HomeVerified } from "../../../states/demo.states.js";
+import { EmailLink } from "../../(external)/mailpit/_keys.js";
 import { DemoSel } from "./_sel.js";
 
 /** Follows the link `extract-email-link` put in mem. No `requires`: an earlier Block in the chain produces it. */
-export const NavVerificationLinkBlock = defineNavBlock<HomeVerified>({
+export const NavVerificationLinkBlock = defineNavBlock({
   name: "nav-verification-link",
-  checkpoint: "HomeVerified",
+  checkpoint: HomeVerified,
   url: (mem) => mem.get(EmailLink.key).url,
   verify: [Trait.visible(DemoSel.verifiedBanner)],
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_keys.ts

@@ -0,0 +1,21 @@
+import { key, keyGroup } from "waygraph";
+
+export const RequestMethod = key<string>("hoppscotch.requestMethod");
+export const RequestUrl = key<string>("hoppscotch.requestUrl");
+export const RequestHeaders = key<Record<string, string>>("hoppscotch.requestHeaders");
+export const RequestParams = key<Record<string, string>>("hoppscotch.requestParams");
+export const RequestBearerToken = key<string>("hoppscotch.requestBearerToken");
+
+/** Raw JSON text typed into the request body editor. */
+export const RequestBody = key<string>("hoppscotch.requestBody");
+export const ExpectedStatus = key<number>("hoppscotch.expectedStatus");
+
+/** Substring the response body must contain. */
+export const ExpectedResponseText = key<string>("hoppscotch.expectedResponseText");
+
+/** The raw response body, set by read-response-body. */
+export const ResponseBody = key<string>("hoppscotch.responseBody");
+
+/** Response headers (lower-cased names), set by read-response-headers. */
+export const ResponseHeaders = key<Record<string, string>>("hoppscotch.responseHeaders");
+export const ExpectedResponseHeader = keyGroup<{ name: string; value: string }>("hoppscotch.expectedResponseHeader");

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/assert-response-body.method.block.ts

@@ -1,6 +1,6 @@
 import { defineAssertBlock, type Trait } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { ExpectedResponseText, ResponseBody } from "../../../../states/demo.mem-keys.js";
+import { HoppscotchRest } from "../_states.js";
+import { ExpectedResponseText, ResponseBody } from "../_keys.js";
 
 // Hoppscotch pretty-prints JSON, so compare with whitespace removed from both sides.
 const squash = (text: string): string => text.replace(/\s+/g, "");
@@ -12,10 +12,10 @@ const bodyContainsExpected: Trait = {
   },
 };
 
-export const AssertResponseBodyBlock = defineAssertBlock<HoppscotchRest>({
+export const AssertResponseBodyBlock = defineAssertBlock({
   name: "assert-response-body",
   description: "Confirms the response body read earlier contains the mem-supplied text (whitespace ignored).",
-  checkpoint: "HoppscotchRest",
+  checkpoint: HoppscotchRest,
   requires: [ExpectedResponseText],
   verify: [bodyContainsExpected],
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/assert-response-header.method.block.ts

@@ -1,6 +1,6 @@
 import { defineAssertBlock, type Trait } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { ExpectedResponseHeader, ResponseHeaders } from "../../../../states/demo.mem-keys.js";
+import { HoppscotchRest } from "../_states.js";
+import { ExpectedResponseHeader, ResponseHeaders } from "../_keys.js";
 
 const headerMatches: Trait = {
   name: "response-header-matches",
@@ -10,10 +10,10 @@ const headerMatches: Trait = {
   },
 };
 
-export const AssertResponseHeaderBlock = defineAssertBlock<HoppscotchRest>({
+export const AssertResponseHeaderBlock = defineAssertBlock({
   name: "assert-response-header",
   description: "Confirms a response header read earlier has the mem-supplied value.",
-  checkpoint: "HoppscotchRest",
+  checkpoint: HoppscotchRest,
   requires: [ExpectedResponseHeader.key],
   verify: [headerMatches],
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/assert-status.method.block.ts

@@ -1,6 +1,6 @@
 import { defineAssertBlock, type Trait } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { ExpectedStatus } from "../../../../states/demo.mem-keys.js";
+import { HoppscotchRest } from "../_states.js";
+import { ExpectedStatus } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
 const statusMatches: Trait = {
@@ -11,10 +11,10 @@ const statusMatches: Trait = {
   },
 };
 
-export const AssertStatusBlock = defineAssertBlock<HoppscotchRest>({
+export const AssertStatusBlock = defineAssertBlock({
   name: "assert-status",
   description: "Confirms the response status code equals the mem-supplied one.",
-  checkpoint: "HoppscotchRest",
+  checkpoint: HoppscotchRest,
   requires: [ExpectedStatus],
   verify: [statusMatches],
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/pick-extension-interceptor.method.block.ts

@@ -1,10 +1,12 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchSettings } from "../../../../states/demo.states.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchSettings } from "../_states.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const PickExtensionInterceptorBlock = defineMethodBlock<HoppscotchSettings, HoppscotchSettings>({
+export const PickExtensionInterceptorBlock = defineMethodBlock({
   name: "pick-extension-interceptor",
   description: "Routes Hoppscotch's requests through the browser extension, which skips CORS.",
+  from: HoppscotchSettings,
+  to: HoppscotchSettings,
   instruction: {
     async act(page) {
       const radio = page.locator(HoppscotchSel.extensionInterceptor);
@@ -13,6 +15,5 @@ export const PickExtensionInterceptorBlock = defineMethodBlock<HoppscotchSetting
       });
       await radio.click();
     },
-    resolve: () => checkpoint("HoppscotchSettings"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/read-response-body.method.block.ts

@@ -1,11 +1,13 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { ResponseBody } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { ResponseBody } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const ReadResponseBodyBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const ReadResponseBodyBlock = defineMethodBlock({
   name: "read-response-body",
   description: "Reads the raw response body into mem.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   instruction: {
     async act(page, _in, mem) {
       await page.locator(HoppscotchSel.rawTab).click();
@@ -16,6 +18,5 @@ export const ReadResponseBodyBlock = defineMethodBlock<HoppscotchRest, Hoppscotc
       const json = page.locator(HoppscotchSel.responseJsonTab);
       if (await json.count()) await json.click();
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/read-response-headers.method.block.ts

@@ -1,11 +1,13 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { ResponseHeaders } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { ResponseHeaders } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const ReadResponseHeadersBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const ReadResponseHeadersBlock = defineMethodBlock({
   name: "read-response-headers",
   description: "Reads the response headers (lower-cased names) into mem.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   instruction: {
     async act(page, _in, mem) {
       await page.locator(HoppscotchSel.responseHeadersTab).click();
@@ -16,6 +18,5 @@ export const ReadResponseHeadersBlock = defineMethodBlock<HoppscotchRest, Hoppsc
       for (let i = 0; i + 1 < texts.length; i += 2) headers[texts[i]!.toLowerCase()] = texts[i + 1]!;
       mem.set(ResponseHeaders, headers);
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/send-request.method.block.ts

@@ -1,15 +1,16 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const SendRequestBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SendRequestBlock = defineMethodBlock({
   name: "send-request",
   description: "Sends the request and waits for the response status to appear.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   instruction: {
     async act(page) {
       await page.locator(HoppscotchSel.send).click();
       await page.locator(HoppscotchSel.status).waitFor({ timeout: 20_000 });
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/set-bearer-token.method.block.ts

@@ -1,11 +1,13 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { RequestBearerToken } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { RequestBearerToken } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const SetBearerTokenBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SetBearerTokenBlock = defineMethodBlock({
   name: "set-bearer-token",
   description: "Sets the Authorization tab to Bearer and types the mem-supplied token.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   requires: [RequestBearerToken],
   instruction: {
     async act(page, _in, mem) {
@@ -15,6 +17,5 @@ export const SetBearerTokenBlock = defineMethodBlock<HoppscotchRest, HoppscotchR
       await page.locator(HoppscotchSel.bearerToken).locator(HoppscotchSel.editor).click();
       await page.keyboard.type(mem.get(RequestBearerToken));
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/set-headers.method.block.ts

@@ -1,11 +1,13 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { RequestHeaders } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { RequestHeaders } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const SetHeadersBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SetHeadersBlock = defineMethodBlock({
   name: "set-headers",
   description: "Adds each mem-supplied header (name -> value) on the Headers tab.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   requires: [RequestHeaders],
   instruction: {
     async act(page, _in, mem) {
@@ -18,6 +20,5 @@ export const SetHeadersBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>
         await page.keyboard.type(value);
       }
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/set-json-body.method.block.ts

@@ -1,6 +1,6 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { RequestBody } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { RequestBody } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
 const spansLines = (text: string): boolean => {
@@ -11,9 +11,11 @@ const spansLines = (text: string): boolean => {
   }
 };
 
-export const SetJsonBodyBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SetJsonBodyBlock = defineMethodBlock({
   name: "set-json-body",
   description: "Sets the content type to application/json and types the mem-supplied body, prettified.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   requires: [RequestBody],
   instruction: {
     async act(page, _in, mem) {
@@ -31,6 +33,5 @@ export const SetJsonBodyBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest
         throw new Error("set-json-body: Hoppscotch's Prettify button was not found, so the body stayed on one line");
       }
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/set-method.method.block.ts

@@ -1,17 +1,18 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { RequestMethod } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { RequestMethod } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const SetMethodBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SetMethodBlock = defineMethodBlock({
   name: "set-method",
   description: "Picks the HTTP method (GET, POST, PUT, PATCH, DELETE, ...) from the request bar.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   requires: [RequestMethod],
   instruction: {
     async act(page, _in, mem) {
       await page.locator(HoppscotchSel.methodInput).click();
       await page.locator(HoppscotchSel.menuItem(mem.get(RequestMethod))).click();
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/set-query-params.method.block.ts

@@ -1,11 +1,13 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { RequestParams } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { RequestParams } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const SetQueryParamsBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SetQueryParamsBlock = defineMethodBlock({
   name: "set-query-params",
   description: "Adds each mem-supplied query parameter (name -> value) on the Parameters tab.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   requires: [RequestParams],
   instruction: {
     async act(page, _in, mem) {
@@ -17,6 +19,5 @@ export const SetQueryParamsBlock = defineMethodBlock<HoppscotchRest, HoppscotchR
         await page.keyboard.type(value);
       }
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_methods/set-url.method.block.ts

@@ -1,11 +1,13 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { HoppscotchRest } from "../../../../states/demo.states.js";
-import { RequestUrl } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { HoppscotchRest } from "../_states.js";
+import { RequestUrl } from "../_keys.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const SetUrlBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
+export const SetUrlBlock = defineMethodBlock({
   name: "set-url",
   description: "Types the request URL into the request bar.",
+  from: HoppscotchRest,
+  to: HoppscotchRest,
   requires: [RequestUrl],
   instruction: {
     async act(page, _in, mem) {
@@ -13,6 +15,5 @@ export const SetUrlBlock = defineMethodBlock<HoppscotchRest, HoppscotchRest>({
       await page.keyboard.press("Control+A");
       await page.keyboard.type(mem.get(RequestUrl));
     },
-    resolve: () => checkpoint("HoppscotchRest"),
   },
 });

package/templates/scaffold/src/map/(external)/hoppscotch/_nav.block.ts

@@ -1,10 +1,10 @@
 import { defineNavBlock, Trait } from "waygraph";
-import type { HoppscotchRest } from "../../../states/demo.states.js";
+import { HoppscotchRest } from "./_states.js";
 import { HoppscotchSel } from "./_sel.js";
 
-export const NavHoppscotchRestBlock = defineNavBlock<HoppscotchRest>({
+export const NavHoppscotchRestBlock = defineNavBlock({
   name: "nav-hoppscotch-rest",
-  checkpoint: "HoppscotchRest",
+  checkpoint: HoppscotchRest,
   // Cross-origin, so a function: the Map folder rule only checks static URLs.
   url: () => "https://hoppscotch.io/",
   verify: [Trait.visible(HoppscotchSel.send)],

package/templates/scaffold/src/map/(external)/hoppscotch/_page.block.ts

@@ -1,5 +1,5 @@
 import { definePageBlock, Trait } from "waygraph";
-import type { HoppscotchRest } from "../../../states/demo.states.js";
+import { HoppscotchRest } from "./_states.js";
 import { SetMethodBlock } from "./_methods/set-method.method.block.js";
 import { SetUrlBlock } from "./_methods/set-url.method.block.js";
 import { SetHeadersBlock } from "./_methods/set-headers.method.block.js";
@@ -14,10 +14,10 @@ import { ReadResponseHeadersBlock } from "./_methods/read-response-headers.metho
 import { AssertResponseHeaderBlock } from "./_methods/assert-response-header.method.block.js";
 import { HoppscotchSel } from "./_sel.js";
 
-export const HoppscotchRestPageBlock = definePageBlock<HoppscotchRest>({
+export const HoppscotchRestPageBlock = definePageBlock({
   name: "page-hoppscotch-rest",
   description: "Hoppscotch REST client - build a request, send it, check the response.",
-  checkpoint: "HoppscotchRest",
+  checkpoint: HoppscotchRest,
   verify: [Trait.visible(HoppscotchSel.send)],
   methods: {
     setMethod: () => SetMethodBlock,

package/templates/scaffold/src/map/(external)/hoppscotch/_states.ts

@@ -0,0 +1,6 @@
+import { checkpoint } from "waygraph";
+
+export const HoppscotchSettings = checkpoint("HoppscotchSettings");
+export type HoppscotchSettings = typeof HoppscotchSettings;
+export const HoppscotchRest = checkpoint("HoppscotchRest");
+export type HoppscotchRest = typeof HoppscotchRest;

package/templates/scaffold/src/map/(external)/hoppscotch/settings/_nav.block.ts

@@ -1,10 +1,10 @@
 import { defineNavBlock, Trait } from "waygraph";
-import type { HoppscotchSettings } from "../../../../states/demo.states.js";
+import { HoppscotchSettings } from "../_states.js";
 import { HoppscotchSel } from "../_sel.js";
 
-export const NavHoppscotchSettingsBlock = defineNavBlock<HoppscotchSettings>({
+export const NavHoppscotchSettingsBlock = defineNavBlock({
   name: "nav-hoppscotch-settings",
-  checkpoint: "HoppscotchSettings",
+  checkpoint: HoppscotchSettings,
   url: () => "https://hoppscotch.io/settings",
   verify: [Trait.visible(HoppscotchSel.interceptorHeading)],
 });

package/templates/scaffold/src/map/(external)/mailpit/_keys.ts

@@ -0,0 +1,13 @@
+import { key, keyGroup } from "waygraph";
+
+/** The link read out of the opened message - set by extract-email-link. */
+export const EmailLink = keyGroup<{ url: string }>("mailpit.emailLink");
+
+/** Matched by email, not inbox position, so one inbox can hold several recipients' mail. */
+export const ExpectedRecipient = keyGroup<{ email: string }>("mailpit.expectedRecipient");
+
+/** Substring the link's `href` must contain; mem varies per scenario, the Blocks do not. */
+export const ExpectedLinkPattern = key<string>("mailpit.expectedLinkPattern");
+
+/** Substring the open message's body must contain. */
+export const ExpectedEmailContent = key<string>("mailpit.expectedEmailContent");

package/templates/scaffold/src/map/(external)/mailpit/_methods/assert-email-content.method.block.ts

@@ -1,6 +1,6 @@
 import { defineAssertBlock, type Trait } from "waygraph";
-import type { MailpitMessageOpen } from "../../../../states/demo.states.js";
-import { ExpectedEmailContent } from "../../../../states/demo.mem-keys.js";
+import { MailpitMessageOpen } from "../_states.js";
+import { ExpectedEmailContent } from "../_keys.js";
 import { MailpitSel } from "../_sel.js";
 
 // Reads the expected copy from mem, so one Block serves any email template.
@@ -14,10 +14,10 @@ const bodyContainsExpectedText: Trait = {
 };
 
 /** The open message says what the scenario expects (copy comes from mem). */
-export const AssertEmailContentBlock = defineAssertBlock<MailpitMessageOpen>({
+export const AssertEmailContentBlock = defineAssertBlock({
   name: "assert-email-content",
   description: "Confirms the open message's body contains the mem-supplied expected copy.",
-  checkpoint: "MailpitMessageOpen",
+  checkpoint: MailpitMessageOpen,
   requires: [ExpectedEmailContent],
   verify: [bodyContainsExpectedText],
 });

package/templates/scaffold/src/map/(external)/mailpit/_methods/assert-email-received.method.block.ts

@@ -1,6 +1,6 @@
 import { defineAssertBlock, type Trait } from "waygraph";
-import type { MailpitInbox } from "../../../../states/demo.states.js";
-import { ExpectedRecipient } from "../../../../states/demo.mem-keys.js";
+import { MailpitInbox } from "../_states.js";
+import { ExpectedRecipient } from "../_keys.js";
 import { MailpitSel } from "../_sel.js";
 
 // Mem-aware: which recipient to look for is only known at run time.
@@ -21,10 +21,10 @@ const emailReceived: Trait = {
 };
 
 /** A message for the expected recipient has arrived; nothing is opened or consumed. */
-export const AssertEmailReceivedBlock = defineAssertBlock<MailpitInbox>({
+export const AssertEmailReceivedBlock = defineAssertBlock({
   name: "assert-email-received",
   description: "Confirms a message addressed to the expected recipient has arrived.",
-  checkpoint: "MailpitInbox",
+  checkpoint: MailpitInbox,
   requires: [ExpectedRecipient.key],
   verify: [emailReceived],
 });

package/templates/scaffold/src/map/(external)/mailpit/_methods/extract-email-link.method.block.ts

@@ -1,12 +1,14 @@
-import { defineMethodBlock, checkpoint } from "waygraph";
-import type { MailpitMessageOpen } from "../../../../states/demo.states.js";
-import { EmailLink, ExpectedLinkPattern } from "../../../../states/demo.mem-keys.js";
+import { defineMethodBlock } from "waygraph";
+import { MailpitMessageOpen } from "../_states.js";
+import { EmailLink, ExpectedLinkPattern } from "../_keys.js";
 import { MailpitSel } from "../_sel.js";
 
 /** Reads the link matching `ExpectedLinkPattern` out of the preview into mem; going there is a separate Nav. */
-export const ExtractEmailLinkBlock = defineMethodBlock<MailpitMessageOpen, MailpitMessageOpen>({
+export const ExtractEmailLinkBlock = defineMethodBlock({
   name: "extract-email-link",
   description: "Reads the link matching the mem-supplied pattern out of the open message's preview.",
+  from: MailpitMessageOpen,
+  to: MailpitMessageOpen,
   requires: [ExpectedLinkPattern],
   instruction: {
     async act(page, _in, mem) {
@@ -18,6 +20,5 @@ export const ExtractEmailLinkBlock = defineMethodBlock<MailpitMessageOpen, Mailp
       if (!href) throw new Error(`extract-email-link: no link matching "${pattern}" in message preview`);
       mem.set(EmailLink({ url: href }));
     },
-    resolve: () => checkpoint("MailpitMessageOpen"),
   },
 });