pro-editor-schema 1.1.1 → 1.1.3

package/dist/index.d.mts

@@ -93,7 +93,7 @@ declare const INLINE_ELEMENT_SCHEMAS: Record<InlineSchemaCode, Schema>;
 declare const ATOM_SCHEMAS: Record<AtomSchemaCode, Schema>;
 
 type ValidationErrorLevel = "blocker" | "warning" | "info";
-type ValidationErrorKind = "unlinked" | "forbidden" | "missing" | "converted";
+type ValidationErrorKind = "unlinked" | "forbidden" | "missing" | "converted" | "possible-url" | "unreachable-url";
 type ValidationError = {
     id: string;
     store: string;

package/dist/index.d.ts

@@ -93,7 +93,7 @@ declare const INLINE_ELEMENT_SCHEMAS: Record<InlineSchemaCode, Schema>;
 declare const ATOM_SCHEMAS: Record<AtomSchemaCode, Schema>;
 
 type ValidationErrorLevel = "blocker" | "warning" | "info";
-type ValidationErrorKind = "unlinked" | "forbidden" | "missing" | "converted";
+type ValidationErrorKind = "unlinked" | "forbidden" | "missing" | "converted" | "possible-url" | "unreachable-url";
 type ValidationError = {
     id: string;
     store: string;

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -2970,42 +2980,52 @@ 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);
+// src/validation/validateWeblink.ts
+var import_mark = __toESM(require("mark.js"));
+var WEB_URI_PATTERN = "(?:(?:https?):\\/\\/)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,}(?::\\d{1,5})?(?:\\/[^\\s]*)?";
+var WEB_URI_IN_TEXT_REGEX = new RegExp(WEB_URI_PATTERN, "gi");
+var POSSIBLE_WEBLINK_EXCLUDE_SELECTORS = [
+  "tag",
+  "tag *",
+  ".del",
+  "del *",
+  "uri",
+  "uri *",
+  "query",
+  "query *",
+  "comment",
+  "comment *",
+  ...IGNORED_ELEMENT_SELECTORS
+];
+var collectPossibleWebLinks = (content) => {
+  const clone = content.cloneNode(true);
+  const possibleWebLinks = /* @__PURE__ */ new Set();
+  const instance = new import_mark.default(clone);
+  instance.markRegExp(WEB_URI_IN_TEXT_REGEX, {
+    acrossElements: true,
+    exclude: POSSIBLE_WEBLINK_EXCLUDE_SELECTORS,
+    filter: (_textNode, term) => {
+      possibleWebLinks.add(term);
+      return true;
+    }
+  });
+  return possibleWebLinks;
 };
-var validateUri = (uriElement) => {
-  const url = uriElement.getAttribute(LINK_ATTRIBUTE);
-  if (!url) {
-    return [
+var validatePossibleWeblinks = (root) => {
+  const errors = [];
+  const possibleWebLinks = collectPossibleWebLinks(root);
+  for (const possibleWebLink of possibleWebLinks) {
+    errors.push(
       createValidationIssue({
-        store: getStore(uriElement),
-        title: "URL is required",
-        kind: "missing",
-        description: "URL is required. Please check and adjust.",
+        store: possibleWebLink,
+        title: "Possible web link",
+        kind: "possible-url",
+        description: "This looks like a URL. Would you like to add weblink tags?",
         level: "warning"
       })
-    ];
-  }
-  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"
-    })
-  ];
+  return errors;
 };
 
 // src/validation/validateXml.ts
@@ -3028,9 +3048,6 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schema.tag === FOOTNOTE_SCHEMA.tag) {
       errors.push(...validateFootnoteCue(element, linkElements));
     }
-    if (schema.tag === URI_SCHEMA.tag) {
-      errors.push(...validateUri(element));
-    }
     if (isIgnoredValidation(schema.code)) {
       return errors;
     }
@@ -3052,6 +3069,7 @@ var validateXml = (xml, elementsToLink, linkElements, schemasToValidateAgainst)
   const errors = [];
   errors.push(...validateConsecutiveFootnotes(xml));
   errors.push(...validateConsecutiveFootnoteCues(xml));
+  errors.push(...validatePossibleWeblinks(xml));
   for (const child of Array.from(xml.children)) {
     errors.push(
       ...validateElement(

package/dist/index.mjs

@@ -2902,42 +2902,52 @@ 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);
+// src/validation/validateWeblink.ts
+import Mark from "mark.js";
+var WEB_URI_PATTERN = "(?:(?:https?):\\/\\/)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,}(?::\\d{1,5})?(?:\\/[^\\s]*)?";
+var WEB_URI_IN_TEXT_REGEX = new RegExp(WEB_URI_PATTERN, "gi");
+var POSSIBLE_WEBLINK_EXCLUDE_SELECTORS = [
+  "tag",
+  "tag *",
+  ".del",
+  "del *",
+  "uri",
+  "uri *",
+  "query",
+  "query *",
+  "comment",
+  "comment *",
+  ...IGNORED_ELEMENT_SELECTORS
+];
+var collectPossibleWebLinks = (content) => {
+  const clone = content.cloneNode(true);
+  const possibleWebLinks = /* @__PURE__ */ new Set();
+  const instance = new Mark(clone);
+  instance.markRegExp(WEB_URI_IN_TEXT_REGEX, {
+    acrossElements: true,
+    exclude: POSSIBLE_WEBLINK_EXCLUDE_SELECTORS,
+    filter: (_textNode, term) => {
+      possibleWebLinks.add(term);
+      return true;
+    }
+  });
+  return possibleWebLinks;
 };
-var validateUri = (uriElement) => {
-  const url = uriElement.getAttribute(LINK_ATTRIBUTE);
-  if (!url) {
-    return [
+var validatePossibleWeblinks = (root) => {
+  const errors = [];
+  const possibleWebLinks = collectPossibleWebLinks(root);
+  for (const possibleWebLink of possibleWebLinks) {
+    errors.push(
       createValidationIssue({
-        store: getStore(uriElement),
-        title: "URL is required",
-        kind: "missing",
-        description: "URL is required. Please check and adjust.",
+        store: possibleWebLink,
+        title: "Possible web link",
+        kind: "possible-url",
+        description: "This looks like a URL. Would you like to add weblink tags?",
         level: "warning"
       })
-    ];
-  }
-  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"
-    })
-  ];
+  return errors;
 };
 
 // src/validation/validateXml.ts
@@ -2960,9 +2970,6 @@ var validateElement = (element, root, elementsToLink, linkElements, schemasToVal
     if (schema.tag === FOOTNOTE_SCHEMA.tag) {
       errors.push(...validateFootnoteCue(element, linkElements));
     }
-    if (schema.tag === URI_SCHEMA.tag) {
-      errors.push(...validateUri(element));
-    }
     if (isIgnoredValidation(schema.code)) {
       return errors;
     }
@@ -2984,6 +2991,7 @@ var validateXml = (xml, elementsToLink, linkElements, schemasToValidateAgainst)
   const errors = [];
   errors.push(...validateConsecutiveFootnotes(xml));
   errors.push(...validateConsecutiveFootnoteCues(xml));
+  errors.push(...validatePossibleWeblinks(xml));
   for (const child of Array.from(xml.children)) {
     errors.push(
       ...validateElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-editor-schema",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Pro Editor XML schemas",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,11 +26,15 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
+    "@types/mark.js": "^8.11.12",
     "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"
+  },
+  "dependencies": {
+    "mark.js": "^8.11.1"
   }
 }