Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 08b302bd46 | |||
| 747a67d790 | |||
| 6ec05d6b4a | |||
| 77df2743c5 | |||
| e4bdde1373 | |||
| e193e28fe9 |
31
changelog.md
31
changelog.md
@@ -1,5 +1,36 @@
|
||||
# Changelog
|
||||
|
||||
## 2025-12-31 - 3.19.1 - fix(intellisense)
|
||||
Debounce TypeScript/JavaScript IntelliSense processing and cache missing packages to reduce work and noisy logs
|
||||
|
||||
- Add 500ms debounce in editor workspace to avoid parsing on every keystroke
|
||||
- Introduce notFoundPackages cache to skip repeated filesystem checks for packages without types
|
||||
- Clear not-found cache when scanning node_modules so newly installed packages are re-detected
|
||||
- Remove noisy console logs and make file/directory read errors non-fatal (ignored)
|
||||
- Simplify processContentChange signature (removed optional filePath) and remove manual diagnostic refresh logic
|
||||
|
||||
## 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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@design.estate/dees-catalog",
|
||||
"version": "3.17.0",
|
||||
"version": "3.19.1",
|
||||
"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",
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@design.estate/dees-catalog',
|
||||
version: '3.17.0',
|
||||
version: '3.19.1',
|
||||
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
} from '@design.estate/dees-element';
|
||||
import * as domtools from '@design.estate/dees-domtools';
|
||||
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-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 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 = [
|
||||
themeDefaultStyles,
|
||||
cssManager.defaultStyles,
|
||||
@@ -239,6 +248,7 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 70%)')};
|
||||
}
|
||||
|
||||
.toolbar-button:hover {
|
||||
@@ -439,26 +449,58 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
const menuItems = [];
|
||||
|
||||
if (node.type === 'directory') {
|
||||
// Directory-specific options
|
||||
menuItems.push(
|
||||
{
|
||||
name: 'New File',
|
||||
iconName: 'lucide:filePlus',
|
||||
iconName: 'filePlus',
|
||||
action: async () => this.createNewFile(node.path),
|
||||
},
|
||||
{
|
||||
name: 'New Folder',
|
||||
iconName: 'lucide:folderPlus',
|
||||
iconName: 'folderPlus',
|
||||
action: async () => this.createNewFolder(node.path),
|
||||
},
|
||||
{ name: 'divider' }
|
||||
{ divider: true }
|
||||
);
|
||||
}
|
||||
|
||||
menuItems.push({
|
||||
name: 'Delete',
|
||||
iconName: 'lucide:trash2',
|
||||
action: async () => this.deleteItem(node),
|
||||
});
|
||||
// Common options for both files and directories
|
||||
menuItems.push(
|
||||
{
|
||||
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);
|
||||
}
|
||||
@@ -471,38 +513,48 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
const menuItems = [
|
||||
const menuItems: any[] = [
|
||||
{
|
||||
name: 'New File',
|
||||
iconName: 'lucide:filePlus',
|
||||
iconName: 'filePlus',
|
||||
action: async () => this.createNewFile('/'),
|
||||
},
|
||||
{
|
||||
name: 'New Folder',
|
||||
iconName: 'lucide:folderPlus',
|
||||
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);
|
||||
}
|
||||
|
||||
private async showInputModal(options: {
|
||||
heading: string;
|
||||
label: string;
|
||||
value?: string;
|
||||
buttonName?: 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;
|
||||
}}
|
||||
.value=${options.value || ''}
|
||||
></dees-input-text>
|
||||
`,
|
||||
menuOptions: [
|
||||
@@ -514,10 +566,15 @@ export class DeesEditorFiletree extends DeesElement {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'Create',
|
||||
name: options.buttonName || 'Create',
|
||||
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();
|
||||
resolve(inputValue.trim() || null);
|
||||
resolve(inputValue || null);
|
||||
},
|
||||
},
|
||||
],
|
||||
@@ -603,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() {
|
||||
await this.loadTree();
|
||||
}
|
||||
|
||||
public async updated(changedProperties: Map<string, any>) {
|
||||
if (changedProperties.has('executionEnvironment') && this.executionEnvironment) {
|
||||
await this.loadTree();
|
||||
if (changedProperties.has('executionEnvironment')) {
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
} from '@design.estate/dees-element';
|
||||
import * as domtools from '@design.estate/dees-domtools';
|
||||
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 type { FileSystemTree } from '@webcontainer/api';
|
||||
import '../dees-editor-monaco/dees-editor-monaco.js';
|
||||
@@ -56,6 +56,9 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
build: 'tsc',
|
||||
dev: 'tsc --watch',
|
||||
},
|
||||
dependencies: {
|
||||
'@push.rocks/smartpromise': '^4.2.3',
|
||||
},
|
||||
devDependencies: {
|
||||
typescript: '^5.0.0',
|
||||
},
|
||||
@@ -65,6 +68,19 @@ export class DeesEditorWorkspace extends DeesElement {
|
||||
),
|
||||
},
|
||||
},
|
||||
'npmextra.json': {
|
||||
file: {
|
||||
contents: JSON.stringify(
|
||||
{
|
||||
deesEditorWorkspace: {
|
||||
onInit: 'pnpm install',
|
||||
},
|
||||
},
|
||||
null,
|
||||
2
|
||||
),
|
||||
},
|
||||
},
|
||||
'tsconfig.json': {
|
||||
file: {
|
||||
contents: JSON.stringify(
|
||||
@@ -125,6 +141,28 @@ export function formatName(name: string): string {
|
||||
export function createUser(firstName: string, lastName: string): IUser {
|
||||
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();
|
||||
`,
|
||||
},
|
||||
},
|
||||
@@ -199,6 +237,11 @@ export function createUser(firstName: string, lastName: string): IUser {
|
||||
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
|
||||
private intelliSenseInitialized: boolean = false;
|
||||
|
||||
// node_modules watcher for auto-loading types
|
||||
private nodeModulesWatcher: IFileWatcher | null = null;
|
||||
private nodeModulesDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
|
||||
private intelliSenseDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
// Auto-save functionality
|
||||
@state()
|
||||
accessor autoSave: boolean = false;
|
||||
@@ -753,6 +796,7 @@ export function createUser(firstName: string, lastName: string): IUser {
|
||||
clearInterval(this.autoSaveInterval);
|
||||
this.autoSaveInterval = null;
|
||||
}
|
||||
this.stopNodeModulesWatcher();
|
||||
}
|
||||
|
||||
public async firstUpdated() {
|
||||
@@ -783,6 +827,10 @@ export function createUser(firstName: string, lastName: string): IUser {
|
||||
} else if (!this.executionEnvironment.ready) {
|
||||
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)
|
||||
} catch (error) {
|
||||
console.error('Failed to initialize workspace:', error);
|
||||
@@ -793,6 +841,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> {
|
||||
if (!this.executionEnvironment) return;
|
||||
if (this.intelliSenseInitialized) return;
|
||||
@@ -816,6 +892,51 @@ export function createUser(firstName: string, lastName: string): IUser {
|
||||
|
||||
// Set up marker listener for Problems panel
|
||||
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 }>) {
|
||||
@@ -909,10 +1030,15 @@ export function createUser(firstName: string, lastName: string): IUser {
|
||||
...this.openFiles.slice(fileIndex + 1),
|
||||
];
|
||||
|
||||
// Process content for IntelliSense (TypeScript/JavaScript files)
|
||||
// Process content for IntelliSense (debounced to avoid parsing on every keystroke)
|
||||
const language = this.getLanguageFromPath(this.activeFilePath);
|
||||
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
|
||||
this.intelliSenseManager.processContentChange(newContent);
|
||||
if (this.intelliSenseDebounceTimeout) {
|
||||
clearTimeout(this.intelliSenseDebounceTimeout);
|
||||
}
|
||||
this.intelliSenseDebounceTimeout = setTimeout(() => {
|
||||
this.intelliSenseManager?.processContentChange(newContent);
|
||||
}, 500); // 500ms debounce
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ interface IMonacoTypeScriptAPI {
|
||||
*/
|
||||
export class TypeScriptIntelliSenseManager {
|
||||
private loadedLibs: Set<string> = new Set();
|
||||
private notFoundPackages: Set<string> = new Set(); // Packages checked but not found
|
||||
private monacoInstance: typeof monaco | null = null;
|
||||
private executionEnvironment: IExecutionEnvironment | null = null;
|
||||
|
||||
@@ -174,13 +175,19 @@ export class TypeScriptIntelliSenseManager {
|
||||
public async loadTypesForPackage(packageName: string): Promise<void> {
|
||||
if (!this.monacoInstance || !this.executionEnvironment) return;
|
||||
if (this.loadedLibs.has(packageName)) return;
|
||||
if (this.notFoundPackages.has(packageName)) return; // Skip packages we already checked
|
||||
|
||||
try {
|
||||
const typesLoaded = await this.tryLoadPackageTypes(packageName);
|
||||
let typesLoaded = await this.tryLoadPackageTypes(packageName);
|
||||
if (!typesLoaded) {
|
||||
await this.tryLoadAtTypesPackage(packageName);
|
||||
typesLoaded = await this.tryLoadAtTypesPackage(packageName);
|
||||
}
|
||||
if (typesLoaded) {
|
||||
this.loadedLibs.add(packageName);
|
||||
} else {
|
||||
// Cache that this package wasn't found to avoid repeated filesystem checks
|
||||
this.notFoundPackages.add(packageName);
|
||||
}
|
||||
this.loadedLibs.add(packageName);
|
||||
} catch (error) {
|
||||
console.warn(`Failed to load types for ${packageName}:`, error);
|
||||
}
|
||||
@@ -195,26 +202,25 @@ export class TypeScriptIntelliSenseManager {
|
||||
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 packageJsonExists = await this.executionEnvironment.exists(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}`);
|
||||
|
||||
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;
|
||||
}
|
||||
// Load all .d.ts files from the package, not just the entry point
|
||||
// Modern packages often have multiple declaration files with imports
|
||||
await this.loadAllDtsFilesFromPackage(basePath);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// Try common locations
|
||||
// Try common locations - if any exist, load all .d.ts files
|
||||
const commonPaths = [
|
||||
`${basePath}/index.d.ts`,
|
||||
`${basePath}/dist/index.d.ts`,
|
||||
@@ -223,24 +229,62 @@ export class TypeScriptIntelliSenseManager {
|
||||
|
||||
for (const dtsPath of commonPaths) {
|
||||
if (await this.executionEnvironment.exists(dtsPath)) {
|
||||
const content = await this.executionEnvironment.readFile(dtsPath);
|
||||
ts.typescriptDefaults.addExtraLib(
|
||||
content,
|
||||
`file://${dtsPath}`
|
||||
);
|
||||
await this.loadAllDtsFilesFromPackage(basePath);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch {
|
||||
} catch (error) {
|
||||
console.error(`Failed to load package types for ${packageName}:`, error);
|
||||
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;
|
||||
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);
|
||||
ts.typescriptDefaults.addExtraLib(content, `file://${fullPath}`);
|
||||
} catch {
|
||||
// Ignore files that can't be read
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// Directory might not be readable
|
||||
}
|
||||
}
|
||||
|
||||
private async tryLoadAtTypesPackage(packageName: string): Promise<boolean> {
|
||||
if (!this.executionEnvironment) return false;
|
||||
|
||||
// Handle scoped packages: @scope/package -> @types/scope__package
|
||||
const typesPackageName = packageName.startsWith('@')
|
||||
@@ -252,11 +296,8 @@ export class TypeScriptIntelliSenseManager {
|
||||
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}`
|
||||
);
|
||||
// Load all .d.ts files from the @types package
|
||||
await this.loadAllDtsFilesFromPackage(basePath);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -270,8 +311,55 @@ export class TypeScriptIntelliSenseManager {
|
||||
*/
|
||||
public async processContentChange(content: string): Promise<void> {
|
||||
const imports = this.parseImports(content);
|
||||
|
||||
for (const packageName of imports) {
|
||||
await this.loadTypesForPackage(packageName);
|
||||
if (!this.loadedLibs.has(packageName)) {
|
||||
await this.loadTypesForPackage(packageName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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;
|
||||
|
||||
// Clear not-found cache so newly installed packages can be detected
|
||||
this.notFoundPackages.clear();
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
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.
|
||||
@@ -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 ============
|
||||
|
||||
public async spawn(command: string, args: string[] = []): Promise<IProcessHandle> {
|
||||
|
||||
@@ -7,6 +7,14 @@ export interface IFileEntry {
|
||||
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
|
||||
*/
|
||||
@@ -68,6 +76,19 @@ export interface IExecutionEnvironment {
|
||||
*/
|
||||
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 ============
|
||||
|
||||
/**
|
||||
|
||||
@@ -246,7 +246,7 @@ export class DeesContextmenu extends DeesElement {
|
||||
@mouseleave=${() => this.handleMenuItemLeave()}
|
||||
>
|
||||
${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>
|
||||
${menuItem.shortcut && !hasSubmenu ? html`
|
||||
@@ -436,8 +436,9 @@ export class DeesContextmenu extends DeesElement {
|
||||
}
|
||||
|
||||
// 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) {
|
||||
await this.windowLayer.destroy();
|
||||
this.windowLayer.destroy();
|
||||
}
|
||||
|
||||
this.style.opacity = '0';
|
||||
|
||||
@@ -268,9 +268,9 @@ export class DeesIcon extends DeesElement {
|
||||
name: iconStr.substring(7) // Remove 'lucide:' prefix
|
||||
};
|
||||
} else {
|
||||
// For backward compatibility, assume FontAwesome if no prefix
|
||||
// Default to Lucide when no prefix is provided
|
||||
return {
|
||||
type: 'fa',
|
||||
type: 'lucide',
|
||||
name: iconStr
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user