@executor-js/plugin-graphql 1.5.5 → 1.5.7

package/dist/{chunk-ADQTI2OK.js → chunk-OUZI3QNC.js}

@@ -2,10 +2,10 @@ import {
   graphqlPresets
 } from "./chunk-D6E4WAYW.js";
 import {
-  AuthTemplate,
   ExtractedField,
   ExtractionResult,
   GraphqlArgument,
+  GraphqlAuthMethodInput,
   GraphqlAuthRequiredError,
   GraphqlExtractionError,
   GraphqlIntegrationConfig,
@@ -14,8 +14,10 @@ import {
   InvocationResult,
   OperationBinding,
   decodeGraphqlIntegrationConfig,
-  decodeGraphqlIntegrationConfigOption
-} from "./chunk-N5GJE7R6.js";
+  decodeGraphqlIntegrationConfigOption,
+  expandGraphqlAuthMethodInputs,
+  normalizeGraphqlAuthMethods
+} from "./chunk-732HGFSH.js";
 
 // src/sdk/introspect.ts
 import { Effect, Option, Schema } from "effect";
@@ -563,7 +565,8 @@ var rowToOperation = (row) => {
     binding: decodeBinding(operation.binding)
   };
 };
-var makeDefaultGraphqlStore = ({ pluginStorage }) => {
+var introspectionBlobKey = (introspectionHash) => `introspection/${introspectionHash}`;
+var makeDefaultGraphqlStore = ({ pluginStorage, blobs }) => {
   const listOperationRows = (integration) => pluginStorage.list({
     collection: OPERATION_COLLECTION,
     keyPrefix: `${integration}.`
@@ -598,7 +601,11 @@ var makeDefaultGraphqlStore = ({ pluginStorage }) => {
     listOperations: (integration) => listOperationRows(integration).pipe(
       Effect4.map((rows) => rows.map(rowToOperation).filter(Predicate.isNotNull))
     ),
-    removeOperations
+    removeOperations,
+    putIntrospection: (introspectionHash, introspectionJson) => blobs.put(introspectionBlobKey(introspectionHash), introspectionJson, {
+      owner: CATALOG_OWNER
+    }),
+    getIntrospection: (introspectionHash) => blobs.get(introspectionBlobKey(introspectionHash))
   };
 };
 
@@ -611,9 +618,19 @@ import {
   IntegrationAlreadyExistsError,
   IntegrationDetectionResult,
   IntegrationSlug,
+  mergeAuthTemplates,
+  sha256Hex,
   ToolName,
   ToolResult
 } from "@executor-js/sdk/core";
+import {
+  TOKEN_VARIABLE,
+  describeApiKeyAuthMethod,
+  describeNoneAuthMethod,
+  oauthBearerPlacement,
+  renderAuthPlacements,
+  requiredPlacementVariables
+} from "@executor-js/sdk/http-auth";
 var GraphqlErrorBody = Schema3.Struct({ message: Schema3.String });
 var GraphqlErrorsBody = Schema3.Array(Schema3.Unknown);
 var decodeGraphqlErrorBody = Schema3.decodeUnknownOption(GraphqlErrorBody);
@@ -621,7 +638,6 @@ var decodeGraphqlErrorsBody = Schema3.decodeUnknownOption(GraphqlErrorsBody);
 var decodeGraphqlErrors = (errors) => Option5.getOrUndefined(decodeGraphqlErrorsBody(errors));
 var extractGraphqlErrorMessage = (errors) => errors.map((error) => Option5.getOrUndefined(decodeGraphqlErrorBody(error))?.message).find((message) => message !== void 0 && message.length > 0);
 var GRAPHQL_PLUGIN_ID = "graphql";
-var AuthTemplateSchema = AuthTemplate;
 var GraphqlAddIntegrationInputSchema = Schema3.Struct({
   endpoint: Schema3.String,
   slug: Schema3.optional(Schema3.String),
@@ -629,17 +645,17 @@ var GraphqlAddIntegrationInputSchema = Schema3.Struct({
   introspectionJson: Schema3.optional(Schema3.String),
   headers: Schema3.optional(Schema3.Record(Schema3.String, Schema3.String)),
   queryParams: Schema3.optional(Schema3.Record(Schema3.String, Schema3.String)),
-  authenticationTemplate: Schema3.optional(Schema3.Array(AuthTemplateSchema))
+  authenticationTemplate: Schema3.optional(Schema3.Array(GraphqlAuthMethodInput))
 });
 var GraphqlConfigureInputSchema = Schema3.Struct({
   name: Schema3.optional(Schema3.String),
   endpoint: Schema3.optional(Schema3.String),
   headers: Schema3.optional(Schema3.Record(Schema3.String, Schema3.String)),
   queryParams: Schema3.optional(Schema3.Record(Schema3.String, Schema3.String)),
-  authenticationTemplate: Schema3.optional(Schema3.Array(AuthTemplateSchema))
+  authenticationTemplate: Schema3.optional(Schema3.Array(GraphqlAuthMethodInput))
 });
 var GraphqlConfigureAuthInputSchema = Schema3.Struct({
-  authenticationTemplate: Schema3.Array(AuthTemplateSchema),
+  authenticationTemplate: Schema3.Array(GraphqlAuthMethodInput),
   mode: Schema3.optional(Schema3.Literals(["merge", "replace"]))
 });
 var StaticAddIntegrationOutputSchema = Schema3.Struct({
@@ -790,17 +806,12 @@ var annotationsFor = (binding) => {
   }
   return {};
 };
-var renderAuthTemplate = (template, value) => {
-  if (template.kind === "oauth2") {
-    const header = template.header ?? "Authorization";
-    const prefix = template.prefix ?? "Bearer ";
-    return { headers: { [header]: `${prefix}${value}` }, queryParams: {} };
-  }
-  const rendered = template.prefix ? `${template.prefix}${value}` : value;
-  if (template.in === "query") {
-    return { headers: {}, queryParams: { [template.name]: rendered } };
+var renderGraphqlAuthMethod = (method, values) => {
+  if (method.kind === "apikey") return renderAuthPlacements(method.placements, values);
+  if (method.kind === "oauth2") {
+    return renderAuthPlacements([oauthBearerPlacement(method.header, method.prefix)], values);
   }
-  return { headers: { [template.name]: rendered }, queryParams: {} };
+  return { headers: {}, queryParams: {} };
 };
 var buildToolDefs = (prepared) => prepared.map((p) => ({
   name: ToolName.make(p.toolName),
@@ -813,24 +824,25 @@ var toStoredOperations = (slug, prepared) => prepared.map((p) => ({
   integration: String(slug),
   binding: p.binding
 }));
-var introspectHeadersForConnection = (config, credentialValue) => {
+var introspectHeadersForConnection = (config, values, templateSlug) => {
   const headers = { ...config.headers ?? {} };
   const queryParams = { ...config.queryParams ?? {} };
-  if (credentialValue !== null) {
-    const template = config.authenticationTemplate[0];
-    if (template) {
-      const rendered = renderAuthTemplate(template, credentialValue);
-      Object.assign(headers, rendered.headers);
-      Object.assign(queryParams, rendered.queryParams);
-    }
+  const method = (templateSlug !== null ? config.authenticationTemplate.find(
+    (m) => m.slug === String(templateSlug)
+  ) : void 0) ?? config.authenticationTemplate[0];
+  if (method) {
+    const rendered = renderGraphqlAuthMethod(method, values);
+    Object.assign(headers, rendered.headers);
+    Object.assign(queryParams, rendered.queryParams);
   }
   return { headers, queryParams };
 };
-var introspectForConnection = (config, credentialValue, httpClientLayer) => {
-  if (config.introspectionJson) {
-    return parseIntrospectionJson(config.introspectionJson);
+var loadIntrospectionJson = (storage, config) => config.introspectionHash != null ? storage.getIntrospection(config.introspectionHash) : Effect5.succeed(null);
+var introspectForConnection = (config, introspectionJson, values, templateSlug, httpClientLayer) => {
+  if (introspectionJson != null) {
+    return parseIntrospectionJson(introspectionJson);
   }
-  const auth = introspectHeadersForConnection(config, credentialValue);
+  const auth = introspectHeadersForConnection(config, values, templateSlug);
   return introspect(
     config.endpoint,
     Object.keys(auth.headers).length > 0 ? auth.headers : void 0,
@@ -838,19 +850,20 @@ var introspectForConnection = (config, credentialValue, httpClientLayer) => {
   ).pipe(Effect5.provide(httpClientLayer));
 };
 var materializeOperations = (ctx, integration, config, credential, httpClientLayer) => Effect5.gen(function* () {
-  const template = config.authenticationTemplate.find(
-    (t) => t.slug === String(credential.template)
+  const method = config.authenticationTemplate.find(
+    (m) => m.slug === String(credential.template)
   );
   const headers = { ...config.headers ?? {} };
   const queryParams = {
     ...config.queryParams ?? {}
   };
-  if (template && credential.value !== null) {
-    const rendered = renderAuthTemplate(template, credential.value);
+  if (method) {
+    const rendered = renderGraphqlAuthMethod(method, credential.values);
     Object.assign(headers, rendered.headers);
     Object.assign(queryParams, rendered.queryParams);
   }
-  const introspection = config.introspectionJson ? yield* parseIntrospectionJson(config.introspectionJson) : yield* introspect(
+  const introspectionJson = yield* loadIntrospectionJson(ctx.storage, config);
+  const introspection = introspectionJson != null ? yield* parseIntrospectionJson(introspectionJson) : yield* introspect(
     config.endpoint,
     Object.keys(headers).length > 0 ? headers : void 0,
     Object.keys(queryParams).length > 0 ? queryParams : void 0
@@ -867,69 +880,34 @@ var materializeOperations = (ctx, integration, config, credential, httpClientLay
   yield* ctx.storage.replaceOperations(integration, stored);
   return stored;
 });
-var graphqlApiKeyLabel = (placement) => `API key (${placement.name || (placement.carrier === "header" ? "header" : "query")})`;
 var describeGraphqlAuthMethods = (record) => {
   const config = Option5.getOrUndefined(decodeGraphqlIntegrationConfigOption(record.config));
   if (!config) return [];
-  return config.authenticationTemplate.map((template) => {
-    const slug = template.slug;
-    if (template.kind === "oauth2") {
+  return config.authenticationTemplate.map((method) => {
+    if (method.kind === "apikey") return describeApiKeyAuthMethod(method);
+    if (method.kind === "oauth2") {
       return {
-        id: slug,
+        id: method.slug,
         label: "OAuth",
         kind: "oauth",
-        template: slug,
+        template: method.slug,
         oauth: {}
       };
     }
-    const placement = {
-      carrier: template.in,
-      name: template.name,
-      prefix: template.prefix ?? ""
-    };
-    return {
-      id: slug,
-      label: graphqlApiKeyLabel(placement),
-      kind: "apikey",
-      template: slug,
-      placements: [placement]
-    };
+    return describeNoneAuthMethod(method.slug);
   });
 };
 var describeGraphqlIntegrationDisplay = (record) => {
   const config = Option5.getOrUndefined(decodeGraphqlIntegrationConfigOption(record.config));
   return { url: config?.endpoint };
 };
-var shortId = () => Math.random().toString(36).slice(2, 8);
-var freshCustomSlug = (taken) => {
-  let candidate = `custom_${shortId()}`;
-  while (taken.has(candidate)) candidate = `custom_${shortId()}`;
-  return candidate;
-};
-var mergeGraphqlAuthTemplate = (existing, incoming) => {
-  const result = existing.map((entry) => entry);
-  const taken = new Set(result.map((entry) => entry.slug));
-  for (const entry of incoming) {
-    const requested = entry.slug.trim();
-    const existingIndex = result.findIndex((current) => current.slug === requested);
-    if (requested.length > 0 && existingIndex >= 0) {
-      result[existingIndex] = entry;
-      continue;
-    }
-    const slug = requested.length > 0 && !taken.has(requested) ? requested : freshCustomSlug(taken);
-    taken.add(slug);
-    result.push({ ...entry, slug });
-  }
-  return result;
-};
 var makeGraphqlExtension = (ctx) => {
   const buildConfig = (input) => GraphqlIntegrationConfig.make({
     endpoint: input.endpoint,
     name: input.name?.trim() || slugFromEndpoint(input.endpoint),
-    ...input.introspectionJson !== void 0 ? { introspectionJson: input.introspectionJson } : {},
     ...input.headers !== void 0 ? { headers: input.headers } : {},
     ...input.queryParams !== void 0 ? { queryParams: input.queryParams } : {},
-    authenticationTemplate: input.authenticationTemplate ?? []
+    authenticationTemplate: input.authenticationTemplate ? normalizeGraphqlAuthMethods(input.authenticationTemplate) : []
   });
   const addIntegrationInternal = (input) => Effect5.gen(function* () {
     const slug = IntegrationSlug.make(input.slug ?? slugFromEndpoint(input.endpoint));
@@ -939,41 +917,48 @@ var makeGraphqlExtension = (ctx) => {
     }
     return yield* addIntegrationTransaction(input, slug);
   });
-  const addIntegrationTransaction = (input, slug) => ctx.transaction(
-    Effect5.gen(function* () {
-      const baseConfig = buildConfig(input);
-      if (baseConfig.introspectionJson === void 0) {
-        yield* ctx.core.integrations.register({
+  const addIntegrationTransaction = (input, slug) => Effect5.gen(function* () {
+    const baseConfig = buildConfig(input);
+    if (input.introspectionJson === void 0) {
+      yield* ctx.transaction(
+        ctx.core.integrations.register({
           slug,
           description: baseConfig.name,
           config: baseConfig,
           canRemove: true,
           canRefresh: true
+        })
+      );
+      return { slug: String(slug), name: baseConfig.name, toolCount: 0 };
+    }
+    const introspection = yield* parseIntrospectionJson(input.introspectionJson);
+    const { result } = yield* extract(introspection);
+    const prepared = prepareOperations(result.fields, introspection);
+    const snapshotJson = JSON.stringify({ data: introspection });
+    const introspectionHash = yield* sha256Hex(snapshotJson);
+    const config = GraphqlIntegrationConfig.make({
+      ...baseConfig,
+      introspectionHash
+    });
+    yield* ctx.storage.putIntrospection(introspectionHash, snapshotJson);
+    yield* ctx.transaction(
+      Effect5.gen(function* () {
+        yield* ctx.storage.replaceOperations(String(slug), toStoredOperations(slug, prepared));
+        yield* ctx.core.integrations.register({
+          slug,
+          description: config.name,
+          config,
+          canRemove: true,
+          canRefresh: true
         });
-        return { slug: String(slug), name: baseConfig.name, toolCount: 0 };
-      }
-      const introspection = yield* parseIntrospectionJson(baseConfig.introspectionJson);
-      const { result } = yield* extract(introspection);
-      const prepared = prepareOperations(result.fields, introspection);
-      const config = GraphqlIntegrationConfig.make({
-        ...baseConfig,
-        introspectionJson: JSON.stringify({ data: introspection })
-      });
-      yield* ctx.storage.replaceOperations(String(slug), toStoredOperations(slug, prepared));
-      yield* ctx.core.integrations.register({
-        slug,
-        description: config.name,
-        config,
-        canRemove: true,
-        canRefresh: true
-      });
-      return {
-        slug: String(slug),
-        name: config.name,
-        toolCount: prepared.length
-      };
-    })
-  );
+      })
+    );
+    return {
+      slug: String(slug),
+      name: config.name,
+      toolCount: prepared.length
+    };
+  });
   const configureIntegration = (slug, input) => Effect5.gen(function* () {
     const record = yield* ctx.core.integrations.get(IntegrationSlug.make(slug));
     if (!record) return;
@@ -990,10 +975,10 @@ var makeGraphqlExtension = (ctx) => {
     const next = GraphqlIntegrationConfig.make({
       endpoint: input.endpoint ?? current.endpoint,
       name: input.name?.trim() || current.name,
-      ...current.introspectionJson !== void 0 ? { introspectionJson: current.introspectionJson } : {},
+      ...current.introspectionHash !== void 0 ? { introspectionHash: current.introspectionHash } : {},
       ...(input.headers ?? current.headers) !== void 0 ? { headers: input.headers ?? current.headers } : {},
       ...(input.queryParams ?? current.queryParams) !== void 0 ? { queryParams: input.queryParams ?? current.queryParams } : {},
-      authenticationTemplate: input.authenticationTemplate ?? current.authenticationTemplate
+      authenticationTemplate: input.authenticationTemplate ? normalizeGraphqlAuthMethods(input.authenticationTemplate) : current.authenticationTemplate
     });
     yield* ctx.core.integrations.update(IntegrationSlug.make(slug), {
       description: next.name,
@@ -1011,9 +996,11 @@ var makeGraphqlExtension = (ctx) => {
       if (!record) return [];
       const current = Option5.getOrNull(decodeGraphqlIntegrationConfigOption(record.config));
       if (!current) return [];
-      const merged = input.mode === "replace" ? input.authenticationTemplate : mergeGraphqlAuthTemplate(
+      const merged = input.mode === "replace" ? normalizeGraphqlAuthMethods(input.authenticationTemplate) : mergeAuthTemplates(
         current.authenticationTemplate,
-        input.authenticationTemplate
+        expandGraphqlAuthMethodInputs(
+          input.authenticationTemplate
+        )
       );
       const next = GraphqlIntegrationConfig.make({
         ...current,
@@ -1124,15 +1111,22 @@ var graphqlPlugin = definePlugin((options) => {
     // -----------------------------------------------------------------------
     resolveTools: ({
       config,
-      getValue
+      template,
+      storage,
+      getValues
     }) => Effect5.gen(function* () {
       const decoded = yield* decodeGraphqlIntegrationConfig(config).pipe(Effect5.option);
       if (Option5.isNone(decoded)) return { tools: [] };
       const graphqlConfig = decoded.value;
-      const credentialValue = graphqlConfig.introspectionJson === void 0 ? yield* getValue().pipe(Effect5.catch(() => Effect5.succeed(null))) : null;
+      const introspectionJson = yield* loadIntrospectionJson(storage, graphqlConfig);
+      const values = introspectionJson == null ? yield* getValues().pipe(
+        Effect5.catch(() => Effect5.succeed({}))
+      ) : {};
       const introspection = yield* introspectForConnection(
         graphqlConfig,
-        credentialValue,
+        introspectionJson,
+        values,
+        template,
         options?.httpClientLayer ?? httpClientLayerFallback
       ).pipe(Effect5.option);
       if (Option5.isNone(introspection)) return { tools: [] };
@@ -1181,23 +1175,24 @@ var graphqlPlugin = definePlugin((options) => {
       const queryParams = {
         ...config.queryParams ?? {}
       };
-      const template = config.authenticationTemplate.find(
-        (t) => t.slug === String(credential.template)
+      const method = config.authenticationTemplate.find(
+        (m) => m.slug === String(credential.template)
       );
-      if (template) {
-        if (credential.value === null) {
+      if (method && method.kind !== "none") {
+        const missing = (method.kind === "oauth2" ? [TOKEN_VARIABLE] : requiredPlacementVariables(method.placements)).filter((variable) => credential.values[variable] == null);
+        if (missing.length > 0) {
           return yield* new GraphqlAuthRequiredError({
-            code: template.kind === "oauth2" ? "oauth_connection_missing" : "connection_value_missing",
-            message: template.kind === "oauth2" ? `Missing OAuth connection value for GraphQL integration "${integration}" (connection "${credential.connection}")` : `Missing credential value for GraphQL integration "${integration}" (connection "${credential.connection}")`,
+            code: method.kind === "oauth2" ? "oauth_connection_missing" : "connection_value_missing",
+            message: method.kind === "oauth2" ? `Missing OAuth connection value for GraphQL integration "${integration}" (connection "${credential.connection}")` : `Missing credential value for GraphQL integration "${integration}" (connection "${credential.connection}") for input(s): ${missing.join(", ")}`,
             owner: credential.owner,
             integration,
             connection: String(credential.connection),
-            credentialKind: template.kind === "oauth2" ? "oauth" : "secret",
-            credentialLabel: template.kind === "oauth2" ? "OAuth sign-in" : "API key",
+            credentialKind: method.kind === "oauth2" ? "oauth" : "secret",
+            credentialLabel: method.kind === "oauth2" ? "OAuth sign-in" : "API key",
             template: String(credential.template)
           });
         }
-        const rendered = renderAuthTemplate(template, credential.value);
+        const rendered = renderGraphqlAuthMethod(method, credential.values);
         Object.assign(headers, rendered.headers);
         Object.assign(queryParams, rendered.queryParams);
       }
@@ -1306,4 +1301,4 @@ export {
   describeGraphqlAuthMethods,
   graphqlPlugin
 };
-//# sourceMappingURL=chunk-ADQTI2OK.js.map
+//# sourceMappingURL=chunk-OUZI3QNC.js.map