@hyperframes/core 0.8.191 → 0.8.192

package/dist/beats/beatFile.js

@@ -1,7 +1,7 @@
 // Persistence for beat data: one JSON file per audio file, matched by the
 // audio's project-relative path. Lives under `beats/` in the project so it
 // survives the audio being removed and re-added.
-import { decodeAuthoredAttribute, scanHtmlOpeningTags, } from "@hyperframes/parsers";
+import { decodeAuthoredAttribute, decodedUrlPath, scanHtmlOpeningTags, } from "@hyperframes/parsers";
 /** Project-relative path of the audio file behind a (possibly absolute) src URL. */
 export function audioRelPathForSrc(src) {
     if (!src)
@@ -23,16 +23,16 @@ export function audioRelPathForSrc(src) {
             after = after.slice(0, queryOrHash);
         if (after.startsWith("comp/"))
             after = after.slice("comp/".length);
-        rel = after ? decodeURIComponent(after) : null;
+        rel = after ? decodedUrlPath(after) : null;
     }
     if (!rel) {
         // Fall back to the FULL pathname (not just basename) so two files with the
         // same name in different folders don't collide on one beat file.
         try {
-            rel = decodeURIComponent(new URL(src, "http://_").pathname);
+            rel = decodedUrlPath(new URL(src, "http://_").pathname);
         }
         catch {
-            rel = src;
+            rel = decodedUrlPath(src);
         }
     }
     if (!rel)

package/dist/compiler/htmlBundler.js

@@ -125,23 +125,42 @@ function rebaseRelativePath(urlValue, fromDir, toDir) {
     const rebased = encodeUrlPath(relative(resolve(toDir), absolutePath).split(sep).join("/"));
     return appendSuffixToUrl(rebased, suffix);
 }
-function rebaseSrcsetPaths(srcsetValue, fromDir, toDir) {
-    if (!srcsetValue)
-        return srcsetValue;
-    return srcsetValue
-        .split(",")
-        .map((rawCandidate) => {
-        const candidate = rawCandidate.trim();
-        if (!candidate)
-            return candidate;
-        const parts = candidate.split(/\s+/);
-        const first = parts[0] ?? "";
-        if (parts.length === 0 || !isRelativeUrl(first))
-            return candidate;
-        parts[0] = rebaseRelativePath(first, fromDir, toDir);
-        return parts.join(" ");
-    })
-        .join(", ");
+function rewriteSrcsetUrls(srcset, rewriteUrl) {
+    const parts = [];
+    let position = 0;
+    let written = 0;
+    // Preserve URL commas per https://html.spec.whatwg.org/multipage/images.html#parse-a-srcset-attribute
+    while (position < srcset.length) {
+        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--;
+        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;
+        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 parts.length > 0 ? parts.join("") + srcset.slice(written) : srcset;
 }
 function rebaseColorGradingLutPath(value, fromDir, toDir) {
     if (!value.trim().startsWith("{"))
@@ -194,7 +213,7 @@ function rebaseEntryAuthoredAssetPaths(document, sourceDir, projectDir) {
     for (const el of [...document.querySelectorAll("[srcset]")]) {
         const srcset = el.getAttribute("srcset");
         if (srcset)
-            el.setAttribute("srcset", rebaseSrcsetPaths(srcset, sourceDir, projectDir));
+            el.setAttribute("srcset", rewriteSrcsetUrls(srcset, (url) => isRelativeUrl(url) ? rebaseRelativePath(url, sourceDir, projectDir) : url));
     }
     for (const el of [...document.querySelectorAll(`[${HF_COLOR_GRADING_ATTR}]`)]) {
         const value = el.getAttribute(HF_COLOR_GRADING_ATTR);
@@ -301,6 +320,8 @@ const INLINE_MIME = {
  * exactly where "self-contained" stops being true.
  */
 const MAX_INLINE_ASSET_BYTES = 2 * 1024 * 1024;
+// An asset is inlined once per reference, so repeats can pass V8's ~2^29-char string limit.
+const MAX_INLINED_BUNDLE_CHARS = 256 * 1024 * 1024;
 function safeStatSize(filePath) {
     try {
         return statSync(filePath).size;
@@ -313,9 +334,14 @@ function warnAssetTooLargeToInline(assetPath, byteLength) {
     const mb = (byteLength / (1024 * 1024)).toFixed(1);
     console.warn(`[HyperFrames] Not inlining "${assetPath}" (${mb} MB exceeds the ${MAX_INLINE_ASSET_BYTES / (1024 * 1024)} MB inline limit). The bundle may not be self-contained.`);
 }
+function warnInlineBudgetExhausted(assetPath) {
+    console.warn(`[HyperFrames] Not inlining "${assetPath}" and later assets: the bundle already inlines ${MAX_INLINED_BUNDLE_CHARS / (1024 * 1024)} MB of data URLs. The bundle may not be self-contained.`);
+}
 /** Inlines relative asset URLs as data: URLs, reading each project file once per build. */
 function createAssetInliner(resolveProjectPath, inlineAssets) {
     const assets = new Map();
+    let inlinedChars = 0;
+    let budgetExhausted = false;
     const readAsset = (filePath, mimeType) => {
         // Size-check before reading: an oversized asset must not be pulled into memory
         // just to be discarded.
@@ -354,7 +380,16 @@ function createAssetInliner(resolveProjectPath, inlineAssets) {
             warnAssetTooLargeToInline(basePath, asset.tooLarge);
             return null;
         }
-        return asset.dataUrl === null ? null : appendSuffixToUrl(asset.dataUrl, suffix);
+        if (asset.dataUrl === null)
+            return null;
+        if (budgetExhausted || inlinedChars + asset.dataUrl.length > MAX_INLINED_BUNDLE_CHARS) {
+            if (!budgetExhausted)
+                warnInlineBudgetExhausted(basePath);
+            budgetExhausted = true;
+            return null;
+        }
+        inlinedChars += asset.dataUrl.length;
+        return appendSuffixToUrl(asset.dataUrl, suffix);
     };
 }
 function isExternalSvgFragmentUse(el, attr, urlValue) {
@@ -414,25 +449,6 @@ function rewriteColorGradingLutWithInlinedAssets(value, inlineAsset) {
     Reflect.set(lut, "src", inlined);
     return JSON.stringify(parsed);
 }
-function rewriteSrcsetWithInlinedAssets(srcsetValue, inlineAsset) {
-    if (!srcsetValue)
-        return srcsetValue;
-    return srcsetValue
-        .split(",")
-        .map((rawCandidate) => {
-        const candidate = rawCandidate.trim();
-        if (!candidate)
-            return candidate;
-        const parts = candidate.split(/\s+/);
-        if (parts.length === 0)
-            return candidate;
-        const maybeInlined = inlineAsset(parts[0] ?? "");
-        if (maybeInlined)
-            parts[0] = maybeInlined;
-        return parts.join(" ");
-    })
-        .join(", ");
-}
 function rewriteCssUrlsWithInlinedAssets(cssText, inlineAsset) {
     if (!cssText)
         return cssText;
@@ -1228,7 +1244,7 @@ async function bundleProject(projectDir, options) {
     for (const el of [...document.querySelectorAll("[srcset]")]) {
         const srcset = el.getAttribute("srcset");
         if (srcset)
-            el.setAttribute("srcset", rewriteSrcsetWithInlinedAssets(srcset, inlineAsset));
+            el.setAttribute("srcset", rewriteSrcsetUrls(srcset, (url) => inlineAsset(url) ?? url));
     }
     // Before inlining, so postcss reads paths not font bytes.
     const liveStyles = [...document.querySelectorAll("style")].filter(isAlwaysAppliedStyle);

package/dist/compiler/importMaps.d.ts

@@ -1,7 +1,8 @@
+type SpecifierMap = Record<string, string | null>;
 /** The subset of an import map a composition can declare. */
 export interface ImportMap {
-    imports?: Record<string, string>;
-    scopes?: Record<string, Record<string, string>>;
+    imports?: SpecifierMap;
+    scopes?: Record<string, SpecifierMap>;
 }
 /**
  * Parses a mounted composition's import map, rebasing each address the way its `src`/`href`
@@ -16,3 +17,4 @@ export declare function parseImportMap(json: string, rebase: (url: string) => st
 export declare function mergeImportMapsIntoDocument(doc: Document, maps: ImportMap[]): void;
 /** Emits what inlineSubCompositions collected from mounted files' module and import-map scripts. */
 export declare function emitMountedModuleScripts(doc: Document, importMaps: ImportMap[], moduleScripts: string[]): void;
+export {};

package/dist/compiler/importMaps.js

@@ -1,5 +1,14 @@
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isScopeMap(value) {
+    return isRecord(value) && Object.values(value).every(isRecord);
+}
 const rebaseEntries = (entries, rebase) => entries &&
-    Object.fromEntries(Object.entries(entries).map(([specifier, url]) => [specifier, rebase(url)]));
+    Object.fromEntries(Object.entries(entries).map(([specifier, url]) => [
+        specifier,
+        typeof url === "string" ? rebase(url) : null,
+    ]));
 /**
  * Parses a mounted composition's import map, rebasing each address the way its `src`/`href`
  * attributes are rebased. Returns null for a map the browser would reject too.
@@ -12,9 +21,13 @@ export function parseImportMap(json, rebase) {
     catch {
         return null;
     }
-    if (!parsed || typeof parsed !== "object")
+    if (!isRecord(parsed))
         return null;
     const { imports, scopes } = parsed;
+    if (imports !== undefined && !isRecord(imports))
+        return null;
+    if (scopes !== undefined && !isScopeMap(scopes))
+        return null;
     return {
         imports: rebaseEntries(imports, rebase),
         scopes: scopes &&
@@ -26,8 +39,14 @@ export function parseImportMap(json, rebase) {
 }
 function mergeEntries(into, from, where) {
     for (const [specifier, url] of Object.entries(from ?? {})) {
-        if (!(specifier in into))
-            into[specifier] = url;
+        if (!Object.hasOwn(into, specifier)) {
+            Object.defineProperty(into, specifier, {
+                value: url,
+                enumerable: true,
+                configurable: true,
+                writable: true,
+            });
+        }
         else if (into[specifier] !== url) {
             console.warn(`[HyperFrames] import map conflict for "${specifier}"${where}: keeping ${into[specifier]}, ignoring ${url}.`);
         }
@@ -54,7 +73,9 @@ export function mergeImportMapsIntoDocument(doc, maps) {
     for (const map of maps) {
         mergeEntries(imports, map.imports, "");
         for (const [prefix, entries] of Object.entries(map.scopes ?? {})) {
-            mergeEntries((scopes[prefix] ??= {}), entries, ` in scope ${prefix}`);
+            const scope = (Object.hasOwn(scopes, prefix) ? scopes[prefix] : undefined) ?? {};
+            Object.defineProperty(scopes, prefix, { value: scope, enumerable: true });
+            mergeEntries(scope, entries, ` in scope ${prefix}`);
         }
     }
     if (!el) {