proschi 0.9.0 → 0.10.0

package/dist/cli.cjs

@@ -20267,6 +20267,12 @@ function problemFromFiles(id, files) {
   };
 }
 
+// ../frontend/src/practice/lessonBlocks.ts
+var CALLOUT_TONES = ["tip", "pitfall", "interview", "takeaway"];
+var RICH_BLOCKS = ["tldr", "callout", "numbers", "deepdive", "quiz"];
+var FENCE = /^\s*(`{3,})\s*([\w-]*)(?:\s+(.*?))?\s*$/;
+var closesFence = (line, ticks) => new RegExp(`^\\s*\`{${ticks.length},}\\s*$`).test(line);
+
 // ../frontend/src/practice/lesson.ts
 var LESSON_HEADINGS = [
   "What you'll learn",
@@ -20279,19 +20285,43 @@ var LESSON_HEADINGS = [
   "Further reading"
 ];
 var normalize = (heading) => heading.replace(/[‘’]/g, "'").trim();
-function proseLines(source2) {
-  const out = [];
-  let fence = false;
+function scan(source2) {
+  const prose = [];
+  const blocks2 = [];
+  const open = [];
+  let code;
   source2.replace(/\r\n?/g, "\n").split("\n").forEach((text, i) => {
-    if (/^\s*```/.test(text)) fence = !fence;
-    else if (!fence) out.push({ text, line: i + 1 });
+    const line = i + 1;
+    if (code !== void 0) {
+      if (closesFence(text, code)) code = void 0;
+      return;
+    }
+    const top = open.at(-1);
+    if (top && closesFence(text, top.ticks)) {
+      open.pop();
+      return;
+    }
+    const fence = FENCE.exec(text);
+    if (fence) {
+      const [, ticks, lang, info = ""] = fence;
+      if (top) blocks2.find((b) => b.line === top.line).body.push({ text, line });
+      if (RICH_BLOCKS.includes(lang)) {
+        const block = { lang, info, line, body: [] };
+        blocks2.push(block);
+        open.push({ ...block, ticks });
+      } else code = ticks;
+      return;
+    }
+    if (top) blocks2.find((b) => b.line === top.line).body.push({ text, line });
+    if (top?.lang !== "quiz") prose.push({ text, line, ...top ? { block: blocks2.find((b) => b.line === top.line) } : {} });
   });
-  return out;
+  return { prose, blocks: blocks2 };
 }
+var proseLines = (source2) => scan(source2).prose;
 function h2Headings(source2) {
-  return proseLines(source2).map(({ text, line }) => ({ m: /^##\s+(.*?)\s*#*\s*$/.exec(text), line })).filter((h) => h.m !== null).map(({ m, line }) => ({ text: m[1], line }));
+  return proseLines(source2).filter((l) => !l.block).map(({ text, line }) => ({ m: /^##\s+(.*?)\s*#*\s*$/.exec(text), line })).filter((h) => h.m !== null).map(({ m, line }) => ({ text: m[1], line }));
 }
-function lessonIssues(source2) {
+function lessonIssues(source2, cardIds) {
   const issues = [];
   if (!source2.trim()) return [{ message: "The lesson is empty" }];
   const headings = h2Headings(source2);
@@ -20310,6 +20340,7 @@ function lessonIssues(source2) {
       lastName = required;
     }
   }
+  issues.push(...blockIssues(source2, cardIds));
   for (const { text, line } of proseLines(source2)) {
     const prose = text.replace(/`[^`]*`/g, "");
     for (const m of prose.matchAll(/\]\(([^)\s]*)[^)]*\)/g)) {
@@ -20318,6 +20349,26 @@ function lessonIssues(source2) {
   }
   return issues;
 }
+function blockIssues(source2, cardIds) {
+  const issues = [];
+  for (const block of scan(source2).blocks) {
+    const { lang, info, line } = block;
+    const tone = info.split(/\s+/)[0];
+    if (lang === "callout" && !CALLOUT_TONES.includes(tone))
+      issues.push({ message: `A callout needs a tone after "callout": ${CALLOUT_TONES.join(", ")}${tone ? `, not "${tone}"` : ""}`, line });
+    if (lang === "deepdive" && !info.trim()) issues.push({ message: 'A deepdive needs a title after "deepdive"', line });
+    if (lang !== "callout" && lang !== "deepdive" && info.trim()) issues.push({ message: `A ${lang} block takes nothing after its name`, line });
+    if (!block.body.some((l) => l.text.trim())) issues.push({ message: `The ${lang} block is empty`, line });
+    for (const { text, line: at } of block.body) {
+      if (lang === "quiz") {
+        for (const id of text.split(/\s+/).filter(Boolean)) if (cardIds && !cardIds.has(id)) issues.push({ message: `The quiz names "${id}", which is not a review card`, line: at });
+      } else if (FENCE.test(text)) continue;
+      else if (/^#{1,2}\s/.test(text)) issues.push({ message: `Headings inside a ${lang} block must be ### or smaller, so the lesson's sections stay its own`, line: at });
+      else if (lang === "numbers" && text.trim() && !/^[^|]+\|\s*\S/.test(text)) issues.push({ message: 'Each line of a numbers block is "value | label"', line: at });
+    }
+  }
+  return issues;
+}
 
 // ../frontend/src/practice/markdown.ts
 function safeHref(href) {
@@ -20395,7 +20446,6 @@ function delimiterRow(line) {
   return cells.map((c) => c.startsWith(":") && c.endsWith(":") ? "center" : c.endsWith(":") ? "right" : c.startsWith(":") ? "left" : void 0);
 }
 var LIST_ITEM = /^\s*(?:([-*+])|(\d+)[.)])\s+(.*)$/;
-var FENCE = /^\s*```\s*([\w-]*)(?:\s+[\w-]+)*\s*$/;
 var QUOTE = /^\s{0,3}>\s?(.*)$/;
 function parseMarkdown(source2, slug2 = slugger()) {
   const lines = source2.replace(/\r\n?/g, "\n").split("\n");
@@ -20419,9 +20469,10 @@ function parseMarkdown(source2, slug2 = slugger()) {
     const fence = FENCE.exec(line);
     if (fence) {
       flush();
+      const [, ticks, lang, info = ""] = fence;
       const body = [];
-      while (++i < lines.length && !/^\s*```\s*$/.test(lines[i])) body.push(lines[i]);
-      blocks2.push({ kind: "code", ...fence[1] ? { lang: fence[1] } : {}, text: body.join("\n") });
+      while (++i < lines.length && !closesFence(lines[i], ticks)) body.push(lines[i]);
+      blocks2.push(isRich(lang) ? richBlock(lang, info, body.join("\n"), slug2) : { kind: "code", ...lang ? { lang } : {}, text: body.join("\n") });
       continue;
     }
     if (!line.trim()) {
@@ -20477,6 +20528,30 @@ function parseMarkdown(source2, slug2 = slugger()) {
   flush();
   return blocks2;
 }
+var isRich = (lang) => RICH_BLOCKS.includes(lang);
+function richBlock(lang, info, body, slug2) {
+  switch (lang) {
+    case "tldr":
+      return { kind: "tldr", children: parseMarkdown(body, slug2) };
+    case "callout": {
+      const [, tone = "", title = ""] = /^(\S*)\s*(.*)$/.exec(info) ?? [];
+      const known = CALLOUT_TONES.includes(tone) ? tone : "tip";
+      return { kind: "callout", tone: known, ...title ? { title: parseInline(title) } : {}, children: parseMarkdown(body, slug2) };
+    }
+    case "numbers":
+      return {
+        kind: "numbers",
+        items: body.split("\n").filter((l) => l.trim()).map((l) => {
+          const bar = l.indexOf("|");
+          return bar < 0 ? { value: l.trim(), label: [] } : { value: l.slice(0, bar).trim(), label: parseInline(l.slice(bar + 1).trim()) };
+        })
+      };
+    case "deepdive":
+      return { kind: "deepdive", title: parseInline(info || "Deep dive"), children: parseMarkdown(body, slug2) };
+    case "quiz":
+      return { kind: "quiz", ids: body.split(/\s+/).filter(Boolean) };
+  }
+}
 
 // ../frontend/src/practice/modes/mdItems.ts
 function splitAt(lines, level) {
@@ -21094,7 +21169,7 @@ function validateProblem(problem, engine = defaultEngine, options = {}) {
     if (!problem.statement.includes(`**${name}**`)) add(PROBLEM_MD, `The statement must name the use case **${name}** in bold`);
     if (!problem.solution.includes(`usecase "${name}"`)) add(SOLUTION, `The solution must define usecase "${name}" from the traffic`);
   }
-  if (problem.lesson !== void 0) for (const issue of lessonIssues(problem.lesson)) add(LESSON_MD, issue.message, issue.line);
+  if (problem.lesson !== void 0) for (const issue of lessonIssues(problem.lesson, options.cardIds)) add(LESSON_MD, issue.message, issue.line);
   const importLine = problem.given.split("\n").findIndex((l) => /^\s*import /.test(l));
   if (importLine >= 0) add(GIVEN, "The given must not import anything", importLine + 1);
   report(GIVEN, parse(problem.given).diagnostics.filter((d) => d.severity === "error"));
@@ -21808,7 +21883,7 @@ var FACTOR = 19 / 81;
 
 // ../frontend/src/learn/achievements.ts
 var TIERS = ["bronze", "silver", "gold"];
-var ICONS = ["layers", "brain", "flame", "trophy", "check", "zap", "coins", "calculator", "target", "map", "database", "radio", "shield", "star"];
+var ICONS = ["layers", "brain", "flame", "trophy", "check", "zap", "coins", "calculator", "target", "map", "database", "radio", "shield", "star", "book"];
 var RULE_FIELDS = {
   reviews: { required: ["min"], optional: [] },
   mastered: { required: ["min"], optional: [] },
@@ -21825,7 +21900,10 @@ var RULE_FIELDS = {
   "challenge-streak": { required: ["min"], optional: [] },
   "game-waves": { required: ["min"], optional: [] },
   "game-clears": { required: ["min"], optional: [] },
-  "game-ascension": { required: ["min"], optional: [] }
+  "game-ascension": { required: ["min"], optional: [] },
+  lessons: { required: ["min"], optional: ["stage"] },
+  "stage-lessons": { required: [], optional: [] },
+  "all-lessons": { required: [], optional: [] }
 };
 var RULE_KINDS = Object.keys(RULE_FIELDS);
 var ACHIEVEMENTS_LOCK_FILE = "achievements.lock";
@@ -21913,6 +21991,10 @@ function checkRule(raw, context, retired = false) {
   if (rule.stage !== void 0 && (typeof rule.stage !== "string" || !context.stages.includes(rule.stage))) return `"stage" names "${String(rule.stage)}", which is not a roadmap stage`;
   if (kind === "game-waves" && rule.min > 24) return '"min" of a game-waves rule is at most 24, the last wave of Endless';
   if (kind === "game-ascension" && rule.min > 10) return '"min" of a game-ascension rule is at most 10';
+  if (kind === "lessons") {
+    const reachable = rule.stage ? context.stageProblems?.[rule.stage]?.length ?? Infinity : context.problems.length;
+    if (rule.min > reachable) return `"min" is ${String(rule.min)}, but only ${reachable} lesson(s) can count towards it`;
+  }
   if (kind === "solved" || kind === "first-run" || kind === "under-reference") {
     const reachable = context.problems.filter((p) => (!rule.difficulty || p.difficulty === rule.difficulty) && (!rule.tag || p.tags.includes(rule.tag))).length;
     if (rule.min > reachable) return `"min" is ${String(rule.min)}, but only ${reachable} problem(s) can count towards it`;
@@ -22094,7 +22176,7 @@ ${ACHIEVEMENTS_USAGE}`);
     err(`${displayPath3(file)}: not valid JSON: ${e.message}`);
     return 1;
   }
-  const violations = checkAchievements(raw, { problems: problemsIn(problemsDir), topics, stages: ROADMAP.map((s) => s.id), lock: lock ?? "" }).violations;
+  const violations = checkAchievements(raw, { problems: problemsIn(problemsDir), topics, stages: ROADMAP.map((s) => s.id), stageProblems: Object.fromEntries(ROADMAP.map((s) => [s.id, s.problems])), lock: lock ?? "" }).violations;
   if (lock === void 0) {
     const fresh = violations.filter((v) => !v.message.startsWith("New achievement"));
     violations.length = 0;
@@ -26196,7 +26278,7 @@ ${IMPORT_USAGE}`);
 }
 
 // src/cli.ts
-var VERSION2 = true ? "0.9.0" : "dev";
+var VERSION2 = true ? "0.10.0" : "dev";
 var USAGE = `Usage:
   proschi check [--strict] [--format text|github|json] [--openapi <node>=<spec>]... <file|dir>...
   proschi parse <file>

package/dist/server.cjs

@@ -29432,7 +29432,7 @@ function positionAt(text, offset) {
 
 // src/server.ts
 if (process.argv.includes("--version")) {
-  console.log(true ? "0.9.0" : "dev");
+  console.log(true ? "0.10.0" : "dev");
   process.exit(0);
 }
 var connection = (0, import_node.createConnection)(import_node.ProposedFeatures.all);
@@ -29473,7 +29473,7 @@ connection.onInitialize(() => ({
     documentFormattingProvider: true,
     codeActionProvider: { codeActionKinds: [import_node.CodeActionKind.QuickFix] }
   },
-  serverInfo: { name: "proschi-language-server", version: true ? "0.9.0" : "dev" }
+  serverInfo: { name: "proschi-language-server", version: true ? "0.10.0" : "dev" }
 }));
 function validate(document) {
   const analysis = analysisOf(document);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proschi",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Command-line checker and language server for Proschi architecture diagrams",
   "license": "MIT",
   "repository": {