@glossarist/concept-browser 0.4.14 → 0.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -78,4 +78,4 @@
     "postcss.config.js",
     "env.d.ts"
   ]
-}
+}

package/src/components/ConceptDetail.vue

@@ -2,7 +2,7 @@
 import type { Concept, LocalizedConcept, Designation, Expression, ConceptSource } from 'glossarist';
 import type { Manifest, GraphEdge } from '../adapters/types';
 import { computed, ref, nextTick, watch } from 'vue';
-import { langName, langLabel } from '../utils/lang';
+import { langName, langLabel, sortLanguages } from '../utils/lang';
 import { renderMath, cleanContent } from '../utils/math';
 import type { RenderOptions } from '../utils/math';
 import { escapeAttr } from '../utils/escape';
@@ -59,22 +59,7 @@ function copyUri() {
 }
 
 const languages = computed(() => {
-  const order = props.manifest.languageOrder;
-  const keys = props.concept.languages;
-  if (!order) {
-    return [...keys].sort((a, b) => {
-      if (a === 'eng') return -1;
-      if (a === 'eng') return 1;
-      return a.localeCompare(b);
-    });
-  }
-  const orderIndex = new Map(order.map((lang, i) => [lang, i]));
-  return [...keys].sort((a, b) => {
-    const ai = orderIndex.get(a) ?? order.length;
-    const bi = orderIndex.get(b) ?? order.length;
-    if (ai !== bi) return ai - bi;
-    return a.localeCompare(b);
-  });
+  return sortLanguages(props.concept.languages, props.manifest.languageOrder);
 });
 
 // Collapsible language sections — expand all with content, collapse those without

package/src/components/ConceptTimeline.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Concept, LocalizedConcept } from 'glossarist';
 import { computed } from 'vue';
-import { langName, langLabel } from '../utils/lang';
+import { langName, langLabel, sortLanguages } from '../utils/lang';
 import { entryStatusColor } from '../utils/concept-helpers';
 
 const props = defineProps<{
@@ -141,19 +141,7 @@ const languagesWithHistory = computed(() => {
       langs.push(lang);
     }
   }
-  const order = props.languageOrder;
-  if (order) {
-    const orderIndex = new Map(order.map((l, i) => [l, i]));
-    langs.sort((a, b) => {
-      const ai = orderIndex.get(a) ?? order.length;
-      const bi = orderIndex.get(b) ?? order.length;
-      if (ai !== bi) return ai - bi;
-      return a.localeCompare(b);
-    });
-  } else {
-    langs.sort();
-  }
-  return langs;
+  return sortLanguages(langs, props.languageOrder);
 });
 
 function formatDate(isoDate: string): string {

package/src/utils/lang.ts

@@ -29,4 +29,17 @@ export function langLabel(code: string): string {
   return code.toUpperCase();
 }
 
+const FALLBACK_LANG_ORDER = ['eng', 'fra'];
+
+export function sortLanguages(languages: string[], order?: string[]): string[] {
+  const priority = order ?? FALLBACK_LANG_ORDER;
+  const index = new Map(priority.map((l, i) => [l, i]));
+  return [...languages].sort((a, b) => {
+    const ai = index.get(a) ?? priority.length;
+    const bi = index.get(b) ?? priority.length;
+    if (ai !== bi) return ai - bi;
+    return a.localeCompare(b);
+  });
+}
+
 export const DEFAULT_LANG = 'eng';