@eclipse-docks/core 0.7.132 → 0.7.134

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

@@ -5,7 +5,6 @@ import {
     PANEL_BOTTOM,
     SIDEBAR_MAIN,
     SIDEBAR_MAIN_TOOLBAR,
-    SYSTEM_ATTRIBUTIONS,
     TOOLBAR_BOTTOM_END,
     TOOLBAR_MAIN_RIGHT
 } from "../core/contribution-targets";
@@ -13,7 +12,6 @@ import {
     ABOUT_TAB_ATTRIBUTIONS,
     ABOUT_TAB_PACKAGES,
     ABOUT_TAB_RELEASE,
-    ATTRIBUTION_ECLIPSE_DOCKS,
     VIEW_FILEBROWSER,
     VIEW_LOG_TERMINAL,
     TOOLBAR_LAYOUT_SWITCHER,
@@ -67,17 +65,6 @@ contributionRegistry.registerContribution(ABOUT_TABS, {
     component: (id: string) => html`<docks-npm-packages id="${id}" embedded></docks-npm-packages>`
 });
 
-contributionRegistry.registerContribution(SYSTEM_ATTRIBUTIONS, {
-    name: ATTRIBUTION_ECLIPSE_DOCKS,
-    label: "Eclipse Docks",
-    component: () => html`
-        <p>
-            Eclipse Docks is made available under the
-            <a href="https://www.eclipse.org/legal/epl-2.0" target="_blank" rel="noopener noreferrer">Eclipse Public License 2.0</a>.
-        </p>
-    `
-} as HTMLContribution);
-
 contributionRegistry.registerContribution(TOOLBAR_BOTTOM_END, {
     name: TOOLBAR_INFO,
     label: "Info",
@@ -107,6 +94,6 @@ contributionRegistry.registerContribution(TOOLBAR_MAIN_RIGHT, {
 contributionRegistry.registerContribution(SIDEBAR_MAIN_TOOLBAR, {
     name: SIDEBAR_TOOLBAR_EXTENSIONS,
     command: "open_extensions",
-    icon: "docks extensions",
+    icon: "puzzle-piece",
     label: "Extensions",
 });

package/src/contributions/index.ts

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

package/src/core/apploader.ts

@@ -12,17 +12,17 @@
  * - App Loader: Bridge between framework and application
  */
 
-import { render, TemplateResult, html } from "lit";
+import { render } from "lit";
+import { contributionTargetMappingRegistry, type ContributionNameRemap } from "./contribution-mapping";
+import { SYSTEM_LAYOUTS } from "./contribution-targets";
+import { Contribution, LayoutContribution, TOPIC_CONTRIBUTEIONS_CHANGED, contributionRegistry } from "./contributionregistry";
 import { rootContext } from "./di";
+import { publish } from "./events";
+import { Extension, extensionRegistry } from "./extensionregistry";
 import { createLogger } from "./logger";
-import { extensionRegistry, Extension } from "./extensionregistry";
-import { contributionRegistry, Contribution, LayoutContribution, TOPIC_CONTRIBUTEIONS_CHANGED } from "./contributionregistry";
-import { SYSTEM_LAYOUTS } from "./contribution-targets";
-import { appSettings } from "./settingsservice";
 import { marketplaceRegistry } from "./marketplaceregistry";
-import { contributionTargetMappingRegistry, type ContributionNameRemap } from "./contribution-mapping";
-import { publish } from "./events";
-
+import type { ResolvedDependencyMap } from "./resolved-package-info";
+import { appSettings } from "./settingsservice";
 
 const logger = createLogger('AppLoader');
 
@@ -179,8 +179,14 @@ export interface AppDefinition {
      */
     dispose?: () => void | Promise<void>;
 
-    /** Resolved dependency versions (e.g. from build plugin). Shown in About / version info. */
-    dependencies?: Record<string, string>;
+    /** Resolved dependency metadata (from build plugin). Shown in About / NPM Packages. */
+    dependencies?: ResolvedDependencyMap;
+
+    /** Direct app package.json dependencies, in declaration order. */
+    directDependencies?: string[];
+
+    /** Third-party packages nested under a direct core/extension dependency in the About tree. */
+    nestedDependencies?: Record<string, string[]>;
 
     /** Marketplace catalog URLs for this app. Registered when the app is registered. */
     marketplaceCatalogUrls?: string[];
@@ -213,7 +219,8 @@ export interface RegisterAppOptions {
     container?: HTMLElement;
 
     /**
-     * When true, fill name, version, description, dependencies, marketplaceCatalogUrls from __RESOLVED_PACKAGE_INFO__ only when not already set on the app.
+     * When true, fill name, version, description, dependencies, directDependencies,
+     * nestedDependencies, and marketplaceCatalogUrls from __RESOLVED_PACKAGE_INFO__ only when not already set on the app.
      */
     hostConfig?: boolean;
 }
@@ -250,6 +257,8 @@ class AppLoaderService {
             if (app.version === undefined) app.version = resolved.version;
             if (app.description === undefined) app.description = resolved.description;
             if (app.dependencies === undefined) app.dependencies = resolved.dependencies;
+            if (app.directDependencies === undefined) app.directDependencies = resolved.directDependencies;
+            if (app.nestedDependencies === undefined) app.nestedDependencies = resolved.nestedDependencies;
             if (app.marketplaceCatalogUrls === undefined) app.marketplaceCatalogUrls = resolved.marketplaceCatalogUrls;
         }
         app.name = app.name ?? 'app';

package/src/core/contribution-names.ts

@@ -26,6 +26,7 @@ export const ABOUT_TAB_PACKAGES = "about.tab.packages";
 export const ABOUT_TAB_ATTRIBUTIONS = "about.tab.attributions";
 
 export const ATTRIBUTION_ECLIPSE_DOCKS = "attribution.eclipse-docks";
+export const ATTRIBUTION_FONT_AWESOME = "attribution.font-awesome";
 
 export const CTXMENU_FILEBROWSER_RENAME = "contextmenu.filebrowser.rename";
 export const CTXMENU_FILEBROWSER_DELETE = "contextmenu.filebrowser.delete";

package/src/core/license-attribution.ts

@@ -0,0 +1,45 @@
+import { html, nothing, type TemplateResult } from "lit";
+import { contributionRegistry, type HTMLContribution } from "./contributionregistry";
+import { SYSTEM_ATTRIBUTIONS } from "./contribution-targets";
+
+export type LicenseAttributionOptions = {
+    name: string;
+    label: string;
+    ranking?: number;
+    component?: () => TemplateResult;
+    license?: string;
+    licenseUrl?: string;
+    projectUrl?: string;
+    projectLabel?: string;
+};
+
+export function registerLicenseAttribution(options: LicenseAttributionOptions): void {
+    const component =
+        options.component ??
+        (() => {
+            if (!options.license || !options.licenseUrl) {
+                return html`<p>${options.label}</p>`;
+            }
+            return html`
+                <p>
+                    ${options.label} is used under the
+                    <a href=${options.licenseUrl} target="_blank" rel="noopener noreferrer">${options.license}</a>.
+                    ${options.projectUrl
+                        ? html`
+                              See
+                              <a href=${options.projectUrl} target="_blank" rel="noopener noreferrer"
+                                  >${options.projectLabel ?? options.projectUrl}</a
+                              >.
+                          `
+                        : nothing}
+                </p>
+            `;
+        });
+
+    contributionRegistry.registerContribution(SYSTEM_ATTRIBUTIONS, {
+        name: options.name,
+        label: options.label,
+        ranking: options.ranking ?? 0,
+        component,
+    } as HTMLContribution);
+}

package/src/core/resolved-package-info.ts

@@ -0,0 +1,15 @@
+/** Metadata for one npm package resolved at build time from its installed package.json. */
+export interface ResolvedDependencyInfo {
+    license?: string;
+    homepage?: string;
+    repository?: string;
+    description?: string;
+}
+
+export type ResolvedDependencyMap = Record<string, ResolvedDependencyInfo>;
+
+export function normalizeDependencyInfo(
+    value: ResolvedDependencyInfo | undefined,
+): ResolvedDependencyInfo | undefined {
+    return value;
+}

package/src/vite-env.d.ts

@@ -14,7 +14,16 @@ declare const __RESOLVED_PACKAGE_INFO__: {
   name: string;
   version: string;
   description?: string;
-  dependencies: Record<string, string>;
+  dependencies: Record<
+    string,
+    {
+      license?: string;
+      homepage?: string;
+      repository?: string;
+      description?: string;
+    }
+  >;
+  directDependencies: string[];
+  nestedDependencies: Record<string, string[]>;
   marketplaceCatalogUrls?: string[];
 } | undefined;
-

package/src/vite-plugin-resolve-deps.ts

@@ -1,23 +1,64 @@
 import { readFileSync, existsSync } from 'fs';
 import path from 'path';
 import type { Plugin } from 'vite';
+import type { ResolvedDependencyInfo, ResolvedDependencyMap } from './core/resolved-package-info';
+
+export type { ResolvedDependencyInfo, ResolvedDependencyMap };
 
 export interface ResolvedPackageInfo {
   name: string;
   version: string;
   description?: string;
-  dependencies: Record<string, string>;
+  dependencies: ResolvedDependencyMap;
+  /** Direct app `package.json` dependencies, in declaration order. */
+  directDependencies: string[];
+  /** Third-party runtime packages nested under a direct @eclipse-docks/core or extension-* dependency. */
+  nestedDependencies: Record<string, string[]>;
   marketplaceCatalogUrls?: string[];
 }
 
+type LicenseField =
+  | string
+  | { type?: string; url?: string }
+  | Array<string | { type?: string; url?: string }>;
+
 interface PackageJson {
   name?: string;
   version?: string;
   description?: string;
+  license?: LicenseField;
+  homepage?: string;
+  repository?: string | { type?: string; url?: string };
   dependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
 }
 
+export type ResolvePackageInfoOptions = {
+  includeDevDependencies?: boolean;
+  /**
+   * When true (default), list each direct `@eclipse-docks/core` and `extension-*`
+   * dependency's own third-party `package.json` dependencies in the About tree.
+   */
+  includeExtensionRuntimeDependencies?: boolean;
+};
+
+const RUNTIME_SKIP_PATTERN = /^@types\//;
+
+const RUNTIME_SKIP_PACKAGES = new Set([
+  'typescript',
+  'vite',
+  'vitest',
+  'jsdom',
+  'playwright',
+  'rolldown',
+  'fake-indexeddb',
+  '@vitest/coverage-v8',
+  'vite-plugin-dts',
+  'vite-plugin-cross-origin-isolation',
+  'vite-plugin-mkcert',
+  'vite-plugin-pwa',
+]);
+
 function packageJsonPath(appRoot: string, packageName: string): string | null {
   const segments = packageName.startsWith('@')
     ? packageName.split('/')
@@ -37,42 +78,165 @@ function packageJsonPath(appRoot: string, packageName: string): string | null {
   return null;
 }
 
+function readWorkspacePackageJson(appRoot: string, depName: string): PackageJson | null {
+  if (!depName.startsWith('@eclipse-docks/')) return null;
+
+  const folder = depName === '@eclipse-docks/core' ? 'core' : depName.slice('@eclipse-docks/'.length);
+  let dir = path.resolve(appRoot);
+  const root = path.parse(dir).root;
+
+  while (dir !== root) {
+    const workspacePkgPath = path.join(dir, 'packages', folder, 'package.json');
+    if (existsSync(workspacePkgPath)) {
+      try {
+        return JSON.parse(readFileSync(workspacePkgPath, 'utf8')) as PackageJson;
+      } catch {
+        return null;
+      }
+    }
+    dir = path.dirname(dir);
+  }
+
+  return null;
+}
+
 function readPackageJson(appRoot: string, packageName: string): PackageJson | null {
   const pkgPath = packageJsonPath(appRoot, packageName);
-  if (!pkgPath) return null;
-  try {
-    return JSON.parse(readFileSync(pkgPath, 'utf8')) as PackageJson;
-  } catch {
-    return null;
+  let pkg: PackageJson | null = null;
+  if (pkgPath) {
+    try {
+      pkg = JSON.parse(readFileSync(pkgPath, 'utf8')) as PackageJson;
+    } catch {
+      pkg = null;
+    }
+  }
+
+  const workspacePkg = readWorkspacePackageJson(appRoot, packageName);
+  if (workspacePkg) {
+    pkg = {
+      ...workspacePkg,
+      ...pkg,
+      description: pkg?.description ?? workspacePkg.description,
+      license: pkg?.license ?? workspacePkg.license,
+      homepage: pkg?.homepage ?? workspacePkg.homepage,
+      repository: pkg?.repository ?? workspacePkg.repository,
+    };
   }
+
+  return pkg;
 }
 
-function findPackageVersion(appRoot: string, depName: string): string | null {
-  const pkg = readPackageJson(appRoot, depName);
-  if (typeof pkg?.version === 'string') return pkg.version;
-  return null;
+function normalizeLicense(license: LicenseField | undefined): string | undefined {
+  if (!license) return undefined;
+  if (typeof license === 'string') return license;
+  if (Array.isArray(license)) {
+    const parts = license
+      .map((entry) => (typeof entry === 'string' ? entry : entry.type ?? ''))
+      .filter(Boolean);
+    return parts.length > 0 ? parts.join(' AND ') : undefined;
+  }
+  return license.type;
 }
 
-function resolveDepVersionsFromPkg(
+function normalizeRepository(
+  repository: PackageJson['repository'],
+): string | undefined {
+  if (!repository) return undefined;
+  const raw = typeof repository === 'string' ? repository : repository.url;
+  if (!raw) return undefined;
+  return raw
+    .replace(/^git\+/, '')
+    .replace(/^git:\/\//, 'https://')
+    .replace(/\.git$/, '');
+}
+
+function shouldSkipRuntimePackage(name: string): boolean {
+  if (RUNTIME_SKIP_PATTERN.test(name)) return true;
+  if (RUNTIME_SKIP_PACKAGES.has(name)) return true;
+  if (name.startsWith('vite-plugin-')) return true;
+  return false;
+}
+
+/** Unscoped `extension-*` or scoped `@namespace/extension-*` (any npm scope). */
+const DEFAULT_EXTENSION_PATTERN = /^(?:@[^/]+\/)?extension-/;
+
+function isEclipseDocksPlatformPackage(name: string): boolean {
+  return name === '@eclipse-docks/core' || DEFAULT_EXTENSION_PATTERN.test(name);
+}
+
+export function resolveDependencyInfo(
   appRoot: string,
+  depName: string,
+): ResolvedDependencyInfo {
+  const pkg = readPackageJson(appRoot, depName);
+
+  return {
+    license: normalizeLicense(pkg?.license),
+    homepage: typeof pkg?.homepage === 'string' ? pkg.homepage : undefined,
+    repository: normalizeRepository(pkg?.repository),
+    description: typeof pkg?.description === 'string' ? pkg.description : undefined,
+  };
+}
+
+function collectDirectDependencyEntries(
   pkg: PackageJson,
-  options?: { includeDevDependencies?: boolean }
-): Record<string, string> {
+  options?: ResolvePackageInfoOptions,
+): Array<[string, string]> {
   const deps = { ...pkg.dependencies };
   if (options?.includeDevDependencies && pkg.devDependencies) {
     Object.assign(deps, pkg.devDependencies);
   }
-  const result: Record<string, string> = {};
-  for (const [name, specifier] of Object.entries(deps)) {
-    const version = findPackageVersion(appRoot, name);
-    result[name] = version ?? specifier;
+  return Object.entries(deps);
+}
+
+/** Direct third-party runtime dependencies declared in `seed`'s package.json. */
+function collectDirectThirdPartyDependencies(appRoot: string, seed: string): string[] {
+  const pkg = readPackageJson(appRoot, seed);
+  if (!pkg?.dependencies) return [];
+
+  return Object.keys(pkg.dependencies)
+    .filter((dep) => !shouldSkipRuntimePackage(dep))
+    .filter((dep) => !isEclipseDocksPlatformPackage(dep))
+    .sort((a, b) => a.localeCompare(b));
+}
+
+function resolveDependenciesFromPkg(
+  appRoot: string,
+  pkg: PackageJson,
+  options?: ResolvePackageInfoOptions,
+): Pick<ResolvedPackageInfo, 'dependencies' | 'directDependencies' | 'nestedDependencies'> {
+  const depEntries = collectDirectDependencyEntries(pkg, options);
+  const directDependencies = depEntries.map(([name]) => name);
+  const dependencies: ResolvedDependencyMap = {};
+
+  for (const [name] of depEntries) {
+    dependencies[name] = resolveDependencyInfo(appRoot, name);
   }
-  return result;
+
+  const nestedDependencies: Record<string, string[]> = {};
+
+  if (options?.includeExtensionRuntimeDependencies !== false) {
+    for (const name of directDependencies) {
+      if (!isEclipseDocksPlatformPackage(name)) continue;
+
+      const thirdParty = collectDirectThirdPartyDependencies(appRoot, name);
+      if (thirdParty.length === 0) continue;
+
+      nestedDependencies[name] = thirdParty;
+      for (const dep of thirdParty) {
+        if (!dependencies[dep]) {
+          dependencies[dep] = resolveDependencyInfo(appRoot, dep);
+        }
+      }
+    }
+  }
+
+  return { dependencies, directDependencies, nestedDependencies };
 }
 
 export function resolvePackageInfo(
   appRoot: string,
-  options?: { includeDevDependencies?: boolean }
+  options?: ResolvePackageInfoOptions,
 ): ResolvedPackageInfo | null {
   const pkgPath = path.join(appRoot, 'package.json');
   if (!existsSync(pkgPath)) return null;
@@ -87,18 +251,47 @@ export function resolvePackageInfo(
   const name = typeof pkg.name === 'string' ? pkg.name : '';
   const version = typeof pkg.version === 'string' ? pkg.version : '0.0.0';
   const description = typeof pkg.description === 'string' ? pkg.description : undefined;
-  const dependencies = resolveDepVersionsFromPkg(appRoot, pkg, options);
-  const marketplaceCatalogUrls = (pkg as { marketplace?: { catalogUrls?: string[] } }).marketplace?.catalogUrls;
+  const { dependencies, directDependencies, nestedDependencies } = resolveDependenciesFromPkg(
+    appRoot,
+    pkg,
+    options,
+  );
+  const marketplaceCatalogUrls = (pkg as { marketplace?: { catalogUrls?: string[] } }).marketplace
+    ?.catalogUrls;
 
-  return { name, version, description, dependencies, marketplaceCatalogUrls };
+  return {
+    name,
+    version,
+    description,
+    dependencies,
+    directDependencies,
+    nestedDependencies,
+    marketplaceCatalogUrls,
+  };
 }
 
 export function resolveDepVersions(
   appRoot: string,
-  options?: { includeDevDependencies?: boolean }
+  options?: ResolvePackageInfoOptions,
 ): Record<string, string> {
-  const info = resolvePackageInfo(appRoot, options);
-  return info?.dependencies ?? {};
+  const pkgPath = path.join(appRoot, 'package.json');
+  if (!existsSync(pkgPath)) return {};
+
+  let pkg: PackageJson;
+  try {
+    pkg = JSON.parse(readFileSync(pkgPath, 'utf8')) as PackageJson;
+  } catch {
+    return {};
+  }
+
+  const depEntries = collectDirectDependencyEntries(pkg, options);
+  const result: Record<string, string> = {};
+  for (const [name, specifier] of depEntries) {
+    const installed = readPackageJson(appRoot, name);
+    result[name] =
+      typeof installed?.version === 'string' ? installed.version : specifier;
+  }
+  return result;
 }
 
 const RESOLVED_PACKAGE_INFO_KEY = '__RESOLVED_PACKAGE_INFO__';
@@ -121,9 +314,6 @@ export function prependExtensionSideEffectImport(code: string): string {
   return EXTENSION_IMPORT_STATEMENT + code;
 }
 
-/** Unscoped `extension-*` or scoped `@namespace/extension-*` (any npm scope). */
-const DEFAULT_EXTENSION_PATTERN = /^(?:@[^/]+\/)?extension-/;
-
 const DEFAULT_PRIORITY_FIRST = ['@eclipse-docks/extension-pwa', 'extension-pwa'];
 
 export interface ExtensionSideEffectsOptions {
@@ -145,8 +335,7 @@ export interface ExtensionSideEffectsOptions {
   packageNamePattern?: RegExp;
 }
 
-export type ResolveDepVersionsPluginOptions = {
-  includeDevDependencies?: boolean;
+export type ResolveDepVersionsPluginOptions = ResolvePackageInfoOptions & {
   /**
    * By default, registers a virtual module that side-effect-imports every matching direct
    * `dependencies` entry (see `ExtensionSideEffectsOptions`), and prepends
@@ -241,6 +430,14 @@ export function resolveExtensionSideEffectPackages(
   );
 }
 
+function dependencyKeysFromInfo(info: ResolvedPackageInfo | null | undefined): string[] {
+  if (!info) return [];
+  if (info.directDependencies.length > 0) {
+    return info.directDependencies;
+  }
+  return Object.keys(info.dependencies);
+}
+
 export function resolveDepVersionsPlugin(
   options?: ResolveDepVersionsPluginOptions,
 ): Plugin {
@@ -259,6 +456,8 @@ export function resolveDepVersionsPlugin(
           version: '0.0.0',
           description: undefined,
           dependencies: {},
+          directDependencies: [],
+          nestedDependencies: {},
           marketplaceCatalogUrls: undefined,
         };
       return {
@@ -276,9 +475,10 @@ export function resolveDepVersionsPlugin(
         return;
       }
       const info = resolvePackageInfo(appRoot, options);
+      const depKeys = dependencyKeysFromInfo(info);
       extensionImportPackages = resolveExtensionSideEffectPackages(
         appRoot,
-        info?.dependencies ?? {},
+        Object.fromEntries(depKeys.map((name) => [name, '*'])),
         normalized,
       );
     },