glossarist 0.4.17 → 0.4.19

package/data/concept-model/shapes/glossarist.shacl.ttl

@@ -391,6 +391,24 @@ gloss:ConceptSourceShape a sh:NodeShape ;
     sh:path gloss:modification ;
     sh:datatype xsd:string ;
     sh:maxCount 1 ;
+  ] ;
+  sh:property [
+    sh:path gloss:sourcedFrom ;
+    sh:class gloss:Citation ;
+  ] ;
+  sh:sparql [
+    sh:message "sourced_from is only allowed on sources of type lineage"@en ;
+    sh:select """
+      PREFIX gloss: <https://www.glossarist.org/ontologies/>
+      PREFIX srctype: <https://www.glossarist.org/ontologies/srctype/>
+      SELECT $this
+      WHERE {
+        $this gloss:sourcedFrom ?target .
+        FILTER NOT EXISTS {
+          $this gloss:sourceType srctype:lineage .
+        }
+      }
+    """ ;
   ] .
 
 gloss:ConceptDateShape a sh:NodeShape ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glossarist",
-  "version": "0.4.17",
+  "version": "0.4.19",
   "description": "JavaScript SDK for Glossarist GCR packages — read, write, validate, and manage terminology concepts",
   "type": "module",
   "main": "src/index.js",

package/src/models/concept-source.js

@@ -11,6 +11,9 @@ export class ConceptSource extends GlossaristModel {
       ? (data.origin instanceof Citation ? data.origin : new Citation(data.origin))
       : null;
     this.modification = data.modification ?? null;
+    this.sourced_from = (data.sourced_from ?? []).map(
+      c => c instanceof Citation ? c : new Citation(c)
+    );
   }
 
   toJSON() {
@@ -20,6 +23,7 @@ export class ConceptSource extends GlossaristModel {
     if (this.type != null) obj.type = this.type;
     if (this.origin != null) obj.origin = this.origin.toJSON();
     if (this.modification != null) obj.modification = this.modification;
+    if (this.sourced_from.length > 0) obj.sourced_from = this.sourced_from.map(c => c.toJSON());
     return obj;
   }
 

package/src/models/index.d.ts

@@ -257,6 +257,7 @@ export class ConceptSource extends GlossaristModel {
   readonly type: string | null;
   readonly origin: Citation | null;
   readonly modification: string | null;
+  readonly sourced_from: Citation[];
 }
 
 export const RELATIONSHIP_TYPES: readonly string[];

package/src/models/related-concept.js

@@ -37,12 +37,21 @@ export class RelatedConcept extends GlossaristModel {
   constructor(data = {}) {
     super();
     this.type = data.type ?? 'see';
-    this.content = data.content ?? null;
+    this.content = normalizeContent(data.content);
     this.ref = data.ref
       ? (data.ref instanceof ConceptRef ? data.ref : new ConceptRef(data.ref))
       : null;
   }
 
+  // Convenience reader: returns the first available string value
+  // from the localized hash, or null if absent. Mirrors
+  // PartitiveHyperedge#contentString.
+  get contentString() {
+    if (!this.content) return null;
+    const values = Object.values(this.content);
+    return values.length > 0 ? values[0] : null;
+  }
+
   toJSON() {
     const obj = { type: this.type };
     if (this.content != null) obj.content = this.content;
@@ -50,7 +59,30 @@ export class RelatedConcept extends GlossaristModel {
     return obj;
   }
 
+  static identityOf(value) {
+    const v = value ?? {};
+    const ref = v?.ref;
+    return `${v.type ?? ''}|${ref?.source ?? ''}|${ref?.id ?? ''}`;
+  }
+
+  identity() {
+    return RelatedConcept.identityOf(this);
+  }
+
   static fromJSON(data) {
     return new RelatedConcept(data);
   }
 }
+
+// Content is a localized string (language → text). Plain strings on
+// input are normalized to `{ default: '...' }` so callers always see
+// the same shape. Mirrors PartitiveHyperedge's normalizeContent.
+function normalizeContent(value) {
+  if (value == null) return null;
+  if (typeof value === 'string') return { default: value };
+  if (typeof value === 'object') {
+    const entries = Object.entries(value).filter(([, v]) => typeof v === 'string');
+    return entries.length > 0 ? Object.fromEntries(entries) : null;
+  }
+  return null;
+}

package/src/rdf/gloss-source.js

@@ -27,13 +27,18 @@ export function* conceptSourceToQuads(source, { subjectUri, index }) {
   }
 
   if (source.origin) {
-    yield* citationToQuads(source.origin, { subjectUri: srcSubject });
+    yield* citationToQuads(source.origin, { subjectUri: srcSubject, predicate: PRED.gloss.sourceOrigin, bnodeKey: 'origin' });
+  }
+
+  const sourcedFrom = source.sourced_from ?? [];
+  for (let i = 0; i < sourcedFrom.length; i++) {
+    yield* citationToQuads(sourcedFrom[i], { subjectUri: srcSubject, predicate: PRED.gloss.sourcedFrom, bnodeKey: 'sourced_from', index: i });
   }
 }
 
-function* citationToQuads(citation, { subjectUri }) {
-  const citSubject = deterministicBnode(subjectUri, 'origin', 0);
-  yield quad(namedNode(subjectUri), namedNode(PRED.gloss.sourceOrigin), namedNode(citSubject));
+function* citationToQuads(citation, { subjectUri, predicate, bnodeKey, index = 0 }) {
+  const citSubject = deterministicBnode(subjectUri, bnodeKey, index);
+  yield quad(namedNode(subjectUri), namedNode(predicate), namedNode(citSubject));
   yield quad(namedNode(citSubject), namedNode(WELL_KNOWN.rdfType), namedNode(PRED.gloss.Citation));
 
   if (citation.original) {

package/src/rdf/predicates.d.ts

@@ -104,6 +104,7 @@ export declare const PRED = {
     "sourceId": "https://www.glossarist.org/ontologies/sourceId",
     "sourceOrigin": "https://www.glossarist.org/ontologies/sourceOrigin",
     "modification": "https://www.glossarist.org/ontologies/modification",
+    "sourcedFrom": "https://www.glossarist.org/ontologies/sourcedFrom",
     "hasCitationRef": "https://www.glossarist.org/ontologies/hasCitationRef",
     "hasCitationLocality": "https://www.glossarist.org/ontologies/hasCitationLocality",
     "citationOriginal": "https://www.glossarist.org/ontologies/citationOriginal",
@@ -362,6 +363,7 @@ export type Predicate =
   | "https://www.glossarist.org/ontologies/sourceId"
   | "https://www.glossarist.org/ontologies/sourceOrigin"
   | "https://www.glossarist.org/ontologies/modification"
+  | "https://www.glossarist.org/ontologies/sourcedFrom"
   | "https://www.glossarist.org/ontologies/hasCitationRef"
   | "https://www.glossarist.org/ontologies/hasCitationLocality"
   | "https://www.glossarist.org/ontologies/citationOriginal"

package/src/rdf/predicates.js

@@ -104,6 +104,7 @@ export const PRED = {
     "sourceId": "https://www.glossarist.org/ontologies/sourceId",
     "sourceOrigin": "https://www.glossarist.org/ontologies/sourceOrigin",
     "modification": "https://www.glossarist.org/ontologies/modification",
+    "sourcedFrom": "https://www.glossarist.org/ontologies/sourcedFrom",
     "hasCitationRef": "https://www.glossarist.org/ontologies/hasCitationRef",
     "hasCitationLocality": "https://www.glossarist.org/ontologies/hasCitationLocality",
     "citationOriginal": "https://www.glossarist.org/ontologies/citationOriginal",