@glossarist/concept-browser 0.7.101 → 0.7.103
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/index.mjs +6 -28
- package/cli/index.ts +289 -0
- package/package.json +2 -2
- package/src/__tests__/__fixtures__/concepts.ts +3 -3
- package/src/__tests__/composables/use-concept-edges-v2.test.ts +1 -0
- package/src/__tests__/designation-relationship.test.ts +2 -2
- package/src/__tests__/perf/serialization-perf.test.ts +1 -0
- package/src/__tests__/use-rdf-document.test.ts +1 -0
- package/src/adapters/bibliography-adapter.ts +1 -1
- package/src/adapters/model-bridge.ts +15 -15
- package/src/adapters/non-verbal/figure-bridge.ts +2 -2
- package/src/adapters/non-verbal/formula-bridge.ts +2 -2
- package/src/adapters/non-verbal/table-bridge.ts +2 -2
- package/src/components/CitationDisplay.vue +1 -1
- package/src/components/ConceptDetail.vue +2 -2
- package/src/components/ConceptDiffModal.vue +2 -2
- package/src/components/ConceptDiffView.vue +1 -1
- package/src/components/DesignationList.vue +4 -4
- package/src/components/NavIcon.vue +1 -0
- package/src/components/figure/FigureDisplay.vue +5 -5
- package/src/components/formula/FormulaDisplay.vue +4 -4
- package/src/components/table/TableDisplay.vue +3 -3
- package/src/components/use-rdf-document.ts +16 -7
- package/src/composables/use-concept-content.ts +3 -3
- package/src/composables/use-concept-diff.ts +2 -2
- package/src/composables/use-concept-edges.ts +3 -3
- package/src/config/page-types.ts +1 -1
- package/src/i18n/locales/eng.yml +12 -0
- package/src/i18n/locales/fra.yml +12 -0
- package/src/layouts/Default.astro +32 -2
- package/src/utils/content-renderer.ts +1 -1
- package/src/utils/partitive-multiplicity.ts +3 -2
- package/src/views/ConceptView.vue +3 -3
- package/src/views/learn/LearnRelationshipsView.vue +63 -0
- package/tailwind.config.js +3 -3
- package/tsconfig.json +1 -1
- package/src/adapters/model-bridge/bridges.ts +0 -159
- package/src/adapters/model-bridge/concept.ts +0 -97
- package/src/adapters/model-bridge/entity-refs.ts +0 -49
- package/src/adapters/model-bridge/hyperedge.ts +0 -103
- package/src/adapters/model-bridge/index.ts +0 -46
- package/src/adapters/model-bridge/mappers.ts +0 -277
- package/src/adapters/model-bridge/partitive.ts +0 -79
- package/src/adapters/non-verbal/glossarist-augment.d.ts +0 -339
- /package/src/adapters/{model-bridge/jsonld-types.ts → jsonld-types.ts} +0 -0
|
@@ -200,7 +200,7 @@ function getTermForLang(lang: string): string {
|
|
|
200
200
|
|
|
201
201
|
function getDesignationsForLang(lang: string): Designation[] {
|
|
202
202
|
const lc = props.concept.localization(lang);
|
|
203
|
-
return lc?.terms ?? [];
|
|
203
|
+
return [...(lc?.terms ?? [])];
|
|
204
204
|
}
|
|
205
205
|
|
|
206
206
|
function hasDefinition(lang: string): boolean {
|
|
@@ -444,7 +444,7 @@ const nonVerbalReps = computed(() => {
|
|
|
444
444
|
</div>
|
|
445
445
|
|
|
446
446
|
<!-- Non-verbal representations -->
|
|
447
|
-
<NonVerbalRepDisplay v-if="lc.lc.nonVerbalRep?.length" :reps="lc.lc.nonVerbalRep" :locale="lc.lang" :register-id="registerId" :dataset-locales="languages" />
|
|
447
|
+
<NonVerbalRepDisplay v-if="lc.lc.nonVerbalRep?.length" :reps="[...lc.lc.nonVerbalRep]" :locale="lc.lang" :register-id="registerId" :dataset-locales="languages" />
|
|
448
448
|
|
|
449
449
|
<!-- Sources -->
|
|
450
450
|
<div v-if="lc.sources.length" class="space-y-2">
|
|
@@ -33,7 +33,7 @@ const { t } = useI18n();
|
|
|
33
33
|
const targetConcept = ref<Concept | null>(null);
|
|
34
34
|
const loadError = ref<string | null>(null);
|
|
35
35
|
|
|
36
|
-
function conceptToData(c:
|
|
36
|
+
function conceptToData(c: any, registerId: string): ConceptLikeData | null {
|
|
37
37
|
if (!c) return null;
|
|
38
38
|
const langs = c.languages ?? [];
|
|
39
39
|
const localizations: Record<string, unknown> = {};
|
|
@@ -51,7 +51,7 @@ function conceptToData(c: Concept | null, registerId: string): ConceptLikeData |
|
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
const oldData = computed(() => conceptToData(targetConcept.value, props.targetRegisterId));
|
|
54
|
-
const newData = computed(() => conceptToData(props.currentConcept, props.currentRegisterId));
|
|
54
|
+
const newData = computed(() => conceptToData(props.currentConcept as any, props.currentRegisterId));
|
|
55
55
|
|
|
56
56
|
async function loadTarget() {
|
|
57
57
|
if (!props.open || !props.targetRegisterId || !props.targetConceptId) return;
|
|
@@ -51,7 +51,7 @@ watchEffect(() => {
|
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
|
|
54
|
-
const effectiveDiff = computed(() => props.diff ?? internal.diffResult.value);
|
|
54
|
+
const effectiveDiff = computed(() => (props.diff ?? internal.diffResult.value) as any);
|
|
55
55
|
const sections = computed(() => deriveDiffSections(effectiveDiff.value, props.lang));
|
|
56
56
|
const similarity = computed(() => computeSimilarity(effectiveDiff.value));
|
|
57
57
|
const hasChanges = computed(() => effectiveDiff.value?.hasChanges === true);
|
|
@@ -77,11 +77,11 @@ function resolvedLabel(dr: { content: string | null; ref?: { source: string | nu
|
|
|
77
77
|
<div v-if="d.related?.length" class="mt-0.5 space-y-0.5">
|
|
78
78
|
<div v-for="(dr, dri) in d.related" :key="'dr'+dri" class="text-xs text-ink-400 flex items-center gap-1.5">
|
|
79
79
|
<span class="badge text-[9px] bg-gray-50 text-gray-600">{{ relationshipLabel(dr.type ?? '') }}</span>
|
|
80
|
-
<template v-if="getDesignationTarget(dr)">
|
|
81
|
-
<span class="italic">{{ getDesignationTarget(dr) }}</span>
|
|
80
|
+
<template v-if="getDesignationTarget(dr as any)">
|
|
81
|
+
<span class="italic">{{ getDesignationTarget(dr as any) }}</span>
|
|
82
82
|
</template>
|
|
83
|
-
<button v-else-if="'ref' in dr && dr.ref" @click="emit('navigate-related', dr.ref)" class="concept-link">{{ resolvedLabel(dr) }}</button>
|
|
84
|
-
<span v-else>{{ resolvedLabel(dr) }}</span>
|
|
83
|
+
<button v-else-if="'ref' in dr && dr.ref" @click="emit('navigate-related', dr.ref)" class="concept-link">{{ resolvedLabel(dr as any) }}</button>
|
|
84
|
+
<span v-else>{{ resolvedLabel(dr as any) }}</span>
|
|
85
85
|
</div>
|
|
86
86
|
</div>
|
|
87
87
|
</div>
|
|
@@ -10,6 +10,7 @@ const icons: Record<string, string> = {
|
|
|
10
10
|
list: 'M4 6h16M4 10h16M4 14h16M4 18h16',
|
|
11
11
|
schema: 'M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z',
|
|
12
12
|
database: 'M4 7c0 1.1 3.6 2 8 2s8-.9 8-2M4 7c0-1.1 3.6-2 8-2s8 .9 8 2M4 7v10c0 1.1 3.6 2 8 2s8-.9 8-2V7M4 12c0 1.1 3.6 2 8 2s8-.9 8-2',
|
|
13
|
+
book: 'M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25',
|
|
13
14
|
};
|
|
14
15
|
|
|
15
16
|
defineProps<{ name: string }>();
|
|
@@ -50,8 +50,8 @@ const topLevelImages = computed(() => fig.value?.images ?? []);
|
|
|
50
50
|
>
|
|
51
51
|
<div v-if="topLevelImages.length" :class="`figure__media figure__media--${layout}`">
|
|
52
52
|
<FigureImages
|
|
53
|
-
:images="topLevelImages"
|
|
54
|
-
:alt="fig.alt"
|
|
53
|
+
:images="[...topLevelImages]"
|
|
54
|
+
:alt="(fig.alt as any)"
|
|
55
55
|
:dataset-id="datasetId"
|
|
56
56
|
:locale="locale"
|
|
57
57
|
:fallback-chain="fallbackChain"
|
|
@@ -76,8 +76,8 @@ const topLevelImages = computed(() => fig.value?.images ?? []);
|
|
|
76
76
|
|
|
77
77
|
<NonVerbalCaption
|
|
78
78
|
:identifier="fig.identifier"
|
|
79
|
-
:caption="fig.caption"
|
|
80
|
-
:description="fig.description"
|
|
79
|
+
:caption="(fig.caption as any)"
|
|
80
|
+
:description="(fig.description as any)"
|
|
81
81
|
:locale="locale"
|
|
82
82
|
:fallback-chain="fallbackChain"
|
|
83
83
|
:description-id="descriptionId"
|
|
@@ -85,7 +85,7 @@ const topLevelImages = computed(() => fig.value?.images ?? []);
|
|
|
85
85
|
|
|
86
86
|
<NonVerbalSources
|
|
87
87
|
v-if="fig.sources?.length"
|
|
88
|
-
:sources="fig.sources"
|
|
88
|
+
:sources="[...(fig.sources || [])]"
|
|
89
89
|
/>
|
|
90
90
|
</figure>
|
|
91
91
|
|
|
@@ -41,7 +41,7 @@ const descriptionId = computed(() => `${anchor.value}-desc`);
|
|
|
41
41
|
>
|
|
42
42
|
<div class="formula__expr-line">
|
|
43
43
|
<FormulaExpression
|
|
44
|
-
:expression="form.expression"
|
|
44
|
+
:expression="(form.expression as any)"
|
|
45
45
|
:notation="(form.notation as FormulaNotation | null)"
|
|
46
46
|
:locale="locale"
|
|
47
47
|
:fallback-chain="fallbackChain"
|
|
@@ -50,8 +50,8 @@ const descriptionId = computed(() => `${anchor.value}-desc`);
|
|
|
50
50
|
|
|
51
51
|
<NonVerbalCaption
|
|
52
52
|
:identifier="form.identifier"
|
|
53
|
-
:caption="form.caption"
|
|
54
|
-
:description="form.description"
|
|
53
|
+
:caption="(form.caption as any)"
|
|
54
|
+
:description="(form.description as any)"
|
|
55
55
|
:locale="locale"
|
|
56
56
|
:fallback-chain="fallbackChain"
|
|
57
57
|
:description-id="descriptionId"
|
|
@@ -59,7 +59,7 @@ const descriptionId = computed(() => `${anchor.value}-desc`);
|
|
|
59
59
|
|
|
60
60
|
<NonVerbalSources
|
|
61
61
|
v-if="form.sources?.length"
|
|
62
|
-
:sources="form.sources"
|
|
62
|
+
:sources="[...(form.sources || [])]"
|
|
63
63
|
/>
|
|
64
64
|
</figure>
|
|
65
65
|
|
|
@@ -65,8 +65,8 @@ const markup = computed(() => {
|
|
|
65
65
|
|
|
66
66
|
<NonVerbalCaption
|
|
67
67
|
:identifier="table.identifier"
|
|
68
|
-
:caption="table.caption"
|
|
69
|
-
:description="table.description"
|
|
68
|
+
:caption="(table.caption as any)"
|
|
69
|
+
:description="(table.description as any)"
|
|
70
70
|
:locale="locale"
|
|
71
71
|
:fallback-chain="fallbackChain"
|
|
72
72
|
:description-id="descriptionId"
|
|
@@ -74,7 +74,7 @@ const markup = computed(() => {
|
|
|
74
74
|
|
|
75
75
|
<NonVerbalSources
|
|
76
76
|
v-if="table.sources?.length"
|
|
77
|
-
:sources="table.sources"
|
|
77
|
+
:sources="[...(table.sources || [])]"
|
|
78
78
|
/>
|
|
79
79
|
</figure>
|
|
80
80
|
|
|
@@ -8,12 +8,21 @@ import {
|
|
|
8
8
|
writeTurtleSync,
|
|
9
9
|
collectQuads,
|
|
10
10
|
PREFIXES,
|
|
11
|
-
type ClassInstance,
|
|
12
|
-
type PropValue,
|
|
13
|
-
type Quad,
|
|
14
11
|
} from 'glossarist/rdf';
|
|
12
|
+
import type { Quad } from '@rdfjs/types';
|
|
15
13
|
|
|
16
|
-
export
|
|
14
|
+
export interface PropValue {
|
|
15
|
+
predicate: string;
|
|
16
|
+
values: string[];
|
|
17
|
+
nested?: boolean;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export interface ClassInstance {
|
|
21
|
+
classId: string;
|
|
22
|
+
classLabel: string;
|
|
23
|
+
label: string;
|
|
24
|
+
props: PropValue[];
|
|
25
|
+
}
|
|
17
26
|
|
|
18
27
|
export interface RdfDocument {
|
|
19
28
|
sections: ComputedRef<ClassInstance[]>;
|
|
@@ -111,10 +120,10 @@ export function useRdfDocument(
|
|
|
111
120
|
const concept = getConcept();
|
|
112
121
|
const uri = getConceptUri();
|
|
113
122
|
const conceptQuads = collectQuads(
|
|
114
|
-
conceptToQuads(concept, {
|
|
123
|
+
conceptToQuads(concept as any, {
|
|
115
124
|
registerId: options.registerId ?? '',
|
|
116
125
|
uriBase: options.uriBase ?? '',
|
|
117
|
-
}),
|
|
126
|
+
}) as any,
|
|
118
127
|
);
|
|
119
128
|
const provenanceQuads = collectQuads(
|
|
120
129
|
provenanceToQuads({
|
|
@@ -122,7 +131,7 @@ export function useRdfDocument(
|
|
|
122
131
|
serializer: 'concept-browser',
|
|
123
132
|
serializerVersion: SERIALIZER_VERSION,
|
|
124
133
|
generatedAt: new Date().toISOString(),
|
|
125
|
-
}),
|
|
134
|
+
}) as any,
|
|
126
135
|
);
|
|
127
136
|
return [...conceptQuads, ...provenanceQuads];
|
|
128
137
|
});
|
|
@@ -101,14 +101,14 @@ export function useConceptContent(
|
|
|
101
101
|
renderedAnnotations: annotations.map((a: string) => renderContent(a, opts)),
|
|
102
102
|
notes,
|
|
103
103
|
examples,
|
|
104
|
-
sources: lc.sources,
|
|
105
|
-
designations: lc.terms,
|
|
104
|
+
sources: [...lc.sources],
|
|
105
|
+
designations: [...lc.terms],
|
|
106
106
|
renderedDesignations: new Map(lc.terms.map(d => [d.designation, renderContent(d.designation)])),
|
|
107
107
|
entryStatus: lc.entryStatus ?? '',
|
|
108
108
|
classification: lc.classification,
|
|
109
109
|
reviewType: lc.reviewType,
|
|
110
110
|
release: lc.release,
|
|
111
|
-
lineageSourceSimilarity: lc.lineageSourceSimilarity,
|
|
111
|
+
lineageSourceSimilarity: (lc.lineageSourceSimilarity as any),
|
|
112
112
|
lcScript: lc.script,
|
|
113
113
|
lcSystem: lc.system,
|
|
114
114
|
});
|
|
@@ -211,8 +211,8 @@ export function useConceptDiff() {
|
|
|
211
211
|
error.value = null;
|
|
212
212
|
try {
|
|
213
213
|
diffResult.value = diffConcepts(
|
|
214
|
-
oldData ? toDiffableConcept(oldData) : null,
|
|
215
|
-
newData ? toDiffableConcept(newData) : null,
|
|
214
|
+
(oldData ? toDiffableConcept(oldData) : null) as any,
|
|
215
|
+
(newData ? toDiffableConcept(newData) : null) as any,
|
|
216
216
|
);
|
|
217
217
|
} catch (e: unknown) {
|
|
218
218
|
error.value = e instanceof Error ? e.message : String(e);
|
|
@@ -7,7 +7,7 @@ import type { Concept, RelatedConcept, ConceptRef } from 'glossarist';
|
|
|
7
7
|
import { PartitiveHyperedge } from 'glossarist';
|
|
8
8
|
import { GenericHyperedge } from 'glossarist/models';
|
|
9
9
|
import type {
|
|
10
|
-
|
|
10
|
+
PartitiveHyperedge as GlsPartitiveRelation,
|
|
11
11
|
PartitiveMember as GlsPartitiveMember,
|
|
12
12
|
} from 'glossarist/models';
|
|
13
13
|
import type {
|
|
@@ -39,7 +39,7 @@ export interface EdgeDisplay {
|
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
export function useConceptEdges(
|
|
42
|
-
concept: ComputedRef<
|
|
42
|
+
concept: ComputedRef<any>,
|
|
43
43
|
registerId: ComputedRef<string>,
|
|
44
44
|
manifest: ComputedRef<Manifest | null | undefined>,
|
|
45
45
|
edges: ComputedRef<GraphEdge[]>,
|
|
@@ -138,7 +138,7 @@ export function useConceptEdges(
|
|
|
138
138
|
// Concept-level related concepts (managed concept cross-references)
|
|
139
139
|
const conceptRelated = computed(() => {
|
|
140
140
|
if (!concept.value) return [];
|
|
141
|
-
const direct = concept.value.relatedConcepts?.filter(rc => !INVERSE_RELATIONSHIPS[rc.type]) ?? [];
|
|
141
|
+
const direct = concept.value.relatedConcepts?.filter((rc: any) => !INVERSE_RELATIONSHIPS[rc.type]) ?? [];
|
|
142
142
|
const derived = incomingEdges.value
|
|
143
143
|
.filter(e => INVERSE_RELATIONSHIPS[e.type])
|
|
144
144
|
.map(e => {
|
package/src/config/page-types.ts
CHANGED
|
@@ -35,7 +35,7 @@ export const PAGE_TYPES: readonly PageTypeDefinition[] = [
|
|
|
35
35
|
{ type: 'stats', route: 'stats', title: 'Statistics', icon: 'chart', scope: 'dataset', featureFlag: '!stats', autoSynthesize: true },
|
|
36
36
|
{ type: 'sources', route: 'sources', title: 'Sources', icon: 'database', scope: 'dataset', autoSynthesize: true },
|
|
37
37
|
{ type: 'about', route: 'about', title: 'About', icon: 'info', scope: 'dataset', featureFlag: '!about', autoSynthesize: true },
|
|
38
|
-
{ type: 'learn', route: 'learn', title: 'Learn', icon: 'book
|
|
38
|
+
{ type: 'learn', route: 'learn', title: 'Learn', icon: 'book', scope: 'global', autoSynthesize: true },
|
|
39
39
|
] as const;
|
|
40
40
|
|
|
41
41
|
export type BuiltinPageType = typeof PAGE_TYPES[number]['type'];
|
package/src/i18n/locales/eng.yml
CHANGED
|
@@ -56,6 +56,18 @@ learn.dimensions.delimiting.false.label: not delimiting
|
|
|
56
56
|
learn.dimensions.delimiting.false.meaning: An ordinary part. Drawn at normal stroke width (1.5px).
|
|
57
57
|
learn.dimensions.delimiting.true.label: delimiting
|
|
58
58
|
learn.dimensions.delimiting.true.meaning: The part is essential to the whole's identity. Drawn at 3× normal stroke width (4.5px).
|
|
59
|
+
learn.dimensions.combinationsTitle: Valid multiplicity combinations
|
|
60
|
+
learn.dimensions.combinationsDescription: ISO 704 description
|
|
61
|
+
learn.dimensions.combinationsModel: Our model
|
|
62
|
+
learn.dimensions.combinationsVisual: Visual
|
|
63
|
+
learn.dimensions.combo.compulsory: compulsory
|
|
64
|
+
learn.dimensions.combo.atLeastOne: at least one
|
|
65
|
+
learn.dimensions.combo.optional: optional
|
|
66
|
+
learn.dimensions.combo.optionalMultiple: optional multiple
|
|
67
|
+
learn.dimensions.combo.compulsoryMultiple: compulsory multiple
|
|
68
|
+
learn.dimensions.invalidDescription: (invalid)
|
|
69
|
+
learn.dimensions.invalidModel: optional + at_least_one
|
|
70
|
+
learn.dimensions.invalidReason: Vacuous — collapses to optional + multiple (0..*). Rejected by glossarist-js.
|
|
59
71
|
learn.designations.title: Designations
|
|
60
72
|
learn.designations.short: Terms and symbols — preferred, admitted, deprecated, full form, abbreviation, acronym, initialism.
|
|
61
73
|
learn.designations.intro: Concepts are designated by terms, proper names, and symbols. This page explains the vocabulary you'll see on each concept page.
|
package/src/i18n/locales/fra.yml
CHANGED
|
@@ -55,6 +55,18 @@ learn.dimensions.delimiting.false.label: non délimitante
|
|
|
55
55
|
learn.dimensions.delimiting.false.meaning: Une partie ordinaire. Dessinée à largeur de trait normale (1,5 px).
|
|
56
56
|
learn.dimensions.delimiting.true.label: délimitante
|
|
57
57
|
learn.dimensions.delimiting.true.meaning: La partie est essentielle à l'identité du tout. Dessinée à largeur de trait 3× (4,5 px).
|
|
58
|
+
learn.dimensions.combinationsTitle: Combinaisons de multiplicité valides
|
|
59
|
+
learn.dimensions.combinationsDescription: Description ISO 704
|
|
60
|
+
learn.dimensions.combinationsModel: Notre modèle
|
|
61
|
+
learn.dimensions.combinationsVisual: Visuel
|
|
62
|
+
learn.dimensions.combo.compulsory: obligatoire
|
|
63
|
+
learn.dimensions.combo.atLeastOne: au moins un
|
|
64
|
+
learn.dimensions.combo.optional: optionnel
|
|
65
|
+
learn.dimensions.combo.optionalMultiple: optionnel multiple
|
|
66
|
+
learn.dimensions.combo.compulsoryMultiple: obligatoire multiple
|
|
67
|
+
learn.dimensions.invalidDescription: (invalide)
|
|
68
|
+
learn.dimensions.invalidModel: optional + at_least_one
|
|
69
|
+
learn.dimensions.invalidReason: Vacuous — se réduit à optional + multiple (0..*). Rejeté par glossarist-js.
|
|
58
70
|
learn.designations.title: Désignations
|
|
59
71
|
learn.designations.short: Termes et symboles — préféré, admis, déconseillé, forme complète, abréviation, acronyme, sigle.
|
|
60
72
|
learn.designations.intro: Les concepts sont désignés par des termes, noms propres et symboles. Cette page explique le vocabulaire que vous verrez sur chaque page de concept.
|
|
@@ -12,6 +12,30 @@ interface Props {
|
|
|
12
12
|
|
|
13
13
|
const { title, description = '', conceptTerm, conceptDefinition } = Astro.props;
|
|
14
14
|
const siteConfig = await getSiteConfig();
|
|
15
|
+
|
|
16
|
+
// Derive Google Fonts URL from siteConfig branding (build-time SSG).
|
|
17
|
+
// Falls back to the default DM Sans / DM Serif Display / JetBrains Mono
|
|
18
|
+
// when no branding.fonts is declared.
|
|
19
|
+
const brandingFonts = siteConfig?.branding?.fonts;
|
|
20
|
+
const fontParts: string[] = [];
|
|
21
|
+
if (brandingFonts?.header?.source === 'google' && brandingFonts.header.family) {
|
|
22
|
+
const w = (brandingFonts.header.weights || [400, 700]).join(';');
|
|
23
|
+
fontParts.push(`family=${brandingFonts.header.family.replace(/ /g, '+')}:wght@${w}`);
|
|
24
|
+
}
|
|
25
|
+
if (brandingFonts?.body?.source === 'google' && brandingFonts.body.family) {
|
|
26
|
+
const w = (brandingFonts.body.weights || [400, 700]).join(';');
|
|
27
|
+
fontParts.push(`family=${brandingFonts.body.family.replace(/ /g, '+')}:wght@${w}`);
|
|
28
|
+
}
|
|
29
|
+
const fontsUrl = fontParts.length > 0
|
|
30
|
+
? `https://fonts.googleapis.com/css2?${fontParts.join('&')}&display=swap`
|
|
31
|
+
: 'https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,300;0,9..40,400;0,9..40,500;0,9..40,600;0,9..40,700;1,9..40,400&family=DM+Serif+Display:ital@0;1&family=JetBrains+Mono:wght@400;500&display=swap';
|
|
32
|
+
|
|
33
|
+
const fontHeader = brandingFonts?.header?.family
|
|
34
|
+
? `'${brandingFonts.header.family}', Georgia, serif`
|
|
35
|
+
: `'DM Serif Display', Georgia, serif`;
|
|
36
|
+
const fontBody = brandingFonts?.body?.family
|
|
37
|
+
? `'${brandingFonts.body.family}', system-ui, sans-serif`
|
|
38
|
+
: `'DM Sans', system-ui, sans-serif`;
|
|
15
39
|
---
|
|
16
40
|
|
|
17
41
|
<!DOCTYPE html>
|
|
@@ -42,8 +66,14 @@ const siteConfig = await getSiteConfig();
|
|
|
42
66
|
<title>{title}</title>
|
|
43
67
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
|
44
68
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
|
45
|
-
<link rel="preload" as="style" href=
|
|
46
|
-
<noscript><link href=
|
|
69
|
+
<link rel="preload" as="style" href={fontsUrl} onload="this.rel='stylesheet'">
|
|
70
|
+
<noscript><link href={fontsUrl} rel="stylesheet"></noscript>
|
|
71
|
+
<style is:global>
|
|
72
|
+
:root {
|
|
73
|
+
--font-header: ${fontHeader};
|
|
74
|
+
--font-body: ${fontBody};
|
|
75
|
+
}
|
|
76
|
+
</style>
|
|
47
77
|
<script is:inline>
|
|
48
78
|
(function() {
|
|
49
79
|
const c = document.cookie.split(';').map(s => s.trim()).find(s => s.startsWith('theme='));
|
|
@@ -183,7 +183,7 @@ function resolveUrnRefs(text: string, opts: RenderOptions): string {
|
|
|
183
183
|
function resolveMentions(text: string, opts: RenderOptions): string {
|
|
184
184
|
return text.replace(/\{\{([^{}]+?)\}\}/g, (_orig, body) => {
|
|
185
185
|
const parsed = parseMention(body);
|
|
186
|
-
const p = parsed as Record<string, unknown>;
|
|
186
|
+
const p = parsed as unknown as Record<string, unknown>;
|
|
187
187
|
|
|
188
188
|
switch (p.kind) {
|
|
189
189
|
case 'fig-ref':
|
|
@@ -28,10 +28,11 @@ import {
|
|
|
28
28
|
multiplicityFromPair,
|
|
29
29
|
isValidPresence,
|
|
30
30
|
isValidCount,
|
|
31
|
-
type PartitivePresence,
|
|
32
|
-
type PartitiveCount,
|
|
33
31
|
} from 'glossarist/models';
|
|
34
32
|
|
|
33
|
+
type PartitivePresence = (typeof PARTITIVE_PRESENCE.VALUES)[number];
|
|
34
|
+
type PartitiveCount = (typeof PARTITIVE_COUNT.VALUES)[number];
|
|
35
|
+
|
|
35
36
|
// ── Two independent axes (re-exported SSOT) ────────────────────────────
|
|
36
37
|
|
|
37
38
|
export { PARTITIVE_PRESENCE, PARTITIVE_COUNT };
|
|
@@ -60,7 +60,7 @@ const activeRegisterId = computed(() => sphereFocusPayload.value?.registerId ??
|
|
|
60
60
|
const adjacent = ref({ prev: null as string | null, next: null as string | null });
|
|
61
61
|
|
|
62
62
|
const { conceptPartitiveRelations, conceptGenericRelations } = useConceptEdges(
|
|
63
|
-
concept,
|
|
63
|
+
computed(() => concept.value as any),
|
|
64
64
|
activeRegisterId,
|
|
65
65
|
manifest,
|
|
66
66
|
edges,
|
|
@@ -284,7 +284,7 @@ onUnmounted(() => window.removeEventListener('keydown', onKeydown));
|
|
|
284
284
|
<!-- Sphere mode — receives concept + edges directly, no URI matching -->
|
|
285
285
|
<RelationSphere
|
|
286
286
|
v-if="viewMode === 'sphere'"
|
|
287
|
-
:concept="concept"
|
|
287
|
+
:concept="concept as any"
|
|
288
288
|
:manifest="manifest"
|
|
289
289
|
:register-id="activeRegisterId"
|
|
290
290
|
:edges="edges"
|
|
@@ -295,7 +295,7 @@ onUnmounted(() => window.removeEventListener('keydown', onKeydown));
|
|
|
295
295
|
<!-- Detail mode -->
|
|
296
296
|
<ConceptDetail
|
|
297
297
|
v-else
|
|
298
|
-
:concept="concept"
|
|
298
|
+
:concept="concept as any"
|
|
299
299
|
:manifest="manifest"
|
|
300
300
|
:edges="edges"
|
|
301
301
|
:adjacent="adjacent"
|
|
@@ -86,6 +86,39 @@ const delimitingValues: readonly DimensionValue[] = [
|
|
|
86
86
|
meaning: t('learn.dimensions.delimiting.true.meaning'),
|
|
87
87
|
},
|
|
88
88
|
];
|
|
89
|
+
|
|
90
|
+
const validCombinations = [
|
|
91
|
+
{
|
|
92
|
+
description: t('learn.dimensions.combo.compulsory'),
|
|
93
|
+
uml: '1..1',
|
|
94
|
+
model: 'required + exactly_one',
|
|
95
|
+
svg: '<svg width="44" height="14"><line x1="2" y1="7" x2="42" y2="7" stroke="currentColor" stroke-width="1.5"/></svg>',
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
description: t('learn.dimensions.combo.atLeastOne'),
|
|
99
|
+
uml: '1..*',
|
|
100
|
+
model: 'required + at_least_one',
|
|
101
|
+
svg: '<svg width="44" height="14"><line x1="2" y1="5" x2="42" y2="5" stroke="currentColor" stroke-width="1.5"/><line x1="2" y1="9" x2="42" y2="9" stroke="currentColor" stroke-width="1.5" stroke-dasharray="4 3"/></svg>',
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
description: t('learn.dimensions.combo.optional'),
|
|
105
|
+
uml: '0..1',
|
|
106
|
+
model: 'optional + exactly_one',
|
|
107
|
+
svg: '<svg width="44" height="14"><line x1="2" y1="7" x2="42" y2="7" stroke="currentColor" stroke-width="1.5" stroke-dasharray="4 3"/></svg>',
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
description: t('learn.dimensions.combo.optionalMultiple'),
|
|
111
|
+
uml: '0..*',
|
|
112
|
+
model: 'optional + multiple',
|
|
113
|
+
svg: '<svg width="44" height="14"><line x1="2" y1="5" x2="42" y2="5" stroke="currentColor" stroke-width="1.5" stroke-dasharray="4 3"/><line x1="2" y1="9" x2="42" y2="9" stroke="currentColor" stroke-width="1.5" stroke-dasharray="4 3"/></svg>',
|
|
114
|
+
},
|
|
115
|
+
{
|
|
116
|
+
description: t('learn.dimensions.combo.compulsoryMultiple'),
|
|
117
|
+
uml: '2..*',
|
|
118
|
+
model: 'required + multiple',
|
|
119
|
+
svg: '<svg width="44" height="14"><line x1="2" y1="5" x2="42" y2="5" stroke="currentColor" stroke-width="1.5"/><line x1="2" y1="9" x2="42" y2="9" stroke="currentColor" stroke-width="1.5"/></svg>',
|
|
120
|
+
},
|
|
121
|
+
];
|
|
89
122
|
</script>
|
|
90
123
|
|
|
91
124
|
<template>
|
|
@@ -202,6 +235,36 @@ const delimitingValues: readonly DimensionValue[] = [
|
|
|
202
235
|
</template>
|
|
203
236
|
</DimensionCard>
|
|
204
237
|
</div>
|
|
238
|
+
|
|
239
|
+
<h3 class="text-base font-semibold text-ink-700 dark:text-ink-100 mt-6 mb-3">
|
|
240
|
+
{{ t('learn.dimensions.combinationsTitle') }}
|
|
241
|
+
</h3>
|
|
242
|
+
<div class="card p-4 overflow-x-auto">
|
|
243
|
+
<table class="w-full text-sm">
|
|
244
|
+
<thead>
|
|
245
|
+
<tr class="border-b border-ink-100 dark:border-ink-700 text-ink-500 dark:text-ink-400 text-xs uppercase tracking-wide">
|
|
246
|
+
<th class="text-left py-2 pr-4">{{ t('learn.dimensions.combinationsDescription') }}</th>
|
|
247
|
+
<th class="text-center py-2 px-2">UML</th>
|
|
248
|
+
<th class="text-left py-2 px-2">{{ t('learn.dimensions.combinationsModel') }}</th>
|
|
249
|
+
<th class="text-center py-2 pl-4">{{ t('learn.dimensions.combinationsVisual') }}</th>
|
|
250
|
+
</tr>
|
|
251
|
+
</thead>
|
|
252
|
+
<tbody class="divide-y divide-ink-100 dark:divide-ink-700">
|
|
253
|
+
<tr v-for="combo in validCombinations" :key="combo.model">
|
|
254
|
+
<td class="py-2 pr-4 text-ink-700 dark:text-ink-200">{{ combo.description }}</td>
|
|
255
|
+
<td class="py-2 px-2 text-center font-mono text-ink-500 dark:text-ink-400">{{ combo.uml }}</td>
|
|
256
|
+
<td class="py-2 px-2 font-mono text-xs text-ink-600 dark:text-ink-300">{{ combo.model }}</td>
|
|
257
|
+
<td class="py-2 pl-4 text-center" v-html="combo.svg"></td>
|
|
258
|
+
</tr>
|
|
259
|
+
<tr class="opacity-50">
|
|
260
|
+
<td class="py-2 pr-4 text-ink-500 dark:text-ink-400 italic">{{ t('learn.dimensions.invalidDescription') }}</td>
|
|
261
|
+
<td class="py-2 px-2 text-center font-mono text-ink-400">—</td>
|
|
262
|
+
<td class="py-2 px-2 font-mono text-xs text-ink-400">{{ t('learn.dimensions.invalidModel') }}</td>
|
|
263
|
+
<td class="py-2 pl-4 text-center text-xs text-ink-400 italic">{{ t('learn.dimensions.invalidReason') }}</td>
|
|
264
|
+
</tr>
|
|
265
|
+
</tbody>
|
|
266
|
+
</table>
|
|
267
|
+
</div>
|
|
205
268
|
</section>
|
|
206
269
|
|
|
207
270
|
<!-- ── General hyperedge ──────────────────────────────────────── -->
|
package/tailwind.config.js
CHANGED
|
@@ -13,8 +13,8 @@ export default {
|
|
|
13
13
|
theme: {
|
|
14
14
|
extend: {
|
|
15
15
|
fontFamily: {
|
|
16
|
-
serif: ['"DM Serif Display"', 'Georgia', 'serif'],
|
|
17
|
-
sans: ['"DM Sans"', 'system-ui', 'sans-serif'],
|
|
16
|
+
serif: ['var(--font-header, "DM Serif Display")', 'Georgia', 'serif'],
|
|
17
|
+
sans: ['var(--font-body, "DM Sans")', 'system-ui', 'sans-serif'],
|
|
18
18
|
mono: ['"JetBrains Mono"', 'monospace'],
|
|
19
19
|
},
|
|
20
20
|
colors: {
|
|
@@ -39,7 +39,7 @@ export default {
|
|
|
39
39
|
},
|
|
40
40
|
typography: {
|
|
41
41
|
serif: {
|
|
42
|
-
'font-family': '"DM Serif Display", Georgia, serif',
|
|
42
|
+
'font-family': 'var(--font-header, "DM Serif Display"), Georgia, serif',
|
|
43
43
|
},
|
|
44
44
|
},
|
|
45
45
|
},
|
package/tsconfig.json
CHANGED
|
@@ -20,6 +20,6 @@
|
|
|
20
20
|
},
|
|
21
21
|
"baseUrl": "."
|
|
22
22
|
},
|
|
23
|
-
"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue", "env.d.ts", ".astro/types.d.ts"],
|
|
23
|
+
"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue", "cli/**/*.ts", "env.d.ts", ".astro/types.d.ts"],
|
|
24
24
|
"exclude": ["src/content.config.ts", "src/pages/**", "src/layouts/**", "src/astro-islands/**", "src/lib/site-config.ts"]
|
|
25
25
|
}
|