@hyperframes/lint 0.8.180 → 0.8.183

package/dist/browser.js

@@ -115,11 +115,13 @@ function readAttr(tagSource, attr) {
 function hasAttrName(tagSource, attr) {
   return readDecodedAttr(tagSource, attr) !== null;
 }
+function isAudibleVideo(attr) {
+  if (attr("muted") !== null) return false;
+  const declared = attr("data-has-audio");
+  return declared === null || declared === "true";
+}
 function isAudibleVideoTag(tagSource) {
-  if (hasAttrName(tagSource, "muted")) return false;
-  if (!hasAttrName(tagSource, "data-has-audio")) return true;
-  const declared = readAttr(tagSource, "data-has-audio");
-  return declared === "true";
+  return isAudibleVideo((name) => readDecodedAttr(tagSource, name));
 }
 function mediaTimeWindow(tagSource) {
   const start = Number(readAttr(tagSource, "data-start"));

package/dist/index.js

@@ -115,11 +115,13 @@ function readAttr(tagSource, attr) {
 function hasAttrName(tagSource, attr) {
   return readDecodedAttr(tagSource, attr) !== null;
 }
+function isAudibleVideo(attr) {
+  if (attr("muted") !== null) return false;
+  const declared = attr("data-has-audio");
+  return declared === null || declared === "true";
+}
 function isAudibleVideoTag(tagSource) {
-  if (hasAttrName(tagSource, "muted")) return false;
-  if (!hasAttrName(tagSource, "data-has-audio")) return true;
-  const declared = readAttr(tagSource, "data-has-audio");
-  return declared === "true";
+  return isAudibleVideo((name) => readDecodedAttr(tagSource, name));
 }
 function mediaTimeWindow(tagSource) {
   const start = Number(readAttr(tagSource, "data-start"));
@@ -6652,6 +6654,17 @@ import { existsSync as existsSync2, readFileSync, readdirSync } from "fs";
 import { dirname as dirname2, extname, join as join3, relative as relative2, resolve } from "path";
 import { rewriteAssetPath as rewriteAssetPath2 } from "@hyperframes/parsers/asset-paths";
 import { spansOverlap } from "@hyperframes/parsers/time-spans";
+import {
+  compositionOriginSeconds,
+  cutToHostSlots,
+  MEDIA_START_BASIS_ATTR,
+  resolveMediaStartSeconds
+} from "@hyperframes/parsers/media-timing";
+import { parseNumeric as parseNumeric2 } from "@hyperframes/parsers/composition-contract";
+import {
+  resolveReferencedDuration,
+  resolveReferencedStart
+} from "@hyperframes/parsers/reference-resolver";
 import { checkSubCompositionUsability } from "@hyperframes/parsers/sub-composition-validity";
 import { parseHTML as parseHTML3 } from "linkedom";
 import {
@@ -7112,7 +7125,7 @@ async function lintProject(projectDir, entryFile, hostOptions = {}) {
     ...lintTextureMaskAssetNotFound(projectDir, allHtmlSources),
     ...!entryFile ? lintMultipleRootCompositions(projectDir) : [],
     ...!entryFile ? lintBlankRootWithStandaloneComposition(rootHtml, allHtmlSources) : [],
-    ...lintDuplicateAudioTracks(allHtmlSources),
+    ...lintDuplicateAudioTracks(projectDir, rootHtml),
     ...lintMissingOrEmptySubComposition(projectDir, rootHtml),
     ...await lintVideoMediaStartPastEof(projectDir, allHtmlSources),
     ...await lintHevcPreviewCodec(collectLocalVideoCandidates(projectDir, allHtmlSources))
@@ -7321,30 +7334,77 @@ function lintMultipleRootCompositions(projectDir) {
   }
   return findings;
 }
-function lintDuplicateAudioTracks(htmlSources) {
-  const findings = [];
-  const tracks = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const { html } of htmlSources) {
-    const soundTagRe = /<(?:audio|video)\b[^>]*>/gi;
-    let match;
-    while ((match = soundTagRe.exec(html)) !== null) {
-      const tag = match[0];
-      if (/^<video/i.test(tag) && !isAudibleVideoTag(tag)) continue;
-      const trackStr = readAttr(tag, "data-track-index");
-      const startStr = readAttr(tag, "data-start");
-      const durStr = readAttr(tag, "data-duration");
-      const src = readDecodedAttr(tag, "src") || "unknown";
-      if (!trackStr || !startStr) continue;
-      const trackIndex = parseInt(trackStr, 10);
-      const start = parseFloat(startStr);
-      const duration = durStr ? parseFloat(durStr) : Infinity;
-      const key = `${src}:${start}:${duration}:${trackIndex}`;
-      if (seen.has(key)) continue;
-      seen.add(key);
-      tracks.push({ trackIndex, start, end: start + duration, src });
+var timingFile = (doc) => ({ doc, starts: /* @__PURE__ */ new Map() });
+var localStart = (file, el) => resolveReferencedStart(file.doc, el, file.starts, /* @__PURE__ */ new Set());
+var localDuration = (file, el) => resolveReferencedDuration(file.doc, el, file.starts, /* @__PURE__ */ new Set());
+function collectMainTimelineAudio(projectDir, rootHtml) {
+  const spans = [];
+  const mount = (html, at) => {
+    const { document: document2 } = parseHTML3(html);
+    const root = querySelectorAllIncludingTemplates(document2, "[data-composition-id]")[0];
+    if (root) visit(root, { ...at, file: timingFile(document2) });
+  };
+  const visit = (parent, at) => {
+    for (const el of parent.children) {
+      if (el.tagName === "TEMPLATE") {
+        visit(el.content, at);
+        continue;
+      }
+      const span = audioSpanOf(el, at.file, at.origin, at.slots);
+      if (span) spans.push(span);
+      const scope = nestedScopeOf(el, at.file, at.origin, at.slots);
+      if (!scope) {
+        visit(el, at);
+        continue;
+      }
+      const inner = { ...at, ...scope };
+      const src = el.getAttribute("data-composition-src")?.trim();
+      const file = src && !isUnresolvedAssetPlaceholder2(src) && !isRemoteOrInlineUrl2(src);
+      const filePath = file ? resolve(projectDir, src) : null;
+      if (filePath && !at.mounting.includes(filePath)) {
+        const read = readProjectFile2(filePath);
+        if (read.kind === "file")
+          mount(read.text, { ...inner, mounting: [...at.mounting, filePath] });
+      }
+      visit(el, inner);
     }
+  };
+  const { document } = parseHTML3(rootHtml);
+  visit(document, { file: timingFile(document), origin: 0, slots: [], mounting: [] });
+  return spans;
+}
+function nestedScopeOf(el, file, origin, slots) {
+  if (!el.hasAttribute("data-composition-id") && !el.hasAttribute("data-composition-src")) {
+    return null;
+  }
+  const start = origin + localStart(file, el);
+  const duration = localDuration(file, el);
+  const window = duration === null ? [] : [{ start, end: start + duration }];
+  return { origin: compositionOriginSeconds(start, el), slots: [...slots, ...window] };
+}
+function audioSpanOf(el, file, origin, slots) {
+  const tag = el.tagName.toLowerCase();
+  if (tag !== "audio" && !(tag === "video" && isAudibleVideo((name) => el.getAttribute(name)))) {
+    return null;
   }
+  const trackStr = el.getAttribute("data-track-index");
+  if (!trackStr || !el.hasAttribute("data-start")) return null;
+  const start = resolveMediaStartSeconds({
+    authoredStart: parseNumeric2(el.getAttribute("data-start")),
+    hostStart: origin,
+    hasAutoStart: el.hasAttribute("data-hf-auto-start"),
+    basis: el.getAttribute(MEDIA_START_BASIS_ATTR),
+    ordinaryStart: () => origin + localStart(file, el)
+  });
+  const duration = parseNumeric2(el.getAttribute("data-duration")) ?? localDuration(file, el);
+  const kept = cutToHostSlots({ start, end: start + (duration ?? Infinity) }, slots);
+  if (kept.end <= kept.start) return null;
+  return { trackIndex: parseInt(trackStr, 10), ...kept, src: el.getAttribute("src") || "unknown" };
+}
+var formatSeconds = (t) => Number.isFinite(t) ? String(Number(t.toFixed(2))) : "end";
+function lintDuplicateAudioTracks(projectDir, rootHtml) {
+  const findings = [];
+  const tracks = collectMainTimelineAudio(projectDir, rootHtml);
   for (let i = 0; i < tracks.length; i++) {
     for (let j = i + 1; j < tracks.length; j++) {
       const a = tracks[i];
@@ -7354,7 +7414,7 @@ function lintDuplicateAudioTracks(htmlSources) {
         findings.push({
           code: "duplicate_audio_track",
           severity: "warning",
-          message: `Multiple audible <audio>/<video> elements on track ${a.trackIndex} overlap (${a.src} at ${a.start}-${Number.isFinite(a.end) ? a.end.toFixed(1) : "end"}s, ${b.src} at ${b.start}-${Number.isFinite(b.end) ? b.end.toFixed(1) : "end"}s). This causes layered audio playback.`,
+          message: `Multiple audible <audio>/<video> elements on track ${a.trackIndex} overlap (${a.src} at ${formatSeconds(a.start)}-${formatSeconds(a.end)}s, ${b.src} at ${formatSeconds(b.start)}-${formatSeconds(b.end)}s). This causes layered audio playback.`,
           fixHint: "Use non-overlapping time windows or different track indices."
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/lint",
-  "version": "0.8.180",
+  "version": "0.8.183",
   "repository": {
     "type": "git",
     "url": "https://github.com/heygen-com/hyperframes",
@@ -35,7 +35,7 @@
     "linkedom": "^0.18.12",
     "postcss": "^8.5.8",
     "postcss-selector-parser": "^7.1.4",
-    "@hyperframes/parsers": "0.8.180"
+    "@hyperframes/parsers": "0.8.183"
   },
   "devDependencies": {
     "@types/node": "^25.0.10",