minor review changes

Author: andrewseguin

src/cdk/table/table-errors.ts

@@ -56,3 +56,11 @@ export function getTableMissingRowDefsError() {
 export function getTableUnknownDataSourceError() {
   return Error(`Provided data source did not match an array, Observable, or DataSource`);
 }
+
+/**
+ * Returns an error to be thrown when the text column cannot find a parent table to inject.
+ * @docs-private
+ */
+export function getTableTextColumnMissingParentTableError() {
+  return Error(`Text column could not find a parent table for registration.`);
+}

src/cdk/table/text-column.spec.ts

@@ -3,6 +3,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {CdkTableModule} from './table-module';
 import {expectTableToMatchContent} from './table.spec';
 import {TextColumnOptions, TEXT_COLUMN_OPTIONS} from './text-column';
+import {getTableTextColumnMissingParentTableError} from './table-errors';
 
 describe('CdkTextColumn', () => {
   let fixture: ComponentFixture<BasicTextColumnApp>;
@@ -14,6 +15,7 @@ describe('CdkTextColumn', () => {
       imports: [CdkTableModule],
       declarations: [
         BasicTextColumnApp,
+        MissingTableApp,
       ],
     }).compileComponents();
   }));
@@ -34,6 +36,12 @@ describe('CdkTextColumn', () => {
     ]);
   });
 
+  it('should throw an error if the text column is not in the content of a table', () => {
+    expect(() => TestBed.createComponent(MissingTableApp).detectChanges())
+      .toThrowError(getTableTextColumnMissingParentTableError().message);
+
+  });
+
   it('should allow for alternate header text', () => {
     component.headerTextB = 'column-b';
     fixture.detectChanges();
@@ -97,7 +105,7 @@ describe('CdkTextColumn', () => {
   });
 
   describe('with options', () => {
-    function createTestComponent(options: TextColumnOptions) {
+    function createTestComponent(options: TextColumnOptions<any>) {
       // Reset the previously configured testing module to be able set new providers.
       // The testing module has been initialized in the root describe group for the ripples.
       TestBed.resetTestingModule();
@@ -114,8 +122,8 @@ describe('CdkTextColumn', () => {
     }
 
     it('should be able to provide a header text transformation', () => {
-      const defaultHeaderTextTransformation = (name: string) => `${name}!`;
-      createTestComponent({ defaultHeaderTextTransformation });
+      const defaultHeaderTextTransform = (name: string) => `${name}!`;
+      createTestComponent({defaultHeaderTextTransform});
 
       expectTableToMatchContent(tableElement, [
         ['propertyA!', 'propertyB!', 'propertyC!'],
@@ -137,7 +145,7 @@ describe('CdkTextColumn', () => {
             return '';
         }
       };
-      createTestComponent({ defaultDataAccessor });
+      createTestComponent({defaultDataAccessor});
 
       expectTableToMatchContent(tableElement, [
         ['PropertyA', 'PropertyB', 'PropertyC'],
@@ -178,3 +186,11 @@ class BasicTextColumnApp {
   dataAccessorA: (data: TestData) => string;
   justifyC = 'start';
 }
+
+@Component({
+  template: `
+    <cdk-text-column name="column-a"></cdk-text-column>
+  `
+})
+class MissingTableApp {
+}

src/cdk/table/text-column.ts

@@ -20,21 +20,23 @@ import {
 } from '@angular/core';
 import {CdkColumnDef} from './cell';
 import {CdkTable} from './table';
+import {getTableTextColumnMissingParentTableError} from './table-errors';
 
 /** Configurable options for `CdkTextColumn`. */
-export interface TextColumnOptions {
+export interface TextColumnOptions<T> {
   /**
    * Default function that provides the header text based on the column name if a header
    * text is not provided.
    */
-  defaultHeaderTextTransformation?: (name: string) => string;
+  defaultHeaderTextTransform?: (name: string) => string;
 
   /** Default data accessor to use if one is not provided. */
-  defaultDataAccessor?: (data: any, name: string) => string;
+  defaultDataAccessor?: (data: T, name: string) => string;
 }
 
 /** Injection token that can be used to specify the text column options. */
-export const TEXT_COLUMN_OPTIONS = new InjectionToken<TextColumnOptions>('text-column-options');
+export const TEXT_COLUMN_OPTIONS =
+  new InjectionToken<TextColumnOptions<any>>('text-column-options');
 
 /**
  * Column that simply shows text content for the header and row cells. Assumes that the table
@@ -70,7 +72,7 @@ export const TEXT_COLUMN_OPTIONS = new InjectionToken<TextColumnOptions>('text-c
 export class CdkTextColumn<T> implements OnDestroy, OnInit {
   /** Column name that should be used to reference this column. */
   @Input()
-  get name(): string { return this._name; }
+  get name(): string {return this._name;}
   set name(name: string) {
     this._name = name;
     this.columnDef.name = name;
@@ -97,7 +99,7 @@ export class CdkTextColumn<T> implements OnDestroy, OnInit {
   @ViewChild(CdkColumnDef) columnDef: CdkColumnDef;
 
   constructor(@Optional() private table: CdkTable<T>,
-              @Optional() @Inject(TEXT_COLUMN_OPTIONS) private options: TextColumnOptions) {
+    @Optional() @Inject(TEXT_COLUMN_OPTIONS) private options: TextColumnOptions<T>) {
     this.options = options || {};
   }
 
@@ -108,11 +110,13 @@ export class CdkTextColumn<T> implements OnDestroy, OnInit {
 
     if (!this.dataAccessor) {
       this.dataAccessor = this.options.defaultDataAccessor ||
-          ((data: T, name: string) => (data as any)[name]);
+        ((data: T, name: string) => (data as any)[name]);
     }
 
     if (this.table) {
       this.table.addColumnDef(this.columnDef);
+    } else {
+      throw getTableTextColumnMissingParentTableError();
     }
   }
 
@@ -127,10 +131,10 @@ export class CdkTextColumn<T> implements OnDestroy, OnInit {
    * has been provided. Otherwise simply capitalize the column name.
    */
   _createDefaultHeaderText() {
-    if (this.options && this.options.defaultHeaderTextTransformation) {
-      return this.options.defaultHeaderTextTransformation(this.name);
+    if (this.options && this.options.defaultHeaderTextTransform) {
+      return this.options.defaultHeaderTextTransform(this.name);
     }
 
-    return this.name.charAt(0).toUpperCase() + this.name.slice(1);
+    return this.name[0].toUpperCase() + this.name.slice(1);
   }
 }