Compare commits

...

10 Commits

Author SHA1 Message Date
826689ec0e v3.20.0
Some checks failed
Default (tags) / security (push) Failing after 18s
Default (tags) / test (push) Failing after 16s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-12-31 12:37:14 +00:00
15bca09086 feat(workspace): rename editor components to workspace group and move terminal & TypeScript intellisense into workspace 2025-12-31 12:37:14 +00:00
08b302bd46 v3.19.1
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 11:02:58 +00:00
747a67d790 fix(intellisense): Debounce TypeScript/JavaScript IntelliSense processing and cache missing packages to reduce work and noisy logs 2025-12-31 11:02:58 +00:00
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
34 changed files with 1387 additions and 202 deletions

View File

@@ -1,5 +1,56 @@
# Changelog # Changelog
## 2025-12-31 - 3.20.0 - feat(workspace)
rename editor components to workspace group and move terminal & TypeScript intellisense into workspace
- Renamed components and modules from 00group-editor/dees-editor-* to 00group-workspace/dees-workspace-* (e.g. dees-editor-monaco -> dees-workspace-monaco).
- Moved terminal implementation from dees-terminal to dees-workspace-terminal and updated related imports/usages.
- Moved TypeScript intellisense manager into 00group-workspace and updated paths.
- Updated ts_web elements index to export 00group-workspace instead of 00group-editor and adjusted internal imports accordingly.
- Updated scripts/update-monaco-version.cjs to write MONACO_VERSION into the new workspace path and updated log tags.
## 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
- 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.20.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

@@ -11,7 +11,7 @@ function resolveMonacoPackageJson() {
}); });
return resolvedPath; return resolvedPath;
} catch (error) { } catch (error) {
console.error('[dees-editor] Unable to resolve monaco-editor/package.json'); console.error('[dees-workspace] Unable to resolve monaco-editor/package.json');
throw error; throw error;
} }
} }
@@ -20,25 +20,25 @@ function getMonacoVersion() {
const monacoPackagePath = resolveMonacoPackageJson(); const monacoPackagePath = resolveMonacoPackageJson();
const monacoPackage = require(monacoPackagePath); const monacoPackage = require(monacoPackagePath);
if (!monacoPackage.version) { if (!monacoPackage.version) {
throw new Error('[dees-editor] monaco-editor/package.json does not expose a version field'); throw new Error('[dees-workspace] monaco-editor/package.json does not expose a version field');
} }
return monacoPackage.version; return monacoPackage.version;
} }
function writeVersionModule(version) { function writeVersionModule(version) {
const targetDir = path.join(projectRoot, 'ts_web', 'elements', '00group-editor', 'dees-editor-monaco'); const targetDir = path.join(projectRoot, 'ts_web', 'elements', '00group-workspace', 'dees-workspace-monaco');
fs.mkdirSync(targetDir, { recursive: true }); fs.mkdirSync(targetDir, { recursive: true });
const targetFile = path.join(targetDir, 'version.ts'); const targetFile = path.join(targetDir, 'version.ts');
const fileContent = `// Auto-generated by scripts/update-monaco-version.cjs\nexport const MONACO_VERSION = '${version}';\n`; const fileContent = `// Auto-generated by scripts/update-monaco-version.cjs\nexport const MONACO_VERSION = '${version}';\n`;
fs.writeFileSync(targetFile, fileContent, 'utf8'); fs.writeFileSync(targetFile, fileContent, 'utf8');
console.log(`[dees-editor] Wrote ${path.relative(projectRoot, targetFile)} with monaco-editor@${version}`); console.log(`[dees-workspace] Wrote ${path.relative(projectRoot, targetFile)} with monaco-editor@${version}`);
} }
try { try {
const version = getMonacoVersion(); const version = getMonacoVersion();
writeVersionModule(version); writeVersionModule(version);
} catch (error) { } catch (error) {
console.error('[dees-editor] Failed to update Monaco version module.'); console.error('[dees-workspace] Failed to update Monaco version module.');
console.error(error instanceof Error ? error.message : error); console.error(error instanceof Error ? error.message : error);
process.exitCode = 1; process.exitCode = 1;
} }

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.20.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

@@ -1 +0,0 @@
export * from './dees-editor-filetree.js';

View File

@@ -1 +0,0 @@
export * from './dees-editor-markdown.js';

View File

@@ -1 +0,0 @@
export * from './dees-editor-markdownoutlet.js';

View File

@@ -1 +0,0 @@
export * from './dees-editor-monaco.js';

View File

@@ -1,6 +0,0 @@
// Editor Components
export * from './dees-editor-monaco/index.js';
export * from './dees-editor-filetree/index.js';
export * from './dees-editor-workspace/index.js';
export * from './dees-editor-markdown/index.js';
export * from './dees-editor-markdownoutlet/index.js';

View File

@@ -12,8 +12,8 @@ import { themeDefaultStyles } from '../../00theme.js';
import { DeesModal } from '../../dees-modal/dees-modal.js'; import { DeesModal } from '../../dees-modal/dees-modal.js';
import '../../dees-icon/dees-icon.js'; import '../../dees-icon/dees-icon.js';
import '../../dees-label/dees-label.js'; import '../../dees-label/dees-label.js';
import '../../00group-editor/dees-editor-monaco/dees-editor-monaco.js'; import '../../00group-workspace/dees-workspace-monaco/dees-workspace-monaco.js';
import { DeesEditorMonaco } from '../../00group-editor/dees-editor-monaco/dees-editor-monaco.js'; import { DeesWorkspaceMonaco } from '../../00group-workspace/dees-workspace-monaco/dees-workspace-monaco.js';
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
@@ -77,7 +77,7 @@ export class DeesInputCode extends DeesInputBase<string> {
@state() @state()
accessor copySuccess: boolean = false; accessor copySuccess: boolean = false;
private editorElement: DeesEditorMonaco | null = null; private editorElement: DeesWorkspaceMonaco | null = null;
public static styles = [ public static styles = [
themeDefaultStyles, themeDefaultStyles,
@@ -207,7 +207,7 @@ export class DeesInputCode extends DeesInputBase<string> {
position: relative; position: relative;
} }
dees-editor-monaco { dees-workspace-monaco {
display: block; display: block;
} }
@@ -295,12 +295,12 @@ export class DeesInputCode extends DeesInputBase<string> {
</div> </div>
</div> </div>
<div class="editor-wrapper"> <div class="editor-wrapper">
<dees-editor-monaco <dees-workspace-monaco
.content=${this.value} .content=${this.value}
.language=${this.language} .language=${this.language}
.wordWrap=${this.wordWrap} .wordWrap=${this.wordWrap}
@content-change=${this.handleContentChange} @content-change=${this.handleContentChange}
></dees-editor-monaco> ></dees-workspace-monaco>
</div> </div>
</div> </div>
</div> </div>
@@ -308,7 +308,7 @@ export class DeesInputCode extends DeesInputBase<string> {
} }
async firstUpdated() { async firstUpdated() {
this.editorElement = this.shadowRoot?.querySelector('dees-editor-monaco') as DeesEditorMonaco; this.editorElement = this.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
if (this.editorElement) { if (this.editorElement) {
// Subscribe to content changes from the editor // Subscribe to content changes from the editor
this.editorElement.contentSubject.subscribe((newContent: string) => { this.editorElement.contentSubject.subscribe((newContent: string) => {
@@ -386,7 +386,7 @@ export class DeesInputCode extends DeesInputBase<string> {
public async openFullscreen() { public async openFullscreen() {
const currentValue = this.value; const currentValue = this.value;
let modalEditorElement: DeesEditorMonaco | null = null; let modalEditorElement: DeesWorkspaceMonaco | null = null;
// Modal-specific state // Modal-specific state
let modalLanguage = this.language; let modalLanguage = this.language;
@@ -579,11 +579,11 @@ export class DeesInputCode extends DeesInputBase<string> {
</div> </div>
</div> </div>
<div class="modal-editor-wrapper"> <div class="modal-editor-wrapper">
<dees-editor-monaco <dees-workspace-monaco
.content=${currentValue} .content=${currentValue}
.language=${modalLanguage} .language=${modalLanguage}
.wordWrap=${modalWordWrap} .wordWrap=${modalWordWrap}
></dees-editor-monaco> ></dees-workspace-monaco>
</div> </div>
`, `,
menuOptions: [ menuOptions: [
@@ -597,7 +597,7 @@ export class DeesInputCode extends DeesInputBase<string> {
name: 'Save & Close', name: 'Save & Close',
action: async (modalRef) => { action: async (modalRef) => {
// Get the editor content from the modal // Get the editor content from the modal
modalEditorElement = modalRef.shadowRoot?.querySelector('dees-editor-monaco') as DeesEditorMonaco; modalEditorElement = modalRef.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
if (modalEditorElement) { if (modalEditorElement) {
const editor = await modalEditorElement.editorDeferred.promise; const editor = await modalEditorElement.editorDeferred.promise;
const newValue = editor.getValue(); const newValue = editor.getValue();
@@ -611,7 +611,7 @@ export class DeesInputCode extends DeesInputBase<string> {
// Wait for modal to render // Wait for modal to render
await new Promise(resolve => setTimeout(resolve, 100)); await new Promise(resolve => setTimeout(resolve, 100));
modalEditorElement = modal.shadowRoot?.querySelector('dees-editor-monaco') as DeesEditorMonaco; modalEditorElement = modal.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
// Wire up toolbar event handlers // Wire up toolbar event handlers
const toolbar = modal.shadowRoot?.querySelector('.modal-toolbar'); const toolbar = modal.shadowRoot?.querySelector('.modal-toolbar');

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

@@ -14,7 +14,7 @@ import {
domtools, domtools,
} from '@design.estate/dees-element'; } from '@design.estate/dees-element';
import '../../dees-icon/dees-icon.js'; import '../../dees-icon/dees-icon.js';
import type { DeesTerminal } from '../../dees-terminal/dees-terminal.js'; import type { DeesWorkspaceTerminal } from '../../00group-workspace/dees-workspace-terminal/dees-workspace-terminal.js';
import { themeDefaultStyles } from '../../00theme.js'; import { themeDefaultStyles } from '../../00theme.js';
declare global { declare global {
@@ -393,7 +393,7 @@ export class DeesSimpleAppDash extends DeesElement {
} }
} }
public currentTerminal: DeesTerminal; public currentTerminal: DeesWorkspaceTerminal;
public async launchTerminal() { public async launchTerminal() {
const domtools = await this.domtoolsPromise; const domtools = await this.domtoolsPromise;
if (this.currentTerminal) { if (this.currentTerminal) {
@@ -403,8 +403,8 @@ export class DeesSimpleAppDash extends DeesElement {
} }
const maincontainer = this.shadowRoot.querySelector('.maincontainer'); const maincontainer = this.shadowRoot.querySelector('.maincontainer');
const { DeesTerminal } = await import('../../dees-terminal/dees-terminal.js'); const { DeesWorkspaceTerminal } = await import('../../00group-workspace/dees-workspace-terminal/dees-workspace-terminal.js');
const terminal = new DeesTerminal(); const terminal = new DeesWorkspaceTerminal();
terminal.setupCommand = this.terminalSetupCommand; terminal.setupCommand = this.terminalSetupCommand;
this.currentTerminal = terminal; this.currentTerminal = terminal;
maincontainer.appendChild(terminal); maincontainer.appendChild(terminal);

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';
@@ -20,7 +20,7 @@ import { DeesInputText } from '../../00group-input/dees-input-text/dees-input-te
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
'dees-editor-filetree': DeesEditorFiletree; 'dees-workspace-filetree': DeesWorkspaceFiletree;
} }
} }
@@ -30,11 +30,11 @@ interface ITreeNode extends IFileEntry {
level: number; level: number;
} }
@customElement('dees-editor-filetree') @customElement('dees-workspace-filetree')
export class DeesEditorFiletree extends DeesElement { export class DeesWorkspaceFiletree extends DeesElement {
public static demo = () => html` public static demo = () => html`
<div style="width: 300px; height: 400px; position: relative;"> <div style="width: 300px; height: 400px; position: relative;">
<dees-editor-filetree></dees-editor-filetree> <dees-workspace-filetree></dees-workspace-filetree>
</div> </div>
`; `;
@@ -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` return html`
<div class="empty"> <div class="filetree-toolbar">
No files found. <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>
`; <div class="toolbar-button" @click=${() => this.createNewFolder('/')} title="New Folder">
} <dees-icon .icon=${'lucide:folderPlus'} iconSize="16"></dees-icon>
</div>
return html` </div>
<div class="tree-container"> </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)} ${this.renderTree(this.treeData)}
</div> </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 }
); );
} }
// 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({ menuItems.push({
name: 'Delete', name: 'Paste',
iconName: 'lucide:trash2', iconName: 'clipboard',
action: async () => this.deleteItem(node), 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')) {
// Stop watching the old environment
if (this.lastExecutionEnvironment !== this.executionEnvironment) {
this.stopFileWatcher();
this.lastExecutionEnvironment = this.executionEnvironment;
}
if (this.executionEnvironment) {
await this.loadTree(); 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

@@ -0,0 +1 @@
export * from './dees-workspace-filetree.js';

View File

@@ -9,19 +9,19 @@ import {
domtools domtools
} from '@design.estate/dees-element'; } from '@design.estate/dees-element';
import { themeDefaultStyles } from '../../00theme.js'; import { themeDefaultStyles } from '../../00theme.js';
import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js'; import { DeesWorkspaceMonaco } from '../dees-workspace-monaco/dees-workspace-monaco.js';
const deferred = domtools.plugins.smartpromise.defer(); const deferred = domtools.plugins.smartpromise.defer();
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
'dees-editormarkdown': DeesEditorMarkdown; 'dees-workspace-markdown': DeesWorkspaceMarkdown;
} }
} }
@customElement('dees-editormarkdown') @customElement('dees-workspace-markdown')
export class DeesEditorMarkdown extends DeesElement { export class DeesWorkspaceMarkdown extends DeesElement {
public static demo = () => html`<dees-editormarkdown></dees-editormarkdown>`; public static demo = () => html`<dees-workspace-markdown></dees-workspace-markdown>`;
public static styles = [ public static styles = [
themeDefaultStyles, themeDefaultStyles,
@@ -52,7 +52,7 @@ export class DeesEditorMarkdown extends DeesElement {
return html` return html`
<div class="gridcontainer"> <div class="gridcontainer">
<div class="editorContainer"> <div class="editorContainer">
<dees-editor-monaco <dees-workspace-monaco
.language=${'markdown'} .language=${'markdown'}
.content=${`# a test content .content=${`# a test content
@@ -76,10 +76,10 @@ const hello = 'yes'
\`\`\` \`\`\`
`} `}
wordWrap="bounded" wordWrap="bounded"
></dees-editor-monaco> ></dees-workspace-monaco>
</div> </div>
<div class="outletContainer"> <div class="outletContainer">
<dees-editormarkdownoutlet></dees-editormarkdownoutlet> <dees-workspace-markdownoutlet></dees-workspace-markdownoutlet>
</div> </div>
</div> </div>
`; `;
@@ -87,10 +87,10 @@ const hello = 'yes'
public async firstUpdated(_changedPropertiesArg) { public async firstUpdated(_changedPropertiesArg) {
await super.firstUpdated(_changedPropertiesArg); await super.firstUpdated(_changedPropertiesArg);
const editor = this.shadowRoot.querySelector('dees-editor-monaco') as DeesEditorMonaco; const editor = this.shadowRoot.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
// lets care about wiring the markdown stuff. // lets care about wiring the markdown stuff.
const markdownOutlet = this.shadowRoot.querySelector('dees-editormarkdownoutlet'); const markdownOutlet = this.shadowRoot.querySelector('dees-workspace-markdownoutlet');
const smartmarkdownInstance = new domtools.plugins.smartmarkdown.SmartMarkdown(); const smartmarkdownInstance = new domtools.plugins.smartmarkdown.SmartMarkdown();
const mdParsedResult = await smartmarkdownInstance.getMdParsedResultFromMarkdown('loading...') const mdParsedResult = await smartmarkdownInstance.getMdParsedResultFromMarkdown('loading...')
editor.contentSubject.subscribe(async contentArg => { editor.contentSubject.subscribe(async contentArg => {

View File

@@ -0,0 +1 @@
export * from './dees-workspace-markdown.js';

View File

@@ -2,14 +2,14 @@ import { customElement, DeesElement, html, type TemplateResult } from '@design.e
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
'dees-editormarkdownoutlet': DeesEditorMarkdownOutlet; 'dees-workspace-markdownoutlet': DeesWorkspaceMarkdownoutlet;
} }
} }
@customElement('dees-editormarkdownoutlet') @customElement('dees-workspace-markdownoutlet')
export class DeesEditorMarkdownOutlet extends DeesElement { export class DeesWorkspaceMarkdownoutlet extends DeesElement {
// DEMO // DEMO
public static demo = () => html`<dees-editormarkdownoutlet></dees-editormarkdownoutlet>`; public static demo = () => html`<dees-workspace-markdownoutlet></dees-workspace-markdownoutlet>`;
// INSTANCE // INSTANCE
private outlet: HTMLElement; private outlet: HTMLElement;

View File

@@ -0,0 +1 @@
export * from './dees-workspace-markdownoutlet.js';

View File

@@ -15,14 +15,14 @@ import type * as monaco from 'monaco-editor';
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
'dees-editor-monaco': DeesEditorMonaco; 'dees-workspace-monaco': DeesWorkspaceMonaco;
} }
} }
@customElement('dees-editor-monaco') @customElement('dees-workspace-monaco')
export class DeesEditorMonaco extends DeesElement { export class DeesWorkspaceMonaco extends DeesElement {
// DEMO // DEMO
public static demo = () => html`<dees-editor-monaco></dees-editor-monaco>`; public static demo = () => html`<dees-workspace-monaco></dees-workspace-monaco>`;
// STATIC // STATIC
public static monacoDeferred: ReturnType<typeof domtools.plugins.smartpromise.defer>; public static monacoDeferred: ReturnType<typeof domtools.plugins.smartpromise.defer>;
@@ -98,17 +98,17 @@ export class DeesEditorMonaco extends DeesElement {
const container = this.shadowRoot.getElementById('container'); const container = this.shadowRoot.getElementById('container');
const monacoCdnBase = `https://cdn.jsdelivr.net/npm/monaco-editor@${MONACO_VERSION}`; const monacoCdnBase = `https://cdn.jsdelivr.net/npm/monaco-editor@${MONACO_VERSION}`;
if (!DeesEditorMonaco.monacoDeferred) { if (!DeesWorkspaceMonaco.monacoDeferred) {
DeesEditorMonaco.monacoDeferred = domtools.plugins.smartpromise.defer(); DeesWorkspaceMonaco.monacoDeferred = domtools.plugins.smartpromise.defer();
const scriptUrl = `${monacoCdnBase}/min/vs/loader.js`; const scriptUrl = `${monacoCdnBase}/min/vs/loader.js`;
const script = document.createElement('script'); const script = document.createElement('script');
script.src = scriptUrl; script.src = scriptUrl;
script.onload = () => { script.onload = () => {
DeesEditorMonaco.monacoDeferred.resolve(); DeesWorkspaceMonaco.monacoDeferred.resolve();
}; };
document.head.appendChild(script); document.head.appendChild(script);
} }
await DeesEditorMonaco.monacoDeferred.promise; await DeesWorkspaceMonaco.monacoDeferred.promise;
(window as any).require.config({ (window as any).require.config({
paths: { vs: `${monacoCdnBase}/min/vs` }, paths: { vs: `${monacoCdnBase}/min/vs` },

View File

@@ -0,0 +1 @@
export * from './dees-workspace-monaco.js';

View File

@@ -0,0 +1,361 @@
import {
DeesElement,
property,
html,
customElement,
type TemplateResult,
css,
cssManager,
} from '@design.estate/dees-element';
import { Terminal } from 'xterm';
import { FitAddon } from 'xterm-addon-fit';
import { themeDefaultStyles } from '../../00theme.js';
declare global {
interface HTMLElementTagNameMap {
'dees-workspace-terminal-preview': DeesWorkspaceTerminalPreview;
}
}
/**
* A read-only terminal preview component using xterm.js for rendering.
* Used during workspace initialization to show onInit command progress.
*/
@customElement('dees-workspace-terminal-preview')
export class DeesWorkspaceTerminalPreview extends DeesElement {
public static demo = () => html`
<dees-workspace-terminal-preview
.command=${'pnpm install'}
.lines=${[
'Packages: +42',
'Progress: resolved 142, reused 140, downloaded 2, added 42, done',
'',
'dependencies:',
'+ @push.rocks/smartpromise 4.2.3',
'+ typescript 5.3.3',
'',
'Done in 2.3s'
]}
></dees-workspace-terminal-preview>
`;
/**
* The command being displayed (shown in header)
*/
@property({ type: String })
accessor command: string = '';
/**
* Output lines to display
*/
@property({ type: Array })
accessor lines: string[] = [];
private terminal: Terminal | null = null;
private fitAddon: FitAddon | null = null;
private lastLineCount: number = 0;
private resizeObserver: ResizeObserver | null = null;
public static styles = [
themeDefaultStyles,
cssManager.defaultStyles,
css`
:host {
display: block;
height: 200px;
}
.terminal-preview {
height: 100%;
border-radius: 8px;
overflow: hidden;
background: #000000;
border: 1px solid hsl(0 0% 20%);
display: flex;
flex-direction: column;
}
.terminal-header {
display: flex;
align-items: center;
gap: 8px;
padding: 8px 12px;
background: hsl(0 0% 10%);
font-size: 12px;
font-family: 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', monospace;
color: hsl(0 0% 60%);
border-bottom: 1px solid hsl(0 0% 20%);
flex-shrink: 0;
}
.terminal-header-icon {
color: hsl(0 0% 50%);
}
.terminal-header-command {
color: hsl(0 0% 80%);
font-weight: 500;
}
.terminal-container {
flex: 1;
position: relative;
padding: 8px;
}
#xterm-container {
position: absolute;
top: 8px;
left: 8px;
right: 8px;
bottom: 8px;
}
/* xterm.js styles */
.xterm {
font-feature-settings: 'liga' 0;
position: relative;
user-select: none;
-ms-user-select: none;
-webkit-user-select: none;
}
.xterm.focus,
.xterm:focus {
outline: none;
}
.xterm .xterm-helpers {
position: absolute;
top: 0;
z-index: 5;
}
.xterm .xterm-helper-textarea {
padding: 0;
border: 0;
margin: 0;
position: absolute;
opacity: 0;
left: -9999em;
top: 0;
width: 0;
height: 0;
z-index: -5;
white-space: nowrap;
overflow: hidden;
resize: none;
}
.xterm .composition-view {
background: #000000;
color: #fff;
display: none;
position: absolute;
white-space: nowrap;
z-index: 1;
}
.xterm .composition-view.active {
display: block;
}
.xterm .xterm-viewport {
background-color: #000000;
overflow-y: scroll;
cursor: default;
position: absolute;
right: 0;
left: 0;
top: 0;
bottom: 0;
}
.xterm .xterm-screen {
position: relative;
}
.xterm .xterm-screen canvas {
position: absolute;
left: 0;
top: 0;
}
.xterm .xterm-scroll-area {
visibility: hidden;
}
.xterm-char-measure-element {
display: inline-block;
visibility: hidden;
position: absolute;
top: 0;
left: -9999em;
line-height: normal;
}
.xterm {
cursor: text;
}
.xterm.enable-mouse-events {
cursor: default;
}
.xterm.xterm-cursor-pointer {
cursor: pointer;
}
.xterm.column-select.focus {
cursor: crosshair;
}
.xterm .xterm-accessibility,
.xterm .xterm-message {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
z-index: 10;
color: transparent;
}
.xterm .live-region {
position: absolute;
left: -9999px;
width: 1px;
height: 1px;
overflow: hidden;
}
.xterm-dim {
opacity: 0.5;
}
.xterm-underline {
text-decoration: underline;
}
/* Custom scrollbar for xterm viewport */
.xterm .xterm-viewport::-webkit-scrollbar {
width: 8px;
}
.xterm .xterm-viewport::-webkit-scrollbar-track {
background: hsl(0 0% 8%);
}
.xterm .xterm-viewport::-webkit-scrollbar-thumb {
background: hsl(0 0% 25%);
border-radius: 4px;
}
.xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
background: hsl(0 0% 35%);
}
`,
];
public render(): TemplateResult {
return html`
<div class="terminal-preview">
<div class="terminal-header">
<span class="terminal-header-icon">$</span>
<span class="terminal-header-command">${this.command || 'Waiting...'}</span>
</div>
<div class="terminal-container">
<div id="xterm-container"></div>
</div>
</div>
`;
}
public async firstUpdated(
_changedProperties: Map<string | number | symbol, unknown>
): Promise<void> {
super.firstUpdated(_changedProperties);
const container = this.shadowRoot?.getElementById('xterm-container');
if (!container) return;
// Create xterm terminal in read-only mode
this.terminal = new Terminal({
convertEol: true,
cursorBlink: false,
disableStdin: true,
fontSize: 12,
fontFamily: "'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', monospace",
theme: {
background: '#000000',
foreground: '#cccccc',
},
scrollback: 1000,
});
this.fitAddon = new FitAddon();
this.terminal.loadAddon(this.fitAddon);
this.terminal.open(container);
this.fitAddon.fit();
// Set up resize observer to refit terminal
this.resizeObserver = new ResizeObserver(() => {
if (this.fitAddon) {
this.fitAddon.fit();
}
});
this.resizeObserver.observe(container);
// Write any existing lines
this.writeNewLines();
}
public async updated(changedProperties: Map<string, any>) {
super.updated(changedProperties);
if (changedProperties.has('lines')) {
this.writeNewLines();
}
}
private writeNewLines() {
if (!this.terminal) return;
// Write only new lines since last update
const newLines = this.lines.slice(this.lastLineCount);
for (const line of newLines) {
this.terminal.writeln(line);
}
this.lastLineCount = this.lines.length;
}
public async disconnectedCallback(): Promise<void> {
if (this.resizeObserver) {
this.resizeObserver.disconnect();
this.resizeObserver = null;
}
if (this.terminal) {
this.terminal.dispose();
this.terminal = null;
}
await super.disconnectedCallback();
}
/**
* Add a new line to the output
*/
public addLine(line: string) {
this.lines = [...this.lines, line];
}
/**
* Clear all output lines
*/
public clear() {
this.lines = [];
this.lastLineCount = 0;
if (this.terminal) {
this.terminal.clear();
}
}
}

View File

@@ -0,0 +1 @@
export * from './dees-workspace-terminal-preview.js';

View File

@@ -11,21 +11,21 @@ import * as domtools from '@design.estate/dees-domtools';
import { Terminal } from 'xterm'; import { Terminal } from 'xterm';
import { FitAddon } from 'xterm-addon-fit'; import { FitAddon } from 'xterm-addon-fit';
import { themeDefaultStyles } from '../00theme.js'; import { themeDefaultStyles } from '../../00theme.js';
import type { IExecutionEnvironment } from '../00group-runtime/index.js'; import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
import { WebContainerEnvironment } from '../00group-runtime/index.js'; import { WebContainerEnvironment } from '../../00group-runtime/index.js';
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
'dees-terminal': DeesTerminal; 'dees-workspace-terminal': DeesWorkspaceTerminal;
} }
} }
@customElement('dees-terminal') @customElement('dees-workspace-terminal')
export class DeesTerminal extends DeesElement { export class DeesWorkspaceTerminal extends DeesElement {
public static demo = () => { public static demo = () => {
const env = new WebContainerEnvironment(); const env = new WebContainerEnvironment();
return html`<dees-terminal .executionEnvironment=${env}></dees-terminal>`; return html`<dees-workspace-terminal .executionEnvironment=${env}></dees-workspace-terminal>`;
}; };
// INSTANCE // INSTANCE

View File

@@ -0,0 +1 @@
export * from './dees-workspace-terminal.js';

View File

@@ -10,20 +10,22 @@ 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-workspace-monaco/dees-workspace-monaco.js';
import '../dees-editor-filetree/dees-editor-filetree.js'; import '../dees-workspace-filetree/dees-workspace-filetree.js';
import { DeesEditorFiletree } from '../dees-editor-filetree/dees-editor-filetree.js'; import { DeesWorkspaceFiletree } from '../dees-workspace-filetree/dees-workspace-filetree.js';
import '../../dees-terminal/dees-terminal.js'; import '../dees-workspace-terminal/dees-workspace-terminal.js';
import '../dees-workspace-terminal-preview/dees-workspace-terminal-preview.js';
import '../../dees-icon/dees-icon.js'; import '../../dees-icon/dees-icon.js';
import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js'; import { DeesWorkspaceMonaco } from '../dees-workspace-monaco/dees-workspace-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 {
'dees-editor-workspace': DeesEditorWorkspace; 'dees-workspace': DeesWorkspace;
} }
} }
@@ -34,8 +36,8 @@ interface IOpenFile {
modified: boolean; modified: boolean;
} }
@customElement('dees-editor-workspace') @customElement('dees-workspace')
export class DeesEditorWorkspace extends DeesElement { export class DeesWorkspace extends DeesElement {
public static demo = () => { public static demo = () => {
const env = new WebContainerEnvironment(); const env = new WebContainerEnvironment();
@@ -55,6 +57,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 +69,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 +142,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();
`, `,
}, },
}, },
@@ -136,10 +176,10 @@ export function createUser(firstName: string, lastName: string): IUser {
return html` return html`
<div style="width: 100%; height: 600px; position: relative;"> <div style="width: 100%; height: 600px; position: relative;">
<dees-editor-workspace <dees-workspace
.executionEnvironment=${env} .executionEnvironment=${env}
.initializationPromise=${mountPromise} .initializationPromise=${mountPromise}
></dees-editor-workspace> ></dees-workspace>
</div> </div>
`; `;
}; };
@@ -193,11 +233,43 @@ export function createUser(firstName: string, lastName: string): IUser {
resource: { path: string }; resource: { path: string };
}> = []; }> = [];
private editorElement: DeesEditorMonaco | null = null; private editorElement: DeesWorkspaceMonaco | null = null;
private initializationStarted: boolean = false; private initializationStarted: boolean = false;
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;
private intelliSenseDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
// Auto-save functionality
@state()
accessor autoSave: boolean = false;
private autoSaveInterval: ReturnType<typeof setInterval> | null = null;
// Init terminal preview state
@state()
accessor initCommand: string = '';
@state()
accessor initOutput: string[] = [];
// 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 +462,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;
@@ -541,6 +638,11 @@ export function createUser(firstName: string, lastName: string): IUser {
opacity: 0.5; opacity: 0.5;
} }
@keyframes spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
.initializing { .initializing {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -552,7 +654,17 @@ export function createUser(firstName: string, lastName: string): IUser {
gap: 12px; gap: 12px;
} }
dees-editor-filetree { .initializing dees-icon {
animation: spin 1s linear infinite;
}
.initializing dees-workspace-terminal-preview {
margin-top: 24px;
width: 80%;
max-width: 600px;
}
dees-workspace-filetree {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -560,7 +672,7 @@ export function createUser(firstName: string, lastName: string): IUser {
bottom: 0; bottom: 0;
} }
dees-editor-monaco { dees-workspace-monaco {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -568,7 +680,7 @@ export function createUser(firstName: string, lastName: string): IUser {
bottom: 0; bottom: 0;
} }
dees-terminal { dees-workspace-terminal {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -590,6 +702,12 @@ export function createUser(firstName: string, lastName: string): IUser {
<div class="initializing"> <div class="initializing">
<dees-icon .icon=${'lucide:loader2'} iconSize="32"></dees-icon> <dees-icon .icon=${'lucide:loader2'} iconSize="32"></dees-icon>
<span>Initializing workspace...</span> <span>Initializing workspace...</span>
${this.initCommand ? html`
<dees-workspace-terminal-preview
.command=${this.initCommand}
.lines=${this.initOutput}
></dees-workspace-terminal-preview>
` : ''}
</div> </div>
`; `;
} }
@@ -601,16 +719,17 @@ export function createUser(firstName: string, lastName: string): IUser {
class="filetree-panel ${this.isFileTreeCollapsed ? 'collapsed' : ''}" class="filetree-panel ${this.isFileTreeCollapsed ? 'collapsed' : ''}"
style="width: ${this.isFileTreeCollapsed ? 0 : this.fileTreeWidth}px" style="width: ${this.isFileTreeCollapsed ? 0 : this.fileTreeWidth}px"
> >
<dees-editor-filetree <dees-workspace-filetree
.executionEnvironment=${this.executionEnvironment} .executionEnvironment=${this.executionEnvironment}
.selectedPath=${this.activeFilePath} .selectedPath=${this.activeFilePath}
@file-select=${this.handleFileSelect} @file-select=${this.handleFileSelect}
></dees-editor-filetree> ></dees-workspace-filetree>
</div> </div>
` : ''} ` : ''}
<div class="editor-panel"> <div class="editor-panel">
<div class="tabs-bar"> <div class="tabs-bar">
<div class="tabs-container">
${this.openFiles.map(file => html` ${this.openFiles.map(file => html`
<div <div
class="tab ${file.path === this.activeFilePath ? 'active' : ''}" class="tab ${file.path === this.activeFilePath ? 'active' : ''}"
@@ -624,6 +743,10 @@ export function createUser(firstName: string, lastName: string): IUser {
</div> </div>
`)} `)}
</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"> <div class="editor-content">
${this.openFiles.length === 0 ? html` ${this.openFiles.length === 0 ? html`
<div class="empty-state"> <div class="empty-state">
@@ -631,12 +754,12 @@ export function createUser(firstName: string, lastName: string): IUser {
<span>Select a file to edit</span> <span>Select a file to edit</span>
</div> </div>
` : html` ` : html`
<dees-editor-monaco <dees-workspace-monaco
.filePath=${this.activeFilePath} .filePath=${this.activeFilePath}
.content=${this.getActiveFileContent()} .content=${this.getActiveFileContent()}
.language=${this.getLanguageFromPath(this.activeFilePath)} .language=${this.getLanguageFromPath(this.activeFilePath)}
@content-change=${this.handleContentChange} @content-change=${this.handleContentChange}
></dees-editor-monaco> ></dees-workspace-monaco>
`} `}
</div> </div>
</div> </div>
@@ -676,10 +799,10 @@ export function createUser(firstName: string, lastName: string): IUser {
</div> </div>
</div> </div>
<div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}"> <div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}">
<dees-terminal <dees-workspace-terminal
.executionEnvironment=${this.executionEnvironment} .executionEnvironment=${this.executionEnvironment}
.setupCommand=${''} .setupCommand=${''}
></dees-terminal> ></dees-workspace-terminal>
</div> </div>
<div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}"> <div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}">
${this.renderProblemsPanel()} ${this.renderProblemsPanel()}
@@ -690,6 +813,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 +856,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 +870,58 @@ 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);
// Set command for terminal preview display
this.initCommand = onInit;
this.initOutput = [];
// Parse command and args
const [cmd, ...args] = onInit.split(' ');
const process = await this.executionEnvironment.spawn(cmd, args);
// Capture stdout/stderr for terminal preview
process.output.pipeTo(
new WritableStream({
write: (data) => {
// Split data into lines and append
const lines = data.split('\n');
for (const line of lines) {
if (line) {
this.initOutput = [...this.initOutput, line];
}
}
},
})
);
// Wait for completion
const exitCode = await process.exit;
console.log('onInit command completed with exit code:', exitCode);
// Add completion message
this.initOutput = [...this.initOutput, '', `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 +945,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 }>) {
@@ -844,10 +1083,15 @@ export function createUser(firstName: string, lastName: string): IUser {
...this.openFiles.slice(fileIndex + 1), ...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); const language = this.getLanguageFromPath(this.activeFilePath);
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) { 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
} }
} }
} }
@@ -880,6 +1124,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;
@@ -932,7 +1265,7 @@ export function createUser(firstName: string, lastName: string): IUser {
// Wait for editor to be ready, then navigate to the line // Wait for editor to be ready, then navigate to the line
await this.updateComplete; await this.updateComplete;
const editorElement = this.shadowRoot?.querySelector('dees-editor-monaco') as DeesEditorMonaco; const editorElement = this.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
if (editorElement) { if (editorElement) {
const editor = await editorElement.editorDeferred.promise; const editor = await editorElement.editorDeferred.promise;
editor.revealLineInCenter(marker.startLineNumber); editor.revealLineInCenter(marker.startLineNumber);
@@ -976,35 +1309,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

@@ -1,2 +1,2 @@
export * from './dees-editor-workspace.js'; export * from './dees-workspace.js';
export * from './typescript-intellisense.js'; export * from './typescript-intellisense.js';

View File

@@ -24,6 +24,7 @@ interface IMonacoTypeScriptAPI {
*/ */
export class TypeScriptIntelliSenseManager { export class TypeScriptIntelliSenseManager {
private loadedLibs: Set<string> = new Set(); private loadedLibs: Set<string> = new Set();
private notFoundPackages: Set<string> = new Set(); // Packages checked but not found
private monacoInstance: typeof monaco | null = null; private monacoInstance: typeof monaco | null = null;
private executionEnvironment: IExecutionEnvironment | null = null; private executionEnvironment: IExecutionEnvironment | null = null;
@@ -174,13 +175,19 @@ export class TypeScriptIntelliSenseManager {
public async loadTypesForPackage(packageName: string): Promise<void> { public async loadTypesForPackage(packageName: string): Promise<void> {
if (!this.monacoInstance || !this.executionEnvironment) return; if (!this.monacoInstance || !this.executionEnvironment) return;
if (this.loadedLibs.has(packageName)) return; if (this.loadedLibs.has(packageName)) return;
if (this.notFoundPackages.has(packageName)) return; // Skip packages we already checked
try { try {
const typesLoaded = await this.tryLoadPackageTypes(packageName); let typesLoaded = await this.tryLoadPackageTypes(packageName);
if (!typesLoaded) { if (!typesLoaded) {
await this.tryLoadAtTypesPackage(packageName); typesLoaded = await this.tryLoadAtTypesPackage(packageName);
} }
if (typesLoaded) {
this.loadedLibs.add(packageName); this.loadedLibs.add(packageName);
} else {
// Cache that this package wasn't found to avoid repeated filesystem checks
this.notFoundPackages.add(packageName);
}
} catch (error) { } catch (error) {
console.warn(`Failed to load types for ${packageName}:`, error); console.warn(`Failed to load types for ${packageName}:`, error);
} }
@@ -195,26 +202,25 @@ export class TypeScriptIntelliSenseManager {
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(
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}`);
const typesPath = packageJson.types || packageJson.typings; const typesPath = packageJson.types || packageJson.typings;
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(
content,
`file://${fullTypesPath}`
);
return true; 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 +229,62 @@ 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); await this.loadAllDtsFilesFromPackage(basePath);
ts.typescriptDefaults.addExtraLib(
content,
`file://${dtsPath}`
);
return true; return true;
} }
} }
return false; return false;
} catch { } catch (error) {
console.error(`Failed to load package types for ${packageName}:`, 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);
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 // Handle scoped packages: @scope/package -> @types/scope__package
const typesPackageName = packageName.startsWith('@') const typesPackageName = packageName.startsWith('@')
@@ -252,11 +296,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;
@@ -270,10 +311,57 @@ export class TypeScriptIntelliSenseManager {
*/ */
public async processContentChange(content: string): Promise<void> { public async processContentChange(content: string): Promise<void> {
const imports = this.parseImports(content); const imports = this.parseImports(content);
for (const packageName of imports) { for (const packageName of imports) {
if (!this.loadedLibs.has(packageName)) {
await this.loadTypesForPackage(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);
}
}
/** /**
* Add a file model to Monaco for cross-file IntelliSense * Add a file model to Monaco for cross-file IntelliSense

View File

@@ -0,0 +1,8 @@
// Workspace Components
export * from './dees-workspace/index.js';
export * from './dees-workspace-monaco/index.js';
export * from './dees-workspace-filetree/index.js';
export * from './dees-workspace-terminal/index.js';
export * from './dees-workspace-terminal-preview/index.js';
export * from './dees-workspace-markdown/index.js';
export * from './dees-workspace-markdownoutlet/index.js';

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
}; };
} }

View File

@@ -1 +0,0 @@
export * from './dees-terminal.js';

View File

@@ -6,7 +6,7 @@ export * from './00group-appui/index.js';
export * from './00group-button/index.js'; export * from './00group-button/index.js';
export * from './00group-chart/index.js'; export * from './00group-chart/index.js';
export * from './00group-dataview/index.js'; export * from './00group-dataview/index.js';
export * from './00group-editor/index.js'; export * from './00group-workspace/index.js';
export * from './00group-form/index.js'; export * from './00group-form/index.js';
export * from './00group-input/index.js'; export * from './00group-input/index.js';
export * from './00group-pdf/index.js'; export * from './00group-pdf/index.js';
@@ -34,7 +34,7 @@ export * from './dees-spinner/index.js';
export * from './dees-statsgrid/index.js'; export * from './dees-statsgrid/index.js';
export * from './dees-stepper/index.js'; export * from './dees-stepper/index.js';
export * from './dees-table/index.js'; export * from './dees-table/index.js';
export * from './dees-terminal/index.js'; // dees-terminal is now part of 00group-workspace as dees-workspace-terminal
export * from './dees-toast/index.js'; export * from './dees-toast/index.js';
export * from './dees-updater/index.js'; export * from './dees-updater/index.js';
export * from './dees-windowcontrols/index.js'; export * from './dees-windowcontrols/index.js';