@eclipse-lyra/core 0.7.5 → 0.7.7

package/dist/vite-plugin-resolve-deps.d.ts

@@ -0,0 +1,18 @@
+import { Plugin } from 'vite';
+export interface ResolvedPackageInfo {
+    name: string;
+    version: string;
+    description?: string;
+    dependencies: Record<string, string>;
+    marketplaceCatalogUrls?: string[];
+}
+export declare function resolvePackageInfo(appRoot: string, options?: {
+    includeDevDependencies?: boolean;
+}): ResolvedPackageInfo | null;
+export declare function resolveDepVersions(appRoot: string, options?: {
+    includeDevDependencies?: boolean;
+}): Record<string, string>;
+export declare function resolveDepVersionsPlugin(options?: {
+    includeDevDependencies?: boolean;
+}): Plugin;
+//# sourceMappingURL=vite-plugin-resolve-deps.d.ts.map

package/dist/vite-plugin-resolve-deps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-resolve-deps.d.ts","sourceRoot":"","sources":["../src/vite-plugin-resolve-deps.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;CACnC;AAoDD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,mBAAmB,GAAG,IAAI,CAkB5B;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGxB;AAID,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE;IACjD,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,MAAM,CAcT"}

package/dist/widgets/icon.d.ts

@@ -4,7 +4,7 @@ export declare class LyraIcon extends LyraWidget {
     family?: string;
     variant?: string;
     label?: string;
-    render(): import('lit-html').TemplateResult<1> | "";
+    render(): "" | import('lit-html').TemplateResult<1>;
     static styles: import('lit').CSSResult;
 }
 //# sourceMappingURL=icon.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-lyra/core",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "Eclipse Lyra platform core: registries, services, parts, widgets, and API",
   "type": "module",
   "license": "EPL-2.0",
@@ -51,8 +51,15 @@
     "./core/events": {
       "types": "./dist/core/events.d.ts",
       "import": "./dist/core/events.js"
+    },
+    "./vite-plugin-resolve-deps": {
+      "types": "./src/vite-plugin-resolve-deps.ts",
+      "import": "./src/vite-plugin-resolve-deps.ts"
     }
   },
+  "peerDependencies": {
+    "vite": ">=5"
+  },
   "files": [
     "dist",
     "src"

package/src/api/services.ts

@@ -42,15 +42,11 @@ export {
     toastWarning
 } from '../core/toast';
 export { taskService } from '../core/taskservice';
-export { applyAppHostConfig } from '../core/app-host-config';
-export type { AppHostConfig } from '../core/app-host-config';
 export { publish, subscribe, unsubscribe } from '../core/events';
 export { configureFramework, getFrameworkConfig } from '../core/config';
 export { treeNodeComparator } from '../core/tree-utils';
 export type { TreeContribution, TreeNode } from '../core/tree-utils';
 export { watchSignal } from '../core/signals';
-export { packageInfoService } from '../core/packageinfoservice';
-export type { PackageInfo } from '../core/packageinfoservice';
 export { persistenceService } from '../core/persistenceservice';
 export { esmShService } from '../core/esmsh-service';
 export type { EsmShSource, EsmShOptions } from '../core/esmsh-service';

package/src/api/types.ts

@@ -19,7 +19,7 @@ export type {
     CommandContribution,
     HTMLContribution,
     TabContribution,
-    PaneContribution,
+    LayoutContribution,
     ContributionChangeEvent
 } from '../core/contributionregistry';
 export type {

package/src/commands/global.ts

@@ -123,7 +123,7 @@ registerAll({
                 icon: "puzzle-piece",
                 state: {},
                 noOverflow: true,
-                widgetFactory: () => html`<lyra-extensions></lyra-extensions>`,
+                component: () => html`<lyra-extensions></lyra-extensions>`,
             }
             editorRegistry.loadEditor(editorInput, "extensions-editor").then()
         }

package/src/commands/version-info.ts

@@ -1,10 +1,9 @@
 import { registerAll } from "../core/commandregistry";
-import { html, render } from "lit";
+import { html, render, type TemplateResult } from "lit";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { marked } from "marked";
 import { toastError } from "../core/toast";
 import { appLoaderService, type ReleaseEntry } from "../core/apploader";
-import { packageInfoService } from "../core/packageinfoservice";
 
 registerAll({
     command: {
@@ -21,8 +20,22 @@ registerAll({
                 return;
             }
 
-            const hasPackages = packageInfoService.hasPackages();
-            const packagesTree = packageInfoService.renderTree();
+            const deps = app.dependencies ?? {};
+            const hasPackages = Object.keys(deps).length > 0;
+            const packagesTree: TemplateResult = hasPackages
+                ? html`
+                    <wa-tree style="--indent-guide-width: 1px;">
+                        <wa-tree-item expanded>
+                            <span>${app.name ?? ''}</span>
+                            ${Object.entries(deps).map(([name, version]) => html`
+                                <wa-tree-item>
+                                    <span>${name} <small>${version}</small></span>
+                                </wa-tree-item>
+                            `)}
+                        </wa-tree-item>
+                    </wa-tree>
+                `
+                : html``;
 
             let dialogContainer: HTMLElement | null = null;
             const getDialogContainer = (): HTMLElement => {
@@ -61,8 +74,9 @@ registerAll({
                 }
             }
 
-            const isDev = app.version === '0.0.0';
-            const currentIndex = releases.length > 0 ? releases.findIndex(r => r.tag_name === app.version) : -1;
+            const appVersion = app.version ?? '0.0.0';
+            const isDev = appVersion === '0.0.0';
+            const currentIndex = releases.length > 0 ? releases.findIndex(r => r.tag_name === appVersion) : -1;
             const startIndex = currentIndex >= 0 ? currentIndex : 0;
             let currentReleaseIndex = startIndex;
 
@@ -72,7 +86,7 @@ registerAll({
                 }
 
                 const release = releases[index];
-                const isCurrentVersion = release.tag_name === app.version;
+                const isCurrentVersion = release.tag_name === appVersion;
 
                 let message = `**Version:** ${release.tag_name}`;
                 if (isCurrentVersion) {
@@ -84,7 +98,7 @@ registerAll({
                 message += `**Released:** ${publishDate}\n\n`;
 
                 if (!isCurrentVersion) {
-                    const cleanCurrent = app.version.replace(/^v/, '');
+                    const cleanCurrent = appVersion.replace(/^v/, '');
                     const cleanRelease = release.tag_name.replace(/^v/, '');
                     const currentParts = cleanCurrent.split('.').map(Number);
                     const releaseParts = cleanRelease.split('.').map(Number);
@@ -126,7 +140,7 @@ registerAll({
 
                 const template = html`
                     <wa-dialog 
-                        label="About ${app.name} - ${app.version}"
+                        label="About ${app.name ?? ''} - ${app.version ?? '0.0.0'}"
                         open 
                         light-dismiss
                         style="--width: 600px;"
@@ -144,7 +158,7 @@ registerAll({
                                 margin-left: 0.5rem;
                             }
                         </style>
-                        <small>${app.description}</small>
+                        <small>${app.description ?? ''}</small>
                         <div class="dialog-content">
                             <wa-tab-group>
                                 ${releases.length > 0 ? html`

package/src/components/command.ts

@@ -123,9 +123,9 @@ export class LyraCommand extends LyraWidget {
             `
         }
         
-        if ('html' in contribution) {
+        if ('component' in contribution) {
             const htmlContribution = contribution as HTMLContribution
-            const contents = htmlContribution.html
+            const contents = htmlContribution.component
             if (contents instanceof Function) {
                 return contents()
             }

package/src/components/index.ts

@@ -6,4 +6,4 @@ import "./log-terminal"
 import "./command"
 import "./fastviews"
 import "./language-selector"
-import "./app-switcher"
+import "./layout-switcher"

package/src/components/layout-switcher.ts

@@ -0,0 +1,83 @@
+import { html, css } from "lit";
+import { customElement, state } from "lit/decorators.js";
+import { LyraElement } from "../parts/element";
+import { appLoaderService } from "../core/apploader";
+
+@customElement('lyra-layout-switcher')
+export class LyraLayoutSwitcher extends LyraElement {
+    @state()
+    private currentLayoutId = 'standard';
+
+    protected doBeforeUI() {
+        this.currentLayoutId = appLoaderService.getCurrentLayoutId();
+        const updateLayout = () => {
+            this.currentLayoutId = appLoaderService.getCurrentLayoutId();
+            this.requestUpdate();
+        };
+        window.addEventListener('app-loaded', updateLayout);
+        window.addEventListener('layout-changed', updateLayout);
+        return () => {
+            window.removeEventListener('app-loaded', updateLayout);
+            window.removeEventListener('layout-changed', updateLayout);
+        };
+    }
+
+    private async handleSelect(e: CustomEvent) {
+        const layoutId = e.detail?.item?.value;
+        if (!layoutId || layoutId === this.currentLayoutId) return;
+        try {
+            await appLoaderService.setPreferredLayoutId(layoutId);
+        } catch (err) {
+            console.error('Failed to switch layout:', err);
+        }
+    }
+
+    protected render() {
+        const layouts = appLoaderService.getRegisteredLayouts();
+        if (layouts.length <= 1) {
+            return html``;
+        }
+
+        const currentLayout = layouts.find((l) => l.id === this.currentLayoutId);
+        const layoutName = currentLayout?.name ?? this.currentLayoutId;
+
+        return html`
+            <wa-dropdown
+                placement="bottom-end"
+                distance="4"
+                size="small"
+                @wa-select=${this.handleSelect}>
+                <wa-button
+                    slot="trigger"
+                    appearance="plain"
+                    size="small"
+                    with-caret
+                    title="Switch layout (current: ${layoutName})">
+                    <wa-icon name="table-cells" label="Layout"></wa-icon>
+                </wa-button>
+                ${layouts.map(
+                    (layout) => html`
+                        <wa-dropdown-item
+                            value="${layout.id}"
+                            type="checkbox"
+                            ?checked=${layout.id === this.currentLayoutId}>
+                            ${layout.name}
+                        </wa-dropdown-item>
+                    `
+                )}
+            </wa-dropdown>
+        `;
+    }
+
+    static styles = css`
+        :host {
+            display: inline-block;
+        }
+    `;
+}
+
+declare global {
+    interface HTMLElementTagNameMap {
+        'lyra-layout-switcher': LyraLayoutSwitcher;
+    }
+}

package/src/components/part-name.ts

@@ -10,7 +10,7 @@ import {i18n} from "../core/i18n";
 const t = i18n('partname');
 
 contributionRegistry.registerContribution(TOOLBAR_BOTTOM_CENTER, {
-    html: "<lyra-part-name></lyra-part-name>"
+    component: "<lyra-part-name></lyra-part-name>"
 } as HTMLContribution)
 
 @customElement('lyra-part-name')

package/src/components/tasks.ts

@@ -10,7 +10,7 @@ import {i18n} from "../core/i18n";
 const t = i18n('tasks');
 
 contributionRegistry.registerContribution(TOOLBAR_BOTTOM_CENTER, {
-    html: "<lyra-tasks></lyra-tasks>"
+    component: "<lyra-tasks></lyra-tasks>"
 } as HTMLContribution)
 
 // Singleton dialog container for progress dialog

package/src/contributions/default-layout-contributions.ts

@@ -0,0 +1,10 @@
+import "../layouts/standard-layout";
+import { contributionRegistry } from "../core/contributionregistry";
+import { SYSTEM_LAYOUTS } from "../core/constants";
+
+contributionRegistry.registerContribution(SYSTEM_LAYOUTS, {
+    id: "standard",
+    name: "Standard",
+    label: "Standard",
+    component: "lyra-standard-layout",
+});

package/src/contributions/default-ui-contributions.ts

@@ -29,16 +29,16 @@ contributionRegistry.registerContribution(TOOLBAR_BOTTOM_END, {
 
 contributionRegistry.registerContribution(TOOLBAR_BOTTOM_END, {
     label: `Fast Views`,
-    html: `<lyra-fastviews target="system.fastviews-bottomend" icon="bolt" title="Fast Views"></lyra-fastviews>`
+    component: `<lyra-fastviews target="system.fastviews-bottomend" icon="bolt" title="Fast Views"></lyra-fastviews>`
 });
 
 contributionRegistry.registerContribution(TOOLBAR_BOTTOM_END, {
     label: "Language",
-    html: () => html`<lyra-language-selector></lyra-language-selector>`
+    component: () => html`<lyra-language-selector></lyra-language-selector>`
 });
 
 contributionRegistry.registerContribution(TOOLBAR_MAIN_RIGHT, {
     label: "App Switcher",
-    html: () => html`<lyra-app-switcher></lyra-app-switcher>`
+    component: () => html`<lyra-layout-switcher></lyra-layout-switcher>`
 } as HTMLContribution);
 

package/src/contributions/index.ts

@@ -1,3 +1,4 @@
 import "./default-ui-contributions";
+import "./default-layout-contributions";
 import "./marketplace-catalog-contributions";
 

package/src/contributions/marketplace-catalog-contributions.ts

@@ -2,5 +2,5 @@ import {createLogger} from "../core/logger";
 
 const logger = createLogger('MarketplaceCatalogContributions');
 
-logger.debug('Marketplace catalog URLs are set by the app host via applyAppHostConfig()');
+logger.debug('Marketplace catalog URLs are set per app via AppDefinition.marketplaceCatalogUrls');