eklavya 1.9.3 → 1.10.0

package/dist/ask.js

@@ -22,22 +22,24 @@ const TIER_LABEL = {
 export function askHeader({ config, level, pinned, tier, position }) {
     if (config.quiet)
         return null;
+    // `learn (topic)` rather than `learn: topic`: the value now sits behind its own
+    // `focus:` label, and two colons in one field read as a nested key.
     const focus = config.focus === 'learn' && config.focus_topic
-        ? `learn: ${config.focus_topic}`
+        ? `learn (${config.focus_topic})`
         : config.focus;
     const label = TIER_LABEL[tier];
     const parts = [
         // `enforced` is the one value with a consequence attached, so it says so.
-        config.mode === 'enforced' ? 'enforced (gated)' : config.mode,
-        focus,
+        ['mode', config.mode === 'enforced' ? 'enforced (gated)' : config.mode],
+        ['focus', focus],
         // A pinned level explains itself here or nowhere: without it, questions
         // simply stop getting harder one day and nothing on screen says why.
-        pinned ? `${level} (pinned)` : level,
-        label ? `tier ${tier} ${label}` : `tier ${tier}`,
+        ['level', pinned ? `${level} (pinned)` : level],
+        ['tier', label ? `${tier} ${label}` : String(tier)],
     ];
     if (position && position.total > 1)
-        parts.push(`q ${position.index}/${position.total}`);
-    return `[${parts.join(' · ')}]`;
+        parts.push(['question', `${position.index} of ${position.total}`]);
+    return `[${parts.map(([key, value]) => `${key}: ${value}`).join(' · ')}]`;
 }
 /**
  * The settings line, matched exactly as `askHeader` composes it.
@@ -47,7 +49,10 @@ export function askHeader({ config, level, pinned, tier, position }) {
  * eat a real question. Both positions are matched because the line moved from the
  * bottom to the top in 1.9, and stems recorded before that are still in the
  * database; a strip that only knew the new position would let every old row's
- * fingerprint drift.
+ * fingerprint drift. The `key:` labels are optional in the pattern for the same
+ * reason: rows recorded before the line was labelled are still the same
+ * questions, and a strip that only knew the labelled shape would leave the old
+ * line baked into every one of their fingerprints.
  *
  * It exists because the tutor will eventually record the whole block it
  * displayed, and `question` is what `questionFingerprint` hashes -- a settings
@@ -56,7 +61,7 @@ export function askHeader({ config, level, pinned, tier, position }) {
  * the options out of the stem to avoid. The brackets are optional in the pattern
  * for the same reason the leading dials group is: older rows do not have them.
  */
-const SETTINGS_LINE_BODY = String.raw `\[?[ \t]*(?:(?:off|ambient|enforced(?:[ \t]*\(gated\))?)[ \t]*·[ \t]*)?(?:project|concept|learn(?::[^\n·\]]*)?)[ \t]*·[ \t]*(?:easy|medium|hard)(?:[ \t]*\(pinned\))?[ \t]*·[ \t]*tier[ \t]*[1-5][^\n]*`;
+const SETTINGS_LINE_BODY = String.raw `\[?[ \t]*(?:(?:mode:[ \t]*)?(?:off|ambient|enforced(?:[ \t]*\(gated\))?)[ \t]*·[ \t]*)?(?:focus:[ \t]*)?(?:project|concept|learn(?:[ \t]*[:(][^\n·\]]*)?)[ \t]*·[ \t]*(?:level:[ \t]*)?(?:easy|medium|hard)(?:[ \t]*\(pinned\))?[ \t]*·[ \t]*tier:?[ \t]*[1-5][^\n]*`;
 const LEADING_LINE = new RegExp(String.raw `^[ \t]*${SETTINGS_LINE_BODY}\n+`, 'i');
 const TRAILING_LINE = new RegExp(String.raw `\n[ \t]*${SETTINGS_LINE_BODY}$`, 'i');
 export function stripAskHeader(question) {

package/dist/ask.js.map

@@ -1 +1 @@
-{"version":3,"file":"ask.js","sourceRoot":"","sources":["../src/ask.ts"],"names":[],"mappings":"AA+CA,+EAA+E;AAC/E,MAAM,UAAU,GAA2B;IACzC,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,WAAW;IACd,CAAC,EAAE,WAAW;IACd,CAAC,EAAE,eAAe;IAClB,CAAC,EAAE,QAAQ;CACZ,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAkB;IACjF,IAAI,MAAM,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAE9B,MAAM,KAAK,GACT,MAAM,CAAC,KAAK,KAAK,OAAO,IAAI,MAAM,CAAC,WAAW;QAC5C,CAAC,CAAC,UAAU,MAAM,CAAC,WAAW,EAAE;QAChC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;IAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG;QACZ,0EAA0E;QAC1E,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI;QAC7D,KAAK;QACL,wEAAwE;QACxE,qEAAqE;QACrE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK;QACpC,KAAK,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE;KACjD,CAAC;IACF,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAExF,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;AAClC,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,kBAAkB,GACtB,MAAM,CAAC,GAAG,CAAA,yMAAyM,CAAC;AAEtN,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,UAAU,kBAAkB,KAAK,EAAE,GAAG,CAAC,CAAC;AAClF,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,WAAW,kBAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;AAElF,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9E,CAAC"}
+{"version":3,"file":"ask.js","sourceRoot":"","sources":["../src/ask.ts"],"names":[],"mappings":"AAsDA,+EAA+E;AAC/E,MAAM,UAAU,GAA2B;IACzC,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,WAAW;IACd,CAAC,EAAE,WAAW;IACd,CAAC,EAAE,eAAe;IAClB,CAAC,EAAE,QAAQ;CACZ,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAkB;IACjF,IAAI,MAAM,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAE9B,gFAAgF;IAChF,oEAAoE;IACpE,MAAM,KAAK,GACT,MAAM,CAAC,KAAK,KAAK,OAAO,IAAI,MAAM,CAAC,WAAW;QAC5C,CAAC,CAAC,UAAU,MAAM,CAAC,WAAW,GAAG;QACjC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;IAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAuB;QAChC,0EAA0E;QAC1E,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QACvE,CAAC,OAAO,EAAE,KAAK,CAAC;QAChB,wEAAwE;QACxE,qEAAqE;QACrE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;QAC/C,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KACpD,CAAC;IACF,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,KAAK,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAEvG,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;AAC5E,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,kBAAkB,GACtB,MAAM,CAAC,GAAG,CAAA,sQAAsQ,CAAC;AAEnR,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,UAAU,kBAAkB,KAAK,EAAE,GAAG,CAAC,CAAC;AAClF,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,WAAW,kBAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;AAElF,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9E,CAAC"}