Compare commits

...

6 Commits

Author SHA1 Message Date
9e229543eb v3.17.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
2025-12-31 07:01:59 +00:00
f60836eabf feat(editor): add file explorer toolbar, empty-space context menu, editor auto-save, save-all, and keyboard save shortcuts 2025-12-31 07:01:59 +00:00
318e545435 v3.16.0
Some checks failed
Default (tags) / security (push) Failing after 16s
Default (tags) / test (push) Failing after 14s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-30 17:08:28 +00:00
a823e8aaa6 feat(editor): improve TypeScript IntelliSense and module resolution for Monaco editor 2025-12-30 17:08:28 +00:00
0b06499664 v3.15.0
Some checks failed
Default (tags) / security (push) Failing after 16s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-30 16:55:00 +00:00
d177b5a935 feat(editor): enable file-backed Monaco models and add Problems panel; lazy-init project TypeScript IntelliSense 2025-12-30 16:55:00 +00:00
11 changed files with 725 additions and 51 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@@ -1,5 +1,35 @@
# Changelog # Changelog
## 2025-12-31 - 3.17.0 - feat(editor)
add file explorer toolbar, empty-space context menu, editor auto-save, save-all, and keyboard save shortcuts
- Added filetree toolbar with New File / New Folder actions and toolbar styling
- Added right-click context menu for empty filetree space to create files/folders
- Implemented editor menu button with context menu (Auto Save toggle, Save, Save All)
- Added auto-save toggle with 2s interval and cleanup on disconnect
- Implemented Save and Save All APIs that persist files and update IntelliSense manager
- Added keyboard shortcuts: Cmd/Ctrl+S to save active file and Cmd/Ctrl+Shift+S to save all
- Made tabs scrollable with a tabs container and added an editor menu button
## 2025-12-30 - 3.16.0 - feat(editor)
improve TypeScript IntelliSense and module resolution for Monaco editor
- Add file cache (fileCache) and getFileContent() for synchronous access to project files
- Track and dispose Monaco extra libs (addedExtraLibs) and register project files via addExtraLib to enable TypeScript module resolution
- Add addFileAsExtraLib logic to register .ts/.tsx files also under .js/.jsx paths so ESM imports resolve to TypeScript sources
- Use ModuleResolutionKind.Bundler fallback to NodeJs and set compilerOptions (baseUrl '/', allowImportingTsExtensions, resolveJsonModule) to improve resolution
- Adapt executionEnvironment API usage to readDir/readFile and check entry.type ('directory'|'file') instead of isDirectory/isFile
- Add a debugging/screenshot asset: .playwright-mcp/module-resolution-fixed.png
## 2025-12-30 - 3.15.0 - feat(editor)
enable file-backed Monaco models and add Problems panel; lazy-init project TypeScript IntelliSense
- dees-editor-monaco: add `filePath` property and create/get Monaco models with file:// URIs so editors are backed by real models; sync content into models and handle model switching when filePath changes; enable hover config and improved lifecycle handling.
- dees-editor-workspace: add bottom 'Problems' panel and panel tabs (terminal/problems), diagnosticMarkers state, marker listener, UI for problem list, and navigation to file/position when a problem is clicked; initialize IntelliSense lazily when a file is opened.
- typescript-intellisense: index project .ts/.js files from the virtual filesystem into Monaco models for cross-file resolution, enable allowNonTsExtensions and set eager model sync so TypeScript processes models eagerly.
- General: improved handling for language changes, model language switching, and deferred initialization of the IntelliSense manager.
- Add Playwright test images (workspace screenshots) used by CI/tests.
## 2025-12-30 - 3.14.2 - fix(editor) ## 2025-12-30 - 3.14.2 - fix(editor)
bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API

View File

@@ -1,6 +1,6 @@
{ {
"name": "@design.estate/dees-catalog", "name": "@design.estate/dees-catalog",
"version": "3.14.2", "version": "3.17.0",
"private": false, "private": false,
"description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.", "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", "main": "dist_ts_web/index.js",

View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@design.estate/dees-catalog', name: '@design.estate/dees-catalog',
version: '3.14.2', version: '3.17.0',
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.' description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
} }

View File

@@ -203,6 +203,48 @@ export class DeesEditorFiletree extends DeesElement {
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')}; color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
font-style: italic; font-style: italic;
} }
.filetree-toolbar {
display: flex;
align-items: center;
justify-content: space-between;
height: 36px;
padding: 0 12px;
border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 8%)')};
position: sticky;
top: 0;
z-index: 1;
}
.toolbar-title {
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
}
.toolbar-actions {
display: flex;
gap: 4px;
}
.toolbar-button {
padding: 4px;
border-radius: 4px;
cursor: pointer;
opacity: 0.7;
transition: opacity 0.15s, background 0.15s;
display: flex;
align-items: center;
justify-content: center;
}
.toolbar-button:hover {
opacity: 1;
background: ${cssManager.bdTheme('hsl(0 0% 0% / 0.08)', 'hsl(0 0% 100% / 0.1)')};
}
`, `,
]; ];
@@ -231,18 +273,25 @@ export class DeesEditorFiletree extends DeesElement {
`; `;
} }
if (this.treeData.length === 0) {
return html`
<div class="empty">
No files found.
</div>
`;
}
return html` return html`
<div class="tree-container"> <div class="filetree-toolbar">
${this.renderTree(this.treeData)} <span class="toolbar-title">Explorer</span>
<div class="toolbar-actions">
<div class="toolbar-button" @click=${() => this.createNewFile('/')} title="New File">
<dees-icon .icon=${'lucide:filePlus'} iconSize="16"></dees-icon>
</div>
<div class="toolbar-button" @click=${() => this.createNewFolder('/')} title="New Folder">
<dees-icon .icon=${'lucide:folderPlus'} iconSize="16"></dees-icon>
</div>
</div>
</div> </div>
${this.treeData.length === 0
? html`<div class="empty">No files found.</div>`
: html`
<div class="tree-container" @contextmenu=${this.handleEmptySpaceContextMenu}>
${this.renderTree(this.treeData)}
</div>
`}
`; `;
} }
@@ -414,6 +463,30 @@ export class DeesEditorFiletree extends DeesElement {
await DeesContextmenu.openContextMenuWithOptions(e, menuItems); await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
} }
private async handleEmptySpaceContextMenu(e: MouseEvent) {
// Only trigger if clicking on the container itself, not a tree item
const target = e.target as HTMLElement;
if (target.closest('.tree-item')) return;
e.preventDefault();
e.stopPropagation();
const menuItems = [
{
name: 'New File',
iconName: 'lucide:filePlus',
action: async () => this.createNewFile('/'),
},
{
name: 'New Folder',
iconName: 'lucide:folderPlus',
action: async () => this.createNewFolder('/'),
},
];
await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
}
private async showInputModal(options: { private async showInputModal(options: {
heading: string; heading: string;
label: string; label: string;

View File

@@ -40,6 +40,11 @@ export class DeesEditorMonaco extends DeesElement {
}) })
accessor language = 'typescript'; accessor language = 'typescript';
@property({
type: String
})
accessor filePath: string = '';
@property({ @property({
type: Object type: Object
}) })
@@ -114,14 +119,35 @@ export class DeesEditorMonaco extends DeesElement {
const isBright = domtoolsInstance.themeManager.goBrightBoolean; const isBright = domtoolsInstance.themeManager.goBrightBoolean;
const initialTheme = isBright ? 'vs' : 'vs-dark'; const initialTheme = isBright ? 'vs' : 'vs-dark';
const editor = ((window as any).monaco.editor as typeof monaco.editor).create(container, { const monacoInstance = (window as any).monaco as typeof monaco;
value: this.content,
language: this.language, // Create or get model with proper file URI for TypeScript IntelliSense
let model: monaco.editor.ITextModel | null = null;
if (this.filePath) {
const uri = monacoInstance.Uri.parse(`file://${this.filePath}`);
model = monacoInstance.editor.getModel(uri);
if (!model) {
model = monacoInstance.editor.createModel(this.content, this.language, uri);
} else {
model.setValue(this.content);
}
}
const editor = (monacoInstance.editor as typeof monaco.editor).create(container, {
model: model || undefined,
value: model ? undefined : this.content,
language: model ? undefined : this.language,
theme: initialTheme, theme: initialTheme,
useShadowDOM: true, useShadowDOM: true,
fontSize: 16, fontSize: 16,
automaticLayout: true, automaticLayout: true,
wordWrap: this.wordWrap wordWrap: this.wordWrap,
hover: {
enabled: true,
delay: 300,
sticky: true,
above: false,
},
}); });
// Subscribe to theme changes // Subscribe to theme changes
@@ -160,7 +186,35 @@ export class DeesEditorMonaco extends DeesElement {
public async updated(changedProperties: Map<string, any>): Promise<void> { public async updated(changedProperties: Map<string, any>): Promise<void> {
super.updated(changedProperties); super.updated(changedProperties);
// Handle content changes const monacoInstance = (window as any).monaco as typeof monaco;
if (!monacoInstance) return;
// Handle filePath changes - switch to different model
if (changedProperties.has('filePath') && this.filePath) {
const editor = await this.editorDeferred.promise;
const uri = monacoInstance.Uri.parse(`file://${this.filePath}`);
let model = monacoInstance.editor.getModel(uri);
if (!model) {
model = monacoInstance.editor.createModel(this.content, this.language, uri);
} else {
// Update model content if different
if (model.getValue() !== this.content) {
this.isUpdatingFromExternal = true;
model.setValue(this.content);
this.isUpdatingFromExternal = false;
}
}
// Switch editor to use this model
const currentModel = editor.getModel();
if (currentModel?.uri.toString() !== uri.toString()) {
editor.setModel(model);
}
return; // filePath change handles content too
}
// Handle content changes (when no filePath or filePath unchanged)
if (changedProperties.has('content')) { if (changedProperties.has('content')) {
const editor = await this.editorDeferred.promise; const editor = await this.editorDeferred.promise;
const currentValue = editor.getValue(); const currentValue = editor.getValue();
@@ -176,10 +230,7 @@ export class DeesEditorMonaco extends DeesElement {
const editor = await this.editorDeferred.promise; const editor = await this.editorDeferred.promise;
const model = editor.getModel(); const model = editor.getModel();
if (model) { if (model) {
const monacoInstance = (window as any).monaco; monacoInstance.editor.setModelLanguage(model, this.language);
if (monacoInstance) {
monacoInstance.editor.setModelLanguage(model, this.language);
}
} }
} }
} }

View File

@@ -20,6 +20,7 @@ import '../../dees-terminal/dees-terminal.js';
import '../../dees-icon/dees-icon.js'; import '../../dees-icon/dees-icon.js';
import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js'; import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js';
import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js'; import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js';
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
@@ -178,9 +179,45 @@ export function createUser(firstName: string, lastName: string): IUser {
@state() @state()
accessor isInitializing: boolean = true; accessor isInitializing: boolean = true;
@state()
accessor activeBottomPanel: 'terminal' | 'problems' = 'terminal';
@state()
accessor diagnosticMarkers: Array<{
message: string;
severity: number;
startLineNumber: number;
startColumn: number;
endLineNumber: number;
endColumn: number;
source?: string;
resource: { path: string };
}> = [];
private editorElement: DeesEditorMonaco | null = null; private editorElement: DeesEditorMonaco | null = null;
private initializationStarted: boolean = false; private initializationStarted: boolean = false;
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null; private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
private intelliSenseInitialized: boolean = false;
// Auto-save functionality
@state()
accessor autoSave: boolean = false;
private autoSaveInterval: ReturnType<typeof setInterval> | null = null;
// Keyboard shortcut handler (bound for proper cleanup)
private keydownHandler = (e: KeyboardEvent) => {
// Cmd+S (Mac) or Ctrl+S (Windows/Linux) - Save
if ((e.metaKey || e.ctrlKey) && e.key === 's' && !e.shiftKey) {
e.preventDefault();
this.saveActiveFile();
}
// Cmd+Shift+S - Save All
if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.key.toLowerCase() === 's') {
e.preventDefault();
this.saveAllFiles();
}
};
public static styles = [ public static styles = [
themeDefaultStyles, themeDefaultStyles,
@@ -374,6 +411,31 @@ export function createUser(firstName: string, lastName: string): IUser {
background: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')}; background: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
} }
.tabs-container {
display: flex;
flex: 1;
overflow-x: auto;
}
.editor-menu-button {
padding: 6px 8px;
margin-right: 4px;
margin-left: auto;
border-radius: 4px;
cursor: pointer;
opacity: 0.6;
transition: opacity 0.15s, background 0.15s;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
}
.editor-menu-button:hover {
opacity: 1;
background: ${cssManager.bdTheme('hsl(0 0% 0% / 0.08)', 'hsl(0 0% 100% / 0.1)')};
}
.editor-content { .editor-content {
flex: 1; flex: 1;
position: relative; position: relative;
@@ -387,6 +449,127 @@ export function createUser(firstName: string, lastName: string): IUser {
bottom: 0; bottom: 0;
} }
.problems-content {
position: absolute;
top: 32px;
left: 0;
right: 0;
bottom: 0;
overflow-y: auto;
background: ${cssManager.bdTheme('hsl(0 0% 100%)', 'hsl(0 0% 9%)')};
}
.panel-tabs {
display: flex;
align-items: center;
gap: 0;
}
.panel-tab {
display: flex;
align-items: center;
gap: 6px;
padding: 0 12px;
height: 32px;
cursor: pointer;
font-size: 12px;
font-weight: 500;
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 55%)')};
border-bottom: 2px solid transparent;
transition: all 0.15s ease;
}
.panel-tab:hover {
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 75%)')};
background: ${cssManager.bdTheme('hsl(0 0% 90%)', 'hsl(0 0% 12%)')};
}
.panel-tab.active {
color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 90%)')};
border-bottom-color: ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 60%)')};
}
.panel-tab-badge {
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 18px;
height: 18px;
padding: 0 5px;
border-radius: 9px;
font-size: 11px;
font-weight: 600;
background: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 45%)')};
color: white;
}
.panel-tab-badge.warning {
background: ${cssManager.bdTheme('hsl(40 70% 50%)', 'hsl(40 70% 45%)')};
}
.panel-tab-badge.none {
display: none;
}
.problems-list {
padding: 4px 0;
}
.problem-item {
display: flex;
align-items: flex-start;
gap: 8px;
padding: 6px 12px;
cursor: pointer;
font-size: 12px;
line-height: 1.4;
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 80%)')};
transition: background 0.1s ease;
}
.problem-item:hover {
background: ${cssManager.bdTheme('hsl(0 0% 95%)', 'hsl(0 0% 15%)')};
}
.problem-icon {
flex-shrink: 0;
margin-top: 2px;
}
.problem-icon.error {
color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 60%)')};
}
.problem-icon.warning {
color: ${cssManager.bdTheme('hsl(40 70% 50%)', 'hsl(40 70% 60%)')};
}
.problem-details {
flex: 1;
min-width: 0;
}
.problem-message {
word-break: break-word;
}
.problem-location {
margin-top: 2px;
font-size: 11px;
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 55%)')};
}
.problems-empty {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100%;
color: ${cssManager.bdTheme('hsl(0 0% 55%)', 'hsl(0 0% 50%)')};
font-size: 13px;
gap: 8px;
}
.empty-state { .empty-state {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -474,18 +657,23 @@ export function createUser(firstName: string, lastName: string): IUser {
<div class="editor-panel"> <div class="editor-panel">
<div class="tabs-bar"> <div class="tabs-bar">
${this.openFiles.map(file => html` <div class="tabs-container">
<div ${this.openFiles.map(file => html`
class="tab ${file.path === this.activeFilePath ? 'active' : ''}" <div
@click=${() => this.activateFile(file.path)} class="tab ${file.path === this.activeFilePath ? 'active' : ''}"
> @click=${() => this.activateFile(file.path)}
${file.modified ? html`<span class="tab-modified"></span>` : ''} >
<span class="tab-name">${file.name}</span> ${file.modified ? html`<span class="tab-modified"></span>` : ''}
<span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}> <span class="tab-name">${file.name}</span>
<dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon> <span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
</span> <dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
</div> </span>
`)} </div>
`)}
</div>
<div class="editor-menu-button" @click=${this.showEditorMenu} title="Editor options">
<dees-icon .icon=${'lucide:moreVertical'} iconSize="16"></dees-icon>
</div>
</div> </div>
<div class="editor-content"> <div class="editor-content">
${this.openFiles.length === 0 ? html` ${this.openFiles.length === 0 ? html`
@@ -495,6 +683,7 @@ export function createUser(firstName: string, lastName: string): IUser {
</div> </div>
` : html` ` : html`
<dees-editor-monaco <dees-editor-monaco
.filePath=${this.activeFilePath}
.content=${this.getActiveFileContent()} .content=${this.getActiveFileContent()}
.language=${this.getLanguageFromPath(this.activeFilePath)} .language=${this.getLanguageFromPath(this.activeFilePath)}
@content-change=${this.handleContentChange} @content-change=${this.handleContentChange}
@@ -509,9 +698,24 @@ export function createUser(firstName: string, lastName: string): IUser {
style="height: ${this.isTerminalCollapsed ? 32 : this.terminalHeight}px" style="height: ${this.isTerminalCollapsed ? 32 : this.terminalHeight}px"
> >
<div class="panel-header"> <div class="panel-header">
<div class="panel-header-title"> <div class="panel-tabs">
<dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon> <div
Terminal class="panel-tab ${this.activeBottomPanel === 'terminal' ? 'active' : ''}"
@click=${() => this.activeBottomPanel = 'terminal'}
>
<dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
Terminal
</div>
<div
class="panel-tab ${this.activeBottomPanel === 'problems' ? 'active' : ''}"
@click=${() => this.activeBottomPanel = 'problems'}
>
<dees-icon .icon=${'lucide:circleAlert'} iconSize="14"></dees-icon>
Problems
${this.diagnosticMarkers.length > 0 ? html`
<span class="panel-tab-badge ${this.getErrorCount() === 0 ? 'warning' : ''}">${this.diagnosticMarkers.length}</span>
` : ''}
</div>
</div> </div>
<div class="panel-header-actions"> <div class="panel-header-actions">
<div class="panel-action" @click=${this.toggleTerminal}> <div class="panel-action" @click=${this.toggleTerminal}>
@@ -522,18 +726,35 @@ export function createUser(firstName: string, lastName: string): IUser {
</div> </div>
</div> </div>
</div> </div>
<div class="terminal-content"> <div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}">
<dees-terminal <dees-terminal
.executionEnvironment=${this.executionEnvironment} .executionEnvironment=${this.executionEnvironment}
.setupCommand=${''} .setupCommand=${''}
></dees-terminal> ></dees-terminal>
</div> </div>
<div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}">
${this.renderProblemsPanel()}
</div>
</div> </div>
` : ''} ` : ''}
</div> </div>
`; `;
} }
async connectedCallback() {
await super.connectedCallback();
document.addEventListener('keydown', this.keydownHandler);
}
async disconnectedCallback() {
await super.disconnectedCallback();
document.removeEventListener('keydown', this.keydownHandler);
if (this.autoSaveInterval) {
clearInterval(this.autoSaveInterval);
this.autoSaveInterval = null;
}
}
public async firstUpdated() { public async firstUpdated() {
if (this.executionEnvironment) { if (this.executionEnvironment) {
await this.initializeWorkspace(); await this.initializeWorkspace();
@@ -562,8 +783,7 @@ export function createUser(firstName: string, lastName: string): IUser {
} else if (!this.executionEnvironment.ready) { } else if (!this.executionEnvironment.ready) {
await this.executionEnvironment.init(); await this.executionEnvironment.init();
} }
// Initialize IntelliSense after workspace is ready // IntelliSense is initialized lazily when first file is opened (Monaco loads on demand)
await this.initializeIntelliSense();
} catch (error) { } catch (error) {
console.error('Failed to initialize workspace:', error); console.error('Failed to initialize workspace:', error);
// Reset flag to allow retry // Reset flag to allow retry
@@ -575,16 +795,27 @@ export function createUser(firstName: string, lastName: string): IUser {
private async initializeIntelliSense(): Promise<void> { private async initializeIntelliSense(): Promise<void> {
if (!this.executionEnvironment) return; if (!this.executionEnvironment) return;
if (this.intelliSenseInitialized) return;
// Wait for Monaco to be available globally // Wait for Monaco to be available globally (with retry for timing)
const monacoInstance = (window as any).monaco; let monacoInstance = (window as any).monaco;
if (!monacoInstance) { if (!monacoInstance) {
console.warn('Monaco not loaded, IntelliSense disabled'); // Monaco loads asynchronously when the editor mounts, wait a bit
await new Promise(resolve => setTimeout(resolve, 100));
monacoInstance = (window as any).monaco;
}
if (!monacoInstance) {
console.warn('Monaco not yet loaded, IntelliSense will be initialized later');
return; return;
} }
this.intelliSenseInitialized = true;
this.intelliSenseManager = new TypeScriptIntelliSenseManager(); this.intelliSenseManager = new TypeScriptIntelliSenseManager();
await this.intelliSenseManager.init(monacoInstance, this.executionEnvironment); await this.intelliSenseManager.init(monacoInstance, this.executionEnvironment);
// Set up marker listener for Problems panel
this.setupMarkerListener();
} }
private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) { private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
@@ -610,6 +841,21 @@ export function createUser(firstName: string, lastName: string): IUser {
{ path, name, content, modified: false }, { path, name, content, modified: false },
]; ];
this.activeFilePath = path; this.activeFilePath = 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
await this.updateComplete;
// Give Monaco time to load via require.js
await new Promise(resolve => setTimeout(resolve, 500));
await this.initializeIntelliSense();
// Process the initial file content for IntelliSense
const language = this.getLanguageFromPath(path);
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
await this.intelliSenseManager.processContentChange(content);
}
}
} catch (error) { } catch (error) {
console.error(`Failed to open file ${path}:`, error); console.error(`Failed to open file ${path}:`, error);
} }
@@ -699,18 +945,24 @@ export function createUser(firstName: string, lastName: string): IUser {
this.isTerminalCollapsed = !this.isTerminalCollapsed; this.isTerminalCollapsed = !this.isTerminalCollapsed;
} }
// ========== Save Operations ==========
public async saveActiveFile(): Promise<void> { public async saveActiveFile(): Promise<void> {
const file = this.openFiles.find(f => f.path === this.activeFilePath); const file = this.openFiles.find(f => f.path === this.activeFilePath);
if (!file || !this.executionEnvironment) return; if (!file || !this.executionEnvironment) return;
try { try {
await this.executionEnvironment.writeFile(file.path, file.content); await this.executionEnvironment.writeFile(file.path, file.content);
const fileIndex = this.openFiles.findIndex(f => f.path === this.activeFilePath);
this.openFiles = [ // Update file state to mark as saved
...this.openFiles.slice(0, fileIndex), this.openFiles = this.openFiles.map(f =>
{ ...file, modified: false }, f.path === file.path ? { ...f, modified: false } : f
...this.openFiles.slice(fileIndex + 1), );
];
// Update IntelliSense manager with latest content
if (this.intelliSenseManager) {
this.intelliSenseManager.addFileModel(file.path, file.content);
}
} catch (error) { } catch (error) {
console.error('Failed to save file:', error); console.error('Failed to save file:', error);
} }
@@ -722,11 +974,160 @@ export function createUser(firstName: string, lastName: string): IUser {
for (const file of this.openFiles.filter(f => f.modified)) { for (const file of this.openFiles.filter(f => f.modified)) {
try { try {
await this.executionEnvironment.writeFile(file.path, file.content); await this.executionEnvironment.writeFile(file.path, file.content);
// Update IntelliSense manager
if (this.intelliSenseManager) {
this.intelliSenseManager.addFileModel(file.path, file.content);
}
} catch (error) { } catch (error) {
console.error(`Failed to save ${file.path}:`, error); console.error(`Failed to save ${file.path}:`, error);
} }
} }
// Mark all files as saved
this.openFiles = this.openFiles.map(f => ({ ...f, modified: false })); this.openFiles = this.openFiles.map(f => ({ ...f, modified: false }));
} }
// ========== Editor Menu ==========
private async showEditorMenu(e: MouseEvent) {
e.stopPropagation();
const menuItems: Parameters<typeof DeesContextmenu.openContextMenuWithOptions>[1] = [
{
name: this.autoSave ? '✓ Auto Save' : 'Auto Save',
iconName: 'lucide:save',
action: async () => this.toggleAutoSave(),
},
{ divider: true },
{
name: 'Save',
iconName: 'lucide:save',
action: async () => this.saveActiveFile(),
},
{
name: 'Save All',
iconName: 'lucide:save',
action: async () => this.saveAllFiles(),
},
];
await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
}
private toggleAutoSave() {
this.autoSave = !this.autoSave;
if (this.autoSave) {
// Save every 2 seconds if there are changes
this.autoSaveInterval = setInterval(() => {
const hasUnsaved = this.openFiles.some(f => f.modified);
if (hasUnsaved) {
this.saveAllFiles();
}
}, 2000);
} else {
if (this.autoSaveInterval) {
clearInterval(this.autoSaveInterval);
this.autoSaveInterval = null;
}
}
}
private getErrorCount(): number {
// Monaco MarkerSeverity: Error = 8, Warning = 4, Info = 2, Hint = 1
return this.diagnosticMarkers.filter(m => m.severity === 8).length;
}
private renderProblemsPanel(): TemplateResult {
if (this.diagnosticMarkers.length === 0) {
return html`
<div class="problems-empty">
<dees-icon .icon=${'lucide:checkCircle'} iconSize="24"></dees-icon>
<span>No problems detected</span>
</div>
`;
}
return html`
<div class="problems-list">
${this.diagnosticMarkers.map(marker => html`
<div class="problem-item" @click=${() => this.navigateToProblem(marker)}>
<dees-icon
class="problem-icon ${marker.severity === 8 ? 'error' : 'warning'}"
.icon=${marker.severity === 8 ? 'lucide:circleX' : 'lucide:triangleAlert'}
iconSize="14"
></dees-icon>
<div class="problem-details">
<div class="problem-message">${marker.message}</div>
<div class="problem-location">
${marker.resource.path.split('/').pop()} (${marker.startLineNumber}, ${marker.startColumn})
${marker.source ? `[${marker.source}]` : ''}
</div>
</div>
</div>
`)}
</div>
`;
}
private async navigateToProblem(marker: typeof this.diagnosticMarkers[0]) {
// Extract file path from resource
const filePath = marker.resource.path;
const fileName = filePath.split('/').pop() || '';
// Open the file if not already open
const existingFile = this.openFiles.find(f => f.path === filePath);
if (!existingFile) {
await this.openFile(filePath, fileName);
} else {
this.activeFilePath = filePath;
}
// Wait for editor to be ready, then navigate to the line
await this.updateComplete;
const editorElement = this.shadowRoot?.querySelector('dees-editor-monaco') as DeesEditorMonaco;
if (editorElement) {
const editor = await editorElement.editorDeferred.promise;
editor.revealLineInCenter(marker.startLineNumber);
editor.setPosition({
lineNumber: marker.startLineNumber,
column: marker.startColumn,
});
editor.focus();
}
}
private setupMarkerListener() {
const monacoInstance = (window as any).monaco;
if (!monacoInstance) return;
// Listen for marker changes
monacoInstance.editor.onDidChangeMarkers((uris: any[]) => {
this.updateDiagnosticMarkers();
});
// Initial load
this.updateDiagnosticMarkers();
}
private updateDiagnosticMarkers() {
const monacoInstance = (window as any).monaco;
if (!monacoInstance) return;
// Get all markers from Monaco
const allMarkers = monacoInstance.editor.getModelMarkers({});
// Transform to our format
this.diagnosticMarkers = allMarkers.map((m: any) => ({
message: m.message,
severity: m.severity,
startLineNumber: m.startLineNumber,
startColumn: m.startColumn,
endLineNumber: m.endLineNumber,
endColumn: m.endColumn,
source: m.source,
resource: { path: m.resource.path },
}));
}
} }

View File

@@ -2,15 +2,20 @@ import type * as monaco from 'monaco-editor';
import type { IExecutionEnvironment } from '../../00group-runtime/index.js'; import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
// Monaco TypeScript API types (runtime API still exists, types deprecated in 0.55+) // Monaco TypeScript API types (runtime API still exists, types deprecated in 0.55+)
interface IExtraLibDisposable {
dispose(): void;
}
interface IMonacoTypeScriptAPI { interface IMonacoTypeScriptAPI {
typescriptDefaults: { typescriptDefaults: {
setCompilerOptions(options: Record<string, unknown>): void; setCompilerOptions(options: Record<string, unknown>): void;
setDiagnosticsOptions(options: Record<string, unknown>): void; setDiagnosticsOptions(options: Record<string, unknown>): void;
addExtraLib(content: string, filePath?: string): void; addExtraLib(content: string, filePath?: string): IExtraLibDisposable;
setEagerModelSync(value: boolean): void;
}; };
ScriptTarget: { ES2020: number }; ScriptTarget: { ES2020: number };
ModuleKind: { ESNext: number }; ModuleKind: { ESNext: number };
ModuleResolutionKind: { NodeJs: number }; ModuleResolutionKind: { NodeJs: number; Bundler?: number };
} }
/** /**
@@ -22,6 +27,12 @@ export class TypeScriptIntelliSenseManager {
private monacoInstance: typeof monaco | null = null; private monacoInstance: typeof monaco | null = null;
private executionEnvironment: IExecutionEnvironment | null = null; private executionEnvironment: IExecutionEnvironment | null = null;
// Cache of file contents for synchronous access and module resolution
private fileCache: Map<string, string> = new Map();
// Track extra libs added for cleanup
private addedExtraLibs: Map<string, IExtraLibDisposable> = new Map();
/** /**
* Get TypeScript API with proper typing for Monaco 0.55+ * Get TypeScript API with proper typing for Monaco 0.55+
*/ */
@@ -40,6 +51,50 @@ export class TypeScriptIntelliSenseManager {
this.monacoInstance = monacoInst; this.monacoInstance = monacoInst;
this.executionEnvironment = env; this.executionEnvironment = env;
this.configureCompilerOptions(); this.configureCompilerOptions();
// Load all project TypeScript/JavaScript files into Monaco for cross-file resolution
await this.loadAllProjectFiles();
}
/**
* Recursively load all .ts/.js files from the virtual filesystem into Monaco
*/
private async loadAllProjectFiles(): Promise<void> {
if (!this.executionEnvironment) return;
await this.loadFilesFromDirectory('/');
}
/**
* Recursively load files from a directory
*/
private async loadFilesFromDirectory(dirPath: string): Promise<void> {
if (!this.executionEnvironment) return;
try {
const entries = await this.executionEnvironment.readDir(dirPath);
for (const entry of entries) {
const fullPath = dirPath === '/' ? `/${entry.name}` : `${dirPath}/${entry.name}`;
// Skip node_modules - too large and handled separately via addExtraLib
if (entry.name === 'node_modules') continue;
if (entry.type === 'directory') {
await this.loadFilesFromDirectory(fullPath);
} else if (entry.type === 'file') {
const ext = entry.name.split('.').pop()?.toLowerCase();
if (ext === 'ts' || ext === 'tsx' || ext === 'js' || ext === 'jsx') {
try {
const content = await this.executionEnvironment.readFile(fullPath);
this.addFileModel(fullPath, content);
} catch {
// Ignore files that can't be read
}
}
}
}
} catch {
// Directory might not exist or not be readable
}
} }
private configureCompilerOptions(): void { private configureCompilerOptions(): void {
@@ -49,20 +104,32 @@ export class TypeScriptIntelliSenseManager {
ts.typescriptDefaults.setCompilerOptions({ ts.typescriptDefaults.setCompilerOptions({
target: ts.ScriptTarget.ES2020, target: ts.ScriptTarget.ES2020,
module: ts.ModuleKind.ESNext, module: ts.ModuleKind.ESNext,
moduleResolution: ts.ModuleResolutionKind.NodeJs, // Use Bundler resolution if available (Monaco 0.45+), fallback to NodeJs
moduleResolution: ts.ModuleResolutionKind.Bundler ?? ts.ModuleResolutionKind.NodeJs,
allowSyntheticDefaultImports: true, allowSyntheticDefaultImports: true,
esModuleInterop: true, esModuleInterop: true,
strict: true, strict: true,
noEmit: true, noEmit: true,
allowJs: true, allowJs: true,
checkJs: false, checkJs: false,
allowNonTsExtensions: true,
lib: ['es2020', 'dom', 'dom.iterable'], lib: ['es2020', 'dom', 'dom.iterable'],
// Set baseUrl to root for resolving absolute imports
baseUrl: '/',
// Allow importing .ts extensions directly (useful for some setups)
allowImportingTsExtensions: true,
// Resolve JSON modules
resolveJsonModule: true,
}); });
ts.typescriptDefaults.setDiagnosticsOptions({ ts.typescriptDefaults.setDiagnosticsOptions({
noSemanticValidation: false, noSemanticValidation: false,
noSyntaxValidation: false, noSyntaxValidation: false,
}); });
// Enable eager model sync so TypeScript immediately processes all models
// This is critical for cross-file IntelliSense to work without requiring edits
ts.typescriptDefaults.setEagerModelSync(true);
} }
/** /**
@@ -210,10 +277,15 @@ export class TypeScriptIntelliSenseManager {
/** /**
* Add a file model to Monaco for cross-file IntelliSense * Add a file model to Monaco for cross-file IntelliSense
* Also registers the file with TypeScript via addExtraLib for module resolution
*/ */
public addFileModel(path: string, content: string): void { public addFileModel(path: string, content: string): void {
if (!this.monacoInstance) return; if (!this.monacoInstance) return;
// Cache the content for sync access
this.fileCache.set(path, content);
// Create/update the editor model
const uri = this.monacoInstance.Uri.parse(`file://${path}`); const uri = this.monacoInstance.Uri.parse(`file://${path}`);
const existingModel = this.monacoInstance.editor.getModel(uri); const existingModel = this.monacoInstance.editor.getModel(uri);
@@ -223,6 +295,53 @@ export class TypeScriptIntelliSenseManager {
const language = this.getLanguageFromPath(path); const language = this.getLanguageFromPath(path);
this.monacoInstance.editor.createModel(content, language, uri); this.monacoInstance.editor.createModel(content, language, uri);
} }
// Also add as extra lib for TypeScript module resolution
// This is critical - TypeScript's resolver uses extra libs, not editor models
this.addFileAsExtraLib(path, content);
}
/**
* Add a file as an extra lib for TypeScript module resolution.
* This enables TypeScript to resolve imports to project files.
*/
private addFileAsExtraLib(path: string, content: string): void {
const ts = this.tsApi;
if (!ts) return;
// Dispose existing lib if present (for updates)
const existing = this.addedExtraLibs.get(path);
if (existing) {
existing.dispose();
}
// Add the file with its actual path
const filePath = `file://${path}`;
const disposable = ts.typescriptDefaults.addExtraLib(content, filePath);
this.addedExtraLibs.set(path, disposable);
// For .ts files, also add with .js extension to handle ESM imports
// (e.g., import from './utils.js' should resolve to ./utils.ts)
if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
const jsPath = path.replace(/\.ts$/, '.js');
const jsFilePath = `file://${jsPath}`;
const jsDisposable = ts.typescriptDefaults.addExtraLib(content, jsFilePath);
this.addedExtraLibs.set(jsPath, jsDisposable);
this.fileCache.set(jsPath, content);
} else if (path.endsWith('.tsx')) {
const jsxPath = path.replace(/\.tsx$/, '.jsx');
const jsxFilePath = `file://${jsxPath}`;
const jsxDisposable = ts.typescriptDefaults.addExtraLib(content, jsxFilePath);
this.addedExtraLibs.set(jsxPath, jsxDisposable);
this.fileCache.set(jsxPath, content);
}
}
/**
* Get cached file content for synchronous access
*/
public getFileContent(path: string): string | undefined {
return this.fileCache.get(path);
} }
private getLanguageFromPath(path: string): string { private getLanguageFromPath(path: string): string {