@zapier/zapier-sdk 0.29.0 → 0.30.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zapier/zapier-sdk
 
+## 0.30.0
+
+### Minor Changes
+
+- 0055854: Remove internal `_telemetry` property from all method option types
+
 ## 0.29.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -27,7 +27,12 @@ function _interopNamespace(e) {
 
 var os__namespace = /*#__PURE__*/_interopNamespace(os);
 
-// src/types/properties.ts
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 function withFormatter(schema, formatMeta) {
   Object.assign(schema._zod.def, {
     formatMeta
@@ -469,6 +474,24 @@ function isPlainObject(value) {
   return proto === Object.prototype || proto === null;
 }
 
+// src/utils/telemetry-context.ts
+var telemetryStore = null;
+try {
+  const mod = __require("async_hooks");
+  telemetryStore = new mod.AsyncLocalStorage();
+} catch {
+}
+function isTelemetryNested() {
+  if (!telemetryStore) return true;
+  const store = telemetryStore.getStore();
+  return store !== void 0 && store.depth > 0;
+}
+function runWithTelemetryContext(fn) {
+  if (!telemetryStore) return fn();
+  const currentDepth = telemetryStore.getStore()?.depth ?? -1;
+  return telemetryStore.run({ depth: currentDepth + 1 }, fn);
+}
+
 // src/plugins/fetch/index.ts
 function transformUrlToRelayPath(url) {
   const targetUrl = new URL(url);
@@ -509,76 +532,72 @@ function inferContentType(body) {
 var fetchPlugin = ({ context }) => {
   return {
     fetch: async function fetch2(url, init) {
-      const { api } = context;
-      const startTime = Date.now();
-      const isNested = init?._telemetry?.isNested === true;
-      try {
-        const {
-          connectionId,
-          authenticationId,
-          callbackUrl,
-          _telemetry,
-          ...fetchInit
-        } = init || {};
-        const resolvedConnectionId = connectionId ?? authenticationId;
-        const relayPath = transformUrlToRelayPath(url);
-        const headers = normalizeHeaders(
-          fetchInit.headers
-        );
-        const hasContentType = Object.keys(headers).some(
-          (k) => k.toLowerCase() === "content-type"
-        );
-        if (fetchInit.body && !hasContentType) {
-          const inferred = inferContentType(
-            fetchInit.body
+      return runWithTelemetryContext(async () => {
+        const { api } = context;
+        const startTime = Date.now();
+        const isNested = isTelemetryNested();
+        try {
+          const { connectionId, authenticationId, callbackUrl, ...fetchInit } = init || {};
+          const resolvedConnectionId = connectionId ?? authenticationId;
+          const relayPath = transformUrlToRelayPath(url);
+          const headers = normalizeHeaders(
+            fetchInit.headers
+          );
+          const hasContentType = Object.keys(headers).some(
+            (k) => k.toLowerCase() === "content-type"
           );
-          if (inferred) {
-            headers["Content-Type"] = inferred;
+          if (fetchInit.body && !hasContentType) {
+            const inferred = inferContentType(
+              fetchInit.body
+            );
+            if (inferred) {
+              headers["Content-Type"] = inferred;
+            }
           }
-        }
-        if (resolvedConnectionId) {
-          headers["X-Relay-Authentication-Id"] = coerceToNumericId(
-            "connectionId",
-            resolvedConnectionId
-          ).toString();
-        }
-        if (callbackUrl) {
-          headers["X-Relay-Callback-Url"] = callbackUrl;
-        }
-        const result = await api.fetch(relayPath, {
-          method: fetchInit.method ?? "GET",
-          body: fetchInit.body,
-          headers,
-          redirect: fetchInit.redirect,
-          signal: fetchInit.signal,
-          authRequired: true
-        });
-        if (!isNested) {
-          context.eventEmission.emitMethodCalled({
-            method_name: "fetch",
-            execution_duration_ms: Date.now() - startTime,
-            success_flag: true,
-            error_message: null,
-            error_type: null,
-            argument_count: init ? 2 : 1,
-            is_paginated: false
-          });
-        }
-        return result;
-      } catch (error) {
-        if (!isNested) {
-          context.eventEmission.emitMethodCalled({
-            method_name: "fetch",
-            execution_duration_ms: Date.now() - startTime,
-            success_flag: false,
-            error_message: error instanceof Error ? error.message : String(error),
-            error_type: error instanceof Error ? error.constructor.name : "Unknown",
-            argument_count: init ? 2 : 1,
-            is_paginated: false
+          if (resolvedConnectionId) {
+            headers["X-Relay-Authentication-Id"] = coerceToNumericId(
+              "connectionId",
+              resolvedConnectionId
+            ).toString();
+          }
+          if (callbackUrl) {
+            headers["X-Relay-Callback-Url"] = callbackUrl;
+          }
+          const result = await api.fetch(relayPath, {
+            method: fetchInit.method ?? "GET",
+            body: fetchInit.body,
+            headers,
+            redirect: fetchInit.redirect,
+            signal: fetchInit.signal,
+            authRequired: true
           });
+          if (!isNested) {
+            context.eventEmission.emitMethodCalled({
+              method_name: "fetch",
+              execution_duration_ms: Date.now() - startTime,
+              success_flag: true,
+              error_message: null,
+              error_type: null,
+              argument_count: init ? 2 : 1,
+              is_paginated: false
+            });
+          }
+          return result;
+        } catch (error) {
+          if (!isNested) {
+            context.eventEmission.emitMethodCalled({
+              method_name: "fetch",
+              execution_duration_ms: Date.now() - startTime,
+              success_flag: false,
+              error_message: error instanceof Error ? error.message : String(error),
+              error_type: error instanceof Error ? error.constructor.name : "Unknown",
+              argument_count: init ? 2 : 1,
+              is_paginated: false
+            });
+          }
+          throw error;
         }
-        throw error;
-      }
+      });
     },
     context: {
       meta: {
@@ -769,11 +788,6 @@ var validateOptions = (schema, options) => {
 };
 
 // src/utils/function-utils.ts
-var TelemetryMarkerSchema = zod.z.object({
-  _telemetry: zod.z.object({
-    isNested: zod.z.boolean().optional()
-  }).optional()
-});
 function extractCursor(data) {
   if (!data?.next) {
     return void 0;
@@ -803,20 +817,36 @@ function createFunction(coreFn, schema, telemetry) {
   const functionName = coreFn.name;
   const namedFunctions = {
     [functionName]: async function(options) {
-      const startTime = Date.now();
-      const normalizedOptions = options ?? {};
-      const isNested = normalizedOptions?._telemetry?.isNested === true;
-      try {
-        if (schema) {
-          const validatedOptions = validateOptions(schema, normalizedOptions);
-          const result2 = await coreFn({
-            ...normalizedOptions,
-            ...validatedOptions
-          });
+      return runWithTelemetryContext(async () => {
+        const startTime = Date.now();
+        const normalizedOptions = options ?? {};
+        const isNested = isTelemetryNested();
+        try {
+          if (schema) {
+            const validatedOptions = validateOptions(schema, normalizedOptions);
+            const result2 = await coreFn({
+              ...normalizedOptions,
+              ...validatedOptions
+            });
+            if (!isNested && telemetry?.onMethodCalled) {
+              const argumentCount = Object.keys(
+                normalizedOptions
+              ).length;
+              telemetry.onMethodCalled({
+                methodName: functionName,
+                durationMs: Date.now() - startTime,
+                success: true,
+                argumentCount,
+                isPaginated: false
+              });
+            }
+            return result2;
+          }
+          const result = await coreFn(normalizedOptions);
           if (!isNested && telemetry?.onMethodCalled) {
             const argumentCount = Object.keys(
               normalizedOptions
-            ).filter((k) => k !== "_telemetry").length;
+            ).length;
             telemetry.onMethodCalled({
               methodName: functionName,
               durationMs: Date.now() - startTime,
@@ -825,39 +855,25 @@ function createFunction(coreFn, schema, telemetry) {
               isPaginated: false
             });
           }
-          return result2;
-        }
-        const result = await coreFn(normalizedOptions);
-        if (!isNested && telemetry?.onMethodCalled) {
-          const argumentCount = Object.keys(normalizedOptions).filter(
-            (k) => k !== "_telemetry"
-          ).length;
-          telemetry.onMethodCalled({
-            methodName: functionName,
-            durationMs: Date.now() - startTime,
-            success: true,
-            argumentCount,
-            isPaginated: false
-          });
-        }
-        return result;
-      } catch (error) {
-        const normalizedError = normalizeError(error);
-        if (!isNested && telemetry?.onMethodCalled) {
-          const argumentCount = Object.keys(normalizedOptions).filter(
-            (k) => k !== "_telemetry"
-          ).length;
-          telemetry.onMethodCalled({
-            methodName: functionName,
-            durationMs: Date.now() - startTime,
-            success: false,
-            error: normalizedError,
-            argumentCount,
-            isPaginated: false
-          });
+          return result;
+        } catch (error) {
+          const normalizedError = normalizeError(error);
+          if (!isNested && telemetry?.onMethodCalled) {
+            const argumentCount = Object.keys(
+              normalizedOptions
+            ).length;
+            telemetry.onMethodCalled({
+              methodName: functionName,
+              durationMs: Date.now() - startTime,
+              success: false,
+              error: normalizedError,
+              argumentCount,
+              isPaginated: false
+            });
+          }
+          throw normalizedError;
         }
-        throw normalizedError;
-      }
+      });
     }
   };
   return namedFunctions[functionName];
@@ -898,73 +914,75 @@ function createPaginatedFunction(coreFn, schema, telemetry, explicitFunctionName
   const validator = schema ? createValidator(schema) : null;
   const namedFunctions = {
     [functionName]: function(options) {
-      const startTime = Date.now();
-      const normalizedOptions = options ?? {};
-      const isNested = normalizedOptions?._telemetry?.isNested === true;
-      const validatedOptions = {
-        ...normalizedOptions,
-        ...validator ? validator(normalizedOptions) : normalizedOptions
-      };
-      const pageSize = validatedOptions.pageSize || 100;
-      const optimizedOptions = {
-        ...validatedOptions,
-        pageSize
-      };
-      const iterator = paginate(pageFunction, optimizedOptions);
-      const firstPagePromise = iterator.next().then((result) => {
-        if (result.done) {
-          throw new Error("Paginate should always iterate at least once");
-        }
-        return result.value;
-      });
-      if (!isNested && telemetry?.onMethodCalled) {
-        firstPagePromise.then(() => {
-          const argumentCount = Object.keys(
-            normalizedOptions
-          ).filter((k) => k !== "_telemetry").length;
-          telemetry.onMethodCalled({
-            methodName: functionName,
-            durationMs: Date.now() - startTime,
-            success: true,
-            argumentCount,
-            isPaginated: true
-          });
-        }).catch((error) => {
-          const argumentCount = Object.keys(
-            normalizedOptions
-          ).filter((k) => k !== "_telemetry").length;
-          telemetry.onMethodCalled({
-            methodName: functionName,
-            durationMs: Date.now() - startTime,
-            success: false,
-            error: error instanceof Error ? error : new Error(String(error)),
-            argumentCount,
-            isPaginated: true
-          });
-        });
-      }
-      return Object.assign(firstPagePromise, {
-        [Symbol.asyncIterator]: async function* () {
-          yield await firstPagePromise;
-          for await (const page of iterator) {
-            yield page;
+      return runWithTelemetryContext(() => {
+        const startTime = Date.now();
+        const normalizedOptions = options ?? {};
+        const isNested = isTelemetryNested();
+        const validatedOptions = {
+          ...normalizedOptions,
+          ...validator ? validator(normalizedOptions) : normalizedOptions
+        };
+        const pageSize = validatedOptions.pageSize || 100;
+        const optimizedOptions = {
+          ...validatedOptions,
+          pageSize
+        };
+        const iterator = paginate(pageFunction, optimizedOptions);
+        const firstPagePromise = iterator.next().then((result) => {
+          if (result.done) {
+            throw new Error("Paginate should always iterate at least once");
           }
-        },
-        items: function() {
-          return {
-            [Symbol.asyncIterator]: async function* () {
-              const firstPage = await firstPagePromise;
-              for (const item of firstPage.data) {
-                yield item;
-              }
-              for await (const page of iterator) {
-                for (const item of page.data) {
+          return result.value;
+        });
+        if (!isNested && telemetry?.onMethodCalled) {
+          firstPagePromise.then(() => {
+            const argumentCount = Object.keys(
+              normalizedOptions
+            ).length;
+            telemetry.onMethodCalled({
+              methodName: functionName,
+              durationMs: Date.now() - startTime,
+              success: true,
+              argumentCount,
+              isPaginated: true
+            });
+          }).catch((error) => {
+            const argumentCount = Object.keys(
+              normalizedOptions
+            ).length;
+            telemetry.onMethodCalled({
+              methodName: functionName,
+              durationMs: Date.now() - startTime,
+              success: false,
+              error: error instanceof Error ? error : new Error(String(error)),
+              argumentCount,
+              isPaginated: true
+            });
+          });
+        }
+        return Object.assign(firstPagePromise, {
+          [Symbol.asyncIterator]: async function* () {
+            yield await firstPagePromise;
+            for await (const page of iterator) {
+              yield page;
+            }
+          },
+          items: function() {
+            return {
+              [Symbol.asyncIterator]: async function* () {
+                const firstPage = await firstPagePromise;
+                for (const item of firstPage.data) {
                   yield item;
                 }
+                for await (const page of iterator) {
+                  for (const item of page.data) {
+                    yield item;
+                  }
+                }
               }
-            }
-          };
-        }
+            };
+          }
+        });
       });
     }
   };
@@ -983,7 +1001,7 @@ var ListAppsSchema = apps.ListAppsQuerySchema.omit({
   maxItems: zod.z.number().min(1).optional().describe("Maximum total items to return across all pages"),
   // SDK specific property for pagination/iterable helpers
   cursor: zod.z.string().optional().describe("Cursor to start from")
-}).merge(TelemetryMarkerSchema).describe("List all available apps with optional filtering");
+}).describe("List all available apps with optional filtering");
 
 // src/utils/string-utils.ts
 function toTitleCase(input) {
@@ -1193,7 +1211,7 @@ var ListActionsSchema = zod.z.object({
   pageSize: zod.z.number().min(1).optional().describe("Number of actions per page"),
   maxItems: zod.z.number().min(1).optional().describe("Maximum total items to return across all pages"),
   cursor: zod.z.string().optional().describe("Cursor to start from")
-}).merge(TelemetryMarkerSchema).describe("List all actions for a specific app");
+}).describe("List all actions for a specific app");
 var NeedChoicesSchema = zod.z.object({
   key: zod.z.string().optional(),
   label: zod.z.string().optional(),
@@ -2229,7 +2247,7 @@ var ListConnectionsQuerySchema = connections.ListConnectionsQuerySchema.omit({
   maxItems: zod.z.number().min(1).optional().describe("Maximum total items to return across all pages"),
   // SDK specific property for pagination/iterable helpers
   cursor: zod.z.string().optional().describe("Cursor to start from")
-}).merge(TelemetryMarkerSchema).describe("List available connections with optional filtering");
+}).describe("List available connections with optional filtering");
 var ConnectionItemSchema = withFormatter(connections.ConnectionItemSchema, {
   format: (item) => {
     const details = [];
@@ -2356,7 +2374,7 @@ var ListClientCredentialsQuerySchema = clientCredentials.ListClientCredentialsQu
   maxItems: zod.z.number().min(1).optional().describe("Maximum total items to return across all pages"),
   // SDK specific property for pagination/iterable helpers
   cursor: zod.z.string().optional().describe("Cursor to start from")
-}).merge(TelemetryMarkerSchema).describe("List client credentials for the authenticated user");
+}).describe("List client credentials for the authenticated user");
 var ClientCredentialsItemSchema = withFormatter(
   clientCredentials.ClientCredentialsItemSchema,
   {
@@ -2459,7 +2477,7 @@ var listClientCredentialsPlugin = ({ context }) => {
 };
 var CreateClientCredentialsSchema = clientCredentials.CreateClientCredentialsRequestSchema.omit({ allowed_scopes: true }).extend({
   allowedScopes: zod.z.array(zod.z.enum(["credentials", "external"])).default(["external"]).describe("Scopes to allow for these credentials")
-}).merge(TelemetryMarkerSchema).describe("Create new client credentials for the authenticated user");
+}).describe("Create new client credentials for the authenticated user");
 
 // src/plugins/createClientCredentials/index.ts
 var createClientCredentialsPlugin = ({ context }) => {
@@ -2524,7 +2542,7 @@ var createClientCredentialsPlugin = ({ context }) => {
 };
 var DeleteClientCredentialsSchema = zod.z.object({
   clientId: zod.z.string().describe("The client ID of the client credentials to delete")
-}).merge(TelemetryMarkerSchema).describe("Delete client credentials by client ID");
+}).describe("Delete client credentials by client ID");
 
 // src/plugins/deleteClientCredentials/index.ts
 var deleteClientCredentialsPlugin = ({ context }) => {
@@ -2588,8 +2606,7 @@ var GetAppSchema = zod.z.object({
 var getAppPlugin = ({ sdk, context }) => {
   async function getApp(options) {
     const appsIterable = sdk.listApps({
-      appKeys: [options.appKey],
-      _telemetry: { isNested: true }
+      appKeys: [options.appKey]
     }).items();
     for await (const app of appsIterable) {
       return {
@@ -2630,13 +2647,13 @@ var GetActionSchema = zod.z.object({
   appKey: AppKeyPropertySchema,
   actionType: ActionTypePropertySchema,
   actionKey: ActionKeyPropertySchema
-}).merge(TelemetryMarkerSchema).describe("Get detailed information about a specific action");
+}).describe("Get detailed information about a specific action");
 
 // src/plugins/getAction/index.ts
 var getActionPlugin = ({ sdk, context }) => {
   async function getAction(options) {
     const { actionKey, actionType, appKey } = options;
-    for await (const action of sdk.listActions({ appKey, _telemetry: { isNested: true } }).items()) {
+    for await (const action of sdk.listActions({ appKey }).items()) {
       if ((action.key === actionKey || action.id === actionKey) && action.action_type === actionType) {
         return { data: action };
       }
@@ -2725,8 +2742,7 @@ var FindFirstConnectionSchema = ListConnectionsQuerySchema.omit({
   connectionIds: true,
   pageSize: true,
   maxItems: true,
-  cursor: true,
-  _telemetry: true
+  cursor: true
 }).describe("Find the first connection matching the criteria");
 
 // src/plugins/findFirstConnection/index.ts
@@ -2734,8 +2750,7 @@ var findFirstConnectionPlugin = ({ sdk, context }) => {
   async function findFirstConnection(options = {}) {
     const connectionsResponse = await sdk.listConnections({
       ...options,
-      maxItems: 1,
-      _telemetry: { isNested: true }
+      maxItems: 1
     });
     if (connectionsResponse.data.length === 0) {
       throw new ZapierResourceNotFoundError(
@@ -2777,8 +2792,7 @@ var FindUniqueConnectionSchema = ListConnectionsQuerySchema.omit({
   connectionIds: true,
   pageSize: true,
   maxItems: true,
-  cursor: true,
-  _telemetry: true
+  cursor: true
 }).describe("Find a unique connection matching the criteria");
 
 // src/plugins/findUniqueConnection/index.ts
@@ -2786,9 +2800,8 @@ var findUniqueConnectionPlugin = ({ sdk, context }) => {
   async function findUniqueConnection(options = {}) {
     const connectionsResponse = await sdk.listConnections({
       ...options,
-      maxItems: 2,
+      maxItems: 2
       // Get up to 2 to check for uniqueness
-      _telemetry: { isNested: true }
     });
     if (connectionsResponse.data.length === 0) {
       throw new ZapierResourceNotFoundError(
@@ -2910,8 +2923,7 @@ var runActionPlugin = ({ sdk, context }) => {
     const actionData = await sdk.getAction({
       appKey,
       actionKey,
-      actionType,
-      _telemetry: { isNested: true }
+      actionType
     });
     if (actionData.data.action_type !== actionType) {
       throw new ZapierValidationError(
@@ -2990,7 +3002,7 @@ var RelayRequestSchema = zod.z.object({
     zod.z.instanceof(Headers),
     zod.z.array(zod.z.tuple([zod.z.string(), zod.z.string()]))
   ]).optional().describe("Request headers")
-}).merge(TelemetryMarkerSchema).describe("Make authenticated HTTP requests through Zapier's Relay service");
+}).describe("Make authenticated HTTP requests through Zapier's Relay service");
 var RelayFetchSchema = RelayRequestSchema;
 
 // src/utils/logging.ts
@@ -3023,8 +3035,7 @@ var requestPlugin = ({ sdk, context }) => {
       body,
       headers,
       connectionId: resolvedConnectionId,
-      callbackUrl,
-      _telemetry: { isNested: true }
+      callbackUrl
     });
   }
   const requestDefinition = createFunction(
@@ -5391,7 +5402,7 @@ function getCpuTime() {
 
 // package.json
 var package_default = {
-  version: "0.29.0"};
+  version: "0.30.0"};
 
 // src/plugins/eventEmission/builders.ts
 function createBaseEvent(context = {}) {