@ckeditor/ckeditor5-html-support 37.1.0 → 38.0.0-rc.1

package/lang/translations/lv.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Latvian (https://www.transifex.com/ckeditor/teams/11143/lv/)\n"
+"Language-Team: Latvian (https://app.transifex.com/ckeditor/teams/11143/lv/)\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 

package/lang/translations/ms.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Malay (https://www.transifex.com/ckeditor/teams/11143/ms/)\n"
+"Language-Team: Malay (https://app.transifex.com/ckeditor/teams/11143/ms/)\n"
 "Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

package/lang/translations/nl.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Dutch (https://www.transifex.com/ckeditor/teams/11143/nl/)\n"
+"Language-Team: Dutch (https://app.transifex.com/ckeditor/teams/11143/nl/)\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

package/lang/translations/no.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Norwegian (https://www.transifex.com/ckeditor/teams/11143/no/)\n"
+"Language-Team: Norwegian (https://app.transifex.com/ckeditor/teams/11143/no/)\n"
 "Language: no\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

package/lang/translations/pl.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Polish (https://www.transifex.com/ckeditor/teams/11143/pl/)\n"
+"Language-Team: Polish (https://app.transifex.com/ckeditor/teams/11143/pl/)\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 

package/lang/translations/pt-br.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/ckeditor/teams/11143/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://app.transifex.com/ckeditor/teams/11143/pt_BR/)\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 

package/lang/translations/pt.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Portuguese (https://www.transifex.com/ckeditor/teams/11143/pt/)\n"
+"Language-Team: Portuguese (https://app.transifex.com/ckeditor/teams/11143/pt/)\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 

package/lang/translations/ro.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Romanian (https://www.transifex.com/ckeditor/teams/11143/ro/)\n"
+"Language-Team: Romanian (https://app.transifex.com/ckeditor/teams/11143/ro/)\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 

package/lang/translations/ru.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Russian (https://www.transifex.com/ckeditor/teams/11143/ru/)\n"
+"Language-Team: Russian (https://app.transifex.com/ckeditor/teams/11143/ru/)\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 

package/lang/translations/sk.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Slovak (https://www.transifex.com/ckeditor/teams/11143/sk/)\n"
+"Language-Team: Slovak (https://app.transifex.com/ckeditor/teams/11143/sk/)\n"
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 

package/lang/translations/sr-latn.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr@latin/)\n"
+"Language-Team: Serbian (Latin) (https://app.transifex.com/ckeditor/teams/11143/sr@latin/)\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 

package/lang/translations/sr.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Serbian (https://www.transifex.com/ckeditor/teams/11143/sr/)\n"
+"Language-Team: Serbian (https://app.transifex.com/ckeditor/teams/11143/sr/)\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 

package/lang/translations/sv.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Swedish (https://www.transifex.com/ckeditor/teams/11143/sv/)\n"
+"Language-Team: Swedish (https://app.transifex.com/ckeditor/teams/11143/sv/)\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

package/lang/translations/th.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Thai (https://www.transifex.com/ckeditor/teams/11143/th/)\n"
+"Language-Team: Thai (https://app.transifex.com/ckeditor/teams/11143/th/)\n"
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

package/lang/translations/tr.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Turkish (https://www.transifex.com/ckeditor/teams/11143/tr/)\n"
+"Language-Team: Turkish (https://app.transifex.com/ckeditor/teams/11143/tr/)\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 

package/lang/translations/uk.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Ukrainian (https://www.transifex.com/ckeditor/teams/11143/uk/)\n"
+"Language-Team: Ukrainian (https://app.transifex.com/ckeditor/teams/11143/uk/)\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 

package/lang/translations/ur.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Urdu (https://www.transifex.com/ckeditor/teams/11143/ur/)\n"
+"Language-Team: Urdu (https://app.transifex.com/ckeditor/teams/11143/ur/)\n"
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

package/lang/translations/vi.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Vietnamese (https://www.transifex.com/ckeditor/teams/11143/vi/)\n"
+"Language-Team: Vietnamese (https://app.transifex.com/ckeditor/teams/11143/vi/)\n"
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

package/lang/translations/zh-cn.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Chinese (China) (https://www.transifex.com/ckeditor/teams/11143/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://app.transifex.com/ckeditor/teams/11143/zh_CN/)\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

package/lang/translations/zh.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/ckeditor/teams/11143/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (https://app.transifex.com/ckeditor/teams/11143/zh_TW/)\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-html-support",
-  "version": "37.1.0",
+  "version": "38.0.0-rc.1",
   "description": "HTML Support feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -16,42 +16,43 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "^37.1.0",
+    "ckeditor5": "^38.0.0-rc.1",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": "^37.1.0",
-    "@ckeditor/ckeditor5-basic-styles": "^37.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^37.1.0",
-    "@ckeditor/ckeditor5-clipboard": "^37.1.0",
-    "@ckeditor/ckeditor5-cloud-services": "^37.1.0",
-    "@ckeditor/ckeditor5-code-block": "^37.1.0",
-    "@ckeditor/ckeditor5-core": "^37.1.0",
+    "@ckeditor/ckeditor5-alignment": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-basic-styles": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-block-quote": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-clipboard": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-cloud-services": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-code-block": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-core": "^38.0.0-rc.1",
     "@ckeditor/ckeditor5-dev-utils": "^37.0.0",
-    "@ckeditor/ckeditor5-easy-image": "^37.1.0",
-    "@ckeditor/ckeditor5-editor-classic": "^37.1.0",
-    "@ckeditor/ckeditor5-engine": "^37.1.0",
-    "@ckeditor/ckeditor5-enter": "^37.1.0",
-    "@ckeditor/ckeditor5-essentials": "^37.1.0",
-    "@ckeditor/ckeditor5-font": "^37.1.0",
-    "@ckeditor/ckeditor5-heading": "^37.1.0",
-    "@ckeditor/ckeditor5-highlight": "^37.1.0",
-    "@ckeditor/ckeditor5-horizontal-line": "^37.1.0",
-    "@ckeditor/ckeditor5-html-embed": "^37.1.0",
-    "@ckeditor/ckeditor5-image": "^37.1.0",
-    "@ckeditor/ckeditor5-indent": "^37.1.0",
-    "@ckeditor/ckeditor5-link": "^37.1.0",
-    "@ckeditor/ckeditor5-list": "^37.1.0",
-    "@ckeditor/ckeditor5-media-embed": "^37.1.0",
-    "@ckeditor/ckeditor5-page-break": "^37.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^37.1.0",
-    "@ckeditor/ckeditor5-paste-from-office": "^37.1.0",
-    "@ckeditor/ckeditor5-remove-format": "^37.1.0",
-    "@ckeditor/ckeditor5-source-editing": "^37.1.0",
-    "@ckeditor/ckeditor5-table": "^37.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^37.1.0",
-    "@ckeditor/ckeditor5-utils": "^37.1.0",
-    "@ckeditor/ckeditor5-widget": "^37.1.0",
+    "@ckeditor/ckeditor5-easy-image": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-editor-classic": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-engine": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-enter": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-essentials": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-font": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-heading": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-highlight": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-horizontal-line": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-html-embed": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-image": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-indent": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-link": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-list": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-media-embed": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-page-break": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-paragraph": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-paste-from-office": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-remove-format": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-source-editing": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-table": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-theme-lark": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-typing": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-utils": "^38.0.0-rc.1",
+    "@ckeditor/ckeditor5-widget": "^38.0.0-rc.1",
     "typescript": "^4.8.4",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"

package/src/converters.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 import { toWidget } from 'ckeditor5/src/widget';
-import { setViewAttributes, mergeViewElementAttributes, updateViewAttributes } from './conversionutils';
+import { setViewAttributes, mergeViewElementAttributes, updateViewAttributes } from './utils';
 /**
  * View-to-model conversion helper for object elements.
  *

package/src/datafilter.d.ts

@@ -9,7 +9,7 @@ import { Plugin, type Editor } from 'ckeditor5/src/core';
 import { type MatcherPattern, type UpcastConversionApi, type ViewElement } from 'ckeditor5/src/engine';
 import { Widget } from 'ckeditor5/src/widget';
 import { default as DataSchema, type DataSchemaDefinition } from './dataschema';
-import type { GHSViewAttributes } from './conversionutils';
+import type { GHSViewAttributes } from './utils';
 import '../theme/datafilter.css';
 /**
  * Allows to validate elements and element attributes registered by {@link module:html-support/dataschema~DataSchema}.
@@ -159,6 +159,10 @@ export default class DataFilter extends Plugin {
      * - classes Set with matched class names.
      */
     processViewAttributes(viewElement: ViewElement, conversionApi: UpcastConversionApi): GHSViewAttributes | null;
+    /**
+     * Adds allowed element definition and fires registration event.
+     */
+    private _addAllowedElement;
     /**
      * Registers elements allowed by {@link module:html-support/datafilter~DataFilter#allowElement} method
      * once {@link module:engine/controller/datacontroller~DataController editor's data controller} is initialized.

package/src/datafilter.js

@@ -5,10 +5,9 @@
 /**
  * @module html-support/datafilter
  */
-/* globals document */
 import { Plugin } from 'ckeditor5/src/core';
 import { Matcher } from 'ckeditor5/src/engine';
-import { priorities, CKEditorError } from 'ckeditor5/src/utils';
+import { CKEditorError, priorities, isValidAttributeName } from 'ckeditor5/src/utils';
 import { Widget } from 'ckeditor5/src/widget';
 import { viewToModelObjectConverter, toObjectWidgetConverter, createObjectView, viewToAttributeInlineConverter, attributeToViewInlineConverter, viewToModelBlockAttributeConverter, modelToViewBlockAttributeConverter } from './converters';
 import { default as DataSchema } from './dataschema';
@@ -123,25 +122,7 @@ export default class DataFilter extends Plugin {
      */
     allowElement(viewName) {
         for (const definition of this._dataSchema.getDefinitionsForView(viewName, true)) {
-            if (this._allowedElements.has(definition)) {
-                continue;
-            }
-            this._allowedElements.add(definition);
-            // We need to wait for all features to be initialized before we can register
-            // element, so we can access existing features model schemas.
-            // If the data has not been initialized yet, _registerElementsAfterInit() method will take care of
-            // registering elements.
-            if (this._dataInitialized) {
-                // Defer registration to the next data pipeline data set so any disallow rules could be applied
-                // even if added after allow rule (disallowElement).
-                this.editor.data.once('set', () => {
-                    this._fireRegisterEvent(definition);
-                }, {
-                    // With the highest priority listener we are able to register elements right before
-                    // running data conversion.
-                    priority: priorities.get('highest') + 1
-                });
-            }
+            this._addAllowedElement(definition);
             // Reset cached map to recalculate it on the next usage.
             this._coupledAttributes = null;
         }
@@ -206,6 +187,38 @@ export default class DataFilter extends Plugin {
         consumeAttributes(viewElement, conversionApi, this._disallowedAttributes);
         return consumeAttributes(viewElement, conversionApi, this._allowedAttributes);
     }
+    /**
+     * Adds allowed element definition and fires registration event.
+     */
+    _addAllowedElement(definition) {
+        if (this._allowedElements.has(definition)) {
+            return;
+        }
+        this._allowedElements.add(definition);
+        // For attribute based integrations (table figure, document lists, etc.) register related element definitions.
+        if ('appliesToBlock' in definition && typeof definition.appliesToBlock == 'string') {
+            for (const relatedDefinition of this._dataSchema.getDefinitionsForModel(definition.appliesToBlock)) {
+                if (relatedDefinition.isBlock) {
+                    this._addAllowedElement(relatedDefinition);
+                }
+            }
+        }
+        // We need to wait for all features to be initialized before we can register
+        // element, so we can access existing features model schemas.
+        // If the data has not been initialized yet, _registerElementsAfterInit() method will take care of
+        // registering elements.
+        if (this._dataInitialized) {
+            // Defer registration to the next data pipeline data set so any disallow rules could be applied
+            // even if added after allow rule (disallowElement).
+            this.editor.data.once('set', () => {
+                this._fireRegisterEvent(definition);
+            }, {
+                // With the highest priority listener we are able to register elements right before
+                // running data conversion.
+                priority: priorities.get('highest') + 1
+            });
+        }
+    }
     /**
      * Registers elements allowed by {@link module:html-support/datafilter~DataFilter#allowElement} method
      * once {@link module:engine/controller/datacontroller~DataController editor's data controller} is initialized.
@@ -433,6 +446,10 @@ export default class DataFilter extends Plugin {
         const schema = editor.model.schema;
         const conversion = editor.conversion;
         const attributeKey = definition.model;
+        // This element is stored in the model as an attribute on a block element, for example DocumentLists.
+        if (definition.appliesToBlock) {
+            return;
+        }
         schema.extend('$text', {
             allowAttributes: attributeKey
         });
@@ -589,15 +606,3 @@ function splitRules(rules) {
     }
     return splittedRules;
 }
-/**
- * Returns true if name is valid for a DOM attribute name.
- */
-function isValidAttributeName(name) {
-    try {
-        document.createAttribute(name);
-    }
-    catch (error) {
-        return false;
-    }
-    return true;
-}

package/src/dataschema.d.ts

@@ -5,7 +5,7 @@
 /**
  * @module html-support/dataschema
  */
-import { Plugin, type Editor } from 'ckeditor5/src/core';
+import { Plugin } from 'ckeditor5/src/core';
 import type { AttributeProperties, SchemaItemDefinition } from 'ckeditor5/src/engine';
 /**
  * Holds representation of the extended HTML document type definitions to be used by the
@@ -44,7 +44,6 @@ export default class DataSchema extends Plugin {
      * A map of registered data schema definitions.
      */
     private readonly _definitions;
-    constructor(editor: Editor);
     /**
      * @inheritDoc
      */
@@ -85,6 +84,10 @@ export default class DataSchema extends Plugin {
      * @param includeReferences Indicates if this method should also include definitions of referenced models.
      */
     getDefinitionsForView(viewName: string | RegExp, includeReferences?: boolean): Set<DataSchemaDefinition>;
+    /**
+     * Returns definitions matching the given model name.
+     */
+    getDefinitionsForModel(modelName: string): Array<DataSchemaDefinition>;
     /**
      * Returns definitions matching the given view name.
      */
@@ -166,4 +169,11 @@ export interface DataSchemaInlineElementDefinition extends DataSchemaDefinition
      * {@link module:html-support/datafilter~DataFilter#_registerModelPostFixer GHS post-fixer} for more details.
      */
     coupledAttribute?: string;
+    /**
+     * Indicates that element should not be converted as a model text attribute.
+     * It is used to map view elements that do not have a separate model element but their data is stored in a model attribute.
+     * For example `<tbody>` element does not have a dedicated model element and GHS stores attributes of `<tbody>`
+     * in the `htmlTbodyAttributes` model attribute of the `table` model element.
+     */
+    appliesToBlock?: boolean | string;
 }

package/src/dataschema.js

@@ -42,9 +42,12 @@ import { mergeWith } from 'lodash-es';
  * ```
  */
 export default class DataSchema extends Plugin {
-    constructor(editor) {
-        super(editor);
-        this._definitions = new Map();
+    constructor() {
+        super(...arguments);
+        /**
+         * A map of registered data schema definitions.
+         */
+        this._definitions = [];
     }
     /**
      * @inheritDoc
@@ -67,13 +70,13 @@ export default class DataSchema extends Plugin {
      * Add new data schema definition describing block element.
      */
     registerBlockElement(definition) {
-        this._definitions.set(definition.model, { ...definition, isBlock: true });
+        this._definitions.push({ ...definition, isBlock: true });
     }
     /**
      * Add new data schema definition describing inline element.
      */
     registerInlineElement(definition) {
-        this._definitions.set(definition.model, { ...definition, isInline: true });
+        this._definitions.push({ ...definition, isInline: true });
     }
     /**
      * Updates schema definition describing block element with new properties.
@@ -114,12 +117,17 @@ export default class DataSchema extends Plugin {
         }
         return definitions;
     }
+    /**
+     * Returns definitions matching the given model name.
+     */
+    getDefinitionsForModel(modelName) {
+        return this._definitions.filter(definition => definition.model == modelName);
+    }
     /**
      * Returns definitions matching the given view name.
      */
     _getMatchingViewDefinitions(viewName) {
-        return Array.from(this._definitions.values())
-            .filter(def => def.view && testViewName(viewName, def.view));
+        return this._definitions.filter(def => def.view && testViewName(viewName, def.view));
     }
     /**
      * Resolves all definition references registered for the given data schema definition.
@@ -127,17 +135,27 @@ export default class DataSchema extends Plugin {
      * @param modelName Data schema model name.
      */
     *_getReferences(modelName) {
-        const { modelSchema } = this._definitions.get(modelName);
-        if (!modelSchema) {
-            return;
-        }
-        const inheritProperties = ['inheritAllFrom', 'inheritTypesFrom', 'allowWhere', 'allowContentOf', 'allowAttributesOf'];
-        for (const property of inheritProperties) {
-            for (const referenceName of toArray(modelSchema[property] || [])) {
-                const definition = this._definitions.get(referenceName);
-                if (referenceName !== modelName && definition) {
-                    yield* this._getReferences(definition.model);
-                    yield definition;
+        const inheritProperties = [
+            'inheritAllFrom',
+            'inheritTypesFrom',
+            'allowWhere',
+            'allowContentOf',
+            'allowAttributesOf'
+        ];
+        const definitions = this._definitions.filter(definition => definition.model == modelName);
+        for (const { modelSchema } of definitions) {
+            if (!modelSchema) {
+                continue;
+            }
+            for (const property of inheritProperties) {
+                for (const referenceName of toArray(modelSchema[property] || [])) {
+                    const definitions = this._definitions.filter(definition => definition.model == referenceName);
+                    for (const definition of definitions) {
+                        if (referenceName !== modelName) {
+                            yield* this._getReferences(definition.model);
+                            yield definition;
+                        }
+                    }
                 }
             }
         }
@@ -151,11 +169,17 @@ export default class DataSchema extends Plugin {
      * @param definition Definition update.
      */
     _extendDefinition(definition) {
-        const currentDefinition = this._definitions.get(definition.model);
-        const mergedDefinition = mergeWith({}, currentDefinition, definition, (target, source) => {
-            return Array.isArray(target) ? target.concat(source) : undefined;
-        });
-        this._definitions.set(definition.model, mergedDefinition);
+        const currentDefinitions = Array.from(this._definitions.entries())
+            .filter(([, currentDefinition]) => currentDefinition.model == definition.model);
+        if (currentDefinitions.length == 0) {
+            this._definitions.push(definition);
+            return;
+        }
+        for (const [idx, currentDefinition] of currentDefinitions) {
+            this._definitions[idx] = mergeWith({}, currentDefinition, definition, (target, source) => {
+                return Array.isArray(target) ? target.concat(source) : undefined;
+            });
+        }
     }
 }
 /**

package/src/generalhtmlsupport.d.ts

@@ -18,8 +18,7 @@ import TableElementSupport from './integrations/table';
 import StyleElementSupport from './integrations/style';
 import DocumentListElementSupport from './integrations/documentlist';
 import CustomElementSupport from './integrations/customelement';
-import type { Range, Selectable } from 'ckeditor5/src/engine';
-type LimitedSelectable = Exclude<Selectable, Iterable<Range> | null>;
+import type { Selectable } from 'ckeditor5/src/engine';
 /**
  * The General HTML Support feature.
  *
@@ -42,9 +41,10 @@ export default class GeneralHtmlSupport extends Plugin {
     /**
      * Returns a GHS model attribute name related to a given view element name.
      *
+     * @internal
      * @param viewElementName A view element name.
      */
-    private getGhsAttributeNameForElement;
+    getGhsAttributeNameForElement(viewElementName: string): string;
     /**
      * Updates GHS model attribute for a specified view element name, so it includes the given class name.
      *
@@ -53,7 +53,7 @@ export default class GeneralHtmlSupport extends Plugin {
      * @param className The css class to add.
      * @param selectable The selection or element to update.
      */
-    addModelHtmlClass(viewElementName: string, className: ArrayOrItem<string>, selectable: LimitedSelectable): void;
+    addModelHtmlClass(viewElementName: string, className: ArrayOrItem<string>, selectable: Selectable): void;
     /**
      * Updates GHS model attribute for a specified view element name, so it does not include the given class name.
      *
@@ -62,7 +62,7 @@ export default class GeneralHtmlSupport extends Plugin {
      * @param className The css class to remove.
      * @param selectable The selection or element to update.
      */
-    removeModelHtmlClass(viewElementName: string, className: ArrayOrItem<string>, selectable: LimitedSelectable): void;
+    removeModelHtmlClass(viewElementName: string, className: ArrayOrItem<string>, selectable: Selectable): void;
     /**
      * Updates GHS model attribute for a specified view element name, so it includes the given attribute.
      *
@@ -96,4 +96,3 @@ export default class GeneralHtmlSupport extends Plugin {
      */
     private removeModelHtmlStyles;
 }
-export {};