pro-editor-schema 0.2.22 → 0.2.25

package/dist/index.js

@@ -2336,12 +2336,13 @@ var LINK_SCHEMA = createSchema({
 });
 
 // src/schema/elementSchemas/inlineElements/uri.ts
+var LINK_ATTRIBUTE = "xlinkhref";
 var URI_SCHEMA = createSchema({
   code: "uri",
   kind: "inline",
   tag: URI_TAG,
-  requiredAttributes: [],
-  optionalAttributes: ["xlinkhref"],
+  requiredAttributes: [LINK_ATTRIBUTE],
+  optionalAttributes: [],
   allowedChildrenCodes: [...ATOM_CODES_ALLOWED_CHILDREN]
 });
 
@@ -2626,6 +2627,65 @@ var getElementsSelector = ({
   return Array.from(elements);
 };
 
+// src/validation/validateLinkend.ts
+var findElementLinkedTo = (linkend, elementsToLink) => {
+  return elementsToLink.includes(linkend);
+};
+var LINK_TO_CROSS_CHECK = [
+  TABLE_LINK_ROLE,
+  FIGURE_LINK_ROLE,
+  EQUATION_LINK_ROLE,
+  FOOTNOTE_LINK_ROLE,
+  REFERENCE_LINK_ROLE
+];
+var LINK_BLOCKER_ROLES = [
+  TABLE_LINK_ROLE,
+  FIGURE_LINK_ROLE,
+  EQUATION_LINK_ROLE,
+  FOOTNOTE_LINK_ROLE
+];
+var validateLinkend = (linkElement, elementsToLink) => {
+  const linkend = linkElement.getAttribute("linkend");
+  if (!linkend) {
+    return [];
+  }
+  const isLinkFootnoteCue = linkElement.tagName.toUpperCase() === FOOTNOTE_LINK_SCHEMA.tag;
+  if (isLinkFootnoteCue) {
+    if (findElementLinkedTo(linkend, elementsToLink)) {
+      return [];
+    }
+    return [
+      createValidationIssue({
+        store: getStore(linkElement),
+        title: "Unlinked footnote cue",
+        kind: "unlinked",
+        description: "This footnote cue is not referenced to any footnote in this chapter. Please link it again manually.",
+        level: "blocker"
+      })
+    ];
+  }
+  const role = linkElement.getAttribute("role");
+  if (!role) {
+    return [];
+  }
+  if (!LINK_TO_CROSS_CHECK.includes(role)) {
+    return [];
+  }
+  if (findElementLinkedTo(linkend, elementsToLink)) {
+    return [];
+  }
+  const isBlocker = LINK_BLOCKER_ROLES.includes(role.toLowerCase());
+  return [
+    createValidationIssue({
+      store: getStore(linkElement),
+      title: "Unlinked element",
+      kind: "unlinked",
+      description: "This link is not referenced to any element in the current chapter or any other chapter. Please link it again manually.",
+      level: isBlocker ? "blocker" : "warning"
+    })
+  ];
+};
+
 // src/validation/validateFootnotes.ts
 var extractFootnoteNumber = (footnote) => {
   if (!footnote) return "no label";
@@ -2636,16 +2696,13 @@ var extractFootnoteNumber = (footnote) => {
   }
   return footnoteNumber;
 };
-var validateFootnoteCue = (footnoteElement, root) => {
+var validateFootnoteCue = (footnoteElement, linkElements) => {
   const errors = [];
   const linkend = footnoteElement.getAttribute("xmlid") || "";
   const footnoteNumber = footnoteElement.querySelector(
     FOOTNOTE_NUMBER_SCHEMA.tag
   );
-  const footnoteLink = root.querySelector(
-    `${FOOTNOTE_LINK_SCHEMA.tag}[linkend='${CSS.escape(linkend)}']`
-  );
-  if (footnoteLink) {
+  if (findElementLinkedTo(linkend, linkElements)) {
     return errors;
   }
   if (!footnoteNumber) {
@@ -2728,56 +2785,6 @@ var validateConsecutiveFootnoteCues = (root) => {
   return [];
 };
 
-// src/validation/validateLinkend.ts
-var findElementLinkedTo = (linkend, elementsToLink) => {
-  return elementsToLink.includes(linkend);
-};
-var LINK_BLOCKER_ROLES = [
-  TABLE_LINK_ROLE,
-  FIGURE_LINK_ROLE,
-  EQUATION_LINK_ROLE,
-  FOOTNOTE_LINK_ROLE,
-  CHAPTER_LINK_ROLE
-];
-var validateLinkend = (linkElement, elementsToLink) => {
-  const linkend = linkElement.getAttribute("linkend");
-  if (!linkend) {
-    return [];
-  }
-  const isLinkFootnoteCue = linkElement.tagName.toUpperCase() === FOOTNOTE_LINK_SCHEMA.tag;
-  if (isLinkFootnoteCue) {
-    if (findElementLinkedTo(linkend, elementsToLink)) {
-      return [];
-    }
-    return [
-      createValidationIssue({
-        store: getStore(linkElement),
-        title: "Unlinked footnote cue",
-        kind: "unlinked",
-        description: "This footnote cue is not referenced to any footnote in this chapter. Please link it again manually.",
-        level: "blocker"
-      })
-    ];
-  }
-  const role = linkElement.getAttribute("role");
-  if (!role) {
-    return [];
-  }
-  if (findElementLinkedTo(linkend, elementsToLink)) {
-    return [];
-  }
-  const isBlocker = LINK_BLOCKER_ROLES.includes(role.toLowerCase());
-  return [
-    createValidationIssue({
-      store: getStore(linkElement),
-      title: "Unlinked element",
-      kind: "unlinked",
-      description: "This link is not referenced to any element in the current chapter or any other chapter. Please link it again manually.",
-      level: isBlocker ? "blocker" : "warning"
-    })
-  ];
-};
-
 // src/validation/validateAttributes.ts
 var validateAttributes = (element, schema) => {
   const errors = [];
@@ -2909,21 +2916,6 @@ var validateChildren = (element, schema) => {
   return errors;
 };
 
-// src/validation/utils/getLinkableRoles.ts
-var getLinkableRoles = () => {
-  const linkRoleDefinition = findAttributeDefinitionByName(
-    LINK_SCHEMA.requiredAttributes,
-    "role"
-  );
-  if (!linkRoleDefinition) {
-    return [];
-  }
-  if (isAttributeRestricted(linkRoleDefinition)) {
-    return linkRoleDefinition.values;
-  }
-  return [];
-};
-
 // src/validation/validateReferences.ts
 var findElementLinkedTo2 = (xmlid, linkElements) => {
   return linkElements.includes(xmlid);
@@ -2959,7 +2951,18 @@ var isValidUri = (uri) => {
   return WEB_URI_REGEX.test(uri);
 };
 var validateUri = (uriElement) => {
-  const url = uriElement.textContent.trim();
+  const url = uriElement.getAttribute(LINK_ATTRIBUTE);
+  if (!url) {
+    return [
+      createValidationIssue({
+        store: getStore(uriElement),
+        title: "URL is required",
+        kind: "missing",
+        description: "URL is required. Please check and adjust.",
+        level: "warning"
+      })
+    ];
+  }
   if (isValidUri(url)) {
     return [];
   }
@@ -2985,16 +2988,14 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schemasToValidateAgainst.includes(schema.code)) {
       errors.push(...validateElementAgainstSchema(element, schema));
     }
-    const role = element.getAttribute("role");
-    const linkableRoles = getLinkableRoles();
-    if (schema.tag === LINK_SCHEMA.tag && role && linkableRoles.includes(role) || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
+    if (schema.tag === LINK_SCHEMA.tag || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
       errors.push(...validateLinkend(element, elementsToLink));
     }
     if (schema.tag === BIBLIOMIXED_SCHEMA.tag) {
       errors.push(...validateReferenceCited(element, linkElements));
     }
     if (schema.tag === FOOTNOTE_SCHEMA.tag) {
-      errors.push(...validateFootnoteCue(element, root));
+      errors.push(...validateFootnoteCue(element, linkElements));
     }
     if (schema.tag === URI_SCHEMA.tag) {
       errors.push(...validateUri(element));

package/dist/index.mjs

@@ -2268,12 +2268,13 @@ var LINK_SCHEMA = createSchema({
 });
 
 // src/schema/elementSchemas/inlineElements/uri.ts
+var LINK_ATTRIBUTE = "xlinkhref";
 var URI_SCHEMA = createSchema({
   code: "uri",
   kind: "inline",
   tag: URI_TAG,
-  requiredAttributes: [],
-  optionalAttributes: ["xlinkhref"],
+  requiredAttributes: [LINK_ATTRIBUTE],
+  optionalAttributes: [],
   allowedChildrenCodes: [...ATOM_CODES_ALLOWED_CHILDREN]
 });
 
@@ -2558,6 +2559,65 @@ var getElementsSelector = ({
   return Array.from(elements);
 };
 
+// src/validation/validateLinkend.ts
+var findElementLinkedTo = (linkend, elementsToLink) => {
+  return elementsToLink.includes(linkend);
+};
+var LINK_TO_CROSS_CHECK = [
+  TABLE_LINK_ROLE,
+  FIGURE_LINK_ROLE,
+  EQUATION_LINK_ROLE,
+  FOOTNOTE_LINK_ROLE,
+  REFERENCE_LINK_ROLE
+];
+var LINK_BLOCKER_ROLES = [
+  TABLE_LINK_ROLE,
+  FIGURE_LINK_ROLE,
+  EQUATION_LINK_ROLE,
+  FOOTNOTE_LINK_ROLE
+];
+var validateLinkend = (linkElement, elementsToLink) => {
+  const linkend = linkElement.getAttribute("linkend");
+  if (!linkend) {
+    return [];
+  }
+  const isLinkFootnoteCue = linkElement.tagName.toUpperCase() === FOOTNOTE_LINK_SCHEMA.tag;
+  if (isLinkFootnoteCue) {
+    if (findElementLinkedTo(linkend, elementsToLink)) {
+      return [];
+    }
+    return [
+      createValidationIssue({
+        store: getStore(linkElement),
+        title: "Unlinked footnote cue",
+        kind: "unlinked",
+        description: "This footnote cue is not referenced to any footnote in this chapter. Please link it again manually.",
+        level: "blocker"
+      })
+    ];
+  }
+  const role = linkElement.getAttribute("role");
+  if (!role) {
+    return [];
+  }
+  if (!LINK_TO_CROSS_CHECK.includes(role)) {
+    return [];
+  }
+  if (findElementLinkedTo(linkend, elementsToLink)) {
+    return [];
+  }
+  const isBlocker = LINK_BLOCKER_ROLES.includes(role.toLowerCase());
+  return [
+    createValidationIssue({
+      store: getStore(linkElement),
+      title: "Unlinked element",
+      kind: "unlinked",
+      description: "This link is not referenced to any element in the current chapter or any other chapter. Please link it again manually.",
+      level: isBlocker ? "blocker" : "warning"
+    })
+  ];
+};
+
 // src/validation/validateFootnotes.ts
 var extractFootnoteNumber = (footnote) => {
   if (!footnote) return "no label";
@@ -2568,16 +2628,13 @@ var extractFootnoteNumber = (footnote) => {
   }
   return footnoteNumber;
 };
-var validateFootnoteCue = (footnoteElement, root) => {
+var validateFootnoteCue = (footnoteElement, linkElements) => {
   const errors = [];
   const linkend = footnoteElement.getAttribute("xmlid") || "";
   const footnoteNumber = footnoteElement.querySelector(
     FOOTNOTE_NUMBER_SCHEMA.tag
   );
-  const footnoteLink = root.querySelector(
-    `${FOOTNOTE_LINK_SCHEMA.tag}[linkend='${CSS.escape(linkend)}']`
-  );
-  if (footnoteLink) {
+  if (findElementLinkedTo(linkend, linkElements)) {
     return errors;
   }
   if (!footnoteNumber) {
@@ -2660,56 +2717,6 @@ var validateConsecutiveFootnoteCues = (root) => {
   return [];
 };
 
-// src/validation/validateLinkend.ts
-var findElementLinkedTo = (linkend, elementsToLink) => {
-  return elementsToLink.includes(linkend);
-};
-var LINK_BLOCKER_ROLES = [
-  TABLE_LINK_ROLE,
-  FIGURE_LINK_ROLE,
-  EQUATION_LINK_ROLE,
-  FOOTNOTE_LINK_ROLE,
-  CHAPTER_LINK_ROLE
-];
-var validateLinkend = (linkElement, elementsToLink) => {
-  const linkend = linkElement.getAttribute("linkend");
-  if (!linkend) {
-    return [];
-  }
-  const isLinkFootnoteCue = linkElement.tagName.toUpperCase() === FOOTNOTE_LINK_SCHEMA.tag;
-  if (isLinkFootnoteCue) {
-    if (findElementLinkedTo(linkend, elementsToLink)) {
-      return [];
-    }
-    return [
-      createValidationIssue({
-        store: getStore(linkElement),
-        title: "Unlinked footnote cue",
-        kind: "unlinked",
-        description: "This footnote cue is not referenced to any footnote in this chapter. Please link it again manually.",
-        level: "blocker"
-      })
-    ];
-  }
-  const role = linkElement.getAttribute("role");
-  if (!role) {
-    return [];
-  }
-  if (findElementLinkedTo(linkend, elementsToLink)) {
-    return [];
-  }
-  const isBlocker = LINK_BLOCKER_ROLES.includes(role.toLowerCase());
-  return [
-    createValidationIssue({
-      store: getStore(linkElement),
-      title: "Unlinked element",
-      kind: "unlinked",
-      description: "This link is not referenced to any element in the current chapter or any other chapter. Please link it again manually.",
-      level: isBlocker ? "blocker" : "warning"
-    })
-  ];
-};
-
 // src/validation/validateAttributes.ts
 var validateAttributes = (element, schema) => {
   const errors = [];
@@ -2841,21 +2848,6 @@ var validateChildren = (element, schema) => {
   return errors;
 };
 
-// src/validation/utils/getLinkableRoles.ts
-var getLinkableRoles = () => {
-  const linkRoleDefinition = findAttributeDefinitionByName(
-    LINK_SCHEMA.requiredAttributes,
-    "role"
-  );
-  if (!linkRoleDefinition) {
-    return [];
-  }
-  if (isAttributeRestricted(linkRoleDefinition)) {
-    return linkRoleDefinition.values;
-  }
-  return [];
-};
-
 // src/validation/validateReferences.ts
 var findElementLinkedTo2 = (xmlid, linkElements) => {
   return linkElements.includes(xmlid);
@@ -2891,7 +2883,18 @@ var isValidUri = (uri) => {
   return WEB_URI_REGEX.test(uri);
 };
 var validateUri = (uriElement) => {
-  const url = uriElement.textContent.trim();
+  const url = uriElement.getAttribute(LINK_ATTRIBUTE);
+  if (!url) {
+    return [
+      createValidationIssue({
+        store: getStore(uriElement),
+        title: "URL is required",
+        kind: "missing",
+        description: "URL is required. Please check and adjust.",
+        level: "warning"
+      })
+    ];
+  }
   if (isValidUri(url)) {
     return [];
   }
@@ -2917,16 +2920,14 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schemasToValidateAgainst.includes(schema.code)) {
       errors.push(...validateElementAgainstSchema(element, schema));
     }
-    const role = element.getAttribute("role");
-    const linkableRoles = getLinkableRoles();
-    if (schema.tag === LINK_SCHEMA.tag && role && linkableRoles.includes(role) || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
+    if (schema.tag === LINK_SCHEMA.tag || schema.tag === FOOTNOTE_LINK_SCHEMA.tag) {
       errors.push(...validateLinkend(element, elementsToLink));
     }
     if (schema.tag === BIBLIOMIXED_SCHEMA.tag) {
       errors.push(...validateReferenceCited(element, linkElements));
     }
     if (schema.tag === FOOTNOTE_SCHEMA.tag) {
-      errors.push(...validateFootnoteCue(element, root));
+      errors.push(...validateFootnoteCue(element, linkElements));
     }
     if (schema.tag === URI_SCHEMA.tag) {
       errors.push(...validateUri(element));

package/package.json

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