markstream-octane 0.0.56-beta.3 → 0.1.0-beta.2

package/dist/types/types/component-props.d.ts

@@ -1,29 +1,13 @@
 // Generated by scripts/generate-tsrx-types.mjs for the built package.
 import type { CodeBlockNode } from 'stream-markdown-parser';
 import type { OctaneStyle } from './octane';
-export interface CodeBlockMonacoThemeObject {
-    name: string;
-    base?: string;
-    inherit?: boolean;
-    colors?: Record<string, string>;
-    rules?: Array<Record<string, unknown>>;
-    [key: string]: unknown;
-}
-export type CodeBlockMonacoTheme = string | CodeBlockMonacoThemeObject;
-export type CodeBlockMonacoLanguage = string | ((...args: unknown[]) => unknown);
+export type CodeBlockTheme = string;
+export type CodeBlockThemes = readonly [dark: string, light: string];
 export interface CommonCodeBlockProps {
     showHeader?: boolean;
     showCopyButton?: boolean;
     showExpandButton?: boolean;
 }
-export interface ShikiCodeBlockProps extends CommonCodeBlockProps {
-    themes?: readonly string[];
-    /**
-     * Shiki language preload request forwarded to stream-markdown's registerHighlight().
-     * This is not a rendering allow-list; already available Shiki languages may still highlight.
-     */
-    langs?: readonly string[];
-}
 export interface CodeBlockDiffHideUnchangedRegionsOptions {
     enabled?: boolean;
     contextLineCount?: number;
@@ -31,67 +15,71 @@ export interface CodeBlockDiffHideUnchangedRegionsOptions {
     revealLineCount?: number;
 }
 export type CodeBlockDiffHideUnchangedRegions = boolean | CodeBlockDiffHideUnchangedRegionsOptions;
-export type CodeBlockDiffLineStyle = 'background' | 'bar';
-export type CodeBlockDiffAppearance = 'auto' | 'light' | 'dark';
-export type CodeBlockDiffUnchangedRegionStyle = 'line-info' | 'line-info-basic' | 'metadata' | 'simple';
-export type CodeBlockDiffHunkActionKind = 'revert' | 'stage';
-export type CodeBlockDiffHunkSide = 'upper' | 'lower';
-export interface CodeBlockDiffHunkActionContext {
-    action: CodeBlockDiffHunkActionKind;
-    side: CodeBlockDiffHunkSide;
-    lineChange: unknown;
-    originalModel: unknown;
-    modifiedModel: unknown;
-}
-export interface CodeBlockMonacoOptions {
-    MAX_HEIGHT?: number | string;
+export interface CodeBlockOptions {
     fontSize?: number;
     lineHeight?: number;
     fontFamily?: string;
+    maxHeight?: number;
+    padding?: number;
     tabSize?: number;
-    readOnly?: boolean;
-    wordWrap?: 'off' | 'on' | 'wordWrapColumn' | 'bounded' | string;
-    wrappingIndent?: 'none' | 'same' | 'indent' | 'deepIndent' | string;
-    theme?: string;
-    themes?: CodeBlockMonacoTheme[];
-    languages?: CodeBlockMonacoLanguage[];
-    renderSideBySide?: boolean;
-    useInlineViewWhenSpaceIsLimited?: boolean;
-    enableSplitViewResizing?: boolean;
-    ignoreTrimWhitespace?: boolean;
-    maxComputationTime?: number;
-    diffAlgorithm?: string;
-    renderIndicators?: boolean;
-    originalEditable?: boolean;
-    revealDebounceMs?: number;
-    revealStrategy?: 'bottom' | 'centerIfOutside' | 'center';
-    revealBatchOnIdleMs?: number;
-    updateThrottleMs?: number;
-    diffUpdateThrottleMs?: number;
-    diffAutoScroll?: boolean;
-    diffHideUnchangedRegions?: CodeBlockDiffHideUnchangedRegions;
-    diffLineStyle?: CodeBlockDiffLineStyle;
-    diffAppearance?: CodeBlockDiffAppearance;
-    diffUnchangedRegionStyle?: CodeBlockDiffUnchangedRegionStyle;
-    diffHunkActionsOnHover?: boolean;
-    diffHunkHoverHideDelayMs?: number;
-    onDiffHunkAction?: (context: CodeBlockDiffHunkActionContext) => void | boolean | Promise<void | boolean>;
-    scrollbar?: Record<string, unknown>;
-    [key: string]: unknown;
+    disableLineNumbers?: boolean;
+    overflow?: 'scroll' | 'wrap';
+    disableVirtualizationBuffers?: boolean;
+    preferredHighlighter?: 'shiki-js' | 'shiki-wasm';
+    useCSSClasses?: boolean;
+    useTokenTransformer?: boolean;
+    tokenizeMaxLineLength?: number;
+    tokenizeMaxLength?: number;
+    unsafeCSS?: string;
+    diffStyle?: 'unified' | 'split';
+    diffIndicators?: 'classic' | 'bars' | 'none';
+    disableBackground?: boolean;
+    hunkSeparators?: 'simple' | 'metadata' | 'line-info' | 'line-info-basic';
+    expandUnchanged?: boolean;
+    collapsedContextThreshold?: number;
+    lineDiffType?: 'word-alt' | 'word' | 'char' | 'none';
+    maxLineDiffLength?: number;
+    expansionLineCount?: number;
+    parseDiffOptions?: Record<string, unknown>;
+    lineHoverHighlight?: 'disabled' | 'both' | 'number' | 'line';
+    enableTokenInteractionsOnWhitespace?: boolean;
+    enableGutterUtility?: boolean;
+    enableLineSelection?: boolean;
+    controlledSelection?: boolean;
+    onGutterUtilityClick?: (...args: any[]) => unknown;
+    onLineClick?: (...args: any[]) => unknown;
+    onLineNumberClick?: (...args: any[]) => unknown;
+    onLineEnter?: (...args: any[]) => unknown;
+    onLineLeave?: (...args: any[]) => unknown;
+    onTokenClick?: (...args: any[]) => unknown;
+    onTokenEnter?: (...args: any[]) => unknown;
+    onTokenLeave?: (...args: any[]) => unknown;
+    onLineSelected?: (...args: any[]) => unknown;
+    onLineSelectionStart?: (...args: any[]) => unknown;
+    onLineSelectionChange?: (...args: any[]) => unknown;
+    onLineSelectionEnd?: (...args: any[]) => unknown;
+    getLineIndex?: (...args: any[]) => unknown;
+    renderAnnotation?: (...args: any[]) => unknown;
+    renderGutterUtility?: (...args: any[]) => unknown;
+    onPostRender?: (...args: any[]) => unknown;
+    mergeConflict?: boolean;
+    lineAnnotations?: unknown[];
+    onController?: (controller: any) => void;
+    workerManager?: unknown;
 }
 export interface CodeBlockNodeProps extends CommonCodeBlockProps {
     node: CodeBlockNode;
+    codeBlockOptions?: CodeBlockOptions;
     isDark?: boolean;
     loading?: boolean;
     stream?: boolean;
-    darkTheme?: CodeBlockMonacoTheme;
-    lightTheme?: CodeBlockMonacoTheme;
+    darkTheme?: CodeBlockTheme;
+    lightTheme?: CodeBlockTheme;
     isShowPreview?: boolean;
-    monacoOptions?: CodeBlockMonacoOptions;
     enableFontSizeControl?: boolean;
     minWidth?: string | number;
     maxWidth?: string | number;
-    themes?: CodeBlockMonacoTheme[];
+    themes?: CodeBlockThemes;
     showPreviewButton?: boolean;
     showCollapseButton?: boolean;
     showFontSizeButtons?: boolean;

package/dist/types/types.d.ts

@@ -4,10 +4,11 @@ import type { ComponentBody } from 'octane';
 import type { BaseNode, HtmlPolicy, MarkdownIt, ParsedNode, ParseOptions } from 'stream-markdown-parser';
 import type { CustomComponentMap, HtmlComponentDefinitions, HtmlComponentMap, StreamingComponentDefinitions, StreamingComponentMap } from './customComponents';
 import type { SmoothMarkdownStreamOptions } from './hooks/useSmoothMarkdownStream';
-import type { CodeBlockMonacoOptions, CodeBlockMonacoTheme, CodeBlockNodeProps, CodeBlockPreviewPayload, D2BlockNodeProps, InfographicBlockNodeProps, MermaidBlockNodeProps, ShikiCodeBlockProps } from './types/component-props';
-type NodeRendererCodeBlockThemes = CodeBlockNodeProps['themes'] | ShikiCodeBlockProps['themes'];
-export type NodeRendererCodeBlockProps = Partial<Omit<CodeBlockNodeProps, 'node' | 'themes'>> & Partial<Omit<ShikiCodeBlockProps, 'themes'>> & {
+import type { CodeBlockNodeProps, CodeBlockOptions, CodeBlockPreviewPayload, CodeBlockTheme, CodeBlockThemes, D2BlockNodeProps, InfographicBlockNodeProps, MermaidBlockNodeProps } from './types/component-props';
+type NodeRendererCodeBlockThemes = CodeBlockNodeProps['themes'];
+export type NodeRendererCodeBlockProps = Partial<Omit<CodeBlockNodeProps, 'node' | 'themes' | 'codeBlockOptions'>> & {
     themes?: NodeRendererCodeBlockThemes;
+    codeBlockOptions?: never;
 } & Record<string, unknown>;
 export interface NodeRendererProps<TStreamingComponents extends Record<string, ComponentBody<any>> = StreamingComponentMap, THtmlComponents extends Record<string, any> = HtmlComponentMap> {
     content?: string;
@@ -31,30 +32,21 @@ export interface NodeRendererProps<TStreamingComponents extends Record<string, C
     htmlPolicy?: HtmlPolicy;
     viewportPriority?: boolean;
     codeBlockStream?: boolean;
-    codeBlockDarkTheme?: CodeBlockMonacoTheme;
-    codeBlockLightTheme?: CodeBlockMonacoTheme;
-    codeBlockMonacoOptions?: CodeBlockMonacoOptions;
+    codeBlockDarkTheme?: CodeBlockTheme;
+    codeBlockLightTheme?: CodeBlockTheme;
     renderCodeBlocksAsPre?: boolean;
     codeBlockMinWidth?: string | number;
     codeBlockMaxWidth?: string | number;
+    codeBlockOptions?: CodeBlockOptions;
     codeBlockProps?: NodeRendererCodeBlockProps;
     mermaidProps?: Partial<Omit<MermaidBlockNodeProps, 'node' | 'loading' | 'isDark'>>;
     d2Props?: Partial<Omit<D2BlockNodeProps, 'node' | 'loading' | 'isDark'>>;
     infographicProps?: Partial<Omit<InfographicBlockNodeProps, 'node' | 'loading' | 'isDark'>>;
     showTooltips?: boolean;
     /**
-     * Theme names or theme objects preloaded for Monaco-backed code blocks.
-     * When Shiki code blocks are used, only string theme names are forwarded to
-     * MarkdownCodeBlockNode / stream-markdown; theme objects are ignored.
+     * Dark/light theme names used by stream-diffs backed code blocks.
      */
-    themes?: CodeBlockMonacoTheme[];
-    /**
-     * Shiki language preload list forwarded to MarkdownCodeBlockNode.
-     *
-     * The default Octane code block renderer is Monaco-backed. This prop is used
-     * when a custom `code_block` or language renderer uses MarkdownCodeBlockNode.
-     */
-    langs?: readonly string[];
+    themes?: CodeBlockThemes;
     isDark?: boolean;
     customId?: string;
     indexKey?: number | string;
@@ -102,6 +94,7 @@ export interface RenderContext {
     htmlComponents?: HtmlComponentMap;
     customHtmlTags?: readonly string[];
     htmlPolicy?: HtmlPolicy;
+    codeBlockOptions?: CodeBlockOptions;
     codeBlockProps?: NodeRendererCodeBlockProps;
     mermaidProps?: Partial<Omit<MermaidBlockNodeProps, 'node' | 'loading' | 'isDark'>>;
     d2Props?: Partial<Omit<D2BlockNodeProps, 'node' | 'loading' | 'isDark'>>;
@@ -110,13 +103,11 @@ export interface RenderContext {
     codeBlockStream?: boolean;
     renderCodeBlocksAsPre?: boolean;
     codeBlockThemes?: {
-        themes?: CodeBlockMonacoTheme[];
-        darkTheme?: CodeBlockMonacoTheme;
-        lightTheme?: CodeBlockMonacoTheme;
-        monacoOptions?: CodeBlockMonacoOptions;
+        themes?: CodeBlockThemes;
+        darkTheme?: CodeBlockTheme;
+        lightTheme?: CodeBlockTheme;
         minWidth?: string | number;
         maxWidth?: string | number;
-        langs?: readonly string[];
     };
     events: {
         onCopy?: (code: string) => void;

package/dist/types/utils/languageIcon.d.ts

@@ -2,8 +2,9 @@
 export type LanguageIconResolver = (lang: string) => string | undefined | null;
 export declare function setLanguageIconResolver(resolver?: LanguageIconResolver | null): void;
 export declare function normalizeLanguageIdentifier(lang?: string | null): string;
-export declare function resolveMonacoLanguageId(lang?: string | null): string;
+export declare function resolveLanguageId(lang?: string | null): string;
 export declare function preloadExtendedLanguageIcons(): Promise<void>;
 export declare function subscribeLanguageIconsRevision(listener: () => void): () => void;
 export declare function getLanguageIcon(lang: string): string;
 export declare const languageMap: Record<string, string>;
+export declare function isLikelyIncompleteLanguageIdentifier(lang?: string | null): boolean;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "markstream-octane",
   "type": "module",
-  "version": "0.0.56-beta.3",
-  "description": "Octane streaming Markdown renderer for AI chat, LLM token streams, SSE/WebSocket output, incomplete Markdown, long documents, Mermaid, KaTeX, Shiki, Monaco, and custom Octane components.",
+  "version": "0.1.0-beta.2",
+  "description": "Octane streaming Markdown renderer for AI chat, LLM token streams, SSE/WebSocket output, incomplete Markdown, long documents, Mermaid, KaTeX, stream-diffs powered code blocks, and custom Octane components.",
   "author": "Simon He",
   "license": "MIT",
   "homepage": "https://markstream.simonhe.me",
@@ -35,9 +35,7 @@
     "streaming-mermaid",
     "katex",
     "streaming-katex",
-    "shiki",
-    "monaco",
-    "monaco-editor",
+    "stream-diffs",
     "streaming-code-blocks",
     "large-documents",
     "safe-html",
@@ -84,8 +82,7 @@
     "katex": ">=0.16.22",
     "mermaid": ">=11",
     "octane": "^0.1.21",
-    "stream-markdown": ">=0.0.16",
-    "stream-monaco": ">=0.0.48"
+    "stream-diffs": ">=0.0.2"
   },
   "peerDependenciesMeta": {
     "@antv/infographic": {
@@ -100,18 +97,15 @@
     "mermaid": {
       "optional": true
     },
-    "stream-markdown": {
-      "optional": true
-    },
-    "stream-monaco": {
+    "stream-diffs": {
       "optional": true
     }
   },
   "dependencies": {
     "@floating-ui/dom": "^1.8.0",
     "clsx": "^2.1.1",
-    "markstream-core": "1.0.3",
-    "stream-markdown-parser": "1.2.1"
+    "markstream-core": "1.1.0-beta.1",
+    "stream-markdown-parser": "1.2.5-beta.1"
   },
   "devDependencies": {
     "@octanejs/testing-library": "^0.1.18",
@@ -144,6 +138,6 @@
     "size:check": "node ../../scripts/check-package-size.mjs",
     "check:core-published": "node ../../scripts/check-core-published.mjs --package-json package.json --core-package-json ../markstream-core/package.json",
     "check:workspace-deps-published": "node ../../scripts/check-workspace-deps-published.mjs --package-json package.json",
-    "release": "pnpm run check:workspace-deps-published && bumpp --all --commit --no-tag --no-push --execute 'pnpm --workspace-root run docs:llms:generate' && pnpm publish --access public $(node ../../scripts/dist-tag.mjs) && node ../../scripts/tag-package.mjs --package-json package.json --push"
+    "release": "pnpm run check:workspace-deps-published && bumpp --all --commit --no-tag --no-push --execute 'pnpm --workspace-root run docs:llms:generate' && DIST_TAG=\"$(node ../../scripts/dist-tag.mjs)\" && pnpm publish --access public --tag \"${DIST_TAG}\" && node ../../scripts/tag-package.mjs --package-json package.json --push"
   }
 }

package/dist/types/components/CodeBlockNode/monacoThemeRegistry.d.ts

@@ -1,8 +0,0 @@
-// Generated by scripts/generate-tsrx-types.mjs for the built package.
-type MonacoTheme = any;
-type SetThemeFn = (theme: MonacoTheme, force?: boolean) => Promise<void> | void;
-export declare function subscribeMonacoThemeApplied(listener: () => void): () => void;
-export declare function registerMonacoThemeSetter(setTheme: SetThemeFn | null | undefined): void;
-export declare function setDesiredMonacoTheme(theme: MonacoTheme | null | undefined): void;
-export declare function getDesiredMonacoTheme(): MonacoTheme | null;
-export {};

package/dist/types/components/CodeBlockNode/monacoThemeScheduler.d.ts

@@ -1,5 +0,0 @@
-// Generated by scripts/generate-tsrx-types.mjs for the built package.
-type MonacoTheme = any;
-type SetThemeFn = (theme: MonacoTheme, force?: boolean) => Promise<void> | void;
-export declare function scheduleMonacoThemeUpdate(theme: MonacoTheme, setTheme: SetThemeFn): Promise<void>;
-export {};

package/dist/types/components/MarkdownCodeBlockNode/MarkdownCodeBlockNode.d.ts

@@ -1,34 +0,0 @@
-// Generated by scripts/generate-tsrx-types.mjs for the built package.
-import type { ShikiCodeBlockProps } from '../../types/component-props';
-export interface MarkdownCodeBlockNodeProps extends ShikiCodeBlockProps {
-    node: {
-        type: 'code_block';
-        language: string;
-        code: string;
-        raw: string;
-        diff?: boolean;
-        originalCode?: string;
-        updatedCode?: string;
-    };
-    loading?: boolean;
-    stream?: boolean;
-    darkTheme?: string;
-    lightTheme?: string;
-    isDark?: boolean;
-    isShowPreview?: boolean;
-    enableFontSizeControl?: boolean;
-    minWidth?: string | number;
-    maxWidth?: string | number;
-    showPreviewButton?: boolean;
-    showCollapseButton?: boolean;
-    showFontSizeButtons?: boolean;
-    showTooltips?: boolean;
-    onCopy?: (code: string) => void;
-    onPreviewCode?: (payload: {
-        type: string;
-        content: string;
-        title: string;
-    }) => void;
-}
-export declare function MarkdownCodeBlockNode(rawProps: MarkdownCodeBlockNodeProps): import("octane/jsx-runtime").Octane.JSX.Element;
-export default MarkdownCodeBlockNode;