glossarist 0.4.48 → 0.4.50

package/package.json

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

package/src/concept-collection.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { naturalSort } from './sort.js';
 
 const _items = Symbol('items');
@@ -87,17 +86,21 @@ export class ConceptCollection {
     if (Array.isArray(sectionId)) {
       const targetSet = new Set(sectionId);
       return new ConceptCollection(this[_items].filter(c => {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         const ids = options.register
+          // @ts-expect-error TODO(Phase 2e): type this fully
           ? options.register.conceptSectionIds(c)
           : _flatConceptSectionIds(c);
         return ids.some(id => targetSet.has(id));
       }));
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (!options.register) {
       throw new Error('bySection(sectionId) requires { register } to expand the concept section closures');
     }
     const target = sectionId;
     return new ConceptCollection(this[_items].filter(c => {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       const ids = options.register.conceptSectionIds(c);
       return ids.includes(target);
     }));
@@ -112,6 +115,7 @@ export class ConceptCollection {
   sorted() {
     const copy = [...this[_items]];
     copy.sort((a, b) => naturalSort(a.id, b.id));
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return new ConceptCollection(copy);
   }
 
@@ -155,9 +159,11 @@ function _flatConceptSectionIds(concept) {
     if (!Array.isArray(source)) continue;
     for (const entry of source) {
       if (typeof entry === 'string') {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         out.push(entry);
       } else if (entry && typeof entry === 'object') {
         const id = entry.id ?? entry.sectionId ?? entry.ref?.id;
+        // @ts-expect-error TODO(Phase 2e): type this fully
         if (id) out.push(String(id));
       }
     }

package/src/concept-parser.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 { Concept } from './models/concept.js';
 import { RelatedConcept } from './models/related-concept.js';
@@ -22,10 +21,14 @@ const STRUCTURAL_KEYS = new Set([
 function _registryStructuralKeys() {
   const out = [];
   for (const cls of HyperedgeRegistry.allClasses()) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     out.push(cls.wireKey);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     out.push(_camelCase(cls.wireKey));
     for (const k of cls.v1WireKeys ?? []) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       out.push(k);
+      // @ts-expect-error TODO(Phase 2e): type this fully
       out.push(_camelCase(k));
     }
   }
@@ -62,6 +65,7 @@ export class ConceptParser {
       // behavior (yaml.org core schema).
       docs = yaml.loadAll(raw, { schema: yaml.CORE_SCHEMA ?? yaml.JSON_SCHEMA });
     } catch (err) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       throw new YamlParseError(label, err);
     }
 
@@ -179,6 +183,7 @@ function _resolveHyperedgeData(container) {
     if (Array.isArray(arr)) {
       for (const r of arr) {
         const tagged = _addTypeIfMissing(r, cls.typeTag);
+        // @ts-expect-error TODO(Phase 2e): type this fully
         if (tagged != null) out.push(tagged);
       }
     }
@@ -192,6 +197,7 @@ function _resolveHyperedgeData(container) {
       for (const h of v1Arr) {
         const hash = h?.toJSON && typeof h.toJSON === 'function' ? h.toJSON() : h;
         const migrated = migrateHyperedgeToRelation(hash);
+        // @ts-expect-error TODO(Phase 2e): type this fully
         if (migrated) out.push({ ...migrated, type: cls.typeTag });
       }
     }

package/src/concept-reader.ts

@@ -1,4 +1,5 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
+import type { Concept } from './models/concept.js';
+import type { RegisterJson } from './models/register.js';
 import fs from 'fs';
 import path from 'path';
 import * as yaml from 'js-yaml';
@@ -38,7 +39,7 @@ export function readConcepts(dir) {
     .filter(f => f.endsWith('.yaml') && f !== 'register.yaml')
     .sort(naturalSort);
 
-  const concepts = [];
+  const concepts: Concept[] = [];
   for (const file of files) {
     const raw = fs.readFileSync(path.join(dir, file), 'utf8');
     const concept = conceptParser.parse(raw, file);
@@ -150,5 +151,5 @@ export function readRegister(dir) {
   const p = path.join(dir, 'register.yaml');
   if (!fs.existsSync(p)) return null;
   const raw = yaml.load(fs.readFileSync(p, 'utf8'));
-  return Register.fromJSON(raw);
+  return Register.fromJSON(raw as RegisterJson);
 }

package/src/concept-serializer.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 { PartitiveHyperedge } from './models/partitive-hyperedge.js';
 import { GenericHyperedge } from './models/generic-hyperedge.js';
@@ -21,10 +20,13 @@ function _emitTypedRelations(concept) {
 export class ConceptSerializer {
   toCanonicalYaml(concept) {
     const doc = { termid: concept.id };
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (concept.term) doc.term = concept.term;
 
     const { partitive, generic } = _emitTypedRelations(concept);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (partitive.length > 0) doc.partitive_relations = partitive;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (generic.length > 0) doc.generic_relations = generic;
 
     for (const lang of concept.languages) {
@@ -51,6 +53,7 @@ export class ConceptSerializer {
       localizedConcepts[lang] = lcId;
 
       const lcObj = lc.toJSON();
+      // @ts-expect-error TODO(Phase 2e): type this fully
       langDocs.push({ data: lcObj, id: lcId });
     }
 
@@ -60,22 +63,30 @@ export class ConceptSerializer {
     };
 
     if (concept.domains.length > 0) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       mainDoc.data.domains = concept.domains.map(d => d.toJSON());
     }
 
     if (concept.relatedConcepts.length > 0) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       mainDoc.related = concept.relatedConcepts.map(rc => rc.toJSON());
     }
     const { partitive, generic } = _emitTypedRelations(concept);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (partitive.length > 0) mainDoc.partitive_relations = partitive;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (generic.length > 0) mainDoc.generic_relations = generic;
     if (concept.sources.length > 0) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       mainDoc.sources = concept.sources.map(s => s.toJSON());
     }
     if (concept.dates.length > 0) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       mainDoc.dates = concept.dates.map(d => d.toJSON());
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (concept.status) mainDoc.status = concept.status;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (concept.schemaVersion) mainDoc.schema_version = concept.schemaVersion;
 
     const parts = [

package/src/concept-writer.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 { conceptSerializer } from './concept-serializer.js';
@@ -19,7 +18,9 @@ export function writeConcept(dir, concept, format = 'auto') {
   const y = format === 'canonical'
     ? conceptSerializer.toCanonicalYaml(concept)
     : format === 'managed'
+      // @ts-expect-error TODO(Phase 2e): type this fully
       ? conceptSerializer.toManagedYaml(concept)
+      // @ts-expect-error TODO(Phase 2e): type this fully
       : conceptSerializer.toYaml(concept);
 
   fs.writeFileSync(path.join(dir, `${concept.id}.yaml`), y, 'utf8');
@@ -30,12 +31,15 @@ export function writeConcepts(dir, concepts, options = {}) {
   fs.mkdirSync(dir, { recursive: true });
 
   for (const concept of concepts) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     writeConcept(dir, concept, options.format);
   }
 
+  // @ts-expect-error TODO(Phase 2e): type this fully
   if (options.register) {
     fs.writeFileSync(
       path.join(dir, 'register.yaml'),
+      // @ts-expect-error TODO(Phase 2e): type this fully
       conceptSerializer.toRegisterYaml(options.register),
       'utf8',
     );

package/src/diff/collection-diff.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — TEMPORARY during TS migration. TODO(Phase 2e): remove and type fully.
 import { GlossaristModel } from '../models/base.js';
 import { Added, Removed, Matched, deserializeChange } from './change.js';
 import { ConceptDiff, DiffStats, diffConcepts } from './concept-diff.js';
@@ -7,83 +6,121 @@ import { averageSimilarity } from './similarity.js';
 export class ConceptCollectionDiff extends GlossaristModel {
   constructor(data: Record<string, unknown> = {}) {
     super();
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.oldCount = data.oldCount ?? data.old_count ?? 0;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this.newCount = data.newCount ?? data.new_count ?? 0;
 
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._matched = wrapIdList(data.matched, Matched);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._added = wrapIdList(data.added, Added);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._removed = wrapIdList(data.removed, Removed);
 
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._conceptDiffs = {};
     const raw = data.conceptDiffs ?? data.concept_diffs ?? {};
     for (const [id, diff] of Object.entries(raw)) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       this._conceptDiffs[id] = diff instanceof ConceptDiff
         ? diff
         : ConceptDiff.fromJSON(diff);
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._statsCache = undefined;
+    // @ts-expect-error TODO(Phase 2e): type this fully
     this._similarityCache = undefined;
   }
 
+  // @ts-expect-error TODO(Phase 2e): type this fully
   get matched() { return this._matched; }
+  // @ts-expect-error TODO(Phase 2e): type this fully
   get added() { return this._added; }
+  // @ts-expect-error TODO(Phase 2e): type this fully
   get removed() { return this._removed; }
+  // @ts-expect-error TODO(Phase 2e): type this fully
   get conceptDiffs() { return this._conceptDiffs; }
 
   get changedIds() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return Object.keys(this._conceptDiffs);
   }
 
   get hasChanges() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._added.length > 0
+      // @ts-expect-error TODO(Phase 2e): type this fully
       || this._removed.length > 0
+      // @ts-expect-error TODO(Phase 2e): type this fully
       || Object.values(this._conceptDiffs).some(d => d.hasChanges);
   }
 
   conceptDiff(id) {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._conceptDiffs[id] ?? null;
   }
 
   get stats() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (this._statsCache === undefined) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       let added = this._added.length;
+      // @ts-expect-error TODO(Phase 2e): type this fully
       let removed = this._removed.length;
       let changed = 0;
+      // @ts-expect-error TODO(Phase 2e): type this fully
       for (const diff of Object.values(this._conceptDiffs)) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         const s = diff.stats;
         added += s.added;
         removed += s.removed;
         changed += s.changed;
       }
+      // @ts-expect-error TODO(Phase 2e): type this fully
       this._statsCache = new DiffStats({ added, removed, changed });
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._statsCache;
   }
 
   get similarity() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (this._similarityCache === undefined) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       if (this._matched.length === 0) {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         this._similarityCache = 0;
       } else {
+        // @ts-expect-error TODO(Phase 2e): type this fully
         const values = this._matched.map(entry => {
           const id = entry.value;
+          // @ts-expect-error TODO(Phase 2e): type this fully
           const diff = this._conceptDiffs[id];
           return diff ? diff.similarity : 1.0;
         });
+        // @ts-expect-error TODO(Phase 2e): type this fully
         this._similarityCache = averageSimilarity(values);
       }
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     return this._similarityCache;
   }
 
   *walk() {
+    // @ts-expect-error TODO(Phase 2e): type this fully
     for (let i = 0; i < this._added.length; i++) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       yield { path: `added[${i}]`, change: this._added[i] };
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     for (let i = 0; i < this._removed.length; i++) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       yield { path: `removed[${i}]`, change: this._removed[i] };
     }
+    // @ts-expect-error TODO(Phase 2e): type this fully
     for (const [id, diff] of Object.entries(this._conceptDiffs)) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       for (const entry of diff.walk()) {
         yield { path: `concepts.${id}.${entry.path}`, change: entry.change, conceptId: id, language: entry.language };
       }
@@ -92,14 +129,21 @@ export class ConceptCollectionDiff extends GlossaristModel {
 
   toJSON() {
     const obj = {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       old_count: this.oldCount,
+      // @ts-expect-error TODO(Phase 2e): type this fully
       new_count: this.newCount,
+      // @ts-expect-error TODO(Phase 2e): type this fully
       matched: this._matched.map(c => c.toJSON()),
+      // @ts-expect-error TODO(Phase 2e): type this fully
       added: this._added.map(c => c.toJSON()),
+      // @ts-expect-error TODO(Phase 2e): type this fully
       removed: this._removed.map(c => c.toJSON()),
       concept_diffs: {},
     };
+    // @ts-expect-error TODO(Phase 2e): type this fully
     for (const [id, diff] of Object.entries(this._conceptDiffs)) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       obj.concept_diffs[id] = diff.toJSON();
     }
     return obj;
@@ -111,6 +155,7 @@ export class ConceptCollectionDiff extends GlossaristModel {
 }
 
 export function diffConceptCollections(oldCollection, newCollection, options = {}) {
+  // @ts-expect-error TODO(Phase 2e): type this fully
   const language = options.language ?? 'eng';
 
   const oldConcepts = extractConcepts(oldCollection);
@@ -131,12 +176,15 @@ export function diffConceptCollections(oldCollection, newCollection, options = {
     const oldConcept = oldMap.get(id);
     const newConcept = newMap.get(id);
 
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (options.skipUnchanged && conceptsEqual(oldConcept, newConcept)) {
       continue;
     }
 
     const diff = diffConcepts(oldConcept, newConcept, language);
+    // @ts-expect-error TODO(Phase 2e): type this fully
     if (diff.hasChanges || !options.skipUnchanged) {
+      // @ts-expect-error TODO(Phase 2e): type this fully
       conceptDiffs[id] = diff;
     }
   }