BREAKING use Typescript strict mode

This is breaking because:

- `ApolloBase.client` throws an error if no client has been created
  beforehand. The behavior now matches the typing that always declared a
  client existed. In most cases, you should pass either `apolloOptions`
  or `apolloNamedOptions` to `Apollo.constructor` to create the
  client immediately upon construction.
- `ApolloBase.query()`, `ApolloBase.mutate()` and
  `ApolloBase.subscribe()` all have a new constraint on `V`. If you
  inherit from this class, you might need to adjust your typing.
- Classes that inherit `Query`, `Mutation` and `Subscription` must
  declare the `document` member. This requirement always existed at
  runtime but was not enforced at compile time until now. If you
  generated code, you have nothing to do.
- `QueryRef.getLastResult()` and `QueryRef.getLastError()` might return
  `undefined`. This was always the case, but was typed incorrectly until
  now.
- `pickFlag()` was dropped without any replacement.
- `createPersistedQueryLink()` requires options. This was always the
  case but was typed incorrectly until now.

.changeset/chilly-spiders-protect.md

@@ -0,0 +1,26 @@
+---
+"apollo-angular": major
+---
+
+BREAKING use Typescript strict mode
+
+This is breaking because:
+
+- `ApolloBase.client` throws an error if no client has been created
+  beforehand. The behavior now matches the typing that always declared a
+  client existed. In most cases, you should pass either `apolloOptions`
+  or `apolloNamedOptions` to `Apollo.constructor` to create the
+  client immediately upon construction.
+- `ApolloBase.query()`, `ApolloBase.mutate()` and
+  `ApolloBase.subscribe()` all have a new constraint on `V`. If you
+  inherit from this class, you might need to adjust your typing.
+- Classes that inherit `Query`, `Mutation` and `Subscription` must
+  declare the `document` member. This requirement always existed at
+  runtime but was not enforced at compile time until now. If you generated
+  code, you have nothing to do.
+- `QueryRef.getLastResult()` and `QueryRef.getLastError()` might return
+  `undefined`. This was always the case, but was typed incorrectly until
+  now.
+- `pickFlag()` was dropped without any replacement.
+- `createPersistedQueryLink()` requires options. This was always the
+  case but was typed incorrectly until now.

packages/apollo-angular/http/src/http-batch-link.ts

@@ -11,12 +11,27 @@ import { BatchHandler, BatchLink } from '@apollo/client/link/batch';
 import { BatchOptions, Body, Context, OperationPrinter, Options, Request } from './types';
 import { createHeadersWithClientAwareness, fetch, mergeHeaders, prioritize } from './utils';
 
-const defaults = {
+export const defaults = {
   batchInterval: 10,
   batchMax: 10,
   uri: 'graphql',
   method: 'POST',
-};
+  withCredentials: false,
+  includeQuery: true,
+  includeExtensions: false,
+  useMultipart: false,
+} as const;
+
+/**
+ * Decides which value to pick from Context, Options or defaults
+ */
+export function pick<K extends keyof Omit<typeof defaults, 'batchInterval' | 'batchMax'>>(
+  context: Context,
+  options: Options,
+  key: K,
+): ReturnType<typeof prioritize<Context[K] | Options[K] | (typeof defaults)[K]>> {
+  return prioritize(context[key], options[key], defaults[key]);
+}
 
 export class HttpBatchLinkHandler extends ApolloLink {
   public batcher: ApolloLink;
@@ -87,13 +102,15 @@ export class HttpBatchLinkHandler extends ApolloLink {
     });
   }
 
-  private createOptions(operations: Operation[]): Options {
+  private createOptions(
+    operations: Operation[],
+  ): Required<Pick<Options, 'method' | 'uri' | 'withCredentials'>> {
     const context: Context = operations[0].getContext();
 
     return {
-      method: prioritize(context.method, this.options.method, defaults.method),
-      uri: prioritize(context.uri, this.options.uri, defaults.uri),
-      withCredentials: prioritize(context.withCredentials, this.options.withCredentials),
+      method: pick(context, this.options, 'method'),
+      uri: pick(context, this.options, 'uri'),
+      withCredentials: pick(context, this.options, 'withCredentials'),
     };
   }
 
@@ -147,15 +164,15 @@ export class HttpBatchLinkHandler extends ApolloLink {
     }
 
     const headers =
-      context.headers && context.headers.keys().map((k: string) => context.headers.get(k));
+      context.headers && context.headers.keys().map((k: string) => context.headers!.get(k));
 
     const opts = JSON.stringify({
       includeQuery: context.includeQuery,
       includeExtensions: context.includeExtensions,
       headers,
     });
 
-    return prioritize(context.uri, this.options.uri) + opts;
+    return prioritize(context.uri, this.options.uri, '') + opts;
   }
 
   public request(op: Operation): LinkObservable<FetchResult> | null {

packages/apollo-angular/http/src/http-link.ts

@@ -7,8 +7,9 @@ import {
   Observable as LinkObservable,
   Operation,
 } from '@apollo/client/core';
+import { pick } from './http-batch-link';
 import { Body, Context, OperationPrinter, Options, Request } from './types';
-import { createHeadersWithClientAwareness, fetch, mergeHeaders, prioritize } from './utils';
+import { createHeadersWithClientAwareness, fetch, mergeHeaders } from './utils';
 
 // XXX find a better name for it
 export class HttpLinkHandler extends ApolloLink {
@@ -29,20 +30,12 @@ export class HttpLinkHandler extends ApolloLink {
       new LinkObservable((observer: any) => {
         const context: Context = operation.getContext();
 
-        // decides which value to pick, Context, Options or to just use the default
-        const pick = <K extends keyof Context>(
-          key: K,
-          init?: Context[K] | Options[K],
-        ): Context[K] | Options[K] => {
-          return prioritize(context[key], this.options[key], init);
-        };
-
-        let method = pick('method', 'POST');
-        const includeQuery = pick('includeQuery', true);
-        const includeExtensions = pick('includeExtensions', false);
-        const url = pick('uri', 'graphql');
-        const withCredentials = pick('withCredentials');
-        const useMultipart = pick('useMultipart');
+        let method = pick(context, this.options, 'method');
+        const includeQuery = pick(context, this.options, 'includeQuery');
+        const includeExtensions = pick(context, this.options, 'includeExtensions');
+        const url = pick(context, this.options, 'uri');
+        const withCredentials = pick(context, this.options, 'withCredentials');
+        const useMultipart = pick(context, this.options, 'useMultipart');
         const useGETForQueries = this.options.useGETForQueries === true;
 
         const isQuery = operation.query.definitions.some(

packages/apollo-angular/http/src/utils.ts

@@ -109,26 +109,25 @@ export const fetch = (
   });
 };
 
-export const mergeHeaders = (source: HttpHeaders, destination: HttpHeaders): HttpHeaders => {
+export const mergeHeaders = (
+  source: HttpHeaders | undefined,
+  destination: HttpHeaders,
+): HttpHeaders => {
   if (source && destination) {
     const merged = destination
       .keys()
-      .reduce((headers, name) => headers.set(name, destination.getAll(name)), source);
+      .reduce((headers, name) => headers.set(name, destination.getAll(name)!), source);
 
     return merged;
   }
 
   return destination || source;
 };
 
-export function prioritize<T>(...values: T[]): T {
-  const picked = values.find(val => typeof val !== 'undefined');
-
-  if (typeof picked === 'undefined') {
-    return values[values.length - 1];
-  }
-
-  return picked;
+export function prioritize<T>(
+  ...values: [NonNullable<T>, ...T[]] | [...T[], NonNullable<T>]
+): NonNullable<T> {
+  return values.find(val => typeof val !== 'undefined') as NonNullable<T>;
 }
 
 export function createHeadersWithClientAwareness(context: Record<string, any>) {

packages/apollo-angular/persisted-queries/src/index.ts

@@ -19,5 +19,5 @@ const transformLink = setContext((_, context) => {
   return ctx;
 });
 
-export const createPersistedQueryLink = (options?: Options) =>
+export const createPersistedQueryLink = (options: Options) =>
   ApolloLink.from([_createPersistedQueryLink(options), transformLink as any]);

packages/apollo-angular/persisted-queries/tests/persisted-queries.spec.ts

@@ -1,4 +1,4 @@
-import { ApolloLink, execute, gql, Observable, Operation } from '@apollo/client/core';
+import { ApolloLink, execute, FetchResult, gql, Observable, Operation } from '@apollo/client/core';
 import { createPersistedQueryLink } from '../src';
 
 const query = gql`
@@ -23,7 +23,7 @@ class MockLink extends ApolloLink {
   }
 
   public request(operation: Operation) {
-    return new Observable(observer => {
+    return new Observable<FetchResult>(observer => {
       const request: any = {};
 
       if (operation.getContext().includeQuery) {

packages/apollo-angular/schematics/install/index.ts

@@ -74,7 +74,7 @@ function addDependencies(options: Schema): Rule {
 function includeAsyncIterableLib(): Rule {
   const requiredLib = 'esnext.asynciterable';
 
-  function updateFn(tsconfig: any) {
+  function updateFn(tsconfig: any): boolean {
     const compilerOptions: CompilerOptions = tsconfig.compilerOptions;
 
     if (
@@ -85,6 +85,8 @@ function includeAsyncIterableLib(): Rule {
       compilerOptions.lib.push(requiredLib);
       return true;
     }
+
+    return false;
   }
 
   return (host: Tree) => {
@@ -127,7 +129,7 @@ function updateTSConfig(
 }
 
 function allowSyntheticDefaultImports(): Rule {
-  function updateFn(tsconfig: any) {
+  function updateFn(tsconfig: any): boolean {
     if (
       tsconfig?.compilerOptions &&
       tsconfig?.compilerOptions?.lib &&
@@ -136,6 +138,8 @@ function allowSyntheticDefaultImports(): Rule {
       tsconfig.compilerOptions.allowSyntheticDefaultImports = true;
       return true;
     }
+
+    return false;
   }
 
   return (host: Tree) => {

packages/apollo-angular/schematics/install/schema.ts

@@ -1,6 +1,6 @@
 export interface Schema {
   /** Name of the project to target. */
-  project?: string;
+  project: string;
   /** Url to your GraphQL endpoint */
   endpoint?: string;
   /** Version of GraphQL (16 by default) */

packages/apollo-angular/schematics/tests/ng-add.spec.ts

@@ -18,6 +18,7 @@ describe('ng-add with module', () => {
     const { dependencies } = packageJson;
 
     const dependenciesMap = createDependenciesMap({
+      project: 'my-project',
       graphql: '16',
     });
 
@@ -72,6 +73,7 @@ describe('ng-add with standalone', () => {
     const { dependencies } = packageJson;
 
     const dependenciesMap = createDependenciesMap({
+      project: 'my-project',
       graphql: '16',
     });
 

packages/apollo-angular/schematics/utils/ast.ts

@@ -17,7 +17,7 @@ export async function addModuleImportToRootModule(
   host: Tree,
   importedModuleName: string,
   importedModulePath: string,
-  projectName?: string,
+  projectName: string,
 ) {
   const mainPath = await getMainFilePath(host, projectName);
   if (isStandaloneApp(host, mainPath)) {
@@ -67,7 +67,7 @@ function addModuleImportToModule(
   }
 
   changes
-    .filter((change: Change) => change instanceof InsertChange)
+    .filter((change: Change): change is InsertChange => change instanceof InsertChange)
     .forEach((change: InsertChange) => recorder.insertLeft(change.pos, change.toAdd));
 
   host.commitUpdate(recorder);
@@ -98,7 +98,7 @@ function _addSymbolToNgModuleMetadata(
   const matchingProperties: ts.ObjectLiteralElement[] = (
     node as ts.ObjectLiteralExpression
   ).properties
-    .filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)
+    .filter((prop): prop is ts.PropertyAssignment => prop.kind == ts.SyntaxKind.PropertyAssignment)
     // Filter out every fields that's not "metadataField". Also handles string literals
     // (but not expressions).
     .filter((prop: ts.PropertyAssignment) => {
@@ -218,7 +218,7 @@ function getDecoratorMetadata(
     source,
     ts.SyntaxKind.ImportDeclaration,
   )
-    .map((node: ts.ImportDeclaration) => _angularImportsFromNode(node, source))
+    .map(node => _angularImportsFromNode(node as ts.ImportDeclaration, source))
     .reduce((acc: { [name: string]: string }, current: { [name: string]: string }) => {
       for (const key of Object.keys(current)) {
         acc[key] = current[key];
@@ -418,7 +418,7 @@ export function insertImport(
 
   // no such import declaration exists
   const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter(
-    (n: ts.StringLiteral) => n.text === 'use strict',
+    n => (n as ts.StringLiteral).text === 'use strict',
   );
   let fallbackPos = 0;
   if (useStrict.length > 0) {