apollo-link-core - npm Package Compare versions

Comparing version 0.2.0 to 0.3.0

dist/src/link.js

@@ -102,2 +102,5 @@ "use strict";
 exports.execute = execute;
+function getName(node) {
+    return node && node.name && node.name.kind === 'Name' && node.name.value;
+}
 function transformOperation(operation) {
@@ -111,4 +114,4 @@ var transformedOperation;
     }
-    if (!transformedOperation.operationName) {
-        if (transformedOperation.query && transformedOperation.query.definitions) {
+    if (transformedOperation.query && transformedOperation.query.definitions) {
+        if (!transformedOperation.operationName) {
             var operationTypes_1 = ['query', 'mutation', 'subscription'];
@@ -119,14 +122,8 @@ var definitions = transformedOperation.query.definitions.filter(function (x) {
             });
-            if (definitions.length) {
-                var definition = definitions[0];
-                var hasName = definition.name && definition.name.kind === 'Name';
-                transformedOperation.operationName = hasName
-                    ? definitions[0].name.value
-                    : '';
-            }
+            transformedOperation.operationName = getName(definitions[0]) || '';
         }
-        else {
-            transformedOperation.operationName = '';
-        }
     }
+    else if (!transformedOperation.operationName) {
+        transformedOperation.operationName = '';
+    }
     return transformedOperation;
@@ -133,0 +130,0 @@ }

dist/tests/link.js

@@ -43,9 +43,11 @@ "use strict";
         });
-        it('should pass error to observable\'s error', function (done) {
+        it("should pass error to observable's error", function (done) {
             var error = new Error('thrown');
             var returnOne = new test_utils_1.SetContextLink(setContext);
-            var mock = new test_utils_1.MockLink(function (op) { return new zen_observable_ts_1.default(function (observer) {
-                observer.next({ data: op.context.add });
-                observer.error(error);
-            }); });
+            var mock = new test_utils_1.MockLink(function (op) {
+                return new zen_observable_ts_1.default(function (observer) {
+                    observer.next({ data: op.context.add });
+                    observer.error(error);
+                });
+            });
             var link = returnOne.concat(mock);
@@ -52,0 +54,0 @@ test_utils_2.testLinkResults({

lib/link.js

@@ -102,2 +102,5 @@ "use strict";
 exports.execute = execute;
+function getName(node) {
+    return node && node.name && node.name.kind === 'Name' && node.name.value;
+}
 function transformOperation(operation) {
@@ -111,4 +114,4 @@ var transformedOperation;
     }
-    if (!transformedOperation.operationName) {
-        if (transformedOperation.query && transformedOperation.query.definitions) {
+    if (transformedOperation.query && transformedOperation.query.definitions) {
+        if (!transformedOperation.operationName) {
             var operationTypes_1 = ['query', 'mutation', 'subscription'];
@@ -119,14 +122,8 @@ var definitions = transformedOperation.query.definitions.filter(function (x) {
             });
-            if (definitions.length) {
-                var definition = definitions[0];
-                var hasName = definition.name && definition.name.kind === 'Name';
-                transformedOperation.operationName = hasName
-                    ? definitions[0].name.value
-                    : '';
-            }
+            transformedOperation.operationName = getName(definitions[0]) || '';
         }
-        else {
-            transformedOperation.operationName = '';
-        }
     }
+    else if (!transformedOperation.operationName) {
+        transformedOperation.operationName = '';
+    }
     return transformedOperation;
@@ -133,0 +130,0 @@ }

package.json

 {
   "name": "apollo-link-core",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Flexible, lightweight transport layer for GraphQL",
@@ -33,5 +33,5 @@ "author": "Evans Hauser <[e-mail]>",
     "prebuild": "npm run clean:dist",
-    "build": "tsc",
+    "build": "tsc -p .",
     "postbuild": "cp -R ./dist/src/. ./lib",
-    "watch": "tsc -w",
+    "watch": "tsc -w -p .",
     "clean": "npm run clean:dist && npm run clean:coverage",
@@ -45,3 +45,3 @@ "clean:dist": "rimraf dist/* && rimraf lib/*",
     "graphql-tag": "^2.4.2",
-    "zen-observable-ts": "^0.1.0"
+    "zen-observable-ts": "^0.2.0"
   },
@@ -67,5 +67,4 @@ "devDependencies": {
   "optionalDependencies": {
-    "@types/graphql": "~0.9.0",
-    "@types/zen-observable": "^0.5.1"
+    "@types/graphql": "~0.9.0"
   }
 }

src/link.ts

@@ -141,2 +141,6 @@ import {
 
+function getName(node: OperationDefinitionNode) {
+  return node && node.name && node.name.kind === 'Name' && node.name.value;
+}
+
 function transformOperation(operation: GraphQLRequest): Operation {
@@ -156,4 +160,4 @@ let transformedOperation: Operation;
 
-  if (!transformedOperation.operationName) {
-    if (transformedOperation.query && transformedOperation.query.definitions) {
+  if (transformedOperation.query && transformedOperation.query.definitions) {
+    if (!transformedOperation.operationName) {
       const operationTypes = ['query', 'mutation', 'subscription'];
@@ -166,12 +170,6 @@ const definitions = <OperationDefinitionNode[]>transformedOperation.query.definitions.filter(
 
-      if (definitions.length) {
-        const definition = definitions[0];
-        const hasName = definition.name && definition.name.kind === 'Name';
-        transformedOperation.operationName = hasName
-          ? definitions[0].name.value
-          : '';
-      }
-    } else {
-      transformedOperation.operationName = '';
+      transformedOperation.operationName = getName(definitions[0]) || '';
     }
+  } else if (!transformedOperation.operationName) {
+    transformedOperation.operationName = '';
   }
@@ -178,0 +176,0 @@

No alert changes

Improved metrics

Dependency count

4

decreased by-20%

Worsened metrics

Total package byte prevSize

160357

decreased by-45.93%

Number of package files

71

decreased by-18.39%

Lines of code

2977

decreased by-12.49%

Dependency changes

• + Addedzen-observable-ts@0.2.0(transitive)

• - Removed@types/zen-observable@0.5.4(transitive)

• - Removedzen-observable-ts@0.1.0(transitive)

• Updatedzen-observable-ts@^0.2.0