@zapier/zapier-sdk 0.102.3 → 0.102.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @zapier/zapier-sdk
 
+## 0.102.4
+
+### Patch Changes
+
+- 2c8ea56: _This release contains no user-facing changes._
+- Updated dependencies [2c8ea56]
+  - @zapier/kitcore@0.18.0
+
 ## 0.102.3
 
 ### Patch Changes

package/dist/{chunk-AQJZPUFM.mjs → chunk-6TIBB6TI.mjs}

@@ -1,6 +1,6 @@
 import { __require } from './chunk-Y6FXYEAI.mjs';
 import { z } from 'zod';
-import { withPositional, createDeprecationLogger, createAsyncContext, declareOptionalProperty, declareProperty, defineProperty, defineMethod, coreOptionsPluginRef, createValidator, defineFormatter, declareMethod, defineResolver, concatLists, openEnum, defineHook, definePlugin, getRegistryPlugin, paginate, toSnakeCase, isCoreError, toTitleCase, CORE_ERROR_SYMBOL, CoreErrorCode, CORE_SIGNAL_SYMBOL, isCoreSignal, createSdk, CORE_OPTIONS_ID } from '@zapier/kitcore';
+import { withPositional, declareOptionalProperty, defineProperty, createDeprecationLogger, createAsyncContext, definePlugin, sendHttpRequestPlugin, declareProperty, defineMethod, coreOptionsPluginRef, createValidator, defineFormatter, declareMethod, defineResolver, concatLists, openEnum, defineHook, getRegistryPlugin, paginate, toSnakeCase, isCoreError, toTitleCase, createSdk, CORE_ERROR_SYMBOL, CoreErrorCode, CORE_SIGNAL_SYMBOL, isCoreSignal, CORE_OPTIONS_ID } from '@zapier/kitcore';
 export { CONTEXT, CORE_ERROR_SYMBOL, CORE_OPTIONS_ID, CORE_SIGNAL_SYMBOL, CoreCancelledSignal, CoreDisposeError, CoreErrorCode, CoreSignal, addPlugin, composePlugins, createController, createCorePlugin, createFunction, createPaginatedFunction, createPaginatedPluginMethod, createPluginMethod, createPluginStack, createSdk, declareMethod, declareOptionalProperty, declarePlugin, declareProperty, defineFormatter, defineLegacyMerge, defineMethod, defineMethodOverride, defineOverride, definePlugin, defineProperty, defineResolver, disposeSdk, fromFunctionPlugin, getContext, getCoreErrorCause, getCoreErrorCode, getNegatable, getRegistryPlugin, isCoreCancelledSignal, isCoreError, isCoreSignal, isPositional, omitExports, resolvePlugin, runInMethodScope, runWithTelemetryContext, selectExports, toSnakeCase, toTitleCase } from '@zapier/kitcore';
 import { buildHttpRequestContext, buildActionRunContext } from '@zapier/policy-context';
 import { ListAppsQuerySchema, AppItemSchema as AppItemSchema$1 } from '@zapier/zapier-sdk-core/v0/schemas/apps';
@@ -1070,6 +1070,51 @@ function createSemaphore(maxPermits) {
     }
   };
 }
+var SDK_OPTIONS_ID = "zapier/sdkOptions";
+var sdkOptionsPluginRef = declareOptionalProperty({
+  id: SDK_OPTIONS_ID
+});
+
+// src/plugins/transport/options.ts
+function resolveTransportFetch({
+  fetch: customFetch,
+  debug = false
+}) {
+  const originalFetch = customFetch ?? ((input, init) => globalThis.fetch(input, init));
+  if (!debug) return originalFetch;
+  return createDebugFetch({
+    originalFetch,
+    debugLog: createDebugLogger(debug)
+  });
+}
+
+// src/plugins/transport/http-fetch.ts
+var httpFetchPlugin = defineProperty({
+  namespace: "kitcore",
+  name: "httpFetch",
+  imports: [sdkOptionsPluginRef],
+  setup: ({ imports }) => resolveTransportFetch({
+    fetch: imports.sdkOptions?.fetch,
+    debug: imports.sdkOptions?.debug
+  }),
+  get: ({ state }) => state
+});
+
+// src/plugins/transport/standalone.ts
+function createZapierSendHttpRequest({
+  fetch: customFetch,
+  debug
+}) {
+  const sdk = createSdk(
+    definePlugin({
+      name: "zapierStandaloneHttpTransport",
+      imports: [sendHttpRequestPlugin, httpFetchPlugin],
+      exports: [sendHttpRequestPlugin]
+    }),
+    { configuration: { [SDK_OPTIONS_ID]: { fetch: customFetch, debug } } }
+  );
+  return sdk.sendHttpRequest;
+}
 
 // src/api/correlation.ts
 var CORRELATION_CALL_ID = Symbol(
@@ -1987,7 +2032,7 @@ function parseDeprecationDate(value) {
 }
 
 // src/sdk-version.ts
-var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.102.3" : void 0) || "unknown";
+var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.102.4" : void 0) || "unknown";
 
 // src/utils/open-url.ts
 var nodePrefix = "node:";
@@ -2275,11 +2320,23 @@ var ZapierApiClient = class {
         mergedHeaders.set(key, value);
       });
       this.applyTelemetryHeaders({ headers: mergedHeaders, callId });
+      const {
+        authRequired: _authRequired,
+        requiredScopes: _requiredScopes,
+        searchParams: _searchParams,
+        approvalContext: _approvalContext,
+        customErrorHandler: _customErrorHandler,
+        resource: _resource,
+        ...wireInit
+      } = fetchInit;
       let retries = 0;
       while (true) {
-        const response = await this.options.fetch(url, {
-          ...fetchInit,
-          headers: mergedHeaders
+        const response = await this.options.sendHttpRequest({
+          ...wireInit,
+          // Set the resolved URL and merged headers after the spread so caller
+          // values cannot override them.
+          url,
+          headers: Object.fromEntries(mergedHeaders)
         });
         if (response.status !== 429) {
           return response;
@@ -3343,7 +3400,12 @@ var createZapierApi = (options) => {
   return new ZapierApiClient({
     ...options,
     debug,
-    fetch: debugFetch
+    // The credential-exchange transport. Debug-wrapped here rather than in the
+    // pipeline because `resolveAuthToken` is issued outside it.
+    fetch: debugFetch,
+    // Built from the caller's own `fetch`, not `debugFetch`: the pipeline wraps
+    // for debug itself, and passing the wrapped one would log twice.
+    sendHttpRequest: options.sendHttpRequest ?? createZapierSendHttpRequest({ fetch: options.fetch, debug })
   });
 };
 
@@ -3380,9 +3442,11 @@ function getOrCreateApiClient(config) {
     callerPackage
   });
 }
-var SDK_OPTIONS_ID = "zapier/sdkOptions";
-var sdkOptionsPluginRef = declareOptionalProperty({
-  id: SDK_OPTIONS_ID
+var zapierHttpTransportPlugin = definePlugin({
+  namespace: "zapier",
+  name: "httpTransport",
+  imports: [sendHttpRequestPlugin, httpFetchPlugin],
+  exports: [sendHttpRequestPlugin]
 });
 
 // src/plugins/api/index.ts
@@ -3410,7 +3474,9 @@ function withCorrelationId({
 var apiPlugin = defineProperty({
   namespace: "zapier",
   name: "api",
-  imports: [sdkOptionsPluginRef],
+  // Import the aggregate so it also provides `kitcore/httpFetch`; importing
+  // `sendHttpRequestPlugin` alone would bypass `sdkOptions.fetch`.
+  imports: [sdkOptionsPluginRef, zapierHttpTransportPlugin],
   setup: ({ imports }) => {
     const {
       fetch: customFetch = globalThis.fetch,
@@ -3444,7 +3510,10 @@ var apiPlugin = defineProperty({
       maxApprovalRetries,
       approvalMode,
       openAutoModeApprovalsInBrowser,
-      callerPackage
+      callerPackage,
+      // Inject the graph-composed transport so host `dispatchHttpRequest` wraps
+      // apply.
+      sendHttpRequest: imports.sendHttpRequest
     });
   },
   get: ({ state, callContext }) => callContext?.callId ? withCorrelationId({ client: state, callId: callContext.callId }) : state

package/dist/{chunk-GQP5NSYD.cjs → chunk-WVRZG6I6.cjs}

@@ -1071,6 +1071,51 @@ function createSemaphore(maxPermits) {
     }
   };
 }
+var SDK_OPTIONS_ID = "zapier/sdkOptions";
+var sdkOptionsPluginRef = kitcore.declareOptionalProperty({
+  id: SDK_OPTIONS_ID
+});
+
+// src/plugins/transport/options.ts
+function resolveTransportFetch({
+  fetch: customFetch,
+  debug = false
+}) {
+  const originalFetch = customFetch ?? ((input, init) => globalThis.fetch(input, init));
+  if (!debug) return originalFetch;
+  return createDebugFetch({
+    originalFetch,
+    debugLog: createDebugLogger(debug)
+  });
+}
+
+// src/plugins/transport/http-fetch.ts
+var httpFetchPlugin = kitcore.defineProperty({
+  namespace: "kitcore",
+  name: "httpFetch",
+  imports: [sdkOptionsPluginRef],
+  setup: ({ imports }) => resolveTransportFetch({
+    fetch: imports.sdkOptions?.fetch,
+    debug: imports.sdkOptions?.debug
+  }),
+  get: ({ state }) => state
+});
+
+// src/plugins/transport/standalone.ts
+function createZapierSendHttpRequest({
+  fetch: customFetch,
+  debug
+}) {
+  const sdk = kitcore.createSdk(
+    kitcore.definePlugin({
+      name: "zapierStandaloneHttpTransport",
+      imports: [kitcore.sendHttpRequestPlugin, httpFetchPlugin],
+      exports: [kitcore.sendHttpRequestPlugin]
+    }),
+    { configuration: { [SDK_OPTIONS_ID]: { fetch: customFetch, debug } } }
+  );
+  return sdk.sendHttpRequest;
+}
 
 // src/api/correlation.ts
 var CORRELATION_CALL_ID = Symbol(
@@ -1988,7 +2033,7 @@ function parseDeprecationDate(value) {
 }
 
 // src/sdk-version.ts
-var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.102.3" : void 0) || "unknown";
+var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.102.4" : void 0) || "unknown";
 
 // src/utils/open-url.ts
 var nodePrefix = "node:";
@@ -2276,11 +2321,23 @@ var ZapierApiClient = class {
         mergedHeaders.set(key, value);
       });
       this.applyTelemetryHeaders({ headers: mergedHeaders, callId });
+      const {
+        authRequired: _authRequired,
+        requiredScopes: _requiredScopes,
+        searchParams: _searchParams,
+        approvalContext: _approvalContext,
+        customErrorHandler: _customErrorHandler,
+        resource: _resource,
+        ...wireInit
+      } = fetchInit;
       let retries = 0;
       while (true) {
-        const response = await this.options.fetch(url, {
-          ...fetchInit,
-          headers: mergedHeaders
+        const response = await this.options.sendHttpRequest({
+          ...wireInit,
+          // Set the resolved URL and merged headers after the spread so caller
+          // values cannot override them.
+          url,
+          headers: Object.fromEntries(mergedHeaders)
         });
         if (response.status !== 429) {
           return response;
@@ -3344,7 +3401,12 @@ var createZapierApi = (options) => {
   return new ZapierApiClient({
     ...options,
     debug,
-    fetch: debugFetch
+    // The credential-exchange transport. Debug-wrapped here rather than in the
+    // pipeline because `resolveAuthToken` is issued outside it.
+    fetch: debugFetch,
+    // Built from the caller's own `fetch`, not `debugFetch`: the pipeline wraps
+    // for debug itself, and passing the wrapped one would log twice.
+    sendHttpRequest: options.sendHttpRequest ?? createZapierSendHttpRequest({ fetch: options.fetch, debug })
   });
 };
 
@@ -3381,9 +3443,11 @@ function getOrCreateApiClient(config) {
     callerPackage
   });
 }
-var SDK_OPTIONS_ID = "zapier/sdkOptions";
-var sdkOptionsPluginRef = kitcore.declareOptionalProperty({
-  id: SDK_OPTIONS_ID
+var zapierHttpTransportPlugin = kitcore.definePlugin({
+  namespace: "zapier",
+  name: "httpTransport",
+  imports: [kitcore.sendHttpRequestPlugin, httpFetchPlugin],
+  exports: [kitcore.sendHttpRequestPlugin]
 });
 
 // src/plugins/api/index.ts
@@ -3411,7 +3475,9 @@ function withCorrelationId({
 var apiPlugin = kitcore.defineProperty({
   namespace: "zapier",
   name: "api",
-  imports: [sdkOptionsPluginRef],
+  // Import the aggregate so it also provides `kitcore/httpFetch`; importing
+  // `sendHttpRequestPlugin` alone would bypass `sdkOptions.fetch`.
+  imports: [sdkOptionsPluginRef, zapierHttpTransportPlugin],
   setup: ({ imports }) => {
     const {
       fetch: customFetch = globalThis.fetch,
@@ -3445,7 +3511,10 @@ var apiPlugin = kitcore.defineProperty({
       maxApprovalRetries,
       approvalMode,
       openAutoModeApprovalsInBrowser,
-      callerPackage
+      callerPackage,
+      // Inject the graph-composed transport so host `dispatchHttpRequest` wraps
+      // apply.
+      sendHttpRequest: imports.sendHttpRequest
     });
   },
   get: ({ state, callContext }) => callContext?.callId ? withCorrelationId({ client: state, callId: callContext.callId }) : state