@decocms/blocks-cli 7.17.0 → 7.17.1

package/package.json

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

package/scripts/generate-schema.test.ts

@@ -157,6 +157,66 @@ describe("typeToJsonSchema with intersection types", () => {
   }, 30_000);
 });
 
+describe("typeToJsonSchema loader block-ref matching", () => {
+  // Regression: a loader that returns an array whose element type has no
+  // resolvable name (`VNode[]`, `string[]`, …) used to be bucketed under the
+  // generic key "Array". Because an array type's OWN symbol name is also
+  // "Array", EVERY array-of-objects section prop (`Collection[]`, `Tab[]`)
+  // matched that bucket and collapsed into a block-ref picker — so the array
+  // was no longer editable and its item fields (label, nested loaders) all
+  // disappeared from the CMS form. The two guards (drop the "Array" bucket at
+  // registration; never look it up from an array prop's symbol name) keep the
+  // array inline and editable.
+  it("does not collapse an array-of-objects prop into a block-ref via the generic 'Array' bucket", () => {
+    const project = new Project({
+      useInMemoryFileSystem: true,
+      compilerOptions: { skipLibCheck: true },
+    });
+    const sf = project.createSourceFile(
+      "props.ts",
+      `
+        interface Product { productID: string; name: string; }
+        interface Collection { label: string; products: Product[] | null; }
+        export interface Props {
+          collections: Collection[];
+          topLevelProducts?: Product[] | null;
+        }
+      `,
+    );
+    const ctx = {
+      // Mimics a site where List/Sections (VNode[]) and skuList (string[])
+      // would otherwise land in an "Array" bucket, plus a real Product[] loader.
+      outputTypeToLoaderKeys: new Map<string, string[]>([
+        ["Product[]", ["site/loaders/algolia/products/list.ts"]],
+        ["Array", ["site/loaders/List/Sections.tsx", "site/loaders/skuList.ts"]],
+      ]),
+    };
+
+    const schema = typeToJsonSchema(sf.getInterfaceOrThrow("Props").getType(), new Set(), ctx);
+    const collections = schema.properties.collections;
+
+    // Stays an editable array of objects — NOT a block-ref anyOf.
+    expect(collections.type).toBe("array");
+    expect(collections.anyOf).toBeUndefined();
+
+    const item = collections.items;
+    expect(item.type).toBe("object");
+    expect(item.properties.label).toMatchObject({ type: "string" });
+    // The nested Product[] field still resolves to a loader picker (its type
+    // name matches a registered loader output).
+    expect(item.properties.products.anyOf).toEqual([
+      { $ref: "#/definitions/Resolvable" },
+      { $ref: "#/definitions/c2l0ZS9sb2FkZXJzL2FsZ29saWEvcHJvZHVjdHMvbGlzdC50cw==" },
+    ]);
+
+    // Control: a top-level Product[] prop still resolves to a loader picker.
+    expect(schema.properties.topLevelProducts.anyOf).toEqual([
+      { $ref: "#/definitions/Resolvable" },
+      { $ref: "#/definitions/c2l0ZS9sb2FkZXJzL2FsZ29saWEvcHJvZHVjdHMvbGlzdC50cw==" },
+    ]);
+  }, 30_000);
+});
+
 // ---------------------------------------------------------------------------
 // Default output path (.deco/) + legacy warning — subprocess, mirrors the
 // pattern in generate-sections.test.ts. generate-schema.ts IS guarded by

package/scripts/generate-schema.ts

@@ -345,15 +345,21 @@ function extractLoaderOutputTypeName(sourceFile: SourceFile): string | null {
     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)
+  // 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();
-    if (elType) {
-      const elName = elType.getSymbol()?.getName() ?? elType.getAliasSymbol()?.getName() ?? null;
-      if (elName) return `${elName}[]`;
-    }
+    const elName = elType?.getSymbol()?.getName() ?? elType?.getAliasSymbol()?.getName() ?? null;
+    return elName ? `${elName}[]` : null;
   }
-  return ret.getSymbol()?.getName() ?? ret.getAliasSymbol()?.getName() ?? 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;
 }
 
 export function typeToJsonSchema(type: Type, visited = new Set<string>(), ctx?: GenerationContext): any {
@@ -565,7 +571,12 @@ export function typeToJsonSchema(type: Type, visited = new Set<string>(), ctx?:
         // baseHint strips "| null | undefined" so "ProductListingPage | null" → "ProductListingPage"
         if (ctx?.outputTypeToLoaderKeys) {
           const typeSym = propType.getSymbol() ?? propType.getAliasSymbol();
-          const outputTypeName = typeSym?.getName() ?? baseHint;
+          // 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) ??
             (outputTypeName !== baseHint ? ctx.outputTypeToLoaderKeys.get(baseHint) : undefined);