@decocms/blocks-cli 7.64.3 → 7.65.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks-cli",
-  "version": "7.64.3",
+  "version": "7.65.1",
   "type": "module",
   "description": "Deco codegen (generate-blocks, generate-schema, generate-invoke) and Fresh-to-TanStack migration tooling",
   "repository": {
@@ -33,7 +33,7 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.64.3",
+    "@decocms/blocks": "7.65.1",
     "ts-morph": "^27.0.0",
     "tsx": "^4.22.5"
   },

package/scripts/deco-migrate-cli.ts

@@ -123,15 +123,15 @@ function showHelp() {
     npx tsx scripts/deco-migrate-cli.ts https://github.com/org/my-site
 
     ${dim("# Migrate local dir, compare against golden reference:")}
-    npx tsx scripts/deco-migrate-cli.ts ./casaevideo \\
-      --ref ./casaevideo-storefront
+    npx tsx scripts/deco-migrate-cli.ts ./acme \\
+      --ref ./acme-storefront
 
     ${dim("# Quick re-run (wipe previous output first):")}
-    npx tsx scripts/deco-migrate-cli.ts ./casaevideo \\
-      -o ./casaevideo-migrated --clean
+    npx tsx scripts/deco-migrate-cli.ts ./acme \\
+      -o ./acme-migrated --clean
 
     ${dim("# Dry run to preview what would change:")}
-    npx tsx scripts/deco-migrate-cli.ts ./casaevideo --dry-run -v
+    npx tsx scripts/deco-migrate-cli.ts ./acme --dry-run -v
 `);
 }
 

package/scripts/generate-invoke.test.ts

@@ -197,8 +197,8 @@ describe("generate-invoke.ts — default --apps-dir resolution", () => {
   // at node_modules/@decocms/apps-vtex/src/invoke.ts — NOT at the package
   // root. The old default only probed the root, never resolved on a site
   // with npm-installed packages, and forced sites to pass
-  // `--apps-dir node_modules/@decocms/apps-vtex/src` by hand (granadobr's
-  // migration workaround). The default must probe <pkg>/invoke.ts first,
+  // `--apps-dir node_modules/@decocms/apps-vtex/src` by hand (a production
+  // site's migration workaround). The default must probe <pkg>/invoke.ts first,
   // then <pkg>/src/invoke.ts.
 
   function makeSite(layout: "root" | "src"): { siteDir: string; cleanup: () => void } {

package/scripts/generate-schema-loader-aliases.test.ts

@@ -0,0 +1,186 @@
+import { spawnSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+
+interface Schema {
+  type?: string;
+  $ref?: string;
+  allOf?: Schema[];
+  anyOf?: Schema[];
+  properties?: Record<string, Schema>;
+  items?: Schema;
+  required?: string[];
+}
+
+// Exercise loader discovery AND prop matching through the real CLI. A context
+// pre-seeded with "Settings" would miss the bug in output-type registration.
+describe("generate-schema named loader aliases", () => {
+  let fixture: string;
+  let props: Schema;
+
+  beforeAll(() => {
+    fixture = mkdtempSync(path.join(tmpdir(), "schema-loader-aliases-"));
+    const write = (relative: string, contents: string) => {
+      const file = path.join(fixture, relative);
+      mkdirSync(path.dirname(file), { recursive: true });
+      writeFileSync(file, contents);
+    };
+    write(
+      "tsconfig.json",
+      JSON.stringify({
+        compilerOptions: {
+          target: "ES2022",
+          module: "ESNext",
+          moduleResolution: "Bundler",
+          strict: true,
+        },
+      }),
+    );
+    write(
+      "src/types.ts",
+      `export interface Config { title: string; modules: unknown; }
+       export type Settings = Omit<Config, "modules">;
+       export type Picked = Pick<Config, "title">;
+       export type Plain = { label: string };
+       export type Tree = { id: string; children?: Tree[] };
+       export type Generic<T> = { value: T };
+       export interface Product { productID: string; }
+       export interface Collection { label: string; settings: Settings; }
+       export type Unrelated = { title: string };`,
+    );
+    const loaders: Record<string, string> = {
+      settings: "Settings",
+      nullable: "Promise<Settings | null>",
+      picked: "Picked",
+      plain: "Plain",
+      list: "Promise<Settings[] | null>",
+      tree: "Tree",
+      products: "Product[]",
+      anonymous: "{ title: string }",
+      anonymousList: "{ label: string }[]",
+      strings: "string[]",
+      directOmit: 'Omit<Config, "title">',
+      generic: "Generic<string>",
+    };
+    for (const [name, output] of Object.entries(loaders)) {
+      write(
+        `src/loaders/${name}.ts`,
+        `import type { Config, Settings, Picked, Plain, Tree, Generic, Product } from "../types";
+         export default function load(): ${output} { throw new Error("fixture only"); }`,
+      );
+    }
+    write(
+      "src/sections/Example.tsx",
+      `import type { Config, Settings as SiteSettings, Picked, Plain, Tree,
+         Generic, Product, Collection, Unrelated } from "../types";
+       export interface Props {
+         settings: SiteSettings;
+         picked?: Picked | null;
+         plain: Plain;
+         list: SiteSettings[];
+         nullableList?: Array<SiteSettings> | null;
+         tree: Tree;
+         products: Product[];
+         collections: Collection[];
+         anonymous: { title: string };
+         anonymousList: { other: number }[];
+         strings: string[];
+         unrelated: Unrelated;
+         directOmit: Omit<Config, "modules">;
+         generic: Generic<number>;
+       }
+       export default function Example(_props: Props) { return null; }`,
+    );
+
+    const run = spawnSync(
+      process.execPath,
+      [
+        "--import",
+        import.meta.resolve("tsx"),
+        path.resolve(__dirname, "generate-schema.ts"),
+        "--skip-apps",
+      ],
+      { cwd: fixture, encoding: "utf8", timeout: 30_000 },
+    );
+    expect(run.status, run.error?.message ?? run.stderr).toBe(0);
+    const meta = JSON.parse(readFileSync(path.join(fixture, ".deco/meta.gen.json"), "utf8"));
+    const section = meta.schema.definitions[btoa("site/sections/Example.tsx")];
+    const ref = section.allOf.find((part: Schema) => part.$ref).$ref;
+    props = meta.schema.definitions[ref.replace("#/definitions/", "")];
+  }, 30_000);
+
+  afterAll(() => {
+    if (fixture) rmSync(fixture, { recursive: true, force: true });
+  });
+
+  function field(name: string): Schema {
+    const schema = props.properties?.[name];
+    expect(schema, name).toBeDefined();
+    return schema!;
+  }
+
+  function inline(schema: Schema): Schema {
+    return schema.anyOf?.find((branch) => branch.type) ?? schema;
+  }
+
+  function expectLoader(schema: Schema, name: string) {
+    expect(schema.anyOf).toEqual(expect.arrayContaining([{ $ref: "#/definitions/Resolvable" }]));
+    expect(schema.anyOf).toContainEqual({
+      $ref: `#/definitions/${btoa(`site/loaders/${name}.ts`)}`,
+    });
+    expect(schema.properties).toBeUndefined();
+    expect(schema.anyOf).not.toContainEqual({
+      $ref: `#/definitions/${btoa("site/loaders/anonymousList.ts")}`,
+    });
+  }
+
+  it("matches an imported Omit alias, including a nullable async loader", () => {
+    expectLoader(field("settings"), "settings");
+    expectLoader(field("settings"), "nullable");
+    expect(props.required).toContain("settings");
+  });
+
+  it("matches Pick and plain object aliases without changing optionality", () => {
+    expectLoader(field("picked"), "picked");
+    expectLoader(field("plain"), "plain");
+    expect(props.required).not.toContain("picked");
+  });
+
+  it("matches aliases through arrays, Promise and nullable wrappers", () => {
+    expectLoader(field("list"), "list");
+    expectLoader(field("nullableList"), "list");
+    expect(props.required).not.toContain("nullableList");
+  });
+
+  it("matches a recursive alias without expanding its fields", () => {
+    expectLoader(field("tree"), "tree");
+  });
+
+  it("keeps named-interface array loaders working", () => {
+    expectLoader(field("products"), "products");
+  });
+
+  it("keeps unrelated object arrays editable and resolves their nested settings", () => {
+    const collections = inline(field("collections"));
+    expect(collections.type).toBe("array");
+    expect(collections.items?.properties?.label.type).toBe("string");
+    expectLoader(collections.items!.properties!.settings, "settings");
+  });
+
+  it("does not collapse unrelated anonymous arrays into an __type[] bucket", () => {
+    expect(inline(field("anonymousList")).items?.properties?.other.type).toBe("number");
+  });
+
+  it("does not register generic utility types or match different instantiations", () => {
+    expect(inline(field("directOmit")).properties?.title.type).toBe("string");
+    expect(inline(field("generic")).properties?.value.type).toBe("number");
+  });
+
+  it("does not match primitives, anonymous objects or unrelated named aliases", () => {
+    expect(inline(field("strings")).items?.type).toBe("string");
+    expect(inline(field("anonymous")).properties?.title.type).toBe("string");
+    expect(inline(field("unrelated")).properties?.title.type).toBe("string");
+  });
+});

package/scripts/generate-schema.test.ts

@@ -156,7 +156,7 @@ describe("typeToJsonSchema with intersection types", () => {
       useInMemoryFileSystem: true,
       compilerOptions: { skipLibCheck: true },
     });
-    // Mirrors the granado header `SiteNavigationElement` recursive workaround:
+    // Mirrors a production header `SiteNavigationElement` recursive workaround:
     // nested children written as `Leaf & { children?: Array<…> }`. Before the
     // intersection branch these collapsed to `children: { items: { type: "string" } }`.
     const sf = project.createSourceFile(
@@ -217,7 +217,7 @@ describe("typeToJsonSchema Section-typed props", () => {
     });
   }, 30_000);
 
-  // Regression (casaevideo footer): a component that declares its own local
+  // Regression (a production footer): a component that declares its own local
   // `type Section = { label; items }` used to collide with the magic name and
   // collapse into a non-editable __SECTION_REF__ picker — the footer columns
   // showed only a drag handle, no expand arrow, no form. A concretely-shaped

package/scripts/generate-schema.ts

@@ -369,6 +369,37 @@ interface GenerationContext {
   outputTypeToLoaderKeys: Map<string, string[]>;
 }
 
+function namedLoaderType(type: Type | undefined): string | null {
+  if (!type) return null;
+  const name = type.getSymbol()?.getName();
+  if (
+    name &&
+    name !== "__type" &&
+    name !== "__object" &&
+    name !== "Array" &&
+    name !== "ReadonlyArray"
+  ) {
+    return name;
+  }
+  // Mapped/object aliases have a synthetic symbol but retain their own name.
+  // Bare Omit<T, K>/Generic<T> must not share a bucket across instantiations.
+  const alias = type.getAliasSymbol();
+  return alias && type.getAliasTypeArguments().length === 0 ? alias.getName() : null;
+}
+
+/** Same bounded name lookup for loader outputs and section props; no shape matching. */
+function loaderTypeName(type: Type): string | null {
+  if (type.isUnion()) {
+    const nonNull = type.getUnionTypes().filter((t) => !t.isNull() && !t.isUndefined());
+    if (nonNull.length === 1) type = nonNull[0];
+  }
+  if (type.isArray()) {
+    const name = namedLoaderType(type.getArrayElementType());
+    return name ? `${name}[]` : null;
+  }
+  return namedLoaderType(type);
+}
+
 /**
  * Extract the return type name of a loader's default export.
  * Unwraps Promise<T> and T | null wrappers.
@@ -383,25 +414,7 @@ function extractLoaderOutputTypeName(sourceFile: SourceFile): string | null {
     const args = ret.getTypeArguments();
     if (args.length) ret = args[0];
   }
-  if (ret.isUnion()) {
-    const nonNull = ret.getUnionTypes().filter((t) => !t.isNull() && !t.isUndefined());
-    if (nonNull.length === 1) ret = nonNull[0];
-  }
-  // Unwrap array element type — Product[] → "Product[]" (keyed as array).
-  // When the element type has no resolvable name (primitives like `string[]`,
-  // or opaque types like `VNode[]`), there is NO meaningful output-type key.
-  // Returning the generic `Array` symbol here would bucket the loader under
-  // "Array", which then collides with EVERY array-typed section prop
-  // (`Collection[]`, `Tab[]`, …) and wrongly turns them into loader pickers.
-  if (ret.isArray()) {
-    const elType = ret.getArrayElementType();
-    const elName = elType?.getSymbol()?.getName() ?? elType?.getAliasSymbol()?.getName() ?? null;
-    return elName ? `${elName}[]` : null;
-  }
-  // Reject anonymous object returns (`{ … }` → symbol name "__type"): they are
-  // not a nameable output type and would over-match anonymous-object props.
-  const name = ret.getSymbol()?.getName() ?? ret.getAliasSymbol()?.getName() ?? null;
-  return name && name !== "__type" ? name : null;
+  return loaderTypeName(ret);
 }
 
 export function typeToJsonSchema(type: Type, visited = new Set<string>(), ctx?: GenerationContext): any {
@@ -619,32 +632,10 @@ export function typeToJsonSchema(type: Type, visited = new Set<string>(), ctx?:
         // Loader output type → block-ref: emit anyOf [Resolvable, ...matchingLoaders]
         // baseHint strips "| null | undefined" so "ProductListingPage | null" → "ProductListingPage"
         if (ctx?.outputTypeToLoaderKeys) {
-          const typeSym = propType.getSymbol() ?? propType.getAliasSymbol();
-          // An array type's symbol name is always the generic "Array", which is
-          // never a meaningful loader output key — fall back to the AST type
-          // text (`baseHint`, e.g. "Collection[]") instead. The element-based
-          // `${elName}[]` lookup below handles arrays precisely.
-          const symName = typeSym?.getName();
-          const outputTypeName = symName && symName !== "Array" ? symName : baseHint;
-          let matchingLoaders =
-            ctx.outputTypeToLoaderKeys.get(outputTypeName) ??
+          const outputTypeName = loaderTypeName(propType);
+          const matchingLoaders =
+            (outputTypeName ? ctx.outputTypeToLoaderKeys.get(outputTypeName) : undefined) ??
             (outputTypeName !== baseHint ? ctx.outputTypeToLoaderKeys.get(baseHint) : undefined);
-          // If no match yet and the prop type is an array, try element type name + "[]"
-          if (!matchingLoaders?.length) {
-            let arrayElementType = propType.isArray() ? propType.getArrayElementType() : null;
-            if (!arrayElementType && propType.isUnion()) {
-              const nonNull = propType.getUnionTypes().filter((t) => !t.isNull() && !t.isUndefined());
-              if (nonNull.length === 1 && nonNull[0].isArray()) {
-                arrayElementType = nonNull[0].getArrayElementType();
-              }
-            }
-            if (arrayElementType) {
-              const elName = arrayElementType.getSymbol()?.getName() ?? arrayElementType.getAliasSymbol()?.getName();
-              if (elName) {
-                matchingLoaders = ctx.outputTypeToLoaderKeys.get(`${elName}[]`);
-              }
-            }
-          }
           if (matchingLoaders?.length) {
             const blockRefSchema: any = {
               anyOf: [

package/scripts/generate-sections.test.ts

@@ -9,7 +9,7 @@
  *
  * Verifies the operationally important behavior: a co-located test/spec/
  * stories/gen file sitting next to a real section must never be walked into
- * sectionMeta (the fila incident this generator's `walkDir` reproduced:
+ * sectionMeta (a production-site incident this generator's `walkDir` reproduced:
  * `sections.test.ts` became a bogus section in a site's generated output).
  */
 import * as cp from "node:child_process";
@@ -273,8 +273,8 @@ describe("generate-sections neverDefer convention", () => {
   // SectionMetaEntry interface the SAME file declares omitted the field —
   // so every generated file containing a neverDefer section failed the
   // site's typecheck (TS2353 excess property), and sites hand-patched the
-  // interface only to have the next regeneration wipe the patch (miess's
-  // .deco/sections.gen.ts carried exactly that TODO). The emitted interface
+  // interface only to have the next regeneration wipe the patch (a production
+  // site's .deco/sections.gen.ts carried exactly that TODO). The emitted interface
   // must match SectionMetaEntry in @decocms/blocks/cms.
   let tmpDir: string;
   let sectionsDir: string;
@@ -292,7 +292,7 @@ describe("generate-sections neverDefer convention", () => {
   });
 
   it("declares neverDefer on the emitted SectionMetaEntry interface and the generated file typechecks + imports", () => {
-    // Mirrors miess's src/sections/Product/SearchResult.tsx.
+    // Mirrors a production site's src/sections/Product/SearchResult.tsx.
     fs.writeFileSync(
       path.join(sectionsDir, "SearchResult.tsx"),
       "export const neverDefer = true;\nexport default function SearchResult() { return null; }\n",

package/scripts/lib/blocks-dedupe.test.ts

@@ -83,7 +83,7 @@ describe("pickWinner", () => {
   });
 
   it("prefers higher decode-pass count when path-status matches", () => {
-    // The lebiscuit reproduction case: a stale single-encoded leftover with a
+    // A production reproduction case: a stale single-encoded leftover with a
     // newer mtime and larger size loses to the bot's double-encoded fresh file.
     const stale = cand({
       file: "pages-Home%20-%20LB-618509.json",

package/scripts/lib/upgrade-6-to-7.ts

@@ -7,7 +7,7 @@
  * only the package dependency that needs to move.
  *
  * Mapping derived by hand against a real production site
- * (montecarlo-tanstack) — see the issue for the full worked table. Symbol
+ * (a production VTEX storefront) — see the issue for the full worked table. Symbol
  * renames and relocations mean a pure specifier-string rewrite is not
  * enough for every case; those are called out below.
  */

package/scripts/migrate/analyzers/htmx-analyze.test.ts

@@ -116,7 +116,7 @@ describe("classify (pure)", () => {
 	});
 
 	it("treats hx-on with a fetch attr as click-swap (the fetch wins)", () => {
-		// Real example from als (EmailAndPassword button): hx-get +
+		// Real example from a production htmx storefront (EmailAndPassword button): hx-get +
 		// hx-target + hx-trigger=click — engineer often piles
 		// hx-on alongside, but the dominant migration path is the
 		// click-swap recipe.
@@ -127,11 +127,11 @@ describe("classify (pure)", () => {
 });
 
 /* ------------------------------------------------------------------ */
-/* analyzeFile() — JSX walker tests using real als-shaped fixtures     */
+/* analyzeFile() — JSX walker tests using real htmx-shaped fixtures     */
 /* ------------------------------------------------------------------ */
 
 describe("analyzeFile (real shapes)", () => {
-	it("detects hx-on:click={useScript(...)} click handler (als AddToBagButton shape)", () => {
+	it("detects hx-on:click={useScript(...)} click handler (AddToBagButton shape)", () => {
 		const file = `
 import { useScript } from "@deco/deco/hooks";
 export default function AddToBagButton() {
@@ -157,7 +157,7 @@ export default function AddToBagButton() {
 		expect(out[0].attrs).toEqual(["hx-on:click"]);
 	});
 
-	it("detects hx-post + hx-target + hx-trigger=keyup on an input as auto-fetch (als SearchInput shape)", () => {
+	it("detects hx-post + hx-target + hx-trigger=keyup on an input as auto-fetch (SearchInput shape)", () => {
 		const file = `
 <input
   id={searchInputId}
@@ -181,7 +181,7 @@ export default function AddToBagButton() {
 		expect(out[0].attrs).toContain("hx-target");
 	});
 
-	it("detects hx-post + hx-target + hx-swap on a form as form-swap (als EmailAndPassword shape)", () => {
+	it("detects hx-post + hx-target + hx-swap on a form as form-swap (EmailAndPassword shape)", () => {
 		const file = `
 <form
   class="flex flex-col w-full"
@@ -202,7 +202,7 @@ export default function AddToBagButton() {
 		expect(out[0].attrs).toContain("hx-target");
 	});
 
-	it("detects hx-get on a button as click-swap (als ForgotPassword shape)", () => {
+	it("detects hx-get on a button as click-swap (ForgotPassword shape)", () => {
 		const file = `
 <button
   type="button"

package/scripts/migrate/config.ts

@@ -3,7 +3,7 @@
  *
  * Looks for `.deco-migrate.config.json` next to the source root. The file
  * is optional — without it the script falls back to a baked-in default set
- * of section-convention names that work for `casaevideo` and most other
+ * of section-convention names that work for `acme` and most other
  * Deco/VTEX sites that derived from the same template.
  *
  * The defaults are kept here (not in `transforms/section-conventions.ts`)
@@ -61,7 +61,7 @@ export interface SectionConventionSets {
 }
 
 /**
- * Built-in defaults. Originally extracted from `casaevideo` migration —
+ * Built-in defaults. Originally extracted from a production migration —
  * these names are common across Deco/VTEX storefronts that share the
  * lineage. Sites that don't have these sections are unaffected (the
  * matcher just never fires).

package/scripts/migrate/phase-analyze.test.ts

@@ -10,7 +10,7 @@ import { extractGoogleFonts, extractPlatform } from "./phase-analyze";
 //   3. apps/site.ts loose string match against platform name + "platform"
 //   4. .deco/blocks filenames hinting at platform
 // Strategy 3 is the false-positive trap that ate Magento sites before #211:
-// helsinki/granadobr's apps/site.ts imports `apps/vtex/mod.ts` for the color
+// a production site's apps/site.ts imports `apps/vtex/mod.ts` for the color
 // palette, so the content matches `"vtex"` even though the real platform is
 // declared via `apps/magento.ts`. The fix adds "magento" to the platforms
 // list so Strategy 2 fires first and short-circuits before Strategy 3 can
@@ -90,7 +90,7 @@ describe("extractPlatform", () => {
     fs.rmSync(tmp, { recursive: true, force: true });
   });
 
-  it("detects magento from apps/magento.ts (granadobr/helsinki shape)", () => {
+  it("detects magento from apps/magento.ts (a production site shape)", () => {
     fs.writeFileSync(path.join(tmp, "apps", "magento.ts"), "export default {};\n");
     // Also write a site.ts that imports vtex for color palettes — this is
     // what tripped Strategy 3 before #211.
@@ -113,7 +113,7 @@ describe("extractPlatform", () => {
   });
 
   it("prefers magento over vtex when both an apps/magento.ts AND a vtex string match exist", () => {
-    // Reproduce the exact granadobr trap: apps/magento.ts is the real signal,
+    // Reproduce the exact production trap: apps/magento.ts is the real signal,
     // but apps/site.ts loosely contains "vtex" + "platform".
     fs.writeFileSync(path.join(tmp, "apps", "magento.ts"), "export default {};\n");
     fs.writeFileSync(

package/scripts/migrate/phase-analyze.ts

@@ -41,7 +41,7 @@ const PATTERN_DETECTORS: Array<[DetectedPattern, RegExp]> = [
   ["head-component", /<Head[\s>]/],
   ["define-app", /defineApp\(/],
   ["invoke-proxy", /proxy<Manifest/],
-  // Bagaggio-style HTMX dynamic-section loader. Both the source file and
+  // legacy HTMX-style dynamic-section loader. Both the source file and
   // every call site need manual conversion to React state / createServerFn.
   ["sections-component-loader", /sections\/Component\.tsx?$/m],
   ["use-component", /import\s*\{[^}]*\buseComponent\b[^}]*\}\s*from\s*["'][^"']*sections\/Component(?:\.tsx?)?["']/],
@@ -270,7 +270,7 @@ function decideAction(
     };
   }
 
-  // Bagaggio-style HTMX dynamic-section loader → delete and flag.
+  // legacy HTMX-style dynamic-section loader → delete and flag.
   // The file uses Deno-only APIs (`toFileUrl(Deno.cwd())`, `import.meta.resolve`)
   // and the `useComponent(component, props)` HTMX render-and-swap pattern, none
   // of which work on TanStack Start / Cloudflare Workers. The site author must
@@ -430,7 +430,7 @@ function extractVtexAccount(sourceDir: string): string | null {
     const fp = path.join(sourceDir, candidate);
     if (!fs.existsSync(fp)) continue;
     const content = fs.readFileSync(fp, "utf-8");
-    // Match patterns like: casaevideo: "casaevideonewio"
+    // Match patterns like: acme: "acmenewio"
     const match = content.match(/vtexAn|VTEX_AN/i);
     if (match) {
       const dictMatch = content.match(/["'](\w+)["']\s*:\s*["'](\w+myvtex|\w+newio|\w+)["']/);
@@ -718,7 +718,7 @@ export function analyze(ctx: MigrationContext): void {
       f.path === "sections/Component.ts",
   );
   if (componentLoaderFile || useComponentSites.length > 0) {
-    console.log("\n  ⚠ HTMX dynamic-section loader detected (Bagaggio-style)");
+    console.log("\n  ⚠ HTMX dynamic-section loader detected (legacy HTMX-style)");
     if (componentLoaderFile) {
       console.log(`    • ${componentLoaderFile.path} (will be deleted)`);
     }

package/scripts/migrate/phase-cleanup.ts

@@ -627,7 +627,7 @@ function guardUndeclaredVariables(src: string, onFix: (msg: string) => void): st
 /**
  * Migrate account.json → src/constants/account.ts and rewrite imports.
  *
- * Old stack: root-level `account.json` containing e.g. `"casaevideo"`
+ * Old stack: root-level `account.json` containing e.g. `"acme"`
  * New stack: `src/constants/account.ts` exporting `accountName`
  *
  * Also rewrites every file that imports from `account.json` (via

package/scripts/migrate/phase-transform.ts

@@ -31,7 +31,7 @@ function getSectionMeta(ctx: MigrationContext, relPath: string): SectionMeta | u
 
 /**
  * Cached per-run section-conventions closure. Built once from the
- * resolved config sets (`ctx.config.sectionConventions`), so casaevideo
+ * resolved config sets (`ctx.config.sectionConventions`), so the built-in
  * defaults still apply when no config file exists.
  */
 let cachedSectionTransform:
@@ -227,7 +227,7 @@ export function transform(ctx: MigrationContext): void {
           "that ships HTML fragments and swaps them client-side. It does not work on TanStack Start. " +
           "Recipes: " +
           "(1) Self-contained UI toggles → keep state in React (`useState` + event handlers); " +
-          "(2) Form submissions / mutations → `createServerFn` + `useMutation` (see casaevideo-storefront for canonical examples); " +
+          "(2) Form submissions / mutations → `createServerFn` + `useMutation` (see a production storefront for canonical examples); " +
           "(3) Ad-hoc data fetches → call the loader/action via `~/server/invoke` and store results in `useState`. " +
           "Remove the import after refactoring, then delete `src/sections/Component.tsx`.",
         severity: "error",

package/scripts/migrate/post-cleanup/rules.ts

@@ -1090,8 +1090,8 @@ export const FRAMEWORK_DUPLICATES: FrameworkDuplicate[] = [
     sitePath: "src/sdk/useSuggestions.ts",
     canonicalImport: "@decocms/blocks/sdk/useSuggestions",
     // Fingerprint: hand-rolled hook with the module-level signal +
-    // serial-queue + latestQuery cancel pattern. Both casaevideo and
-    // baggagio independently invented this exact shape. Sites that
+    // serial-queue + latestQuery cancel pattern. Multiple production sites
+    // independently invented this exact shape. Sites that
     // already adopted `createUseSuggestions(…)` factory calls won't
     // match this signature.
     contentSignature: [

package/scripts/migrate/post-cleanup/shim-classify.test.ts

@@ -183,7 +183,7 @@ describe("classifyShimExports — type/interface declarations", () => {
   });
 });
 
-describe("classifyShimExports — real casaevideo-storefront fixtures", () => {
+describe("classifyShimExports — real production storefront fixtures", () => {
   it("vtex-segment.ts (mixed: stub + functional)", () => {
     const code = `
       export function getSegmentFromBag(_req?: any): Record<string, unknown> | null {

package/scripts/migrate/post-cleanup/shim-classify.ts

@@ -26,11 +26,11 @@
  * would need real semantic analysis. False negatives are tolerable; the
  * rule still warns when *any* imported symbol from the shim is a clear
  * stub, which is enough to surface the real-world regressions we've
- * actually seen on production sites (casaevideo: `getSegmentFromBag`,
+ * actually seen on production sites (e.g. `getSegmentFromBag`,
  * `getISCookiesFromBag`, `toProduct`).
  *
  * Implementation note — string parsing, not a real TypeScript AST. The
- * shim files are tiny by design (the casaevideo ones are 1-39 lines).
+ * shim files are tiny by design (the real ones are 1-39 lines).
  * A balanced-brace body extractor + small set of stub patterns covers
  * every case observed on real sites. If this ever needs to handle
  * decorators, generics on consts, or weirder JSX forms, the right move

package/scripts/migrate/templates/ci-workflows.test.ts

@@ -45,9 +45,9 @@ describe("generateCiFiles", () => {
     expect(f[".github/workflows/ci.yml"]).toContain('BUN_VERSION: "1.3.5"');
   });
 
-  it("is de-projectized — no colombo migration-debt refs", () => {
+  it("is de-projectized — no site-specific migration-debt refs", () => {
     const blob = Object.values(files).join("\n");
-    expect(blob).not.toMatch(/oficina/i);
+    expect(blob).not.toMatch(/sitea|siteb/i);
     expect(blob).not.toMatch(/#7[89]|#81/); // issues #78/#79/#81
     expect(blob).not.toMatch(/AGENTS\.md/);
   });
@@ -156,7 +156,7 @@ describe("generateSyncBlocksBotYml", () => {
   });
 
   it("is de-projectized — no real site/customer names", () => {
-    expect(yml).not.toMatch(/oficina|miess|colombo/i);
+    expect(yml).not.toMatch(/sitea|acme|siteb/i);
   });
 
   it("runs the site's own installed CLI, or a pinned one when given", () => {

package/scripts/migrate/templates/cursor-rules.test.ts

@@ -58,8 +58,8 @@ describe("generateMigrationPolicyPointerRule", () => {
 	it("escapes nothing weird from siteName — siteName is used as a label only", () => {
 		// We don't sanitise; we trust the migration script to pass a real
 		// package name. But verify nothing surprising happens with hyphens
-		// (a common shape, e.g. "casaevideo-storefront").
-		const out = generateMigrationPolicyPointerRule("casaevideo-storefront");
-		expect(out).toContain("`casaevideo-storefront`");
+		// (a common shape, e.g. "acme-storefront").
+		const out = generateMigrationPolicyPointerRule("acme-storefront");
+		expect(out).toContain("`acme-storefront`");
 	});
 });

package/scripts/migrate/templates/lib-utils.ts

@@ -9,7 +9,7 @@
  * - Most sites end up importing zero of these (apps-start exports
  *   direct equivalents for most VTEX utilities — see migrate#107).
  * - Eager generation creates dead `src/lib/*.ts` files that every site
- *   then has to clean up by hand (see baggagio-tanstack#7, ~235 LOC).
+ *   then has to clean up by hand (~235 LOC on one production migration).
  *
  * Registry shape: `"src/lib/<name>.ts"` → file contents.
  */
@@ -41,8 +41,8 @@ export function selectImportedLibTemplates(
 // Per the migration tooling policy (D3 — Throwing stubs):
 // generated stubs MUST throw at runtime so the first call surfaces the
 // gap loudly. Silent identity-cast `toProduct` was the bug behind
-// baggagio-tanstack#10 (PDP product data was being dropped on the floor
-// for weeks before anyone noticed).
+// a real production incident (PDP product data was being dropped on the
+// floor for weeks before anyone noticed).
 //
 // Each thrown message points at the canonical replacement so the fix
 // is mechanical. `deco-post-cleanup --fix` automates the swap.

package/scripts/migrate/templates/perf-yml.ts

@@ -19,7 +19,7 @@
  */
 
 /**
- * @param workerName  Cloudflare Worker name (= wrangler `name` field, e.g. "oficina-tanstack").
+ * @param workerName  Cloudflare Worker name (= wrangler `name` field, e.g. "my-site-tanstack").
  *                    Used in the CF check-run name and the main preview base URL.
  */
 export function generatePerfFiles(workerName: string): Record<string, string> {

package/scripts/migrate/templates/section-loaders.ts

@@ -139,8 +139,8 @@ export function generateSectionLoaders(ctx: MigrationContext): string {
   // returned.
   //
   // The previous template chose mixins XOR own-loader and silently dropped
-  // the section's loader when both were present — see als-tanstack
-  // SearchContainerV2 SSR regression.
+  // the section's loader when both were present — see a production
+  // storefront's SearchContainer SSR regression.
   for (const meta of ctx.sectionMetas) {
     if (meta.isHeader || meta.isAccountSection || meta.isStatusOnly) continue;
     // Skip sections with no loader AND no device needs
@@ -418,7 +418,7 @@ export function generateSectionLoaders(ctx: MigrationContext): string {
   // ---------- Privacy cookie check ----------
   if (isVtex && hasPrivacyPolice) {
     entries.push(``);
-    const vtexAccount = ctx.vtexAccount || "casaevideonewio";
+    const vtexAccount = ctx.vtexAccount || "acme";
     entries.push(`  "site/sections/Account/PrivacyPolice.tsx": (props: any, req) => {`);
     entries.push(`    const cookies = req.headers.get("cookie") ?? "";`);
     entries.push(`    const logged = cookies.includes("VtexIdclientAutCookie_${vtexAccount}");`);

package/scripts/migrate/templates/setup.ts

@@ -11,7 +11,7 @@ function discoverFonts(ctx: MigrationContext): string[] {
   const staticFonts = path.join(ctx.sourceDir, "static", "fonts");
   if (fs.existsSync(staticFonts)) return scanFontDir(staticFonts);
 
-  // Check static-*/fonts/ (multi-brand sites like casaevideo)
+  // Check static-*/fonts/ (multi-brand sites)
   try {
     const entries = fs.readdirSync(ctx.sourceDir, { withFileTypes: true });
     for (const e of entries) {

package/scripts/migrate/transforms/ctx-compat.ts

@@ -11,7 +11,7 @@ import type { TransformResult } from "../types";
  * *non-optional* deep read like `ctx.salesforce.cartExtension[0]` still throws
  * — and `withSectionLoader`'s try/catch would swallow it, dropping the
  * section's props (blank render). The hand-fixed reference migration
- * (`granadobr-tanstack`) solves this by optional-chaining every `ctx` read.
+ * (a production storefront) solves this by optional-chaining every `ctx` read.
  *
  * This codemod reproduces that: every `ctx.` member-access chain becomes an
  * optional chain (`ctx?.a?.b?.[0]`). Optional chaining short-circuits to

package/scripts/migrate/transforms/htmx-on-events.test.ts

@@ -224,7 +224,7 @@ describe("transformHtmxOnEvents — idempotency + edge cases", () => {
   });
 });
 
-describe("transformHtmxOnEvents — als-shaped fixtures", () => {
+describe("transformHtmxOnEvents — htmx-shaped fixtures", () => {
   it("AddToBagButton: hx-on-click + Fresh useScript → onClick + TODO", () => {
     const src = `import { useScript } from "site/sdk/useScript.ts";
 

package/scripts/migrate/transforms/htmx-on-events.ts

@@ -61,8 +61,8 @@ const STANDARD_EVENT_MAP: Record<string, string> = {
  * handler bodies reference Fresh-only globals (`useScript`,
  * `globalThis.window.STOREFRONT`, `STOREFRONT.*`). The comment is the
  * only file-level annotation the codemod emits — per-occurrence
- * comments would balloon the diff for a 88-rename file like
- * als-storefront's hot paths. It is detected by an idempotency check
+ * comments would balloon the diff for an 88-rename file like a
+ * production storefront's hot paths. It is detected by an idempotency check
  * so re-running the codemod does not double-inject.
  */
 const TODO_MARKER = "// MIGRATION TODO (codemod: htmx-on-event-rename):";

package/scripts/migrate/types.ts

@@ -140,7 +140,7 @@ export interface MigrationContext {
   layout: import("./source-layout").SourceLayout;
   siteName: string;
   platform: Platform;
-  /** VTEX account name (e.g. "casaevideonewio") — extracted from source code */
+  /** VTEX account name (e.g. "acme") — extracted from source code */
   vtexAccount: string | null;
   gtmId: string | null;
 

package/scripts/migrate-to-cf-observability.test.ts

@@ -46,13 +46,13 @@ describe("migrate-to-cf-observability codemod", () => {
     fs.writeFileSync(
       wranglerPath,
       `{
-  "name": "lebiscuit-tanstack",
+  "name": "acme-tanstack",
   "compatibility_date": "2026-02-14",
   "main": "./src/worker-entry.ts",
   "kv_namespaces": [{ "binding": "SITES_KV", "id": "abc" }],
   "version_metadata": { "binding": "CF_VERSION_METADATA" },
   "analytics_engine_datasets": [
-    { "binding": "DECO_METRICS", "dataset": "deco_metrics_lebiscuit" }
+    { "binding": "DECO_METRICS", "dataset": "deco_metrics_acme" }
   ],
   "observability": {
     "logs": {
@@ -77,7 +77,7 @@ describe("migrate-to-cf-observability codemod", () => {
     // No destinations by default.
     expect(result).not.toContain('"destinations"');
     // Original keys preserved.
-    expect(result).toContain('"name": "lebiscuit-tanstack"');
+    expect(result).toContain('"name": "acme-tanstack"');
     expect(result).toContain('"binding": "DECO_METRICS"');
     // Result must be valid JSONC.
     expect(() => JSON.parse(stripJsoncComments(result))).not.toThrow();
@@ -87,7 +87,7 @@ describe("migrate-to-cf-observability codemod", () => {
     fs.writeFileSync(
       wranglerPath,
       `{
-  "name": "lebiscuit-tanstack",
+  "name": "acme-tanstack",
   "main": "./src/worker-entry.ts",
   "observability": {
     "enabled": true,
@@ -146,7 +146,7 @@ describe("migrate-to-cf-observability codemod", () => {
     fs.writeFileSync(
       wranglerPath,
       `{
-  "name": "lebiscuit-tanstack",
+  "name": "acme-tanstack",
   "main": "./src/worker-entry.ts",
   "observability": {
     "logs": { "enabled": true }

package/scripts/migrate-to-cf-observability.ts

@@ -21,7 +21,7 @@
  * Cloudflare captures nothing, regardless of the sub-block flags.
  * `persist: true` keeps the data queryable in the CF dashboard
  * (Workers Logs view + Traces view). Discovered the hard way during the
- * lebiscuit canary cutover.
+ * production canary cutover.
  *
  * Behavior:
  *   - dry-run by default — prints a unified diff against the existing