@expofp/loader 1.0.45 → 1.0.46

package/dist/importJson.d.ts

@@ -1 +1,2 @@
-export declare function importJson(url: string, importCallback: ((url: string, type: 'module' | 'fetch') => void) | undefined): Promise<any>;
+import { ResolveContextInternal } from './resolve';
+export declare function importJson(url: string, resolveContext: ResolveContextInternal): Promise<any>;

package/dist/index.js

@@ -1,74 +1,74 @@
-function U(e) {
+function J(e) {
   return i("assetResolver resolveRef:", e), l(e);
 }
-const J = {
+const U = {
   schema: "asset",
-  resolveRef: async (e) => U(e),
+  resolveRef: async (e) => J(e),
   offlineMethod: "localizeRef"
 };
 let d;
-const B = /* @__PURE__ */ new WeakSet(), E = new Function("url", 'return import(url, { with: { type: "json" } });');
+const B = /* @__PURE__ */ new WeakSet(), g = new Function("url", 'return import(url, { with: { type: "json" } });');
 async function f(e, t) {
-  if (d === void 0)
+  var r, o;
+  if (d === void 0 && !t.forceFetch)
     try {
-      await E(e), d = !1;
+      await g(e), d = !1;
     } catch {
       i("importJson: dynamic import not available, falling back to fetch"), d = !0;
     }
   let n;
-  return d ? (i("importJson: fetch", e), n = await N(e), t == null || t(e, "fetch")) : (n = (await E(e)).default, t == null || t(e, "module")), B.has(n) || u(n), n;
+  return !d && !t.forceFetch ? (n = (await g(e)).default, (r = t.importCallback) == null || r.call(t, e, "json")) : (i("importJson: fetch", e), n = await N(e, t.refCache), (o = t.importCallback) == null || o.call(t, e, "json")), B.has(n) || u(n), n;
 }
-const p = /* @__PURE__ */ new Map();
-async function N(e) {
-  if (p.has(e))
-    return p.get(e);
-  const t = (async function() {
-    const o = await fetch(e);
-    if (!o.ok)
+async function N(e, t) {
+  const n = "__loadJson__" + e;
+  if (t.has(n))
+    return t.get(n);
+  const r = (async function() {
+    const a = await fetch(e);
+    if (!a.ok)
       throw new Error(`Failed to fetch JSON from ${e}`);
-    return await o.json();
+    return await a.json();
   })();
-  return p.set(e, t), t;
+  return t.set(n, r), r;
 }
-const v = /* @__PURE__ */ new Map();
-async function h(e, t) {
-  if (v.has(e))
-    return v.get(e);
-  const n = t().then((o) => (u(o), o));
-  return v.set(e, n), n;
+async function h(e, t, n) {
+  if (t.has(e))
+    return t.get(e);
+  const r = n().then((o) => (u(o), o));
+  return t.set(e, r), r;
 }
 const T = {
   schema: "bundle-assets",
   async resolveRef(e, t) {
     i("bundleAssetsResolver resolveRef:", e);
     const n = l(e);
-    return h(e, async () => {
-      const o = await f(n, t.importCallback), r = n.substring(0, n.lastIndexOf("/") + 1);
-      return o.map((a) => ({
-        $ref: `asset+${r}${a}`
+    return h(e, t.refCache, async () => {
+      const r = await f(n, t), o = n.substring(0, n.lastIndexOf("/") + 1);
+      return r.map((s) => ({
+        $ref: `asset+${o}${s}`
       }));
     });
   },
   offlineMethod: "localizeRef"
-}, S = "https://efp-runtime.expofp.com/", D = {
+}, C = "https://efp-runtime.expofp.com/", S = {
   schema: "expo-runtime-branch",
   async resolveRef(e, t) {
     i("expoRuntimeBranchResolver resolveRef:", e);
-    const n = l(e), o = `${S}branches/${n}.json`;
-    return h(e, async () => ({
-      $ref: `expo-runtime+https://efp-runtime.expofp.com/releases/${await f(o, t.importCallback)}/`
+    const n = l(e), r = `${C}branches/${n}.json`;
+    return h(e, t.refCache, async () => ({
+      $ref: `expo-runtime+https://efp-runtime.expofp.com/releases/${await f(r, t)}/`
     }));
   },
   offlineMethod: "resolveRef"
-}, W = {
+}, D = {
   schema: "expo-runtime-get-branch",
   async resolveRef(e, t) {
     i("expoRuntimeGetBranchResolver resolveRef:", e);
-    const o = `https://${l(e)}.expofp.com/get-branch`;
-    return f(o, t.importCallback);
+    const r = `https://${l(e)}.expofp.com/get-branch`;
+    return f(r, t);
   },
   offlineMethod: "resolveRef"
-}, P = {
+}, W = {
   schema: "expo-runtime",
   // canResolve(ref: string) {
   //   return canResolveRefSchema(ref, SCHEMA);
@@ -99,43 +99,43 @@ const T = {
   //     return targetFilePath;
   //   },
   offlineMethod: "resolveRef"
-}, I = {
+}, P = {
   canResolve(e) {
     return e.startsWith("http://") || e.startsWith("https://") || e.startsWith("./");
   },
   resolveRef(e, t) {
     if (i("httpResolver resolveRef:", e), !this.canResolve(e)) throw new Error(`Unexpected ref in httpResolver: ${e}`);
-    return f(e, t.importCallback);
+    return f(e, t);
   },
   offlineMethod: "resolveRef"
 };
-async function _(e, t = {}) {
-  const { globalVar: n, timeoutMs: o = 1e4, pollIntervalMs: r = 10 } = t;
-  z() ? (await L(e), n && await O(() => window[n], n, o, r)) : (await G(e), n && await O(
+async function $(e, t = {}) {
+  const { globalVar: n, timeoutMs: r = 1e4, pollIntervalMs: o = 10 } = t;
+  I() ? (await z(e), n && await E(() => window[n], n, r, o)) : (await L(e), n && await E(
     () => globalThis[n],
     n,
-    o,
-    r
+    r,
+    o
   ));
 }
-function z() {
+function I() {
   return typeof window < "u" && typeof document < "u";
 }
-function L(e) {
+function z(e) {
   return new Promise((t, n) => {
-    const o = document.createElement("script");
-    o.src = e, o.async = !0;
-    const r = () => {
-      o.onload = null, o.onerror = null;
+    const r = document.createElement("script");
+    r.src = e, r.async = !0;
+    const o = () => {
+      r.onload = null, r.onerror = null;
     };
-    o.onload = () => {
-      r(), t();
-    }, o.onerror = () => {
-      r(), n(new Error(`Failed to load script: ${e}`));
-    }, document.head.appendChild(o);
+    r.onload = () => {
+      o(), t();
+    }, r.onerror = () => {
+      o(), n(new Error(`Failed to load script: ${e}`));
+    }, document.head.appendChild(r);
   });
 }
-async function G(e) {
+async function L(e) {
   if (typeof fetch != "function")
     throw new Error(
       "loadAndWaitGlobal: fetch is not available. Use Node 18+ or provide a global fetch."
@@ -146,81 +146,83 @@ async function G(e) {
   const n = await t.text();
   globalThis.window = globalThis, (0, eval)(n);
 }
-function O(e, t, n, o) {
-  return new Promise((r, s) => {
-    const a = Date.now(), c = () => {
+function E(e, t, n, r) {
+  return new Promise((o, a) => {
+    const s = Date.now(), c = () => {
       try {
         if (e() !== void 0)
-          return r();
+          return o();
       } catch {
       }
-      if (Date.now() - a >= n)
-        return s(new Error(`Timed out after ${n} ms waiting for global "${t}"`));
-      setTimeout(c, o);
+      if (Date.now() - s >= n)
+        return a(new Error(`Timed out after ${n} ms waiting for global "${t}"`));
+      setTimeout(c, r);
     };
     c();
   });
 }
-const V = {
+const G = {
   schema: "legacy-asset-urls",
   resolveRef(e, t) {
-    return i("legacyAssetUrlsResolver resolveRef:", e), h(e, async () => {
-      var R, g;
-      const n = l(e), o = `${n}version.js`;
+    return i("legacyAssetUrlsResolver resolveRef:", e), h(e, t.refCache, async () => {
+      var y, v;
+      const n = l(e), r = `${n}version.js`;
       try {
-        await _(o, { globalVar: "__fpDataVersion", timeoutMs: 3e4 }), (R = t.importCallback) == null || R.call(t, o, "script");
+        await $(r, { globalVar: "__fpDataVersion", timeoutMs: 3e4 }), (y = t.importCallback) == null || y.call(t, r, "script");
       } catch {
-        console.warn(`Could not load version.js at ${o}, proceeding without it`);
+        console.warn(`Could not load version.js at ${r}, proceeding without it`);
       }
-      const r = globalThis.__fpDataVersion || (+/* @__PURE__ */ new Date()).toString(), s = `${n}files.json?v=${r}`, a = `${n}data.js?v=${r}`, c = f(s, t.importCallback), k = _(a, { globalVar: "__data" });
-      (g = t.importCallback) == null || g.call(t, a, "script"), await Promise.all([c, k]);
-      const x = await c, C = globalThis.__data || {};
-      return { ...[...x, "data.js"].reduce((b, $) => (b[$] = { $ref: `asset+${n}${$}?v=${r}` }, b), {}), ...Z(n, C) };
+      const o = globalThis.__fpDataVersion || (+/* @__PURE__ */ new Date()).toString(), a = `${n}files.json?v=${o}`, s = `${n}data.js?v=${o}`, c = f(a, t), j = $(s, { globalVar: "__data" });
+      (v = t.importCallback) == null || v.call(t, s, "script"), await Promise.all([c, j]);
+      const A = await c, M = globalThis.__data || {};
+      return { ...[...A, "data.js"].reduce((b, R) => (b[R] = { $ref: `asset+${n}${R}?v=${o}` }, b), {}), ...V(n, M) };
     });
   },
   offlineMethod: "resolveRef"
 };
-function Z(e, t) {
+function V(e, t) {
   const n = /* @__PURE__ */ new Set();
-  function o(r) {
-    typeof r == "string" && r.length > 0 && n.add(r);
+  function r(o) {
+    typeof o == "string" && o.length > 0 && n.add(o);
   }
-  return o(t.logo), t.exhibitors.forEach((r) => {
-    var s;
-    o(r.logo), (s = r.gallery) == null || s.forEach((a) => o(a));
-  }), t.events.forEach((r) => {
-    var s;
-    o(r.logoFile), (s = r.speakers) == null || s.forEach((a) => {
-      o(a.photoFile);
+  return r(t.logo), t.exhibitors.forEach((o) => {
+    var a;
+    r(o.logo), (a = o.gallery) == null || a.forEach((s) => r(s));
+  }), t.events.forEach((o) => {
+    var a;
+    r(o.logoFile), (a = o.speakers) == null || a.forEach((s) => {
+      r(s.photoFile);
     });
-  }), Array.from(n).reduce((r, s) => (r[s] = { $ref: `asset+${e}${s}` }, r), {});
+  }), Array.from(n).reduce((o, a) => (o[a] = { $ref: `asset+${e}${a}` }, o), {});
 }
-const H = {
+const Z = {
   schema: "legacy-data",
-  resolveRef(e) {
-    return i("legacyDataResolver resolveRef:", e), h(e, async () => {
-      const t = l(e);
+  resolveRef(e, t) {
+    return i("legacyDataResolver resolveRef:", e), h(e, t.refCache, async () => {
+      const n = l(e);
       return {
-        _to_remove_for_offline_to_work_dataUrlBase: t,
-        legacyAssetUrls: { $ref: `legacy-asset-urls+${t}` }
+        _to_remove_for_offline_to_work_dataUrlBase: n,
+        legacyAssetUrls: { $ref: `legacy-asset-urls+${n}` }
       };
     });
   },
   offlineMethod: "resolveRef"
-}, K = [
-  I,
-  T,
-  J,
+}, H = [
   P,
-  D,
+  T,
+  U,
   W,
-  H,
-  V
-];
+  S,
+  D,
+  Z,
+  G
+], x = /* @__PURE__ */ new Map();
 async function m(e, t, n) {
-  i("Resolving:", t), typeof window < "u" && (window.__lastResolveObject = e);
-  const o = {
-    importCallback: n == null ? void 0 : n.importCallback
+  i("Resolving:", t, "of", e, n), typeof window < "u" && (window.__lastResolveObject = e);
+  const r = {
+    importCallback: n == null ? void 0 : n.importCallback,
+    refCache: (n == null ? void 0 : n.refCache) || x,
+    forceFetch: !!(n != null && n.forceFetch)
   };
   if (typeof t != "string")
     throw new Error(`Invalid JSON Pointer (not a string): ${t}`);
@@ -228,77 +230,77 @@ async function m(e, t, n) {
     throw new Error(`Invalid JSON Pointer: ${t}`);
   if (t.length > 1 && t.endsWith("/"))
     throw new Error(`Invalid JSON Pointer: ${t}`);
-  let r;
-  if (t === "/" ? r = [] : r = t.substring(1).split("/"), r.some((s) => s.length === 0))
+  let o;
+  if (t === "/" ? o = [] : o = t.substring(1).split("/"), o.some((a) => a.length === 0))
     throw new Error(`Invalid JSON Pointer (empty part): ${t}`);
   if (n != null && n.mutate) {
-    r.unshift("root");
-    const s = { root: e };
-    await A(s, r, 0, o), te(e, s.root);
+    o.unshift("root");
+    const a = { root: e };
+    await O(a, o, 0, r), ee(e, a.root);
   } else
-    return await F(e, r, 0, o);
+    return await k(e, o, 0, r);
 }
-async function A(e, t, n, o) {
-  const r = t[n];
-  if (await q(e, r, o), n != t.length - 1) {
-    if (e[r] === null || typeof e[r] != "object")
+async function O(e, t, n, r) {
+  const o = t[n];
+  if (await K(e, o, r), n != t.length - 1) {
+    if (e[o] === null || typeof e[o] != "object")
       throw new Error(
         `Cannot resolve path, encountered non-object at part '${t.slice(1).join("/")}', index ${n - 1}'`
       );
-    return await A(e[r], t, n + 1, o);
+    return await O(e[o], t, n + 1, r);
   }
 }
-async function q(e, t, n) {
+async function K(e, t, n) {
   i("resolveObjectMutate:", e, t);
-  let o = e[t];
-  const r = await y(o, n);
-  r !== void 0 && (e[t] = r);
+  let r = e[t];
+  const o = await p(r, n);
+  o !== void 0 && (e[t] = o);
 }
-async function F(e, t, n, o) {
+async function k(e, t, n, r) {
   if (n === t.length)
-    return await y(e, o);
+    return await p(e, r);
   if (e === null || typeof e != "object")
     throw new Error(
       `Cannot resolve path, encountered non-object at part '${t.join("/")}', index ${n}'`
     );
-  const r = t[n];
-  let s = e[r];
-  return s === void 0 && (s = (await y(e, o))[r]), await F(s, t, n + 1, o);
+  const o = t[n];
+  let a = e[o];
+  return a === void 0 && (a = (await p(e, r))[o]), await k(a, t, n + 1, r);
 }
-async function y(e, t) {
+async function p(e, t) {
   i("resolveObject:", e);
   let n = e;
   do {
     if (typeof n != "object" || n === null || !("$ref" in n))
       return n;
-    const o = K.filter((s) => j(s, n.$ref));
-    if (o.length === 0) {
+    const r = H.filter((a) => F(a, n.$ref));
+    if (r.length === 0) {
       if (n.$ref)
         throw new Error(`No resolver found for ref: ${n.$ref}`);
       return u(n), n;
     }
-    if (o.length > 1)
+    if (r.length > 1)
       throw new Error(`Multiple resolvers can resolve ref: ${n.$ref}`);
-    const r = await Q(o[0], n.$ref, t);
-    n = ee(r, n);
+    const o = await q(r[0], n.$ref, t);
+    n = Y(o, n);
   } while (!0);
 }
-async function Q(e, t, n) {
-  if (!j(e, t))
+async function q(e, t, n) {
+  if (!F(e, t))
     throw new Error(`Unexpected ref: ${t}`);
   return e.resolveRef(t, n);
 }
-function j(e, t) {
+function F(e, t) {
   if (e.canResolve)
     return e.canResolve(t);
   if (e.schema)
-    return X(t, e.schema);
+    return Q(t, e.schema);
   throw new Error("Resolver is missing canResolve method and schema property");
 }
-function X(e, t) {
+function Q(e, t) {
   const n = [`${t}+`, `${t}:`];
-  for (const o of n)
-    if (e.startsWith(o))
+  for (const r of n)
+    if (e.startsWith(r))
       return !0;
   return !1;
 }
@@ -310,22 +312,22 @@ function l(e) {
     return e.substring(t + 1);
   if (n !== -1)
     return e.substring(n + 1);
-  const o = e.indexOf(":");
-  if (o !== -1)
-    return e.substring(o + 1);
+  const r = e.indexOf(":");
+  if (r !== -1)
+    return e.substring(r + 1);
   throw new Error(`Error getting URL from: ${e}, no valid prefix found`);
 }
-typeof window < "u" && (window.__debugResolve = async function(t, n, o) {
-  let r, s, a;
-  return typeof t == "string" ? (r = window.__lastResolveObject, s = t, a = n) : (r = t, s = n, a = o), await m(r, s, a);
+typeof window < "u" && (window.__debugResolve = async function(t, n, r) {
+  let o, a, s;
+  return typeof t == "string" ? (o = window.__lastResolveObject, a = t, s = n) : (o = t, a = n, s = r), await m(o, a, s);
 });
 function w(e) {
   return async (t, ...n) => {
     try {
-      const s = (await import(await m(t, "/runtime/entry")))[e];
-      return s(t, ...n);
-    } catch (o) {
-      throw console.error("efp-loader", `Error when trying to import and call "${e}":`, o), o;
+      const a = (await import(await m(t, "/runtime/entry")))[e];
+      return a(t, ...n);
+    } catch (r) {
+      throw console.error("efp-loader", `Error when trying to import and call "${e}":`, r), r;
     }
   };
 }
@@ -341,32 +343,32 @@ function u(e) {
   }
   return e;
 }
-function M(e) {
+function _(e) {
   return "structuredClone" in globalThis ? globalThis.structuredClone(e) : JSON.parse(JSON.stringify(e));
 }
-function Y(e) {
+function X(e) {
   if (typeof document > "u") return;
   const t = document.createElement("link");
   t.rel = "preconnect", t.href = e, t.crossOrigin = "anonymous", document.head.appendChild(t);
 }
-function ee(e, t) {
+function Y(e, t) {
   if (e === t) return;
   if (t === null || typeof t != "object")
     throw new Error("Cannot merge non-object source");
   if (Array.isArray(t))
     throw new Error("Cannot merge arrays");
-  const n = Object.keys(t).filter((r) => r !== "$ref");
-  if (n.length === 0) return M(e);
+  const n = Object.keys(t).filter((o) => o !== "$ref");
+  if (n.length === 0) return _(e);
   if (Array.isArray(e))
     throw new Error("Cannot merge into arrays");
   if (e === null || typeof e != "object")
     throw new Error("Cannot merge into non-object target");
-  const o = M({ ...e });
-  for (const r of n)
-    o[r] = t[r];
-  return o;
+  const r = _({ ...e });
+  for (const o of n)
+    r[o] = t[o];
+  return r;
 }
-function te(e, t) {
+function ee(e, t) {
   if (e !== t) {
     if (t === null || typeof t != "object")
       throw new Error("Cannot replace with non-object source");
@@ -386,47 +388,47 @@ function te(e, t) {
       e[n] = t[n];
   }
 }
-async function ne(e, t, n) {
+async function te(e, t, n) {
   n = n || {};
-  for (const o of t)
-    await m(e, o, { ...n, mutate: !0 });
+  for (const r of t)
+    await m(e, r, { ...n, mutate: !0 });
 }
-typeof window < "u" && (window.__debugMutateManifest = ne);
-async function oe(e) {
-  const { makeOfflineBundle: t } = await import("./makeOfflineBundle-C2JTPRo2.js");
+typeof window < "u" && (window.__debugMutateManifest = te);
+async function ne(e) {
+  const { makeOfflineBundle: t } = await import("./makeOfflineBundle-g0Y3sA2l.js");
   return await t(e);
 }
 async function re(e) {
-  const { downloadZip: t } = await import("./downloadZip-B3vadhXZ.js");
+  const { downloadZip: t } = await import("./downloadZip-DMgeO3fU.js");
   return await t(e);
 }
-async function se(e) {
-  const { makeOffline: t } = await import("./makeOffline-DJO3H5Pc.js"), n = await t(e);
-  for await (const o of (await n).files)
-    "data" in o ? console.info(`🗳️ Put ${o.targetFilePath} <=`, o.data) : "url" in o && console.info(`🗳️ Download ${o.targetFilePath} <= ${o.url}`);
+async function oe(e) {
+  const { makeOffline: t } = await import("./makeOffline-1iGrM4gF.js"), n = await t(e);
+  for await (const r of (await n).files)
+    "data" in r ? console.info(`🗳️ Put ${r.targetFilePath} <=`, r.data) : "url" in r && console.info(`🗳️ Download ${r.targetFilePath} <= ${r.url}`);
   console.info("Offline data: ", n.manifest);
 }
-typeof window < "u" && (window.__debugDownloadZip = re, window.__debugMakeOfflineBundle = oe, window.__debugLogOfflineManifestFiles = se);
-const le = w("mount"), ce = w("load"), fe = w("initialize");
-async function ue(e, t, ...n) {
+typeof window < "u" && (window.__debugDownloadZip = re, window.__debugMakeOfflineBundle = ne, window.__debugLogOfflineManifestFiles = oe);
+const ie = w("mount"), le = w("load"), ce = w("initialize");
+async function fe(e, t, ...n) {
   return await w(e)(t, ...n);
 }
-Y("https://efp-runtime.expofp.com/");
+X("https://efp-runtime.expofp.com/");
 export {
-  ee as a,
-  Q as b,
-  j as c,
-  ue as callFunction_Experimental,
-  M as d,
+  Y as a,
+  q as b,
+  F as c,
+  fe as callFunction_Experimental,
+  _ as d,
   re as downloadZip,
-  fe as initialize,
+  ce as initialize,
   i as l,
-  ce as load,
-  oe as makeOfflineBundle,
-  le as mount,
-  ne as mutateManifest,
+  le as load,
+  ne as makeOfflineBundle,
+  ie as mount,
+  te as mutateManifest,
   l as p,
-  K as r,
+  H as r,
   m as resolve
 };
 //# sourceMappingURL=index.js.map