@hyperframes/parsers 0.8.220 → 0.8.222

package/dist/assetResolution.js

@@ -122,8 +122,9 @@ import { posix } from "path";
 
 // src/assetPaths.ts
 import { isAbsolute, relative, resolve } from "path";
+var URL_SCHEME_OF_TWO_OR_MORE_CHARS_RE = /^[a-z][a-z0-9+.-]+:/i;
 function isNonRelativeUrl(val) {
-  return !val || val.startsWith("http://") || val.startsWith("https://") || val.startsWith("//") || val.startsWith("data:") || val.startsWith("#") || val.startsWith("/");
+  return !val || val.startsWith("http://") || val.startsWith("https://") || val.startsWith("//") || val.startsWith("data:") || val.startsWith("#") || val.startsWith("/") || URL_SCHEME_OF_TWO_OR_MORE_CHARS_RE.test(val);
 }
 
 // src/rewriteSubCompPaths.ts

package/dist/assets.d.ts

@@ -85,4 +85,6 @@ declare function rewriteInlineStyleAssetUrls<T>(elements: Iterable<T>, compSrcPa
  */
 declare function rewriteCssAssetUrls(cssText: string, compSrcPath: string, assetExists?: AssetExists): string;
 
-export { type AssetExists, CSS_URL_RE, PATH_ATTRS, isNonRelativeUrl, isPathInside, rewriteAssetPath, rewriteAssetPaths, rewriteCssAssetUrls, rewriteInlineStyleAssetUrls };
+declare function rewriteSrcsetUrls(srcset: string, rewriteUrl: (url: string) => string): string;
+
+export { type AssetExists, CSS_URL_RE, PATH_ATTRS, isNonRelativeUrl, isPathInside, rewriteAssetPath, rewriteAssetPaths, rewriteCssAssetUrls, rewriteInlineStyleAssetUrls, rewriteSrcsetUrls };

package/dist/assets.js

@@ -41,8 +41,9 @@ function decodeCssEscapes(text) {
 // src/assetPaths.ts
 var CSS_URL_RE = /\burl\(\s*(["']?)([^)"'\s](?:[^)"']*[^)"'\s])?)\1\s*\)/g;
 var PATH_ATTRS = ["src", "href"];
+var URL_SCHEME_OF_TWO_OR_MORE_CHARS_RE = /^[a-z][a-z0-9+.-]+:/i;
 function isNonRelativeUrl(val) {
-  return !val || val.startsWith("http://") || val.startsWith("https://") || val.startsWith("//") || val.startsWith("data:") || val.startsWith("#") || val.startsWith("/");
+  return !val || val.startsWith("http://") || val.startsWith("https://") || val.startsWith("//") || val.startsWith("data:") || val.startsWith("#") || val.startsWith("/") || URL_SCHEME_OF_TWO_OR_MORE_CHARS_RE.test(val);
 }
 var LEADING_PARENT_SEGMENT_RE = /^\.\.(?:[\\/]|$)/;
 function isPathInside(childPath, parentPath) {
@@ -55,6 +56,48 @@ function isPathInside(childPath, parentPath) {
 
 // src/rewriteSubCompPaths.ts
 import { posix } from "path";
+
+// src/srcset.ts
+function skipSrcsetDescriptors(srcset, position) {
+  let inParens = false;
+  while (position < srcset.length) {
+    const char = srcset.charAt(position++);
+    if (char === "(") inParens = true;
+    else if (char === ")") inParens = false;
+    else if (char === "," && !inParens) break;
+  }
+  return position;
+}
+function readSrcsetUrl(srcset, position) {
+  while (position < srcset.length && /[ \t\n\r\f,]/.test(srcset.charAt(position))) position++;
+  const start = position;
+  while (position < srcset.length && !/[ \t\n\r\f]/.test(srcset.charAt(position))) position++;
+  let end = position;
+  while (end > start && srcset.charAt(end - 1) === ",") end--;
+  return { start, end, next: position };
+}
+function rewriteSrcsetUrls(srcset, rewriteUrl) {
+  const parts = [];
+  let position = 0;
+  let written = 0;
+  while (position < srcset.length) {
+    const { start, end, next } = readSrcsetUrl(srcset, position);
+    position = next;
+    if (end > start) {
+      const url = srcset.slice(start, end);
+      const rewritten = rewriteUrl(url);
+      if (rewritten !== url) {
+        parts.push(srcset.slice(written, start), rewritten);
+        written = end;
+      }
+    }
+    if (end < position) continue;
+    position = skipSrcsetDescriptors(srcset, position);
+  }
+  return parts.length > 0 ? parts.join("") + srcset.slice(written) : srcset;
+}
+
+// src/rewriteSubCompPaths.ts
 var { join, resolve: resolve2, dirname } = posix;
 var isAbsoluteOrSpecial = isNonRelativeUrl;
 function needsRewrite(val) {
@@ -76,11 +119,18 @@ function rewriteAssetPaths(elements, compSrcPath, getAttr, setAttr, assetExists)
   for (const el of elements) {
     for (const attr of PATH_ATTRS) {
       const val = (getAttr(el, attr) || "").trim();
-      const rewritten = rewriteAssetPath(compSrcPath, val, assetExists);
-      if (rewritten !== val) {
-        setAttr(el, attr, rewritten);
+      const rewritten2 = rewriteAssetPath(compSrcPath, val, assetExists);
+      if (rewritten2 !== val) {
+        setAttr(el, attr, rewritten2);
       }
     }
+    const srcset = getAttr(el, "srcset");
+    if (!srcset) continue;
+    const rewritten = rewriteSrcsetUrls(
+      srcset,
+      (url) => rewriteAssetPath(compSrcPath, url, assetExists)
+    );
+    if (rewritten !== srcset) setAttr(el, "srcset", rewritten);
   }
 }
 function rewriteInlineStyleAssetUrls(elements, compSrcPath, getStyle, setStyle, assetExists) {
@@ -117,5 +167,6 @@ export {
   rewriteAssetPaths,
   rewriteCssAssetUrls,
   rewriteInlineStyleAssetUrls,
+  rewriteSrcsetUrls,
   splitUrlSuffix
 };

package/dist/composition.d.ts

@@ -1,7 +1,7 @@
 import { C as CompositionVariable, F as FontValue, I as ImageValue } from './types-CdT7qqke.js';
 export { A as AddElementData, b as Asset, B as BooleanVariable, c as CANVAS_DIMENSIONS, d as COMPOSITION_VARIABLE_TYPES, a as CanvasResolution, e as ColorVariable, f as CompositionAPI, g as CompositionAsset, h as CompositionSpec, i as CompositionVariableBase, j as CompositionVariableType, D as DEFAULT_DURATIONS, E as ElementKeyframes, k as EnumVariable, l as FontVariable, m as ImageVariable, K as Keyframe, n as KeyframeProperties, M as MediaElementType, o as MediaFile, N as NumberVariable, P as PlayerAPI, R as ResolvedResolutionFlag, p as StageZoom, S as StageZoomKeyframe, q as StringVariable, r as TIMELINE_COLORS, s as TimelineCompositionElement, T as TimelineElement, t as TimelineElementBase, u as TimelineElementType, v as TimelineMediaElement, w as TimelineTextElement, x as VALID_CANVAS_RESOLUTIONS, V as ValidationResult, W as WaveformData, y as getDefaultStageZoom, z as isAspectAgnosticResolutionAlias, G as isCompositionElement, H as isMediaElement, J as isTextElement, L as normalizeResolutionFlag, O as resolveResolutionFlagPair } from './types-CdT7qqke.js';
 export { c as decodeUrlPathVariants } from './urlPath-C_0f_-Hp.js';
-export { CANONICAL_AUTHORED_TIMING_ATTRIBUTES, COMPOSITION_ATTRIBUTES, COMPOSITION_CONTRACT_VERSION, ClipAttributeReader, ClipAttributeWriter, ClipTiming, ClipTimingDiagnostic, ClipTimingDiagnosticCode, ClipTimingUpdate, ClipTimingWriteError, DERIVED_TIMING_ATTRIBUTES, LEGACY_TIMING_ATTRIBUTES, ReadClipTimingOptions, ReferenceExpression, parseNumeric, parseStartExpression, readClipTiming, writeClipTiming } from './compositionContract.js';
+export { CANONICAL_AUTHORED_TIMING_ATTRIBUTES, COMPOSITION_ATTRIBUTES, COMPOSITION_CONTRACT_VERSION, ClipAttributeReader, ClipAttributeWriter, ClipTiming, ClipTimingDiagnostic, ClipTimingDiagnosticCode, ClipTimingUpdate, ClipTimingWriteError, DERIVED_TIMING_ATTRIBUTES, LEGACY_TIMING_ATTRIBUTES, ReadClipTimingOptions, ReferenceExpression, SPLIT_BOUNDARY_EPSILON_S, parseNumeric, parseStartExpression, readClipTiming, writeClipTiming } from './compositionContract.js';
 
 /**
  * Browser-safe parser for the `data-composition-variables` schema attribute.

package/dist/composition.js

@@ -390,6 +390,7 @@ function scanVariableUsage(scriptText) {
 
 // src/compositionContract.ts
 var COMPOSITION_CONTRACT_VERSION = 1;
+var SPLIT_BOUNDARY_EPSILON_S = 0.03;
 var COMPOSITION_ATTRIBUTES = Object.freeze({
   start: "data-start",
   duration: "data-duration",
@@ -873,6 +874,7 @@ export {
   HTML_BODY_CSS_HEIGHT_FIRST_RE,
   HTML_BODY_CSS_WIDTH_FIRST_RE,
   LEGACY_TIMING_ATTRIBUTES,
+  SPLIT_BOUNDARY_EPSILON_S,
   TIMELINE_COLORS,
   VALID_CANVAS_RESOLUTIONS,
   VIEWPORT_META_SIZE_RE,

package/dist/compositionContract.d.ts

@@ -6,6 +6,8 @@
  * accept legacy documents; writers always emit the canonical representation.
  */
 declare const COMPOSITION_CONTRACT_VERSION: 1;
+/** Least a split leaves either side of its cut (s); timing is written to the ms, so less rounds to a 0-length half. */
+declare const SPLIT_BOUNDARY_EPSILON_S = 0.03;
 declare const COMPOSITION_ATTRIBUTES: Readonly<{
     readonly start: "data-start";
     readonly duration: "data-duration";
@@ -74,4 +76,4 @@ declare function readClipTiming(attributes: ClipAttributeReader, options?: ReadC
 /** Write only canonical authored timing and remove derived/legacy source attributes. */
 declare function writeClipTiming(attributes: ClipAttributeWriter, update: ClipTimingUpdate): ClipTiming;
 
-export { CANONICAL_AUTHORED_TIMING_ATTRIBUTES, COMPOSITION_ATTRIBUTES, COMPOSITION_CONTRACT_VERSION, type ClipAttributeReader, type ClipAttributeWriter, type ClipTiming, type ClipTimingDiagnostic, type ClipTimingDiagnosticCode, type ClipTimingUpdate, ClipTimingWriteError, DERIVED_TIMING_ATTRIBUTES, LEGACY_TIMING_ATTRIBUTES, type ReadClipTimingOptions, type ReferenceExpression, parseNumeric, parseStartExpression, readClipTiming, writeClipTiming };
+export { CANONICAL_AUTHORED_TIMING_ATTRIBUTES, COMPOSITION_ATTRIBUTES, COMPOSITION_CONTRACT_VERSION, type ClipAttributeReader, type ClipAttributeWriter, type ClipTiming, type ClipTimingDiagnostic, type ClipTimingDiagnosticCode, type ClipTimingUpdate, ClipTimingWriteError, DERIVED_TIMING_ATTRIBUTES, LEGACY_TIMING_ATTRIBUTES, type ReadClipTimingOptions, type ReferenceExpression, SPLIT_BOUNDARY_EPSILON_S, parseNumeric, parseStartExpression, readClipTiming, writeClipTiming };

package/dist/compositionContract.js

@@ -1,5 +1,6 @@
 // src/compositionContract.ts
 var COMPOSITION_CONTRACT_VERSION = 1;
+var SPLIT_BOUNDARY_EPSILON_S = 0.03;
 var COMPOSITION_ATTRIBUTES = Object.freeze({
   start: "data-start",
   duration: "data-duration",
@@ -286,6 +287,7 @@ export {
   ClipTimingWriteError,
   DERIVED_TIMING_ATTRIBUTES,
   LEGACY_TIMING_ATTRIBUTES,
+  SPLIT_BOUNDARY_EPSILON_S,
   parseNumeric,
   parseStartExpression,
   readClipTiming,

package/dist/ffBinaries.d.ts

@@ -7,8 +7,8 @@ declare const FFMPEG_PATH_ENV = "HYPERFRAMES_FFMPEG_PATH";
 declare const FFPROBE_PATH_ENV = "HYPERFRAMES_FFPROBE_PATH";
 type FfBinaryName = "ffmpeg" | "ffprobe";
 declare function isX86OnlyMachO(file: string): boolean;
-/** The first x86_64-only binary skipped on this Mac, for naming in the "not found" hint. */
-declare function getSkippedX86Binary(): string | undefined;
+/** The first x86_64-only `name` binary skipped on this Mac, for naming in the "not found" hint. */
+declare function getSkippedX86Binary(name: FfBinaryName): string | undefined;
 interface FindFfBinaryOptions {
     /**
      * How to treat an env override that points at a missing file: `true`

package/dist/ffBinaries.js

@@ -2,7 +2,7 @@
 import { execFileSync } from "child_process";
 import { accessSync, closeSync, constants, existsSync, openSync, readSync } from "fs";
 import { createRequire } from "module";
-import { delimiter, dirname, join, resolve } from "path";
+import { basename, delimiter, dirname, join, resolve } from "path";
 var FFMPEG_PATH_ENV = "HYPERFRAMES_FFMPEG_PATH";
 var FFPROBE_PATH_ENV = "HYPERFRAMES_FFPROBE_PATH";
 var ENV_BY_NAME = {
@@ -40,12 +40,13 @@ function runsOnThisMac(candidate) {
     return true;
   }
   if (!isX86OnlyMachO(candidate)) return true;
-  skippedX86Binary ??= candidate;
+  const name = basename(candidate);
+  if (!skippedX86Binaries.has(name)) skippedX86Binaries.set(name, candidate);
   return false;
 }
-var skippedX86Binary;
-function getSkippedX86Binary() {
-  return skippedX86Binary;
+var skippedX86Binaries = /* @__PURE__ */ new Map();
+function getSkippedX86Binary(name) {
+  return skippedX86Binaries.get(name);
 }
 function isExecutablePathCandidate(candidate) {
   if (process.platform === "win32") return existsSync(candidate);
@@ -92,7 +93,7 @@ function binaryFileName(name) {
 }
 function findInProjectLocalBin(name) {
   const candidate = resolve(".hyperframes", "bin", binaryFileName(name));
-  return existsSync(candidate) ? candidate : void 0;
+  return existsSync(candidate) && runsOnThisMac(candidate) ? candidate : void 0;
 }
 function tryResolve(fromFile, request) {
   try {
@@ -154,7 +155,7 @@ function findFfBinary(name, options = {}) {
 function clearFfBinaryLookupCache() {
   pathLookupCache.clear();
   lastMissAt.clear();
-  skippedX86Binary = void 0;
+  skippedX86Binaries.clear();
 }
 export {
   FFMPEG_PATH_ENV,

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export { SPRING_PRESETS, SpringPreset, generateSpringEaseData } from './springEa
 export { parseGsapScriptAcorn as parseGsapScript } from './gsapParserAcorn.js';
 export { EXCLUDED_TAGS, ensureHfIds, isCompositionTemplate, mintHfId, stampHfIdsInPlace, walkCompositionDescendants } from './hfIds.js';
 export { ParsableDocumentLike, SubCompositionValidity, SubCompositionValidityReason, checkSubCompositionUsability, resolveSubCompositionContent } from './subCompositionValidity.js';
-export { CANONICAL_AUTHORED_TIMING_ATTRIBUTES, COMPOSITION_ATTRIBUTES, COMPOSITION_CONTRACT_VERSION, ClipAttributeReader, ClipAttributeWriter, ClipTiming, ClipTimingDiagnostic, ClipTimingDiagnosticCode, ClipTimingUpdate, ClipTimingWriteError, DERIVED_TIMING_ATTRIBUTES, LEGACY_TIMING_ATTRIBUTES, ReadClipTimingOptions, ReferenceExpression, parseNumeric, parseStartExpression, readClipTiming, writeClipTiming } from './compositionContract.js';
+export { CANONICAL_AUTHORED_TIMING_ATTRIBUTES, COMPOSITION_ATTRIBUTES, COMPOSITION_CONTRACT_VERSION, ClipAttributeReader, ClipAttributeWriter, ClipTiming, ClipTimingDiagnostic, ClipTimingDiagnosticCode, ClipTimingUpdate, ClipTimingWriteError, DERIVED_TIMING_ATTRIBUTES, LEGACY_TIMING_ATTRIBUTES, ReadClipTimingOptions, ReferenceExpression, SPLIT_BOUNDARY_EPSILON_S, parseNumeric, parseStartExpression, readClipTiming, writeClipTiming } from './compositionContract.js';
 export { CANONICAL_FONT_DISPLAY_NAMES, FONT_ALIAS_KEYS, FONT_ALIAS_MAP, HTML_BODY_CSS_HEIGHT_FIRST_RE, HTML_BODY_CSS_WIDTH_FIRST_RE, MediaSrcMutation, VIEWPORT_META_SIZE_RE, VariableUsageScan, extractMediaSrcMutations, parseCompositionVariables, resolveAliasDisplayName, scanVariableUsage } from './composition.js';
 export { StructureNode, TrackKind, TrackKindSource, isSubCompositionHost, isTimedElement, topLevelElements, trackKindOf } from './topLevelElements.js';
 export { AttrReader, DEFAULT_IMAGE_TIMELINE_DURATION_SECONDS, MAX_PLAYBACK_RATE, MIN_PLAYBACK_RATE, MediaDurationResult, MediaDurationSource, MediaTag, PENDING_MEDIA_DURATION_READERS, ResolveMediaDurationInput, clampPlaybackRate, readAuthoredDurationSeconds, readDataDurationSeconds, readMediaOffsetSeconds, readPlaybackRate, resolveMediaDuration, resolveNaturalDurationSeconds } from './mediaDuration.js';

package/dist/index.js

@@ -2687,6 +2687,7 @@ function removeAnimationFromScript(script, animationId) {
 
 // src/compositionContract.ts
 var COMPOSITION_CONTRACT_VERSION = 1;
+var SPLIT_BOUNDARY_EPSILON_S = 0.03;
 var COMPOSITION_ATTRIBUTES = Object.freeze({
   start: "data-start",
   duration: "data-duration",
@@ -4744,6 +4745,7 @@ export {
   MIN_PLAYBACK_RATE,
   PENDING_MEDIA_DURATION_READERS,
   PROPERTY_GROUPS,
+  SPLIT_BOUNDARY_EPSILON_S,
   SPRING_PRESETS,
   SUPPORTED_EASES,
   SUPPORTED_PROPS,

package/dist/slideshow.js

@@ -26,6 +26,9 @@ function parseSlideshowManifest(html) {
 function isOptionalNumberArray(v) {
   return v === void 0 || Array.isArray(v) && v.every((n) => typeof n === "number");
 }
+function isOptionalFiniteNumber(v) {
+  return v === void 0 || typeof v === "number" && Number.isFinite(v);
+}
 function isOptionalBoolean(v) {
   return v === void 0 || typeof v === "boolean";
 }
@@ -44,6 +47,7 @@ function isSlideRef(v) {
   if (!isRecord(v)) return false;
   const r = v;
   if (typeof r["sceneId"] !== "string") return false;
+  if (![r["startTime"], r["endTime"]].every(isOptionalFiniteNumber)) return false;
   if (!isOptionalNumberArray(r["fragments"])) return false;
   if (r["hotspots"] !== void 0 && (!Array.isArray(r["hotspots"]) || !r["hotspots"].every(isSlideHotspot)))
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/parsers",
-  "version": "0.8.220",
+  "version": "0.8.222",
   "repository": {
     "type": "git",
     "url": "https://github.com/heygen-com/hyperframes",
@@ -139,7 +139,7 @@
     "tsx": "^4.21.0",
     "typescript": "^5.0.0",
     "vitest": "^4.1.11",
-    "@hyperframes/core": "0.8.220"
+    "@hyperframes/core": "0.8.222"
   },
   "scripts": {
     "build": "tsup",