ssml-builder-js 2.14.0 → 2.16.0

package/dist/core.mjs

@@ -8,15 +8,17 @@ import {
   fromPlainTextToSsml,
   getAzureVoiceCatalogMetadata,
   getBuiltInVoiceCatalogMetadata,
+  getSsmlSourceMap,
   isValidAzureAudioDuration,
   mapSsmlTextNodes,
   normalizeAzureLanguage,
   parseSsml,
   splitSsmlDocument,
   validateAzureSsml,
+  validateAzureSsmlChunks,
   validateSsml,
   validateSsmlStructureIntegrity
-} from "./chunk-AQ55MOPU.mjs";
+} from "./chunk-NKLZGITR.mjs";
 import "./chunk-6S5ODO6A.mjs";
 export {
   areAzureLanguagesEquivalent,
@@ -28,12 +30,14 @@ export {
   fromPlainTextToSsml,
   getAzureVoiceCatalogMetadata,
   getBuiltInVoiceCatalogMetadata,
+  getSsmlSourceMap,
   isValidAzureAudioDuration,
   mapSsmlTextNodes,
   normalizeAzureLanguage,
   parseSsml,
   splitSsmlDocument,
   validateAzureSsml,
+  validateAzureSsmlChunks,
   validateSsml,
   validateSsmlStructureIntegrity
 };

package/dist/elements.js

@@ -1024,34 +1024,51 @@ function createAzureUrlValidatorRunner(validator, options = {}) {
   const inFlight = /* @__PURE__ */ new Map();
   const waiters = [];
   let active = 0;
-  const acquire = async () => {
+  const configuredSignal = options.signal ?? new AbortController().signal;
+  const acquire = async (signal) => {
+    if (signal.aborted) throw new Error("URL validation was aborted.");
     if (active < concurrency) {
       active += 1;
       return;
     }
-    await new Promise((resolve) => waiters.push(resolve));
+    await new Promise((resolve, reject) => {
+      let waiter;
+      const abortHandler = () => {
+        const index = waiters.indexOf(waiter);
+        if (index >= 0) waiters.splice(index, 1);
+        signal.removeEventListener("abort", abortHandler);
+        reject(new Error("URL validation was aborted."));
+      };
+      signal.addEventListener("abort", abortHandler, { once: true });
+      waiter = () => {
+        signal.removeEventListener("abort", abortHandler);
+        resolve();
+      };
+      waiters.push(waiter);
+    });
     active += 1;
   };
   const release = () => {
     active -= 1;
     waiters.shift()?.();
   };
-  const check = async (url, context) => {
-    if (options.signal?.aborted) throw new Error("URL validation was aborted.");
-    const cached = cache.get(url);
+  const check = async (url, context, signal = configuredSignal) => {
+    if (signal.aborted) throw new Error("URL validation was aborted.");
+    const key = `${context.tag}:${context.attribute}:${url}`;
+    const cached = cache.get(key);
     if (cached !== void 0) return cached;
-    const existing = inFlight.get(url);
+    const existing = inFlight.get(key);
     if (existing) return existing;
     const promise = (async () => {
-      await acquire();
+      await acquire(signal);
       try {
-        if (options.signal?.aborted) throw new Error("URL validation was aborted.");
-        const validation = Promise.resolve(validator(url, context));
+        if (signal.aborted) throw new Error("URL validation was aborted.");
+        const validation = Promise.resolve(validator(url, context, signal));
         let timer;
         let abortHandler;
         const cancellation = new Promise((_resolve, reject) => {
           abortHandler = () => reject(new Error("URL validation was aborted."));
-          options.signal?.addEventListener("abort", abortHandler, { once: true });
+          signal.addEventListener("abort", abortHandler, { once: true });
           if (options.timeoutMs !== void 0 && options.timeoutMs > 0) {
             timer = setTimeout(
               () => reject(new Error(`URL validation timed out after ${options.timeoutMs} ms.`)),
@@ -1061,24 +1078,24 @@ function createAzureUrlValidatorRunner(validator, options = {}) {
         });
         try {
           const result = await (timer || abortHandler ? Promise.race([validation, cancellation]) : validation);
-          cache.set(url, result);
+          cache.set(key, result);
           return result;
         } finally {
           if (timer) clearTimeout(timer);
-          if (abortHandler) options.signal?.removeEventListener("abort", abortHandler);
+          if (abortHandler) signal.removeEventListener("abort", abortHandler);
         }
       } finally {
         release();
       }
     })();
-    inFlight.set(url, promise);
+    inFlight.set(key, promise);
     try {
       return await promise;
     } finally {
-      inFlight.delete(url);
+      inFlight.delete(key);
     }
   };
-  return (url, context) => check(url, context);
+  return (url, context, signal) => check(url, context, signal ?? configuredSignal);
 }
 var ALLOWED_BREAK_STRENGTHS = /* @__PURE__ */ new Set(["none", "x-weak", "weak", "medium", "strong", "x-strong"]);
 var ALLOWED_SAY_AS = /* @__PURE__ */ new Set([
@@ -1191,6 +1208,7 @@ function tokenizeElements(source) {
     if (parent) parent.childElementCount += 1;
     const parentVoiceName = [...openElements].reverse().find((element) => element.voiceName)?.voiceName;
     const tokenName = nameMatch[1];
+    const path = parent ? [...parent.path, `${tokenName}[${childElementIndex ?? 0}]`] : [tokenName];
     const tokenVoiceName = tokenName.toLowerCase() === "voice" ? attributes.get("name") : tokenName.toLowerCase() === "mstts:turn" ? attributes.get("voice") ?? parentVoiceName : parentVoiceName;
     tokens.push({
       attributes,
@@ -1201,12 +1219,14 @@ function tokenizeElements(source) {
       parentName: parent?.name,
       parentVoiceName,
       selfClosing,
-      start
+      start,
+      path
     });
     if (!selfClosing) {
       openElements.push({
         childElementCount: 0,
         name: tokenName,
+        path,
         voiceName: tokenVoiceName
       });
     }
@@ -1219,13 +1239,14 @@ function location(source, offset) {
   const line = before.split("\n").length;
   return { line, column: before.length - (before.lastIndexOf("\n") + 1) + 1 };
 }
-function addDiagnostic(diagnostics, source, offset, message, severity = "error", code2) {
+function addDiagnostic(diagnostics, source, offset, message, severity = "error", code2, metadata = {}) {
   diagnostics.push({
     ...location(source, offset),
     message,
     severity,
     source: "ssml-static-validator",
-    ...code2 ? { code: code2 } : {}
+    ...code2 ? { code: code2 } : {},
+    ...metadata
   });
 }
 function isSupportedProsodyRate(value) {
@@ -1688,9 +1709,11 @@ function validateAzureSsmlStatic(ssml, options = {}) {
   for (const token of tokens) {
     const tokenName = token.name.toLowerCase();
     const tokenVoiceName = tokenName === "voice" ? attr(token, "name")?.trim() : tokenName === "mstts:turn" ? attr(token, "voice")?.trim() || token.parentVoiceName : options.validateNestedVoices === false ? voiceName : token.parentVoiceName;
+    const tokenDiagnosticStart = diagnostics.length;
     validateElement(token, ssml, diagnostics, tokenVoiceName, options, voiceCatalog);
     const definition = tokenVoiceName ? voiceCatalog.get(tokenVoiceName.toLowerCase()) : void 0;
     validateVoiceFeatureMatrix(token, ssml, diagnostics, tokenVoiceName, definition);
+    annotateTokenDiagnostics(diagnostics, tokenDiagnosticStart, token, options, tokenVoiceName);
     if (tokenName === "voice" && options.model && definition?.models && !definition.models.some((model) => model.toLowerCase() === options.model?.toLowerCase())) {
       addDiagnostic(
         diagnostics,
@@ -1712,18 +1735,37 @@ function urlAttributes(token) {
     return value === void 0 ? [] : [{ attribute, value }];
   });
 }
+function annotateTokenDiagnostics(diagnostics, startIndex, token, options, voiceName) {
+  const attributes = [...token.attributes.keys()];
+  for (const diagnostic of diagnostics.slice(startIndex)) {
+    const attributeName = attributes.find(
+      (attribute) => new RegExp(`(?:<[^> ]+\\s+|")${attribute}(?:"|>|\\s)`, "i").test(diagnostic.message)
+    );
+    const nodePath = options.sourceNodePath ? [...options.sourceNodePath] : [...token.path];
+    Object.assign(diagnostic, {
+      range: { start: token.start, end: token.end + 1 },
+      tagName: token.name,
+      ...attributeName ? { attributeName } : {},
+      ...voiceName ? { voiceName } : {},
+      ...options.chunkIndex !== void 0 ? { chunkIndex: options.chunkIndex } : {},
+      nodePath,
+      targetNodePath: [...token.path]
+    });
+  }
+}
 function validateAzureSsml(ssml, options = {}) {
   const diagnostics = validateAzureSsmlStatic(ssml, options);
   const validator = options.urlValidator ?? options.customUrlValidator;
   if (!validator || typeof ssml !== "string") return diagnostics;
   const runnerOptions = options.urlValidation ?? {};
-  const boundedValidator = createAzureUrlValidatorRunner(validator, {
+  const boundedValidator = options.urlValidatorRunner ?? createAzureUrlValidatorRunner(validator, {
     ...runnerOptions,
     ...options.urlValidatorConcurrency !== void 0 ? { concurrency: options.urlValidatorConcurrency } : {},
     ...options.urlValidatorTimeoutMs !== void 0 ? { timeoutMs: options.urlValidatorTimeoutMs } : {},
     ...options.urlValidatorSignal ? { signal: options.urlValidatorSignal } : {},
     ...options.urlValidatorCache ? { cache: options.urlValidatorCache } : {}
   });
+  const validationSignal = options.urlValidatorSignal ?? options.urlValidation?.signal ?? new AbortController().signal;
   let tokens;
   try {
     tokens = tokenizeElements(ssml);
@@ -1733,25 +1775,33 @@ function validateAzureSsml(ssml, options = {}) {
   const checks = tokens.flatMap(
     (token) => urlAttributes(token).map(async ({ attribute, value }) => {
       try {
-        const result = await boundedValidator(value, { tag: token.name, attribute });
+        const result = await boundedValidator(
+          value,
+          { tag: token.name, attribute, ...options.sourceNodePath ? { sourceNodePath: options.sourceNodePath } : {} },
+          validationSignal
+        );
         const valid = typeof result === "boolean" ? result : result.valid;
         if (!valid) {
           const reason = typeof result === "boolean" ? void 0 : result.reason;
+          const diagnosticStart = diagnostics.length;
           addDiagnostic(
             diagnostics,
             ssml,
             token.start,
             `<${token.name} ${attribute}> was rejected by the custom URL validator${reason ? `: ${reason}` : "."}`
           );
+          annotateTokenDiagnostics(diagnostics, diagnosticStart, token, options, token.parentVoiceName);
         }
       } catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
+        const diagnosticStart = diagnostics.length;
         addDiagnostic(
           diagnostics,
           ssml,
           token.start,
           `<${token.name} ${attribute}> could not be validated by the custom URL validator: ${reason}`
         );
+        annotateTokenDiagnostics(diagnostics, diagnosticStart, token, options, token.parentVoiceName);
       }
     })
   );