@prosekit/extensions 0.2.4 → 0.2.5

package/dist/_tsup-dts-rollup.d.ts

@@ -125,6 +125,10 @@ toggleCode: [];
 export declare function defineCodeBlock(): Extension<    {
 NODES: "codeBlock";
 COMMAND_ARGS: {
+setCodeBlock: [attrs?: CodeBlockAttrs | undefined];
+insertCodeBlock: [attrs?: CodeBlockAttrs | undefined];
+toggleCodeBlock: [attrs?: CodeBlockAttrs | undefined];
+setCodeBlockAttrs: [attrs: CodeBlockAttrs];
 setCodeBlockLanguage: [language: string];
 };
 }>;
@@ -136,6 +140,10 @@ setCodeBlockLanguage: [language: string];
  */
 declare function defineCodeBlockCommands(): Extension<    {
 COMMAND_ARGS: {
+setCodeBlock: [attrs?: CodeBlockAttrs | undefined];
+insertCodeBlock: [attrs?: CodeBlockAttrs | undefined];
+toggleCodeBlock: [attrs?: CodeBlockAttrs | undefined];
+setCodeBlockAttrs: [attrs: CodeBlockAttrs];
 setCodeBlockLanguage: [language: string];
 };
 }>;
@@ -188,7 +196,7 @@ declare function defineCodeBlockShikiji(options?: {
     /**
      * The shikiji theme to use.
      *
-     * @default 'github-light'
+     * @default 'one-dark-pro'
      */
     theme?: BundledTheme;
 }): Extension;

package/dist/prosekit-extensions-code-block.js

@@ -6,19 +6,33 @@ import {
 import { union } from "@prosekit/core";
 
 // src/code-block/code-block-commands.ts
-import { defineCommands } from "@prosekit/core";
+import {
+  defineCommands,
+  insertNode,
+  setBlockType,
+  setNodeAttrs,
+  toggleNode
+} from "@prosekit/core";
 function defineCodeBlockCommands() {
   return defineCommands({
-    setCodeBlockLanguage: (language) => (state, dispatch) => {
-      const pos = state.selection.$from.before();
-      const codeBlock = state.doc.nodeAt(pos);
-      if (!codeBlock || codeBlock.type.name !== "codeBlock") {
-        return false;
-      }
-      const { tr } = state;
-      tr.setNodeMarkup(pos, void 0, { language });
-      dispatch == null ? void 0 : dispatch(tr);
-      return true;
+    setCodeBlock: (attrs) => {
+      return setBlockType({ type: "codeBlock", attrs });
+    },
+    insertCodeBlock: (attrs) => {
+      return insertNode({ type: "codeBlock", attrs });
+    },
+    toggleCodeBlock: (attrs) => {
+      return toggleNode({ type: "codeBlock", attrs });
+    },
+    setCodeBlockAttrs: (attrs) => {
+      return setNodeAttrs({ type: "codeBlock", attrs });
+    },
+    /**
+     * @deprecated Use `setCodeBlockAttrs` instead.
+     */
+    setCodeBlockLanguage: (language) => {
+      const attrs = { language };
+      return setNodeAttrs({ type: "codeBlock", attrs });
     }
   });
 }
@@ -176,36 +190,52 @@ var existCodeBlock = (state, dispatch) => {
 };
 
 // src/code-block/code-block-shikiji.ts
+import { ProseKitError } from "@prosekit/core";
 import { createParser } from "prosemirror-highlight/shikiji";
+async function importGetHighlighter() {
+  try {
+    const { getHighlighter } = await import("shikiji");
+    return getHighlighter;
+  } catch (error) {
+    throw new ProseKitError(
+      "Failed to import package 'shikiji'. Make sure you've installed it.",
+      { cause: error }
+    );
+  }
+}
+async function createHighlighter(theme) {
+  const getHighlighter = await importGetHighlighter();
+  const fallbackLang = "md";
+  return await getHighlighter({
+    langs: [fallbackLang],
+    themes: [theme]
+  });
+}
 function createHighlighterLoader() {
   let shikijiImport;
   let highlighter;
-  const languages = /* @__PURE__ */ new Set();
-  const themes = /* @__PURE__ */ new Set();
+  const loadLangs = /* @__PURE__ */ new Set();
+  const loadThemes = /* @__PURE__ */ new Set();
   return function highlighterLoader(lang, theme) {
     if (!shikijiImport) {
-      shikijiImport = import("shikiji").then(async ({ getHighlighter }) => {
-        const fallbackLang = "md";
-        highlighter = await getHighlighter({
-          langs: [fallbackLang],
-          themes: []
-        });
+      shikijiImport = createHighlighter(theme).then((result) => {
+        highlighter = result;
       });
       return { promise: shikijiImport };
     }
     if (!highlighter) {
       return { promise: shikijiImport };
     }
-    if (!languages.has(lang)) {
+    if (!loadLangs.has(lang)) {
       const promise = highlighter.loadLanguage(lang).then(() => {
-        languages.add(lang);
+        loadLangs.add(lang);
       }).catch(() => {
       });
       return { promise };
     }
-    if (!themes.has(theme)) {
+    if (!loadThemes.has(theme)) {
       const promise = highlighter.loadTheme(theme).then(() => {
-        themes.add(theme);
+        loadThemes.add(theme);
       }).catch(() => {
       });
       return { promise };
@@ -229,7 +259,7 @@ function createLazyParser(theme) {
   };
 }
 function defineCodeBlockShikiji(options) {
-  const theme = (options == null ? void 0 : options.theme) || "github-light";
+  const theme = (options == null ? void 0 : options.theme) || "one-dark-pro";
   const parser = createLazyParser(theme);
   return defineCodeBlockHighlight({ parser });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/extensions",
   "type": "module",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -126,7 +126,7 @@
     "dist"
   ],
   "dependencies": {
-    "@prosekit/core": "^0.2.4",
+    "@prosekit/core": "^0.2.6",
     "@prosekit/pm": "^0.1.1",
     "prosemirror-dropcursor": "^1.8.1",
     "prosemirror-flat-list": "^0.4.5",
@@ -142,10 +142,10 @@
   },
   "devDependencies": {
     "@prosekit/dev": "*",
-    "shikiji": "^0.9.18",
+    "shikiji": "^0.9.19",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vitest": "^1.1.3"
+    "vitest": "^1.2.0"
   },
   "scripts": {
     "build:tsup": "tsup",