ssml-builder-js 2.14.0 → 2.15.0

package/dist/core.mjs

@@ -8,6 +8,7 @@ import {
   fromPlainTextToSsml,
   getAzureVoiceCatalogMetadata,
   getBuiltInVoiceCatalogMetadata,
+  getSsmlSourceMap,
   isValidAzureAudioDuration,
   mapSsmlTextNodes,
   normalizeAzureLanguage,
@@ -16,7 +17,7 @@ import {
   validateAzureSsml,
   validateSsml,
   validateSsmlStructureIntegrity
-} from "./chunk-AQ55MOPU.mjs";
+} from "./chunk-FXUM45ZY.mjs";
 import "./chunk-6S5ODO6A.mjs";
 export {
   areAzureLanguagesEquivalent,
@@ -28,6 +29,7 @@ export {
   fromPlainTextToSsml,
   getAzureVoiceCatalogMetadata,
   getBuiltInVoiceCatalogMetadata,
+  getSsmlSourceMap,
   isValidAzureAudioDuration,
   mapSsmlTextNodes,
   normalizeAzureLanguage,

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([
@@ -1724,6 +1741,7 @@ function validateAzureSsml(ssml, options = {}) {
     ...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,7 +1751,11 @@ 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;