Fix false-positive geometry/material_instances pairing errors in block permutations

ide/vscode/src/version.ts

@@ -1 +1 @@
-export const Version = "9.0.18";
+export const Version = "9.0.20";

packages/bedrock-diagnoser/src/diagnostics/behavior-pack/block/components/diagnose.ts

@@ -86,6 +86,7 @@ const component_test: Record<string, ComponentCheck<Internal.BehaviorPack.Block>
   'minecraft:geometry': (name, component, context, diagnoser) => {
     try {
       if (
+        !context.isPermutation &&
         !context.components.includes('minecraft:material_instances') &&
         FormatVersion.isGreaterOrEqualThan(context.source.format_version as FormatVersion, [1, 21, 80])
       )
@@ -114,6 +115,7 @@ const component_test: Record<string, ComponentCheck<Internal.BehaviorPack.Block>
   'minecraft:material_instances': (name, component, context, diagnoser) => {
     try {
       if (
+        !context.isPermutation &&
         !context.components.includes('minecraft:geometry') &&
         FormatVersion.isGreaterOrEqualThan(context.source.format_version as FormatVersion, [1, 21, 80])
       )

packages/bedrock-diagnoser/src/diagnostics/behavior-pack/block/document.ts

@@ -37,7 +37,7 @@ export function diagnose_block_document(diagnoser: DocumentDiagnosticsBuilder):
   //check components
   block['minecraft:block']?.permutations?.forEach((p) => {
     context.components.push(...getUsedComponents(p));
-    behaviorpack_diagnose_block_components(p, context, diagnoser);
+    behaviorpack_diagnose_block_components(p, { ...context, isPermutation: true }, diagnoser);
   });
 
   if (block['minecraft:block']['events']) {

packages/bedrock-diagnoser/src/utility/components/components.ts

@@ -11,6 +11,8 @@ export interface Context<T> {
   source: Readonly<T>;
   /** The components used by the source collected from multiple sources */
   components: string[];
+  /** Whether the current components being checked belong to a permutation (not the top-level block) */
+  isPermutation?: boolean;
 }
 
 /**Checks if components dependencies are present, a component might need others to be present

packages/bedrock-diagnoser/test/lib/diagnostics/behavior-pack/block.test.ts

@@ -0,0 +1,120 @@
+import { Internal } from 'bc-minecraft-bedrock-project';
+import { TestDiagnoser } from '../../../diagnoser';
+import { behaviorpack_diagnose_block_components } from '../../../../src/diagnostics/behavior-pack/block/components/diagnose';
+import { Context } from '../../../../src/utility/components';
+
+const FORMAT_VERSION_1_21_80 = '1.21.80';
+const FORMAT_VERSION_1_20_0 = '1.20.0';
+
+function makeBlock(formatVersion: string): Internal.BehaviorPack.Block {
+  return {
+    format_version: formatVersion,
+    'minecraft:block': {
+      description: { identifier: 'test:block' },
+      components: {},
+    },
+  };
+}
+
+function makeContext(
+  block: Internal.BehaviorPack.Block,
+  components: string[],
+  isPermutation?: boolean,
+): Context<Internal.BehaviorPack.Block> {
+  return { source: block, components, isPermutation };
+}
+
+describe('BehaviorPack', () => {
+  describe('Block', () => {
+    describe('minecraft:geometry / minecraft:material_instances pairing', () => {
+      it('errors when geometry is at top-level without material_instances (>= 1.21.80)', () => {
+        const diagnoser = TestDiagnoser.create();
+        const block = makeBlock(FORMAT_VERSION_1_21_80);
+        const context = makeContext(block, ['minecraft:geometry']);
+
+        behaviorpack_diagnose_block_components(
+          { components: { 'minecraft:geometry': 'geometry.example' } },
+          context,
+          diagnoser,
+        );
+
+        expect(diagnoser.hasCode('behaviorpack.block.components.material_instances_x_geometry')).toBe(true);
+      });
+
+      it('errors when material_instances is at top-level without geometry (>= 1.21.80)', () => {
+        const diagnoser = TestDiagnoser.create();
+        const block = makeBlock(FORMAT_VERSION_1_21_80);
+        const context = makeContext(block, ['minecraft:material_instances']);
+
+        behaviorpack_diagnose_block_components(
+          { components: { 'minecraft:material_instances': { '*': { texture: 'test' } } } },
+          context,
+          diagnoser,
+        );
+
+        expect(diagnoser.hasCode('behaviorpack.block.components.material_instances_x_geometry')).toBe(true);
+      });
+
+      it('does not error when geometry is in a permutation without material_instances (>= 1.21.80)', () => {
+        const diagnoser = TestDiagnoser.create();
+        const block = makeBlock(FORMAT_VERSION_1_21_80);
+        const context = makeContext(block, ['minecraft:geometry'], true);
+
+        behaviorpack_diagnose_block_components(
+          { components: { 'minecraft:geometry': 'geometry.example' } },
+          context,
+          diagnoser,
+        );
+
+        expect(diagnoser.hasCode('behaviorpack.block.components.material_instances_x_geometry')).toBe(false);
+      });
+
+      it('does not error when material_instances is in a permutation without geometry (>= 1.21.80)', () => {
+        const diagnoser = TestDiagnoser.create();
+        const block = makeBlock(FORMAT_VERSION_1_21_80);
+        const context = makeContext(block, ['minecraft:material_instances'], true);
+
+        behaviorpack_diagnose_block_components(
+          { components: { 'minecraft:material_instances': { '*': { texture: 'test' } } } },
+          context,
+          diagnoser,
+        );
+
+        expect(diagnoser.hasCode('behaviorpack.block.components.material_instances_x_geometry')).toBe(false);
+      });
+
+      it('does not error when both geometry and material_instances are present at top-level (>= 1.21.80)', () => {
+        const diagnoser = TestDiagnoser.create();
+        const block = makeBlock(FORMAT_VERSION_1_21_80);
+        const context = makeContext(block, ['minecraft:geometry', 'minecraft:material_instances']);
+
+        behaviorpack_diagnose_block_components(
+          {
+            components: {
+              'minecraft:geometry': 'geometry.example',
+              'minecraft:material_instances': { '*': { texture: 'test' } },
+            },
+          },
+          context,
+          diagnoser,
+        );
+
+        expect(diagnoser.hasCode('behaviorpack.block.components.material_instances_x_geometry')).toBe(false);
+      });
+
+      it('does not error when geometry is used without material_instances in format versions < 1.21.80', () => {
+        const diagnoser = TestDiagnoser.create();
+        const block = makeBlock(FORMAT_VERSION_1_20_0);
+        const context = makeContext(block, ['minecraft:geometry']);
+
+        behaviorpack_diagnose_block_components(
+          { components: { 'minecraft:geometry': 'geometry.example' } },
+          context,
+          diagnoser,
+        );
+
+        expect(diagnoser.hasCode('behaviorpack.block.components.material_instances_x_geometry')).toBe(false);
+      });
+    });
+  });
+});