Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11c88f9749 | |||
| d0bd4027bb | |||
| 62de004350 | |||
| cfe3490bcf | |||
| 826689ec0e | |||
| 15bca09086 | |||
| 08b302bd46 | |||
| 747a67d790 | |||
| 6ec05d6b4a | |||
| 77df2743c5 | |||
| e4bdde1373 | |||
| e193e28fe9 | |||
| 9e229543eb | |||
| f60836eabf | |||
| 318e545435 | |||
| a823e8aaa6 | |||
| 0b06499664 | |||
| d177b5a935 |
BIN
.playwright-mcp/dees-workspace-bright-theme.png
Normal file
|
After Width: | Height: | Size: 89 KiB |
BIN
.playwright-mcp/dees-workspace-dark-theme.png
Normal file
|
After Width: | Height: | Size: 89 KiB |
BIN
.playwright-mcp/dees-workspace-demo-4k.png
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
.playwright-mcp/intellisense-test.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
.playwright-mcp/module-resolution-fixed.png
Normal file
|
After Width: | Height: | Size: 43 KiB |
BIN
.playwright-mcp/workspace-full.png
Normal file
|
After Width: | Height: | Size: 69 KiB |
BIN
.playwright-mcp/workspace-with-problems-panel.png
Normal file
|
After Width: | Height: | Size: 69 KiB |
89
changelog.md
@@ -1,5 +1,94 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2025-12-31 - 3.21.0 - feat(terminal)
|
||||||
|
add dynamic bright/dark theming for terminal components and terminal preview
|
||||||
|
|
||||||
|
- Add bright/dark theme PNG assets under .playwright-mcp for previews.
|
||||||
|
- Replace hardcoded terminal background/colors with cssManager.bdTheme in workspace terminal and preview styles.
|
||||||
|
- Introduce getTerminalTheme helper to compute xterm theme for bright/dark modes.
|
||||||
|
- Subscribe to themeManager.themeObservable and apply updates to xterm (terminal.options.theme) so terminals update live on theme change.
|
||||||
|
- Remove hardcoded background property/CSS var and unused background accessor from workspace terminal.
|
||||||
|
- Ensure proper cleanup: unsubscribe theme subscriptions and dispose terminals in disconnectedCallback.
|
||||||
|
|
||||||
|
## 2025-12-31 - 3.20.1 - fix(dees-workspace)
|
||||||
|
fix demo wrapper and workspace layout; always render terminal preview
|
||||||
|
|
||||||
|
- Import @design.estate/dees-wcctools/demotools and wrap demo content in <dees-demowrapper>
|
||||||
|
- Create an absolute-positioned container so the dees-workspace fills 100% height/width
|
||||||
|
- Always render dees-workspace-terminal-preview (use empty command when none) to avoid conditional rendering issues
|
||||||
|
- Set a fixed height (200px) for the terminal preview in the initializing state
|
||||||
|
- Add Playwright demo asset .playwright-mcp/dees-workspace-demo-4k.png
|
||||||
|
|
||||||
|
## 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)
|
||||||
|
improve TypeScript IntelliSense and module resolution for Monaco editor
|
||||||
|
|
||||||
|
- Add file cache (fileCache) and getFileContent() for synchronous access to project files
|
||||||
|
- Track and dispose Monaco extra libs (addedExtraLibs) and register project files via addExtraLib to enable TypeScript module resolution
|
||||||
|
- Add addFileAsExtraLib logic to register .ts/.tsx files also under .js/.jsx paths so ESM imports resolve to TypeScript sources
|
||||||
|
- Use ModuleResolutionKind.Bundler fallback to NodeJs and set compilerOptions (baseUrl '/', allowImportingTsExtensions, resolveJsonModule) to improve resolution
|
||||||
|
- Adapt executionEnvironment API usage to readDir/readFile and check entry.type ('directory'|'file') instead of isDirectory/isFile
|
||||||
|
- Add a debugging/screenshot asset: .playwright-mcp/module-resolution-fixed.png
|
||||||
|
|
||||||
|
## 2025-12-30 - 3.15.0 - feat(editor)
|
||||||
|
enable file-backed Monaco models and add Problems panel; lazy-init project TypeScript IntelliSense
|
||||||
|
|
||||||
|
- dees-editor-monaco: add `filePath` property and create/get Monaco models with file:// URIs so editors are backed by real models; sync content into models and handle model switching when filePath changes; enable hover config and improved lifecycle handling.
|
||||||
|
- dees-editor-workspace: add bottom 'Problems' panel and panel tabs (terminal/problems), diagnosticMarkers state, marker listener, UI for problem list, and navigation to file/position when a problem is clicked; initialize IntelliSense lazily when a file is opened.
|
||||||
|
- typescript-intellisense: index project .ts/.js files from the virtual filesystem into Monaco models for cross-file resolution, enable allowNonTsExtensions and set eager model sync so TypeScript processes models eagerly.
|
||||||
|
- General: improved handling for language changes, model language switching, and deferred initialization of the IntelliSense manager.
|
||||||
|
- Add Playwright test images (workspace screenshots) used by CI/tests.
|
||||||
|
|
||||||
## 2025-12-30 - 3.14.2 - fix(editor)
|
## 2025-12-30 - 3.14.2 - fix(editor)
|
||||||
bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API
|
bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@design.estate/dees-catalog",
|
"name": "@design.estate/dees-catalog",
|
||||||
"version": "3.14.2",
|
"version": "3.21.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",
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@design.estate/dees-catalog',
|
name: '@design.estate/dees-catalog',
|
||||||
version: '3.14.2',
|
version: '3.21.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.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
export * from './dees-editor-filetree.js';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from './dees-editor-markdown.js';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from './dees-editor-markdownoutlet.js';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from './dees-editor-monaco.js';
|
|
||||||
@@ -1,732 +0,0 @@
|
|||||||
import {
|
|
||||||
DeesElement,
|
|
||||||
property,
|
|
||||||
html,
|
|
||||||
customElement,
|
|
||||||
type TemplateResult,
|
|
||||||
css,
|
|
||||||
cssManager,
|
|
||||||
state,
|
|
||||||
} 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 { WebContainerEnvironment } from '../../00group-runtime/index.js';
|
|
||||||
import type { FileSystemTree } from '@webcontainer/api';
|
|
||||||
import '../dees-editor-monaco/dees-editor-monaco.js';
|
|
||||||
import '../dees-editor-filetree/dees-editor-filetree.js';
|
|
||||||
import { DeesEditorFiletree } from '../dees-editor-filetree/dees-editor-filetree.js';
|
|
||||||
import '../../dees-terminal/dees-terminal.js';
|
|
||||||
import '../../dees-icon/dees-icon.js';
|
|
||||||
import { DeesEditorMonaco } from '../dees-editor-monaco/dees-editor-monaco.js';
|
|
||||||
import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js';
|
|
||||||
|
|
||||||
declare global {
|
|
||||||
interface HTMLElementTagNameMap {
|
|
||||||
'dees-editor-workspace': DeesEditorWorkspace;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interface IOpenFile {
|
|
||||||
path: string;
|
|
||||||
name: string;
|
|
||||||
content: string;
|
|
||||||
modified: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
@customElement('dees-editor-workspace')
|
|
||||||
export class DeesEditorWorkspace extends DeesElement {
|
|
||||||
public static demo = () => {
|
|
||||||
const env = new WebContainerEnvironment();
|
|
||||||
|
|
||||||
// Mount initial TypeScript project files
|
|
||||||
const mountPromise = (async () => {
|
|
||||||
await env.init();
|
|
||||||
|
|
||||||
const fileTree: FileSystemTree = {
|
|
||||||
'package.json': {
|
|
||||||
file: {
|
|
||||||
contents: JSON.stringify(
|
|
||||||
{
|
|
||||||
name: 'demo-project',
|
|
||||||
version: '1.0.0',
|
|
||||||
type: 'module',
|
|
||||||
scripts: {
|
|
||||||
build: 'tsc',
|
|
||||||
dev: 'tsc --watch',
|
|
||||||
},
|
|
||||||
devDependencies: {
|
|
||||||
typescript: '^5.0.0',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
null,
|
|
||||||
2
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'tsconfig.json': {
|
|
||||||
file: {
|
|
||||||
contents: JSON.stringify(
|
|
||||||
{
|
|
||||||
compilerOptions: {
|
|
||||||
target: 'ES2022',
|
|
||||||
module: 'NodeNext',
|
|
||||||
moduleResolution: 'NodeNext',
|
|
||||||
strict: true,
|
|
||||||
outDir: './dist',
|
|
||||||
rootDir: './src',
|
|
||||||
declaration: true,
|
|
||||||
},
|
|
||||||
include: ['src/**/*'],
|
|
||||||
},
|
|
||||||
null,
|
|
||||||
2
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
src: {
|
|
||||||
directory: {
|
|
||||||
'index.ts': {
|
|
||||||
file: {
|
|
||||||
contents: `// Main entry point
|
|
||||||
import { greet, formatName } from './utils.js';
|
|
||||||
|
|
||||||
const name = formatName('World');
|
|
||||||
console.log(greet(name));
|
|
||||||
|
|
||||||
// Example async function
|
|
||||||
async function main() {
|
|
||||||
const result = await Promise.resolve('Hello from async!');
|
|
||||||
console.log(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
main();
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'utils.ts': {
|
|
||||||
file: {
|
|
||||||
contents: `// Utility functions
|
|
||||||
|
|
||||||
export interface IUser {
|
|
||||||
firstName: string;
|
|
||||||
lastName: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function greet(name: string): string {
|
|
||||||
return \`Hello, \${name}!\`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function formatName(name: string): string {
|
|
||||||
return name.trim().toUpperCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createUser(firstName: string, lastName: string): IUser {
|
|
||||||
return { firstName, lastName };
|
|
||||||
}
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
await env.mount(fileTree);
|
|
||||||
})();
|
|
||||||
|
|
||||||
return html`
|
|
||||||
<div style="width: 100%; height: 600px; position: relative;">
|
|
||||||
<dees-editor-workspace
|
|
||||||
.executionEnvironment=${env}
|
|
||||||
.initializationPromise=${mountPromise}
|
|
||||||
></dees-editor-workspace>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
};
|
|
||||||
|
|
||||||
// INSTANCE
|
|
||||||
@property({ type: Object })
|
|
||||||
accessor executionEnvironment: IExecutionEnvironment | null = null;
|
|
||||||
|
|
||||||
@property({ attribute: false })
|
|
||||||
accessor initializationPromise: Promise<void> | null = null;
|
|
||||||
|
|
||||||
@property({ type: Boolean })
|
|
||||||
accessor showFileTree: boolean = true;
|
|
||||||
|
|
||||||
@property({ type: Boolean })
|
|
||||||
accessor showTerminal: boolean = true;
|
|
||||||
|
|
||||||
@property({ type: Number })
|
|
||||||
accessor fileTreeWidth: number = 250;
|
|
||||||
|
|
||||||
@property({ type: Number })
|
|
||||||
accessor terminalHeight: number = 200;
|
|
||||||
|
|
||||||
@state()
|
|
||||||
accessor openFiles: IOpenFile[] = [];
|
|
||||||
|
|
||||||
@state()
|
|
||||||
accessor activeFilePath: string = '';
|
|
||||||
|
|
||||||
@state()
|
|
||||||
accessor isTerminalCollapsed: boolean = false;
|
|
||||||
|
|
||||||
@state()
|
|
||||||
accessor isFileTreeCollapsed: boolean = false;
|
|
||||||
|
|
||||||
@state()
|
|
||||||
accessor isInitializing: boolean = true;
|
|
||||||
|
|
||||||
private editorElement: DeesEditorMonaco | null = null;
|
|
||||||
private initializationStarted: boolean = false;
|
|
||||||
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
|
|
||||||
|
|
||||||
public static styles = [
|
|
||||||
themeDefaultStyles,
|
|
||||||
cssManager.defaultStyles,
|
|
||||||
css`
|
|
||||||
:host {
|
|
||||||
display: block;
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 7%)')};
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.workspace-container {
|
|
||||||
display: grid;
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.workspace-container.with-filetree.with-terminal {
|
|
||||||
grid-template-columns: auto 1fr;
|
|
||||||
grid-template-rows: 1fr auto;
|
|
||||||
grid-template-areas:
|
|
||||||
"filetree editor"
|
|
||||||
"filetree terminal";
|
|
||||||
}
|
|
||||||
|
|
||||||
.workspace-container.with-filetree:not(.with-terminal) {
|
|
||||||
grid-template-columns: auto 1fr;
|
|
||||||
grid-template-rows: 1fr;
|
|
||||||
grid-template-areas: "filetree editor";
|
|
||||||
}
|
|
||||||
|
|
||||||
.workspace-container:not(.with-filetree).with-terminal {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
grid-template-rows: 1fr auto;
|
|
||||||
grid-template-areas:
|
|
||||||
"editor"
|
|
||||||
"terminal";
|
|
||||||
}
|
|
||||||
|
|
||||||
.workspace-container:not(.with-filetree):not(.with-terminal) {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
grid-template-rows: 1fr;
|
|
||||||
grid-template-areas: "editor";
|
|
||||||
}
|
|
||||||
|
|
||||||
.filetree-panel {
|
|
||||||
grid-area: filetree;
|
|
||||||
position: relative;
|
|
||||||
border-right: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
|
|
||||||
overflow: hidden;
|
|
||||||
transition: width 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filetree-panel.collapsed {
|
|
||||||
width: 0 !important;
|
|
||||||
border-right: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editor-panel {
|
|
||||||
grid-area: editor;
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
overflow: hidden;
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 100%)', 'hsl(0 0% 9%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.terminal-panel {
|
|
||||||
grid-area: terminal;
|
|
||||||
position: relative;
|
|
||||||
border-top: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
|
|
||||||
overflow: hidden;
|
|
||||||
transition: height 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.terminal-panel.collapsed {
|
|
||||||
height: 32px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-header {
|
|
||||||
height: 32px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
padding: 0 8px;
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 95%)', 'hsl(0 0% 8%)')};
|
|
||||||
border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: 500;
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-header-title {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-header-actions {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-action {
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
|
|
||||||
transition: all 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-action:hover {
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 18%)')};
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 80%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.tabs-bar {
|
|
||||||
display: flex;
|
|
||||||
align-items: stretch;
|
|
||||||
height: 36px;
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 8%)')};
|
|
||||||
border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
|
|
||||||
overflow-x: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
padding: 0 12px;
|
|
||||||
min-width: 120px;
|
|
||||||
max-width: 200px;
|
|
||||||
border-right: 1px solid ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 12%)')};
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 12px;
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 94%)', 'hsl(0 0% 10%)')};
|
|
||||||
transition: all 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab:hover {
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 92%)', 'hsl(0 0% 12%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab.active {
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 100%)', 'hsl(0 0% 9%)')};
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 90%)')};
|
|
||||||
border-bottom: 2px solid ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 60%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-name {
|
|
||||||
flex: 1;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-close {
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border-radius: 4px;
|
|
||||||
opacity: 0;
|
|
||||||
transition: all 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab:hover .tab-close {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-close:hover {
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 25%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-modified {
|
|
||||||
width: 8px;
|
|
||||||
height: 8px;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
|
|
||||||
}
|
|
||||||
|
|
||||||
.editor-content {
|
|
||||||
flex: 1;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.terminal-content {
|
|
||||||
position: absolute;
|
|
||||||
top: 32px;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.empty-state {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 50%)')};
|
|
||||||
font-size: 14px;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.empty-state dees-icon {
|
|
||||||
width: 48px;
|
|
||||||
height: 48px;
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.initializing {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
|
|
||||||
font-size: 14px;
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
dees-editor-filetree {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
dees-editor-monaco {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
dees-terminal {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
}
|
|
||||||
`,
|
|
||||||
];
|
|
||||||
|
|
||||||
public render(): TemplateResult {
|
|
||||||
const containerClasses = [
|
|
||||||
'workspace-container',
|
|
||||||
this.showFileTree && !this.isFileTreeCollapsed ? 'with-filetree' : '',
|
|
||||||
this.showTerminal ? 'with-terminal' : '',
|
|
||||||
].filter(Boolean).join(' ');
|
|
||||||
|
|
||||||
if (this.isInitializing) {
|
|
||||||
return html`
|
|
||||||
<div class="initializing">
|
|
||||||
<dees-icon .icon=${'lucide:loader2'} iconSize="32"></dees-icon>
|
|
||||||
<span>Initializing workspace...</span>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
return html`
|
|
||||||
<div class="${containerClasses}">
|
|
||||||
${this.showFileTree ? html`
|
|
||||||
<div
|
|
||||||
class="filetree-panel ${this.isFileTreeCollapsed ? 'collapsed' : ''}"
|
|
||||||
style="width: ${this.isFileTreeCollapsed ? 0 : this.fileTreeWidth}px"
|
|
||||||
>
|
|
||||||
<dees-editor-filetree
|
|
||||||
.executionEnvironment=${this.executionEnvironment}
|
|
||||||
.selectedPath=${this.activeFilePath}
|
|
||||||
@file-select=${this.handleFileSelect}
|
|
||||||
></dees-editor-filetree>
|
|
||||||
</div>
|
|
||||||
` : ''}
|
|
||||||
|
|
||||||
<div class="editor-panel">
|
|
||||||
<div class="tabs-bar">
|
|
||||||
${this.openFiles.map(file => html`
|
|
||||||
<div
|
|
||||||
class="tab ${file.path === this.activeFilePath ? 'active' : ''}"
|
|
||||||
@click=${() => this.activateFile(file.path)}
|
|
||||||
>
|
|
||||||
${file.modified ? html`<span class="tab-modified"></span>` : ''}
|
|
||||||
<span class="tab-name">${file.name}</span>
|
|
||||||
<span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
|
|
||||||
<dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
`)}
|
|
||||||
</div>
|
|
||||||
<div class="editor-content">
|
|
||||||
${this.openFiles.length === 0 ? html`
|
|
||||||
<div class="empty-state">
|
|
||||||
<dees-icon .icon=${'lucide:fileCode'} iconSize="48"></dees-icon>
|
|
||||||
<span>Select a file to edit</span>
|
|
||||||
</div>
|
|
||||||
` : html`
|
|
||||||
<dees-editor-monaco
|
|
||||||
.content=${this.getActiveFileContent()}
|
|
||||||
.language=${this.getLanguageFromPath(this.activeFilePath)}
|
|
||||||
@content-change=${this.handleContentChange}
|
|
||||||
></dees-editor-monaco>
|
|
||||||
`}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
${this.showTerminal ? html`
|
|
||||||
<div
|
|
||||||
class="terminal-panel ${this.isTerminalCollapsed ? 'collapsed' : ''}"
|
|
||||||
style="height: ${this.isTerminalCollapsed ? 32 : this.terminalHeight}px"
|
|
||||||
>
|
|
||||||
<div class="panel-header">
|
|
||||||
<div class="panel-header-title">
|
|
||||||
<dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
|
|
||||||
Terminal
|
|
||||||
</div>
|
|
||||||
<div class="panel-header-actions">
|
|
||||||
<div class="panel-action" @click=${this.toggleTerminal}>
|
|
||||||
<dees-icon
|
|
||||||
.icon=${this.isTerminalCollapsed ? 'lucide:chevronUp' : 'lucide:chevronDown'}
|
|
||||||
iconSize="14"
|
|
||||||
></dees-icon>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="terminal-content">
|
|
||||||
<dees-terminal
|
|
||||||
.executionEnvironment=${this.executionEnvironment}
|
|
||||||
.setupCommand=${''}
|
|
||||||
></dees-terminal>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
` : ''}
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async firstUpdated() {
|
|
||||||
if (this.executionEnvironment) {
|
|
||||||
await this.initializeWorkspace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async updated(changedProperties: Map<string, any>) {
|
|
||||||
if (changedProperties.has('executionEnvironment') && this.executionEnvironment) {
|
|
||||||
await this.initializeWorkspace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async initializeWorkspace() {
|
|
||||||
if (!this.executionEnvironment) return;
|
|
||||||
|
|
||||||
// Prevent double initialization
|
|
||||||
if (this.initializationStarted) return;
|
|
||||||
this.initializationStarted = true;
|
|
||||||
|
|
||||||
this.isInitializing = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Wait for any external initialization (e.g., file mounting)
|
|
||||||
if (this.initializationPromise) {
|
|
||||||
await this.initializationPromise;
|
|
||||||
} else if (!this.executionEnvironment.ready) {
|
|
||||||
await this.executionEnvironment.init();
|
|
||||||
}
|
|
||||||
// Initialize IntelliSense after workspace is ready
|
|
||||||
await this.initializeIntelliSense();
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to initialize workspace:', error);
|
|
||||||
// Reset flag to allow retry
|
|
||||||
this.initializationStarted = false;
|
|
||||||
} finally {
|
|
||||||
this.isInitializing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async initializeIntelliSense(): Promise<void> {
|
|
||||||
if (!this.executionEnvironment) return;
|
|
||||||
|
|
||||||
// Wait for Monaco to be available globally
|
|
||||||
const monacoInstance = (window as any).monaco;
|
|
||||||
if (!monacoInstance) {
|
|
||||||
console.warn('Monaco not loaded, IntelliSense disabled');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.intelliSenseManager = new TypeScriptIntelliSenseManager();
|
|
||||||
await this.intelliSenseManager.init(monacoInstance, this.executionEnvironment);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
|
|
||||||
const { path, name } = e.detail;
|
|
||||||
await this.openFile(path, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async openFile(path: string, name: string) {
|
|
||||||
// Check if already open
|
|
||||||
const existingFile = this.openFiles.find(f => f.path === path);
|
|
||||||
if (existingFile) {
|
|
||||||
this.activeFilePath = path;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load file content
|
|
||||||
if (!this.executionEnvironment) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const content = await this.executionEnvironment.readFile(path);
|
|
||||||
this.openFiles = [
|
|
||||||
...this.openFiles,
|
|
||||||
{ path, name, content, modified: false },
|
|
||||||
];
|
|
||||||
this.activeFilePath = path;
|
|
||||||
} catch (error) {
|
|
||||||
console.error(`Failed to open file ${path}:`, error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private activateFile(path: string) {
|
|
||||||
this.activeFilePath = path;
|
|
||||||
}
|
|
||||||
|
|
||||||
private closeFile(e: Event, path: string) {
|
|
||||||
e.stopPropagation();
|
|
||||||
|
|
||||||
const fileIndex = this.openFiles.findIndex(f => f.path === path);
|
|
||||||
if (fileIndex === -1) return;
|
|
||||||
|
|
||||||
// Check for unsaved changes
|
|
||||||
const file = this.openFiles[fileIndex];
|
|
||||||
if (file.modified) {
|
|
||||||
const confirmed = confirm(`${file.name} has unsaved changes. Close anyway?`);
|
|
||||||
if (!confirmed) return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.openFiles = this.openFiles.filter(f => f.path !== path);
|
|
||||||
|
|
||||||
// If closing the active file, activate another one
|
|
||||||
if (this.activeFilePath === path) {
|
|
||||||
if (this.openFiles.length > 0) {
|
|
||||||
const newIndex = Math.min(fileIndex, this.openFiles.length - 1);
|
|
||||||
this.activeFilePath = this.openFiles[newIndex].path;
|
|
||||||
} else {
|
|
||||||
this.activeFilePath = '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private getActiveFileContent(): string {
|
|
||||||
const file = this.openFiles.find(f => f.path === this.activeFilePath);
|
|
||||||
return file?.content || '';
|
|
||||||
}
|
|
||||||
|
|
||||||
private handleContentChange(e: CustomEvent) {
|
|
||||||
const newContent = e.detail;
|
|
||||||
const fileIndex = this.openFiles.findIndex(f => f.path === this.activeFilePath);
|
|
||||||
if (fileIndex === -1) return;
|
|
||||||
|
|
||||||
const file = this.openFiles[fileIndex];
|
|
||||||
if (file.content !== newContent) {
|
|
||||||
this.openFiles = [
|
|
||||||
...this.openFiles.slice(0, fileIndex),
|
|
||||||
{ ...file, content: newContent, modified: true },
|
|
||||||
...this.openFiles.slice(fileIndex + 1),
|
|
||||||
];
|
|
||||||
|
|
||||||
// Process content for IntelliSense (TypeScript/JavaScript files)
|
|
||||||
const language = this.getLanguageFromPath(this.activeFilePath);
|
|
||||||
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
|
|
||||||
this.intelliSenseManager.processContentChange(newContent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private getLanguageFromPath(path: string): string {
|
|
||||||
const ext = path.split('.').pop()?.toLowerCase();
|
|
||||||
const languageMap: Record<string, string> = {
|
|
||||||
ts: 'typescript',
|
|
||||||
tsx: 'typescript',
|
|
||||||
js: 'javascript',
|
|
||||||
jsx: 'javascript',
|
|
||||||
json: 'json',
|
|
||||||
html: 'html',
|
|
||||||
css: 'css',
|
|
||||||
scss: 'scss',
|
|
||||||
less: 'less',
|
|
||||||
md: 'markdown',
|
|
||||||
yaml: 'yaml',
|
|
||||||
yml: 'yaml',
|
|
||||||
xml: 'xml',
|
|
||||||
sql: 'sql',
|
|
||||||
py: 'python',
|
|
||||||
sh: 'shell',
|
|
||||||
bash: 'shell',
|
|
||||||
};
|
|
||||||
return languageMap[ext || ''] || 'plaintext';
|
|
||||||
}
|
|
||||||
|
|
||||||
private toggleTerminal() {
|
|
||||||
this.isTerminalCollapsed = !this.isTerminalCollapsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
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 }));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,243 +0,0 @@
|
|||||||
import type * as monaco from 'monaco-editor';
|
|
||||||
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
|
|
||||||
|
|
||||||
// Monaco TypeScript API types (runtime API still exists, types deprecated in 0.55+)
|
|
||||||
interface IMonacoTypeScriptAPI {
|
|
||||||
typescriptDefaults: {
|
|
||||||
setCompilerOptions(options: Record<string, unknown>): void;
|
|
||||||
setDiagnosticsOptions(options: Record<string, unknown>): void;
|
|
||||||
addExtraLib(content: string, filePath?: string): void;
|
|
||||||
};
|
|
||||||
ScriptTarget: { ES2020: number };
|
|
||||||
ModuleKind: { ESNext: number };
|
|
||||||
ModuleResolutionKind: { NodeJs: number };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Manages TypeScript IntelliSense by loading type definitions
|
|
||||||
* from the virtual filesystem into Monaco.
|
|
||||||
*/
|
|
||||||
export class TypeScriptIntelliSenseManager {
|
|
||||||
private loadedLibs: Set<string> = new Set();
|
|
||||||
private monacoInstance: typeof monaco | null = null;
|
|
||||||
private executionEnvironment: IExecutionEnvironment | null = null;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get TypeScript API with proper typing for Monaco 0.55+
|
|
||||||
*/
|
|
||||||
private get tsApi(): IMonacoTypeScriptAPI | null {
|
|
||||||
if (!this.monacoInstance) return null;
|
|
||||||
return (this.monacoInstance.languages as any).typescript as IMonacoTypeScriptAPI;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize with Monaco and execution environment
|
|
||||||
*/
|
|
||||||
public async init(
|
|
||||||
monacoInst: typeof monaco,
|
|
||||||
env: IExecutionEnvironment
|
|
||||||
): Promise<void> {
|
|
||||||
this.monacoInstance = monacoInst;
|
|
||||||
this.executionEnvironment = env;
|
|
||||||
this.configureCompilerOptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
private configureCompilerOptions(): void {
|
|
||||||
const ts = this.tsApi;
|
|
||||||
if (!ts) return;
|
|
||||||
|
|
||||||
ts.typescriptDefaults.setCompilerOptions({
|
|
||||||
target: ts.ScriptTarget.ES2020,
|
|
||||||
module: ts.ModuleKind.ESNext,
|
|
||||||
moduleResolution: ts.ModuleResolutionKind.NodeJs,
|
|
||||||
allowSyntheticDefaultImports: true,
|
|
||||||
esModuleInterop: true,
|
|
||||||
strict: true,
|
|
||||||
noEmit: true,
|
|
||||||
allowJs: true,
|
|
||||||
checkJs: false,
|
|
||||||
lib: ['es2020', 'dom', 'dom.iterable'],
|
|
||||||
});
|
|
||||||
|
|
||||||
ts.typescriptDefaults.setDiagnosticsOptions({
|
|
||||||
noSemanticValidation: false,
|
|
||||||
noSyntaxValidation: false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parse imports from TypeScript/JavaScript content
|
|
||||||
*/
|
|
||||||
public parseImports(content: string): string[] {
|
|
||||||
const imports: string[] = [];
|
|
||||||
|
|
||||||
// Match ES6 imports: import { x } from 'package' or import 'package'
|
|
||||||
const importRegex = /import\s+(?:[\w*{}\s,]+from\s+)?['"]([^'"]+)['"]/g;
|
|
||||||
let match: RegExpExecArray | null;
|
|
||||||
|
|
||||||
while ((match = importRegex.exec(content)) !== null) {
|
|
||||||
const importPath = match[1];
|
|
||||||
// Only process non-relative imports (npm packages)
|
|
||||||
if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
|
|
||||||
const packageName = importPath.startsWith('@')
|
|
||||||
? importPath.split('/').slice(0, 2).join('/') // @scope/package
|
|
||||||
: importPath.split('/')[0]; // package
|
|
||||||
imports.push(packageName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Match require calls: require('package')
|
|
||||||
const requireRegex = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
|
|
||||||
while ((match = requireRegex.exec(content)) !== null) {
|
|
||||||
const importPath = match[1];
|
|
||||||
if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
|
|
||||||
const packageName = importPath.startsWith('@')
|
|
||||||
? importPath.split('/').slice(0, 2).join('/')
|
|
||||||
: importPath.split('/')[0];
|
|
||||||
imports.push(packageName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [...new Set(imports)];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load type definitions for a package from virtual FS
|
|
||||||
*/
|
|
||||||
public async loadTypesForPackage(packageName: string): Promise<void> {
|
|
||||||
if (!this.monacoInstance || !this.executionEnvironment) return;
|
|
||||||
if (this.loadedLibs.has(packageName)) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const typesLoaded = await this.tryLoadPackageTypes(packageName);
|
|
||||||
if (!typesLoaded) {
|
|
||||||
await this.tryLoadAtTypesPackage(packageName);
|
|
||||||
}
|
|
||||||
this.loadedLibs.add(packageName);
|
|
||||||
} catch (error) {
|
|
||||||
console.warn(`Failed to load types for ${packageName}:`, error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async tryLoadPackageTypes(packageName: string): Promise<boolean> {
|
|
||||||
const ts = this.tsApi;
|
|
||||||
if (!this.executionEnvironment || !ts) return false;
|
|
||||||
|
|
||||||
const basePath = `/node_modules/${packageName}`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Check package.json for types field
|
|
||||||
const packageJsonPath = `${basePath}/package.json`;
|
|
||||||
if (await this.executionEnvironment.exists(packageJsonPath)) {
|
|
||||||
const packageJson = JSON.parse(
|
|
||||||
await this.executionEnvironment.readFile(packageJsonPath)
|
|
||||||
);
|
|
||||||
|
|
||||||
const typesPath = packageJson.types || packageJson.typings;
|
|
||||||
if (typesPath) {
|
|
||||||
const fullTypesPath = `${basePath}/${typesPath}`;
|
|
||||||
if (await this.executionEnvironment.exists(fullTypesPath)) {
|
|
||||||
const content = await this.executionEnvironment.readFile(fullTypesPath);
|
|
||||||
ts.typescriptDefaults.addExtraLib(
|
|
||||||
content,
|
|
||||||
`file://${fullTypesPath}`
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try common locations
|
|
||||||
const commonPaths = [
|
|
||||||
`${basePath}/index.d.ts`,
|
|
||||||
`${basePath}/dist/index.d.ts`,
|
|
||||||
`${basePath}/lib/index.d.ts`,
|
|
||||||
];
|
|
||||||
|
|
||||||
for (const dtsPath of commonPaths) {
|
|
||||||
if (await this.executionEnvironment.exists(dtsPath)) {
|
|
||||||
const content = await this.executionEnvironment.readFile(dtsPath);
|
|
||||||
ts.typescriptDefaults.addExtraLib(
|
|
||||||
content,
|
|
||||||
`file://${dtsPath}`
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async tryLoadAtTypesPackage(packageName: string): Promise<boolean> {
|
|
||||||
const ts = this.tsApi;
|
|
||||||
if (!this.executionEnvironment || !ts) return false;
|
|
||||||
|
|
||||||
// Handle scoped packages: @scope/package -> @types/scope__package
|
|
||||||
const typesPackageName = packageName.startsWith('@')
|
|
||||||
? `@types/${packageName.slice(1).replace('/', '__')}`
|
|
||||||
: `@types/${packageName}`;
|
|
||||||
|
|
||||||
const basePath = `/node_modules/${typesPackageName}`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const indexPath = `${basePath}/index.d.ts`;
|
|
||||||
if (await this.executionEnvironment.exists(indexPath)) {
|
|
||||||
const content = await this.executionEnvironment.readFile(indexPath);
|
|
||||||
ts.typescriptDefaults.addExtraLib(
|
|
||||||
content,
|
|
||||||
`file://${indexPath}`
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Process content change and load types for any new imports
|
|
||||||
*/
|
|
||||||
public async processContentChange(content: string): Promise<void> {
|
|
||||||
const imports = this.parseImports(content);
|
|
||||||
for (const packageName of imports) {
|
|
||||||
await this.loadTypesForPackage(packageName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a file model to Monaco for cross-file IntelliSense
|
|
||||||
*/
|
|
||||||
public addFileModel(path: string, content: string): void {
|
|
||||||
if (!this.monacoInstance) return;
|
|
||||||
|
|
||||||
const uri = this.monacoInstance.Uri.parse(`file://${path}`);
|
|
||||||
const existingModel = this.monacoInstance.editor.getModel(uri);
|
|
||||||
|
|
||||||
if (existingModel) {
|
|
||||||
existingModel.setValue(content);
|
|
||||||
} else {
|
|
||||||
const language = this.getLanguageFromPath(path);
|
|
||||||
this.monacoInstance.editor.createModel(content, language, uri);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private getLanguageFromPath(path: string): string {
|
|
||||||
const ext = path.split('.').pop()?.toLowerCase();
|
|
||||||
switch (ext) {
|
|
||||||
case 'ts':
|
|
||||||
case 'tsx':
|
|
||||||
return 'typescript';
|
|
||||||
case 'js':
|
|
||||||
case 'jsx':
|
|
||||||
return 'javascript';
|
|
||||||
case 'json':
|
|
||||||
return 'json';
|
|
||||||
default:
|
|
||||||
return 'plaintext';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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';
|
|
||||||
@@ -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');
|
||||||
|
|||||||
@@ -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> {
|
||||||
|
|||||||
@@ -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 ============
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -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);
|
||||||
@@ -417,7 +417,6 @@ export class DeesSimpleAppDash extends DeesElement {
|
|||||||
terminal.style.opacity = '0';
|
terminal.style.opacity = '0';
|
||||||
terminal.style.transform = 'translateY(8px) scale(0.99)';
|
terminal.style.transform = 'translateY(8px) scale(0.99)';
|
||||||
terminal.style.transition = 'all 0.25s cubic-bezier(0.4, 0, 0.2, 1)';
|
terminal.style.transition = 'all 0.25s cubic-bezier(0.4, 0, 0.2, 1)';
|
||||||
terminal.background = 'hsl(220 13% 8%)';
|
|
||||||
terminal.style.boxShadow = '0 25px 50px -12px rgb(0 0 0 / 0.5), 0 0 0 1px rgb(255 255 255 / 0.05)';
|
terminal.style.boxShadow = '0 25px 50px -12px rgb(0 0 0 / 0.5), 0 0 0 1px rgb(255 255 255 / 0.05)';
|
||||||
terminal.style.maxWidth = `calc(${maincontainer.clientWidth}px -240px)`;
|
terminal.style.maxWidth = `calc(${maincontainer.clientWidth}px -240px)`;
|
||||||
terminal.style.maxHeight = `calc(${maincontainer.clientHeight}px - 24px)`;
|
terminal.style.maxHeight = `calc(${maincontainer.clientHeight}px - 24px)`;
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from './dees-workspace-filetree.js';
|
||||||
@@ -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 => {
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from './dees-workspace-markdown.js';
|
||||||
@@ -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;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from './dees-workspace-markdownoutlet.js';
|
||||||
@@ -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>;
|
||||||
@@ -40,6 +40,11 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
})
|
})
|
||||||
accessor language = 'typescript';
|
accessor language = 'typescript';
|
||||||
|
|
||||||
|
@property({
|
||||||
|
type: String
|
||||||
|
})
|
||||||
|
accessor filePath: string = '';
|
||||||
|
|
||||||
@property({
|
@property({
|
||||||
type: Object
|
type: Object
|
||||||
})
|
})
|
||||||
@@ -93,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` },
|
||||||
@@ -114,14 +119,35 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
||||||
const initialTheme = isBright ? 'vs' : 'vs-dark';
|
const initialTheme = isBright ? 'vs' : 'vs-dark';
|
||||||
|
|
||||||
const editor = ((window as any).monaco.editor as typeof monaco.editor).create(container, {
|
const monacoInstance = (window as any).monaco as typeof monaco;
|
||||||
value: this.content,
|
|
||||||
language: this.language,
|
// Create or get model with proper file URI for TypeScript IntelliSense
|
||||||
|
let model: monaco.editor.ITextModel | null = null;
|
||||||
|
if (this.filePath) {
|
||||||
|
const uri = monacoInstance.Uri.parse(`file://${this.filePath}`);
|
||||||
|
model = monacoInstance.editor.getModel(uri);
|
||||||
|
if (!model) {
|
||||||
|
model = monacoInstance.editor.createModel(this.content, this.language, uri);
|
||||||
|
} else {
|
||||||
|
model.setValue(this.content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const editor = (monacoInstance.editor as typeof monaco.editor).create(container, {
|
||||||
|
model: model || undefined,
|
||||||
|
value: model ? undefined : this.content,
|
||||||
|
language: model ? undefined : this.language,
|
||||||
theme: initialTheme,
|
theme: initialTheme,
|
||||||
useShadowDOM: true,
|
useShadowDOM: true,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
automaticLayout: true,
|
automaticLayout: true,
|
||||||
wordWrap: this.wordWrap
|
wordWrap: this.wordWrap,
|
||||||
|
hover: {
|
||||||
|
enabled: true,
|
||||||
|
delay: 300,
|
||||||
|
sticky: true,
|
||||||
|
above: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Subscribe to theme changes
|
// Subscribe to theme changes
|
||||||
@@ -160,7 +186,35 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
public async updated(changedProperties: Map<string, any>): Promise<void> {
|
public async updated(changedProperties: Map<string, any>): Promise<void> {
|
||||||
super.updated(changedProperties);
|
super.updated(changedProperties);
|
||||||
|
|
||||||
// Handle content changes
|
const monacoInstance = (window as any).monaco as typeof monaco;
|
||||||
|
if (!monacoInstance) return;
|
||||||
|
|
||||||
|
// Handle filePath changes - switch to different model
|
||||||
|
if (changedProperties.has('filePath') && this.filePath) {
|
||||||
|
const editor = await this.editorDeferred.promise;
|
||||||
|
const uri = monacoInstance.Uri.parse(`file://${this.filePath}`);
|
||||||
|
let model = monacoInstance.editor.getModel(uri);
|
||||||
|
|
||||||
|
if (!model) {
|
||||||
|
model = monacoInstance.editor.createModel(this.content, this.language, uri);
|
||||||
|
} else {
|
||||||
|
// Update model content if different
|
||||||
|
if (model.getValue() !== this.content) {
|
||||||
|
this.isUpdatingFromExternal = true;
|
||||||
|
model.setValue(this.content);
|
||||||
|
this.isUpdatingFromExternal = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switch editor to use this model
|
||||||
|
const currentModel = editor.getModel();
|
||||||
|
if (currentModel?.uri.toString() !== uri.toString()) {
|
||||||
|
editor.setModel(model);
|
||||||
|
}
|
||||||
|
return; // filePath change handles content too
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle content changes (when no filePath or filePath unchanged)
|
||||||
if (changedProperties.has('content')) {
|
if (changedProperties.has('content')) {
|
||||||
const editor = await this.editorDeferred.promise;
|
const editor = await this.editorDeferred.promise;
|
||||||
const currentValue = editor.getValue();
|
const currentValue = editor.getValue();
|
||||||
@@ -176,13 +230,10 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
const editor = await this.editorDeferred.promise;
|
const editor = await this.editorDeferred.promise;
|
||||||
const model = editor.getModel();
|
const model = editor.getModel();
|
||||||
if (model) {
|
if (model) {
|
||||||
const monacoInstance = (window as any).monaco;
|
|
||||||
if (monacoInstance) {
|
|
||||||
monacoInstance.editor.setModelLanguage(model, this.language);
|
monacoInstance.editor.setModelLanguage(model, this.language);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public async disconnectedCallback(): Promise<void> {
|
public async disconnectedCallback(): Promise<void> {
|
||||||
await super.disconnectedCallback();
|
await super.disconnectedCallback();
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from './dees-workspace-monaco.js';
|
||||||
@@ -0,0 +1,395 @@
|
|||||||
|
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;
|
||||||
|
private terminalThemeSubscription: any = null;
|
||||||
|
|
||||||
|
public static styles = [
|
||||||
|
themeDefaultStyles,
|
||||||
|
cssManager.defaultStyles,
|
||||||
|
css`
|
||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
height: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.terminal-preview {
|
||||||
|
height: 100%;
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
background: ${cssManager.bdTheme('#ffffff', '#000000')};
|
||||||
|
border: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 20%)')};
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.terminal-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 10%)')};
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', monospace;
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
|
||||||
|
border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 20%)')};
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.terminal-header-icon {
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 50%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.terminal-header-command {
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 20%)', '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: ${cssManager.bdTheme('#ffffff', '#000000')};
|
||||||
|
color: ${cssManager.bdTheme('#333333', '#ffffff')};
|
||||||
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
white-space: nowrap;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .composition-view.active {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-viewport {
|
||||||
|
background-color: ${cssManager.bdTheme('#ffffff', '#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: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 8%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-viewport::-webkit-scrollbar-thumb {
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 0% 80%)', 'hsl(0 0% 25%)')};
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 0% 70%)', '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>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get terminal theme colors based on bright/dark mode
|
||||||
|
*/
|
||||||
|
private getTerminalTheme(isBright: boolean) {
|
||||||
|
return isBright
|
||||||
|
? {
|
||||||
|
background: '#ffffff',
|
||||||
|
foreground: '#333333',
|
||||||
|
cursor: '#333333',
|
||||||
|
cursorAccent: '#ffffff',
|
||||||
|
selectionBackground: 'rgba(0, 0, 0, 0.2)',
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
background: '#000000',
|
||||||
|
foreground: '#cccccc',
|
||||||
|
cursor: '#cccccc',
|
||||||
|
cursorAccent: '#000000',
|
||||||
|
selectionBackground: 'rgba(255, 255, 255, 0.2)',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public async firstUpdated(
|
||||||
|
_changedProperties: Map<string | number | symbol, unknown>
|
||||||
|
): Promise<void> {
|
||||||
|
super.firstUpdated(_changedProperties);
|
||||||
|
|
||||||
|
const container = this.shadowRoot?.getElementById('xterm-container');
|
||||||
|
if (!container) return;
|
||||||
|
|
||||||
|
// Get current theme from domtools
|
||||||
|
const domtoolsInstance = await this.domtoolsPromise;
|
||||||
|
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
||||||
|
|
||||||
|
// 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: this.getTerminalTheme(isBright),
|
||||||
|
scrollback: 1000,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Subscribe to theme changes
|
||||||
|
this.terminalThemeSubscription = domtoolsInstance.themeManager.themeObservable.subscribe((goBright: boolean) => {
|
||||||
|
if (this.terminal) {
|
||||||
|
this.terminal.options.theme = this.getTerminalTheme(goBright);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
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.terminalThemeSubscription) {
|
||||||
|
this.terminalThemeSubscription.unsubscribe();
|
||||||
|
this.terminalThemeSubscription = 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from './dees-workspace-terminal-preview.js';
|
||||||
@@ -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
|
||||||
@@ -47,9 +47,6 @@ export class DeesTerminal extends DeesElement {
|
|||||||
@property()
|
@property()
|
||||||
accessor environmentVariables: { [key: string]: string } = {};
|
accessor environmentVariables: { [key: string]: string } = {};
|
||||||
|
|
||||||
@property()
|
|
||||||
accessor background: string = '#000000';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Promise that resolves when the environment is ready.
|
* Promise that resolves when the environment is ready.
|
||||||
* @deprecated Use executionEnvironment directly
|
* @deprecated Use executionEnvironment directly
|
||||||
@@ -57,6 +54,9 @@ export class DeesTerminal extends DeesElement {
|
|||||||
private environmentDeferred = new domtools.plugins.smartpromise.Deferred<IExecutionEnvironment>();
|
private environmentDeferred = new domtools.plugins.smartpromise.Deferred<IExecutionEnvironment>();
|
||||||
public environmentPromise = this.environmentDeferred.promise;
|
public environmentPromise = this.environmentDeferred.promise;
|
||||||
|
|
||||||
|
// Theme subscription for dynamic theme updates
|
||||||
|
private terminalThemeSubscription: any = null;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
this.resizeObserver = new ResizeObserver((entries) => {
|
this.resizeObserver = new ResizeObserver((entries) => {
|
||||||
@@ -72,10 +72,9 @@ export class DeesTerminal extends DeesElement {
|
|||||||
themeDefaultStyles,
|
themeDefaultStyles,
|
||||||
cssManager.defaultStyles,
|
cssManager.defaultStyles,
|
||||||
css`
|
css`
|
||||||
/* TODO: Migrate hardcoded values to --dees-* CSS variables */
|
|
||||||
:host {
|
:host {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
background: var(--dees-terminal-background, #000000);
|
background: ${cssManager.bdTheme('#ffffff', '#000000')};
|
||||||
position: absolute;
|
position: absolute;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -170,8 +169,8 @@ export class DeesTerminal extends DeesElement {
|
|||||||
|
|
||||||
.xterm .composition-view {
|
.xterm .composition-view {
|
||||||
/* TODO: Composition position got messed up somewhere */
|
/* TODO: Composition position got messed up somewhere */
|
||||||
background: var(--dees-terminal-background, #000000);
|
background: ${cssManager.bdTheme('#ffffff', '#000000')};
|
||||||
color: #fff;
|
color: ${cssManager.bdTheme('#333333', '#ffffff')};
|
||||||
display: none;
|
display: none;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
@@ -184,7 +183,7 @@ export class DeesTerminal extends DeesElement {
|
|||||||
|
|
||||||
.xterm .xterm-viewport {
|
.xterm .xterm-viewport {
|
||||||
/* On OS X this is required in order for the scroll bar to appear fully opaque */
|
/* On OS X this is required in order for the scroll bar to appear fully opaque */
|
||||||
background-color: var(--dees-terminal-background, #000000);
|
background-color: ${cssManager.bdTheme('#ffffff', '#000000')};
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@@ -275,25 +274,51 @@ export class DeesTerminal extends DeesElement {
|
|||||||
private fitAddon: FitAddon;
|
private fitAddon: FitAddon;
|
||||||
private terminal: Terminal | null = null;
|
private terminal: Terminal | null = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get terminal theme colors based on bright/dark mode
|
||||||
|
*/
|
||||||
|
private getTerminalTheme(isBright: boolean) {
|
||||||
|
return isBright
|
||||||
|
? {
|
||||||
|
background: '#ffffff',
|
||||||
|
foreground: '#333333',
|
||||||
|
cursor: '#333333',
|
||||||
|
cursorAccent: '#ffffff',
|
||||||
|
selectionBackground: 'rgba(0, 0, 0, 0.2)',
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
background: '#000000',
|
||||||
|
foreground: '#cccccc',
|
||||||
|
cursor: '#cccccc',
|
||||||
|
cursorAccent: '#000000',
|
||||||
|
selectionBackground: 'rgba(255, 255, 255, 0.2)',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public async firstUpdated(
|
public async firstUpdated(
|
||||||
_changedProperties: Map<string | number | symbol, unknown>
|
_changedProperties: Map<string | number | symbol, unknown>
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const domtools = await this.domtoolsPromise;
|
const domtoolsInstance = await this.domtoolsPromise;
|
||||||
super.firstUpdated(_changedProperties);
|
super.firstUpdated(_changedProperties);
|
||||||
|
|
||||||
// Sync CSS variable with background property
|
// Get current theme
|
||||||
this.style.setProperty('--dees-terminal-background', this.background);
|
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
||||||
|
|
||||||
const container = this.shadowRoot.getElementById('container');
|
const container = this.shadowRoot.getElementById('container');
|
||||||
|
|
||||||
const term = new Terminal({
|
const term = new Terminal({
|
||||||
convertEol: true,
|
convertEol: true,
|
||||||
cursorBlink: true,
|
cursorBlink: true,
|
||||||
theme: {
|
theme: this.getTerminalTheme(isBright),
|
||||||
background: this.background,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
this.terminal = term;
|
this.terminal = term;
|
||||||
|
|
||||||
|
// Subscribe to theme changes
|
||||||
|
this.terminalThemeSubscription = domtoolsInstance.themeManager.themeObservable.subscribe((goBright: boolean) => {
|
||||||
|
if (this.terminal) {
|
||||||
|
this.terminal.options.theme = this.getTerminalTheme(goBright);
|
||||||
|
}
|
||||||
|
});
|
||||||
this.fitAddon = new FitAddon();
|
this.fitAddon = new FitAddon();
|
||||||
term.loadAddon(this.fitAddon);
|
term.loadAddon(this.fitAddon);
|
||||||
|
|
||||||
@@ -383,6 +408,14 @@ export class DeesTerminal extends DeesElement {
|
|||||||
|
|
||||||
async disconnectedCallback(): Promise<void> {
|
async disconnectedCallback(): Promise<void> {
|
||||||
this.resizeObserver.unobserve(this);
|
this.resizeObserver.unobserve(this);
|
||||||
|
if (this.terminalThemeSubscription) {
|
||||||
|
this.terminalThemeSubscription.unsubscribe();
|
||||||
|
this.terminalThemeSubscription = null;
|
||||||
|
}
|
||||||
|
if (this.terminal) {
|
||||||
|
this.terminal.dispose();
|
||||||
|
this.terminal = null;
|
||||||
|
}
|
||||||
await super.disconnectedCallback();
|
await super.disconnectedCallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from './dees-workspace-terminal.js';
|
||||||
1318
ts_web/elements/00group-workspace/dees-workspace/dees-workspace.ts
Normal 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';
|
||||||
@@ -0,0 +1,450 @@
|
|||||||
|
import type * as monaco from 'monaco-editor';
|
||||||
|
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
|
||||||
|
|
||||||
|
// Monaco TypeScript API types (runtime API still exists, types deprecated in 0.55+)
|
||||||
|
interface IExtraLibDisposable {
|
||||||
|
dispose(): void;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface IMonacoTypeScriptAPI {
|
||||||
|
typescriptDefaults: {
|
||||||
|
setCompilerOptions(options: Record<string, unknown>): void;
|
||||||
|
setDiagnosticsOptions(options: Record<string, unknown>): void;
|
||||||
|
addExtraLib(content: string, filePath?: string): IExtraLibDisposable;
|
||||||
|
setEagerModelSync(value: boolean): void;
|
||||||
|
};
|
||||||
|
ScriptTarget: { ES2020: number };
|
||||||
|
ModuleKind: { ESNext: number };
|
||||||
|
ModuleResolutionKind: { NodeJs: number; Bundler?: number };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages TypeScript IntelliSense by loading type definitions
|
||||||
|
* from the virtual filesystem into Monaco.
|
||||||
|
*/
|
||||||
|
export class TypeScriptIntelliSenseManager {
|
||||||
|
private loadedLibs: Set<string> = new Set();
|
||||||
|
private notFoundPackages: Set<string> = new Set(); // Packages checked but not found
|
||||||
|
private monacoInstance: typeof monaco | null = null;
|
||||||
|
private executionEnvironment: IExecutionEnvironment | null = null;
|
||||||
|
|
||||||
|
// Cache of file contents for synchronous access and module resolution
|
||||||
|
private fileCache: Map<string, string> = new Map();
|
||||||
|
|
||||||
|
// Track extra libs added for cleanup
|
||||||
|
private addedExtraLibs: Map<string, IExtraLibDisposable> = new Map();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TypeScript API with proper typing for Monaco 0.55+
|
||||||
|
*/
|
||||||
|
private get tsApi(): IMonacoTypeScriptAPI | null {
|
||||||
|
if (!this.monacoInstance) return null;
|
||||||
|
return (this.monacoInstance.languages as any).typescript as IMonacoTypeScriptAPI;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize with Monaco and execution environment
|
||||||
|
*/
|
||||||
|
public async init(
|
||||||
|
monacoInst: typeof monaco,
|
||||||
|
env: IExecutionEnvironment
|
||||||
|
): Promise<void> {
|
||||||
|
this.monacoInstance = monacoInst;
|
||||||
|
this.executionEnvironment = env;
|
||||||
|
this.configureCompilerOptions();
|
||||||
|
// Load all project TypeScript/JavaScript files into Monaco for cross-file resolution
|
||||||
|
await this.loadAllProjectFiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recursively load all .ts/.js files from the virtual filesystem into Monaco
|
||||||
|
*/
|
||||||
|
private async loadAllProjectFiles(): Promise<void> {
|
||||||
|
if (!this.executionEnvironment) return;
|
||||||
|
await this.loadFilesFromDirectory('/');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recursively load files from a directory
|
||||||
|
*/
|
||||||
|
private async loadFilesFromDirectory(dirPath: string): Promise<void> {
|
||||||
|
if (!this.executionEnvironment) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const entries = await this.executionEnvironment.readDir(dirPath);
|
||||||
|
|
||||||
|
for (const entry of entries) {
|
||||||
|
const fullPath = dirPath === '/' ? `/${entry.name}` : `${dirPath}/${entry.name}`;
|
||||||
|
|
||||||
|
// Skip node_modules - too large and handled separately via addExtraLib
|
||||||
|
if (entry.name === 'node_modules') continue;
|
||||||
|
|
||||||
|
if (entry.type === 'directory') {
|
||||||
|
await this.loadFilesFromDirectory(fullPath);
|
||||||
|
} else if (entry.type === 'file') {
|
||||||
|
const ext = entry.name.split('.').pop()?.toLowerCase();
|
||||||
|
if (ext === 'ts' || ext === 'tsx' || ext === 'js' || ext === 'jsx') {
|
||||||
|
try {
|
||||||
|
const content = await this.executionEnvironment.readFile(fullPath);
|
||||||
|
this.addFileModel(fullPath, content);
|
||||||
|
} catch {
|
||||||
|
// Ignore files that can't be read
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Directory might not exist or not be readable
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private configureCompilerOptions(): void {
|
||||||
|
const ts = this.tsApi;
|
||||||
|
if (!ts) return;
|
||||||
|
|
||||||
|
ts.typescriptDefaults.setCompilerOptions({
|
||||||
|
target: ts.ScriptTarget.ES2020,
|
||||||
|
module: ts.ModuleKind.ESNext,
|
||||||
|
// Use Bundler resolution if available (Monaco 0.45+), fallback to NodeJs
|
||||||
|
moduleResolution: ts.ModuleResolutionKind.Bundler ?? ts.ModuleResolutionKind.NodeJs,
|
||||||
|
allowSyntheticDefaultImports: true,
|
||||||
|
esModuleInterop: true,
|
||||||
|
strict: true,
|
||||||
|
noEmit: true,
|
||||||
|
allowJs: true,
|
||||||
|
checkJs: false,
|
||||||
|
allowNonTsExtensions: true,
|
||||||
|
lib: ['es2020', 'dom', 'dom.iterable'],
|
||||||
|
// Set baseUrl to root for resolving absolute imports
|
||||||
|
baseUrl: '/',
|
||||||
|
// Allow importing .ts extensions directly (useful for some setups)
|
||||||
|
allowImportingTsExtensions: true,
|
||||||
|
// Resolve JSON modules
|
||||||
|
resolveJsonModule: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
ts.typescriptDefaults.setDiagnosticsOptions({
|
||||||
|
noSemanticValidation: false,
|
||||||
|
noSyntaxValidation: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Enable eager model sync so TypeScript immediately processes all models
|
||||||
|
// This is critical for cross-file IntelliSense to work without requiring edits
|
||||||
|
ts.typescriptDefaults.setEagerModelSync(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse imports from TypeScript/JavaScript content
|
||||||
|
*/
|
||||||
|
public parseImports(content: string): string[] {
|
||||||
|
const imports: string[] = [];
|
||||||
|
|
||||||
|
// Match ES6 imports: import { x } from 'package' or import 'package'
|
||||||
|
const importRegex = /import\s+(?:[\w*{}\s,]+from\s+)?['"]([^'"]+)['"]/g;
|
||||||
|
let match: RegExpExecArray | null;
|
||||||
|
|
||||||
|
while ((match = importRegex.exec(content)) !== null) {
|
||||||
|
const importPath = match[1];
|
||||||
|
// Only process non-relative imports (npm packages)
|
||||||
|
if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
|
||||||
|
const packageName = importPath.startsWith('@')
|
||||||
|
? importPath.split('/').slice(0, 2).join('/') // @scope/package
|
||||||
|
: importPath.split('/')[0]; // package
|
||||||
|
imports.push(packageName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match require calls: require('package')
|
||||||
|
const requireRegex = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
|
||||||
|
while ((match = requireRegex.exec(content)) !== null) {
|
||||||
|
const importPath = match[1];
|
||||||
|
if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
|
||||||
|
const packageName = importPath.startsWith('@')
|
||||||
|
? importPath.split('/').slice(0, 2).join('/')
|
||||||
|
: importPath.split('/')[0];
|
||||||
|
imports.push(packageName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...new Set(imports)];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load type definitions for a package from virtual FS
|
||||||
|
*/
|
||||||
|
public async loadTypesForPackage(packageName: string): Promise<void> {
|
||||||
|
if (!this.monacoInstance || !this.executionEnvironment) return;
|
||||||
|
if (this.loadedLibs.has(packageName)) return;
|
||||||
|
if (this.notFoundPackages.has(packageName)) return; // Skip packages we already checked
|
||||||
|
|
||||||
|
try {
|
||||||
|
let typesLoaded = await this.tryLoadPackageTypes(packageName);
|
||||||
|
if (!typesLoaded) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.warn(`Failed to load types for ${packageName}:`, error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async tryLoadPackageTypes(packageName: string): Promise<boolean> {
|
||||||
|
const ts = this.tsApi;
|
||||||
|
if (!this.executionEnvironment || !ts) return false;
|
||||||
|
|
||||||
|
const basePath = `/node_modules/${packageName}`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Check package.json for types field
|
||||||
|
const packageJsonPath = `${basePath}/package.json`;
|
||||||
|
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) {
|
||||||
|
// 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 - if any exist, load all .d.ts files
|
||||||
|
const commonPaths = [
|
||||||
|
`${basePath}/index.d.ts`,
|
||||||
|
`${basePath}/dist/index.d.ts`,
|
||||||
|
`${basePath}/lib/index.d.ts`,
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const dtsPath of commonPaths) {
|
||||||
|
if (await this.executionEnvironment.exists(dtsPath)) {
|
||||||
|
await this.loadAllDtsFilesFromPackage(basePath);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to load package types for ${packageName}:`, error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
|
||||||
|
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('@')
|
||||||
|
? `@types/${packageName.slice(1).replace('/', '__')}`
|
||||||
|
: `@types/${packageName}`;
|
||||||
|
|
||||||
|
const basePath = `/node_modules/${typesPackageName}`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const indexPath = `${basePath}/index.d.ts`;
|
||||||
|
if (await this.executionEnvironment.exists(indexPath)) {
|
||||||
|
// Load all .d.ts files from the @types package
|
||||||
|
await this.loadAllDtsFilesFromPackage(basePath);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process content change and load types for any new imports
|
||||||
|
*/
|
||||||
|
public async processContentChange(content: string): Promise<void> {
|
||||||
|
const imports = this.parseImports(content);
|
||||||
|
|
||||||
|
for (const packageName of imports) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a file model to Monaco for cross-file IntelliSense
|
||||||
|
* Also registers the file with TypeScript via addExtraLib for module resolution
|
||||||
|
*/
|
||||||
|
public addFileModel(path: string, content: string): void {
|
||||||
|
if (!this.monacoInstance) return;
|
||||||
|
|
||||||
|
// Cache the content for sync access
|
||||||
|
this.fileCache.set(path, content);
|
||||||
|
|
||||||
|
// Create/update the editor model
|
||||||
|
const uri = this.monacoInstance.Uri.parse(`file://${path}`);
|
||||||
|
const existingModel = this.monacoInstance.editor.getModel(uri);
|
||||||
|
|
||||||
|
if (existingModel) {
|
||||||
|
existingModel.setValue(content);
|
||||||
|
} else {
|
||||||
|
const language = this.getLanguageFromPath(path);
|
||||||
|
this.monacoInstance.editor.createModel(content, language, uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also add as extra lib for TypeScript module resolution
|
||||||
|
// This is critical - TypeScript's resolver uses extra libs, not editor models
|
||||||
|
this.addFileAsExtraLib(path, content);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a file as an extra lib for TypeScript module resolution.
|
||||||
|
* This enables TypeScript to resolve imports to project files.
|
||||||
|
*/
|
||||||
|
private addFileAsExtraLib(path: string, content: string): void {
|
||||||
|
const ts = this.tsApi;
|
||||||
|
if (!ts) return;
|
||||||
|
|
||||||
|
// Dispose existing lib if present (for updates)
|
||||||
|
const existing = this.addedExtraLibs.get(path);
|
||||||
|
if (existing) {
|
||||||
|
existing.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the file with its actual path
|
||||||
|
const filePath = `file://${path}`;
|
||||||
|
const disposable = ts.typescriptDefaults.addExtraLib(content, filePath);
|
||||||
|
this.addedExtraLibs.set(path, disposable);
|
||||||
|
|
||||||
|
// For .ts files, also add with .js extension to handle ESM imports
|
||||||
|
// (e.g., import from './utils.js' should resolve to ./utils.ts)
|
||||||
|
if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
|
||||||
|
const jsPath = path.replace(/\.ts$/, '.js');
|
||||||
|
const jsFilePath = `file://${jsPath}`;
|
||||||
|
const jsDisposable = ts.typescriptDefaults.addExtraLib(content, jsFilePath);
|
||||||
|
this.addedExtraLibs.set(jsPath, jsDisposable);
|
||||||
|
this.fileCache.set(jsPath, content);
|
||||||
|
} else if (path.endsWith('.tsx')) {
|
||||||
|
const jsxPath = path.replace(/\.tsx$/, '.jsx');
|
||||||
|
const jsxFilePath = `file://${jsxPath}`;
|
||||||
|
const jsxDisposable = ts.typescriptDefaults.addExtraLib(content, jsxFilePath);
|
||||||
|
this.addedExtraLibs.set(jsxPath, jsxDisposable);
|
||||||
|
this.fileCache.set(jsxPath, content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get cached file content for synchronous access
|
||||||
|
*/
|
||||||
|
public getFileContent(path: string): string | undefined {
|
||||||
|
return this.fileCache.get(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private getLanguageFromPath(path: string): string {
|
||||||
|
const ext = path.split('.').pop()?.toLowerCase();
|
||||||
|
switch (ext) {
|
||||||
|
case 'ts':
|
||||||
|
case 'tsx':
|
||||||
|
return 'typescript';
|
||||||
|
case 'js':
|
||||||
|
case 'jsx':
|
||||||
|
return 'javascript';
|
||||||
|
case 'json':
|
||||||
|
return 'json';
|
||||||
|
default:
|
||||||
|
return 'plaintext';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
8
ts_web/elements/00group-workspace/index.ts
Normal 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';
|
||||||
@@ -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';
|
||||||
|
|||||||
@@ -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
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
export * from './dees-terminal.js';
|
|
||||||
@@ -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';
|
||||||
|
|||||||