glossarist 0.4.49 → 0.4.50

package/src/rdf/sections-builder.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 // Sections builder — transforms a Quad[] into the ClassInstance[]
 // shape consumed by Vue UI components (RdfInstanceSection,
 // RdfInstanceHeader, RdfSourcePanel).
@@ -51,6 +50,7 @@ const SKOS_PREF_LABEL = `${PREFIXES.skos}prefLabel`;
  * @returns {ClassInstance[]}
  */
 export function quadSectionsToClassInstances(quads, options = {}) {
+  // @ts-expect-error TODO(Phase 2e): type this fully
   const language = options.language ?? 'eng';
   if (!quads || quads.length === 0) return [];
 
@@ -66,6 +66,7 @@ export function quadSectionsToClassInstances(quads, options = {}) {
     const target = isBnode ? bnodeQuads : bySubject;
     if (!target.has(key)) {
       target.set(key, { subject: subj, quads: [] });
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (!isBnode) order.push(key);
     }
     target.get(key).quads.push(q);
@@ -74,6 +75,7 @@ export function quadSectionsToClassInstances(quads, options = {}) {
   const result = [];
   for (const key of order) {
     const entry = bySubject.get(key);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     result.push(resourceToClassInstance(entry.subject, entry.quads, bnodeQuads, language));
   }
   return result;
@@ -87,15 +89,19 @@ function resourceToClassInstance(subject, quads, bnodeQuads, language) {
 
   for (const q of quads) {
     if (q.predicate.value === RDF_TYPE) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       types.push(q.object.value);
     } else if (q.predicate.value === SKOS_PREF_LABEL) {
       // Prefer prefLabel in the requested language; first one wins per lang
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (!prefLabel || (q.object.language === language && prefLabel.language !== language)) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         prefLabel = { value: q.object.value, language: q.object.language };
       }
     } else if (q.predicate.value === RDFS_LABEL && !rdfsLabel) {
       rdfsLabel = q.object.value;
     } else {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       otherQuads.push(q);
     }
   }
@@ -107,6 +113,7 @@ function resourceToClassInstance(subject, quads, bnodeQuads, language) {
   const rawClassId = types.length > 0 ? types[0] : '';
   const classId = rawClassId ? compactIri(rawClassId) : '';
   const classLabel = deriveClassLabel(rawClassId);
+  // @ts-expect-error TODO(Phase 2e): type this fully
   const label = prefLabel?.value ?? rdfsLabel ?? deriveSubjectLabel(subjectStr);
 
   // Group predicates (preserve insertion order). Compact IRIs to CURIEs
@@ -116,16 +123,21 @@ function resourceToClassInstance(subject, quads, bnodeQuads, language) {
   const seenPredKeys = new Set();
 
   for (const q of otherQuads) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     const isBnodeObj = q.object.termType === 'BlankNode';
+    // @ts-expect-error TODO(Phase 2e): type this fully
     const formatted = formatTerm(q.object, bnodeQuads);
     if (formatted === '') continue;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     const predicate = compactIri(q.predicate.value);
     const dedupKey = `${predicate}#${isBnodeObj ? 'n' : 'f'}#${formatted}`;
     if (seenPredKeys.has(dedupKey)) continue;
     seenPredKeys.add(dedupKey);
 
     const prop = { predicate, values: [formatted] };
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (isBnodeObj) prop.nested = true;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     props.push(prop);
   }
 

package/src/rdf/shacl.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 // SHACL validator wrapper. Loads vendored concept-model shapes once and
 // validates any RDFJS Dataset against them. Mirrors the mechanics of
 // glossarist-ruby's `Glossarist::Validation::ShaclValidator`.
@@ -29,6 +28,7 @@ const FACTORY = {
   dataset: rdfDatasetFactory.dataset.bind(rdfDatasetFactory),
 };
 const createDataset = FACTORY.dataset;
+// @ts-expect-error TODO(Phase 2e): type this fully
 const ShaclValidatorCtor = ShaclValidator.default ?? ShaclValidator;
 
 // Path to the vendored SHACL shapes (synced from glossarist/concept-model
@@ -82,6 +82,7 @@ export async function loadShapes({ shapesPath = SHAPES_PATH } = {}) {
 // library's default env (from defaultEnv.js) provides one — we no longer
 // pass a custom factory. Callers still control Dataset creation via
 // quadsToDataset below.
+// @ts-expect-error TODO(Phase 2e): type this fully
 export async function validateShacl(dataDataset, { shapes, shapesPath } = {}) {
   const shapesDataset = shapes ?? await loadShapes({ shapesPath });
   const validator = new ShaclValidatorCtor(shapesDataset);

package/src/rdf/write-turtle-sync.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 // Sync Turtle writer — produces Turtle from RDF/JS Quads without
 // n3's callback API. Designed for UI use cases (Vue computed, React
 // render) that need synchronous output.
@@ -20,6 +19,7 @@ const RDF_TYPE = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
  * @returns {string}
  */
 export function writeTurtleSync(quads, options = {}) {
+  // @ts-expect-error TODO(Phase 2e): type this fully
   const prefixes = options.prefixes ?? {};
   const sorted = [...quads].sort(compareQuadSync);
   const grouped = groupBySubject(sorted);
@@ -28,11 +28,14 @@ export function writeTurtleSync(quads, options = {}) {
 
   // Prefix declarations — sorted by prefix name for deterministic output.
   for (const [prefix, iri] of Object.entries(prefixes).sort(([a], [b]) => a.localeCompare(b))) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     lines.push(`@prefix ${prefix}: <${iri}> .`);
   }
 
   for (const { subject, triples } of grouped) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     lines.push('');
+    // @ts-expect-error TODO(Phase 2e): type this fully
     lines.push(...writeResource(subject, triples, prefixes));
   }
 
@@ -53,6 +56,7 @@ function writeResource(subject, triples, prefixes) {
 
   if (types.length > 0) {
     const typeStrs = types.map(t => formatTermSync(t.object, prefixes));
+    // @ts-expect-error TODO(Phase 2e): type this fully
     allPredObjs.push({ predStr: 'a', objStrs: typeStrs });
   }
 
@@ -65,14 +69,18 @@ function writeResource(subject, triples, prefixes) {
     byPredicate.get(predStr).push(formatTermSync(t.object, prefixes));
   }
   for (const [predStr, objStrs] of byPredicate) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     allPredObjs.push({ predStr, objStrs });
   }
 
+  // @ts-expect-error TODO(Phase 2e): type this fully
   lines.push(`${subjectStr} ${allPredObjs[0].predStr} ${allPredObjs[0].objStrs.join(', ')} ;`);
   for (let i = 1; i < allPredObjs.length; i++) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     lines.push(`  ${allPredObjs[i].predStr} ${allPredObjs[i].objStrs.join(', ')} ;`);
   }
   // Replace trailing ; with .
+  // @ts-expect-error TODO(Phase 2e): type this fully
   lines[lines.length - 1] = lines[lines.length - 1].replace(/ ;$/, ' .');
   return lines;
 }
@@ -120,13 +128,17 @@ function compactIriSync(iri, prefixes) {
   let bestPrefix = null;
   let bestLen = 0;
   for (const [prefix, base] of Object.entries(prefixes)) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (iri.startsWith(base) && base.length > bestLen) {
       // Reject if local part contains characters that can't appear in a
       // Turtle pname-local (e.g. leading digit is fine per Turtle 1.1,
       // but // is not).
+      // @ts-expect-error TODO(Phase 2e): type this fully
       const local = iri.slice(base.length);
       if (!local.startsWith('//')) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         bestPrefix = prefix;
+        // @ts-expect-error TODO(Phase 2e): type this fully
         bestLen = base.length;
       }
     }

package/src/reference-resolver.ts

@@ -1,32 +1,47 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { ConceptRef } from './models/concept-ref.js';
 import { parseMention } from './reference-mention.js';
 
 export class Reference {
   constructor(type, target, relationship, source, extras = {}) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.type = type;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.target = target;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.relationship = relationship ?? null;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.source = source ?? null;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.uri = extras.uri ?? null;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.citation = extras.citation ?? null;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.sourceId = extras.sourceId ?? null;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.resolution = extras.resolution ?? null;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.lookupKey = extras.lookupKey ?? null;
   }
 
   get dedupKey() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (this.type === 'bibliography') {
       return ['bibliography',
+        // @ts-expect-error TODO(Phase 2e): type this fully
         this.sourceId ?? this.citation?.ref?.id ?? this.target];
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (this.type === 'figure' || this.type === 'table' || this.type === 'formula') {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       return [this.type, this.lookupKey?.entityId ?? this.target];
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (this.type === 'concept') {
       return ['concept',
+        // @ts-expect-error TODO(Phase 2e): type this fully
         this.lookupKey?.id ?? this.lookupKey?.designation ?? this.target];
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return [this.type, this.target];
   }
 }
@@ -79,6 +94,7 @@ export class ReferenceResolver {
     for (const rc of concept.relatedConcepts) {
       const target = refTarget(rc);
       if (target) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         refs.push(new Reference('concept', target, rc.type, 'relatedConcepts', {
           lookupKey: { id: target },
         }));
@@ -97,6 +113,7 @@ export class ReferenceResolver {
 
       const compTarget = hyperedgeRefTarget(rel.comprehensive);
       if (compTarget) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         refs.push(new Reference(
           'concept',
           compTarget,
@@ -115,6 +132,7 @@ export class ReferenceResolver {
         const memberRef = m?.ref ?? m;
         const pTarget = hyperedgeRefTarget(memberRef);
         if (!pTarget) continue;
+        // @ts-expect-error TODO(Phase 2e): type this fully
         refs.push(new Reference(
           'concept',
           pTarget,
@@ -126,16 +144,19 @@ export class ReferenceResolver {
     }
 
     for (const ref of concept.figures) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       refs.push(new Reference('figure', ref.display ?? ref.entityId, 'structural', 'figures', {
         lookupKey: { entityType: 'figure', entityId: ref.entityId },
       }));
     }
     for (const ref of concept.tables) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       refs.push(new Reference('table', ref.display ?? ref.entityId, 'structural', 'tables', {
         lookupKey: { entityType: 'table', entityId: ref.entityId },
       }));
     }
     for (const ref of concept.formulas) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       refs.push(new Reference('formula', ref.display ?? ref.entityId, 'structural', 'formulas', {
         lookupKey: { entityType: 'formula', entityId: ref.entityId },
       }));
@@ -149,6 +170,7 @@ export class ReferenceResolver {
         const src = lc.sources[i];
         const ref = src.origin?.toString() ?? '';
         if (ref) {
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('standard', ref, src.type, `localizations.${lang}.sources[${i}]`));
         }
       }
@@ -181,35 +203,42 @@ export class ReferenceResolver {
       const parsed = parseMention(m[1]);
       switch (parsed.kind) {
         case 'cite-ref':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(this._resolveCiteRef(parsed, source, concept));
           break;
         case 'urn-ref':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('concept', parsed.label ?? parsed.uri, 'embedded', source, {
             uri: parsed.uri,
             resolution: null,
           }));
           break;
         case 'fig-ref':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('figure', parsed.label ?? parsed.key, 'embedded', source, {
             lookupKey: { entityType: 'figure', entityId: parsed.key },
           }));
           break;
         case 'table-ref':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('table', parsed.label ?? parsed.key, 'embedded', source, {
             lookupKey: { entityType: 'table', entityId: parsed.key },
           }));
           break;
         case 'formula-ref':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('formula', parsed.label ?? parsed.key, 'embedded', source, {
             lookupKey: { entityType: 'formula', entityId: parsed.key },
           }));
           break;
         case 'numeric':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('concept', parsed.label ?? parsed.id, 'embedded', source, {
             lookupKey: { id: parsed.id },
           }));
           break;
         case 'designation':
+          // @ts-expect-error TODO(Phase 2e): type this fully
           refs.push(new Reference('concept', parsed.label ?? parsed.id, 'embedded', source, {
             lookupKey: { designation: parsed.id },
           }));
@@ -279,6 +308,7 @@ export class ReferenceResolver {
         return registry[dataset]?.concepts?.byId(ref.lookupKey.id) ?? null;
       }
       for (const entry of Object.values(registry)) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         const found = entry?.concepts?.byId(ref.lookupKey.id);
         if (found) return found;
       }

package/src/render-classification.ts

@@ -1,10 +1,12 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { resolveBibliographyRecord, findNonVerbalEntity } from './reference-resolver.js';
 
 export class ReferenceClassifier {
   constructor(registry = {}, sourceDatasetId = null, options = {}) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.registry = registry;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.sourceDatasetId = sourceDatasetId;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.options = options;
   }
 
@@ -28,7 +30,9 @@ export class ReferenceClassifier {
     if (ref.uri) {
       const dsId = ref.resolution?.datasetId;
       if (!dsId) return 'unresolved';
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (!this.registry[dsId]) return 'external-citation';
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (dsId === this.sourceDatasetId) return 'same-dataset';
       return 'cross-dataset';
     }
@@ -37,7 +41,9 @@ export class ReferenceClassifier {
     }
     if (ref.lookupKey?.id) {
       const dsId = ref.lookupKey.dataset;
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (!this.registry[dsId]) return 'unresolved';
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (dsId === this.sourceDatasetId) return 'same-dataset';
       return 'cross-dataset';
     }
@@ -52,11 +58,13 @@ export class ReferenceClassifier {
 
   _classifyBibliography(ref) {
     if (ref.citation) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       return resolveBibliographyRecord(ref.citation.ref, this.registry)
         ? 'internal-citation'
         : 'self-contained-citation';
     }
     if (ref.uri) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       return resolveBibliographyRecord(ref.resolution, this.registry)
         ? 'internal-citation'
         : 'external-citation';
@@ -69,6 +77,7 @@ export class ReferenceClassifier {
   }
 
   _classifyNonVerbal(ref) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return findNonVerbalEntity(ref, this.registry)
       ? 'internal-citation'
       : 'external-citation';

package/src/v1-reader.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import fs from 'fs';
 import path from 'path';
 import * as yaml from 'js-yaml';
@@ -29,7 +28,9 @@ export class V1Reader {
     }
 
     return new Concept({
+      // @ts-expect-error TODO(Phase 2e): type this fully
       id: String(data.termid ?? data.data?.identifier ?? path.basename(conceptDir)),
+      // @ts-expect-error TODO(Phase 2e): type this fully
       term: data.term ?? null,
       localizations,
       raw: data,
@@ -45,6 +46,7 @@ export class V1Reader {
       const conceptDir = path.join(dir, entry.name);
       if (!fs.existsSync(path.join(conceptDir, 'concept.yaml'))) continue;
       try {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         concepts.push(V1Reader.readConcept(conceptDir));
       } catch { /* skip unreadable concepts */ }
     }

package/src/validators/asset-index.ts

@@ -1,30 +1,35 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { DATASET_ASSETS } from '../dataset-asset.js';
 
 export class AssetIndex {
   constructor() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._paths = new Set();
   }
 
   get paths() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return [...this._paths].sort();
   }
 
   get size() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._paths.size;
   }
 
   register(path) {
     if (path == null) return;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._paths.add(this._normalize(path));
   }
 
   has(path) {
     if (path == null) return false;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._paths.has(this._normalize(path));
   }
 
   [Symbol.iterator]() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._paths[Symbol.iterator]();
   }
 

package/src/validators/concept-validator.ts

@@ -1,5 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { ValidationRule } from './validation-rule.js';
 import { ValidationResult } from './validation-result.js';
 
@@ -61,6 +59,7 @@ export class ConceptValidator {
   _rules = [];
 
   addRule(rule) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._rules.push(rule);
     return this;
   }
@@ -85,6 +84,7 @@ export class ConceptValidator {
     }
 
     for (const rule of this._rules) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       rule.validate(concept, '', result);
     }
 

package/src/validators/gcr-validator.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import * as yaml from 'js-yaml';
 import { DATASET_ASSETS } from '../dataset-asset.js';
 import { ValidationResult } from './validation-result.js';
@@ -23,6 +22,7 @@ export class GcrValidator {
     try {
       meta = yaml.load(raw);
     } catch (e) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       result.addError(`metadata.yaml: invalid YAML: ${e.message}`);
       return;
     }
@@ -55,6 +55,7 @@ export class GcrValidator {
     try {
       yaml.load(raw);
     } catch (e) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       result.addError(`${path}: invalid YAML at line ${e.mark?.line ?? '?'}: ${e.message}`);
     }
   }

package/src/validators/v3-rules.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { ValidationRule } from './validation-rule.js';
 import { parseMention } from '../reference-mention.js';
 import { GraphicalSymbol } from '../models/designation.js';
@@ -168,6 +167,7 @@ function _findCiteMentions(concept) {
     CITE_MENTION_RE.lastIndex = 0;
     let m;
     while ((m = CITE_MENTION_RE.exec(text)) !== null) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       mentions.push({ key: m[1].trim(), source });
     }
   }
@@ -271,6 +271,7 @@ function _findNvrMentions(concept) {
       if (parsed.kind === 'fig-ref' ||
           parsed.kind === 'table-ref' ||
           parsed.kind === 'formula-ref') {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         mentions.push({ key: parsed.key, source });
       }
     }
@@ -327,7 +328,9 @@ export class NonVerbalRefIntegrityRule extends ValidationRule {
 
 export class OrphanedImagesRule {
   constructor() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.name = 'orphaned-images';
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.severity = 'warning';
   }
 
@@ -366,6 +369,7 @@ export class OrphanedImagesRule {
     const issues = [];
     for (const imgPath of assetIndex.paths) {
       if (!referenced.has(imgPath)) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         issues.push({
           path: imgPath,
           severity: 'warning',