@envelop/newrelic 4.1.0-alpha-c0cc559.0 → 5.0.0-alpha-d0d0776.0

package/index.js

@@ -2,28 +2,27 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+const core = require('@envelop/core');
+const graphql = require('graphql');
+
 function _interopNamespace(e) {
-    if (e && e.__esModule) { return e; } else {
-        var n = {};
-        if (e) {
-            Object.keys(e).forEach(function (k) {
-                var d = Object.getOwnPropertyDescriptor(e, k);
+    if (e && e.__esModule) return e;
+    const n = Object.create(null);
+    if (e) {
+        for (const k in e) {
+            if (k !== 'default') {
+                const d = Object.getOwnPropertyDescriptor(e, k);
                 Object.defineProperty(n, k, d.get ? d : {
                     enumerable: true,
-                    get: function () {
-                        return e[k];
-                    }
+                    get: function () { return e[k]; }
                 });
-            });
+            }
         }
-        n['default'] = e;
-        return n;
     }
+    n["default"] = e;
+    return Object.freeze(n);
 }
 
-const core = require('@envelop/core');
-const graphql = require('graphql');
-
 var AttributeName;
 (function (AttributeName) {
     AttributeName["COMPONENT_NAME"] = "Envelop_NewRelic_Plugin";
@@ -58,7 +57,7 @@ const useNewRelic = (rawOptions) => {
     };
     options.isExecuteVariablesRegex = options.includeExecuteVariables instanceof RegExp;
     options.isResolverArgsRegex = options.includeResolverArgs instanceof RegExp;
-    const instrumentationApi$ = new Promise(function (resolve) { resolve(_interopNamespace(require('newrelic'))); })
+    const instrumentationApi$ = Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('newrelic')); })
         .then(m => m.default || m)
         .then(({ shim }) => {
         shim.agent.metrics.getOrCreateMetric(`Supportability/ExternalModules/${AttributeName.COMPONENT_NAME}`).incrementCallCount();
@@ -71,7 +70,6 @@ const useNewRelic = (rawOptions) => {
     });
     return {
         async onExecute({ args }) {
-            var _a, _b;
             const instrumentationApi = await instrumentationApi$;
             const transactionNameState = instrumentationApi.agent.tracer.getTransaction().nameState;
             const spanContext = instrumentationApi.agent.tracer.getSpanContext();
@@ -79,9 +77,9 @@ const useNewRelic = (rawOptions) => {
             const rootOperation = args.document.definitions.find(definitionNode => definitionNode.kind === graphql.Kind.OPERATION_DEFINITION);
             const operationType = rootOperation.operation;
             const document = graphql.print(args.document);
-            const operationName = ((_a = options.extractOperationName) === null || _a === void 0 ? void 0 : _a.call(options, args.contextValue)) ||
+            const operationName = options.extractOperationName?.(args.contextValue) ||
                 args.operationName ||
-                ((_b = rootOperation.name) === null || _b === void 0 ? void 0 : _b.value) ||
+                rootOperation.name?.value ||
                 AttributeName.ANONYMOUS_OPERATION;
             let rootFields = null;
             if (options.rootFieldsNaming) {
@@ -138,7 +136,6 @@ const useNewRelic = (rawOptions) => {
                 onResolverCalled,
                 onExecuteDone({ result }) {
                     const sendResult = (singularResult) => {
-                        var _a;
                         if (singularResult.data && options.includeRawResult) {
                             spanContext.addCustomAttribute(AttributeName.EXECUTION_RESULT, JSON.stringify(singularResult));
                         }
@@ -146,7 +143,7 @@ const useNewRelic = (rawOptions) => {
                             const agent = instrumentationApi.agent;
                             const transaction = instrumentationApi.tracer.getTransaction();
                             for (const error of singularResult.errors) {
-                                if ((_a = options.skipError) === null || _a === void 0 ? void 0 : _a.call(options, error))
+                                if (options.skipError?.(error))
                                     continue;
                                 agent.errors.add(transaction, JSON.stringify(error));
                             }

package/index.mjs

@@ -48,7 +48,6 @@ const useNewRelic = (rawOptions) => {
     });
     return {
         async onExecute({ args }) {
-            var _a, _b;
             const instrumentationApi = await instrumentationApi$;
             const transactionNameState = instrumentationApi.agent.tracer.getTransaction().nameState;
             const spanContext = instrumentationApi.agent.tracer.getSpanContext();
@@ -56,9 +55,9 @@ const useNewRelic = (rawOptions) => {
             const rootOperation = args.document.definitions.find(definitionNode => definitionNode.kind === Kind.OPERATION_DEFINITION);
             const operationType = rootOperation.operation;
             const document = print(args.document);
-            const operationName = ((_a = options.extractOperationName) === null || _a === void 0 ? void 0 : _a.call(options, args.contextValue)) ||
+            const operationName = options.extractOperationName?.(args.contextValue) ||
                 args.operationName ||
-                ((_b = rootOperation.name) === null || _b === void 0 ? void 0 : _b.value) ||
+                rootOperation.name?.value ||
                 AttributeName.ANONYMOUS_OPERATION;
             let rootFields = null;
             if (options.rootFieldsNaming) {
@@ -115,7 +114,6 @@ const useNewRelic = (rawOptions) => {
                 onResolverCalled,
                 onExecuteDone({ result }) {
                     const sendResult = (singularResult) => {
-                        var _a;
                         if (singularResult.data && options.includeRawResult) {
                             spanContext.addCustomAttribute(AttributeName.EXECUTION_RESULT, JSON.stringify(singularResult));
                         }
@@ -123,7 +121,7 @@ const useNewRelic = (rawOptions) => {
                             const agent = instrumentationApi.agent;
                             const transaction = instrumentationApi.tracer.getTransaction();
                             for (const error of singularResult.errors) {
-                                if ((_a = options.skipError) === null || _a === void 0 ? void 0 : _a.call(options, error))
+                                if (options.skipError?.(error))
                                     continue;
                                 agent.errors.add(transaction, JSON.stringify(error));
                             }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@envelop/newrelic",
-  "version": "4.1.0-alpha-c0cc559.0",
+  "version": "5.0.0-alpha-d0d0776.0",
   "sideEffects": false,
   "peerDependencies": {
-    "@envelop/core": "2.4.0-alpha-c0cc559.0",
+    "@envelop/core": "3.0.0-alpha-d0d0776.0",
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
     "newrelic": "^7 || ^8.0.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/dotansimha/envelop.git",
+    "url": "https://github.com/n1ru4l/envelop.git",
     "directory": "packages/plugins/newrelic"
   },
   "author": "Santino Puleio <santinopuleio@gmail.com>",
@@ -22,12 +22,24 @@
   },
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
+      "require": {
+        "default": "./index.js",
+        "types": "./index.d.ts"
+      },
+      "import": {
+        "default": "./index.mjs",
+        "types": "./index.d.ts"
+      }
     },
     "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
+      "require": {
+        "default": "./*.js",
+        "types": "./*.d.ts"
+      },
+      "import": {
+        "default": "./*.mjs",
+        "types": "./*.d.ts"
+      }
     },
     "./package.json": "./package.json"
   }