pro-editor-schema 0.2.21 → 0.2.22

package/dist/index.js

@@ -244,7 +244,13 @@ var INSERTION_SCHEMA = createSchema({
   tag: SPAN_TAG,
   matchesElement: (element) => element.classList.contains("ins"),
   requiredAttributes: [...TRACK_CHANGES_ATTRS, ...ID_ATTRS],
-  optionalAttributes: [],
+  optionalAttributes: [
+    {
+      name: "role",
+      values: ["web-link", "figure-note-link", "figsource"],
+      defaultValue: ""
+    }
+  ],
   allowedChildrenCodes: [
     ...ATOM_CODES_ALLOWED_CHILDREN,
     ...INLINE_ELEMENT_CODES_ALLOWED_CHILDREN
@@ -2334,8 +2340,8 @@ var URI_SCHEMA = createSchema({
   code: "uri",
   kind: "inline",
   tag: URI_TAG,
-  requiredAttributes: [...ID_ATTRS],
-  optionalAttributes: ["linkend"],
+  requiredAttributes: [],
+  optionalAttributes: ["xlinkhref"],
   allowedChildrenCodes: [...ATOM_CODES_ALLOWED_CHILDREN]
 });
 
@@ -2601,6 +2607,25 @@ var retrieveTextIgnoringNodesWithSelector = (element, selector = ".del") => {
   return clonedElement.textContent || "";
 };
 
+// src/validation/utils/getElementsSelector.ts
+var getElementsSelector = ({
+  element,
+  selector,
+  filterDeletedNodes
+}) => {
+  const elements = element.querySelectorAll(selector);
+  if (filterDeletedNodes) {
+    return Array.from(elements).filter((element2) => {
+      const hasDeletedParent = element2.closest(".del") !== null;
+      if (hasDeletedParent) {
+        return false;
+      }
+      return true;
+    });
+  }
+  return Array.from(elements);
+};
+
 // src/validation/validateFootnotes.ts
 var extractFootnoteNumber = (footnote) => {
   if (!footnote) return "no label";
@@ -2643,7 +2668,11 @@ var validateFootnoteCue = (footnoteElement, root) => {
   return errors;
 };
 var validateConsecutiveFootnotes = (root) => {
-  const footnotes = Array.from(root.querySelectorAll(FOOTNOTE_SCHEMA.tag));
+  const footnotes = getElementsSelector({
+    element: root,
+    selector: FOOTNOTE_SCHEMA.tag,
+    filterDeletedNodes: true
+  });
   if (footnotes.length === 0) {
     return [];
   }
@@ -2672,9 +2701,11 @@ var validateConsecutiveFootnotes = (root) => {
   return [];
 };
 var validateConsecutiveFootnoteCues = (root) => {
-  const footnoteLinks = Array.from(
-    root.querySelectorAll(FOOTNOTE_LINK_SCHEMA.tag)
-  );
+  const footnoteLinks = getElementsSelector({
+    element: root,
+    selector: FOOTNOTE_LINK_SCHEMA.tag,
+    filterDeletedNodes: true
+  });
   if (footnoteLinks.length === 0) {
     return [];
   }
@@ -2916,6 +2947,33 @@ var validateReferenceCited = (referenceElement, linkElements) => {
   ];
 };
 
+// src/validation/validateUri.ts
+var WEB_URI_REGEX = /^(?:(?:https?):\/\/)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(?::\d{1,5})?(?:\/[^\s]*)?$/i;
+var isValidUri = (uri) => {
+  if (!uri || /\s/.test(uri)) {
+    return false;
+  }
+  if (/^[a-z][a-z0-9+.-]*:/i.test(uri) && !/^https?:\/\//i.test(uri)) {
+    return false;
+  }
+  return WEB_URI_REGEX.test(uri);
+};
+var validateUri = (uriElement) => {
+  const url = uriElement.textContent.trim();
+  if (isValidUri(url)) {
+    return [];
+  }
+  return [
+    createValidationIssue({
+      store: getStore(uriElement),
+      title: "URL cannot be reached",
+      kind: "unlinked",
+      description: "URL cannot be reached. Please check and adjust.",
+      level: "warning"
+    })
+  ];
+};
+
 // src/validation/validateXml.ts
 var validateElement = (element, root, elementsToLink, linkElements, schemasToValidateAgainst) => {
   if (isIgnoredElement(element)) {
@@ -2938,6 +2996,9 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schema.tag === FOOTNOTE_SCHEMA.tag) {
       errors.push(...validateFootnoteCue(element, root));
     }
+    if (schema.tag === URI_SCHEMA.tag) {
+      errors.push(...validateUri(element));
+    }
     if (isIgnoredValidation(schema.code)) {
       return errors;
     }

package/dist/index.mjs

@@ -176,7 +176,13 @@ var INSERTION_SCHEMA = createSchema({
   tag: SPAN_TAG,
   matchesElement: (element) => element.classList.contains("ins"),
   requiredAttributes: [...TRACK_CHANGES_ATTRS, ...ID_ATTRS],
-  optionalAttributes: [],
+  optionalAttributes: [
+    {
+      name: "role",
+      values: ["web-link", "figure-note-link", "figsource"],
+      defaultValue: ""
+    }
+  ],
   allowedChildrenCodes: [
     ...ATOM_CODES_ALLOWED_CHILDREN,
     ...INLINE_ELEMENT_CODES_ALLOWED_CHILDREN
@@ -2266,8 +2272,8 @@ var URI_SCHEMA = createSchema({
   code: "uri",
   kind: "inline",
   tag: URI_TAG,
-  requiredAttributes: [...ID_ATTRS],
-  optionalAttributes: ["linkend"],
+  requiredAttributes: [],
+  optionalAttributes: ["xlinkhref"],
   allowedChildrenCodes: [...ATOM_CODES_ALLOWED_CHILDREN]
 });
 
@@ -2533,6 +2539,25 @@ var retrieveTextIgnoringNodesWithSelector = (element, selector = ".del") => {
   return clonedElement.textContent || "";
 };
 
+// src/validation/utils/getElementsSelector.ts
+var getElementsSelector = ({
+  element,
+  selector,
+  filterDeletedNodes
+}) => {
+  const elements = element.querySelectorAll(selector);
+  if (filterDeletedNodes) {
+    return Array.from(elements).filter((element2) => {
+      const hasDeletedParent = element2.closest(".del") !== null;
+      if (hasDeletedParent) {
+        return false;
+      }
+      return true;
+    });
+  }
+  return Array.from(elements);
+};
+
 // src/validation/validateFootnotes.ts
 var extractFootnoteNumber = (footnote) => {
   if (!footnote) return "no label";
@@ -2575,7 +2600,11 @@ var validateFootnoteCue = (footnoteElement, root) => {
   return errors;
 };
 var validateConsecutiveFootnotes = (root) => {
-  const footnotes = Array.from(root.querySelectorAll(FOOTNOTE_SCHEMA.tag));
+  const footnotes = getElementsSelector({
+    element: root,
+    selector: FOOTNOTE_SCHEMA.tag,
+    filterDeletedNodes: true
+  });
   if (footnotes.length === 0) {
     return [];
   }
@@ -2604,9 +2633,11 @@ var validateConsecutiveFootnotes = (root) => {
   return [];
 };
 var validateConsecutiveFootnoteCues = (root) => {
-  const footnoteLinks = Array.from(
-    root.querySelectorAll(FOOTNOTE_LINK_SCHEMA.tag)
-  );
+  const footnoteLinks = getElementsSelector({
+    element: root,
+    selector: FOOTNOTE_LINK_SCHEMA.tag,
+    filterDeletedNodes: true
+  });
   if (footnoteLinks.length === 0) {
     return [];
   }
@@ -2848,6 +2879,33 @@ var validateReferenceCited = (referenceElement, linkElements) => {
   ];
 };
 
+// src/validation/validateUri.ts
+var WEB_URI_REGEX = /^(?:(?:https?):\/\/)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(?::\d{1,5})?(?:\/[^\s]*)?$/i;
+var isValidUri = (uri) => {
+  if (!uri || /\s/.test(uri)) {
+    return false;
+  }
+  if (/^[a-z][a-z0-9+.-]*:/i.test(uri) && !/^https?:\/\//i.test(uri)) {
+    return false;
+  }
+  return WEB_URI_REGEX.test(uri);
+};
+var validateUri = (uriElement) => {
+  const url = uriElement.textContent.trim();
+  if (isValidUri(url)) {
+    return [];
+  }
+  return [
+    createValidationIssue({
+      store: getStore(uriElement),
+      title: "URL cannot be reached",
+      kind: "unlinked",
+      description: "URL cannot be reached. Please check and adjust.",
+      level: "warning"
+    })
+  ];
+};
+
 // src/validation/validateXml.ts
 var validateElement = (element, root, elementsToLink, linkElements, schemasToValidateAgainst) => {
   if (isIgnoredElement(element)) {
@@ -2870,6 +2928,9 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schema.tag === FOOTNOTE_SCHEMA.tag) {
       errors.push(...validateFootnoteCue(element, root));
     }
+    if (schema.tag === URI_SCHEMA.tag) {
+      errors.push(...validateUri(element));
+    }
     if (isIgnoredValidation(schema.code)) {
       return errors;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-editor-schema",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Pro Editor XML schemas",
   "main": "dist/index.js",
   "module": "dist/index.mjs",