@manuscripts/transform 1.2.4 → 1.2.5-LEAN-2066

package/dist/cjs/jats/importer/jats-body-dom-parser.js

@@ -505,6 +505,22 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'sec[sec-type="keywords"]',
+        node: 'keywords_section',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+                category: (0, transformer_1.chooseSectionCategory)(element),
+            };
+        },
+    },
+    {
+        tag: 'kwd-group-list',
+        context: 'keywords_section/',
+        node: 'keywords_element',
+    },
     {
         tag: 'sec',
         node: 'section',
@@ -516,6 +532,22 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'kwd-group',
+        context: 'keywords_element/',
+        node: 'keywords_group',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                type: element.getAttribute('kwd-group-type'),
+            };
+        },
+    },
+    {
+        tag: 'kwd',
+        context: 'keywords_group//',
+        node: 'keyword',
+    },
     {
         tag: 'label',
         context: 'section/',
@@ -568,7 +600,7 @@ const nodes = [
     {
         tag: 'title',
         node: 'section_title',
-        context: 'section/|footnotes_section/|bibliography_section/',
+        context: 'section/|footnotes_section/|bibliography_section/|keywords_section/',
     },
     {
         tag: 'title',

package/dist/cjs/jats/importer/jats-body-transformations.js

@@ -19,6 +19,17 @@ exports.jatsBodyTransformations = void 0;
 const transformer_1 = require("../../transformer");
 const removeNodeFromParent = (node) => node.parentNode && node.parentNode.removeChild(node);
 const capitalizeFirstLetter = (str) => str.charAt(0).toUpperCase() + str.slice(1);
+const createSectionContainer = (type, createElement) => {
+    const sectionContainer = createElement('sec');
+    const sectionCategory = (0, transformer_1.chooseSectionCategoryByType)(type);
+    sectionContainer.setAttribute('sec-type', sectionCategory ? (0, transformer_1.chooseSecType)(sectionCategory) : '');
+    const title = createElement('title');
+    title.textContent = sectionCategory
+        ? (0, transformer_1.getSectionTitles)(sectionCategory)[0]
+        : ' ';
+    sectionContainer.appendChild(title);
+    return sectionContainer;
+};
 exports.jatsBodyTransformations = {
     ensureSection(body, createElement) {
         let section = createElement('sec');
@@ -146,34 +157,64 @@ exports.jatsBodyTransformations = {
         section.append(...floatsGroup.children);
         return section;
     },
-    moveSectionsToBody(doc, body, references, createElement) {
+    moveAbstractsIntoContainer(doc, abstractsContainer, createElement) {
         const abstractNodes = doc.querySelectorAll('front > article-meta > abstract');
-        for (const abstractNode of abstractNodes) {
+        abstractNodes.forEach((abstractNode) => {
             const abstract = this.createAbstract(abstractNode, createElement);
             removeNodeFromParent(abstractNode);
-            body.insertBefore(abstract, body.firstChild);
-        }
+            abstractsContainer.appendChild(abstract);
+        });
+    },
+    wrapBodySections(doc, bodyContainer) {
+        const bodySections = doc.querySelectorAll('body > sec:not([sec-type="backmatter"]), body > sec:not([sec-type])');
+        bodySections.forEach((section) => {
+            removeNodeFromParent(section);
+            bodyContainer.appendChild(section);
+        });
+    },
+    moveBackSectionsIntoContainer(doc, backmatterContainer) {
         for (const section of doc.querySelectorAll('back > sec')) {
             removeNodeFromParent(section);
-            body.appendChild(section);
+            backmatterContainer.appendChild(section);
         }
+    },
+    moveAcknowledgmentsIntoContainer(doc, backmatterContainer, createElement) {
         const ackNode = doc.querySelector('back > ack');
         if (ackNode) {
             const acknowledgements = this.createAcknowledgments(ackNode, createElement);
             removeNodeFromParent(ackNode);
-            body.appendChild(acknowledgements);
+            backmatterContainer.appendChild(acknowledgements);
         }
+    },
+    moveAppendicesIntoContainer(doc, backmatterContainer, createElement) {
         const appGroup = doc.querySelectorAll('back > app-group > app');
         for (const app of appGroup) {
             const appendix = this.createAppendixSection(app, createElement);
             removeNodeFromParent(app);
-            body.appendChild(appendix);
+            backmatterContainer.appendChild(appendix);
         }
+    },
+    moveBibliographyIntoContainer(doc, backmatterContainer, references, createElement) {
         if (references) {
-            body.appendChild(this.createBibliography(doc, references, createElement));
+            backmatterContainer.appendChild(this.createBibliography(doc, references, createElement));
         }
     },
-    mapFootnotesToSections(doc, body, createElement) {
+    moveSectionsToBody(doc, body, references, createElement) {
+        const bodyContainer = createSectionContainer('body', createElement);
+        const abstractsContainer = createSectionContainer('abstracts', createElement);
+        const backmatterContainer = createSectionContainer('backmatter', createElement);
+        this.mapFootnotesToSections(doc, backmatterContainer, createElement);
+        this.wrapBodySections(doc, bodyContainer);
+        this.moveAbstractsIntoContainer(doc, abstractsContainer, createElement);
+        this.moveBackSectionsIntoContainer(doc, backmatterContainer);
+        this.moveAcknowledgmentsIntoContainer(doc, backmatterContainer, createElement);
+        this.moveAppendicesIntoContainer(doc, backmatterContainer, createElement);
+        this.moveBibliographyIntoContainer(doc, backmatterContainer, references, createElement);
+        body.insertBefore(abstractsContainer, body.firstChild);
+        body.insertBefore(bodyContainer, abstractsContainer.nextSibling);
+        body.append(backmatterContainer);
+    },
+    mapFootnotesToSections(doc, backmatterContainer, createElement) {
         const footnoteGroups = [...doc.querySelectorAll('fn[fn-type]')];
         for (const footnote of footnoteGroups) {
             const type = footnote.getAttribute('fn-type') || '';
@@ -190,7 +231,7 @@ exports.jatsBodyTransformations = {
                 section.append(...footnote.children);
                 removeNodeFromParent(footnote);
                 section.setAttribute('sec-type', (0, transformer_1.chooseSecType)(category));
-                body.append(section);
+                backmatterContainer.append(section);
             }
         }
         const footnotes = [...doc.querySelectorAll('fn')];
@@ -205,7 +246,7 @@ exports.jatsBodyTransformations = {
         }
         if (!footnotesSection && containingGroup.innerHTML) {
             const section = this.createFootnotes([containingGroup], createElement);
-            body.append(section);
+            backmatterContainer.append(section);
         }
         let regularFootnoteGroups = [
             ...doc.querySelectorAll('back > fn-group:not([fn-type])'),
@@ -218,7 +259,7 @@ exports.jatsBodyTransformations = {
         if (regularFootnoteGroups.length > 0) {
             regularFootnoteGroups.map((g) => removeNodeFromParent(g));
             const footnotes = this.createFootnotes(regularFootnoteGroups, createElement);
-            body.appendChild(footnotes);
+            backmatterContainer.appendChild(footnotes);
         }
     },
     moveCaptionsToEnd(body) {
@@ -266,4 +307,18 @@ exports.jatsBodyTransformations = {
             paragraph === null || paragraph === void 0 ? void 0 : paragraph.replaceWith(parent);
         });
     },
+    moveKeywordsToBody(document, body, createElement) {
+        const keywordGroups = [...document.querySelectorAll('kwd-group')];
+        if (keywordGroups.length > 0) {
+            const section = createElement('sec');
+            section.setAttribute('sec-type', 'keywords');
+            const title = createElement('title');
+            title.textContent = 'Keywords';
+            section.append(title);
+            const kwdGroupsEl = createElement('kwd-group-list');
+            kwdGroupsEl.append(keywordGroups[0]);
+            section.append(kwdGroupsEl);
+            body.prepend(section);
+        }
+    },
 };

package/dist/cjs/jats/importer/jats-comments.js

@@ -63,6 +63,21 @@ const insertToken = (doc, processingInstructionNode, authorQueriesMap) => {
         return parentElement.insertBefore(tokenNode, processingInstructionNode);
     }
 };
+const extractCommentsFromKeywords = (tokens, model, authorQueriesMap) => {
+    var _a;
+    const commentAnnotations = [];
+    const name = model.name;
+    const filteredTokens = filterAndSortTokens(tokens, name);
+    let content = name;
+    for (const token of filteredTokens) {
+        content = name.replace(token, '');
+        const query = authorQueriesMap.get(token);
+        const commentAnnotation = (0, transformer_1.buildComment)((_a = model.containedGroup) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(), `${query}`, undefined, [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)], DEFAULT_ANNOTATION_COLOR);
+        model['name'] = content;
+        commentAnnotations.push(commentAnnotation);
+    }
+    return commentAnnotations;
+};
 const createComments = (authorQueriesMap, manuscriptModels) => {
     const tokens = [...authorQueriesMap.keys()];
     const commentAnnotations = [];
@@ -71,10 +86,19 @@ const createComments = (authorQueriesMap, manuscriptModels) => {
             const comments = addCommentsFromMarkedProcessingInstructions(tokens, model, authorQueriesMap);
             commentAnnotations.push(...comments);
         }
+        else if ((0, transformer_1.isKeyword)(model)) {
+            const comments = extractCommentsFromKeywords(tokens, model, authorQueriesMap);
+            commentAnnotations.push(...comments);
+        }
     }
     return commentAnnotations;
 };
 exports.createComments = createComments;
+function filterAndSortTokens(tokens, content) {
+    return tokens
+        .filter((token) => content.indexOf(token) >= 0)
+        .sort((a, b) => content.indexOf(a) - content.indexOf(b));
+}
 const addCommentsFromMarkedProcessingInstructions = (tokens, model, authorQueriesMap) => {
     const commentAnnotations = [];
     for (const field of ['contents', 'caption', 'title']) {

package/dist/cjs/jats/importer/jats-front-parser.js

@@ -68,31 +68,6 @@ exports.jatsFrontParser = {
         }
         return (0, jats_journal_meta_parser_1.parseJournalMeta)(journalMeta);
     },
-    parseKeywords(keywordGroupNodes) {
-        var _a, _b;
-        if (!keywordGroupNodes) {
-            return { groups: [], keywords: [] };
-        }
-        let keywordPriority = 1;
-        const keywordGroups = { groups: [], keywords: [] };
-        for (const keywordGroupNode of keywordGroupNodes) {
-            const manuscriptKeywordGroup = (0, builders_1.buildKeywordGroup)({
-                title: ((_a = keywordGroupNode.querySelector('title')) === null || _a === void 0 ? void 0 : _a.textContent) || undefined,
-                label: ((_b = keywordGroupNode.querySelector('label')) === null || _b === void 0 ? void 0 : _b.textContent) || undefined,
-                type: keywordGroupNode.getAttribute('kwd-group-type') || undefined,
-            });
-            keywordGroups.groups.push(manuscriptKeywordGroup);
-            for (const keywordNode of keywordGroupNode.querySelectorAll('kwd')) {
-                if (keywordNode.textContent) {
-                    const keyword = (0, builders_1.buildKeyword)(keywordNode.textContent);
-                    keyword.priority = keywordPriority++;
-                    keyword.containedGroup = manuscriptKeywordGroup._id;
-                    keywordGroups.keywords.push(keyword);
-                }
-            }
-        }
-        return keywordGroups;
-    },
     parseDates(historyNode) {
         if (!historyNode) {
             return undefined;

package/dist/cjs/jats/importer/parse-jats-article.js

@@ -54,9 +54,6 @@ const parseJATSFront = async (front) => {
     const manuscriptMeta = Object.assign({ title: title ? inlineContentsFromJATSTitle(title) : undefined, subtitle: subtitle ? inlineContentsFromJATSTitle(subtitle) : undefined, runningTitle: runningTitle
             ? inlineContentsFromJATSTitle(runningTitle)
             : undefined }, jats_front_parser_1.jatsFrontParser.parseCounts(articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('counts')));
-    const keywordGroupNodes = articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelectorAll('kwd-group');
-    const { keywords, groups: keywordGroups } = jats_front_parser_1.jatsFrontParser.parseKeywords(keywordGroupNodes);
-    const manuscript_keywordIDs = keywords.length > 0 ? keywords.map((k) => k._id) : undefined;
     const { affiliations, affiliationIDs } = jats_front_parser_1.jatsFrontParser.parseAffiliationNodes([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -73,14 +70,12 @@ const parseJATSFront = async (front) => {
     const supplements = jats_front_parser_1.jatsFrontParser.parseSupplements([
         ...front.querySelectorAll('article-meta > supplementary-material'),
     ]);
-    const manuscript = Object.assign(Object.assign(Object.assign(Object.assign({}, (0, builders_1.buildManuscript)()), manuscriptMeta), { keywordIDs: manuscript_keywordIDs }), history);
+    const manuscript = Object.assign(Object.assign(Object.assign({}, (0, builders_1.buildManuscript)()), manuscriptMeta), history);
     return {
         models: generateModelIDs([
             manuscript,
-            ...keywords,
             ...affiliations,
             ...authors,
-            ...keywordGroups,
             ...footnotes,
             ...correspondingList,
             journal,
@@ -116,11 +111,11 @@ const parseJATSBody = (document, body, bibliographyItems, refModels, referenceId
     const orderedFootnotesIDs = (0, footnotes_order_1.createOrderedFootnotesIDs)(document);
     jats_body_transformations_1.jatsBodyTransformations.moveFloatsGroupToBody(document, body, createElement);
     jats_body_transformations_1.jatsBodyTransformations.ensureSection(body, createElement);
-    jats_body_transformations_1.jatsBodyTransformations.mapFootnotesToSections(document, body, createElement);
     jats_body_transformations_1.jatsBodyTransformations.moveSectionsToBody(document, body, bibliographyItems, createElement);
     jats_body_transformations_1.jatsBodyTransformations.moveCaptionsToEnd(body);
     jats_body_transformations_1.jatsBodyTransformations.moveTableFooterToEnd(body);
     jats_body_transformations_1.jatsBodyTransformations.moveBlockNodesFromParagraph(document, body, createElement);
+    jats_body_transformations_1.jatsBodyTransformations.moveKeywordsToBody(document, body, createElement);
     const node = jats_body_dom_parser_1.jatsBodyDOMParser.parse(body);
     if (!node.firstChild) {
         throw new Error('No content was parsed from the JATS article body');

package/dist/cjs/jats/jats-exporter.js

@@ -136,8 +136,10 @@ class JATSExporter {
                 article.appendChild(body);
                 const back = this.buildBack(body);
                 article.appendChild(back);
+                this.unwrapBody(body);
                 this.moveAbstracts(front, body);
                 this.moveFloatsGroup(body, article);
+                this.removeBackContainer(body);
             }
             await this.rewriteIDs(idGenerator);
             if (mediaPathGenerator) {
@@ -398,9 +400,7 @@ class JATSExporter {
             if (history.childElementCount) {
                 articleMeta.appendChild(history);
             }
-            if (manuscript.keywordIDs) {
-                this.buildKeywords(articleMeta, manuscript.keywordIDs);
-            }
+            this.buildKeywords(articleMeta);
             let countingElements = [];
             if (manuscript.genericCounts) {
                 const elements = manuscript.genericCounts.map((el) => {
@@ -624,6 +624,7 @@ class JATSExporter {
                 bibliography_element: () => '',
                 bibliography_item: () => '',
                 comment_list: () => '',
+                keywords_group: () => '',
                 bibliography_section: (node) => [
                     'ref-list',
                     { id: normalizeID(node.attrs.id) },
@@ -1392,21 +1393,49 @@ class JATSExporter {
                 table.insertBefore(tfoot, tbody);
             }
         };
-        this.moveAbstracts = (front, body) => {
-            const sections = body.querySelectorAll(':scope > sec');
-            const abstractSections = Array.from(sections).filter((section) => {
-                const sectionType = section.getAttribute('sec-type');
-                if (sectionType === 'abstract' ||
-                    sectionType === 'abstract-teaser' ||
-                    sectionType === 'abstract-graphical') {
-                    return true;
-                }
-                const sectionTitle = section.querySelector(':scope > title');
-                if (!sectionTitle) {
-                    return false;
-                }
-                return sectionTitle.textContent === 'Abstract';
+        this.unwrapBody = (body) => {
+            const container = body.querySelector(':scope > sec[sec-type="body"]');
+            if (!container) {
+                return;
+            }
+            const sections = container.querySelectorAll(':scope > sec');
+            sections.forEach((section) => {
+                body.appendChild(section.cloneNode(true));
             });
+            body.removeChild(container);
+        };
+        this.removeBackContainer = (body) => {
+            const container = body.querySelector(':scope > sec[sec-type="backmatter"]');
+            if (!container) {
+                return;
+            }
+            const isContainerEmpty = container.children.length === 0;
+            if (!isContainerEmpty) {
+                warn('Backmatter section is not empty.');
+            }
+            body.removeChild(container);
+        };
+        this.moveAbstracts = (front, body) => {
+            const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
+            let abstractSections;
+            if (container) {
+                abstractSections = Array.from(container.querySelectorAll(':scope > sec'));
+            }
+            else {
+                abstractSections = Array.from(body.querySelectorAll(':scope > sec')).filter((section) => {
+                    const sectionType = section.getAttribute('sec-type');
+                    if (sectionType === 'abstract' ||
+                        sectionType === 'abstract-teaser' ||
+                        sectionType === 'abstract-graphical') {
+                        return true;
+                    }
+                    const sectionTitle = section.querySelector(':scope > title');
+                    if (!sectionTitle) {
+                        return false;
+                    }
+                    return sectionTitle.textContent === 'Abstract';
+                });
+            }
             if (abstractSections.length) {
                 for (const abstractSection of abstractSections) {
                     const abstractNode = this.document.createElement('abstract');
@@ -1427,6 +1456,9 @@ class JATSExporter {
                     }
                 }
             }
+            if (container) {
+                body.removeChild(container);
+            }
         };
         this.moveSectionsToBack = (back, body) => {
             const availabilitySection = body.querySelector('sec[sec-type="availability"]');
@@ -1529,10 +1561,8 @@ class JATSExporter {
             return name;
         };
     }
-    buildKeywords(articleMeta, keywordIDs) {
-        const keywords = keywordIDs
-            .map((id) => this.modelMap.get(id))
-            .filter((model) => model && model.name);
+    buildKeywords(articleMeta) {
+        const keywords = [...this.modelMap.values()].filter((model) => model.objectType === json_schema_1.ObjectTypes.Keyword);
         const keywordGroups = new Map();
         keywords.forEach((keyword) => {
             const containedGroup = keyword.containedGroup || '';
@@ -1566,6 +1596,7 @@ class JATSExporter {
                 kwd.textContent = keyword.name;
                 kwdGroup.appendChild(kwd);
             }
+            articleMeta.appendChild(kwdGroup);
         }
     }
 }

package/dist/cjs/schema/index.js

@@ -59,6 +59,7 @@ const inline_equation_1 = require("./nodes/inline_equation");
 const inline_footnote_1 = require("./nodes/inline_footnote");
 const keyword_1 = require("./nodes/keyword");
 const keywords_element_1 = require("./nodes/keywords_element");
+const keywords_group_1 = require("./nodes/keywords_group");
 const keywords_section_1 = require("./nodes/keywords_section");
 const link_1 = require("./nodes/link");
 const list_1 = require("./nodes/list");
@@ -173,6 +174,7 @@ exports.schema = new prosemirror_model_1.Schema({
         keyword: keyword_1.keyword,
         keywords_element: keywords_element_1.keywordsElement,
         keywords_section: keywords_section_1.keywordsSection,
+        keywords_group: keywords_group_1.keywordsGroup,
         link: link_1.link,
         list_item: list_1.listItem,
         listing: listing_1.listing,

package/dist/cjs/schema/nodes/keyword.js

@@ -25,8 +25,7 @@ exports.keyword = {
         dataTracked: { default: null },
         comments: { default: null },
     },
-    inline: true,
-    group: 'inline',
+    group: 'block',
     selectable: false,
     parseDOM: [
         {

package/dist/cjs/schema/nodes/keywords_element.js

@@ -18,11 +18,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.keywordsElement = void 0;
 exports.keywordsElement = {
     atom: true,
-    content: 'keyword*',
+    content: 'keywords_group*',
     attrs: {
         id: { default: '' },
         contents: { default: '' },
         paragraphStyle: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',

package/dist/cjs/schema/nodes/keywords_group.js

@@ -0,0 +1,48 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isKeywordsGroupNode = exports.keywordsGroup = void 0;
+exports.keywordsGroup = {
+    content: 'keyword*',
+    attrs: {
+        id: { default: '' },
+        type: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block',
+    selectable: false,
+    parseDOM: [
+        {
+            tag: 'div.keywords',
+        },
+    ],
+    toDOM: (node) => {
+        const keywordsGroupNode = node;
+        return [
+            'div',
+            {
+                id: keywordsGroupNode.attrs.id,
+                class: 'keywords',
+                spellcheck: 'false',
+                contenteditable: false,
+            },
+            0,
+        ];
+    },
+};
+const isKeywordsGroupNode = (node) => node.type === node.type.schema.nodes.keywords_group;
+exports.isKeywordsGroupNode = isKeywordsGroupNode;

package/dist/cjs/schema/nodes/keywords_section.js

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isKeywordsSectionNode = exports.keywordsSection = void 0;
 exports.keywordsSection = {
-    content: 'section_title_plain (keywords_element | placeholder_element)',
+    content: 'section_title (keywords_element | placeholder_element)',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

package/dist/cjs/schema/nodes/section.js

@@ -35,7 +35,7 @@ const choosePageBreakStyle = (element) => {
     return exports.PAGE_BREAK_NONE;
 };
 exports.section = {
-    content: 'section_label? section_title (paragraph | element)* section*',
+    content: 'section_label? section_title (paragraph | element)* sections*',
     attrs: {
         id: { default: '' },
         category: { default: '' },

package/dist/cjs/transformer/decode.js

@@ -275,11 +275,11 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.KeywordsElement]: (data) => {
                 const model = data;
-                const keywords = this.getKeywords();
+                const keywordGroups = this.getKeywordGroups();
                 return schema_1.schema.nodes.keywords_element.create({
                     id: model._id,
                     paragraphStyle: model.paragraphStyle,
-                }, keywords);
+                }, keywordGroups);
             },
             [json_schema_1.ObjectTypes.Keyword]: (data) => {
                 const model = data;
@@ -426,9 +426,7 @@ class Decoder {
                 const elementNodes = elements
                     .map(this.decode)
                     .filter(exports.isManuscriptNode);
-                const sectionTitle = isKeywordsSection
-                    ? 'section_title_plain'
-                    : 'section_title';
+                const sectionTitle = 'section_title';
                 const sectionTitleNode = model.title
                     ? this.parseContents(model.title, 'h1', this.getComments(model), {
                         topNode: schema_1.schema.nodes[sectionTitle].create(),
@@ -572,19 +570,6 @@ class Decoder {
                     id: (0, id_1.generateNodeID)(schema_1.schema.nodes.section),
                 }));
             }
-            const keywordsSection = getSections(this.modelMap).filter((section) => section.category === 'MPSectionCategory:keywords');
-            const keywords = this.getKeywords();
-            if (keywordsSection.length === 0 && keywords.length > 0) {
-                const keywordsSection = schema_1.schema.nodes.keywords_section.createAndFill({
-                    id: (0, id_1.generateNodeID)(schema_1.schema.nodes.keywords_section),
-                }, [
-                    schema_1.schema.nodes.section_title_plain.create({}, schema_1.schema.text('Keywords')),
-                    schema_1.schema.nodes.keywords_element.create({
-                        id: (0, id_1.generateNodeID)(schema_1.schema.nodes.keywords_element),
-                    }, keywords),
-                ]);
-                rootSectionNodes.unshift(keywordsSection);
-            }
             const contents = rootSectionNodes;
             if (this.comments.size) {
                 const comments = schema_1.schema.nodes.comment_list.createAndFill({
@@ -632,17 +617,16 @@ class Decoder {
             }
             return parser.parse(template.content.firstElementChild, options);
         };
-        this.getKeywords = () => {
+        this.getKeywords = (id) => {
             const keywordsOfKind = [];
-            for (const model of this.modelMap.values()) {
-                const commentNodes = this.createCommentsNode(model);
-                commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
+            const keywordsByGroup = [...this.modelMap.values()].filter((m) => m.objectType === json_schema_1.ObjectTypes.Keyword &&
+                m.containedGroup === id);
+            for (const model of keywordsByGroup) {
                 if (isKeyword(model)) {
                     const keyword = this.parseContents(model.name || '', 'div', this.getComments(model), {
                         topNode: schema_1.schema.nodes.keyword.create({
                             id: model._id,
                             contents: model.name,
-                            comments: commentNodes.map((c) => c.attrs.id),
                         }),
                     });
                     keywordsOfKind.push(keyword);
@@ -689,5 +673,27 @@ class Decoder {
         this.modelMap = modelMap;
         this.allowMissingElements = allowMissingElements;
     }
+    getKeywordGroups() {
+        const kwdGroupNodes = [];
+        const kwdGroupsModels = [
+            ...this.modelMap.values(),
+        ].filter((model) => model.objectType === json_schema_1.ObjectTypes.KeywordGroup);
+        if (kwdGroupsModels.length > 0) {
+            for (const kwdGroupModel of kwdGroupsModels) {
+                const keywords = this.getKeywords(kwdGroupModel._id);
+                const commentNodes = this.createCommentsNode(kwdGroupModel);
+                commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
+                const contents = [];
+                contents.push(...keywords);
+                const kwdGroupNode = schema_1.schema.nodes.keywords_group.create({
+                    id: kwdGroupModel._id,
+                    type: kwdGroupModel.type,
+                    comments: commentNodes.map((c) => c.attrs.id),
+                }, contents);
+                kwdGroupNodes.push(kwdGroupNode);
+            }
+        }
+        return kwdGroupNodes;
+    }
 }
 exports.Decoder = Decoder;