glossarist 0.3.7 → 0.4.0

package/src/models/localized-string.js

@@ -0,0 +1,19 @@
+const FALLBACK_LANG = 'eng';
+
+export function fetchLocalizedString(hash, lang, fallback = FALLBACK_LANG) {
+  if (hash == null || typeof hash !== 'object') return null;
+  const direct = hash[lang] ?? hash[String(lang)];
+  if (direct != null) return direct;
+  if (fallback != null && fallback !== lang) {
+    return hash[fallback] ?? hash[String(fallback)] ?? null;
+  }
+  return null;
+}
+
+export function localizedStringIsEmpty(hash) {
+  return hash == null || (typeof hash === 'object' && Object.keys(hash).length === 0);
+}
+
+export function localizedStringIsPresent(hash) {
+  return !localizedStringIsEmpty(hash);
+}

package/src/models/non-verb-rep.js

@@ -1,23 +1,25 @@
-import { GlossaristModel } from './base.js';
-import { ConceptSource } from './concept-source.js';
+import { NonVerbalEntity } from './non-verbal-entity.js';
+import { FigureImage } from './figure.js';
 
-export class NonVerbRep extends GlossaristModel {
+export const NON_VERBAL_TYPES = Object.freeze(['image', 'table', 'formula']);
+
+export class NonVerbRep extends NonVerbalEntity {
   constructor(data = {}) {
-    super();
+    super(data);
     this.type = data.type ?? null;
-    this.ref = data.ref ?? null;
-    this.text = data.text ?? null;
-    this.sources = (data.sources ?? []).map(
-      s => s instanceof ConceptSource ? s : new ConceptSource(s)
-    );
+    this._rawImages = data.images ?? [];
+    this._images = null;
+  }
+
+  get images() {
+    return this._lazy('_images', '_rawImages',
+      i => i instanceof FigureImage ? i : new FigureImage(i));
   }
 
   toJSON() {
-    const obj = {};
+    const obj = super.toJSON();
     if (this.type != null) obj.type = this.type;
-    if (this.ref != null) obj.ref = this.ref;
-    if (this.text != null) obj.text = this.text;
-    if (this.sources.length > 0) obj.sources = this.sources.map(s => s.toJSON());
+    this._serialize(obj, 'images', '_images', '_rawImages');
     return obj;
   }
 

package/src/models/non-verbal-entity.js

@@ -0,0 +1,39 @@
+import { RegistrableModel } from './registrable.js';
+import { ConceptSource } from './concept-source.js';
+
+export class NonVerbalEntity extends RegistrableModel {
+  constructor(data = {}) {
+    super();
+    this.caption = data.caption ?? null;
+    this.description = data.description ?? null;
+    this.alt = data.alt ?? null;
+    this._rawSources = data.sources ?? [];
+    this._sources = null;
+  }
+
+  get sources() {
+    return this._lazy('_sources', '_rawSources',
+      s => s instanceof ConceptSource ? s : new ConceptSource(s));
+  }
+
+  findById(_targetId) {
+    return null;
+  }
+
+  allIds() {
+    return [];
+  }
+
+  toJSON() {
+    const obj = {};
+    if (this.caption != null) obj.caption = this.caption;
+    if (this.description != null) obj.description = this.description;
+    if (this.alt != null) obj.alt = this.alt;
+    this._serialize(obj, 'sources', '_sources', '_rawSources');
+    return obj;
+  }
+
+  static fromJSON(data) {
+    return NonVerbalEntity.fromData(data);
+  }
+}

package/src/models/non-verbal-reference.js

@@ -0,0 +1,35 @@
+import { RegistrableModel } from './registrable.js';
+
+export class NonVerbalReference extends RegistrableModel {
+  constructor(data = {}) {
+    super();
+    this.entityId = data.entityId ?? data.entity_id ?? data.ref ?? data.id ?? null;
+    this.display = data.display ?? null;
+  }
+
+  get dedupKey() {
+    return [this.constructor.name, this.entityId];
+  }
+
+  toJSON() {
+    if (this.display != null) {
+      return { ref: this.entityId, display: this.display };
+    }
+    return this.entityId;
+  }
+
+  static fromJSON(data) {
+    if (data instanceof NonVerbalReference) return data;
+    if (typeof data === 'string') {
+      return new NonVerbalReference({ entityId: data });
+    }
+    const entityId = data.entityId ?? data.entity_id ?? data.ref ?? data.id ?? null;
+    const display = data.display ?? null;
+    const type = data.type;
+    if (type && this._registry().has(type)) {
+      const Cls = this._registry().get(type);
+      return new Cls({ entityId, display });
+    }
+    return new NonVerbalReference({ entityId, display });
+  }
+}

package/src/models/non-verbal-references.js

@@ -0,0 +1,16 @@
+import { NonVerbalReference } from './non-verbal-reference.js';
+
+export class FigureReference extends NonVerbalReference {
+  static fromJSON(data) { return NonVerbalReference.fromJSON(data); }
+}
+NonVerbalReference.register('figure', FigureReference);
+
+export class TableReference extends NonVerbalReference {
+  static fromJSON(data) { return NonVerbalReference.fromJSON(data); }
+}
+NonVerbalReference.register('table', TableReference);
+
+export class FormulaReference extends NonVerbalReference {
+  static fromJSON(data) { return NonVerbalReference.fromJSON(data); }
+}
+NonVerbalReference.register('formula', FormulaReference);

package/src/models/registrable.js

@@ -0,0 +1,25 @@
+import { GlossaristModel } from './base.js';
+
+const _registries = new WeakMap();
+
+export class RegistrableModel extends GlossaristModel {
+  static _registry() {
+    let map = _registries.get(this);
+    if (!map) {
+      map = new Map();
+      _registries.set(this, map);
+    }
+    return map;
+  }
+
+  static register(type, cls) {
+    this._registry().set(type, cls);
+  }
+
+  static fromData(data) {
+    if (data instanceof this) return data;
+    const type = data?.type;
+    const Cls = type ? this._registry().get(type) ?? this : this;
+    return new Cls(data);
+  }
+}

package/src/models/shared-non-verbal-entity.js

@@ -0,0 +1,28 @@
+import { NonVerbalEntity } from './non-verbal-entity.js';
+
+export class SharedNonVerbalEntity extends NonVerbalEntity {
+  constructor(data = {}) {
+    super(data);
+    this.id = data.id ?? null;
+    this.identifier = data.identifier ?? null;
+  }
+
+  findById(targetId) {
+    return this.id === targetId ? this : null;
+  }
+
+  allIds() {
+    return this.id != null ? [this.id] : [];
+  }
+
+  toJSON() {
+    const obj = super.toJSON();
+    if (this.id != null) obj.id = this.id;
+    if (this.identifier != null) obj.identifier = this.identifier;
+    return obj;
+  }
+
+  static fromJSON(data) {
+    return SharedNonVerbalEntity.fromData(data);
+  }
+}

package/src/models/table.js

@@ -0,0 +1,21 @@
+import { SharedNonVerbalEntity } from './shared-non-verbal-entity.js';
+import { NonVerbalEntity } from './non-verbal-entity.js';
+
+export class Table extends SharedNonVerbalEntity {
+  constructor(data = {}) {
+    super(data);
+    this.content = data.content ?? null;
+    this.format = data.format ?? null;
+  }
+
+  toJSON() {
+    const obj = super.toJSON();
+    if (this.content != null) obj.content = this.content;
+    if (this.format != null) obj.format = this.format;
+    return obj;
+  }
+
+  static fromJSON(data) { return new Table(data); }
+}
+
+NonVerbalEntity.register('table', Table);

package/src/reference-mention.js

@@ -27,6 +27,12 @@
 
 const NUMERIC_RE = /^\d+(?:[.-]\d+)+$/;
 
+const NVR_PREFIXES = Object.freeze([
+  { prefix: 'fig:', kind: 'fig-ref' },
+  { prefix: 'table:', kind: 'table-ref' },
+  { prefix: 'formula:', kind: 'formula-ref' },
+]);
+
 /**
  * Parse the body of a {{...}} mention (without the braces).
  *
@@ -63,7 +69,17 @@ export function parseMention(raw) {
     };
   }
 
-  // 3. Comma-separated form: {{id, render}}.
+  // 3. NVR prefixes (fig:/table:/formula:) — config-driven dispatch.
+  for (const { prefix, kind } of NVR_PREFIXES) {
+    const escPrefix = prefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const match = body.match(new RegExp(`^${escPrefix}([^,}]+)(?:,(.*))?$`));
+    if (match) {
+      const label = match[2] !== undefined ? unquoteLabel(match[2].trim()) : null;
+      return { kind, key: match[1].trim(), label, raw: body };
+    }
+  }
+
+  // 4. Comma-separated form: {{id, render}}.
   //    ID always comes first, render text always comes last.
   const commaIdx = body.indexOf(',');
   if (commaIdx !== -1) {
@@ -76,12 +92,12 @@ export function parseMention(raw) {
     return { kind: 'designation', id, label, raw: body };
   }
 
-  // 4. Bare numeric id.
+  // 5. Bare numeric id.
   if (NUMERIC_RE.test(body)) {
     return { kind: 'numeric', id: body, label: null, raw: body };
   }
 
-  // 5. Anything else is unresolved at the parse layer.
+  // 6. Anything else is unresolved at the parse layer.
   return { kind: 'unresolved', raw: body };
 }