@aglyn/plugins-ai 1.0.0-beta.264 → 1.0.0-beta.266

package/src/lib/layout-language/ai-layout-compiler.js

@@ -23,7 +23,7 @@ import { aiPageScrollInteraction } from "../runtime/ai-page-links.js";
 import { aiLayoutFitText, aiLayoutQuoteGap, aiLayoutWords } from "./ai-layout-copy.js";
 import { AI_LAYOUT_GROUP_KINDS, AI_LAYOUT_MAX_ITEMS } from "./ai-layout-language.js";
 import { aiLayoutDesignChoices, aiLayoutFamily, aiLayoutGroupVariant } from "./ai-layout-design.js";
-import { AI_LAYOUT_FEATURED_RECORDS, AI_LAYOUT_LISTING_ELEMENTS, aiLayoutIsRecordImageAlt, aiLayoutListingAt, aiLayoutRecordHref, aiLayoutRecordImageAltField } from "./ai-layout-listings.js";
+import { AI_LAYOUT_FEATURED_RECORDS, AI_LAYOUT_LISTING_ELEMENTS, aiLayoutIsRecordImageAlt, aiLayoutListingAt, aiLayoutRecordHref, aiLayoutRecordImageAltField, aiLayoutRepeatFilterOf } from "./ai-layout-listings.js";
 import { aiStorefrontItemIcons } from "./ai-layout-storefront.js";
 import { AI_LAYOUT_LABELS_EN, aiLayoutLabel } from "./ai-layout-labels.js";
 import { aiLayoutRenamedLabel, aiLayoutResolveLink } from "./ai-layout-links.js";
@@ -57,10 +57,15 @@ const componentOf = (targets, id)=>{
 /**
  * The section of this page that places a form: one whose plan places one, or
  * whose design places one by its id.
- */ function formSectionOf(sections, plan, targets) {
+ */ /** Whether the site's form lives on another page of the site than this one. */ function formLivesElsewhere(targets) {
+    return !!targets.formPageId && targets.formPageId !== targets.pageId;
+}
+function formSectionOf(sections, plan, targets) {
     const forms = formIdsOf(targets);
     const planned = plan.sections.findIndex((section)=>section.uses.some((ref)=>forms.has(ref)));
     if (planned !== -1) return planned;
+    // A form drawn on a page it does not live on becomes a button to its page (AGL-3899).
+    if (formLivesElsewhere(targets)) return null;
     const designed = sections.findIndex((section)=>section.blocks.some((block)=>block.kind === 'form' && (!block.to || forms.has(block.to))));
     return designed === -1 ? null : designed;
 }
@@ -456,6 +461,31 @@ function compileSection(page, raw, index) {
             ]
         } : {}));
     const lastCol = raw.cols && raw.cols.length >= 2 ? raw.cols.length - 1 : undefined;
+    // A form the design drew where the plan places none, on a page the form
+    // does not live on, is that page's way to it (AGL-3899): a button to the
+    // page that holds the form, never a second copy of the form.
+    if (!plannedForms.length && formLivesElsewhere(page.targets)) {
+        const at0 = blocks.findIndex((block)=>block.kind === 'form');
+        if (at0 !== -1) {
+            const asks = blocks.some((block)=>block.kind === 'button' && (block.to === 'form' || block.to === `page:${page.targets.formPageId}`));
+            const col = blocks[at0].col;
+            const kept = blocks.filter((block)=>block.kind !== 'form');
+            if (!asks) {
+                kept.splice(at0, 0, _extends({
+                    kind: 'button',
+                    text: aiLayoutLabel('getInTouch', page.options.language),
+                    to: 'form'
+                }, col !== undefined ? {
+                    col
+                } : {}));
+            }
+            blocks.splice(0, blocks.length, ...kept);
+            page.settled.push({
+                at,
+                what: 'a form on a page it does not live on; a button to its page instead'
+            });
+        }
+    }
     for (const block of blocks){
         var _block_items;
         if (block.kind === 'form' && !(block.to && forms.has(block.to))) {
@@ -1071,7 +1101,10 @@ function group(scope, block, room) {
         // columns (AGL-3676): the beta.237 Willow Wick home, on a paid plan, drew
         // every other group compact — four bands of a title and a sentence.
         const variant = design && block.kind === 'cards' && block.style !== 'quiet' ? aiLayoutGroupVariant(design.input, design.choices, (_scope_words = scope.words) != null ? _scope_words : '') : null;
-        if (variant === 'icons') return iconColumns(scope, items, room);
+        // Icon columns side by side, where rule 1 knows them by their cells; any
+        // site's groups may take them (AGL-3899), and one to a row outside a
+        // store they are drawn compact.
+        if (variant === 'icons' && (retail || perRow > 1)) return iconColumns(scope, items, room);
         const pictured = (variant === 'pictures' || variant === 'articles') && room === 'full' && picturesLeft(scope.page) >= items.length;
         return pictured && designedGroup(scope, variant, items, room) || compactGroup(scope, block, items, perRow);
     }
@@ -2050,7 +2083,7 @@ function listingSection(scope, blocks, placed) {
     var _ref;
     var _page_plan_sections_index_name, _page_plan_sections_index, _page_options_sectionIds;
     const { page, index, at } = scope;
-    const { listing, role } = placed;
+    const { listing, role, filter } = placed;
     if (listing.kind === 'reviews') return reviewsSection(scope, blocks);
     if (listing.kind === 'signup') return signupSection(scope, blocks);
     // The grid straight under a Shop page's title bar opens on the products:
@@ -2111,7 +2144,7 @@ function listingSection(scope, blocks, placed) {
             }
         }
     ], '3', 'flex-end') : head;
-    const records = listingElement(scope, listing, role);
+    const records = listingElement(scope, listing, role, filter);
     const parts = [
         top ? centered ? tree.add('muiContainer', {
             maxWidth: 'md',
@@ -2414,7 +2447,7 @@ function listingSection(scope, blocks, placed) {
  * The element that lists the records, bound to them: the Product grid over
  * the site's catalog, or Collection Entries over its blog with one post's
  * card as the template it repeats. Its records count as the section's items.
- */ function listingElement(scope, listing, role) {
+ */ function listingElement(scope, listing, role, filter) {
     const { page } = scope;
     const tree = page.tree;
     const featured = role === 'featured';
@@ -2478,14 +2511,16 @@ function listingSection(scope, blocks, placed) {
             emptyActionHref: listing.emptyAction.href
         } : {}), null, null, 'products');
     } else if (listing.kind === 'records') {
-        id = recordsElement(scope, listing, featured ? shown : null);
+        id = recordsElement(scope, listing, featured ? shown : null, filter);
     } else {
         id = postsElement(scope, listing, featured ? shown : COLLECTION_INDEX_POSTS);
     }
-    // What a visitor sees here is the site's records, however many it keeps:
-    // the section shows its planned items when it has any to show.
+    // What a visitor sees here is the site's records, however many it keeps —
+    // a section named for one group, that group's (AGL-3921): the section shows
+    // its planned items when it has any to show.
+    const listed = (filter == null ? void 0 : filter.records.length) ? filter.records.length : listing.records.length;
     noted(scope, Array.from({
-        length: Math.max(2, Math.min(shown, listing.records.length))
+        length: Math.max(2, Math.min(shown, listed))
     }, ()=>id));
     return id;
 }
@@ -2629,7 +2664,7 @@ function listingSection(scope, blocks, placed) {
  * record's name, as the design's own picture cards do (AGL-3717) — so a list
  * of pieces stays the image-led gallery it was before it was a dataset.
  * A featured band shows the first few; a page of its own, every record.
- */ function recordsElement(scope, listing, limit) {
+ */ function recordsElement(scope, listing, limit, filter) {
     var _listing_fields, _listing_fields1;
     var _page_design;
     const { page } = scope;
@@ -2685,7 +2720,7 @@ function listingSection(scope, blocks, placed) {
     }, null, 'recordLink') : null;
     page.settled.push({
         at: scope.at,
-        what: `${listing.name} listed from its dataset${questions ? ' as a ruled list' : picture ? ' as picture cards' : ' as cards'}${recordHref ? `, each linking its page under /${listing.recordBase}` : ''}`
+        what: `${listing.name} listed from its dataset${questions ? ' as a ruled list' : picture ? ' as picture cards' : ' as cards'}${recordHref ? `, each linking its page under /${listing.recordBase}` : ''}${filter ? `, only those filed “${filter.value}”` : ''}`
     });
     const card = questions ? tree.add('muiStack', {
         spacing: '1'
@@ -2711,6 +2746,8 @@ function listingSection(scope, blocks, placed) {
         repeatDataset: listing.datasetId
     }, limit ? {
         repeatLimit: String(limit)
+    } : {}, filter ? {
+        repeatFilter: aiLayoutRepeatFilterOf(filter)
     } : {}), questions ? {
         display: 'grid',
         gap: 3