Compare commits

...

11 Commits

Author SHA1 Message Date
8d6bd20321 v3.27.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-01 20:25:05 +00:00
d7f3594dd4 feat(services): introduce DeesServiceLibLoader to lazy-load heavy client libraries from CDN and update components to use it 2026-01-01 20:25:05 +00:00
2a6457e192 v3.26.1
Some checks failed
Default (tags) / security (push) Failing after 15s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-01 19:59:53 +00:00
979e1f7991 fix(dees-actionbar): animate actionbar hide using grid-template-rows and wait for animation before clearing state 2026-01-01 19:59:53 +00:00
bbb57f1b9f update 2026-01-01 18:33:05 +00:00
a218b6a0a1 v3.26.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-01 11:32:01 +00:00
a20d9ff138 feat(workspace): add external file change detection, conflict resolution UI, and diff editor 2026-01-01 11:32:01 +00:00
3a7c2fe781 v3.25.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-01 10:20:22 +00:00
22156d71dc feat(dees-actionbar): add action bar component and improve workspace package update handling 2026-01-01 10:20:22 +00:00
dce557d85b v3.24.0
Some checks failed
Default (tags) / security (push) Failing after 15s
Default (tags) / test (push) Failing after 16s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-01 08:09:30 +00:00
829c09a97b feat(workspace): add workspace bottom bar, terminal tab manager, and run-process integration 2026-01-01 08:09:30 +00:00
35 changed files with 3371 additions and 337 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

@@ -1,5 +1,51 @@
# 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
- Introduce dees-actionbar component (dees-actionbar.ts) with interfaces, queueing, timed auto-trigger and demo usage
- Add actionbar.interfaces.ts and index export; export dees-actionbar from elements index
- Enhance workspace bottombar: add pendingPackageUpdate flag, process-complete handler, and connected/disconnected listeners to auto-refresh package status after updates
- Make pnpm outdated checking robust by streaming output via a reader and adding a 10s timeout to avoid hanging; handle timeout and stream cancellation
- Update package update commands to include '--latest' for updatePackage and updateAllPackages, and show 'Checking...' label during checks
- Add '@types/node' (^22.0.0) to devDependencies in the workspace package config
## 2026-01-01 - 3.24.0 - feat(workspace)
add workspace bottom bar, terminal tab manager, and run-process integration
- Add dees-workspace-bottombar component and export; bottom bar emits run-process events to launch processes.
- Introduce terminal interfaces (IRunProcessEventDetail, ITerminalTab, ICreateTerminalTabOptions, etc.) and a TerminalTabManager to manage multiple terminal tabs and lifecycle.
- Integrate bottombar into dees-workspace: layout refactor (workspace-outer), move/adjust resize handles and panels, and handle @run-process to create terminal tabs and focus terminal panel.
- Enhance dees-workspace-terminal: tabbed terminal UI, new public APIs (createProcessTab, writeToTab, sendInputToTab), theme updates, and improved disposal/cleanup behavior.
- Update module exports to include bottombar and additional terminal sub-exports (interfaces, terminal-tab-manager).
## 2025-12-31 - 3.23.0 - feat(workspace)
add resizable file tree and terminal panes with draggable handles and public layout APIs

View File

@@ -1,6 +1,6 @@
{
"name": "@design.estate/dees-catalog",
"version": "3.23.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",

View File

@@ -3,6 +3,6 @@
*/
export const commitinfo = {
name: '@design.estate/dees-catalog',
version: '3.23.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.'
}

View File

@@ -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 {
@@ -151,6 +152,9 @@ 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

View File

@@ -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;
}
}

View File

@@ -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 }) => {

View File

@@ -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
@@ -20,6 +21,7 @@ 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,10 +308,15 @@ 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);
@@ -319,9 +326,9 @@ export class CodeBlockHandler extends BaseBlockHandler {
// 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

View File

@@ -0,0 +1,548 @@
import {
DeesElement,
property,
html,
customElement,
type TemplateResult,
css,
cssManager,
state,
} from '@design.estate/dees-element';
import { themeDefaultStyles } from '../../00theme.js';
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
import '../../dees-icon/dees-icon.js';
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
import type { IRunProcessEventDetail, ITerminalProcessCompleteEventDetail } from '../dees-workspace-terminal/interfaces.js';
declare global {
interface HTMLElementTagNameMap {
'dees-workspace-bottombar': DeesWorkspaceBottombar;
}
}
interface IOutdatedPackage {
name: string;
current: string;
wanted: string;
latest: string;
type: 'dependencies' | 'devDependencies';
}
@customElement('dees-workspace-bottombar')
export class DeesWorkspaceBottombar extends DeesElement {
// INSTANCE
@property({ type: Object })
accessor executionEnvironment: IExecutionEnvironment | null = null;
// Script runner state
@state()
accessor scripts: Record<string, string> = {};
// Package checker state
@state()
accessor packageStatus: 'checking' | 'up-to-date' | 'updates-available' | 'error' | 'idle' = 'idle';
@state()
accessor outdatedPackages: IOutdatedPackage[] = [];
@state()
accessor isCheckingPackages: boolean = false;
// Track if we have a pending package update that should trigger refresh
private pendingPackageUpdate: boolean = false;
// Bound handler for process-complete events
private handleProcessComplete = (e: CustomEvent<ITerminalProcessCompleteEventDetail>) => {
// If we have a pending package update and a process completed, refresh
if (this.pendingPackageUpdate) {
this.pendingPackageUpdate = false;
// Small delay to let pnpm-lock.yaml update
setTimeout(() => this.checkPackages(), 500);
}
};
public static styles = [
themeDefaultStyles,
cssManager.defaultStyles,
css`
:host {
display: block;
height: 24px;
flex-shrink: 0;
}
.bottom-bar {
height: 24px;
display: flex;
align-items: center;
padding: 0 8px;
gap: 4px;
background: ${cssManager.bdTheme('hsl(0 0% 94%)', 'hsl(0 0% 6%)')};
border-top: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
font-size: 11px;
color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
}
.widget {
display: flex;
align-items: center;
gap: 4px;
padding: 2px 6px;
border-radius: 3px;
cursor: pointer;
transition: background 0.15s ease, color 0.15s ease;
white-space: nowrap;
}
.widget:hover {
background: ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 12%)')};
color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 80%)')};
}
.widget dees-icon {
flex-shrink: 0;
}
.widget-separator {
width: 1px;
height: 14px;
background: ${cssManager.bdTheme('hsl(0 0% 80%)', 'hsl(0 0% 20%)')};
margin: 0 4px;
}
.widget.running {
color: ${cssManager.bdTheme('hsl(210 100% 45%)', 'hsl(210 100% 60%)')};
}
.widget.up-to-date {
color: ${cssManager.bdTheme('hsl(142 70% 35%)', 'hsl(142 70% 50%)')};
}
.widget.updates-available {
color: ${cssManager.bdTheme('hsl(38 92% 45%)', 'hsl(38 92% 55%)')};
}
.widget.error {
color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 60%)')};
}
@keyframes spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
.spinning {
animation: spin 1s linear infinite;
}
.spacer {
flex: 1;
}
`,
];
public render(): TemplateResult {
return html`
<div class="bottom-bar">
<!-- Script Runner Widget -->
<div
class="widget"
@click=${this.handleScriptClick}
title="Run script"
>
<dees-icon
.icon=${'lucide:play'}
iconSize="12"
></dees-icon>
<span>Scripts</span>
</div>
<div class="widget-separator"></div>
<!-- Package Checker Widget -->
<div
class="widget ${this.getPackageStatusClass()}"
@click=${this.handlePackageClick}
title="${this.getPackageTooltip()}"
>
<dees-icon
.icon=${this.getPackageIcon()}
iconSize="12"
class="${this.isCheckingPackages ? 'spinning' : ''}"
></dees-icon>
<span>${this.getPackageStatusText()}</span>
</div>
<div class="spacer"></div>
<!-- Future widgets can be added here -->
</div>
`;
}
public async connectedCallback() {
await super.connectedCallback();
// Listen for process-complete events to refresh after package updates
window.addEventListener('process-complete', this.handleProcessComplete as EventListener);
}
public async disconnectedCallback() {
await super.disconnectedCallback();
window.removeEventListener('process-complete', this.handleProcessComplete as EventListener);
}
async firstUpdated() {
await this.loadScripts();
await this.checkPackages();
}
async updated(changedProperties: Map<string, any>) {
if (changedProperties.has('executionEnvironment') && this.executionEnvironment) {
await this.loadScripts();
await this.checkPackages();
}
}
// ========== Script Runner ==========
private async loadScripts(): Promise<void> {
if (!this.executionEnvironment) return;
try {
const packageJsonExists = await this.executionEnvironment.exists('/package.json');
if (!packageJsonExists) {
this.scripts = {};
return;
}
const content = await this.executionEnvironment.readFile('/package.json');
const packageJson = JSON.parse(content);
this.scripts = packageJson.scripts || {};
} catch (error) {
console.warn('Failed to load scripts from package.json:', error);
this.scripts = {};
}
}
private async handleScriptClick(e: MouseEvent): Promise<void> {
e.stopPropagation();
const scriptNames = Object.keys(this.scripts);
if (scriptNames.length === 0) {
return;
}
const menuItems = scriptNames.map(name => ({
name: name,
iconName: 'lucide:terminal' as const,
action: async () => {
await this.runScript(name);
},
}));
await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
}
private async runScript(scriptName: string): Promise<void> {
if (!this.executionEnvironment) return;
// Emit run-process event for the workspace to create a terminal tab
const detail: IRunProcessEventDetail = {
type: 'script',
label: scriptName,
command: 'pnpm',
args: ['run', scriptName],
metadata: { scriptName },
};
this.dispatchEvent(new CustomEvent('run-process', {
bubbles: true,
composed: true,
detail,
}));
}
// ========== Package Checker ==========
private async checkPackages(): Promise<void> {
if (!this.executionEnvironment) {
this.packageStatus = 'idle';
return;
}
try {
const packageJsonExists = await this.executionEnvironment.exists('/package.json');
if (!packageJsonExists) {
this.packageStatus = 'idle';
return;
}
this.packageStatus = 'checking';
this.isCheckingPackages = true;
// Run pnpm outdated --json with timeout
const process = await this.executionEnvironment.spawn('pnpm', ['outdated', '--json']);
let output = '';
// Collect output asynchronously - don't await, stream may not close if no output
const outputReader = process.output.getReader();
const readOutput = async () => {
try {
while (true) {
const { done, value } = await outputReader.read();
if (done) break;
output += value;
}
} catch {
// Ignore stream errors
}
};
// Start reading but don't await - we'll use whatever we have when process exits
readOutput();
// Wait for process exit with timeout (10 seconds)
const exitCode = await Promise.race([
process.exit,
new Promise<number>((resolve) => setTimeout(() => resolve(-1), 10000)),
]);
// Cancel reader when done
try {
await outputReader.cancel();
} catch {
// Ignore cancel errors
}
// Handle timeout
if (exitCode === -1) {
console.warn('Package check timed out');
this.packageStatus = 'error';
return;
}
// pnpm outdated returns exit code 1 if there are outdated packages
if (exitCode === 0) {
// No outdated packages
this.packageStatus = 'up-to-date';
this.outdatedPackages = [];
} else {
// Parse outdated packages
try {
const outdatedData = JSON.parse(output);
this.outdatedPackages = this.parseOutdatedPackages(outdatedData);
this.packageStatus = this.outdatedPackages.length > 0 ? 'updates-available' : 'up-to-date';
} catch {
// If parsing fails but exit code is 1, assume there are updates
this.packageStatus = 'updates-available';
this.outdatedPackages = [];
}
}
} catch (error) {
console.warn('Failed to check for package updates:', error);
this.packageStatus = 'error';
} finally {
this.isCheckingPackages = false;
}
}
private parseOutdatedPackages(data: any): IOutdatedPackage[] {
const packages: IOutdatedPackage[] = [];
// pnpm outdated --json returns an object with package names as keys
if (typeof data === 'object' && data !== null) {
for (const [name, info] of Object.entries(data)) {
const pkgInfo = info as any;
packages.push({
name,
current: pkgInfo.current || 'unknown',
wanted: pkgInfo.wanted || pkgInfo.current || 'unknown',
latest: pkgInfo.latest || pkgInfo.wanted || 'unknown',
type: pkgInfo.dependencyType === 'devDependencies' ? 'devDependencies' : 'dependencies',
});
}
}
return packages;
}
private async handlePackageClick(e: MouseEvent): Promise<void> {
e.stopPropagation();
const menuItems: Parameters<typeof DeesContextmenu.openContextMenuWithOptions>[1] = [];
// Refresh option - show output in terminal
menuItems.push({
name: this.isCheckingPackages ? 'Checking...' : 'Check for updates',
iconName: 'lucide:refreshCw',
action: async () => {
if (this.isCheckingPackages) return;
// Create terminal tab to show pnpm outdated output
const detail: IRunProcessEventDetail = {
type: 'package-update',
label: 'check packages',
command: 'pnpm',
args: ['outdated'],
};
this.dispatchEvent(new CustomEvent('run-process', {
bubbles: true,
composed: true,
detail,
}));
// Also refresh the widget status silently after a delay
setTimeout(() => this.checkPackages(), 3000);
},
});
if (this.outdatedPackages.length > 0) {
menuItems.push({ divider: true });
// Show outdated packages (max 10)
const displayPackages = this.outdatedPackages.slice(0, 10);
for (const pkg of displayPackages) {
menuItems.push({
name: `${pkg.name}: ${pkg.current}${pkg.latest}`,
iconName: 'lucide:package',
action: async () => {
// Update single package
await this.updatePackage(pkg.name);
},
});
}
if (this.outdatedPackages.length > 10) {
menuItems.push({
name: `... and ${this.outdatedPackages.length - 10} more`,
iconName: 'lucide:moreHorizontal',
action: async () => {},
});
}
menuItems.push({ divider: true });
menuItems.push({
name: 'Update all packages',
iconName: 'lucide:arrowUpCircle',
action: async () => {
await this.updateAllPackages();
},
});
}
await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
}
private async updatePackage(packageName: string): Promise<void> {
if (!this.executionEnvironment) return;
// Mark that we have a pending update - will trigger refresh when complete
this.pendingPackageUpdate = true;
// Emit run-process event for the workspace to create a terminal tab
const detail: IRunProcessEventDetail = {
type: 'package-update',
label: `update ${packageName}`,
command: 'pnpm',
args: ['update', '--latest', packageName],
metadata: { packageName },
};
this.dispatchEvent(new CustomEvent('run-process', {
bubbles: true,
composed: true,
detail,
}));
}
private async updateAllPackages(): Promise<void> {
if (!this.executionEnvironment) return;
// Mark that we have a pending update - will trigger refresh when complete
this.pendingPackageUpdate = true;
// Emit run-process event for the workspace to create a terminal tab
const detail: IRunProcessEventDetail = {
type: 'package-update',
label: 'update all',
command: 'pnpm',
args: ['update', '--latest'],
};
this.dispatchEvent(new CustomEvent('run-process', {
bubbles: true,
composed: true,
detail,
}));
}
// ========== Helper Methods ==========
private getPackageStatusClass(): string {
if (this.isCheckingPackages) return '';
return this.packageStatus;
}
private getPackageIcon(): string {
if (this.isCheckingPackages) return 'lucide:loader2';
switch (this.packageStatus) {
case 'up-to-date':
return 'lucide:checkCircle';
case 'updates-available':
return 'lucide:alertCircle';
case 'error':
return 'lucide:xCircle';
default:
return 'lucide:package';
}
}
private getPackageStatusText(): string {
if (this.isCheckingPackages) return 'Checking...';
switch (this.packageStatus) {
case 'up-to-date':
return 'Up to date';
case 'updates-available':
return `${this.outdatedPackages.length} update${this.outdatedPackages.length !== 1 ? 's' : ''}`;
case 'error':
return 'Check failed';
default:
return 'Packages';
}
}
private getPackageTooltip(): string {
if (this.isCheckingPackages) return 'Checking for package updates...';
switch (this.packageStatus) {
case 'up-to-date':
return 'All packages are up to date';
case 'updates-available':
return `${this.outdatedPackages.length} package update${this.outdatedPackages.length !== 1 ? 's' : ''} available`;
case 'error':
return 'Failed to check for updates. Click to retry.';
default:
return 'Click to check for package updates';
}
}
// ========== Public Methods ==========
/**
* Manually trigger a package check
*/
public async refreshPackageStatus(): Promise<void> {
await this.checkPackages();
}
/**
* Manually reload scripts from package.json
*/
public async refreshScripts(): Promise<void> {
await this.loadScripts();
}
}

View File

@@ -0,0 +1 @@
export * from './dees-workspace-bottombar.js';

View File

@@ -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;
}
}
}

View File

@@ -0,0 +1 @@
export * from './dees-workspace-diff-editor.js';

View File

@@ -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 });
}
}
}

View File

@@ -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();

View File

@@ -1 +1,3 @@
export * from './dees-workspace-terminal.js';
export * from './interfaces.js';
export * from './terminal-tab-manager.js';

View File

@@ -0,0 +1,126 @@
import type { Terminal } from 'xterm';
import type { FitAddon } from 'xterm-addon-fit';
import type { IProcessHandle } from '../../00group-runtime/index.js';
/**
* Type of terminal tab based on its source/purpose
*/
export type TTerminalTabType =
| 'shell' // Default interactive shell (jsh)
| 'script' // Script from package.json
| 'package-update' // Package update process
| 'custom'; // External process from API
/**
* Represents a single terminal tab instance
*/
export interface ITerminalTab {
/** Unique identifier for the tab */
id: string;
/** Display label for the tab */
label: string;
/** Icon name (lucide icon) */
iconName: string;
/** Type of terminal process */
type: TTerminalTabType;
/** Whether the tab can be closed */
closeable: boolean;
/** xterm.js Terminal instance */
terminal: Terminal;
/** FitAddon for this terminal */
fitAddon: FitAddon;
/** Process handle (if process is running) */
process: IProcessHandle | null;
/** Process input writer (for interactive terminals) */
inputWriter: WritableStreamDefaultWriter<string> | null;
/** Whether the process has exited */
exited: boolean;
/** Exit code (if process has exited) */
exitCode: number | null;
/** Timestamp when tab was created */
createdAt: number;
/** Optional metadata for script tabs */
metadata?: {
scriptName?: string;
packageName?: string;
command?: string;
};
}
/**
* Options for creating a new terminal tab
*/
export interface ICreateTerminalTabOptions {
/** Display label (auto-generated if not provided) */
label?: string;
/** Tab type */
type: TTerminalTabType;
/** Icon name override */
iconName?: string;
/** Whether the tab can be closed (default: true for non-shell) */
closeable?: boolean;
/** Command to spawn (default: 'jsh' for shell type) */
command?: string;
/** Command arguments */
args?: string[];
/** Additional metadata */
metadata?: ITerminalTab['metadata'];
/** Whether to switch to this tab after creation (default: true) */
switchToTab?: boolean;
}
/**
* Event detail for terminal tab events
*/
export interface ITerminalTabEventDetail {
tabId: string;
}
/**
* Event detail for tab switch events
*/
export interface ITerminalTabSwitchEventDetail {
tabId: string;
previousTabId: string | null;
}
/**
* Event detail for process completion
*/
export interface ITerminalProcessCompleteEventDetail {
tabId: string;
exitCode: number;
}
/**
* Event detail for run-process events from bottom bar
*/
export interface IRunProcessEventDetail {
type: TTerminalTabType;
label: string;
command: string;
args?: string[];
metadata?: {
scriptName?: string;
packageName?: string;
};
}

View File

@@ -0,0 +1,259 @@
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
*/
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
*/
private generateTabId(): string {
this.tabCounter++;
return `terminal-${this.tabCounter}-${Date.now()}`;
}
/**
* Get default label for tab type
*/
private getDefaultLabel(type: TTerminalTabType, metadata?: ITerminalTab['metadata']): string {
switch (type) {
case 'shell':
return 'bash';
case 'script':
return metadata?.scriptName || 'script';
case 'package-update':
return metadata?.packageName ? `update ${metadata.packageName}` : 'update';
case 'custom':
return metadata?.command || 'process';
default:
return 'terminal';
}
}
/**
* Get default icon for tab type
*/
private getDefaultIcon(type: TTerminalTabType): string {
switch (type) {
case 'shell':
return 'lucide:terminal';
case 'script':
return 'lucide:play';
case 'package-update':
return 'lucide:packageCheck';
case 'custom':
return 'lucide:code';
default:
return 'lucide:terminal';
}
}
/**
* Get terminal theme configuration
*/
private getTerminalTheme(isBright: boolean): any {
if (isBright) {
return {
background: '#ffffff',
foreground: '#333333',
cursor: '#333333',
cursorAccent: '#ffffff',
selection: 'rgba(0, 0, 0, 0.2)',
black: '#000000',
red: '#cd3131',
green: '#00bc00',
yellow: '#949800',
blue: '#0451a5',
magenta: '#bc05bc',
cyan: '#0598bc',
white: '#555555',
brightBlack: '#666666',
brightRed: '#cd3131',
brightGreen: '#14ce14',
brightYellow: '#b5ba00',
brightBlue: '#0451a5',
brightMagenta: '#bc05bc',
brightCyan: '#0598bc',
brightWhite: '#a5a5a5',
};
} else {
return {
background: '#000000',
foreground: '#ffffff',
cursor: '#ffffff',
cursorAccent: '#000000',
selection: 'rgba(255, 255, 255, 0.2)',
};
}
}
/**
* 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 using CDN-loaded module
const terminal = new this.xtermBundle.Terminal({
convertEol: true,
cursorBlink: true,
theme: this.getTerminalTheme(isBright),
fontFamily: 'Menlo, Monaco, "Courier New", monospace',
fontSize: 13,
lineHeight: 1.2,
});
// Create FitAddon using CDN-loaded module
const fitAddon = new this.xtermFitAddonBundle.FitAddon();
terminal.loadAddon(fitAddon);
const tab: ITerminalTab = {
id,
label: options.label || this.getDefaultLabel(type, options.metadata),
iconName: options.iconName || this.getDefaultIcon(type),
type,
closeable: options.closeable ?? (type !== 'shell'),
terminal,
fitAddon,
process: null,
inputWriter: null,
exited: false,
exitCode: null,
createdAt: Date.now(),
metadata: options.metadata,
};
this.tabs.set(id, tab);
return tab;
}
/**
* Get tab by ID
*/
getTab(id: string): ITerminalTab | undefined {
return this.tabs.get(id);
}
/**
* Get all tabs as array (ordered by creation time)
*/
getAllTabs(): ITerminalTab[] {
return Array.from(this.tabs.values()).sort((a, b) => a.createdAt - b.createdAt);
}
/**
* Get the number of tabs
*/
getTabCount(): number {
return this.tabs.size;
}
/**
* Check if tab exists
*/
hasTab(id: string): boolean {
return this.tabs.has(id);
}
/**
* Close and cleanup a tab
*/
closeTab(id: string): boolean {
const tab = this.tabs.get(id);
if (!tab) return false;
// Kill process if still running
if (tab.process && !tab.exited) {
try {
tab.process.kill();
} catch (e) {
console.warn('Failed to kill process:', e);
}
}
// Dispose terminal
try {
tab.terminal.dispose();
} catch (e) {
console.warn('Failed to dispose terminal:', e);
}
this.tabs.delete(id);
return true;
}
/**
* Rename a tab
*/
renameTab(id: string, newLabel: string): boolean {
const tab = this.tabs.get(id);
if (!tab) return false;
tab.label = newLabel;
return true;
}
/**
* Update tab process state to exited
*/
markTabExited(id: string, exitCode: number): void {
const tab = this.tabs.get(id);
if (!tab) return;
tab.exited = true;
tab.exitCode = exitCode;
}
/**
* Set process for a tab
*/
setTabProcess(id: string, process: ITerminalTab['process'], inputWriter: ITerminalTab['inputWriter']): void {
const tab = this.tabs.get(id);
if (!tab) return;
tab.process = process;
tab.inputWriter = inputWriter;
}
/**
* Update theme for all terminals
*/
updateAllThemes(isBright: boolean): void {
const theme = this.getTerminalTheme(isBright);
for (const tab of this.tabs.values()) {
tab.terminal.options.theme = theme;
}
}
/**
* Dispose all tabs and cleanup
*/
disposeAll(): void {
for (const [id] of this.tabs) {
this.closeTab(id);
}
this.tabs.clear();
}
}

View File

@@ -17,12 +17,18 @@ import '../dees-workspace-monaco/dees-workspace-monaco.js';
import '../dees-workspace-filetree/dees-workspace-filetree.js';
import { DeesWorkspaceFiletree } from '../dees-workspace-filetree/dees-workspace-filetree.js';
import '../dees-workspace-terminal/dees-workspace-terminal.js';
import { DeesWorkspaceTerminal } from '../dees-workspace-terminal/dees-workspace-terminal.js';
import type { IRunProcessEventDetail } from '../dees-workspace-terminal/interfaces.js';
import '../dees-workspace-terminal-preview/dees-workspace-terminal-preview.js';
import '../dees-workspace-bottombar/dees-workspace-bottombar.js';
import '../../dees-icon/dees-icon.js';
import { DeesWorkspaceMonaco } from '../dees-workspace-monaco/dees-workspace-monaco.js';
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 {
@@ -62,6 +68,7 @@ export class DeesWorkspace extends DeesElement {
'@push.rocks/smartpromise': '^4.2.3',
},
devDependencies: {
'@types/node': '^22.0.0',
typescript: '^5.0.0',
},
},
@@ -250,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;
@@ -275,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
@@ -370,10 +394,18 @@ testSmartPromise();
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
}
.workspace-outer {
display: flex;
flex-direction: column;
height: 100%;
width: 100%;
}
.workspace-container {
display: flex;
flex-direction: row;
height: 100%;
flex: 1;
min-height: 0;
width: 100%;
}
@@ -857,6 +889,7 @@ testSmartPromise();
}
return html`
<div class="workspace-outer">
<div class="${containerClasses}">
<!-- Filetree panel (full height) -->
${this.showFileTree ? html`
@@ -901,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>
@@ -915,6 +957,7 @@ testSmartPromise();
></dees-workspace-monaco>
`}
</div>
<dees-actionbar></dees-actionbar>
</div>
<!-- Horizontal resize handle for terminal -->
@@ -973,6 +1016,13 @@ testSmartPromise();
` : ''}
</div>
</div>
<!-- Bottom Bar (full width) -->
<dees-workspace-bottombar
.executionEnvironment=${this.executionEnvironment}
@run-process=${this.handleRunProcess}
></dees-workspace-bottombar>
</div>
`;
}
@@ -996,6 +1046,7 @@ testSmartPromise();
this.autoSaveInterval = null;
}
this.stopNodeModulesWatcher();
this.stopAllFileWatchers();
}
public async firstUpdated() {
@@ -1012,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() {
@@ -1166,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);
@@ -1190,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
@@ -1226,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
@@ -1484,6 +1731,44 @@ testSmartPromise();
}));
}
// ========== Bottom Bar Event Handlers ==========
/**
* Handle run-process events from bottom bar widgets
* Creates a new terminal tab for the process
*/
private async handleRunProcess(e: CustomEvent<IRunProcessEventDetail>): Promise<void> {
const detail = e.detail;
// Find the terminal component
const terminal = this.shadowRoot?.querySelector('dees-workspace-terminal') as DeesWorkspaceTerminal;
if (!terminal) {
console.warn('Terminal component not found');
return;
}
// Expand terminal if collapsed
if (this.isTerminalCollapsed) {
this.isTerminalCollapsed = false;
}
// Switch to terminal panel
this.activeBottomPanel = 'terminal';
// Wait for UI update
await this.updateComplete;
// Create a new terminal tab for the process
await terminal.createProcessTab({
type: detail.type,
label: detail.label,
command: detail.command,
args: detail.args,
metadata: detail.metadata,
switchToTab: true,
});
}
// ========== Public Layout Methods ==========
/**

View File

@@ -6,3 +6,5 @@ export * from './dees-workspace-terminal/index.js';
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';

View File

@@ -0,0 +1,54 @@
/**
* Action button configuration for the action bar
*/
export interface IActionBarAction {
/** Unique identifier for the action */
id: string;
/** Button label text */
label: string;
/** Primary action gets highlighted styling and receives timeout trigger */
primary?: boolean;
/** Lucide icon name (optional) */
icon?: string;
}
/**
* Configuration options for showing an action bar
*/
export interface IActionBarOptions {
/** Message text to display */
message: string;
/** Lucide icon name for the message (optional) */
icon?: string;
/** Visual type affects coloring */
type?: 'info' | 'warning' | 'error' | 'question';
/** Action buttons to display */
actions: IActionBarAction[];
/** Timeout configuration (optional) */
timeout?: {
/** Duration in milliseconds before auto-triggering default action */
duration: number;
/** ID of the action to auto-trigger when timeout expires */
defaultActionId: string;
};
/** Whether to show a dismiss (X) button */
dismissible?: boolean;
}
/**
* Result returned when an action bar is resolved
*/
export interface IActionBarResult {
/** ID of the action that was triggered */
actionId: string;
/** Whether the action was triggered by timeout (true) or user click (false) */
timedOut: boolean;
}
/**
* Internal queue item for pending action bars
*/
export interface IActionBarQueueItem {
options: IActionBarOptions;
resolve: (result: IActionBarResult) => void;
}

View File

@@ -0,0 +1,500 @@
import {
customElement,
DeesElement,
type TemplateResult,
html,
css,
state,
cssManager,
} from '@design.estate/dees-element';
import { themeDefaultStyles } from '../00theme.js';
import '../dees-icon/dees-icon.js';
import type {
IActionBarOptions,
IActionBarResult,
IActionBarQueueItem,
IActionBarAction,
} from './actionbar.interfaces.js';
declare global {
interface HTMLElementTagNameMap {
'dees-actionbar': DeesActionbar;
}
}
@customElement('dees-actionbar')
export class DeesActionbar extends DeesElement {
// STATIC
public static demo = () => {
const getActionbar = (e: Event) => {
const button = e.currentTarget as HTMLElement;
const container = button.closest('.demo-container');
return container?.querySelector('dees-actionbar') as DeesActionbar | null;
};
const showActionBar = async (e: Event) => {
const actionbar = getActionbar(e);
if (!actionbar) return;
const result = await actionbar.show({
message: 'File changed externally. Reload?',
type: 'warning',
icon: 'lucide:alertTriangle',
actions: [
{ id: 'reload', label: 'Reload', primary: true },
{ id: 'ignore', label: 'Ignore' },
],
timeout: { duration: 5000, defaultActionId: 'reload' },
dismissible: true,
});
console.log('Action bar result:', result);
};
const showErrorBar = async (e: Event) => {
const actionbar = getActionbar(e);
if (!actionbar) return;
const result = await actionbar.show({
message: 'Process failed with exit code 1',
type: 'error',
icon: 'lucide:xCircle',
actions: [
{ id: 'retry', label: 'Retry', primary: true },
{ id: 'dismiss', label: 'Dismiss' },
],
timeout: { duration: 10000, defaultActionId: 'dismiss' },
});
console.log('Error bar result:', result);
};
const showQuestionBar = async (e: Event) => {
const actionbar = getActionbar(e);
if (!actionbar) return;
const result = await actionbar.show({
message: 'Save changes before closing?',
type: 'question',
icon: 'lucide:helpCircle',
actions: [
{ id: 'save', label: 'Save', primary: true },
{ id: 'discard', label: 'Discard' },
{ id: 'cancel', label: 'Cancel' },
],
});
console.log('Question bar result:', result);
};
return html`
<style>
.demo-container {
display: flex;
flex-direction: column;
height: 300px;
border: 1px solid #333;
border-radius: 8px;
overflow: hidden;
}
.demo-content {
flex: 1;
padding: 16px;
display: flex;
gap: 8px;
align-items: flex-start;
}
</style>
<div class="demo-container">
<div class="demo-content">
<dees-button @click=${showActionBar}>Warning</dees-button>
<dees-button @click=${showErrorBar}>Error</dees-button>
<dees-button @click=${showQuestionBar}>Question</dees-button>
</div>
<dees-actionbar></dees-actionbar>
</div>
`;
};
// Queue of pending action bars
private queue: IActionBarQueueItem[] = [];
// Current active bar state
@state() accessor currentBar: IActionBarOptions | null = null;
@state() accessor timeRemaining: number = 0;
@state() accessor progressPercent: number = 100;
@state() accessor isVisible: boolean = false;
// Timeout handling
private timeoutInterval: ReturnType<typeof setInterval> | null = null;
private currentResolve: ((result: IActionBarResult) => void) | null = null;
public static styles = [
themeDefaultStyles,
cssManager.defaultStyles,
css`
:host {
display: grid;
grid-template-rows: 0fr;
transition: grid-template-rows 0.2s ease-out;
}
:host(.visible) {
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;
}
.progress-bar {
height: 3px;
background: ${cssManager.bdTheme('hsl(0 0% 90%)', 'hsl(0 0% 18%)')};
overflow: hidden;
}
.progress-bar-fill {
height: 100%;
background: ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 60%)')};
transition: width 0.1s linear;
}
.progress-bar-fill.warning {
background: ${cssManager.bdTheme('hsl(38 92% 50%)', 'hsl(38 92% 55%)')};
}
.progress-bar-fill.error {
background: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 55%)')};
}
.progress-bar-fill.question {
background: ${cssManager.bdTheme('hsl(270 70% 50%)', 'hsl(270 70% 60%)')};
}
.content {
display: flex;
align-items: center;
padding: 8px 12px;
gap: 12px;
min-height: 32px;
}
.message-section {
display: flex;
align-items: center;
gap: 8px;
flex: 1;
min-width: 0;
}
.message-icon {
flex-shrink: 0;
color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
}
.message-icon.info {
color: ${cssManager.bdTheme('hsl(210 100% 45%)', 'hsl(210 100% 60%)')};
}
.message-icon.warning {
color: ${cssManager.bdTheme('hsl(38 92% 45%)', 'hsl(38 92% 55%)')};
}
.message-icon.error {
color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 55%)')};
}
.message-icon.question {
color: ${cssManager.bdTheme('hsl(270 70% 50%)', 'hsl(270 70% 60%)')};
}
.message-text {
font-size: 13px;
color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 85%)')};
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.actions-section {
display: flex;
align-items: center;
gap: 8px;
flex-shrink: 0;
}
.action-button {
display: flex;
align-items: center;
gap: 4px;
padding: 4px 10px;
border-radius: 4px;
font-size: 12px;
font-weight: 500;
cursor: pointer;
border: 1px solid transparent;
transition: all 0.15s ease;
white-space: nowrap;
}
.action-button.secondary {
background: transparent;
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 70%)')};
border-color: ${cssManager.bdTheme('hsl(0 0% 80%)', 'hsl(0 0% 30%)')};
}
.action-button.secondary:hover {
background: ${cssManager.bdTheme('hsl(0 0% 92%)', 'hsl(0 0% 18%)')};
}
.action-button.primary {
background: ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 55%)')};
color: white;
}
.action-button.primary:hover {
background: ${cssManager.bdTheme('hsl(210 100% 45%)', 'hsl(210 100% 50%)')};
}
.action-button.primary.warning {
background: ${cssManager.bdTheme('hsl(38 92% 45%)', 'hsl(38 92% 50%)')};
}
.action-button.primary.warning:hover {
background: ${cssManager.bdTheme('hsl(38 92% 40%)', 'hsl(38 92% 45%)')};
}
.action-button.primary.error {
background: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 55%)')};
}
.action-button.primary.error:hover {
background: ${cssManager.bdTheme('hsl(0 70% 45%)', 'hsl(0 70% 50%)')};
}
.action-button.primary.question {
background: ${cssManager.bdTheme('hsl(270 70% 50%)', 'hsl(270 70% 55%)')};
}
.action-button.primary.question:hover {
background: ${cssManager.bdTheme('hsl(270 70% 45%)', 'hsl(270 70% 50%)')};
}
.countdown {
font-size: 11px;
opacity: 0.8;
margin-left: 2px;
}
.dismiss-button {
display: flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
border-radius: 4px;
cursor: pointer;
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 50%)')};
transition: all 0.15s ease;
}
.dismiss-button:hover {
background: ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 22%)')};
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 70%)')};
}
`,
];
public render(): TemplateResult {
if (!this.currentBar) {
return html``;
}
const bar = this.currentBar;
const type = bar.type || 'info';
const hasTimeout = bar.timeout && this.timeRemaining > 0;
return html`
<div class="actionbar-item">
${hasTimeout ? html`
<div class="progress-bar">
<div
class="progress-bar-fill ${type}"
style="width: ${this.progressPercent}%"
></div>
</div>
` : ''}
<div class="content">
<div class="message-section">
${bar.icon ? html`
<dees-icon
class="message-icon ${type}"
.icon=${bar.icon}
iconSize="16"
></dees-icon>
` : ''}
<span class="message-text">${bar.message}</span>
</div>
<div class="actions-section">
${bar.actions.map(action => this.renderActionButton(action, bar, hasTimeout))}
${bar.dismissible ? html`
<div
class="dismiss-button"
@click=${() => this.handleDismiss()}
title="Dismiss"
>
<dees-icon .icon=${'lucide:x'} iconSize="14"></dees-icon>
</div>
` : ''}
</div>
</div>
</div>
`;
}
private renderActionButton(
action: IActionBarAction,
bar: IActionBarOptions,
hasTimeout: boolean | undefined
): TemplateResult {
const isPrimary = action.primary;
const type = bar.type || 'info';
const isDefaultAction = bar.timeout?.defaultActionId === action.id;
const showCountdown = hasTimeout && isDefaultAction;
const seconds = Math.ceil(this.timeRemaining / 1000);
return html`
<button
class="action-button ${isPrimary ? `primary ${type}` : 'secondary'}"
@click=${() => this.handleAction(action.id, false)}
>
${action.icon ? html`
<dees-icon .icon=${action.icon} iconSize="12"></dees-icon>
` : ''}
<span>${action.label}</span>
${showCountdown ? html`
<span class="countdown">(${seconds}s)</span>
` : ''}
</button>
`;
}
// ========== Public API ==========
/**
* Show an action bar with the given options.
* Returns a promise that resolves when an action is taken.
*/
public async show(options: IActionBarOptions): Promise<IActionBarResult> {
return new Promise((resolve) => {
// Add to queue
this.queue.push({ options, resolve });
// If no current bar, process queue
if (!this.currentBar) {
this.processQueue();
}
});
}
/**
* Dismiss the current action bar without triggering any action.
*/
public dismiss(): void {
this.handleDismiss();
}
/**
* Clear all pending action bars in the queue.
*/
public clearQueue(): void {
// Resolve all queued items with dismiss
for (const item of this.queue) {
item.resolve({ actionId: 'dismissed', timedOut: false });
}
this.queue = [];
}
// ========== 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) {
// Hide with animation - don't await, let it run async
this.hideCurrentBar();
return;
}
const item = this.queue.shift()!;
this.currentBar = item.options;
this.currentResolve = item.resolve;
this.isVisible = true;
this.classList.add('visible');
// Setup timeout if configured
if (item.options.timeout) {
this.startTimeout(item.options.timeout.duration, item.options.timeout.defaultActionId);
}
}
private startTimeout(duration: number, defaultActionId: string): void {
this.timeRemaining = duration;
this.progressPercent = 100;
const startTime = Date.now();
const updateInterval = 50; // Update every 50ms for smooth animation
this.timeoutInterval = setInterval(() => {
const elapsed = Date.now() - startTime;
this.timeRemaining = Math.max(0, duration - elapsed);
this.progressPercent = (this.timeRemaining / duration) * 100;
if (this.timeRemaining <= 0) {
this.clearTimeoutInterval();
this.handleAction(defaultActionId, true);
}
}, updateInterval);
}
private clearTimeoutInterval(): void {
if (this.timeoutInterval) {
clearInterval(this.timeoutInterval);
this.timeoutInterval = null;
}
}
private handleAction(actionId: string, timedOut: boolean): void {
this.clearTimeoutInterval();
if (this.currentResolve) {
this.currentResolve({ actionId, timedOut });
}
// Process next item in queue
this.processQueue();
}
private handleDismiss(): void {
this.handleAction('dismissed', false);
}
public async disconnectedCallback(): Promise<void> {
await super.disconnectedCallback();
this.clearTimeoutInterval();
}
}

View File

@@ -0,0 +1,2 @@
export * from './dees-actionbar.js';
export * from './actionbar.interfaces.js';

View File

@@ -14,6 +14,7 @@ export * from './00group-runtime/index.js';
export * from './00group-simple/index.js';
// Standalone Components
export * from './dees-actionbar/index.js';
export * from './dees-badge/index.js';
export * from './dees-chips/index.js';
export * from './dees-contextmenu/index.js';

View 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
View 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';

View 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';