Compare commits

...

6 Commits

Author SHA1 Message Date
6ec05d6b4a v3.19.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 14s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-31 09:47:38 +00:00
77df2743c5 feat(dees-editor-workspace): improve TypeScript IntelliSense, auto-run workspace init commands, and watch node_modules for new packages 2025-12-31 09:47:38 +00:00
e4bdde1373 v3.18.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 14s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-31 08:53:01 +00:00
e193e28fe9 feat(filetree): add filesystem watch support to WebContainer environment and auto-refresh file tree; improve icon handling and context menu behavior 2025-12-31 08:53:01 +00:00
9e229543eb v3.17.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-31 07:01:59 +00:00
f60836eabf feat(editor): add file explorer toolbar, empty-space context menu, editor auto-save, save-all, and keyboard save shortcuts 2025-12-31 07:01:59 +00:00
10 changed files with 884 additions and 111 deletions

View File

@@ -1,5 +1,38 @@
# Changelog # Changelog
## 2025-12-31 - 3.19.0 - feat(dees-editor-workspace)
improve TypeScript IntelliSense, auto-run workspace init commands, and watch node_modules for new packages
- Execute an onInit command from /npmextra.json on workspace initialization (e.g., run pnpm install).
- Add npmextra.json and an import test file (importtest.ts) plus a sample dependency in the scaffold to test package imports.
- Add node_modules watcher with debounce to auto-scan and load package types after installs.
- Enhance TypeScript IntelliSense: recursively load all .d.ts files from packages and @types packages, add package.json as extra lib, and log progress/errors for debugging.
- Change processContentChange signature to accept optional filePath and trigger a diagnostic refresh when new types are loaded.
- Expose scanAndLoadNewPackageTypes to scan top-level and scoped packages and load their types.
- Add start/stop logic for the node_modules watcher in workspace lifecycle to avoid leaks and handle cleanup.
## 2025-12-31 - 3.18.0 - feat(filetree)
add filesystem watch support to WebContainer environment and auto-refresh file tree; improve icon handling and context menu behavior
- Add IFileWatcher interface and watch(...) signature to IExecutionEnvironment.
- Implement watch(...) in WebContainerEnvironment using WebContainer's fs.watch and return a stop() handle.
- dees-editor-filetree: start/stop file watcher, debounce auto-refresh on FS changes, cleanup on disconnect, and track last execution environment.
- Add clipboard state (copy/cut) and related UI/menu enhancements for file operations (new file/folder, rename, delete, copy/paste).
- dees-icon: default to Lucide icons when no prefix is provided.
- dees-contextmenu: remove 'lucide:' prefix usage in templates and avoid awaiting windowLayer.destroy() to provide instant visual feedback.
- Menu item shape adjusted (use { divider: true } for dividers) and various menu icon name updates.
## 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) ## 2025-12-30 - 3.16.0 - feat(editor)
improve TypeScript IntelliSense and module resolution for Monaco editor improve TypeScript IntelliSense and module resolution for Monaco editor

View File

@@ -1,6 +1,6 @@
{ {
"name": "@design.estate/dees-catalog", "name": "@design.estate/dees-catalog",
"version": "3.16.0", "version": "3.19.0",
"private": false, "private": false,
"description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.", "description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.",
"main": "dist_ts_web/index.js", "main": "dist_ts_web/index.js",

View File

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

View File

@@ -10,7 +10,7 @@ import {
} from '@design.estate/dees-element'; } from '@design.estate/dees-element';
import * as domtools from '@design.estate/dees-domtools'; import * as domtools from '@design.estate/dees-domtools';
import { themeDefaultStyles } from '../../00theme.js'; import { themeDefaultStyles } from '../../00theme.js';
import type { IExecutionEnvironment, IFileEntry } from '../../00group-runtime/index.js'; import type { IExecutionEnvironment, IFileEntry, IFileWatcher } from '../../00group-runtime/index.js';
import '../../dees-icon/dees-icon.js'; import '../../dees-icon/dees-icon.js';
import '../../dees-contextmenu/dees-contextmenu.js'; import '../../dees-contextmenu/dees-contextmenu.js';
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js'; import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
@@ -60,6 +60,15 @@ export class DeesEditorFiletree extends DeesElement {
private expandedPaths: Set<string> = new Set(); private expandedPaths: Set<string> = new Set();
private loadTreeStarted: boolean = false; private loadTreeStarted: boolean = false;
// Clipboard state for copy/paste operations
private clipboardPath: string | null = null;
private clipboardOperation: 'copy' | 'cut' | null = null;
// File watcher for auto-refresh
private fileWatcher: IFileWatcher | null = null;
private refreshDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
private lastExecutionEnvironment: IExecutionEnvironment | null = null;
public static styles = [ public static styles = [
themeDefaultStyles, themeDefaultStyles,
cssManager.defaultStyles, cssManager.defaultStyles,
@@ -203,6 +212,49 @@ export class DeesEditorFiletree extends DeesElement {
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')}; color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
font-style: italic; font-style: italic;
} }
.filetree-toolbar {
display: flex;
align-items: center;
justify-content: space-between;
height: 36px;
padding: 0 12px;
border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 8%)')};
position: sticky;
top: 0;
z-index: 1;
}
.toolbar-title {
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
}
.toolbar-actions {
display: flex;
gap: 4px;
}
.toolbar-button {
padding: 4px;
border-radius: 4px;
cursor: pointer;
opacity: 0.7;
transition: opacity 0.15s, background 0.15s;
display: flex;
align-items: center;
justify-content: center;
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 70%)')};
}
.toolbar-button:hover {
opacity: 1;
background: ${cssManager.bdTheme('hsl(0 0% 0% / 0.08)', 'hsl(0 0% 100% / 0.1)')};
}
`, `,
]; ];
@@ -231,18 +283,25 @@ export class DeesEditorFiletree extends DeesElement {
`; `;
} }
if (this.treeData.length === 0) {
return html`
<div class="empty">
No files found.
</div>
`;
}
return html` return html`
<div class="tree-container"> <div class="filetree-toolbar">
${this.renderTree(this.treeData)} <span class="toolbar-title">Explorer</span>
<div class="toolbar-actions">
<div class="toolbar-button" @click=${() => this.createNewFile('/')} title="New File">
<dees-icon .icon=${'lucide:filePlus'} iconSize="16"></dees-icon>
</div>
<div class="toolbar-button" @click=${() => this.createNewFolder('/')} title="New Folder">
<dees-icon .icon=${'lucide:folderPlus'} iconSize="16"></dees-icon>
</div>
</div>
</div> </div>
${this.treeData.length === 0
? html`<div class="empty">No files found.</div>`
: html`
<div class="tree-container" @contextmenu=${this.handleEmptySpaceContextMenu}>
${this.renderTree(this.treeData)}
</div>
`}
`; `;
} }
@@ -390,26 +449,94 @@ export class DeesEditorFiletree extends DeesElement {
const menuItems = []; const menuItems = [];
if (node.type === 'directory') { if (node.type === 'directory') {
// Directory-specific options
menuItems.push( menuItems.push(
{ {
name: 'New File', name: 'New File',
iconName: 'lucide:filePlus', iconName: 'filePlus',
action: async () => this.createNewFile(node.path), action: async () => this.createNewFile(node.path),
}, },
{ {
name: 'New Folder', name: 'New Folder',
iconName: 'lucide:folderPlus', iconName: 'folderPlus',
action: async () => this.createNewFolder(node.path), action: async () => this.createNewFolder(node.path),
}, },
{ name: 'divider' } { divider: true }
); );
} }
menuItems.push({ // Common options for both files and directories
name: 'Delete', menuItems.push(
iconName: 'lucide:trash2', {
action: async () => this.deleteItem(node), name: 'Rename',
}); iconName: 'pencil',
action: async () => this.renameItem(node),
},
{
name: 'Duplicate',
iconName: 'files',
action: async () => this.duplicateItem(node),
},
{
name: 'Copy',
iconName: 'copy',
action: async () => this.copyItem(node),
}
);
// Paste option (only for directories and when clipboard has content)
if (node.type === 'directory' && this.clipboardPath) {
menuItems.push({
name: 'Paste',
iconName: 'clipboard',
action: async () => this.pasteItem(node.path),
});
}
menuItems.push(
{ divider: true },
{
name: 'Delete',
iconName: 'trash2',
action: async () => this.deleteItem(node),
}
);
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: any[] = [
{
name: 'New File',
iconName: 'filePlus',
action: async () => this.createNewFile('/'),
},
{
name: 'New Folder',
iconName: 'folderPlus',
action: async () => this.createNewFolder('/'),
},
];
// Add Paste option if clipboard has content
if (this.clipboardPath) {
menuItems.push(
{ divider: true },
{
name: 'Paste',
iconName: 'clipboard',
action: async () => this.pasteItem('/'),
}
);
}
await DeesContextmenu.openContextMenuWithOptions(e, menuItems); await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
} }
@@ -417,19 +544,17 @@ export class DeesEditorFiletree extends DeesElement {
private async showInputModal(options: { private async showInputModal(options: {
heading: string; heading: string;
label: string; label: string;
value?: string;
buttonName?: string;
}): Promise<string | null> { }): Promise<string | null> {
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
let inputValue = '';
const modal = await DeesModal.createAndShow({ const modal = await DeesModal.createAndShow({
heading: options.heading, heading: options.heading,
width: 'small', width: 'small',
content: html` content: html`
<dees-input-text <dees-input-text
.label=${options.label} .label=${options.label}
@changeSubject=${(e: CustomEvent) => { .value=${options.value || ''}
inputValue = (e.target as DeesInputText).value;
}}
></dees-input-text> ></dees-input-text>
`, `,
menuOptions: [ menuOptions: [
@@ -441,10 +566,15 @@ export class DeesEditorFiletree extends DeesElement {
}, },
}, },
{ {
name: 'Create', name: options.buttonName || 'Create',
action: async (modalRef) => { action: async (modalRef) => {
// Query the input element directly and read its value
const contentEl = modalRef.shadowRoot?.querySelector('.modal .content');
const inputElement = contentEl?.querySelector('dees-input-text') as DeesInputText | null;
const inputValue = inputElement?.value?.trim() || '';
await modalRef.destroy(); await modalRef.destroy();
resolve(inputValue.trim() || null); resolve(inputValue || null);
}, },
}, },
], ],
@@ -530,13 +660,225 @@ export class DeesEditorFiletree extends DeesElement {
} }
} }
/**
* Rename a file or folder
*/
private async renameItem(node: ITreeNode) {
if (!this.executionEnvironment) return;
const newName = await this.showInputModal({
heading: 'Rename',
label: 'New name',
value: node.name,
buttonName: 'Rename',
});
if (!newName || newName === node.name) return;
// Calculate new path
const parentPath = node.path.substring(0, node.path.lastIndexOf('/')) || '/';
const newPath = parentPath === '/' ? `/${newName}` : `${parentPath}/${newName}`;
try {
if (node.type === 'file') {
// For files: read content, write to new path, delete old
const content = await this.executionEnvironment.readFile(node.path);
await this.executionEnvironment.writeFile(newPath, content);
await this.executionEnvironment.rm(node.path);
} else {
// For directories: recursively copy contents then delete old
await this.copyDirectoryContents(node.path, newPath);
await this.executionEnvironment.rm(node.path, { recursive: true });
}
await this.refresh();
this.dispatchEvent(
new CustomEvent('item-renamed', {
detail: { oldPath: node.path, newPath, type: node.type },
bubbles: true,
composed: true,
})
);
} catch (error) {
console.error('Failed to rename item:', error);
}
}
/**
* Duplicate a file or folder
*/
private async duplicateItem(node: ITreeNode) {
if (!this.executionEnvironment) return;
const parentPath = node.path.substring(0, node.path.lastIndexOf('/')) || '/';
let newName: string;
if (node.type === 'file') {
// Add _copy before extension
const lastDot = node.name.lastIndexOf('.');
if (lastDot > 0) {
const baseName = node.name.substring(0, lastDot);
const ext = node.name.substring(lastDot);
newName = `${baseName}_copy${ext}`;
} else {
newName = `${node.name}_copy`;
}
} else {
newName = `${node.name}_copy`;
}
const newPath = parentPath === '/' ? `/${newName}` : `${parentPath}/${newName}`;
try {
if (node.type === 'file') {
const content = await this.executionEnvironment.readFile(node.path);
await this.executionEnvironment.writeFile(newPath, content);
} else {
await this.copyDirectoryContents(node.path, newPath);
}
await this.refresh();
this.dispatchEvent(
new CustomEvent('item-duplicated', {
detail: { sourcePath: node.path, newPath, type: node.type },
bubbles: true,
composed: true,
})
);
} catch (error) {
console.error('Failed to duplicate item:', error);
}
}
/**
* Copy item path to clipboard
*/
private async copyItem(node: ITreeNode) {
this.clipboardPath = node.path;
this.clipboardOperation = 'copy';
}
/**
* Paste copied item to target directory
*/
private async pasteItem(targetPath: string) {
if (!this.executionEnvironment || !this.clipboardPath) return;
// Get the name from clipboard path
const name = this.clipboardPath.split('/').pop() || 'pasted';
const newPath = targetPath === '/' ? `/${name}` : `${targetPath}/${name}`;
try {
// Check if source exists
if (!(await this.executionEnvironment.exists(this.clipboardPath))) {
console.error('Source file no longer exists');
this.clipboardPath = null;
this.clipboardOperation = null;
return;
}
// Check if it's a file or directory by trying to read as file
try {
const content = await this.executionEnvironment.readFile(this.clipboardPath);
await this.executionEnvironment.writeFile(newPath, content);
} catch {
// If reading fails, it's a directory
await this.copyDirectoryContents(this.clipboardPath, newPath);
}
await this.refresh();
this.dispatchEvent(
new CustomEvent('item-pasted', {
detail: { sourcePath: this.clipboardPath, targetPath: newPath },
bubbles: true,
composed: true,
})
);
// Clear clipboard after paste
this.clipboardPath = null;
this.clipboardOperation = null;
} catch (error) {
console.error('Failed to paste item:', error);
}
}
/**
* Recursively copy directory contents to a new path
*/
private async copyDirectoryContents(sourcePath: string, destPath: string) {
if (!this.executionEnvironment) return;
// Create destination directory
await this.executionEnvironment.mkdir(destPath);
// Read source directory contents
const entries = await this.executionEnvironment.readDir(sourcePath);
for (const entry of entries) {
const srcEntryPath = sourcePath === '/' ? `/${entry.name}` : `${sourcePath}/${entry.name}`;
const destEntryPath = destPath === '/' ? `/${entry.name}` : `${destPath}/${entry.name}`;
if (entry.type === 'directory') {
await this.copyDirectoryContents(srcEntryPath, destEntryPath);
} else {
const content = await this.executionEnvironment.readFile(srcEntryPath);
await this.executionEnvironment.writeFile(destEntryPath, content);
}
}
}
public async firstUpdated() { public async firstUpdated() {
await this.loadTree(); await this.loadTree();
} }
public async updated(changedProperties: Map<string, any>) { public async updated(changedProperties: Map<string, any>) {
if (changedProperties.has('executionEnvironment') && this.executionEnvironment) { if (changedProperties.has('executionEnvironment')) {
await this.loadTree(); // Stop watching the old environment
if (this.lastExecutionEnvironment !== this.executionEnvironment) {
this.stopFileWatcher();
this.lastExecutionEnvironment = this.executionEnvironment;
}
if (this.executionEnvironment) {
await this.loadTree();
this.startFileWatcher();
}
}
}
public async disconnectedCallback() {
await super.disconnectedCallback();
this.stopFileWatcher();
if (this.refreshDebounceTimeout) {
clearTimeout(this.refreshDebounceTimeout);
this.refreshDebounceTimeout = null;
}
}
private startFileWatcher() {
if (!this.executionEnvironment || this.fileWatcher) return;
try {
this.fileWatcher = this.executionEnvironment.watch(
'/',
(_event, _filename) => {
// Debounce refresh to avoid excessive updates
if (this.refreshDebounceTimeout) {
clearTimeout(this.refreshDebounceTimeout);
}
this.refreshDebounceTimeout = setTimeout(() => {
this.refresh();
}, 300);
},
{ recursive: true }
);
} catch (error) {
console.warn('File watching not supported:', error);
}
}
private stopFileWatcher() {
if (this.fileWatcher) {
this.fileWatcher.stop();
this.fileWatcher = null;
} }
} }

View File

@@ -10,7 +10,7 @@ import {
} from '@design.estate/dees-element'; } from '@design.estate/dees-element';
import * as domtools from '@design.estate/dees-domtools'; import * as domtools from '@design.estate/dees-domtools';
import { themeDefaultStyles } from '../../00theme.js'; import { themeDefaultStyles } from '../../00theme.js';
import type { IExecutionEnvironment } from '../../00group-runtime/index.js'; import type { IExecutionEnvironment, IFileWatcher } from '../../00group-runtime/index.js';
import { WebContainerEnvironment } from '../../00group-runtime/index.js'; import { WebContainerEnvironment } from '../../00group-runtime/index.js';
import type { FileSystemTree } from '@webcontainer/api'; import type { FileSystemTree } from '@webcontainer/api';
import '../dees-editor-monaco/dees-editor-monaco.js'; import '../dees-editor-monaco/dees-editor-monaco.js';
@@ -20,6 +20,7 @@ import '../../dees-terminal/dees-terminal.js';
import '../../dees-icon/dees-icon.js'; import '../../dees-icon/dees-icon.js';
import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js'; import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js';
import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js'; import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js';
import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
@@ -55,6 +56,9 @@ export class DeesEditorWorkspace extends DeesElement {
build: 'tsc', build: 'tsc',
dev: 'tsc --watch', dev: 'tsc --watch',
}, },
dependencies: {
'@push.rocks/smartpromise': '^4.2.3',
},
devDependencies: { devDependencies: {
typescript: '^5.0.0', typescript: '^5.0.0',
}, },
@@ -64,6 +68,19 @@ export class DeesEditorWorkspace extends DeesElement {
), ),
}, },
}, },
'npmextra.json': {
file: {
contents: JSON.stringify(
{
deesEditorWorkspace: {
onInit: 'pnpm install',
},
},
null,
2
),
},
},
'tsconfig.json': { 'tsconfig.json': {
file: { file: {
contents: JSON.stringify( contents: JSON.stringify(
@@ -124,6 +141,28 @@ export function formatName(name: string): string {
export function createUser(firstName: string, lastName: string): IUser { export function createUser(firstName: string, lastName: string): IUser {
return { firstName, lastName }; return { firstName, lastName };
} }
`,
},
},
'importtest.ts': {
file: {
contents: `// Test npm package imports
import * as smartpromise from '@push.rocks/smartpromise';
// This should have IntelliSense showing defer() method
const deferred = smartpromise.defer<string>();
// Test using the deferred promise
async function testSmartPromise() {
setTimeout(() => {
deferred.resolve('Hello from smartpromise!');
}, 100);
const result = await deferred.promise;
console.log(result);
}
testSmartPromise();
`, `,
}, },
}, },
@@ -198,6 +237,30 @@ export function createUser(firstName: string, lastName: string): IUser {
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null; private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
private intelliSenseInitialized: boolean = false; private intelliSenseInitialized: boolean = false;
// node_modules watcher for auto-loading types
private nodeModulesWatcher: IFileWatcher | null = null;
private nodeModulesDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
// Auto-save functionality
@state()
accessor autoSave: boolean = false;
private autoSaveInterval: ReturnType<typeof setInterval> | null = null;
// Keyboard shortcut handler (bound for proper cleanup)
private keydownHandler = (e: KeyboardEvent) => {
// Cmd+S (Mac) or Ctrl+S (Windows/Linux) - Save
if ((e.metaKey || e.ctrlKey) && e.key === 's' && !e.shiftKey) {
e.preventDefault();
this.saveActiveFile();
}
// Cmd+Shift+S - Save All
if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.key.toLowerCase() === 's') {
e.preventDefault();
this.saveAllFiles();
}
};
public static styles = [ public static styles = [
themeDefaultStyles, themeDefaultStyles,
cssManager.defaultStyles, cssManager.defaultStyles,
@@ -390,6 +453,31 @@ export function createUser(firstName: string, lastName: string): IUser {
background: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')}; background: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
} }
.tabs-container {
display: flex;
flex: 1;
overflow-x: auto;
}
.editor-menu-button {
padding: 6px 8px;
margin-right: 4px;
margin-left: auto;
border-radius: 4px;
cursor: pointer;
opacity: 0.6;
transition: opacity 0.15s, background 0.15s;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
}
.editor-menu-button:hover {
opacity: 1;
background: ${cssManager.bdTheme('hsl(0 0% 0% / 0.08)', 'hsl(0 0% 100% / 0.1)')};
}
.editor-content { .editor-content {
flex: 1; flex: 1;
position: relative; position: relative;
@@ -611,18 +699,23 @@ export function createUser(firstName: string, lastName: string): IUser {
<div class="editor-panel"> <div class="editor-panel">
<div class="tabs-bar"> <div class="tabs-bar">
${this.openFiles.map(file => html` <div class="tabs-container">
<div ${this.openFiles.map(file => html`
class="tab ${file.path === this.activeFilePath ? 'active' : ''}" <div
@click=${() => this.activateFile(file.path)} class="tab ${file.path === this.activeFilePath ? 'active' : ''}"
> @click=${() => this.activateFile(file.path)}
${file.modified ? html`<span class="tab-modified"></span>` : ''} >
<span class="tab-name">${file.name}</span> ${file.modified ? html`<span class="tab-modified"></span>` : ''}
<span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}> <span class="tab-name">${file.name}</span>
<dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon> <span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
</span> <dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
</div> </span>
`)} </div>
`)}
</div>
<div class="editor-menu-button" @click=${this.showEditorMenu} title="Editor options">
<dees-icon .icon=${'lucide:moreVertical'} iconSize="16"></dees-icon>
</div>
</div> </div>
<div class="editor-content"> <div class="editor-content">
${this.openFiles.length === 0 ? html` ${this.openFiles.length === 0 ? html`
@@ -690,6 +783,21 @@ export function createUser(firstName: string, lastName: string): IUser {
`; `;
} }
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;
}
this.stopNodeModulesWatcher();
}
public async firstUpdated() { public async firstUpdated() {
if (this.executionEnvironment) { if (this.executionEnvironment) {
await this.initializeWorkspace(); await this.initializeWorkspace();
@@ -718,6 +826,10 @@ export function createUser(firstName: string, lastName: string): IUser {
} else if (!this.executionEnvironment.ready) { } else if (!this.executionEnvironment.ready) {
await this.executionEnvironment.init(); await this.executionEnvironment.init();
} }
// Execute onInit command from npmextra.json if present
await this.executeOnInitCommand();
// IntelliSense is initialized lazily when first file is opened (Monaco loads on demand) // IntelliSense is initialized lazily when first file is opened (Monaco loads on demand)
} catch (error) { } catch (error) {
console.error('Failed to initialize workspace:', error); console.error('Failed to initialize workspace:', error);
@@ -728,6 +840,34 @@ export function createUser(firstName: string, lastName: string): IUser {
} }
} }
/**
* Execute onInit command from npmextra.json if present
* This allows automatic setup like `pnpm install` on workspace initialization
*/
private async executeOnInitCommand(): Promise<void> {
if (!this.executionEnvironment) return;
try {
if (await this.executionEnvironment.exists('/npmextra.json')) {
const content = await this.executionEnvironment.readFile('/npmextra.json');
const config = JSON.parse(content);
const onInit = config?.deesEditorWorkspace?.onInit;
if (onInit && typeof onInit === 'string') {
console.log('Executing onInit command:', onInit);
// Parse command and args
const [cmd, ...args] = onInit.split(' ');
const process = await this.executionEnvironment.spawn(cmd, args);
// Wait for completion
const exitCode = await process.exit;
console.log('onInit command completed with exit code:', exitCode);
}
}
} catch (error) {
console.warn('Failed to execute onInit command:', error);
}
}
private async initializeIntelliSense(): Promise<void> { private async initializeIntelliSense(): Promise<void> {
if (!this.executionEnvironment) return; if (!this.executionEnvironment) return;
if (this.intelliSenseInitialized) return; if (this.intelliSenseInitialized) return;
@@ -751,6 +891,51 @@ export function createUser(firstName: string, lastName: string): IUser {
// Set up marker listener for Problems panel // Set up marker listener for Problems panel
this.setupMarkerListener(); this.setupMarkerListener();
// Start watching node_modules for package installations
this.startNodeModulesWatcher();
// Initial scan for any existing packages
await this.intelliSenseManager.scanAndLoadNewPackageTypes();
}
/**
* Watch node_modules for changes (e.g., after pnpm install)
* and automatically load types for new packages
*/
private startNodeModulesWatcher(): void {
if (!this.executionEnvironment || this.nodeModulesWatcher) return;
try {
this.nodeModulesWatcher = this.executionEnvironment.watch(
'/node_modules',
(_event, _filename) => {
// Debounce - pnpm install creates many file changes
if (this.nodeModulesDebounceTimeout) {
clearTimeout(this.nodeModulesDebounceTimeout);
}
this.nodeModulesDebounceTimeout = setTimeout(async () => {
if (this.intelliSenseManager) {
await this.intelliSenseManager.scanAndLoadNewPackageTypes();
}
}, 2000); // 2 second debounce for package installation
},
{ recursive: true }
);
} catch (error) {
console.warn('Could not watch node_modules:', error);
}
}
private stopNodeModulesWatcher(): void {
if (this.nodeModulesWatcher) {
this.nodeModulesWatcher.stop();
this.nodeModulesWatcher = null;
}
if (this.nodeModulesDebounceTimeout) {
clearTimeout(this.nodeModulesDebounceTimeout);
this.nodeModulesDebounceTimeout = null;
}
} }
private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) { private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
@@ -788,7 +973,7 @@ export function createUser(firstName: string, lastName: string): IUser {
// Process the initial file content for IntelliSense // Process the initial file content for IntelliSense
const language = this.getLanguageFromPath(path); const language = this.getLanguageFromPath(path);
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) { if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
await this.intelliSenseManager.processContentChange(content); await this.intelliSenseManager.processContentChange(content, path);
} }
} }
} catch (error) { } catch (error) {
@@ -847,7 +1032,7 @@ export function createUser(firstName: string, lastName: string): IUser {
// Process content for IntelliSense (TypeScript/JavaScript files) // Process content for IntelliSense (TypeScript/JavaScript files)
const language = this.getLanguageFromPath(this.activeFilePath); const language = this.getLanguageFromPath(this.activeFilePath);
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) { if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
this.intelliSenseManager.processContentChange(newContent); this.intelliSenseManager.processContentChange(newContent, this.activeFilePath);
} }
} }
} }
@@ -880,6 +1065,95 @@ export function createUser(firstName: string, lastName: string): IUser {
this.isTerminalCollapsed = !this.isTerminalCollapsed; 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);
// 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);
}
}
public async saveAllFiles(): Promise<void> {
if (!this.executionEnvironment) return;
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 { private getErrorCount(): number {
// Monaco MarkerSeverity: Error = 8, Warning = 4, Info = 2, Hint = 1 // Monaco MarkerSeverity: Error = 8, Warning = 4, Info = 2, Hint = 1
return this.diagnosticMarkers.filter(m => m.severity === 8).length; return this.diagnosticMarkers.filter(m => m.severity === 8).length;
@@ -976,35 +1250,4 @@ export function createUser(firstName: string, lastName: string): IUser {
resource: { path: m.resource.path }, 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;
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),
];
} catch (error) {
console.error('Failed to save file:', error);
}
}
public async saveAllFiles(): Promise<void> {
if (!this.executionEnvironment) return;
for (const file of this.openFiles.filter(f => f.modified)) {
try {
await this.executionEnvironment.writeFile(file.path, file.content);
} catch (error) {
console.error(`Failed to save ${file.path}:`, error);
}
}
this.openFiles = this.openFiles.map(f => ({ ...f, modified: false }));
}
} }

View File

@@ -175,10 +175,14 @@ export class TypeScriptIntelliSenseManager {
if (!this.monacoInstance || !this.executionEnvironment) return; if (!this.monacoInstance || !this.executionEnvironment) return;
if (this.loadedLibs.has(packageName)) return; if (this.loadedLibs.has(packageName)) return;
console.log(`[IntelliSense] Loading types for package: ${packageName}`);
try { try {
const typesLoaded = await this.tryLoadPackageTypes(packageName); const typesLoaded = await this.tryLoadPackageTypes(packageName);
console.log(`[IntelliSense] tryLoadPackageTypes result for ${packageName}: ${typesLoaded}`);
if (!typesLoaded) { if (!typesLoaded) {
await this.tryLoadAtTypesPackage(packageName); const atTypesLoaded = await this.tryLoadAtTypesPackage(packageName);
console.log(`[IntelliSense] tryLoadAtTypesPackage result for ${packageName}: ${atTypesLoaded}`);
} }
this.loadedLibs.add(packageName); this.loadedLibs.add(packageName);
} catch (error) { } catch (error) {
@@ -191,30 +195,33 @@ export class TypeScriptIntelliSenseManager {
if (!this.executionEnvironment || !ts) return false; if (!this.executionEnvironment || !ts) return false;
const basePath = `/node_modules/${packageName}`; const basePath = `/node_modules/${packageName}`;
console.log(`[IntelliSense] Checking package at: ${basePath}`);
try { try {
// Check package.json for types field // Check package.json for types field
const packageJsonPath = `${basePath}/package.json`; const packageJsonPath = `${basePath}/package.json`;
if (await this.executionEnvironment.exists(packageJsonPath)) { const packageJsonExists = await this.executionEnvironment.exists(packageJsonPath);
const packageJson = JSON.parse( console.log(`[IntelliSense] package.json exists: ${packageJsonExists}`);
await this.executionEnvironment.readFile(packageJsonPath)
); if (packageJsonExists) {
const packageJsonContent = await this.executionEnvironment.readFile(packageJsonPath);
const packageJson = JSON.parse(packageJsonContent);
// Add package.json to Monaco so TypeScript can resolve the types field
ts.typescriptDefaults.addExtraLib(packageJsonContent, `file://${packageJsonPath}`);
console.log(`[IntelliSense] Added package.json: ${packageJsonPath}`);
const typesPath = packageJson.types || packageJson.typings; const typesPath = packageJson.types || packageJson.typings;
console.log(`[IntelliSense] types field: ${typesPath}`);
if (typesPath) { if (typesPath) {
const fullTypesPath = `${basePath}/${typesPath}`; // Load all .d.ts files from the package, not just the entry point
if (await this.executionEnvironment.exists(fullTypesPath)) { // Modern packages often have multiple declaration files with imports
const content = await this.executionEnvironment.readFile(fullTypesPath); await this.loadAllDtsFilesFromPackage(basePath);
ts.typescriptDefaults.addExtraLib( return true;
content,
`file://${fullTypesPath}`
);
return true;
}
} }
} }
// Try common locations // Try common locations - if any exist, load all .d.ts files
const commonPaths = [ const commonPaths = [
`${basePath}/index.d.ts`, `${basePath}/index.d.ts`,
`${basePath}/dist/index.d.ts`, `${basePath}/dist/index.d.ts`,
@@ -223,24 +230,65 @@ export class TypeScriptIntelliSenseManager {
for (const dtsPath of commonPaths) { for (const dtsPath of commonPaths) {
if (await this.executionEnvironment.exists(dtsPath)) { if (await this.executionEnvironment.exists(dtsPath)) {
const content = await this.executionEnvironment.readFile(dtsPath); console.log(`[IntelliSense] Found types at: ${dtsPath}`);
ts.typescriptDefaults.addExtraLib( await this.loadAllDtsFilesFromPackage(basePath);
content,
`file://${dtsPath}`
);
return true; return true;
} }
} }
console.log(`[IntelliSense] No types found for ${packageName}`);
return false; return false;
} catch { } catch (error) {
console.error(`[IntelliSense] Error loading package types:`, error);
return false; return false;
} }
} }
private async tryLoadAtTypesPackage(packageName: string): Promise<boolean> { /**
* Recursively load all .d.ts files from a package directory
*/
private async loadAllDtsFilesFromPackage(basePath: string): Promise<void> {
const ts = this.tsApi; const ts = this.tsApi;
if (!this.executionEnvironment || !ts) return false; if (!this.executionEnvironment || !ts) return;
await this.loadDtsFilesFromDirectory(basePath);
}
/**
* Recursively load .d.ts files from a directory
*/
private async loadDtsFilesFromDirectory(dirPath: string): Promise<void> {
const ts = this.tsApi;
if (!this.executionEnvironment || !ts) return;
try {
const entries = await this.executionEnvironment.readDir(dirPath);
for (const entry of entries) {
const fullPath = dirPath === '/' ? `/${entry.name}` : `${dirPath}/${entry.name}`;
// Skip nested node_modules (shouldn't happen in a package but be safe)
if (entry.name === 'node_modules') continue;
if (entry.type === 'directory') {
await this.loadDtsFilesFromDirectory(fullPath);
} else if (entry.type === 'file' && entry.name.endsWith('.d.ts')) {
try {
const content = await this.executionEnvironment.readFile(fullPath);
console.log(`[IntelliSense] Adding extra lib: ${fullPath} (${content.length} chars)`);
ts.typescriptDefaults.addExtraLib(content, `file://${fullPath}`);
} catch (error) {
console.warn(`[IntelliSense] Failed to read .d.ts file: ${fullPath}`, error);
}
}
}
} catch (error) {
console.warn(`[IntelliSense] Failed to read directory: ${dirPath}`, error);
}
}
private async tryLoadAtTypesPackage(packageName: string): Promise<boolean> {
if (!this.executionEnvironment) return false;
// Handle scoped packages: @scope/package -> @types/scope__package // Handle scoped packages: @scope/package -> @types/scope__package
const typesPackageName = packageName.startsWith('@') const typesPackageName = packageName.startsWith('@')
@@ -252,11 +300,8 @@ export class TypeScriptIntelliSenseManager {
try { try {
const indexPath = `${basePath}/index.d.ts`; const indexPath = `${basePath}/index.d.ts`;
if (await this.executionEnvironment.exists(indexPath)) { if (await this.executionEnvironment.exists(indexPath)) {
const content = await this.executionEnvironment.readFile(indexPath); // Load all .d.ts files from the @types package
ts.typescriptDefaults.addExtraLib( await this.loadAllDtsFilesFromPackage(basePath);
content,
`file://${indexPath}`
);
return true; return true;
} }
return false; return false;
@@ -267,11 +312,83 @@ export class TypeScriptIntelliSenseManager {
/** /**
* Process content change and load types for any new imports * Process content change and load types for any new imports
* @param content The file content to parse for imports
* @param filePath Optional file path to trigger diagnostic refresh
*/ */
public async processContentChange(content: string): Promise<void> { public async processContentChange(content: string, filePath?: string): Promise<void> {
const imports = this.parseImports(content); const imports = this.parseImports(content);
let typesLoaded = false;
for (const packageName of imports) { for (const packageName of imports) {
await this.loadTypesForPackage(packageName); if (!this.loadedLibs.has(packageName)) {
await this.loadTypesForPackage(packageName);
typesLoaded = true;
}
}
// If we loaded new types and have a file path, trigger diagnostic refresh
if (typesLoaded && filePath && this.monacoInstance) {
this.triggerDiagnosticRefresh(filePath);
}
}
/**
* Force Monaco to re-validate a file by touching its model.
* This is needed because addExtraLib doesn't always trigger re-validation.
*/
private triggerDiagnosticRefresh(filePath: string): void {
if (!this.monacoInstance) return;
const uri = this.monacoInstance.Uri.parse(`file://${filePath}`);
const model = this.monacoInstance.editor.getModel(uri);
if (model) {
// Touch the model to trigger re-validation
// We do this by getting and re-setting the same value
const currentValue = model.getValue();
model.setValue(currentValue);
console.log(`[IntelliSense] Triggered diagnostic refresh for: ${filePath}`);
}
}
/**
* Scan node_modules for packages and load types for any not yet loaded.
* Called when node_modules changes (e.g., after pnpm install).
*/
public async scanAndLoadNewPackageTypes(): Promise<void> {
if (!this.executionEnvironment) return;
try {
// Check if node_modules exists
if (!await this.executionEnvironment.exists('/node_modules')) return;
// Read top-level node_modules
const entries = await this.executionEnvironment.readDir('/node_modules');
for (const entry of entries) {
if (entry.type !== 'directory') continue;
if (entry.name.startsWith('@')) {
// Scoped package - read subdirectories
try {
const scopedPath = `/node_modules/${entry.name}`;
const scopedEntries = await this.executionEnvironment.readDir(scopedPath);
for (const scopedEntry of scopedEntries) {
if (scopedEntry.type === 'directory') {
const packageName = `${entry.name}/${scopedEntry.name}`;
await this.loadTypesForPackage(packageName);
}
}
} catch {
// Skip if we can't read scoped directory
}
} else if (!entry.name.startsWith('.')) {
// Regular package
await this.loadTypesForPackage(entry.name);
}
}
} catch (error) {
console.warn('Failed to scan node_modules:', error);
} }
} }

View File

@@ -1,5 +1,5 @@
import * as webcontainer from '@webcontainer/api'; import * as webcontainer from '@webcontainer/api';
import type { IExecutionEnvironment, IFileEntry, IProcessHandle } from '../interfaces/IExecutionEnvironment.js'; import type { IExecutionEnvironment, IFileEntry, IFileWatcher, IProcessHandle } from '../interfaces/IExecutionEnvironment.js';
/** /**
* WebContainer-based execution environment. * WebContainer-based execution environment.
@@ -123,6 +123,22 @@ export class WebContainerEnvironment implements IExecutionEnvironment {
} }
} }
public watch(
path: string,
callback: (event: 'rename' | 'change', filename: string | null) => void,
options?: { recursive?: boolean }
): IFileWatcher {
this.ensureReady();
const watcher = this.container!.fs.watch(
path,
{ recursive: options?.recursive ?? false },
callback
);
return {
stop: () => watcher.close(),
};
}
// ============ Process Execution ============ // ============ Process Execution ============
public async spawn(command: string, args: string[] = []): Promise<IProcessHandle> { public async spawn(command: string, args: string[] = []): Promise<IProcessHandle> {

View File

@@ -7,6 +7,14 @@ export interface IFileEntry {
path: string; path: string;
} }
/**
* Handle to a file system watcher
*/
export interface IFileWatcher {
/** Stop watching for changes */
stop(): void;
}
/** /**
* Handle to a spawned process with I/O streams * Handle to a spawned process with I/O streams
*/ */
@@ -68,6 +76,19 @@ export interface IExecutionEnvironment {
*/ */
exists(path: string): Promise<boolean>; exists(path: string): Promise<boolean>;
/**
* Watch a file or directory for changes
* @param path - Absolute path to watch
* @param callback - Called when changes occur
* @param options - Optional: { recursive: true } to watch subdirectories
* @returns Watcher handle with stop() method
*/
watch(
path: string,
callback: (event: 'rename' | 'change', filename: string | null) => void,
options?: { recursive?: boolean }
): IFileWatcher;
// ============ Process Execution ============ // ============ Process Execution ============
/** /**

View File

@@ -246,7 +246,7 @@ export class DeesContextmenu extends DeesElement {
@mouseleave=${() => this.handleMenuItemLeave()} @mouseleave=${() => this.handleMenuItemLeave()}
> >
${menuItem.iconName ? html` ${menuItem.iconName ? html`
<dees-icon .icon="${`lucide:${menuItem.iconName}`}"></dees-icon> <dees-icon .icon="${menuItem.iconName}"></dees-icon>
` : ''} ` : ''}
<span class="menuitem-text">${menuItem.name}</span> <span class="menuitem-text">${menuItem.name}</span>
${menuItem.shortcut && !hasSubmenu ? html` ${menuItem.shortcut && !hasSubmenu ? html`
@@ -436,8 +436,9 @@ export class DeesContextmenu extends DeesElement {
} }
// Only destroy window layer if this is not a submenu // Only destroy window layer if this is not a submenu
// Don't await - let cleanup happen in background for instant visual feedback
if (this.windowLayer && !this.parentMenu) { if (this.windowLayer && !this.parentMenu) {
await this.windowLayer.destroy(); this.windowLayer.destroy();
} }
this.style.opacity = '0'; this.style.opacity = '0';

View File

@@ -268,9 +268,9 @@ export class DeesIcon extends DeesElement {
name: iconStr.substring(7) // Remove 'lucide:' prefix name: iconStr.substring(7) // Remove 'lucide:' prefix
}; };
} else { } else {
// For backward compatibility, assume FontAwesome if no prefix // Default to Lucide when no prefix is provided
return { return {
type: 'fa', type: 'lucide',
name: iconStr name: iconStr
}; };
} }