@glossarist/concept-browser 0.7.77 → 0.7.80

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

@@ -10,14 +10,15 @@
 // This file declares the runtime shape so consumer code can be type-checked.
 // DELETE this file when upstream ships proper declarations — tracked by
 // PR glossarist/glossarist-js#31 (targets v0.4.3+).
+//
+// v2 PartitiveRelation block (below) tracks glossarist 0.4.20 — the runtime
+// exports PartitiveRelation/PartitiveMember/TypeSharedPlurality from
+// src/models/index.js, but the d.ts has not been updated. Remove the v2
+// block when upstream PRs the d.ts changes.
 
 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;
@@ -134,4 +135,154 @@ declare module 'glossarist' {
     static fromYAML(yamlString: string): BibliographyData;
     static fromJSON(data: Record<string, unknown>): BibliographyData;
   }
+
+  // ── v2 PartitiveRelation (glossarist 0.4.20) ────────────────────────────
+  // Runtime exports these from src/models/index.js; d.ts is stale.
+
+  type Completeness = 'complete' | 'partial';
+  const COMPLETENESS: { readonly COMPLETE: 'complete'; readonly PARTIAL: 'partial' };
+  const COMPLETENESS_VALUES: readonly Completeness[];
+  const DEFAULT_COMPLETENESS: Completeness;
+  function isValidCompleteness(value: unknown): value is Completeness;
+
+  type MemberCertainty = 'confirmed' | 'possible';
+  const MEMBER_CERTAINTY: { readonly CONFIRMED: 'confirmed'; readonly POSSIBLE: 'possible' };
+  const MEMBER_CERTAINTY_VALUES: readonly MemberCertainty[];
+  const DEFAULT_MEMBER_CERTAINTY: MemberCertainty;
+  function isValidMemberCertainty(value: unknown): value is MemberCertainty;
+
+  class TypeSharedPlurality extends GlossaristModel {
+    constructor(data?: {
+      isShared?: boolean;
+      is_shared?: boolean;
+      isUncertain?: boolean;
+      is_uncertain?: boolean;
+      sharedType?: ConceptRef;
+      shared_type?: ConceptRef;
+    });
+    readonly isShared: boolean;
+    readonly isUncertain: boolean;
+    readonly sharedType: ConceptRef | null;
+    hasSharedType(): boolean;
+    toJSON(): { is_shared: boolean; is_uncertain?: boolean; shared_type?: ReturnType<ConceptRef['toJSON']> };
+    static fromJSON(data: Record<string, unknown>): TypeSharedPlurality;
+  }
+
+  class PartitiveMember extends GlossaristModel {
+    constructor(data?: { ref?: ConceptRef; certainty?: MemberCertainty });
+    readonly ref: ConceptRef;
+    readonly certainty: MemberCertainty;
+    readonly isConfirmed: boolean;
+    readonly isPossible: boolean;
+    toJSON(): { ref: ReturnType<ConceptRef['toJSON']>; certainty?: MemberCertainty };
+    static fromJSON(data: Record<string, unknown>): PartitiveMember;
+    static identityOf(value: unknown): string;
+  }
+
+  class PartitiveRelation extends GlossaristModel {
+    constructor(data?: {
+      comprehensive?: ConceptRef;
+      partitives?: PartitiveMember[];
+      completeness?: Completeness;
+      plurality?: TypeSharedPlurality;
+      criterion?: Record<string, string> | string;
+    });
+    readonly comprehensive: ConceptRef;
+    readonly partitives: PartitiveMember[];
+    readonly completeness: Completeness;
+    readonly plurality: TypeSharedPlurality | null;
+    readonly criterion: Record<string, string> | null;
+    readonly isComplete: boolean;
+    readonly isPartial: boolean;
+    readonly isCoordinate: boolean;
+    hasPlurality(): boolean;
+    hasCriterion(): boolean;
+    toJSON(): {
+      comprehensive: ReturnType<ConceptRef['toJSON']>;
+      partitives: ReturnType<PartitiveMember['toJSON']>[];
+      completeness: Completeness;
+      plurality?: ReturnType<TypeSharedPlurality['toJSON']>;
+      criterion?: Record<string, string>;
+    };
+    static fromJSON(data: Record<string, unknown>): PartitiveRelation;
+    static identityOf(value: unknown): string;
+  }
+
+  interface Concept {
+    readonly partitiveRelations: PartitiveRelation[];
+  }
+}
+
+// Re-declare the same exports under the 'glossarist/models' subpath so
+// deep-import callers can use them. Upstream's d.ts is stale on this
+// subpath too.
+declare module 'glossarist/models' {
+  export type Completeness = 'complete' | 'partial';
+  export const COMPLETENESS: { readonly COMPLETE: 'complete'; readonly PARTIAL: 'partial' };
+  export const COMPLETENESS_VALUES: readonly Completeness[];
+  export const DEFAULT_COMPLETENESS: Completeness;
+  export function isValidCompleteness(value: unknown): value is Completeness;
+
+  export type MemberCertainty = 'confirmed' | 'possible';
+  export const MEMBER_CERTAINTY: { readonly CONFIRMED: 'confirmed'; readonly POSSIBLE: 'possible' };
+  export const MEMBER_CERTAINTY_VALUES: readonly MemberCertainty[];
+  export const DEFAULT_MEMBER_CERTAINTY: MemberCertainty;
+  export function isValidMemberCertainty(value: unknown): value is MemberCertainty;
+
+  export class TypeSharedPlurality extends GlossaristModel {
+    constructor(data?: {
+      isShared?: boolean;
+      is_shared?: boolean;
+      isUncertain?: boolean;
+      is_uncertain?: boolean;
+      sharedType?: ConceptRef;
+      shared_type?: ConceptRef;
+    });
+    readonly isShared: boolean;
+    readonly isUncertain: boolean;
+    readonly sharedType: ConceptRef | null;
+    hasSharedType(): boolean;
+    toJSON(): { is_shared: boolean; is_uncertain?: boolean; shared_type?: ReturnType<ConceptRef['toJSON']> };
+    static fromJSON(data: Record<string, unknown>): TypeSharedPlurality;
+  }
+
+  export class PartitiveMember extends GlossaristModel {
+    constructor(data?: { ref?: ConceptRef; certainty?: MemberCertainty });
+    readonly ref: ConceptRef;
+    readonly certainty: MemberCertainty;
+    readonly isConfirmed: boolean;
+    readonly isPossible: boolean;
+    toJSON(): { ref: ReturnType<ConceptRef['toJSON']>; certainty?: MemberCertainty };
+    static fromJSON(data: Record<string, unknown>): PartitiveMember;
+    static identityOf(value: unknown): string;
+  }
+
+  export class PartitiveRelation extends GlossaristModel {
+    constructor(data?: {
+      comprehensive?: ConceptRef;
+      partitives?: PartitiveMember[];
+      completeness?: Completeness;
+      plurality?: TypeSharedPlurality;
+      criterion?: Record<string, string> | string;
+    });
+    readonly comprehensive: ConceptRef;
+    readonly partitives: PartitiveMember[];
+    readonly completeness: Completeness;
+    readonly plurality: TypeSharedPlurality | null;
+    readonly criterion: Record<string, string> | null;
+    readonly isComplete: boolean;
+    readonly isPartial: boolean;
+    readonly isCoordinate: boolean;
+    hasPlurality(): boolean;
+    hasCriterion(): boolean;
+    toJSON(): {
+      comprehensive: ReturnType<ConceptRef['toJSON']>;
+      partitives: ReturnType<PartitiveMember['toJSON']>[];
+      completeness: Completeness;
+      plurality?: ReturnType<TypeSharedPlurality['toJSON']>;
+      criterion?: Record<string, string>;
+    };
+    static fromJSON(data: Record<string, unknown>): PartitiveRelation;
+    static identityOf(value: unknown): string;
+  }
 }

package/src/adapters/types.ts

@@ -148,6 +148,42 @@ export interface GraphEdge {
   lang?: string;
 }
 
+/**
+ * Wire-shape projection of a PartitiveRelation — used by:
+ *   - build-edges.js output (partitive_relations.json)
+ *   - GraphDataSource (loads the wire file for tools/future consumers)
+ *   - use-concept-edges composable (projects the glossarist-js model
+ *     into this shape for display, resolving ConceptRef → URI)
+ *
+ * The glossarist-js `PartitiveRelation` class is the model SSOT
+ * (ConceptRef-based). This interface is the *resolved-for-display*
+ * shape — keep the two concerns separate.
+ *
+ * Renamed from `PartitiveRelation` to avoid collision with the
+ * upstream model class. v2 shape per concept-model
+ * TODO.partitive-relation-v2.
+ */
+export interface PartitiveRelationWire {
+  source: string;
+  comprehensive: string;
+  partitives: PartitiveMemberWire[];
+  completeness: 'complete' | 'partial';
+  plurality: TypeSharedPluralityWire | null;
+  criterion?: Record<string, string>;
+  register: string;
+}
+
+export interface PartitiveMemberWire {
+  uri: string;
+  certainty: 'confirmed' | 'possible';
+}
+
+export interface TypeSharedPluralityWire {
+  isShared: boolean;
+  isUncertain: boolean;
+  sharedType?: string | null;
+}
+
 export interface GraphNode {
   uri: string;
   register: string;

package/src/components/AppSidebar.vue

@@ -6,6 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useDsStyle } from '../utils/dataset-style';
 import { useSiteConfig } from '../config/use-site-config';
 import NavIcon from './NavIcon.vue';
+import DatasetGroupRenderer from './groups/DatasetGroupRenderer.vue';
 import { useI18n, locale } from '../i18n';
 import type { SectionNode } from '../adapters/types';
 import { toSectionTree } from '../utils/section-tree';
@@ -284,61 +285,17 @@ const activeSectionId = computed(() => {
             <span class="text-[9px] uppercase tracking-wide text-ink-300 dark:text-ink-500 font-sans">{{ groupTypeMeta(group).label }}</span>
           </button>
 
-          <!-- Group entries -->
-          <div v-if="isGroupExpanded(group.id)" class="space-y-1" :class="group.label ? 'ml-1' : ''">
-            <!-- Per-entry rendering: button is kind-specific, expansion is shared (DRY/MECE) -->
-            <div
-              v-for="ds in group.entries"
-              :key="ds.id"
-              class="rounded-lg transition-all duration-150"
-              :class="currentDataset === ds.id ? 'bg-surface' : ''"
-            >
-              <!-- LINEAGE: compact timeline button -->
-              <button
-                v-if="group.kind === 'lineage'"
-                @click="goToDataset(ds.id)"
-                class="series-entry w-full text-left flex items-center gap-2 pl-6 pr-3 py-1.5 rounded-md text-sm border-l-2 transition-all duration-150"
-                :class="currentDataset === ds.id
-                  ? 'bg-amber-50/70 dark:bg-amber-400/10 border-l-[3px] text-ink-900 dark:text-ink-50 font-semibold'
-                  : 'border-transparent text-ink-600 dark:text-ink-300 hover:bg-ink-50 dark:hover:bg-ink-700/40 hover:text-ink-900 dark:hover:text-ink-50'"
-                :style="currentDataset === ds.id ? { borderLeftColor: 'var(--gold-accent, #B8935A)' } : {}"
-              >
-                <span class="flex-1 truncate text-[13.5px] font-medium leading-snug">{{ ds.ref || ds.title || ds.id }}</span>
-                <span
-                  v-if="ds.status && ds.status !== 'valid'"
-                  class="text-[9px] uppercase tracking-wide italic text-ink-400 dark:text-ink-400"
-                >{{ ds.status }}</span>
-                <span
-                  v-if="ds.isCurrent"
-                  class="current-star flex-shrink-0"
-                  title="Current edition"
-                >✦</span>
-              </button>
-
-              <!-- DEFAULT/OTHER: standard entry button -->
-              <button
-                v-else
-                @click="goToDataset(ds.id)"
-                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="{ borderLeftColor: currentDataset === ds.id ? getColor(ds.id) : 'transparent' }"
-              >
-                <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>
-
-              <!-- SHARED expansion content: sub-pages + sections + provenance.
-                   Appears for the active dataset in ALL group kinds (DRY). -->
-              <div v-if="currentDataset === ds.id && (filteredDatasetPages.length || provenance.owner)" class="px-2 pb-2">
+          <!-- Group entries: dispatch to kind-specific renderer (OCP).
+               Shared expansion content lives in the `expanded` slot so
+               it stays identical across kinds (DRY/MECE). -->
+          <DatasetGroupRenderer
+            v-if="isGroupExpanded(group.id)"
+            :kind="group.kind"
+            :entries="group.entries"
+            :current-dataset="currentDataset"
+          >
+            <template #expanded="{ entry: ds, isCurrent }">
+              <div v-if="isCurrent && (filteredDatasetPages.length || provenance.owner)" class="px-2 pb-2">
                 <nav v-if="filteredDatasetPages.length" class="space-y-0.5 mt-1">
                   <router-link
                     v-for="page in filteredDatasetPages"
@@ -410,8 +367,8 @@ const activeSectionId = computed(() => {
                   </div>
                 </div>
               </div>
-            </div>
-          </div>
+            </template>
+          </DatasetGroupRenderer>
         </div>
       </template>
 

package/src/components/ConceptDetail.vue

@@ -27,6 +27,8 @@ import FormatDownloads from './FormatDownloads.vue';
 import ConceptEditionRail from './ConceptEditionRail.vue';
 import NonVerbalRepDisplay from './NonVerbalRepDisplay.vue';
 import NonVerbalList from './non-verbal/NonVerbalList.vue';
+import PartitiveRelationList from './PartitiveRelationList.vue';
+import ConceptDiffModal from './ConceptDiffModal.vue';
 import CitationDisplay from './CitationDisplay.vue';
 import DesignationList from './DesignationList.vue';
 import { useI18n } from '../i18n';
@@ -72,6 +74,7 @@ const {
   edgeBadgeColor,
   inverseEdgeType,
   conceptRelated,
+  conceptPartitiveRelations,
   getResolvedRef,
   relatedLabel,
   navigateEdge,
@@ -80,6 +83,11 @@ const {
 
 const hoveredEdgeDisplay = ref<{ designation: string; conceptId: string; tooltip: string } | null>(null);
 
+const diffTarget = ref<{ registerId: string; conceptId: string; label: string } | null>(null);
+function onCompareEdition(target: { registerId: string; conceptId: string; label: string }) {
+  diffTarget.value = target;
+}
+
 const uriCopied = ref(false);
 function copyUri() {
   const uri = conceptUri(props.concept, props.registerId, props.manifest.uriBase);
@@ -561,11 +569,32 @@ const nonVerbalReps = computed(() => {
             </Transition>
           </div>
 
+          <!-- Partitive relations — one-to-many decompositions (ISO 704) -->
+          <PartitiveRelationList
+            v-if="conceptPartitiveRelations.length"
+            :relations="conceptPartitiveRelations"
+            :manifest="manifest"
+            :register-id="registerId"
+          />
+
           <!-- Edition series — supersession chain across vocabulary editions -->
           <ConceptEditionRail
             :concept-uri="conceptUri(props.concept, props.registerId, props.manifest.uriBase)"
             :register-id="registerId"
             :concept-id="conceptId"
+            @compare="onCompareEdition"
+          />
+
+          <!-- Edition diff modal — opened from the rail's compare buttons -->
+          <ConceptDiffModal
+            v-if="diffTarget"
+            :open="true"
+            :current-concept="concept"
+            :current-register-id="registerId"
+            :target-register-id="diffTarget.registerId"
+            :target-concept-id="diffTarget.conceptId"
+            :target-label="diffTarget.label"
+            @close="diffTarget = null"
           />
 
           <!-- Domains -->

package/src/components/ConceptDiffModal.vue

@@ -0,0 +1,120 @@
+<script setup lang="ts">
+/**
+ * ConceptDiffModal — modal wrapper around ConceptDiffView that fetches
+ * the comparison concept on demand.
+ *
+ * Triggered from ConceptEditionRail when the user clicks "compare"
+ * next to a non-current edition. The current concept (props.concept)
+ * becomes the "new" side; the selected edition becomes the "old" side.
+ */
+import { ref, watch, computed } from 'vue';
+import { useVocabularyStore } from '../stores/vocabulary';
+import ConceptDiffView from './ConceptDiffView.vue';
+import type { ConceptLikeData } from '../composables/use-concept-diff';
+import type { Concept } from 'glossarist';
+import { useI18n } from '../i18n';
+
+const props = defineProps<{
+  open: boolean;
+  /** The concept currently being viewed. */
+  currentConcept: Concept | null;
+  currentRegisterId: string;
+  /** Edition to compare against. */
+  targetRegisterId: string;
+  targetConceptId: string;
+  targetLabel?: string;
+}>();
+
+const emit = defineEmits<{ close: [] }>();
+
+const store = useVocabularyStore();
+const { t } = useI18n();
+
+const targetConcept = ref<Concept | null>(null);
+const loadError = ref<string | null>(null);
+
+function conceptToData(c: Concept | null, registerId: string): ConceptLikeData | null {
+  if (!c) return null;
+  const langs = c.languages ?? [];
+  const localizations: Record<string, unknown> = {};
+  for (const lang of langs) {
+    const lc = c.localization(lang);
+    if (lc) localizations[lang] = lc;
+  }
+  return {
+    conceptId: c.id,
+    uri: c.uri ?? undefined,
+    status: c.status ?? undefined,
+    languages: langs,
+    localizations,
+  };
+}
+
+const oldData = computed(() => conceptToData(targetConcept.value, props.targetRegisterId));
+const newData = computed(() => conceptToData(props.currentConcept, props.currentRegisterId));
+
+async function loadTarget() {
+  if (!props.open || !props.targetRegisterId || !props.targetConceptId) return;
+  loadError.value = null;
+  targetConcept.value = null;
+  try {
+    const adapter = store.datasets.get(props.targetRegisterId);
+    if (!adapter) throw new Error(`dataset ${props.targetRegisterId} not loaded`);
+    if (!adapter.index) await store.loadDataset(props.targetRegisterId);
+    targetConcept.value = await adapter.fetchConcept(props.targetConceptId);
+  } catch (e: unknown) {
+    loadError.value = e instanceof Error ? e.message : String(e);
+  }
+}
+
+watch(() => [props.open, props.targetRegisterId, props.targetConceptId] as const, () => {
+  if (props.open) loadTarget();
+}, { immediate: true });
+</script>
+
+<template>
+  <Teleport to="body">
+    <Transition name="fade">
+      <div
+        v-if="open"
+        class="fixed inset-0 z-50 bg-black/40 flex items-center justify-center p-4"
+        @click.self="$emit('close')"
+      >
+        <div class="bg-surface rounded-lg shadow-xl max-w-3xl w-full max-h-[85vh] overflow-hidden flex flex-col">
+          <header class="px-5 py-3 border-b border-ink-100 dark:border-ink-700 flex items-center justify-between">
+            <h2 class="text-sm font-semibold text-ink-700 dark:text-ink-200">
+              {{ t('concept.compareEditions') || 'Compare editions' }}
+            </h2>
+            <button
+              type="button"
+              class="text-ink-400 hover:text-ink-700 dark:hover:text-ink-200"
+              @click="$emit('close')"
+              :aria-label="t('common.close') || 'Close'"
+            >
+              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+              </svg>
+            </button>
+          </header>
+          <div class="p-5 overflow-y-auto">
+            <div v-if="loadError" class="card p-4 border-red-200 bg-red-50/50">
+              <p class="text-sm text-red-700">{{ loadError }}</p>
+            </div>
+            <ConceptDiffView
+              v-else
+              :old-concept="oldData"
+              :new-concept="newData"
+              :old-label="targetLabel || targetRegisterId"
+              :new-label="currentRegisterId"
+            />
+          </div>
+        </div>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
+
+<style scoped>
+.fade-enter-active, .fade-leave-active { transition: opacity 0.2s ease; }
+.fade-enter-from, .fade-leave-to { opacity: 0; }
+</style>