@finbheara/archive-client 0.16.0 → 0.16.1

package/README.md

@@ -285,7 +285,9 @@ joins: every school reached through any number of edges, in either direction (th
 split are joined through their predecessor, the schools of a merger through their successor). An
 earlier row at a joined school alone is no match. `r.school.lineage` lists the ids joined to the
 asked ones. A release that publishes no lineage (feature `schools.lineage`) joins
-nothing and its answer carries no `lineage`, never refused.
+nothing and its answer carries no `lineage`, never refused. The line is read on the same school
+graph as `rel.schools.line` (`@finbheara/domain/school-graph`): untimed, every path, and as of a
+year, every path none of whose steps is dated after it (`LINE_AS_OF`).
 
 `population` is how the dancer's published majors population meets the asked one: `same`,
 `contradicts`, `both`, `unknown`, `unasked`. A dancer's population is read only from its rows at

package/dist/chunks/{index-zspxdmkd.js → index-hbb1dnnh.js}

@@ -71,6 +71,7 @@ import { Age, DANCE_UP_YEARS, birthYearsMeet } from "@finbheara/domain/age";
 import { createIndex as createIndex2, indexSchema as indexSchema2, personEncoder } from "@finbheara/domain/noun-index";
 import domainPkg from "@finbheara/domain/package.json";
 import { dancerName } from "@finbheara/domain/person";
+import { schoolGraph as schoolGraph2 } from "@finbheara/domain/school-graph";
 import {
   compTitle,
   populationIn,
@@ -634,12 +635,6 @@ class MajorsFinder2 {
   }
 }
 
-import { createIndex, indexSchema } from "@finbheara/domain/noun-index";
-import {
-  DEFAULT_SCHOOL_NAME_READER,
-  schoolEncoder
-} from "@finbheara/domain/school";
-
 import {
   schoolGraph
 } from "@finbheara/domain/school-graph";
@@ -674,6 +669,11 @@ async function releaseSchoolGraph2(rel) {
   return schoolGraph({ links, redirect: (id) => redirects.get(id) ?? null });
 }
 
+import { createIndex, indexSchema } from "@finbheara/domain/noun-index";
+import {
+  DEFAULT_SCHOOL_NAME_READER,
+  schoolEncoder
+} from "@finbheara/domain/school";
 function readsSpanishNames2(candidates) {
   return candidates.some((c) => c.spanishNames !== undefined && (c.spanishNames.file || c.prints.some((p) => c.spanishNames?.prints.includes(p.trim()))));
 }
@@ -861,16 +861,12 @@ class SchoolResolver2 {
   }
 }
 
-var LINEAGE_FILE = "school-lineage.jsonl";
+var LINE_AS_OF = { name: "line-as-of", keep: (s) => !s.flags.datedAfter };
 function schoolLine(lineage, ids, year) {
   const reached = new Set(ids);
-  const todo = [...ids];
-  for (let id = todo.pop();id !== undefined; id = todo.pop())
-    for (const [o, y] of lineage.get(id) ?? [])
-      if (!reached.has(o) && (year === null || y === null || y <= year)) {
-        reached.add(o);
-        todo.push(o);
-      }
+  for (const id of ids)
+    for (const x of lineage.within(id, LINE_AS_OF, year))
+      reached.add(x);
   return reached;
 }
 function initialsOnly2(name) {
@@ -1097,21 +1093,10 @@ class DancerResolver2 {
     this.lineageOf ??= (async () => {
       if ((await this.rel.capability("schools.lineage")).state !== "full")
         return null;
-      await this.rel.fetch(LINEAGE_FILE);
-      const out = new Map;
-      const join = (a, b, year) => {
-        const m = out.get(a) ?? new Map;
-        const was = m.get(b);
-        m.set(b, was === undefined ? year : was === null || year === null ? null : Math.min(was, year));
-        out.set(a, m);
-      };
-      for (const r of readJsonl(this.rel.path(LINEAGE_FILE)))
-        if (r.id !== r.other) {
-          const year = typeof r.year === "number" ? r.year : null;
-          join(r.id, r.other, year);
-          join(r.other, r.id, year);
-        }
-      return out;
+      await this.rel.fetch(LINEAGE_FILE2);
+      return schoolGraph2({
+        links: linksOfLineage2(readJsonl(this.rel.path(LINEAGE_FILE2)))
+      });
     })();
     return this.lineageOf;
   }

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   nameOrderOf,
   openRelease2,
   releases2
-} from "./chunks/index-zspxdmkd.js";
+} from "./chunks/index-hbb1dnnh.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 

package/dist/index.js

@@ -50,7 +50,7 @@ import {
   openCached2,
   ReleaseManager2,
   releases2
-} from "./chunks/index-zspxdmkd.js";
+} from "./chunks/index-hbb1dnnh.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/dancers.d.ts

@@ -1,9 +1,11 @@
+import { type SchoolGraph, type StepPolicy } from "@finbheara/domain/school-graph";
 import { type PersonName } from "@finbheara/names/normalize";
 import { type NameLevel } from "./dancers-names.js";
 import type { IndexBuilder } from "./indexes.js";
 import type { Release } from "./release.js";
 import { FEIS_LOCAL_ID_FLOOR } from "./results.js";
-export type Lineage = Map<string, Map<string, number | null>>;
+export type Lineage = SchoolGraph;
+export declare const LINE_AS_OF: StepPolicy;
 export declare function schoolLine(lineage: Lineage, ids: readonly string[], year: number | null): Set<string>;
 export declare function initialsOnly(name: PersonName): boolean;
 export { FEIS_LOCAL_ID_FLOOR };

package/dist/types/school-links.d.ts

@@ -1,7 +1,7 @@
 import { type LineAnswer, type LinkAnswer, type LinkQuery, type SchoolGraph, type SchoolLink } from "@finbheara/domain/school-graph";
 import type { Release } from "./release.js";
 export declare const LINEAGE_FILE = "school-lineage.jsonl";
-interface LineageLine {
+export interface LineageLine {
     id: string;
     direction: "precedes" | "succeeds";
     other: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.16.0",
+	"version": "0.16.1",
 	"description": "Open a versioned release of an Irish dance results archive: download, verify, decompress and cache it by tag, keep the cache, and resolve feises and schools against it",
 	"keywords": ["irish-dance", "results", "release", "cache", "sqlite"],
 	"license": "MIT",