waygraph 0.7.15 → 0.10.0

package/templates/quickstart/src/blocks/saucedemo-web/inventory/inventory.page.block.ts

@@ -0,0 +1,37 @@
+import { definePageBlock, Trait } from "waygraph";
+import type { LoggedIn } from "../../../states/checkout.states.js";
+import { AddToCartBlock } from "./methods/add-to-cart.effect.block.js";
+import { RemoveFromCartBlock } from "./methods/remove-from-cart.effect.block.js";
+import { AddAllToCartBlock } from "./methods/add-all-to-cart.method.block.js";
+import { RemoveAllFromCartBlock } from "./methods/remove-all-from-cart.method.block.js";
+import { NavItemDetailBlock } from "./nav-item-detail.block.js";
+import { InventorySel } from "./methods/inventory-items.js";
+
+/**
+ * Kind: Page
+ * Helper: definePageBlock
+ * Route: saucedemo-web/inventory/  (= /inventory.html)
+ *
+ * Hub for the inventory screen after login. Methods (per-item + bulk
+ * add/remove, open detail) hang off this page; DOM strings live in
+ * InventorySel. Arrival-only (no url/click) - submit-login already resolved
+ * to LoggedIn. Cart Effects/Methods use In Checkpoint<string> (from: "*") so
+ * auto still offers them after leave/return - menu follows live DOM buttons.
+ */
+export const InventoryPageBlock = definePageBlock<LoggedIn>({
+  name: "page-inventory",
+  description:
+    "Inventory catalog hub - per-item and bulk add/remove, open item detail.",
+  checkpoint: "LoggedIn",
+  verify: [
+    Trait.url({ pathname: "/inventory.html" }),
+    Trait.visible(InventorySel.list),
+  ],
+  methods: {
+    addToCart: () => AddToCartBlock,
+    removeFromCart: () => RemoveFromCartBlock,
+    addAllToCart: () => AddAllToCartBlock,
+    removeAllFromCart: () => RemoveAllFromCartBlock,
+    openDetail: () => NavItemDetailBlock,
+  },
+});

package/templates/quickstart/src/blocks/saucedemo-web/inventory/methods/add-all-to-cart.method.block.ts

@@ -0,0 +1,55 @@
+import { defineMethodBlock, checkpoint, type Checkpoint } from "waygraph";
+import type { RemoveFromCartOutcome } from "../../../../states/checkout.states.js";
+import { collectAddableItems, InventorySel } from "./inventory-items.js";
+
+type BulkObserve = "added" | "nothing";
+
+/**
+ * Kind: Method
+ * Helper: defineMethodBlock
+ * Route: saucedemo-web/inventory/methods/  (= /inventory.html)
+ *
+ * Bulk: click every live "Add to cart" once. No instanceOptions - one auto
+ * menu row. In is Checkpoint<string> (from: "*") so back-and-forth works:
+ * leave inventory and return, collectors re-read Add buttons from the DOM.
+ * Out: ItemInCart if the cart has items after; LoggedIn if still empty.
+ */
+export const AddAllToCartBlock = defineMethodBlock<
+  Checkpoint<string>,
+  RemoveFromCartOutcome
+>({
+  name: "add-all-to-cart",
+  description: "Adds every product still showing Add to cart on this page.",
+  instruction: {
+    async act(page) {
+      const items = await collectAddableItems(page);
+      for (const item of items) {
+        await page.locator(InventorySel.addBtn(item.id)).click();
+      }
+    },
+    async observe(page): Promise<BulkObserve> {
+      const badge = await page.locator(InventorySel.cartBadge).count();
+      return badge > 0 ? "added" : "nothing";
+    },
+    resolve: (observed) =>
+      checkpoint(observed === "added" ? "ItemInCart" : "LoggedIn"),
+    verify: (out) =>
+      out.__state === "ItemInCart"
+        ? [
+            {
+              name: "cart-has-items",
+              async check(page) {
+                return (await page.locator(InventorySel.cartBadge).count()) > 0;
+              },
+            },
+          ]
+        : [
+            {
+              name: "cart-still-empty",
+              async check(page) {
+                return (await page.locator(InventorySel.cartBadge).count()) === 0;
+              },
+            },
+          ],
+  },
+});

package/{examples/saucedemo/src/blocks/saucedemo-web/inventory/actions → templates/quickstart/src/blocks/saucedemo-web/inventory/methods}/add-to-cart.effect.block.ts

@@ -1,12 +1,12 @@
 import { defineEffectBlock, checkpoint, type Checkpoint, type WaygraphInstanceOption } from "waygraph";
 import type { ItemInCart } from "../../../../states/checkout.states.js";
 import { SelectedItem } from "../../../../states/checkout.mem-keys.js";
-import { collectAddableItems } from "./inventory-items.js";
+import { collectAddableItems, InventorySel } from "./inventory-items.js";
 
 /**
  * Kind: Effect
  * Helper: defineEffectBlock
- * Route: saucedemo-web/inventory/actions/  (= /inventory.html)
+ * Route: saucedemo-web/inventory/methods/  (= /inventory.html)
  *
  * Mutates cart for the mem-picked product. waygraph auto lists one
  * "Add ..." row per live Add button via instanceOptions.
@@ -18,7 +18,7 @@ export const AddToCartBlock = defineEffectBlock<Checkpoint<string>, ItemInCart>(
   instruction: {
     async act(page, _input, mem) {
       const { id } = mem.get(SelectedItem.key);
-      await page.locator(`[data-test="add-to-cart-${id}"]`).click();
+      await page.locator(InventorySel.addBtn(id)).click();
     },
     resolve: () => checkpoint("ItemInCart"),
     verify: [
@@ -26,11 +26,11 @@ export const AddToCartBlock = defineEffectBlock<Checkpoint<string>, ItemInCart>(
         name: "item-added-to-cart",
         async check(page, mem) {
           const { id } = mem.get(SelectedItem.key);
-          return await page.locator(`[data-test="remove-${id}"]`).first().isVisible();
+          return await page.locator(InventorySel.removeBtn(id)).first().isVisible();
         },
       },
     ],
-    highlights: () => [{ selector: ".shopping_cart_badge", label: "remember this: cart now has the item" }],
+    highlights: () => [{ selector: InventorySel.cartBadge, label: "remember this: cart now has the item" }],
   },
   async instanceOptions(page): Promise<readonly WaygraphInstanceOption[]> {
     const items = await collectAddableItems(page);
@@ -39,7 +39,7 @@ export const AddToCartBlock = defineEffectBlock<Checkpoint<string>, ItemInCart>(
       label: `Add "${item.name}" to cart`,
       key: SelectedItem.key,
       value: item,
-      highlight: `[data-test="add-to-cart-${item.id}"]`,
+      highlight: InventorySel.addBtn(item.id),
     }));
   },
 });

package/templates/quickstart/src/blocks/saucedemo-web/inventory/{actions → methods}/inventory-items.ts

@@ -2,27 +2,45 @@ import type { Page, Locator } from "@playwright/test";
 
 /**
  * Kind: helper (not a Block)
- * Route: saucedemo-web/inventory/actions/  (= /inventory.html)
+ * Route: saucedemo-web/inventory/methods/  (= /inventory.html)
  *
- * DOM collectors for Effect / MemNav instanceOptions. Discovery ignores this
- * file (no *.block.ts suffix). Keep selectors here so add/remove/detail stay thin.
+ * DOM selectors + collectors for Effect / MemNav instanceOptions. Discovery
+ * ignores this file (no *.block.ts suffix). InventorySel = strings only;
+ * collectors use Sel to spawn auto menu rows.
  */
 
 /** Product slug + display name (saucedemo inventory / detail / cart). */
 export type InventoryItem = { id: string; name: string };
 
+/** DOM selectors for this screen - static strings + per-id factories. */
+export const InventorySel = {
+  list: ".inventory_list",
+  card: ".inventory_item",
+  name: ".inventory_item_name",
+  detailName: ".inventory_details_name",
+  cartItem: ".cart_item",
+  cartBadge: ".shopping_cart_badge",
+  addBtn: (id: string) => `[data-test="add-to-cart-${id}"]`,
+  removeBtn: (id: string) => `[data-test="remove-${id}"]`,
+  addBtnPrefix: 'button[data-test^="add-to-cart-"]',
+  removeBtnPrefix: 'button[data-test^="remove-"]',
+  title: (id: string) =>
+    `div.inventory_item:has(button[data-test="add-to-cart-${id}"], button[data-test="remove-${id}"]) ` +
+    `.inventory_item_name`,
+};
+
 async function readItemName(page: Page, button: Locator, id: string): Promise<string> {
   const card = button.locator("xpath=ancestor::div[contains(@class,'inventory_item')][1]");
   if ((await card.count()) > 0) {
-    const text = await card.locator(".inventory_item_name").first().textContent().catch(() => null);
+    const text = await card.locator(InventorySel.name).first().textContent({ timeout: 500 }).catch(() => null);
     if (text?.trim()) return text.trim();
   }
   const cartRow = button.locator("xpath=ancestor::div[contains(@class,'cart_item')][1]");
   if ((await cartRow.count()) > 0) {
-    const text = await cartRow.locator(".inventory_item_name").first().textContent().catch(() => null);
+    const text = await cartRow.locator(InventorySel.name).first().textContent({ timeout: 500 }).catch(() => null);
     if (text?.trim()) return text.trim();
   }
-  const detailName = await page.locator(".inventory_details_name").first().textContent().catch(() => null);
+  const detailName = await page.locator(InventorySel.detailName).first().textContent({ timeout: 500 }).catch(() => null);
   if (detailName?.trim()) return detailName.trim();
   return id.replace(/-/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
@@ -33,7 +51,7 @@ async function collectByPrefix(page: Page, prefix: "add-to-cart-" | "remove-"):
   const items: InventoryItem[] = [];
   for (let i = 0; i < count; i++) {
     const button = buttons.nth(i);
-    const testId = await button.getAttribute("data-test");
+    const testId = await button.getAttribute("data-test", { timeout: 500 }).catch(() => null);
     const id = testId?.replace(new RegExp(`^${prefix}`), "");
     if (!id) continue;
     items.push({ id, name: await readItemName(page, button, id) });
@@ -56,32 +74,34 @@ export function collectRemovableItems(page: Page): Promise<InventoryItem[]> {
  * Used by MemNavBlock (open item details) - not filtered by cart state.
  */
 export async function collectInventoryItems(page: Page): Promise<InventoryItem[]> {
-  const cards = page.locator(".inventory_item");
+  const cards = page.locator(InventorySel.card);
   const count = await cards.count();
   const items: InventoryItem[] = [];
   for (let i = 0; i < count; i++) {
     const card = cards.nth(i);
-    const addTest = await card.locator('button[data-test^="add-to-cart-"]').first().getAttribute("data-test").catch(() => null);
-    const removeTest = await card
-      .locator('button[data-test^="remove-"]')
-      .first()
-      .getAttribute("data-test")
-      .catch(() => null);
+    // count() first - getAttribute on a missing locator waits the full default timeout.
+    const addLoc = card.locator(InventorySel.addBtnPrefix);
+    const removeLoc = card.locator(InventorySel.removeBtnPrefix);
+    const addTest =
+      (await addLoc.count()) > 0
+        ? await addLoc.first().getAttribute("data-test", { timeout: 500 }).catch(() => null)
+        : null;
+    const removeTest =
+      (await removeLoc.count()) > 0
+        ? await removeLoc.first().getAttribute("data-test", { timeout: 500 }).catch(() => null)
+        : null;
     const id =
       addTest?.replace(/^add-to-cart-/, "") ?? removeTest?.replace(/^remove-/, "") ?? null;
     if (!id) continue;
     const name =
-      (await card.locator(".inventory_item_name").first().textContent().catch(() => null))?.trim() ??
+      (await card.locator(InventorySel.name).first().textContent({ timeout: 500 }).catch(() => null))?.trim() ??
       id.replace(/-/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
     items.push({ id, name });
   }
   return items;
 }
 
-/** Click the product title link inside the card that owns this item id. */
+/** @deprecated Prefer {@link InventorySel.title} */
 export function inventoryItemTitleSelector(id: string): string {
-  return (
-    `div.inventory_item:has(button[data-test="add-to-cart-${id}"], button[data-test="remove-${id}"]) ` +
-    `.inventory_item_name`
-  );
+  return InventorySel.title(id);
 }

package/templates/quickstart/src/blocks/saucedemo-web/inventory/methods/remove-all-from-cart.method.block.ts

@@ -0,0 +1,55 @@
+import { defineMethodBlock, checkpoint, type Checkpoint } from "waygraph";
+import type { RemoveFromCartOutcome } from "../../../../states/checkout.states.js";
+import { collectRemovableItems, InventorySel } from "./inventory-items.js";
+
+type BulkObserve = "still-has-items" | "cart-empty";
+
+/**
+ * Kind: Method
+ * Helper: defineMethodBlock
+ * Route: saucedemo-web/inventory/methods/  (= /inventory.html)
+ *
+ * Bulk: click every live "Remove" once. No instanceOptions - one auto menu
+ * row. In is Checkpoint<string> (from: "*") so round-trips work the same as
+ * single-item remove. Out: LoggedIn when cart empty; ItemInCart if anything
+ * remains (partial failure / race).
+ */
+export const RemoveAllFromCartBlock = defineMethodBlock<
+  Checkpoint<string>,
+  RemoveFromCartOutcome
+>({
+  name: "remove-all-from-cart",
+  description: "Removes every product still showing Remove on this page.",
+  instruction: {
+    async act(page) {
+      const items = await collectRemovableItems(page);
+      for (const item of items) {
+        await page.locator(InventorySel.removeBtn(item.id)).click();
+      }
+    },
+    async observe(page): Promise<BulkObserve> {
+      const left = await collectRemovableItems(page);
+      return left.length > 0 ? "still-has-items" : "cart-empty";
+    },
+    resolve: (observed) =>
+      checkpoint(observed === "still-has-items" ? "ItemInCart" : "LoggedIn"),
+    verify: (out) =>
+      out.__state === "ItemInCart"
+        ? [
+            {
+              name: "cart-still-has-items",
+              async check(page) {
+                return (await collectRemovableItems(page)).length > 0;
+              },
+            },
+          ]
+        : [
+            {
+              name: "cart-empty",
+              async check(page) {
+                return (await page.locator(InventorySel.cartBadge).count()) === 0;
+              },
+            },
+          ],
+  },
+});

package/{examples/saucedemo/src/blocks/saucedemo-web/inventory/actions → templates/quickstart/src/blocks/saucedemo-web/inventory/methods}/remove-from-cart.effect.block.ts

@@ -1,14 +1,14 @@
 import { defineEffectBlock, checkpoint, type Checkpoint, type WaygraphInstanceOption } from "waygraph";
 import type { RemoveFromCartOutcome } from "../../../../states/checkout.states.js";
 import { SelectedItem } from "../../../../states/checkout.mem-keys.js";
-import { collectRemovableItems } from "./inventory-items.js";
+import { collectRemovableItems, InventorySel } from "./inventory-items.js";
 
 type RemoveObserve = "still-has-items" | "cart-empty";
 
 /**
  * Kind: Effect
  * Helper: defineEffectBlock
- * Route: saucedemo-web/inventory/actions/  (= /inventory.html)
+ * Route: saucedemo-web/inventory/methods/  (= /inventory.html)
  *
  * Removes the mem-picked product. After Add, waygraph auto shows matching
  * "Remove ..." rows from live Remove buttons.
@@ -20,7 +20,7 @@ export const RemoveFromCartBlock = defineEffectBlock<Checkpoint<string>, RemoveF
   instruction: {
     async act(page, _input, mem) {
       const { id } = mem.get(SelectedItem.key);
-      await page.locator(`[data-test="remove-${id}"]`).click();
+      await page.locator(InventorySel.removeBtn(id)).click();
     },
     async observe(page): Promise<RemoveObserve> {
       const left = await collectRemovableItems(page);
@@ -42,7 +42,7 @@ export const RemoveFromCartBlock = defineEffectBlock<Checkpoint<string>, RemoveF
             {
               name: "cart-empty",
               async check(page) {
-                return (await page.locator(".shopping_cart_badge").count()) === 0;
+                return (await page.locator(InventorySel.cartBadge).count()) === 0;
               },
             },
           ],
@@ -54,7 +54,7 @@ export const RemoveFromCartBlock = defineEffectBlock<Checkpoint<string>, RemoveF
       label: `Remove "${item.name}" from cart`,
       key: SelectedItem.key,
       value: item,
-      highlight: `[data-test="remove-${item.id}"]`,
+      highlight: InventorySel.removeBtn(item.id),
     }));
   },
 });

package/templates/quickstart/src/blocks/saucedemo-web/inventory/nav-item-detail.block.ts

@@ -4,7 +4,7 @@ import { SelectedItem } from "../../../states/checkout.mem-keys.js";
 import {
   collectInventoryItems,
   inventoryItemTitleSelector,
-} from "./actions/inventory-items.js";
+} from "./methods/inventory-items.js";
 
 /**
  * Kind: Nav

package/templates/quickstart/src/blocks/saucedemo-web/inventory-item/nav-back-to-inventory.block.ts

@@ -1,15 +1,15 @@
-import { defineNavBlock, Trait } from "waygraph";
+import { defineNavClickBlock, Trait } from "waygraph";
 import type { LoggedIn } from "../../../states/checkout.states.js";
 
 /**
  * Kind: Nav
- * Helper: defineNavBlock
+ * Helper: defineNavClickBlock
  * Route: saucedemo-web/inventory-item/  (= /inventory-item.html From)
  *
  * click, not url - detail page "Back to products". Separate Block from
  * nav-back-to-products (different From Checkpoint; atomic convention).
  */
-export const NavBackToInventoryBlock = defineNavBlock<LoggedIn>({
+export const NavBackToInventoryBlock = defineNavClickBlock<LoggedIn>({
   name: "nav-back-to-inventory",
   description: "Clicks 'Back to products' on the item detail page.",
   checkpoint: "LoggedIn",

package/templates/quickstart/src/blocks/saucedemo-web/inventory-item/nav-back-to-products.block.ts

@@ -1,15 +1,15 @@
-import { defineNavBlock, Trait } from "waygraph";
+import { defineNavClickBlock, Trait } from "waygraph";
 import type { LoggedIn } from "../../../states/checkout.states.js";
 
 /**
  * Kind: Nav
- * Helper: defineNavBlock
+ * Helper: defineNavClickBlock
  * Route: saucedemo-web/inventory-item/  (lands on /inventory.html)
  *
  * click, not url - order-complete "Back Home" proves the button path
  * (a url NavBlock would teleport without exercising the control).
  */
-export const NavBackToProductsBlock = defineNavBlock<LoggedIn>({
+export const NavBackToProductsBlock = defineNavClickBlock<LoggedIn>({
   name: "nav-back-to-products",
   description: "Clicks 'Back Home' on the order confirmation page.",
   checkpoint: "LoggedIn",

package/templates/quickstart/src/blocks/saucedemo-web/inventory-item/nav-continue-shopping.block.ts

@@ -1,14 +1,14 @@
-import { defineNavBlock, Trait } from "waygraph";
+import { defineNavClickBlock, Trait } from "waygraph";
 import type { LoggedIn } from "../../../states/checkout.states.js";
 
 /**
  * Kind: Nav
- * Helper: defineNavBlock
+ * Helper: defineNavClickBlock
  * Route: saucedemo-web/inventory-item/  (lands on /inventory.html)
  *
  * click, not url - cart page "Continue Shopping" proves the app's own path.
  */
-export const NavContinueShoppingBlock = defineNavBlock<LoggedIn>({
+export const NavContinueShoppingBlock = defineNavClickBlock<LoggedIn>({
   name: "nav-continue-shopping",
   description: "Clicks 'Continue Shopping' on the cart page.",
   checkpoint: "LoggedIn",

package/templates/quickstart/src/blocks/saucedemo-web/{actions → methods}/submit-login-for-flow.ts

@@ -1,11 +1,11 @@
 import type { DefinedBlock } from "waygraph";
 import type { LoginPage, LoggedIn } from "../../../states/checkout.states.js";
-import { SubmitLoginActionBlock } from "./submit-login.action.block.js";
+import { SubmitLoginActionBlock } from "./submit-login.method.block.js";
 
 /**
  * Kind: helper (not a discoverable Block file)
  * Helper: typed alias over SubmitLoginActionBlock
- * Route: saucedemo-web/actions/  (page URL /)
+ * Route: saucedemo-web/methods/  (page URL /)
  *
  * DefinedBlock cast so linear Flows can chain .withVerify on Out=LoggedIn;
  * runtime still branches on bad credentials via SubmitLoginActionBlock.

package/templates/quickstart/src/blocks/saucedemo-web/{actions/submit-login.action.block.ts → methods/submit-login.method.block.ts}

@@ -1,18 +1,18 @@
-import { defineBlock, checkpoint, Trait } from "waygraph";
+import { defineMethodBlock, checkpoint, Trait } from "waygraph";
 import type { LoginPage, LoginSubmitOutcome } from "../../../states/checkout.states.js";
 import { LoginCreds } from "../../../states/checkout.mem-keys.js";
 
 type LoginObserve = "success" | "failure";
 
 /**
- * Kind: Action
- * Helper: defineBlock
- * Route: saucedemo-web/actions/  (page URL /)
+ * Kind: Method
+ * Helper: defineMethodBlock
+ * Route: saucedemo-web/methods/  (page URL /)
  *
  * Fills credentials and submits - never page.goto (nav-login owns that).
  * Branches: good creds -> LoggedIn; bad/locked -> LoginPage with error banner.
  */
-export const SubmitLoginActionBlock = defineBlock<LoginPage, LoginSubmitOutcome>({
+export const SubmitLoginActionBlock = defineMethodBlock<LoginPage, LoginSubmitOutcome>({
   name: "submit-login",
   description: "Logs a user in when credentials are valid; stays on LoginPage when auth fails.",
   requires: [LoginCreds.key],

package/{examples/saucedemo/src/blocks/saucedemo-web/actions/submit-logout.action.block.ts → templates/quickstart/src/blocks/saucedemo-web/methods/submit-logout.method.block.ts}

@@ -1,14 +1,14 @@
-import { defineBlock, checkpoint, Trait } from "waygraph";
+import { defineMethodBlock, checkpoint, Trait } from "waygraph";
 import type { LoggedIn, LoginPage } from "../../../states/checkout.states.js";
 
 /**
- * Kind: Action
- * Helper: defineBlock
- * Route: saucedemo-web/actions/  (page URL / after logout)
+ * Kind: Method
+ * Helper: defineMethodBlock
+ * Route: saucedemo-web/methods/  (page URL / after logout)
  *
  * Burger menu Logout - real cycle back to LoginPage (same Checkpoint nav-login lands on).
  */
-export const SubmitLogoutBlock = defineBlock<LoggedIn, LoginPage>({
+export const SubmitLogoutBlock = defineMethodBlock<LoggedIn, LoginPage>({
   name: "submit-logout",
   description: "Opens the burger menu and logs out.",
   instruction: {

package/templates/quickstart/src/flows/cart-bulk.flow.ts

@@ -0,0 +1,19 @@
+import { Engine, start, end, withTitle, chainFlow } from "waygraph";
+import { loginFlow } from "./login.flow.js";
+import { AddAllToCartBlock } from "../blocks/saucedemo-web/inventory/methods/add-all-to-cart.method.block.js";
+import { RemoveAllFromCartBlock } from "../blocks/saucedemo-web/inventory/methods/remove-all-from-cart.method.block.js";
+
+const engine = new Engine();
+
+/**
+ * Episode after login: drain every Add button, then every Remove button.
+ * Proves bulk Methods + round-trip (LoggedIn <-> ItemInCart) without
+ * instanceOptions. Pair with loginFlow via chainFlow for `waygraph demo`.
+ */
+export const cartBulkEpisode = withTitle(
+  engine.defineFlow([start, AddAllToCartBlock, RemoveAllFromCartBlock, end]),
+  "Cart bulk add/remove all",
+);
+
+/** Full demo: Sign In -> Add all -> Remove all. */
+export const cartBulkFlow = chainFlow(loginFlow, cartBulkEpisode);

package/templates/quickstart/src/flows/cart-mem.flow.ts

@@ -1,5 +1,5 @@
 import { Engine, start, end } from "waygraph";
-import { RemoveFromCartBlock } from "../blocks/saucedemo-web/inventory/actions/remove-from-cart.effect.block.js";
+import { RemoveFromCartBlock } from "../blocks/saucedemo-web/inventory/methods/remove-from-cart.effect.block.js";
 
 const engine = new Engine();
 

package/templates/quickstart/src/flows/catalog-logout.flow.ts

@@ -1,7 +1,7 @@
 import { Engine, start, end, withTitle } from "waygraph";
 import { NavItemDetailBlock } from "../blocks/saucedemo-web/inventory/nav-item-detail.block.js";
 import { NavBackToInventoryBlock } from "../blocks/saucedemo-web/inventory-item/nav-back-to-inventory.block.js";
-import { SubmitLogoutBlock } from "../blocks/saucedemo-web/actions/submit-logout.action.block.js";
+import { SubmitLogoutBlock } from "../blocks/saucedemo-web/methods/submit-logout.method.block.js";
 
 const engine = new Engine();
 

package/templates/quickstart/src/flows/checkout-then-browse-again.flow.ts

@@ -9,12 +9,12 @@ import type {
   OrderComplete,
 } from "../states/checkout.states.js";
 import { NavLoginBlock } from "../blocks/saucedemo-web/nav-login.block.js";
-import { SubmitLoginForFlow } from "../blocks/saucedemo-web/actions/submit-login-for-flow.js";
-import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/actions/add-to-cart.effect.block.js";
+import { SubmitLoginForFlow } from "../blocks/saucedemo-web/methods/submit-login-for-flow.js";
+import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/methods/add-to-cart.effect.block.js";
 import { NavCartBlock } from "../blocks/saucedemo-web/cart/nav-cart.block.js";
 import { NavCheckoutInfoBlock } from "../blocks/saucedemo-web/cart/nav-checkout-info.block.js";
-import { SubmitCheckoutInfoBlock } from "../blocks/saucedemo-web/checkout-step-one/actions/submit-checkout-info.action.block.js";
-import { FinishOrderBlock } from "../blocks/saucedemo-web/checkout-step-two/actions/finish-order.action.block.js";
+import { SubmitCheckoutInfoBlock } from "../blocks/saucedemo-web/checkout-step-one/methods/submit-checkout-info.method.block.js";
+import { FinishOrderBlock } from "../blocks/saucedemo-web/checkout-step-two/methods/finish-order.method.block.js";
 import { NavBackToProductsBlock } from "../blocks/saucedemo-web/inventory-item/nav-back-to-products.block.js";
 
 const engine = new Engine({ headless: false, slowMo: 250 });

package/templates/quickstart/src/flows/checkout.flow.ts

@@ -9,12 +9,12 @@ import type {
   OrderComplete,
 } from "../states/checkout.states.js";
 import { NavLoginBlock } from "../blocks/saucedemo-web/nav-login.block.js";
-import { SubmitLoginForFlow } from "../blocks/saucedemo-web/actions/submit-login-for-flow.js";
-import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/actions/add-to-cart.effect.block.js";
+import { SubmitLoginForFlow } from "../blocks/saucedemo-web/methods/submit-login-for-flow.js";
+import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/methods/add-to-cart.effect.block.js";
 import { NavCartBlock } from "../blocks/saucedemo-web/cart/nav-cart.block.js";
 import { NavCheckoutInfoBlock } from "../blocks/saucedemo-web/cart/nav-checkout-info.block.js";
-import { SubmitCheckoutInfoBlock } from "../blocks/saucedemo-web/checkout-step-one/actions/submit-checkout-info.action.block.js";
-import { FinishOrderBlock } from "../blocks/saucedemo-web/checkout-step-two/actions/finish-order.action.block.js";
+import { SubmitCheckoutInfoBlock } from "../blocks/saucedemo-web/checkout-step-one/methods/submit-checkout-info.method.block.js";
+import { FinishOrderBlock } from "../blocks/saucedemo-web/checkout-step-two/methods/finish-order.method.block.js";
 
 const engine = new Engine({ headless: false, slowMo: 250 });
 

package/templates/quickstart/src/flows/login.flow.ts

@@ -1,6 +1,6 @@
 import { Engine, start, end, withTitle } from "waygraph";
 import { NavLoginBlock } from "../blocks/saucedemo-web/nav-login.block.js";
-import { SubmitLoginForFlow } from "../blocks/saucedemo-web/actions/submit-login-for-flow.js";
+import { SubmitLoginForFlow } from "../blocks/saucedemo-web/methods/submit-login-for-flow.js";
 
 const engine = new Engine();
 

package/templates/quickstart/src/flows/shop.flow.ts

@@ -1,9 +1,9 @@
 import { Engine, start, end, withTitle } from "waygraph";
-import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/actions/add-to-cart.effect.block.js";
+import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/methods/add-to-cart.effect.block.js";
 import { NavCartBlock } from "../blocks/saucedemo-web/cart/nav-cart.block.js";
 import { NavCheckoutInfoBlock } from "../blocks/saucedemo-web/cart/nav-checkout-info.block.js";
-import { SubmitCheckoutInfoBlock } from "../blocks/saucedemo-web/checkout-step-one/actions/submit-checkout-info.action.block.js";
-import { FinishOrderBlock } from "../blocks/saucedemo-web/checkout-step-two/actions/finish-order.action.block.js";
+import { SubmitCheckoutInfoBlock } from "../blocks/saucedemo-web/checkout-step-one/methods/submit-checkout-info.method.block.js";
+import { FinishOrderBlock } from "../blocks/saucedemo-web/checkout-step-two/methods/finish-order.method.block.js";
 
 const engine = new Engine();
 

package/templates/quickstart/src/flows/smoke.flow.ts

@@ -1,8 +1,8 @@
 import { Engine, start, end } from "waygraph";
 import type { LoginPage, LoggedIn, ItemInCart } from "../states/checkout.states.js";
 import { NavLoginBlock } from "../blocks/saucedemo-web/nav-login.block.js";
-import { SubmitLoginForFlow } from "../blocks/saucedemo-web/actions/submit-login-for-flow.js";
-import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/actions/add-to-cart.effect.block.js";
+import { SubmitLoginForFlow } from "../blocks/saucedemo-web/methods/submit-login-for-flow.js";
+import { AddToCartBlock } from "../blocks/saucedemo-web/inventory/methods/add-to-cart.effect.block.js";
 
 const engine = new Engine();
 

package/templates/quickstart/src/flows/viewer-blocked.flow.ts

@@ -1,6 +1,6 @@
 import { Engine, start, end, withTitle, withSessionReset } from "waygraph";
 import { NavLoginBlock } from "../blocks/saucedemo-web/nav-login.block.js";
-import { SubmitLoginActionBlock } from "../blocks/saucedemo-web/actions/submit-login.action.block.js";
+import { SubmitLoginActionBlock } from "../blocks/saucedemo-web/methods/submit-login.method.block.js";
 
 const engine = new Engine();
 

package/templates/scaffold/package.json

@@ -16,7 +16,7 @@
     "baseUrl": "https://example.com"
   },
   "dependencies": {
-    "waygraph": "^0.7.9"
+    "waygraph": "^0.9.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.55.0",