@bitcobblers/wod-wiki-ui 0.35.2115 → 0.35.2117

package/dist/extensions/index.cjs

@@ -7,6 +7,7 @@ var state = require('@codemirror/state');
 var lint = require('@codemirror/lint');
 var wodWikiLang = require('@bitcobblers/wod-wiki-lang');
 var wodWikiCore = require('@bitcobblers/wod-wiki-core');
+var commands = require('@codemirror/commands');
 var wodWikiWql = require('@bitcobblers/wod-wiki-wql');
 var autocomplete = require('@codemirror/autocomplete');
 var client = require('react-dom/client');
@@ -18,7 +19,6 @@ var tailwindMerge = require('tailwind-merge');
 var recharts = require('recharts');
 var reactDom = require('react-dom');
 var server = require('react-dom/server');
-var commands = require('@codemirror/commands');
 var solid = require('@heroicons/react/20/solid');
 var common = require('@lezer/common');
 var lr = require('@lezer/lr');
@@ -386,255 +386,202 @@ var linkOpen = [
   ctrlClickPlugin,
   linkCursorTheme
 ];
-var VALID_DIALECTS = ["time", "log"];
+var sectionIdentity = state.Facet.define({ combine: (values2) => values2[0] });
+var registeredSectionWidgets = state.Facet.define({ combine: (values2) => values2.length ? values2.flat() : void 0 });
 var forceSectionParse = state.StateEffect.define();
-function generateSectionId(type, cmStartLine, content) {
-  return wodWikiCore.generateSectionId(type, cmStartLine - 1, content);
-}
-function mapIdentities(oldSections, newSections) {
-  return newSections.map((nSec) => {
-    const match = oldSections.find(
-      (oSec) => oSec.type === nSec.type && Math.abs(oSec.startLine - nSec.startLine) <= 2
-    );
-    return match ? { ...nSec, id: match.id } : nSec;
-  });
-}
-function matchDialectFence(trimmed) {
-  const match = wodWikiCore.matchDialectFence(trimmed);
-  if (!match) return null;
-  return { dialect: match.dialect, sport: match.sport };
-}
-function matchWidgetFence(trimmed) {
-  const match = trimmed.match(/^```\s*widget:([\w-]+)\s*$/);
-  return match ? match[1] : null;
-}
-function matchContentFence(trimmed) {
-  const match = trimmed.match(/^```\s*query(?:[:\s](.*))?$/i);
-  if (!match) return null;
-  const rawSuffix = (match[1] ?? "").trim();
-  if (rawSuffix === "") return { kind: "query" };
-  const parsed = wodWikiWql.parseQueryWidgetSuffix(rawSuffix.replace(/^:/, ""));
-  return {
-    kind: "query",
-    widgetType: parsed.type,
-    widgetError: parsed.error
-  };
-}
-function matchGenericFence(trimmed) {
-  const match = trimmed.match(/^```\s*(\S+)\s*$/);
-  if (!match) return null;
-  const tag = match[1].toLowerCase();
-  if (VALID_DIALECTS.includes(tag)) return null;
-  if (tag.startsWith("widget:")) return null;
-  if (tag.startsWith("query")) return null;
-  return match[1];
-}
-function matchMarkdownEmbed(trimmed) {
-  const imgMatch = trimmed.match(/^!\[([^\]]*)\]\(([^)]+)\)$/);
-  if (imgMatch) {
-    const label = imgMatch[1];
-    const url = imgMatch[2];
-    return { type: "image", url, label };
-  }
-  const linkMatch = trimmed.match(/^\[([^\]]+)\]\(([^)]+)\)$/);
-  if (linkMatch) {
-    const label = linkMatch[1];
-    const url = linkMatch[2];
-    return { type: "link", url, label };
+var sectionSaved = state.StateEffect.define();
+var sectionRestore = state.StateEffect.define();
+var sectionMove = state.StateEffect.define();
+var restoreHistoryIdentity = state.StateEffect.define({
+  map(value, changes) {
+    const blocks = {};
+    for (const block of Object.values(value.blocks)) {
+      const from = changes.mapPos(block.from, 1);
+      const to = changes.mapPos(block.to, -1);
+      if (from < to) blocks[block.id] = { ...block, from, to };
+    }
+    return { rawContent: value.rawContent, blocks };
   }
-  return null;
+});
+function sourceCoordinates(rawContent) {
+  const rawStarts = [0];
+  const editorStarts = [0];
+  let removed = 0;
+  for (const match of rawContent.matchAll(/\r\n|\r|\n/g)) {
+    removed += match[0].length - 1;
+    rawStarts.push(match.index + match[0].length);
+    editorStarts.push(match.index + match[0].length - removed);
+  }
+  return { rawStarts, editorStarts };
+}
+function toSourcePosition(state, rawStarts, position) {
+  const line = state.doc.lineAt(position);
+  return rawStarts[line.number - 1] + position - line.from;
+}
+function toEditorBlocks(state) {
+  const blocks = {};
+  for (const block of Object.values(state.noteBlocks)) {
+    const section = state.sections.find((section2) => section2.id === block.id);
+    if (section) blocks[block.id] = { ...block, from: section.from, to: section.to };
+  }
+  return blocks;
+}
+function deriveState(state, rawContent, sourceRevision, lineage, savedVersions, previousSections = []) {
+  const registeredWidgets = state.facet(registeredSectionWidgets);
+  const noteBlocks = wodWikiCore.reconcileNoteBlocks(rawContent, { sourceRevision, blocks: lineage, registeredWidgets });
+  const coordinates = sourceCoordinates(rawContent);
+  const sections = wodWikiCore.parseDocumentSections(rawContent, { registeredWidgets }).map((section) => {
+    const start = coordinates.editorStarts[section.startLine];
+    const end = coordinates.editorStarts[section.endLine] + section.to - coordinates.rawStarts[section.endLine];
+    const block = wodWikiCore.actionableSectionKind(section) ? Object.values(noteBlocks).find((block2) => block2.from === section.from && block2.to === section.to) : void 0;
+    const prior = previousSections.find((prior2) => prior2.from === start && prior2.to === end && prior2.type === (section.type === "title" ? "markdown" : section.type));
+    const query = section.querySuffix ? wodWikiWql.parseQueryWidgetSuffix(section.querySuffix) : void 0;
+    const subtype = section.subtype;
+    return {
+      id: block?.id ?? prior?.id ?? section.id,
+      type: section.type === "title" ? "markdown" : section.type,
+      ...subtype === "heading" || subtype === "paragraph" || subtype === "list" || subtype === "blockquote" || subtype === "table" ? { subtype } : {},
+      from: start,
+      to: end,
+      startLine: section.startLine + 1,
+      endLine: section.endLine + 1,
+      ...section.contentFrom !== void 0 ? { contentFrom: coordinates.editorStarts[section.startLine + 1] ?? end } : {},
+      ...section.contentTo !== void 0 ? { contentTo: coordinates.editorStarts[section.endLine] - (section.type === "frontmatter" ? 1 : 0) } : {},
+      sport: section.sport,
+      widgetName: section.widgetName,
+      contentId: section.contentId,
+      queryType: query?.type,
+      queryError: query?.error,
+      embed: section.embed
+    };
+  });
+  for (const block of Object.values(noteBlocks)) block.version = savedVersions[block.id] ?? block.version;
+  return { sections, rawContent, sourceRevision, noteBlocks, savedVersions };
 }
-function detectMarkdownSubtype(lines) {
-  const first = lines.find((l) => l.trim().length > 0)?.trim() ?? "";
-  if (/^#{1,6}\s/.test(first)) return "heading";
-  if (/^[-*+]\s|^\d+\.\s/.test(first)) return "list";
-  if (/^>\s?/.test(first)) return "blockquote";
-  if (first.startsWith("|") && lines.some((l) => /^\|[\s:]*-+/.test(l.trim()))) return "table";
-  return "paragraph";
-}
-function scanFenced(state, openLineNum) {
-  const openLine = state.doc.line(openLineNum);
-  const contentFrom = openLine.to + 1;
-  for (let i = openLineNum + 1; i <= state.doc.lines; i++) {
-    const l = state.doc.line(i);
-    if (l.text.trim().startsWith("```")) {
-      return { closeLine: i, contentFrom, contentTo: l.from };
-    }
-  }
-  const last = state.doc.line(state.doc.lines);
-  return { closeLine: state.doc.lines, contentFrom, contentTo: last.to };
-}
-function parseSections(state) {
-  const sections = [];
-  let currentMdLines = [];
-  let mdStartLine = 1;
-  let mdStartPos = 0;
-  function flushMarkdown(endLine, endPos) {
-    if (currentMdLines.length === 0) return;
-    const content = currentMdLines.join("\n");
-    if (content.trim().length > 0) {
-      const embed = currentMdLines.length === 1 ? matchMarkdownEmbed(content.trim()) : null;
-      if (embed) {
-        sections.push({
-          id: generateSectionId("embed", mdStartLine, content),
-          type: "embed",
-          from: mdStartPos,
-          to: endPos,
-          startLine: mdStartLine,
-          endLine,
-          embed
-        });
-      } else {
-        sections.push({
-          id: generateSectionId("markdown", mdStartLine, content),
-          type: "markdown",
-          subtype: detectMarkdownSubtype(currentMdLines),
-          from: mdStartPos,
-          to: endPos,
-          startLine: mdStartLine,
-          endLine
-        });
-      }
-    }
-    currentMdLines = [];
-  }
-  let lineNum = 1;
-  while (lineNum <= state.doc.lines) {
-    const line = state.doc.line(lineNum);
-    const trimmed = line.text.trim();
-    const dialectMatch = matchDialectFence(trimmed);
-    const widgetMatch = matchWidgetFence(trimmed);
-    const contentMatch = matchContentFence(trimmed);
-    const genericFence = matchGenericFence(trimmed);
-    if (dialectMatch || widgetMatch || contentMatch || genericFence) {
-      flushMarkdown(lineNum - 1, line.from);
-      const { closeLine, contentFrom, contentTo } = scanFenced(state, lineNum);
-      const closeLineObj = state.doc.line(closeLine);
-      const innerContent = state.doc.sliceString(contentFrom, contentTo);
-      if (dialectMatch) {
-        sections.push({
-          id: generateSectionId(dialectMatch.dialect, lineNum, innerContent),
-          type: dialectMatch.dialect,
-          from: line.from,
-          to: closeLineObj.to,
-          startLine: lineNum,
-          endLine: closeLine,
-          contentFrom,
-          contentTo,
-          sport: dialectMatch.sport,
-          contentId: wodWikiCore.blockContentId(innerContent)
-        });
-      } else if (widgetMatch) {
-        sections.push({
-          id: generateSectionId("widget", lineNum, innerContent),
-          type: "widget",
-          widgetName: widgetMatch,
-          from: line.from,
-          to: closeLineObj.to,
-          startLine: lineNum,
-          endLine: closeLine,
-          contentFrom,
-          contentTo
-        });
-      } else if (contentMatch) {
-        sections.push({
-          id: generateSectionId("query", lineNum, innerContent),
-          type: "query",
-          from: line.from,
-          to: closeLineObj.to,
-          startLine: lineNum,
-          endLine: closeLine,
-          contentFrom,
-          contentTo,
-          queryType: contentMatch.widgetType,
-          queryError: contentMatch.widgetError
-        });
-      } else if (genericFence) {
-        sections.push({
-          id: generateSectionId("code", lineNum, innerContent),
-          type: "code",
-          from: line.from,
-          to: closeLineObj.to,
-          startLine: lineNum,
-          endLine: closeLine,
-          contentFrom,
-          contentTo
-        });
-      }
-      lineNum = closeLine + 1;
-      mdStartLine = lineNum;
-      mdStartPos = lineNum <= state.doc.lines ? state.doc.line(lineNum).from : state.doc.length;
-      continue;
-    }
-    if (trimmed === "---") {
-      const lineCount = state.doc.lines;
-      const nextLineText = lineNum < lineCount ? state.doc.line(lineNum + 1).text.trim() : "";
-      if (nextLineText !== "") {
-        let foundClose = false;
-        let closeLine = lineNum;
-        let hasKeyValueLine = false;
-        for (let j = lineNum + 1; j <= lineCount; j++) {
-          const jTrimmed = state.doc.line(j).text.trim();
-          if (matchDialectFence(jTrimmed) || matchGenericFence(jTrimmed)) break;
-          if (jTrimmed === "---") {
-            closeLine = j;
-            foundClose = true;
-            break;
-          }
-          if (/^[A-Za-z_][\w-]*\s*:/.test(jTrimmed)) {
-            hasKeyValueLine = true;
+var sectionField = state.StateField.define({
+  create(state) {
+    const initial = state.facet(sectionIdentity);
+    const rawContent = initial?.rawContent ?? state.doc.toString();
+    if (rawContent.replace(/\r\n|\r/g, "\n") !== state.doc.toString()) throw new Error("Editor source and identity map disagree");
+    if (initial) wodWikiCore.validateNoteBlocks(rawContent, initial.blocks, initial.sourceRevision, { registeredWidgets: state.facet(registeredSectionWidgets) });
+    const savedVersions = Object.fromEntries(Object.values(initial?.blocks ?? {}).map((block) => [block.id, block.version]));
+    return deriveState(state, rawContent, initial?.sourceRevision ?? 1, initial?.blocks ?? {}, savedVersions);
+  },
+  update(value, tr) {
+    let rawContent = value.rawContent;
+    let lineage = value.noteBlocks;
+    let sourceRevision = value.sourceRevision;
+    let savedVersions = value.savedVersions;
+    if (tr.docChanged) {
+      const { rawStarts } = sourceCoordinates(rawContent);
+      const changes = [];
+      const lineBreak = rawContent.includes("\r\n") ? "\r\n" : rawContent.includes("\r") ? "\r" : "\n";
+      tr.changes.iterChanges((fromA, toA, fromB, toB) => changes.push({
+        from: toSourcePosition(tr.startState, rawStarts, fromA),
+        to: toSourcePosition(tr.startState, rawStarts, toA),
+        insert: tr.newDoc.sliceString(fromB, toB, lineBreak)
+      }));
+      lineage = wodWikiCore.mapNoteBlockChanges(lineage, changes);
+      for (let i = changes.length - 1; i >= 0; i--) {
+        const change = changes[i];
+        rawContent = rawContent.slice(0, change.from) + change.insert + rawContent.slice(change.to);
+      }
+      if (tr.isUserEvent("move.drop")) {
+        const moves = [];
+        tr.changes.iterChanges((fromA, toA, fromB, toB) => moves.push({ fromA, toA, fromB, toB }));
+        const deletion = moves.filter((change) => change.toA > change.fromA && change.fromB === change.toB);
+        const insertion = moves.filter((change) => change.fromA === change.toA && change.toB > change.fromB);
+        if (deletion.length === 1 && insertion.length === 1) {
+          const removed = deletion[0];
+          const added = insertion[0];
+          if (tr.startState.doc.sliceString(removed.fromA, removed.toA) === tr.newDoc.sliceString(added.fromB, added.toB)) {
+            const currentStarts = sourceCoordinates(rawContent).rawStarts;
+            for (const section of value.sections) {
+              const block = value.noteBlocks[section.id];
+              if (block && section.from >= removed.fromA && section.to <= removed.toA) {
+                lineage[block.id] = {
+                  ...block,
+                  from: toSourcePosition(tr.state, currentStarts, added.fromB + section.from - removed.fromA),
+                  to: toSourcePosition(tr.state, currentStarts, added.fromB + section.to - removed.fromA)
+                };
+              }
+            }
           }
         }
-        if (foundClose && hasKeyValueLine) {
-          flushMarkdown(lineNum - 1, line.from);
-          const closeLineObj = state.doc.line(closeLine);
-          const content = state.doc.sliceString(line.from, closeLineObj.to);
-          sections.push({
-            id: generateSectionId("frontmatter", lineNum, content),
-            type: "frontmatter",
-            from: line.from,
-            to: closeLineObj.to,
-            startLine: lineNum,
-            endLine: closeLine,
-            contentFrom: line.to + 1,
-            contentTo: closeLineObj.from - 1
-          });
-          lineNum = closeLine + 1;
-          mdStartLine = lineNum;
-          mdStartPos = lineNum <= lineCount ? state.doc.line(lineNum).from : state.doc.length;
-          continue;
+      }
+      if (tr.isUserEvent("move.line")) {
+        const currentStarts = sourceCoordinates(rawContent).rawStarts;
+        for (let i = 0; i < tr.startState.selection.ranges.length; i++) {
+          const before = tr.startState.selection.ranges[i];
+          const after = tr.newSelection.ranges[i];
+          if (!after) continue;
+          const firstLine = tr.startState.doc.lineAt(before.from);
+          const lastLine = tr.startState.doc.lineAt(before.to > before.from && tr.startState.doc.lineAt(before.to).from === before.to ? before.to - 1 : before.to);
+          const delta = after.anchor - before.anchor;
+          for (const section of value.sections) {
+            const block = value.noteBlocks[section.id];
+            if (block && section.from >= firstLine.from && section.to <= lastLine.to) {
+              lineage[block.id] = {
+                ...block,
+                from: toSourcePosition(tr.state, currentStarts, section.from + delta),
+                to: toSourcePosition(tr.state, currentStarts, section.to + delta)
+              };
+            }
+          }
         }
       }
     }
-    if (currentMdLines.length === 0) {
-      mdStartLine = lineNum;
-      mdStartPos = line.from;
-    }
-    currentMdLines.push(line.text);
-    lineNum++;
-  }
-  flushMarkdown(state.doc.lines, state.doc.length);
-  return sections;
-}
-var sectionField = state.StateField.define({
-  create(state) {
-    return { sections: parseSections(state) };
-  },
-  update(value, tr) {
-    if (tr.docChanged || tr.effects.some((e) => e.is(forceSectionParse))) {
-      const newSections = parseSections(tr.state);
-      return { sections: mapIdentities(value.sections, newSections) };
+    for (const effect of tr.effects) {
+      if (effect.is(sectionSaved)) {
+        sourceRevision = Math.max(sourceRevision, effect.value.sourceRevision);
+        savedVersions = { ...savedVersions };
+        for (const block of Object.values(effect.value.blocks)) savedVersions[block.id] = Math.max(savedVersions[block.id] ?? 1, block.version);
+      }
+      if (effect.is(sectionRestore)) {
+        if (effect.value.rawContent.replace(/\r\n|\r/g, "\n") !== tr.newDoc.toString()) throw new Error("Restored source does not match editor");
+        wodWikiCore.validateNoteBlocks(effect.value.rawContent, effect.value.blocks, effect.value.sourceRevision, { registeredWidgets: tr.state.facet(registeredSectionWidgets) });
+        rawContent = effect.value.rawContent;
+        lineage = effect.value.blocks;
+        sourceRevision = effect.value.sourceRevision;
+        savedVersions = { ...savedVersions, ...Object.fromEntries(Object.values(lineage).map((block) => [block.id, block.version])) };
+      }
+      if (effect.is(restoreHistoryIdentity)) {
+        const exactHistory = tr.effects.some((candidate) => candidate.is(restoreHistoryIdentity) && candidate.value.rawContent.replace(/\r\n|\r/g, "\n") === tr.newDoc.toString());
+        if (exactHistory && effect.value.rawContent.replace(/\r\n|\r/g, "\n") !== tr.newDoc.toString()) continue;
+        if (effect.value.rawContent.replace(/\r\n|\r/g, "\n") === tr.newDoc.toString()) rawContent = effect.value.rawContent;
+        const { rawStarts } = sourceCoordinates(rawContent);
+        lineage = Object.fromEntries(Object.values(effect.value.blocks).map((block) => [block.id, {
+          ...block,
+          from: toSourcePosition(tr.state, rawStarts, block.from),
+          to: toSourcePosition(tr.state, rawStarts, block.to)
+        }]));
+      }
+      if (effect.is(sectionMove)) {
+        const prior = value.noteBlocks[effect.value.id];
+        if (!prior || lineage[prior.id]) throw new Error("Explicit move must remove the original occurrence");
+        const { rawStarts } = sourceCoordinates(rawContent);
+        const from = toSourcePosition(tr.state, rawStarts, effect.value.from);
+        const to = toSourcePosition(tr.state, rawStarts, effect.value.to);
+        if (rawContent.slice(from, to) !== value.rawContent.slice(prior.from, prior.to)) throw new Error("Explicit move changed source");
+        lineage = { ...lineage, [prior.id]: { ...prior, from, to } };
+      }
+    }
+    if (tr.docChanged || tr.effects.some((effect) => effect.is(forceSectionParse) || effect.is(sectionRestore) || effect.is(sectionSaved) || effect.is(restoreHistoryIdentity))) {
+      const previous = value.sections.map((section) => ({ ...section, from: tr.changes.mapPos(section.from, 1), to: tr.changes.mapPos(section.to, -1) }));
+      return deriveState(tr.state, rawContent, sourceRevision, lineage, savedVersions, previous);
     }
     return value;
   }
 });
+var sectionIdentityHistory = commands.invertedEffects.of((tr) => {
+  const value = tr.startState.field(sectionField, false);
+  return value && tr.docChanged ? [restoreHistoryIdentity.of({ rawContent: value.rawContent, blocks: toEditorBlocks(value) })] : [];
+});
 function sectionAtPos(state, pos) {
-  const { sections } = state.field(sectionField);
-  return sections.find((s) => pos >= s.from && pos <= s.to) ?? null;
+  return state.field(sectionField).sections.find((section) => pos >= section.from && pos <= section.to) ?? null;
 }
 function activeCursorSection(state) {
-  const pos = state.selection.main.head;
-  return sectionAtPos(state, pos);
+  return sectionAtPos(state, state.selection.main.head);
 }
 
 // src/extensions/whiteboard-linter.ts
@@ -2508,18 +2455,9 @@ function dispatchExpandRuntimePanel(view, sectionId, expanded) {
 function sessionQueryWql(resultId) {
   return `:session{result:${resultId}}`;
 }
-function sessionQueryInsert(state, blockId, resultId, runBlock) {
+function sessionQueryInsert(state, blockId, resultId) {
   const sections = state.field(sectionField).sections;
-  let section = sections.find((s) => s.id === blockId);
-  if (!section && runBlock?.contentId) {
-    section = sections.find((s) => s.contentId === runBlock.contentId);
-  }
-  if (!section && runBlock?.id) {
-    section = sections.find((s) => s.id === runBlock.id);
-  }
-  if (!section && runBlock) {
-    section = sections.find((s) => s.type === "time" || s.type === "log");
-  }
+  const section = sections.find((s) => s.id === blockId);
   if (!section || section.type !== "time" && section.type !== "log") {
     return null;
   }
@@ -4689,7 +4627,7 @@ var STATIC_OPTIONS = {
   unit: UNIT_OPTIONS,
   intensity: wodWikiWql.WQL_INTENSITY_TIERS.map((v) => ({ value: v, label: v }))
 };
-var CANONICAL_BLOCK_TYPES = ["wod", "movement", "workout"];
+var CANONICAL_BLOCK_TYPES = ["wod", "query", "widget", "embed"];
 function canonicalSuggestionItems(values2) {
   return values2.map((value) => ({ value, label: value.charAt(0).toUpperCase() + value.slice(1) }));
 }
@@ -12204,6 +12142,7 @@ function editorPreset(optionsOrDialect = "markdown") {
     extensions.push(
       markdown({ codeLanguages: resolveCodeLanguage }),
       sectionField,
+      sectionIdentityHistory,
       previewDecorations,
       wodLinter,
       wodAutocompletion,
@@ -12263,12 +12202,18 @@ exports.navigationFacet = navigationFacet;
 exports.previewDecorations = previewDecorations;
 exports.queryBlockPreview = queryBlockPreview;
 exports.registerCustomCompletionSource = registerCustomCompletionSource;
+exports.registeredSectionWidgets = registeredSectionWidgets;
 exports.removeRuntimePanel = removeRuntimePanel;
 exports.runtimePanelField = runtimePanelField;
 exports.saveBlockQuerySource = saveBlockQuerySource;
 exports.sectionAtPos = sectionAtPos;
 exports.sectionField = sectionField;
 exports.sectionGeometry = sectionGeometry;
+exports.sectionIdentity = sectionIdentity;
+exports.sectionIdentityHistory = sectionIdentityHistory;
+exports.sectionMove = sectionMove;
+exports.sectionRestore = sectionRestore;
+exports.sectionSaved = sectionSaved;
 exports.sessionQueryInsert = sessionQueryInsert;
 exports.sessionQueryWql = sessionQueryWql;
 exports.setGutterHighlights = setGutterHighlights;