@vectoriox/iox-ui 5.41.1 → 5.43.0

package/src/design-core/design-apply.ts

@@ -1,13 +1,14 @@
 import { deriveBrandTokens } from './brand';
-import { SPEC_LEGACY_ALIASES } from './flavor-spec.generated';
+import { FLAVOR_SPEC_VERSION, SPEC_LEGACY_ALIASES } from './flavor-spec.generated';
 import { SWISS_FLAVOR } from './flavor';
 import { buildFlavorTokens, legacyFlavorTokens } from './flavor-tokens';
 import {
-    FlavorRevertPlan, FlavorSeedOptions, FlavorSeedPlan, planFlavorRevert, planFlavorSeed, SeedBaseline, SeedExpectation, untouchedSeedRow,
+    FlavorRevertPlan, FlavorRevertSnapshot, FlavorSeedOptions, FlavorSeedPlan, flavorSeedWrites, planFlavorRevert, planFlavorSeed, SeedBaseline,
+    SeedExpectation, untouchedSeedRow,
 } from './flavor-seed';
 import { DesignChoices, DesignTokenRow, flavorSourceStamp, StoredDesignTokenRow } from './design-token.model';
 import { fontFamilyKey, FontFamilyToken, fontRoleReferences, parseFontFamilies } from './fonts';
-import { flavorPackById, isRetiredFlavorId, packDesignChoices, StoredDesign } from './design-settings';
+import { DesignConfigEntry, DesignConfigKey, designConfigEntries, flavorPackById, isRetiredFlavorId, packDesignChoices, StoredDesign } from './design-settings';
 
 /**
  * Applying a look (design-system DS4): the COMPLETE `buildFlavorTokens` set for the chosen
@@ -125,6 +126,58 @@ export function planDesignRevert(current: ReadonlyArray<StoredDesignTokenRow>, d
     return planFlavorRevert(current, snapshot.tokens, snapshot.wrote ?? designTokenRows(design.choices));
 }
 
+/** The revert snapshot an Apply stores in `settings.design` (board F7): design-core's snapshot plus the design
+ *  row's previous config VERBATIM, so a revert restores every choice (pair, axes, mode, fonts), not only the
+ *  flavor id and seed. */
+export interface DesignRevertSnapshot extends FlavorRevertSnapshot {
+    fromConfig?: DesignConfigEntry[];
+}
+
+/**
+ * What an Apply of `plan` stores as its revert snapshot — the ONE rule the builder's Apply and the
+ * server-side site build (W2) share: the whole pre-apply token set, what the apply writes into each row,
+ * and where a revert goes back to — never a null flavor (a studio with no design row wore its design's
+ * defaults, so that is what it returns to). An apply that writes nothing keeps the previous snapshot:
+ * clobbering a useful one with "nothing changed" would be a lie.
+ */
+export function designApplySnapshot(
+    previous: StoredDesign,
+    previousConfig: ReadonlyArray<DesignConfigEntry> | null | undefined,
+    existing: ReadonlyArray<StoredDesignTokenRow>,
+    plan: FlavorSeedPlan,
+    appliedAt: number,
+): DesignRevertSnapshot | null {
+    if (!plan.create.length && !plan.update.length) return previous.revert;
+    const origin: Pick<DesignRevertSnapshot, 'from' | 'fromConfig'> = previous.storedFlavorId
+        ? {
+            from: { flavorId: previous.storedFlavorId, flavorVersion: previous.flavorVersion, brandSeed: previous.storedSeed },
+            fromConfig: (previousConfig ?? []).filter(kv => kv?.key !== DesignConfigKey.Revert),
+        }
+        : {
+            from: { flavorId: previous.choices.flavorId, flavorVersion: String(FLAVOR_SPEC_VERSION), brandSeed: previous.choices.seed },
+            fromConfig: designConfigEntries(previous.choices, FLAVOR_SPEC_VERSION, null),
+        };
+    return {
+        appliedAt,
+        ...origin,
+        tokens: (existing ?? []).map(r => ({ name: r.name, type: r.type, value: r.value, values: r.values, source: r.source, group: r.group, tier: r.tier })),
+        wrote: flavorSeedWrites(plan, existing),
+    };
+}
+
+/** The config a revert puts back: the snapshot's verbatim config, else (a snapshot older than `fromConfig`)
+ *  the identity it recorded. */
+export function designRevertConfig(snapshot: DesignRevertSnapshot): DesignConfigEntry[] {
+    if (snapshot.fromConfig) return snapshot.fromConfig;
+    return [
+        ...(snapshot.from.flavorId ? [
+            { key: DesignConfigKey.FlavorId, value: snapshot.from.flavorId },
+            { key: DesignConfigKey.FlavorVersion, value: snapshot.from.flavorVersion ?? '' },
+        ] : []),
+        ...(snapshot.from.brandSeed ? [{ key: DesignConfigKey.BrandSeed, value: snapshot.from.brandSeed }] : []),
+    ];
+}
+
 /** The rows a design is missing by name — the builder-load top-up (never touches an existing row). */
 export function missingDesignRows(existing: ReadonlyArray<{ name: string }>, choices: DesignChoices): DesignTokenRow[] {
     const have = new Set((existing ?? []).map(r => r.name));

package/src/generation-core/site-spec.generated.ts

@@ -171,7 +171,7 @@ export const SPEC_SITE_PATTERNS = {
       ]
     }
   },
-  "footer.columns": {
+  "footer.three-column": {
     "family": "footer",
     "label": "Footer, three columns",
     "global": "after",
@@ -385,7 +385,7 @@ export const SPEC_SITE_PATTERNS = {
       ]
     }
   },
-  "projects.grid": {
+  "collection.card-grid": {
     "family": "collection",
     "label": "Project cards, three across",
     "node": {
@@ -460,8 +460,8 @@ export const SPEC_SITE_PATTERNS = {
       }
     }
   },
-  "services.three": {
-    "family": "features",
+  "feature.triad": {
+    "family": "feature",
     "label": "Three services",
     "node": {
       "t": "Section",
@@ -571,7 +571,7 @@ export const SPEC_SITE_PATTERNS = {
       }
     }
   },
-  "cta.band": {
+  "cta.banner": {
     "family": "cta",
     "label": "Call to action band",
     "node": {
@@ -1951,14 +1951,14 @@ export const SPEC_SITE_TEMPLATES = {
             "pattern": "hero.split"
           },
           {
-            "pattern": "projects.grid",
+            "pattern": "collection.card-grid",
             "binding": "projectsLatest"
           },
           {
-            "pattern": "services.three"
+            "pattern": "feature.triad"
           },
           {
-            "pattern": "cta.band"
+            "pattern": "cta.banner"
           }
         ]
       },
@@ -1977,7 +1977,7 @@ export const SPEC_SITE_TEMPLATES = {
             }
           },
           {
-            "pattern": "projects.grid",
+            "pattern": "collection.card-grid",
             "binding": "projects",
             "without": [
               "header"
@@ -2004,7 +2004,7 @@ export const SPEC_SITE_TEMPLATES = {
             "pattern": "project.next"
           },
           {
-            "pattern": "cta.band"
+            "pattern": "cta.banner"
           }
         ]
       },
@@ -2026,7 +2026,7 @@ export const SPEC_SITE_TEMPLATES = {
             "pattern": "about.story"
           },
           {
-            "pattern": "cta.band"
+            "pattern": "cta.banner"
           }
         ]
       },
@@ -2045,7 +2045,7 @@ export const SPEC_SITE_TEMPLATES = {
     ],
     "globals": {
       "header": "nav.inline-cta",
-      "footer": "footer.columns"
+      "footer": "footer.three-column"
     }
   }
 } as const;