mrmd-editor 0.7.1 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrmd-editor",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "Markdown editor with realtime collaboration - the core editor package",
   "type": "module",
   "main": "dist/mrmd.cjs",
@@ -15,7 +15,8 @@
     "dev": "rollup -c --watch",
     "build": "rollup -c",
     "serve": "npx serve .",
-    "test:node": "node -e \"const m = require('./dist/mrmd.cjs'); console.log('Loaded:', m.version, Object.keys(m))\""
+    "test:node": "node -e \"const m = require('./dist/mrmd.cjs'); console.log('Loaded:', m.version, Object.keys(m))\"",
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "codemirror",
@@ -30,7 +31,8 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "puppeteer": "^24.34.0",
-    "rollup": "^4.9.0"
+    "rollup": "^4.9.0",
+    "vite": "^8.0.0"
   },
   "dependencies": {
     "@codemirror/autocomplete": "^6.18.0",
@@ -50,6 +52,7 @@
     "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/language": "^6.10.2",
     "@codemirror/legacy-modes": "^6.5.2",
+    "@codemirror/lint": "^6.8.0",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/theme-one-dark": "^6.1.3",
@@ -61,6 +64,7 @@
     "codemirror-lang-r": "^0.1.1",
     "katex": "^0.16.27",
     "mrmd-js": "^2.2.0",
+    "prettier": "^3.8.1",
     "y-codemirror.next": "^0.3.5",
     "y-websocket": "^2.0.0",
     "yaml": "^2.8.2",

package/src/commands.js

@@ -10,11 +10,14 @@
 
 import { findCells, findCodeBlocks, getCellAtCursor, findCodeBlockAtPosition, findOutputBlock } from './cells.js';
 import { indentRange } from '@codemirror/language';
+import { applyFrontmatterTemplate } from './frontmatter-updater.js';
 import { prettierFormat, prettierSupports } from './prettier.js';
+import { applyFirstLanguageToolSuggestion } from './grammar.js';
+import { insertPageBreak } from './section-controls/commands.js';
 
 /**
  * Run the current cell and stay in place.
- * Bound to Mod-Enter by default.
+ * Used by the default Mod-Enter shortcut when the cursor is in a code cell.
  *
  * @param {Object} editor - Editor API instance
  * @returns {(view: EditorView) => boolean}
@@ -42,6 +45,23 @@ export function runCell(editor) {
   };
 }
 
+/**
+ * Run the current cell when the cursor is inside executable code.
+ * Otherwise insert a markdown page break token at the cursor.
+ * Bound to Mod-Enter by default.
+ *
+ * @param {Object} editor - Editor API instance
+ * @returns {(view: EditorView) => boolean}
+ */
+export function runCellOrInsertPageBreak(editor) {
+  const runCellCommand = runCell(editor);
+
+  return (view) => {
+    if (runCellCommand(view)) return true;
+    return insertPageBreak(view);
+  };
+}
+
 /**
  * Run the current cell and advance to the next cell.
  * If no next cell exists, create a new one with the same language.
@@ -286,7 +306,7 @@ export function insertCellBelow(editor) {
     const currentCell = getCellAtCursor(content, pos);
 
     // Determine language and insert position
-    const lang = currentCell?.language || 'javascript';
+    const lang = currentCell?.language || editor?.defaultCellLanguage || 'python';
     const outputBlock = currentCell ? findOutputBlock(content, currentCell.end) : null;
     const insertPos = outputBlock ? outputBlock.end : (currentCell ? currentCell.end : content.length);
 
@@ -314,7 +334,7 @@ export function insertCellAbove(editor) {
     const pos = view.state.selection.main.head;
     const currentCell = getCellAtCursor(content, pos);
 
-    const lang = currentCell?.language || 'javascript';
+    const lang = currentCell?.language || editor?.defaultCellLanguage || 'python';
     const insertPos = currentCell ? currentCell.start : 0;
 
     const newCell = `\`\`\`${lang}\n\n\`\`\`\n\n`;
@@ -348,7 +368,7 @@ function getMostCommonLanguage(content) {
 
   // Find most common
   let maxCount = 0;
-  let mostCommon = 'javascript'; // default
+  let mostCommon = 'python'; // default (primary notebook runtime)
 
   for (const [lang, count] of Object.entries(langCounts)) {
     if (count > maxCount) {
@@ -791,12 +811,95 @@ export function viewSource(editor) {
   };
 }
 
+/**
+ * Insert or augment scholarly frontmatter at the top of the document.
+ * Preserves existing frontmatter values and adds missing template fields.
+ *
+ * @param {Object} editor - Editor API instance
+ * @returns {(view: EditorView) => boolean}
+ */
+export function insertFrontmatterTemplate(editor) {
+  return (view) => {
+    const result = applyFrontmatterTemplate(view.state.doc.toString());
+
+    if (!result) {
+      console.warn('[frontmatter] Cannot apply template to invalid frontmatter. Fix YAML first.');
+      return false;
+    }
+
+    const spec = {
+      changes: result.changes,
+      scrollIntoView: true,
+    };
+
+    if (result.selection) {
+      spec.selection = {
+        anchor: result.selection.from,
+        head: result.selection.to,
+      };
+    }
+
+    view.dispatch(spec);
+    return true;
+  };
+}
+
+/**
+ * Apply the first available grammar suggestion near the cursor.
+ *
+ * @param {Object} editor - Editor API instance
+ * @returns {(view: EditorView) => boolean}
+ */
+export function applyFirstGrammarSuggestion(editor) {
+  return (view) => applyFirstLanguageToolSuggestion(view);
+}
+
+/**
+ * Toggle source mode (show all raw markdown syntax).
+ *
+ * @param {Object} editor - Editor API instance
+ * @returns {(view: EditorView) => boolean}
+ */
+export function toggleSourceMode(editor) {
+  return (view) => {
+    editor.setSourceMode();
+    return true;
+  };
+}
+
+/**
+ * Toggle WYSIWYG mode.
+ *
+ * @param {Object} editor - Editor API instance
+ * @returns {(view: EditorView) => boolean}
+ */
+export function toggleWysiwygMode(editor) {
+  return (view) => {
+    editor.setWysiwygMode();
+    return true;
+  };
+}
+
+/**
+ * Toggle invisible characters (spaces, tabs, newlines).
+ *
+ * @param {Object} editor - Editor API instance
+ * @returns {(view: EditorView) => boolean}
+ */
+export function toggleInvisibles(editor) {
+  return (view) => {
+    editor.setShowInvisibles();
+    return true;
+  };
+}
+
 /**
  * All available commands.
  * Maps command names to factory functions.
  */
 export const commandRegistry = {
   runCell,
+  runCellOrInsertPageBreak,
   runCellAndAdvance,
   runAllCells,
   runAllAbove,
@@ -811,4 +914,9 @@ export const commandRegistry = {
   indent,
   dedent,
   viewSource,
+  insertFrontmatterTemplate,
+  applyFirstGrammarSuggestion,
+  toggleSourceMode,
+  toggleWysiwygMode,
+  toggleInvisibles,
 };