@sprucelabs/heartwood-view-controllers 112.3.28 → 112.3.30

package/build/esm/tests/utilities/interactor.js

@@ -15,7 +15,7 @@ import { getVcName } from './assertSupport.js';
 import { pluckButtons } from './buttonAssert.js';
 import calendarInteractor from './calendarInteractor.js';
 import formAssert from './formAssert.js';
-import navigationAssert from './navigationAssert.js';
+import navigationAssert, { getButtonFromNav } from './navigationAssert.js';
 import pagerAssert from './pagerAssert.js';
 import vcAssert from './vcAssert.js';
 const interactor = {
@@ -396,9 +396,7 @@ const interactor = {
             const navVc = vc.load
                 ? navigationAssert.skillViewRendersNavigation(vc)
                 : vc;
-            const { foundButtons } = pluckButtons(navVc, [buttonId]);
-            const match = foundButtons[0];
-            assert.isTruthy(match, `I could not find a button with the id '${buttonId}' in your nav!`);
+            const match = getButtonFromNav(navVc, buttonId);
             return this.click(match);
         });
     },

package/build/esm/tests/utilities/navigationAssert.d.ts

@@ -20,3 +20,4 @@ declare const navigationAssert: {
     hasAdditionalValidRoutes(vc: ViewController<Navigation>, routes: NavigationRoute[]): void;
 };
 export default navigationAssert;
+export declare function getButtonFromNav(vc: ViewController<Navigation>, id: string): any;

package/build/esm/tests/utilities/navigationAssert.js

@@ -59,18 +59,13 @@ const navigationAssert = {
     },
 };
 export default navigationAssert;
-function getButtonFromNav(vc, id) {
-    var _a, _b, _c, _d;
+export function getButtonFromNav(vc, id) {
+    var _a;
     const model = renderUtil.render(vc);
-    if ((_a = model.buttons) === null || _a === void 0 ? void 0 : _a[0].dropdown) {
-        const button = (_c = (_b = model.buttons[0].dropdown) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.find((b) => b.id === id);
-        assert.isTruthy(button);
-        return;
-    }
-    const buttons = (_d = model.buttons) === null || _d === void 0 ? void 0 : _d.reduce((acc, b) => {
+    const buttons = (_a = model.buttons) === null || _a === void 0 ? void 0 : _a.reduce((acc, b) => {
         var _a, _b;
         if (b.dropdown) {
-            return [...acc, ...((_b = (_a = b === null || b === void 0 ? void 0 : b.dropdown) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : [])];
+            return [...acc, b, ...((_b = (_a = b === null || b === void 0 ? void 0 : b.dropdown) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : [])];
         }
         return [...acc, b];
     }, []);

package/build/tests/utilities/interactor.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -11,7 +44,7 @@ const assertSupport_1 = require("./assertSupport");
 const buttonAssert_1 = require("./buttonAssert");
 const calendarInteractor_1 = __importDefault(require("./calendarInteractor"));
 const formAssert_1 = __importDefault(require("./formAssert"));
-const navigationAssert_1 = __importDefault(require("./navigationAssert"));
+const navigationAssert_1 = __importStar(require("./navigationAssert"));
 const pagerAssert_1 = __importDefault(require("./pagerAssert"));
 const vcAssert_1 = __importDefault(require("./vcAssert"));
 const interactor = {
@@ -317,9 +350,7 @@ const interactor = {
         const navVc = vc.load
             ? navigationAssert_1.default.skillViewRendersNavigation(vc)
             : vc;
-        const { foundButtons } = (0, buttonAssert_1.pluckButtons)(navVc, [buttonId]);
-        const match = foundButtons[0];
-        test_utils_1.assert.isTruthy(match, `I could not find a button with the id '${buttonId}' in your nav!`);
+        const match = (0, navigationAssert_1.getButtonFromNav)(navVc, buttonId);
         return this.click(match);
     },
     /**

package/build/tests/utilities/navigationAssert.d.ts

@@ -20,3 +20,4 @@ declare const navigationAssert: {
     hasAdditionalValidRoutes(vc: ViewController<Navigation>, routes: NavigationRoute[]): void;
 };
 export default navigationAssert;
+export declare function getButtonFromNav(vc: ViewController<Navigation>, id: string): any;

package/build/tests/utilities/navigationAssert.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getButtonFromNav = getButtonFromNav;
 const schema_1 = require("@sprucelabs/schema");
 const test_utils_1 = require("@sprucelabs/test-utils");
 const render_utility_1 = __importDefault(require("../../utilities/render.utility"));
@@ -62,14 +63,9 @@ const navigationAssert = {
 exports.default = navigationAssert;
 function getButtonFromNav(vc, id) {
     const model = render_utility_1.default.render(vc);
-    if (model.buttons?.[0].dropdown) {
-        const button = model.buttons[0].dropdown?.items?.find((b) => b.id === id);
-        test_utils_1.assert.isTruthy(button);
-        return;
-    }
     const buttons = model.buttons?.reduce((acc, b) => {
         if (b.dropdown) {
-            return [...acc, ...(b?.dropdown?.items ?? [])];
+            return [...acc, b, ...(b?.dropdown?.items ?? [])];
         }
         return [...acc, b];
     }, []);

package/package.json

@@ -13,7 +13,7 @@
   "sideEffects": false,
   "license": "MIT",
   "description": "All the power of Heartwood in one, convenient package.",
-  "version": "112.3.28",
+  "version": "112.3.30",
   "skill": {
     "namespace": "HeartwoodViewControllers",
     "commandOverrides": {