@executor-js/plugin-openapi 1.4.28 → 1.4.30

package/dist/{chunk-E7PZ2QGD.js → chunk-EOXXE5DG.js}

@@ -187,13 +187,12 @@ var preferredResponseContent = (content) => {
 
 // src/sdk/types.ts
 import { Schema as Schema3 } from "effect";
+import { ScopedSecretCredentialInput, SecretBackedValue } from "@executor-js/sdk/shared";
 import {
-  ConnectionId,
-  ScopeId,
-  ScopedSecretCredentialInput,
-  SecretBackedValue,
-  SecretId
-} from "@executor-js/sdk/core";
+  OAuth2Flow as HttpOAuth2Flow,
+  OAuth2SourceConfig as SharedOAuth2SourceConfig
+} from "@executor-js/sdk/http-source";
+var OAuth2SourceConfig = SharedOAuth2SourceConfig;
 var OperationId = Schema3.String.pipe(Schema3.brand("OperationId"));
 var HttpMethod = Schema3.Literals([
   "get",
@@ -287,50 +286,6 @@ var OpenApiCredentialInput = Schema3.Union([
   HeaderValue,
   ConfiguredHeaderValue
 ]);
-var OpenApiSourceBindingValue = Schema3.Union([
-  Schema3.Struct({
-    kind: Schema3.Literal("secret"),
-    secretId: SecretId,
-    secretScopeId: Schema3.optional(ScopeId)
-  }),
-  Schema3.Struct({
-    kind: Schema3.Literal("connection"),
-    connectionId: ConnectionId
-  }),
-  Schema3.Struct({
-    kind: Schema3.Literal("text"),
-    text: Schema3.String
-  })
-]);
-var OpenApiSourceBindingInput = Schema3.Struct({
-  sourceId: Schema3.String,
-  sourceScope: ScopeId,
-  scope: ScopeId,
-  slot: Schema3.String,
-  value: OpenApiSourceBindingValue
-});
-var OpenApiSourceBindingRef = Schema3.Struct({
-  sourceId: Schema3.String,
-  sourceScopeId: ScopeId,
-  scopeId: ScopeId,
-  slot: Schema3.String,
-  value: OpenApiSourceBindingValue,
-  createdAt: Schema3.Date,
-  updatedAt: Schema3.Date
-});
-var OAuth2Flow = Schema3.Literals(["authorizationCode", "clientCredentials"]);
-var OAuth2SourceConfig = Schema3.Struct({
-  kind: Schema3.Literal("oauth2"),
-  securitySchemeName: Schema3.String,
-  flow: OAuth2Flow,
-  tokenUrl: Schema3.String,
-  authorizationUrl: Schema3.NullOr(Schema3.String),
-  issuerUrl: Schema3.optional(Schema3.NullOr(Schema3.String)),
-  clientIdSlot: Schema3.String,
-  clientSecretSlot: Schema3.NullOr(Schema3.String),
-  connectionSlot: Schema3.String,
-  scopes: Schema3.Array(Schema3.String)
-}).annotate({ identifier: "OpenApiOAuth2SourceConfig" });
 var InvocationResult = Schema3.Struct({
   status: Schema3.Number,
   headers: Schema3.Record(Schema3.String, Schema3.String),
@@ -530,7 +485,7 @@ var extract = Effect2.fn("OpenApi.extract")(function* (doc) {
 });
 
 // src/sdk/preview.ts
-import { Effect as Effect3, Option as Option3 } from "effect";
+import { Effect as Effect3, Option as Option3, Predicate } from "effect";
 import { Schema as Schema4 } from "effect";
 var OAuth2Scopes = Schema4.Record(Schema4.String, Schema4.String);
 var SecuritySchemeType = Schema4.Literals(["http", "apiKey", "oauth2", "openIdConnect"]);
@@ -702,7 +657,7 @@ var extractSecuritySchemes = (rawSchemes, resolver) => Object.entries(rawSchemes
 var buildHeaderPresets = (schemes, strategies) => {
   const schemeMap = new Map(schemes.map((s) => [s.name, s]));
   return strategies.flatMap((strategy) => {
-    const resolved = strategy.schemes.map((name) => schemeMap.get(name)).filter((s) => s !== void 0);
+    const resolved = strategy.schemes.map((name) => schemeMap.get(name)).filter(Predicate.isNotUndefined);
     if (resolved.length === 0) return [];
     const headers = {};
     const secretHeaders = [];
@@ -825,90 +780,14 @@ var previewSpec = Effect3.fn("OpenApi.previewSpec")(function* (input) {
   });
 });
 
-// src/sdk/store.ts
-import { Effect as Effect4, Option as Option4, Schema as Schema5 } from "effect";
-import { defineSchema } from "@executor-js/sdk/core";
-var openapiSchema = defineSchema({
-  openapi_source: {
-    fields: {
-      id: { type: "string", required: true },
-      scope_id: { type: "string", required: true, index: true },
-      name: { type: "string", required: true },
-      spec: { type: "string", required: true },
-      // Origin URL the spec was fetched from. Set when `addSpec` was
-      // invoked with an http(s) URL; null when the caller passed raw
-      // spec text. Drives `canRefresh` on the core source row and
-      // is the address re-fetched on `refreshSource`.
-      source_url: { type: "string", required: false },
-      base_url: { type: "string", required: false },
-      // OAuth2 stays JSON because it is one typed source-owned config object
-      // carrying slot names, not concrete secret/connection ids.
-      oauth2: { type: "json", required: false }
-    }
-  },
-  openapi_operation: {
-    fields: {
-      id: { type: "string", required: true },
-      scope_id: { type: "string", required: true, index: true },
-      source_id: { type: "string", required: true, index: true },
-      binding: { type: "json", required: true }
-    }
-  },
-  openapi_source_header: {
-    fields: {
-      id: { type: "string", required: true },
-      scope_id: { type: "string", required: true, index: true },
-      source_id: { type: "string", required: true, index: true },
-      name: { type: "string", required: true },
-      kind: { type: ["text", "binding"], required: true },
-      text_value: { type: "string", required: false },
-      slot_key: { type: "string", required: false },
-      prefix: { type: "string", required: false }
-    }
-  },
-  openapi_source_query_param: {
-    fields: {
-      id: { type: "string", required: true },
-      scope_id: { type: "string", required: true, index: true },
-      source_id: { type: "string", required: true, index: true },
-      name: { type: "string", required: true },
-      kind: { type: ["text", "binding"], required: true },
-      text_value: { type: "string", required: false },
-      slot_key: { type: "string", required: false },
-      prefix: { type: "string", required: false }
-    }
-  },
-  openapi_source_spec_fetch_header: {
-    fields: {
-      id: { type: "string", required: true },
-      scope_id: { type: "string", required: true, index: true },
-      source_id: { type: "string", required: true, index: true },
-      name: { type: "string", required: true },
-      kind: { type: ["text", "binding"], required: true },
-      text_value: { type: "string", required: false },
-      slot_key: { type: "string", required: false },
-      prefix: { type: "string", required: false }
-    }
-  },
-  openapi_source_spec_fetch_query_param: {
-    fields: {
-      id: { type: "string", required: true },
-      scope_id: { type: "string", required: true, index: true },
-      source_id: { type: "string", required: true, index: true },
-      name: { type: "string", required: true },
-      kind: { type: ["text", "binding"], required: true },
-      text_value: { type: "string", required: false },
-      slot_key: { type: "string", required: false },
-      prefix: { type: "string", required: false }
-    }
-  }
-});
+// src/sdk/source-contracts.ts
+import { Schema as Schema5 } from "effect";
 var StoredSourceSchema = Schema5.Struct({
   namespace: Schema5.String,
   scope: Schema5.String,
   name: Schema5.String,
   config: Schema5.Struct({
-    spec: Schema5.String,
+    spec: Schema5.optional(Schema5.String),
     sourceUrl: Schema5.optional(Schema5.String),
     baseUrl: Schema5.optional(Schema5.String),
     namespace: Schema5.optional(Schema5.String),
@@ -925,326 +804,14 @@ var StoredSourceSchema = Schema5.Struct({
     oauth2: Schema5.optional(OAuth2SourceConfig)
   })
 }).annotate({ identifier: "OpenApiStoredSource" });
-var encodeBinding = Schema5.encodeSync(OperationBinding);
-var decodeBinding = Schema5.decodeUnknownSync(OperationBinding);
-var decodeBindingJson = Schema5.decodeUnknownSync(Schema5.fromJsonString(OperationBinding));
-var decodeOAuth2SourceConfigOption = Schema5.decodeUnknownOption(OAuth2SourceConfig);
-var decodeOAuth2SourceConfigJsonOption = Schema5.decodeUnknownOption(
-  Schema5.fromJsonString(OAuth2SourceConfig)
-);
-var encodeOAuth2SourceConfig = Schema5.encodeSync(OAuth2SourceConfig);
-var NullableString = Schema5.NullOr(Schema5.String);
-var OptionalNullableString = Schema5.optional(NullableString);
-var ChildStorageRow = Schema5.Struct({
-  name: Schema5.String,
-  kind: Schema5.Literals(["text", "binding"]),
-  text_value: OptionalNullableString,
-  slot_key: OptionalNullableString,
-  prefix: OptionalNullableString
-});
-var decodeChildStorageRowOption = Schema5.decodeUnknownOption(ChildStorageRow);
-var SourceStorageRow = Schema5.Struct({
-  id: Schema5.String,
-  scope_id: Schema5.String,
-  name: Schema5.String,
-  spec: Schema5.String,
-  source_url: OptionalNullableString,
-  base_url: OptionalNullableString,
-  oauth2: Schema5.optional(Schema5.Unknown)
-});
-var decodeSourceStorageRow = Schema5.decodeUnknownSync(SourceStorageRow);
-var OperationStorageRow = Schema5.Struct({
-  id: Schema5.String,
-  source_id: Schema5.String,
-  binding: Schema5.Unknown
-});
-var decodeOperationStorageRow = Schema5.decodeUnknownSync(OperationStorageRow);
-var valueMapToChildRows = (sourceId, scope, values) => {
-  if (!values) return [];
-  return Object.entries(values).map(([name, value]) => {
-    const id = JSON.stringify([sourceId, name]);
-    if (typeof value === "string") {
-      return {
-        id,
-        scope_id: scope,
-        source_id: sourceId,
-        name,
-        kind: "text",
-        text_value: value
-      };
-    }
-    return {
-      id,
-      scope_id: scope,
-      source_id: sourceId,
-      name,
-      kind: "binding",
-      slot_key: value.slot,
-      prefix: value.prefix
-    };
-  });
-};
-var childRowsToValueMap = (rows) => {
-  const out = {};
-  for (const row of rows) {
-    const decoded = decodeChildStorageRowOption(row);
-    if (Option4.isSome(decoded)) {
-      const child = decoded.value;
-      if (child.kind === "binding" && child.slot_key != null) {
-        out[child.name] = child.prefix != null ? ConfiguredHeaderBinding.make({
-          kind: "binding",
-          slot: child.slot_key,
-          prefix: child.prefix
-        }) : ConfiguredHeaderBinding.make({
-          kind: "binding",
-          slot: child.slot_key
-        });
-      } else if (child.kind === "text" && child.text_value != null) {
-        out[child.name] = child.text_value;
-      }
-    }
-  }
-  return out;
-};
-var toJsonRecord = (value) => value;
 var slugifySlotPart = (value) => value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "default";
 var headerBindingSlot = (headerName) => `header:${slugifySlotPart(headerName)}`;
 var queryParamBindingSlot = (name) => `query_param:${slugifySlotPart(name)}`;
+var specFetchHeaderBindingSlot = (headerName) => `spec_fetch_header:${slugifySlotPart(headerName)}`;
+var specFetchQueryParamBindingSlot = (name) => `spec_fetch_query_param:${slugifySlotPart(name)}`;
 var oauth2ClientIdSlot = (securitySchemeName) => `oauth2:${slugifySlotPart(securitySchemeName)}:client-id`;
 var oauth2ClientSecretSlot = (securitySchemeName) => `oauth2:${slugifySlotPart(securitySchemeName)}:client-secret`;
 var oauth2ConnectionSlot = (securitySchemeName) => `oauth2:${slugifySlotPart(securitySchemeName)}:connection`;
-var normalizeStoredOAuth2 = (value) => {
-  if (value == null) return void 0;
-  const sourceConfig = typeof value === "string" ? decodeOAuth2SourceConfigJsonOption(value) : decodeOAuth2SourceConfigOption(value);
-  if (Option4.isSome(sourceConfig)) {
-    return sourceConfig.value;
-  }
-  return void 0;
-};
-var makeDefaultOpenapiStore = ({ adapter }) => {
-  const loadChildValueMap = (model, sourceId, scope) => adapter.findMany({
-    model,
-    where: [
-      { field: "source_id", value: sourceId },
-      { field: "scope_id", value: scope }
-    ]
-  }).pipe(Effect4.map(childRowsToValueMap));
-  const rowToSource = (row) => Effect4.gen(function* () {
-    const sourceRow = decodeSourceStorageRow(row);
-    const sourceId = sourceRow.id;
-    const scope = sourceRow.scope_id;
-    const oauth2 = normalizeStoredOAuth2(sourceRow.oauth2);
-    const headers = yield* loadChildValueMap("openapi_source_header", sourceId, scope);
-    const queryParams = yield* loadChildValueMap("openapi_source_query_param", sourceId, scope);
-    const specFetchHeaders = yield* loadChildValueMap(
-      "openapi_source_spec_fetch_header",
-      sourceId,
-      scope
-    );
-    const specFetchQueryParams = yield* loadChildValueMap(
-      "openapi_source_spec_fetch_query_param",
-      sourceId,
-      scope
-    );
-    const specFetchCredentials = Object.keys(specFetchHeaders).length === 0 && Object.keys(specFetchQueryParams).length === 0 ? void 0 : {
-      ...Object.keys(specFetchHeaders).length > 0 ? { headers: specFetchHeaders } : {},
-      ...Object.keys(specFetchQueryParams).length > 0 ? { queryParams: specFetchQueryParams } : {}
-    };
-    return {
-      namespace: sourceId,
-      scope,
-      name: sourceRow.name,
-      config: {
-        spec: sourceRow.spec,
-        sourceUrl: sourceRow.source_url ?? void 0,
-        baseUrl: sourceRow.base_url ?? void 0,
-        headers,
-        queryParams,
-        specFetchCredentials,
-        oauth2
-      }
-    };
-  });
-  const rowToOperation = (row) => {
-    const operationRow = decodeOperationStorageRow(row);
-    return {
-      toolId: operationRow.id,
-      sourceId: operationRow.source_id,
-      binding: decodeBinding(
-        typeof operationRow.binding === "string" ? decodeBindingJson(operationRow.binding) : operationRow.binding
-      )
-    };
-  };
-  const replaceChildRows = (model, sourceId, scope, values) => Effect4.gen(function* () {
-    yield* adapter.deleteMany({
-      model,
-      where: [
-        { field: "source_id", value: sourceId },
-        { field: "scope_id", value: scope }
-      ]
-    });
-    const rows = valueMapToChildRows(sourceId, scope, values);
-    if (rows.length === 0) return;
-    yield* adapter.createMany({
-      model,
-      data: rows,
-      forceAllowId: true
-    });
-  });
-  const deleteSource = (namespace, scope) => Effect4.gen(function* () {
-    yield* adapter.deleteMany({
-      model: "openapi_operation",
-      where: [
-        { field: "source_id", value: namespace },
-        { field: "scope_id", value: scope }
-      ]
-    });
-    for (const model of [
-      "openapi_source_header",
-      "openapi_source_query_param",
-      "openapi_source_spec_fetch_header",
-      "openapi_source_spec_fetch_query_param"
-    ]) {
-      yield* adapter.deleteMany({
-        model,
-        where: [
-          { field: "source_id", value: namespace },
-          { field: "scope_id", value: scope }
-        ]
-      });
-    }
-    yield* adapter.delete({
-      model: "openapi_source",
-      where: [
-        { field: "id", value: namespace },
-        { field: "scope_id", value: scope }
-      ]
-    });
-  });
-  return {
-    upsertSource: (input, operations) => Effect4.gen(function* () {
-      yield* deleteSource(input.namespace, input.scope);
-      yield* adapter.create({
-        model: "openapi_source",
-        data: {
-          id: input.namespace,
-          scope_id: input.scope,
-          name: input.name,
-          spec: input.config.spec,
-          source_url: input.config.sourceUrl ?? void 0,
-          base_url: input.config.baseUrl ?? void 0,
-          oauth2: input.config.oauth2 ? toJsonRecord(encodeOAuth2SourceConfig(input.config.oauth2)) : void 0
-        },
-        forceAllowId: true
-      });
-      yield* replaceChildRows(
-        "openapi_source_header",
-        input.namespace,
-        input.scope,
-        input.config.headers
-      );
-      yield* replaceChildRows(
-        "openapi_source_query_param",
-        input.namespace,
-        input.scope,
-        input.config.queryParams
-      );
-      yield* replaceChildRows(
-        "openapi_source_spec_fetch_header",
-        input.namespace,
-        input.scope,
-        input.config.specFetchCredentials?.headers
-      );
-      yield* replaceChildRows(
-        "openapi_source_spec_fetch_query_param",
-        input.namespace,
-        input.scope,
-        input.config.specFetchCredentials?.queryParams
-      );
-      if (operations.length > 0) {
-        yield* adapter.createMany({
-          model: "openapi_operation",
-          data: operations.map((op) => ({
-            id: op.toolId,
-            scope_id: input.scope,
-            source_id: op.sourceId,
-            binding: toJsonRecord(encodeBinding(op.binding))
-          })),
-          forceAllowId: true
-        });
-      }
-    }),
-    updateSourceMeta: (namespace, scope, patch) => Effect4.gen(function* () {
-      const existingRow = yield* adapter.findOne({
-        model: "openapi_source",
-        where: [
-          { field: "id", value: namespace },
-          { field: "scope_id", value: scope }
-        ]
-      });
-      if (!existingRow) return;
-      const existing = yield* rowToSource(existingRow);
-      const nextName = patch.name?.trim() || existing.name;
-      const nextBaseUrl = patch.baseUrl !== void 0 ? patch.baseUrl : existing.config.baseUrl;
-      const nextOAuth2 = patch.oauth2 !== void 0 ? patch.oauth2 : existing.config.oauth2;
-      yield* adapter.update({
-        model: "openapi_source",
-        where: [
-          { field: "id", value: namespace },
-          { field: "scope_id", value: scope }
-        ],
-        update: {
-          name: nextName,
-          base_url: nextBaseUrl ?? void 0,
-          oauth2: nextOAuth2 ? toJsonRecord(encodeOAuth2SourceConfig(nextOAuth2)) : void 0
-        }
-      });
-      if (patch.headers !== void 0) {
-        yield* replaceChildRows("openapi_source_header", namespace, scope, patch.headers);
-      }
-      if (patch.queryParams !== void 0) {
-        yield* replaceChildRows(
-          "openapi_source_query_param",
-          namespace,
-          scope,
-          patch.queryParams
-        );
-      }
-    }),
-    getSource: (namespace, scope) => Effect4.gen(function* () {
-      const row = yield* adapter.findOne({
-        model: "openapi_source",
-        where: [
-          { field: "id", value: namespace },
-          { field: "scope_id", value: scope }
-        ]
-      });
-      if (!row) return null;
-      return yield* rowToSource(row);
-    }),
-    listSources: () => Effect4.gen(function* () {
-      const rows = yield* adapter.findMany({ model: "openapi_source" });
-      return yield* Effect4.forEach(rows, rowToSource, {
-        concurrency: "unbounded"
-      });
-    }),
-    getOperationByToolId: (toolId, scope) => adapter.findOne({
-      model: "openapi_operation",
-      where: [
-        { field: "id", value: toolId },
-        { field: "scope_id", value: scope }
-      ]
-    }).pipe(Effect4.map((row) => row ? rowToOperation(row) : null)),
-    listOperationsBySource: (sourceId, scope) => adapter.findMany({
-      model: "openapi_operation",
-      where: [
-        { field: "source_id", value: sourceId },
-        { field: "scope_id", value: scope }
-      ]
-    }).pipe(Effect4.map((rows) => rows.map(rowToOperation))),
-    removeSource: (namespace, scope) => deleteSource(namespace, scope)
-  };
-};
 
 export {
   OpenApiParseError,
@@ -1259,6 +826,7 @@ export {
   expandServerUrlOptions,
   resolveBaseUrl,
   preferredContent,
+  OAuth2SourceConfig,
   OperationId,
   HttpMethod,
   ParameterLocation,
@@ -1273,12 +841,6 @@ export {
   OperationBinding,
   HeaderValue,
   ConfiguredHeaderBinding,
-  ConfiguredHeaderValue,
-  OpenApiCredentialInput,
-  OpenApiSourceBindingValue,
-  OpenApiSourceBindingInput,
-  OpenApiSourceBindingRef,
-  OAuth2SourceConfig,
   InvocationResult,
   extract,
   OAuth2AuthorizationCodeFlow,
@@ -1291,13 +853,13 @@ export {
   PreviewOperation,
   SpecPreview,
   previewSpec,
-  openapiSchema,
   StoredSourceSchema,
   headerBindingSlot,
   queryParamBindingSlot,
+  specFetchHeaderBindingSlot,
+  specFetchQueryParamBindingSlot,
   oauth2ClientIdSlot,
   oauth2ClientSecretSlot,
-  oauth2ConnectionSlot,
-  makeDefaultOpenapiStore
+  oauth2ConnectionSlot
 };
-//# sourceMappingURL=chunk-E7PZ2QGD.js.map
+//# sourceMappingURL=chunk-EOXXE5DG.js.map