@craftile/core 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftile/core",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Framework-agnostic block editor engine for Craftile",
   "keywords": [
     "craftile",
@@ -26,8 +26,8 @@
     "src"
   ],
   "dependencies": {
-    "@craftile/event-bus": "1.1.0",
-    "@craftile/types": "1.1.0"
+    "@craftile/event-bus": "1.1.2",
+    "@craftile/types": "1.1.2"
   },
   "devDependencies": {
     "vitest": "^3.2.4",

package/src/commands/duplicate-block.ts

@@ -108,9 +108,6 @@ export class DuplicateBlockCommand implements Command {
 
   private determineInsertLocation(): void {
     const originalBlock = this.page.blocks[this.blockId];
-    if (!originalBlock) {
-      throw new Error(`Block not found: ${this.blockId}`);
-    }
 
     this.parentId = originalBlock.parentId || null;
 
@@ -148,7 +145,7 @@ export class DuplicateBlockCommand implements Command {
 
       targetParent.children.splice(this.insertIndex, 0, this.duplicatedBlockId);
     } else {
-      let targetRegion = this.page.regions.find((r) => r.name === this.regionId);
+      let targetRegion = this.page.regions.find((r) => getRegionId(r) === this.regionId);
 
       if (!targetRegion) {
         targetRegion = { name: this.regionId || 'main', blocks: [] };
@@ -178,7 +175,7 @@ export class DuplicateBlockCommand implements Command {
     } else {
       // Remove from region
       if (this.page.regions) {
-        const targetRegion = this.page.regions.find((r) => r.name === this.regionId);
+        const targetRegion = this.page.regions.find((r) => getRegionId(r) === this.regionId);
         if (targetRegion) {
           const index = targetRegion.blocks.indexOf(this.duplicatedBlockId);
           if (index !== -1) {

package/src/commands/insert-block-from-preset.ts

@@ -26,6 +26,7 @@ export class InsertBlockFromPresetCommand implements Command {
   private properties: Record<string, any>;
   private insertedBlock?: Block;
   private actualIndex?: number;
+  private resolvedRegionId?: string;
   private blocksManager: BlocksManager;
   private emit: EngineEmitFn;
   private createdBlockIds: string[] = [];
@@ -69,6 +70,7 @@ export class InsertBlockFromPresetCommand implements Command {
 
   apply(): void {
     const target = resolveInsertTarget(this.page, this.parentId, this.regionId, this.index);
+    this.resolvedRegionId = target.kind === 'region' ? target.regionId : undefined;
 
     const blockSchema = this.blocksManager.get(this.blockType);
 
@@ -126,11 +128,7 @@ export class InsertBlockFromPresetCommand implements Command {
       this.insertedBlock.parentId = target.parent.id;
       target.parent.children.splice(target.index, 0, this.blockId);
     } else {
-      let region = this.page.regions.find((r) => getRegionId(r) === target.regionId);
-      if (!region) {
-        region = { id: target.regionId, name: target.regionId, blocks: [] };
-        this.page.regions.push(region);
-      }
+      const region = this.page.regions.find((r) => getRegionId(r) === target.regionId)!;
       region.blocks.splice(target.index, 0, this.blockId);
     }
 
@@ -158,9 +156,8 @@ export class InsertBlockFromPresetCommand implements Command {
       if (parent && this.actualIndex !== undefined) {
         parent.children.splice(this.actualIndex, 1);
       }
-    } else {
-      const targetRegionId = this.regionId || getRegionId(this.page.regions[0]);
-      const targetRegion = this.page.regions.find((r) => getRegionId(r) === targetRegionId);
+    } else if (this.resolvedRegionId) {
+      const targetRegion = this.page.regions.find((r) => getRegionId(r) === this.resolvedRegionId);
 
       if (targetRegion && this.actualIndex !== undefined) {
         targetRegion.blocks.splice(this.actualIndex, 1);
@@ -171,6 +168,7 @@ export class InsertBlockFromPresetCommand implements Command {
       blockId: this.blockId,
       block: this.insertedBlock,
       parentId: this.parentId,
+      regionId: this.resolvedRegionId,
     });
   }
 

package/src/commands/insert-block.ts

@@ -23,6 +23,7 @@ export class InsertBlockCommand implements Command {
   private blockSchema?: BlockSchema;
   private insertedBlock?: Block;
   private actualIndex?: number;
+  private resolvedRegionId?: string;
   private emit: EngineEmitFn;
 
   constructor(page: Page, options: InsertBlockOptions) {
@@ -40,6 +41,7 @@ export class InsertBlockCommand implements Command {
 
   apply(): void {
     const target = resolveInsertTarget(this.page, this.parentId, this.regionId, this.index);
+    this.resolvedRegionId = target.kind === 'region' ? target.regionId : undefined;
 
     const blockName = this.blockSchema?.meta?.name || this.blockType;
 
@@ -59,11 +61,7 @@ export class InsertBlockCommand implements Command {
       this.insertedBlock.parentId = target.parent.id;
       target.parent.children.splice(target.index, 0, this.blockId);
     } else {
-      let region = this.page.regions.find((r) => getRegionId(r) === target.regionId);
-      if (!region) {
-        region = { id: target.regionId, name: target.regionId, blocks: [] };
-        this.page.regions.push(region);
-      }
+      const region = this.page.regions.find((r) => getRegionId(r) === target.regionId)!;
       region.blocks.splice(target.index, 0, this.blockId);
     }
 
@@ -88,9 +86,8 @@ export class InsertBlockCommand implements Command {
       if (parent && this.actualIndex !== undefined) {
         parent.children.splice(this.actualIndex, 1);
       }
-    } else {
-      const targetRegionId = this.regionId || getRegionId(this.page.regions[0]);
-      const targetRegion = this.page.regions.find((r) => getRegionId(r) === targetRegionId);
+    } else if (this.resolvedRegionId) {
+      const targetRegion = this.page.regions.find((r) => getRegionId(r) === this.resolvedRegionId);
 
       if (targetRegion && this.actualIndex !== undefined) {
         targetRegion.blocks.splice(this.actualIndex, 1);
@@ -101,6 +98,7 @@ export class InsertBlockCommand implements Command {
       blockId: this.blockId,
       block: this.insertedBlock,
       parentId: this.parentId,
+      regionId: this.resolvedRegionId,
     });
   }
 

package/src/commands/move-block.ts

@@ -55,11 +55,7 @@ export class MoveBlockCommand implements Command {
       target.parent.children.splice(target.index, 0, this.blockId);
     } else {
       this.blockToMove!.parentId = undefined;
-      let region = this.page.regions.find((r) => getRegionId(r) === target.regionId);
-      if (!region) {
-        region = { id: target.regionId, name: target.regionId, blocks: [] };
-        this.page.regions.push(region);
-      }
+      const region = this.page.regions.find((r) => getRegionId(r) === target.regionId)!;
       region.blocks.splice(target.index, 0, this.blockId);
     }
 
@@ -67,7 +63,7 @@ export class MoveBlockCommand implements Command {
       blockId: this.blockId,
       targetParentId: this.targetParentId,
       targetIndex: this.targetIndex,
-      targetRegionId: this.targetRegionId,
+      targetRegionId: target.kind === 'region' ? target.regionId : undefined,
       sourceParentId: this.originalParentId || null,
       sourceRegionId: this.originalRegionId || null,
       sourceIndex: this.originalIndex,
@@ -121,12 +117,12 @@ export class MoveBlockCommand implements Command {
 
     const regionId = resolveRegionId(this.page, this.targetRegionId);
     const existing = this.page.regions.find((r) => getRegionId(r) === regionId);
+    if (!existing) {
+      throw new Error(`Region not found: ${regionId}`);
+    }
+
     const sourceIsTarget = this.originalRegionId === regionId;
-    const prospective = existing
-      ? sourceIsTarget
-        ? existing.blocks.filter((id) => id !== this.blockId)
-        : existing.blocks
-      : [];
+    const prospective = sourceIsTarget ? existing.blocks.filter((id) => id !== this.blockId) : existing.blocks;
 
     return { kind: 'region', regionId, index: clampIndex(prospective.length, this.targetIndex) };
   }

package/src/commands/remove-block.ts

@@ -54,6 +54,7 @@ export class RemoveBlockCommand implements Command {
       blockId: this.blockId,
       block: this.removedBlock,
       parentId: this.originalParentId,
+      regionId: this.regionId,
     });
   }
 

package/src/utils.ts

@@ -60,10 +60,14 @@ export const resolveInsertTarget = (
 
   const targetRegionId = resolveRegionId(page, regionId);
   const existing = page.regions.find((r) => getRegionId(r) === targetRegionId);
+  if (!existing) {
+    throw new Error(`Region not found: ${targetRegionId}`);
+  }
+
   return {
     kind: 'region',
     regionId: targetRegionId,
-    index: clampIndex(existing?.blocks.length ?? 0, index),
+    index: clampIndex(existing.blocks.length, index),
   };
 };