@expofp/config 3.28.1 → 3.28.3

package/dist/lib/normalize-fp-svg.d.ts

@@ -8,7 +8,7 @@ import type { FpSvgLayerJs } from '@expofp/schema';
  * (`window['__fpBooth'] = …` — the chain had every layer script clobber the
  * shared `window.__fp`). The schemas and the floorplan know only the plain
  * `__fp`/`__fpPaths` keys, so the loader folds the alias onto them on the
- * payload's own copy, before the resource walk — the `svgAsset` href rewrite
+ * payload's own copy, before the resource walk — the `svgAsset` URL rewrite
  * then covers a folded drawing like a plain one. The folded values skip the
  * (opt-in) schema validation, which ran before the fold — the same trust the
  * untouched alias keys always had.

package/dist/lib/normalize-fp-svg.js

@@ -7,7 +7,7 @@
  * (`window['__fpBooth'] = …` — the chain had every layer script clobber the
  * shared `window.__fp`). The schemas and the floorplan know only the plain
  * `__fp`/`__fpPaths` keys, so the loader folds the alias onto them on the
- * payload's own copy, before the resource walk — the `svgAsset` href rewrite
+ * payload's own copy, before the resource walk — the `svgAsset` URL rewrite
  * then covers a folded drawing like a plain one. The folded values skip the
  * (opt-in) schema validation, which ran before the fold — the same trust the
  * untouched alias keys always had.

package/dist/lib/resource-urls.d.ts

@@ -16,10 +16,10 @@ export declare function toAbsoluteUrl(path: string, baseUrl: string): string;
 export declare function isAbsoluteUrl(path: string): boolean;
 /** The ref's own directory — the base its document's relative paths resolve against. */
 export declare function refDirectory(ref: string): string;
-/** Every distinct `<image>` asset href in one SVG document string. */
-export declare function collectSvgImageHrefs(svg: string): string[];
-/** Rewrite every `<image>` asset href in one SVG document string. */
-export declare function rewriteSvgImageHrefs(svg: string, rewrite: (href: string) => string): string;
+/** Every distinct `<image>` asset URL in one SVG document string. */
+export declare function collectSvgImageAssets(svg: string): string[];
+/** Rewrite every `<image>` asset URL in one SVG document string. */
+export declare function rewriteSvgImageAssets(svg: string, rewrite: (url: string) => string): string;
 /** Every distinct non-`data:` `url(…)` in one CSS text. */
 export declare function collectCssUrls(css: string): string[];
 /** Rewrite every non-`data:` `url(…)` in one CSS text. */

package/dist/lib/resource-urls.js

@@ -42,37 +42,44 @@ function execAll(regex, text) {
     }
     return matches;
 }
-/* ── SVG documents (`svgAsset`) — `<image>` hrefs are asset paths ─────────── */
+/* ── SVG documents (`svgAsset`) — an `<image>`'s URLs are asset paths ─────── */
 const IMAGE_TAG = /<image\b[^>]*>/g;
-const HREF_ATTR = /(\b(?:xlink:)?href\s*=\s*)(?:"([^"]*)"|'([^']*)')/g;
-/** In-document (`#id`) and empty hrefs are not asset URLs. */
-function isAssetHref(href) {
-    return !!href && !href.startsWith('#');
+/**
+ * The asset-bearing attributes of an `<image>`: the href it draws, and
+ * `data-model-3d` — the URL of the 3D model the floor plan renders *instead* of
+ * the image, whose href then never loads (floorplan's `layer-models.ts`). Both are
+ * authored relative to the drawing, so both need the same rebase; a model URL
+ * left behind resolves against the page and 404s.
+ */
+const ASSET_ATTR = /(\b(?:(?:xlink:)?href|data-model-3d)\s*=\s*)(?:"([^"]*)"|'([^']*)')/g;
+/** In-document (`#id`) and empty references are not asset URLs. */
+function isAssetUrl(url) {
+    return !!url && !url.startsWith('#');
 }
-/** Every distinct `<image>` asset href in one SVG document string. */
-export function collectSvgImageHrefs(svg) {
-    const hrefs = new Set();
+/** Every distinct `<image>` asset URL in one SVG document string. */
+export function collectSvgImageAssets(svg) {
+    const urls = new Set();
     if (!svg.includes('<image'))
         return [];
     for (const tag of svg.match(IMAGE_TAG) ?? []) {
-        for (const match of execAll(HREF_ATTR, tag)) {
-            const href = match[2] ?? match[3];
-            if (isAssetHref(href))
-                hrefs.add(href);
+        for (const match of execAll(ASSET_ATTR, tag)) {
+            const url = match[2] ?? match[3];
+            if (isAssetUrl(url))
+                urls.add(url);
         }
     }
-    return [...hrefs];
+    return [...urls];
 }
-/** Rewrite every `<image>` asset href in one SVG document string. */
-export function rewriteSvgImageHrefs(svg, rewrite) {
+/** Rewrite every `<image>` asset URL in one SVG document string. */
+export function rewriteSvgImageAssets(svg, rewrite) {
     if (!svg.includes('<image'))
         return svg;
-    return svg.replace(IMAGE_TAG, (tag) => tag.replace(HREF_ATTR, (match, attr, doubleQuoted, singleQuoted) => {
-        const href = doubleQuoted ?? singleQuoted ?? '';
-        if (!isAssetHref(href))
+    return svg.replace(IMAGE_TAG, (tag) => tag.replace(ASSET_ATTR, (match, attr, doubleQuoted, singleQuoted) => {
+        const url = doubleQuoted ?? singleQuoted ?? '';
+        if (!isAssetUrl(url))
             return match;
         const quote = doubleQuoted !== undefined ? '"' : "'";
-        return `${attr}${quote}${rewrite(href)}${quote}`;
+        return `${attr}${quote}${rewrite(url)}${quote}`;
     }));
 }
 /* ── CSS text (`cssAsset`) — `url(…)`s are asset paths ────────────────────── */

package/dist/lib/visit-resources.js

@@ -20,7 +20,7 @@
 import { getResolved, isResolved, resolve } from '@expofp/resolve';
 import { deepClone } from '@expofp/utils';
 import { refSchemaOf, toJsonSchema, typeMatches } from './json-schema.js';
-import { collectCssUrls, collectSvgImageHrefs, inlineCssImports, isAbsoluteUrl, refDirectory, rewriteCssUrls, rewriteSvgImageHrefs, toAbsoluteUrl, } from './resource-urls.js';
+import { collectCssUrls, collectSvgImageAssets, inlineCssImports, isAbsoluteUrl, refDirectory, rewriteCssUrls, rewriteSvgImageAssets, toAbsoluteUrl, } from './resource-urls.js';
 import { timeValidation } from './validate-timing.js';
 /**
  * Gates every schema validation (`parse`) of the large expo documents —
@@ -138,10 +138,10 @@ async function walk(node, value, assign, handler, options) {
         }
         else if (node?.svgAsset) {
             const rewrites = new Map();
-            for (const href of collectSvgImageHrefs(value)) {
-                rewrites.set(href, await handler.asset(href));
+            for (const url of collectSvgImageAssets(value)) {
+                rewrites.set(url, await handler.asset(url));
             }
-            assign(rewriteSvgImageHrefs(value, (href) => rewrites.get(href) ?? href));
+            assign(rewriteSvgImageAssets(value, (url) => rewrites.get(url) ?? url));
         }
         else if (node?.cssAsset) {
             // a handler that can fetch stylesheets gets @imports spliced in first,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/config",
-  "version": "3.28.1",
+  "version": "3.28.3",
   "type": "module",
   "description": "ExpoFP SDK internal: config layer and schemas",
   "homepage": "https://developer.expofp.com/",
@@ -29,8 +29,8 @@
     "debug": "^4.4.3",
     "tslib": "^2.3.0",
     "zod": "4.4.3",
-    "@expofp/resolve": "3.28.1",
-    "@expofp/schema": "3.28.1",
-    "@expofp/utils": "3.28.1"
+    "@expofp/resolve": "3.28.3",
+    "@expofp/schema": "3.28.3",
+    "@expofp/utils": "3.28.3"
   }
 }