apollo-link - npm Package Compare versions

Comparing version 0.6.1-beta.1 to 0.6.1-beta.4

package.json

 {
   "name": "apollo-link",
-  "version": "0.6.1-beta.1",
+  "version": "0.6.1-beta.4",
   "description": "Flexible, lightweight transport layer for GraphQL",
@@ -13,6 +13,6 @@ "author": "Evans Hauser <[e-mail]>",
   "license": "MIT",
-  "main": "./dist/src/bundle.umd.js",
-  "module": "./dist/src/index.js",
-  "jsnext:main": "./dist/src/index.js",
-  "typings": "./dist/src/index.d.ts",
+  "main": "./lib/bundle.umd.js",
+  "module": "./lib/index.js",
+  "jsnext:main": "./lib/index.js",
+  "typings": "./lib/index.d.ts",
   "repository": {
@@ -27,51 +27,45 @@ "type": "git",
   "scripts": {
-    "pretest": "npm run build-test",
-    "test": "npm run test-only --",
-    "posttest": "npm run lint",
-    "test-only": "mocha --reporter spec --full-trace dist/tests/tests.js",
-    "test-watch":
-      "mocha --reporter spec --full-trace dist/tests/tests.js --watch",
-    "coverage":
-      "istanbul cover ./node_modules/mocha/bin/_mocha -- --reporter dot --full-trace dist/tests/tests.js",
-    "postcoverage":
-      "remap-istanbul --input coverage/coverage.json --type lcovonly --output coverage/lcov.info",
-    "lint":
-      "tslint --type-check -p tsconfig.test.json src/*.ts && tslint --type-check -p tsconfig.test.json tests/*.ts",
-    "prebuild": "npm run clean:dist",
+    "build:browser": "browserify ./lib/bundle.umd.js -o=./lib/bundle.js --i apollo-utilities --i zen-observable-ts && npm run minify:browser",
     "build": "tsc -p .",
-    "build-test": "tsc -p tsconfig.test.json",
+    "bundle": "rollup -c",
+    "clean": "rimraf lib/* && rimraf coverage/*",
+    "filesize": "npm run build && npm run build:browser",
+    "lint": "tslint --type-check -p tsconfig.json -c ../../tslint.json src/*.ts",
+    "minify:browser": "uglifyjs -c -m -o ./lib/bundle.min.js -- ./lib/bundle.js",
     "postbuild": "npm run bundle",
-    "postbuild-test": "npm run bundle",
-    "bundle": "rollup -c",
-    "watch": "tsc -w -p .",
-    "clean": "npm run clean:dist && npm run clean:coverage",
-    "clean:dist": "rimraf dist/*",
-    "clean:coverage": "rimraf coverage/*",
-    "prepublishOnly": "npm run clean && npm run build"
+    "prebuild": "npm run clean",
+    "prepublishOnly": "npm run clean && npm run build",
+    "test": "jest",
+    "watch": "tsc -w -p ."
   },
   "dependencies": {
-    "graphql": "^0.10.3",
-    "graphql-tag": "^2.4.2",
-    "zen-observable-ts": "^0.4.3-beta.0"
+    "apollo-utilities": "^0.2.0-beta.0",
+    "zen-observable-ts": "^0.4.3-beta.3"
   },
   "devDependencies": {
-    "@types/chai": "4.0.4",
-    "@types/chai-as-promised": "0.0.31",
     "@types/graphql": "0.10.2",
-    "@types/mocha": "2.2.42",
-    "@types/sinon": "2.3.3",
-    "chai": "4.1.1",
-    "chai-as-promised": "7.1.1",
-    "fetch-mock": "5.12.2",
-    "istanbul": "0.4.5",
-    "lodash": "4.17.4",
-    "mocha": "3.5.0",
-    "remap-istanbul": "0.9.5",
+    "@types/jest": "^20.0.8",
+    "browserify": "^14.4.0",
+    "graphql": "^0.11.3",
+    "graphql-tag": "^2.4.2",
+    "jest": "^21.1.0",
     "rimraf": "2.6.1",
     "rollup": "^0.45.2",
-    "sinon": "3.2.0",
-    "source-map-support": "0.4.16",
+    "ts-jest": "^21.0.1",
     "tslint": "5.7.0",
-    "typescript": "2.5.1"
+    "typescript": "2.5.1",
+    "uglify-js": "^3.1.1"
+  },
+  "jest": {
+    "transform": {
+      ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "json"
+    ]
   }
 }

rollup.config.js

 export default {
-  entry: 'dist/src/index.js',
-  dest: 'dist/src/bundle.umd.js',
+  entry: './lib/index.js',
+  dest: './lib/bundle.umd.js',
   format: 'umd',
@@ -8,10 +8,7 @@ sourceMap: true,
   exports: 'named',
-  onwarn
+  onwarn,
 };
 
 function onwarn(message) {
-  const suppressed = [
-    'UNRESOLVED_IMPORT',
-    'THIS_IS_UNDEFINED'
-  ];
+  const suppressed = ['UNRESOLVED_IMPORT', 'THIS_IS_UNDEFINED'];
 
@@ -18,0 +15,0 @@ if (!suppressed.find(code => message.code === code)) {

src/index.ts

@@ -1,2 +0,2 @@
-import { execute, ApolloLink } from './link';
+export * from './link';
 export { makePromise } from './linkUtils';
@@ -8,3 +8,2 @@ export * from './types';
 
-export default ApolloLink;
-export { Observable, ApolloLink, execute };
+export { Observable };

src/link.ts

@@ -0,1 +1,3 @@
+import Observable from 'zen-observable-ts';
+
 import {
@@ -11,106 +13,109 @@ GraphQLRequest,
   validateOperation,
-  toLink,
   isTerminating,
   LinkError,
+  transformOperation,
 } from './linkUtils';
 
-import gql from 'graphql-tag';
+const passthrough = (op, forward) => (forward ? forward(op) : Observable.of());
 
-import Observable from 'zen-observable-ts';
-import {
-  DocumentNode,
-  DefinitionNode,
-  OperationDefinitionNode,
-} from 'graphql/language/ast';
+const toLink = (handler: RequestHandler | ApolloLink) =>
+  typeof handler === 'function' ? new ApolloLink(handler) : handler;
 
-export abstract class ApolloLink {
-  public static from(links: (ApolloLink | RequestHandler)[]) {
-    if (links.length === 0) {
-      return ApolloLink.empty();
-    }
+export const empty = (): ApolloLink =>
+  new ApolloLink((op, forward) => Observable.of());
 
-    return links.map(toLink).reduce((x, y) => x.concat(y));
+export const from = (links: ApolloLink[]): ApolloLink => {
+  if (links.length === 0) return empty();
+
+  return links.map(toLink).reduce((x, y) => x.concat(y));
+};
+
+export const split = (
+  test: (op: Operation) => boolean,
+  left: ApolloLink | RequestHandler,
+  right: ApolloLink | RequestHandler = new ApolloLink(passthrough),
+): ApolloLink => {
+  const leftLink = toLink(left);
+  const rightLink = toLink(right);
+
+  if (isTerminating(leftLink) && isTerminating(rightLink)) {
+    return new ApolloLink(operation => {
+      return test(operation)
+        ? leftLink.request(operation) || Observable.of()
+        : rightLink.request(operation) || Observable.of();
+    });
+  } else {
+    return new ApolloLink((operation, forward) => {
+      return test(operation)
+        ? leftLink.request(operation, forward) || Observable.of()
+        : rightLink.request(operation, forward) || Observable.of();
+    });
   }
+};
 
-  public static empty(): ApolloLink {
-    return new FunctionLink((op, forward) => Observable.of());
+// join two Links together
+export const concat = (
+  first: ApolloLink | RequestHandler,
+  second: ApolloLink | RequestHandler,
+) => {
+  const firstLink = toLink(first);
+  if (isTerminating(firstLink)) {
+    console.warn(
+      new LinkError(
+        `You are calling concat on a terminating link, which will have no effect`,
+        firstLink,
+      ),
+    );
+    return firstLink;
   }
+  const nextLink = toLink(second);
 
-  public static passthrough(): ApolloLink {
-    return new FunctionLink(
-      (op, forward) => (forward ? forward(op) : Observable.of()),
+  if (isTerminating(nextLink)) {
+    return new ApolloLink(
+      operation =>
+        firstLink.request(
+          operation,
+          op => nextLink.request(op) || Observable.of(),
+        ) || Observable.of(),
     );
+  } else {
+    return new ApolloLink((operation, forward) => {
+      return (
+        firstLink.request(operation, op => {
+          return nextLink.request(op, forward) || Observable.of();
+        }) || Observable.of()
+      );
+    });
   }
+};
 
-  // split allows for creating a split point in an execution chain
-  // like filter, it can be used to direct operations based
-  // on request information. Instead of dead ending an execution,
-  // split allows for new chains to be formed.
-  public static split(
-    test: (op: Operation) => boolean,
-    left: ApolloLink | RequestHandler,
-    right: ApolloLink | RequestHandler = ApolloLink.passthrough(),
-  ): ApolloLink {
-    const leftLink = toLink(left);
-    const rightLink = toLink(right);
-
-    if (isTerminating(leftLink) && isTerminating(rightLink)) {
-      return new FunctionLink(operation => {
-        return test(operation)
-          ? leftLink.request(operation) || Observable.of()
-          : rightLink.request(operation) || Observable.of();
-      });
-    } else {
-      return new FunctionLink((operation, forward) => {
-        return test(operation)
-          ? leftLink.request(operation, forward) || Observable.of()
-          : rightLink.request(operation, forward) || Observable.of();
-      });
-    }
+// XXX add in type support for context manipulation
+// XXX remove mutability of context
+export class ApolloLink {
+  constructor(request?: RequestHandler) {
+    if (request) this.request = request;
   }
 
+  public static empty = empty;
+  public static from = from;
+  public static split = split;
+
   public split(
     test: (op: Operation) => boolean,
     left: ApolloLink | RequestHandler,
-    right: ApolloLink | RequestHandler = ApolloLink.passthrough(),
+    right: ApolloLink | RequestHandler = new ApolloLink(passthrough),
   ): ApolloLink {
-    return this.concat(ApolloLink.split(test, left, right));
+    return this.concat(split(test, left, right));
   }
 
-  // join two Links together
   public concat(next: ApolloLink | RequestHandler): ApolloLink {
-    if (isTerminating(this)) {
-      console.warn(
-        new LinkError(
-          `You are calling concat on a terminating link, which will have no effect`,
-          this,
-        ),
-      );
-      return this;
-    }
-    const nextLink = toLink(next);
-
-    if (isTerminating(nextLink)) {
-      return new FunctionLink(
-        operation =>
-          this.request(
-            operation,
-            op => nextLink.request(op) || Observable.of(),
-          ) || Observable.of(),
-      );
-    } else {
-      return new FunctionLink((operation, forward) => {
-        return (
-          this.request(operation, op => {
-            return nextLink.request(op, forward) || Observable.of();
-          }) || Observable.of()
-        );
-      });
-    }
+    return concat(this, next);
   }
 
-  public abstract request(
+  public request(
     operation: Operation,
     forward?: NextLink,
-  ): Observable<FetchResult> | null;
+  ): Observable<FetchResult> | null {
+    throw new Error('request is not implemented');
+  }
 }
@@ -122,67 +127,6 @@
 ): Observable<FetchResult> {
-  const copy = { ...operation };
+  const copy = { context: {}, variables: {}, extensions: {}, ...operation };
   validateOperation(copy);
 
-  if (!copy.context) {
-    copy.context = {};
-  }
-  if (!copy.variables) {
-    copy.variables = {};
-  }
-  if (!copy.query) {
-    console.warn(`query should either be a string or GraphQL AST`);
-    copy.query = <DocumentNode>{};
-  }
-
   return link.request(transformOperation(copy)) || Observable.of();
 }
-
-function getName(node: OperationDefinitionNode) {
-  return node && node.name && node.name.kind === 'Name' && node.name.value;
-}
-
-function transformOperation(operation: GraphQLRequest): Operation {
-  let transformedOperation: Operation;
-
-  if (typeof operation.query === 'string') {
-    transformedOperation = {
-      ...operation,
-      query: gql(operation.query),
-    };
-  } else {
-    transformedOperation = {
-      ...operation,
-    } as Operation;
-  }
-
-  if (transformedOperation.query && transformedOperation.query.definitions) {
-    if (!transformedOperation.operationName) {
-      const operationTypes = ['query', 'mutation', 'subscription'];
-      const definitions = <OperationDefinitionNode[]>transformedOperation.query.definitions.filter(
-        (x: DefinitionNode) =>
-          x.kind === 'OperationDefinition' &&
-          operationTypes.indexOf(x.operation) >= 0,
-      );
-
-      transformedOperation.operationName = getName(definitions[0]) || '';
-    }
-  } else if (!transformedOperation.operationName) {
-    transformedOperation.operationName = '';
-  }
-
-  return transformedOperation;
-}
-
-export class FunctionLink extends ApolloLink {
-  constructor(public f: RequestHandler) {
-    super();
-    this.request = f;
-  }
-
-  public request(
-    operation: Operation,
-    forward: NextLink,
-  ): Observable<FetchResult> {
-    throw Error('should be overridden');
-  }
-}

src/linkUtils.ts

@@ -1,9 +0,16 @@
-import { GraphQLRequest, RequestHandler } from './types';
+import { getOperationName } from 'apollo-utilities';
+import Observable from 'zen-observable-ts';
 
-import { ApolloLink, FunctionLink } from './link';
+import { GraphQLRequest, Operation } from './types';
+import { ApolloLink } from './link';
 
-import Observable from 'zen-observable-ts';
-
 export function validateOperation(operation: GraphQLRequest): GraphQLRequest {
-  const OPERATION_FIELDS = ['query', 'operationName', 'variables', 'context'];
+  const OPERATION_FIELDS = [
+    'query',
+    'operationName',
+    'variables',
+    'context',
+    'extensions',
+  ];
+  if (!operation.query) throw new Error('ApolloLink requires a query');
   for (let key of Object.keys(operation)) {
@@ -26,10 +33,2 @@ if (OPERATION_FIELDS.indexOf(key) < 0) {
 
-export function toLink(link: ApolloLink | RequestHandler): ApolloLink {
-  if (typeof link === 'function') {
-    return new FunctionLink(link);
-  } else {
-    return link as ApolloLink;
-  }
-}
-
 export function isTerminating(link: ApolloLink): boolean {
@@ -57,1 +56,15 @@ return link.request.length <= 1;
 }
+
+export function transformOperation(operation: GraphQLRequest): Operation {
+  const transformedOperation: Operation = { ...operation };
+
+  // best guess at an operation name
+  if (!transformedOperation.operationName) {
+    transformedOperation.operationName =
+      typeof transformedOperation.query !== 'string'
+        ? getOperationName(transformedOperation.query)
+        : '';
+  }
+
+  return transformedOperation as Operation;
+}

src/test-utils/testingUtils.ts

@@ -1,4 +0,2 @@
-import { assert } from 'chai';
-import * as sinon from 'sinon';
-import * as Links from '../link';
+import { execute, ApolloLink } from '../link';
 
@@ -13,12 +11,9 @@ const sampleQuery = `
 
-export function checkCalls<T>(
-  calls: Array<sinon.SinonSpyCall>,
-  results: Array<T>,
-) {
-  assert.deepEqual(calls.length, results.length);
-  calls.map((call, i) => assert.deepEqual(call.args[0].data, results[i]));
+export function checkCalls<T>(calls: any[] = [], results: Array<T>) {
+  expect(calls.length).toBe(results.length);
+  calls.map((call, i) => expect(call.data).toEqual(results[i]));
 }
 
 export interface TestResultType {
-  link: Links.ApolloLink;
+  link: ApolloLink;
   results?: any[];
@@ -37,8 +32,8 @@ query?: string;
 
-  const spy = sinon.spy();
-  Links.execute(link, { query, context, variables }).subscribe({
+  const spy = jest.fn();
+  execute(link, { query, context, variables }).subscribe({
     next: spy,
     error: error => {
-      assert(error, results.pop());
-      checkCalls(spy.getCalls(), results);
+      expect(error).toEqual(results.pop());
+      checkCalls(spy.mock.calls[0], results);
       if (done) {
@@ -49,3 +44,3 @@ done();
     complete: () => {
-      checkCalls(spy.getCalls(), results);
+      checkCalls(spy.mock.calls[0], results);
       if (done) {
@@ -52,0 +47,0 @@ done();

src/types.ts

@@ -5,14 +5,12 @@ import Observable from 'zen-observable-ts';
 export interface GraphQLRequest {
-  query?: string | DocumentNode;
+  query: string | DocumentNode;
   variables?: Record<string, any>;
-  context?: Record<string, any>;
-}
-
-export interface Operation {
-  query: DocumentNode;
-  variables?: Record<string, any>;
   operationName?: string;
   context?: Record<string, any>;
+  extensions?: Record<string, any>;
 }
 
+// backwards compat
+export type Operation = GraphQLRequest;
+
 export type FetchResult<
@@ -19,0 +17,0 @@ C = Record<string, any>,

tsconfig.json

 {
   "extends": "../../tsconfig",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "."
+    "rootDir": "./src",
+    "outDir": "lib"
   },
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/__tests__/*.ts"]
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

79246

increased by24.36%

Dependency count

2

decreased by-33.33%

Dev dependency count

12

decreased by-33.33%

Number of package files

40

increased by2.56%

Lines of code

1707

increased by61.95%

Worsened metrics

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addedapollo-utilities@^0.2.0-beta.0

• + Addedapollo-utilities@0.2.0-rc.3(transitive)

• - Removedgraphql@^0.10.3

• - Removedgraphql-tag@^2.4.2

• - Removedgraphql@0.10.5(transitive)

• - Removedgraphql-tag@2.12.6(transitive)

• - Removediterall@1.3.0(transitive)

• - Removedtslib@2.8.1(transitive)

• Updatedzen-observable-ts@^0.4.3-beta.3