Extract Google bundle registration helper

Rhys Sullivan committed 4 months ago

Commit eb7ef351 parent 2be5cb61 file · +30 −9Browse files

Unified · Split

packages/plugins/google/src/sdk/plugin.ts+30−9

 const fetchGoogleBundleConversion = (
   urls: readonly string[],
   httpClientLayer: Layer.Layer<HttpClient.HttpClient, never, never>,
+  consentScopesOverride?: readonly string[],
 ) =>
   Effect.forEach(
     urls,
     { concurrency: 4 },
   ).pipe(
     Effect.flatMap((documents) => {
-      const consentScopes = googlePhotosBundleConsentScopes(urls);
+      const consentScopes = consentScopesOverride ?? googlePhotosBundleConsentScopes(urls);
       return convertGoogleDiscoveryBundleToOpenApi({
         documents,
-        ...(consentScopes ? { consentScopes } : {}),
+        ...(consentScopes !== undefined ? { consentScopes } : {}),
       });
     }),
   );
 ) => {
   const httpClientLayer = options?.httpClientLayer ?? ctx.httpClientLayer;
-  const addBundle = (config: GoogleBundleConfig) =>
+  const addGoogleOpenApiIntegration = (input: {
+    readonly urls: readonly string[];
+    readonly slug: IntegrationSlug;
+    readonly name: string;
+    readonly description: string;
+    readonly baseUrl?: string;
+    readonly consentScopes?: readonly string[];
+  }) =>
     Effect.gen(function* () {
-      const urls = yield* googleBundleUrlsWithIdentity(config.urls);
+      const urls = yield* googleBundleUrlsWithIdentity(input.urls);
-      const conversion = yield* fetchGoogleBundleConversion(urls, httpClientLayer);
+      const conversion = yield* fetchGoogleBundleConversion(
+        urls,
+        httpClientLayer,
+        input.consentScopes,
+      );
       const compiled = yield* compileOpenApiSpec(conversion.specText);
-      const slug = IntegrationSlug.make(config.slug?.trim() || DEFAULT_GOOGLE_SLUG);
+      const slug = input.slug;
       const existing = yield* ctx.core.integrations.get(slug);
       if (existing) {
       const integrationConfig: GoogleIntegrationConfig = {
         specHash,
         googleDiscoveryUrls: urls,
-        ...(config.baseUrl ? { baseUrl: config.baseUrl } : {}),
+        ...(input.baseUrl ? { baseUrl: input.baseUrl } : {}),
         ...(conversion.authenticationTemplate
           ? { authenticationTemplate: conversion.authenticationTemplate }
           : {}),
         Effect.gen(function* () {
           yield* ctx.core.integrations.register({
             slug,
-            name: config.name?.trim() || "Google",
+            name: input.name,
-            description: config.description ?? "Google APIs",
+            description: input.description,
             config: integrationConfig satisfies GoogleIntegrationConfig as IntegrationConfig,
             canRemove: true,
             canRefresh: true,
       return { slug, toolCount: compiled.definitions.length };
     });
+  const addBundle = (config: GoogleBundleConfig) =>
+    addGoogleOpenApiIntegration({
+      urls: config.urls,
+      slug: IntegrationSlug.make(config.slug?.trim() || DEFAULT_GOOGLE_SLUG),
+      name: config.name?.trim() || "Google",
+      description: config.description ?? "Google APIs",
+      baseUrl: config.baseUrl,
+    });
   const updateBundle = (rawSlug: string, input?: GoogleUpdateInput) =>
     Effect.gen(function* () {
       const slug = IntegrationSlug.make(rawSlug);