@bitcobblers/wod-wiki-engine 0.37.2139 → 0.37.2140

package/dist/index.cjs

@@ -617,16 +617,34 @@ function csvToSessionRows(csv) {
 }
 
 // src/version.ts
-var VERSION = "0.37.2139";
-var GIT_SHA = "491ec71";
-var BUILD_TIME = "2026-10-17T15:36:01.834Z";
+var VERSION = "0.37.2140";
+var GIT_SHA = "bcf7960";
+var BUILD_TIME = "2026-10-18T21:43:29.081Z";
 var SEMVER = {
-  version: "0.37.2139",
-  gitSha: "491ec71",
-  buildTime: "2026-10-17T15:36:01.834Z"
+  version: "0.37.2140",
+  gitSha: "bcf7960",
+  buildTime: "2026-10-18T21:43:29.081Z"
 };
 var SEED_SCHEMA = 9;
 var SEED_REGISTERED_WIDGETS = wodWikiCore.KNOWN_SECTION_WIDGETS;
+var SEED_PRECEDENCE_RANK = {
+  core: 0,
+  community: 1,
+  imported: 2,
+  user: 3
+};
+function seedSourceTier(sourceIdOrMetaKey, explicitTier) {
+  if (explicitTier) return explicitTier;
+  if (!sourceIdOrMetaKey) return "core";
+  if (sourceIdOrMetaKey === "user") return "user";
+  const id = sourceIdOrMetaKey.startsWith("seed:") ? sourceIdOrMetaKey.slice(5) : sourceIdOrMetaKey;
+  if (id === "core" || id === "efforts" || id === "equipment") return "core";
+  if (id === "community" || id.startsWith("community-") || id === "common") return "community";
+  return "imported";
+}
+function seedPrecedenceRank(sourceIdOrMetaKey, explicitTier) {
+  return SEED_PRECEDENCE_RANK[seedSourceTier(sourceIdOrMetaKey, explicitTier)];
+}
 var SEED_BROADCAST_CHANNEL = "wodwiki.seed";
 var EFFORTS_CHUNK_ID = "efforts";
 var EQUIPMENT_CHUNK_ID = "equipment";
@@ -768,36 +786,79 @@ function refreshedBlocks(existing, rawContent, sourceRevision) {
   let ordinal = 0;
   return wodWikiCore.reconcileNoteBlocks(rawContent, { sourceRevision, blocks: mapped, registeredWidgets: SEED_REGISTERED_WIDGETS, createId: () => `seed:${existing.id}:r${sourceRevision}:${ordinal++}` });
 }
-async function applyDefinitionChunk(defStore, parse, family, rows, ids, owned, existingById, allIds) {
+async function applyDefinitionChunk(defStore, noteStore, parse, family, seedSource, incomingRank, otherCheckpoints, priorIds, rows, ids, owned, existingById, allIds) {
+  const priorIdSet = new Set(priorIds);
+  const maxOtherRankForNote = (noteId) => {
+    let max = -1;
+    for (const cp of otherCheckpoints) {
+      if (cp.noteIds.has(noteId) && cp.rank > max) max = cp.rank;
+    }
+    return max;
+  };
   const projections = [];
   for (const [i, row] of rows.entries()) {
     if (!owned.has(ids[i])) continue;
     const parsed = parse(row.content);
     if (!parsed) continue;
-    projections.push({ ...parsed, registrySource: "bundled", ownerNoteId: ids[i], sourceId: family, sourcePath: row.path });
+    projections.push({ ...parsed, registrySource: "bundled", ownerNoteId: ids[i], sourceId: seedSource, sourcePath: row.path });
   }
   const prior = await defStore.getMany(projections.map((p) => p.slug));
-  for (const [i, p] of projections.entries()) {
+  const changed = projections.filter((p, i) => {
     const before = prior[i];
-    if (before?.registrySource === "bundled" && before.ownerNoteId && before.ownerNoteId !== p.ownerNoteId) {
-      throw new Error(`Seed definition collision: '${p.slug}' is already owned by another seed source (note ${before.ownerNoteId})`);
+    if (!before) return true;
+    if (before.registrySource !== "bundled") return false;
+    let beforeRank;
+    if (before.ownerNoteId === p.ownerNoteId || before.ownerNoteId && priorIdSet.has(before.ownerNoteId) && maxOtherRankForNote(before.ownerNoteId) < incomingRank) {
+      beforeRank = incomingRank;
+    } else {
+      const cpRank = before.ownerNoteId ? maxOtherRankForNote(before.ownerNoteId) : -1;
+      beforeRank = cpRank >= 0 ? cpRank : seedPrecedenceRank(before.sourceId);
     }
-  }
-  const changed = projections.filter((p, i) => (!prior[i] || prior[i]?.registrySource === "bundled") && !equal(p, prior[i]));
+    return incomingRank >= beforeRank && !equal(p, before);
+  });
   if (changed.length) await defStore.putMany(changed);
   const wantedSlugs = new Set(projections.map((p) => p.slug));
   const removedBySlug = /* @__PURE__ */ new Map();
   for (const id of allIds) {
-    if (!owned.has(id)) continue;
     const note = existingById.get(id);
-    const slug = note ? parse(note.rawContent)?.slug : void 0;
+    if (!note || note.seedOrigin !== "seed") continue;
+    const slug = parse(note.rawContent)?.slug;
     if (slug && !wantedSlugs.has(slug)) removedBySlug.set(slug, id);
   }
   const removedSlugs = [...removedBySlug.keys()];
-  const old = await defStore.getMany(removedSlugs);
-  for (const [i, row] of old.entries()) {
-    if (row?.registrySource === "bundled" && removedBySlug.get(removedSlugs[i]) === row.ownerNoteId) {
-      await defStore.delete(removedSlugs[i]);
+  if (removedSlugs.length) {
+    const old = await defStore.getMany(removedSlugs);
+    for (const [i, row] of old.entries()) {
+      const slug = removedSlugs[i];
+      if (!row || row.registrySource !== "bundled") continue;
+      const removedNoteId = removedBySlug.get(slug);
+      const isOwnedByThisSource = row.ownerNoteId === removedNoteId && (!row.sourceId || row.sourceId === seedSource || row.sourceId === family);
+      if (!isOwnedByThisSource) continue;
+      let restored = false;
+      for (const cp of otherCheckpoints) {
+        const candidateIds = cp.meta.chunks?.[family]?.noteIds ?? [];
+        if (!candidateIds.length) continue;
+        const candidateNotes = await noteStore.getMany(candidateIds);
+        for (const candidateNote of candidateNotes) {
+          if (!candidateNote || candidateNote.seedOrigin !== "seed") continue;
+          const parsed = parse(candidateNote.rawContent);
+          if (parsed && parsed.slug === slug) {
+            await defStore.put({
+              ...parsed,
+              registrySource: "bundled",
+              ownerNoteId: candidateNote.id,
+              sourceId: cp.sourceId,
+              sourcePath: candidateNote.sourcePath ?? ""
+            });
+            restored = true;
+            break;
+          }
+        }
+        if (restored) break;
+      }
+      if (!restored) {
+        await defStore.delete(slug);
+      }
     }
   }
   return changed.length;
@@ -838,30 +899,41 @@ async function applySeedChunk(storage, write) {
     const allIds = [.../* @__PURE__ */ new Set([...ids, ...goneIds])];
     const stored = await noteStore.getMany(allIds);
     const existingById = new Map(allIds.map((id, i) => [id, stored[i]]));
+    const seedSource = write.meta.key.startsWith("seed:") ? write.meta.key.slice(5) : write.meta.key;
+    const incomingRank = seedPrecedenceRank(write.meta.key, write.meta.tier);
+    const otherCheckpoints = [];
+    for (const row of await metaStore.getAll()) {
+      const meta = row;
+      if (!meta || typeof meta.key !== "string" || !meta.key.startsWith("seed:") || meta.key === write.meta.key) continue;
+      const noteIds = /* @__PURE__ */ new Set();
+      for (const chunk of Object.values(meta.chunks ?? {})) {
+        for (const noteId of chunk.noteIds ?? []) noteIds.add(noteId);
+      }
+      otherCheckpoints.push({
+        key: meta.key,
+        sourceId: meta.key.slice(5),
+        rank: seedPrecedenceRank(meta.key, meta.tier),
+        meta,
+        noteIds
+      });
+    }
+    otherCheckpoints.sort((a, b) => b.rank - a.rank);
+    const maxOtherRankForNote = (noteId) => {
+      let max = -1;
+      for (const cp of otherCheckpoints) {
+        if (cp.noteIds.has(noteId) && cp.rank > max) max = cp.rank;
+      }
+      return max;
+    };
     const ownedIds = allIds.filter((id) => {
       const note = existingById.get(id);
-      return !note || note.seedOrigin === "seed" && (declared.has(id) || note.seedChunkId === write.chunkId);
+      if (!note) return declared.has(id);
+      if (note.seedOrigin !== "seed") return false;
+      const otherRank = maxOtherRankForNote(id);
+      if (declared.has(id)) return incomingRank >= otherRank;
+      return otherRank < 0 && note.seedChunkId === write.chunkId;
     });
     const owned = new Set(ownedIds);
-    {
-      let checkpoints;
-      for (const [i, id] of ids.entries()) {
-        const existing = existingById.get(id);
-        if (!existing || existing.seedOrigin !== "seed") continue;
-        if (checkpoints === void 0) {
-          checkpoints = [];
-          for (const row of await metaStore.getAll()) {
-            const meta = row;
-            if (!meta || typeof meta.key !== "string" || !meta.key.startsWith("seed:") || meta.key === write.meta.key) continue;
-            const noteIds = /* @__PURE__ */ new Set();
-            for (const chunk of Object.values(meta.chunks ?? {})) for (const noteId of chunk.noteIds ?? []) noteIds.add(noteId);
-            checkpoints.push({ key: meta.key, noteIds });
-          }
-        }
-        const owner = checkpoints.find((checkpoint) => checkpoint.noteIds.has(id));
-        if (owner) throw new Error(`Seed note collision: '${write.rows[i].path}' is already owned by ${owner.key}`);
-      }
-    }
     const revisionStore = tx.readwrite("block_revisions");
     const historyIds = ids.filter((id, i) => owned.has(id) && existingById.get(id)?.rawContent !== write.rows[i].content);
     const histories = await revisionStore.getAllFromIndexMany("by-note", historyIds);
@@ -883,7 +955,7 @@ async function applySeedChunk(storage, write) {
     for (const [i, row] of write.rows.entries()) {
       const id = ids[i], existing = existingById.get(id);
       if (!owned.has(id)) {
-        result.skippedUserOwned++;
+        if (existing && existing.seedOrigin !== "seed") result.skippedUserOwned++;
         continue;
       }
       if (!existing) result.addedNotes++;
@@ -983,10 +1055,10 @@ async function applySeedChunk(storage, write) {
       result.deleted++;
     }
     if (write.chunkId === EFFORTS_CHUNK_ID) {
-      result.totalEfforts = await applyDefinitionChunk(tx.readwrite("efforts"), wodWikiLang.parseEffortFile, "efforts", write.rows, ids, owned, existingById, allIds);
+      result.totalEfforts = await applyDefinitionChunk(tx.readwrite("efforts"), noteStore, wodWikiLang.parseEffortFile, "efforts", seedSource, incomingRank, otherCheckpoints, priorIds, write.rows, ids, owned, existingById, allIds);
     }
     if (write.chunkId === EQUIPMENT_CHUNK_ID) {
-      result.totalEquipment = await applyDefinitionChunk(tx.readwrite("equipment"), wodWikiLang.parseEquipmentFile, "equipment", write.rows, ids, owned, existingById, allIds);
+      result.totalEquipment = await applyDefinitionChunk(tx.readwrite("equipment"), noteStore, wodWikiLang.parseEquipmentFile, "equipment", seedSource, incomingRank, otherCheckpoints, priorIds, write.rows, ids, owned, existingById, allIds);
     }
     if (changedNotes.length) await noteStore.putMany(changedNotes);
     if (revisions.length) await revisionStore.putMany(revisions);
@@ -1042,6 +1114,10 @@ Object.defineProperty(exports, "ButtonBehavior", {
   enumerable: true,
   get: function () { return wodWikiLang.ButtonBehavior; }
 });
+Object.defineProperty(exports, "CATALOG_PRECEDENCE_RANK", {
+  enumerable: true,
+  get: function () { return wodWikiLang.CATALOG_PRECEDENCE_RANK; }
+});
 Object.defineProperty(exports, "CONSUMED_HINTS", {
   enumerable: true,
   get: function () { return wodWikiLang.CONSUMED_HINTS; }
@@ -1442,6 +1518,10 @@ Object.defineProperty(exports, "createParser", {
   enumerable: true,
   get: function () { return wodWikiLang.createParser; }
 });
+Object.defineProperty(exports, "dedupeEntitiesByPrecedence", {
+  enumerable: true,
+  get: function () { return wodWikiLang.dedupeEntitiesByPrecedence; }
+});
 Object.defineProperty(exports, "dialectRegistry", {
   enumerable: true,
   get: function () { return wodWikiLang.dialectRegistry; }
@@ -1574,6 +1654,22 @@ Object.defineProperty(exports, "renderMetric", {
   enumerable: true,
   get: function () { return wodWikiLang.renderMetric; }
 });
+Object.defineProperty(exports, "resolveEntityRank", {
+  enumerable: true,
+  get: function () { return wodWikiLang.resolveEntityRank; }
+});
+Object.defineProperty(exports, "resolveEntityTier", {
+  enumerable: true,
+  get: function () { return wodWikiLang.resolveEntityTier; }
+});
+Object.defineProperty(exports, "resolveSourceRank", {
+  enumerable: true,
+  get: function () { return wodWikiLang.resolveSourceRank; }
+});
+Object.defineProperty(exports, "resolveSourceTier", {
+  enumerable: true,
+  get: function () { return wodWikiLang.resolveSourceTier; }
+});
 Object.defineProperty(exports, "strategyRegistry", {
   enumerable: true,
   get: function () { return wodWikiLang.strategyRegistry; }
@@ -1898,6 +1994,7 @@ exports.EQUIPMENT_CHUNK_ID = EQUIPMENT_CHUNK_ID;
 exports.GIT_SHA = GIT_SHA;
 exports.NOTE_ID_FRONTMATTER_KEY = NOTE_ID_FRONTMATTER_KEY;
 exports.SEED_BROADCAST_CHANNEL = SEED_BROADCAST_CHANNEL;
+exports.SEED_PRECEDENCE_RANK = SEED_PRECEDENCE_RANK;
 exports.SEED_REGISTERED_WIDGETS = SEED_REGISTERED_WIDGETS;
 exports.SEED_SCHEMA = SEED_SCHEMA;
 exports.SEMVER = SEMVER;
@@ -1932,6 +2029,8 @@ exports.registerLanguagePack = registerLanguagePack;
 exports.seedMetaKey = seedMetaKey;
 exports.seedNoteId = seedNoteId;
 exports.seedNoteSourceId = seedNoteSourceId;
+exports.seedPrecedenceRank = seedPrecedenceRank;
+exports.seedSourceTier = seedSourceTier;
 exports.sessionToCsv = sessionToCsv;
 exports.splitCsvRecords = splitCsvRecords;
 exports.statementToNode = statementToNode;