Compare commits

..

6 Commits

Author SHA1 Message Date
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
ed18360748 v3.14.2
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 11s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-30 16:31:27 +00:00
f30025957f fix(editor): bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API 2025-12-30 16:31:27 +00:00
14 changed files with 556 additions and 36 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: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@@ -1,5 +1,32 @@
# Changelog
## 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)
bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API
- Bumped dependency monaco-editor from 0.52.2 to 0.55.1 in package.json.
- Generated MONACO_VERSION module updated to 0.55.1 and moved target to ts_web/elements/00group-editor/dees-editor-monaco/version.ts.
- Refactored TypeScript IntelliSense code to use a typed Monaco TS API (added IMonacoTypeScriptAPI, tsApi getter, and replaced direct monaco.languages.typescript.* calls).
- Added test/workspace screenshot .playwright-mcp/workspace-test.png (binary asset).
## 2025-12-30 - 3.14.1 - fix(build)
bump @webcontainer/api and enable skipLibCheck to avoid type-check conflicts

View File

@@ -1,6 +1,6 @@
{
"name": "@design.estate/dees-catalog",
"version": "3.14.1",
"version": "3.16.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",
@@ -38,7 +38,7 @@
"ibantools": "^4.5.1",
"lit": "^3.3.1",
"lucide": "^0.562.0",
"monaco-editor": "0.52.2",
"monaco-editor": "0.55.1",
"pdfjs-dist": "^4.10.38",
"xterm": "^5.3.0",
"xterm-addon-fit": "^0.8.0"

26
pnpm-lock.yaml generated
View File

@@ -75,8 +75,8 @@ importers:
specifier: ^0.562.0
version: 0.562.0
monaco-editor:
specifier: 0.52.2
version: 0.52.2
specifier: 0.55.1
version: 0.55.1
pdfjs-dist:
specifier: ^4.10.38
version: 4.10.38
@@ -2152,6 +2152,9 @@ packages:
resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==}
engines: {node: '>=6'}
dompurify@3.2.7:
resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
dunder-proto@1.0.1:
resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
engines: {node: '>= 0.4'}
@@ -2774,6 +2777,11 @@ packages:
markdown-table@3.0.4:
resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
marked@14.0.0:
resolution: {integrity: sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==}
engines: {node: '>= 18'}
hasBin: true
matcher@5.0.0:
resolution: {integrity: sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -2984,6 +2992,9 @@ packages:
monaco-editor@0.52.2:
resolution: {integrity: sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==}
monaco-editor@0.55.1:
resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==}
mongodb-connection-string-url@3.0.2:
resolution: {integrity: sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==}
@@ -7173,6 +7184,10 @@ snapshots:
dependencies:
'@leichtgewicht/ip-codec': 2.0.5
dompurify@3.2.7:
optionalDependencies:
'@types/trusted-types': 2.0.7
dunder-proto@1.0.1:
dependencies:
call-bind-apply-helpers: 1.0.2
@@ -7892,6 +7907,8 @@ snapshots:
markdown-table@3.0.4: {}
marked@14.0.0: {}
matcher@5.0.0:
dependencies:
escape-string-regexp: 5.0.0
@@ -8273,6 +8290,11 @@ snapshots:
monaco-editor@0.52.2: {}
monaco-editor@0.55.1:
dependencies:
dompurify: 3.2.7
marked: 14.0.0
mongodb-connection-string-url@3.0.2:
dependencies:
'@types/whatwg-url': 11.0.5

View File

@@ -26,7 +26,7 @@ function getMonacoVersion() {
}
function writeVersionModule(version) {
const targetDir = path.join(projectRoot, 'ts_web', 'elements', 'dees-editor');
const targetDir = path.join(projectRoot, 'ts_web', 'elements', '00group-editor', 'dees-editor-monaco');
fs.mkdirSync(targetDir, { recursive: true });
const targetFile = path.join(targetDir, 'version.ts');
const fileContent = `// Auto-generated by scripts/update-monaco-version.cjs\nexport const MONACO_VERSION = '${version}';\n`;

View File

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

View File

@@ -40,6 +40,11 @@ export class DeesEditorMonaco extends DeesElement {
})
accessor language = 'typescript';
@property({
type: String
})
accessor filePath: string = '';
@property({
type: Object
})
@@ -114,14 +119,35 @@ export class DeesEditorMonaco extends DeesElement {
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
const initialTheme = isBright ? 'vs' : 'vs-dark';
const editor = ((window as any).monaco.editor as typeof monaco.editor).create(container, {
value: this.content,
language: this.language,
const monacoInstance = (window as any).monaco as typeof monaco;
// 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,
useShadowDOM: true,
fontSize: 16,
automaticLayout: true,
wordWrap: this.wordWrap
wordWrap: this.wordWrap,
hover: {
enabled: true,
delay: 300,
sticky: true,
above: false,
},
});
// Subscribe to theme changes
@@ -160,7 +186,35 @@ export class DeesEditorMonaco extends DeesElement {
public async updated(changedProperties: Map<string, any>): Promise<void> {
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')) {
const editor = await this.editorDeferred.promise;
const currentValue = editor.getValue();
@@ -176,10 +230,7 @@ export class DeesEditorMonaco extends DeesElement {
const editor = await this.editorDeferred.promise;
const model = editor.getModel();
if (model) {
const monacoInstance = (window as any).monaco;
if (monacoInstance) {
monacoInstance.editor.setModelLanguage(model, this.language);
}
monacoInstance.editor.setModelLanguage(model, this.language);
}
}
}

View File

@@ -1,2 +1,2 @@
// Auto-generated by scripts/update-monaco-version.cjs
export const MONACO_VERSION = '0.52.2';
export const MONACO_VERSION = '0.55.1';

View File

@@ -178,9 +178,25 @@ export function createUser(firstName: string, lastName: string): IUser {
@state()
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 initializationStarted: boolean = false;
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
private intelliSenseInitialized: boolean = false;
public static styles = [
themeDefaultStyles,
@@ -387,6 +403,127 @@ export function createUser(firstName: string, lastName: string): IUser {
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 {
display: flex;
flex-direction: column;
@@ -495,6 +632,7 @@ export function createUser(firstName: string, lastName: string): IUser {
</div>
` : html`
<dees-editor-monaco
.filePath=${this.activeFilePath}
.content=${this.getActiveFileContent()}
.language=${this.getLanguageFromPath(this.activeFilePath)}
@content-change=${this.handleContentChange}
@@ -509,9 +647,24 @@ export function createUser(firstName: string, lastName: string): IUser {
style="height: ${this.isTerminalCollapsed ? 32 : this.terminalHeight}px"
>
<div class="panel-header">
<div class="panel-header-title">
<dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
Terminal
<div class="panel-tabs">
<div
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 class="panel-header-actions">
<div class="panel-action" @click=${this.toggleTerminal}>
@@ -522,12 +675,15 @@ export function createUser(firstName: string, lastName: string): IUser {
</div>
</div>
</div>
<div class="terminal-content">
<div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}">
<dees-terminal
.executionEnvironment=${this.executionEnvironment}
.setupCommand=${''}
></dees-terminal>
</div>
<div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}">
${this.renderProblemsPanel()}
</div>
</div>
` : ''}
</div>
@@ -562,8 +718,7 @@ export function createUser(firstName: string, lastName: string): IUser {
} else if (!this.executionEnvironment.ready) {
await this.executionEnvironment.init();
}
// Initialize IntelliSense after workspace is ready
await this.initializeIntelliSense();
// IntelliSense is initialized lazily when first file is opened (Monaco loads on demand)
} catch (error) {
console.error('Failed to initialize workspace:', error);
// Reset flag to allow retry
@@ -575,16 +730,27 @@ export function createUser(firstName: string, lastName: string): IUser {
private async initializeIntelliSense(): Promise<void> {
if (!this.executionEnvironment) return;
if (this.intelliSenseInitialized) return;
// Wait for Monaco to be available globally
const monacoInstance = (window as any).monaco;
// Wait for Monaco to be available globally (with retry for timing)
let monacoInstance = (window as any).monaco;
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;
}
this.intelliSenseInitialized = true;
this.intelliSenseManager = new TypeScriptIntelliSenseManager();
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 }>) {
@@ -610,6 +776,21 @@ export function createUser(firstName: string, lastName: string): IUser {
{ path, name, content, modified: false },
];
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) {
console.error(`Failed to open file ${path}:`, error);
}
@@ -699,6 +880,103 @@ export function createUser(firstName: string, lastName: string): IUser {
this.isTerminalCollapsed = !this.isTerminalCollapsed;
}
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 },
}));
}
public async saveActiveFile(): Promise<void> {
const file = this.openFiles.find(f => f.path === this.activeFilePath);
if (!file || !this.executionEnvironment) return;

View File

@@ -1,6 +1,23 @@
import type * as monaco from 'monaco-editor';
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
// Monaco TypeScript API types (runtime API still exists, types deprecated in 0.55+)
interface IExtraLibDisposable {
dispose(): void;
}
interface IMonacoTypeScriptAPI {
typescriptDefaults: {
setCompilerOptions(options: Record<string, unknown>): void;
setDiagnosticsOptions(options: Record<string, unknown>): void;
addExtraLib(content: string, filePath?: string): IExtraLibDisposable;
setEagerModelSync(value: boolean): void;
};
ScriptTarget: { ES2020: number };
ModuleKind: { ESNext: number };
ModuleResolutionKind: { NodeJs: number; Bundler?: number };
}
/**
* Manages TypeScript IntelliSense by loading type definitions
* from the virtual filesystem into Monaco.
@@ -10,6 +27,20 @@ export class TypeScriptIntelliSenseManager {
private monacoInstance: typeof monaco | 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+
*/
private get tsApi(): IMonacoTypeScriptAPI | null {
if (!this.monacoInstance) return null;
return (this.monacoInstance.languages as any).typescript as IMonacoTypeScriptAPI;
}
/**
* Initialize with Monaco and execution environment
*/
@@ -20,28 +51,85 @@ export class TypeScriptIntelliSenseManager {
this.monacoInstance = monacoInst;
this.executionEnvironment = env;
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 {
if (!this.monacoInstance) return;
const ts = this.tsApi;
if (!ts) return;
this.monacoInstance.languages.typescript.typescriptDefaults.setCompilerOptions({
target: this.monacoInstance.languages.typescript.ScriptTarget.ES2020,
module: this.monacoInstance.languages.typescript.ModuleKind.ESNext,
moduleResolution: this.monacoInstance.languages.typescript.ModuleResolutionKind.NodeJs,
ts.typescriptDefaults.setCompilerOptions({
target: ts.ScriptTarget.ES2020,
module: ts.ModuleKind.ESNext,
// Use Bundler resolution if available (Monaco 0.45+), fallback to NodeJs
moduleResolution: ts.ModuleResolutionKind.Bundler ?? ts.ModuleResolutionKind.NodeJs,
allowSyntheticDefaultImports: true,
esModuleInterop: true,
strict: true,
noEmit: true,
allowJs: true,
checkJs: false,
allowNonTsExtensions: true,
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,
});
this.monacoInstance.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
ts.typescriptDefaults.setDiagnosticsOptions({
noSemanticValidation: 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);
}
/**
@@ -99,7 +187,8 @@ export class TypeScriptIntelliSenseManager {
}
private async tryLoadPackageTypes(packageName: string): Promise<boolean> {
if (!this.executionEnvironment || !this.monacoInstance) return false;
const ts = this.tsApi;
if (!this.executionEnvironment || !ts) return false;
const basePath = `/node_modules/${packageName}`;
@@ -116,7 +205,7 @@ export class TypeScriptIntelliSenseManager {
const fullTypesPath = `${basePath}/${typesPath}`;
if (await this.executionEnvironment.exists(fullTypesPath)) {
const content = await this.executionEnvironment.readFile(fullTypesPath);
this.monacoInstance.languages.typescript.typescriptDefaults.addExtraLib(
ts.typescriptDefaults.addExtraLib(
content,
`file://${fullTypesPath}`
);
@@ -135,7 +224,7 @@ export class TypeScriptIntelliSenseManager {
for (const dtsPath of commonPaths) {
if (await this.executionEnvironment.exists(dtsPath)) {
const content = await this.executionEnvironment.readFile(dtsPath);
this.monacoInstance.languages.typescript.typescriptDefaults.addExtraLib(
ts.typescriptDefaults.addExtraLib(
content,
`file://${dtsPath}`
);
@@ -150,7 +239,8 @@ export class TypeScriptIntelliSenseManager {
}
private async tryLoadAtTypesPackage(packageName: string): Promise<boolean> {
if (!this.executionEnvironment || !this.monacoInstance) return false;
const ts = this.tsApi;
if (!this.executionEnvironment || !ts) return false;
// Handle scoped packages: @scope/package -> @types/scope__package
const typesPackageName = packageName.startsWith('@')
@@ -163,7 +253,7 @@ export class TypeScriptIntelliSenseManager {
const indexPath = `${basePath}/index.d.ts`;
if (await this.executionEnvironment.exists(indexPath)) {
const content = await this.executionEnvironment.readFile(indexPath);
this.monacoInstance.languages.typescript.typescriptDefaults.addExtraLib(
ts.typescriptDefaults.addExtraLib(
content,
`file://${indexPath}`
);
@@ -187,10 +277,15 @@ export class TypeScriptIntelliSenseManager {
/**
* 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 {
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 existingModel = this.monacoInstance.editor.getModel(uri);
@@ -200,6 +295,53 @@ export class TypeScriptIntelliSenseManager {
const language = this.getLanguageFromPath(path);
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 {