Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e229543eb | |||
| f60836eabf | |||
| 318e545435 | |||
| a823e8aaa6 | |||
| 0b06499664 | |||
| d177b5a935 | |||
| ed18360748 | |||
| f30025957f | |||
| 745cf82fd1 | |||
| cd81d67695 | |||
| e962b28dd0 | |||
| ad8a9513d9 | |||
| 339b0e784d | |||
| c27b532aaa |
BIN
.playwright-mcp/intellisense-test.png
Normal file
BIN
.playwright-mcp/intellisense-test.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 66 KiB |
BIN
.playwright-mcp/module-resolution-fixed.png
Normal file
BIN
.playwright-mcp/module-resolution-fixed.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
BIN
.playwright-mcp/workspace-full.png
Normal file
BIN
.playwright-mcp/workspace-full.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 69 KiB |
BIN
.playwright-mcp/workspace-test.png
Normal file
BIN
.playwright-mcp/workspace-test.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 102 KiB |
BIN
.playwright-mcp/workspace-with-problems-panel.png
Normal file
BIN
.playwright-mcp/workspace-with-problems-panel.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 69 KiB |
BIN
.playwright-mcp/workspace-working.png
Normal file
BIN
.playwright-mcp/workspace-working.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
62
changelog.md
62
changelog.md
@@ -1,5 +1,67 @@
|
||||
# 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)
|
||||
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
|
||||
|
||||
- Updated @webcontainer/api from 1.2.0 to 1.6.1
|
||||
- Added "skipLibCheck": true to tsconfig.json compilerOptions to suppress external library type errors
|
||||
- No breaking changes expected; this is a build/dev fix
|
||||
|
||||
## 2025-12-30 - 3.14.0 - feat(editor)
|
||||
add modal prompts for file/folder creation, improve Monaco editor reactivity and add TypeScript IntelliSense support
|
||||
|
||||
- Replace window.prompt for new file/folder with DeesModal + DeesInputText (showInputModal) to provide a focused modal input UX.
|
||||
- Monaco editor: add language property, handle external content updates without emitting change events (isUpdatingFromExternal), dispatch 'content-change' events, and apply language changes at runtime.
|
||||
- Add TypeScriptIntelliSenseManager to load .d.ts/type packages from the virtual filesystem (/node_modules), parse imports, load @types fallbacks, and add file models to Monaco for cross-file IntelliSense.
|
||||
- Workspace demo now mounts an initial TypeScript project and exposes initializationPromise to wait for external setup; workspace initializes IntelliSense and processes content changes to keep types up to date.
|
||||
- Export typescript-intellisense from workspace index so the manager is available to consumers.
|
||||
|
||||
## 2025-12-30 - 3.13.1 - fix(webcontainer)
|
||||
prevent double initialization and race conditions when booting WebContainer and loading editor workspace/file tree
|
||||
|
||||
- Add loadTreeStarted flag in dees-editor-filetree to avoid double-loading the file tree and reset it on refresh or on error to allow retries.
|
||||
- Add initializationStarted flag in dees-editor-workspace to prevent duplicate workspace initialization and reset it on initialization failure to allow retry.
|
||||
- Make WebContainerEnvironment use a shared singleton container and a bootPromise so only one WebContainer boot runs per page; instances wait for an ongoing boot instead of booting again.
|
||||
- Reset bootPromise/sharedContainer on boot failure and clear them on teardown so subsequent attempts can retry cleanly.
|
||||
|
||||
## 2025-12-30 - 3.13.0 - feat(editor/runtime)
|
||||
Replace bare editor with Monaco-based editor and add runtime + workspace/filetree integration
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@design.estate/dees-catalog",
|
||||
"version": "3.13.0",
|
||||
"version": "3.17.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",
|
||||
@@ -32,13 +32,13 @@
|
||||
"@tiptap/extension-underline": "^2.23.0",
|
||||
"@tiptap/starter-kit": "^2.23.0",
|
||||
"@tsclass/tsclass": "^9.3.0",
|
||||
"@webcontainer/api": "1.2.0",
|
||||
"@webcontainer/api": "1.6.1",
|
||||
"apexcharts": "^5.3.6",
|
||||
"highlight.js": "11.11.1",
|
||||
"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"
|
||||
|
||||
35
pnpm-lock.yaml
generated
35
pnpm-lock.yaml
generated
@@ -57,8 +57,8 @@ importers:
|
||||
specifier: ^9.3.0
|
||||
version: 9.3.0
|
||||
'@webcontainer/api':
|
||||
specifier: 1.2.0
|
||||
version: 1.2.0
|
||||
specifier: 1.6.1
|
||||
version: 1.6.1
|
||||
apexcharts:
|
||||
specifier: ^5.3.6
|
||||
version: 5.3.6
|
||||
@@ -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
|
||||
@@ -1760,6 +1760,9 @@ packages:
|
||||
'@webcontainer/api@1.2.0':
|
||||
resolution: {integrity: sha512-tzoKBd4lLdhHy5GHFpUkl+ndoSba8JqmB7x0ZQFnWfjbcbQOvKQfxA8MEMUYhgqjWHnbrWdAfnBEHz5f5lYG5A==}
|
||||
|
||||
'@webcontainer/api@1.6.1':
|
||||
resolution: {integrity: sha512-2RS2KiIw32BY1Icf6M1DvqSmcon9XICZCDgS29QJb2NmF12ZY2V5Ia+949hMKB3Wno+P/Y8W+sPP59PZeXSELg==}
|
||||
|
||||
'@yr/monotone-cubic-spline@1.0.3':
|
||||
resolution: {integrity: sha512-FQXkOta0XBSUPHndIKON2Y9JeQz5ZeMqLYZVVK93FliNBFm7LNMIZmY6FrMEB9XPcDbE2bekMbZD6kzDkxwYjA==}
|
||||
|
||||
@@ -2149,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'}
|
||||
@@ -2771,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}
|
||||
@@ -2981,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==}
|
||||
|
||||
@@ -6800,6 +6814,8 @@ snapshots:
|
||||
|
||||
'@webcontainer/api@1.2.0': {}
|
||||
|
||||
'@webcontainer/api@1.6.1': {}
|
||||
|
||||
'@yr/monotone-cubic-spline@1.0.3': {}
|
||||
|
||||
accepts@1.3.8:
|
||||
@@ -7168,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
|
||||
@@ -7887,6 +7907,8 @@ snapshots:
|
||||
|
||||
markdown-table@3.0.4: {}
|
||||
|
||||
marked@14.0.0: {}
|
||||
|
||||
matcher@5.0.0:
|
||||
dependencies:
|
||||
escape-string-regexp: 5.0.0
|
||||
@@ -8268,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
|
||||
|
||||
@@ -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`;
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@design.estate/dees-catalog',
|
||||
version: '3.13.0',
|
||||
version: '3.17.0',
|
||||
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
||||
}
|
||||
|
||||
@@ -14,6 +14,9 @@ import type { IExecutionEnvironment, IFileEntry } from '../../00group-runtime/in
|
||||
import '../../dees-icon/dees-icon.js';
|
||||
import '../../dees-contextmenu/dees-contextmenu.js';
|
||||
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
|
||||
import { DeesModal } from '../../dees-modal/dees-modal.js';
|
||||
import '../../00group-input/dees-input-text/dees-input-text.js';
|
||||
import { DeesInputText } from '../../00group-input/dees-input-text/dees-input-text.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -55,6 +58,7 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
accessor errorMessage: string = '';
|
||||
|
||||
private expandedPaths: Set<string> = new Set();
|
||||
private loadTreeStarted: boolean = false;
|
||||
|
||||
public static styles = [
|
||||
themeDefaultStyles,
|
||||
@@ -199,6 +203,48 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
|
||||
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)')};
|
||||
}
|
||||
`,
|
||||
];
|
||||
|
||||
@@ -227,18 +273,25 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
`;
|
||||
}
|
||||
|
||||
if (this.treeData.length === 0) {
|
||||
return html`
|
||||
<div class="empty">
|
||||
No files found.
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
return html`
|
||||
<div class="tree-container">
|
||||
${this.renderTree(this.treeData)}
|
||||
<div class="filetree-toolbar">
|
||||
<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>
|
||||
${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>
|
||||
`}
|
||||
`;
|
||||
}
|
||||
|
||||
@@ -410,8 +463,84 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
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: {
|
||||
heading: string;
|
||||
label: string;
|
||||
}): Promise<string | null> {
|
||||
return new Promise(async (resolve) => {
|
||||
let inputValue = '';
|
||||
|
||||
const modal = await DeesModal.createAndShow({
|
||||
heading: options.heading,
|
||||
width: 'small',
|
||||
content: html`
|
||||
<dees-input-text
|
||||
.label=${options.label}
|
||||
@changeSubject=${(e: CustomEvent) => {
|
||||
inputValue = (e.target as DeesInputText).value;
|
||||
}}
|
||||
></dees-input-text>
|
||||
`,
|
||||
menuOptions: [
|
||||
{
|
||||
name: 'Cancel',
|
||||
action: async (modalRef) => {
|
||||
await modalRef.destroy();
|
||||
resolve(null);
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'Create',
|
||||
action: async (modalRef) => {
|
||||
await modalRef.destroy();
|
||||
resolve(inputValue.trim() || null);
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// Focus the input after modal renders
|
||||
await modal.updateComplete;
|
||||
const contentEl = modal.shadowRoot?.querySelector('.modal .content');
|
||||
if (contentEl) {
|
||||
const inputElement = contentEl.querySelector('dees-input-text') as DeesInputText | null;
|
||||
if (inputElement) {
|
||||
await inputElement.updateComplete;
|
||||
inputElement.focus();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private async createNewFile(parentPath: string) {
|
||||
const fileName = prompt('Enter file name:');
|
||||
const fileName = await this.showInputModal({
|
||||
heading: 'New File',
|
||||
label: 'File name',
|
||||
});
|
||||
if (!fileName || !this.executionEnvironment) return;
|
||||
|
||||
const newPath = parentPath === '/' ? `/${fileName}` : `${parentPath}/${fileName}`;
|
||||
@@ -431,7 +560,10 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
}
|
||||
|
||||
private async createNewFolder(parentPath: string) {
|
||||
const folderName = prompt('Enter folder name:');
|
||||
const folderName = await this.showInputModal({
|
||||
heading: 'New Folder',
|
||||
label: 'Folder name',
|
||||
});
|
||||
if (!folderName || !this.executionEnvironment) return;
|
||||
|
||||
const newPath = parentPath === '/' ? `/${folderName}` : `${parentPath}/${folderName}`;
|
||||
@@ -484,6 +616,10 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
private async loadTree() {
|
||||
if (!this.executionEnvironment) return;
|
||||
|
||||
// Prevent double loading on initial render
|
||||
if (this.loadTreeStarted) return;
|
||||
this.loadTreeStarted = true;
|
||||
|
||||
this.isLoading = true;
|
||||
this.errorMessage = '';
|
||||
|
||||
@@ -503,6 +639,8 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
} catch (error) {
|
||||
this.errorMessage = `Failed to load files: ${error}`;
|
||||
console.error('Failed to load file tree:', error);
|
||||
// Reset flag to allow retry
|
||||
this.loadTreeStarted = false;
|
||||
} finally {
|
||||
this.isLoading = false;
|
||||
}
|
||||
@@ -521,6 +659,7 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
|
||||
public async refresh() {
|
||||
this.expandedPaths.clear();
|
||||
this.loadTreeStarted = false; // Reset to allow loading
|
||||
await this.loadTree();
|
||||
}
|
||||
|
||||
|
||||
@@ -29,13 +29,22 @@ export class DeesEditorMonaco extends DeesElement {
|
||||
|
||||
// INSTANCE
|
||||
public editorDeferred = domtools.plugins.smartpromise.defer<monaco.editor.IStandaloneCodeEditor>();
|
||||
public language = 'typescript';
|
||||
|
||||
@property({
|
||||
type: String
|
||||
})
|
||||
accessor content = "function hello() {\n\talert('Hello world!');\n}";
|
||||
|
||||
@property({
|
||||
type: String
|
||||
})
|
||||
accessor language = 'typescript';
|
||||
|
||||
@property({
|
||||
type: String
|
||||
})
|
||||
accessor filePath: string = '';
|
||||
|
||||
@property({
|
||||
type: Object
|
||||
})
|
||||
@@ -47,6 +56,7 @@ export class DeesEditorMonaco extends DeesElement {
|
||||
accessor wordWrap: monaco.editor.IStandaloneEditorConstructionOptions['wordWrap'] = 'off';
|
||||
|
||||
private monacoThemeSubscription: domtools.plugins.smartrx.rxjs.Subscription | null = null;
|
||||
private isUpdatingFromExternal: boolean = false;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
@@ -109,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
|
||||
@@ -138,11 +169,72 @@ export class DeesEditorMonaco extends DeesElement {
|
||||
// editor is setup let do the rest
|
||||
const editor = await this.editorDeferred.promise;
|
||||
editor.onDidChangeModelContent(async eventArg => {
|
||||
this.contentSubject.next(editor.getValue());
|
||||
// Don't emit events when we're programmatically updating the content
|
||||
if (this.isUpdatingFromExternal) return;
|
||||
|
||||
const value = editor.getValue();
|
||||
this.contentSubject.next(value);
|
||||
this.dispatchEvent(new CustomEvent('content-change', {
|
||||
detail: value,
|
||||
bubbles: true,
|
||||
composed: true,
|
||||
}));
|
||||
});
|
||||
this.contentSubject.next(editor.getValue());
|
||||
}
|
||||
|
||||
public async updated(changedProperties: Map<string, any>): Promise<void> {
|
||||
super.updated(changedProperties);
|
||||
|
||||
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();
|
||||
if (currentValue !== this.content) {
|
||||
this.isUpdatingFromExternal = true;
|
||||
editor.setValue(this.content);
|
||||
this.isUpdatingFromExternal = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Handle language changes
|
||||
if (changedProperties.has('language')) {
|
||||
const editor = await this.editorDeferred.promise;
|
||||
const model = editor.getModel();
|
||||
if (model) {
|
||||
monacoInstance.editor.setModelLanguage(model, this.language);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public async disconnectedCallback(): Promise<void> {
|
||||
await super.disconnectedCallback();
|
||||
if (this.monacoThemeSubscription) {
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -12,11 +12,15 @@ import * as domtools from '@design.estate/dees-domtools';
|
||||
import { themeDefaultStyles } from '../../00theme.js';
|
||||
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
|
||||
import { WebContainerEnvironment } from '../../00group-runtime/index.js';
|
||||
import type { FileSystemTree } from '@webcontainer/api';
|
||||
import '../dees-editor-monaco/dees-editor-monaco.js';
|
||||
import '../dees-editor-filetree/dees-editor-filetree.js';
|
||||
import { DeesEditorFiletree } from '../dees-editor-filetree/dees-editor-filetree.js';
|
||||
import '../../dees-terminal/dees-terminal.js';
|
||||
import '../../dees-icon/dees-icon.js';
|
||||
import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js';
|
||||
import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js';
|
||||
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
@@ -35,9 +39,108 @@ interface IOpenFile {
|
||||
export class DeesEditorWorkspace extends DeesElement {
|
||||
public static demo = () => {
|
||||
const env = new WebContainerEnvironment();
|
||||
|
||||
// Mount initial TypeScript project files
|
||||
const mountPromise = (async () => {
|
||||
await env.init();
|
||||
|
||||
const fileTree: FileSystemTree = {
|
||||
'package.json': {
|
||||
file: {
|
||||
contents: JSON.stringify(
|
||||
{
|
||||
name: 'demo-project',
|
||||
version: '1.0.0',
|
||||
type: 'module',
|
||||
scripts: {
|
||||
build: 'tsc',
|
||||
dev: 'tsc --watch',
|
||||
},
|
||||
devDependencies: {
|
||||
typescript: '^5.0.0',
|
||||
},
|
||||
},
|
||||
null,
|
||||
2
|
||||
),
|
||||
},
|
||||
},
|
||||
'tsconfig.json': {
|
||||
file: {
|
||||
contents: JSON.stringify(
|
||||
{
|
||||
compilerOptions: {
|
||||
target: 'ES2022',
|
||||
module: 'NodeNext',
|
||||
moduleResolution: 'NodeNext',
|
||||
strict: true,
|
||||
outDir: './dist',
|
||||
rootDir: './src',
|
||||
declaration: true,
|
||||
},
|
||||
include: ['src/**/*'],
|
||||
},
|
||||
null,
|
||||
2
|
||||
),
|
||||
},
|
||||
},
|
||||
src: {
|
||||
directory: {
|
||||
'index.ts': {
|
||||
file: {
|
||||
contents: `// Main entry point
|
||||
import { greet, formatName } from './utils.js';
|
||||
|
||||
const name = formatName('World');
|
||||
console.log(greet(name));
|
||||
|
||||
// Example async function
|
||||
async function main() {
|
||||
const result = await Promise.resolve('Hello from async!');
|
||||
console.log(result);
|
||||
}
|
||||
|
||||
main();
|
||||
`,
|
||||
},
|
||||
},
|
||||
'utils.ts': {
|
||||
file: {
|
||||
contents: `// Utility functions
|
||||
|
||||
export interface IUser {
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
}
|
||||
|
||||
export function greet(name: string): string {
|
||||
return \`Hello, \${name}!\`;
|
||||
}
|
||||
|
||||
export function formatName(name: string): string {
|
||||
return name.trim().toUpperCase();
|
||||
}
|
||||
|
||||
export function createUser(firstName: string, lastName: string): IUser {
|
||||
return { firstName, lastName };
|
||||
}
|
||||
`,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
await env.mount(fileTree);
|
||||
})();
|
||||
|
||||
return html`
|
||||
<div style="width: 100%; height: 600px; position: relative;">
|
||||
<dees-editor-workspace .executionEnvironment=${env}></dees-editor-workspace>
|
||||
<dees-editor-workspace
|
||||
.executionEnvironment=${env}
|
||||
.initializationPromise=${mountPromise}
|
||||
></dees-editor-workspace>
|
||||
</div>
|
||||
`;
|
||||
};
|
||||
@@ -46,6 +149,9 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
@property({ type: Object })
|
||||
accessor executionEnvironment: IExecutionEnvironment | null = null;
|
||||
|
||||
@property({ attribute: false })
|
||||
accessor initializationPromise: Promise<void> | null = null;
|
||||
|
||||
@property({ type: Boolean })
|
||||
accessor showFileTree: boolean = true;
|
||||
|
||||
@@ -73,7 +179,45 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
@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;
|
||||
|
||||
// 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 = [
|
||||
themeDefaultStyles,
|
||||
@@ -267,6 +411,31 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
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 {
|
||||
flex: 1;
|
||||
position: relative;
|
||||
@@ -280,6 +449,127 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
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;
|
||||
@@ -367,18 +657,23 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
|
||||
<div class="editor-panel">
|
||||
<div class="tabs-bar">
|
||||
${this.openFiles.map(file => html`
|
||||
<div
|
||||
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>
|
||||
<span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
|
||||
<dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
|
||||
</span>
|
||||
</div>
|
||||
`)}
|
||||
<div class="tabs-container">
|
||||
${this.openFiles.map(file => html`
|
||||
<div
|
||||
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>
|
||||
<span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
|
||||
<dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
|
||||
</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 class="editor-content">
|
||||
${this.openFiles.length === 0 ? html`
|
||||
@@ -388,6 +683,7 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
</div>
|
||||
` : html`
|
||||
<dees-editor-monaco
|
||||
.filePath=${this.activeFilePath}
|
||||
.content=${this.getActiveFileContent()}
|
||||
.language=${this.getLanguageFromPath(this.activeFilePath)}
|
||||
@content-change=${this.handleContentChange}
|
||||
@@ -402,9 +698,24 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
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}>
|
||||
@@ -415,18 +726,35 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
</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>
|
||||
`;
|
||||
}
|
||||
|
||||
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() {
|
||||
if (this.executionEnvironment) {
|
||||
await this.initializeWorkspace();
|
||||
@@ -442,19 +770,54 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
private async initializeWorkspace() {
|
||||
if (!this.executionEnvironment) return;
|
||||
|
||||
// Prevent double initialization
|
||||
if (this.initializationStarted) return;
|
||||
this.initializationStarted = true;
|
||||
|
||||
this.isInitializing = true;
|
||||
|
||||
try {
|
||||
if (!this.executionEnvironment.ready) {
|
||||
// Wait for any external initialization (e.g., file mounting)
|
||||
if (this.initializationPromise) {
|
||||
await this.initializationPromise;
|
||||
} else if (!this.executionEnvironment.ready) {
|
||||
await this.executionEnvironment.init();
|
||||
}
|
||||
// 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
|
||||
this.initializationStarted = false;
|
||||
} finally {
|
||||
this.isInitializing = false;
|
||||
}
|
||||
}
|
||||
|
||||
private async initializeIntelliSense(): Promise<void> {
|
||||
if (!this.executionEnvironment) return;
|
||||
if (this.intelliSenseInitialized) return;
|
||||
|
||||
// Wait for Monaco to be available globally (with retry for timing)
|
||||
let monacoInstance = (window as any).monaco;
|
||||
if (!monacoInstance) {
|
||||
// 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 }>) {
|
||||
const { path, name } = e.detail;
|
||||
await this.openFile(path, name);
|
||||
@@ -478,6 +841,21 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
{ 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);
|
||||
}
|
||||
@@ -530,6 +908,12 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
{ ...file, content: newContent, modified: true },
|
||||
...this.openFiles.slice(fileIndex + 1),
|
||||
];
|
||||
|
||||
// Process content for IntelliSense (TypeScript/JavaScript files)
|
||||
const language = this.getLanguageFromPath(this.activeFilePath);
|
||||
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
|
||||
this.intelliSenseManager.processContentChange(newContent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -561,18 +945,24 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
this.isTerminalCollapsed = !this.isTerminalCollapsed;
|
||||
}
|
||||
|
||||
// ========== Save Operations ==========
|
||||
|
||||
public async saveActiveFile(): Promise<void> {
|
||||
const file = this.openFiles.find(f => f.path === this.activeFilePath);
|
||||
if (!file || !this.executionEnvironment) return;
|
||||
|
||||
try {
|
||||
await this.executionEnvironment.writeFile(file.path, file.content);
|
||||
const fileIndex = this.openFiles.findIndex(f => f.path === this.activeFilePath);
|
||||
this.openFiles = [
|
||||
...this.openFiles.slice(0, fileIndex),
|
||||
{ ...file, modified: false },
|
||||
...this.openFiles.slice(fileIndex + 1),
|
||||
];
|
||||
|
||||
// Update file state to mark as saved
|
||||
this.openFiles = this.openFiles.map(f =>
|
||||
f.path === file.path ? { ...f, modified: false } : f
|
||||
);
|
||||
|
||||
// Update IntelliSense manager with latest content
|
||||
if (this.intelliSenseManager) {
|
||||
this.intelliSenseManager.addFileModel(file.path, file.content);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to save file:', error);
|
||||
}
|
||||
@@ -584,11 +974,160 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
for (const file of this.openFiles.filter(f => f.modified)) {
|
||||
try {
|
||||
await this.executionEnvironment.writeFile(file.path, file.content);
|
||||
|
||||
// Update IntelliSense manager
|
||||
if (this.intelliSenseManager) {
|
||||
this.intelliSenseManager.addFileModel(file.path, file.content);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Failed to save ${file.path}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
// Mark all files as saved
|
||||
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 },
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
export * from './dees-editor-workspace.js';
|
||||
export * from './typescript-intellisense.js';
|
||||
|
||||
@@ -0,0 +1,362 @@
|
||||
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.
|
||||
*/
|
||||
export class TypeScriptIntelliSenseManager {
|
||||
private loadedLibs: Set<string> = new Set();
|
||||
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
|
||||
*/
|
||||
public async init(
|
||||
monacoInst: typeof monaco,
|
||||
env: IExecutionEnvironment
|
||||
): Promise<void> {
|
||||
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 {
|
||||
const ts = this.tsApi;
|
||||
if (!ts) return;
|
||||
|
||||
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,
|
||||
});
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse imports from TypeScript/JavaScript content
|
||||
*/
|
||||
public parseImports(content: string): string[] {
|
||||
const imports: string[] = [];
|
||||
|
||||
// Match ES6 imports: import { x } from 'package' or import 'package'
|
||||
const importRegex = /import\s+(?:[\w*{}\s,]+from\s+)?['"]([^'"]+)['"]/g;
|
||||
let match: RegExpExecArray | null;
|
||||
|
||||
while ((match = importRegex.exec(content)) !== null) {
|
||||
const importPath = match[1];
|
||||
// Only process non-relative imports (npm packages)
|
||||
if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
|
||||
const packageName = importPath.startsWith('@')
|
||||
? importPath.split('/').slice(0, 2).join('/') // @scope/package
|
||||
: importPath.split('/')[0]; // package
|
||||
imports.push(packageName);
|
||||
}
|
||||
}
|
||||
|
||||
// Match require calls: require('package')
|
||||
const requireRegex = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
|
||||
while ((match = requireRegex.exec(content)) !== null) {
|
||||
const importPath = match[1];
|
||||
if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
|
||||
const packageName = importPath.startsWith('@')
|
||||
? importPath.split('/').slice(0, 2).join('/')
|
||||
: importPath.split('/')[0];
|
||||
imports.push(packageName);
|
||||
}
|
||||
}
|
||||
|
||||
return [...new Set(imports)];
|
||||
}
|
||||
|
||||
/**
|
||||
* Load type definitions for a package from virtual FS
|
||||
*/
|
||||
public async loadTypesForPackage(packageName: string): Promise<void> {
|
||||
if (!this.monacoInstance || !this.executionEnvironment) return;
|
||||
if (this.loadedLibs.has(packageName)) return;
|
||||
|
||||
try {
|
||||
const typesLoaded = await this.tryLoadPackageTypes(packageName);
|
||||
if (!typesLoaded) {
|
||||
await this.tryLoadAtTypesPackage(packageName);
|
||||
}
|
||||
this.loadedLibs.add(packageName);
|
||||
} catch (error) {
|
||||
console.warn(`Failed to load types for ${packageName}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
private async tryLoadPackageTypes(packageName: string): Promise<boolean> {
|
||||
const ts = this.tsApi;
|
||||
if (!this.executionEnvironment || !ts) return false;
|
||||
|
||||
const basePath = `/node_modules/${packageName}`;
|
||||
|
||||
try {
|
||||
// Check package.json for types field
|
||||
const packageJsonPath = `${basePath}/package.json`;
|
||||
if (await this.executionEnvironment.exists(packageJsonPath)) {
|
||||
const packageJson = JSON.parse(
|
||||
await this.executionEnvironment.readFile(packageJsonPath)
|
||||
);
|
||||
|
||||
const typesPath = packageJson.types || packageJson.typings;
|
||||
if (typesPath) {
|
||||
const fullTypesPath = `${basePath}/${typesPath}`;
|
||||
if (await this.executionEnvironment.exists(fullTypesPath)) {
|
||||
const content = await this.executionEnvironment.readFile(fullTypesPath);
|
||||
ts.typescriptDefaults.addExtraLib(
|
||||
content,
|
||||
`file://${fullTypesPath}`
|
||||
);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Try common locations
|
||||
const commonPaths = [
|
||||
`${basePath}/index.d.ts`,
|
||||
`${basePath}/dist/index.d.ts`,
|
||||
`${basePath}/lib/index.d.ts`,
|
||||
];
|
||||
|
||||
for (const dtsPath of commonPaths) {
|
||||
if (await this.executionEnvironment.exists(dtsPath)) {
|
||||
const content = await this.executionEnvironment.readFile(dtsPath);
|
||||
ts.typescriptDefaults.addExtraLib(
|
||||
content,
|
||||
`file://${dtsPath}`
|
||||
);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private async tryLoadAtTypesPackage(packageName: string): Promise<boolean> {
|
||||
const ts = this.tsApi;
|
||||
if (!this.executionEnvironment || !ts) return false;
|
||||
|
||||
// Handle scoped packages: @scope/package -> @types/scope__package
|
||||
const typesPackageName = packageName.startsWith('@')
|
||||
? `@types/${packageName.slice(1).replace('/', '__')}`
|
||||
: `@types/${packageName}`;
|
||||
|
||||
const basePath = `/node_modules/${typesPackageName}`;
|
||||
|
||||
try {
|
||||
const indexPath = `${basePath}/index.d.ts`;
|
||||
if (await this.executionEnvironment.exists(indexPath)) {
|
||||
const content = await this.executionEnvironment.readFile(indexPath);
|
||||
ts.typescriptDefaults.addExtraLib(
|
||||
content,
|
||||
`file://${indexPath}`
|
||||
);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Process content change and load types for any new imports
|
||||
*/
|
||||
public async processContentChange(content: string): Promise<void> {
|
||||
const imports = this.parseImports(content);
|
||||
for (const packageName of imports) {
|
||||
await this.loadTypesForPackage(packageName);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
|
||||
if (existingModel) {
|
||||
existingModel.setValue(content);
|
||||
} else {
|
||||
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 {
|
||||
const ext = path.split('.').pop()?.toLowerCase();
|
||||
switch (ext) {
|
||||
case 'ts':
|
||||
case 'tsx':
|
||||
return 'typescript';
|
||||
case 'js':
|
||||
case 'jsx':
|
||||
return 'javascript';
|
||||
case 'json':
|
||||
return 'json';
|
||||
default:
|
||||
return 'plaintext';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,10 @@ import type { IExecutionEnvironment, IFileEntry, IProcessHandle } from '../inter
|
||||
* Runs Node.js and shell commands in the browser using WebContainer API.
|
||||
*/
|
||||
export class WebContainerEnvironment implements IExecutionEnvironment {
|
||||
private container: webcontainer.WebContainer | null = null;
|
||||
// Static shared state - WebContainer only allows ONE boot per page
|
||||
private static sharedContainer: webcontainer.WebContainer | null = null;
|
||||
private static bootPromise: Promise<webcontainer.WebContainer> | null = null;
|
||||
|
||||
private _ready: boolean = false;
|
||||
|
||||
public readonly type = 'webcontainer' as const;
|
||||
@@ -15,11 +18,29 @@ export class WebContainerEnvironment implements IExecutionEnvironment {
|
||||
return this._ready;
|
||||
}
|
||||
|
||||
private get container(): webcontainer.WebContainer | null {
|
||||
return WebContainerEnvironment.sharedContainer;
|
||||
}
|
||||
|
||||
// ============ Lifecycle ============
|
||||
|
||||
public async init(): Promise<void> {
|
||||
if (this._ready && this.container) {
|
||||
return; // Already initialized
|
||||
// Already initialized (this instance)
|
||||
if (this._ready && WebContainerEnvironment.sharedContainer) {
|
||||
return;
|
||||
}
|
||||
|
||||
// If boot is in progress (by any instance), wait for it
|
||||
if (WebContainerEnvironment.bootPromise) {
|
||||
await WebContainerEnvironment.bootPromise;
|
||||
this._ready = true;
|
||||
return;
|
||||
}
|
||||
|
||||
// If already booted by another instance, just mark ready
|
||||
if (WebContainerEnvironment.sharedContainer) {
|
||||
this._ready = true;
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if SharedArrayBuffer is available (required for WebContainer)
|
||||
@@ -32,14 +53,24 @@ export class WebContainerEnvironment implements IExecutionEnvironment {
|
||||
);
|
||||
}
|
||||
|
||||
this.container = await webcontainer.WebContainer.boot();
|
||||
this._ready = true;
|
||||
// Start boot process
|
||||
WebContainerEnvironment.bootPromise = webcontainer.WebContainer.boot();
|
||||
|
||||
try {
|
||||
WebContainerEnvironment.sharedContainer = await WebContainerEnvironment.bootPromise;
|
||||
this._ready = true;
|
||||
} catch (error) {
|
||||
// Reset promise on failure so retry is possible
|
||||
WebContainerEnvironment.bootPromise = null;
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
public async destroy(): Promise<void> {
|
||||
if (this.container) {
|
||||
this.container.teardown();
|
||||
this.container = null;
|
||||
if (WebContainerEnvironment.sharedContainer) {
|
||||
WebContainerEnvironment.sharedContainer.teardown();
|
||||
WebContainerEnvironment.sharedContainer = null;
|
||||
WebContainerEnvironment.bootPromise = null;
|
||||
this._ready = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
"module": "NodeNext",
|
||||
"moduleResolution": "NodeNext",
|
||||
"esModuleInterop": true,
|
||||
"verbatimModuleSyntax": true
|
||||
"verbatimModuleSyntax": true,
|
||||
"skipLibCheck": true
|
||||
},
|
||||
"exclude": [
|
||||
"dist_*/**/*.d.ts"
|
||||
|
||||
Reference in New Issue
Block a user