@seed-hypermedia/client 0.0.38 → 0.0.39

package/dist/index.mjs

@@ -2173,10 +2173,9 @@ async function resolveHypermediaUrl(url, opts) {
   let blockRef = null;
   let blockRange = null;
   let panel = null;
-  let parsedHostname = null;
+  let parsedUrl = null;
   try {
-    const parsedUrl = new URL(url);
-    parsedHostname = parsedUrl.hostname;
+    parsedUrl = new URL(url);
     const hasVersion = parsedUrl.searchParams.has("v");
     const hasLatest = parsedUrl.searchParams.has("l");
     panel = parsedUrl.searchParams.get("panel");
@@ -2194,45 +2193,42 @@ async function resolveHypermediaUrl(url, opts) {
     latest = blockRef ? false : hasLatest || !hasVersion;
   } catch {
   }
-  if ((opts == null ? void 0 : opts.domainResolver) && parsedHostname) {
+  if ((opts == null ? void 0 : opts.domainResolver) && parsedUrl) {
     try {
-      const parsedUrl = new URL(url);
-      const uid = await opts.domainResolver(parsedHostname);
+      const uid = await opts.domainResolver(parsedUrl.hostname);
       if (uid) {
-        const pathSegments = parsedUrl.pathname.split("/").filter(Boolean);
-        const profilePath = resolveProfilePath(uid, pathSegments);
-        const resolvedUid = (profilePath == null ? void 0 : profilePath.uid) || uid;
-        const path = (profilePath == null ? void 0 : profilePath.path) || (pathSegments.length > 0 ? pathSegments : null);
-        const version = parsedUrl.searchParams.get("v") || null;
-        const pathStr = path ? "/" + path.join("/") : "";
-        const siteHostname = parsedUrl.origin;
-        return {
-          id: `hm://${resolvedUid}${pathStr}`,
-          hmId: {
-            id: `hm://${resolvedUid}${pathStr}`,
-            uid: resolvedUid,
-            path,
-            version,
-            blockRef,
-            blockRange,
-            hostname: siteHostname,
-            scheme: "hm",
-            latest
-          },
-          version,
-          title: null,
-          target: null,
-          authors: null,
-          type: null,
+        return buildResolvedUrlFromDomainUid(parsedUrl, uid, {
+          latest,
+          blockRef,
+          blockRange,
           panel
-        };
+        });
       }
     } catch {
     }
   }
-  const response = await fetch(url, {
-    method: "OPTIONS"
-  });
+  let response;
+  try {
+    response = await fetch(url, {
+      method: "OPTIONS"
+    });
+  } catch (error) {
+    if ((opts == null ? void 0 : opts.domainResolver) && parsedUrl) {
+      try {
+        const uid = await opts.domainResolver(parsedUrl.hostname);
+        if (uid) {
+          return buildResolvedUrlFromDomainUid(parsedUrl, uid, {
+            latest,
+            blockRef,
+            blockRange,
+            panel
+          });
+        }
+      } catch {
+      }
+    }
+    throw error;
+  }
   if (response.status === 200) {
     const rawId = response.headers.get("x-hypermedia-id");
     const id = rawId ? decodeURIComponent(rawId) : null;
@@ -2290,6 +2286,40 @@ async function resolveId(input, opts) {
   }
   throw new Error(`Invalid Hypermedia ID: ${input}`);
 }
+function buildResolvedUrlFromDomainUid(parsedUrl, uid, {
+  latest,
+  blockRef,
+  blockRange,
+  panel
+}) {
+  const pathSegments = entityQueryPathToHmIdPath(parsedUrl.pathname);
+  const profilePath = resolveProfilePath(uid, pathSegments);
+  const resolvedUid = (profilePath == null ? void 0 : profilePath.uid) || uid;
+  const path = (profilePath == null ? void 0 : profilePath.path) || (pathSegments.length > 0 ? pathSegments : null);
+  const version = parsedUrl.searchParams.get("v") || null;
+  const pathStr = path ? "/" + path.join("/") : "";
+  const siteHostname = parsedUrl.origin;
+  return {
+    id: `hm://${resolvedUid}${pathStr}`,
+    hmId: {
+      id: `hm://${resolvedUid}${pathStr}`,
+      uid: resolvedUid,
+      path,
+      version,
+      blockRef,
+      blockRange,
+      hostname: siteHostname,
+      scheme: "hm",
+      latest
+    },
+    version,
+    title: null,
+    target: null,
+    authors: null,
+    type: null,
+    panel
+  };
+}
 function resolveProfilePath(siteUid, pathSegments) {
   if (pathSegments[0] !== ":profile") return null;
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seed-hypermedia/client",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "repository": {
     "type": "git",
     "url": "https://github.com/seed-hypermedia/seed",