@glossarist/concept-browser 0.7.69 → 0.7.73

package/astro.config.mjs

@@ -0,0 +1,55 @@
+import { defineConfig } from 'astro/config';
+import vue from '@astrojs/vue';
+import sitemap from '@astrojs/sitemap';
+import tailwindcss from '@tailwindcss/vite';
+import yaml from 'js-yaml';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { resolve, dirname } from 'path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(resolve(__dirname, 'package.json'), 'utf-8'));
+const pkgVersion = pkg.version;
+
+const site = process.env.SITE_URL || 'https://www.geolexica.org';
+const base = process.env.BASE_PATH || '/';
+
+export default defineConfig({
+  root: __dirname,
+  site,
+  base,
+  output: 'static',
+  publicDir: resolve(process.cwd(), 'public'),
+  integrations: [
+    vue({ appEntrypoint: '/src/islands/app-entry' }),
+    sitemap(),
+  ],
+  i18n: {
+    defaultLocale: 'eng',
+    locales: ['eng', 'fra', 'deu', 'jpn', 'ara', 'zho', 'rus', 'spa', 'kor', 'swe', 'pol', 'fin', 'dan', 'nld', 'msa'],
+    routing: {
+      prefixDefaultLocale: false,
+    },
+  },
+  prefetch: {
+    prefetchAll: true,
+    defaultStrategy: 'viewport',
+  },
+  vite: {
+    plugins: [
+      tailwindcss(),
+      {
+        name: 'yaml-transform',
+        enforce: 'pre',
+        transform(code, id) {
+          if (!id.endsWith('.yml') && !id.endsWith('.yaml')) return;
+          const data = yaml.load(code);
+          return { code: `export default ${JSON.stringify(data)}`, map: null };
+        },
+      },
+    ],
+    define: {
+      __CONCEPT_BROWSER_VERSION__: JSON.stringify(pkgVersion),
+    },
+  },
+});

package/cli/index.mjs

@@ -173,15 +173,34 @@ Environment:
       }
     }
 
-    // Run vite build using the package's vite.config.ts via programmatic API
-    console.log(`\n=== BUILD SPA ===\n`);
-    const viteConfig = resolve(pkgRoot, 'vite.config.ts');
-    const { build: viteBuild } = await import('vite');
-    await viteBuild({
-      configFile: viteConfig,
-      root: pkgRoot,
-      mode: 'production',
-    });
+    // Bridge data to Astro content collections
+    console.log(`\n=== BRIDGE DATA ===\n`);
+    const bridge = resolve(pkgRoot, 'scripts', 'bridge-to-astro.mjs');
+    if (existsSync(bridge)) {
+      await import(`file://${bridge}`);
+    }
+
+    // Run Astro build (TODO.astro/22)
+    console.log(`\n=== BUILD ASTRO ===\n`);
+    const astroConfig = resolve(pkgRoot, 'astro.config.mjs');
+    if (existsSync(astroConfig)) {
+      try {
+        const { build: astroBuild } = await import('astro');
+        await astroBuild({ root: pkgRoot, logLevel: 'info' });
+      } catch (e) {
+        console.warn(`  Astro build failed (${e.message}), falling back to Vite SPA`);
+        console.log(`\n=== BUILD SPA ===\n`);
+        const viteConfig = resolve(pkgRoot, 'vite.config.ts');
+        const { build: viteBuild } = await import('vite');
+        await viteBuild({ configFile: viteConfig, root: pkgRoot, mode: 'production' });
+      }
+    } else {
+      // Fall back to Vite SPA if Astro config doesn't exist
+      console.log(`\n=== BUILD SPA ===\n`);
+      const viteConfig = resolve(pkgRoot, 'vite.config.ts');
+      const { build: viteBuild } = await import('vite');
+      await viteBuild({ configFile: viteConfig, root: pkgRoot, mode: 'production' });
+    }
 
     // Run postbuild (404 page) via dynamic import
     const postbuild = resolve(pkgRoot, 'scripts', 'generate-404.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.69",
+  "version": "0.7.73",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -23,29 +23,34 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "mutation:test": "stryker run stryker.config.mjs",
-    "validate:shacl": "node scripts/validate-shacl.mjs"
+    "validate:shacl": "node scripts/validate-shacl.mjs",
+    "dev:astro": "astro dev",
+    "build:astro": "astro build",
+    "preview:astro": "astro preview"
   },
   "dependencies": {
+    "@astrojs/sitemap": "^3.7.3",
+    "@astrojs/vue": "^7.0.1",
     "@plurimath/plurimath": "^0.2.2",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "autoprefixer": "^10.4.21",
+    "@vitejs/plugin-vue": "^6.0.7",
+    "astro": "^7.0.7",
     "d3": "^7.9.0",
     "favicons": "^7.2.0",
-    "glossarist": "^0.4.15",
+    "glossarist": "^0.4.17",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "pinia": "^2.3.1",
-    "postcss": "^8.5.3",
     "sharp": "^0.34.5",
-    "tailwindcss": "^3.4.17",
-    "vite": "^6.3.5",
+    "vite": "^8.1.4",
     "vue": "^3.5.13",
     "vue-router": "^4.5.1"
   },
   "devDependencies": {
+    "@astrojs/check": "^0.9.9",
     "@rdfjs/dataset": "^2.0.2",
     "@stryker-mutator/core": "^9.6.1",
     "@stryker-mutator/vitest-runner": "^9.6.1",
+    "@tailwindcss/vite": "^4.3.2",
     "@types/d3": "^7.4.3",
     "@types/n3": "^1.26.1",
     "@vue/test-utils": "^2.4.8",
@@ -53,6 +58,7 @@
     "happy-dom": "^20.9.0",
     "n3": "^1.26.0",
     "rdf-validate-shacl": "^0.4.5",
+    "tailwindcss": "^4.3.2",
     "typescript": "~5.7.3",
     "vitest": "^4.1.5",
     "vue-tsc": "^2.2.8"
@@ -87,11 +93,11 @@
     "src",
     "data",
     "public/favicon.svg",
+    "astro.config.mjs",
     "index.html",
     "vite.config.ts",
     "tsconfig.json",
     "tailwind.config.js",
-    "postcss.config.js",
     "env.d.ts"
   ]
 }

package/public/favicon.svg

@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none">
-  <rect width="32" height="32" rx="6" fill="#2563eb"/>
-  <text x="16" y="22" text-anchor="middle" font-family="system-ui" font-weight="bold" font-size="18" fill="white">G</text>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="uuid-e2e4f56e-6766-4eaf-8ba1-80c056213369" xmlns="http://www.w3.org/2000/svg" width="183.1" height="172.48" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 183.1 172.48"><defs><linearGradient id="uuid-526bfbac-cffb-4a71-b92d-c02fefae5080" x1="51.31" y1="161.8" x2="102.32" y2="73.02" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3fb6b0"/><stop offset=".07" stop-color="#5cc5be"/><stop offset=".15" stop-color="#78d3cc"/><stop offset=".24" stop-color="#8fe0d8"/><stop offset=".34" stop-color="#a1e9e1"/><stop offset=".47" stop-color="#aef0e7"/><stop offset=".63" stop-color="#b5f3ea"/><stop offset="1" stop-color="#b8f5ec"/></linearGradient><linearGradient id="uuid-1b1e62d8-3f5c-498e-8428-628e5706abf6" x1="0" y1="59.58" x2="183.1" y2="59.58" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2d4164"/><stop offset=".47" stop-color="#2d4164" stop-opacity=".94"/><stop offset="1" stop-color="#2d4164" stop-opacity=".8"/></linearGradient><linearGradient id="uuid-b44d9113-c74c-48d0-8db3-7071ba63ee91" x1="71.68" y1="31.06" x2="111.41" y2="31.06" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2d4164"/><stop offset=".28" stop-color="#2c4365"/><stop offset="1" stop-color="#588ac1"/></linearGradient><linearGradient id="uuid-ef83f354-a6ba-455c-a262-42ad1af8aab0" x1="76.66" y1="69.37" x2="183.1" y2="69.37" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#34798a" stop-opacity=".7"/><stop offset="1" stop-color="#62c4dd"/></linearGradient><linearGradient id="uuid-9c4f3d11-41f0-40bc-8383-a054e148eefb" x1="81.4" y1="129.46" x2="127.22" y2="50.28" gradientUnits="userSpaceOnUse"><stop offset=".2" stop-color="#456399"/><stop offset="1" stop-color="#3a5c80" stop-opacity=".7"/></linearGradient><linearGradient id="uuid-75c138e5-3eb7-4084-88c8-ea7b28bec669" x1="88.72" y1="146.48" x2="54.34" y2="146.48" xlink:href="#uuid-b44d9113-c74c-48d0-8db3-7071ba63ee91"/><linearGradient id="uuid-648153de-b6a2-4cdb-bf68-e5b0950e981e" x1="86.16" y1="99.24" x2="47.06" y2="25.85" gradientUnits="userSpaceOnUse"><stop offset=".2" stop-color="#456399"/><stop offset="1" stop-color="#3a5c80" stop-opacity=".7"/></linearGradient><linearGradient id="uuid-e1874ccf-ad77-48dc-8e9c-b19bc34aaaf5" x1="89.58" y1="107.94" x2="63.88" y2="57.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#456399" stop-opacity=".5"/><stop offset="1" stop-color="#97a4b7" stop-opacity=".8"/></linearGradient></defs><path d="m87.41,59.48l-61.18,106.11c-1.63,2.85.6,6.85,3.98,6.88h37.88l63.56-112.75-44.23-.25Z" style="fill:url(#uuid-526bfbac-cffb-4a71-b92d-c02fefae5080); stroke-width:0px;"/><path d="m40.39,141.03c.29.28,1.01,2.7,1.61,4.91.67,2.49,2.77,4.38,5.33,4.68,21.2,2.5,21.4,20.71,21.4,20.71l22.5-39.92c-23.71,14.02-41.88,6.43-40.64-8.09-2.71,4.71-7.5,12.99-10.21,17.7Z" style="fill:#3a5c80; stroke-width:0px;"/><path d="m75.5,80.4s-14.96,25.41-18.41,31.59c8.71-8.42,17.69,2.79,24.11-8.66,8.13-14.5-5.7-22.93-5.7-22.93Z" style="fill:#60abbc; stroke-width:0px;"/><path d="m113.82,172.48h38.28c4.52-.01,6.66-3.57,4.43-7.48-6.55-11.51-59.96-105.41-59.96-105.41l-43.04-.37,60.29,113.27Z" style="fill:#b8f5ec; stroke-width:0px;"/><path d="m106.47,91.98c-9.24,2.3-34.69,12.42-21.32,20.21,12.57,7.31,28.11.2,32.05-11.73,1.79-4.66-2.29-10.67-10.74-8.47Z" style="fill:#3fb6b0; stroke-width:0px;"/><path d="m137.32,131.2l-13.09-23.07c.37,24.63-35.5,17.21-35.5,17.21l24.95,46.87c-1-25.77,10.54-35.8,23.65-41Z" style="fill:#7ee0d4; stroke-width:0px;"/><path d="m57.35,132.11s0-.01.01-.02c0,0,0,0,0,0" style="fill:#3a5c80; stroke-width:0px;"/><path d="m183.1,52.52c-.1-3.25-2.07-5.56-6-5.59-13.09-.07-163.15,0-163.15,0L0,72.26h183.1v-19.75Z" style="fill:url(#uuid-1b1e62d8-3f5c-498e-8428-628e5706abf6); stroke-width:0px;"/><path d="m71.68,47s19.67-31.93,27.9-31.9c10.36,0,15.93,31.9,8.24,31.83l-36.15.07Z" style="fill:url(#uuid-b44d9113-c74c-48d0-8db3-7071ba63ee91); stroke-width:0px;"/><path d="m183.1,59.91l-.13,10.94c.07,6.28-2.04,8.39-8.33,8.31h-97.99l10.97-19.59,95.47.33Z" style="fill:url(#uuid-ef83f354-a6ba-455c-a262-42ad1af8aab0); opacity:.78; stroke-width:0px;"/><polygon points="7.1 59.58 0 72.26 80.52 72.26 87.63 59.58 7.1 59.58" style="fill:#3a5c80; opacity:.8; stroke-width:0px;"/><path d="m117.54,47s-65.24,112.78-69.85,120.82c-1.1,1.92.38,4.63,2.65,4.65.71,0,17.74,0,17.74,0l70.73-125.47h-21.27Z" style="fill:url(#uuid-9c4f3d11-41f0-40bc-8383-a054e148eefb); opacity:.8; stroke-width:0px;"/><path d="m84.52,142.79c.55-.64.79-1.48,1.27-2.18,10.98-16.02-12.03-16.74-17.61-8.28l-12.79,23.17c-.14.24-.26.48-.38.72-3.39,7.29,6.71,13.38,11.92,7.26l17.59-20.69Z" style="fill:url(#uuid-75c138e5-3eb7-4084-88c8-ea7b28bec669); opacity:.8; stroke-width:0px;"/><path d="m124.71,126.57s0-.01-.01-.02c0,0,0,0,0,0,0,0,0,.02,0,.02Z" style="fill:#2e4365; stroke-width:0px;"/><polygon points="136.69 172.48 113.82 172.48 53.53 59.58 73.24 59.58 136.69 172.48" style="fill:url(#uuid-648153de-b6a2-4cdb-bf68-e5b0950e981e); opacity:.75; stroke-width:0px;"/><path d="m73.39,59.58l33.44,59.63c2.82,7.65-7.17,26.67-12.28,17.06L53.53,59.58h19.86Z" style="fill:url(#uuid-e1874ccf-ad77-48dc-8e9c-b19bc34aaaf5); stroke-width:0px;"/><path d="m115.87,135.34l18.22,32.5s-36.61-14.66-18.22-32.5Z" style="fill:#4977a4; stroke-width:0px;"/></svg>

package/scripts/bridge-to-astro.mjs

@@ -0,0 +1,149 @@
+/**
+ * Data bridge: converts public/data/*.json into Astro content collections.
+ *
+ * Reads from the CONSUMER's CWD: public/data/datasets.json, public/data/{id}/manifest.json
+ * Writes to the CONSUMER's CWD: .cb-content/{datasets,groups,concepts,pages}/
+ *
+ * The package directory (node_modules/@glossarist/concept-browser/) is NEVER written to.
+ */
+import { readFileSync, writeFileSync, mkdirSync, existsSync, readdirSync } from 'fs';
+import { join } from 'path';
+
+const CWD = process.cwd();
+const PUBLIC_DATA = join(CWD, 'public', 'data');
+const PUBLIC_ROOT = join(CWD, 'public');
+const CONTENT_DIR = join(CWD, '.cb-content');
+
+function readJson(p) {
+  if (!existsSync(p)) return null;
+  return JSON.parse(readFileSync(p, 'utf-8'));
+}
+
+function writeJson(dir, name, data) {
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(join(dir, name), JSON.stringify(data, null, 2));
+}
+
+// --- Datasets ---
+const registryPath = join(PUBLIC_ROOT, 'datasets.json');
+const siteConfigPath = join(PUBLIC_ROOT, 'site-config.json');
+const registry = readJson(registryPath) || [];
+const siteConfig = readJson(siteConfigPath) || {};
+
+console.log(`Bridging ${registry.length} datasets to content collections...`);
+
+for (const reg of registry) {
+  const id = reg.id;
+  const manifestPath = join(PUBLIC_DATA, id, 'manifest.json');
+  const manifest = readJson(manifestPath);
+  if (!manifest) {
+    console.warn(`  Skipping ${id}: no manifest.json`);
+    continue;
+  }
+
+  const summary = reg.summary || {};
+  const entry = {
+    id: manifest.id || id,
+    title: summary.title || manifest.title || id,
+    description: summary.description || manifest.description || '',
+    uri: manifest.datasetUri || reg.datasetUri || '',
+    uriBase: manifest.uriBase || reg.uriBase || '',
+    year: manifest.year ?? summary.year ?? undefined,
+    status: manifest.status || summary.status || 'valid',
+    ref: manifest.ref || reg.ref || undefined,
+    refAliases: manifest.refAliases || reg.refAliases || undefined,
+    owner: summary.owner || manifest.owner || '',
+    languages: manifest.languages || summary.languages || ['eng'],
+    conceptCount: manifest.conceptCount || summary.conceptCount || 0,
+    color: summary.color || manifest.color || undefined,
+    tags: summary.tags || manifest.tags || [],
+    sections: manifest.sections || [],
+    sourceRepo: manifest.sourceRepo || '',
+    lastUpdated: manifest.lastUpdated || '',
+  };
+
+  // Remove undefined values
+  Object.keys(entry).forEach(k => entry[k] === undefined && delete entry[k]);
+
+  writeJson(join(CONTENT_DIR, 'datasets'), `${id}.json`, entry);
+  console.log(`  Dataset: ${id} (${entry.conceptCount} concepts)`);
+
+  // --- Concepts for this dataset ---
+  const indexPath = join(PUBLIC_DATA, id, 'index.json');
+  const index = readJson(indexPath);
+  if (index && index.concepts) {
+    for (const concept of index.concepts) {
+      if (!concept) continue;
+      const conceptEntry = {
+        registerId: id,
+        conceptId: concept.id,
+        uri: `${entry.uriBase || ''}/${id}/concept/${concept.id}`,
+        status: concept.status || 'valid',
+        designations: concept.designations || {},
+        eng: concept.eng || concept.designations?.eng || '',
+        groups: concept.groups || [],
+        tags: [],
+      };
+
+      const fullConceptPath = join(PUBLIC_DATA, id, 'concepts', `${concept.id}.json`);
+      const fullConcept = readJson(fullConceptPath);
+      if (fullConcept) {
+        const lc = fullConcept['gl:localizedConcept'] || fullConcept.localizedConcept || {};
+        const localizations = {};
+        for (const [lang, loc] of Object.entries(lc)) {
+          localizations[lang] = {
+            languageCode: loc['gl:languageCode'] || lang,
+            terms: (loc['gl:designation'] || []).map(d => ({ designation: d['gl:term'] || d.term || '', normativeStatus: d['gl:normativeStatus'] || d.normativeStatus })).filter(d => d.designation),
+            definitions: (loc['gl:definition'] || []).map(d => ({ content: d['gl:content'] || d.content || '' })).filter(d => d.content),
+            notes: (loc['gl:notes'] || []).map(n => ({ content: n['gl:content'] || n.content || '' })).filter(n => n.content),
+            examples: (loc['gl:examples'] || []).map(e => ({ content: e['gl:content'] || e.content || '' })).filter(e => e.content),
+          };
+        }
+        conceptEntry.localizations = localizations;
+        conceptEntry.languages = Object.keys(localizations);
+      }
+
+      writeJson(
+        join(CONTENT_DIR, 'concepts', id),
+        `${concept.id}.json`,
+        conceptEntry
+      );
+    }
+    console.log(`    ${index.concepts.filter(Boolean).length} concepts bridged`);
+  }
+}
+
+// --- Groups ---
+const groups = siteConfig.datasetGroups || [];
+for (const g of groups) {
+  const entry = {
+    id: g.id,
+    label: g.label || g.id,
+    kind: g.kind || (g.series ? 'lineage' : 'default'),
+    description: g.description || '',
+    current: g.current || undefined,
+    datasets: g.datasets || [],
+    color: g.color || undefined,
+  };
+  Object.keys(entry).forEach(k => entry[k] === undefined && delete entry[k]);
+  writeJson(join(CONTENT_DIR, 'groups'), `${g.id}.json`, entry);
+  console.log(`  Group: ${g.id} (${entry.datasets.length} datasets)`);
+}
+
+// --- Pages (from public/pages/*.json) ---
+const pagesDir = join(CWD, 'public', 'pages');
+if (existsSync(pagesDir)) {
+  mkdirSync(join(CONTENT_DIR, 'pages'), { recursive: true });
+  for (const file of readdirSync(pagesDir)) {
+    if (!file.endsWith('.json')) continue;
+    const page = readJson(join(pagesDir, file));
+    if (!page) continue;
+    // Write as a minimal markdown file for the pages content collection
+    const slug = file.replace('.json', '');
+    const md = `---\ntitle: "${page.title || slug}"\ntype: "page"\n---\n\n${page.html || ''}\n`;
+    writeFileSync(join(CONTENT_DIR, 'pages', `${slug}.md`), md);
+  }
+  console.log('  Pages bridged from public/pages/');
+}
+
+console.log('Data bridge complete.');

package/scripts/generate-data.mjs

@@ -273,6 +273,7 @@ function sourcesToJsonLd(sources) {
     if (s.id) doc['gl:id'] = s.id;
     if (s.type) doc['gl:sourceType'] = s.type;
     if (s.status) doc['gl:sourceStatus'] = s.status;
+    if (s.modification) doc['gl:modification'] = s.modification;
     if (s.origin) {
       const origin = { '@type': 'gl:Citation' };
       const ref = refToJsonLd(s.origin.ref);
@@ -282,6 +283,17 @@ function sourcesToJsonLd(sources) {
       if (s.origin.link) origin['gl:link'] = s.origin.link;
       doc['gl:origin'] = origin;
     }
+    if (s.sourced_from && s.sourced_from.length) {
+      doc['gl:sourcedFrom'] = s.sourced_from.map(sf => {
+        const cite = { '@type': 'gl:Citation' };
+        const ref = refToJsonLd(sf.ref);
+        if (ref) cite['gl:ref'] = ref;
+        const loc = localityToJsonLd(sf.locality);
+        if (loc) cite['gl:locality'] = loc;
+        if (sf.link) cite['gl:link'] = sf.link;
+        return cite;
+      });
+    }
     return doc;
   });
 }

package/src/adapters/model-bridge.ts

@@ -103,6 +103,8 @@ interface JsonLdSource {
   'gl:sourceStatus'?: string;
   'gl:modification'?: string;
   'gl:origin'?: JsonLdOrigin;
+  'gl:sourcedFrom'?: JsonLdOrigin[];
+  'gl:sourced_from'?: JsonLdOrigin[];
 }
 
 interface JsonLdRelated {
@@ -216,6 +218,21 @@ export function getRelatedCitation(rc: object): Record<string, unknown> | null {
 // Relationship types whose target is a designation string, not a concept ref.
 const DESIGNATION_REL_TYPES = new Set(['abbreviated_form_for', 'short_form_for']);
 
+function attachSourcedFromToSources(
+  sources: readonly { sourced_from?: unknown }[],
+  rawSources: unknown,
+): void {
+  if (!Array.isArray(rawSources)) return;
+  for (let i = 0; i < sources.length && i < rawSources.length; i++) {
+    const raw = rawSources[i] as Record<string, unknown> | undefined;
+    if (raw?.sourced_from && Array.isArray(raw.sourced_from)) {
+      (sources[i] as { sourced_from: unknown }).sourced_from = raw.sourced_from.map(
+        (sf: unknown) => sf instanceof Citation ? sf : Citation.fromJSON(sf as Record<string, unknown>)
+      );
+    }
+  }
+}
+
 function attachBridges(concept: Concept, localizations: Record<string, unknown>): void {
   for (const lang of concept.languages) {
     const lc = concept.localization(lang);
@@ -223,6 +240,9 @@ function attachBridges(concept: Concept, localizations: Record<string, unknown>)
     if (!lc || !raw || typeof raw !== 'object') continue;
     const rawObj = raw as Record<string, unknown>;
 
+    // Attach sourced_from to localization-level sources
+    attachSourcedFromToSources(lc.sources as unknown as { sourced_from?: unknown }[], rawObj.sources);
+
     // Annotations
     const annList = rawObj.annotations;
     if (Array.isArray(annList) && annList.length > 0) {
@@ -234,7 +254,8 @@ function attachBridges(concept: Concept, localizations: Record<string, unknown>)
     // Designation-level relationship targets, ref text, sourceId, citation
     const rawTerms = rawObj.terms;
     if (Array.isArray(rawTerms)) {
-      for (const rawTerm of rawTerms) {
+      for (let ti = 0; ti < rawTerms.length; ti++) {
+        const rawTerm = rawTerms[ti];
         if (!rawTerm || typeof rawTerm !== 'object') continue;
         const rawT = rawTerm as Record<string, unknown>;
         const rawDesignation = rawT.designation as string | undefined;
@@ -244,6 +265,11 @@ function attachBridges(concept: Concept, localizations: Record<string, unknown>)
         const rawRelated = rawT.related;
         if (!Array.isArray(rawRelated)) continue;
         attachRelatedBridges(designation.related, rawRelated);
+        // Attach sourced_from to designation-level sources
+        attachSourcedFromToSources(
+          designation.sources as unknown as { sourced_from?: unknown }[],
+          rawT.sources,
+        );
       }
     }
 
@@ -408,6 +434,19 @@ function mapDetailedDefinitionFromJsonLd(d: any): Record<string, unknown> {
   return result;
 }
 
+function mapOriginFromJsonLd(o: JsonLdOrigin): Record<string, unknown> {
+  const origin: Record<string, unknown> = {};
+  const ref = mapRefFromJsonLd(o['gl:ref']);
+  if (ref) origin.ref = ref;
+  const loc = mapLocalityFromJsonLd(o['gl:locality']);
+  if (loc) origin.locality = loc;
+  if (o['gl:link']) origin.link = o['gl:link'];
+  if (o['gl:id']) origin.id = o['gl:id'];
+  if (o['gl:version']) origin.version = o['gl:version'];
+  if (o['gl:source']) origin.source = o['gl:source'];
+  return origin;
+}
+
 function mapSourceFromJsonLd(s: JsonLdSource): Record<string, unknown> {
   const result: Record<string, unknown> = {};
   if (s['gl:id']) result.id = s['gl:id'];
@@ -416,17 +455,12 @@ function mapSourceFromJsonLd(s: JsonLdSource): Record<string, unknown> {
   if (s['gl:modification']) result.modification = s['gl:modification'];
 
   if (s['gl:origin']) {
-    const origin: Record<string, unknown> = {};
-    const o = s['gl:origin'];
-    const ref = mapRefFromJsonLd(o['gl:ref']);
-    if (ref) origin.ref = ref;
-    const loc = mapLocalityFromJsonLd(o['gl:locality']);
-    if (loc) origin.locality = loc;
-    if (o['gl:link']) origin.link = o['gl:link'];
-    if (o['gl:id']) origin.id = o['gl:id'];
-    if (o['gl:version']) origin.version = o['gl:version'];
-    if (o['gl:source']) origin.source = o['gl:source'];
-    result.origin = origin;
+    result.origin = mapOriginFromJsonLd(s['gl:origin']);
+  }
+
+  const sf = s['gl:sourcedFrom'] ?? s['gl:sourced_from'];
+  if (sf?.length) {
+    result.sourced_from = sf.map(item => mapOriginFromJsonLd(item));
   }
 
   return result;
@@ -614,6 +648,10 @@ export function conceptFromJson(doc: Record<string, unknown>): Concept {
   const concept = Concept.fromJSON(doc);
   const locs = (doc as Record<string, unknown>).localizations as Record<string, unknown> | undefined;
   if (locs) attachBridges(concept, locs);
+  attachSourcedFromToSources(
+    concept.sources as unknown as { sourced_from?: unknown }[],
+    (doc as Record<string, unknown>).sources,
+  );
   return concept;
 }
 

package/src/adapters/non-verbal/glossarist-augment.d.ts

@@ -11,9 +11,13 @@
 // DELETE this file when upstream ships proper declarations — tracked by
 // PR glossarist/glossarist-js#31 (targets v0.4.3+).
 
-import type { ConceptSource, GlossaristModel } from 'glossarist';
+import type { ConceptSource, Citation, GlossaristModel } from 'glossarist';
 
 declare module 'glossarist' {
+  interface ConceptSource {
+    sourced_from?: Citation[];
+  }
+
   class RegistrableModel extends GlossaristModel {
     static register(type: string, cls: typeof RegistrableModel): void;
     static fromData(data: Record<string, unknown>): RegistrableModel;

package/src/assets/glossarist-logo-full.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="uuid-fffeb195-1711-411a-b374-52204ad82fd6" xmlns="http://www.w3.org/2000/svg" width="183.1" height="172.48" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 183.1 172.48"><defs><linearGradient id="uuid-6317b9cc-2e5f-41e2-85f1-7443049bc3fc" x1="51.31" y1="161.8" x2="102.32" y2="73.02" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3fb6b0"/><stop offset=".07" stop-color="#5cc5be"/><stop offset=".15" stop-color="#78d3cc"/><stop offset=".24" stop-color="#8fe0d8"/><stop offset=".34" stop-color="#a1e9e1"/><stop offset=".47" stop-color="#aef0e7"/><stop offset=".63" stop-color="#b5f3ea"/><stop offset="1" stop-color="#b8f5ec"/></linearGradient><linearGradient id="uuid-ea13e7e7-b134-4ab8-aa9c-2ec35d57d2e0" x1="0" y1="59.58" x2="183.1" y2="59.58" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2d4164"/><stop offset=".47" stop-color="#2d4164" stop-opacity=".94"/><stop offset="1" stop-color="#2d4164" stop-opacity=".8"/></linearGradient><linearGradient id="uuid-b04c0104-3d2b-4e91-a646-00a62f882d94" x1="71.68" y1="31.06" x2="111.41" y2="31.06" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2d4164"/><stop offset=".28" stop-color="#2c4365"/><stop offset="1" stop-color="#588ac1"/></linearGradient><linearGradient id="uuid-3270c642-e286-4980-b9d4-c5a586959dc8" x1="76.66" y1="69.37" x2="183.1" y2="69.37" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#34798a" stop-opacity=".7"/><stop offset="1" stop-color="#62c4dd"/></linearGradient><linearGradient id="uuid-b517cc88-1e38-4408-9af5-0022fab7d735" x1="81.4" y1="129.46" x2="127.22" y2="50.28" gradientUnits="userSpaceOnUse"><stop offset=".2" stop-color="#456399"/><stop offset="1" stop-color="#3a5c80" stop-opacity=".7"/></linearGradient><linearGradient id="uuid-30648514-5669-4d95-96c9-4dab36559efb" x1="88.72" y1="146.48" x2="54.34" y2="146.48" xlink:href="#uuid-b04c0104-3d2b-4e91-a646-00a62f882d94"/><linearGradient id="uuid-ab3522e9-c0cd-4474-8859-9f36cdf98f81" x1="86.16" y1="99.24" x2="47.06" y2="25.85" gradientUnits="userSpaceOnUse"><stop offset=".2" stop-color="#456399"/><stop offset="1" stop-color="#3a5c80" stop-opacity=".7"/></linearGradient><linearGradient id="uuid-4f227c7d-7a65-4e56-9321-c6145c47210b" x1="89.58" y1="107.94" x2="63.88" y2="57.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#456399" stop-opacity=".5"/><stop offset="1" stop-color="#97a4b7" stop-opacity=".8"/></linearGradient></defs><path d="m87.41,59.48l-61.18,106.11c-1.63,2.85.6,6.85,3.98,6.88h37.88l63.56-112.75-44.23-.25Z" style="fill:url(#uuid-6317b9cc-2e5f-41e2-85f1-7443049bc3fc); stroke-width:0px;"/><path d="m40.39,141.03c.29.28,1.01,2.7,1.61,4.91.67,2.49,2.77,4.38,5.33,4.68,21.2,2.5,21.4,20.71,21.4,20.71l22.5-39.92c-23.71,14.02-41.88,6.43-40.64-8.09-2.71,4.71-7.5,12.99-10.21,17.7Z" style="fill:#3a5c80; stroke-width:0px;"/><path d="m75.5,80.4s-14.96,25.41-18.41,31.59c8.71-8.42,17.69,2.79,24.11-8.66,8.13-14.5-5.7-22.93-5.7-22.93Z" style="fill:#60abbc; stroke-width:0px;"/><path d="m113.82,172.48h38.28c4.52-.01,6.66-3.57,4.43-7.48-6.55-11.51-59.96-105.41-59.96-105.41l-43.04-.37,60.29,113.27Z" style="fill:#b8f5ec; stroke-width:0px;"/><path d="m106.47,91.98c-9.24,2.3-34.69,12.42-21.32,20.21,12.57,7.31,28.11.2,32.05-11.73,1.79-4.66-2.29-10.67-10.74-8.47Z" style="fill:#3fb6b0; stroke-width:0px;"/><path d="m137.32,131.2l-13.09-23.07c.37,24.63-35.5,17.21-35.5,17.21l24.95,46.87c-1-25.77,10.54-35.8,23.65-41Z" style="fill:#7ee0d4; stroke-width:0px;"/><path d="m57.35,132.11s0-.01.01-.02c0,0,0,0,0,0" style="fill:#3a5c80; stroke-width:0px;"/><path d="m183.1,52.52c-.1-3.25-2.07-5.56-6-5.59-13.09-.07-163.15,0-163.15,0L0,72.26h183.1v-19.75Z" style="fill:url(#uuid-ea13e7e7-b134-4ab8-aa9c-2ec35d57d2e0); stroke-width:0px;"/><path d="m71.68,47s19.67-31.93,27.9-31.9c10.36,0,15.93,31.9,8.24,31.83l-36.15.07Z" style="fill:url(#uuid-b04c0104-3d2b-4e91-a646-00a62f882d94); stroke-width:0px;"/><path d="m183.1,59.91l-.13,10.94c.07,6.28-2.04,8.39-8.33,8.31h-97.99l10.97-19.59,95.47.33Z" style="fill:url(#uuid-3270c642-e286-4980-b9d4-c5a586959dc8); opacity:.78; stroke-width:0px;"/><polygon points="7.1 59.58 0 72.26 80.52 72.26 87.63 59.58 7.1 59.58" style="fill:#3a5c80; opacity:.8; stroke-width:0px;"/><path d="m117.54,47s-65.24,112.78-69.85,120.82c-1.1,1.92.38,4.63,2.65,4.65.71,0,17.74,0,17.74,0l70.73-125.47h-21.27Z" style="fill:url(#uuid-b517cc88-1e38-4408-9af5-0022fab7d735); opacity:.8; stroke-width:0px;"/><path d="m84.52,142.79c.55-.64.79-1.48,1.27-2.18,10.98-16.02-12.03-16.74-17.61-8.28l-12.79,23.17c-.14.24-.26.48-.38.72-3.39,7.29,6.71,13.38,11.92,7.26l17.59-20.69Z" style="fill:url(#uuid-30648514-5669-4d95-96c9-4dab36559efb); opacity:.8; stroke-width:0px;"/><path d="m124.71,126.57s0-.01-.01-.02c0,0,0,0,0,0,0,0,0,.02,0,.02Z" style="fill:#2e4365; stroke-width:0px;"/><polygon points="136.69 172.48 113.82 172.48 53.53 59.58 73.24 59.58 136.69 172.48" style="fill:url(#uuid-ab3522e9-c0cd-4474-8859-9f36cdf98f81); opacity:.75; stroke-width:0px;"/><path d="m73.39,59.58l33.44,59.63c2.82,7.65-7.17,26.67-12.28,17.06L53.53,59.58h19.86Z" style="fill:url(#uuid-4f227c7d-7a65-4e56-9321-c6145c47210b); stroke-width:0px;"/><path d="m115.87,135.34l18.22,32.5s-36.61-14.66-18.22-32.5Z" style="fill:#4977a4; stroke-width:0px;"/></svg>

package/src/astro-islands/app.ts

@@ -0,0 +1,3 @@
+import { createPinia } from 'pinia';
+export const pinia = createPinia();
+export default pinia;

package/src/components/AppFooter.vue

@@ -2,7 +2,8 @@
 import { computed } from 'vue';
 import { useSiteConfig } from '../config/use-site-config';
 import { useI18n } from '../i18n';
-import glossaristLogo from '../assets/glossarist-logo.svg';
+
+const glossaristLogo = new URL('../assets/glossarist-logo.svg', import.meta.url).href;
 
 const { config } = useSiteConfig();
 const { t } = useI18n();
@@ -58,7 +59,7 @@ const ownerUrl = computed(() => config.value?.branding?.ownerUrl || '/');
           >{{ link.label }}</a>
           <span class="text-ink-200">|</span>
           <span class="text-xs inline-flex items-center gap-1.5">
-            <img :src="glossaristLogo" alt="" class="w-4 h-4 opacity-80" />
+            <img :src="glossaristLogo" alt="Glossarist" class="w-4 h-4 opacity-80" />
             <a :href="poweredBy.url" target="_blank" rel="noopener" class="concept-link">{{ poweredBy.message }}</a>
           </span>
         </div>

package/src/components/AppHeader.vue

@@ -6,6 +6,8 @@ import { useSiteConfig } from '../config/use-site-config';
 import { useI18n } from '../i18n';
 import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
 
+const glossaristLogo = new URL('../assets/glossarist-logo.svg', import.meta.url).href;
+
 const router = useRouter();
 const ui = useUiStore();
 const store = useVocabularyStore();
@@ -76,13 +78,8 @@ onBeforeUnmount(() => document.removeEventListener('click', closeLangOnOutside))
             class="h-8 max-w-[48px] object-contain rounded"
           />
         </div>
-        <div v-else class="w-8 h-8 rounded-lg flex items-center justify-center transition-colors" style="background-color: var(--brand-dark)">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M4 19.5A2.5 2.5 0 0 1 6.5 17H20"/>
-            <path d="M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z"/>
-            <line x1="9" y1="7" x2="17" y2="7"/>
-            <line x1="9" y1="11" x2="15" y2="11"/>
-          </svg>
+        <div v-else class="h-8 flex items-center">
+          <img :src="glossaristLogo" alt="Glossarist" class="h-8 max-w-[48px] object-contain rounded" />
         </div>
         <span class="font-serif text-lg text-ink-800 leading-none hidden sm:inline">{{ localizedTitle }}</span>
       </button>

package/src/components/AppSidebar.vue

@@ -319,17 +319,20 @@ const activeSectionId = computed(() => {
               <button
                 v-else
                 @click="goToDataset(ds.id)"
-                class="w-full text-left px-3 py-2 rounded-lg text-sm border-l-2"
+                class="w-full text-left px-3 py-2 rounded-lg text-sm border-l-2 flex items-start gap-2"
                 :class="[
                   currentDataset === ds.id
                     ? 'text-ink-800 dark:text-ink-50'
                     : 'border-transparent text-ink-600 dark:text-ink-300 hover:bg-ink-50 dark:hover:bg-ink-700 hover:text-ink-800 dark:hover:text-ink-50'
                 ]"
-                :style="currentDataset === ds.id ? { borderLeftColor: getColor(ds.id), borderLeftWidth: '2px' } : {}"
+                :style="{ borderLeftColor: currentDataset === ds.id ? getColor(ds.id) : 'transparent' }"
               >
-                <div class="font-medium truncate leading-snug">{{ localizedDatasetField(ds.id, 'title', ds.title) }}</div>
-                <div v-if="ds.loaded" class="text-xs mt-0.5" :class="currentDataset === ds.id ? 'text-ink-400 dark:text-ink-300' : 'text-ink-300 dark:text-ink-400'">
-                  {{ ds.conceptCount.toLocaleString() }} {{ t('home.concepts').toLowerCase() }}
+                <span class="w-2 h-2 rounded-full flex-shrink-0 mt-1.5" :style="{ backgroundColor: getColor(ds.id) }"></span>
+                <div class="min-w-0 flex-1">
+                  <div class="font-medium truncate leading-snug">{{ localizedDatasetField(ds.id, 'title', ds.title) }}</div>
+                  <div v-if="ds.loaded" class="text-xs mt-0.5" :class="currentDataset === ds.id ? 'text-ink-400 dark:text-ink-300' : 'text-ink-300 dark:text-ink-400'">
+                    {{ ds.conceptCount.toLocaleString() }} {{ t('home.concepts').toLowerCase() }}
+                  </div>
                 </div>
               </button>
 

package/src/components/ConceptDetail.vue

@@ -448,6 +448,12 @@ const nonVerbalReps = computed(() => {
                     <span v-if="!src.origin && src.modification" class="text-ink-400">{{ src.modification }}</span>
                   </div>
                   <div v-if="src.modification" class="text-xs text-ink-300 mt-1">{{ src.modification }}</div>
+                  <div v-if="src.sourced_from?.length" class="text-xs text-ink-400 mt-1">
+                    <span class="text-ink-300">{{ t('concept.sourcedFrom') }}:</span>
+                    <div v-for="(sf, sfi) in src.sourced_from" :key="'sf'+sfi" class="ml-2">
+                      <CitationDisplay v-if="sf" :citation="sf" :register-id="registerId" />
+                    </div>
+                  </div>
                 </div>
               </div>
 
@@ -614,6 +620,12 @@ const nonVerbalReps = computed(() => {
                   <CitationDisplay v-if="src.origin" :citation="src.origin" />
                 </div>
                 <div v-if="src.modification" class="text-ink-300 mt-0.5">{{ src.modification }}</div>
+                <div v-if="src.sourced_from?.length" class="text-ink-400 mt-0.5">
+                  <span class="text-ink-300">{{ t('concept.sourcedFrom') }}:</span>
+                  <div v-for="(sf, sfi) in src.sourced_from" :key="'sf'+sfi" class="ml-2">
+                    <CitationDisplay v-if="sf" :citation="sf" />
+                  </div>
+                </div>
               </div>
             </div>
           </div>