@design.estate/wcctools 6.1.0 → 6.2.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/changelog.md +20 -0
- package/dist_shell/bundle.js +405 -368
- package/dist_shell/bundle.js.map +1 -1
- package/dist_shell/bundle.js.third-party-notices.json +52 -0
- package/dist_shell/bundle.js.third-party-notices.txt +107 -1
- package/dist_shell/index.html +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.bundlestatus.d.ts +36 -0
- package/dist_ts/classes.bundlestatus.js +110 -0
- package/dist_ts/classes.devapi.d.ts +3 -0
- package/dist_ts/classes.devapi.js +8 -1
- package/dist_ts/classes.devserver.d.ts +45 -10
- package/dist_ts/classes.devserver.js +123 -49
- package/dist_ts/cli.js +5 -2
- package/dist_ts/index.d.ts +0 -2
- package/dist_ts/index.js +1 -3
- package/dist_ts_interfaces/requests.d.ts +35 -0
- package/dist_ts_shell/bundlestatus.d.ts +15 -0
- package/dist_ts_shell/bundlestatus.js +64 -0
- package/dist_ts_shell/elements/wcc-contextmenu.d.ts +3 -0
- package/dist_ts_shell/elements/wcc-contextmenu.js +18 -3
- package/dist_ts_shell/elements/wcc-preview-frame.d.ts +6 -0
- package/dist_ts_shell/elements/wcc-preview-frame.js +50 -2
- package/dist_ts_shell/elements/wcc-shell.d.ts +15 -0
- package/dist_ts_shell/elements/wcc-shell.js +45 -3
- package/dist_ts_shell/plugins.d.ts +2 -1
- package/dist_ts_shell/plugins.js +3 -2
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +5 -2
- package/readme.md +6 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.bundlestatus.ts +123 -0
- package/ts/classes.devapi.ts +9 -0
- package/ts/classes.devserver.ts +127 -47
- package/ts/cli.ts +4 -1
- package/ts/index.ts +0 -2
- package/ts_interfaces/bridge.ts +95 -0
- package/ts_interfaces/catalog.ts +37 -0
- package/ts_interfaces/index.ts +4 -0
- package/ts_interfaces/plugins.ts +3 -0
- package/ts_interfaces/requests.ts +65 -0
- package/ts_interfaces/standard.ts +103 -0
- package/ts_shared/index.ts +1 -0
- package/ts_shared/plugins.ts +3 -0
- package/ts_shared/previewroute.ts +58 -0
- package/ts_shell/bundlestatus.ts +68 -0
- package/ts_shell/elements/wcc-contextmenu.ts +306 -0
- package/ts_shell/elements/wcc-preview-frame.ts +167 -0
- package/ts_shell/elements/wcc-properties.ts +998 -0
- package/ts_shell/elements/wcc-record-button.ts +108 -0
- package/ts_shell/elements/wcc-recording-panel.ts +1005 -0
- package/ts_shell/elements/wcc-shell.ts +485 -0
- package/ts_shell/elements/wcc-sidebar.ts +1419 -0
- package/ts_shell/index.html +21 -0
- package/ts_shell/index.ts +4 -0
- package/ts_shell/plugins.ts +12 -0
- package/ts_shell/previewconnection.ts +103 -0
- package/ts_shell/services/recorder.service.ts +451 -0
- package/ts_shell/types/dom-mediacapture-stub/index.d.ts +12 -0
- package/ts_shell/types/dom-mediacapture-stub/package.json +6 -0
- package/ts_shell/types/dom-webcodecs-stub/index.d.ts +2 -0
- package/ts_shell/types/dom-webcodecs-stub/package.json +6 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -75,6 +75,9 @@ let WccPreviewFrame = (() => {
|
|
|
75
75
|
let _isResizing_decorators;
|
|
76
76
|
let _isResizing_initializers = [];
|
|
77
77
|
let _isResizing_extraInitializers = [];
|
|
78
|
+
let _bundleFailures_decorators;
|
|
79
|
+
let _bundleFailures_initializers = [];
|
|
80
|
+
let _bundleFailures_extraInitializers = [];
|
|
78
81
|
var WccPreviewFrame = class extends _classSuper {
|
|
79
82
|
static { _classThis = this; }
|
|
80
83
|
static {
|
|
@@ -85,12 +88,14 @@ let WccPreviewFrame = (() => {
|
|
|
85
88
|
_isNative_decorators = [property({ type: Boolean })];
|
|
86
89
|
_sidebarWidth_decorators = [property({ type: Number })];
|
|
87
90
|
_isResizing_decorators = [property({ type: Boolean })];
|
|
91
|
+
_bundleFailures_decorators = [property({ attribute: false })];
|
|
88
92
|
__esDecorate(this, null, _viewport_decorators, { kind: "accessor", name: "viewport", static: false, private: false, access: { has: obj => "viewport" in obj, get: obj => obj.viewport, set: (obj, value) => { obj.viewport = value; } }, metadata: _metadata }, _viewport_initializers, _viewport_extraInitializers);
|
|
89
93
|
__esDecorate(this, null, _previewSrc_decorators, { kind: "accessor", name: "previewSrc", static: false, private: false, access: { has: obj => "previewSrc" in obj, get: obj => obj.previewSrc, set: (obj, value) => { obj.previewSrc = value; } }, metadata: _metadata }, _previewSrc_initializers, _previewSrc_extraInitializers);
|
|
90
94
|
__esDecorate(this, null, _advancedEditorOpen_decorators, { kind: "accessor", name: "advancedEditorOpen", static: false, private: false, access: { has: obj => "advancedEditorOpen" in obj, get: obj => obj.advancedEditorOpen, set: (obj, value) => { obj.advancedEditorOpen = value; } }, metadata: _metadata }, _advancedEditorOpen_initializers, _advancedEditorOpen_extraInitializers);
|
|
91
95
|
__esDecorate(this, null, _isNative_decorators, { kind: "accessor", name: "isNative", static: false, private: false, access: { has: obj => "isNative" in obj, get: obj => obj.isNative, set: (obj, value) => { obj.isNative = value; } }, metadata: _metadata }, _isNative_initializers, _isNative_extraInitializers);
|
|
92
96
|
__esDecorate(this, null, _sidebarWidth_decorators, { kind: "accessor", name: "sidebarWidth", static: false, private: false, access: { has: obj => "sidebarWidth" in obj, get: obj => obj.sidebarWidth, set: (obj, value) => { obj.sidebarWidth = value; } }, metadata: _metadata }, _sidebarWidth_initializers, _sidebarWidth_extraInitializers);
|
|
93
97
|
__esDecorate(this, null, _isResizing_decorators, { kind: "accessor", name: "isResizing", static: false, private: false, access: { has: obj => "isResizing" in obj, get: obj => obj.isResizing, set: (obj, value) => { obj.isResizing = value; } }, metadata: _metadata }, _isResizing_initializers, _isResizing_extraInitializers);
|
|
98
|
+
__esDecorate(this, null, _bundleFailures_decorators, { kind: "accessor", name: "bundleFailures", static: false, private: false, access: { has: obj => "bundleFailures" in obj, get: obj => obj.bundleFailures, set: (obj, value) => { obj.bundleFailures = value; } }, metadata: _metadata }, _bundleFailures_initializers, _bundleFailures_extraInitializers);
|
|
94
99
|
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
95
100
|
WccPreviewFrame = _classThis = _classDescriptor.value;
|
|
96
101
|
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
@@ -114,6 +119,13 @@ let WccPreviewFrame = (() => {
|
|
|
114
119
|
#isResizing_accessor_storage = (__runInitializers(this, _sidebarWidth_extraInitializers), __runInitializers(this, _isResizing_initializers, false));
|
|
115
120
|
get isResizing() { return this.#isResizing_accessor_storage; }
|
|
116
121
|
set isResizing(value) { this.#isResizing_accessor_storage = value; }
|
|
122
|
+
#bundleFailures_accessor_storage = (__runInitializers(this, _isResizing_extraInitializers), __runInitializers(this, _bundleFailures_initializers, []));
|
|
123
|
+
/**
|
|
124
|
+
* Catalog bundles whose latest run failed: shown over the preview, which shows an outdated
|
|
125
|
+
* bundle or none, until a run finishes and the preview reloads.
|
|
126
|
+
*/
|
|
127
|
+
get bundleFailures() { return this.#bundleFailures_accessor_storage; }
|
|
128
|
+
set bundleFailures(value) { this.#bundleFailures_accessor_storage = value; }
|
|
117
129
|
static styles = [
|
|
118
130
|
css `
|
|
119
131
|
:host {
|
|
@@ -135,6 +147,34 @@ let WccPreviewFrame = (() => {
|
|
|
135
147
|
border: 0;
|
|
136
148
|
background: transparent;
|
|
137
149
|
}
|
|
150
|
+
|
|
151
|
+
.bundle-failure {
|
|
152
|
+
position: absolute;
|
|
153
|
+
inset: 0;
|
|
154
|
+
box-sizing: border-box;
|
|
155
|
+
overflow: auto;
|
|
156
|
+
padding: 24px;
|
|
157
|
+
background: rgba(20, 0, 0, 0.92);
|
|
158
|
+
color: #ffd7d7;
|
|
159
|
+
font-family: 'Geist Sans', 'Inter', sans-serif;
|
|
160
|
+
font-size: 14px;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
.bundle-failure h2 {
|
|
164
|
+
margin: 0 0 8px;
|
|
165
|
+
font-size: 16px;
|
|
166
|
+
font-weight: 600;
|
|
167
|
+
color: #ff8a8a;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
.bundle-failure pre {
|
|
171
|
+
margin: 0 0 24px;
|
|
172
|
+
white-space: pre-wrap;
|
|
173
|
+
overflow-wrap: anywhere;
|
|
174
|
+
font-family: 'Geist Mono', 'Intel One Mono', monospace;
|
|
175
|
+
font-size: 13px;
|
|
176
|
+
line-height: 1.5;
|
|
177
|
+
}
|
|
138
178
|
`,
|
|
139
179
|
];
|
|
140
180
|
get iframe() {
|
|
@@ -181,11 +221,19 @@ let WccPreviewFrame = (() => {
|
|
|
181
221
|
${this.previewSrc ? html `
|
|
182
222
|
<iframe class="preview" title="Preview" src=${this.previewSrc}></iframe>
|
|
183
223
|
` : null}
|
|
224
|
+
${this.bundleFailures.length > 0 ? html `
|
|
225
|
+
<div class="bundle-failure" role="alert">
|
|
226
|
+
${this.bundleFailures.map((bundleArg) => html `
|
|
227
|
+
<h2>bundle failed: ${bundleArg.name}</h2>
|
|
228
|
+
<pre>${bundleArg.errorMessage}</pre>
|
|
229
|
+
`)}
|
|
230
|
+
</div>
|
|
231
|
+
` : null}
|
|
184
232
|
`;
|
|
185
233
|
}
|
|
186
234
|
constructor() {
|
|
187
235
|
super(...arguments);
|
|
188
|
-
__runInitializers(this,
|
|
236
|
+
__runInitializers(this, _bundleFailures_extraInitializers);
|
|
189
237
|
}
|
|
190
238
|
static {
|
|
191
239
|
__runInitializers(_classThis, _classExtraInitializers);
|
|
@@ -194,4 +242,4 @@ let WccPreviewFrame = (() => {
|
|
|
194
242
|
return WccPreviewFrame = _classThis;
|
|
195
243
|
})();
|
|
196
244
|
export { WccPreviewFrame };
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
245
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2NjLXByZXZpZXctZnJhbWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90c19zaGVsbC9lbGVtZW50cy93Y2MtcHJldmlldy1mcmFtZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBdUIsR0FBRyxFQUFFLFVBQVUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRS9ILE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBVXpDLHlGQUF5RjtBQUN6RixNQUFNLGdCQUFnQixHQUFHLENBQUMsV0FBeUIsRUFBVSxFQUFFO0lBQzdELFFBQVEsV0FBVyxFQUFFLENBQUM7UUFDcEIsS0FBSyxRQUFRO1lBQ1gsT0FBTyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLE1BQU0sSUFBSSxDQUFDO1FBQ3hELEtBQUssU0FBUztZQUNaLE9BQU8sR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxPQUFPLElBQUksQ0FBQztRQUN6RCxLQUFLLE9BQU87WUFDVixPQUFPLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsS0FBSyxJQUFJLENBQUM7UUFDdkQ7WUFDRSxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUY7OztHQUdHO0lBRVUsZUFBZTs0QkFEM0IsYUFBYSxDQUFDLG1CQUFtQixDQUFDOzs7O3NCQUNFLFdBQVc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7K0JBQW5CLFNBQVEsV0FBVzs7OztvQ0FDN0MsUUFBUSxFQUFFO3NDQUlWLFFBQVEsRUFBRTs4Q0FHVixRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7b0NBRzNCLFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FB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
|
|
@@ -26,6 +26,12 @@ declare global {
|
|
|
26
26
|
export declare class WccShell extends DeesElement {
|
|
27
27
|
/** The path the server serves the preview document on. */
|
|
28
28
|
accessor previewPath: string;
|
|
29
|
+
/**
|
|
30
|
+
* The dev server's typed API. With it, the shell follows the bundle status and shows a failed
|
|
31
|
+
* catalog bundle over the preview; without it (the shell outside `wcctools dev`), it does not.
|
|
32
|
+
* Read when the shell connects.
|
|
33
|
+
*/
|
|
34
|
+
accessor apiPath: string;
|
|
29
35
|
accessor selection: plugins.interfaces.IWccSelection | null;
|
|
30
36
|
accessor selectedViewport: TWccViewport;
|
|
31
37
|
accessor selectedTheme: plugins.interfaces.TWccTheme;
|
|
@@ -42,6 +48,8 @@ export declare class WccShell extends DeesElement {
|
|
|
42
48
|
accessor advancedEditorOpen: boolean;
|
|
43
49
|
accessor isResizing: boolean;
|
|
44
50
|
accessor captureTarget: HTMLElement | null;
|
|
51
|
+
/** The catalog bundles whose latest completed run failed, as the dev server reports them. */
|
|
52
|
+
accessor bundleFailures: plugins.interfaces.IWccBundleStatus[];
|
|
45
53
|
get isNative(): boolean;
|
|
46
54
|
private frameScrollY;
|
|
47
55
|
private sidebarScrollY;
|
|
@@ -49,6 +57,7 @@ export declare class WccShell extends DeesElement {
|
|
|
49
57
|
/** The selection the preview shows, as far as the shell asked it to. */
|
|
50
58
|
private previewSelectionKey;
|
|
51
59
|
private connection;
|
|
60
|
+
private bundleStatusClient;
|
|
52
61
|
private routeDisposers;
|
|
53
62
|
private scrollDisposers;
|
|
54
63
|
private scrollUpdateTimeout;
|
|
@@ -57,6 +66,12 @@ export declare class WccShell extends DeesElement {
|
|
|
57
66
|
private handleDocumentKeydown;
|
|
58
67
|
connectedCallback(): Promise<void>;
|
|
59
68
|
disconnectedCallback(): Promise<void>;
|
|
69
|
+
private startBundleStatus;
|
|
70
|
+
/**
|
|
71
|
+
* Apply the dev server's bundle status: a bundle whose latest completed run failed is shown
|
|
72
|
+
* over the preview until a run of it finishes, which also reloads the preview.
|
|
73
|
+
*/
|
|
74
|
+
applyBundleStatus(snapshotArg: plugins.interfaces.IWccBundleStatusSnapshot): void;
|
|
60
75
|
firstUpdated(): Promise<void>;
|
|
61
76
|
private connectRoutes;
|
|
62
77
|
/**
|
|
@@ -35,6 +35,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
|
|
|
35
35
|
import { DeesElement, property, state, html, customElement } from '@design.estate/dees-element';
|
|
36
36
|
import * as plugins from '../plugins.js';
|
|
37
37
|
import { WccPreviewConnection } from '../previewconnection.js';
|
|
38
|
+
import { WccBundleStatusClient } from '../bundlestatus.js';
|
|
38
39
|
import './wcc-preview-frame.js';
|
|
39
40
|
import './wcc-sidebar.js';
|
|
40
41
|
import './wcc-properties.js';
|
|
@@ -56,6 +57,9 @@ let WccShell = (() => {
|
|
|
56
57
|
let _previewPath_decorators;
|
|
57
58
|
let _previewPath_initializers = [];
|
|
58
59
|
let _previewPath_extraInitializers = [];
|
|
60
|
+
let _apiPath_decorators;
|
|
61
|
+
let _apiPath_initializers = [];
|
|
62
|
+
let _apiPath_extraInitializers = [];
|
|
59
63
|
let _selection_decorators;
|
|
60
64
|
let _selection_initializers = [];
|
|
61
65
|
let _selection_extraInitializers = [];
|
|
@@ -95,11 +99,15 @@ let WccShell = (() => {
|
|
|
95
99
|
let _captureTarget_decorators;
|
|
96
100
|
let _captureTarget_initializers = [];
|
|
97
101
|
let _captureTarget_extraInitializers = [];
|
|
102
|
+
let _bundleFailures_decorators;
|
|
103
|
+
let _bundleFailures_initializers = [];
|
|
104
|
+
let _bundleFailures_extraInitializers = [];
|
|
98
105
|
var WccShell = class extends _classSuper {
|
|
99
106
|
static { _classThis = this; }
|
|
100
107
|
static {
|
|
101
108
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
102
109
|
_previewPath_decorators = [property({ attribute: 'preview-path' })];
|
|
110
|
+
_apiPath_decorators = [property({ attribute: 'api-path' })];
|
|
103
111
|
_selection_decorators = [property({ attribute: false })];
|
|
104
112
|
_selectedViewport_decorators = [property()];
|
|
105
113
|
_selectedTheme_decorators = [property()];
|
|
@@ -113,7 +121,9 @@ let WccShell = (() => {
|
|
|
113
121
|
_advancedEditorOpen_decorators = [state()];
|
|
114
122
|
_isResizing_decorators = [state()];
|
|
115
123
|
_captureTarget_decorators = [state()];
|
|
124
|
+
_bundleFailures_decorators = [state()];
|
|
116
125
|
__esDecorate(this, null, _previewPath_decorators, { kind: "accessor", name: "previewPath", static: false, private: false, access: { has: obj => "previewPath" in obj, get: obj => obj.previewPath, set: (obj, value) => { obj.previewPath = value; } }, metadata: _metadata }, _previewPath_initializers, _previewPath_extraInitializers);
|
|
126
|
+
__esDecorate(this, null, _apiPath_decorators, { kind: "accessor", name: "apiPath", static: false, private: false, access: { has: obj => "apiPath" in obj, get: obj => obj.apiPath, set: (obj, value) => { obj.apiPath = value; } }, metadata: _metadata }, _apiPath_initializers, _apiPath_extraInitializers);
|
|
117
127
|
__esDecorate(this, null, _selection_decorators, { kind: "accessor", name: "selection", static: false, private: false, access: { has: obj => "selection" in obj, get: obj => obj.selection, set: (obj, value) => { obj.selection = value; } }, metadata: _metadata }, _selection_initializers, _selection_extraInitializers);
|
|
118
128
|
__esDecorate(this, null, _selectedViewport_decorators, { kind: "accessor", name: "selectedViewport", static: false, private: false, access: { has: obj => "selectedViewport" in obj, get: obj => obj.selectedViewport, set: (obj, value) => { obj.selectedViewport = value; } }, metadata: _metadata }, _selectedViewport_initializers, _selectedViewport_extraInitializers);
|
|
119
129
|
__esDecorate(this, null, _selectedTheme_decorators, { kind: "accessor", name: "selectedTheme", static: false, private: false, access: { has: obj => "selectedTheme" in obj, get: obj => obj.selectedTheme, set: (obj, value) => { obj.selectedTheme = value; } }, metadata: _metadata }, _selectedTheme_initializers, _selectedTheme_extraInitializers);
|
|
@@ -127,6 +137,7 @@ let WccShell = (() => {
|
|
|
127
137
|
__esDecorate(this, null, _advancedEditorOpen_decorators, { kind: "accessor", name: "advancedEditorOpen", static: false, private: false, access: { has: obj => "advancedEditorOpen" in obj, get: obj => obj.advancedEditorOpen, set: (obj, value) => { obj.advancedEditorOpen = value; } }, metadata: _metadata }, _advancedEditorOpen_initializers, _advancedEditorOpen_extraInitializers);
|
|
128
138
|
__esDecorate(this, null, _isResizing_decorators, { kind: "accessor", name: "isResizing", static: false, private: false, access: { has: obj => "isResizing" in obj, get: obj => obj.isResizing, set: (obj, value) => { obj.isResizing = value; } }, metadata: _metadata }, _isResizing_initializers, _isResizing_extraInitializers);
|
|
129
139
|
__esDecorate(this, null, _captureTarget_decorators, { kind: "accessor", name: "captureTarget", static: false, private: false, access: { has: obj => "captureTarget" in obj, get: obj => obj.captureTarget, set: (obj, value) => { obj.captureTarget = value; } }, metadata: _metadata }, _captureTarget_initializers, _captureTarget_extraInitializers);
|
|
140
|
+
__esDecorate(this, null, _bundleFailures_decorators, { kind: "accessor", name: "bundleFailures", static: false, private: false, access: { has: obj => "bundleFailures" in obj, get: obj => obj.bundleFailures, set: (obj, value) => { obj.bundleFailures = value; } }, metadata: _metadata }, _bundleFailures_initializers, _bundleFailures_extraInitializers);
|
|
130
141
|
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
131
142
|
WccShell = _classThis = _classDescriptor.value;
|
|
132
143
|
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
@@ -136,7 +147,15 @@ let WccShell = (() => {
|
|
|
136
147
|
/** The path the server serves the preview document on. */
|
|
137
148
|
get previewPath() { return this.#previewPath_accessor_storage; }
|
|
138
149
|
set previewPath(value) { this.#previewPath_accessor_storage = value; }
|
|
139
|
-
#
|
|
150
|
+
#apiPath_accessor_storage = (__runInitializers(this, _previewPath_extraInitializers), __runInitializers(this, _apiPath_initializers, ''));
|
|
151
|
+
/**
|
|
152
|
+
* The dev server's typed API. With it, the shell follows the bundle status and shows a failed
|
|
153
|
+
* catalog bundle over the preview; without it (the shell outside `wcctools dev`), it does not.
|
|
154
|
+
* Read when the shell connects.
|
|
155
|
+
*/
|
|
156
|
+
get apiPath() { return this.#apiPath_accessor_storage; }
|
|
157
|
+
set apiPath(value) { this.#apiPath_accessor_storage = value; }
|
|
158
|
+
#selection_accessor_storage = (__runInitializers(this, _apiPath_extraInitializers), __runInitializers(this, _selection_initializers, null));
|
|
140
159
|
get selection() { return this.#selection_accessor_storage; }
|
|
141
160
|
set selection(value) { this.#selection_accessor_storage = value; }
|
|
142
161
|
#selectedViewport_accessor_storage = (__runInitializers(this, _selection_extraInitializers), __runInitializers(this, _selectedViewport_initializers, 'desktop'));
|
|
@@ -179,10 +198,14 @@ let WccShell = (() => {
|
|
|
179
198
|
#captureTarget_accessor_storage = (__runInitializers(this, _isResizing_extraInitializers), __runInitializers(this, _captureTarget_initializers, null));
|
|
180
199
|
get captureTarget() { return this.#captureTarget_accessor_storage; }
|
|
181
200
|
set captureTarget(value) { this.#captureTarget_accessor_storage = value; }
|
|
201
|
+
#bundleFailures_accessor_storage = (__runInitializers(this, _captureTarget_extraInitializers), __runInitializers(this, _bundleFailures_initializers, []));
|
|
202
|
+
/** The catalog bundles whose latest completed run failed, as the dev server reports them. */
|
|
203
|
+
get bundleFailures() { return this.#bundleFailures_accessor_storage; }
|
|
204
|
+
set bundleFailures(value) { this.#bundleFailures_accessor_storage = value; }
|
|
182
205
|
get isNative() {
|
|
183
206
|
return this.selectedViewport === 'native';
|
|
184
207
|
}
|
|
185
|
-
frameScrollY = (__runInitializers(this,
|
|
208
|
+
frameScrollY = (__runInitializers(this, _bundleFailures_extraInitializers), 0);
|
|
186
209
|
sidebarScrollY = 0;
|
|
187
210
|
scrollPositionsRestored = false;
|
|
188
211
|
/** The selection the preview shows, as far as the shell asked it to. */
|
|
@@ -202,6 +225,7 @@ let WccShell = (() => {
|
|
|
202
225
|
this.debouncedScrollUpdate();
|
|
203
226
|
},
|
|
204
227
|
});
|
|
228
|
+
bundleStatusClient = null;
|
|
205
229
|
routeDisposers = [];
|
|
206
230
|
scrollDisposers = [];
|
|
207
231
|
scrollUpdateTimeout;
|
|
@@ -281,6 +305,7 @@ let WccShell = (() => {
|
|
|
281
305
|
.sidebarWidth=${this.sidebarWidth}
|
|
282
306
|
.advancedEditorOpen=${this.advancedEditorOpen}
|
|
283
307
|
.isResizing=${this.isResizing}
|
|
308
|
+
.bundleFailures=${this.bundleFailures}
|
|
284
309
|
></wcc-preview-frame>
|
|
285
310
|
`;
|
|
286
311
|
}
|
|
@@ -299,6 +324,7 @@ let WccShell = (() => {
|
|
|
299
324
|
const connected = super.connectedCallback();
|
|
300
325
|
document.addEventListener('keydown', this.handleDocumentKeydown);
|
|
301
326
|
this.connection.start();
|
|
327
|
+
this.startBundleStatus();
|
|
302
328
|
if (this.hasUpdated) {
|
|
303
329
|
await this.setupSidebarScrollListener();
|
|
304
330
|
}
|
|
@@ -309,6 +335,8 @@ let WccShell = (() => {
|
|
|
309
335
|
const disconnected = super.disconnectedCallback();
|
|
310
336
|
document.removeEventListener('keydown', this.handleDocumentKeydown);
|
|
311
337
|
this.connection.dispose();
|
|
338
|
+
this.bundleStatusClient?.dispose();
|
|
339
|
+
this.bundleStatusClient = null;
|
|
312
340
|
this.bridge = null;
|
|
313
341
|
for (const dispose of this.routeDisposers) {
|
|
314
342
|
dispose();
|
|
@@ -318,6 +346,20 @@ let WccShell = (() => {
|
|
|
318
346
|
clearTimeout(this.scrollUpdateTimeout);
|
|
319
347
|
return disconnected;
|
|
320
348
|
}
|
|
349
|
+
startBundleStatus() {
|
|
350
|
+
if (!this.apiPath || this.bundleStatusClient) {
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
353
|
+
this.bundleStatusClient = new WccBundleStatusClient(this.apiPath, (snapshotArg) => this.applyBundleStatus(snapshotArg));
|
|
354
|
+
this.bundleStatusClient.start();
|
|
355
|
+
}
|
|
356
|
+
/**
|
|
357
|
+
* Apply the dev server's bundle status: a bundle whose latest completed run failed is shown
|
|
358
|
+
* over the preview until a run of it finishes, which also reloads the preview.
|
|
359
|
+
*/
|
|
360
|
+
applyBundleStatus(snapshotArg) {
|
|
361
|
+
this.bundleFailures = snapshotArg.bundles.filter((bundleArg) => bundleArg.errorMessage !== undefined);
|
|
362
|
+
}
|
|
321
363
|
async firstUpdated() {
|
|
322
364
|
await this.setupSidebarScrollListener();
|
|
323
365
|
}
|
|
@@ -521,4 +563,4 @@ let WccShell = (() => {
|
|
|
521
563
|
return WccShell = _classThis;
|
|
522
564
|
})();
|
|
523
565
|
export { WccShell };
|
|
524
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"wcc-shell.js","sourceRoot":"","sources":["../../../ts_shell/elements/wcc-shell.ts"],"names":[],"mappings":"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"}
|
|
566
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"wcc-shell.js","sourceRoot":"","sources":["../../../ts_shell/elements/wcc-shell.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import * as typedrequest from '@api.global/typedrequest';
|
|
1
2
|
import * as deesDomtools from '@design.estate/dees-domtools';
|
|
2
3
|
import * as interfaces from '../dist_ts_interfaces/index.js';
|
|
3
4
|
import * as shared from '../dist_ts_shared/index.js';
|
|
4
|
-
export { deesDomtools, interfaces, shared, };
|
|
5
|
+
export { typedrequest, deesDomtools, interfaces, shared, };
|
package/dist_ts_shell/plugins.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import * as typedrequest from '@api.global/typedrequest';
|
|
1
2
|
import * as deesDomtools from '@design.estate/dees-domtools';
|
|
2
3
|
import * as interfaces from '../dist_ts_interfaces/index.js';
|
|
3
4
|
import * as shared from '../dist_ts_shared/index.js';
|
|
4
|
-
export { deesDomtools, interfaces, shared, };
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
export { typedrequest, deesDomtools, interfaces, shared, };
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3NoZWxsL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssWUFBWSxNQUFNLDhCQUE4QixDQUFDO0FBRTdELE9BQU8sS0FBSyxVQUFVLE1BQU0sMkJBQTJCLENBQUM7QUFDeEQsT0FBTyxLQUFLLE1BQU0sTUFBTSx1QkFBdUIsQ0FBQztBQUVoRCxPQUFPLEVBQ0wsWUFBWSxFQUNaLFlBQVksRUFDWixVQUFVLEVBQ1YsTUFBTSxHQUNQLENBQUMifQ==
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@design.estate/wcctools',
|
|
6
|
-
version: '6.
|
|
6
|
+
version: '6.2.0',
|
|
7
7
|
description: 'A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUseUJBQXlCO0lBQy9CLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSxtSkFBbUo7Q0FDakssQ0FBQSJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@design.estate/wcctools",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.",
|
|
6
6
|
"bin": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"@api.global/typedserver": "^14.2.1",
|
|
20
20
|
"@design.estate/dees-domtools": "^5.0.0",
|
|
21
21
|
"@design.estate/dees-element": "^4.0.0",
|
|
22
|
-
"@git.zone/tswatch": "^
|
|
22
|
+
"@git.zone/tswatch": "^7.0.0",
|
|
23
23
|
"@push.rocks/smartconfig": "^6.3.0",
|
|
24
24
|
"@push.rocks/smartconsole": "^2.1.0",
|
|
25
25
|
"@push.rocks/smartexit": "^2.2.0",
|
|
@@ -38,6 +38,9 @@
|
|
|
38
38
|
},
|
|
39
39
|
"files": [
|
|
40
40
|
"ts/**/*",
|
|
41
|
+
"ts_interfaces/**/*",
|
|
42
|
+
"ts_shared/**/*",
|
|
43
|
+
"ts_shell/**/*",
|
|
41
44
|
"ts_web/**/*",
|
|
42
45
|
"dist/**/*",
|
|
43
46
|
"dist_*/**/*",
|
package/readme.md
CHANGED
|
@@ -165,7 +165,7 @@ pnpm exec wcctools dev # port from the tswatch configuration, else 30
|
|
|
165
165
|
pnpm exec wcctools dev --port 0 # any free port
|
|
166
166
|
```
|
|
167
167
|
|
|
168
|
-
It prints the shell's address, for example `wcctools dev: http://localhost:3002/wcctools/`. Saving a source file rebuilds the bundle and reloads only the preview frame; the shell keeps its state. `Ctrl+C` stops the server and the watchers.
|
|
168
|
+
It prints the shell's address, for example `wcctools dev: http://localhost:3002/wcctools/`. Saving a source file rebuilds the bundle and reloads only the preview frame; the shell keeps its state. When a bundle fails, the shell shows `bundle failed` with the bundler's message over the preview until the next run of that bundle finishes. `Ctrl+C` (or `SIGTERM`) stops the server and the watchers.
|
|
169
169
|
|
|
170
170
|
## 📂 Sections Configuration
|
|
171
171
|
|
|
@@ -498,11 +498,15 @@ Bundles and watches the catalogue as the project's `@git.zone/tswatch` configura
|
|
|
498
498
|
|------|--------|
|
|
499
499
|
| `/` | Redirects to `/wcctools/` |
|
|
500
500
|
| `/wcctools/`, `/wcctools-route/...` | The shell |
|
|
501
|
-
| `/wcctools/typedrequest` | The shell's typed API |
|
|
501
|
+
| `/wcctools/typedrequest` | The shell's typed API: the server info (`getDevServerInfo`) and the bundle status (`getBundleStatus`) |
|
|
502
502
|
| every other path | The catalogue's serve directory (default `dist_watch/`), with live reload for the preview document |
|
|
503
503
|
|
|
504
504
|
`--port` overrides the configured port; `0` picks a free port.
|
|
505
505
|
|
|
506
|
+
The shell follows the bundle status: per bundle the state of its latest run (`started`, `finished` or `failed`), the duration of the latest completed run and, while its latest completed run failed, the bundler's error message. A failed bundle is shown over the preview until a run of it finishes, which also reloads the preview. The typed API is read-only.
|
|
507
|
+
|
|
508
|
+
`wcctools dev` owns the process signals: on `SIGINT` or `SIGTERM` it stops the server and tswatch's bundling and watching once, within tswatch's shutdown deadline (the longest `stopGracePeriod` of the configured watcher commands plus a margin), and exits.
|
|
509
|
+
|
|
506
510
|
Every `wcctools` command exits with code 2 on a usage error (an unknown command or option, a missing or invalid option value) and with 1 on any other failure.
|
|
507
511
|
|
|
508
512
|
### `wcctools check` and `wcctools fix`
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@design.estate/wcctools',
|
|
6
|
-
version: '6.
|
|
6
|
+
version: '6.2.0',
|
|
7
7
|
description: 'A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.'
|
|
8
8
|
}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
|
|
3
|
+
/** The longest time a status request waits for a change before it answers the unchanged status. */
|
|
4
|
+
export const bundleStatusWaitLimitMs = 25_000;
|
|
5
|
+
|
|
6
|
+
/** What a status request answers while the board is closed: the server is not serving. */
|
|
7
|
+
export const bundleStatusClosedMessage = 'wcctools: the dev server is not serving the bundle status.';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* The status of the catalog bundles, as tswatch's bundle events report it, for the shell's
|
|
11
|
+
* `getBundleStatus` requests. Every event raises the revision and answers the requests waiting for
|
|
12
|
+
* a change. While closed (the server is not serving), requests are refused with a typed error, so
|
|
13
|
+
* a client backs off as it does for any failed request.
|
|
14
|
+
*/
|
|
15
|
+
export class WccBundleStatusBoard {
|
|
16
|
+
private readonly bundles = new Map<string, plugins.interfaces.IWccBundleStatus>();
|
|
17
|
+
private revision = 0;
|
|
18
|
+
private isOpen = false;
|
|
19
|
+
/** Settles one waiting request: answers the current snapshot, or refuses; each removes itself. */
|
|
20
|
+
private readonly waiters = new Set<(refusalArg?: Error) => void>();
|
|
21
|
+
|
|
22
|
+
/** Starts a run of the server: the bundles of an earlier run are forgotten. */
|
|
23
|
+
public open() {
|
|
24
|
+
this.bundles.clear();
|
|
25
|
+
this.isOpen = true;
|
|
26
|
+
this.changed();
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** Ends the run: every waiting request is refused now, later ones at once. */
|
|
30
|
+
public close() {
|
|
31
|
+
this.isOpen = false;
|
|
32
|
+
const refusal = this.createClosedError();
|
|
33
|
+
for (const settle of [...this.waiters]) {
|
|
34
|
+
settle(refusal);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** The number of requests waiting for a change. */
|
|
39
|
+
public getWaiterCount(): number {
|
|
40
|
+
return this.waiters.size;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
public record(eventArg: plugins.tswatch.TBundleEvent) {
|
|
44
|
+
const previous = this.bundles.get(eventArg.name);
|
|
45
|
+
const status: plugins.interfaces.IWccBundleStatus = { name: eventArg.name, state: eventArg.type };
|
|
46
|
+
switch (eventArg.type) {
|
|
47
|
+
case 'started':
|
|
48
|
+
// The latest completed run stays reported while the next one runs
|
|
49
|
+
if (previous?.durationMs !== undefined) {
|
|
50
|
+
status.durationMs = previous.durationMs;
|
|
51
|
+
}
|
|
52
|
+
if (previous?.errorMessage !== undefined) {
|
|
53
|
+
status.errorMessage = previous.errorMessage;
|
|
54
|
+
}
|
|
55
|
+
break;
|
|
56
|
+
case 'finished':
|
|
57
|
+
status.durationMs = eventArg.durationMs;
|
|
58
|
+
break;
|
|
59
|
+
case 'failed':
|
|
60
|
+
status.durationMs = eventArg.durationMs;
|
|
61
|
+
status.errorMessage = eventArg.errorMessage;
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
this.bundles.set(eventArg.name, status);
|
|
65
|
+
this.changed();
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
public getSnapshot(): plugins.interfaces.IWccBundleStatusSnapshot {
|
|
69
|
+
return {
|
|
70
|
+
revision: this.revision,
|
|
71
|
+
bundles: [...this.bundles.values()].map((statusArg) => ({ ...statusArg })),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* The snapshot once it differs from `afterRevisionArg`, or after the wait limit; at once without
|
|
77
|
+
* a revision or for a revision that is no longer current. Refused while closed. When
|
|
78
|
+
* `abortSignalArg` aborts (the client went away), the wait ends at once and releases its timer;
|
|
79
|
+
* it answers the current snapshot, which the transport drops.
|
|
80
|
+
*/
|
|
81
|
+
public waitForChange(
|
|
82
|
+
afterRevisionArg: number | undefined,
|
|
83
|
+
abortSignalArg?: AbortSignal,
|
|
84
|
+
): Promise<plugins.interfaces.IWccBundleStatusSnapshot> {
|
|
85
|
+
if (!this.isOpen) {
|
|
86
|
+
return Promise.reject(this.createClosedError());
|
|
87
|
+
}
|
|
88
|
+
if (afterRevisionArg === undefined || afterRevisionArg !== this.revision || abortSignalArg?.aborted) {
|
|
89
|
+
return Promise.resolve(this.getSnapshot());
|
|
90
|
+
}
|
|
91
|
+
return new Promise((resolve, reject) => {
|
|
92
|
+
const settle = (refusalArg?: Error) => {
|
|
93
|
+
clearTimeout(waitLimit);
|
|
94
|
+
abortSignalArg?.removeEventListener('abort', onAbort);
|
|
95
|
+
this.waiters.delete(settle);
|
|
96
|
+
if (refusalArg) {
|
|
97
|
+
reject(refusalArg);
|
|
98
|
+
} else {
|
|
99
|
+
resolve(this.getSnapshot());
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
const onAbort = () => settle();
|
|
103
|
+
const waitLimit = setTimeout(() => settle(), bundleStatusWaitLimitMs);
|
|
104
|
+
abortSignalArg?.addEventListener('abort', onAbort, { once: true });
|
|
105
|
+
this.waiters.add(settle);
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
private changed() {
|
|
110
|
+
this.revision++;
|
|
111
|
+
this.answerWaiters();
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
private answerWaiters() {
|
|
115
|
+
for (const settle of [...this.waiters]) {
|
|
116
|
+
settle();
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
private createClosedError() {
|
|
121
|
+
return new plugins.typedrequest.TypedResponseError(bundleStatusClosedMessage);
|
|
122
|
+
}
|
|
123
|
+
}
|
package/ts/classes.devapi.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { WccBundleStatusBoard } from './classes.bundlestatus.js';
|
|
2
3
|
|
|
3
4
|
/**
|
|
4
5
|
* The typed API the shell reaches on `/wcctools/typedrequest`. Later features register their
|
|
@@ -6,6 +7,8 @@ import * as plugins from './plugins.js';
|
|
|
6
7
|
*/
|
|
7
8
|
export class WccDevApi {
|
|
8
9
|
public readonly typedrouter = new plugins.typedrequest.TypedRouter();
|
|
10
|
+
/** The catalog bundles' status, fed with tswatch's bundle events while the server runs. */
|
|
11
|
+
public readonly bundleStatus = new WccBundleStatusBoard();
|
|
9
12
|
private serverInfo: plugins.interfaces.IWccDevServerInfo | null = null;
|
|
10
13
|
|
|
11
14
|
constructor() {
|
|
@@ -17,6 +20,12 @@ export class WccDevApi {
|
|
|
17
20
|
return { ...this.serverInfo };
|
|
18
21
|
}),
|
|
19
22
|
);
|
|
23
|
+
this.typedrouter.addTypedHandler(
|
|
24
|
+
new plugins.typedrequest.TypedHandler<plugins.interfaces.IReq_GetBundleStatus>('getBundleStatus', async (requestArg, typedToolsArg) => {
|
|
25
|
+
// A client that goes away ends its wait, so no waiter or timer outlives the request
|
|
26
|
+
return this.bundleStatus.waitForChange(requestArg.afterRevision, typedToolsArg?.abortSignal);
|
|
27
|
+
}),
|
|
28
|
+
);
|
|
20
29
|
}
|
|
21
30
|
|
|
22
31
|
public setServerInfo(infoArg: plugins.interfaces.IWccDevServerInfo) {
|