@design.estate/dees-catalog 3.81.0 → 3.82.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.smartconfig.json +11 -6
- package/dist_bundle/bundle.js +33 -5
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/elements/00group-runtime/environments/WebContainerEnvironment.d.ts +2 -1
- package/dist_ts_web/elements/00group-runtime/environments/WebContainerEnvironment.js +8 -1
- package/dist_ts_web/elements/00group-runtime/interfaces/IExecutionEnvironment.d.ts +16 -1
- package/dist_ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.d.ts +1 -0
- package/dist_ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.js +18 -4
- package/dist_ts_web/elements/00group-workspace/dees-workspace-terminal/interfaces.d.ts +1 -1
- package/package.json +15 -15
- package/scripts/update-monaco-version.cjs +44 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/00group-runtime/environments/WebContainerEnvironment.ts +15 -1
- package/ts_web/elements/00group-runtime/interfaces/IExecutionEnvironment.ts +18 -1
- package/ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.ts +21 -4
- package/ts_web/elements/00group-workspace/dees-workspace-terminal/interfaces.ts +2 -2
package/.smartconfig.json
CHANGED
|
@@ -37,12 +37,17 @@
|
|
|
37
37
|
]
|
|
38
38
|
},
|
|
39
39
|
"release": {
|
|
40
|
-
"
|
|
41
|
-
"
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
"targets": {
|
|
41
|
+
"npm": {
|
|
42
|
+
"registries": [
|
|
43
|
+
"https://verdaccio.lossless.digital",
|
|
44
|
+
"https://registry.npmjs.org"
|
|
45
|
+
],
|
|
46
|
+
"accessLevel": "public"
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
},
|
|
50
|
+
"schemaVersion": 2
|
|
46
51
|
},
|
|
47
52
|
"@git.zone/tsdoc": {
|
|
48
53
|
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
package/dist_bundle/bundle.js
CHANGED
|
@@ -132879,6 +132879,13 @@ var init_WebContainerEnvironment = __esm({
|
|
|
132879
132879
|
kill: /* @__PURE__ */ __name(() => process4.kill(), "kill")
|
|
132880
132880
|
};
|
|
132881
132881
|
}
|
|
132882
|
+
getShellCommand() {
|
|
132883
|
+
return {
|
|
132884
|
+
command: "jsh",
|
|
132885
|
+
label: "jsh",
|
|
132886
|
+
prompt: "~/"
|
|
132887
|
+
};
|
|
132888
|
+
}
|
|
132882
132889
|
// ============ WebContainer-specific methods ============
|
|
132883
132890
|
/**
|
|
132884
132891
|
* Mount files into the virtual filesystem.
|
|
@@ -133379,6 +133386,19 @@ var init_dees_workspace_terminal = __esm({
|
|
|
133379
133386
|
console.error("Failed to spawn process:", error);
|
|
133380
133387
|
}
|
|
133381
133388
|
}
|
|
133389
|
+
async getShellCommand() {
|
|
133390
|
+
if (this.executionEnvironment && !this.executionEnvironment.ready) {
|
|
133391
|
+
await this.executionEnvironment.init();
|
|
133392
|
+
}
|
|
133393
|
+
if (this.executionEnvironment?.getShellCommand) {
|
|
133394
|
+
return await this.executionEnvironment.getShellCommand();
|
|
133395
|
+
}
|
|
133396
|
+
return {
|
|
133397
|
+
command: "jsh",
|
|
133398
|
+
label: "jsh",
|
|
133399
|
+
prompt: "~/"
|
|
133400
|
+
};
|
|
133401
|
+
}
|
|
133382
133402
|
handleProcessExit(tabId, exitCode3) {
|
|
133383
133403
|
const tab2 = this.tabManager.getTab(tabId);
|
|
133384
133404
|
if (!tab2) return;
|
|
@@ -133424,10 +133444,11 @@ var init_dees_workspace_terminal = __esm({
|
|
|
133424
133444
|
* Create a new shell tab
|
|
133425
133445
|
*/
|
|
133426
133446
|
async createShellTab(label) {
|
|
133447
|
+
const shellCommand = await this.getShellCommand();
|
|
133427
133448
|
const tab2 = this.tabManager.createTab(
|
|
133428
133449
|
{
|
|
133429
133450
|
type: "shell",
|
|
133430
|
-
label: label ||
|
|
133451
|
+
label: label || `${shellCommand.label || shellCommand.command} ${this.tabManager.getTabCount() + 1}`,
|
|
133431
133452
|
closeable: this.tabManager.getTabCount() > 0
|
|
133432
133453
|
// First tab not closeable
|
|
133433
133454
|
},
|
|
@@ -133436,9 +133457,9 @@ var init_dees_workspace_terminal = __esm({
|
|
|
133436
133457
|
this.tabs = this.tabManager.getAllTabs();
|
|
133437
133458
|
this.switchToTab(tab2.id);
|
|
133438
133459
|
await this.updateComplete;
|
|
133439
|
-
await this.spawnProcessForTab(tab2,
|
|
133460
|
+
await this.spawnProcessForTab(tab2, shellCommand.command, shellCommand.args || []);
|
|
133440
133461
|
if (this.tabManager.getTabCount() === 1 && this.setupCommand) {
|
|
133441
|
-
await this.waitForPrompt(tab2.terminal, "~/");
|
|
133462
|
+
await this.waitForPrompt(tab2.terminal, shellCommand.prompt || "~/");
|
|
133442
133463
|
if (tab2.inputWriter) {
|
|
133443
133464
|
tab2.inputWriter.write(this.setupCommand);
|
|
133444
133465
|
}
|
|
@@ -154395,6 +154416,9 @@ __publicField(_DeesFormattingMenu, "styles", [
|
|
|
154395
154416
|
__runInitializers(_init35, 1, _DeesFormattingMenu);
|
|
154396
154417
|
var DeesFormattingMenu = _DeesFormattingMenu;
|
|
154397
154418
|
|
|
154419
|
+
// ts_web/elements/00group-input/dees-input-wysiwyg/wysiwyg.interfaces.ts
|
|
154420
|
+
init_dist_ts30();
|
|
154421
|
+
|
|
154398
154422
|
// ts_web/elements/00group-input/dees-input-wysiwyg/wysiwyg.constants.ts
|
|
154399
154423
|
var PROGRAMMING_LANGUAGES = [
|
|
154400
154424
|
"JavaScript",
|
|
@@ -165021,6 +165045,7 @@ __name(compileLucenePredicate, "compileLucenePredicate");
|
|
|
165021
165045
|
// ts_web/elements/00group-dataview/dees-table/dees-table.ts
|
|
165022
165046
|
init_dist_ts30();
|
|
165023
165047
|
init_dist_ts29();
|
|
165048
|
+
init_dees_icon();
|
|
165024
165049
|
init_theme();
|
|
165025
165050
|
var ___virtualRange_dec, ___flashingCells_dec, ___floatingActive_dec, ___editingCell_dec, ___focusedCell_dec, _selectedIds_dec, _selectionMode_dec, _searchMode_dec, _fixedHeight_dec, _highlightDuration_dec, _highlightUpdates_dec, _virtualOverscan_dec, _virtualized_dec, _showSelectionCheckbox_dec, _showColumnFilters_dec, _columnFilters_dec, _filterText_dec, _sortBy_dec, _showGrid_dec, _showHorizontalLines_dec, _showVerticalLines_dec, _selectedDataRow_dec, _reverseDisplayFunction_dec, _displayFunction_dec, _augmentFromDisplayFunction_dec, _rowKey_dec, _columns_dec, _dataActions_dec, _searchable_dec, _dataName_dec, _required_dec3, _disabled_dec3, _label_dec3, _key_dec2, _data_dec, _heading2_dec, _heading1_dec, _a42, _DeesTable_decorators, _init39, _heading1, _heading22, _data, _key2, _label3, _disabled3, _required3, _dataName, _searchable, _dataActions, _columns, _rowKey, _augmentFromDisplayFunction, _displayFunction, _reverseDisplayFunction, _selectedDataRow, _showVerticalLines, _showHorizontalLines, _showGrid, _sortBy, _filterText, _columnFilters, _showColumnFilters, _showSelectionCheckbox, _virtualized, _virtualOverscan, _highlightUpdates, _highlightDuration, _fixedHeight, _searchMode, _selectionMode, _selectedIds, ___focusedCell, ___editingCell, ___floatingActive, ___flashingCells, ___virtualRange;
|
|
165026
165051
|
function ordinalLabel(n12) {
|
|
@@ -202660,6 +202685,9 @@ _init112 = __decoratorStart(_a109);
|
|
|
202660
202685
|
DeesWorkspaceMarkdownoutlet = __decorateElement(_init112, 0, "DeesWorkspaceMarkdownoutlet", _DeesWorkspaceMarkdownoutlet_decorators, DeesWorkspaceMarkdownoutlet);
|
|
202661
202686
|
__runInitializers(_init112, 1, DeesWorkspaceMarkdownoutlet);
|
|
202662
202687
|
|
|
202688
|
+
// ts_web/elements/dees-tooltip/dees-tooltip.ts
|
|
202689
|
+
init_dist_ts30();
|
|
202690
|
+
|
|
202663
202691
|
// ts_web/elements/index.ts
|
|
202664
202692
|
init_theme();
|
|
202665
202693
|
init_group_runtime();
|
|
@@ -202667,7 +202695,7 @@ init_group_runtime();
|
|
|
202667
202695
|
// ts_web/00_commitinfo_data.ts
|
|
202668
202696
|
var commitinfo = {
|
|
202669
202697
|
name: "@design.estate/dees-catalog",
|
|
202670
|
-
version: "3.
|
|
202698
|
+
version: "3.82.0",
|
|
202671
202699
|
description: "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript."
|
|
202672
202700
|
};
|
|
202673
202701
|
export {
|
|
@@ -204633,4 +204661,4 @@ ibantools/jsnext/ibantools.js:
|
|
|
204633
204661
|
* @preferred
|
|
204634
204662
|
*)
|
|
204635
204663
|
*/
|
|
204636
|
-
//# sourceMappingURL=bundle
|
|
204664
|
+
//# sourceMappingURL=bundle.js.map
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@design.estate/dees-catalog',
|
|
6
|
-
version: '3.
|
|
6
|
+
version: '3.82.0',
|
|
7
7
|
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsNkJBQTZCO0lBQ25DLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSxzSkFBc0o7Q0FDcEssQ0FBQSJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as webcontainer from '@tempfix/webcontainer__api';
|
|
2
|
-
import type { IExecutionEnvironment, IFileEntry, IFileWatcher, IProcessHandle } from '../interfaces/IExecutionEnvironment.js';
|
|
2
|
+
import type { IExecutionEnvironment, IFileEntry, IFileWatcher, IProcessHandle, IShellCommand } from '../interfaces/IExecutionEnvironment.js';
|
|
3
3
|
/**
|
|
4
4
|
* WebContainer-based execution environment.
|
|
5
5
|
* Runs Node.js and shell commands in the browser using WebContainer API.
|
|
@@ -25,6 +25,7 @@ export declare class WebContainerEnvironment implements IExecutionEnvironment {
|
|
|
25
25
|
recursive?: boolean;
|
|
26
26
|
}): IFileWatcher;
|
|
27
27
|
spawn(command: string, args?: string[]): Promise<IProcessHandle>;
|
|
28
|
+
getShellCommand(): IShellCommand;
|
|
28
29
|
/**
|
|
29
30
|
* Mount files into the virtual filesystem.
|
|
30
31
|
* This is a WebContainer-specific operation.
|
|
@@ -119,6 +119,13 @@ export class WebContainerEnvironment {
|
|
|
119
119
|
kill: () => process.kill(),
|
|
120
120
|
};
|
|
121
121
|
}
|
|
122
|
+
getShellCommand() {
|
|
123
|
+
return {
|
|
124
|
+
command: 'jsh',
|
|
125
|
+
label: 'jsh',
|
|
126
|
+
prompt: '~/',
|
|
127
|
+
};
|
|
128
|
+
}
|
|
122
129
|
// ============ WebContainer-specific methods ============
|
|
123
130
|
/**
|
|
124
131
|
* Mount files into the virtual filesystem.
|
|
@@ -144,4 +151,4 @@ export class WebContainerEnvironment {
|
|
|
144
151
|
}
|
|
145
152
|
}
|
|
146
153
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViQ29udGFpbmVyRW52aXJvbm1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90c193ZWIvZWxlbWVudHMvMDBncm91cC1ydW50aW1lL2Vudmlyb25tZW50cy9XZWJDb250YWluZXJFbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssWUFBWSxNQUFNLDRCQUE0QixDQUFDO0FBUzNEOzs7R0FHRztBQUNILE1BQU0sT0FBTyx1QkFBdUI7SUFDbEMsbUVBQW1FO0lBQzNELE1BQU0sQ0FBQyxlQUFlLEdBQXFDLElBQUksQ0FBQztJQUNoRSxNQUFNLENBQUMsV0FBVyxHQUE4QyxJQUFJLENBQUM7SUFFckUsTUFBTSxHQUFZLEtBQUssQ0FBQztJQUVoQixJQUFJLEdBQUcsY0FBdUIsQ0FBQztJQUUvQyxJQUFXLEtBQUs7UUFDZCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztJQUVELElBQVksU0FBUztRQUNuQixPQUFPLHVCQUF1QixDQUFDLGVBQWUsQ0FBQztJQUNqRCxDQUFDO0lBRUQsc0NBQXNDO0lBRS9CLEtBQUssQ0FBQyxJQUFJO1FBQ2Ysc0NBQXNDO1FBQ3RDLElBQUksSUFBSSxDQUFDLE1BQU0sSUFBSSx1QkFBdUIsQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUMzRCxPQUFPO1FBQ1QsQ0FBQztRQUVELHdEQUF3RDtRQUN4RCxJQUFJLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sdUJBQXVCLENBQUMsV0FBVyxDQUFDO1lBQzFDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDO1lBQ25CLE9BQU87UUFDVCxDQUFDO1FBRUQseURBQXlEO1FBQ3pELElBQUksdUJBQXVCLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDNUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7WUFDbkIsT0FBTztRQUNULENBQUM7UUFFRCxzRUFBc0U7UUFD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
|
|
@@ -28,6 +28,16 @@ export interface IProcessHandle {
|
|
|
28
28
|
/** Kill the process */
|
|
29
29
|
kill(): void;
|
|
30
30
|
}
|
|
31
|
+
export interface IShellCommand {
|
|
32
|
+
/** Executable to start for an interactive shell session. */
|
|
33
|
+
command: string;
|
|
34
|
+
/** Optional command arguments. */
|
|
35
|
+
args?: string[];
|
|
36
|
+
/** Optional display label for terminal tabs. */
|
|
37
|
+
label?: string;
|
|
38
|
+
/** Optional prompt marker used for setup commands. */
|
|
39
|
+
prompt?: string;
|
|
40
|
+
}
|
|
31
41
|
/**
|
|
32
42
|
* Abstract execution environment interface.
|
|
33
43
|
* Implementations can target WebContainer (browser), Backend API (server), or Mock (testing).
|
|
@@ -81,11 +91,16 @@ export interface IExecutionEnvironment {
|
|
|
81
91
|
}): IFileWatcher;
|
|
82
92
|
/**
|
|
83
93
|
* Spawn a new process
|
|
84
|
-
* @param command - Command to run (e.g., '
|
|
94
|
+
* @param command - Command to run (e.g., 'node', 'npm')
|
|
85
95
|
* @param args - Optional arguments
|
|
86
96
|
* @returns Process handle with I/O streams
|
|
87
97
|
*/
|
|
88
98
|
spawn(command: string, args?: string[]): Promise<IProcessHandle>;
|
|
99
|
+
/**
|
|
100
|
+
* Return the environment-native interactive shell command.
|
|
101
|
+
* Implementations should provide this when terminal shells need a specific executable.
|
|
102
|
+
*/
|
|
103
|
+
getShellCommand?(): IShellCommand | Promise<IShellCommand>;
|
|
89
104
|
/**
|
|
90
105
|
* Initialize the environment (e.g., boot WebContainer)
|
|
91
106
|
* Must be called before any other operations
|
package/dist_ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.d.ts
CHANGED
|
@@ -59,6 +59,7 @@ export declare class DeesWorkspaceTerminal extends DeesElement {
|
|
|
59
59
|
private attachTerminalToContainer;
|
|
60
60
|
handleResize(): void;
|
|
61
61
|
private spawnProcessForTab;
|
|
62
|
+
private getShellCommand;
|
|
62
63
|
private handleProcessExit;
|
|
63
64
|
/**
|
|
64
65
|
* Show actionbar offering to close an exited tab
|
package/dist_ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.js
CHANGED
|
@@ -669,6 +669,19 @@ let DeesWorkspaceTerminal = (() => {
|
|
|
669
669
|
console.error('Failed to spawn process:', error);
|
|
670
670
|
}
|
|
671
671
|
}
|
|
672
|
+
async getShellCommand() {
|
|
673
|
+
if (this.executionEnvironment && !this.executionEnvironment.ready) {
|
|
674
|
+
await this.executionEnvironment.init();
|
|
675
|
+
}
|
|
676
|
+
if (this.executionEnvironment?.getShellCommand) {
|
|
677
|
+
return await this.executionEnvironment.getShellCommand();
|
|
678
|
+
}
|
|
679
|
+
return {
|
|
680
|
+
command: 'jsh',
|
|
681
|
+
label: 'jsh',
|
|
682
|
+
prompt: '~/',
|
|
683
|
+
};
|
|
684
|
+
}
|
|
672
685
|
handleProcessExit(tabId, exitCode) {
|
|
673
686
|
const tab = this.tabManager.getTab(tabId);
|
|
674
687
|
if (!tab)
|
|
@@ -721,9 +734,10 @@ let DeesWorkspaceTerminal = (() => {
|
|
|
721
734
|
* Create a new shell tab
|
|
722
735
|
*/
|
|
723
736
|
async createShellTab(label) {
|
|
737
|
+
const shellCommand = await this.getShellCommand();
|
|
724
738
|
const tab = this.tabManager.createTab({
|
|
725
739
|
type: 'shell',
|
|
726
|
-
label: label ||
|
|
740
|
+
label: label || `${shellCommand.label || shellCommand.command} ${this.tabManager.getTabCount() + 1}`,
|
|
727
741
|
closeable: this.tabManager.getTabCount() > 0, // First tab not closeable
|
|
728
742
|
}, this.isBright);
|
|
729
743
|
this.tabs = this.tabManager.getAllTabs();
|
|
@@ -731,10 +745,10 @@ let DeesWorkspaceTerminal = (() => {
|
|
|
731
745
|
this.switchToTab(tab.id);
|
|
732
746
|
// Wait for DOM update then spawn shell
|
|
733
747
|
await this.updateComplete;
|
|
734
|
-
await this.spawnProcessForTab(tab,
|
|
748
|
+
await this.spawnProcessForTab(tab, shellCommand.command, shellCommand.args || []);
|
|
735
749
|
// Run setup command if this is the first tab
|
|
736
750
|
if (this.tabManager.getTabCount() === 1 && this.setupCommand) {
|
|
737
|
-
await this.waitForPrompt(tab.terminal, '~/');
|
|
751
|
+
await this.waitForPrompt(tab.terminal, shellCommand.prompt || '~/');
|
|
738
752
|
if (tab.inputWriter) {
|
|
739
753
|
tab.inputWriter.write(this.setupCommand);
|
|
740
754
|
}
|
|
@@ -897,4 +911,4 @@ let DeesWorkspaceTerminal = (() => {
|
|
|
897
911
|
return DeesWorkspaceTerminal = _classThis;
|
|
898
912
|
})();
|
|
899
913
|
export { DeesWorkspaceTerminal };
|
|
900
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dees-workspace-terminal.js","sourceRoot":"","sources":["../../../../ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.ts"],"names":[],"mappings":"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"}
|
|
914
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dees-workspace-terminal.js","sourceRoot":"","sources":["../../../../ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ export interface ICreateTerminalTabOptions {
|
|
|
52
52
|
iconName?: string;
|
|
53
53
|
/** Whether the tab can be closed (default: true for non-shell) */
|
|
54
54
|
closeable?: boolean;
|
|
55
|
-
/** Command to spawn (
|
|
55
|
+
/** Command to spawn (shell type uses the execution environment shell by default) */
|
|
56
56
|
command?: string;
|
|
57
57
|
/** Command arguments */
|
|
58
58
|
args?: string[];
|
package/package.json
CHANGED
|
@@ -1,18 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@design.estate/dees-catalog",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.82.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.",
|
|
6
6
|
"main": "dist_ts_web/index.js",
|
|
7
7
|
"typings": "dist_ts_web/index.d.ts",
|
|
8
8
|
"type": "module",
|
|
9
|
-
"scripts": {
|
|
10
|
-
"test": "tstest test/ --web --verbose --timeout 30 --logfile",
|
|
11
|
-
"build": "tsbuild tsfolders --allowimplicitany && tsbundle",
|
|
12
|
-
"watch": "tswatch",
|
|
13
|
-
"buildDocs": "tsdoc",
|
|
14
|
-
"postinstall": "node scripts/update-monaco-version.cjs"
|
|
15
|
-
},
|
|
16
9
|
"author": "Lossless GmbH",
|
|
17
10
|
"license": "MIT",
|
|
18
11
|
"dependencies": {
|
|
@@ -45,12 +38,12 @@
|
|
|
45
38
|
"xterm-addon-fit": "^0.8.0"
|
|
46
39
|
},
|
|
47
40
|
"devDependencies": {
|
|
48
|
-
"@git.zone/tsbuild": "^4.4.
|
|
49
|
-
"@git.zone/tsbundle": "^2.10.
|
|
50
|
-
"@git.zone/tstest": "^3.6.
|
|
51
|
-
"@git.zone/tswatch": "^3.3.
|
|
41
|
+
"@git.zone/tsbuild": "^4.4.2",
|
|
42
|
+
"@git.zone/tsbundle": "^2.10.4",
|
|
43
|
+
"@git.zone/tstest": "^3.6.6",
|
|
44
|
+
"@git.zone/tswatch": "^3.3.5",
|
|
52
45
|
"@push.rocks/projectinfo": "^5.1.0",
|
|
53
|
-
"@types/node": "^25.
|
|
46
|
+
"@types/node": "^25.9.1"
|
|
54
47
|
},
|
|
55
48
|
"files": [
|
|
56
49
|
"ts/**/*",
|
|
@@ -60,6 +53,7 @@
|
|
|
60
53
|
"dist_ts/**/*",
|
|
61
54
|
"dist_ts_web/**/*",
|
|
62
55
|
"assets/**/*",
|
|
56
|
+
"scripts/**/*",
|
|
63
57
|
"cli.js",
|
|
64
58
|
".smartconfig.json",
|
|
65
59
|
"readme.md"
|
|
@@ -93,5 +87,11 @@
|
|
|
93
87
|
"Modern Web",
|
|
94
88
|
"Frontend Development"
|
|
95
89
|
],
|
|
96
|
-
"
|
|
97
|
-
|
|
90
|
+
"scripts": {
|
|
91
|
+
"test": "tstest test/ --web --verbose --timeout 30 --logfile",
|
|
92
|
+
"build": "tsbuild tsfolders --allowimplicitany && tsbundle",
|
|
93
|
+
"watch": "tswatch",
|
|
94
|
+
"buildDocs": "tsdoc",
|
|
95
|
+
"postinstall": "node scripts/update-monaco-version.cjs"
|
|
96
|
+
}
|
|
97
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
const fs = require('fs');
|
|
3
|
+
const path = require('path');
|
|
4
|
+
|
|
5
|
+
const projectRoot = path.resolve(__dirname, '..');
|
|
6
|
+
|
|
7
|
+
function resolveMonacoPackageJson() {
|
|
8
|
+
try {
|
|
9
|
+
const resolvedPath = require.resolve('monaco-editor/package.json', {
|
|
10
|
+
paths: [projectRoot],
|
|
11
|
+
});
|
|
12
|
+
return resolvedPath;
|
|
13
|
+
} catch (error) {
|
|
14
|
+
console.error('[dees-workspace] Unable to resolve monaco-editor/package.json');
|
|
15
|
+
throw error;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function getMonacoVersion() {
|
|
20
|
+
const monacoPackagePath = resolveMonacoPackageJson();
|
|
21
|
+
const monacoPackage = require(monacoPackagePath);
|
|
22
|
+
if (!monacoPackage.version) {
|
|
23
|
+
throw new Error('[dees-workspace] monaco-editor/package.json does not expose a version field');
|
|
24
|
+
}
|
|
25
|
+
return monacoPackage.version;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function writeVersionModule(version) {
|
|
29
|
+
const targetDir = path.join(projectRoot, 'ts_web', 'elements', '00group-workspace', 'dees-workspace-monaco');
|
|
30
|
+
fs.mkdirSync(targetDir, { recursive: true });
|
|
31
|
+
const targetFile = path.join(targetDir, 'version.ts');
|
|
32
|
+
const fileContent = `// Auto-generated by scripts/update-monaco-version.cjs\nexport const MONACO_VERSION = '${version}';\n`;
|
|
33
|
+
fs.writeFileSync(targetFile, fileContent, 'utf8');
|
|
34
|
+
console.log(`[dees-workspace] Wrote ${path.relative(projectRoot, targetFile)} with monaco-editor@${version}`);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
try {
|
|
38
|
+
const version = getMonacoVersion();
|
|
39
|
+
writeVersionModule(version);
|
|
40
|
+
} catch (error) {
|
|
41
|
+
console.error('[dees-workspace] Failed to update Monaco version module.');
|
|
42
|
+
console.error(error instanceof Error ? error.message : error);
|
|
43
|
+
process.exitCode = 1;
|
|
44
|
+
}
|
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@design.estate/dees-catalog',
|
|
6
|
-
version: '3.
|
|
6
|
+
version: '3.82.0',
|
|
7
7
|
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
|
8
8
|
}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import * as webcontainer from '@tempfix/webcontainer__api';
|
|
2
|
-
import type {
|
|
2
|
+
import type {
|
|
3
|
+
IExecutionEnvironment,
|
|
4
|
+
IFileEntry,
|
|
5
|
+
IFileWatcher,
|
|
6
|
+
IProcessHandle,
|
|
7
|
+
IShellCommand,
|
|
8
|
+
} from '../interfaces/IExecutionEnvironment.js';
|
|
3
9
|
|
|
4
10
|
/**
|
|
5
11
|
* WebContainer-based execution environment.
|
|
@@ -154,6 +160,14 @@ export class WebContainerEnvironment implements IExecutionEnvironment {
|
|
|
154
160
|
};
|
|
155
161
|
}
|
|
156
162
|
|
|
163
|
+
public getShellCommand(): IShellCommand {
|
|
164
|
+
return {
|
|
165
|
+
command: 'jsh',
|
|
166
|
+
label: 'jsh',
|
|
167
|
+
prompt: '~/',
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
|
|
157
171
|
// ============ WebContainer-specific methods ============
|
|
158
172
|
|
|
159
173
|
/**
|
|
@@ -29,6 +29,17 @@ export interface IProcessHandle {
|
|
|
29
29
|
kill(): void;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
export interface IShellCommand {
|
|
33
|
+
/** Executable to start for an interactive shell session. */
|
|
34
|
+
command: string;
|
|
35
|
+
/** Optional command arguments. */
|
|
36
|
+
args?: string[];
|
|
37
|
+
/** Optional display label for terminal tabs. */
|
|
38
|
+
label?: string;
|
|
39
|
+
/** Optional prompt marker used for setup commands. */
|
|
40
|
+
prompt?: string;
|
|
41
|
+
}
|
|
42
|
+
|
|
32
43
|
/**
|
|
33
44
|
* Abstract execution environment interface.
|
|
34
45
|
* Implementations can target WebContainer (browser), Backend API (server), or Mock (testing).
|
|
@@ -93,12 +104,18 @@ export interface IExecutionEnvironment {
|
|
|
93
104
|
|
|
94
105
|
/**
|
|
95
106
|
* Spawn a new process
|
|
96
|
-
* @param command - Command to run (e.g., '
|
|
107
|
+
* @param command - Command to run (e.g., 'node', 'npm')
|
|
97
108
|
* @param args - Optional arguments
|
|
98
109
|
* @returns Process handle with I/O streams
|
|
99
110
|
*/
|
|
100
111
|
spawn(command: string, args?: string[]): Promise<IProcessHandle>;
|
|
101
112
|
|
|
113
|
+
/**
|
|
114
|
+
* Return the environment-native interactive shell command.
|
|
115
|
+
* Implementations should provide this when terminal shells need a specific executable.
|
|
116
|
+
*/
|
|
117
|
+
getShellCommand?(): IShellCommand | Promise<IShellCommand>;
|
|
118
|
+
|
|
102
119
|
// ============ Lifecycle ============
|
|
103
120
|
|
|
104
121
|
/**
|
package/ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.ts
CHANGED
|
@@ -12,7 +12,7 @@ import * as domtools from '@design.estate/dees-domtools';
|
|
|
12
12
|
|
|
13
13
|
import type { Terminal } from 'xterm';
|
|
14
14
|
import { themeDefaultStyles } from '../../00theme.js';
|
|
15
|
-
import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
|
|
15
|
+
import type { IExecutionEnvironment, IShellCommand } from '../../00group-runtime/index.js';
|
|
16
16
|
import { WebContainerEnvironment } from '../../00group-runtime/index.js';
|
|
17
17
|
import '../../00group-utility/dees-icon/dees-icon.js';
|
|
18
18
|
import '../../00group-feedback/dees-actionbar/dees-actionbar.js';
|
|
@@ -660,6 +660,22 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
|
|
660
660
|
}
|
|
661
661
|
}
|
|
662
662
|
|
|
663
|
+
private async getShellCommand(): Promise<IShellCommand> {
|
|
664
|
+
if (this.executionEnvironment && !this.executionEnvironment.ready) {
|
|
665
|
+
await this.executionEnvironment.init();
|
|
666
|
+
}
|
|
667
|
+
|
|
668
|
+
if (this.executionEnvironment?.getShellCommand) {
|
|
669
|
+
return await this.executionEnvironment.getShellCommand();
|
|
670
|
+
}
|
|
671
|
+
|
|
672
|
+
return {
|
|
673
|
+
command: 'jsh',
|
|
674
|
+
label: 'jsh',
|
|
675
|
+
prompt: '~/',
|
|
676
|
+
};
|
|
677
|
+
}
|
|
678
|
+
|
|
663
679
|
private handleProcessExit(tabId: string, exitCode: number): void {
|
|
664
680
|
const tab = this.tabManager.getTab(tabId);
|
|
665
681
|
if (!tab) return;
|
|
@@ -723,10 +739,11 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
|
|
723
739
|
* Create a new shell tab
|
|
724
740
|
*/
|
|
725
741
|
public async createShellTab(label?: string): Promise<string> {
|
|
742
|
+
const shellCommand = await this.getShellCommand();
|
|
726
743
|
const tab = this.tabManager.createTab(
|
|
727
744
|
{
|
|
728
745
|
type: 'shell',
|
|
729
|
-
label: label ||
|
|
746
|
+
label: label || `${shellCommand.label || shellCommand.command} ${this.tabManager.getTabCount() + 1}`,
|
|
730
747
|
closeable: this.tabManager.getTabCount() > 0, // First tab not closeable
|
|
731
748
|
},
|
|
732
749
|
this.isBright
|
|
@@ -739,11 +756,11 @@ export class DeesWorkspaceTerminal extends DeesElement {
|
|
|
739
756
|
|
|
740
757
|
// Wait for DOM update then spawn shell
|
|
741
758
|
await this.updateComplete;
|
|
742
|
-
await this.spawnProcessForTab(tab,
|
|
759
|
+
await this.spawnProcessForTab(tab, shellCommand.command, shellCommand.args || []);
|
|
743
760
|
|
|
744
761
|
// Run setup command if this is the first tab
|
|
745
762
|
if (this.tabManager.getTabCount() === 1 && this.setupCommand) {
|
|
746
|
-
await this.waitForPrompt(tab.terminal, '~/');
|
|
763
|
+
await this.waitForPrompt(tab.terminal, shellCommand.prompt || '~/');
|
|
747
764
|
if (tab.inputWriter) {
|
|
748
765
|
tab.inputWriter.write(this.setupCommand);
|
|
749
766
|
}
|
|
@@ -6,7 +6,7 @@ import type { IProcessHandle } from '../../00group-runtime/index.js';
|
|
|
6
6
|
* Type of terminal tab based on its source/purpose
|
|
7
7
|
*/
|
|
8
8
|
export type TTerminalTabType =
|
|
9
|
-
| 'shell' //
|
|
9
|
+
| 'shell' // Environment-native interactive shell
|
|
10
10
|
| 'script' // Script from package.json
|
|
11
11
|
| 'package-update' // Package update process
|
|
12
12
|
| 'custom'; // External process from API
|
|
@@ -75,7 +75,7 @@ export interface ICreateTerminalTabOptions {
|
|
|
75
75
|
/** Whether the tab can be closed (default: true for non-shell) */
|
|
76
76
|
closeable?: boolean;
|
|
77
77
|
|
|
78
|
-
/** Command to spawn (
|
|
78
|
+
/** Command to spawn (shell type uses the execution environment shell by default) */
|
|
79
79
|
command?: string;
|
|
80
80
|
|
|
81
81
|
/** Command arguments */
|