Fix inputs and values attachments to be data-first (#127)

* Fix inputs and values attachments to be data-first

* Load adapters as plugin

* Fix tests

* Review comments

* (try to) fix test run for core package

* Run base branch coverage manually

* Fix unit-tests action: use ArtiomTr with pre-generated coverage files

* Try just PR branch tests

* Try clear before build

* Try no cache

* Use latest node

* Review comments resolved

* Resolve review comments

* Add destoryBlockToolAdapter method to Adapter plugin

Author: gohabereg

.nvmrc

@@ -1 +1 @@
-v20.9.0
+v24.15.0

packages/core/package.json

@@ -46,7 +46,7 @@
     "@editorjs/helpers": "^1.2.1",
     "@editorjs/model": "workspace:^",
     "@editorjs/sdk": "workspace:^",
-    "reflect-metadata": "^0.2.2",
-    "typedi": "^0.10.0"
+    "inversify": "^8.1.0",
+    "reflect-metadata": "^0.2.2"
   }
 }

packages/core/src/api/BlocksAPI.integration.spec.ts

@@ -51,7 +51,6 @@ jest.unstable_mockModule('../tools/ToolsManager', () => ({
 // Import real model (no mock) and mocked adapters
 const { EditorJSModel, EventType, BlockAddedEvent, BlockRemovedEvent } = await import('@editorjs/model');
 const { EventBus } = await import('@editorjs/sdk');
-const { CaretAdapter, FormattingAdapter } = await import('@editorjs/dom-adapters');
 const ToolsManager = (await import('../tools/ToolsManager')).default;
 const { BlocksManager } = await import('../components/BlockManager.js');
 const { BlocksAPI } = await import('./BlocksAPI.js');
@@ -73,19 +72,13 @@ describe('BlocksAPI integration (real model, mocked DOM adapters)', () => {
     model = new EditorJSModel(USER_ID, { identifier: DOCUMENT_ID });
     eventBus = new EventBus();
 
-    // @ts-expect-error — mock constructor, no real DOM needed
-    const caretAdapter = new CaretAdapter();
     // @ts-expect-error — mock constructor
     const toolsManager = new ToolsManager();
-    // @ts-expect-error — mock constructor
-    const formattingAdapter = new FormattingAdapter();
 
     blocksManager = new BlocksManager(
       model,
       eventBus,
-      caretAdapter,
       toolsManager,
-      formattingAdapter,
       config
     );
 
@@ -333,7 +326,7 @@ describe('BlocksAPI integration (real model, mocked DOM adapters)', () => {
       expect(handler).toHaveBeenCalledWith(expect.any(BlockAddedEvent));
     });
 
-    it('should emit BlockRemovedEvent on model when delete is called', () => {
+    it('should emit BlockRemovedEvent on model when delete is called', async () => {
       blocksAPI.insert('paragraph');
 
       const handler = jest.fn();
@@ -342,6 +335,8 @@ describe('BlocksAPI integration (real model, mocked DOM adapters)', () => {
 
       blocksAPI.delete(0);
 
+      await Promise.resolve(); // flush queueMicrotask used by removeBlock
+
       expect(handler).toHaveBeenCalledWith(expect.any(BlockRemovedEvent));
     });
   });

packages/core/src/api/BlocksAPI.ts

@@ -1,5 +1,6 @@
 import 'reflect-metadata';
-import { Inject, Service } from 'typedi';
+import { inject, injectable } from 'inversify';
+import { TOKENS } from '../tokens.js';
 import { BlocksManager } from '../components/BlockManager.js';
 import { BlockToolData } from '@editorjs/editorjs';
 import { CoreConfigValidated } from '@editorjs/sdk';
@@ -10,7 +11,7 @@ import { type BlockNodeSerialized, EditorDocumentSerialized } from '@editorjs/mo
  * Blocks API
  *  - provides methods to work with blocks
  */
-@Service()
+@injectable()
 export class BlocksAPI implements BlocksApiInterface {
   /**
    * BlocksManager instance to work with blocks
@@ -29,7 +30,7 @@ export class BlocksAPI implements BlocksApiInterface {
    */
   constructor(
     blocksManager: BlocksManager,
-    @Inject('EditorConfig') config: CoreConfigValidated
+    @inject(TOKENS.EditorConfig) config: CoreConfigValidated
   ) {
     this.#blocksManager = blocksManager;
     this.#config = config;

packages/core/src/api/DocumentAPI/DocumentAPI.ts

@@ -1,14 +1,14 @@
 import 'reflect-metadata';
-import { Service } from 'typedi';
 
 import { type EditorDocumentSerialized, EditorJSModel } from '@editorjs/model';
 import { DocumentAPI as DocumentApiInterface } from '@editorjs/sdk';
+import { injectable } from 'inversify';
 
 /**
  * Document API
  *  - provides access to document serialized data
  */
-@Service()
+@injectable()
 export class DocumentAPI implements DocumentApiInterface {
   /**
    * Editor document model instance

packages/core/src/api/SelectionAPI.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Service } from 'typedi';
+import { injectable } from 'inversify';
 
 import { SelectionManager } from '../components/SelectionManager.js';
 import { createInlineToolName } from '@editorjs/model';
@@ -10,7 +10,7 @@ import { SelectionAPI as SelectionApiInterface } from '@editorjs/sdk';
  * Selection API class
  * - provides methods to work with selection
  */
-@Service()
+@injectable()
 export class SelectionAPI implements SelectionApiInterface {
   #selectionManager: SelectionManager;
 

packages/core/src/api/index.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Inject, Service } from 'typedi';
+import { inject, injectable } from 'inversify';
 import { EditorAPI as EditorApiInterface } from '@editorjs/sdk';
 import { BlocksAPI } from './BlocksAPI.js';
 import { SelectionAPI } from './SelectionAPI.js';
@@ -8,23 +8,23 @@ import { DocumentAPI } from './DocumentAPI/index.js';
 /**
  * Class gathers all Editor's APIs
  */
-@Service()
+@injectable()
 export class EditorAPI implements EditorApiInterface {
   /**
    * Blocks API instance to work with blocks
    */
-  @Inject()
+  @inject(BlocksAPI)
   public blocks!: BlocksAPI;
 
   /**
    * Selection API instance to work with selection and inline formatting
    */
-  @Inject()
+  @inject(SelectionAPI)
   public selection!: SelectionAPI;
 
   /**
    * Document API instance to work with document
    */
-  @Inject()
+  @inject(DocumentAPI)
   public document!: DocumentAPI;
 }