@canopy-iiif/app 1.4.10 → 1.4.11

package/lib/base-path.js

@@ -0,0 +1,67 @@
+'use strict';
+
+function normalizeBasePath(value) {
+  if (value == null) return '';
+  const raw = String(value).trim();
+  if (!raw) return '';
+  const prefixed = raw.startsWith('/') ? raw : `/${raw}`;
+  const cleaned = prefixed.replace(/\/+$/, '');
+  return cleaned === '/' ? '' : cleaned;
+}
+
+let cachedBasePath = null;
+
+function readBasePath(options = {}) {
+  const {force = false} = options;
+  if (!force && cachedBasePath !== null) return cachedBasePath;
+  const candidates = [];
+  try {
+    if (typeof window !== 'undefined' && window.CANOPY_BASE_PATH != null) {
+      candidates.push(window.CANOPY_BASE_PATH);
+    }
+  } catch (_) {}
+  try {
+    if (typeof globalThis !== 'undefined' && globalThis.CANOPY_BASE_PATH != null) {
+      candidates.push(globalThis.CANOPY_BASE_PATH);
+    }
+  } catch (_) {}
+  try {
+    if (typeof process !== 'undefined' && process.env && process.env.CANOPY_BASE_PATH) {
+      candidates.push(process.env.CANOPY_BASE_PATH);
+    }
+  } catch (_) {}
+
+  for (const candidate of candidates) {
+    const normalized = normalizeBasePath(candidate);
+    if (normalized || normalized === '') {
+      cachedBasePath = normalized;
+      return cachedBasePath;
+    }
+  }
+
+  cachedBasePath = '';
+  return cachedBasePath;
+}
+
+function withBasePath(href) {
+  if (typeof href !== 'string') return href;
+  const raw = href.trim();
+  if (!raw) return href;
+  if (/^(?:[a-z][a-z0-9+.-]*:|\/\/|#)/i.test(raw)) return raw;
+  if (!raw.startsWith('/')) return raw;
+  const base = readBasePath();
+  if (!base || base === '/') return raw;
+  if (raw === base || raw.startsWith(`${base}/`)) return raw;
+  return `${base}${raw}`;
+}
+
+function clearBasePathCache() {
+  cachedBasePath = null;
+}
+
+module.exports = {
+  normalizeBasePath,
+  readBasePath,
+  withBasePath,
+  clearBasePathCache,
+};

package/lib/common.js

@@ -8,7 +8,9 @@ const OUT_DIR = path.resolve('site');
 const CACHE_DIR = path.resolve('.cache/mdx');
 const ASSETS_DIR = path.resolve('assets');
 
-const BASE_PATH = String(process.env.CANOPY_BASE_PATH || '').replace(/\/$/, '');
+const { readBasePath, withBasePath } = require('./base-path');
+
+const BASE_PATH = readBasePath();
 let cachedAppearance = null;
 
 function resolveThemeAppearance() {
@@ -107,10 +109,7 @@ function htmlShell({ title, body, cssHref, scriptHref, headExtra, bodyClass }) {
 }
 
 function withBase(href) {
-  if (!href) return href;
-  if (!BASE_PATH) return href;
-  if (typeof href === 'string' && href.startsWith('/')) return `${BASE_PATH}${href}`;
-  return href;
+  return withBasePath(href);
 }
 
 function rootRelativeHref(href) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",
@@ -33,6 +33,11 @@
     "./ui/theme": "./ui/theme.js",
     "./lib/components/*": "./lib/components/*",
     "./head": "./lib/head.js",
+    "./base-path": {
+      "types": "./types/base-path.d.ts",
+      "default": "./lib/base-path.js",
+      "require": "./lib/base-path.js"
+    },
     "./orchestrator": {
       "types": "./types/orchestrator.d.ts",
       "import": "./lib/orchestrator.js",

package/types/base-path.d.ts

@@ -0,0 +1,4 @@
+export function normalizeBasePath(value: unknown): string;
+export function readBasePath(options?: {force?: boolean}): string;
+export function withBasePath(href: string): string;
+export function clearBasePathCache(): void;