@glossarist/concept-browser 0.7.84 → 0.7.86

package/src/utils/partitive-relation-styling.ts

@@ -1,23 +1,28 @@
 /**
- * Partitive relation styling — colors for one-to-many decompositions.
+ * Partitive relation styling — colors and labels for one-to-many
+ * partitive decompositions.
  *
  * Independent of relationship-categories.ts (which handles binary edges).
- * Partitive relations have their own visual language:
- *   - completeness (complete/partial) affects opacity
- *   - plurality (type-shared, uncertain) adds accent badges
+ * The visual encoding for PartitiveRelation comes from two orthogonal
+ * axes per ISO 704:2022:
  *
- * v2 redesign: replaces v1 hyperedge-styling.ts per
- * concept-model/TODO.partitive-relation-v2.
+ *   1. completeness (complete / partial) — relation-level metadata,
+ *      affects overall opacity. Partial relations have a continued
+ *      backline ("more exist but aren't shown").
+ *   2. multiplicity + is_delimiting (per-member) — see
+ *      partitive-multiplicity.ts for the registry + rakeStrokeStyle().
+ *
+ * This module owns:
+ *   - relation-level color/badge (completeness-driven)
+ *   - human-readable labels for badges
+ *
+ * It does NOT encode multiplicity visuals — those live in
+ * partitive-multiplicity.ts (separated so renderers can consume the
+ * pure rakeStrokeStyle() helper without pulling badge strings).
  */
 
-import type { TypeSharedPluralityWire } from '../adapters/types';
-
 const BASE_LIGHT = '#0d9488';
 const BASE_DARK = '#2dd4bf';
-const ACCENT_SHARED_LIGHT = '#3b82f6';
-const ACCENT_SHARED_DARK = '#60a5fa';
-const ACCENT_UNCERTAIN_LIGHT = '#f59e0b';
-const ACCENT_UNCERTAIN_DARK = '#fbbf24';
 
 export interface PartitiveRelationStyle {
   color: string;
@@ -25,38 +30,24 @@ export interface PartitiveRelationStyle {
   opacity: number;
 }
 
+/**
+ * Relation-level style (color + opacity) driven by completeness.
+ *
+ * Per-member multiplicity + delimiting rendering is via
+ * `rakeStrokeStyle()` from partitive-multiplicity.ts, not here —
+ * this helper is for the relation's overall frame + header badges.
+ */
 export function partitiveRelationStyle(
   completeness: 'complete' | 'partial',
-  plurality: TypeSharedPluralityWire | null,
   isDark: boolean,
 ): PartitiveRelationStyle {
-  const base = isDark ? BASE_DARK : BASE_LIGHT;
-  const opacity = completeness === 'partial' ? 0.6 : 1.0;
-
-  let badgeClass = 'badge-teal';
-  if (plurality?.isShared) {
-    badgeClass = 'badge-blue';
-    if (plurality.isUncertain) {
-      badgeClass = 'badge-yellow';
-    }
-  }
-
-  return { color: base, badgeClass, opacity };
-}
-
-export function pluralityColor(
-  plurality: TypeSharedPluralityWire,
-  isDark: boolean,
-): string {
-  if (plurality.isUncertain) return isDark ? ACCENT_UNCERTAIN_DARK : ACCENT_UNCERTAIN_LIGHT;
-  if (plurality.isShared) return isDark ? ACCENT_SHARED_DARK : ACCENT_SHARED_LIGHT;
-  return isDark ? BASE_DARK : BASE_LIGHT;
+  return {
+    color: isDark ? BASE_DARK : BASE_LIGHT,
+    badgeClass: 'badge-teal',
+    opacity: completeness === 'partial' ? 0.6 : 1.0,
+  };
 }
 
 export function completenessLabel(completeness: 'complete' | 'partial'): string {
   return completeness === 'partial' ? 'Partial' : 'Complete';
 }
-
-export function certaintyLabel(certainty: 'confirmed' | 'possible'): string {
-  return certainty === 'possible' ? 'Possible' : 'Confirmed';
-}

package/src/views/ConceptView.vue

@@ -5,6 +5,8 @@ import { useVocabularyStore } from '../stores/vocabulary';
 import { conceptUri } from '../adapters/model-bridge';
 import { UriRouter } from '../adapters/UriRouter';
 import type { PartitiveRelationWire, PartitiveMemberWire } from '../adapters/types';
+import type { PartitiveMember } from 'glossarist/models';
+import type { PartitiveMultiplicity } from '../utils/partitive-multiplicity';
 import ConceptDetail from '../components/ConceptDetail.vue';
 import RelationSphere from '../components/RelationSphere.vue';
 import ShortcutsModal from '../components/ShortcutsModal.vue';
@@ -80,15 +82,14 @@ const partitiveRelationsForSphere = computed<PartitiveRelationWire[]>(() => {
       : null;
     if (!compRef.id || !compTarget) continue;
     const partitives: PartitiveMemberWire[] = rel.partitives
-      .map(member => {
+      .map((member): PartitiveMemberWire | null => {
         const ref = member.ref;
         if (!ref?.id) return null;
-        const targetRegister = store.manifests.has(activeRegisterId.value)
-          ? activeRegisterId.value
-          : activeRegisterId.value;
-        const uri = UriRouter.buildConceptUri(m.uriBase, targetRegister, ref.id);
+        const uri = UriRouter.buildConceptUri(m.uriBase, activeRegisterId.value, ref.id);
         if (uri === sourceUri) return null;
-        return { uri, certainty: member.certainty };
+        const multiplicity: PartitiveMultiplicity = member.multiplicity;
+        const isDelimiting = member.isDelimiting;
+        return { uri, multiplicity, isDelimiting };
       })
       .filter((x): x is PartitiveMemberWire => x !== null);
     if (partitives.length === 0) continue;
@@ -97,13 +98,6 @@ const partitiveRelationsForSphere = computed<PartitiveRelationWire[]>(() => {
       comprehensive: compTarget,
       partitives,
       completeness: rel.completeness,
-      plurality: rel.plurality
-        ? {
-            isShared: rel.plurality.isShared,
-            isUncertain: rel.plurality.isUncertain,
-            sharedType: null,
-          }
-        : null,
       register: activeRegisterId.value,
     });
   }

package/src/__tests__/model-bridge-partitive.test.ts

@@ -1,146 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { conceptFromJson } from '../adapters/model-bridge';
-
-describe('conceptFromJson — gl:partitiveRelations (v2)', () => {
-  function makeJson(overrides: Record<string, unknown> = {}) {
-    return {
-      '@type': 'gl:Concept',
-      '@id': 'https://example.org/test/concept/1.3',
-      'gl:identifier': '1.3',
-      'gl:localizedConcept': {},
-      ...overrides,
-    };
-  }
-
-  it('returns empty array when no partitiveRelations', () => {
-    const c = conceptFromJson(makeJson());
-    expect(c.partitiveRelations).toEqual([]);
-  });
-
-  it('parses comprehensive + 2 partitives', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.5' } },
-        ],
-      }],
-    }));
-    expect(c.partitiveRelations).toHaveLength(1);
-    const r = c.partitiveRelations[0];
-    expect(r.comprehensive.source).toBe('urn:test');
-    expect(r.comprehensive.id).toBe('1.3');
-    expect(r.partitives).toHaveLength(2);
-    expect(r.partitives[0].ref.id).toBe('1.4');
-    expect(r.partitives[1].ref.id).toBe('1.5');
-  });
-
-  it('parses completeness', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.5' } },
-        ],
-        'gl:completeness': 'partial',
-      }],
-    }));
-    expect(c.partitiveRelations[0].completeness).toBe('partial');
-    expect(c.partitiveRelations[0].isPartial).toBe(true);
-  });
-
-  it('parses per-member certainty', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.5' }, 'gl:certainty': 'possible' },
-        ],
-      }],
-    }));
-    const members = c.partitiveRelations[0].partitives;
-    expect(members[0].certainty).toBe('confirmed');
-    expect(members[1].certainty).toBe('possible');
-    expect(members[1].isPossible).toBe(true);
-  });
-
-  it('parses plurality block', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.5' } },
-        ],
-        'gl:hasPlurality': {
-          'gl:isShared': true,
-          'gl:isUncertain': true,
-          'gl:sharedType': { 'gl:source': 'urn:test', 'gl:id': '1.99' },
-        },
-      }],
-    }));
-    const p = c.partitiveRelations[0].plurality;
-    expect(p).not.toBeNull();
-    expect(p?.isShared).toBe(true);
-    expect(p?.isUncertain).toBe(true);
-    expect(p?.sharedType?.id).toBe('1.99');
-  });
-
-  it('parses criterion as localized hash', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.5' } },
-        ],
-        'gl:criterion': { eng: 'physical structure', fra: 'structure physique' },
-      }],
-    }));
-    expect(c.partitiveRelations[0].criterion?.eng).toBe('physical structure');
-    expect(c.partitiveRelations[0].criterion?.fra).toBe('structure physique');
-  });
-
-  it('parses criterion as plain string (normalized to default)', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.5' } },
-        ],
-        'gl:criterion': 'a bare criterion string',
-      }],
-    }));
-    expect(c.partitiveRelations[0].criterion?.default).toBe('a bare criterion string');
-  });
-
-  it('skips relation with no comprehensive', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-        ],
-      }],
-    }));
-    expect(c.partitiveRelations).toEqual([]);
-  });
-
-  it('skips relation with < 2 valid partitives', () => {
-    const c = conceptFromJson(makeJson({
-      'gl:partitiveRelations': [{
-        'gl:comprehensive': { 'gl:source': 'urn:test', 'gl:id': '1.3' },
-        'gl:hasPartitive': [
-          { 'gl:ref': { 'gl:source': 'urn:test', 'gl:id': '1.4' } },
-          // Single member — PartitiveRelation constructor throws
-        ],
-      }],
-    }));
-    // The constructor throws before we catch it, so the relation is dropped
-    // via the runtime error path. conceptFromJson should not propagate.
-    expect(c.partitiveRelations).toEqual([]);
-  });
-});