pro-editor-schema 0.1.200 → 0.2.1

package/README.md

@@ -7,41 +7,64 @@ TypeScript library that defines XML/HTML schema rules used by the editor and pro
 - Schema definitions for supported tags and schema codes.
 - Shared schema constants and attribute helpers.
 - Runtime schema lookup utilities.
-- XML validation utilities (`validateXml`, attribute/child validators, footnote and link validators).
+- XML validation utilities (`validateXml` and related validators).
 - Type-safe element factory (`createElement`) based on schema definitions.
 
-## Install and build
+## Install
 
 ```bash
 npm install
-npm run typecheck
-npm run test
-npm run build
 ```
 
+## Scripts
+
+| Command | Description |
+| --- | --- |
+| `npm run dev` | Build in watch mode |
+| `npm run build` | Build CJS, ESM, and type declarations |
+| `npm run typecheck` | Run TypeScript without emitting files |
+| `npm run lint` | Run ESLint on `src/` |
+| `npm run test` | Run tests once with Vitest |
+| `npm run test:watch` | Run tests in watch mode |
+| `npm run check` | Run the full verification pipeline (`npm ci`, `typecheck`, `lint`, `test`, `build`) |
+
+For local development, `npm run check` is the fastest way to verify everything before pushing.
+
+## CI
+
+GitHub Actions runs on push and pull requests to `main` / `master`:
+
+- **Typecheck** — `npm run typecheck`
+- **Lint** — `npm run lint`
+- **Test** — `npm test`
+
+Workflow file: `.github/workflows/ci.yml`
+
 ## Project structure
 
-- `src/index.ts`: public exports for schemas, types, shared constants, and validation.
-- `src/schema/schema.types.ts`: core schema and validation-related types.
-- `src/schema/schemas.ts`: central `SCHEMAS` map (`code -> schema`).
-- `src/schema/elementSchemas/elements`: element schema definitions and `ELEMENT_SCHEMAS`.
-- `src/schema/elementSchemas/atoms`: atom schema definitions and `ATOM_SCHEMAS`.
-- `src/schema/elementSchemas/inlineElements`: inline schema definitions and `INLINE_ELEMENT_SCHEMAS`.
-- `src/schema/shared`: shared attribute and ignored-node constants.
-- `src/schema/utils`: schema lookup and element creation helpers.
-- `src/validation`: document validation entrypoint and validation modules.
+- `src/index.ts` — public exports for schemas, types, shared constants, and validation.
+- `src/schema/schema.types.ts` — core schema and validation-related types.
+- `src/schema/schemas.ts` — central `SCHEMAS` map (`code -> schema`).
+- `src/schema/elementSchemas/elements` — element schema definitions and `ELEMENT_SCHEMAS`.
+- `src/schema/elementSchemas/atoms` — atom schema definitions and `ATOM_SCHEMAS`.
+- `src/schema/elementSchemas/inlineElements` — inline schema definitions and `INLINE_ELEMENT_SCHEMAS`.
+- `src/schema/shared` — shared attribute and ignored-node constants.
+- `src/schema/utils` — schema lookup, element creation, and label helpers.
+- `src/validation` — document validation entrypoint and validation modules.
+- `src/**/*.test.ts` — Vitest test files (run with `happy-dom`).
 
 ## Schema model
 
 Each schema defines:
 
-- `code`: internal schema identifier.
-- `kind`: schema category (`element`, `atom`, `inline`).
-- `tag`: uppercase XML tag name used in documents.
-- `requiredAttributes`: required attributes (free or restricted values).
-- `optionalAttributes`: optional attributes (free or restricted values).
-- `defaultChildTagName`: preferred child tag (optional, used by some block-like schemas).
-- `allowedChildTagNames`: allowed child tags and whether each child is required.
+- `code` — internal schema identifier.
+- `kind` — schema category (`element`, `atom`, `inline`).
+- `tag` — uppercase XML tag name used in documents.
+- `requiredAttributes` — required attributes (free or restricted values).
+- `optionalAttributes` — optional attributes (free or restricted values).
+- `defaultChildCode` — preferred child tag (optional, used by some block-like schemas).
+- `allowedChildrenCodes` — allowed child tags and whether each child is required.
+- `matchesElement` — optional predicate to resolve elements that share the same tag (for example `SPAN`, `SECTION1`).
 
 Schemas are combined in `SCHEMAS` from:
 
@@ -49,15 +72,29 @@ Schemas are combined in `SCHEMAS` from:
 - `ATOM_SCHEMAS`
 - `INLINE_ELEMENT_SCHEMAS`
 
+### Resolving schemas from DOM elements
+
+`findSchemaByElement` matches by tag name. When multiple schemas share a tag, the first schema with a matching `matchesElement` predicate wins.
+
+Examples:
+
+- `SPAN` with class `ins` → `insertion`
+- `SPAN` with class `del` → `deletion`
+- `SPAN` with class `cmtQurySection` → `commentQuerySection`
+- `SECTION1` with `role="H1"` → `heading`
+- `SECTION1` with `role="ch"` or a `FOOTNOTE` child → `footnoteSection`
+
+When adding a new schema that reuses an existing tag, define `matchesElement` on every schema that shares that tag.
+
 ## Public API highlights
 
 From `src/index.ts`, consumers can import:
 
-- Types: `Schema`, `SchemaCode`, `ElementSchemaCode`, `AtomSchemaCode`, `InlineSchemaCode`
-- Maps: `SCHEMAS`, `ELEMENT_SCHEMAS`, `ATOM_SCHEMAS`, `INLINE_ELEMENT_SCHEMAS`
-- Utilities: `findSchemaByCode`, `findSchemaByElement`, `createElement`
-- Validators: `validateXml`, `validateFootnotes`, `validateLinkend`, `validateAttributes`, `validateChildren`
-- Shared constants: ignored elements/attributes and global attribute constants
+- **Types:** `Schema`, `SchemaCode`, `ElementSchemaCode`, `AtomSchemaCode`, `InlineSchemaCode`, `ValidationError`
+- **Maps:** `SCHEMAS`, `ELEMENT_SCHEMAS`, `ATOM_SCHEMAS`, `INLINE_ELEMENT_SCHEMAS`
+- **Utilities:** `findSchemaByCode`, `findSchemaByElement`, `createElement`, `ElementLabel`
+- **Validation:** `validateXml`
+- **Shared constants:** ignored elements/attributes, global attribute constants, dependents forbidden elements
 
 ## Usage examples
 
@@ -79,7 +116,6 @@ const para = createElement({
   attributes: {
     store: "body",
     "ele-id": "p-1",
-    role: "body",
   },
 });
 ```
@@ -89,23 +125,41 @@ const para = createElement({
 ```ts
 import { validateXml } from "pro-editor-schema";
 
-const errors = validateXml(rootElement, linkedIds, true);
+const errors = validateXml(
+  rootElement,
+  elementsToLink,
+  linkElements,
+  ["para", "heading"],
+);
 ```
 
-`validateXml` performs:
+`validateXml` parameters:
+
+- `xml` — root element to validate.
+- `elementsToLink` — IDs available as `linkend` targets.
+- `linkElements` — IDs cited by links (used for reference validation).
+- `schemasToValidateAgainst` — schema codes to run attribute/child validation against.
+
+`validateXml` always runs:
+
+- Consecutive footnote number checks
+- Consecutive footnote cue checks
+
+It also runs per-element checks for:
+
+- Link targets (`linkend`) on linkable elements
+- Uncited bibliographic references
+- Unreferenced footnotes
 
-- Footnote sequence checks
-- Footnote cue sequence checks
-- Link target checks (`linkend`)
-- Optional schema-based attribute and child validation when enabled
+Schema-based attribute and child validation only runs for codes listed in `schemasToValidateAgainst`.
 
 ## How validation works
 
 - `validateXml` traverses the XML tree and delegates checks per element.
-- `findSchemaByElement` resolves schema from classes, role, and tag fallback.
-- `validateAttributes` ensures required attributes exist and restricted values are valid.
+- `findSchemaByElement` resolves schema from tag and optional `matchesElement`.
+- `validateAttributes` validates restricted attribute values.
 - `validateChildren` ensures child tags are allowed and required children exist.
-- `validateFootnotes` and `validateLinkend` provide cross-reference integrity checks.
+- `validateFootnotes`, `validateLinkend`, and `validateReferenceCited` provide cross-reference integrity checks.
 
 Validation results use `ValidationError`:
 
@@ -118,23 +172,23 @@ Validation results use `ValidationError`:
 
 ## Adding or updating a schema
 
-1. Create or update schema file in one of:
+1. Create or update a schema file in one of:
    - `src/schema/elementSchemas/elements`
    - `src/schema/elementSchemas/atoms`
    - `src/schema/elementSchemas/inlineElements`
-2. Define schema with `createSchema(...)`.
-3. Add it to the corresponding registry:
+2. Define the schema with `createSchema(...)`.
+3. If the tag is already used by another schema, add a `matchesElement` predicate.
+4. Register it in the corresponding map:
    - `ELEMENT_SCHEMAS`
    - `ATOM_SCHEMAS`
    - `INLINE_ELEMENT_SCHEMAS`
-4. Ensure the schema code exists in the matching union type in `schema.types.ts`.
-5. If needed, export constants/types from folder `index.ts` and `src/index.ts`.
-6. Run:
-   - `npm run typecheck`
-   - `npm run test`
+5. Ensure the schema code exists in the matching union type in `schema.types.ts`.
+6. Add or update tests for any new validation or utility behavior.
+7. Run `npm run check`.
 
 ## Notes
 
 - Tag matching is done in uppercase in schema definitions and validation.
 - Some schema codes represent block/group-like structures while still being typed as `kind: "element"` in the current model.
 - Ignored attributes and ignored UI helper elements are excluded from strict validation by design.
+- Track-changes atoms (`insertion`, `deletion`) are unwrapped when validating required children.

package/dist/index.d.mts

@@ -17,21 +17,21 @@ type Schema<TRequiredAttributes = readonly AttributeDefinition[], TOptionalAttri
     requiredAttributes: TRequiredAttributes;
     optionalAttributes: TOptionalAttributes;
     defaultChildCode?: SchemaCode;
-    allowedChildrenCodes: ReadonlySet<AllowedChildren>;
+    allowedChildrenCodes: AllowedChildren[];
+    matchesElement?: (element: Element) => boolean;
 };
 type SchemaCode = ElementSchemaCode | InlineSchemaCode | AtomSchemaCode;
 type ElementSchemaCode = "referenceBibliomixed" | "referenceBibliography" | "bibliodiv" | "degrees" | "email" | "equation" | "fignote" | "figsource" | "firstname" | "footnote" | "footnoteno" | "honorific" | "img" | "informalfigure" | "keyword" | "label1" | "li" | "line" | "lrh" | "math" | "mathphrase" | "merror" | "mfrac" | "mi" | "mmultiscripts" | "mn" | "mo" | "mover" | "mpadded" | "mphantom" | "mprescripts" | "mroot" | "mrow" | "ms" | "mspace" | "msqrt" | "mstyle" | "msub" | "msubsup" | "msup" | "mtable" | "mtd" | "mtext" | "mtr" | "munder" | "munderover" | "olink" | "org" | "orgname" | "para" | "punc" | "rrh" | "source1" | "speaker" | "subtitle1" | "surname" | "tag" | "tblfn" | "tblsource" | "thead" | "title1" | "token" | "tp" | "abstract1" | "affiliation" | "alttext" | "appendix" | "author" | "authorgroup" | "blockquote" | "caption1" | "chapter" | "dialogue" | "epigraph" | "figure1" | "footnoteSection" | "heading" | "imageobject" | "info1" | "keywordset" | "mediaobject" | "ol" | "personname" | "poem" | "sidebar" | "table" | "table1" | "tbody" | "td" | "tgroup" | "tr" | "ul";
 type AtomSchemaCode = "indexterm" | "primary" | "secondary" | "tertiary" | "quaternary" | "bookmark" | "see" | "commentQuerySection" | "comment" | "content" | "query" | "reply" | "deletion" | "emphasis" | "highlightmark" | "i" | "insertion" | "sc" | "strike" | "sub" | "sup" | "u" | "b" | "referenceMark";
 type InlineSchemaCode = "footnote1" | "inlineequation" | "link" | "uri" | "phrase";
-declare const ElementLabel: Record<SchemaCode, string>;
 
 declare const SCHEMAS: Record<SchemaCode, Schema>;
 
+declare const isTrackChangesSchema: (schema: Schema) => boolean;
 declare const isIgnoredAttribute: (attribute: string) => boolean;
 declare const isIgnoredElement: (element: Element) => boolean;
 declare const isIgnoredValidation: (code: SchemaCode) => boolean;
-declare const findSchemaByCode: (code: SchemaCode) => Schema | undefined;
-declare const findSchemaByTagName: (tagName: string) => Schema[];
+declare const findSchemaByCode: (code: SchemaCode) => Schema;
 declare const findSchemaByElement: (element: Element) => Schema | undefined;
 declare const isAttributeRestricted: (attr: AttributeDefinition) => attr is RestrictedAttribute;
 declare const getAttributeName: (attribute: AttributeDefinition) => string;
@@ -49,12 +49,20 @@ type CreateElementParams<TSchema extends Schema> = {
 };
 declare const createElement: <TSchema extends Schema>({ schemaCode, attributes, }: CreateElementParams<TSchema>) => HTMLElement;
 
+declare const ElementLabel: Record<SchemaCode, string>;
+
 declare const IGNORED_ELEMENT_SELECTORS: string[];
 declare const IGNORED_VALIDATION_ELEMENT_SELECTORS: SchemaCode[];
 
 declare const IGNORED_ATTRIBUTES: string[];
 declare const IGNORED_ATTRIBUTES_STARTS_WITH: string[];
 
+type DependentForbiddenElement = {
+    code: SchemaCode;
+    dependentElements: SchemaCode[];
+};
+declare const DEPENDENT_FORBIDDEN_ELEMENTS: DependentForbiddenElement[];
+
 declare const ALIGNMENT_ATTRIBUTE = "data-alignment";
 declare const LEFT_INDENT_ATTRIBUTE = "data-left-indent";
 declare const RIGHT_INDENT_ATTRIBUTE = "data-right-indent";
@@ -105,6 +113,6 @@ type ValidationError = {
  * * ValidateConsecutiveFootnotes and ValidateConsecutiveFootnoteCues are default validations.
  * @returns The validation errors.
  */
-declare const validateXml: (xml: Element, elementsToLink: readonly string[], linkElements: readonly string[], schemasToValidateAgainst: SchemaCode[]) => ValidationError[];
+declare const validateXml: (xml: Element, elementsToLink: string[], linkElements: string[], schemasToValidateAgainst: SchemaCode[]) => ValidationError[];
 
-export { ALIGNMENT_ATTRIBUTE, ATOM_SCHEMAS, type AllowedChildren, type AtomSchemaCode, type AttributeDefinition, ELEMENT_SCHEMAS, ELE_ID_ATTRIBUTE, ElementLabel, type ElementSchemaCode, FIGURE_PLACEMENT_ATTRIBUTE, type FreeAttribute, ID_ATTRS, IGNORED_ATTRIBUTES, IGNORED_ATTRIBUTES_STARTS_WITH, IGNORED_ELEMENT_SELECTORS, IGNORED_VALIDATION_ELEMENT_SELECTORS, INDENT_TYPE_ATTRIBUTE, INLINE_ELEMENT_SCHEMAS, type InlineSchemaCode, LAYOUT_ATTRIBUTES, LAYOUT_CELL_WIDTH_ATTRIBUTE, LAYOUT_TABLE_ORIENTATION_ATTRIBUTE, LAYOUT_TABLE_PLACEMENT_ATTRIBUTE, LAYOUT_USER_ATTRIBUTE, LEFT_INDENT_ATTRIBUTE, RIGHT_INDENT_ATTRIBUTE, type RestrictedAttribute, SCHEMAS, SPACE_ABOVE_ATTRIBUTE, SPACE_BELOW_ATTRIBUTE, SPECIAL_INDENT_ATTRIBUTE, STORE_ATTRIBUTE, STYLE_NAME_ATTRIBUTE, type Schema, type SchemaCode, type SchemaKind, TRACK_CHANGES_ATTRS, TRACK_CHANGES_ATTR_DATA_DATE, TRACK_CHANGES_ATTR_DATA_TIME, TRACK_CHANGES_ATTR_DATA_USERID, TRACK_CHANGES_ATTR_DATA_USERNAME, type ValidationError, type ValidationErrorKind, type ValidationErrorLevel, createElement, findAttributeDefinitionByName, findSchemaByCode, findSchemaByElement, findSchemaByTagName, getAttributeName, isAttributeRestricted, isIgnoredAttribute, isIgnoredElement, isIgnoredValidation, validateXml };
+export { ALIGNMENT_ATTRIBUTE, ATOM_SCHEMAS, type AllowedChildren, type AtomSchemaCode, type AttributeDefinition, DEPENDENT_FORBIDDEN_ELEMENTS, ELEMENT_SCHEMAS, ELE_ID_ATTRIBUTE, ElementLabel, type ElementSchemaCode, FIGURE_PLACEMENT_ATTRIBUTE, type FreeAttribute, ID_ATTRS, IGNORED_ATTRIBUTES, IGNORED_ATTRIBUTES_STARTS_WITH, IGNORED_ELEMENT_SELECTORS, IGNORED_VALIDATION_ELEMENT_SELECTORS, INDENT_TYPE_ATTRIBUTE, INLINE_ELEMENT_SCHEMAS, type InlineSchemaCode, LAYOUT_ATTRIBUTES, LAYOUT_CELL_WIDTH_ATTRIBUTE, LAYOUT_TABLE_ORIENTATION_ATTRIBUTE, LAYOUT_TABLE_PLACEMENT_ATTRIBUTE, LAYOUT_USER_ATTRIBUTE, LEFT_INDENT_ATTRIBUTE, RIGHT_INDENT_ATTRIBUTE, type RestrictedAttribute, SCHEMAS, SPACE_ABOVE_ATTRIBUTE, SPACE_BELOW_ATTRIBUTE, SPECIAL_INDENT_ATTRIBUTE, STORE_ATTRIBUTE, STYLE_NAME_ATTRIBUTE, type Schema, type SchemaCode, type SchemaKind, TRACK_CHANGES_ATTRS, TRACK_CHANGES_ATTR_DATA_DATE, TRACK_CHANGES_ATTR_DATA_TIME, TRACK_CHANGES_ATTR_DATA_USERID, TRACK_CHANGES_ATTR_DATA_USERNAME, type ValidationError, type ValidationErrorKind, type ValidationErrorLevel, createElement, findAttributeDefinitionByName, findSchemaByCode, findSchemaByElement, getAttributeName, isAttributeRestricted, isIgnoredAttribute, isIgnoredElement, isIgnoredValidation, isTrackChangesSchema, validateXml };

package/dist/index.d.ts

@@ -17,21 +17,21 @@ type Schema<TRequiredAttributes = readonly AttributeDefinition[], TOptionalAttri
     requiredAttributes: TRequiredAttributes;
     optionalAttributes: TOptionalAttributes;
     defaultChildCode?: SchemaCode;
-    allowedChildrenCodes: ReadonlySet<AllowedChildren>;
+    allowedChildrenCodes: AllowedChildren[];
+    matchesElement?: (element: Element) => boolean;
 };
 type SchemaCode = ElementSchemaCode | InlineSchemaCode | AtomSchemaCode;
 type ElementSchemaCode = "referenceBibliomixed" | "referenceBibliography" | "bibliodiv" | "degrees" | "email" | "equation" | "fignote" | "figsource" | "firstname" | "footnote" | "footnoteno" | "honorific" | "img" | "informalfigure" | "keyword" | "label1" | "li" | "line" | "lrh" | "math" | "mathphrase" | "merror" | "mfrac" | "mi" | "mmultiscripts" | "mn" | "mo" | "mover" | "mpadded" | "mphantom" | "mprescripts" | "mroot" | "mrow" | "ms" | "mspace" | "msqrt" | "mstyle" | "msub" | "msubsup" | "msup" | "mtable" | "mtd" | "mtext" | "mtr" | "munder" | "munderover" | "olink" | "org" | "orgname" | "para" | "punc" | "rrh" | "source1" | "speaker" | "subtitle1" | "surname" | "tag" | "tblfn" | "tblsource" | "thead" | "title1" | "token" | "tp" | "abstract1" | "affiliation" | "alttext" | "appendix" | "author" | "authorgroup" | "blockquote" | "caption1" | "chapter" | "dialogue" | "epigraph" | "figure1" | "footnoteSection" | "heading" | "imageobject" | "info1" | "keywordset" | "mediaobject" | "ol" | "personname" | "poem" | "sidebar" | "table" | "table1" | "tbody" | "td" | "tgroup" | "tr" | "ul";
 type AtomSchemaCode = "indexterm" | "primary" | "secondary" | "tertiary" | "quaternary" | "bookmark" | "see" | "commentQuerySection" | "comment" | "content" | "query" | "reply" | "deletion" | "emphasis" | "highlightmark" | "i" | "insertion" | "sc" | "strike" | "sub" | "sup" | "u" | "b" | "referenceMark";
 type InlineSchemaCode = "footnote1" | "inlineequation" | "link" | "uri" | "phrase";
-declare const ElementLabel: Record<SchemaCode, string>;
 
 declare const SCHEMAS: Record<SchemaCode, Schema>;
 
+declare const isTrackChangesSchema: (schema: Schema) => boolean;
 declare const isIgnoredAttribute: (attribute: string) => boolean;
 declare const isIgnoredElement: (element: Element) => boolean;
 declare const isIgnoredValidation: (code: SchemaCode) => boolean;
-declare const findSchemaByCode: (code: SchemaCode) => Schema | undefined;
-declare const findSchemaByTagName: (tagName: string) => Schema[];
+declare const findSchemaByCode: (code: SchemaCode) => Schema;
 declare const findSchemaByElement: (element: Element) => Schema | undefined;
 declare const isAttributeRestricted: (attr: AttributeDefinition) => attr is RestrictedAttribute;
 declare const getAttributeName: (attribute: AttributeDefinition) => string;
@@ -49,12 +49,20 @@ type CreateElementParams<TSchema extends Schema> = {
 };
 declare const createElement: <TSchema extends Schema>({ schemaCode, attributes, }: CreateElementParams<TSchema>) => HTMLElement;
 
+declare const ElementLabel: Record<SchemaCode, string>;
+
 declare const IGNORED_ELEMENT_SELECTORS: string[];
 declare const IGNORED_VALIDATION_ELEMENT_SELECTORS: SchemaCode[];
 
 declare const IGNORED_ATTRIBUTES: string[];
 declare const IGNORED_ATTRIBUTES_STARTS_WITH: string[];
 
+type DependentForbiddenElement = {
+    code: SchemaCode;
+    dependentElements: SchemaCode[];
+};
+declare const DEPENDENT_FORBIDDEN_ELEMENTS: DependentForbiddenElement[];
+
 declare const ALIGNMENT_ATTRIBUTE = "data-alignment";
 declare const LEFT_INDENT_ATTRIBUTE = "data-left-indent";
 declare const RIGHT_INDENT_ATTRIBUTE = "data-right-indent";
@@ -105,6 +113,6 @@ type ValidationError = {
  * * ValidateConsecutiveFootnotes and ValidateConsecutiveFootnoteCues are default validations.
  * @returns The validation errors.
  */
-declare const validateXml: (xml: Element, elementsToLink: readonly string[], linkElements: readonly string[], schemasToValidateAgainst: SchemaCode[]) => ValidationError[];
+declare const validateXml: (xml: Element, elementsToLink: string[], linkElements: string[], schemasToValidateAgainst: SchemaCode[]) => ValidationError[];
 
-export { ALIGNMENT_ATTRIBUTE, ATOM_SCHEMAS, type AllowedChildren, type AtomSchemaCode, type AttributeDefinition, ELEMENT_SCHEMAS, ELE_ID_ATTRIBUTE, ElementLabel, type ElementSchemaCode, FIGURE_PLACEMENT_ATTRIBUTE, type FreeAttribute, ID_ATTRS, IGNORED_ATTRIBUTES, IGNORED_ATTRIBUTES_STARTS_WITH, IGNORED_ELEMENT_SELECTORS, IGNORED_VALIDATION_ELEMENT_SELECTORS, INDENT_TYPE_ATTRIBUTE, INLINE_ELEMENT_SCHEMAS, type InlineSchemaCode, LAYOUT_ATTRIBUTES, LAYOUT_CELL_WIDTH_ATTRIBUTE, LAYOUT_TABLE_ORIENTATION_ATTRIBUTE, LAYOUT_TABLE_PLACEMENT_ATTRIBUTE, LAYOUT_USER_ATTRIBUTE, LEFT_INDENT_ATTRIBUTE, RIGHT_INDENT_ATTRIBUTE, type RestrictedAttribute, SCHEMAS, SPACE_ABOVE_ATTRIBUTE, SPACE_BELOW_ATTRIBUTE, SPECIAL_INDENT_ATTRIBUTE, STORE_ATTRIBUTE, STYLE_NAME_ATTRIBUTE, type Schema, type SchemaCode, type SchemaKind, TRACK_CHANGES_ATTRS, TRACK_CHANGES_ATTR_DATA_DATE, TRACK_CHANGES_ATTR_DATA_TIME, TRACK_CHANGES_ATTR_DATA_USERID, TRACK_CHANGES_ATTR_DATA_USERNAME, type ValidationError, type ValidationErrorKind, type ValidationErrorLevel, createElement, findAttributeDefinitionByName, findSchemaByCode, findSchemaByElement, findSchemaByTagName, getAttributeName, isAttributeRestricted, isIgnoredAttribute, isIgnoredElement, isIgnoredValidation, validateXml };
+export { ALIGNMENT_ATTRIBUTE, ATOM_SCHEMAS, type AllowedChildren, type AtomSchemaCode, type AttributeDefinition, DEPENDENT_FORBIDDEN_ELEMENTS, ELEMENT_SCHEMAS, ELE_ID_ATTRIBUTE, ElementLabel, type ElementSchemaCode, FIGURE_PLACEMENT_ATTRIBUTE, type FreeAttribute, ID_ATTRS, IGNORED_ATTRIBUTES, IGNORED_ATTRIBUTES_STARTS_WITH, IGNORED_ELEMENT_SELECTORS, IGNORED_VALIDATION_ELEMENT_SELECTORS, INDENT_TYPE_ATTRIBUTE, INLINE_ELEMENT_SCHEMAS, type InlineSchemaCode, LAYOUT_ATTRIBUTES, LAYOUT_CELL_WIDTH_ATTRIBUTE, LAYOUT_TABLE_ORIENTATION_ATTRIBUTE, LAYOUT_TABLE_PLACEMENT_ATTRIBUTE, LAYOUT_USER_ATTRIBUTE, LEFT_INDENT_ATTRIBUTE, RIGHT_INDENT_ATTRIBUTE, type RestrictedAttribute, SCHEMAS, SPACE_ABOVE_ATTRIBUTE, SPACE_BELOW_ATTRIBUTE, SPECIAL_INDENT_ATTRIBUTE, STORE_ATTRIBUTE, STYLE_NAME_ATTRIBUTE, type Schema, type SchemaCode, type SchemaKind, TRACK_CHANGES_ATTRS, TRACK_CHANGES_ATTR_DATA_DATE, TRACK_CHANGES_ATTR_DATA_TIME, TRACK_CHANGES_ATTR_DATA_USERID, TRACK_CHANGES_ATTR_DATA_USERNAME, type ValidationError, type ValidationErrorKind, type ValidationErrorLevel, createElement, findAttributeDefinitionByName, findSchemaByCode, findSchemaByElement, getAttributeName, isAttributeRestricted, isIgnoredAttribute, isIgnoredElement, isIgnoredValidation, isTrackChangesSchema, validateXml };

package/dist/index.js

@@ -22,6 +22,7 @@ var index_exports = {};
 __export(index_exports, {
   ALIGNMENT_ATTRIBUTE: () => ALIGNMENT_ATTRIBUTE,
   ATOM_SCHEMAS: () => ATOM_SCHEMAS,
+  DEPENDENT_FORBIDDEN_ELEMENTS: () => DEPENDENT_FORBIDDEN_ELEMENTS,
   ELEMENT_SCHEMAS: () => ELEMENT_SCHEMAS,
   ELE_ID_ATTRIBUTE: () => ELE_ID_ATTRIBUTE,
   ElementLabel: () => ElementLabel,
@@ -55,35 +56,19 @@ __export(index_exports, {
   findAttributeDefinitionByName: () => findAttributeDefinitionByName,
   findSchemaByCode: () => findSchemaByCode,
   findSchemaByElement: () => findSchemaByElement,
-  findSchemaByTagName: () => findSchemaByTagName,
   getAttributeName: () => getAttributeName,
   isAttributeRestricted: () => isAttributeRestricted,
   isIgnoredAttribute: () => isIgnoredAttribute,
   isIgnoredElement: () => isIgnoredElement,
   isIgnoredValidation: () => isIgnoredValidation,
+  isTrackChangesSchema: () => isTrackChangesSchema,
   validateXml: () => validateXml
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/schema/utils/createSchema.ts
-var createSchema = ({
-  code,
-  kind,
-  tag,
-  requiredAttributes,
-  optionalAttributes,
-  defaultChildCode,
-  allowedChildrenCodes
-}) => {
-  return {
-    code,
-    kind,
-    tag,
-    requiredAttributes,
-    optionalAttributes,
-    defaultChildCode,
-    allowedChildrenCodes: new Set(allowedChildrenCodes)
-  };
+var createSchema = (params) => {
+  return params;
 };
 
 // src/schema/shared/globalAttributes.ts
@@ -184,6 +169,7 @@ var COMMENT_QUERY_SECTION_SCHEMA = createSchema({
   kind: "atom",
   tag: SPAN_TAG,
   code: "commentQuerySection",
+  matchesElement: (element) => element.classList.contains("cmtQurySection"),
   requiredAttributes: [...ID_ATTRS, "id"],
   optionalAttributes: [...TRACK_CHANGES_ATTRS, "title"],
   allowedChildrenCodes: [...ATOM_CODES_ALLOWED_CHILDREN]
@@ -203,6 +189,7 @@ var DELETION_SCHEMA = createSchema({
   code: "deletion",
   kind: "atom",
   tag: SPAN_TAG,
+  matchesElement: (element) => element.classList.contains("del"),
   requiredAttributes: [...TRACK_CHANGES_ATTRS, ...ID_ATTRS],
   optionalAttributes: [],
   allowedChildrenCodes: [
@@ -253,6 +240,7 @@ var INSERTION_SCHEMA = createSchema({
   code: "insertion",
   kind: "atom",
   tag: SPAN_TAG,
+  matchesElement: (element) => element.classList.contains("ins"),
   requiredAttributes: [...TRACK_CHANGES_ATTRS, ...ID_ATTRS],
   optionalAttributes: [],
   allowedChildrenCodes: [
@@ -1974,15 +1962,21 @@ var EPIGRAPH_SCHEMA = createSchema({
 });
 
 // src/schema/elementSchemas/elements/footnoteSection.ts
+var FOOTNOTE_SECTION_ROLES = ["ch", "bk"];
 var FOOTNOTE_SECTION_SCHEMA = createSchema({
   code: "footnoteSection",
   kind: "element",
   tag: SECTION_TAG,
+  matchesElement: (element) => {
+    const role = element.getAttribute("role");
+    if (role && FOOTNOTE_SECTION_ROLES.includes(role)) return true;
+    return element.querySelector(FOOTNOTE_TAG) !== null;
+  },
   requiredAttributes: [
     ...ID_ATTRS,
     {
       name: "role",
-      values: ["ch", "bk"],
+      values: FOOTNOTE_SECTION_ROLES,
       defaultValue: "ch"
     }
   ],
@@ -1995,16 +1989,22 @@ var FOOTNOTE_SECTION_SCHEMA = createSchema({
 });
 
 // src/schema/elementSchemas/elements/heading.ts
+var HEADING_ROLES = ["H1", "H2", "H3", "H4", "H5", "H6", "vignette_group"];
 var HEADING_SCHEMA = createSchema({
   code: "heading",
   kind: "element",
   tag: SECTION_TAG,
+  matchesElement: (element) => {
+    const role = element.getAttribute("role");
+    if (!role) return false;
+    return HEADING_ROLES.includes(role);
+  },
   requiredAttributes: [
     ...ID_ATTRS,
     "xmlid",
     {
       name: "role",
-      values: ["H1", "H2", "H3", "H4", "H5", "H6", "vignette_group"],
+      values: HEADING_ROLES,
       defaultValue: "H1"
     }
   ],
@@ -2071,17 +2071,7 @@ var MATHPHRASE_SCHEMA = createSchema({
   tag: MATHPHRASE_TAG,
   requiredAttributes: [ELE_ID_ATTRIBUTE],
   optionalAttributes: [],
-  allowedChildrenCodes: [
-    { code: MATH_SCHEMA.code, required: true },
-    {
-      code: INSERTION_SCHEMA.code,
-      required: false
-    },
-    {
-      code: DELETION_SCHEMA.code,
-      required: false
-    }
-  ]
+  allowedChildrenCodes: [{ code: MATH_SCHEMA.code, required: true }]
 });
 
 // src/schema/elementSchemas/elements/reference/bibliodiv.ts
@@ -2339,7 +2329,78 @@ var SCHEMAS = {
   ...INLINE_ELEMENT_SCHEMAS
 };
 
-// src/schema/schema.types.ts
+// src/schema/shared/ignoredElements.ts
+var IGNORED_ELEMENT_SELECTORS = [
+  "span.rhlabel",
+  "span.printlabel",
+  "span.refIcon",
+  "span.missLink",
+  "span.ref-drag"
+];
+var IGNORED_VALIDATION_ELEMENT_SELECTORS = [
+  "referenceBibliomixed"
+];
+
+// src/schema/shared/ignoredAttributes.ts
+var IGNORED_ATTRIBUTES = [
+  // Styling & layout
+  "class",
+  "style",
+  // Editor state
+  "contenteditable",
+  "draggable",
+  "data-prevpos",
+  "tabindex",
+  // Browser behaviour
+  "spellcheck",
+  "translate",
+  "lang",
+  "dir",
+  "hidden",
+  "data-gramm"
+];
+var IGNORED_ATTRIBUTES_STARTS_WITH = ["er-", "er_", "drop", "drag"];
+
+// src/schema/utils/utils.ts
+var isTrackChangesSchema = (schema) => schema.code === "insertion" || schema.code === "deletion";
+var isIgnoredAttribute = (attribute) => IGNORED_ATTRIBUTES.includes(attribute) || IGNORED_ATTRIBUTES_STARTS_WITH.some(
+  (startsWith) => attribute.startsWith(startsWith)
+);
+var isIgnoredElement = (element) => IGNORED_ELEMENT_SELECTORS.some((selector) => element.matches(selector));
+var isIgnoredValidation = (code) => IGNORED_VALIDATION_ELEMENT_SELECTORS.includes(code);
+var findSchemaByCode = (code) => SCHEMAS[code];
+var findSchemaByElement = (element) => {
+  const schema = Object.values(SCHEMAS).find(
+    (schema2) => schema2.tag == element.tagName && (!schema2.matchesElement || schema2.matchesElement(element))
+  );
+  return schema;
+};
+var isAttributeRestricted = (attr) => typeof attr !== "string";
+var getAttributeName = (attribute) => typeof attribute === "string" ? attribute.toLowerCase() : attribute.name.toLowerCase();
+var findAttributeDefinitionByName = (definitions, name) => {
+  for (const def of definitions) {
+    if (getAttributeName(def) === name.toLowerCase()) {
+      return def;
+    }
+  }
+  return void 0;
+};
+
+// src/schema/utils/createElement.ts
+var createElement = ({
+  schemaCode,
+  attributes
+}) => {
+  const schema = findSchemaByCode(schemaCode);
+  const element = document.createElement(schema.tag.toLowerCase());
+  for (const [name, value] of Object.entries(attributes)) {
+    if (!value) continue;
+    element.setAttribute(name, String(value));
+  }
+  return element;
+};
+
+// src/schema/shared/labelElements.ts
 var ElementLabel = {
   referenceBibliomixed: "Reference Bibliomixed",
   referenceBibliography: "Reference Bibliography",
@@ -2464,111 +2525,13 @@ var ElementLabel = {
   phrase: "Phrase"
 };
 
-// src/schema/shared/ignoredElements.ts
-var IGNORED_ELEMENT_SELECTORS = [
-  "span.rhlabel",
-  "span.printlabel",
-  "span.refIcon",
-  "span.missLink",
-  "span.ref-drag"
-];
-var IGNORED_VALIDATION_ELEMENT_SELECTORS = [
-  "referenceBibliomixed"
-];
-
-// src/schema/shared/ignoredAttributes.ts
-var IGNORED_ATTRIBUTES = [
-  // Styling & layout
-  "class",
-  "style",
-  // Editor state
-  "contenteditable",
-  "draggable",
-  "data-prevpos",
-  "tabindex",
-  // Browser behaviour
-  "spellcheck",
-  "translate",
-  "lang",
-  "dir",
-  "hidden",
-  "data-gramm"
-];
-var IGNORED_ATTRIBUTES_STARTS_WITH = ["er-", "er_", "drop", "drag"];
-
-// src/schema/utils/utils.ts
-var isIgnoredAttribute = (attribute) => IGNORED_ATTRIBUTES.includes(attribute) || IGNORED_ATTRIBUTES_STARTS_WITH.some(
-  (startsWith) => attribute.startsWith(startsWith)
-);
-var isIgnoredElement = (element) => IGNORED_ELEMENT_SELECTORS.some((selector) => element.matches(selector));
-var isIgnoredValidation = (code) => IGNORED_VALIDATION_ELEMENT_SELECTORS.includes(code);
-var findSchemaByCode = (code) => SCHEMAS[code];
-var findSchemaByTagName = (tagName) => Object.values(SCHEMAS).filter(
-  (schema) => schema.tag === tagName.toUpperCase()
-);
-var findSchemaByElement = (element) => {
-  const tagName = element.tagName.toUpperCase();
-  const isInsertion = element.classList.contains("ins");
-  const isDeletion = element.classList.contains("del");
-  const isQueryComment = element.classList.contains("cmtQurySection");
-  const role = element.getAttribute("role");
-  if (tagName === SPAN_TAG) {
-    if (isQueryComment) {
-      return findSchemaByCode("commentQuerySection");
-    }
-    if (isInsertion) {
-      return findSchemaByCode("insertion");
-    }
-    if (isDeletion) {
-      return findSchemaByCode("deletion");
-    }
-  }
-  if (tagName === SECTION_TAG) {
-    if (role) {
-      if (role.startsWith("H")) {
-        return findSchemaByCode("heading");
-      }
-      if (role === "ch" || role === "bk") {
-        return findSchemaByCode("footnoteSection");
-      }
-    }
-    const isFootnoteSectionWithoutRole = element.querySelector(FOOTNOTE_TAG);
-    if (isFootnoteSectionWithoutRole) {
-      return findSchemaByCode("footnoteSection");
-    }
-  }
-  const candidates = findSchemaByTagName(tagName);
-  return candidates[0];
-};
-var isAttributeRestricted = (attr) => typeof attr !== "string";
-var getAttributeName = (attribute) => typeof attribute === "string" ? attribute.toLowerCase() : attribute.name.toLowerCase();
-var findAttributeDefinitionByName = (definitions, name) => {
-  for (const def of definitions) {
-    if (getAttributeName(def) === name.toLowerCase()) {
-      return def;
-    }
-  }
-  return void 0;
-};
-
-// src/schema/utils/createElement.ts
-var createElement = ({
-  schemaCode,
-  attributes
-}) => {
-  const schema = findSchemaByCode(schemaCode);
-  if (!schema) {
-    throw new Error(`Schema not found for code: ${schemaCode}`);
-  }
-  const element = document.createElement(schema.tag.toLowerCase());
-  for (const [name, value] of Object.entries(attributes)) {
-    if (value === void 0) {
-      continue;
-    }
-    element.setAttribute(name, String(value));
+// src/schema/shared/dependentsForbiddenElements.ts
+var DEPENDENT_FORBIDDEN_ELEMENTS = [
+  {
+    code: "commentQuerySection",
+    dependentElements: ["query", "comment", "reply", "content"]
   }
-  return element;
-};
+];
 
 // src/validation/utils/generateValidationIssueId.ts
 var generateValidationIssueId = () => {
@@ -2791,12 +2754,47 @@ var validateElementAgainstSchema = (element, schema) => {
   errors.push(...validateChildren(element, schema));
   return errors;
 };
-var validateChildren = (element, schema) => {
+var validateRequiredChildren = (element, schema, childElements) => {
   const errors = [];
+  for (const allowedChild of schema.allowedChildrenCodes) {
+    if (!allowedChild.required) {
+      continue;
+    }
+    const hasChild = childElements.some((child) => {
+      const childSchema = findSchemaByElement(child);
+      return childSchema?.code === allowedChild.code;
+    });
+    if (!hasChild) {
+      const requiredChildrenTag = findSchemaByCode(allowedChild.code).tag;
+      addValidationIssue(errors, {
+        store: getStore(element),
+        title: `Missing required child element ${requiredChildrenTag}`,
+        level: "warning",
+        kind: "missing",
+        description: `The child element ${requiredChildrenTag} is required but not present.`
+      });
+    }
+  }
+  return errors;
+};
+var getEffectiveChildElements = (element) => {
+  const effectiveChildren = [];
   const childElements = [...element.children].filter(
     (child) => !isIgnoredElement(child)
   );
-  const allowedChildren = [...schema.allowedChildrenCodes];
+  for (const child of childElements) {
+    const childSchema = findSchemaByElement(child);
+    if (childSchema && isTrackChangesSchema(childSchema)) {
+      effectiveChildren.push(...getEffectiveChildElements(child));
+      continue;
+    }
+    effectiveChildren.push(child);
+  }
+  return effectiveChildren;
+};
+var validateChildren = (element, schema) => {
+  const errors = [];
+  const childElements = getEffectiveChildElements(element);
   if (schema.kind === "atom") {
     return errors;
   }
@@ -2812,7 +2810,7 @@ var validateChildren = (element, schema) => {
       });
       continue;
     }
-    const allowedChild = allowedChildren.find(
+    const allowedChild = schema.allowedChildrenCodes.find(
       (candidate) => candidate.code === childSchema.code
     );
     if (!allowedChild) {
@@ -2827,34 +2825,7 @@ var validateChildren = (element, schema) => {
     }
     errors.push(...validateElementAgainstSchema(child, childSchema));
   }
-  for (const allowedChild of allowedChildren) {
-    if (!allowedChild.required) {
-      continue;
-    }
-    const hasChild = childElements.some((child) => {
-      const childSchema = findSchemaByElement(child);
-      return childSchema?.code === allowedChild.code;
-    });
-    if (!hasChild) {
-      const requiredChildLabel = ElementLabel[allowedChild.code];
-      addValidationIssue(errors, {
-        store: getStore(element),
-        title: `Missing required child element ${requiredChildLabel}`,
-        level: "warning",
-        kind: "missing",
-        description: `The child element ${requiredChildLabel} is required but not present.`
-      });
-    }
-  }
-  if (schema.allowedChildrenCodes.size === 0 && childElements.length > 0) {
-    addValidationIssue(errors, {
-      store: getStore(element),
-      title: "Atom element cannot contain child elements",
-      level: "warning",
-      kind: "forbidden",
-      description: `The element is an atom element and cannot contain child elements.`
-    });
-  }
+  errors.push(...validateRequiredChildren(element, schema, childElements));
   return errors;
 };
 
@@ -2907,9 +2878,9 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schemasToValidateAgainst.includes(schema.code)) {
       errors.push(...validateElementAgainstSchema(element, schema));
     }
-    const role = element.getAttribute("role") || "";
+    const role = element.getAttribute("role");
     const linkableRoles = getLinkableRoles();
-    if (schema.tag === LINK_SCHEMA.tag && linkableRoles.includes(role) || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
+    if (schema.tag === LINK_SCHEMA.tag && role && linkableRoles.includes(role) || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
       errors.push(...validateLinkend(element, elementsToLink));
     }
     if (schema.tag === BIBLIOMIXED_SCHEMA.tag) {
@@ -2956,6 +2927,7 @@ var validateXml = (xml, elementsToLink, linkElements, schemasToValidateAgainst)
 0 && (module.exports = {
   ALIGNMENT_ATTRIBUTE,
   ATOM_SCHEMAS,
+  DEPENDENT_FORBIDDEN_ELEMENTS,
   ELEMENT_SCHEMAS,
   ELE_ID_ATTRIBUTE,
   ElementLabel,
@@ -2989,11 +2961,11 @@ var validateXml = (xml, elementsToLink, linkElements, schemasToValidateAgainst)
   findAttributeDefinitionByName,
   findSchemaByCode,
   findSchemaByElement,
-  findSchemaByTagName,
   getAttributeName,
   isAttributeRestricted,
   isIgnoredAttribute,
   isIgnoredElement,
   isIgnoredValidation,
+  isTrackChangesSchema,
   validateXml
 });

package/dist/index.mjs

@@ -1,22 +1,6 @@
 // src/schema/utils/createSchema.ts
-var createSchema = ({
-  code,
-  kind,
-  tag,
-  requiredAttributes,
-  optionalAttributes,
-  defaultChildCode,
-  allowedChildrenCodes
-}) => {
-  return {
-    code,
-    kind,
-    tag,
-    requiredAttributes,
-    optionalAttributes,
-    defaultChildCode,
-    allowedChildrenCodes: new Set(allowedChildrenCodes)
-  };
+var createSchema = (params) => {
+  return params;
 };
 
 // src/schema/shared/globalAttributes.ts
@@ -117,6 +101,7 @@ var COMMENT_QUERY_SECTION_SCHEMA = createSchema({
   kind: "atom",
   tag: SPAN_TAG,
   code: "commentQuerySection",
+  matchesElement: (element) => element.classList.contains("cmtQurySection"),
   requiredAttributes: [...ID_ATTRS, "id"],
   optionalAttributes: [...TRACK_CHANGES_ATTRS, "title"],
   allowedChildrenCodes: [...ATOM_CODES_ALLOWED_CHILDREN]
@@ -136,6 +121,7 @@ var DELETION_SCHEMA = createSchema({
   code: "deletion",
   kind: "atom",
   tag: SPAN_TAG,
+  matchesElement: (element) => element.classList.contains("del"),
   requiredAttributes: [...TRACK_CHANGES_ATTRS, ...ID_ATTRS],
   optionalAttributes: [],
   allowedChildrenCodes: [
@@ -186,6 +172,7 @@ var INSERTION_SCHEMA = createSchema({
   code: "insertion",
   kind: "atom",
   tag: SPAN_TAG,
+  matchesElement: (element) => element.classList.contains("ins"),
   requiredAttributes: [...TRACK_CHANGES_ATTRS, ...ID_ATTRS],
   optionalAttributes: [],
   allowedChildrenCodes: [
@@ -1907,15 +1894,21 @@ var EPIGRAPH_SCHEMA = createSchema({
 });
 
 // src/schema/elementSchemas/elements/footnoteSection.ts
+var FOOTNOTE_SECTION_ROLES = ["ch", "bk"];
 var FOOTNOTE_SECTION_SCHEMA = createSchema({
   code: "footnoteSection",
   kind: "element",
   tag: SECTION_TAG,
+  matchesElement: (element) => {
+    const role = element.getAttribute("role");
+    if (role && FOOTNOTE_SECTION_ROLES.includes(role)) return true;
+    return element.querySelector(FOOTNOTE_TAG) !== null;
+  },
   requiredAttributes: [
     ...ID_ATTRS,
     {
       name: "role",
-      values: ["ch", "bk"],
+      values: FOOTNOTE_SECTION_ROLES,
       defaultValue: "ch"
     }
   ],
@@ -1928,16 +1921,22 @@ var FOOTNOTE_SECTION_SCHEMA = createSchema({
 });
 
 // src/schema/elementSchemas/elements/heading.ts
+var HEADING_ROLES = ["H1", "H2", "H3", "H4", "H5", "H6", "vignette_group"];
 var HEADING_SCHEMA = createSchema({
   code: "heading",
   kind: "element",
   tag: SECTION_TAG,
+  matchesElement: (element) => {
+    const role = element.getAttribute("role");
+    if (!role) return false;
+    return HEADING_ROLES.includes(role);
+  },
   requiredAttributes: [
     ...ID_ATTRS,
     "xmlid",
     {
       name: "role",
-      values: ["H1", "H2", "H3", "H4", "H5", "H6", "vignette_group"],
+      values: HEADING_ROLES,
       defaultValue: "H1"
     }
   ],
@@ -2004,17 +2003,7 @@ var MATHPHRASE_SCHEMA = createSchema({
   tag: MATHPHRASE_TAG,
   requiredAttributes: [ELE_ID_ATTRIBUTE],
   optionalAttributes: [],
-  allowedChildrenCodes: [
-    { code: MATH_SCHEMA.code, required: true },
-    {
-      code: INSERTION_SCHEMA.code,
-      required: false
-    },
-    {
-      code: DELETION_SCHEMA.code,
-      required: false
-    }
-  ]
+  allowedChildrenCodes: [{ code: MATH_SCHEMA.code, required: true }]
 });
 
 // src/schema/elementSchemas/elements/reference/bibliodiv.ts
@@ -2272,7 +2261,78 @@ var SCHEMAS = {
   ...INLINE_ELEMENT_SCHEMAS
 };
 
-// src/schema/schema.types.ts
+// src/schema/shared/ignoredElements.ts
+var IGNORED_ELEMENT_SELECTORS = [
+  "span.rhlabel",
+  "span.printlabel",
+  "span.refIcon",
+  "span.missLink",
+  "span.ref-drag"
+];
+var IGNORED_VALIDATION_ELEMENT_SELECTORS = [
+  "referenceBibliomixed"
+];
+
+// src/schema/shared/ignoredAttributes.ts
+var IGNORED_ATTRIBUTES = [
+  // Styling & layout
+  "class",
+  "style",
+  // Editor state
+  "contenteditable",
+  "draggable",
+  "data-prevpos",
+  "tabindex",
+  // Browser behaviour
+  "spellcheck",
+  "translate",
+  "lang",
+  "dir",
+  "hidden",
+  "data-gramm"
+];
+var IGNORED_ATTRIBUTES_STARTS_WITH = ["er-", "er_", "drop", "drag"];
+
+// src/schema/utils/utils.ts
+var isTrackChangesSchema = (schema) => schema.code === "insertion" || schema.code === "deletion";
+var isIgnoredAttribute = (attribute) => IGNORED_ATTRIBUTES.includes(attribute) || IGNORED_ATTRIBUTES_STARTS_WITH.some(
+  (startsWith) => attribute.startsWith(startsWith)
+);
+var isIgnoredElement = (element) => IGNORED_ELEMENT_SELECTORS.some((selector) => element.matches(selector));
+var isIgnoredValidation = (code) => IGNORED_VALIDATION_ELEMENT_SELECTORS.includes(code);
+var findSchemaByCode = (code) => SCHEMAS[code];
+var findSchemaByElement = (element) => {
+  const schema = Object.values(SCHEMAS).find(
+    (schema2) => schema2.tag == element.tagName && (!schema2.matchesElement || schema2.matchesElement(element))
+  );
+  return schema;
+};
+var isAttributeRestricted = (attr) => typeof attr !== "string";
+var getAttributeName = (attribute) => typeof attribute === "string" ? attribute.toLowerCase() : attribute.name.toLowerCase();
+var findAttributeDefinitionByName = (definitions, name) => {
+  for (const def of definitions) {
+    if (getAttributeName(def) === name.toLowerCase()) {
+      return def;
+    }
+  }
+  return void 0;
+};
+
+// src/schema/utils/createElement.ts
+var createElement = ({
+  schemaCode,
+  attributes
+}) => {
+  const schema = findSchemaByCode(schemaCode);
+  const element = document.createElement(schema.tag.toLowerCase());
+  for (const [name, value] of Object.entries(attributes)) {
+    if (!value) continue;
+    element.setAttribute(name, String(value));
+  }
+  return element;
+};
+
+// src/schema/shared/labelElements.ts
 var ElementLabel = {
   referenceBibliomixed: "Reference Bibliomixed",
   referenceBibliography: "Reference Bibliography",
@@ -2397,111 +2457,13 @@ var ElementLabel = {
   phrase: "Phrase"
 };
 
-// src/schema/shared/ignoredElements.ts
-var IGNORED_ELEMENT_SELECTORS = [
-  "span.rhlabel",
-  "span.printlabel",
-  "span.refIcon",
-  "span.missLink",
-  "span.ref-drag"
-];
-var IGNORED_VALIDATION_ELEMENT_SELECTORS = [
-  "referenceBibliomixed"
-];
-
-// src/schema/shared/ignoredAttributes.ts
-var IGNORED_ATTRIBUTES = [
-  // Styling & layout
-  "class",
-  "style",
-  // Editor state
-  "contenteditable",
-  "draggable",
-  "data-prevpos",
-  "tabindex",
-  // Browser behaviour
-  "spellcheck",
-  "translate",
-  "lang",
-  "dir",
-  "hidden",
-  "data-gramm"
-];
-var IGNORED_ATTRIBUTES_STARTS_WITH = ["er-", "er_", "drop", "drag"];
-
-// src/schema/utils/utils.ts
-var isIgnoredAttribute = (attribute) => IGNORED_ATTRIBUTES.includes(attribute) || IGNORED_ATTRIBUTES_STARTS_WITH.some(
-  (startsWith) => attribute.startsWith(startsWith)
-);
-var isIgnoredElement = (element) => IGNORED_ELEMENT_SELECTORS.some((selector) => element.matches(selector));
-var isIgnoredValidation = (code) => IGNORED_VALIDATION_ELEMENT_SELECTORS.includes(code);
-var findSchemaByCode = (code) => SCHEMAS[code];
-var findSchemaByTagName = (tagName) => Object.values(SCHEMAS).filter(
-  (schema) => schema.tag === tagName.toUpperCase()
-);
-var findSchemaByElement = (element) => {
-  const tagName = element.tagName.toUpperCase();
-  const isInsertion = element.classList.contains("ins");
-  const isDeletion = element.classList.contains("del");
-  const isQueryComment = element.classList.contains("cmtQurySection");
-  const role = element.getAttribute("role");
-  if (tagName === SPAN_TAG) {
-    if (isQueryComment) {
-      return findSchemaByCode("commentQuerySection");
-    }
-    if (isInsertion) {
-      return findSchemaByCode("insertion");
-    }
-    if (isDeletion) {
-      return findSchemaByCode("deletion");
-    }
-  }
-  if (tagName === SECTION_TAG) {
-    if (role) {
-      if (role.startsWith("H")) {
-        return findSchemaByCode("heading");
-      }
-      if (role === "ch" || role === "bk") {
-        return findSchemaByCode("footnoteSection");
-      }
-    }
-    const isFootnoteSectionWithoutRole = element.querySelector(FOOTNOTE_TAG);
-    if (isFootnoteSectionWithoutRole) {
-      return findSchemaByCode("footnoteSection");
-    }
-  }
-  const candidates = findSchemaByTagName(tagName);
-  return candidates[0];
-};
-var isAttributeRestricted = (attr) => typeof attr !== "string";
-var getAttributeName = (attribute) => typeof attribute === "string" ? attribute.toLowerCase() : attribute.name.toLowerCase();
-var findAttributeDefinitionByName = (definitions, name) => {
-  for (const def of definitions) {
-    if (getAttributeName(def) === name.toLowerCase()) {
-      return def;
-    }
-  }
-  return void 0;
-};
-
-// src/schema/utils/createElement.ts
-var createElement = ({
-  schemaCode,
-  attributes
-}) => {
-  const schema = findSchemaByCode(schemaCode);
-  if (!schema) {
-    throw new Error(`Schema not found for code: ${schemaCode}`);
-  }
-  const element = document.createElement(schema.tag.toLowerCase());
-  for (const [name, value] of Object.entries(attributes)) {
-    if (value === void 0) {
-      continue;
-    }
-    element.setAttribute(name, String(value));
+// src/schema/shared/dependentsForbiddenElements.ts
+var DEPENDENT_FORBIDDEN_ELEMENTS = [
+  {
+    code: "commentQuerySection",
+    dependentElements: ["query", "comment", "reply", "content"]
   }
-  return element;
-};
+];
 
 // src/validation/utils/generateValidationIssueId.ts
 var generateValidationIssueId = () => {
@@ -2724,12 +2686,47 @@ var validateElementAgainstSchema = (element, schema) => {
   errors.push(...validateChildren(element, schema));
   return errors;
 };
-var validateChildren = (element, schema) => {
+var validateRequiredChildren = (element, schema, childElements) => {
   const errors = [];
+  for (const allowedChild of schema.allowedChildrenCodes) {
+    if (!allowedChild.required) {
+      continue;
+    }
+    const hasChild = childElements.some((child) => {
+      const childSchema = findSchemaByElement(child);
+      return childSchema?.code === allowedChild.code;
+    });
+    if (!hasChild) {
+      const requiredChildrenTag = findSchemaByCode(allowedChild.code).tag;
+      addValidationIssue(errors, {
+        store: getStore(element),
+        title: `Missing required child element ${requiredChildrenTag}`,
+        level: "warning",
+        kind: "missing",
+        description: `The child element ${requiredChildrenTag} is required but not present.`
+      });
+    }
+  }
+  return errors;
+};
+var getEffectiveChildElements = (element) => {
+  const effectiveChildren = [];
   const childElements = [...element.children].filter(
     (child) => !isIgnoredElement(child)
   );
-  const allowedChildren = [...schema.allowedChildrenCodes];
+  for (const child of childElements) {
+    const childSchema = findSchemaByElement(child);
+    if (childSchema && isTrackChangesSchema(childSchema)) {
+      effectiveChildren.push(...getEffectiveChildElements(child));
+      continue;
+    }
+    effectiveChildren.push(child);
+  }
+  return effectiveChildren;
+};
+var validateChildren = (element, schema) => {
+  const errors = [];
+  const childElements = getEffectiveChildElements(element);
   if (schema.kind === "atom") {
     return errors;
   }
@@ -2745,7 +2742,7 @@ var validateChildren = (element, schema) => {
       });
       continue;
     }
-    const allowedChild = allowedChildren.find(
+    const allowedChild = schema.allowedChildrenCodes.find(
       (candidate) => candidate.code === childSchema.code
     );
     if (!allowedChild) {
@@ -2760,34 +2757,7 @@ var validateChildren = (element, schema) => {
     }
     errors.push(...validateElementAgainstSchema(child, childSchema));
   }
-  for (const allowedChild of allowedChildren) {
-    if (!allowedChild.required) {
-      continue;
-    }
-    const hasChild = childElements.some((child) => {
-      const childSchema = findSchemaByElement(child);
-      return childSchema?.code === allowedChild.code;
-    });
-    if (!hasChild) {
-      const requiredChildLabel = ElementLabel[allowedChild.code];
-      addValidationIssue(errors, {
-        store: getStore(element),
-        title: `Missing required child element ${requiredChildLabel}`,
-        level: "warning",
-        kind: "missing",
-        description: `The child element ${requiredChildLabel} is required but not present.`
-      });
-    }
-  }
-  if (schema.allowedChildrenCodes.size === 0 && childElements.length > 0) {
-    addValidationIssue(errors, {
-      store: getStore(element),
-      title: "Atom element cannot contain child elements",
-      level: "warning",
-      kind: "forbidden",
-      description: `The element is an atom element and cannot contain child elements.`
-    });
-  }
+  errors.push(...validateRequiredChildren(element, schema, childElements));
   return errors;
 };
 
@@ -2840,9 +2810,9 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schemasToValidateAgainst.includes(schema.code)) {
       errors.push(...validateElementAgainstSchema(element, schema));
     }
-    const role = element.getAttribute("role") || "";
+    const role = element.getAttribute("role");
     const linkableRoles = getLinkableRoles();
-    if (schema.tag === LINK_SCHEMA.tag && linkableRoles.includes(role) || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
+    if (schema.tag === LINK_SCHEMA.tag && role && linkableRoles.includes(role) || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
       errors.push(...validateLinkend(element, elementsToLink));
     }
     if (schema.tag === BIBLIOMIXED_SCHEMA.tag) {
@@ -2888,6 +2858,7 @@ var validateXml = (xml, elementsToLink, linkElements, schemasToValidateAgainst)
 export {
   ALIGNMENT_ATTRIBUTE,
   ATOM_SCHEMAS,
+  DEPENDENT_FORBIDDEN_ELEMENTS,
   ELEMENT_SCHEMAS,
   ELE_ID_ATTRIBUTE,
   ElementLabel,
@@ -2921,11 +2892,11 @@ export {
   findAttributeDefinitionByName,
   findSchemaByCode,
   findSchemaByElement,
-  findSchemaByTagName,
   getAttributeName,
   isAttributeRestricted,
   isIgnoredAttribute,
   isIgnoredElement,
   isIgnoredValidation,
+  isTrackChangesSchema,
   validateXml
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-editor-schema",
-  "version": "0.1.200",
+  "version": "0.2.1",
   "description": "Pro Editor XML schemas",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -19,13 +19,18 @@
     "build": "tsup src/index.ts --format cjs,esm --dts",
     "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
     "typecheck": "tsc --noEmit",
+    "lint": "eslint src",
     "test": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "check": "npm ci && npm run typecheck && npm run lint && npm run test && npm run build"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.6.0",
     "happy-dom": "^20.0.10",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0",
+    "typescript-eslint": "^8.62.1",
     "vitest": "^3.2.4"
   }
 }