@glossarist/concept-browser 0.2.12 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.2.12",
+  "version": "0.3.1",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {

package/scripts/generate-data.mjs

@@ -3,6 +3,7 @@ import path from 'path';
 import yaml from 'js-yaml';
 import { naturalSort } from 'glossarist';
 import { loadSiteConfig } from './load-site-config.mjs';
+import { preRenderMath } from './math-prerender.mjs';
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 const ROOT = process.cwd();
@@ -55,7 +56,7 @@ function termToDesignation(term) {
       : term.type === 'abbreviation' ? 'gl:Abbreviation'
       : 'gl:Designation',
     'gl:normativeStatus': term.normative_status || 'preferred',
-    'gl:term': term.designation,
+    'gl:term': preRenderMath(term.designation),
   };
   if (term.gender) doc['gl:gender'] = term.gender;
   if (term.plurality) doc['gl:plurality'] = term.plurality;
@@ -68,7 +69,7 @@ function defsToJsonLd(defs) {
   return defs
     .map(d => ({
       '@type': 'gl:DetailedDefinition',
-      'gl:content': d.content || '',
+      'gl:content': preRenderMath(d.content || ''),
     }))
     .filter(d => d['gl:content']);
 }
@@ -255,7 +256,7 @@ function getPrimaryDesignation(conceptYaml) {
     if (lc && lc.terms && lc.terms.length > 0) {
       const preferredExpr = lc.terms.find(t => t.normative_status === 'preferred' && t.type === 'expression');
       const preferred = preferredExpr || lc.terms.find(t => t.normative_status === 'preferred') || lc.terms[0];
-      descs[lang] = preferred.designation;
+      descs[lang] = preRenderMath(preferred.designation);
     }
   }
   return descs;
@@ -531,11 +532,17 @@ function processDataset(dir, register, opts) {
     status: c.status,
   }));
 
+  // Strip HTML from index summary for text display
+  const plainSummary = summary.map(c => ({
+    ...c,
+    eng: c.eng.replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim(),
+  }));
+
   const graphNodeEntries = concepts.map(c => {
     let term = '', lang = '';
     if (c.designations.eng) { term = c.designations.eng; lang = 'eng'; }
     else { for (const [l, t] of Object.entries(c.designations)) { if (t) { term = t; lang = l; break; } } }
-    return [c.id, term, lang, c.status];
+    return [c.id, term.replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim(), lang, c.status];
   });
   fs.mkdirSync(path.join(DATA, register), { recursive: true });
   fs.writeFileSync(
@@ -553,7 +560,7 @@ function processDataset(dir, register, opts) {
     conceptCount: concepts.length,
     chunkSize: CHUNK_SIZE,
     chunks,
-    concepts: summary,
+    concepts: plainSummary,
   });
 
   writeJson(path.join(DATA, register, 'index-meta.json'), {

package/scripts/math-prerender.mjs

@@ -0,0 +1,80 @@
+import Plurimath from '@plurimath/plurimath';
+
+function renderToMathML(math, format) {
+  try {
+    const p = new Plurimath(math, format);
+    return p.toMathml().replace('display="block"', 'display="inline"').trim();
+  } catch {
+    return null;
+  }
+}
+
+function escapeHtml(text) {
+  return text
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+}
+
+function replaceBracketed(text, prefix, render) {
+  let result = '';
+  let i = 0;
+  const boldPrefix = '*' + prefix;
+  while (i < text.length) {
+    if (text.startsWith(boldPrefix + '[', i)) {
+      i += boldPrefix.length + 1;
+      let j = i;
+      let d = 1;
+      while (j < text.length && d > 0) {
+        if (text[j] === '[') d++;
+        else if (text[j] === ']') d--;
+        j++;
+      }
+      const content = text.slice(i, j - 1);
+      let end = j;
+      if (end < text.length && text[end] === '*') end++;
+      result += render(content, true);
+      i = end;
+    } else if (text.startsWith(prefix + '[', i)) {
+      i += prefix.length + 1;
+      let j = i;
+      let d = 1;
+      while (j < text.length && d > 0) {
+        if (text[j] === '[') d++;
+        else if (text[j] === ']') d--;
+        j++;
+      }
+      const content = text.slice(i, j - 1);
+      result += render(content, false);
+      i = j;
+    } else {
+      result += text[i];
+      i++;
+    }
+  }
+  return result;
+}
+
+function renderStem(math, bold) {
+  const mathml = renderToMathML(math, 'asciimath');
+  if (mathml) {
+    return `<span class="math-inline${bold ? ' math-bold' : ''}">${mathml}</span>`;
+  }
+  return `<code class="math-fallback">${escapeHtml(math)}</code>`;
+}
+
+function renderLatexmath(math, bold) {
+  const mathml = renderToMathML(math, 'latex');
+  if (mathml) {
+    return `<span class="math-inline${bold ? ' math-bold' : ''}">${mathml}</span>`;
+  }
+  return `<code class="math-fallback">${escapeHtml(math)}</code>`;
+}
+
+export function preRenderMath(text) {
+  if (!text) return '';
+  let result = text;
+  result = replaceBracketed(result, 'stem:', renderStem);
+  result = replaceBracketed(result, 'latexmath:', renderLatexmath);
+  return result;
+}

package/src/__tests__/math.test.ts

@@ -1,22 +1,4 @@
-import { describe, it, expect, vi } from 'vitest';
-
-// Mock @plurimath/plurimath for test environment
-vi.mock('@plurimath/plurimath', () => {
-  return {
-    default: class MockPlurimath {
-      private data: string;
-      private format: string;
-      constructor(data: string, format: string) {
-        this.data = data;
-        this.format = format;
-      }
-      toMathml() {
-        return `<math xmlns="http://www.w3.org/1998/Math/MathML"><mi>${this.data}</mi></math>`;
-      }
-    },
-  };
-});
-
+import { describe, it, expect } from 'vitest';
 import { renderMath, cleanContent } from '../utils/math';
 
 describe('renderMath', () => {
@@ -24,25 +6,24 @@ describe('renderMath', () => {
     expect(renderMath('hello world')).toBe('hello world');
   });
 
-  it('renders stem:[x^2] to MathML span', () => {
-    const result = renderMath('the value stem:[x^2]');
-    expect(result).toContain('math-inline');
-    expect(result).toContain('<math');
-    expect(result).not.toContain('math-bold');
+  it('passes through pre-rendered MathML unchanged', () => {
+    const preRendered = 'value <span class="math-inline"><math><mi>x</mi></math></span> here';
+    expect(renderMath(preRendered)).toBe(preRendered);
   });
 
-  it('renders *stem:[x]* (bold math) with math-bold class', () => {
-    const result = renderMath('the value *stem:[x]*');
-    expect(result).toContain('math-inline');
-    expect(result).toContain('math-bold');
+  it('still converts italic in mixed pre-rendered MathML content', () => {
+    const preRendered = '<span class="math-inline"><math><mi>x</mi></math></span> and *italic*';
+    expect(renderMath(preRendered)).toBe(
+      '<span class="math-inline"><math><mi>x</mi></math></span> and <em>italic</em>',
+    );
   });
 
-  it('renders latexmath:[...] with nested brackets', () => {
-    const result = renderMath('coords latexmath:[[u_0, u_1] \\leq 1.0] here');
-    expect(result).toContain('math-inline');
-    expect(result).toContain('<math');
-    expect(result).toContain('u_0');
-    expect(result).not.toContain('latexmath:');
+  it('converts *text* to <em> (italic) for non-pre-rendered content', () => {
+    expect(renderMath('some *italic* text')).toBe('some <em>italic</em> text');
+  });
+
+  it('converts ~text~ to <sub> (subscript)', () => {
+    expect(renderMath('H~2~O')).toBe('H<sub>2</sub>O');
   });
 
   it('converts bullet lines to <ul><li>', () => {
@@ -52,20 +33,6 @@ describe('renderMath', () => {
     expect(result).toContain('<li>second item</li>');
   });
 
-  it('does NOT convert *stem:[...] lines to list items', () => {
-    const result = renderMath('*stem:[x]*');
-    expect(result).not.toContain('<ul');
-    expect(result).toContain('math-bold');
-  });
-
-  it('converts *text* to <em> (italic)', () => {
-    expect(renderMath('some *italic* text')).toBe('some <em>italic</em> text');
-  });
-
-  it('converts ~text~ to <sub> (subscript)', () => {
-    expect(renderMath('H~2~O')).toBe('H<sub>2</sub>O');
-  });
-
   it('resolves URN inline refs via xrefResolver', () => {
     const resolver = (uri: string, term: string) => `[${term}→${uri}]`;
     const result = renderMath(
@@ -117,6 +84,14 @@ describe('renderMath', () => {
     expect(result).toBe('see some term');
   });
 
+  it('resolves cross-refs even in pre-rendered content', () => {
+    const resolver = (uri: string, term: string) => `[${term}→${uri}]`;
+    const preRendered = '<span class="math-inline"><math><mi>x</mi></math></span> and {{urn:iso:std:iso:14812:3.1.1.1,entity}}';
+    expect(renderMath(preRendered, resolver)).toBe(
+      '<span class="math-inline"><math><mi>x</mi></math></span> and [entity→urn:iso:std:iso:14812:3.1.1.1]',
+    );
+  });
+
   it('handles empty input', () => {
     expect(renderMath('')).toBe('');
   });
@@ -128,16 +103,9 @@ describe('renderMath', () => {
 });
 
 describe('cleanContent', () => {
-  it('strips stem:[...] to raw math text', () => {
-    expect(cleanContent('value stem:[x^2] here')).toBe('value x^2 here');
-  });
-
-  it('strips bold stem', () => {
-    expect(cleanContent('value *stem:[x]* here')).toBe('value x here');
-  });
-
-  it('strips latexmath:[...] with nested brackets', () => {
-    expect(cleanContent('coords latexmath:[[u_0, u_1] \\leq 1.0] end')).toBe('coords [u_0, u_1] \\leq 1.0 end');
+  it('strips pre-rendered HTML/MathML tags', () => {
+    expect(cleanContent('value <span class="math-inline"><math><mi>x</mi></math></span> here'))
+      .toBe('value x here');
   });
 
   it('strips *text* to plain text', () => {

package/src/style.css

@@ -158,16 +158,14 @@
     font-family: var(--font-body);
   }
 
-  /* Math (Plurimath MathML output) */
+  /* Math */
   .math-inline {
     display: inline;
   }
   .math-inline math {
     font-size: 1.05em;
   }
-  .math-bold math mi,
-  .math-bold math mn,
-  .math-bold math mo {
+  .math-bold .math-inline math {
     font-weight: bold;
   }
   .math-fallback {

package/src/utils/math.ts

@@ -1,17 +1,3 @@
-import Plurimath from '@plurimath/plurimath';
-
-type MathFormat = 'asciimath' | 'latex' | 'mathml' | 'html' | 'mahtml' | 'omml';
-
-function renderMathSpan(math: string, format: MathFormat, bold: boolean): string {
-  try {
-    const p = new Plurimath(math, format);
-    const mathml = p.toMathml();
-    return `<span class="math-inline${bold ? ' math-bold' : ''}">${mathml}</span>`;
-  } catch {
-    return `<code class="math-fallback">${escapeHtml(math)}</code>`;
-  }
-}
-
 export type XrefResolver = (uri: string, term: string) => string;
 export type BibResolver = (refId: string, title: string) => string;
 export type FigResolver = (figId: string) => string;
@@ -22,12 +8,7 @@ export interface RenderOptions {
   figResolver?: FigResolver;
 }
 
-/**
- * Convert `* item` lines into <ul><li> blocks.
- * Also handles `1)` and `1.` numbered items into ordered lists.
- */
 function convertLists(text: string): string {
-  // Unordered: * item (separated by \n or \n\n)
   let result = text.replace(/(?:^|\n)((?:[ \t]*\* [^\n]+)(?:\n[ \t]*\* [^\n]+)*)/g, (_, block) => {
     if (/^\*stem:\[/.test(block.trimStart())) return _;
     const items: string[] = [];
@@ -41,7 +22,6 @@ function convertLists(text: string): string {
     return `\n<ul class="concept-list">${lis}</ul>`;
   });
 
-  // Ordered: 1) item or 1. item (numbered items)
   result = result.replace(/(?:^|\n)((?:[ \t]*\d+[).][ \t]+[^\n]+)(?:\n[ \t]*\d+[).][ \t]+[^\n]+)*)/g, (_, block) => {
     const items: string[] = [];
     const re = /[ \t]*\d+[).][ \t]+([^\n]+)/g;
@@ -57,63 +37,6 @@ function convertLists(text: string): string {
   return result;
 }
 
-/**
- * Replace `prefix:[content]` where content may contain nested brackets.
- * Handles `*prefix:[content]*` (bold) too.
- */
-function replaceBracketed(
-  text: string,
-  prefix: string,
-  render: (math: string, bold: boolean) => string,
-): string {
-  let result = '';
-  let i = 0;
-  const boldPrefix = '*' + prefix;
-  while (i < text.length) {
-    // Check for bold variant: *prefix:[...]
-    if (text.startsWith(boldPrefix + '[', i)) {
-      const start = i;
-      i += boldPrefix.length + 1; // skip *prefix:[
-      const depth = 1;
-      let j = i;
-      let d = 1;
-      while (j < text.length && d > 0) {
-        if (text[j] === '[') d++;
-        else if (text[j] === ']') d--;
-        j++;
-      }
-      const content = text.slice(i, j - 1);
-      // Check for closing *
-      let end = j;
-      if (end < text.length && text[end] === '*') end++;
-      result += render(content, true);
-      i = end;
-    }
-    // Check for normal variant: prefix:[...]
-    else if (text.startsWith(prefix + '[', i)) {
-      i += prefix.length + 1;
-      let j = i;
-      let d = 1;
-      while (j < text.length && d > 0) {
-        if (text[j] === '[') d++;
-        else if (text[j] === ']') d--;
-        j++;
-      }
-      const content = text.slice(i, j - 1);
-      result += render(content, false);
-      i = j;
-    } else {
-      result += text[i];
-      i++;
-    }
-  }
-  return result;
-}
-
-/**
- * Render stem:[...] math notation to KaTeX HTML.
- * Also handles cross-reference inline patterns (URN refs, bibliography, figures).
- */
 export function renderMath(text: string, xrefResolverOrOpts?: XrefResolver | RenderOptions): string {
   if (!text) return '';
   let result = text;
@@ -122,15 +45,11 @@ export function renderMath(text: string, xrefResolverOrOpts?: XrefResolver | Ren
     ? { xrefResolver: xrefResolverOrOpts }
     : (xrefResolverOrOpts ?? {});
 
-  result = replaceBracketed(result, 'stem:', (math, bold) => renderMathSpan(math, 'asciimath', bold));
-  result = replaceBracketed(result, 'latexmath:', (math, bold) => renderMathSpan(math, 'latex', bold));
-
+  // Math (stem/latexmath) is pre-rendered at build time. Only process text formatting.
   result = convertLists(result);
-
   result = result.replace(/\*([^*]+)\*/g, '<em>$1</em>');
   result = result.replace(/~([^~]+)~/g, '<sub>$1</sub>');
 
-  // Handle AsciiDoc bibliography xrefs: <<ref_XX,title>>
   result = result.replace(/<<([^,>]+),([^>]+)>>/g, (_, refId, title) => {
     if (opts.bibResolver) {
       return opts.bibResolver(refId.trim(), title.trim());
@@ -138,7 +57,6 @@ export function renderMath(text: string, xrefResolverOrOpts?: XrefResolver | Ren
     return `<span class="bib-ref">${escapeHtml(title.trim())}</span>`;
   });
 
-  // Handle AsciiDoc figure xrefs: <<fig_XX>>
   result = result.replace(/<<(fig_[^>]+)>>/g, (_, figId) => {
     if (opts.figResolver) {
       return opts.figResolver(figId.trim());
@@ -146,25 +64,22 @@ export function renderMath(text: string, xrefResolverOrOpts?: XrefResolver | Ren
     return `<span class="fig-ref">${escapeHtml(figId.trim())}</span>`;
   });
 
-  // Handle URN inline refs: {{urn:...,term[,displayText]}} (double-braced)
   result = result.replace(/\{\{(urn:[^,}]+),([^,}]+)(?:,([^}]+))?\}\}/g, (_, uri, term, display) => {
-    const text = (display || term).trim();
+    const t = (display || term).trim();
     if (opts.xrefResolver) {
-      return opts.xrefResolver(uri, text);
+      return opts.xrefResolver(uri, t);
     }
-    return text;
+    return t;
   });
 
-  // Handle URN inline refs: {urn:...,term[,displayText]} (single-braced)
   result = result.replace(/\{(urn:[^,}]+),([^,}]+)(?:,([^}]+))?\}/g, (_, uri, term, display) => {
-    const text = (display || term).trim();
+    const t = (display || term).trim();
     if (opts.xrefResolver) {
-      return opts.xrefResolver(uri, text);
+      return opts.xrefResolver(uri, t);
     }
-    return text;
+    return t;
   });
 
-  // Handle any remaining {{...}} refs (fallback: show term before comma)
   result = result.replace(/\{\{([^,}]+)(?:,\s*[^}]+)?\}\}/g, '$1');
 
   return result;
@@ -177,12 +92,10 @@ function escapeHtml(text: string): string {
     .replace(/>/g, '&gt;');
 }
 
-/**
- * Clean content for plain text display (no math rendering).
- */
 export function cleanContent(text: string): string {
   if (!text) return '';
   let result = text
+    .replace(/<[^>]+>/g, '') // strip pre-rendered HTML/MathML
     .replace(/\*([^*]+)\*/g, '$1')
     .replace(/~([^~]+)~/g, '_$1')
     .replace(/\n[ \t]*\* /g, '; ')
@@ -191,7 +104,5 @@ export function cleanContent(text: string): string {
     .replace(/\{\{urn:[^,}]+,([^,}]+)(?:,[^}]+)?\}\}/g, '$1')
     .replace(/\{urn:[^,}]+,([^,}]+)(?:,[^}]+)?\}/g, '$1')
     .replace(/\{\{([^,}]+)(?:,\s*[^}]+)?\}\}/g, '$1');
-  result = replaceBracketed(result, 'stem:', (math) => math);
-  result = replaceBracketed(result, 'latexmath:', (math) => math);
   return result;
 }

package/vite.config.ts

@@ -20,9 +20,6 @@ export default defineConfig({
       '@': resolve(__dirname, 'src'),
     },
   },
-  optimizeDeps: {
-    include: ['@plurimath/plurimath'],
-  },
   test: {
     environment: 'happy-dom',
     globals: true,