@bitcobblers/wod-wiki-tools 0.37.2137 → 0.37.2139

package/dist/{chunk-GBBJBDLS.mjs → chunk-HRFOKCYI.mjs}

@@ -1,12 +1,12 @@
 import { createRequire } from 'module';
-import { compileSeedRow, SEED_SCHEMA, writeBuildReport } from './chunk-NATJMTAW.mjs';
-import { VERSION } from './chunk-SQAI6B4P.mjs';
-import { openCliDb, nodeFs, sqliteIndexStore, sqliteEffortStore, sqliteBlockStore, sqliteNoteStore, sqliteEventStore, getNoteBundle, getSessionBundle, getEffortBySlug, listTagsByType, nodePath, loadSql, uuid5, CLI_UUID_NAMESPACE, nodeCrypto, stableNoteId, randomId } from './chunk-CYKNTEGY.mjs';
+import { compileSeedRow, SEED_SCHEMA, writeBuildReport } from './chunk-CVFMFD7D.mjs';
+import { VERSION } from './chunk-JUBKCRNV.mjs';
+import { openCliDb, nodeFs, sqliteIndexStore, sqliteEffortStore, sqliteBlockStore, sqliteNoteStore, sqliteEventStore, getNoteBundle, getSessionBundle, getEffortBySlug, getEquipmentBySlug, listTagsByType, nodePath, loadSql, uuid5, CLI_UUID_NAMESPACE, nodeCrypto, stableNoteId, randomId } from './chunk-IWT7U3WX.mjs';
 import { __require } from './chunk-6L5ZDZJ7.mjs';
-import { createParser, frozenNow, createCompiler, createMockClock, RuntimeStack, EventBus, ScriptRuntime, createAnalyticsEngineForBlock, StartSessionAction, NextEvent, toStoredOutputStatement, bundledEfforts, parseScript } from '@bitcobblers/wod-wiki-lang';
-import { buildStatementTree, createIRFile, registerLanguagePack, extractNoteIdentity, extractTypedTags, composeNoteMarkdown, sessionToCsv, effortToMarkdown, equipmentToCsv, markdownToEffort, csvToEquipmentLabels, csvToSessionRows, isIRFile, inMemoryEventStore, readFrontmatterMeta, assertSeedManifest, seedMetaKey, SEED_SCHEMA as SEED_SCHEMA$1, emptySeedMeta, CANVAS_CHUNK_ID, assertSeedRows, seedNoteId, applySeedChunk } from '@bitcobblers/wod-wiki-engine';
+import { createParser, frozenNow, createCompiler, createMockClock, RuntimeStack, EventBus, ScriptRuntime, createAnalyticsEngineForBlock, StartSessionAction, NextEvent, toStoredOutputStatement, bundledEfforts, parseEffortFile, parseEquipmentFile, createReferenceIndex, parseScript, extractStatementRefs } from '@bitcobblers/wod-wiki-lang';
+import { buildStatementTree, createIRFile, registerLanguagePack, extractNoteIdentity, extractTypedTags, composeNoteMarkdown, sessionToCsv, effortToMarkdown, equipmentToMarkdown, equipmentToCsv, csvToEquipmentLabels, csvToSessionRows, isIRFile, inMemoryEventStore, readFrontmatterMeta, assertSeedManifest, seedMetaKey, SEED_SCHEMA as SEED_SCHEMA$1, emptySeedMeta, CANVAS_CHUNK_ID, assertSeedRows, seedNoteId, applySeedChunk } from '@bitcobblers/wod-wiki-engine';
 import { toEventRows, toSummaryEventRows, parseQuery, QueryService, isPipelineQuery, isFindQuery, catalogOfItem } from '@bitcobblers/wod-wiki-wql';
-import { validateNoteBlocks, parseDocumentSections, blockContentId, reconcileNoteBlocks, KNOWN_SECTION_WIDGETS } from '@bitcobblers/wod-wiki-core';
+import { validateNoteBlocks, parseDocumentSections, blockContentId, reconcileNoteBlocks, KNOWN_SECTION_WIDGETS, MetricType } from '@bitcobblers/wod-wiki-core';
 import { rowsEqual } from '@bitcobblers/wod-wiki-storage';
 
 if (typeof globalThis.require === 'undefined') {
@@ -924,23 +924,7 @@ ${escapeCsvField(data.parsed.metric)},${data.scalar},${escapeCsvField(data.unit
   return lines.join("\n");
 }
 var registeredWidgets = KNOWN_SECTION_WIDGETS;
-var saveStores = ["notes", "block_revisions", "block_index", "block_efforts", "tags", "note_tags", "sessions"];
-function extractEffortSlugs(statements) {
-  const slugs = /* @__PURE__ */ new Set();
-  for (const statement of statements) {
-    if (statement.exerciseId) {
-      slugs.add(statement.exerciseId);
-    } else {
-      const effortMetric = statement.metrics?.getMetric?.("effort");
-      const effort = effortMetric && "effort" in effortMetric ? effortMetric.effort : void 0;
-      if (typeof effort === "string") {
-        const slug = effort.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-        if (slug) slugs.add(slug);
-      }
-    }
-  }
-  return [...slugs];
-}
+var saveStores = ["notes", "block_revisions", "block_index", "block_efforts", "block_equipment", "efforts", "equipment", "tags", "note_tags", "sessions"];
 function titleFromLabel(sourceLabel) {
   if (!sourceLabel || sourceLabel === "-") return "stdin";
   const stem = sourceLabel.split("/").pop() ?? sourceLabel;
@@ -1012,9 +996,19 @@ async function saveSource(db, options, startTime) {
     };
     const priorRows = await tx.readonly("block_index").getAllFromIndex("by-note", noteId);
     const priorEfforts = await tx.readonly("block_efforts").getAllFromIndex("by-note", noteId);
+    const priorEquipment = await tx.readonly("block_equipment").getAllFromIndex("by-note", noteId);
+    const storedEfforts = await tx.readonly("efforts").getAll();
+    const effortsBySlug = /* @__PURE__ */ new Map();
+    for (const effort of bundledEfforts) effortsBySlug.set(effort.slug, effort);
+    for (const effort of storedEfforts) effortsBySlug.set(effort.slug, effort);
+    const referenceIndex = createReferenceIndex({
+      efforts: [...effortsBySlug.values()],
+      equipment: await tx.readonly("equipment").getAll()
+    });
     const priorById = new Map(priorRows.map((row) => [row.id, row]));
     const nextRows = [];
     const nextEfforts = [];
+    const nextEquipment = [];
     for (const [position, block] of Object.values(blocks).sort((a, b) => a.from - b.from).entries()) {
       const id = `${noteId}:${block.id}`;
       const prior = priorById.get(id);
@@ -1040,7 +1034,20 @@ async function saveSource(db, options, startTime) {
         ...note.sourceId ? { sourceId: note.sourceId } : {}
       });
       if (block.kind === "wod") {
-        for (const effortSlug of extractEffortSlugs(parseScript(body, { sport: block.sport, dialect: block.dialect }).statements)) {
+        const statements = parseScript(body, { sport: block.sport, dialect: block.dialect, references: referenceIndex }).statements;
+        const refs = extractStatementRefs(statements);
+        const effortSlugs = new Set(refs.efforts);
+        if (effortSlugs.size === 0) {
+          for (const s of statements) {
+            const m = s.metrics?.getMetric?.(MetricType.Effort);
+            const val = typeof m?.value === "string" ? m.value : m && "effort" in m ? String(m.effort) : "";
+            const slug = val.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+            if (slug && !["rest", "amrap", "emom", "tabata", "for-time"].includes(slug)) {
+              effortSlugs.add(slug);
+            }
+          }
+        }
+        for (const effortSlug of effortSlugs) {
           const effortId = `${noteId}:${block.id}:${effortSlug}`;
           const previous = priorEfforts.find((row) => row.id === effortId);
           nextEfforts.push({
@@ -1053,12 +1060,26 @@ async function saveSource(db, options, startTime) {
             createdAt: previous?.createdAt ?? now
           });
         }
+        for (const equipmentSlug of refs.equipment) {
+          const equipmentId = `${noteId}:${block.id}:${equipmentSlug}`;
+          const previous = priorEquipment.find((row) => row.id === equipmentId);
+          nextEquipment.push({
+            ...previous,
+            id: equipmentId,
+            noteId,
+            blockId: block.id,
+            blockContentId: fingerprint,
+            equipmentSlug,
+            createdAt: previous?.createdAt ?? now
+          });
+        }
       }
     }
     if (!rowsEqual(existing, note)) await tx.readwrite("notes").put(note);
     if (revisions.length) await tx.readwrite("block_revisions").putMany(revisions);
     await diffProjection(tx, "block_index", priorRows, nextRows);
     await diffProjection(tx, "block_efforts", priorEfforts, nextEfforts);
+    await diffProjection(tx, "block_equipment", priorEquipment, nextEquipment);
     const tags = await saveTags(tx, noteId, options.tags, now);
     let session;
     let revision;
@@ -1094,6 +1115,7 @@ async function diffProjection(tx, store, previous, next) {
     if (!rowsEqual(old.get(row.id), row)) {
       if (store === "block_index" && "blockVersion" in row) await tx.readwrite("block_index").put(row);
       if (store === "block_efforts" && "effortSlug" in row) await tx.readwrite("block_efforts").put(row);
+      if (store === "block_equipment" && "equipmentSlug" in row) await tx.readwrite("block_equipment").put(row);
     }
   }
 }
@@ -1185,6 +1207,12 @@ async function persistEffort(db, effort) {
     await sql.putRow(tx, sql.storeDefinition("efforts"), effort);
   });
 }
+async function persistEquipment(db, equipment) {
+  const sql = await loadSql();
+  await db.db.transaction(async (tx) => {
+    await sql.putRow(tx, sql.storeDefinition("equipment"), equipment);
+  });
+}
 async function persistTypedTags(db, labels, type) {
   return db.storage.transaction(["tags"], "readwrite", async (tx) => {
     let added = 0;
@@ -1207,17 +1235,18 @@ async function importSeedDir(db, dir, sourceId) {
   const source = sourceId || path.basename(dir);
   const manifest = assertSeedManifest(JSON.parse(fs.readFileSync(path.resolve(dir, "manifest.json"), "utf-8")));
   const key = seedMetaKey(source);
-  let expected = await db.storage.readonly("meta").get(key);
-  if (expected && expected.schema !== SEED_SCHEMA$1) throw new Error("Incompatible seed checkpoint; recreate storage");
+  const stored = await db.storage.readonly("meta").get(key);
+  let expected = stored?.schema === SEED_SCHEMA$1 ? stored : void 0;
   let meta = expected ?? emptySeedMeta(key);
   if (manifest.version < meta.seedVersion) throw new Error("Seed manifest is older than stored checkpoint");
-  const summary = { sourceId: source, version: manifest.version, notes: 0, efforts: 0, blocks: 0, blockEfforts: 0, deleted: 0, skippedUserOwned: 0 };
+  const summary = { sourceId: source, version: manifest.version, notes: 0, efforts: 0, equipment: 0, blocks: 0, blockEfforts: 0, deleted: 0, skippedUserOwned: 0 };
   const metadataChanged = manifest.version !== meta.seedVersion || manifest.builtAt !== meta.builtAt;
   const plan = manifest.chunks.filter((c) => metadataChanged || meta.chunks[c.id]?.sha256 !== c.sha256);
   plan.sort((a, b) => Number(b.id === CANVAS_CHUNK_ID) - Number(a.id === CANVAS_CHUNK_ID));
   const accumulate = (result) => {
     summary.notes += result.totalNotes;
     summary.efforts += result.totalEfforts;
+    summary.equipment += result.totalEquipment;
     summary.blocks += result.totalBlocks;
     summary.deleted += result.deleted;
     summary.skippedUserOwned += result.skippedUserOwned;
@@ -1287,6 +1316,7 @@ async function publishCatalogSeed(db, options) {
   }
   const allIndexRows = await db.storage.readonly("block_index").getAll();
   const allEffortRows = await db.storage.readonly("block_efforts").getAll();
+  const allEquipmentRows = await db.storage.readonly("block_equipment").getAll();
   const indexByNote = /* @__PURE__ */ new Map();
   for (const row of allIndexRows) {
     const list = indexByNote.get(row.noteId) ?? [];
@@ -1299,6 +1329,12 @@ async function publishCatalogSeed(db, options) {
     list.push(row);
     effortsByNote.set(row.noteId, list);
   }
+  const equipmentByNote = /* @__PURE__ */ new Map();
+  for (const row of allEquipmentRows) {
+    const list = equipmentByNote.get(row.noteId) ?? [];
+    list.push(row);
+    equipmentByNote.set(row.noteId, list);
+  }
   const outDir = path.resolve(process.cwd(), options.outDir);
   const chunksDir = path.join(outDir, "chunks");
   fs.mkdirSync(chunksDir, { recursive: true });
@@ -1313,6 +1349,7 @@ async function publishCatalogSeed(db, options) {
       const notePath = note.sourcePath ?? `markdown/collections/${catalogName}/${stem}.md`;
       const noteBlockIndex = indexByNote.get(note.id) ?? [];
       const noteBlockEfforts = effortsByNote.get(note.id) ?? [];
+      const noteBlockEquipment = equipmentByNote.get(note.id) ?? [];
       const blockIndex = noteBlockIndex.length > 0 ? noteBlockIndex.map((b) => ({
         ...b,
         isStatic: true,
@@ -1332,12 +1369,18 @@ async function publishCatalogSeed(db, options) {
         isStatic: true,
         sourcePath: e.sourcePath ?? notePath
       }));
+      const blockEquipment = noteBlockEquipment.map((e) => ({
+        ...e,
+        isStatic: true,
+        sourcePath: e.sourcePath ?? notePath
+      }));
       chunkRows.push({
         path: notePath,
         content: note.rawContent,
         blocks: note.blocks,
         blockIndex,
-        blockEfforts
+        blockEfforts,
+        blockEquipment
       });
     }
     const chunkId = `collection.${catalogName}`;
@@ -1806,7 +1849,7 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         writeErr("[wod init-catalog] Error: Missing catalog name (a single new directory name)");
         return 1;
       }
-      const { scaffoldCatalog } = await import('./scaffoldCatalog-LQOUCJ4X.mjs');
+      const { scaffoldCatalog } = await import('./scaffoldCatalog-OIU4FEKJ.mjs');
       try {
         const result = scaffoldCatalog(parsed.target);
         writeOut(`[wod init-catalog] Created ${result.dir} (${result.files.length} files)`);
@@ -2017,7 +2060,9 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
             writeErr(`[wod ${verb}] Effort not found in ${db.path}: ${id}`);
             return 1;
           }
-          const markdown = effortToMarkdown(effort);
+          const ownerNoteId = typeof effort.ownerNoteId === "string" ? effort.ownerNoteId : `effort/${effort.slug}`;
+          const owner = await db.storage.readonly("notes").get(ownerNoteId);
+          const markdown = owner?.rawContent ?? effortToMarkdown(effort);
           const target = parsed.output && parsed.output !== "-" ? parsed.output : `${id}.md`;
           if (parsed.output === "-") {
             writeOut(markdown);
@@ -2026,15 +2071,29 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
           }
           writeOut(`[wod ${verb}] effort ${id} \u2192 ${target}`);
         } else {
-          const labels = (await listTagsByType(db.db, "equipment")).map((t) => t.label).sort();
-          const csv = equipmentToCsv(labels);
-          const target = parsed.output && parsed.output !== "-" ? parsed.output : "equipment.csv";
-          if (parsed.output === "-") {
-            writeOut(csv);
+          const equipment = id ? await getEquipmentBySlug(db.db, targetId) : void 0;
+          if (equipment) {
+            const ownerNoteId = typeof equipment.ownerNoteId === "string" ? equipment.ownerNoteId : `equipment/${equipment.slug}`;
+            const owner = await db.storage.readonly("notes").get(ownerNoteId);
+            const markdown = owner?.rawContent ?? equipmentToMarkdown(equipment);
+            const target = parsed.output && parsed.output !== "-" ? parsed.output : `${id}.md`;
+            if (parsed.output === "-") {
+              writeOut(markdown);
+            } else {
+              nodeFs().writeFileSync(target, markdown, "utf-8");
+            }
+            writeOut(`[wod ${verb}] equipment ${id} \u2192 ${target}`);
           } else {
-            nodeFs().writeFileSync(target, csv, "utf-8");
+            const labels = (await listTagsByType(db.db, "equipment")).map((t) => t.label).sort();
+            const csv = equipmentToCsv(labels);
+            const target = parsed.output && parsed.output !== "-" ? parsed.output : "equipment.csv";
+            if (parsed.output === "-") {
+              writeOut(csv);
+            } else {
+              nodeFs().writeFileSync(target, csv, "utf-8");
+            }
+            writeOut(`[wod ${verb}] equipment \u2192 ${target} (${labels.length} labels)`);
           }
-          writeOut(`[wod ${verb}] equipment \u2192 ${target} (${labels.length} labels)`);
         }
       } finally {
         await db.close();
@@ -2076,7 +2135,7 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         return 0;
       }
       if (kind === "effort") {
-        const effort = markdownToEffort(fs.readFileSync(file, "utf-8"));
+        const effort = parseEffortFile(fs.readFileSync(file, "utf-8"));
         if (!effort) {
           writeErr(`[wod import] Unparseable effort file (need frontmatter id/slug/label + numeric baseAttributes.met): ${file}`);
           return 1;
@@ -2090,6 +2149,21 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         }
         return 0;
       }
+      if (kind === "equipment" && /\.md$/i.test(file)) {
+        const equipment = parseEquipmentFile(fs.readFileSync(file, "utf-8"));
+        if (!equipment) {
+          writeErr(`[wod import] Unparseable equipment file (need frontmatter type: equipment + id/slug/label): ${file}`);
+          return 1;
+        }
+        const db2 = await openCliDb(cliDb());
+        try {
+          await persistEquipment(db2, { ...equipment, registrySource: "user" });
+          writeOut(`[wod import] equipment ${equipment.slug} \u2014 ${equipment.label} \u2192 ${db2.path}`);
+        } finally {
+          await db2.close();
+        }
+        return 0;
+      }
       if (kind === "equipment") {
         const labels = csvToEquipmentLabels(fs.readFileSync(file, "utf-8"));
         if (labels.length === 0) {
@@ -2144,7 +2218,7 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         writeErr(`[wod build] No markdown/ corpus under ${root} \u2014 run from the content repo root (or pass its directory).`);
         return 1;
       }
-      const { generateSeed } = await import('./compiler-B77PITYH.mjs');
+      const { generateSeed } = await import('./compiler-OXEXGIZG.mjs');
       try {
         const result = generateSeed({
           corpusRoot: root,
@@ -2214,7 +2288,7 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
     }
     if (parsed.subcommand === "server" || parsed.subcommand === "serve" || parsed.subcommand === "playground") {
       const mode = parsed.subcommand === "playground" ? "playground" : "server";
-      const { runCliServer } = await import('./server-JXECWS4A.mjs');
+      const { runCliServer } = await import('./server-2DVBA35J.mjs');
       const options = { env: cliEnv() };
       if (mode === "server") options.database = cliDb();
       if (parsed.host !== void 0) options.host = parsed.host;
@@ -2240,5 +2314,5 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
 }
 
 export { PackLoadError, ParseSyntaxError, WqlSyntaxError, cliMain, formatExecutionOutput, formatParseOutput, formatQueryOutput, loadCliEnvironment, loadLanguagePack, loadQueryData, parseCliArgs, readStdin, resolveDatabaseConfig, runExecution, runParse, runQueryCli };
-//# sourceMappingURL=chunk-GBBJBDLS.mjs.map
-//# sourceMappingURL=chunk-GBBJBDLS.mjs.map
+//# sourceMappingURL=chunk-HRFOKCYI.mjs.map
+//# sourceMappingURL=chunk-HRFOKCYI.mjs.map