fix: adjust comment Y position and minimize state

- Updated _onBegin and targetCodeToBlocks to align comment Y-coordinate with block Y-coordinate
- Incremented Y-coordinate for sequential statement blocks to prevent overlap
- Relaxed test helpers to allow x/y coordinates in blocks

Author: takaokouji

src/lib/ruby-to-blocks-converter/index.js

@@ -188,8 +188,24 @@ class RubyToBlocksConverter {
             if (!_.isArray(blocks)) {
                 blocks = [blocks];
             }
+            let currentY = 0;
             blocks.forEach(block => {
                 if (this._isBlock(block)) {
+                    if (this._isStatementBlock(block)) {
+                        if (block.x === void 0) {
+                            block.x = 0;
+                        }
+                        if (block.y === void 0) {
+                            block.y = currentY;
+                        }
+                        if (block.comment) {
+                            const comment = this._context.comments[block.comment];
+                            if (comment) {
+                                comment.y = block.y;
+                            }
+                        }
+                        currentY += 48;
+                    }
                     block.topLevel = true;
                 } else if (block instanceof Primitive) {
                     throw new RubyToBlocksConverterError(
@@ -1452,21 +1468,22 @@ class RubyToBlocksConverter {
         blocks.forEach(block => {
             switch (this._getBlockType(block)) {
             case 'statement':
+                if (block.comment) {
+                    const comment = this._context.comments[block.comment];
+                    if (comment) {
+                        comment.y = currentY;
+                    }
+                }
                 if (prevBlock) {
                     prevBlock.next = block.id;
                     block.parent = prevBlock.id;
                 } else {
                     result.push(block);
                     block.x = 0;
                     block.y = currentY;
-                    if (block.comment) {
-                        const comment = this._context.comments[block.comment];
-                        if (comment) {
-                            comment.y = block.y;
-                        }
-                    }
-                    currentY += 48;
                 }
+                currentY += 48;
+
                 if (block.next) {
                     const b = this._lastBlock(block);
                     if (this._getBlockType(b) === 'statement') {

test/helpers/expect-to-equal-blocks.js

@@ -182,8 +182,12 @@ const expectToEqualBlock = function (context, parent, actualBlock, expectedBlock
     expect(blocks.getOpcode(block)).toEqual(expected.opcode);
     expect(block.parent).toEqual(parent);
     expect(block.shadow).toEqual(expected.shadow === true);
-    expect(block.x).toEqual(void 0);
-    expect(block.y).toEqual(void 0);
+    if (expected.x !== void 0) {
+        expect(block.x).toEqual(expected.x);
+    }
+    if (expected.y !== void 0) {
+        expect(block.y).toEqual(expected.y);
+    }
 
     expectToEqualFields(context, blocks.getFields(block), expected.fields);