Rename extension provider fields

Author: mehmetozguldev

src-tauri/src/commands/database/sidecar.rs

@@ -16,7 +16,7 @@ const DATABASE_SIDECAR_PROTOCOL_VERSION: u32 = 1;
 
 #[derive(Debug, Deserialize)]
 struct ExtensionManifest {
-   #[serde(rename = "databaseProviders", default)]
+   #[serde(rename = "databases", alias = "databaseProviders", default)]
    database_providers: Vec<DatabaseProviderContribution>,
 }
 

src/extensions/database/database-provider-extensions.ts

@@ -143,12 +143,12 @@ export function getDatabaseProviderExtensions(): ExtensionManifest[] {
       version: "1.0.0",
       publisher: "Athas",
       categories: ["Database"],
-      databaseProviders: [provider],
+      databases: [provider],
       activationEvents: [`onDatabase:${provider.id}`],
       license: "MIT",
       repository: {
         type: "git",
-        url: "https://github.com/athasdev/extensions",
+        url: "https://github.com/athasdev/athas/tree/master/extensions",
       },
       icon: "icon.svg",
     }),

src/extensions/icon-themes/builtin/manifest.json

@@ -1,5 +1,5 @@
 {
-  "iconThemes": [
+  "icons": [
     {
       "id": "material",
       "name": "Material Icons",

src/extensions/marketplace/marketplace-extensions.ts

@@ -1,4 +1,8 @@
 import type { ExtensionCategory, ExtensionManifest } from "../types/extension-manifest";
+import {
+  getManifestDatabaseContributions,
+  getManifestIconContributions,
+} from "../types/extension-contributions";
 
 const CDN_BASE_URL = import.meta.env.VITE_PARSER_CDN_URL || "https://athas.dev/extensions";
 const ATHAS_EXTENSIONS_CDN_PREFIX = "https://athas.dev/extensions";
@@ -45,14 +49,12 @@ function toExtensionCategories(rawCategories: string[] | undefined): ExtensionCa
 
 function isContributionExtension(manifest: ExtensionManifest): boolean {
   return Boolean(
-    manifest.databaseProviders?.length ||
-    manifest.contributes?.databaseProviders?.length ||
+    getManifestDatabaseContributions(manifest).length ||
     manifest.agents?.length ||
     manifest.contributes?.agents?.length ||
     manifest.themes?.length ||
     manifest.contributes?.themes?.length ||
-    manifest.iconThemes?.length ||
-    manifest.contributes?.iconThemes?.length,
+    getManifestIconContributions(manifest).length,
   );
 }
 

src/extensions/registry/extension-store.ts

@@ -27,18 +27,15 @@ import {
 import { resolveInstalledExtensionId } from "./extension-store-runtime";
 import type { AvailableExtension, ExtensionInstallationMetadata } from "./extension-store-types";
 import type { ExtensionManifest } from "../types/extension-manifest";
+import { getManifestDatabaseContributions } from "../types/extension-contributions";
 import {
   recordExtensionLifecycleTelemetry,
   recordExtensionRegistrySync,
   recordExtensionUpdateCheck,
 } from "@/features/telemetry/services/telemetry";
 
 function isBuiltInDatabaseExtension(manifest: ExtensionManifest): boolean {
-  return (
-    manifest.databaseProviders?.some((provider) => provider.id === "sqlite") ||
-    manifest.contributes?.databaseProviders?.some((provider) => provider.id === "sqlite") ||
-    false
-  );
+  return getManifestDatabaseContributions(manifest).some((provider) => provider.id === "sqlite");
 }
 
 interface ExtensionStoreState {

src/extensions/runtime/extension-contribution-runtime.ts

@@ -5,13 +5,14 @@ import type { IconThemeDefinition } from "../icon-themes/types";
 import { themeRegistry } from "../themes/theme-registry";
 import type { ThemeDefinition } from "../themes/types";
 import type { ExtensionManifest } from "../types/extension-manifest";
+import { getManifestIconContributions } from "../types/extension-contributions";
 
 function getThemeContributions(manifest: ExtensionManifest): ThemeContribution[] {
   return [...(manifest.themes ?? []), ...(manifest.contributes?.themes ?? [])];
 }
 
 function getIconThemeContributions(manifest: ExtensionManifest): IconThemeContribution[] {
-  return [...(manifest.iconThemes ?? []), ...(manifest.contributes?.iconThemes ?? [])];
+  return getManifestIconContributions(manifest);
 }
 
 function toCssVariables(colors: Record<string, string>): Record<string, string> {

src/extensions/types/extension-contributions.test.ts

@@ -1,6 +1,8 @@
 import { describe, expect, it } from "vite-plus/test";
 import type { ExtensionManifest } from "./extension-manifest";
 import {
+  getManifestDatabaseContributions,
+  getManifestIconContributions,
   getManifestActivationEvents,
   getManifestLanguageContributions,
   matchesLanguageContribution,
@@ -76,4 +78,40 @@ describe("extension contribution normalization", () => {
       }),
     ).toBe(false);
   });
+
+  it("reads database contributions from the new databases field", () => {
+    const manifest = createManifest({
+      categories: ["Database"],
+      databases: [
+        {
+          id: "duckdb",
+          label: "DuckDB",
+          isFileBased: true,
+          protocolVersion: 1,
+          sidecar: { "darwin-arm64": "bin/athas-db-duckdb" },
+        },
+      ],
+    });
+
+    expect(getManifestDatabaseContributions(manifest).map((database) => database.id)).toEqual([
+      "duckdb",
+    ]);
+  });
+
+  it("reads icon contributions from the new icons field", () => {
+    const manifest = createManifest({
+      categories: ["Icon Theme"],
+      contributes: {
+        icons: [
+          {
+            id: "market",
+            name: "Market",
+            iconDefinitions: {},
+          },
+        ],
+      },
+    });
+
+    expect(getManifestIconContributions(manifest).map((icon) => icon.id)).toEqual(["market"]);
+  });
 });

src/extensions/types/extension-contributions.ts

@@ -1,6 +1,8 @@
 import type {
   CommandContribution,
+  DatabaseProviderContribution,
   ExtensionManifest,
+  IconThemeContribution,
   KeybindingContribution,
   LanguageContribution,
   Snippet,
@@ -73,6 +75,26 @@ export function getManifestSnippetContributions(
   return [...(manifest.snippets || []), ...(manifest.contributes?.snippets || [])];
 }
 
+export function getManifestDatabaseContributions(
+  manifest: ExtensionManifest,
+): DatabaseProviderContribution[] {
+  return [
+    ...(manifest.databases || []),
+    ...(manifest.databaseProviders || []),
+    ...(manifest.contributes?.databases || []),
+    ...(manifest.contributes?.databaseProviders || []),
+  ];
+}
+
+export function getManifestIconContributions(manifest: ExtensionManifest): IconThemeContribution[] {
+  return [
+    ...(manifest.icons || []),
+    ...(manifest.iconThemes || []),
+    ...(manifest.contributes?.icons || []),
+    ...(manifest.contributes?.iconThemes || []),
+  ];
+}
+
 export function getManifestInlineSnippets(manifest: ExtensionManifest): Array<{
   language: string;
   prefix: string;

src/extensions/types/extension-manifest.ts

@@ -38,6 +38,7 @@ export interface ExtensionManifest {
   languages?: LanguageContribution[];
 
   // Database provider sidecars
+  databases?: DatabaseProviderContribution[];
   databaseProviders?: DatabaseProviderContribution[];
 
   // ACP agent contributions
@@ -47,6 +48,7 @@ export interface ExtensionManifest {
   themes?: ThemeContribution[];
 
   // File icon theme contributions
+  icons?: IconThemeContribution[];
   iconThemes?: IconThemeContribution[];
 
   // LSP configuration
@@ -446,11 +448,13 @@ export interface PlatformPackage {
 
 export interface UIContributions {
   languages?: LanguageContribution[];
+  databases?: DatabaseProviderContribution[];
   databaseProviders?: DatabaseProviderContribution[];
   agents?: AgentContribution[];
   grammars?: GrammarConfiguration[];
   snippets?: SnippetContribution[];
   themes?: ThemeContribution[];
+  icons?: IconThemeContribution[];
   iconThemes?: IconThemeContribution[];
   keybindings?: KeybindingContribution[];
   commands?: CommandContribution[];

src/features/database/components/connection/connection-validation.test.ts

@@ -8,21 +8,21 @@ describe("database connection validation", () => {
         "athas.database.redis",
         {
           isInstalled: true,
-          manifest: { databaseProviders: [{ id: "redis", protocolVersion: 1 }] },
+          manifest: { databases: [{ id: "redis", protocolVersion: 1 }] },
         },
       ],
       [
         "athas.database.postgres",
         {
           isInstalled: true,
-          manifest: { databaseProviders: [{ id: " postgres ", protocolVersion: 1 }] },
+          manifest: { databases: [{ id: " postgres ", protocolVersion: 1 }] },
         },
       ],
       [
         "athas.database.mysql",
         {
           isInstalled: false,
-          manifest: { databaseProviders: [{ id: "mysql", protocolVersion: 1 }] },
+          manifest: { databases: [{ id: "mysql", protocolVersion: 1 }] },
         },
       ],
     ]);
@@ -43,21 +43,21 @@ describe("database connection validation", () => {
         "athas.database.sqlite",
         {
           isInstalled: true,
-          manifest: { databaseProviders: [{ id: "sqlite" }] },
+          manifest: { databases: [{ id: "sqlite" }] },
         },
       ],
       [
         "athas.database.postgres",
         {
           isInstalled: true,
-          manifest: { databaseProviders: [{ id: "postgres", protocolVersion: 2 }] },
+          manifest: { databases: [{ id: "postgres", protocolVersion: 2 }] },
         },
       ],
       [
         "athas.database.redis",
         {
           isInstalled: true,
-          manifest: { databaseProviders: [{ id: "redis", protocolVersion: 1 }] },
+          manifest: { databases: [{ id: "redis", protocolVersion: 1 }] },
         },
       ],
     ]);