Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8d6bd20321 | |||
| d7f3594dd4 | |||
| 2a6457e192 | |||
| 979e1f7991 | |||
| bbb57f1b9f | |||
| a218b6a0a1 | |||
| a20d9ff138 |
BIN
.playwright-mcp/both-actionbars-test.png
Normal file
|
After Width: | Height: | Size: 76 KiB |
BIN
.playwright-mcp/editor-actionbar-test.png
Normal file
|
After Width: | Height: | Size: 72 KiB |
BIN
.playwright-mcp/editor-actionbar-visible.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
.playwright-mcp/editor-actionbar-working.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
.playwright-mcp/terminal-actionbar-resize-issue.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
.playwright-mcp/terminal-resize-fix-verification.png
Normal file
|
After Width: | Height: | Size: 56 KiB |
BIN
.playwright-mcp/terminal-with-actionbar-fix.png
Normal file
|
After Width: | Height: | Size: 56 KiB |
BIN
.playwright-mcp/workspace-actionbar-layout.png
Normal file
|
After Width: | Height: | Size: 59 KiB |
BIN
.playwright-mcp/workspace-file-open.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
27
changelog.md
@@ -1,5 +1,32 @@
|
||||
# Changelog
|
||||
|
||||
## 2026-01-01 - 3.27.0 - feat(services)
|
||||
introduce DeesServiceLibLoader to lazy-load heavy client libraries from CDN and update components to use it
|
||||
|
||||
- Add DeesServiceLibLoader singleton (ts_web/services/DeesServiceLibLoader.ts) to lazily load and cache libraries via jsDelivr ESM: xterm, xterm-addon-fit, highlight.js, ApexCharts, and Tiptap.
|
||||
- Inject xterm CSS dynamically to avoid shipping xterm styles in the initial bundle.
|
||||
- Expose helper methods preloadAll() and isLoaded(), and typed bundle interfaces (IXtermBundle, IXtermFitAddonBundle, ITiptapBundle).
|
||||
- Update components to use runtime-loaded modules: dees-chart-area, dees-dataview-codebox, dees-input-richtext, wysiwyg code block, dees-workspace-terminal, terminal-tab-manager, dees-workspace-terminal-preview.
|
||||
- TerminalTabManager now requires setXtermModules(...) before creating tabs and will throw if not initialized; workspace terminal now initializes and passes the loaded modules.
|
||||
- Replace direct runtime imports of heavy libs with typed imports and runtime-loaded bundles to reduce initial bundle size and improve load performance.
|
||||
|
||||
## 2026-01-01 - 3.26.1 - fix(dees-actionbar)
|
||||
animate actionbar hide using grid-template-rows and wait for animation before clearing state
|
||||
|
||||
- Switch host layout from block/max-height to grid using grid-template-rows for open/close transitions
|
||||
- Add min-height: 0 to .actionbar-item to prevent flex children overflow and collapsing
|
||||
- Introduce async hideCurrentBar() that removes 'visible', sets isVisible=false, waits 220ms then clears currentBar and currentResolve
|
||||
- processQueue() now calls hideCurrentBar() asynchronously instead of clearing state immediately
|
||||
|
||||
## 2026-01-01 - 3.26.0 - feat(workspace)
|
||||
add external file change detection, conflict resolution UI, and diff editor
|
||||
|
||||
- Watch open files for external changes with debounced file watchers (startWatchingFile/stopWatchingFile/stopAllFileWatchers).
|
||||
- Prompt the user when disk changes conflict with unsaved local edits via dees-actionbar (actions: Load from Disk, Save Local, Compare).
|
||||
- Introduce dees-workspace-diff-editor component and export it; support comparing and resolving diffs (diff-resolved / diff-closed events).
|
||||
- Add setContentExternal in dees-workspace-monaco to update editor content from external sources while optionally preserving cursor, selections and scroll position.
|
||||
- Start/stop file watchers when files are opened/closed and integrate diff view and actionbar into the workspace UI for seamless conflict handling.
|
||||
|
||||
## 2026-01-01 - 3.25.0 - feat(dees-actionbar)
|
||||
add action bar component and improve workspace package update handling
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@design.estate/dees-catalog",
|
||||
"version": "3.25.0",
|
||||
"version": "3.27.0",
|
||||
"private": false,
|
||||
"description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.",
|
||||
"main": "dist_ts_web/index.js",
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@design.estate/dees-catalog',
|
||||
version: '3.25.0',
|
||||
version: '3.27.0',
|
||||
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
||||
}
|
||||
|
||||
@@ -11,7 +11,8 @@ import { demoFunc } from './demo.js';
|
||||
import { chartAreaStyles } from './styles.js';
|
||||
import { renderChartArea } from './template.js';
|
||||
|
||||
import ApexCharts from 'apexcharts';
|
||||
import type ApexCharts from 'apexcharts';
|
||||
import { DeesServiceLibLoader } from '../../../services/index.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -150,7 +151,10 @@ export class DeesChartArea extends DeesElement {
|
||||
|
||||
public async firstUpdated() {
|
||||
await this.domtoolsPromise;
|
||||
|
||||
|
||||
// Load ApexCharts from CDN
|
||||
const ApexChartsLib = await DeesServiceLibLoader.getInstance().loadApexCharts();
|
||||
|
||||
// Wait for next animation frame to ensure layout is complete
|
||||
await new Promise(resolve => requestAnimationFrame(resolve));
|
||||
|
||||
@@ -353,7 +357,7 @@ export class DeesChartArea extends DeesElement {
|
||||
};
|
||||
|
||||
try {
|
||||
this.chart = new ApexCharts(this.shadowRoot.querySelector('.chartContainer'), options);
|
||||
this.chart = new ApexChartsLib(this.shadowRoot.querySelector('.chartContainer'), options);
|
||||
await this.chart.render();
|
||||
|
||||
// Give the chart a moment to fully initialize before resizing
|
||||
|
||||
@@ -10,12 +10,13 @@ import {
|
||||
} from '@design.estate/dees-element';
|
||||
import { cssGeistFontFamily, cssMonoFontFamily } from '../../00fonts.js';
|
||||
|
||||
import hlight from 'highlight.js';
|
||||
import type { HLJSApi } from 'highlight.js';
|
||||
|
||||
import * as smartstring from '@push.rocks/smartstring';
|
||||
|
||||
import * as domtools from '@design.estate/dees-domtools';
|
||||
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
|
||||
import { DeesServiceLibLoader } from '../../../services/index.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -229,6 +230,7 @@ export class DeesDataviewCodebox extends DeesElement {
|
||||
}
|
||||
|
||||
private codeToDisplayStore = '';
|
||||
private highlightJs: HLJSApi | null = null;
|
||||
|
||||
public async updated(_changedProperties) {
|
||||
super.updated(_changedProperties);
|
||||
@@ -250,11 +252,17 @@ export class DeesDataviewCodebox extends DeesElement {
|
||||
this.codeToDisplay = this.codeToDisplayStore;
|
||||
}
|
||||
await domtools.plugins.smartdelay.delayFor(0);
|
||||
|
||||
// Load highlight.js from CDN if not already loaded
|
||||
if (!this.highlightJs) {
|
||||
this.highlightJs = await DeesServiceLibLoader.getInstance().loadHighlightJs();
|
||||
}
|
||||
|
||||
const localCodeNode = this.shadowRoot.querySelector('code');
|
||||
const html = hlight.highlight(this.codeToDisplayStore, {
|
||||
const highlightedHtml = this.highlightJs.highlight(this.codeToDisplayStore, {
|
||||
language: this.progLang,
|
||||
ignoreIllegals: true,
|
||||
});
|
||||
localCodeNode.innerHTML = html.value;
|
||||
localCodeNode.innerHTML = highlightedHtml.value;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,12 +14,8 @@ import {
|
||||
query,
|
||||
} from '@design.estate/dees-element';
|
||||
|
||||
import { Editor } from '@tiptap/core';
|
||||
import StarterKit from '@tiptap/starter-kit';
|
||||
import Underline from '@tiptap/extension-underline';
|
||||
import TextAlign from '@tiptap/extension-text-align';
|
||||
import Link from '@tiptap/extension-link';
|
||||
import Typography from '@tiptap/extension-typography';
|
||||
import type { Editor } from '@tiptap/core';
|
||||
import { DeesServiceLibLoader, type ITiptapBundle } from '../../../services/index.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -63,6 +59,7 @@ export class DeesInputRichtext extends DeesInputBase<string> {
|
||||
|
||||
private editorElement: HTMLElement;
|
||||
private linkInputElement: HTMLInputElement;
|
||||
private tiptapBundle: ITiptapBundle | null = null;
|
||||
|
||||
public editor: Editor;
|
||||
|
||||
@@ -233,13 +230,19 @@ export class DeesInputRichtext extends DeesInputBase<string> {
|
||||
|
||||
public async firstUpdated() {
|
||||
await this.updateComplete;
|
||||
|
||||
// Load Tiptap from CDN
|
||||
this.tiptapBundle = await DeesServiceLibLoader.getInstance().loadTiptap();
|
||||
|
||||
this.editorElement = this.shadowRoot.querySelector('.editor-content');
|
||||
this.linkInputElement = this.shadowRoot.querySelector('.link-input input');
|
||||
this.initializeEditor();
|
||||
}
|
||||
|
||||
private initializeEditor(): void {
|
||||
if (this.disabled) return;
|
||||
if (this.disabled || !this.tiptapBundle) return;
|
||||
|
||||
const { Editor, StarterKit, Underline, TextAlign, Link, Typography } = this.tiptapBundle;
|
||||
|
||||
this.editor = new Editor({
|
||||
element: this.editorElement,
|
||||
@@ -249,7 +252,7 @@ export class DeesInputRichtext extends DeesInputBase<string> {
|
||||
levels: [1, 2, 3],
|
||||
},
|
||||
}),
|
||||
Underline,
|
||||
Underline.configure({}),
|
||||
TextAlign.configure({
|
||||
types: ['heading', 'paragraph'],
|
||||
}),
|
||||
@@ -259,7 +262,7 @@ export class DeesInputRichtext extends DeesInputBase<string> {
|
||||
class: 'editor-link',
|
||||
},
|
||||
}),
|
||||
Typography,
|
||||
Typography.configure({}),
|
||||
],
|
||||
content: this.value || (this.placeholder ? `<p>${this.placeholder}</p>` : ''),
|
||||
onUpdate: ({ editor }) => {
|
||||
|
||||
@@ -2,9 +2,10 @@ import { BaseBlockHandler, type IBlockEventHandlers } from '../block.base.js';
|
||||
import type { IBlock } from '../../wysiwyg.types.js';
|
||||
import { cssManager } from '@design.estate/dees-element';
|
||||
import { WysiwygSelection } from '../../wysiwyg.selection.js';
|
||||
import hlight from 'highlight.js';
|
||||
import type { HLJSApi } from 'highlight.js';
|
||||
import { cssGeistFontFamily, cssMonoFontFamily } from '../../../../00fonts.js';
|
||||
import { PROGRAMMING_LANGUAGES } from '../../wysiwyg.constants.js';
|
||||
import { DeesServiceLibLoader } from '../../../../../services/index.js';
|
||||
|
||||
/**
|
||||
* CodeBlockHandler with improved architecture
|
||||
@@ -18,8 +19,9 @@ import { PROGRAMMING_LANGUAGES } from '../../wysiwyg.constants.js';
|
||||
*/
|
||||
export class CodeBlockHandler extends BaseBlockHandler {
|
||||
type = 'code';
|
||||
|
||||
|
||||
private highlightTimer: any = null;
|
||||
private highlightJs: HLJSApi | null = null;
|
||||
|
||||
render(block: IBlock, isSelected: boolean): string {
|
||||
const language = block.metadata?.language || 'typescript';
|
||||
@@ -306,28 +308,33 @@ export class CodeBlockHandler extends BaseBlockHandler {
|
||||
return linesBeforeCursor.length - 1; // 0-indexed
|
||||
}
|
||||
|
||||
private applyHighlighting(element: HTMLElement, block: IBlock): void {
|
||||
private async applyHighlighting(element: HTMLElement, block: IBlock): Promise<void> {
|
||||
const editor = element.querySelector('.code-editor') as HTMLElement;
|
||||
if (!editor) return;
|
||||
|
||||
|
||||
// Load highlight.js from CDN if not already loaded
|
||||
if (!this.highlightJs) {
|
||||
this.highlightJs = await DeesServiceLibLoader.getInstance().loadHighlightJs();
|
||||
}
|
||||
|
||||
// Store cursor position
|
||||
const cursorPos = this.getCursorPosition(element);
|
||||
|
||||
|
||||
// Get plain text content
|
||||
const content = editor.textContent || '';
|
||||
const language = block.metadata?.language || 'typescript';
|
||||
|
||||
|
||||
// Apply highlighting
|
||||
try {
|
||||
const result = hlight.highlight(content, {
|
||||
const result = this.highlightJs.highlight(content, {
|
||||
language: language,
|
||||
ignoreIllegals: true
|
||||
ignoreIllegals: true,
|
||||
});
|
||||
|
||||
|
||||
// Only update if we have valid highlighted content
|
||||
if (result.value) {
|
||||
editor.innerHTML = result.value;
|
||||
|
||||
|
||||
// Restore cursor position if editor is focused
|
||||
if (document.activeElement === editor && cursorPos !== null) {
|
||||
requestAnimationFrame(() => {
|
||||
|
||||
@@ -0,0 +1,359 @@
|
||||
import {
|
||||
DeesElement,
|
||||
property,
|
||||
html,
|
||||
customElement,
|
||||
type TemplateResult,
|
||||
css,
|
||||
cssManager,
|
||||
} from '@design.estate/dees-element';
|
||||
import * as domtools from '@design.estate/dees-domtools';
|
||||
import { MONACO_VERSION } from '../dees-workspace-monaco/version.js';
|
||||
import { themeDefaultStyles } from '../../00theme.js';
|
||||
import '../../00group-button/dees-button/dees-button.js';
|
||||
|
||||
import type * as monaco from 'monaco-editor';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
'dees-workspace-diff-editor': DeesWorkspaceDiffEditor;
|
||||
}
|
||||
}
|
||||
|
||||
@customElement('dees-workspace-diff-editor')
|
||||
export class DeesWorkspaceDiffEditor extends DeesElement {
|
||||
// DEMO
|
||||
public static demo = () => html`
|
||||
<dees-workspace-diff-editor
|
||||
.originalContent=${'function hello() {\n console.log("Hello");\n}'}
|
||||
.modifiedContent=${'function hello() {\n console.log("Hello World!");\n return true;\n}'}
|
||||
.language=${'typescript'}
|
||||
.filePath=${'/demo/example.ts'}
|
||||
></dees-workspace-diff-editor>
|
||||
`;
|
||||
|
||||
// INSTANCE
|
||||
public diffEditorDeferred = domtools.plugins.smartpromise.defer<monaco.editor.IStandaloneDiffEditor>();
|
||||
|
||||
@property({ type: String })
|
||||
accessor originalContent: string = '';
|
||||
|
||||
@property({ type: String })
|
||||
accessor modifiedContent: string = '';
|
||||
|
||||
@property({ type: String })
|
||||
accessor originalLabel: string = 'Disk Version';
|
||||
|
||||
@property({ type: String })
|
||||
accessor modifiedLabel: string = 'Local Version';
|
||||
|
||||
@property({ type: String })
|
||||
accessor language: string = 'typescript';
|
||||
|
||||
@property({ type: String })
|
||||
accessor filePath: string = '';
|
||||
|
||||
private diffEditor: monaco.editor.IStandaloneDiffEditor | null = null;
|
||||
private monacoThemeSubscription: domtools.plugins.smartrx.rxjs.Subscription | null = null;
|
||||
private originalModel: monaco.editor.ITextModel | null = null;
|
||||
private modifiedModel: monaco.editor.ITextModel | null = null;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
domtools.DomTools.setupDomTools();
|
||||
}
|
||||
|
||||
public static styles = [
|
||||
themeDefaultStyles,
|
||||
cssManager.defaultStyles,
|
||||
css`
|
||||
:host {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.diff-wrapper {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.diff-toolbar {
|
||||
height: 48px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0 16px;
|
||||
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 12%)')};
|
||||
border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 20%)')};
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.diff-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
font-size: 14px;
|
||||
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 80%)')};
|
||||
}
|
||||
|
||||
.diff-filename {
|
||||
font-weight: 600;
|
||||
color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 90%)')};
|
||||
}
|
||||
|
||||
.diff-labels {
|
||||
font-size: 12px;
|
||||
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
|
||||
}
|
||||
|
||||
.diff-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.diff-container {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.nav-buttons {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.action-buttons {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin-left: 16px;
|
||||
}
|
||||
`,
|
||||
];
|
||||
|
||||
public render(): TemplateResult {
|
||||
const fileName = this.filePath.split('/').pop() || 'file';
|
||||
|
||||
return html`
|
||||
<div class="diff-wrapper">
|
||||
<div class="diff-toolbar">
|
||||
<div class="diff-info">
|
||||
<span class="diff-filename">${fileName}</span>
|
||||
<span class="diff-labels">${this.originalLabel} ↔ ${this.modifiedLabel}</span>
|
||||
</div>
|
||||
<div class="diff-actions">
|
||||
<div class="nav-buttons">
|
||||
<dees-button
|
||||
type="outline"
|
||||
@click=${this.goToPreviousDiff}
|
||||
>Previous</dees-button>
|
||||
<dees-button
|
||||
type="outline"
|
||||
@click=${this.goToNextDiff}
|
||||
>Next</dees-button>
|
||||
</div>
|
||||
<div class="action-buttons">
|
||||
<dees-button
|
||||
type="highlighted"
|
||||
@click=${this.acceptLocal}
|
||||
>Use Local</dees-button>
|
||||
<dees-button
|
||||
type="outline"
|
||||
@click=${this.acceptDisk}
|
||||
>Use Disk</dees-button>
|
||||
<dees-button
|
||||
type="outline"
|
||||
@click=${this.close}
|
||||
>Close</dees-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="diff-container"></div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
public async firstUpdated(): Promise<void> {
|
||||
await super.firstUpdated(new Map());
|
||||
await this.initDiffEditor();
|
||||
}
|
||||
|
||||
private async initDiffEditor(): Promise<void> {
|
||||
const container = this.shadowRoot?.querySelector('.diff-container') as HTMLElement;
|
||||
if (!container) return;
|
||||
|
||||
const monacoCdnBase = `https://cdn.jsdelivr.net/npm/monaco-editor@${MONACO_VERSION}`;
|
||||
|
||||
// Wait for Monaco to be loaded (should already be loaded by dees-workspace-monaco)
|
||||
let monacoInstance = (window as any).monaco as typeof monaco;
|
||||
|
||||
if (!monacoInstance) {
|
||||
// Monaco not loaded yet, wait for it
|
||||
await new Promise<void>((resolve) => {
|
||||
const checkMonaco = setInterval(() => {
|
||||
if ((window as any).monaco) {
|
||||
clearInterval(checkMonaco);
|
||||
resolve();
|
||||
}
|
||||
}, 100);
|
||||
});
|
||||
monacoInstance = (window as any).monaco as typeof monaco;
|
||||
}
|
||||
|
||||
// Get current theme from domtools
|
||||
const domtoolsInstance = await this.domtoolsPromise;
|
||||
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
||||
const initialTheme = isBright ? 'vs' : 'vs-dark';
|
||||
|
||||
// Create unique URIs for models
|
||||
const timestamp = Date.now();
|
||||
const originalUri = monacoInstance.Uri.parse(`diff://original/${timestamp}${this.filePath}`);
|
||||
const modifiedUri = monacoInstance.Uri.parse(`diff://modified/${timestamp}${this.filePath}`);
|
||||
|
||||
// Create models
|
||||
this.originalModel = monacoInstance.editor.createModel(
|
||||
this.originalContent,
|
||||
this.language,
|
||||
originalUri
|
||||
);
|
||||
this.modifiedModel = monacoInstance.editor.createModel(
|
||||
this.modifiedContent,
|
||||
this.language,
|
||||
modifiedUri
|
||||
);
|
||||
|
||||
// Create diff editor
|
||||
this.diffEditor = monacoInstance.editor.createDiffEditor(container, {
|
||||
automaticLayout: true,
|
||||
readOnly: false, // Allow editing the modified (local) side
|
||||
originalEditable: false, // Disk version is read-only
|
||||
renderSideBySide: true,
|
||||
ignoreTrimWhitespace: false,
|
||||
fontSize: 14,
|
||||
minimap: {
|
||||
enabled: false,
|
||||
},
|
||||
});
|
||||
|
||||
// Set the theme
|
||||
monacoInstance.editor.setTheme(initialTheme);
|
||||
|
||||
this.diffEditor.setModel({
|
||||
original: this.originalModel,
|
||||
modified: this.modifiedModel,
|
||||
});
|
||||
|
||||
// Subscribe to theme changes
|
||||
this.monacoThemeSubscription = domtoolsInstance.themeManager.themeObservable.subscribe(
|
||||
(goBright: boolean) => {
|
||||
const newTheme = goBright ? 'vs' : 'vs-dark';
|
||||
monacoInstance.editor.setTheme(newTheme);
|
||||
}
|
||||
);
|
||||
|
||||
// Inject Monaco CSS if not already present
|
||||
const cssId = 'monaco-diff-editor-css';
|
||||
if (!this.shadowRoot?.getElementById(cssId)) {
|
||||
const cssResponse = await fetch(`${monacoCdnBase}/min/vs/editor/editor.main.css`);
|
||||
const cssText = await cssResponse.text();
|
||||
const styleElement = document.createElement('style');
|
||||
styleElement.id = cssId;
|
||||
styleElement.textContent = cssText;
|
||||
this.shadowRoot?.append(styleElement);
|
||||
}
|
||||
|
||||
// Navigate to first diff after a short delay
|
||||
setTimeout(() => {
|
||||
try {
|
||||
this.diffEditor?.revealFirstDiff();
|
||||
} catch {
|
||||
// Ignore if no diffs
|
||||
}
|
||||
}, 100);
|
||||
|
||||
this.diffEditorDeferred.resolve(this.diffEditor);
|
||||
}
|
||||
|
||||
public goToNextDiff(): void {
|
||||
try {
|
||||
this.diffEditor?.goToDiff('next');
|
||||
} catch {
|
||||
// Ignore if no more diffs
|
||||
}
|
||||
}
|
||||
|
||||
public goToPreviousDiff(): void {
|
||||
try {
|
||||
this.diffEditor?.goToDiff('previous');
|
||||
} catch {
|
||||
// Ignore if no more diffs
|
||||
}
|
||||
}
|
||||
|
||||
public acceptLocal(): void {
|
||||
// User wants to keep local version (potentially with edits made in diff view)
|
||||
const modifiedContent = this.diffEditor?.getModifiedEditor().getValue() || this.modifiedContent;
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('diff-resolved', {
|
||||
detail: { action: 'use-local', content: modifiedContent },
|
||||
bubbles: true,
|
||||
composed: true,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
public acceptDisk(): void {
|
||||
// User wants disk version
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('diff-resolved', {
|
||||
detail: { action: 'use-disk', content: this.originalContent },
|
||||
bubbles: true,
|
||||
composed: true,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
public close(): void {
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('diff-closed', {
|
||||
bubbles: true,
|
||||
composed: true,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
public async disconnectedCallback(): Promise<void> {
|
||||
await super.disconnectedCallback();
|
||||
|
||||
if (this.monacoThemeSubscription) {
|
||||
this.monacoThemeSubscription.unsubscribe();
|
||||
this.monacoThemeSubscription = null;
|
||||
}
|
||||
|
||||
// Dispose models
|
||||
if (this.originalModel) {
|
||||
this.originalModel.dispose();
|
||||
this.originalModel = null;
|
||||
}
|
||||
if (this.modifiedModel) {
|
||||
this.modifiedModel.dispose();
|
||||
this.modifiedModel = null;
|
||||
}
|
||||
|
||||
// Dispose editor
|
||||
if (this.diffEditor) {
|
||||
this.diffEditor.dispose();
|
||||
this.diffEditor = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export * from './dees-workspace-diff-editor.js';
|
||||
@@ -242,4 +242,53 @@ export class DeesWorkspaceMonaco extends DeesElement {
|
||||
this.monacoThemeSubscription = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update content from external source with optional cursor preservation.
|
||||
* Use this when the file content changes externally (e.g., file changed on disk).
|
||||
* @param newContent The new content to set
|
||||
* @param preserveCursor Whether to preserve cursor/scroll position (default: true)
|
||||
*/
|
||||
public async setContentExternal(
|
||||
newContent: string,
|
||||
preserveCursor: boolean = true
|
||||
): Promise<void> {
|
||||
const editor = await this.editorDeferred.promise;
|
||||
const currentValue = editor.getValue();
|
||||
|
||||
if (currentValue === newContent) return;
|
||||
|
||||
// Save cursor state if preserving
|
||||
const position = preserveCursor ? editor.getPosition() : null;
|
||||
const selections = preserveCursor ? editor.getSelections() : null;
|
||||
const scrollTop = preserveCursor ? editor.getScrollTop() : 0;
|
||||
const scrollLeft = preserveCursor ? editor.getScrollLeft() : 0;
|
||||
|
||||
// Update content
|
||||
this.isUpdatingFromExternal = true;
|
||||
editor.setValue(newContent);
|
||||
this.isUpdatingFromExternal = false;
|
||||
|
||||
// Restore cursor state if preserving
|
||||
if (preserveCursor) {
|
||||
if (position) {
|
||||
// Clamp position to valid range
|
||||
const model = editor.getModel();
|
||||
const lineCount = model?.getLineCount() || 1;
|
||||
const clampedLine = Math.min(position.lineNumber, lineCount);
|
||||
const lineLength = model?.getLineMaxColumn(clampedLine) || 1;
|
||||
const clampedColumn = Math.min(position.column, lineLength);
|
||||
editor.setPosition({ lineNumber: clampedLine, column: clampedColumn });
|
||||
}
|
||||
if (selections && selections.length > 0) {
|
||||
// Selections may be invalid after content change, wrap in try-catch
|
||||
try {
|
||||
editor.setSelections(selections);
|
||||
} catch {
|
||||
// Ignore invalid selections
|
||||
}
|
||||
}
|
||||
editor.setScrollPosition({ scrollTop, scrollLeft });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,9 +7,10 @@ import {
|
||||
css,
|
||||
cssManager,
|
||||
} from '@design.estate/dees-element';
|
||||
import { Terminal } from 'xterm';
|
||||
import { FitAddon } from 'xterm-addon-fit';
|
||||
import type { Terminal } from 'xterm';
|
||||
import type { FitAddon } from 'xterm-addon-fit';
|
||||
import { themeDefaultStyles } from '../../00theme.js';
|
||||
import { DeesServiceLibLoader } from '../../../services/index.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -305,8 +306,15 @@ export class DeesWorkspaceTerminalPreview extends DeesElement {
|
||||
const domtoolsInstance = await this.domtoolsPromise;
|
||||
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
||||
|
||||
// Create xterm terminal in read-only mode
|
||||
this.terminal = new Terminal({
|
||||
// Load xterm from CDN
|
||||
const libLoader = DeesServiceLibLoader.getInstance();
|
||||
const [xtermBundle, fitAddonBundle] = await Promise.all([
|
||||
libLoader.loadXterm(),
|
||||
libLoader.loadXtermFitAddon(),
|
||||
]);
|
||||
|
||||
// Create xterm terminal in read-only mode using CDN-loaded module
|
||||
this.terminal = new xtermBundle.Terminal({
|
||||
convertEol: true,
|
||||
cursorBlink: false,
|
||||
disableStdin: true,
|
||||
@@ -323,7 +331,7 @@ export class DeesWorkspaceTerminalPreview extends DeesElement {
|
||||
}
|
||||
});
|
||||
|
||||
this.fitAddon = new FitAddon();
|
||||
this.fitAddon = new fitAddonBundle.FitAddon();
|
||||
this.terminal.loadAddon(this.fitAddon);
|
||||
this.terminal.open(container);
|
||||
this.fitAddon.fit();
|
||||
|
||||
@@ -10,18 +10,20 @@ import {
|
||||
} from '@design.estate/dees-element';
|
||||
import * as domtools from '@design.estate/dees-domtools';
|
||||
|
||||
import { Terminal } from 'xterm';
|
||||
import { FitAddon } from 'xterm-addon-fit';
|
||||
import type { Terminal } from 'xterm';
|
||||
import { themeDefaultStyles } from '../../00theme.js';
|
||||
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
|
||||
import { WebContainerEnvironment } from '../../00group-runtime/index.js';
|
||||
import '../../dees-icon/dees-icon.js';
|
||||
import '../../dees-actionbar/dees-actionbar.js';
|
||||
import type { DeesActionbar } from '../../dees-actionbar/dees-actionbar.js';
|
||||
import { TerminalTabManager } from './terminal-tab-manager.js';
|
||||
import type {
|
||||
ITerminalTab,
|
||||
ICreateTerminalTabOptions,
|
||||
TTerminalTabType,
|
||||
} from './interfaces.js';
|
||||
import { DeesServiceLibLoader } from '../../../services/index.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -79,6 +81,9 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
private terminalThemeSubscription: any = null;
|
||||
private isBright: boolean = false;
|
||||
|
||||
// Actionbar reference for terminal-context notifications
|
||||
private terminalActionbar: DeesActionbar | null = null;
|
||||
|
||||
/**
|
||||
* Promise that resolves when the environment is ready.
|
||||
* @deprecated Use executionEnvironment directly
|
||||
@@ -120,17 +125,21 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
|
||||
.terminal-content {
|
||||
flex: 1;
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
background: ${cssManager.bdTheme('#ffffff', '#000000')};
|
||||
}
|
||||
|
||||
#active-terminal-container {
|
||||
position: absolute;
|
||||
top: 20px;
|
||||
left: 20px;
|
||||
right: 20px;
|
||||
bottom: 20px;
|
||||
flex: 1;
|
||||
position: relative;
|
||||
min-height: 0;
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
.terminal-content dees-actionbar {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
/* Tab bar on the right side */
|
||||
@@ -426,6 +435,7 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
<span>No terminal open</span>
|
||||
</div>
|
||||
`}
|
||||
<dees-actionbar></dees-actionbar>
|
||||
</div>
|
||||
|
||||
<!-- Vertical tab bar on the right -->
|
||||
@@ -485,17 +495,31 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
}
|
||||
);
|
||||
|
||||
// Load xterm from CDN
|
||||
const libLoader = DeesServiceLibLoader.getInstance();
|
||||
const [xtermBundle, fitAddonBundle] = await Promise.all([
|
||||
libLoader.loadXterm(),
|
||||
libLoader.loadXtermFitAddon(),
|
||||
]);
|
||||
|
||||
// Initialize tab manager with loaded modules
|
||||
this.tabManager.setXtermModules(xtermBundle, fitAddonBundle);
|
||||
|
||||
// Create default shell tab
|
||||
await this.createShellTab();
|
||||
}
|
||||
|
||||
async connectedCallback(): Promise<void> {
|
||||
await super.connectedCallback();
|
||||
this.resizeObserver.observe(this);
|
||||
// ResizeObserver is set up in attachTerminalToContainer when the container exists
|
||||
}
|
||||
|
||||
async disconnectedCallback(): Promise<void> {
|
||||
this.resizeObserver.unobserve(this);
|
||||
// Unobserve the terminal container
|
||||
const container = this.shadowRoot?.getElementById('active-terminal-container');
|
||||
if (container) {
|
||||
this.resizeObserver.unobserve(container);
|
||||
}
|
||||
if (this.terminalThemeSubscription) {
|
||||
this.terminalThemeSubscription.unsubscribe();
|
||||
this.terminalThemeSubscription = null;
|
||||
@@ -558,6 +582,10 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
const container = this.shadowRoot?.getElementById('active-terminal-container');
|
||||
if (!container) return;
|
||||
|
||||
// Observe container for resize (handles actionbar appearing/disappearing)
|
||||
// ResizeObserver.observe() is idempotent - safe to call multiple times
|
||||
this.resizeObserver.observe(container);
|
||||
|
||||
// Clear container
|
||||
container.innerHTML = '';
|
||||
|
||||
@@ -656,6 +684,36 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
detail: { tabId, exitCode },
|
||||
})
|
||||
);
|
||||
|
||||
// Show actionbar to offer closing the tab (only if tab is closeable)
|
||||
if (tab.closeable) {
|
||||
this.showExitedTabActionbar(tabId, tab.label, exitCode);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Show actionbar offering to close an exited tab
|
||||
*/
|
||||
private async showExitedTabActionbar(tabId: string, tabLabel: string, exitCode: number): Promise<void> {
|
||||
const isSuccess = exitCode === 0;
|
||||
const result = await this.showActionbar({
|
||||
message: isSuccess
|
||||
? `"${tabLabel}" completed. Close tab?`
|
||||
: `"${tabLabel}" exited (code ${exitCode}). Close tab?`,
|
||||
type: isSuccess ? 'info' : 'warning',
|
||||
icon: isSuccess ? 'lucide:checkCircle' : 'lucide:alertTriangle',
|
||||
actions: [
|
||||
{ id: 'close', label: 'Close Tab', primary: true },
|
||||
{ id: 'keep', label: 'Keep Open' },
|
||||
],
|
||||
timeout: { duration: 10000, defaultActionId: 'close' },
|
||||
dismissible: true,
|
||||
});
|
||||
|
||||
// Close tab if user clicked "Close Tab" or timeout triggered auto-close
|
||||
if (result.actionId === 'close') {
|
||||
this.closeTab(tabId);
|
||||
}
|
||||
}
|
||||
|
||||
// ========== Public API ==========
|
||||
@@ -816,6 +874,19 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show an actionbar notification in the terminal panel context.
|
||||
* Use this for terminal-related decisions (e.g., retry failed process, kill process, etc.)
|
||||
*/
|
||||
public async showActionbar(
|
||||
options: Parameters<DeesActionbar['show']>[0]
|
||||
): Promise<ReturnType<DeesActionbar['show']>> {
|
||||
if (!this.terminalActionbar) {
|
||||
this.terminalActionbar = this.shadowRoot?.querySelector('dees-actionbar') as DeesActionbar;
|
||||
}
|
||||
return this.terminalActionbar?.show(options);
|
||||
}
|
||||
|
||||
// ========== Utility Methods ==========
|
||||
|
||||
public async waitForPrompt(term: Terminal, prompt: string): Promise<void> {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { Terminal } from 'xterm';
|
||||
import { FitAddon } from 'xterm-addon-fit';
|
||||
import type { Terminal, ITerminalOptions } from 'xterm';
|
||||
import type { FitAddon } from 'xterm-addon-fit';
|
||||
import type { ITerminalTab, ICreateTerminalTabOptions, TTerminalTabType } from './interfaces.js';
|
||||
import type { IXtermBundle, IXtermFitAddonBundle } from '../../../services/index.js';
|
||||
|
||||
/**
|
||||
* Manages terminal tabs lifecycle and state
|
||||
@@ -8,6 +9,17 @@ import type { ITerminalTab, ICreateTerminalTabOptions, TTerminalTabType } from '
|
||||
export class TerminalTabManager {
|
||||
private tabs: Map<string, ITerminalTab> = new Map();
|
||||
private tabCounter: number = 0;
|
||||
private xtermBundle: IXtermBundle | null = null;
|
||||
private xtermFitAddonBundle: IXtermFitAddonBundle | null = null;
|
||||
|
||||
/**
|
||||
* Initialize the manager with loaded xterm modules.
|
||||
* Must be called before creating tabs.
|
||||
*/
|
||||
public setXtermModules(xtermBundle: IXtermBundle, fitAddonBundle: IXtermFitAddonBundle): void {
|
||||
this.xtermBundle = xtermBundle;
|
||||
this.xtermFitAddonBundle = fitAddonBundle;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate unique tab ID
|
||||
@@ -96,11 +108,15 @@ export class TerminalTabManager {
|
||||
* Create a new tab instance
|
||||
*/
|
||||
createTab(options: ICreateTerminalTabOptions, isBright: boolean): ITerminalTab {
|
||||
if (!this.xtermBundle || !this.xtermFitAddonBundle) {
|
||||
throw new Error('TerminalTabManager: xterm modules not initialized. Call setXtermModules() first.');
|
||||
}
|
||||
|
||||
const id = this.generateTabId();
|
||||
const type = options.type;
|
||||
|
||||
// Create xterm.js Terminal instance
|
||||
const terminal = new Terminal({
|
||||
// Create xterm.js Terminal instance using CDN-loaded module
|
||||
const terminal = new this.xtermBundle.Terminal({
|
||||
convertEol: true,
|
||||
cursorBlink: true,
|
||||
theme: this.getTerminalTheme(isBright),
|
||||
@@ -109,8 +125,8 @@ export class TerminalTabManager {
|
||||
lineHeight: 1.2,
|
||||
});
|
||||
|
||||
// Create FitAddon
|
||||
const fitAddon = new FitAddon();
|
||||
// Create FitAddon using CDN-loaded module
|
||||
const fitAddon = new this.xtermFitAddonBundle.FitAddon();
|
||||
terminal.loadAddon(fitAddon);
|
||||
|
||||
const tab: ITerminalTab = {
|
||||
|
||||
@@ -26,6 +26,9 @@ import { DeesWorkspaceMonaco } from '../dees-workspace-monaco/dees-workspace-mon
|
||||
import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js';
|
||||
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
|
||||
import '@design.estate/dees-wcctools/demotools';
|
||||
import '../../dees-actionbar/dees-actionbar.js';
|
||||
import type { DeesActionbar } from '../../dees-actionbar/dees-actionbar.js';
|
||||
import '../dees-workspace-diff-editor/dees-workspace-diff-editor.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -254,6 +257,11 @@ testSmartPromise();
|
||||
private nodeModulesDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
|
||||
private intelliSenseDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
// Open file watchers for external change detection
|
||||
private openFileWatchers: Map<string, IFileWatcher> = new Map();
|
||||
private fileChangeDebounce: Map<string, ReturnType<typeof setTimeout>> = new Map();
|
||||
private actionbarElement: DeesActionbar | null = null;
|
||||
|
||||
// Auto-save functionality
|
||||
@state()
|
||||
accessor autoSave: boolean = false;
|
||||
@@ -279,6 +287,18 @@ testSmartPromise();
|
||||
@state()
|
||||
accessor isDraggingTerminal: boolean = false;
|
||||
|
||||
// Diff view state
|
||||
@state()
|
||||
accessor showDiffView: boolean = false;
|
||||
|
||||
@state()
|
||||
accessor diffViewConfig: {
|
||||
filePath: string;
|
||||
originalContent: string;
|
||||
modifiedContent: string;
|
||||
language: string;
|
||||
} | null = null;
|
||||
|
||||
// Keyboard shortcut handler (bound for proper cleanup)
|
||||
private keydownHandler = (e: KeyboardEvent) => {
|
||||
// Cmd+S (Mac) or Ctrl+S (Windows/Linux) - Save
|
||||
@@ -914,7 +934,16 @@ testSmartPromise();
|
||||
</div>
|
||||
</div>
|
||||
<div class="editor-content">
|
||||
${this.openFiles.length === 0 ? html`
|
||||
${this.showDiffView && this.diffViewConfig ? html`
|
||||
<dees-workspace-diff-editor
|
||||
.filePath=${this.diffViewConfig.filePath}
|
||||
.originalContent=${this.diffViewConfig.originalContent}
|
||||
.modifiedContent=${this.diffViewConfig.modifiedContent}
|
||||
.language=${this.diffViewConfig.language}
|
||||
@diff-resolved=${this.handleDiffResolved}
|
||||
@diff-closed=${() => { this.showDiffView = false; this.diffViewConfig = null; }}
|
||||
></dees-workspace-diff-editor>
|
||||
` : this.openFiles.length === 0 ? html`
|
||||
<div class="empty-state">
|
||||
<dees-icon .icon=${'lucide:fileCode'} iconSize="48"></dees-icon>
|
||||
<span>Select a file to edit</span>
|
||||
@@ -928,6 +957,7 @@ testSmartPromise();
|
||||
></dees-workspace-monaco>
|
||||
`}
|
||||
</div>
|
||||
<dees-actionbar></dees-actionbar>
|
||||
</div>
|
||||
|
||||
<!-- Horizontal resize handle for terminal -->
|
||||
@@ -1016,6 +1046,7 @@ testSmartPromise();
|
||||
this.autoSaveInterval = null;
|
||||
}
|
||||
this.stopNodeModulesWatcher();
|
||||
this.stopAllFileWatchers();
|
||||
}
|
||||
|
||||
public async firstUpdated() {
|
||||
@@ -1032,6 +1063,11 @@ testSmartPromise();
|
||||
if (changedProperties.has('executionEnvironment') && this.executionEnvironment) {
|
||||
await this.initializeWorkspace();
|
||||
}
|
||||
|
||||
// Capture actionbar reference when it becomes available (after initialization completes)
|
||||
if (!this.actionbarElement) {
|
||||
this.actionbarElement = this.shadowRoot?.querySelector('.editor-panel dees-actionbar') as DeesActionbar;
|
||||
}
|
||||
}
|
||||
|
||||
private async initializeWorkspace() {
|
||||
@@ -1186,6 +1222,191 @@ testSmartPromise();
|
||||
}
|
||||
}
|
||||
|
||||
// ========== Open File Watching for External Changes ==========
|
||||
|
||||
/**
|
||||
* Start watching an open file for external changes
|
||||
*/
|
||||
private startWatchingFile(path: string): void {
|
||||
if (!this.executionEnvironment || this.openFileWatchers.has(path)) return;
|
||||
|
||||
try {
|
||||
const watcher = this.executionEnvironment.watch(
|
||||
path,
|
||||
(_event, _filename) => {
|
||||
// Debounce to avoid multiple rapid triggers
|
||||
const existingTimeout = this.fileChangeDebounce.get(path);
|
||||
if (existingTimeout) {
|
||||
clearTimeout(existingTimeout);
|
||||
}
|
||||
const timeout = setTimeout(() => {
|
||||
this.handleExternalFileChange(path);
|
||||
this.fileChangeDebounce.delete(path);
|
||||
}, 300);
|
||||
this.fileChangeDebounce.set(path, timeout);
|
||||
}
|
||||
);
|
||||
this.openFileWatchers.set(path, watcher);
|
||||
} catch (error) {
|
||||
console.warn(`Could not watch file ${path}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop watching a file when it's closed
|
||||
*/
|
||||
private stopWatchingFile(path: string): void {
|
||||
const watcher = this.openFileWatchers.get(path);
|
||||
if (watcher) {
|
||||
watcher.stop();
|
||||
this.openFileWatchers.delete(path);
|
||||
}
|
||||
const timeout = this.fileChangeDebounce.get(path);
|
||||
if (timeout) {
|
||||
clearTimeout(timeout);
|
||||
this.fileChangeDebounce.delete(path);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop all file watchers
|
||||
*/
|
||||
private stopAllFileWatchers(): void {
|
||||
for (const watcher of this.openFileWatchers.values()) {
|
||||
watcher.stop();
|
||||
}
|
||||
this.openFileWatchers.clear();
|
||||
|
||||
for (const timeout of this.fileChangeDebounce.values()) {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
this.fileChangeDebounce.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle external file change - show actionbar if file has local changes,
|
||||
* otherwise silently update with cursor preservation
|
||||
*/
|
||||
private async handleExternalFileChange(path: string): Promise<void> {
|
||||
const file = this.openFiles.find(f => f.path === path);
|
||||
if (!file || !this.executionEnvironment) return;
|
||||
|
||||
try {
|
||||
// Read the new content from disk
|
||||
const newContent = await this.executionEnvironment.readFile(path);
|
||||
|
||||
// If content is same as what we have, no action needed
|
||||
if (newContent === file.content) return;
|
||||
|
||||
if (file.modified) {
|
||||
// File has unsaved local changes AND disk changed - conflict!
|
||||
const result = await this.actionbarElement?.show({
|
||||
message: `"${file.name}" changed on disk. What do you want to do?`,
|
||||
type: 'question',
|
||||
icon: 'lucide:gitMerge',
|
||||
actions: [
|
||||
{ id: 'load-disk', label: 'Load from Disk', primary: true },
|
||||
{ id: 'save-local', label: 'Save Local to Disk' },
|
||||
{ id: 'compare', label: 'Compare' },
|
||||
],
|
||||
timeout: { duration: 15000, defaultActionId: 'load-disk' },
|
||||
dismissible: true,
|
||||
});
|
||||
|
||||
if (result?.actionId === 'load-disk') {
|
||||
// Discard local changes, load disk version
|
||||
await this.updateFileContent(path, newContent, false);
|
||||
} else if (result?.actionId === 'save-local') {
|
||||
// Keep local changes and save to disk (overwrite external)
|
||||
await this.executionEnvironment.writeFile(path, file.content);
|
||||
// Mark as saved
|
||||
this.openFiles = this.openFiles.map(f =>
|
||||
f.path === path ? { ...f, modified: false } : f
|
||||
);
|
||||
} else if (result?.actionId === 'compare') {
|
||||
// Open diff view
|
||||
this.openDiffView(path, file.content, newContent);
|
||||
}
|
||||
// If dismissed, do nothing - user can manually resolve later
|
||||
} else {
|
||||
// No local changes - silently update with cursor preservation
|
||||
await this.updateFileContent(path, newContent, true);
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn(`Failed to handle external change for ${path}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update file content in state and optionally in the editor
|
||||
*/
|
||||
private async updateFileContent(
|
||||
path: string,
|
||||
newContent: string,
|
||||
preserveCursor: boolean
|
||||
): Promise<void> {
|
||||
// Update internal state
|
||||
this.openFiles = this.openFiles.map(f =>
|
||||
f.path === path ? { ...f, content: newContent, modified: false } : f
|
||||
);
|
||||
|
||||
// If this is the active file, update Monaco editor
|
||||
if (path === this.activeFilePath) {
|
||||
const editor = this.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
|
||||
if (editor) {
|
||||
await editor.setContentExternal(newContent, preserveCursor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Open the diff view to compare local and disk versions
|
||||
*/
|
||||
private openDiffView(path: string, localContent: string, diskContent: string): void {
|
||||
this.diffViewConfig = {
|
||||
filePath: path,
|
||||
originalContent: diskContent,
|
||||
modifiedContent: localContent,
|
||||
language: this.getLanguageFromPath(path),
|
||||
};
|
||||
this.showDiffView = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle diff view resolution
|
||||
*/
|
||||
private async handleDiffResolved(e: CustomEvent): Promise<void> {
|
||||
const { action, content } = e.detail;
|
||||
const path = this.diffViewConfig?.filePath;
|
||||
|
||||
if (!path || !this.executionEnvironment) {
|
||||
this.showDiffView = false;
|
||||
this.diffViewConfig = null;
|
||||
return;
|
||||
}
|
||||
|
||||
if (action === 'use-local') {
|
||||
// Save local content to disk
|
||||
await this.executionEnvironment.writeFile(path, content);
|
||||
this.openFiles = this.openFiles.map(f =>
|
||||
f.path === path ? { ...f, content, modified: false } : f
|
||||
);
|
||||
// Update editor if active
|
||||
if (path === this.activeFilePath) {
|
||||
const editor = this.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
|
||||
if (editor) {
|
||||
await editor.setContentExternal(content, false);
|
||||
}
|
||||
}
|
||||
} else if (action === 'use-disk') {
|
||||
// Update editor with disk content
|
||||
await this.updateFileContent(path, content, false);
|
||||
}
|
||||
|
||||
this.showDiffView = false;
|
||||
this.diffViewConfig = null;
|
||||
}
|
||||
|
||||
private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
|
||||
const { path, name } = e.detail;
|
||||
await this.openFile(path, name);
|
||||
@@ -1210,6 +1431,9 @@ testSmartPromise();
|
||||
];
|
||||
this.activeFilePath = path;
|
||||
|
||||
// Start watching for external changes
|
||||
this.startWatchingFile(path);
|
||||
|
||||
// Initialize IntelliSense lazily after first file opens (Monaco loads on demand)
|
||||
if (!this.intelliSenseInitialized) {
|
||||
// Wait for Monaco editor to mount and load Monaco from CDN
|
||||
@@ -1246,6 +1470,9 @@ testSmartPromise();
|
||||
if (!confirmed) return;
|
||||
}
|
||||
|
||||
// Stop watching this file
|
||||
this.stopWatchingFile(path);
|
||||
|
||||
this.openFiles = this.openFiles.filter(f => f.path !== path);
|
||||
|
||||
// If closing the active file, activate another one
|
||||
|
||||
@@ -7,3 +7,4 @@ export * from './dees-workspace-terminal-preview/index.js';
|
||||
export * from './dees-workspace-markdown/index.js';
|
||||
export * from './dees-workspace-markdownoutlet/index.js';
|
||||
export * from './dees-workspace-bottombar/index.js';
|
||||
export * from './dees-workspace-diff-editor/index.js';
|
||||
|
||||
@@ -128,19 +128,19 @@ export class DeesActionbar extends DeesElement {
|
||||
cssManager.defaultStyles,
|
||||
css`
|
||||
:host {
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
height: 0;
|
||||
transition: height 0.2s ease-out;
|
||||
display: grid;
|
||||
grid-template-rows: 0fr;
|
||||
transition: grid-template-rows 0.2s ease-out;
|
||||
}
|
||||
|
||||
:host(.visible) {
|
||||
height: auto;
|
||||
grid-template-rows: 1fr;
|
||||
}
|
||||
|
||||
.actionbar-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 0;
|
||||
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 12%)')};
|
||||
border-top: 1px solid ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 20%)')};
|
||||
overflow: hidden;
|
||||
@@ -416,12 +416,27 @@ export class DeesActionbar extends DeesElement {
|
||||
|
||||
// ========== Private Methods ==========
|
||||
|
||||
/**
|
||||
* Hide the current actionbar with animation.
|
||||
* Removes visible class first to trigger CSS transition, then clears content after animation.
|
||||
*/
|
||||
private async hideCurrentBar(): Promise<void> {
|
||||
// Remove visible class to start close animation
|
||||
this.classList.remove('visible');
|
||||
this.isVisible = false;
|
||||
|
||||
// Wait for animation to complete (200ms transition + buffer)
|
||||
await new Promise(resolve => setTimeout(resolve, 220));
|
||||
|
||||
// Now safe to clear content
|
||||
this.currentBar = null;
|
||||
this.currentResolve = null;
|
||||
}
|
||||
|
||||
private processQueue(): void {
|
||||
if (this.queue.length === 0) {
|
||||
this.currentBar = null;
|
||||
this.currentResolve = null;
|
||||
this.isVisible = false;
|
||||
this.classList.remove('visible');
|
||||
// Hide with animation - don't await, let it run async
|
||||
this.hideCurrentBar();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
285
ts_web/services/DeesServiceLibLoader.ts
Normal file
@@ -0,0 +1,285 @@
|
||||
import { CDN_BASE, CDN_VERSIONS } from './versions.js';
|
||||
|
||||
// Type imports (no runtime overhead)
|
||||
import type { Terminal, ITerminalOptions } from 'xterm';
|
||||
import type { FitAddon } from 'xterm-addon-fit';
|
||||
import type { HLJSApi } from 'highlight.js';
|
||||
import type ApexChartsType from 'apexcharts';
|
||||
import type { Editor, EditorOptions } from '@tiptap/core';
|
||||
import type { StarterKitOptions } from '@tiptap/starter-kit';
|
||||
import type { UnderlineOptions } from '@tiptap/extension-underline';
|
||||
import type { TextAlignOptions } from '@tiptap/extension-text-align';
|
||||
import type { LinkOptions } from '@tiptap/extension-link';
|
||||
|
||||
/**
|
||||
* Bundle type for xterm and its addons
|
||||
*/
|
||||
export interface IXtermBundle {
|
||||
Terminal: typeof Terminal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bundle type for xterm-addon-fit
|
||||
*/
|
||||
export interface IXtermFitAddonBundle {
|
||||
FitAddon: typeof FitAddon;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bundle type for Tiptap editor and extensions
|
||||
*/
|
||||
export interface ITiptapBundle {
|
||||
Editor: typeof Editor;
|
||||
StarterKit: { configure: (options?: Partial<StarterKitOptions>) => any };
|
||||
Underline: { configure: (options?: Partial<UnderlineOptions>) => any };
|
||||
TextAlign: { configure: (options?: Partial<TextAlignOptions>) => any };
|
||||
Link: { configure: (options?: Partial<LinkOptions>) => any };
|
||||
Typography: { configure: (options?: any) => any };
|
||||
}
|
||||
|
||||
/**
|
||||
* Singleton service for lazy-loading heavy libraries from CDN.
|
||||
*
|
||||
* This reduces initial bundle size by loading libraries only when needed.
|
||||
* Libraries are cached after first load to avoid duplicate fetches.
|
||||
*
|
||||
* @example
|
||||
* ```typescript
|
||||
* const libLoader = DeesServiceLibLoader.getInstance();
|
||||
* const xterm = await libLoader.loadXterm();
|
||||
* const terminal = new xterm.Terminal({ ... });
|
||||
* ```
|
||||
*/
|
||||
export class DeesServiceLibLoader {
|
||||
private static instance: DeesServiceLibLoader;
|
||||
|
||||
// Cached library references
|
||||
private xtermLib: IXtermBundle | null = null;
|
||||
private xtermFitAddonLib: IXtermFitAddonBundle | null = null;
|
||||
private highlightJsLib: HLJSApi | null = null;
|
||||
private apexChartsLib: typeof ApexChartsType | null = null;
|
||||
private tiptapLib: ITiptapBundle | null = null;
|
||||
|
||||
// Loading promises to prevent duplicate concurrent loads
|
||||
private xtermLoadingPromise: Promise<IXtermBundle> | null = null;
|
||||
private xtermFitAddonLoadingPromise: Promise<IXtermFitAddonBundle> | null = null;
|
||||
private highlightJsLoadingPromise: Promise<HLJSApi> | null = null;
|
||||
private apexChartsLoadingPromise: Promise<typeof ApexChartsType> | null = null;
|
||||
private tiptapLoadingPromise: Promise<ITiptapBundle> | null = null;
|
||||
|
||||
private constructor() {}
|
||||
|
||||
/**
|
||||
* Get the singleton instance of DeesServiceLibLoader
|
||||
*/
|
||||
public static getInstance(): DeesServiceLibLoader {
|
||||
if (!DeesServiceLibLoader.instance) {
|
||||
DeesServiceLibLoader.instance = new DeesServiceLibLoader();
|
||||
}
|
||||
return DeesServiceLibLoader.instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load xterm terminal emulator from CDN
|
||||
* @returns Promise resolving to xterm module with Terminal class
|
||||
*/
|
||||
public async loadXterm(): Promise<IXtermBundle> {
|
||||
if (this.xtermLib) {
|
||||
return this.xtermLib;
|
||||
}
|
||||
|
||||
if (this.xtermLoadingPromise) {
|
||||
return this.xtermLoadingPromise;
|
||||
}
|
||||
|
||||
this.xtermLoadingPromise = (async () => {
|
||||
const url = `${CDN_BASE}/xterm@${CDN_VERSIONS.xterm}/+esm`;
|
||||
const module = await import(/* @vite-ignore */ url);
|
||||
|
||||
// Also load and inject xterm CSS
|
||||
await this.injectXtermStyles();
|
||||
|
||||
this.xtermLib = {
|
||||
Terminal: module.Terminal,
|
||||
};
|
||||
return this.xtermLib;
|
||||
})();
|
||||
|
||||
return this.xtermLoadingPromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load xterm-addon-fit from CDN
|
||||
* @returns Promise resolving to FitAddon class
|
||||
*/
|
||||
public async loadXtermFitAddon(): Promise<IXtermFitAddonBundle> {
|
||||
if (this.xtermFitAddonLib) {
|
||||
return this.xtermFitAddonLib;
|
||||
}
|
||||
|
||||
if (this.xtermFitAddonLoadingPromise) {
|
||||
return this.xtermFitAddonLoadingPromise;
|
||||
}
|
||||
|
||||
this.xtermFitAddonLoadingPromise = (async () => {
|
||||
const url = `${CDN_BASE}/xterm-addon-fit@${CDN_VERSIONS.xtermAddonFit}/+esm`;
|
||||
const module = await import(/* @vite-ignore */ url);
|
||||
|
||||
this.xtermFitAddonLib = {
|
||||
FitAddon: module.FitAddon,
|
||||
};
|
||||
return this.xtermFitAddonLib;
|
||||
})();
|
||||
|
||||
return this.xtermFitAddonLoadingPromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Inject xterm CSS styles into the document head
|
||||
*/
|
||||
private async injectXtermStyles(): Promise<void> {
|
||||
const styleId = 'xterm-cdn-styles';
|
||||
if (document.getElementById(styleId)) {
|
||||
return; // Already injected
|
||||
}
|
||||
|
||||
const cssUrl = `${CDN_BASE}/xterm@${CDN_VERSIONS.xterm}/css/xterm.css`;
|
||||
const response = await fetch(cssUrl);
|
||||
const cssText = await response.text();
|
||||
|
||||
const style = document.createElement('style');
|
||||
style.id = styleId;
|
||||
style.textContent = cssText;
|
||||
document.head.appendChild(style);
|
||||
}
|
||||
|
||||
/**
|
||||
* Load highlight.js syntax highlighter from CDN
|
||||
* @returns Promise resolving to highlight.js API
|
||||
*/
|
||||
public async loadHighlightJs(): Promise<HLJSApi> {
|
||||
if (this.highlightJsLib) {
|
||||
return this.highlightJsLib;
|
||||
}
|
||||
|
||||
if (this.highlightJsLoadingPromise) {
|
||||
return this.highlightJsLoadingPromise;
|
||||
}
|
||||
|
||||
this.highlightJsLoadingPromise = (async () => {
|
||||
const url = `${CDN_BASE}/highlight.js@${CDN_VERSIONS.highlightJs}/+esm`;
|
||||
const module = await import(/* @vite-ignore */ url);
|
||||
|
||||
this.highlightJsLib = module.default;
|
||||
return this.highlightJsLib;
|
||||
})();
|
||||
|
||||
return this.highlightJsLoadingPromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load ApexCharts charting library from CDN
|
||||
* @returns Promise resolving to ApexCharts constructor
|
||||
*/
|
||||
public async loadApexCharts(): Promise<typeof ApexChartsType> {
|
||||
if (this.apexChartsLib) {
|
||||
return this.apexChartsLib;
|
||||
}
|
||||
|
||||
if (this.apexChartsLoadingPromise) {
|
||||
return this.apexChartsLoadingPromise;
|
||||
}
|
||||
|
||||
this.apexChartsLoadingPromise = (async () => {
|
||||
const url = `${CDN_BASE}/apexcharts@${CDN_VERSIONS.apexcharts}/+esm`;
|
||||
const module = await import(/* @vite-ignore */ url);
|
||||
|
||||
this.apexChartsLib = module.default;
|
||||
return this.apexChartsLib;
|
||||
})();
|
||||
|
||||
return this.apexChartsLoadingPromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load Tiptap rich text editor and extensions from CDN
|
||||
* @returns Promise resolving to Tiptap bundle with Editor and extensions
|
||||
*/
|
||||
public async loadTiptap(): Promise<ITiptapBundle> {
|
||||
if (this.tiptapLib) {
|
||||
return this.tiptapLib;
|
||||
}
|
||||
|
||||
if (this.tiptapLoadingPromise) {
|
||||
return this.tiptapLoadingPromise;
|
||||
}
|
||||
|
||||
this.tiptapLoadingPromise = (async () => {
|
||||
const version = CDN_VERSIONS.tiptap;
|
||||
|
||||
// Load all Tiptap modules in parallel
|
||||
const [
|
||||
coreModule,
|
||||
starterKitModule,
|
||||
underlineModule,
|
||||
textAlignModule,
|
||||
linkModule,
|
||||
typographyModule,
|
||||
] = await Promise.all([
|
||||
import(/* @vite-ignore */ `${CDN_BASE}/@tiptap/core@${version}/+esm`),
|
||||
import(/* @vite-ignore */ `${CDN_BASE}/@tiptap/starter-kit@${version}/+esm`),
|
||||
import(/* @vite-ignore */ `${CDN_BASE}/@tiptap/extension-underline@${version}/+esm`),
|
||||
import(/* @vite-ignore */ `${CDN_BASE}/@tiptap/extension-text-align@${version}/+esm`),
|
||||
import(/* @vite-ignore */ `${CDN_BASE}/@tiptap/extension-link@${version}/+esm`),
|
||||
import(/* @vite-ignore */ `${CDN_BASE}/@tiptap/extension-typography@${version}/+esm`),
|
||||
]);
|
||||
|
||||
this.tiptapLib = {
|
||||
Editor: coreModule.Editor,
|
||||
StarterKit: starterKitModule.default || starterKitModule.StarterKit,
|
||||
Underline: underlineModule.default || underlineModule.Underline,
|
||||
TextAlign: textAlignModule.default || textAlignModule.TextAlign,
|
||||
Link: linkModule.default || linkModule.Link,
|
||||
Typography: typographyModule.default || typographyModule.Typography,
|
||||
};
|
||||
|
||||
return this.tiptapLib;
|
||||
})();
|
||||
|
||||
return this.tiptapLoadingPromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Preload multiple libraries in parallel
|
||||
* Useful for warming the cache before components are rendered
|
||||
*/
|
||||
public async preloadAll(): Promise<void> {
|
||||
await Promise.all([
|
||||
this.loadXterm(),
|
||||
this.loadXtermFitAddon(),
|
||||
this.loadHighlightJs(),
|
||||
this.loadApexCharts(),
|
||||
this.loadTiptap(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a specific library is already loaded
|
||||
*/
|
||||
public isLoaded(library: 'xterm' | 'xtermFitAddon' | 'highlightJs' | 'apexCharts' | 'tiptap'): boolean {
|
||||
switch (library) {
|
||||
case 'xterm':
|
||||
return this.xtermLib !== null;
|
||||
case 'xtermFitAddon':
|
||||
return this.xtermFitAddonLib !== null;
|
||||
case 'highlightJs':
|
||||
return this.highlightJsLib !== null;
|
||||
case 'apexCharts':
|
||||
return this.apexChartsLib !== null;
|
||||
case 'tiptap':
|
||||
return this.tiptapLib !== null;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
3
ts_web/services/index.ts
Normal file
@@ -0,0 +1,3 @@
|
||||
export { DeesServiceLibLoader } from './DeesServiceLibLoader.js';
|
||||
export type { IXtermBundle, IXtermFitAddonBundle, ITiptapBundle } from './DeesServiceLibLoader.js';
|
||||
export { CDN_BASE, CDN_VERSIONS } from './versions.js';
|
||||
17
ts_web/services/versions.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
/**
|
||||
* CDN versions for lazy-loaded libraries.
|
||||
* Keep these in sync with package.json for type compatibility.
|
||||
*/
|
||||
export const CDN_VERSIONS = {
|
||||
xterm: '5.3.0',
|
||||
xtermAddonFit: '0.8.0',
|
||||
highlightJs: '11.11.1',
|
||||
apexcharts: '5.3.6',
|
||||
tiptap: '2.23.0',
|
||||
fontawesome: '7.1.0',
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* Base CDN URL for jsdelivr ESM imports
|
||||
*/
|
||||
export const CDN_BASE = 'https://cdn.jsdelivr.net/npm';
|
||||